eslint-config-matsuri 4.0.0 → 4.1.0

package/README.md

@@ -25,6 +25,7 @@ Flat configをv3からサポートしています。eslint.config.jsに次のよ
 ```js
 import config from "eslint-config-matsuri";
 
+/** @type { import("eslint").Linter.FlatConfig[] } */
 export default config
 ```
 
@@ -33,6 +34,7 @@ export default config
 ```js
 import config from "eslint-config-matsuri";
 
+/** @type { import("eslint").Linter.FlatConfig[] } */
 export default [
   ...config,
   {

package/index.js

@@ -9,8 +9,7 @@ import pluginReactHooks from "eslint-plugin-react-hooks";
 import pluginReactRefresh from "eslint-plugin-react-refresh";
 import pluginSortImports from "eslint-plugin-sort-imports-es6-autofix";
 import pluginUnusedImport from "eslint-plugin-unused-imports";
-import ts from "@typescript-eslint/eslint-plugin";
-import tsParser from "@typescript-eslint/parser";
+import tseslint from "typescript-eslint";
 
 /**
  * @see https://github.com/storybookjs/eslint-plugin-storybook/issues/135
@@ -20,6 +19,23 @@ const pluginStorybookRecommended = compat.extends(
   "plugin:storybook/recommended"
 );
 
+/**
+ * NOTE: typescript-eslintは、推奨設定をルール単位で返しておらず、parserOptionsやpluginなどを設定を含んだconfigの配列のみを返している。
+ * これを以前のESLintにおけるextendsのような記述できるようにするために、tseslint.configという関数を提供しているが、
+ * 記述が自明な上に、現状シンプルなケースでは問題が既存の設定を取り込むとエラーが見られるため、ルールのみを抽出して返す関数を作成した。
+ */
+const getRulesFromConfigArray = (configs) => {
+  return configs.reduce((rules, config) => {
+    return { ...rules, ...config.rules };
+  }, {});
+};
+const tseslintRecommendedTypeChckedRules = getRulesFromConfigArray(
+  tseslint.configs.recommendedTypeChecked
+);
+const tseslintStylisticTypeCheckedRules = getRulesFromConfigArray(
+  tseslint.configs.stylisticTypeChecked
+);
+
 /** @type { import("eslint").Linter.FlatConfig[] } */
 const config = [
   {
@@ -87,7 +103,7 @@ const config = [
         React: true,
         JSX: true,
       },
-      parser: tsParser,
+      parser: tseslint.parser,
       parserOptions: {
         project: true,
       },
@@ -98,7 +114,7 @@ const config = [
       },
     },
     plugins: {
-      "@typescript-eslint": ts,
+      "@typescript-eslint": tseslint.plugin,
       "unused-imports": pluginUnusedImport,
       "css-reorder": pluginCssReorder,
       "jsx-a11y": pluginJsxA11y,
@@ -107,11 +123,11 @@ const config = [
       "react-refresh": pluginReactRefresh,
     },
     rules: {
+      ...tseslintRecommendedTypeChckedRules,
+      ...tseslintStylisticTypeCheckedRules,
       ...pluginReact.configs.recommended.rules,
       ...pluginReactHooks.configs.recommended.rules,
       ...pluginReact.configs["jsx-runtime"].rules,
-      ...ts.configs["recommended-type-checked"].rules,
-      ...ts.configs["stylistic-type-checked"].rules,
       ...pluginJsxA11y.configs.recommended.rules,
       ...pluginPrettier.rules,
       "css-reorder/property-reorder": "error",

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "eslint-config-matsuri",
-  "version": "4.0.0",
+  "version": "4.1.0",
   "type": "module",
   "description": "",
   "main": "index.js",
   "types": "index.d.ts",
   "engines": {
-    "node": ">=20.0.0"
+    "node": ">=18.0.0"
   },
   "files": [
     "index.js",
@@ -25,15 +25,13 @@
   },
   "devDependencies": {
     "@emotion/react": "11.11.3",
-    "@types/react": "18.2.56",
-    "eslint": "8.56.0",
+    "@types/react": "18.2.58",
+    "eslint": "8.57.0",
     "react": "18.2.0",
     "typescript": "5.3.3"
   },
   "dependencies": {
-    "@eslint/js": "8.56.0",
-    "@typescript-eslint/eslint-plugin": "7.0.1",
-    "@typescript-eslint/parser": "7.0.1",
+    "@eslint/js": "8.57.0",
     "eslint-config-prettier": "9.1.0",
     "eslint-plugin-css-reorder": "0.5.1",
     "eslint-plugin-jsx-a11y": "6.8.0",
@@ -43,6 +41,7 @@
     "eslint-plugin-sort-imports-es6-autofix": "0.6.0",
     "eslint-plugin-storybook": "0.8.0",
     "eslint-plugin-unused-imports": "3.1.0",
-    "globals": "14.0.0"
+    "globals": "14.0.0",
+    "typescript-eslint": "7.0.2"
   }
 }