@coderwyd/eslint-config 2.4.0 → 2.4.2

package/dist/cli.cjs

@@ -46,32 +46,33 @@ var import_parse_gitignore = __toESM(require("parse-gitignore"), 1);
 var import_picocolors = __toESM(require("picocolors"), 1);
 
 // package.json
-var version = "2.4.0";
+var version = "2.4.2";
 var devDependencies = {
   "@antfu/ni": "^0.21.12",
+  "@eslint-react/eslint-plugin": "^1.5.12",
   "@eslint/config-inspector": "^0.4.8",
   "@types/eslint": "^8.56.10",
   "@types/fs-extra": "^11.0.4",
-  "@types/node": "^20.12.11",
+  "@types/node": "^20.12.12",
   "@types/prompts": "^2.4.9",
   "@types/yargs": "^17.0.32",
-  "@unocss/eslint-plugin": "^0.60.0",
+  "@unocss/eslint-plugin": "^0.60.2",
   bumpp: "^9.4.1",
-  eslint: "9.2.0",
+  eslint: "^9.3.0",
   "eslint-plugin-react": "^7.34.1",
   "eslint-plugin-react-hooks": "^4.6.2",
   "eslint-plugin-react-refresh": "^0.4.7",
-  "eslint-plugin-svelte": "2.38.0",
-  execa: "^9.0.1",
+  "eslint-plugin-svelte": "2.39.0",
+  execa: "^9.1.0",
   "fast-glob": "^3.3.2",
   "fs-extra": "^11.2.0",
   "lint-staged": "^15.2.2",
-  rimraf: "^5.0.5",
+  rimraf: "^5.0.7",
   "simple-git-hooks": "^2.11.1",
-  svelte: "^4.2.16",
+  svelte: "^4.2.17",
   "svelte-eslint-parser": "^0.36.0",
   tsup: "^8.0.2",
-  tsx: "^4.9.3",
+  tsx: "^4.10.5",
   typescript: "^5.4.5"
 };
 
@@ -239,7 +240,7 @@ ${coderwydConfig}
       console.log(import_picocolors2.default.green(`${CHECK} created .vscode/settings.json`));
     } else {
       let settingsContent = await import_promises.default.readFile(settingsPath, "utf8");
-      settingsContent = settingsContent.trim().replace(/\s*}$/, "");
+      settingsContent = settingsContent.trim().replace(/\s*\}$/, "");
       settingsContent += settingsContent.endsWith(",") || settingsContent.endsWith("{") ? "" : ",";
       settingsContent += `${vscodeSettingsString}}
 `;

package/dist/cli.js

@@ -17,32 +17,33 @@ import parse from "parse-gitignore";
 import c from "picocolors";
 
 // package.json
-var version = "2.4.0";
+var version = "2.4.2";
 var devDependencies = {
   "@antfu/ni": "^0.21.12",
+  "@eslint-react/eslint-plugin": "^1.5.12",
   "@eslint/config-inspector": "^0.4.8",
   "@types/eslint": "^8.56.10",
   "@types/fs-extra": "^11.0.4",
-  "@types/node": "^20.12.11",
+  "@types/node": "^20.12.12",
   "@types/prompts": "^2.4.9",
   "@types/yargs": "^17.0.32",
-  "@unocss/eslint-plugin": "^0.60.0",
+  "@unocss/eslint-plugin": "^0.60.2",
   bumpp: "^9.4.1",
-  eslint: "9.2.0",
+  eslint: "^9.3.0",
   "eslint-plugin-react": "^7.34.1",
   "eslint-plugin-react-hooks": "^4.6.2",
   "eslint-plugin-react-refresh": "^0.4.7",
-  "eslint-plugin-svelte": "2.38.0",
-  execa: "^9.0.1",
+  "eslint-plugin-svelte": "2.39.0",
+  execa: "^9.1.0",
   "fast-glob": "^3.3.2",
   "fs-extra": "^11.2.0",
   "lint-staged": "^15.2.2",
-  rimraf: "^5.0.5",
+  rimraf: "^5.0.7",
   "simple-git-hooks": "^2.11.1",
-  svelte: "^4.2.16",
+  svelte: "^4.2.17",
   "svelte-eslint-parser": "^0.36.0",
   tsup: "^8.0.2",
-  tsx: "^4.9.3",
+  tsx: "^4.10.5",
   typescript: "^5.4.5"
 };
 
@@ -210,7 +211,7 @@ ${coderwydConfig}
       console.log(c2.green(`${CHECK} created .vscode/settings.json`));
     } else {
       let settingsContent = await fsp.readFile(settingsPath, "utf8");
-      settingsContent = settingsContent.trim().replace(/\s*}$/, "");
+      settingsContent = settingsContent.trim().replace(/\s*\}$/, "");
       settingsContent += settingsContent.endsWith(",") || settingsContent.endsWith("{") ? "" : ",";
       settingsContent += `${vscodeSettingsString}}
 `;

package/dist/index.cjs

@@ -87,7 +87,6 @@ async function comments() {
 // src/constants/glob.ts
 var GLOB_SRC_EXT = "?([cm])[jt]s?(x)";
 var GLOB_SRC = "**/*.?([cm])[jt]s?(x)";
-var GLOB_JSX = "**/*.?([cm])jsx";
 var GLOB_TS = "**/*.?([cm])ts";
 var GLOB_TSX = "**/*.?([cm])tsx";
 var GLOB_VUE = "**/*.vue";
@@ -495,8 +494,8 @@ var parserPlain = {
     }
   })
 };
-async function combine(...configs) {
-  const resolved = await Promise.all(configs);
+async function combine(...configs2) {
+  const resolved = await Promise.all(configs2);
   return resolved.flat();
 }
 function renameRules(rules, map) {
@@ -510,8 +509,8 @@ function renameRules(rules, map) {
     })
   );
 }
-function renamePluginInConfigs(configs, map) {
-  return configs.map((i) => {
+function renamePluginInConfigs(configs2, map) {
+  return configs2.map((i) => {
     const clone = { ...i };
     if (clone.rules)
       clone.rules = renameRules(clone.rules, map);
@@ -940,7 +939,7 @@ async function prettier(rules = {}) {
   const pRules = {
     ...rules
   };
-  const configs = [
+  const configs2 = [
     {
       name: "coderwyd/prettier/setup",
       plugins: {
@@ -959,7 +958,7 @@ async function prettier(rules = {}) {
       }
     }
   ];
-  return configs;
+  return configs2;
 }
 
 // src/configs/typescript.ts
@@ -1128,7 +1127,7 @@ async function unicorn() {
         unicorn: import_eslint_plugin_unicorn.default
       },
       rules: {
-        "unicorn/better-regex": "error",
+        // 'unicorn/better-regex': 'error',
         "unicorn/catch-error-name": "error",
         "unicorn/custom-error-definition": "error",
         "unicorn/error-message": "error",
@@ -1182,7 +1181,7 @@ async function unicorn() {
         "unicorn/prefer-prototype-methods": "error",
         "unicorn/prefer-query-selector": "error",
         "unicorn/prefer-reflect-apply": "error",
-        "unicorn/prefer-regexp-test": "error",
+        // 'unicorn/prefer-regexp-test': 'error',
         "unicorn/prefer-string-replace-all": "error",
         "unicorn/prefer-string-slice": "error",
         "unicorn/prefer-string-starts-ends-with": "error",
@@ -1438,86 +1437,132 @@ async function perfectionist() {
 // src/configs/react.ts
 var import_local_pkg2 = require("local-pkg");
 var ReactRefreshAllowConstantExportPackages = ["vite"];
+var RemixPackages = [
+  "@remix-run/node",
+  "@remix-run/react",
+  "@remix-run/serve",
+  "@remix-run/dev"
+];
+var NextJsPackages = ["next"];
 async function react(options = {}) {
-  const {
-    files = [GLOB_JSX, GLOB_TSX],
-    overrides = {},
-    typescript: typescript2 = true
-  } = options;
+  const { 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 [pluginReact, pluginReactHooks, pluginReactRefresh] = await Promise.all(
-    [
-      interopDefault(import("eslint-plugin-react")),
-      interopDefault(import("eslint-plugin-react-hooks")),
-      interopDefault(import("eslint-plugin-react-refresh"))
-    ]
-  );
+  const tsconfigPath = options?.tsconfigPath ? toArray(options.tsconfigPath) : void 0;
+  const isTypeAware = !!tsconfigPath;
+  const [pluginReact, pluginReactHooks, pluginReactRefresh, parserTs] = await Promise.all([
+    interopDefault(import("@eslint-react/eslint-plugin")),
+    interopDefault(import("eslint-plugin-react-hooks")),
+    interopDefault(import("eslint-plugin-react-refresh")),
+    interopDefault(import("@typescript-eslint/parser"))
+  ]);
   const isAllowConstantExport = ReactRefreshAllowConstantExportPackages.some(
     (i) => (0, import_local_pkg2.isPackageExists)(i)
   );
+  const isUsingRemix = RemixPackages.some((i) => (0, import_local_pkg2.isPackageExists)(i));
+  const isUsingNext = NextJsPackages.some((i) => (0, import_local_pkg2.isPackageExists)(i));
+  const plugins = pluginReact.configs.all.plugins;
   return [
     {
       name: "coderwyd/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: "coderwyd/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",
         // react refresh
         "react-refresh/only-export-components": [
           "warn",
-          { allowConstantExport: isAllowConstantExport }
+          {
+            allowConstantExport: isAllowConstantExport,
+            allowExportNames: [
+              ...isUsingNext ? [
+                "config",
+                "generateStaticParams",
+                "metadata",
+                "generateMetadata",
+                "viewport",
+                "generateViewport"
+              ] : [],
+              ...isUsingRemix ? ["meta", "links", "headers", "loader", "action"] : []
+            ]
+          }
         ],
-        // 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
@@ -1594,7 +1639,7 @@ async function formatter(options = {}, prettierRules2 = {}) {
     };
     return config;
   }
-  const configs = [
+  const configs2 = [
     {
       name: "coderwyd/formatter/setup",
       plugins: {
@@ -1604,34 +1649,34 @@ async function formatter(options = {}, prettierRules2 = {}) {
   ];
   if (html) {
     const htmlConfig = createPrettierFormatter([GLOB_HTML], "html");
-    configs.push(htmlConfig);
+    configs2.push(htmlConfig);
   }
   if (css) {
     const cssConfig = createPrettierFormatter([GLOB_CSS, GLOB_POSTCSS], "css");
     const scssConfig = createPrettierFormatter([GLOB_SCSS], "scss");
     const lessConfig = createPrettierFormatter([GLOB_LESS], "less");
-    configs.push(cssConfig, scssConfig, lessConfig);
+    configs2.push(cssConfig, scssConfig, lessConfig);
   }
   if (markdown) {
     const markdownConfig = createPrettierFormatter([GLOB_MARKDOWN], "markdown");
-    configs.push(markdownConfig);
+    configs2.push(markdownConfig);
   }
   if (graphql) {
     const graphqlConfig = createPrettierFormatter([GLOB_GRAPHQL], "graphql");
-    configs.push(graphqlConfig);
+    configs2.push(graphqlConfig);
   }
   if (yaml) {
     const yamlConfig = createPrettierFormatter([GLOB_YAML], "yaml");
-    configs.push(yamlConfig);
+    configs2.push(yamlConfig);
   }
   if (toml) {
     await ensurePackages(["@toml-tools/parser", "prettier-plugin-toml"]);
     const tomlConfig = createPrettierFormatter([GLOB_TOML], "toml", [
       "prettier-plugin-toml"
     ]);
-    configs.push(tomlConfig);
+    configs2.push(tomlConfig);
   }
-  return configs;
+  return configs2;
 }
 
 // src/configs/svelte.ts
@@ -1766,6 +1811,31 @@ async function command() {
   ];
 }
 
+// src/configs/regexp.ts
+var import_eslint_plugin_regexp = require("eslint-plugin-regexp");
+async function regexp(options = {}) {
+  const config = import_eslint_plugin_regexp.configs["flat/recommended"];
+  const rules = {
+    ...config.rules
+  };
+  if (options.level === "warn") {
+    Object.keys(rules).forEach((key) => {
+      if (rules[key] === "error")
+        rules[key] = "warn";
+    });
+  }
+  return [
+    {
+      ...config,
+      name: "coderwyd/regexp/rules",
+      rules: {
+        ...rules,
+        ...options.overrides
+      }
+    }
+  ];
+}
+
 // src/env.ts
 var import_node_process3 = __toESM(require("process"), 1);
 var import_local_pkg3 = require("local-pkg");
@@ -1805,6 +1875,7 @@ async function defineConfig(options = {}, ...userConfigs) {
     gitignore: enableGitignore = true,
     isInEditor: isInEditor2 = isInEditor,
     react: enableReact = false,
+    regexp: enableRegexp = true,
     svelte: enableSvelte = false,
     tailwindcss: enableTailwindCSS = hasTailwindCSS,
     typescript: enableTypeScript = hasTypeScript,
@@ -1812,24 +1883,24 @@ async function defineConfig(options = {}, ...userConfigs) {
     usePrettierrc = true,
     vue: enableVue = hasVue
   } = options;
-  const configs = [];
+  const configs2 = [];
   if (enableGitignore) {
     if (typeof enableGitignore !== "boolean") {
-      configs.push(
+      configs2.push(
         interopDefault(import("eslint-config-flat-gitignore")).then((r) => [
           r(enableGitignore)
         ])
       );
     } else {
       if (import_node_fs.default.existsSync(".gitignore"))
-        configs.push(
+        configs2.push(
           interopDefault(import("eslint-config-flat-gitignore")).then((r) => [
             r()
           ])
         );
     }
   }
-  configs.push(
+  configs2.push(
     ignores(),
     javascript({
       isInEditor: isInEditor2,
@@ -1847,7 +1918,7 @@ async function defineConfig(options = {}, ...userConfigs) {
   if (enableVue)
     componentExts.push("vue");
   if (enableTypeScript) {
-    configs.push(
+    configs2.push(
       typescript({
         ...resolveSubOptions(options, "typescript"),
         componentExts,
@@ -1855,8 +1926,10 @@ async function defineConfig(options = {}, ...userConfigs) {
       })
     );
   }
+  if (enableRegexp)
+    configs2.push(regexp(typeof enableRegexp === "boolean" ? {} : enableRegexp));
   if (options.test ?? true) {
-    configs.push(
+    configs2.push(
       test({
         isInEditor: isInEditor2,
         overrides: getOverrides(options, "test")
@@ -1864,7 +1937,7 @@ async function defineConfig(options = {}, ...userConfigs) {
     );
   }
   if (enableVue) {
-    configs.push(
+    configs2.push(
       vue({
         ...resolveSubOptions(options, "vue"),
         overrides: getOverrides(options, "typescript"),
@@ -1873,15 +1946,15 @@ async function defineConfig(options = {}, ...userConfigs) {
     );
   }
   if (enableReact) {
-    configs.push(
+    configs2.push(
       react({
         overrides: getOverrides(options, "react"),
-        typescript: !!enableTypeScript
+        tsconfigPath: getOverrides(options, "typescript").tsconfigPath
       })
     );
   }
   if (enableSvelte) {
-    configs.push(
+    configs2.push(
       svelte({
         overrides: getOverrides(options, "svelte"),
         typescript: !!enableTypeScript
@@ -1889,7 +1962,7 @@ async function defineConfig(options = {}, ...userConfigs) {
     );
   }
   if (enableUnoCSS) {
-    configs.push(
+    configs2.push(
       unocss({
         ...resolveSubOptions(options, "unocss"),
         overrides: getOverrides(options, "unocss")
@@ -1897,7 +1970,7 @@ async function defineConfig(options = {}, ...userConfigs) {
     );
   }
   if (enableTailwindCSS) {
-    configs.push(
+    configs2.push(
       tailwindcss({
         ...resolveSubOptions(options, "tailwindcss"),
         overrides: getOverrides(options, "tailwindcss")
@@ -1905,7 +1978,7 @@ async function defineConfig(options = {}, ...userConfigs) {
     );
   }
   if (options.jsonc ?? true) {
-    configs.push(
+    configs2.push(
       jsonc({
         overrides: getOverrides(options, "jsonc")
       }),
@@ -1926,12 +1999,12 @@ async function defineConfig(options = {}, ...userConfigs) {
       );
       Object.assign(prettierRules2, prettierConfig);
     }
-    configs.push(
+    configs2.push(
       prettier(prettierRules2),
       formatter(formatterOptions, prettierRules2)
     );
   } else {
-    configs.push(prettier());
+    configs2.push(prettier());
   }
   const fusedConfig = flatConfigProps.reduce((acc, key) => {
     if (key in options)
@@ -1939,8 +2012,8 @@ async function defineConfig(options = {}, ...userConfigs) {
     return acc;
   }, {});
   if (Object.keys(fusedConfig).length > 0)
-    configs.push([fusedConfig]);
-  const merged = await combine(...configs, ...userConfigs);
+    configs2.push([fusedConfig]);
+  const merged = await combine(...configs2, ...userConfigs);
   if (autoRenamePlugins)
     return renamePluginInConfigs(merged, defaultPluginRenaming);
   return merged;