From 47fc261aad972fa65eead4e8c4a9dc608eca8854 Mon Sep 17 00:00:00 2001 From: fisker Cheung Date: Fri, 27 Sep 2024 20:49:39 +0800 Subject: [PATCH] Remove `eslint-plugin-import` (#16697) --- .github/renovate.json5 | 5 +- eslint.config.js | 23 --- package.json | 1 - .../no-identifier-n.js | 1 - .../test.js | 1 - src/cli/format.js | 1 - website/siteConfig.js | 1 - yarn.lock | 147 +----------------- 8 files changed, 9 insertions(+), 171 deletions(-) diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 09f9379b3..b7fefa81a 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -24,6 +24,10 @@ matchPackagePrefixes: ["@glimmer/"], groupName: "glimmer", }, + { + matchDepNames: ["flow-parser", "hermes-parser"], + groupName: "flow", + }, { matchDepNames: [ "eslint", @@ -32,7 +36,6 @@ "@eslint/js", "@stylistic/eslint-plugin-js", "eslint-config-prettier", - "eslint-plugin-import", "eslint-plugin-jest", "eslint-plugin-n", "eslint-plugin-react", diff --git a/eslint.config.js b/eslint.config.js index cee26542b..9a9307c62 100644 --- a/eslint.config.js +++ b/eslint.config.js @@ -5,7 +5,6 @@ import eslintPluginStylisticJs from "@stylistic/eslint-plugin-js"; import eslintPluginTypescriptEslint from "@typescript-eslint/eslint-plugin"; import { isCI } from "ci-info"; import eslintConfigPrettier from "eslint-config-prettier"; -import eslintPluginImport from "eslint-plugin-import"; import eslintPluginJest from "eslint-plugin-jest"; import eslintPluginN from "eslint-plugin-n"; import eslintPluginReact from "eslint-plugin-react"; @@ -55,7 +54,6 @@ export default [ plugins: { "@stylistic/js": eslintPluginStylisticJs, "@typescript-eslint": eslintPluginTypescriptEslint, - import: eslintPluginImport, n: eslintPluginN, "prettier-internal-rules": eslintPluginPrettierInternalRules, "simple-import-sort": eslintPluginSimpleImportSort, @@ -159,20 +157,6 @@ export default [ /* @typescript-eslint/eslint-plugin */ "@typescript-eslint/prefer-ts-expect-error": "error", - /* eslint-plugin-import */ - "import/no-extraneous-dependencies": [ - "error", - { - devDependencies: [ - "jest.config.js", - "tests/**", - "scripts/**", - "website/**/*", - "eslint.config.js", - ], - }, - ], - /* eslint-plugin-n */ "n/no-path-concat": "error", @@ -466,13 +450,6 @@ export default [ sourceType: "module", }, }, - // `import/no-extraneous-dependencies` reports on Windows but not on CI - { - files: ["website/siteConfig.js"], - linterOptions: { - reportUnusedDisableDirectives: "off", - }, - }, { files: ["bin/prettier.cjs"], languageOptions: { diff --git a/package.json b/package.json index b33031c49..69618a550 100644 --- a/package.json +++ b/package.json @@ -127,7 +127,6 @@ "eslint-config-prettier": "9.1.0", "eslint-formatter-friendly": "7.0.0", "eslint-plugin-compat": "6.0.0", - "eslint-plugin-import": "2.30.0", "eslint-plugin-jest": "28.8.3", "eslint-plugin-n": "17.10.3", "eslint-plugin-react": "7.37.0", diff --git a/scripts/tools/eslint-plugin-prettier-internal-rules/no-identifier-n.js b/scripts/tools/eslint-plugin-prettier-internal-rules/no-identifier-n.js index 2b2ad7c10..81fa73c86 100644 --- a/scripts/tools/eslint-plugin-prettier-internal-rules/no-identifier-n.js +++ b/scripts/tools/eslint-plugin-prettier-internal-rules/no-identifier-n.js @@ -1,6 +1,5 @@ "use strict"; -// eslint-disable-next-line import/no-extraneous-dependencies const { findVariable } = require("@eslint-community/eslint-utils"); const ERROR = "error"; const SUGGESTION = "suggestion"; diff --git a/scripts/tools/eslint-plugin-prettier-internal-rules/test.js b/scripts/tools/eslint-plugin-prettier-internal-rules/test.js index 9c4ef375a..572543bdf 100644 --- a/scripts/tools/eslint-plugin-prettier-internal-rules/test.js +++ b/scripts/tools/eslint-plugin-prettier-internal-rules/test.js @@ -1,4 +1,3 @@ -/* eslint-disable import/no-extraneous-dependencies */ "use strict"; const path = require("path"); diff --git a/src/cli/format.js b/src/cli/format.js index 4f65852ff..06bd00932 100644 --- a/src/cli/format.js +++ b/src/cli/format.js @@ -170,7 +170,6 @@ async function format(context, input, opt) { if (performanceTestFlag?.debugBenchmark) { let benchmark; try { - // eslint-disable-next-line import/no-extraneous-dependencies ({ default: benchmark } = await import("benchmark")); } catch { context.logger.debug( diff --git a/website/siteConfig.js b/website/siteConfig.js index d92f63f4b..54e4a93da 100644 --- a/website/siteConfig.js +++ b/website/siteConfig.js @@ -52,7 +52,6 @@ const siteConfig = { }, highlight: { theme: "default", - // eslint-disable-next-line import/no-extraneous-dependencies -- This is a docusaurus dependency version: require("highlight.js/package.json").version, }, usePrism: ["javascript", "jsx", "typescript", "ts", "js", "html", "css"], diff --git a/yarn.lock b/yarn.lock index 183a21c1e..7b7c5787c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1755,13 +1755,6 @@ __metadata: languageName: node linkType: hard -"@rtsao/scc@npm:^1.1.0": - version: 1.1.0 - resolution: "@rtsao/scc@npm:1.1.0" - checksum: 10/17d04adf404e04c1e61391ed97bca5117d4c2767a76ae3e879390d6dec7b317fcae68afbf9e98badee075d0b64fa60f287729c4942021b4d19cd01db77385c01 - languageName: node - linkType: hard - "@simple-dom/interface@npm:^1.4.0": version: 1.4.0 resolution: "@simple-dom/interface@npm:1.4.0" @@ -1950,13 +1943,6 @@ __metadata: languageName: node linkType: hard -"@types/json5@npm:^0.0.29": - version: 0.0.29 - resolution: "@types/json5@npm:0.0.29" - checksum: 10/4e5aed58cabb2bbf6f725da13421aa50a49abb6bc17bfab6c31b8774b073fa7b50d557c61f961a09a85f6056151190f8ac95f13f5b48136ba5841f7d4484ec56 - languageName: node - linkType: hard - "@types/node@npm:*": version: 20.14.9 resolution: "@types/node@npm:20.14.9" @@ -2336,21 +2322,7 @@ __metadata: languageName: node linkType: hard -"array.prototype.findlastindex@npm:^1.2.5": - version: 1.2.5 - resolution: "array.prototype.findlastindex@npm:1.2.5" - dependencies: - call-bind: "npm:^1.0.7" - define-properties: "npm:^1.2.1" - es-abstract: "npm:^1.23.2" - es-errors: "npm:^1.3.0" - es-object-atoms: "npm:^1.0.0" - es-shim-unscopables: "npm:^1.0.2" - checksum: 10/7c5c821f357cd53ab6cc305de8086430dd8d7a2485db87b13f843e868055e9582b1fd338f02338f67fc3a1603ceaf9610dd2a470b0b506f9d18934780f95b246 - languageName: node - linkType: hard - -"array.prototype.flat@npm:^1.3.1, array.prototype.flat@npm:^1.3.2": +"array.prototype.flat@npm:^1.3.1": version: 1.3.2 resolution: "array.prototype.flat@npm:1.3.2" dependencies: @@ -3244,15 +3216,6 @@ __metadata: languageName: node linkType: hard -"debug@npm:^3.2.7": - version: 3.2.7 - resolution: "debug@npm:3.2.7" - dependencies: - ms: "npm:^2.1.1" - checksum: 10/d86fd7be2b85462297ea16f1934dc219335e802f629ca9a69b63ed8ed041dda492389bb2ee039217c02e5b54792b1c51aa96ae954cf28634d363a2360c7a1639 - languageName: node - linkType: hard - "dedent@npm:^1.0.0": version: 1.5.3 resolution: "dedent@npm:1.5.3" @@ -3793,29 +3756,6 @@ __metadata: languageName: node linkType: hard -"eslint-import-resolver-node@npm:^0.3.9": - version: 0.3.9 - resolution: "eslint-import-resolver-node@npm:0.3.9" - dependencies: - debug: "npm:^3.2.7" - is-core-module: "npm:^2.13.0" - resolve: "npm:^1.22.4" - checksum: 10/d52e08e1d96cf630957272e4f2644dcfb531e49dcfd1edd2e07e43369eb2ec7a7d4423d417beee613201206ff2efa4eb9a582b5825ee28802fc7c71fcd53ca83 - languageName: node - linkType: hard - -"eslint-module-utils@npm:^2.9.0": - version: 2.11.0 - resolution: "eslint-module-utils@npm:2.11.0" - dependencies: - debug: "npm:^3.2.7" - peerDependenciesMeta: - eslint: - optional: true - checksum: 10/1ba42cf48c5f9ec3b76dfa42c16f1c24c10508313689425c05ccb1d0eaa34bdc5c5b9c0c033cd402e9c429666bd3eb8c6d0c66565b0c00949fae743ad3643c95 - languageName: node - linkType: hard - "eslint-plugin-compat@npm:6.0.0": version: 6.0.0 resolution: "eslint-plugin-compat@npm:6.0.0" @@ -3847,34 +3787,6 @@ __metadata: languageName: node linkType: hard -"eslint-plugin-import@npm:2.30.0": - version: 2.30.0 - resolution: "eslint-plugin-import@npm:2.30.0" - dependencies: - "@rtsao/scc": "npm:^1.1.0" - array-includes: "npm:^3.1.8" - array.prototype.findlastindex: "npm:^1.2.5" - array.prototype.flat: "npm:^1.3.2" - array.prototype.flatmap: "npm:^1.3.2" - debug: "npm:^3.2.7" - doctrine: "npm:^2.1.0" - eslint-import-resolver-node: "npm:^0.3.9" - eslint-module-utils: "npm:^2.9.0" - hasown: "npm:^2.0.2" - is-core-module: "npm:^2.15.1" - is-glob: "npm:^4.0.3" - minimatch: "npm:^3.1.2" - object.fromentries: "npm:^2.0.8" - object.groupby: "npm:^1.0.3" - object.values: "npm:^1.2.0" - semver: "npm:^6.3.1" - tsconfig-paths: "npm:^3.15.0" - peerDependencies: - eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8 - checksum: 10/a5f85dfe76e27286c28a01d137769726ce3f758bcc03aa6b6f9e18700a40a08f57239f82e07efcab763c4b03a02d425edcc29fbecf40aad0124286978c6bc63c - languageName: node - linkType: hard - "eslint-plugin-jest@npm:28.8.3": version: 28.8.3 resolution: "eslint-plugin-jest@npm:28.8.3" @@ -5067,7 +4979,7 @@ __metadata: languageName: node linkType: hard -"is-core-module@npm:^2.13.0, is-core-module@npm:^2.15.1": +"is-core-module@npm:^2.13.0": version: 2.15.1 resolution: "is-core-module@npm:2.15.1" dependencies: @@ -6221,17 +6133,6 @@ __metadata: languageName: node linkType: hard -"json5@npm:^1.0.2": - version: 1.0.2 - resolution: "json5@npm:1.0.2" - dependencies: - minimist: "npm:^1.2.0" - bin: - json5: lib/cli.js - checksum: 10/a78d812dbbd5642c4f637dd130954acfd231b074965871c3e28a5bbd571f099d623ecf9161f1960c4ddf68e0cc98dee8bebfdb94a71ad4551f85a1afc94b63f6 - languageName: node - linkType: hard - "jsx-ast-utils@npm:^2.4.1 || ^3.0.0": version: 3.3.5 resolution: "jsx-ast-utils@npm:3.3.5" @@ -6561,7 +6462,7 @@ __metadata: languageName: node linkType: hard -"minimist@npm:1.2.8, minimist@npm:^1.2.0, minimist@npm:^1.2.6, minimist@npm:^1.2.8": +"minimist@npm:1.2.8, minimist@npm:^1.2.8": version: 1.2.8 resolution: "minimist@npm:1.2.8" checksum: 10/908491b6cc15a6c440ba5b22780a0ba89b9810e1aea684e253e43c4e3b8d56ec1dcdd7ea96dde119c29df59c936cde16062159eae4225c691e19c70b432b6e6f @@ -6687,13 +6588,6 @@ __metadata: languageName: node linkType: hard -"ms@npm:^2.1.1": - version: 2.1.3 - resolution: "ms@npm:2.1.3" - checksum: 10/aa92de608021b242401676e35cfa5aa42dd70cbdc082b916da7fb925c542173e36bce97ea3e804923fe92c0ad991434e4a38327e15a1b5b5f945d66df615ae6d - languageName: node - linkType: hard - "n-readlines@npm:1.0.1": version: 1.0.1 resolution: "n-readlines@npm:1.0.1" @@ -6889,17 +6783,6 @@ __metadata: languageName: node linkType: hard -"object.groupby@npm:^1.0.3": - version: 1.0.3 - resolution: "object.groupby@npm:1.0.3" - dependencies: - call-bind: "npm:^1.0.7" - define-properties: "npm:^1.2.1" - es-abstract: "npm:^1.23.2" - checksum: 10/44cb86dd2c660434be65f7585c54b62f0425b0c96b5c948d2756be253ef06737da7e68d7106e35506ce4a44d16aa85a413d11c5034eb7ce5579ec28752eb42d0 - languageName: node - linkType: hard - "object.values@npm:^1.1.6, object.values@npm:^1.2.0": version: 1.2.0 resolution: "object.values@npm:1.2.0" @@ -7394,7 +7277,6 @@ __metadata: eslint-config-prettier: "npm:9.1.0" eslint-formatter-friendly: "npm:7.0.0" eslint-plugin-compat: "npm:6.0.0" - eslint-plugin-import: "npm:2.30.0" eslint-plugin-jest: "npm:28.8.3" eslint-plugin-n: "npm:17.10.3" eslint-plugin-react: "npm:7.37.0" @@ -7796,7 +7678,7 @@ __metadata: languageName: node linkType: hard -"resolve@npm:^1.10.0, resolve@npm:^1.20.0, resolve@npm:^1.22.4": +"resolve@npm:^1.10.0, resolve@npm:^1.20.0": version: 1.22.8 resolution: "resolve@npm:1.22.8" dependencies: @@ -7822,7 +7704,7 @@ __metadata: languageName: node linkType: hard -"resolve@patch:resolve@npm%3A^1.10.0#optional!builtin, resolve@patch:resolve@npm%3A^1.20.0#optional!builtin, resolve@patch:resolve@npm%3A^1.22.4#optional!builtin": +"resolve@patch:resolve@npm%3A^1.10.0#optional!builtin, resolve@patch:resolve@npm%3A^1.20.0#optional!builtin": version: 1.22.8 resolution: "resolve@patch:resolve@npm%3A1.22.8#optional!builtin::version=1.22.8&hash=c3c19d" dependencies: @@ -8406,13 +8288,6 @@ __metadata: languageName: node linkType: hard -"strip-bom@npm:^3.0.0": - version: 3.0.0 - resolution: "strip-bom@npm:3.0.0" - checksum: 10/8d50ff27b7ebe5ecc78f1fe1e00fcdff7af014e73cf724b46fb81ef889eeb1015fc5184b64e81a2efe002180f3ba431bdd77e300da5c6685d702780fbf0c8d5b - languageName: node - linkType: hard - "strip-bom@npm:^4.0.0": version: 4.0.0 resolution: "strip-bom@npm:4.0.0" @@ -8658,18 +8533,6 @@ __metadata: languageName: node linkType: hard -"tsconfig-paths@npm:^3.15.0": - version: 3.15.0 - resolution: "tsconfig-paths@npm:3.15.0" - dependencies: - "@types/json5": "npm:^0.0.29" - json5: "npm:^1.0.2" - minimist: "npm:^1.2.6" - strip-bom: "npm:^3.0.0" - checksum: 10/2041beaedc6c271fc3bedd12e0da0cc553e65d030d4ff26044b771fac5752d0460944c0b5e680f670c2868c95c664a256cec960ae528888db6ded83524e33a14 - languageName: node - linkType: hard - "tslib@npm:^2.3.0, tslib@npm:^2.4.0, tslib@npm:^2.6.0, tslib@npm:^2.6.2": version: 2.6.3 resolution: "tslib@npm:2.6.3"