eslint config helper に移行する

Author: sushichan044

packages/eslint-config/src/base/astro.ts

@@ -4,51 +4,38 @@ import astroPlugin from "eslint-plugin-astro";
 import * as typescriptESLintParserForExtraFiles from "typescript-eslint-parser-for-extra-files";
 
 import { __dirname } from "../lib/dir";
-import { astroFiles, tsFiles } from "../utils/files";
+import { prepareForExtend } from "../utils/eslint";
+import { astroFiles } from "../utils/files";
 import { jsConfig } from "./js";
 import { stylisticConfig } from "./stylistic";
 import { tsConfig } from "./typescript";
 
-export const astroConfig = defineConfig(
-  {
-    files: [tsFiles],
-    languageOptions: {
-      // @ts-expect-error type mismatch, but works
+export const astroConfig = defineConfig({
+  extends: prepareForExtend(
+    jsConfig,
+    stylisticConfig,
+    tsConfig({ extraFiles: true }),
+    astroPlugin.configs.recommended,
+    astroPlugin.configs["jsx-a11y-strict"],
+  ),
+  files: [astroFiles],
+  languageOptions: {
+    parser: astroESLintParser,
+    parserOptions: {
       parser: typescriptESLintParserForExtraFiles,
-      parserOptions: {
-        project: true,
-        projectService: false,
-        tsconfigRootDir: __dirname,
-      },
+      project: true,
+      projectService: false,
+      tsconfigRootDir: __dirname,
     },
   },
-  {
-    extends: [
-      ...jsConfig,
-      ...stylisticConfig,
-      ...tsConfig,
-      ...astroPlugin.configs.recommended,
-      ...astroPlugin.configs["jsx-a11y-strict"],
-    ],
-    files: [astroFiles],
-    languageOptions: {
-      parser: astroESLintParser,
-      parserOptions: {
-        parser: typescriptESLintParserForExtraFiles,
-        project: true,
-        projectService: false,
-        tsconfigRootDir: __dirname,
-      },
-    },
-    name: "@virtual-live-lab/eslint-config/astro",
-    rules: {
-      "astro/no-set-html-directive": "error",
-      "astro/no-set-text-directive": "error",
-      "astro/no-unused-css-selector": "error",
-      "astro/prefer-class-list-directive": "error",
-      "astro/prefer-object-class-list": "error",
-      "astro/prefer-split-class-list": "error",
-      "astro/sort-attributes": "error",
-    },
+  name: "@virtual-live-lab/eslint-config/astro",
+  rules: {
+    "astro/no-set-html-directive": "error",
+    "astro/no-set-text-directive": "error",
+    "astro/no-unused-css-selector": "error",
+    "astro/prefer-class-list-directive": "error",
+    "astro/prefer-object-class-list": "error",
+    "astro/prefer-split-class-list": "error",
+    "astro/sort-attributes": "error",
   },
-);
+});

packages/eslint-config/src/base/base.ts

@@ -1,5 +1,7 @@
-import { Linter } from "eslint";
-
+import { defineConfig } from "@eslint/config-helpers";
 import gitignore from "eslint-config-flat-gitignore";
 
-export const baseConfig: Linter.Config[] = [gitignore()];
+export const baseConfig = defineConfig({
+  extends: [gitignore()],
+  name: "@virtual-live-lab/eslint-config/base",
+});

packages/eslint-config/src/base/js.ts

@@ -1,12 +1,11 @@
-import type { Linter } from "eslint";
-
+import { defineConfig } from "@eslint/config-helpers";
 import js from "@eslint/js";
 
+import { prepareForExtend } from "../utils/eslint";
 import { jsFiles } from "../utils/files";
 
-export const jsConfig: Linter.Config[] = [
-  {
-    files: [jsFiles],
-    ...js.configs.recommended,
-  },
-];
+export const jsConfig = defineConfig({
+  extends: prepareForExtend(js.configs.recommended),
+  files: [jsFiles],
+  name: "@virtual-live-lab/eslint-config/javascript",
+});

packages/eslint-config/src/base/react.ts

@@ -4,16 +4,16 @@ import reactRefresh from "eslint-plugin-react-refresh";
 import globals from "globals";
 
 import { compat } from "../lib/compat";
+import { prepareForExtend } from "../utils/eslint";
 import { jsxFiles } from "../utils/files";
 
 const reactConfig = defineConfig({
-  extends: [
-    // @ts-expect-error 型が合わない
-    react.configs.flat.recommended,
-    // @ts-expect-error 型が合わない
+  extends: prepareForExtend(
+    // @ts-expect-error type mismatch
+    react.configs.flat["recommended"],
     react.configs.flat["jsx-runtime"],
     ...compat.extends("plugin:react-hooks/recommended"),
-  ],
+  ),
   files: [jsxFiles],
   languageOptions: {
     globals: {

packages/eslint-config/src/base/stylistic.ts

@@ -2,10 +2,14 @@ import { defineConfig } from "@eslint/config-helpers";
 import prettierConfig from "eslint-config-prettier/flat";
 import perfectionistPlugin from "eslint-plugin-perfectionist";
 
+import { prepareForExtend } from "../utils/eslint";
 import { jsFiles, tsFiles } from "../utils/files";
 
 export const stylisticConfig = defineConfig({
-  extends: [prettierConfig, perfectionistPlugin.configs["recommended-natural"]],
+  extends: prepareForExtend(
+    prettierConfig,
+    perfectionistPlugin.configs["recommended-natural"],
+  ),
   files: [tsFiles, jsFiles],
   name: "@virtual-live-lab/eslint-config/stylistic",
   rules: {

packages/eslint-config/src/base/typescript.ts

@@ -7,6 +7,7 @@ import tseslint from "typescript-eslint";
 import * as typescriptESLintParserForExtraFiles from "typescript-eslint-parser-for-extra-files";
 
 import { __dirname } from "../lib/dir";
+import { prepareForExtend } from "../utils/eslint";
 import { tsFiles } from "../utils/files";
 
 type TSConfigParams = {
@@ -21,10 +22,10 @@ export const tsConfig = (params: Partial<TSConfigParams> = {}) => {
   const resolvedParams = defu(params, DEFAULT_PARAMS);
 
   return defineConfig({
-    extends: [
-      ...(tseslint.configs.recommendedTypeChecked as Linter.Config[]),
-      ...(tseslint.configs.stylisticTypeChecked as Linter.Config[]),
-    ],
+    extends: prepareForExtend(
+      tseslint.configs.recommendedTypeChecked as unknown as Linter.Config[],
+      tseslint.configs.stylisticTypeChecked as unknown as Linter.Config[],
+    ),
     files: [tsFiles],
     languageOptions: getLanguageOptions({
       extraFiles: resolvedParams.extraFiles,

packages/eslint-config/src/presets/ts.ts

@@ -3,6 +3,6 @@ import { defineConfig } from "@eslint/config-helpers";
 import { tsConfig } from "../base/typescript";
 import js from "./js";
 
-const ts = defineConfig(...js, ...tsConfig);
+const ts = defineConfig(...js, ...tsConfig());
 
 export default ts;