diff --git a/.yarn/patches/eslint-npm-8.44.0-658d375d8a.patch b/.yarn/patches/eslint-npm-8.44.0-658d375d8a.patch deleted file mode 100644 index 52ca5f8..0000000 --- a/.yarn/patches/eslint-npm-8.44.0-658d375d8a.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/lib/api.js b/lib/api.js -index 3dde0985505a07ed8b64250bb96f470a0b17ace1..83d5599d24c4ef18bcae459abc731dff02fea6bb 100644 ---- a/lib/api.js -+++ b/lib/api.js -@@ -13,6 +13,7 @@ const { ESLint } = require("./eslint"); - const { Linter } = require("./linter"); - const { RuleTester } = require("./rule-tester"); - const { SourceCode } = require("./source-code"); -+const recommendedConfig = require("../conf/eslint-recommended"); - - //----------------------------------------------------------------------------- - // Exports -@@ -22,5 +23,6 @@ module.exports = { - Linter, - ESLint, - RuleTester, -+ recommendedConfig, - SourceCode - }; diff --git a/package.json b/package.json index f742981..0173432 100644 --- a/package.json +++ b/package.json @@ -19,18 +19,16 @@ "lint:misc": "prettier '**/*.json' '!**/rules-snapshot.json' '**/*.md' '!**/CHANGELOG.md' '**/*.yml' '!.yarnrc.yml' --ignore-path .gitignore", "test": "jest" }, - "resolutions": { - "eslint@^8.44.0": "patch:eslint@npm%3A8.44.0#./.yarn/patches/eslint-npm-8.44.0-658d375d8a.patch" - }, "devDependencies": { "@eslint/eslintrc": "^1.3.0", + "@eslint/js": "^8.45.0", "@lavamoat/allow-scripts": "^2.3.1", "@metamask/auto-changelog": "^3.0.0", "@metamask/eslint-config": "^12.0.0", "@metamask/eslint-config-nodejs": "^12.0.0", "@metamask/utils": "^6.0.0", "@types/jest": "^29.5.2", - "eslint": "^8.44.0", + "eslint": "^8.45.0", "eslint-config-prettier": "^8.5.0", "eslint-plugin-import": "~2.26.0", "eslint-plugin-jest": "^27.1.5", diff --git a/scripts/validate-configs.js b/scripts/validate-configs.js index eaa7785..42d5b6c 100644 --- a/scripts/validate-configs.js +++ b/scripts/validate-configs.js @@ -1,6 +1,6 @@ const { FlatCompat } = require('@eslint/eslintrc'); +const eslintRecommendedConfig = require('@eslint/js').configs.recommended; const { hasProperty } = require('@metamask/utils'); -const { recommendedConfig: eslintRecommendedConfig } = require('eslint'); const { configs: { recommended: prettierConfig }, } = require('eslint-plugin-prettier'); diff --git a/yarn.lock b/yarn.lock index d7d77b3..7827583 100644 --- a/yarn.lock +++ b/yarn.lock @@ -487,6 +487,13 @@ __metadata: languageName: node linkType: hard +"@eslint/js@npm:^8.45.0": + version: 8.45.0 + resolution: "@eslint/js@npm:8.45.0" + checksum: 38ebf283270d61523691c49662cd0fc4ac60db8e5eb83d49f1830ad2b3e636290469a84306fd2bddf0b79ed4c400377b633eea7c4eaef78d21ab0e0cc97c862f + languageName: node + linkType: hard + "@ethereumjs/common@npm:^3.2.0": version: 3.2.0 resolution: "@ethereumjs/common@npm:3.2.0" @@ -2637,9 +2644,9 @@ __metadata: languageName: node linkType: hard -"eslint@npm:8.44.0": - version: 8.44.0 - resolution: "eslint@npm:8.44.0" +"eslint@npm:^8.44.0, eslint@npm:^8.45.0": + version: 8.45.0 + resolution: "eslint@npm:8.45.0" dependencies: "@eslint-community/eslint-utils": ^4.2.0 "@eslint-community/regexpp": ^4.4.0 @@ -2666,7 +2673,6 @@ __metadata: globals: ^13.19.0 graphemer: ^1.4.0 ignore: ^5.2.0 - import-fresh: ^3.0.0 imurmurhash: ^0.1.4 is-glob: ^4.0.0 is-path-inside: ^3.0.3 @@ -2678,60 +2684,10 @@ __metadata: natural-compare: ^1.4.0 optionator: ^0.9.3 strip-ansi: ^6.0.1 - strip-json-comments: ^3.1.0 text-table: ^0.2.0 bin: eslint: bin/eslint.js - checksum: d06309ce4aafb9d27d558c8e5e5aa5cba3bbec3ce8ceccbc7d4b7a35f2b67fd40189159155553270e2e6febeb69bd8a3b60d6241c8f5ddc2ef1702ccbd328501 - languageName: node - linkType: hard - -"eslint@patch:eslint@npm%3A8.44.0#./.yarn/patches/eslint-npm-8.44.0-658d375d8a.patch::locator=root%40workspace%3A.": - version: 8.44.0 - resolution: "eslint@patch:eslint@npm%3A8.44.0#./.yarn/patches/eslint-npm-8.44.0-658d375d8a.patch::version=8.44.0&hash=24d7fa&locator=root%40workspace%3A." - dependencies: - "@eslint-community/eslint-utils": ^4.2.0 - "@eslint-community/regexpp": ^4.4.0 - "@eslint/eslintrc": ^2.1.0 - "@eslint/js": 8.44.0 - "@humanwhocodes/config-array": ^0.11.10 - "@humanwhocodes/module-importer": ^1.0.1 - "@nodelib/fs.walk": ^1.2.8 - ajv: ^6.10.0 - chalk: ^4.0.0 - cross-spawn: ^7.0.2 - debug: ^4.3.2 - doctrine: ^3.0.0 - escape-string-regexp: ^4.0.0 - eslint-scope: ^7.2.0 - eslint-visitor-keys: ^3.4.1 - espree: ^9.6.0 - esquery: ^1.4.2 - esutils: ^2.0.2 - fast-deep-equal: ^3.1.3 - file-entry-cache: ^6.0.1 - find-up: ^5.0.0 - glob-parent: ^6.0.2 - globals: ^13.19.0 - graphemer: ^1.4.0 - ignore: ^5.2.0 - import-fresh: ^3.0.0 - imurmurhash: ^0.1.4 - is-glob: ^4.0.0 - is-path-inside: ^3.0.3 - js-yaml: ^4.1.0 - json-stable-stringify-without-jsonify: ^1.0.1 - levn: ^0.4.1 - lodash.merge: ^4.6.2 - minimatch: ^3.1.2 - natural-compare: ^1.4.0 - optionator: ^0.9.3 - strip-ansi: ^6.0.1 - strip-json-comments: ^3.1.0 - text-table: ^0.2.0 - bin: - eslint: bin/eslint.js - checksum: 7966cf505da60b3e007dbe49a795442094e84cdfc051fb9cd2617246d39995d620586e7e1883f4064fe53c94c0e5fffbf28aa09b9334b3b17d868b90865fdac4 + checksum: 3e6dcce5cc43c5e301662db88ee26d1d188b22c177b9f104d7eefd1191236980bd953b3670fe2fac287114b26d7c5420ab48407d7ea1c3a446d6313c000009da languageName: node linkType: hard @@ -3361,7 +3317,7 @@ __metadata: languageName: node linkType: hard -"import-fresh@npm:^3.0.0, import-fresh@npm:^3.2.1": +"import-fresh@npm:^3.2.1": version: 3.3.0 resolution: "import-fresh@npm:3.3.0" dependencies: @@ -5090,13 +5046,14 @@ __metadata: resolution: "root@workspace:." dependencies: "@eslint/eslintrc": ^1.3.0 + "@eslint/js": ^8.45.0 "@lavamoat/allow-scripts": ^2.3.1 "@metamask/auto-changelog": ^3.0.0 "@metamask/eslint-config": ^12.0.0 "@metamask/eslint-config-nodejs": ^12.0.0 "@metamask/utils": ^6.0.0 "@types/jest": ^29.5.2 - eslint: ^8.44.0 + eslint: ^8.45.0 eslint-config-prettier: ^8.5.0 eslint-plugin-import: ~2.26.0 eslint-plugin-jest: ^27.1.5 @@ -5435,7 +5392,7 @@ __metadata: languageName: node linkType: hard -"strip-json-comments@npm:^3.1.0, strip-json-comments@npm:^3.1.1": +"strip-json-comments@npm:^3.1.1": version: 3.1.1 resolution: "strip-json-comments@npm:3.1.1" checksum: 492f73e27268f9b1c122733f28ecb0e7e8d8a531a6662efbd08e22cccb3f9475e90a1b82cab06a392f6afae6d2de636f977e231296400d0ec5304ba70f166443