@lincy/eslint-config 4.2.6 → 4.3.1

package/dist/index.js

@@ -1,12 +1,13 @@
 // src/factory.ts
-import process3 from "process";
-import fs from "fs";
+import process3 from "node:process";
+import fs from "node:fs";
 import { isPackageExists as isPackageExists3 } from "local-pkg";
+import { FlatConfigComposer } from "eslint-flat-config-utils";
 
 // src/plugins.ts
 import { default as default2 } from "eslint-plugin-antfu";
 import { default as default3 } from "eslint-plugin-eslint-comments";
-import * as pluginImport from "eslint-plugin-i";
+import * as pluginImport from "eslint-plugin-import-x";
 import { default as default4 } from "eslint-plugin-n";
 import { default as default5 } from "eslint-plugin-unicorn";
 import { default as default6 } from "eslint-plugin-unused-imports";
@@ -90,6 +91,7 @@ var GLOB_EXCLUDE = [
   "**/.idea",
   "**/.output",
   "**/.vite-inspect",
+  "**/.yarn",
   "**/CHANGELOG*.md",
   "**/*.min.*",
   "**/LICENSE*",
@@ -367,21 +369,40 @@ async function javascript(options = {}) {
 }
 
 // src/utils.ts
-import process from "process";
+import process from "node:process";
 import { isPackageExists } from "local-pkg";
 async function combine(...configs) {
   const resolved = await Promise.all(configs);
   return resolved.flat();
 }
-function renameRules(rules, from, to) {
+function renameRules(rules, map) {
   return Object.fromEntries(
     Object.entries(rules).map(([key, value]) => {
-      if (key.startsWith(from))
-        return [to + key.slice(from.length), value];
+      for (const [from, to] of Object.entries(map)) {
+        if (key.startsWith(`${from}/`))
+          return [to + key.slice(from.length), value];
+      }
       return [key, value];
     })
   );
 }
+function renamePluginInConfigs(configs, map) {
+  return configs.map((i) => {
+    const clone = { ...i };
+    if (clone.rules)
+      clone.rules = renameRules(clone.rules, map);
+    if (clone.plugins) {
+      clone.plugins = Object.fromEntries(
+        Object.entries(clone.plugins).map(([key, value]) => {
+          if (key in map)
+            return [map[key], value];
+          return [key, value];
+        })
+      );
+    }
+    return clone;
+  });
+}
 function toArray(value) {
   return Array.isArray(value) ? value : [value];
 }
@@ -958,7 +979,6 @@ async function react(options = {}) {
         "react/jsx-no-target-blank": "error",
         "react/jsx-no-undef": "error",
         "react/jsx-no-useless-fragment": "error",
-        "react/jsx-pascal-case": "error",
         "react/jsx-props-no-spreading": "off",
         // 强制任何 JSX 属性都不会传播
         "react/jsx-uses-react": "error",
@@ -1015,6 +1035,7 @@ async function react(options = {}) {
         "react/static-property-placement": "error",
         "react/style-prop-object": "error",
         "react/void-dom-elements-no-children": "error",
+        "style/jsx-pascal-case": "error",
         ...typescript2 ? {
           "react/jsx-no-undef": "off",
           "react/prop-type": "off"
@@ -1110,6 +1131,22 @@ async function sortPackageJson() {
               "default"
             ],
             pathPattern: "^exports.*$"
+          },
+          {
+            order: [
+              // client hooks only
+              "pre-commit",
+              "prepare-commit-msg",
+              "commit-msg",
+              "post-commit",
+              "pre-rebase",
+              "post-rewrite",
+              "post-checkout",
+              "post-merge",
+              "pre-push",
+              "pre-auto-gc"
+            ],
+            pathPattern: "^(?:gitHooks|husky|simple-git-hooks)$"
           }
         ]
       }
@@ -1289,7 +1326,7 @@ async function test(options = {}) {
 }
 
 // src/configs/typescript.ts
-import process2 from "process";
+import process2 from "node:process";
 async function typescript(options = {}) {
   const {
     componentExts = [],
@@ -1372,13 +1409,11 @@ async function typescript(options = {}) {
       rules: {
         ...renameRules(
           pluginTs.configs["eslint-recommended"].overrides[0].rules,
-          "@typescript-eslint/",
-          "ts/"
+          { "@typescript-eslint": "ts" }
         ),
         ...renameRules(
           pluginTs.configs.strict.rules,
-          "@typescript-eslint/",
-          "ts/"
+          { "@typescript-eslint": "ts" }
         ),
         "no-dupe-class-members": "off",
         "no-loss-of-precision": "off",
@@ -1833,12 +1868,21 @@ var VuePackages = [
   "vitepress",
   "@slidev/cli"
 ];
+var defaultPluginRenaming = {
+  "@stylistic": "style",
+  "@typescript-eslint": "ts",
+  "import-x": "import",
+  "n": "node",
+  "vitest": "test",
+  "yml": "yaml"
+};
 var ReactPackages = [
   "react",
   "next"
 ];
-async function lincy(options = {}, ...userConfigs) {
+function lincy(options = {}, ...userConfigs) {
   const {
+    autoRenamePlugins = true,
     componentExts = [],
     gitignore: enableGitignore = true,
     isInEditor = !!((process3.env.VSCODE_PID || process3.env.JETBRAINS_IDE || process3.env.VIM) && !process3.env.CI),
@@ -1969,11 +2013,14 @@ async function lincy(options = {}, ...userConfigs) {
   }, {});
   if (Object.keys(fusedConfig).length)
     configs.push([fusedConfig]);
-  const merged = combine(
+  let pipeline = new FlatConfigComposer();
+  pipeline = pipeline.append(
     ...configs,
     ...userConfigs
   );
-  return merged;
+  if (autoRenamePlugins)
+    pipeline = pipeline.renamePlugins(defaultPluginRenaming);
+  return pipeline;
 }
 
 // src/index.ts
@@ -2008,6 +2055,7 @@ export {
   combine,
   comments,
   src_default as default,
+  defaultPluginRenaming,
   ensurePackages,
   formatters,
   ignores,
@@ -2021,6 +2069,7 @@ export {
   node,
   perfectionist,
   react,
+  renamePluginInConfigs,
   renameRules,
   sortPackageJson,
   sortTsconfig,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lincy/eslint-config",
   "type": "module",
-  "version": "4.2.6",
+  "version": "4.3.1",
   "packageManager": "pnpm@8.7.6",
   "description": "LinCenYing's ESLint config",
   "author": "LinCenYing <lincenying@gmail.com> (https://github.com/lincenying/)",
@@ -12,7 +12,6 @@
   ],
   "exports": {
     ".": {
-      "types": "./dist/index.d.ts",
       "import": "./dist/index.js",
       "require": "./dist/index.cjs"
     }
@@ -24,17 +23,18 @@
     "dist"
   ],
   "scripts": {
-    "build": "tsup src/index.ts --format esm,cjs --shims --clean --dts",
+    "build": "nr typegen && tsup --format esm,cjs --clean --dts",
     "stub": "tsup src/index.ts --format esm",
     "watch": "tsup --format esm,cjs --watch",
     "postpublish": "simple-open-url https://npmmirror.com/package/@lincy/eslint-config",
     "prepublishOnly": "nr build",
     "release": "bumpp && npm publish -r --access public",
     "test": "vitest",
+    "typegen": "esno scripts/typegen.ts",
     "lint": "pnpm run stub && eslint .",
     "lint:fix": "eslint . --fix",
     "lint:ts": "tsc --noEmit",
-    "prepare": "sh simple-git-hooks.sh"
+    "prepare": "npx simple-git-hooks"
   },
   "peerDependencies": {
     "@unocss/eslint-plugin": ">=0.50.0",
@@ -63,30 +63,31 @@
   },
   "dependencies": {
     "@antfu/eslint-define-config": "1.23.0-2",
-    "@antfu/install-pkg": "^0.3.1",
-    "@stylistic/eslint-plugin": "1.6.3",
-    "@typescript-eslint/eslint-plugin": "^7.2.0",
-    "@typescript-eslint/parser": "^7.2.0",
+    "@antfu/install-pkg": "^0.3.2",
+    "@stylistic/eslint-plugin": "1.7.0",
+    "@typescript-eslint/eslint-plugin": "^7.5.0",
+    "@typescript-eslint/parser": "^7.5.0",
     "eslint-config-flat-gitignore": "^0.1.3",
+    "eslint-flat-config-utils": "^0.2.0",
     "eslint-merge-processors": "^0.1.0",
     "eslint-parser-plain": "^0.1.0",
     "eslint-plugin-antfu": "^2.1.2",
     "eslint-plugin-eslint-comments": "^3.2.0",
-    "eslint-plugin-i": "^2.29.1",
-    "eslint-plugin-jsdoc": "^48.2.1",
-    "eslint-plugin-jsonc": "^2.13.0",
+    "eslint-plugin-import-x": "^0.5.0",
+    "eslint-plugin-jsdoc": "^48.2.2",
+    "eslint-plugin-jsonc": "^2.15.0",
     "eslint-plugin-markdown": "^4.0.1",
     "eslint-plugin-n": "^16.6.2",
     "eslint-plugin-no-only-tests": "^3.1.0",
-    "eslint-plugin-perfectionist": "^2.6.0",
-    "eslint-plugin-toml": "^0.9.2",
+    "eslint-plugin-perfectionist": "^2.7.0",
+    "eslint-plugin-toml": "^0.11.0",
     "eslint-plugin-unicorn": "^51.0.1",
     "eslint-plugin-unused-imports": "^3.1.0",
-    "eslint-plugin-vitest": "^0.3.25",
-    "eslint-plugin-vue": "^9.23.0",
-    "eslint-plugin-yml": "^1.12.2",
+    "eslint-plugin-vitest": "^0.4.1",
+    "eslint-plugin-vue": "^9.24.0",
+    "eslint-plugin-yml": "^1.14.0",
     "eslint-processor-vue-blocks": "^0.1.1",
-    "globals": "^14.0.0",
+    "globals": "^15.0.0",
     "jsonc-eslint-parser": "^2.4.0",
     "local-pkg": "^0.5.0",
     "prompts": "^2.4.2",
@@ -96,33 +97,34 @@
   },
   "devDependencies": {
     "@antfu/ni": "^0.21.12",
-    "@eslint-types/jsdoc": "48.2.0",
-    "@eslint-types/typescript-eslint": "^7.0.2",
+    "@eslint-types/jsdoc": "48.2.1",
+    "@eslint-types/typescript-eslint": "^7.2.0",
     "@eslint-types/unicorn": "^51.0.1",
+    "@eslint/config-inspector": "^0.2.1",
     "@lincy/eslint-config": "workspace:*",
-    "@stylistic/eslint-plugin-migrate": "^1.6.3",
-    "@types/eslint": "^8.56.5",
-    "@types/node": "^20.11.26",
+    "@stylistic/eslint-plugin-migrate": "^1.7.0",
+    "@types/eslint": "^8.56.7",
+    "@types/node": "^20.12.2",
     "@types/prompts": "^2.4.9",
-    "@unocss/eslint-plugin": "^0.58.5",
+    "@unocss/eslint-plugin": "^0.58.8",
     "bumpp": "^9.4.0",
     "eslint": "^8.57.0",
-    "eslint-flat-config-viewer": "^0.1.11",
     "eslint-plugin-format": "^0.1.0",
-    "eslint-plugin-react": "^7.34.0",
+    "eslint-plugin-react": "^7.34.1",
     "eslint-plugin-react-hooks": "^4.6.0",
-    "eslint-plugin-react-refresh": "^0.4.5",
+    "eslint-plugin-react-refresh": "^0.4.6",
+    "eslint-typegen": "^0.2.0",
     "esno": "^4.7.0",
     "lint-staged": "^15.2.2",
     "prettier": "^3.2.5",
     "rimraf": "^5.0.5",
-    "simple-git-hooks": "^2.10.0",
+    "simple-git-hooks": "^2.11.1",
     "simple-open-url": "^3.0.1",
     "sucrase": "^3.35.0",
     "tsup": "^8.0.2",
-    "typescript": "^5.4.2",
+    "typescript": "^5.4.3",
     "unbuild": "^2.0.0",
-    "vitest": "^1.3.1",
+    "vitest": "^1.4.0",
     "vue": "^3.4.21"
   },
   "pnpm": {