chore: use eslint-plugin-eslint-plugin flat configs (#17204)

* chore: use eslint-plugin-eslint-plugin flat configs * fix bin tests * fix cli tests * fix flat-eslint tests * fix eslint tests * fix cli-engine tests
eslint · Jun 7, 2023 · 6a0196c · 6a0196c
1 parent 030a827
commit 6a0196c
Show file tree

Hide file tree

Showing 14 changed files with 361 additions and 152 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -96,9 +96,6 @@ module.exports = {
                 "plugin:eslint-plugin/rules-recommended"
             ],
             rules: {
-                "eslint-plugin/no-missing-message-ids": "error",
-                "eslint-plugin/no-unused-message-ids": "error",
-                "eslint-plugin/prefer-message-ids": "error",
                 "eslint-plugin/prefer-placeholders": "error",
                 "eslint-plugin/prefer-replace-text": "error",
                 "eslint-plugin/report-message-format": ["error", "[^a-z].*\\.$"],
@@ -119,7 +116,6 @@ module.exports = {
                 "plugin:eslint-plugin/tests-recommended"
             ],
             rules: {
-                "eslint-plugin/prefer-output-null": "error",
                 "eslint-plugin/test-case-property-ordering": "error",
                 "eslint-plugin/test-case-shorthand-strings": "error"
             }

diff --git a/eslint.config.js b/eslint.config.js
@@ -27,10 +27,12 @@
 
 const path = require("path");
 const internalPlugin = require("eslint-plugin-internal-rules");
-const eslintPlugin = require("eslint-plugin-eslint-plugin");
+const eslintPluginRulesRecommendedConfig = require("eslint-plugin-eslint-plugin/configs/rules-recommended");
+const eslintPluginTestsRecommendedConfig = require("eslint-plugin-eslint-plugin/configs/tests-recommended");
 const { FlatCompat } = require("@eslint/eslintrc");
 const js = require("./packages/js");
 const globals = require("globals");
+const merge = require("lodash.merge");
 
 //-----------------------------------------------------------------------------
 // Helpers
@@ -99,8 +101,7 @@ module.exports = [
     },
     {
         plugins: {
-            "internal-rules": internalPlugin,
-            "eslint-plugin": eslintPlugin
+            "internal-rules": internalPlugin
         },
         languageOptions: {
             ecmaVersion: "latest"
@@ -129,33 +130,31 @@ module.exports = [
     {
         files: ["lib/rules/*", "tools/internal-rules/*"],
         ignores: ["**/index.js"],
-        rules: {
-            ...eslintPlugin.configs["rules-recommended"].rules,
-            "eslint-plugin/no-missing-message-ids": "error",
-            "eslint-plugin/no-unused-message-ids": "error",
-            "eslint-plugin/prefer-message-ids": "error",
-            "eslint-plugin/prefer-placeholders": "error",
-            "eslint-plugin/prefer-replace-text": "error",
-            "eslint-plugin/report-message-format": ["error", "[^a-z].*\\.$"],
-            "eslint-plugin/require-meta-docs-description": ["error", { pattern: "^(Enforce|Require|Disallow) .+[^. ]$" }],
-            "internal-rules/no-invalid-meta": "error"
-        }
+        ...merge({}, eslintPluginRulesRecommendedConfig, {
+            rules: {
+                "eslint-plugin/prefer-placeholders": "error",
+                "eslint-plugin/prefer-replace-text": "error",
+                "eslint-plugin/report-message-format": ["error", "[^a-z].*\\.$"],
+                "eslint-plugin/require-meta-docs-description": ["error", { pattern: "^(Enforce|Require|Disallow) .+[^. ]$" }],
+                "internal-rules/no-invalid-meta": "error"
+            }
+        })
     },
     {
         files: ["lib/rules/*"],
-        ignores: ["index.js"],
+        ignores: ["**/index.js"],
         rules: {
             "eslint-plugin/require-meta-docs-url": ["error", { pattern: "https://eslint.org/docs/latest/rules/{{name}}" }]
         }
     },
     {
         files: ["tests/lib/rules/*", "tests/tools/internal-rules/*"],
-        rules: {
-            ...eslintPlugin.configs["tests-recommended"].rules,
-            "eslint-plugin/prefer-output-null": "error",
-            "eslint-plugin/test-case-property-ordering": "error",
-            "eslint-plugin/test-case-shorthand-strings": "error"
-        }
+        ...merge({}, eslintPluginTestsRecommendedConfig, {
+            rules: {
+                "eslint-plugin/test-case-property-ordering": "error",
+                "eslint-plugin/test-case-shorthand-strings": "error"
+            }
+        })
     },
     {
         files: ["tests/**/*.js"],

diff --git a/lib/rules/logical-assignment-operators.js b/lib/rules/logical-assignment-operators.js
@@ -188,7 +188,6 @@ module.exports = {
             }]
         },
         fixable: "code",
-        // eslint-disable-next-line eslint-plugin/require-meta-has-suggestions -- Does not detect conditional suggestions
         hasSuggestions: true,
         messages: {
             assignment: "Assignment (=) can be replaced with operator assignment ({{operator}}).",

diff --git a/lib/rules/newline-after-var.js b/lib/rules/newline-after-var.js
@@ -212,7 +212,6 @@ module.exports = {
                 context.report({
                     node,
                     messageId: "unexpected",
-                    data: { identifier: node.name },
                     fix(fixer) {
                         const linesBetween = sourceCode.getText().slice(lastToken.range[1], nextToken.range[0]).split(astUtils.LINEBREAK_MATCHER);
 
@@ -231,7 +230,6 @@ module.exports = {
                 context.report({
                     node,
                     messageId: "expected",
-                    data: { identifier: node.name },
                     fix(fixer) {
                         if ((noNextLineToken ? getLastCommentLineOfBlock(nextLineNum) : lastToken.loc.end.line) === nextToken.loc.start.line) {
                             return fixer.insertTextBefore(nextToken, "\n\n");

diff --git a/package.json b/package.json
@@ -113,7 +113,7 @@
     "eslint": "file:.",
     "eslint-config-eslint": "file:packages/eslint-config-eslint",
     "eslint-plugin-eslint-comments": "^3.2.0",
-    "eslint-plugin-eslint-plugin": "^4.4.0",
+    "eslint-plugin-eslint-plugin": "^5.1.0",
     "eslint-plugin-internal-rules": "file:tools/internal-rules",
     "eslint-plugin-jsdoc": "^38.1.6",
     "eslint-plugin-n": "^15.2.4",

diff --git a/tests/bin/eslint.js b/tests/bin/eslint.js
@@ -204,10 +204,10 @@ describe("bin/eslint.js", () => {
     });
 
     describe("running on files", () => {
-        it("has exit code 0 if no linting errors occur", () => assertExitCode(runESLint(["bin/eslint.js"]), 0));
+        it("has exit code 0 if no linting errors occur", () => assertExitCode(runESLint(["bin/eslint.js", "--no-config-lookup"]), 0));
         it("has exit code 0 if a linting warning is reported", () => assertExitCode(runESLint(["bin/eslint.js", "--no-config-lookup", "--rule", "semi: [1, never]"]), 0));
         it("has exit code 1 if a linting error is reported", () => assertExitCode(runESLint(["bin/eslint.js", "--no-config-lookup", "--rule", "semi: [2, never]"]), 1));
-        it("has exit code 1 if a syntax error is thrown", () => assertExitCode(runESLint(["tests/fixtures/exit-on-fatal-error/fatal-error.js", "--no-ignore"]), 1));
+        it("has exit code 1 if a syntax error is thrown", () => assertExitCode(runESLint(["tests/fixtures/exit-on-fatal-error/fatal-error.js", "--no-config-lookup"]), 1));
     });
 
     describe("automatically fixing files", () => {
@@ -359,7 +359,7 @@ describe("bin/eslint.js", () => {
 
     describe("handling crashes", () => {
         it("prints the error message to stderr in the event of a crash", () => {
-            const child = runESLint(["--rule=no-restricted-syntax:[error, 'Invalid Selector [[[']", "Makefile.js"]);
+            const child = runESLint(["--rule=no-restricted-syntax:[error, 'Invalid Selector [[[']", "--no-config-lookup", "Makefile.js"]);
             const exitCodeAssertion = assertExitCode(child, 2);
             const outputAssertion = getOutput(child).then(output => {
                 const expectedSubstring = "Syntax error in selector";
@@ -372,7 +372,7 @@ describe("bin/eslint.js", () => {
         });
 
         it("prints the error message exactly once to stderr in the event of a crash", () => {
-            const child = runESLint(["--rule=no-restricted-syntax:[error, 'Invalid Selector [[[']", "Makefile.js"]);
+            const child = runESLint(["--rule=no-restricted-syntax:[error, 'Invalid Selector [[[']", "--no-config-lookup", "Makefile.js"]);
             const exitCodeAssertion = assertExitCode(child, 2);
             const outputAssertion = getOutput(child).then(output => {
                 const expectedSubstring = "Syntax error in selector";

diff --git a/tests/fixtures/simple-valid-project/.eslintrc.js b/tests/fixtures/simple-valid-project/.eslintrc.js
@@ -0,0 +1,5 @@
+module.exports = {
+    rules: {
+        quotes: ["error", "single"]
+    }
+};
diff --git a/tests/fixtures/simple-valid-project/eslint.config.js b/tests/fixtures/simple-valid-project/eslint.config.js
@@ -0,0 +1,5 @@
+module.exports = [{
+    rules: {
+        quotes: ["error", "single"]
+    }
+}];
diff --git a/tests/fixtures/simple-valid-project/foo.js b/tests/fixtures/simple-valid-project/foo.js
@@ -0,0 +1 @@
+var a = 'b';
diff --git a/tests/fixtures/simple-valid-project/src/foobar.js b/tests/fixtures/simple-valid-project/src/foobar.js
@@ -0,0 +1 @@
+var a = 'b';