@icebreakers/eslint-config 2.1.2 → 3.0.1

package/README.md

@@ -8,7 +8,7 @@
 
 ## Requirements
 
-- Node.js 18 or newer
+- Node.js 22 or newer
 - ESLint 9 with flat config support
 - 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`)

package/README.zh.md

@@ -6,7 +6,7 @@
 
 ## 环境要求
 
-- Node.js 18 或更高版本
+- Node.js 22 或更高版本
 - 支持 Flat Config 的 ESLint 9
 - React 相关插件已随当前包一起分发。Next.js、Query 等生态预设仍保持可选，缺失时会自动跳过对应配置，而不是在解析时直接报错。
 - 如需启用 Tailwind、MDX、UnoCSS 等，可安装对应的可选依赖：`eslint-plugin-tailwindcss` / `eslint-plugin-better-tailwindcss`、`eslint-plugin-mdx`、`@unocss/eslint-plugin`

package/dist/index.cjs

@@ -345,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",
@@ -563,13 +563,41 @@ function normalizeOptionalAntfuFeatures(options) {
 	if (normalized.nextjs && !hasAllPackages([...OPTIONAL_ANTFU_FEATURE_PACKAGES.nextjs])) normalized.nextjs = false;
 	return normalized;
 }
+function hasGlobalIgnoreShape(config) {
+	const keys = Object.keys(config).filter((key) => key !== "name");
+	return keys.length === 1 && keys[0] === "ignores";
+}
+function liftConfigIgnores(config) {
+	if (!("ignores" in config) || config.ignores == null || hasGlobalIgnoreShape(config) || "files" in config) return config;
+	const { ignores, name, ...rest } = config;
+	return [{
+		...name ? { name: `${name}/ignores` } : {},
+		ignores
+	}, {
+		...name ? { name } : {},
+		...rest
+	}];
+}
+function normalizeResolvedUserConfig(userConfig) {
+	if (Array.isArray(userConfig)) return userConfig.flatMap((config) => liftConfigIgnores(config));
+	return liftConfigIgnores(userConfig);
+}
+function isComposer(value) {
+	return !!value && typeof value === "object" && "toConfigs" in value && typeof value.toConfigs === "function";
+}
+function normalizeUserConfig(userConfig) {
+	if (typeof userConfig?.then === "function") return Promise.resolve(userConfig).then((resolved) => {
+		return isComposer(resolved) ? resolved : normalizeResolvedUserConfig(resolved);
+	});
+	return isComposer(userConfig) ? userConfig : normalizeResolvedUserConfig(userConfig);
+}
 function icebreaker(options = {}, ...userConfigs) {
 	const [resolved, ...presets] = getPresets(options);
-	return (0, antfu_exports.antfu)(normalizeOptionalAntfuFeatures(resolved), ...presets, ...userConfigs);
+	return (0, antfu_exports.antfu)(normalizeOptionalAntfuFeatures(resolved), ...presets, ...userConfigs.map(normalizeUserConfig));
 }
 function icebreakerLegacy(options = {}, ...userConfigs) {
 	const [resolved, ...presets] = getPresets(options, "legacy");
-	return (0, antfu_exports.antfu)(normalizeOptionalAntfuFeatures(resolved), ...presets, ...userConfigs);
+	return (0, antfu_exports.antfu)(normalizeOptionalAntfuFeatures(resolved), ...presets, ...userConfigs.map(normalizeUserConfig));
 }
 //#endregion
 exports.__toESM = __toESM;

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

@@ -336,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",
@@ -554,13 +554,41 @@ function normalizeOptionalAntfuFeatures(options) {
 	if (normalized.nextjs && !hasAllPackages([...OPTIONAL_ANTFU_FEATURE_PACKAGES.nextjs])) normalized.nextjs = false;
 	return normalized;
 }
+function hasGlobalIgnoreShape(config) {
+	const keys = Object.keys(config).filter((key) => key !== "name");
+	return keys.length === 1 && keys[0] === "ignores";
+}
+function liftConfigIgnores(config) {
+	if (!("ignores" in config) || config.ignores == null || hasGlobalIgnoreShape(config) || "files" in config) return config;
+	const { ignores, name, ...rest } = config;
+	return [{
+		...name ? { name: `${name}/ignores` } : {},
+		ignores
+	}, {
+		...name ? { name } : {},
+		...rest
+	}];
+}
+function normalizeResolvedUserConfig(userConfig) {
+	if (Array.isArray(userConfig)) return userConfig.flatMap((config) => liftConfigIgnores(config));
+	return liftConfigIgnores(userConfig);
+}
+function isComposer(value) {
+	return !!value && typeof value === "object" && "toConfigs" in value && typeof value.toConfigs === "function";
+}
+function normalizeUserConfig(userConfig) {
+	if (typeof userConfig?.then === "function") return Promise.resolve(userConfig).then((resolved) => {
+		return isComposer(resolved) ? resolved : normalizeResolvedUserConfig(resolved);
+	});
+	return isComposer(userConfig) ? userConfig : normalizeResolvedUserConfig(userConfig);
+}
 function icebreaker(options = {}, ...userConfigs) {
 	const [resolved, ...presets] = getPresets(options);
-	return (0, antfu_exports.antfu)(normalizeOptionalAntfuFeatures(resolved), ...presets, ...userConfigs);
+	return (0, antfu_exports.antfu)(normalizeOptionalAntfuFeatures(resolved), ...presets, ...userConfigs.map(normalizeUserConfig));
 }
 function icebreakerLegacy(options = {}, ...userConfigs) {
 	const [resolved, ...presets] = getPresets(options, "legacy");
-	return (0, antfu_exports.antfu)(normalizeOptionalAntfuFeatures(resolved), ...presets, ...userConfigs);
+	return (0, antfu_exports.antfu)(normalizeOptionalAntfuFeatures(resolved), ...presets, ...userConfigs.map(normalizeUserConfig));
 }
 //#endregion
 export { getPresets, icebreaker, icebreakerLegacy };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@icebreakers/eslint-config",
   "type": "module",
-  "version": "2.1.2",
+  "version": "3.0.1",
   "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,8 +50,8 @@
     }
   },
   "dependencies": {
-    "@antfu/eslint-config": "7.7.3",
-    "@eslint-react/eslint-plugin": "^2.13.0",
+    "@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",
@@ -57,11 +60,11 @@
     "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.2"
+    "eslint-plugin-better-stylelint": "0.1.3"
   },
   "optionalDependencies": {
-    "@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-mdx": "3.7.0"
   },