@lincy/eslint-config 5.4.2 → 5.5.1

package/dist/index.js

@@ -307,7 +307,9 @@ async function stylistic(options = {}) {
         },
         // 覆盖`stylistic`默认规则
         "style/brace-style": ["error", "stroustrup"],
+        "style/generator-star-spacing": ["error", { after: true, before: false }],
         "style/multiline-ternary": ["error", "never"],
+        "style/yield-star-spacing": ["error", { after: true, before: false }],
         ...overrides
       }
     }
@@ -1088,6 +1090,53 @@ async function perfectionist(options = {}) {
   ];
 }
 
+// src/configs/pnpm.ts
+async function pnpm() {
+  const [
+    pluginPnpm,
+    yamlParser,
+    jsoncParser
+  ] = await Promise.all([
+    interopDefault(import("eslint-plugin-pnpm")),
+    interopDefault(import("yaml-eslint-parser")),
+    interopDefault(import("jsonc-eslint-parser"))
+  ]);
+  return [
+    {
+      files: [
+        "package.json",
+        "**/package.json"
+      ],
+      languageOptions: {
+        parser: jsoncParser
+      },
+      name: "eslint/pnpm/package-json",
+      plugins: {
+        pnpm: pluginPnpm
+      },
+      rules: {
+        "pnpm/json-enforce-catalog": "error",
+        "pnpm/json-prefer-workspace-settings": "error",
+        "pnpm/json-valid-catalog": "error"
+      }
+    },
+    {
+      files: ["pnpm-workspace.yaml"],
+      languageOptions: {
+        parser: yamlParser
+      },
+      name: "eslint/pnpm/pnpm-workspace-yaml",
+      plugins: {
+        pnpm: pluginPnpm
+      },
+      rules: {
+        "pnpm/yaml-no-duplicate-catalog-item": "error",
+        "pnpm/yaml-no-unused-catalog-item": "error"
+      }
+    }
+  ];
+}
+
 // src/configs/react.ts
 import { isPackageExists as isPackageExists2 } from "local-pkg";
 var ReactRefreshAllowConstantExportPackages = [
@@ -1133,7 +1182,6 @@ async function react(options = {}) {
     pluginReactRefresh
   ] = await Promise.all([
     interopDefault(import("@eslint-react/eslint-plugin")),
-    // @ts-expect-error missing types
     interopDefault(import("eslint-plugin-react-hooks")),
     interopDefault(import("eslint-plugin-react-refresh"))
   ]);
@@ -1169,22 +1217,29 @@ async function react(options = {}) {
       },
       name: "eslint/react/rules",
       rules: {
-        // recommended rules from @eslint-react/dom
-        "react-dom/no-children-in-void-dom-elements": "warn",
-        "react-dom/no-dangerously-set-innerhtml": "off",
+        // recommended rules from eslint-plugin-react-dom https://eslint-react.xyz/docs/rules/overview#dom-rules
+        "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-flush-sync": "error",
+        "react-dom/no-hydrate": "error",
         "react-dom/no-missing-button-type": "warn",
         "react-dom/no-missing-iframe-sandbox": "warn",
         "react-dom/no-namespace": "error",
+        "react-dom/no-render": "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-dom/no-use-form-state": "error",
+        "react-dom/no-void-elements-with-children": "error",
+        // recommended rules from eslint-plugin-react-hooks-extra https://eslint-react.xyz/docs/rules/overview#hooks-extra-rules
+        "react-hooks-extra/no-direct-set-state-in-use-effect": "warn",
+        "react-hooks-extra/no-unnecessary-use-prefix": "warn",
+        // recommended rules eslint-plugin-react-hooks https://github.com/facebook/react/tree/main/packages/eslint-plugin-react-hooks/src/rules
         "react-hooks/exhaustive-deps": "warn",
         "react-hooks/rules-of-hooks": "error",
-        // react refresh
+        // preconfigured rules from eslint-plugin-react-refresh https://github.com/ArnaudBarre/eslint-plugin-react-refresh/tree/main/src
         "react-refresh/only-export-components": [
           "warn",
           {
@@ -1215,31 +1270,35 @@ async function react(options = {}) {
             ]
           }
         ],
-        // recommended rules from @eslint-react/web-api
+        // recommended rules from eslint-plugin-react-web-api https://eslint-react.xyz/docs/rules/overview#web-api-rules
         "react-web-api/no-leaked-event-listener": "warn",
         "react-web-api/no-leaked-interval": "warn",
         "react-web-api/no-leaked-resize-observer": "warn",
         "react-web-api/no-leaked-timeout": "warn",
-        // recommended rules from @eslint-react
-        "react/ensure-forward-ref-using-ref": "warn",
+        // recommended rules from eslint-plugin-react-x https://eslint-react.xyz/docs/rules/overview#core-rules
         "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-context-provider": "warn",
         "react/no-create-ref": "error",
+        "react/no-default-props": "error",
         "react/no-direct-mutation-state": "error",
-        "react/no-duplicate-key": "error",
+        "react/no-duplicate-jsx-props": "warn",
+        "react/no-duplicate-key": "warn",
+        "react/no-forward-ref": "warn",
+        "react/no-implicit-key": "warn",
         "react/no-missing-key": "error",
-        "react/no-nested-components": "warn",
+        "react/no-nested-component-definitions": "error",
+        "react/no-prop-types": "error",
         "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",
@@ -1248,14 +1307,13 @@ async function react(options = {}) {
         "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-unstable-context-value": "warn",
+        "react/no-unstable-default-props": "warn",
         "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",
+        "react/no-use-context": "warn",
+        "react/no-useless-forward-ref": "warn",
+        "react/use-jsx-vars": "warn",
         // overrides
         ...overrides
       }
@@ -1441,6 +1499,7 @@ function sortTsconfig() {
               "useDefineForClassFields",
               "emitDecoratorMetadata",
               "experimentalDecorators",
+              "libReplacement",
               /* Modules */
               "baseUrl",
               "rootDir",
@@ -1514,6 +1573,7 @@ function sortTsconfig() {
               "isolatedModules",
               "preserveSymlinks",
               "verbatimModuleSyntax",
+              "erasableSyntaxOnly",
               /* Completeness */
               "skipDefaultLibCheck",
               "skipLibCheck"
@@ -1954,13 +2014,13 @@ async function vue(options = {}) {
       rules: {
         ...pluginVue.configs.base.rules,
         ...vueVersion === "2" ? {
-          ...pluginVue.configs.essential.rules,
-          ...pluginVue.configs["strongly-recommended"].rules,
-          ...pluginVue.configs.recommended.rules
+          ...pluginVue.configs["vue2-essential"].rules,
+          ...pluginVue.configs["vue2-strongly-recommended"].rules,
+          ...pluginVue.configs["vue2-recommended"].rules
         } : {
-          ...pluginVue.configs["vue3-essential"].rules,
-          ...pluginVue.configs["vue3-strongly-recommended"].rules,
-          ...pluginVue.configs["vue3-recommended"].rules
+          ...pluginVue.configs["flat/essential"].map((c) => c.rules).reduce((acc, c) => ({ ...acc, ...c }), {}),
+          ...pluginVue.configs["flat/strongly-recommended"].map((c) => c.rules).reduce((acc, c) => ({ ...acc, ...c }), {}),
+          ...pluginVue.configs["flat/recommended"].map((c) => c.rules).reduce((acc, c) => ({ ...acc, ...c }), {})
         },
         "antfu/no-top-level-await": "off",
         "node/prefer-global/process": "off",
@@ -2127,6 +2187,41 @@ async function yaml(options = {}) {
         } : {},
         ...overrides
       }
+    },
+    {
+      files: ["pnpm-workspace.yaml"],
+      name: "eslint/yaml/pnpm-workspace",
+      rules: {
+        "yaml/sort-keys": [
+          "error",
+          {
+            order: [
+              "packages",
+              "overrides",
+              "patchedDependencies",
+              "hoistPattern",
+              "catalog",
+              "catalogs",
+              "allowedDeprecatedVersions",
+              "allowNonAppliedPatches",
+              "configDependencies",
+              "ignoredBuiltDependencies",
+              "ignoredOptionalDependencies",
+              "neverBuiltDependencies",
+              "onlyBuiltDependencies",
+              "onlyBuiltDependenciesFile",
+              "packageExtensions",
+              "peerDependencyRules",
+              "supportedArchitectures"
+            ],
+            pathPattern: "^$"
+          },
+          {
+            order: { type: "asc" },
+            pathPattern: ".*"
+          }
+        ]
+      }
     }
   ];
 }
@@ -2167,6 +2262,7 @@ function lincy(options = {}, ...userConfigs) {
     ignores: ignoresList = [],
     jsx: enableJsx = true,
     overrides = {},
+    pnpm: enableCatalogs = false,
     react: enableReact = false,
     regexp: enableRegexp = true,
     typescript: enableTypeScript = isPackageExists3("typescript"),
@@ -2302,6 +2398,11 @@ function lincy(options = {}, ...userConfigs) {
       sortTsconfig()
     );
   }
+  if (enableCatalogs) {
+    configs2.push(
+      pnpm()
+    );
+  }
   if (options.yaml ?? true) {
     configs2.push(yaml({
       ...resolveSubOptions(options, "yaml"),
@@ -2430,6 +2531,7 @@ export {
   node,
   parserPlain,
   perfectionist,
+  pnpm,
   react,
   regexp,
   renamePluginInConfigs,

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@lincy/eslint-config",
   "type": "module",
-  "version": "5.4.2",
-  "packageManager": "pnpm@10.3.0",
+  "version": "5.5.1",
+  "packageManager": "pnpm@10.6.5",
   "description": "LinCenYing's ESLint config",
   "author": "LinCenYing <lincenying@gmail.com> (https://github.com/lincenying/)",
   "license": "MIT",
@@ -66,90 +66,72 @@
     }
   },
   "dependencies": {
-    "@antfu/eslint-define-config": "1.23.0-2",
-    "@antfu/install-pkg": "^1.0.0",
-    "@clack/prompts": "^0.10.0",
-    "@eslint-community/eslint-plugin-eslint-comments": "^4.4.1",
-    "@eslint/markdown": "^6.2.2",
-    "@stylistic/eslint-plugin": "4.0.0-beta.1",
-    "@typescript-eslint/eslint-plugin": "^8.24.0",
-    "@typescript-eslint/parser": "^8.24.0",
-    "@vitest/eslint-plugin": "^1.1.31",
-    "eslint-config-flat-gitignore": "^2.0.0",
-    "eslint-flat-config-utils": "^2.0.1",
-    "eslint-merge-processors": "^2.0.0",
-    "eslint-parser-plain": "^0.1.1",
-    "eslint-plugin-antfu": "^3.0.0",
-    "eslint-plugin-import-x": "^4.6.1",
-    "eslint-plugin-jsdoc": "^50.6.3",
-    "eslint-plugin-jsonc": "^2.19.1",
-    "eslint-plugin-n": "^17.15.1",
-    "eslint-plugin-no-only-tests": "^3.3.0",
-    "eslint-plugin-perfectionist": "^4.8.0",
-    "eslint-plugin-regexp": "^2.7.0",
-    "eslint-plugin-toml": "^0.12.0",
-    "eslint-plugin-unicorn": "^56.0.1",
-    "eslint-plugin-unused-imports": "^4.1.4",
-    "eslint-plugin-vue": "^9.32.0",
-    "eslint-plugin-yml": "^1.16.0",
-    "eslint-processor-vue-blocks": "^2.0.0",
-    "globals": "^15.15.0",
-    "jsonc-eslint-parser": "^2.4.0",
-    "local-pkg": "^1.0.0",
-    "prompts": "^2.4.2",
-    "toml-eslint-parser": "^0.10.0",
-    "vue-eslint-parser": "^9.4.3",
-    "yaml-eslint-parser": "^1.2.3"
+    "@antfu/install-pkg": "catalog:prod",
+    "@clack/prompts": "catalog:prod",
+    "@eslint-community/eslint-plugin-eslint-comments": "catalog:prod",
+    "@eslint/markdown": "catalog:prod",
+    "@stylistic/eslint-plugin": "catalog:prod",
+    "@typescript-eslint/eslint-plugin": "catalog:prod",
+    "@typescript-eslint/parser": "catalog:prod",
+    "@vitest/eslint-plugin": "catalog:prod",
+    "eslint-config-flat-gitignore": "catalog:prod",
+    "eslint-flat-config-utils": "catalog:prod",
+    "eslint-merge-processors": "catalog:prod",
+    "eslint-parser-plain": "catalog:prod",
+    "eslint-plugin-antfu": "catalog:prod",
+    "eslint-plugin-import-x": "catalog:prod",
+    "eslint-plugin-jsdoc": "catalog:prod",
+    "eslint-plugin-jsonc": "catalog:prod",
+    "eslint-plugin-n": "catalog:prod",
+    "eslint-plugin-no-only-tests": "catalog:prod",
+    "eslint-plugin-perfectionist": "catalog:prod",
+    "eslint-plugin-pnpm": "catalog:prod",
+    "eslint-plugin-regexp": "catalog:prod",
+    "eslint-plugin-toml": "catalog:prod",
+    "eslint-plugin-unicorn": "catalog:prod",
+    "eslint-plugin-unused-imports": "catalog:prod",
+    "eslint-plugin-vue": "catalog:prod",
+    "eslint-plugin-yml": "catalog:prod",
+    "eslint-processor-vue-blocks": "catalog:prod",
+    "globals": "catalog:prod",
+    "jsonc-eslint-parser": "catalog:prod",
+    "local-pkg": "catalog:prod",
+    "prompts": "catalog:prod",
+    "toml-eslint-parser": "catalog:prod",
+    "vue-eslint-parser": "catalog:prod",
+    "yaml-eslint-parser": "catalog:prod"
   },
   "devDependencies": {
-    "@antfu/ni": "^23.3.1",
-    "@eslint-react/eslint-plugin": "^1.26.2",
-    "@eslint-types/jsdoc": "48.2.2",
-    "@eslint-types/typescript-eslint": "^7.5.0",
-    "@eslint-types/unicorn": "^52.0.0",
-    "@eslint/config-inspector": "^1.0.0",
+    "@antfu/ni": "catalog:dev",
+    "@eslint-react/eslint-plugin": "catalog:dev",
+    "@eslint-types/jsdoc": "catalog:dev",
+    "@eslint-types/typescript-eslint": "catalog:dev",
+    "@eslint-types/unicorn": "catalog:dev",
+    "@eslint/config-inspector": "catalog:dev",
     "@lincy/eslint-config": "workspace:*",
-    "@prettier/plugin-xml": "^3.4.1",
-    "@stylistic/eslint-plugin-migrate": "^4.0.0-beta.1",
-    "@types/fs-extra": "^11.0.4",
-    "@types/node": "^22.13.1",
-    "@types/prompts": "^2.4.9",
-    "@types/react": "^19.0.8",
-    "@unocss/eslint-plugin": "^65.4.3",
-    "bumpp": "^10.0.3",
-    "eslint": "^9.20.1",
-    "eslint-plugin-format": "^1.0.1",
-    "eslint-plugin-react-hooks": "^5.1.0",
-    "eslint-plugin-react-refresh": "^0.4.19",
-    "eslint-ts-patch": "9.8.0-1",
-    "eslint-typegen": "^1.0.0",
-    "esno": "^4.8.0",
-    "fs-extra": "^11.3.0",
-    "lint-staged": "^15.4.3",
-    "prettier": "^3.5.0",
-    "react": "^19.0.0",
-    "rimraf": "^6.0.1",
-    "simple-git-hooks": "^2.11.1",
-    "simple-open-url": "^3.0.1",
-    "sucrase": "^3.35.0",
-    "tsup": "^8.3.6",
-    "typescript": "^5.7.3",
-    "unbuild": "^3.3.1",
-    "vitest": "^3.0.5",
-    "vue": "^3.5.13"
-  },
-  "pnpm": {
-    "peerDependencyRules": {
-      "ignoreMissing": [
-        "prettier"
-      ]
-    }
-  },
-  "resolutions": {
-    "@eslint-community/eslint-utils": "^4.4.1",
-    "@typescript-eslint/utils": "^8.24.0",
-    "eslint": "^9.20.1",
-    "tsx": "^4.19.2"
+    "@prettier/plugin-xml": "catalog:dev",
+    "@stylistic/eslint-plugin-migrate": "catalog:dev",
+    "@types/node": "catalog:dev",
+    "@types/react": "catalog:dev",
+    "@unocss/eslint-plugin": "catalog:dev",
+    "bumpp": "catalog:dev",
+    "eslint": "catalog:dev",
+    "eslint-plugin-format": "catalog:dev",
+    "eslint-plugin-react-hooks": "catalog:dev",
+    "eslint-plugin-react-refresh": "catalog:dev",
+    "eslint-typegen": "catalog:dev",
+    "esno": "catalog:dev",
+    "lint-staged": "catalog:dev",
+    "prettier": "catalog:dev",
+    "react": "catalog:dev",
+    "simple-git-hooks": "catalog:dev",
+    "simple-open-url": "catalog:dev",
+    "sucrase": "catalog:dev",
+    "tinyglobby": "catalog:dev",
+    "tsup": "catalog:dev",
+    "typescript": "catalog:dev",
+    "vitest": "catalog:test",
+    "vue": "catalog:dev"
   },
   "simple-git-hooks": {
     "pre-commit": "npx lint-staged"