@lincy/eslint-config 5.4.1 → 5.5.0

package/README.md

@@ -10,6 +10,8 @@
 - 也适用于 json、yaml、markdown
 - import导入排序, 对象字⾯量项尾逗号
 - 合理的默认值，最佳实践，只需一行配置
+- .gitignore默认支持
+- 需要 ESLint v9.5.0+
 - [ESLint Flat config](https://eslint.org/docs/latest/use/configure/configuration-files-new)
 - 使用 [ESLint Stylistic](https://github.com/eslint-stylistic/eslint-stylistic)
 - **风格原则**: 读取最小，差异稳定
@@ -25,7 +27,7 @@ pnpm add -D eslint @lincy/eslint-config
 ### Create config file
 
 ```js
-// eslint.config.js
+// eslint.config.mjs
 import lincy from '@lincy/eslint-config'
 
 export default lincy()
@@ -110,7 +112,7 @@ export default lincy()
 如果 package.json 中开启了`"type": "module",`
 
 ```js
-// eslint.config.js
+// eslint.config.mjs
 import lincy from '@lincy/eslint-config'
 
 // or

package/dist/index.cjs

@@ -28,8 +28,8 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/index.ts
-var src_exports = {};
-__export(src_exports, {
+var index_exports = {};
+__export(index_exports, {
   GLOB_ALL_SRC: () => GLOB_ALL_SRC,
   GLOB_CSS: () => GLOB_CSS,
   GLOB_EXCLUDE: () => GLOB_EXCLUDE,
@@ -61,7 +61,7 @@ __export(src_exports, {
   StylisticConfigDefaults: () => StylisticConfigDefaults,
   combine: () => combine,
   comments: () => comments,
-  default: () => src_default,
+  default: () => index_default,
   defaultPluginRenaming: () => defaultPluginRenaming,
   disables: () => disables,
   ensurePackages: () => ensurePackages,
@@ -82,6 +82,7 @@ __export(src_exports, {
   node: () => node,
   parserPlain: () => parserPlain,
   perfectionist: () => perfectionist,
+  pnpm: () => pnpm,
   react: () => react,
   regexp: () => regexp,
   renamePluginInConfigs: () => renamePluginInConfigs,
@@ -99,9 +100,9 @@ __export(src_exports, {
   vue: () => vue,
   yaml: () => yaml
 });
-module.exports = __toCommonJS(src_exports);
+module.exports = __toCommonJS(index_exports);
 
-// node_modules/.pnpm/tsup@8.3.5_jiti@2.4.2_postcss@8.4.49_tsx@4.19.2_typescript@5.7.3_yaml@2.6.1/node_modules/tsup/assets/cjs_shims.js
+// node_modules/.pnpm/tsup@8.4.0_jiti@2.4.2_postcss@8.4.49_tsx@4.19.3_typescript@5.8.2_yaml@2.7.0/node_modules/tsup/assets/cjs_shims.js
 var getImportMetaUrl = () => typeof document === "undefined" ? new URL(`file:${__filename}`).href : document.currentScript && document.currentScript.src || new URL("main.js", document.baseURI).href;
 var importMetaUrl = /* @__PURE__ */ getImportMetaUrl();
 
@@ -388,7 +389,6 @@ async function stylistic(options = {}) {
   } = typeof stylistic2 === "boolean" ? StylisticConfigDefaults : { ...StylisticConfigDefaults, ...stylistic2 };
   const pluginStylistic = await interopDefault(import("@stylistic/eslint-plugin"));
   const config = pluginStylistic.configs.customize({
-    flat: true,
     indent,
     jsx: jsx2,
     pluginName: "style",
@@ -415,7 +415,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
       }
     }
@@ -685,6 +687,7 @@ async function imports(options = {}) {
         "antfu/import-dedupe": "error",
         "antfu/no-import-dist": "error",
         "antfu/no-import-node-modules-by-path": "error",
+        "import/consistent-type-specifier-style": ["error", "prefer-top-level"],
         "import/first": "error",
         "import/no-duplicates": "error",
         "import/no-mutable-exports": "error",
@@ -1195,6 +1198,30 @@ async function perfectionist(options = {}) {
   ];
 }
 
+// src/configs/pnpm.ts
+async function pnpm() {
+  return [
+    {
+      files: [
+        "package.json",
+        "**/package.json"
+      ],
+      languageOptions: {
+        parser: await interopDefault(import("jsonc-eslint-parser"))
+      },
+      name: "eslint/pnpm/rules",
+      plugins: {
+        pnpm: await interopDefault(import("eslint-plugin-pnpm"))
+      },
+      rules: {
+        "pnpm/enforce-catalog": "error",
+        "pnpm/prefer-workspace-settings": "error",
+        "pnpm/valid-catalog": "error"
+      }
+    }
+  ];
+}
+
 // src/configs/react.ts
 var import_local_pkg2 = require("local-pkg");
 var ReactRefreshAllowConstantExportPackages = [
@@ -1240,7 +1267,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"))
   ]);
@@ -1852,6 +1878,7 @@ async function typescript(options = {}) {
         "ts/consistent-type-definitions": ["error", "interface"],
         "ts/consistent-type-imports": ["error", {
           disallowTypeAnnotations: false,
+          fixStyle: "separate-type-imports",
           prefer: "type-imports"
         }],
         "ts/method-signature-style": ["error", "property"],
@@ -2060,13 +2087,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",
@@ -2233,6 +2260,37 @@ 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: "^$"
+          }
+        ]
+      }
     }
   ];
 }
@@ -2273,6 +2331,7 @@ function lincy(options = {}, ...userConfigs) {
     ignores: ignoresList = [],
     jsx: enableJsx = true,
     overrides = {},
+    pnpm: enableCatalogs = false,
     react: enableReact = false,
     regexp: enableRegexp = true,
     typescript: enableTypeScript = (0, import_local_pkg4.isPackageExists)("typescript"),
@@ -2408,6 +2467,11 @@ function lincy(options = {}, ...userConfigs) {
       sortTsconfig()
     );
   }
+  if (enableCatalogs) {
+    configs2.push(
+      pnpm()
+    );
+  }
   if (options.yaml ?? true) {
     configs2.push(yaml({
       ...resolveSubOptions(options, "yaml"),
@@ -2482,7 +2546,7 @@ function getOverrides(options, key) {
 }
 
 // src/index.ts
-var src_default = lincy;
+var index_default = lincy;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   GLOB_ALL_SRC,
@@ -2536,6 +2600,7 @@ var src_default = lincy;
   node,
   parserPlain,
   perfectionist,
+  pnpm,
   react,
   regexp,
   renamePluginInConfigs,