eslint-config-matsuri 4.4.0 → 5.1.0

package/README.md

@@ -25,7 +25,7 @@ Flat configをv3からサポートしています。eslint.config.jsに次のよ
 ```js
 import config from "eslint-config-matsuri";
 
-/** @type { import("eslint").Linter.FlatConfig[] } */
+/** @type { import("eslint").Linter.Config[] } */
 export default config
 ```
 
@@ -34,7 +34,7 @@ export default config
 ```js
 import { configs } from "eslint-config-matsuri";
 
-/** @type { import("eslint").Linter.FlatConfig[] } */
+/** @type { import("eslint").Linter.Config[] } */
 export default [
   configs.base,
   {
@@ -70,14 +70,6 @@ export default [
 ]
 ```
 
-VSCodeでFlag configを利用する場合は、`.vscode/settings.json`に次の設定を追加する必要があります。
-
-```json
-{
-  "eslint.experimental.useFlatConfig": true
-}
-```
-
 
 ## Contributing
 

package/configs/base.js

@@ -1,4 +1,4 @@
-/** @type {import("eslint").Linter.FlatConfig } */
+/** @type {import("eslint").Linter.Config } */
 export const baseConfig = {
   ignores: [
     "**/node_modules/**",

package/configs/javascript.js

@@ -4,7 +4,7 @@ import pluginPrettier from "eslint-config-prettier";
 import pluginSortImports from "eslint-plugin-sort-imports-es6-autofix";
 import pluginUnusedImport from "eslint-plugin-unused-imports";
 
-/** @type {import("eslint").Linter.FlatConfig } */
+/** @type {import("eslint").Linter.Config } */
 export const jsConfig = {
   linterOptions: {
     reportUnusedDisableDirectives: true,

package/configs/react.js

@@ -4,7 +4,7 @@ import pluginJsxA11y from "eslint-plugin-jsx-a11y";
 import pluginReact from "eslint-plugin-react";
 import pluginReactHooks from "eslint-plugin-react-hooks";
 
-/** @type {import("eslint").Linter.FlatConfig } */
+/** @type {import("eslint").Linter.Config } */
 export const reactConfig = {
   files: ["**/*.tsx"],
   languageOptions: {

package/configs/test.js

@@ -1,6 +1,6 @@
 import globals from "globals";
 
-/** @type {import("eslint").Linter.FlatConfig } */
+/** @type {import("eslint").Linter.Config } */
 export const testConfig = {
   files: ["**/*.test.ts", "**/*.test.tsx", "**/*.test.js", "**/*.test.jsx"],
   languageOptions: {

package/configs/typescript.js

@@ -19,7 +19,7 @@ const tseslintStylisticTypeCheckedRules = getRulesFromConfigArray(
   tseslint.configs.stylisticTypeChecked
 );
 
-/** @type {import("eslint").Linter.FlatConfig } */
+/** @type {import("eslint").Linter.Config } */
 export const tsConfig = {
   files: ["**/*.ts", "**/*.tsx"],
   plugins: {
@@ -37,8 +37,6 @@ export const tsConfig = {
     "@typescript-eslint/no-unused-vars": "off",
     "@typescript-eslint/explicit-module-boundary-types": "off",
 
-    "@typescript-eslint/no-empty-interface": "off",
-
     "@typescript-eslint/no-non-null-assertion": "error",
 
     "@typescript-eslint/consistent-type-exports": "error",
@@ -47,13 +45,16 @@ export const tsConfig = {
       "error",
       {
         allowString: true,
+        allowNumber: true,
         allowNullableObject: true,
-        allowNullableBoolean: true,
-        allowNullableString: true,
+        allowNullableBoolean: false,
+        allowNullableString: false,
+        allowNullableNumber: false,
+        allowNullableEnum: false,
         allowAny: true,
       },
     ],
-    "@typescript-eslint/ban-types": [
+    "@typescript-eslint/no-restricted-types": [
       "error",
       {
         types: {
@@ -76,7 +77,6 @@ export const tsConfig = {
         },
       },
     ],
-
     /**
      * Allow `() => Promise<void>` in JSX event handler.
      * @see https://github.com/typescript-eslint/typescript-eslint/blob/f373fac1dd0150273d98cee5bed606bbd3f55e4b/packages/eslint-plugin/docs/rules/no-misused-promises.md#checksvoidreturn
@@ -89,5 +89,13 @@ export const tsConfig = {
         },
       },
     ],
+    /**
+     * This rule is included in recommended.
+     */
+    "@typescript-eslint/no-empty-object-type": [
+      "error",
+      // Allow extended interfaces
+      { allowInterfaces: "with-single-extends" },
+    ],
   },
 };

package/index.d.ts

@@ -1,13 +1,13 @@
 import { Linter } from "eslint";
 
 export declare const configs: {
-  base: Linter.FlatConfig;
-  javascript: Linter.FlatConfig;
-  typescript: Linter.FlatConfig;
-  react: Linter.FlatConfig;
-  test: Linter.FlatConfig;
+  base: Linter.Config;
+  javascript: Linter.Config;
+  typescript: Linter.Config;
+  react: Linter.Config;
+  test: Linter.Config;
 };
 
-declare const config: Linter.FlatConfig[];
+declare const config: Linter.Config[];
 
 export default config;

package/index.js

@@ -12,7 +12,7 @@ export const configs = {
   test: testConfig,
 };
 
-/** @type { import("eslint").Linter.FlatConfig[] } */
+/** @type { import("eslint").Linter.Config[] } */
 const config = [baseConfig, jsConfig, tsConfig, reactConfig, testConfig];
 
 export default config;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-config-matsuri",
-  "version": "4.4.0",
+  "version": "5.1.0",
   "type": "module",
   "description": "",
   "main": "index.js",
@@ -14,7 +14,9 @@
     "configs"
   ],
   "scripts": {
-    "test": "eslint . --max-warnings 0"
+    "test": "eslint . --max-warnings 0",
+    "inspect": "npx @eslint/config-inspector",
+    "build-inspect": "npx @eslint/config-inspector build --base /eslint-config-matsuri/"
   },
   "keywords": [],
   "author": "hrdtbs",
@@ -22,18 +24,18 @@
     "registry": "https://registry.npmjs.org/"
   },
   "peerDependencies": {
-    "eslint": "^8.43.0"
+    "eslint": "^8.43.0 || ^9.0.0"
   },
   "dependencies": {
-    "@eslint/js": "9.2.0",
+    "@eslint/js": "9.9.1",
     "eslint-config-prettier": "9.1.0",
     "eslint-plugin-css-reorder": "0.5.1",
-    "eslint-plugin-jsx-a11y": "6.8.0",
-    "eslint-plugin-react": "7.34.1",
+    "eslint-plugin-jsx-a11y": "6.9.0",
+    "eslint-plugin-react": "7.35.0",
     "eslint-plugin-react-hooks": "4.6.2",
     "eslint-plugin-sort-imports-es6-autofix": "0.6.0",
-    "eslint-plugin-unused-imports": "3.2.0",
-    "globals": "15.2.0",
-    "typescript-eslint": "7.8.0"
+    "eslint-plugin-unused-imports": "4.1.3",
+    "globals": "15.9.0",
+    "typescript-eslint": "8.2.0"
   }
 }