@icebreakers/eslint-config 2.1.1 → 3.0.0

package/README.md

@@ -8,9 +8,9 @@
 
 ## Requirements
 
-- Node.js 18 or newer
+- Node.js 22 or newer
 - ESLint 9 with flat config support
-- React and Next related plugins are optional. If they are missing, `react`, `nextjs`, `query`, and React-side `a11y` helpers are skipped automatically instead of failing config resolution.
+- React related plugins are bundled with this package. Next.js, Query, and other ecosystem presets remain optional and are skipped automatically when their plugins are missing.
 - Install optional peer plugins when you turn on Tailwind (`eslint-plugin-tailwindcss` or `eslint-plugin-better-tailwindcss`), MDX (`eslint-plugin-mdx`), or UnoCSS (`@unocss/eslint-plugin`)
 
 ## Installation
@@ -64,7 +64,7 @@ export default icebreaker({
 
 - `miniProgram` – injects Mini Program globals, ignores common outputs/config files, and enables Vue-side Mini Program compatibility tweaks when `vue` is on.
 - `vue` – enables Vue + optionally version specific overrides (Vue 2/3) and ionic/miniProgram adjustments.
-- `react` – defers to the upstream React preset and unlocks accessibility helpers when `a11y` is enabled. If the React plugin set is not installed, this flag is ignored automatically.
+- `react` – defers to the upstream React preset and unlocks accessibility helpers when `a11y` is enabled. The required React lint plugins are bundled with this package.
 - `query` – toggles the TanStack Query plugin (`@tanstack/eslint-plugin-query`) and its recommended lint rules. Missing plugin installs are treated as a no-op.
 - `tailwindcss` – pass `true` to use the built-in Tailwind flat config or provide `{ entryPoint, tailwindConfig }` for Tailwind v4/v3 projects.
 - `mdx` – activates MDX linting via `eslint-plugin-mdx`.

package/README.zh.md

@@ -6,9 +6,9 @@
 
 ## 环境要求
 
-- Node.js 18 或更高版本
+- Node.js 22 或更高版本
 - 支持 Flat Config 的 ESLint 9
-- React / Next 相关插件现在是可选项。缺失时会自动跳过 `react`、`nextjs`、`query` 以及 React 侧的 `a11y` 配置，而不是在解析配置时直接报错。
+- React 相关插件已随当前包一起分发。Next.js、Query 等生态预设仍保持可选，缺失时会自动跳过对应配置，而不是在解析时直接报错。
 - 如需启用 Tailwind、MDX、UnoCSS 等，可安装对应的可选依赖：`eslint-plugin-tailwindcss` / `eslint-plugin-better-tailwindcss`、`eslint-plugin-mdx`、`@unocss/eslint-plugin`
 
 ## 安装
@@ -62,7 +62,7 @@ export default icebreaker({
 
 - `miniProgram`：启用小程序预设，注入全局变量、忽略常见产物/配置文件，并在 `vue: true` 时补充小程序模板兼容调整。
 - `vue`：启用 Vue 规则，可根据 Vue 2/3 自动切换，并在 `ionic`、`miniProgram` 选项开启时追加对应覆盖。
-- `react`：复用上游 React 预设，配合 `a11y` 注入无障碍插件；如果 React 插件组未安装，会自动忽略该选项。
+- `react`：复用上游 React 预设，配合 `a11y` 注入无障碍插件；所需的 React lint 插件已内置在当前包里。
 - `query`：按需启用 TanStack Query 插件（`@tanstack/eslint-plugin-query`）及其推荐规则；缺少插件时按 no-op 处理。
 - `tailwindcss`：传入 `true` 使用内置 Tailwind flat 配置，或通过对象指定 Tailwind v4 的入口文件 / v3 的配置文件路径。
 - `mdx`：激活 `eslint-plugin-mdx` 处理 `.mdx` 文件。

package/dist/index.cjs

@@ -31,14 +31,14 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 	enumerable: true
 }) : target, mod));
 //#endregion
+let node_fs = require("node:fs");
+node_fs = __toESM(node_fs);
 let node_module = require("node:module");
 let node_path = require("node:path");
 node_path = __toESM(node_path);
 let node_process = require("node:process");
 node_process = __toESM(node_process);
 let node_url = require("node:url");
-let node_fs = require("node:fs");
-node_fs = __toESM(node_fs);
 //#region src/antfu.ts
 var antfu_exports = /* @__PURE__ */ __exportAll({});
 __reExport(antfu_exports, require("@antfu/eslint-config"));
@@ -163,7 +163,17 @@ function isPackageAvailable$1(name, searchPaths = [node_process.default.cwd(), P
 		require$2.resolve(name, { paths: searchPaths });
 		return true;
 	} catch {
-		return false;
+		const packageSegments = name.split("/");
+		return searchPaths.some((searchPath) => {
+			let currentDir = node_path.default.resolve(searchPath);
+			while (true) {
+				const packageJsonPath = node_path.default.join(currentDir, "node_modules", ...packageSegments, "package.json");
+				if (node_fs.default.existsSync(packageJsonPath)) return true;
+				const parentDir = node_path.default.dirname(currentDir);
+				if (parentDir === currentDir) return false;
+				currentDir = parentDir;
+			}
+		});
 	}
 }
 function hasAllPackages(names, searchPaths) {
@@ -335,7 +345,7 @@ const BASE_DEFAULTS = {
 };
 const BASE_RULES = {
 	"dot-notation": "off",
-	"e18e/ban-dependencies": "warn",
+	"e18e/ban-dependencies": ["warn", { allowed: ["axios", "lint-staged"] }],
 	"e18e/prefer-array-to-sorted": "off",
 	"pnpm/json-enforce-catalog": "off",
 	"pnpm/json-prefer-workspace-settings": "off",

package/dist/index.d.cts

@@ -758,7 +758,7 @@ interface ConfigObject<Rules extends RulesConfig = RulesConfig> {
    * An object containing a name-value mapping of plugin names to plugin objects.
    * When files is specified, these plugins are only available to the matching files.
    */
-  plugins?: Record<string, Plugin$1>;
+  plugins?: Record<string, Plugin$2>;
   /**
    * An object containing the configured rules. When files or ignores are specified,
    * these rule configurations are only available to the matching files.
@@ -974,7 +974,7 @@ interface Processor<T extends string | ProcessorFile$1 = string | ProcessorFile$
   /** The function to merge messages. */
   postprocess?(messages: LintMessage$1[][], filename: string): LintMessage$1[];
 }
-interface Plugin$1 extends ObjectMetaProperties {
+interface Plugin$2 extends ObjectMetaProperties {
   meta?: ObjectMetaProperties["meta"] & {
     namespace?: string | undefined;
   };
@@ -1327,6 +1327,7 @@ interface ConfigWithExtends$1 extends ConfigObject {
 }
 //#endregion
 //#region ../../node_modules/.pnpm/@eslint+config-helpers@0.5.3/node_modules/@eslint/config-helpers/dist/esm/index.d.ts
+type Plugin$1 = Plugin$2;
 type ConfigWithExtends = ConfigWithExtends$1;
 //#endregion
 //#region ../../node_modules/.pnpm/@types+estree@1.0.8/node_modules/@types/estree/index.d.ts
@@ -2536,7 +2537,7 @@ declare namespace ESLint {
   type ConfigData<Rules extends Linter.RulesRecord = RulesConfig> = Omit<Linter.LegacyConfig<Rules>, "$schema">;
   type Environment = EnvironmentConfig;
   type ObjectMetaProperties = ObjectMetaProperties;
-  type Plugin = Plugin$1;
+  type Plugin = Plugin$2;
   type FixType = "directive" | "problem" | "suggestion" | "layout";
   type CacheStrategy = "content" | "metadata";
   /** The options with which to configure the ESLint instance. */
@@ -2704,7 +2705,34 @@ declare namespace ESLint {
   type EditInfo = Rule.Fix;
 }
 //#endregion
-//#region ../../node_modules/.pnpm/eslint-flat-config-utils@3.0.2/node_modules/eslint-flat-config-utils/dist/index.d.mts
+//#region ../../node_modules/.pnpm/eslint-flat-config-utils@3.1.0/node_modules/eslint-flat-config-utils/dist/index.d.mts
+/**
+ * The options for `renamePluginsInConfigs`
+ */
+interface RenamePluginsInConfigsOptions {
+  /**
+   * Resolve conflicts by merging plugins.
+   *
+   * Note there is no guarantee that the result works the same as the original configs.
+   *
+   * @default false
+   */
+  mergePlugins?: boolean;
+}
+/**
+ * Rename plugin names a flat configs array
+ *
+ * @example
+ * ```ts
+ * import { renamePluginsInConfigs } from 'eslint-flat-config-utils'
+ * import someConfigs from './some-configs'
+ *
+ * export default renamePluginsInConfigs(someConfigs, {
+ *   '@typescript-eslint': 'ts',
+ *   'import-x': 'import',
+ * })
+ * ```
+ */
 /**
  * A type that can be awaited. Promise<T> or T.
  */
@@ -2800,6 +2828,7 @@ declare class FlatConfigComposer<T extends object = ConfigWithExtends, ConfigNam
   private _operationsOverrides;
   private _operationsResolved;
   private _renames;
+  private _renamesOptions;
   private _pluginsConflictsError;
   constructor(...configs: ResolvableFlatConfig<T>[]);
   /**
@@ -2807,7 +2836,7 @@ declare class FlatConfigComposer<T extends object = ConfigWithExtends, ConfigNam
    *
    * This will runs after all config items are resolved. Applies to `plugins` and `rules`.
    */
-  renamePlugins(renames: Record<string, string>): this;
+  renamePlugins(renames: Record<string, string>, options?: RenamePluginsInConfigsOptions): this;
   /**
    * Append configs to the end of the current configs array.
    */
@@ -2883,7 +2912,25 @@ declare class FlatConfigComposer<T extends object = ConfigWithExtends, ConfigNam
   /**
    * Remove a specific config by name or index.
    */
-  remove(nameOrIndex: ConfigNames | string | number): this;
+  remove(nameOrIndex: StringLiteralUnion<ConfigNames, string | number>): this;
+  /**
+   * Replace a plugin with another.
+   *
+   * @example
+   * ```ts
+   * composer
+   *   .replacePlugin('foo', (fooPlugin) => ({
+   *     ...fooPlugin,
+   *     rules: {
+   *       ...fooPlugin.rules,
+   *       someNewRule,
+   *     },
+   *   }))
+   * ```
+   *
+   * The `plugins: { foo }` will be replaced from all configs with a new plugin that is a merge of it and the `bar` plugin
+   */
+  replacePlugin(name: string, replacement: Awaitable$1<Plugin$1> | ((original: Plugin$1) => Awaitable$1<Plugin$1>)): this;
   /**
    * Replace a specific config by name or index.
    *

package/dist/index.d.ts

@@ -758,7 +758,7 @@ interface ConfigObject<Rules extends RulesConfig = RulesConfig> {
    * An object containing a name-value mapping of plugin names to plugin objects.
    * When files is specified, these plugins are only available to the matching files.
    */
-  plugins?: Record<string, Plugin$1>;
+  plugins?: Record<string, Plugin$2>;
   /**
    * An object containing the configured rules. When files or ignores are specified,
    * these rule configurations are only available to the matching files.
@@ -974,7 +974,7 @@ interface Processor<T extends string | ProcessorFile$1 = string | ProcessorFile$
   /** The function to merge messages. */
   postprocess?(messages: LintMessage$1[][], filename: string): LintMessage$1[];
 }
-interface Plugin$1 extends ObjectMetaProperties {
+interface Plugin$2 extends ObjectMetaProperties {
   meta?: ObjectMetaProperties["meta"] & {
     namespace?: string | undefined;
   };
@@ -1327,6 +1327,7 @@ interface ConfigWithExtends$1 extends ConfigObject {
 }
 //#endregion
 //#region ../../node_modules/.pnpm/@eslint+config-helpers@0.5.3/node_modules/@eslint/config-helpers/dist/esm/index.d.ts
+type Plugin$1 = Plugin$2;
 type ConfigWithExtends = ConfigWithExtends$1;
 //#endregion
 //#region ../../node_modules/.pnpm/@types+estree@1.0.8/node_modules/@types/estree/index.d.ts
@@ -2536,7 +2537,7 @@ declare namespace ESLint {
   type ConfigData<Rules extends Linter.RulesRecord = RulesConfig> = Omit<Linter.LegacyConfig<Rules>, "$schema">;
   type Environment = EnvironmentConfig;
   type ObjectMetaProperties = ObjectMetaProperties;
-  type Plugin = Plugin$1;
+  type Plugin = Plugin$2;
   type FixType = "directive" | "problem" | "suggestion" | "layout";
   type CacheStrategy = "content" | "metadata";
   /** The options with which to configure the ESLint instance. */
@@ -2704,7 +2705,34 @@ declare namespace ESLint {
   type EditInfo = Rule.Fix;
 }
 //#endregion
-//#region ../../node_modules/.pnpm/eslint-flat-config-utils@3.0.2/node_modules/eslint-flat-config-utils/dist/index.d.mts
+//#region ../../node_modules/.pnpm/eslint-flat-config-utils@3.1.0/node_modules/eslint-flat-config-utils/dist/index.d.mts
+/**
+ * The options for `renamePluginsInConfigs`
+ */
+interface RenamePluginsInConfigsOptions {
+  /**
+   * Resolve conflicts by merging plugins.
+   *
+   * Note there is no guarantee that the result works the same as the original configs.
+   *
+   * @default false
+   */
+  mergePlugins?: boolean;
+}
+/**
+ * Rename plugin names a flat configs array
+ *
+ * @example
+ * ```ts
+ * import { renamePluginsInConfigs } from 'eslint-flat-config-utils'
+ * import someConfigs from './some-configs'
+ *
+ * export default renamePluginsInConfigs(someConfigs, {
+ *   '@typescript-eslint': 'ts',
+ *   'import-x': 'import',
+ * })
+ * ```
+ */
 /**
  * A type that can be awaited. Promise<T> or T.
  */
@@ -2800,6 +2828,7 @@ declare class FlatConfigComposer<T extends object = ConfigWithExtends, ConfigNam
   private _operationsOverrides;
   private _operationsResolved;
   private _renames;
+  private _renamesOptions;
   private _pluginsConflictsError;
   constructor(...configs: ResolvableFlatConfig<T>[]);
   /**
@@ -2807,7 +2836,7 @@ declare class FlatConfigComposer<T extends object = ConfigWithExtends, ConfigNam
    *
    * This will runs after all config items are resolved. Applies to `plugins` and `rules`.
    */
-  renamePlugins(renames: Record<string, string>): this;
+  renamePlugins(renames: Record<string, string>, options?: RenamePluginsInConfigsOptions): this;
   /**
    * Append configs to the end of the current configs array.
    */
@@ -2883,7 +2912,25 @@ declare class FlatConfigComposer<T extends object = ConfigWithExtends, ConfigNam
   /**
    * Remove a specific config by name or index.
    */
-  remove(nameOrIndex: ConfigNames | string | number): this;
+  remove(nameOrIndex: StringLiteralUnion<ConfigNames, string | number>): this;
+  /**
+   * Replace a plugin with another.
+   *
+   * @example
+   * ```ts
+   * composer
+   *   .replacePlugin('foo', (fooPlugin) => ({
+   *     ...fooPlugin,
+   *     rules: {
+   *       ...fooPlugin.rules,
+   *       someNewRule,
+   *     },
+   *   }))
+   * ```
+   *
+   * The `plugins: { foo }` will be replaced from all configs with a new plugin that is a merge of it and the `bar` plugin
+   */
+  replacePlugin(name: string, replacement: Awaitable$1<Plugin$1> | ((original: Plugin$1) => Awaitable$1<Plugin$1>)): this;
   /**
    * Replace a specific config by name or index.
    *

package/dist/index.js

@@ -1,8 +1,8 @@
 import { createRequire } from "node:module";
+import fs from "node:fs";
 import path from "node:path";
 import process from "node:process";
 import { fileURLToPath } from "node:url";
-import fs from "node:fs";
 //#region \0rolldown/runtime.js
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -154,7 +154,17 @@ function isPackageAvailable$1(name, searchPaths = [process.cwd(), PACKAGE_DIR])
 		require$1.resolve(name, { paths: searchPaths });
 		return true;
 	} catch {
-		return false;
+		const packageSegments = name.split("/");
+		return searchPaths.some((searchPath) => {
+			let currentDir = path.resolve(searchPath);
+			while (true) {
+				const packageJsonPath = path.join(currentDir, "node_modules", ...packageSegments, "package.json");
+				if (fs.existsSync(packageJsonPath)) return true;
+				const parentDir = path.dirname(currentDir);
+				if (parentDir === currentDir) return false;
+				currentDir = parentDir;
+			}
+		});
 	}
 }
 function hasAllPackages(names, searchPaths) {
@@ -326,7 +336,7 @@ const BASE_DEFAULTS = {
 };
 const BASE_RULES = {
 	"dot-notation": "off",
-	"e18e/ban-dependencies": "warn",
+	"e18e/ban-dependencies": ["warn", { allowed: ["axios", "lint-staged"] }],
 	"e18e/prefer-array-to-sorted": "off",
 	"pnpm/json-enforce-catalog": "off",
 	"pnpm/json-prefer-workspace-settings": "off",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@icebreakers/eslint-config",
   "type": "module",
-  "version": "2.1.1",
+  "version": "3.0.0",
   "description": "ESLint preset from Icebreaker's dev-configs",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -38,6 +38,9 @@
     "dist",
     "index.d.ts"
   ],
+  "engines": {
+    "node": ">=22.0.0"
+  },
   "peerDependencies": {
     "eslint-plugin-pnpm": "^1.4.3"
   },
@@ -47,23 +50,23 @@
     }
   },
   "dependencies": {
-    "@antfu/eslint-config": "7.7.3",
+    "@antfu/eslint-config": "8.0.0",
+    "@eslint-react/eslint-plugin": "^3.0.0",
     "eslint-plugin-better-tailwindcss": "^4.3.2",
     "eslint-plugin-format": "2.0.1",
+    "eslint-plugin-jsx-a11y": "^6.10.2",
+    "eslint-plugin-react-hooks": "^7.0.1",
+    "eslint-plugin-react-refresh": "^0.5.2",
     "eslint-plugin-tailwindcss": "3.18.2",
     "eslint-plugin-vuejs-accessibility": "^2.5.0",
     "@icebreakers/stylelint-config": "2.2.1",
-    "eslint-plugin-better-stylelint": "0.1.1"
+    "eslint-plugin-better-stylelint": "0.1.3"
   },
   "optionalDependencies": {
-    "@eslint-react/eslint-plugin": "^3.0.0",
-    "@next/eslint-plugin-next": "^16.2.1",
-    "@tanstack/eslint-plugin-query": "^5.95.2",
+    "@next/eslint-plugin-next": "^16.2.2",
+    "@tanstack/eslint-plugin-query": "^5.96.1",
     "@unocss/eslint-plugin": "66.6.7",
-    "eslint-plugin-jsx-a11y": "^6.10.2",
-    "eslint-plugin-mdx": "3.7.0",
-    "eslint-plugin-react-hooks": "^7.0.1",
-    "eslint-plugin-react-refresh": "^0.5.2"
+    "eslint-plugin-mdx": "3.7.0"
   },
   "publishConfig": {
     "access": "public",