@2030/eslint-config 1.0.0 → 2.0.1

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2019-PRESENT Dai Jun
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -14,7 +14,7 @@
   - 单引号，无分
   - 使用ESLint Stylistic
 - 默认遵守.gitignore
-- 支持 ESLint v9 或 v8.50.0+
+- 要求ESLint v9.5.0+
 
 ## 用法
 

package/dist/cli.cjs

@@ -29,17 +29,10 @@ module.exports = __toCommonJS(cli_exports);
 
 // src/cli/index.ts
 var import_node_process5 = __toESM(require("process"), 1);
+var p5 = __toESM(require("@clack/prompts"), 1);
 var import_picocolors6 = __toESM(require("picocolors"), 1);
-var import_helpers = require("yargs/helpers");
 var import_yargs = __toESM(require("yargs"), 1);
-var p5 = __toESM(require("@clack/prompts"), 1);
-
-// src/cli/run.ts
-var import_node_fs3 = __toESM(require("fs"), 1);
-var import_node_path4 = __toESM(require("path"), 1);
-var import_node_process4 = __toESM(require("process"), 1);
-var import_picocolors5 = __toESM(require("picocolors"), 1);
-var p4 = __toESM(require("@clack/prompts"), 1);
+var import_helpers = require("yargs/helpers");
 
 // src/cli/constants.ts
 var import_picocolors = __toESM(require("picocolors"), 1);
@@ -48,7 +41,7 @@ var import_picocolors = __toESM(require("picocolors"), 1);
 var package_default = {
   name: "@2030/eslint-config",
   type: "module",
-  version: "1.0.0",
+  version: "2.0.1",
   description: "Shareable ESLint config for conventional coding style",
   author: "Dai Jun <zijun2030@163.com>",
   license: "MIT",
@@ -84,20 +77,20 @@ var package_default = {
     prepare: "simple-git-hooks"
   },
   peerDependencies: {
-    "@eslint-react/eslint-plugin": "^1.12.1",
+    "@eslint-react/eslint-plugin": "^1.5.8",
     "@prettier/plugin-xml": "^3.4.1",
-    "@unocss/eslint-plugin": "^0.62.3",
+    "@unocss/eslint-plugin": ">=0.50.0",
     "astro-eslint-parser": "^1.0.2",
-    eslint: "^9.9.1",
-    "eslint-plugin-astro": "^1.2.3",
-    "eslint-plugin-format": "^0.1.2",
-    "eslint-plugin-react-hooks": "^4.6.2",
-    "eslint-plugin-react-refresh": "^0.4.11",
-    "eslint-plugin-solid": "^0.14.2",
-    "eslint-plugin-svelte": "^2.43.0",
-    "prettier-plugin-astro": "^0.14.1",
+    eslint: "^9.10.0",
+    "eslint-plugin-astro": "^1.2.0",
+    "eslint-plugin-format": ">=0.1.0",
+    "eslint-plugin-react-hooks": "^4.6.0",
+    "eslint-plugin-react-refresh": "^0.4.4",
+    "eslint-plugin-solid": "^0.14.3",
+    "eslint-plugin-svelte": ">=2.35.1",
+    "prettier-plugin-astro": "^0.13.0",
     "prettier-plugin-slidev": "^1.0.5",
-    "svelte-eslint-parser": "^0.41.0"
+    "svelte-eslint-parser": ">=0.37.0"
   },
   peerDependenciesMeta: {
     "@eslint-react/eslint-plugin": {
@@ -144,34 +137,34 @@ var package_default = {
     "@antfu/install-pkg": "^0.4.1",
     "@clack/prompts": "^0.7.0",
     "@eslint-community/eslint-plugin-eslint-comments": "^4.4.0",
-    "@stylistic/eslint-plugin": "^2.6.4",
-    "@typescript-eslint/eslint-plugin": "^8.3.0",
-    "@typescript-eslint/parser": "^8.3.0",
-    "@vitest/eslint-plugin": "^1.0.5",
-    "eslint-config-flat-gitignore": "^0.1.8",
-    "eslint-flat-config-utils": "^0.3.1",
+    "@eslint/markdown": "^6.1.0",
+    "@stylistic/eslint-plugin": "^2.8.0",
+    "@typescript-eslint/eslint-plugin": "^8.7.0",
+    "@typescript-eslint/parser": "^8.7.0",
+    "@vitest/eslint-plugin": "^1.1.4",
+    "eslint-config-flat-gitignore": "^0.3.0",
+    "eslint-flat-config-utils": "^0.4.0",
     "eslint-merge-processors": "^0.1.0",
-    "eslint-plugin-antfu": "^2.3.6",
-    "eslint-plugin-command": "^0.2.3",
-    "eslint-plugin-import-x": "^4.0.0",
-    "eslint-plugin-jsdoc": "^50.2.2",
+    "eslint-plugin-antfu": "^2.7.0",
+    "eslint-plugin-command": "^0.2.6",
+    "eslint-plugin-import-x": "^4.3.0",
+    "eslint-plugin-jsdoc": "^50.3.0",
     "eslint-plugin-jsonc": "^2.16.0",
-    "eslint-plugin-markdown": "^5.1.0",
-    "eslint-plugin-n": "^17.10.2",
+    "eslint-plugin-n": "^17.10.3",
     "eslint-plugin-no-only-tests": "^3.3.0",
-    "eslint-plugin-perfectionist": "^3.2.0",
+    "eslint-plugin-perfectionist": "^3.7.0",
     "eslint-plugin-regexp": "^2.6.0",
     "eslint-plugin-toml": "^0.11.1",
     "eslint-plugin-unicorn": "^55.0.0",
-    "eslint-plugin-unused-imports": "^4.1.3",
-    "eslint-plugin-vue": "^9.27.0",
+    "eslint-plugin-unused-imports": "^4.1.4",
+    "eslint-plugin-vue": "^9.28.0",
     "eslint-plugin-yml": "^1.14.0",
     "eslint-processor-vue-blocks": "^0.1.2",
     globals: "^15.9.0",
     "jsonc-eslint-parser": "^2.4.0",
     "local-pkg": "^0.5.0",
     "parse-gitignore": "^2.0.0",
-    picocolors: "^1.0.1",
+    picocolors: "^1.1.0",
     "toml-eslint-parser": "^0.10.0",
     "vue-eslint-parser": "^9.4.3",
     "yaml-eslint-parser": "^1.2.3",
@@ -179,50 +172,49 @@ var package_default = {
   },
   devDependencies: {
     "@2030/eslint-config": "workspace:*",
-    "@antfu/ni": "^0.22.4",
-    "@eslint-react/eslint-plugin": "^1.12.1",
+    "@antfu/ni": "^0.23.0",
+    "@eslint-react/eslint-plugin": "^1.14.2",
     "@eslint/config-inspector": "^0.5.4",
     "@prettier/plugin-xml": "^3.4.1",
-    "@stylistic/eslint-plugin-migrate": "^2.6.4",
-    "@types/eslint": "^9.6.1",
+    "@stylistic/eslint-plugin-migrate": "^2.8.0",
     "@types/fs-extra": "^11.0.4",
-    "@types/node": "^22.5.0",
+    "@types/node": "^22.7.3",
     "@types/prompts": "^2.4.9",
     "@types/yargs": "^17.0.33",
-    "@unocss/eslint-plugin": "^0.62.3",
-    "astro-eslint-parser": "^1.0.2",
+    "@unocss/eslint-plugin": "^0.62.4",
+    "astro-eslint-parser": "^1.0.3",
     bumpp: "^9.5.2",
-    eslint: "^9.9.1",
-    "eslint-plugin-astro": "^1.2.3",
+    eslint: "^9.11.1",
+    "eslint-plugin-astro": "^1.2.4",
     "eslint-plugin-format": "^0.1.2",
     "eslint-plugin-react-hooks": "^4.6.2",
-    "eslint-plugin-react-refresh": "^0.4.11",
-    "eslint-plugin-solid": "^0.14.2",
-    "eslint-plugin-svelte": "^2.43.0",
-    "eslint-typegen": "^0.3.1",
+    "eslint-plugin-react-refresh": "^0.4.12",
+    "eslint-plugin-solid": "^0.14.3",
+    "eslint-plugin-svelte": "^2.44.0",
+    "eslint-typegen": "^0.3.2",
     esno: "^4.7.0",
-    execa: "^9.3.1",
+    execa: "^9.4.0",
     "fast-glob": "^3.3.2",
     "fs-extra": "^11.2.0",
-    jiti: "^1.21.6",
-    "lint-staged": "^15.2.9",
+    jiti: "^2.0.0",
+    "lint-staged": "^15.2.10",
     "prettier-plugin-astro": "^0.14.1",
     "prettier-plugin-slidev": "^1.0.5",
     rimraf: "^6.0.1",
     "simple-git-hooks": "^2.11.1",
     svelte: "^4.2.19",
-    "svelte-eslint-parser": "^0.41.0",
-    tsup: "^8.2.4",
-    tsx: "^4.18.0",
-    typescript: "^5.5.4",
-    vitest: "^2.0.5",
-    vue: "^3.4.38"
+    "svelte-eslint-parser": "^0.41.1",
+    tsup: "^8.3.0",
+    tsx: "^4.19.1",
+    typescript: "^5.6.2",
+    vitest: "^2.1.1",
+    vue: "^3.5.9"
   },
   resolutions: {
     "@eslint-community/eslint-utils": "^4.4.0",
-    "@typescript-eslint/utils": "^8.3.0",
-    eslint: "^9.9.1",
-    tsx: "^4.18.0"
+    "@typescript-eslint/utils": "^8.7.0",
+    eslint: "^9.11.1",
+    tsx: "^4.19.1"
   },
   "simple-git-hooks": {
     "pre-commit": "npx lint-staged"
@@ -344,6 +336,22 @@ var dependenciesMap = {
   vue: []
 };
 
+// src/cli/run.ts
+var import_node_fs3 = __toESM(require("fs"), 1);
+var import_node_path4 = __toESM(require("path"), 1);
+var import_node_process4 = __toESM(require("process"), 1);
+var p4 = __toESM(require("@clack/prompts"), 1);
+var import_picocolors5 = __toESM(require("picocolors"), 1);
+
+// src/cli/stages/update-eslint-files.ts
+var import_node_fs = __toESM(require("fs"), 1);
+var import_promises = __toESM(require("fs/promises"), 1);
+var import_node_path = __toESM(require("path"), 1);
+var import_node_process = __toESM(require("process"), 1);
+var p = __toESM(require("@clack/prompts"), 1);
+var import_parse_gitignore = __toESM(require("parse-gitignore"), 1);
+var import_picocolors2 = __toESM(require("picocolors"), 1);
+
 // src/cli/utils.ts
 var import_node_child_process = require("child_process");
 function isGitClean() {
@@ -356,7 +364,7 @@ function isGitClean() {
 }
 function getEslintConfigContent(mainConfig, additionalConfigs) {
   return `
-import jun from '@2030/eslint-config'
+import jun from '@jun2030/eslint-config'
 
 export default jun({
 ${mainConfig}
@@ -366,20 +374,66 @@ ${config}
 `.trimStart();
 }
 
-// src/cli/stages/update-package-json.ts
-var import_node_path = __toESM(require("path"), 1);
-var import_promises = __toESM(require("fs/promises"), 1);
-var import_node_process = __toESM(require("process"), 1);
-var import_picocolors2 = __toESM(require("picocolors"), 1);
-var p = __toESM(require("@clack/prompts"), 1);
-async function updatePackageJson(result) {
+// src/cli/stages/update-eslint-files.ts
+async function updateEslintFiles(result) {
   const cwd = import_node_process.default.cwd();
+  const pathESLintIgnore = import_node_path.default.join(cwd, ".eslintignore");
   const pathPackageJSON = import_node_path.default.join(cwd, "package.json");
-  p.log.step(import_picocolors2.default.cyan(`Bumping @2030/eslint-config to v${package_default.version}`));
   const pkgContent = await import_promises.default.readFile(pathPackageJSON, "utf-8");
   const pkg = JSON.parse(pkgContent);
+  const configFileName = pkg.type === "module" ? "eslint.config.js" : "eslint.config.mjs";
+  const pathFlatConfig = import_node_path.default.join(cwd, configFileName);
+  const eslintIgnores = [];
+  if (import_node_fs.default.existsSync(pathESLintIgnore)) {
+    p.log.step(import_picocolors2.default.cyan(`Migrating existing .eslintignore`));
+    const content = await import_promises.default.readFile(pathESLintIgnore, "utf-8");
+    const parsed = (0, import_parse_gitignore.default)(content);
+    const globs = parsed.globs();
+    for (const glob of globs) {
+      if (glob.type === "ignore")
+        eslintIgnores.push(...glob.patterns);
+      else if (glob.type === "unignore")
+        eslintIgnores.push(...glob.patterns.map((pattern) => `!${pattern}`));
+    }
+  }
+  const configLines = [];
+  if (eslintIgnores.length)
+    configLines.push(`ignores: ${JSON.stringify(eslintIgnores)},`);
+  if (result.extra.includes("formatter"))
+    configLines.push(`formatters: true,`);
+  if (result.extra.includes("unocss"))
+    configLines.push(`unocss: true,`);
+  for (const framework of result.frameworks)
+    configLines.push(`${framework}: true,`);
+  const mainConfig = configLines.map((i) => `  ${i}`).join("\n");
+  const additionalConfig = [];
+  const eslintConfigContent = getEslintConfigContent(mainConfig, additionalConfig);
+  await import_promises.default.writeFile(pathFlatConfig, eslintConfigContent);
+  p.log.success(import_picocolors2.default.green(`Created ${configFileName}`));
+  const files = import_node_fs.default.readdirSync(cwd);
+  const legacyConfig = [];
+  files.forEach((file) => {
+    if (/eslint|prettier/.test(file) && !/eslint\.config\./.test(file))
+      legacyConfig.push(file);
+  });
+  if (legacyConfig.length)
+    p.note(`${import_picocolors2.default.dim(legacyConfig.join(", "))}`, "You can now remove those files manually");
+}
+
+// src/cli/stages/update-package-json.ts
+var import_promises2 = __toESM(require("fs/promises"), 1);
+var import_node_path2 = __toESM(require("path"), 1);
+var import_node_process2 = __toESM(require("process"), 1);
+var p2 = __toESM(require("@clack/prompts"), 1);
+var import_picocolors3 = __toESM(require("picocolors"), 1);
+async function updatePackageJson(result) {
+  const cwd = import_node_process2.default.cwd();
+  const pathPackageJSON = import_node_path2.default.join(cwd, "package.json");
+  p2.log.step(import_picocolors3.default.cyan(`Bumping @jun2030/eslint-config to v${package_default.version}`));
+  const pkgContent = await import_promises2.default.readFile(pathPackageJSON, "utf-8");
+  const pkg = JSON.parse(pkgContent);
   pkg.devDependencies ??= {};
-  pkg.devDependencies["@2030/eslint-config"] = `^${package_default.version}`;
+  pkg.devDependencies["@jun2030/eslint-config"] = `^${package_default.version}`;
   pkg.devDependencies.eslint ??= package_default.devDependencies.eslint.replace("npm:eslint-ts-patch@", "").replace(/-\d+$/, "");
   const addedPackages = [];
   if (result.extra.length) {
@@ -417,71 +471,18 @@ async function updatePackageJson(result) {
     }
   }
   if (addedPackages.length)
-    p.note(`${import_picocolors2.default.dim(addedPackages.join(", "))}`, "Added packages");
-  await import_promises.default.writeFile(pathPackageJSON, JSON.stringify(pkg, null, 2));
-  p.log.success(import_picocolors2.default.green(`Changes wrote to package.json`));
-}
-
-// src/cli/stages/update-eslint-files.ts
-var import_node_fs = __toESM(require("fs"), 1);
-var import_promises2 = __toESM(require("fs/promises"), 1);
-var import_node_process2 = __toESM(require("process"), 1);
-var import_node_path2 = __toESM(require("path"), 1);
-var import_picocolors3 = __toESM(require("picocolors"), 1);
-var p2 = __toESM(require("@clack/prompts"), 1);
-var import_parse_gitignore = __toESM(require("parse-gitignore"), 1);
-async function updateEslintFiles(result) {
-  const cwd = import_node_process2.default.cwd();
-  const pathESLintIgnore = import_node_path2.default.join(cwd, ".eslintignore");
-  const pathPackageJSON = import_node_path2.default.join(cwd, "package.json");
-  const pkgContent = await import_promises2.default.readFile(pathPackageJSON, "utf-8");
-  const pkg = JSON.parse(pkgContent);
-  const configFileName = pkg.type === "module" ? "eslint.config.js" : "eslint.config.mjs";
-  const pathFlatConfig = import_node_path2.default.join(cwd, configFileName);
-  const eslintIgnores = [];
-  if (import_node_fs.default.existsSync(pathESLintIgnore)) {
-    p2.log.step(import_picocolors3.default.cyan(`Migrating existing .eslintignore`));
-    const content = await import_promises2.default.readFile(pathESLintIgnore, "utf-8");
-    const parsed = (0, import_parse_gitignore.default)(content);
-    const globs = parsed.globs();
-    for (const glob of globs) {
-      if (glob.type === "ignore")
-        eslintIgnores.push(...glob.patterns);
-      else if (glob.type === "unignore")
-        eslintIgnores.push(...glob.patterns.map((pattern) => `!${pattern}`));
-    }
-  }
-  const configLines = [];
-  if (eslintIgnores.length)
-    configLines.push(`ignores: ${JSON.stringify(eslintIgnores)},`);
-  if (result.extra.includes("formatter"))
-    configLines.push(`formatters: true,`);
-  if (result.extra.includes("unocss"))
-    configLines.push(`unocss: true,`);
-  for (const framework of result.frameworks)
-    configLines.push(`${framework}: true,`);
-  const mainConfig = configLines.map((i) => `  ${i}`).join("\n");
-  const additionalConfig = [];
-  const eslintConfigContent = getEslintConfigContent(mainConfig, additionalConfig);
-  await import_promises2.default.writeFile(pathFlatConfig, eslintConfigContent);
-  p2.log.success(import_picocolors3.default.green(`Created ${configFileName}`));
-  const files = import_node_fs.default.readdirSync(cwd);
-  const legacyConfig = [];
-  files.forEach((file) => {
-    if (/eslint|prettier/.test(file) && !/eslint\.config\./.test(file))
-      legacyConfig.push(file);
-  });
-  if (legacyConfig.length)
-    p2.note(`${import_picocolors3.default.dim(legacyConfig.join(", "))}`, "You can now remove those files manually");
+    p2.note(`${import_picocolors3.default.dim(addedPackages.join(", "))}`, "Added packages");
+  await import_promises2.default.writeFile(pathPackageJSON, JSON.stringify(pkg, null, 2));
+  p2.log.success(import_picocolors3.default.green(`Changes wrote to package.json`));
 }
 
 // src/cli/stages/update-vscode-settings.ts
-var import_node_path3 = __toESM(require("path"), 1);
-var import_promises3 = __toESM(require("fs/promises"), 1);
 var import_node_fs2 = __toESM(require("fs"), 1);
+var import_promises3 = __toESM(require("fs/promises"), 1);
+var import_node_path3 = __toESM(require("path"), 1);
 var import_node_process3 = __toESM(require("process"), 1);
-var import_picocolors4 = __toESM(require("picocolors"), 1);
 var p3 = __toESM(require("@clack/prompts"), 1);
+var import_picocolors4 = __toESM(require("picocolors"), 1);
 async function updateVscodeSettings(result) {
   const cwd = import_node_process3.default.cwd();
   if (!result.updateVscodeSettings)
@@ -580,9 +581,9 @@ async function run(options = {}) {
 // src/cli/index.ts
 function header() {
   console.log("\n");
-  p5.intro(`${import_picocolors6.default.green(`@2030/eslint-config `)}${import_picocolors6.default.dim(`v${package_default.version}`)}`);
+  p5.intro(`${import_picocolors6.default.green(`@jun2030/eslint-config `)}${import_picocolors6.default.dim(`v${package_default.version}`)}`);
 }
-var instance = (0, import_yargs.default)((0, import_helpers.hideBin)(import_node_process5.default.argv)).scriptName("@2030/eslint-config").usage("").command(
+var instance = (0, import_yargs.default)((0, import_helpers.hideBin)(import_node_process5.default.argv)).scriptName("@jun2030/eslint-config").usage("").command(
   "*",
   "Run the initialization or migration",
   (args) => args.option("yes", {