@lincy/eslint-config 4.3.1 → 4.5.0

package/dist/index.js

@@ -349,7 +349,7 @@ async function javascript(options = {}) {
         "unused-imports/no-unused-imports": isInEditor ? "off" : "error",
         "unused-imports/no-unused-vars": [
           "error",
-          { args: "after-used", argsIgnorePattern: "^_", vars: "all", varsIgnorePattern: "^_" }
+          { args: "after-used", argsIgnorePattern: "^_", ignoreRestSiblings: true, vars: "all", varsIgnorePattern: "^_" }
         ],
         "use-isnan": ["error", { enforceForIndexOf: true, enforceForSwitchCase: true }],
         "valid-typeof": ["error", { requireStringLiterals: true }],
@@ -379,8 +379,9 @@ 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}/`))
+        if (key.startsWith(`${from}/`)) {
           return [to + key.slice(from.length), value];
+        }
       }
       return [key, value];
     })
@@ -389,13 +390,15 @@ function renameRules(rules, map) {
 function renamePluginInConfigs(configs, map) {
   return configs.map((i) => {
     const clone = { ...i };
-    if (clone.rules)
+    if (clone.rules) {
       clone.rules = renameRules(clone.rules, map);
+    }
     if (clone.plugins) {
       clone.plugins = Object.fromEntries(
         Object.entries(clone.plugins).map(([key, value]) => {
-          if (key in map)
+          if (key in map) {
             return [map[key], value];
+          }
           return [key, value];
         })
       );
@@ -411,11 +414,13 @@ async function interopDefault(m) {
   return resolved.default || resolved;
 }
 async function ensurePackages(packages) {
-  if (process.stdout.isTTY === false)
+  if (process.stdout.isTTY === false) {
     return;
+  }
   const nonExistingPackages = packages.filter((i) => !isPackageExists(i));
-  if (nonExistingPackages.length === 0)
+  if (nonExistingPackages.length === 0) {
     return;
+  }
   const { default: prompts } = await import("prompts");
   const { result } = await prompts([
     {
@@ -424,8 +429,9 @@ async function ensurePackages(packages) {
       type: "confirm"
     }
   ]);
-  if (result)
+  if (result) {
     await import("@antfu/install-pkg").then((i) => i.installPackage(nonExistingPackages, { dev: true }));
+  }
 }
 
 // src/configs/jsdoc.ts
@@ -650,6 +656,7 @@ import * as parserPlain2 from "eslint-parser-plain";
 var StylisticConfigDefaults = {
   indent: 4,
   jsx: true,
+  lessOpinionated: true,
   quotes: "single",
   semi: false
 };
@@ -661,6 +668,7 @@ async function stylistic(options = {}) {
   const {
     indent,
     jsx,
+    lessOpinionated,
     quotes,
     semi
   } = typeof stylistic2 === "boolean" ? StylisticConfigDefaults : { ...StylisticConfigDefaults, ...stylistic2 };
@@ -683,9 +691,13 @@ async function stylistic(options = {}) {
       rules: {
         ...config.rules,
         "antfu/consistent-list-newline": "off",
-        "antfu/if-newline": "error",
-        "antfu/top-level-function": "error",
-        "curly": ["error", "multi-or-nest", "consistent"],
+        ...lessOpinionated ? {
+          curly: ["error", "all"]
+        } : {
+          "antfu/if-newline": "error",
+          "antfu/top-level-function": "error",
+          "curly": ["error", "multi-or-nest", "consistent"]
+        },
         // 覆盖`stylistic`默认规则
         "style/member-delimiter-style": ["error", { multiline: { delimiter: "none" } }],
         "style/multiline-ternary": ["error", "never"],
@@ -798,7 +810,7 @@ async function formatters(options = {}, stylistic2 = {}) {
   }
   if (options.html) {
     configs.push({
-      files: ["**/*.html"],
+      files: [GLOB_HTML],
       languageOptions: {
         parser: parserPlain2
       },
@@ -894,152 +906,116 @@ async function react(options = {}) {
     typescript: typescript2 = true,
     version = "detect"
   } = options;
+  const tsconfigPath = options?.tsconfigPath ? toArray(options.tsconfigPath) : void 0;
+  const isTypeAware = !!tsconfigPath || !typescript2;
   await ensurePackages([
-    "eslint-plugin-react",
+    "@eslint-react/eslint-plugin",
     "eslint-plugin-react-hooks",
     "eslint-plugin-react-refresh"
   ]);
   const [
     pluginReact,
     pluginReactHooks,
-    pluginReactRefresh
+    pluginReactRefresh,
+    parserTs
   ] = await Promise.all([
-    // @ts-expect-error missing types
-    interopDefault(import("eslint-plugin-react")),
+    interopDefault(import("@eslint-react/eslint-plugin")),
     // @ts-expect-error missing types
     interopDefault(import("eslint-plugin-react-hooks")),
     // @ts-expect-error missing types
-    interopDefault(import("eslint-plugin-react-refresh"))
+    interopDefault(import("eslint-plugin-react-refresh")),
+    interopDefault(import("@typescript-eslint/parser"))
   ]);
   const _isAllowConstantExport = ReactRefreshAllowConstantExportPackages.some(
     (i) => isPackageExists2(i)
   );
+  const plugins = pluginReact.configs.all.plugins;
   return [
     {
       name: "eslint:react:setup",
       plugins: {
-        "react": pluginReact,
+        "react": plugins["@eslint-react"],
+        "react-dom": plugins["@eslint-react/dom"],
         "react-hooks": pluginReactHooks,
+        "react-hooks-extra": plugins["@eslint-react/hooks-extra"],
+        "react-naming-convention": plugins["@eslint-react/naming-convention"],
         "react-refresh": pluginReactRefresh
       }
     },
     {
       files,
       languageOptions: {
+        parser: parserTs,
         parserOptions: {
           ecmaFeatures: {
             jsx
-          }
+          },
+          ...isTypeAware ? { project: tsconfigPath } : {}
         }
       },
       name: "eslint:react:rules",
       rules: {
-        // react-hooks
+        // recommended rules from @eslint-react/dom
+        "react-dom/no-children-in-void-dom-elements": "warn",
+        "react-dom/no-dangerously-set-innerhtml": "warn",
+        "react-dom/no-dangerously-set-innerhtml-with-children": "error",
+        "react-dom/no-find-dom-node": "error",
+        "react-dom/no-missing-button-type": "warn",
+        "react-dom/no-missing-iframe-sandbox": "warn",
+        "react-dom/no-namespace": "error",
+        "react-dom/no-render-return-value": "error",
+        "react-dom/no-script-url": "warn",
+        "react-dom/no-unsafe-iframe-sandbox": "warn",
+        "react-dom/no-unsafe-target-blank": "warn",
+        // recommended rules react-hooks
         "react-hooks/exhaustive-deps": "warn",
         "react-hooks/rules-of-hooks": "error",
-        // react-refresh
+        // react refresh
         // 'react-refresh/only-export-components': [
         //     'warn',
-        //     { allowConstantExport: _isAllowConstantExport },
+        //     { allowConstantExport: isAllowConstantExport },
         // ],
-        "react-refresh/only-export-components": "off",
-        // react
-        "react/boolean-prop-naming": "error",
-        "react/button-has-type": "error",
-        "react/default-props-match-prop-types": "error",
-        "react/destructuring-assignment": "error",
-        "react/display-name": "error",
-        "react/forbid-component-props": "off",
-        // 禁止组件上使用某些 props
-        "react/forbid-dom-props": "error",
-        "react/forbid-elements": "error",
-        "react/forbid-foreign-prop-types": "error",
-        "react/forbid-prop-types": "error",
-        "react/function-component-definition": "error",
-        "react/hook-use-state": "off",
-        // useState 钩子值和 setter 变量的解构和对称命名
-        "react/iframe-missing-sandbox": "error",
-        "react/jsx-boolean-value": "error",
-        "react/jsx-filename-extension": "off",
-        // 禁止可能包含 JSX 文件扩展名
-        "react/jsx-fragments": "error",
-        "react/jsx-handler-names": "error",
-        "react/jsx-key": "error",
-        "react/jsx-max-depth": "off",
-        // 强制 JSX 最大深度
-        "react/jsx-no-bind": "off",
-        // .bind()JSX 属性中禁止使用箭头函数
-        "react/jsx-no-comment-textnodes": "error",
-        "react/jsx-no-constructed-context-values": "error",
-        "react/jsx-no-duplicate-props": "error",
-        "react/jsx-no-leaked-render": "error",
-        "react/jsx-no-literals": "off",
-        // 禁止在 JSX 中使用字符串文字
-        "react/jsx-no-script-url": "error",
-        "react/jsx-no-target-blank": "error",
-        "react/jsx-no-undef": "error",
-        "react/jsx-no-useless-fragment": "error",
-        "react/jsx-props-no-spreading": "off",
-        // 强制任何 JSX 属性都不会传播
-        "react/jsx-uses-react": "error",
-        "react/jsx-uses-vars": "error",
+        // recommended rules from @eslint-react
+        "react/ensure-forward-ref-using-ref": "warn",
         "react/no-access-state-in-setstate": "error",
-        "react/no-adjacent-inline-elements": "error",
-        "react/no-array-index-key": "error",
-        "react/no-arrow-function-lifecycle": "error",
-        "react/no-children-prop": "error",
-        "react/no-danger": "off",
-        // 禁止使用 dangerouslySetInnerHTML
-        "react/no-danger-with-children": "error",
-        "react/no-deprecated": "error",
-        "react/no-did-mount-set-state": "error",
-        "react/no-did-update-set-state": "error",
+        "react/no-array-index-key": "warn",
+        "react/no-children-count": "warn",
+        "react/no-children-for-each": "warn",
+        "react/no-children-map": "warn",
+        "react/no-children-only": "warn",
+        "react/no-children-prop": "warn",
+        "react/no-children-to-array": "warn",
+        "react/no-clone-element": "warn",
+        "react/no-comment-textnodes": "warn",
+        "react/no-component-will-mount": "error",
+        "react/no-component-will-receive-props": "error",
+        "react/no-component-will-update": "error",
+        "react/no-create-ref": "error",
         "react/no-direct-mutation-state": "error",
-        "react/no-find-dom-node": "error",
-        "react/no-invalid-html-attribute": "error",
-        "react/no-is-mounted": "error",
-        "react/no-multi-comp": "error",
-        "react/no-namespace": "error",
-        "react/no-object-type-as-default-prop": "error",
+        "react/no-duplicate-key": "error",
+        "react/no-implicit-key": "error",
+        "react/no-missing-key": "error",
+        "react/no-nested-components": "warn",
         "react/no-redundant-should-component-update": "error",
-        "react/no-render-return-value": "error",
-        "react/no-set-state": "error",
+        "react/no-set-state-in-component-did-mount": "warn",
+        "react/no-set-state-in-component-did-update": "warn",
+        "react/no-set-state-in-component-will-update": "warn",
         "react/no-string-refs": "error",
-        "react/no-this-in-sfc": "error",
-        "react/no-typos": "error",
-        "react/no-unescaped-entities": "error",
-        "react/no-unknown-property": "error",
-        "react/no-unsafe": "off",
-        // 禁止使用不安全的生命周期方法
-        "react/no-unstable-nested-components": "error",
-        "react/no-unused-class-component-methods": "error",
-        "react/no-unused-prop-types": "error",
-        "react/no-unused-state": "error",
-        "react/no-will-update-set-state": "error",
-        "react/prefer-es6-class": "error",
-        "react/prefer-exact-props": "error",
-        "react/prefer-read-only-props": "error",
-        "react/prefer-stateless-function": "error",
-        "react/prop-types": "error",
-        "react/react-in-jsx-scope": "off",
-        // 使用 JSX 时需要引入 React
-        "react/require-default-props": "off",
-        // 为每个非必需 prop 强制执行 defaultProps 定义
-        "react/require-optimization": "error",
-        "react/require-render-return": "error",
-        "react/self-closing-comp": "error",
-        "react/sort-comp": "error",
-        "react/sort-default-props": "error",
-        "react/sort-prop-types": "error",
-        "react/state-in-constructor": "error",
-        "react/static-property-placement": "error",
-        "react/style-prop-object": "error",
-        "react/void-dom-elements-no-children": "error",
-        "style/jsx-pascal-case": "error",
-        ...typescript2 ? {
-          "react/jsx-no-undef": "off",
-          "react/prop-type": "off"
+        "react/no-unsafe-component-will-mount": "warn",
+        "react/no-unsafe-component-will-receive-props": "warn",
+        "react/no-unsafe-component-will-update": "warn",
+        "react/no-unstable-context-value": "error",
+        "react/no-unstable-default-props": "error",
+        "react/no-unused-class-component-members": "warn",
+        "react/no-unused-state": "warn",
+        "react/no-useless-fragment": "warn",
+        "react/prefer-destructuring-assignment": "warn",
+        "react/prefer-shorthand-boolean": "warn",
+        "react/prefer-shorthand-fragment": "warn",
+        ...isTypeAware ? {
+          "react/no-leaked-conditional-rendering": "warn"
         } : {},
+        // overrides
         ...overrides
       },
       settings: {
@@ -1869,6 +1845,10 @@ var VuePackages = [
   "@slidev/cli"
 ];
 var defaultPluginRenaming = {
+  "@eslint-react": "react",
+  "@eslint-react/dom": "react-dom",
+  "@eslint-react/hooks-extra": "react-hooks-extra",
+  "@eslint-react/naming-convention": "react-naming-convention",
   "@stylistic": "style",
   "@typescript-eslint": "ts",
   "import-x": "import",
@@ -1894,16 +1874,18 @@ function lincy(options = {}, ...userConfigs) {
   } = options;
   const stylisticOptions = options.stylistic === false ? false : typeof options.stylistic === "object" ? options.stylistic : {};
   if (stylisticOptions) {
-    if (!("jsx" in stylisticOptions))
+    if (!("jsx" in stylisticOptions)) {
       stylisticOptions.jsx = options.jsx ?? true;
+    }
   }
   const configs = [];
   if (enableGitignore) {
     if (typeof enableGitignore !== "boolean") {
       configs.push(interopDefault(import("eslint-config-flat-gitignore")).then((r) => [r(enableGitignore)]));
     } else {
-      if (fs.existsSync(".gitignore"))
+      if (fs.existsSync(".gitignore")) {
         configs.push(interopDefault(import("eslint-config-flat-gitignore")).then((r) => [r()]));
+      }
     }
   }
   configs.push(
@@ -1926,8 +1908,9 @@ function lincy(options = {}, ...userConfigs) {
     // Optional plugins (installed but not enabled by default)
     perfectionist()
   );
-  if (enableVue)
+  if (enableVue) {
     componentExts.push("vue");
+  }
   if (enableTypeScript) {
     configs.push(typescript({
       ...typeof enableTypeScript !== "boolean" ? enableTypeScript : {},
@@ -2007,20 +1990,23 @@ function lincy(options = {}, ...userConfigs) {
     ));
   }
   const fusedConfig = flatConfigProps.reduce((acc, key) => {
-    if (key in options)
+    if (key in options) {
       acc[key] = options[key];
+    }
     return acc;
   }, {});
-  if (Object.keys(fusedConfig).length)
+  if (Object.keys(fusedConfig).length) {
     configs.push([fusedConfig]);
-  let pipeline = new FlatConfigComposer();
-  pipeline = pipeline.append(
+  }
+  let composer = new FlatConfigComposer();
+  composer = composer.append(
     ...configs,
     ...userConfigs
   );
-  if (autoRenamePlugins)
-    pipeline = pipeline.renamePlugins(defaultPluginRenaming);
-  return pipeline;
+  if (autoRenamePlugins) {
+    composer = composer.renamePlugins(defaultPluginRenaming);
+  }
+  return composer;
 }
 
 // src/index.ts

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lincy/eslint-config",
   "type": "module",
-  "version": "4.3.1",
+  "version": "4.5.0",
   "packageManager": "pnpm@8.7.6",
   "description": "LinCenYing's ESLint config",
   "author": "LinCenYing <lincenying@gmail.com> (https://github.com/lincenying/)",
@@ -37,21 +37,21 @@
     "prepare": "npx simple-git-hooks"
   },
   "peerDependencies": {
+    "@eslint-react/eslint-plugin": "^7.33.2",
     "@unocss/eslint-plugin": ">=0.50.0",
     "eslint": ">=8.40.0",
     "eslint-plugin-format": ">=0.1.0",
-    "eslint-plugin-react": "^7.33.2",
     "eslint-plugin-react-hooks": "^4.6.0",
     "eslint-plugin-react-refresh": "^0.4.4"
   },
   "peerDependenciesMeta": {
-    "@unocss/eslint-plugin": {
+    "@eslint-react/eslint-plugin": {
       "optional": true
     },
-    "eslint-plugin-format": {
+    "@unocss/eslint-plugin": {
       "optional": true
     },
-    "eslint-plugin-react": {
+    "eslint-plugin-format": {
       "optional": true
     },
     "eslint-plugin-react-hooks": {
@@ -64,29 +64,29 @@
   "dependencies": {
     "@antfu/eslint-define-config": "1.23.0-2",
     "@antfu/install-pkg": "^0.3.2",
-    "@stylistic/eslint-plugin": "1.7.0",
-    "@typescript-eslint/eslint-plugin": "^7.5.0",
-    "@typescript-eslint/parser": "^7.5.0",
-    "eslint-config-flat-gitignore": "^0.1.3",
-    "eslint-flat-config-utils": "^0.2.0",
+    "@stylistic/eslint-plugin": "1.7.2",
+    "@typescript-eslint/eslint-plugin": "^7.7.1",
+    "@typescript-eslint/parser": "^7.7.1",
+    "eslint-config-flat-gitignore": "^0.1.5",
+    "eslint-flat-config-utils": "^0.2.3",
     "eslint-merge-processors": "^0.1.0",
     "eslint-parser-plain": "^0.1.0",
     "eslint-plugin-antfu": "^2.1.2",
     "eslint-plugin-eslint-comments": "^3.2.0",
     "eslint-plugin-import-x": "^0.5.0",
-    "eslint-plugin-jsdoc": "^48.2.2",
-    "eslint-plugin-jsonc": "^2.15.0",
+    "eslint-plugin-jsdoc": "^48.2.3",
+    "eslint-plugin-jsonc": "^2.15.1",
     "eslint-plugin-markdown": "^4.0.1",
-    "eslint-plugin-n": "^16.6.2",
+    "eslint-plugin-n": "^17.2.1",
     "eslint-plugin-no-only-tests": "^3.1.0",
-    "eslint-plugin-perfectionist": "^2.7.0",
+    "eslint-plugin-perfectionist": "^2.9.0",
     "eslint-plugin-toml": "^0.11.0",
-    "eslint-plugin-unicorn": "^51.0.1",
+    "eslint-plugin-unicorn": "^52.0.0",
     "eslint-plugin-unused-imports": "^3.1.0",
-    "eslint-plugin-vitest": "^0.4.1",
-    "eslint-plugin-vue": "^9.24.0",
+    "eslint-plugin-vitest": "^0.5.3",
+    "eslint-plugin-vue": "^9.25.0",
     "eslint-plugin-yml": "^1.14.0",
-    "eslint-processor-vue-blocks": "^0.1.1",
+    "eslint-processor-vue-blocks": "^0.1.2",
     "globals": "^15.0.0",
     "jsonc-eslint-parser": "^2.4.0",
     "local-pkg": "^0.5.0",
@@ -97,35 +97,36 @@
   },
   "devDependencies": {
     "@antfu/ni": "^0.21.12",
-    "@eslint-types/jsdoc": "48.2.1",
-    "@eslint-types/typescript-eslint": "^7.2.0",
-    "@eslint-types/unicorn": "^51.0.1",
-    "@eslint/config-inspector": "^0.2.1",
+    "@eslint-react/eslint-plugin": "^1.5.9",
+    "@eslint-types/jsdoc": "48.2.2",
+    "@eslint-types/typescript-eslint": "^7.5.0",
+    "@eslint-types/unicorn": "^52.0.0",
+    "@eslint/config-inspector": "^0.4.7",
     "@lincy/eslint-config": "workspace:*",
-    "@stylistic/eslint-plugin-migrate": "^1.7.0",
-    "@types/eslint": "^8.56.7",
-    "@types/node": "^20.12.2",
+    "@stylistic/eslint-plugin-migrate": "^1.7.2",
+    "@types/eslint": "^8.56.10",
+    "@types/node": "^20.12.7",
     "@types/prompts": "^2.4.9",
-    "@unocss/eslint-plugin": "^0.58.8",
+    "@unocss/eslint-plugin": "^0.59.4",
     "bumpp": "^9.4.0",
-    "eslint": "^8.57.0",
-    "eslint-plugin-format": "^0.1.0",
-    "eslint-plugin-react": "^7.34.1",
+    "eslint": "^9.1.1",
+    "eslint-plugin-format": "^0.1.1",
     "eslint-plugin-react-hooks": "^4.6.0",
     "eslint-plugin-react-refresh": "^0.4.6",
-    "eslint-typegen": "^0.2.0",
+    "eslint-typegen": "^0.2.4",
     "esno": "^4.7.0",
     "lint-staged": "^15.2.2",
     "prettier": "^3.2.5",
+    "react": "^18.2.0",
     "rimraf": "^5.0.5",
     "simple-git-hooks": "^2.11.1",
     "simple-open-url": "^3.0.1",
     "sucrase": "^3.35.0",
     "tsup": "^8.0.2",
-    "typescript": "^5.4.3",
+    "typescript": "^5.4.5",
     "unbuild": "^2.0.0",
-    "vitest": "^1.4.0",
-    "vue": "^3.4.21"
+    "vitest": "^1.5.0",
+    "vue": "^3.4.24"
   },
   "pnpm": {
     "peerDependencyRules": {