@antfu/eslint-config 4.7.0 → 4.8.1

package/dist/cli.js

@@ -11,7 +11,7 @@ import c from "ansis";
 var package_default = {
   name: "@antfu/eslint-config",
   type: "module",
-  version: "4.7.0",
+  version: "4.8.1",
   packageManager: "pnpm@10.6.1",
   description: "Anthony's ESLint config",
   author: "Anthony Fu <anthonyfu117@hotmail.com> (https://github.com/antfu/)",
@@ -103,82 +103,76 @@ var package_default = {
     }
   },
   dependencies: {
-    "@antfu/install-pkg": "^1.0.0",
-    "@clack/prompts": "^0.10.0",
-    "@eslint-community/eslint-plugin-eslint-comments": "^4.4.1",
-    "@eslint/markdown": "^6.3.0",
-    "@stylistic/eslint-plugin": "^4.2.0",
-    "@typescript-eslint/eslint-plugin": "^8.26.0",
-    "@typescript-eslint/parser": "^8.26.0",
-    "@vitest/eslint-plugin": "^1.1.36",
-    ansis: "^3.17.0",
-    cac: "^6.7.14",
-    "eslint-config-flat-gitignore": "^2.1.0",
-    "eslint-flat-config-utils": "^2.0.1",
-    "eslint-merge-processors": "^2.0.0",
-    "eslint-plugin-antfu": "^3.1.0",
-    "eslint-plugin-command": "^3.1.0",
-    "eslint-plugin-import-x": "^4.6.1",
-    "eslint-plugin-jsdoc": "^50.6.3",
-    "eslint-plugin-jsonc": "^2.19.1",
-    "eslint-plugin-n": "^17.16.2",
-    "eslint-plugin-no-only-tests": "^3.3.0",
-    "eslint-plugin-perfectionist": "^4.9.0",
-    "eslint-plugin-pnpm-catalogs": "^0.1.0",
-    "eslint-plugin-regexp": "^2.7.0",
-    "eslint-plugin-toml": "^0.12.0",
-    "eslint-plugin-unicorn": "^57.0.0",
-    "eslint-plugin-unused-imports": "^4.1.4",
-    "eslint-plugin-vue": "^10.0.0",
-    "eslint-plugin-yml": "^1.17.0",
-    "eslint-processor-vue-blocks": "^2.0.0",
-    globals: "^16.0.0",
-    "jsonc-eslint-parser": "^2.4.0",
-    "local-pkg": "^1.1.1",
-    "parse-gitignore": "^2.0.0",
-    "toml-eslint-parser": "^0.10.0",
-    "vue-eslint-parser": "^10.1.1",
-    "yaml-eslint-parser": "^1.3.0"
+    "@antfu/install-pkg": "catalog:",
+    "@clack/prompts": "catalog:",
+    "@eslint-community/eslint-plugin-eslint-comments": "catalog:",
+    "@eslint/markdown": "catalog:",
+    "@stylistic/eslint-plugin": "catalog:",
+    "@typescript-eslint/eslint-plugin": "catalog:",
+    "@typescript-eslint/parser": "catalog:",
+    "@vitest/eslint-plugin": "catalog:",
+    ansis: "catalog:",
+    cac: "catalog:",
+    "eslint-config-flat-gitignore": "catalog:",
+    "eslint-flat-config-utils": "catalog:",
+    "eslint-merge-processors": "catalog:",
+    "eslint-plugin-antfu": "catalog:",
+    "eslint-plugin-command": "catalog:",
+    "eslint-plugin-import-x": "catalog:",
+    "eslint-plugin-jsdoc": "catalog:",
+    "eslint-plugin-jsonc": "catalog:",
+    "eslint-plugin-n": "catalog:",
+    "eslint-plugin-no-only-tests": "catalog:",
+    "eslint-plugin-perfectionist": "catalog:",
+    "eslint-plugin-pnpm": "catalog:",
+    "eslint-plugin-regexp": "catalog:",
+    "eslint-plugin-toml": "catalog:",
+    "eslint-plugin-unicorn": "catalog:",
+    "eslint-plugin-unused-imports": "catalog:",
+    "eslint-plugin-vue": "catalog:",
+    "eslint-plugin-yml": "catalog:",
+    "eslint-processor-vue-blocks": "catalog:",
+    globals: "catalog:",
+    "jsonc-eslint-parser": "catalog:",
+    "local-pkg": "catalog:",
+    "parse-gitignore": "catalog:",
+    "toml-eslint-parser": "catalog:",
+    "vue-eslint-parser": "catalog:",
+    "yaml-eslint-parser": "catalog:"
   },
   devDependencies: {
     "@antfu/eslint-config": "workspace:*",
-    "@antfu/ni": "^23.3.1",
-    "@eslint-react/eslint-plugin": "^1.31.0",
-    "@eslint/config-inspector": "^1.0.2",
-    "@prettier/plugin-xml": "^3.4.1",
-    "@stylistic/eslint-plugin-migrate": "^4.2.0",
-    "@types/node": "^22.13.9",
-    "@unocss/eslint-plugin": "^66.0.0",
-    "astro-eslint-parser": "^1.2.1",
-    bumpp: "^10.0.3",
-    eslint: "^9.21.0",
-    "eslint-plugin-astro": "^1.3.1",
-    "eslint-plugin-format": "^1.0.1",
-    "eslint-plugin-react-hooks": "^5.2.0",
-    "eslint-plugin-react-refresh": "^0.4.19",
-    "eslint-plugin-solid": "^0.14.5",
-    "eslint-plugin-svelte": "^3.0.3",
-    "eslint-typegen": "^2.0.0",
-    execa: "^9.5.2",
-    jiti: "^2.4.2",
-    "lint-staged": "^15.4.3",
-    "prettier-plugin-astro": "^0.14.1",
-    "prettier-plugin-slidev": "^1.0.5",
-    "simple-git-hooks": "^2.11.1",
-    svelte: "^5.22.5",
-    "svelte-eslint-parser": "^1.0.1",
-    tinyglobby: "^0.2.12",
-    tsup: "^8.4.0",
-    tsx: "^4.19.3",
-    typescript: "^5.8.2",
-    vitest: "^3.0.8",
-    vue: "^3.5.13"
-  },
-  resolutions: {
-    "@eslint-community/eslint-utils": "^4.4.1",
-    "@typescript-eslint/utils": "^8.26.0",
-    eslint: "^9.21.0",
-    tsx: "^4.19.3"
+    "@antfu/ni": "catalog:",
+    "@eslint-react/eslint-plugin": "catalog:",
+    "@eslint/config-inspector": "catalog:",
+    "@prettier/plugin-xml": "catalog:",
+    "@stylistic/eslint-plugin-migrate": "catalog:",
+    "@types/node": "catalog:",
+    "@unocss/eslint-plugin": "catalog:",
+    "astro-eslint-parser": "catalog:",
+    bumpp: "catalog:",
+    eslint: "catalog:",
+    "eslint-plugin-astro": "catalog:",
+    "eslint-plugin-format": "catalog:",
+    "eslint-plugin-react-hooks": "catalog:",
+    "eslint-plugin-react-refresh": "catalog:",
+    "eslint-plugin-solid": "catalog:",
+    "eslint-plugin-svelte": "catalog:",
+    "eslint-typegen": "catalog:",
+    execa: "catalog:",
+    jiti: "catalog:",
+    "lint-staged": "catalog:",
+    "prettier-plugin-astro": "catalog:",
+    "prettier-plugin-slidev": "catalog:",
+    "simple-git-hooks": "catalog:",
+    svelte: "catalog:",
+    "svelte-eslint-parser": "catalog:",
+    tinyglobby: "catalog:",
+    tsup: "catalog:",
+    tsx: "catalog:",
+    typescript: "catalog:",
+    vitest: "catalog:",
+    vue: "catalog:"
   },
   "simple-git-hooks": {
     "pre-commit": "npx lint-staged"

package/dist/index.d.ts

@@ -17400,16 +17400,16 @@ interface OptionsConfig extends OptionsComponentExts, OptionsProjectType {
      */
     unocss?: boolean | OptionsUnoCSS;
     /**
-     * Enable pnpm catalogs support.
+     * Enable pnpm (workspace/catalogs) support.
      *
      * Currently it's disabled by default, as it's still experimental.
-     * In the future it will be smartly enabled based on the project catalog usage.
+     * In the future it will be smartly enabled based on the project usage.
      *
-     * @see https://github.com/antfu/pnpm-catalogs-utils
+     * @see https://github.com/antfu/pnpm-workspace-utils
      * @experimental
      * @default false
      */
-    pnpmCatalogs?: boolean;
+    pnpm?: boolean;
     /**
      * Use external formatters to format files.
      *
@@ -17512,7 +17512,7 @@ declare function node(): Promise<TypedFlatConfigItem[]>;
  */
 declare function perfectionist(): Promise<TypedFlatConfigItem[]>;
 
-declare function pnpmCatalogs(): Promise<TypedFlatConfigItem[]>;
+declare function pnpm(): Promise<TypedFlatConfigItem[]>;
 
 declare function react(options?: OptionsTypeScriptParserOptions & OptionsTypeScriptWithTypes & OptionsOverrides & OptionsFiles): Promise<TypedFlatConfigItem[]>;
 
@@ -17658,4 +17658,4 @@ declare function ensurePackages(packages: (string | undefined)[]): Promise<void>
 declare function isInEditorEnv(): boolean;
 declare function isInGitHooksOrLintStaged(): boolean;
 
-export { type Awaitable, type ConfigNames, GLOB_ALL_SRC, GLOB_ASTRO, GLOB_ASTRO_TS, GLOB_CSS, GLOB_EXCLUDE, GLOB_GRAPHQL, GLOB_HTML, GLOB_JS, GLOB_JSON, GLOB_JSON5, GLOB_JSONC, GLOB_JSX, GLOB_LESS, GLOB_MARKDOWN, GLOB_MARKDOWN_CODE, GLOB_MARKDOWN_IN_MARKDOWN, GLOB_POSTCSS, GLOB_SCSS, GLOB_SRC, GLOB_SRC_EXT, GLOB_STYLE, GLOB_SVELTE, GLOB_SVG, GLOB_TESTS, GLOB_TOML, GLOB_TS, GLOB_TSX, GLOB_VUE, GLOB_XML, GLOB_YAML, type OptionsComponentExts, type OptionsConfig, type OptionsFiles, type OptionsFormatters, type OptionsHasTypeScript, type OptionsIsInEditor, type OptionsOverrides, type OptionsProjectType, type OptionsRegExp, type OptionsStylistic, type OptionsTypeScriptParserOptions, type OptionsTypeScriptWithTypes, type OptionsTypescript, type OptionsUnicorn, type OptionsUnoCSS, type OptionsVue, type ResolvedOptions, type Rules, type StylisticConfig, StylisticConfigDefaults, type StylisticOptions, type TypedFlatConfigItem, antfu, astro, combine, command, comments, antfu as default, defaultPluginRenaming, disables, ensurePackages, formatters, getOverrides, ignores, imports, interopDefault, isInEditorEnv, isInGitHooksOrLintStaged, isPackageInScope, javascript, jsdoc, jsonc, jsx, markdown, node, parserPlain, perfectionist, pnpmCatalogs, react, regexp, renamePluginInConfigs, renameRules, resolveSubOptions, solid, sortPackageJson, sortTsconfig, stylistic, svelte, test, toArray, toml, typescript, unicorn, unocss, vue, yaml };
+export { type Awaitable, type ConfigNames, GLOB_ALL_SRC, GLOB_ASTRO, GLOB_ASTRO_TS, GLOB_CSS, GLOB_EXCLUDE, GLOB_GRAPHQL, GLOB_HTML, GLOB_JS, GLOB_JSON, GLOB_JSON5, GLOB_JSONC, GLOB_JSX, GLOB_LESS, GLOB_MARKDOWN, GLOB_MARKDOWN_CODE, GLOB_MARKDOWN_IN_MARKDOWN, GLOB_POSTCSS, GLOB_SCSS, GLOB_SRC, GLOB_SRC_EXT, GLOB_STYLE, GLOB_SVELTE, GLOB_SVG, GLOB_TESTS, GLOB_TOML, GLOB_TS, GLOB_TSX, GLOB_VUE, GLOB_XML, GLOB_YAML, type OptionsComponentExts, type OptionsConfig, type OptionsFiles, type OptionsFormatters, type OptionsHasTypeScript, type OptionsIsInEditor, type OptionsOverrides, type OptionsProjectType, type OptionsRegExp, type OptionsStylistic, type OptionsTypeScriptParserOptions, type OptionsTypeScriptWithTypes, type OptionsTypescript, type OptionsUnicorn, type OptionsUnoCSS, type OptionsVue, type ResolvedOptions, type Rules, type StylisticConfig, StylisticConfigDefaults, type StylisticOptions, type TypedFlatConfigItem, antfu, astro, combine, command, comments, antfu as default, defaultPluginRenaming, disables, ensurePackages, formatters, getOverrides, ignores, imports, interopDefault, isInEditorEnv, isInGitHooksOrLintStaged, isPackageInScope, javascript, jsdoc, jsonc, jsx, markdown, node, parserPlain, perfectionist, pnpm, react, regexp, renamePluginInConfigs, renameRules, resolveSubOptions, solid, sortPackageJson, sortTsconfig, stylistic, svelte, test, toArray, toml, typescript, unicorn, unocss, vue, yaml };

package/dist/index.js

@@ -1182,8 +1182,8 @@ async function perfectionist() {
   ];
 }
 
-// src/configs/pnpm-catalogs.ts
-async function pnpmCatalogs() {
+// src/configs/pnpm.ts
+async function pnpm() {
   return [
     {
       files: [
@@ -1193,13 +1193,14 @@ async function pnpmCatalogs() {
       languageOptions: {
         parser: await interopDefault(import("jsonc-eslint-parser"))
       },
-      name: "antfu/pnpm-catalogs/rules",
+      name: "antfu/pnpm/rules",
       plugins: {
-        "pnpm-catalogs": await interopDefault(import("eslint-plugin-pnpm-catalogs"))
+        pnpm: await interopDefault(import("eslint-plugin-pnpm"))
       },
       rules: {
-        "pnpm-catalogs/enforce-catalog": "error",
-        "pnpm-catalogs/valid-catalog": "error"
+        "pnpm/enforce-catalog": "error",
+        "pnpm/prefer-workspace-settings": "error",
+        "pnpm/valid-catalog": "error"
       }
     }
   ];
@@ -2389,8 +2390,22 @@ async function yaml(options = {}) {
           {
             order: [
               "packages",
+              "overrides",
+              "patchedDependencies",
+              "hoistPattern",
               "catalog",
-              "catalogs"
+              "catalogs",
+              "allowedDeprecatedVersions",
+              "allowNonAppliedPatches",
+              "configDependencies",
+              "ignoredBuiltDependencies",
+              "ignoredOptionalDependencies",
+              "neverBuiltDependencies",
+              "onlyBuiltDependencies",
+              "onlyBuiltDependenciesFile",
+              "packageExtensions",
+              "peerDependencyRules",
+              "supportedArchitectures"
             ],
             pathPattern: "^$"
           }
@@ -2435,8 +2450,8 @@ function antfu(options = {}, ...userConfigs) {
     componentExts = [],
     gitignore: enableGitignore = true,
     jsx: enableJsx = true,
-    pnpmCatalogs: enablePnpmCatalogs = false,
-    // TOD: smart detect
+    pnpm: enableCatalogs = false,
+    // TODO: smart detect
     react: enableReact = false,
     regexp: enableRegexp = true,
     solid: enableSolid = false,
@@ -2573,9 +2588,9 @@ function antfu(options = {}, ...userConfigs) {
       sortTsconfig()
     );
   }
-  if (enablePnpmCatalogs) {
+  if (enableCatalogs) {
     configs2.push(
-      pnpmCatalogs()
+      pnpm()
     );
   }
   if (options.yaml ?? true) {
@@ -2708,7 +2723,7 @@ export {
   node,
   parserPlain,
   perfectionist,
-  pnpmCatalogs,
+  pnpm,
   react,
   regexp,
   renamePluginInConfigs,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@antfu/eslint-config",
   "type": "module",
-  "version": "4.7.0",
+  "version": "4.8.1",
   "description": "Anthony's ESLint config",
   "author": "Anthony Fu <anthonyfu117@hotmail.com> (https://github.com/antfu/)",
   "license": "MIT",
@@ -91,7 +91,7 @@
     "eslint-config-flat-gitignore": "^2.1.0",
     "eslint-flat-config-utils": "^2.0.1",
     "eslint-merge-processors": "^2.0.0",
-    "eslint-plugin-antfu": "^3.1.0",
+    "eslint-plugin-antfu": "^3.1.1",
     "eslint-plugin-command": "^3.1.0",
     "eslint-plugin-import-x": "^4.6.1",
     "eslint-plugin-jsdoc": "^50.6.3",
@@ -99,7 +99,7 @@
     "eslint-plugin-n": "^17.16.2",
     "eslint-plugin-no-only-tests": "^3.3.0",
     "eslint-plugin-perfectionist": "^4.9.0",
-    "eslint-plugin-pnpm-catalogs": "^0.1.0",
+    "eslint-plugin-pnpm": "^0.1.1",
     "eslint-plugin-regexp": "^2.7.0",
     "eslint-plugin-toml": "^0.12.0",
     "eslint-plugin-unicorn": "^57.0.0",
@@ -139,7 +139,7 @@
     "prettier-plugin-astro": "^0.14.1",
     "prettier-plugin-slidev": "^1.0.5",
     "simple-git-hooks": "^2.11.1",
-    "svelte": "^5.22.5",
+    "svelte": "^5.22.6",
     "svelte-eslint-parser": "^1.0.1",
     "tinyglobby": "^0.2.12",
     "tsup": "^8.4.0",
@@ -147,13 +147,7 @@
     "typescript": "^5.8.2",
     "vitest": "^3.0.8",
     "vue": "^3.5.13",
-    "@antfu/eslint-config": "4.7.0"
-  },
-  "resolutions": {
-    "@eslint-community/eslint-utils": "^4.4.1",
-    "@typescript-eslint/utils": "^8.26.0",
-    "eslint": "^9.21.0",
-    "tsx": "^4.19.3"
+    "@antfu/eslint-config": "4.8.1"
   },
   "simple-git-hooks": {
     "pre-commit": "npx lint-staged"