From 519cac376e52bdb091f0db8a1aaa1f102842dbf4 Mon Sep 17 00:00:00 2001 From: Flo Edelmann Date: Mon, 12 Feb 2024 18:25:32 +0100 Subject: [PATCH 01/27] Bump postcss-selector-parser from 6.0.13 to 6.0.15 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 329e025f4..3f14f0e83 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,7 @@ "@eslint-community/eslint-utils": "^4.4.0", "natural-compare": "^1.4.0", "nth-check": "^2.1.1", - "postcss-selector-parser": "^6.0.13", + "postcss-selector-parser": "^6.0.15", "semver": "^7.5.4", "vue-eslint-parser": "^9.4.2", "xml-name-validator": "^4.0.0" From 008fbf63890da2a798cd5d63d5d2b7da5aef6356 Mon Sep 17 00:00:00 2001 From: Flo Edelmann Date: Mon, 12 Feb 2024 18:26:03 +0100 Subject: [PATCH 02/27] Bump semver from 7.5.4 to 7.6.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3f14f0e83..a753de994 100644 --- a/package.json +++ b/package.json @@ -58,7 +58,7 @@ "natural-compare": "^1.4.0", "nth-check": "^2.1.1", "postcss-selector-parser": "^6.0.15", - "semver": "^7.5.4", + "semver": "^7.6.0", "vue-eslint-parser": "^9.4.2", "xml-name-validator": "^4.0.0" }, From 954d631dcbb2dc79cb8ca8154f034d7a50f2f8a7 Mon Sep 17 00:00:00 2001 From: Flo Edelmann Date: Mon, 12 Feb 2024 18:31:40 +0100 Subject: [PATCH 03/27] Bump @stylistic/eslint-plugin from 1.4.1 to 1.6.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a753de994..180fded28 100644 --- a/package.json +++ b/package.json @@ -64,7 +64,7 @@ }, "devDependencies": { "@ota-meshi/site-kit-eslint-editor-vue": "^0.1.2", - "@stylistic/eslint-plugin": "^1.4.1", + "@stylistic/eslint-plugin": "^1.6.1", "@types/eslint": "^8.44.1", "@types/eslint-visitor-keys": "^3.3.0", "@types/natural-compare": "^1.4.1", From cc463e243b5f06c878bb01056a9743cc6ba8e65a Mon Sep 17 00:00:00 2001 From: Flo Edelmann Date: Mon, 12 Feb 2024 18:32:12 +0100 Subject: [PATCH 04/27] Bump @types/eslint from 8.44.1 to 8.56.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 180fded28..fb4fafb0f 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "devDependencies": { "@ota-meshi/site-kit-eslint-editor-vue": "^0.1.2", "@stylistic/eslint-plugin": "^1.6.1", - "@types/eslint": "^8.44.1", + "@types/eslint": "^8.56.2", "@types/eslint-visitor-keys": "^3.3.0", "@types/natural-compare": "^1.4.1", "@types/node": "^14.18.54", From a11a51c07f24437188d906f3901ecf6a6a3009a5 Mon Sep 17 00:00:00 2001 From: Flo Edelmann Date: Mon, 12 Feb 2024 18:32:46 +0100 Subject: [PATCH 05/27] Bump @types/natural-compare from 1.4.1 to 1.4.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fb4fafb0f..3bc6a7ad4 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,7 @@ "@stylistic/eslint-plugin": "^1.6.1", "@types/eslint": "^8.56.2", "@types/eslint-visitor-keys": "^3.3.0", - "@types/natural-compare": "^1.4.1", + "@types/natural-compare": "^1.4.3", "@types/node": "^14.18.54", "@types/semver": "^7.5.0", "@types/xml-name-validator": "^4.0.1", From 158e863ba66195c34a6a2895b075b52b7c83bc5b Mon Sep 17 00:00:00 2001 From: Flo Edelmann Date: Mon, 12 Feb 2024 18:34:31 +0100 Subject: [PATCH 06/27] Bump @types/node from 14.18.54 to 14.18.63 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3bc6a7ad4..12de91fef 100644 --- a/package.json +++ b/package.json @@ -68,7 +68,7 @@ "@types/eslint": "^8.56.2", "@types/eslint-visitor-keys": "^3.3.0", "@types/natural-compare": "^1.4.3", - "@types/node": "^14.18.54", + "@types/node": "^14.18.63", "@types/semver": "^7.5.0", "@types/xml-name-validator": "^4.0.1", "@typescript-eslint/parser": "^6.2.0", From c275be1c6ee31821075b1061cccfdabf74d603b4 Mon Sep 17 00:00:00 2001 From: Flo Edelmann Date: Mon, 12 Feb 2024 18:35:18 +0100 Subject: [PATCH 07/27] Bump @types/semver from 7.5.0 to 7.5.7 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 12de91fef..b634d2e61 100644 --- a/package.json +++ b/package.json @@ -69,7 +69,7 @@ "@types/eslint-visitor-keys": "^3.3.0", "@types/natural-compare": "^1.4.3", "@types/node": "^14.18.63", - "@types/semver": "^7.5.0", + "@types/semver": "^7.5.7", "@types/xml-name-validator": "^4.0.1", "@typescript-eslint/parser": "^6.2.0", "@typescript-eslint/types": "^6.2.0", From 464d822589fa700687627ddfd1135c784c3791d5 Mon Sep 17 00:00:00 2001 From: Flo Edelmann Date: Mon, 12 Feb 2024 18:35:46 +0100 Subject: [PATCH 08/27] Bump @types/xml-name-validator from 4.0.1 to 4.0.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b634d2e61..06512d95e 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,7 @@ "@types/natural-compare": "^1.4.3", "@types/node": "^14.18.63", "@types/semver": "^7.5.7", - "@types/xml-name-validator": "^4.0.1", + "@types/xml-name-validator": "^4.0.3", "@typescript-eslint/parser": "^6.2.0", "@typescript-eslint/types": "^6.2.0", "assert": "^2.0.0", From adeef30162b6c3d9613b3dcf7c95b55618ac3635 Mon Sep 17 00:00:00 2001 From: Flo Edelmann Date: Mon, 12 Feb 2024 18:36:20 +0100 Subject: [PATCH 09/27] Bump @typescript-eslint from 6.2.0 to 7.0.1 --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 06512d95e..e21cb6dff 100644 --- a/package.json +++ b/package.json @@ -71,8 +71,8 @@ "@types/node": "^14.18.63", "@types/semver": "^7.5.7", "@types/xml-name-validator": "^4.0.3", - "@typescript-eslint/parser": "^6.2.0", - "@typescript-eslint/types": "^6.2.0", + "@typescript-eslint/parser": "^7.0.1", + "@typescript-eslint/types": "^7.0.1", "assert": "^2.0.0", "env-cmd": "^10.1.0", "esbuild": "^0.18.17", From 19d39a062cec63954c86d83bde927395bef54364 Mon Sep 17 00:00:00 2001 From: Flo Edelmann Date: Mon, 12 Feb 2024 18:36:39 +0100 Subject: [PATCH 10/27] Bump assert from 2.0.0 to 2.1.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e21cb6dff..b8fd6f435 100644 --- a/package.json +++ b/package.json @@ -73,7 +73,7 @@ "@types/xml-name-validator": "^4.0.3", "@typescript-eslint/parser": "^7.0.1", "@typescript-eslint/types": "^7.0.1", - "assert": "^2.0.0", + "assert": "^2.1.0", "env-cmd": "^10.1.0", "esbuild": "^0.18.17", "eslint": "^8.45.0", From c6122c34bf9679fd25ff4d1ce9e509119df2ef34 Mon Sep 17 00:00:00 2001 From: Flo Edelmann Date: Mon, 12 Feb 2024 18:38:08 +0100 Subject: [PATCH 11/27] Bump esbuild from 0.18.17 to 0.20.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b8fd6f435..7c727a9f8 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "@typescript-eslint/types": "^7.0.1", "assert": "^2.1.0", "env-cmd": "^10.1.0", - "esbuild": "^0.18.17", + "esbuild": "^0.20.0", "eslint": "^8.45.0", "eslint-config-prettier": "^8.9.0", "eslint-plugin-eslint-plugin": "~5.1.1", From 862adddb69ebe2a6e374342b75c0a0288b93da05 Mon Sep 17 00:00:00 2001 From: Flo Edelmann Date: Mon, 12 Feb 2024 18:38:45 +0100 Subject: [PATCH 12/27] Bump eslint from 8.45.0 to 8.56.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7c727a9f8..ab6da25ac 100644 --- a/package.json +++ b/package.json @@ -76,7 +76,7 @@ "assert": "^2.1.0", "env-cmd": "^10.1.0", "esbuild": "^0.20.0", - "eslint": "^8.45.0", + "eslint": "^8.56.0", "eslint-config-prettier": "^8.9.0", "eslint-plugin-eslint-plugin": "~5.1.1", "eslint-plugin-import": "^2.27.5", From 35da22e70e8dbcb938d00633081b08340fdc0c87 Mon Sep 17 00:00:00 2001 From: Flo Edelmann Date: Mon, 12 Feb 2024 18:39:57 +0100 Subject: [PATCH 13/27] Bump eslint-config-prettier from 8.9.0 to 9.1.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ab6da25ac..751667ace 100644 --- a/package.json +++ b/package.json @@ -77,7 +77,7 @@ "env-cmd": "^10.1.0", "esbuild": "^0.20.0", "eslint": "^8.56.0", - "eslint-config-prettier": "^8.9.0", + "eslint-config-prettier": "^9.1.0", "eslint-plugin-eslint-plugin": "~5.1.1", "eslint-plugin-import": "^2.27.5", "eslint-plugin-jsonc": "^2.9.0", From 29337ab720ce05d330536a5b5d39e4b960cb5cb7 Mon Sep 17 00:00:00 2001 From: Flo Edelmann Date: Mon, 12 Feb 2024 18:40:32 +0100 Subject: [PATCH 14/27] Bump eslint-plugin-eslint-plugin from 5.1.1 to 5.3.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 751667ace..53174a01f 100644 --- a/package.json +++ b/package.json @@ -78,7 +78,7 @@ "esbuild": "^0.20.0", "eslint": "^8.56.0", "eslint-config-prettier": "^9.1.0", - "eslint-plugin-eslint-plugin": "~5.1.1", + "eslint-plugin-eslint-plugin": "~5.3.0", "eslint-plugin-import": "^2.27.5", "eslint-plugin-jsonc": "^2.9.0", "eslint-plugin-node-dependencies": ">=0.5.0 <1.0.0", From 82ea268adb6e702fb03f641cb7a1e8076f88ccf6 Mon Sep 17 00:00:00 2001 From: Flo Edelmann Date: Mon, 12 Feb 2024 18:42:59 +0100 Subject: [PATCH 15/27] Bump eslint-plugin-import from 2.27.5 to 2.29.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 53174a01f..1f423da1c 100644 --- a/package.json +++ b/package.json @@ -79,7 +79,7 @@ "eslint": "^8.56.0", "eslint-config-prettier": "^9.1.0", "eslint-plugin-eslint-plugin": "~5.3.0", - "eslint-plugin-import": "^2.27.5", + "eslint-plugin-import": "^2.29.1", "eslint-plugin-jsonc": "^2.9.0", "eslint-plugin-node-dependencies": ">=0.5.0 <1.0.0", "eslint-plugin-prettier": "^5.0.0", From 6f85157dde8a542f01040c12cd0c5e7f4d42ad34 Mon Sep 17 00:00:00 2001 From: Flo Edelmann Date: Mon, 12 Feb 2024 18:43:26 +0100 Subject: [PATCH 16/27] Bump eslint-plugin-jsonc from 2.9.0 to 2.13.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1f423da1c..8a196da02 100644 --- a/package.json +++ b/package.json @@ -80,7 +80,7 @@ "eslint-config-prettier": "^9.1.0", "eslint-plugin-eslint-plugin": "~5.3.0", "eslint-plugin-import": "^2.29.1", - "eslint-plugin-jsonc": "^2.9.0", + "eslint-plugin-jsonc": "^2.13.0", "eslint-plugin-node-dependencies": ">=0.5.0 <1.0.0", "eslint-plugin-prettier": "^5.0.0", "eslint-plugin-unicorn": "^48.0.1", From 15e1fdb56089c4426d5a5fb0a4b5b9fe20a9c436 Mon Sep 17 00:00:00 2001 From: Flo Edelmann Date: Mon, 12 Feb 2024 18:44:12 +0100 Subject: [PATCH 17/27] Bump eslint-plugin-node-dependencies from 0.5.0 to 0.11.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8a196da02..3bba2c669 100644 --- a/package.json +++ b/package.json @@ -81,7 +81,7 @@ "eslint-plugin-eslint-plugin": "~5.3.0", "eslint-plugin-import": "^2.29.1", "eslint-plugin-jsonc": "^2.13.0", - "eslint-plugin-node-dependencies": ">=0.5.0 <1.0.0", + "eslint-plugin-node-dependencies": "^0.11.2", "eslint-plugin-prettier": "^5.0.0", "eslint-plugin-unicorn": "^48.0.1", "eslint-plugin-vue": "file:.", From 487e556da8c9333046c20dd21e1b7a1a074a8768 Mon Sep 17 00:00:00 2001 From: Flo Edelmann Date: Mon, 12 Feb 2024 18:44:35 +0100 Subject: [PATCH 18/27] Bump eslint-plugin-prettier from 5.0.0 to 5.1.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3bba2c669..df808582e 100644 --- a/package.json +++ b/package.json @@ -82,7 +82,7 @@ "eslint-plugin-import": "^2.29.1", "eslint-plugin-jsonc": "^2.13.0", "eslint-plugin-node-dependencies": "^0.11.2", - "eslint-plugin-prettier": "^5.0.0", + "eslint-plugin-prettier": "^5.1.3", "eslint-plugin-unicorn": "^48.0.1", "eslint-plugin-vue": "file:.", "espree": "^9.6.1", From 46d7e27e4697269fb03b9287610bf8294e772576 Mon Sep 17 00:00:00 2001 From: Flo Edelmann Date: Mon, 12 Feb 2024 18:45:01 +0100 Subject: [PATCH 19/27] Bump eslint-plugin-unicorn from 48.0.1 to 51.0.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index df808582e..2c11d1756 100644 --- a/package.json +++ b/package.json @@ -83,7 +83,7 @@ "eslint-plugin-jsonc": "^2.13.0", "eslint-plugin-node-dependencies": "^0.11.2", "eslint-plugin-prettier": "^5.1.3", - "eslint-plugin-unicorn": "^48.0.1", + "eslint-plugin-unicorn": "^51.0.1", "eslint-plugin-vue": "file:.", "espree": "^9.6.1", "events": "^3.3.0", From afc60a353669f083c4c295400731d77bd4fbde11 Mon Sep 17 00:00:00 2001 From: Flo Edelmann Date: Tue, 13 Feb 2024 09:47:59 +0100 Subject: [PATCH 20/27] Bump markdownlint-cli from 0.35.0 to 0.39.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2c11d1756..91a0fdef3 100644 --- a/package.json +++ b/package.json @@ -87,7 +87,7 @@ "eslint-plugin-vue": "file:.", "espree": "^9.6.1", "events": "^3.3.0", - "markdownlint-cli": "^0.35.0", + "markdownlint-cli": "^0.39.0", "mocha": "^10.2.0", "nyc": "^15.1.0", "prettier": "^3.0.0", From 04319154c1f59f5c8273c04723dd10917b19d907 Mon Sep 17 00:00:00 2001 From: Flo Edelmann Date: Tue, 13 Feb 2024 09:48:23 +0100 Subject: [PATCH 21/27] Bump mocha from 10.2.0 to 10.3.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 91a0fdef3..adaa10fc9 100644 --- a/package.json +++ b/package.json @@ -88,7 +88,7 @@ "espree": "^9.6.1", "events": "^3.3.0", "markdownlint-cli": "^0.39.0", - "mocha": "^10.2.0", + "mocha": "^10.3.0", "nyc": "^15.1.0", "prettier": "^3.0.0", "typescript": "^5.3.2", From 37ef58feb889be241c8226a7c7ae7a6dbabce866 Mon Sep 17 00:00:00 2001 From: Flo Edelmann Date: Tue, 13 Feb 2024 09:48:46 +0100 Subject: [PATCH 22/27] Bump prettier from 3.0.0. to 3.2.5 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index adaa10fc9..f1ac3fbc0 100644 --- a/package.json +++ b/package.json @@ -90,7 +90,7 @@ "markdownlint-cli": "^0.39.0", "mocha": "^10.3.0", "nyc": "^15.1.0", - "prettier": "^3.0.0", + "prettier": "^3.2.5", "typescript": "^5.3.2", "vitepress": "^1.0.0-rc.31" } From 297467acf25f8a01f842469f3149fec6c9c5eaa9 Mon Sep 17 00:00:00 2001 From: Flo Edelmann Date: Tue, 13 Feb 2024 09:49:07 +0100 Subject: [PATCH 23/27] Bump typescript from 5.3.2 to 5.3.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f1ac3fbc0..360825028 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "mocha": "^10.3.0", "nyc": "^15.1.0", "prettier": "^3.2.5", - "typescript": "^5.3.2", + "typescript": "^5.3.3", "vitepress": "^1.0.0-rc.31" } } From de17a7d93aa71f68a77f29fe16892ea9e2028c96 Mon Sep 17 00:00:00 2001 From: Flo Edelmann Date: Tue, 13 Feb 2024 09:49:40 +0100 Subject: [PATCH 24/27] Bump vitepress from 1.0.0-rc.31 to 1.0.0-rc.42 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 360825028..f9c5449a7 100644 --- a/package.json +++ b/package.json @@ -92,6 +92,6 @@ "nyc": "^15.1.0", "prettier": "^3.2.5", "typescript": "^5.3.3", - "vitepress": "^1.0.0-rc.31" + "vitepress": "^1.0.0-rc.42" } } From 9ef43bd8af91b8bb0b864450b98fbb838c35b9db Mon Sep 17 00:00:00 2001 From: Flo Edelmann Date: Tue, 13 Feb 2024 10:43:35 +0100 Subject: [PATCH 25/27] Migrate to ESLint flat config where possible --- eslint.config.js | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/eslint.config.js b/eslint.config.js index f640b6701..d6ab046ba 100644 --- a/eslint.config.js +++ b/eslint.config.js @@ -2,6 +2,9 @@ const globals = require('globals') const { FlatCompat } = require('@eslint/eslintrc') +const eslintPluginEslintPlugin = require('eslint-plugin-eslint-plugin/configs/all') +const eslintPluginPrettierRecommended = require('eslint-plugin-prettier/recommended') +const eslintPluginUnicorn = require('eslint-plugin-unicorn') const eslintrc = new FlatCompat({ baseDirectory: __dirname @@ -25,14 +28,13 @@ module.exports = [ 'docs/.vitepress/cache' ] }, - ...eslintrc.plugins('eslint-plugin', 'prettier', 'unicorn'), + eslintPluginEslintPlugin, + eslintPluginUnicorn.configs['flat/recommended'], ...eslintrc.extends( - 'plugin:eslint-plugin/all', - 'prettier', 'plugin:node-dependencies/recommended', - 'plugin:jsonc/recommended-with-jsonc', - 'plugin:unicorn/recommended' + 'plugin:jsonc/recommended-with-jsonc' ), + eslintPluginPrettierRecommended, { plugins: { internal: { @@ -203,10 +205,6 @@ module.exports = [ ecmaVersion: 'latest', sourceType: 'module', parser: require('vue-eslint-parser') - // parserOptions: { - // ecmaVersion: 'latest', - // sourceType: 'module' - // } } }, { From c66eacde171f19dedd2c89f763a8f6e90a7cf368 Mon Sep 17 00:00:00 2001 From: ota-meshi Date: Thu, 22 Feb 2024 14:09:37 +0900 Subject: [PATCH 26/27] fix: eslint-compat --- tests/eslint-compat.js | 9 +++++++-- tests/lib/configs/configs.js | 1 + tests/lib/rules/block-order.js | 1 + tests/lib/rules/comment-directive.js | 2 ++ tests/lib/rules/component-tags-order.js | 1 + 5 files changed, 12 insertions(+), 2 deletions(-) diff --git a/tests/eslint-compat.js b/tests/eslint-compat.js index d05bc12a4..e8e89e228 100644 --- a/tests/eslint-compat.js +++ b/tests/eslint-compat.js @@ -31,8 +31,13 @@ function getESLintClassForV8(BaseESLintClass = eslint.ESLint) { // eslint-disable-next-line unicorn/consistent-function-scoping function adjustOptions(options) { const newOptions = { - ...options, - useEslintrc: false + ...options + } + if (newOptions.overrideConfigFile) { + if (newOptions.overrideConfigFile === true) { + newOptions.useEslintrc = false + delete newOptions.overrideConfigFile + } } if (newOptions.overrideConfig) { newOptions.overrideConfig = { ...newOptions.overrideConfig } diff --git a/tests/lib/configs/configs.js b/tests/lib/configs/configs.js index e995ece4e..926fed42c 100644 --- a/tests/lib/configs/configs.js +++ b/tests/lib/configs/configs.js @@ -7,6 +7,7 @@ describe('configs', () => { for (const name of Object.keys(plugin.configs)) { const configName = `plugin:vue/${name}` const eslint = new ESLint({ + overrideConfigFile: true, overrideConfig: { extends: [configName] }, diff --git a/tests/lib/rules/block-order.js b/tests/lib/rules/block-order.js index 8a73527bc..8da11c5ac 100644 --- a/tests/lib/rules/block-order.js +++ b/tests/lib/rules/block-order.js @@ -10,6 +10,7 @@ const { ESLint } = require('../../eslint-compat') // Initialize linter. const eslint = new ESLint({ + overrideConfigFile: true, overrideConfig: { files: ['**/*.vue'], languageOptions: { diff --git a/tests/lib/rules/comment-directive.js b/tests/lib/rules/comment-directive.js index 868cc391b..4278afc99 100644 --- a/tests/lib/rules/comment-directive.js +++ b/tests/lib/rules/comment-directive.js @@ -10,6 +10,7 @@ const { ESLint } = require('../../eslint-compat') // Initialize linter. const eslint = new ESLint({ + overrideConfigFile: true, overrideConfig: { files: ['*'], languageOptions: { @@ -352,6 +353,7 @@ describe('comment-directive', () => { describe('reportUnusedDisableDirectives', () => { const eslint = new ESLint({ + overrideConfigFile: true, overrideConfig: { files: ['**/*.vue'], languageOptions: { diff --git a/tests/lib/rules/component-tags-order.js b/tests/lib/rules/component-tags-order.js index 92f14613b..8ba50eb74 100644 --- a/tests/lib/rules/component-tags-order.js +++ b/tests/lib/rules/component-tags-order.js @@ -10,6 +10,7 @@ const { ESLint } = require('../../eslint-compat') // Initialize linter. const eslint = new ESLint({ + overrideConfigFile: true, overrideConfig: { files: ['**/*.vue'], languageOptions: { From afaaa4718599ffc8700add097767029a393a51fc Mon Sep 17 00:00:00 2001 From: ota-meshi Date: Thu, 22 Feb 2024 14:15:17 +0900 Subject: [PATCH 27/27] fix --- tests/eslint-compat.js | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/tests/eslint-compat.js b/tests/eslint-compat.js index e8e89e228..fe77994ad 100644 --- a/tests/eslint-compat.js +++ b/tests/eslint-compat.js @@ -33,11 +33,9 @@ function getESLintClassForV8(BaseESLintClass = eslint.ESLint) { const newOptions = { ...options } - if (newOptions.overrideConfigFile) { - if (newOptions.overrideConfigFile === true) { - newOptions.useEslintrc = false - delete newOptions.overrideConfigFile - } + if (newOptions.overrideConfigFile === true) { + newOptions.useEslintrc = false + delete newOptions.overrideConfigFile } if (newOptions.overrideConfig) { newOptions.overrideConfig = { ...newOptions.overrideConfig }