diff --git a/eslint.config.js b/eslint.config.js index f6c3356..15ec633 100644 --- a/eslint.config.js +++ b/eslint.config.js @@ -10,6 +10,7 @@ import eslintConfigESLint from "eslint-config-eslint"; import eslintPlugin from "eslint-plugin-eslint-plugin"; import json from "./src/index.js"; +import { defineConfig, globalIgnores } from "eslint/config"; //----------------------------------------------------------------------------- // Helpers @@ -28,20 +29,19 @@ const eslintPluginTestsRecommendedConfig = // Configuration //----------------------------------------------------------------------------- -export default [ - { - ignores: ["**/tests/fixtures/", "**/dist/"], - }, +export default defineConfig([ + globalIgnores(["**/tests/fixtures/", "**/dist/"]), ...eslintConfigESLint.map(config => ({ files: ["**/*.js"], ...config, })), { + plugins: { json }, files: ["**/*.json"], ignores: ["**/package-lock.json"], language: "json/json", - ...json.configs.recommended, + extends: ["json/recommended"], }, { files: ["**/*.js"], @@ -75,9 +75,8 @@ export default [ }, { files: ["src/rules/*.js"], - ...eslintPluginRulesRecommendedConfig, + extends: [eslintPluginRulesRecommendedConfig], rules: { - ...eslintPluginRulesRecommendedConfig.rules, "eslint-plugin/require-meta-schema": "off", // `schema` defaults to [] "eslint-plugin/prefer-placeholders": "error", "eslint-plugin/prefer-replace-text": "error", @@ -90,9 +89,8 @@ export default [ }, { files: ["tests/rules/*.test.js"], - ...eslintPluginTestsRecommendedConfig, + extends: [eslintPluginTestsRecommendedConfig], rules: { - ...eslintPluginTestsRecommendedConfig.rules, "eslint-plugin/test-case-property-ordering": [ "error", [ @@ -109,4 +107,4 @@ export default [ "eslint-plugin/test-case-shorthand-strings": "error", }, }, -]; +]); diff --git a/package.json b/package.json index 1c02a03..b5409ef 100644 --- a/package.json +++ b/package.json @@ -81,7 +81,7 @@ "devDependencies": { "c8": "^9.1.0", "dedent": "^1.5.3", - "eslint": "^9.23.0", + "eslint": "^9.25.1", "eslint-config-eslint": "^11.0.0", "eslint-plugin-eslint-plugin": "^6.3.2", "got": "^14.4.2",