@aiou/eslint-config 2.0.1 → 2.0.2

package/dist/index.cjs

@@ -777,7 +777,8 @@ const markdown = () => {
       // Code blocks in markdown file
       files: [`${GLOB_MARKDOWN}/*.${GLOB_SCRIPT_EXT}`],
       rules: {
-        "react/display-name": "off",
+        // https://eslint-react.xyz/docs/migration
+        "react/no-missing-component-display-name": "off",
         "@typescript-eslint/no-redeclare": "off",
         "@typescript-eslint/no-unused-vars": "off",
         "@typescript-eslint/no-use-before-define": "off",
@@ -3583,6 +3584,19 @@ function mapValues(object, iteratee) {
   return result;
 }
 
+function renameRules(rules, map) {
+  return Object.fromEntries(
+    Object.entries(rules).map(([key, value]) => {
+      for (const [from, to] of Object.entries(map)) {
+        if (key.startsWith(`${from}/`)) {
+          return [to + key.slice(from.length), value];
+        }
+      }
+      return [key, value];
+    })
+  );
+}
+
 const react = () => {
   const plugins = pluginReact__default.default.configs.all.plugins;
   const config = [
@@ -3612,14 +3626,31 @@ const react = () => {
         "react-web-api": plugins["@eslint-react/web-api"]
       },
       rules: {
-        ...pluginReact__default.default.configs["recommended-typescript"].rules,
+        ...renameRules(plugins["@eslint-react"].configs["recommended-typescript"].rules, { "@eslint-react": "react" }),
+        ...renameRules(plugins["@eslint-react/dom"].configs.recommended.rules, { "@eslint-react": "react-dom" }),
+        ...renameRules(pluginReactHooks__default.default.configs.recommended.rules, { "@eslint-react": "react-hooks" }),
+        ...renameRules(plugins["@eslint-react/hooks-extra"].configs.recommended.rules, { "@eslint-react": "react-hooks-extra" }),
+        ...renameRules(plugins["@eslint-react/naming-convention"].configs.recommended.rules, { "@eslint-react": "react-naming-convention" }),
+        ...renameRules(plugins["@eslint-react/web-api"].configs.recommended.rules, { "@eslint-react": "react-web-api" }),
         "react/no-prop-types": "error",
         "react-dom/no-unknown-property": "off",
-        "react/avoid-shorthand-boolean": ["error", "always"],
+        "react/avoid-shorthand-boolean": ["error"],
         // https://github.com/ArnaudBarre/eslint-plugin-react-refresh
         "react-refresh/only-export-components": "warn"
       }
     },
+    {
+      files: ["src/components/**/*.{ts,tsx}"],
+      rules: {
+        "react-naming-convention/filename": ["warn", { rule: "PascalCase" }]
+      }
+    },
+    {
+      files: ["src/hooks/**/use*.{ts,tsx}"],
+      rules: {
+        "react-naming-convention/filename": ["warn", { rule: "kebab-case" }]
+      }
+    },
     {
       files: [
         `**/*config*.${GLOB_SCRIPT_EXT}`,

package/dist/index.mjs

@@ -747,7 +747,8 @@ const markdown = () => {
       // Code blocks in markdown file
       files: [`${GLOB_MARKDOWN}/*.${GLOB_SCRIPT_EXT}`],
       rules: {
-        "react/display-name": "off",
+        // https://eslint-react.xyz/docs/migration
+        "react/no-missing-component-display-name": "off",
         "@typescript-eslint/no-redeclare": "off",
         "@typescript-eslint/no-unused-vars": "off",
         "@typescript-eslint/no-use-before-define": "off",
@@ -3553,6 +3554,19 @@ function mapValues(object, iteratee) {
   return result;
 }
 
+function renameRules(rules, map) {
+  return Object.fromEntries(
+    Object.entries(rules).map(([key, value]) => {
+      for (const [from, to] of Object.entries(map)) {
+        if (key.startsWith(`${from}/`)) {
+          return [to + key.slice(from.length), value];
+        }
+      }
+      return [key, value];
+    })
+  );
+}
+
 const react = () => {
   const plugins = pluginReact.configs.all.plugins;
   const config = [
@@ -3582,14 +3596,31 @@ const react = () => {
         "react-web-api": plugins["@eslint-react/web-api"]
       },
       rules: {
-        ...pluginReact.configs["recommended-typescript"].rules,
+        ...renameRules(plugins["@eslint-react"].configs["recommended-typescript"].rules, { "@eslint-react": "react" }),
+        ...renameRules(plugins["@eslint-react/dom"].configs.recommended.rules, { "@eslint-react": "react-dom" }),
+        ...renameRules(pluginReactHooks.configs.recommended.rules, { "@eslint-react": "react-hooks" }),
+        ...renameRules(plugins["@eslint-react/hooks-extra"].configs.recommended.rules, { "@eslint-react": "react-hooks-extra" }),
+        ...renameRules(plugins["@eslint-react/naming-convention"].configs.recommended.rules, { "@eslint-react": "react-naming-convention" }),
+        ...renameRules(plugins["@eslint-react/web-api"].configs.recommended.rules, { "@eslint-react": "react-web-api" }),
         "react/no-prop-types": "error",
         "react-dom/no-unknown-property": "off",
-        "react/avoid-shorthand-boolean": ["error", "always"],
+        "react/avoid-shorthand-boolean": ["error"],
         // https://github.com/ArnaudBarre/eslint-plugin-react-refresh
         "react-refresh/only-export-components": "warn"
       }
     },
+    {
+      files: ["src/components/**/*.{ts,tsx}"],
+      rules: {
+        "react-naming-convention/filename": ["warn", { rule: "PascalCase" }]
+      }
+    },
+    {
+      files: ["src/hooks/**/use*.{ts,tsx}"],
+      rules: {
+        "react-naming-convention/filename": ["warn", { rule: "kebab-case" }]
+      }
+    },
     {
       files: [
         `**/*config*.${GLOB_SCRIPT_EXT}`,

package/dts/utils.d.ts

@@ -0,0 +1,20 @@
+/**
+ * @fork https://github.com/antfu/eslint-config/blob/main/src/utils.ts
+ * Rename plugin prefixes in a rule object.
+ * Accepts a map of prefixes to rename.
+ *
+ * @example
+ * ```ts
+ * import { renameRules } from '@antfu/eslint-config'
+ *
+ * export default [{
+ *   rules: renameRules(
+ *     {
+ *       '@typescript-eslint/indent': 'error'
+ *     },
+ *     { '@typescript-eslint': 'ts' }
+ *   )
+ * }]
+ * ```
+ */
+export declare function renameRules(rules: Record<string, any>, map: Record<string, string>): Record<string, any>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiou/eslint-config",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "type": "module",
   "description": "eslint config for JW",
   "keywords": [],
@@ -68,8 +68,8 @@
     "jsonc-eslint-parser": "^2.4.0",
     "local-pkg": "^0.4.3",
     "yaml-eslint-parser": "^1.3.0",
-    "@aiou/eslint-ignore": "0.5.2",
-    "@aiou/eslint-plugin-progress": "0.3.1"
+    "@aiou/eslint-plugin-progress": "0.3.1",
+    "@aiou/eslint-ignore": "0.6.0"
   },
   "devDependencies": {
     "@rollup/plugin-alias": "4.0.3",