remove eslint-plugin-prettier

sasaplus1 · Mar 6, 2021 · 181a6db · 181a6db
1 parent 323a657
commit 181a6db
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 53 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -4,56 +4,52 @@ module.exports = {
     es6: true,
     node: true
   },
-  extends: [
-    'eslint:recommended',
-    'plugin:node/recommended',
-    'plugin:prettier/recommended'
-  ],
-  globals: {
-    globalThis: true
-  },
+  extends: ['eslint:recommended', 'plugin:node/recommended', 'prettier'],
   overrides: [
     {
       extends: [
         'eslint:recommended',
-        'plugin:node/recommended',
         'plugin:@typescript-eslint/eslint-recommended',
         'plugin:@typescript-eslint/recommended',
-        'plugin:prettier/recommended',
+        'plugin:node/recommended-module',
         'prettier'
       ],
-      files: ['**/*.ts'],
+      files: ['index.ts', 'src/**/*.ts'],
       parser: '@typescript-eslint/parser',
       plugins: ['@typescript-eslint'],
-      rules: {
-        'node/no-unsupported-features/es-syntax': 'off'
-      },
       settings: {
         node: {
           tryExtensions: ['.ts', '.js', '.json', '.json']
         }
       }
     },
     {
-      env: {
-        mocha: true
-      },
+      extends: [
+        'eslint:recommended',
+        'plugin:@typescript-eslint/eslint-recommended',
+        'plugin:@typescript-eslint/recommended',
+        'plugin:node/recommended-module',
+        'prettier'
+      ],
       files: ['test/**/*.ts'],
-      rules: {
-        'node/no-unsupported-features/es-builtins': 'off'
-      }
-    },
-    {
-      files: ['rollup.config.js'],
-      rules: {
-        'node/no-unsupported-features/es-syntax': 'off'
+      globals: {
+        globalThis: true
+      },
+      parser: '@typescript-eslint/parser',
+      plugins: ['@typescript-eslint'],
+      settings: {
+        node: {
+          tryExtensions: ['.ts', '.js', '.json', '.json']
+        }
       }
     },
     {
-      files: ['benchmark/benchmark.js'],
-      rules: {
-        'node/shebang': 'off'
-      }
+      extends: [
+        'eslint:recommended',
+        'plugin:node/recommended-module',
+        'prettier'
+      ],
+      files: ['rollup.config.js']
     }
   ],
   parserOptions: {

diff --git a/.prettierignore b/.prettierignore
@@ -0,0 +1,3 @@
+dist/
+*.d.ts
+!.*.js
diff --git a/package.json b/package.json
@@ -23,7 +23,6 @@
     "eslint": "^7.21.0",
     "eslint-config-prettier": "^8.1.0",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-prettier": "^3.3.1",
     "espower-typescript": "^10.0.0",
     "husky": "^4.2.5",
     "karma": "^6.1.1",
@@ -63,11 +62,14 @@
     "build:esm": "rollup -c --environment build:esm",
     "build:umd": "rollup -c --environment build:umd",
     "check-types": "tsc --noEmit",
-    "fix": "eslint --fix --ext .js,.ts .",
+    "fix": "run-s fix:*",
+    "fix:eslint": "eslint --fix --ext .js,.ts .",
+    "fix:prettier": "prettier --write '**/*.+(js|ts)'",
     "fixpack": "npx fixpack",
-    "lint": "eslint --cache --ext .js,.ts .",
-    "mocha": "mocha",
-    "test": "run-s mocha"
+    "lint": "run-s lint:*",
+    "lint:eslint": "eslint --cache --ext .js,.ts .",
+    "lint:prettier": "prettier --check '**/*.+(js|ts)'",
+    "test": "mocha"
   },
   "sideEffects": false,
   "types": "./dist/cjs/index.d.ts"

diff --git a/yarn.lock b/yarn.lock
@@ -1176,13 +1176,6 @@ eslint-plugin-node@^11.1.0:
     resolve "^1.10.1"
     semver "^6.1.0"
 
-eslint-plugin-prettier@^3.3.1:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.3.1.tgz#7079cfa2497078905011e6f82e8dd8453d1371b7"
-  integrity sha512-Rq3jkcFY8RYeQLgk2cCwuc0P7SEFwDravPhsJZOQ5N4YI4DSg50NyqJ/9gdZHzQlHf8MvafSesbNJCcP/FF6pQ==
-  dependencies:
-    prettier-linter-helpers "^1.0.0"
-
 eslint-scope@^5.0.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.0.tgz#d0f971dfe59c69e0cada684b23d49dbf82600ce5"
@@ -1443,11 +1436,6 @@ fast-deep-equal@^3.1.1:
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz#545145077c501491e33b15ec408c294376e94ae4"
   integrity sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==
 
-fast-diff@^1.1.2:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03"
-  integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==
-
 fast-glob@^3.1.1:
   version "3.2.5"
   resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.5.tgz#7939af2a656de79a4f1901903ee8adcaa7cb9661"
@@ -2741,13 +2729,6 @@ prelude-ls@~1.1.2:
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
   integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
 
-prettier-linter-helpers@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz#d23d41fe1375646de2d0104d3454a3008802cf7b"
-  integrity sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==
-  dependencies:
-    fast-diff "^1.1.2"
-
 prettier@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.2.1.tgz#795a1a78dd52f073da0cd42b21f9c91381923ff5"
-Original file line number
+Diff line change
@@ -0,0 +1,3 @@
+    dist/
+    *.d.ts
+    !.*.js