fix(deps): update dependency eslint-compat-utils to ^0.3.0 (#304)

* fix(deps): update dependency eslint-compat-utils to ^0.3.0 * Create brave-lobsters-reply.md * Create weak-points-boil.md * fix * fix * fix --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Yosuke Ota <otameshiyo23@gmail.com>
ota-meshi · Jan 16, 2024 · eec7e97 · eec7e97
1 parent ee43850
commit eec7e97
Show file tree

Hide file tree

Showing 10 changed files with 65 additions and 98 deletions.
diff --git a/.changeset/brave-lobsters-reply.md b/.changeset/brave-lobsters-reply.md
@@ -0,0 +1,5 @@
+---
+"eslint-plugin-astro": patch
+---
+
+fix(deps): update dependency eslint-compat-utils to ^0.3.0
diff --git a/package.json b/package.json
@@ -57,7 +57,7 @@
     "@jridgewell/sourcemap-codec": "^1.4.14",
     "@typescript-eslint/types": "^5.25.0",
     "astro-eslint-parser": "^0.16.0",
-    "eslint-compat-utils": "^0.2.0",
+    "eslint-compat-utils": "^0.3.3",
     "postcss": "^8.4.14",
     "postcss-selector-parser": "^6.0.10"
   },

diff --git a/src/processor/index.ts b/src/processor/index.ts
@@ -26,7 +26,7 @@ export const clientSideTsProcessor: Linter.Processor = {
 function preprocess(
   code: string,
   filename: string,
-  vartualFileExt: string,
+  virtualFileExt: string,
 ): ReturnType<NonNullable<Linter.Processor["preprocess"]>> {
   if (filename) {
     const shared = beginShared(filename)
@@ -53,7 +53,7 @@ function preprocess(
     })
     return [
       code,
-      ...shared.clientScripts.map((cs) => cs.getProcessorFile(vartualFileExt)),
+      ...shared.clientScripts.map((cs) => cs.getProcessorFile(virtualFileExt)),
     ]
   }
 

diff --git a/src/rules/prefer-split-class-list.ts b/src/rules/prefer-split-class-list.ts
@@ -362,7 +362,7 @@ export default createRule("prefer-split-class-list", {
             includeComments: false,
             filter: isOpeningParenToken,
           })!
-          const closeToken = sourceCode.getLastToken(callNode)!
+          const closeToken = sourceCode.getLastToken(callNode)
           yield fixer.removeRange([callNode.range[0], openToken.range[1]])
           yield fixer.remove(closeToken)
         },

diff --git a/src/shared/client-script/index.ts b/src/shared/client-script/index.ts
@@ -259,7 +259,12 @@ export class ClientScript {
   }
 
   private isIgnoreMessage(message: Linter.LintMessage) {
-    if (message.ruleId === "eol-last" && message.messageId === "unexpected") {
+    if (
+      (message.ruleId === "eol-last" ||
+        // for test case
+        message.ruleId === "rule-to-test/eol-last") &&
+      message.messageId === "unexpected"
+    ) {
       // Ignore this report as it is not possible to remove the EOF of a block.
       return true
     }

diff --git a/tests/src/integration/eol-last.ts b/tests/src/integration/eol-last.ts
@@ -1,8 +1,6 @@
-import { ESLint } from "eslint"
 import { RuleTester } from "../../utils/eslint-compat"
 import { astroProcessor } from "../../../src/processor"
 import { getCoreRule } from "./get-core-rule"
-import semver from "semver"
 
 describe("Integration test for eol-last", () => {
   const eolLast = getCoreRule("eol-last")!
@@ -17,36 +15,26 @@ describe("Integration test for eol-last", () => {
   tester.run("eol-last", eolLast, {
     valid: [
       {
-        filename: {
-          filename: "foo.astro",
-          ...astroProcessor,
-        } as any,
+        filename: "foo.astro",
+        processor: astroProcessor,
         code: `
         <script define:vars={{ foo: 42 }}>
           console.log(foo)
         </script>\n`,
       } as any,
 
-      ...(semver.lt(ESLint.version, "9.0.0-0")
-        ? [
-            {
-              filename: {
-                filename: "foo.astro",
-                ...astroProcessor,
-              },
-              code: `
+      {
+        filename: "foo.astro",
+        processor: astroProcessor,
+        code: `
         <script define:vars={{ foo: 42 }}>
           console.log(foo)
         </script>`,
-              options: ["never"],
-            },
-          ]
-        : []),
+        options: ["never"],
+      },
       {
-        filename: {
-          filename: "foo.astro",
-          ...astroProcessor,
-        },
+        filename: "foo.astro",
+        processor: astroProcessor,
         code: `
         <script define:vars={{ foo: 42 }}>
           console.log(foo)</script>`,
@@ -55,11 +43,9 @@ describe("Integration test for eol-last", () => {
     ],
     invalid: [
       {
-        // @ts-expect-error -- fine name with processor
-        filename: {
-          filename: "foo.astro",
-          ...astroProcessor,
-        },
+        filename: "foo.astro",
+        // @ts-expect-error -- missing V9 type
+        processor: astroProcessor,
         code: `
         <script define:vars={{ foo: 42 }}>
           console.log(foo)</script>\n`,

diff --git a/tests/src/integration/linebreak-style.ts b/tests/src/integration/linebreak-style.ts
@@ -1,8 +1,6 @@
-import { RuleTester } from "../../utils/eslint-compat"
-import { Linter } from "eslint"
+import { RuleTester, testRuleIdPrefix } from "../../utils/eslint-compat"
 import { astroProcessor } from "../../../src/processor"
 import { getCoreRule } from "./get-core-rule"
-import semver from "semver"
 
 describe("Integration test for linebreak-style", () => {
   const ruleNoUnusedVars = getCoreRule("linebreak-style")!
@@ -20,23 +18,19 @@ describe("Integration test for linebreak-style", () => {
   tester.run("linebreak-style", ruleNoUnusedVars, {
     valid: [
       {
-        // @ts-expect-error -- fine name with processor
-        filename: {
-          filename: "foo.astro",
-          ...astroProcessor,
-        },
+        filename: "foo.astro",
+        // @ts-expect-error -- missing V9 type
+        processor: astroProcessor,
         code: `
         <script define:vars={{ foo: 42, bar: 42 }}>
           console.log(foo)
         </script>
         `,
       },
       {
-        // @ts-expect-error -- fine name with processor
-        filename: {
-          filename: "foo.astro",
-          ...astroProcessor,
-        },
+        filename: "foo.astro",
+        // @ts-expect-error -- missing V9 type
+        processor: astroProcessor,
         code: `
 <script define:vars={{ bar: 42 }}>
 
@@ -49,46 +43,34 @@ describe("Integration test for linebreak-style", () => {
     ],
     invalid: [
       {
-        // @ts-expect-error -- fine name with processor
-        filename: {
-          filename: "foo.astro",
-          ...astroProcessor,
-        },
-        code: `{/*eslint ${
-          semver.gte(Linter.version, "9.0.0-0") ? "rule-to-test/" : ""
-        }linebreak-style:0*/}
+        filename: "foo.astro",
+        // @ts-expect-error -- missing V9 type
+        processor: astroProcessor,
+        code: `{/*eslint ${testRuleIdPrefix}linebreak-style:0*/}
         <script define:vars={{ bar: 42 }}>
           console.log(foo)\r
         </script>
         `,
-        output: `{/*eslint ${
-          semver.gte(Linter.version, "9.0.0-0") ? "rule-to-test/" : ""
-        }linebreak-style:0*/}
+        output: `{/*eslint ${testRuleIdPrefix}linebreak-style:0*/}
         <script define:vars={{ bar: 42 }}>
           console.log(foo)
         </script>
         `,
         errors: 1,
       },
       {
-        // @ts-expect-error -- fine name with processor
-        filename: {
-          filename: "foo.astro",
-          ...astroProcessor,
-        },
-        code: `{/*eslint ${
-          semver.gte(Linter.version, "9.0.0-0") ? "rule-to-test/" : ""
-        }linebreak-style:0*/}
+        filename: "foo.astro",
+        // @ts-expect-error -- missing V9 type
+        processor: astroProcessor,
+        code: `{/*eslint ${testRuleIdPrefix}linebreak-style:0*/}
 <script define:vars={{ bar: 42 }}>\r
 \r
 \r
   // empty lines\r
   console.log(foo)\r
 </script>
         `,
-        output: `{/*eslint ${
-          semver.gte(Linter.version, "9.0.0-0") ? "rule-to-test/" : ""
-        }linebreak-style:0*/}
+        output: `{/*eslint ${testRuleIdPrefix}linebreak-style:0*/}
 <script define:vars={{ bar: 42 }}>\r
 
 \r

diff --git a/tests/src/integration/no-undef.ts b/tests/src/integration/no-undef.ts
@@ -18,11 +18,9 @@ describe("Integration test for no-undef", () => {
   tester.run("no-undef", ruleNoUnusedVars, {
     valid: [
       {
-        // @ts-expect-error -- fine name with processor
-        filename: {
-          filename: "foo.astro",
-          ...astroProcessor,
-        },
+        filename: "foo.astro",
+        // @ts-expect-error -- missing V9 type
+        processor: astroProcessor,
         code: `
         <script define:vars={{ foo: 42, bar: 42 }}>
           console.log(foo)
@@ -32,11 +30,9 @@ describe("Integration test for no-undef", () => {
     ],
     invalid: [
       {
-        // @ts-expect-error -- fine name with processor
-        filename: {
-          filename: "foo.astro",
-          ...astroProcessor,
-        },
+        filename: "foo.astro",
+        // @ts-expect-error -- missing V9 type
+        processor: astroProcessor,
         code: `
         <script define:vars={{ bar: 42 }}>
           console.log(foo)
@@ -51,11 +47,9 @@ describe("Integration test for no-undef", () => {
         ],
       },
       {
-        // @ts-expect-error -- fine name with processor
-        filename: {
-          filename: "foo.astro",
-          ...astroProcessor,
-        },
+        filename: "foo.astro",
+        // @ts-expect-error -- missing V9 type
+        processor: astroProcessor,
         code: `
 <script define:vars={{ bar: 42 }}>
 
@@ -73,11 +67,9 @@ describe("Integration test for no-undef", () => {
         ],
       },
       {
-        // @ts-expect-error -- fine name with processor
-        filename: {
-          filename: "foo.astro",
-          ...astroProcessor,
-        },
+        filename: "foo.astro",
+        // @ts-expect-error -- missing V9 type
+        processor: astroProcessor,
         code: `
 <script define:vars={{ bar: 42 }}>
 

diff --git a/tests/src/integration/no-unused-vars.ts b/tests/src/integration/no-unused-vars.ts
@@ -15,11 +15,9 @@ describe("Integration test for no-unused-vars", () => {
   tester.run("no-unused-vars", ruleNoUnusedVars, {
     valid: [
       {
-        // @ts-expect-error -- fine name with processor
-        filename: {
-          filename: "foo.astro",
-          ...astroProcessor,
-        },
+        filename: "foo.astro",
+        // @ts-expect-error -- missing V9 type
+        processor: astroProcessor,
         code: `
         <script define:vars={{ foo: 42 }}>
           console.log(foo)
@@ -29,11 +27,9 @@ describe("Integration test for no-unused-vars", () => {
     ],
     invalid: [
       {
-        // @ts-expect-error -- fine name with processor
-        filename: {
-          filename: "foo.astro",
-          ...astroProcessor,
-        },
+        filename: "foo.astro",
+        // @ts-expect-error -- missing V9 type
+        processor: astroProcessor,
         code: `
         <script define:vars={{ foo: 42, bar: 42 }}>
           console.log(foo)

diff --git a/tests/utils/eslint-compat.ts b/tests/utils/eslint-compat.ts
@@ -1,5 +1,5 @@
 import { ESLint as OriginalESLint } from "eslint"
-import { getRuleTester } from "eslint-compat-utils/rule-tester"
+import { getRuleIdPrefix, getRuleTester } from "eslint-compat-utils/rule-tester"
 // @ts-expect-error -- missing type
 import { FlatCompat } from "@eslint/eslintrc"
 import astroPlugin from "../../src/index"
@@ -9,6 +9,7 @@ export const LegacyESLint: typeof OriginalESLint =
   getUnsupported().LegacyESLint || OriginalESLint
 // eslint-disable-next-line @typescript-eslint/naming-convention -- class name
 export const RuleTester = getRuleTester()
+export const testRuleIdPrefix = getRuleIdPrefix()
 
 function getUnsupported() {
   try {