@coderwyd/eslint-config 2.4.0 → 2.4.1

package/dist/cli.cjs

@@ -46,7 +46,7 @@ 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.1";
 var devDependencies = {
   "@antfu/ni": "^0.21.12",
   "@eslint/config-inspector": "^0.4.8",
@@ -55,23 +55,23 @@ var devDependencies = {
   "@types/node": "^20.12.11",
   "@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-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.2",
   typescript: "^5.4.5"
 };
 
@@ -239,7 +239,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,7 +17,7 @@ import parse from "parse-gitignore";
 import c from "picocolors";
 
 // package.json
-var version = "2.4.0";
+var version = "2.4.1";
 var devDependencies = {
   "@antfu/ni": "^0.21.12",
   "@eslint/config-inspector": "^0.4.8",
@@ -26,23 +26,23 @@ var devDependencies = {
   "@types/node": "^20.12.11",
   "@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-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.2",
   typescript: "^5.4.5"
 };
 
@@ -210,7 +210,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

@@ -495,8 +495,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 +510,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 +940,7 @@ async function prettier(rules = {}) {
   const pRules = {
     ...rules
   };
-  const configs = [
+  const configs2 = [
     {
       name: "coderwyd/prettier/setup",
       plugins: {
@@ -959,7 +959,7 @@ async function prettier(rules = {}) {
       }
     }
   ];
-  return configs;
+  return configs2;
 }
 
 // src/configs/typescript.ts
@@ -1128,7 +1128,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 +1182,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",
@@ -1594,7 +1594,7 @@ async function formatter(options = {}, prettierRules2 = {}) {
     };
     return config;
   }
-  const configs = [
+  const configs2 = [
     {
       name: "coderwyd/formatter/setup",
       plugins: {
@@ -1604,34 +1604,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 +1766,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 +1830,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 +1838,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 +1873,7 @@ async function defineConfig(options = {}, ...userConfigs) {
   if (enableVue)
     componentExts.push("vue");
   if (enableTypeScript) {
-    configs.push(
+    configs2.push(
       typescript({
         ...resolveSubOptions(options, "typescript"),
         componentExts,
@@ -1855,8 +1881,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 +1892,7 @@ async function defineConfig(options = {}, ...userConfigs) {
     );
   }
   if (enableVue) {
-    configs.push(
+    configs2.push(
       vue({
         ...resolveSubOptions(options, "vue"),
         overrides: getOverrides(options, "typescript"),
@@ -1873,7 +1901,7 @@ async function defineConfig(options = {}, ...userConfigs) {
     );
   }
   if (enableReact) {
-    configs.push(
+    configs2.push(
       react({
         overrides: getOverrides(options, "react"),
         typescript: !!enableTypeScript
@@ -1881,7 +1909,7 @@ async function defineConfig(options = {}, ...userConfigs) {
     );
   }
   if (enableSvelte) {
-    configs.push(
+    configs2.push(
       svelte({
         overrides: getOverrides(options, "svelte"),
         typescript: !!enableTypeScript
@@ -1889,7 +1917,7 @@ async function defineConfig(options = {}, ...userConfigs) {
     );
   }
   if (enableUnoCSS) {
-    configs.push(
+    configs2.push(
       unocss({
         ...resolveSubOptions(options, "unocss"),
         overrides: getOverrides(options, "unocss")
@@ -1897,7 +1925,7 @@ async function defineConfig(options = {}, ...userConfigs) {
     );
   }
   if (enableTailwindCSS) {
-    configs.push(
+    configs2.push(
       tailwindcss({
         ...resolveSubOptions(options, "tailwindcss"),
         overrides: getOverrides(options, "tailwindcss")
@@ -1905,7 +1933,7 @@ async function defineConfig(options = {}, ...userConfigs) {
     );
   }
   if (options.jsonc ?? true) {
-    configs.push(
+    configs2.push(
       jsonc({
         overrides: getOverrides(options, "jsonc")
       }),
@@ -1926,12 +1954,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 +1967,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;