@dhzh/eslint-config 0.2.3 → 0.3.0

package/dist/cli.cjs

@@ -48,8 +48,8 @@ var import_picocolors = __toESM(require("picocolors"), 1);
 var package_default = {
   name: "@dhzh/eslint-config",
   type: "module",
-  version: "0.2.3",
-  packageManager: "pnpm@8.15.7",
+  version: "0.3.0",
+  packageManager: "pnpm@9.0.2",
   description: "Easton's ESLint config",
   author: "Easton Zheng <dhzhme@gmail.com>",
   license: "MIT",
@@ -129,9 +129,10 @@ var package_default = {
   dependencies: {
     "@antfu/install-pkg": "^0.3.2",
     "@clack/prompts": "^0.7.0",
-    "@stylistic/eslint-plugin": "^1.7.0",
-    "@typescript-eslint/eslint-plugin": "^7.6.0",
-    "@typescript-eslint/parser": "^7.6.0",
+    "@eslint-react/eslint-plugin": "^1.5.8",
+    "@stylistic/eslint-plugin": "^1.7.2",
+    "@typescript-eslint/eslint-plugin": "^7.7.0",
+    "@typescript-eslint/parser": "^7.7.0",
     "eslint-config-flat-gitignore": "^0.1.5",
     "eslint-flat-config-utils": "^0.2.3",
     "eslint-merge-processors": "^0.1.0",
@@ -144,7 +145,6 @@ var package_default = {
     "eslint-plugin-n": "^17.2.1",
     "eslint-plugin-no-only-tests": "^3.1.0",
     "eslint-plugin-perfectionist": "^2.9.0",
-    "eslint-plugin-react": "^7.34.1",
     "eslint-plugin-react-hooks": "^4.6.0",
     "eslint-plugin-react-refresh": "^0.4.6",
     "eslint-plugin-toml": "^0.11.0",
@@ -153,7 +153,7 @@ var package_default = {
     "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",
@@ -169,19 +169,19 @@ var package_default = {
     "@antfu/ni": "^0.21.12",
     "@dhzh/eslint-config": "workspace:*",
     "@eslint/config-inspector": "^0.4.6",
-    "@stylistic/eslint-plugin-migrate": "^1.7.0",
+    "@stylistic/eslint-plugin-migrate": "^1.7.2",
     "@types/eslint": "^8.56.9",
     "@types/fs-extra": "^11.0.4",
     "@types/node": "^20.12.7",
     "@types/prompts": "^2.4.9",
     "@types/yargs": "^17.0.32",
-    "@unocss/eslint-plugin": "^0.59.2",
+    "@unocss/eslint-plugin": "^0.59.3",
     "astro-eslint-parser": "^0.17.0",
     bumpp: "^9.4.0",
     "bundle-require": "^4.0.2",
     eslint: "^9.0.0",
     "eslint-plugin-astro": "^0.34.0",
-    "eslint-plugin-format": "^0.1.0",
+    "eslint-plugin-format": "^0.1.1",
     "eslint-plugin-solid": "^0.13.2",
     "eslint-plugin-svelte": "2.36.0-next.13",
     "eslint-typegen": "^0.2.3",
@@ -194,12 +194,12 @@ var package_default = {
     "prettier-plugin-slidev": "^1.0.5",
     rimraf: "^5.0.5",
     "simple-git-hooks": "^2.11.1",
-    svelte: "^4.2.14",
+    svelte: "^4.2.15",
     "svelte-eslint-parser": "^0.34.1",
     tsup: "^8.0.2",
     typescript: "^5.4.5",
     vitest: "^1.5.0",
-    vue: "^3.4.21"
+    vue: "^3.4.23"
   },
   "simple-git-hooks": {
     "pre-commit": "pnpm lint-staged"
@@ -230,18 +230,18 @@ var vscodeSettingsString = `
   },
 
   // Silent the stylistic rules in you IDE, but still auto fix them
-  "eslint.rules.customizations": [
-    { "rule": "style/*", "severity": "off" },
-    { "rule": "format/*", "severity": "off" },
-    { "rule": "*-indent", "severity": "off" },
-    { "rule": "*-spacing", "severity": "off" },
-    { "rule": "*-spaces", "severity": "off" },
-    { "rule": "*-order", "severity": "off" },
-    { "rule": "*-dangle", "severity": "off" },
-    { "rule": "*-newline", "severity": "off" },
-    { "rule": "*quotes", "severity": "off" },
-    { "rule": "*semi", "severity": "off" }
-  ],
+  // "eslint.rules.customizations": [
+  //   { "rule": "style/*", "severity": "off" },
+  //   { "rule": "format/*", "severity": "off" },
+  //   { "rule": "*-indent", "severity": "off" },
+  //   { "rule": "*-spacing", "severity": "off" },
+  //   { "rule": "*-spaces", "severity": "off" },
+  //   { "rule": "*-order", "severity": "off" },
+  //   { "rule": "*-dangle", "severity": "off" },
+  //   { "rule": "*-newline", "severity": "off" },
+  //   { "rule": "*quotes", "severity": "off" },
+  //   { "rule": "*semi", "severity": "off" }
+  // ],
 
   // Enable eslint for all supported languages
   "eslint.validate": [

package/dist/cli.js

@@ -19,8 +19,8 @@ import c from "picocolors";
 var package_default = {
   name: "@dhzh/eslint-config",
   type: "module",
-  version: "0.2.3",
-  packageManager: "pnpm@8.15.7",
+  version: "0.3.0",
+  packageManager: "pnpm@9.0.2",
   description: "Easton's ESLint config",
   author: "Easton Zheng <dhzhme@gmail.com>",
   license: "MIT",
@@ -100,9 +100,10 @@ var package_default = {
   dependencies: {
     "@antfu/install-pkg": "^0.3.2",
     "@clack/prompts": "^0.7.0",
-    "@stylistic/eslint-plugin": "^1.7.0",
-    "@typescript-eslint/eslint-plugin": "^7.6.0",
-    "@typescript-eslint/parser": "^7.6.0",
+    "@eslint-react/eslint-plugin": "^1.5.8",
+    "@stylistic/eslint-plugin": "^1.7.2",
+    "@typescript-eslint/eslint-plugin": "^7.7.0",
+    "@typescript-eslint/parser": "^7.7.0",
     "eslint-config-flat-gitignore": "^0.1.5",
     "eslint-flat-config-utils": "^0.2.3",
     "eslint-merge-processors": "^0.1.0",
@@ -115,7 +116,6 @@ var package_default = {
     "eslint-plugin-n": "^17.2.1",
     "eslint-plugin-no-only-tests": "^3.1.0",
     "eslint-plugin-perfectionist": "^2.9.0",
-    "eslint-plugin-react": "^7.34.1",
     "eslint-plugin-react-hooks": "^4.6.0",
     "eslint-plugin-react-refresh": "^0.4.6",
     "eslint-plugin-toml": "^0.11.0",
@@ -124,7 +124,7 @@ var package_default = {
     "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",
@@ -140,19 +140,19 @@ var package_default = {
     "@antfu/ni": "^0.21.12",
     "@dhzh/eslint-config": "workspace:*",
     "@eslint/config-inspector": "^0.4.6",
-    "@stylistic/eslint-plugin-migrate": "^1.7.0",
+    "@stylistic/eslint-plugin-migrate": "^1.7.2",
     "@types/eslint": "^8.56.9",
     "@types/fs-extra": "^11.0.4",
     "@types/node": "^20.12.7",
     "@types/prompts": "^2.4.9",
     "@types/yargs": "^17.0.32",
-    "@unocss/eslint-plugin": "^0.59.2",
+    "@unocss/eslint-plugin": "^0.59.3",
     "astro-eslint-parser": "^0.17.0",
     bumpp: "^9.4.0",
     "bundle-require": "^4.0.2",
     eslint: "^9.0.0",
     "eslint-plugin-astro": "^0.34.0",
-    "eslint-plugin-format": "^0.1.0",
+    "eslint-plugin-format": "^0.1.1",
     "eslint-plugin-solid": "^0.13.2",
     "eslint-plugin-svelte": "2.36.0-next.13",
     "eslint-typegen": "^0.2.3",
@@ -165,12 +165,12 @@ var package_default = {
     "prettier-plugin-slidev": "^1.0.5",
     rimraf: "^5.0.5",
     "simple-git-hooks": "^2.11.1",
-    svelte: "^4.2.14",
+    svelte: "^4.2.15",
     "svelte-eslint-parser": "^0.34.1",
     tsup: "^8.0.2",
     typescript: "^5.4.5",
     vitest: "^1.5.0",
-    vue: "^3.4.21"
+    vue: "^3.4.23"
   },
   "simple-git-hooks": {
     "pre-commit": "pnpm lint-staged"
@@ -201,18 +201,18 @@ var vscodeSettingsString = `
   },
 
   // Silent the stylistic rules in you IDE, but still auto fix them
-  "eslint.rules.customizations": [
-    { "rule": "style/*", "severity": "off" },
-    { "rule": "format/*", "severity": "off" },
-    { "rule": "*-indent", "severity": "off" },
-    { "rule": "*-spacing", "severity": "off" },
-    { "rule": "*-spaces", "severity": "off" },
-    { "rule": "*-order", "severity": "off" },
-    { "rule": "*-dangle", "severity": "off" },
-    { "rule": "*-newline", "severity": "off" },
-    { "rule": "*quotes", "severity": "off" },
-    { "rule": "*semi", "severity": "off" }
-  ],
+  // "eslint.rules.customizations": [
+  //   { "rule": "style/*", "severity": "off" },
+  //   { "rule": "format/*", "severity": "off" },
+  //   { "rule": "*-indent", "severity": "off" },
+  //   { "rule": "*-spacing", "severity": "off" },
+  //   { "rule": "*-spaces", "severity": "off" },
+  //   { "rule": "*-order", "severity": "off" },
+  //   { "rule": "*-dangle", "severity": "off" },
+  //   { "rule": "*-newline", "severity": "off" },
+  //   { "rule": "*quotes", "severity": "off" },
+  //   { "rule": "*semi", "severity": "off" }
+  // ],
 
   // Enable eslint for all supported languages
   "eslint.validate": [

package/dist/index.cjs

@@ -1081,52 +1081,69 @@ var ReactRefreshAllowConstantExportPackages = [
 ];
 async function react(options = {}) {
   const {
-    files = [GLOB_JSX, GLOB_TSX],
-    overrides = {},
-    typescript: typescript2 = true
+    files = [GLOB_TS, GLOB_TSX],
+    overrides = {}
   } = options;
   await ensurePackages([
-    "eslint-plugin-react",
+    "@eslint-react/eslint-plugin",
     "eslint-plugin-react-hooks",
     "eslint-plugin-react-refresh"
   ]);
+  const tsconfigPath = options?.tsconfigPath ? toArray(options.tsconfigPath) : void 0;
+  const isTypeAware = !!tsconfigPath;
   const [
     pluginReact,
     pluginReactHooks,
-    pluginReactRefresh
+    pluginReactRefresh,
+    parserTs
   ] = await Promise.all([
-    interopDefault(import("eslint-plugin-react")),
+    interopDefault(import("@eslint-react/eslint-plugin")),
     interopDefault(import("eslint-plugin-react-hooks")),
-    interopDefault(import("eslint-plugin-react-refresh"))
+    interopDefault(import("eslint-plugin-react-refresh")),
+    interopDefault(import("@typescript-eslint/parser"))
   ]);
   const isAllowConstantExport = ReactRefreshAllowConstantExportPackages.some(
     (i) => (0, import_local_pkg3.isPackageExists)(i)
   );
+  const plugins = pluginReact.configs.all.plugins;
   return [
     {
       name: "antfu/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
-      },
-      settings: {
-        react: {
-          version: "detect"
-        }
       }
     },
     {
       files,
       languageOptions: {
+        parser: parserTs,
         parserOptions: {
           ecmaFeatures: {
             jsx: true
-          }
-        }
+          },
+          ...isTypeAware ? { project: tsconfigPath } : {}
+        },
+        sourceType: "module"
       },
       name: "antfu/react/rules",
       rules: {
+        // 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",
@@ -1135,32 +1152,45 @@ async function react(options = {}) {
           "warn",
           { allowConstantExport: isAllowConstantExport }
         ],
-        // recommended rules react
-        "react/display-name": "error",
-        "react/jsx-key": "error",
-        "react/jsx-no-comment-textnodes": "error",
-        "react/jsx-no-duplicate-props": "error",
-        "react/jsx-no-target-blank": "error",
-        "react/jsx-no-undef": "error",
-        "react/jsx-uses-react": "error",
-        "react/jsx-uses-vars": "error",
-        "react/no-children-prop": "error",
-        "react/no-danger-with-children": "error",
-        "react/no-deprecated": "error",
+        // recommended rules from @eslint-react
+        "react/ensure-forward-ref-using-ref": "warn",
+        "react/no-access-state-in-setstate": "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-is-mounted": "error",
-        "react/no-render-return-value": "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-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-unescaped-entities": "error",
-        "react/no-unknown-property": "error",
-        "react/no-unsafe": "off",
-        "react/prop-types": "error",
-        "react/react-in-jsx-scope": "off",
-        "react/require-render-return": "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
@@ -2196,6 +2226,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",
@@ -2283,7 +2317,7 @@ function dhzh(options = {}, ...userConfigs) {
   if (enableReact) {
     configs.push(react({
       overrides: getOverrides(options, "react"),
-      typescript: !!enableTypeScript
+      tsconfigPath: getOverrides(options, "typescript").tsconfigPath
     }));
   }
   if (enableSolid) {