feat: run prettier outside of eslint

christophehurpeau · Nov 13, 2020 · 445e2cc · 445e2cc
1 parent c8b10fb
commit 445e2cc
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 34 deletions.
diff --git a/@pob/root/createLintStagedConfig.js b/@pob/root/createLintStagedConfig.js
@@ -77,24 +77,21 @@ module.exports = function createLintStagedConfig() {
         }`,
       ].filter(Boolean);
     },
-    [`{*.json${
-      workspaces
-        ? `,${workspaces
-            .map((workspacePath) => `${workspacePath}/*.json`)
-            .join(',')}`
-        : ''
-    }}`]: (filenames) => {
-      const filteredFilenames = filenames.filter(
-        (name) => !name.endsWith('/package.json'),
-      );
-      if (filteredFilenames.length === 0) return [];
-      return [`prettier --write ${filteredFilenames.join(' ')}`];
-    },
+    '!(package|package-lock).json': ['prettier --write'],
+    [`{scripts,config,${srcDirectories}}/**/*.{yml,yaml,md}`]: [
+      'prettier --write',
+    ],
+    './*.{yml,yaml,md}': ['prettier --write'],
+    [`${srcDirectories}/**/*.{js,ts,tsx}`]: [
+      'prettier --write',
+      'eslint --fix --quiet',
+    ],
+    '{scripts,config,.storyboook}/**/*.{js,mjs,cjs}': [
+      'prettier --write',
+      'eslint --fix --quiet',
+    ],
     [`{.storybook,${srcDirectories}}/**/*.css`]: [
       'prettier --parser css --write',
     ],
-
-    [`${srcDirectories}/**/*.{js,ts,tsx}`]: ['eslint --fix --quiet'],
-    '{scripts,config,.storyboook}/*.js': ['eslint --fix --quiet'],
   };
 };
diff --git a/packages/pob/lib/generators/core/vscode/templates/settings.json.ejs b/packages/pob/lib/generators/core/vscode/templates/settings.json.ejs
@@ -29,22 +29,6 @@
   "eslint.lintTask.enable": true,
 
   // eslint & prettier formatter
-  "eslint.format.enable": true,
-  "editor.defaultFormatter": "esbenp.prettier-vscode",
-  "[javascript]": {
-    "editor.formatOnSave": false,
-    "editor.defaultFormatter": "dbaeumer.vscode-eslint"
-  },
-  "[javascriptreact]": {
-    "editor.formatOnSave": false,
-    "editor.defaultFormatter": "dbaeumer.vscode-eslint"
-  },
-  "[typescript]": {
-    "editor.formatOnSave": false,
-    "editor.defaultFormatter": "dbaeumer.vscode-eslint"
-  },
-  "[typescriptreact]": {
-    "editor.formatOnSave": false,
-    "editor.defaultFormatter": "dbaeumer.vscode-eslint"
-  }
+  "eslint.format.enable": false,
+  "editor.defaultFormatter": "esbenp.prettier-vscode"
 }