@dhzh/eslint-config 1.12.1 → 1.13.0

package/dist/cli/index.cjs

@@ -28,7 +28,7 @@ var import_ansis5 = __toESM(require("ansis"), 1);
 var import_cac = require("cac");
 
 // package.json
-var version = "1.12.1";
+var version = "1.13.0";
 var package_default = {
   name: "@dhzh/eslint-config",
   type: "module",
@@ -117,14 +117,14 @@ var package_default = {
     "eslint-plugin-toml": "^0.12.0",
     "eslint-plugin-unicorn": "^60.0.0",
     "eslint-plugin-unused-imports": "^4.1.4",
-    "eslint-plugin-vue": "^10.1.0",
+    "eslint-plugin-vue": "^10.4.0",
     "eslint-plugin-yml": "^1.18.0",
     "eslint-processor-vue-blocks": "^2.0.0",
     globals: "^16.0.0",
     "jsonc-eslint-parser": "^2.4.0",
     "local-pkg": "^1.1.1",
     "toml-eslint-parser": "^0.10.0",
-    "typescript-eslint": "^8.31.0",
+    "typescript-eslint": "^8.42.0",
     "vue-eslint-parser": "^10.1.3",
     "yaml-eslint-parser": "^1.3.0"
   },
@@ -135,7 +135,7 @@ var package_default = {
     "@types/node": "^22.18.0",
     bumpp: "^10.1.0",
     "bundle-require": "^5.1.0",
-    eslint: "^9.25.1",
+    eslint: "^9.34.0",
     "eslint-typegen": "^2.1.0",
     "lint-staged": "^16.0.0",
     "simple-git-hooks": "^2.13.0",
@@ -273,20 +273,23 @@ var vscodeSettingsString = `
     "editor.defaultFormatter": "dbaeumer.vscode-eslint"
   }
 `;
-var eslintConfigContent = `import { defineConfig } from '@dhzh/eslint-config';
+var eslintConfigContent = (options) => `import { defineConfig } from '@dhzh/eslint-config';
 
-export default defineConfig();
+export default defineConfig({
+  configs: {
+    json: {
+      packageJsonRequireTypes: ${!options.hasNest},
+    },
+  },
+});
 `;
 
 // src/cli/stages/update-eslint-config.ts
-async function updateEslintConfig() {
+async function updateEslintConfig(options) {
   const cwd = import_node_process.default.cwd();
-  const pathPackageJSON = import_node_path.default.join(cwd, "package.json");
-  const pkgContent = await import_promises.default.readFile(pathPackageJSON, "utf8");
-  const pkg = JSON.parse(pkgContent);
-  const configFileName = pkg.type === "module" ? "eslint.config.js" : "eslint.config.mjs";
+  const configFileName = "eslint.config.js";
   const pathFlatConfig = import_node_path.default.join(cwd, configFileName);
-  await import_promises.default.writeFile(pathFlatConfig, eslintConfigContent);
+  await import_promises.default.writeFile(pathFlatConfig, eslintConfigContent(options));
   p.log.success(import_ansis.default.green`Created ${configFileName}`);
 }
 
@@ -339,9 +342,9 @@ async function updateVscodeSettings() {
 }
 
 // src/cli/run.ts
-async function run() {
+async function run(options) {
   await updatePackageJson();
-  await updateEslintConfig();
+  await updateEslintConfig(options);
   await updateVscodeSettings();
   p4.log.success(import_ansis4.default.green`Setup completed`);
   p4.outro(`Now you can update the dependencies by run ${import_ansis4.default.blue("pnpm i")} and run ${import_ansis4.default.blue("eslint --fix")}
@@ -353,8 +356,20 @@ var cli = (0, import_cac.cac)("@dhzh/eslint-config");
 cli.command("", "Run the initialization or migration").action(async () => {
   console.log("\n");
   p5.intro(`${import_ansis5.default.green`@dhzh/eslint-config `}${import_ansis5.default.dim`v${version}`}`);
+  const options = {
+    hasNest: false
+  };
+  const hasNest = await p5.confirm({
+    message: "Is NestJS a part of the current project?"
+  });
+  if (p5.isCancel(hasNest)) {
+    p5.cancel("Operation cancelled");
+    throw new Error("Operation cancelled");
+  } else {
+    options.hasNest = hasNest;
+  }
   try {
-    await run();
+    await run(options);
   } catch (error) {
     p5.log.error(import_ansis5.default.inverse.red(" Failed to migrate "));
     p5.log.error(import_ansis5.default.red`✘ ${String(error)}`);

package/dist/cli/index.js

@@ -4,7 +4,7 @@ import c4 from "ansis";
 import { cac } from "cac";
 
 // package.json
-var version = "1.12.1";
+var version = "1.13.0";
 var package_default = {
   name: "@dhzh/eslint-config",
   type: "module",
@@ -93,14 +93,14 @@ var package_default = {
     "eslint-plugin-toml": "^0.12.0",
     "eslint-plugin-unicorn": "^60.0.0",
     "eslint-plugin-unused-imports": "^4.1.4",
-    "eslint-plugin-vue": "^10.1.0",
+    "eslint-plugin-vue": "^10.4.0",
     "eslint-plugin-yml": "^1.18.0",
     "eslint-processor-vue-blocks": "^2.0.0",
     globals: "^16.0.0",
     "jsonc-eslint-parser": "^2.4.0",
     "local-pkg": "^1.1.1",
     "toml-eslint-parser": "^0.10.0",
-    "typescript-eslint": "^8.31.0",
+    "typescript-eslint": "^8.42.0",
     "vue-eslint-parser": "^10.1.3",
     "yaml-eslint-parser": "^1.3.0"
   },
@@ -111,7 +111,7 @@ var package_default = {
     "@types/node": "^22.18.0",
     bumpp: "^10.1.0",
     "bundle-require": "^5.1.0",
-    eslint: "^9.25.1",
+    eslint: "^9.34.0",
     "eslint-typegen": "^2.1.0",
     "lint-staged": "^16.0.0",
     "simple-git-hooks": "^2.13.0",
@@ -249,20 +249,23 @@ var vscodeSettingsString = `
     "editor.defaultFormatter": "dbaeumer.vscode-eslint"
   }
 `;
-var eslintConfigContent = `import { defineConfig } from '@dhzh/eslint-config';
+var eslintConfigContent = (options) => `import { defineConfig } from '@dhzh/eslint-config';
 
-export default defineConfig();
+export default defineConfig({
+  configs: {
+    json: {
+      packageJsonRequireTypes: ${!options.hasNest},
+    },
+  },
+});
 `;
 
 // src/cli/stages/update-eslint-config.ts
-async function updateEslintConfig() {
+async function updateEslintConfig(options) {
   const cwd = process.cwd();
-  const pathPackageJSON = path.join(cwd, "package.json");
-  const pkgContent = await fsp.readFile(pathPackageJSON, "utf8");
-  const pkg = JSON.parse(pkgContent);
-  const configFileName = pkg.type === "module" ? "eslint.config.js" : "eslint.config.mjs";
+  const configFileName = "eslint.config.js";
   const pathFlatConfig = path.join(cwd, configFileName);
-  await fsp.writeFile(pathFlatConfig, eslintConfigContent);
+  await fsp.writeFile(pathFlatConfig, eslintConfigContent(options));
   p.log.success(c.green`Created ${configFileName}`);
 }
 
@@ -315,9 +318,9 @@ async function updateVscodeSettings() {
 }
 
 // src/cli/run.ts
-async function run() {
+async function run(options) {
   await updatePackageJson();
-  await updateEslintConfig();
+  await updateEslintConfig(options);
   await updateVscodeSettings();
   p4.log.success(c3.green`Setup completed`);
   p4.outro(`Now you can update the dependencies by run ${c3.blue("pnpm i")} and run ${c3.blue("eslint --fix")}
@@ -329,8 +332,20 @@ var cli = cac("@dhzh/eslint-config");
 cli.command("", "Run the initialization or migration").action(async () => {
   console.log("\n");
   p5.intro(`${c4.green`@dhzh/eslint-config `}${c4.dim`v${version}`}`);
+  const options = {
+    hasNest: false
+  };
+  const hasNest = await p5.confirm({
+    message: "Is NestJS a part of the current project?"
+  });
+  if (p5.isCancel(hasNest)) {
+    p5.cancel("Operation cancelled");
+    throw new Error("Operation cancelled");
+  } else {
+    options.hasNest = hasNest;
+  }
   try {
-    await run();
+    await run(options);
   } catch (error) {
     p5.log.error(c4.inverse.red(" Failed to migrate "));
     p5.log.error(c4.red`✘ ${String(error)}`);

package/dist/index.cjs

@@ -30,7 +30,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/index.ts
 var index_exports = {};
 __export(index_exports, {
-  defineConfig: () => defineConfig
+  defineConfig: () => defineConfig3
 });
 module.exports = __toCommonJS(index_exports);
 
@@ -268,6 +268,7 @@ function react(options = {}) {
 }
 
 // src/configs/vue.ts
+var import_config = require("eslint/config");
 var import_js = __toESM(require("@eslint/js"), 1);
 var import_typescript_eslint = __toESM(require("typescript-eslint"), 1);
 var import_eslint_plugin_vue = __toESM(require("eslint-plugin-vue"), 1);
@@ -276,7 +277,7 @@ var import_eslint_merge_processors = require("eslint-merge-processors");
 var import_eslint_processor_vue_blocks = __toESM(require("eslint-processor-vue-blocks"), 1);
 function vue(options = {}) {
   const { overrides = {} } = options;
-  return import_typescript_eslint.default.config(
+  return (0, import_config.defineConfig)(
     {
       ...import_js.default.configs.recommended,
       name: `${RULE_PREFIX}/vue/shared/javascript`,
@@ -584,11 +585,12 @@ function stylistic(options = {}) {
 
 // src/configs/typescript.ts
 var import_node_process = __toESM(require("process"), 1);
+var import_config2 = require("eslint/config");
 var import_typescript_eslint2 = __toESM(require("typescript-eslint"), 1);
 function typescript(options = {}) {
   const { overrides = {}, typeSafe = false, strict = false } = options;
   return [
-    ...import_typescript_eslint2.default.config(
+    ...(0, import_config2.defineConfig)(
       import_typescript_eslint2.default.configs.base,
       import_typescript_eslint2.default.configs.recommendedTypeChecked,
       import_typescript_eslint2.default.configs.strictTypeChecked,
@@ -1029,9 +1031,12 @@ var import_eslint_plugin_jsonc = __toESM(require("eslint-plugin-jsonc"), 1);
 var import_eslint_plugin_package_json = __toESM(require("eslint-plugin-package-json"), 1);
 var import_jsonc_eslint_parser = __toESM(require("jsonc-eslint-parser"), 1);
 var import_eslint_plugin_hyoban2 = __toESM(require("eslint-plugin-hyoban"), 1);
-var import_local_pkg2 = require("local-pkg");
 function json(options = {}) {
-  const { overrides = { core: {}, packageJson: {} }, indent = 2 } = options;
+  const {
+    overrides = { core: {}, packageJson: {} },
+    indent = 2,
+    packageJsonRequireTypes = true
+  } = options;
   return [
     ...import_eslint_plugin_jsonc.default.configs["flat/recommended-with-json"].map((item) => ({
       ...item,
@@ -1181,7 +1186,7 @@ function json(options = {}) {
             ]
           }
         ],
-        "package-json/require-types": (0, import_local_pkg2.isPackageExists)("@nestjs/core") ? "off" : "error",
+        "package-json/require-types": packageJsonRequireTypes ? "error" : "off",
         ...overrides.packageJson
       }
     }
@@ -1508,10 +1513,10 @@ function format(options = {}) {
 
 // src/configs/tailwindcss.ts
 var import_eslint_plugin_tailwindcss = __toESM(require("eslint-plugin-tailwindcss"), 1);
-var import_local_pkg3 = require("local-pkg");
+var import_local_pkg2 = require("local-pkg");
 function tailwindcss(options = {}) {
   const { overrides = {} } = options;
-  return (0, import_local_pkg3.isPackageExists)("tailwindcss") ? [
+  return (0, import_local_pkg2.isPackageExists)("tailwindcss") ? [
     ...import_eslint_plugin_tailwindcss.default.configs["flat/recommended"].map((item) => ({
       ...item,
       name: `${RULE_PREFIX}/tailwindcss/shared/${item.name?.replace("tailwindcss:", "")}`,
@@ -1530,10 +1535,10 @@ function tailwindcss(options = {}) {
 
 // src/configs/unocss.ts
 var import_flat = __toESM(require("@unocss/eslint-config/flat"), 1);
-var import_local_pkg4 = require("local-pkg");
+var import_local_pkg3 = require("local-pkg");
 function unocss(options = {}) {
   const { overrides = {} } = options;
-  const isUnocssEnabled = (0, import_local_pkg4.isPackageExists)("unocss");
+  const isUnocssEnabled = (0, import_local_pkg3.isPackageExists)("unocss");
   if (!isUnocssEnabled) {
     return [];
   }
@@ -1798,7 +1803,7 @@ function disables(options = {}) {
 }
 
 // src/index.ts
-function defineConfig(options = {}) {
+function defineConfig3(options = {}) {
   const { configs: configs2 = {}, ignorePatterns = [] } = options;
   return [
     ...react(configs2.react),

package/dist/index.d.cts

@@ -147,6 +147,7 @@ interface IJsonConfigsOptions {
         core?: Record<string, Linter.RuleEntry>;
         packageJson?: Record<string, Linter.RuleEntry>;
     };
+    packageJsonRequireTypes?: boolean;
 }
 interface IUnicornConfigsOptions extends IConfigsOptions {
 }

package/dist/index.d.ts

@@ -147,6 +147,7 @@ interface IJsonConfigsOptions {
         core?: Record<string, Linter.RuleEntry>;
         packageJson?: Record<string, Linter.RuleEntry>;
     };
+    packageJsonRequireTypes?: boolean;
 }
 interface IUnicornConfigsOptions extends IConfigsOptions {
 }

package/dist/index.js

@@ -232,6 +232,7 @@ function react(options = {}) {
 }
 
 // src/configs/vue.ts
+import { defineConfig } from "eslint/config";
 import js from "@eslint/js";
 import tseslint from "typescript-eslint";
 import pluginVue from "eslint-plugin-vue";
@@ -240,7 +241,7 @@ import { mergeProcessors } from "eslint-merge-processors";
 import processorVueBlocks from "eslint-processor-vue-blocks";
 function vue(options = {}) {
   const { overrides = {} } = options;
-  return tseslint.config(
+  return defineConfig(
     {
       ...js.configs.recommended,
       name: `${RULE_PREFIX}/vue/shared/javascript`,
@@ -548,11 +549,12 @@ function stylistic(options = {}) {
 
 // src/configs/typescript.ts
 import process from "node:process";
+import { defineConfig as defineConfig2 } from "eslint/config";
 import tseslint2 from "typescript-eslint";
 function typescript(options = {}) {
   const { overrides = {}, typeSafe = false, strict = false } = options;
   return [
-    ...tseslint2.config(
+    ...defineConfig2(
       tseslint2.configs.base,
       tseslint2.configs.recommendedTypeChecked,
       tseslint2.configs.strictTypeChecked,
@@ -993,9 +995,12 @@ import pluginJsonc from "eslint-plugin-jsonc";
 import pluginPackageJson from "eslint-plugin-package-json";
 import parserJsonc from "jsonc-eslint-parser";
 import pluginHyoban2 from "eslint-plugin-hyoban";
-import { isPackageExists as isPackageExists2 } from "local-pkg";
 function json(options = {}) {
-  const { overrides = { core: {}, packageJson: {} }, indent = 2 } = options;
+  const {
+    overrides = { core: {}, packageJson: {} },
+    indent = 2,
+    packageJsonRequireTypes = true
+  } = options;
   return [
     ...pluginJsonc.configs["flat/recommended-with-json"].map((item) => ({
       ...item,
@@ -1145,7 +1150,7 @@ function json(options = {}) {
             ]
           }
         ],
-        "package-json/require-types": isPackageExists2("@nestjs/core") ? "off" : "error",
+        "package-json/require-types": packageJsonRequireTypes ? "error" : "off",
         ...overrides.packageJson
       }
     }
@@ -1472,10 +1477,10 @@ function format(options = {}) {
 
 // src/configs/tailwindcss.ts
 import pluginTailwindcss from "eslint-plugin-tailwindcss";
-import { isPackageExists as isPackageExists3 } from "local-pkg";
+import { isPackageExists as isPackageExists2 } from "local-pkg";
 function tailwindcss(options = {}) {
   const { overrides = {} } = options;
-  return isPackageExists3("tailwindcss") ? [
+  return isPackageExists2("tailwindcss") ? [
     ...pluginTailwindcss.configs["flat/recommended"].map((item) => ({
       ...item,
       name: `${RULE_PREFIX}/tailwindcss/shared/${item.name?.replace("tailwindcss:", "")}`,
@@ -1494,10 +1499,10 @@ function tailwindcss(options = {}) {
 
 // src/configs/unocss.ts
 import configUnocss from "@unocss/eslint-config/flat";
-import { isPackageExists as isPackageExists4 } from "local-pkg";
+import { isPackageExists as isPackageExists3 } from "local-pkg";
 function unocss(options = {}) {
   const { overrides = {} } = options;
-  const isUnocssEnabled = isPackageExists4("unocss");
+  const isUnocssEnabled = isPackageExists3("unocss");
   if (!isUnocssEnabled) {
     return [];
   }
@@ -1762,7 +1767,7 @@ function disables(options = {}) {
 }
 
 // src/index.ts
-function defineConfig(options = {}) {
+function defineConfig3(options = {}) {
   const { configs: configs2 = {}, ignorePatterns = [] } = options;
   return [
     ...react(configs2.react),
@@ -1786,5 +1791,5 @@ function defineConfig(options = {}) {
   ];
 }
 export {
-  defineConfig
+  defineConfig3 as defineConfig
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dhzh/eslint-config",
   "type": "module",
-  "version": "1.12.1",
+  "version": "1.13.0",
   "description": "Lyle's ESLint config",
   "author": {
     "name": "Lyle Zheng",
@@ -73,14 +73,14 @@
     "eslint-plugin-toml": "^0.12.0",
     "eslint-plugin-unicorn": "^60.0.0",
     "eslint-plugin-unused-imports": "^4.1.4",
-    "eslint-plugin-vue": "^10.1.0",
+    "eslint-plugin-vue": "^10.4.0",
     "eslint-plugin-yml": "^1.18.0",
     "eslint-processor-vue-blocks": "^2.0.0",
     "globals": "^16.0.0",
     "jsonc-eslint-parser": "^2.4.0",
     "local-pkg": "^1.1.1",
     "toml-eslint-parser": "^0.10.0",
-    "typescript-eslint": "^8.31.0",
+    "typescript-eslint": "^8.42.0",
     "vue-eslint-parser": "^10.1.3",
     "yaml-eslint-parser": "^1.3.0"
   },
@@ -91,7 +91,7 @@
     "@types/node": "^22.18.0",
     "bumpp": "^10.1.0",
     "bundle-require": "^5.1.0",
-    "eslint": "^9.25.1",
+    "eslint": "^9.34.0",
     "eslint-typegen": "^2.1.0",
     "lint-staged": "^16.0.0",
     "simple-git-hooks": "^2.13.0",