@icebreakers/eslint-config 3.0.0 → 4.0.0

package/dist/index.cjs

@@ -293,7 +293,7 @@ function resolveQueryPresets(isEnabled) {
 	return [(0, antfu_exports.interopDefault)(import("@tanstack/eslint-plugin-query")).then((pluginQuery) => pluginQuery.configs["flat/recommended"])];
 }
 //#endregion
-//#region ../../node_modules/.pnpm/defu@6.1.4/node_modules/defu/dist/defu.mjs
+//#region ../../node_modules/.pnpm/defu@6.1.6/node_modules/defu/dist/defu.mjs
 function isPlainObject(value) {
 	if (value === null || typeof value !== "object") return false;
 	const prototype = Object.getPrototypeOf(value);
@@ -304,8 +304,8 @@ function isPlainObject(value) {
 }
 function _defu(baseObject, defaults, namespace = ".", merger) {
 	if (!isPlainObject(defaults)) return _defu(baseObject, {}, namespace, merger);
-	const object = Object.assign({}, defaults);
-	for (const key in baseObject) {
+	const object = { ...defaults };
+	for (const key of Object.keys(baseObject)) {
 		if (key === "__proto__" || key === "constructor") continue;
 		const value = baseObject[key];
 		if (value === null || value === void 0) continue;
@@ -548,6 +548,29 @@ function getPresets(options, mode) {
 	return [resolved, ...presets];
 }
 //#endregion
+//#region src/polyfills.ts
+function createObjectGroupBy() {
+	return function groupBy(items, callback) {
+		const groups = {};
+		let index = 0;
+		for (const item of items) {
+			const key = callback(item, index++);
+			groups[key] ??= [];
+			groups[key].push(item);
+		}
+		return groups;
+	};
+}
+function ensureObjectGroupBy() {
+	if (typeof Object.groupBy === "function") return;
+	Object.defineProperty(Object, "groupBy", {
+		value: createObjectGroupBy(),
+		configurable: true,
+		writable: true
+	});
+}
+ensureObjectGroupBy();
+//#endregion
 //#region src/factory.ts
 const OPTIONAL_ANTFU_FEATURE_PACKAGES = {
 	react: [
@@ -563,13 +586,42 @@ 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);
+	});
+	const resolvedUserConfig = userConfig;
+	return isComposer(resolvedUserConfig) ? resolvedUserConfig : normalizeResolvedUserConfig(resolvedUserConfig);
+}
 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

@@ -3008,6 +3008,7 @@ interface StylelintBridgeOption extends IcebreakerStylelintOptions {
   cwd?: string;
 }
 type StylelintBridgeConfig = boolean | StylelintBridgeOption;
+type ResolvableUserConfig = TypedFlatConfigItem$1 | TypedFlatConfigItem$1[] | FlatConfigComposer<any, any> | Linter.Config[];
 type UserDefinedOptions = OptionsConfig & TypedFlatConfigItem$1 & {
   /**
    * Enable Mini Program support.
@@ -3056,7 +3057,7 @@ type UserDefinedOptions = OptionsConfig & TypedFlatConfigItem$1 & {
    */
   weapp?: boolean;
 };
-type UserConfigItem = Awaitable<TypedFlatConfigItem$1 | TypedFlatConfigItem$1[] | FlatConfigComposer<any, any> | Linter.Config[]>;
+type UserConfigItem = Awaitable<ResolvableUserConfig>;
 //#endregion
 //#region src/factory.d.ts
 declare function icebreaker(options?: UserDefinedOptions, ...userConfigs: UserConfigItem[]): FlatConfigComposer<TypedFlatConfigItem, ConfigNames>;

package/dist/index.d.ts

@@ -3008,6 +3008,7 @@ interface StylelintBridgeOption extends IcebreakerStylelintOptions {
   cwd?: string;
 }
 type StylelintBridgeConfig = boolean | StylelintBridgeOption;
+type ResolvableUserConfig = TypedFlatConfigItem$1 | TypedFlatConfigItem$1[] | FlatConfigComposer<any, any> | Linter.Config[];
 type UserDefinedOptions = OptionsConfig & TypedFlatConfigItem$1 & {
   /**
    * Enable Mini Program support.
@@ -3056,7 +3057,7 @@ type UserDefinedOptions = OptionsConfig & TypedFlatConfigItem$1 & {
    */
   weapp?: boolean;
 };
-type UserConfigItem = Awaitable<TypedFlatConfigItem$1 | TypedFlatConfigItem$1[] | FlatConfigComposer<any, any> | Linter.Config[]>;
+type UserConfigItem = Awaitable<ResolvableUserConfig>;
 //#endregion
 //#region src/factory.d.ts
 declare function icebreaker(options?: UserDefinedOptions, ...userConfigs: UserConfigItem[]): FlatConfigComposer<TypedFlatConfigItem, ConfigNames>;

package/dist/index.js

@@ -284,7 +284,7 @@ function resolveQueryPresets(isEnabled) {
 	return [(0, antfu_exports.interopDefault)(import("@tanstack/eslint-plugin-query")).then((pluginQuery) => pluginQuery.configs["flat/recommended"])];
 }
 //#endregion
-//#region ../../node_modules/.pnpm/defu@6.1.4/node_modules/defu/dist/defu.mjs
+//#region ../../node_modules/.pnpm/defu@6.1.6/node_modules/defu/dist/defu.mjs
 function isPlainObject(value) {
 	if (value === null || typeof value !== "object") return false;
 	const prototype = Object.getPrototypeOf(value);
@@ -295,8 +295,8 @@ function isPlainObject(value) {
 }
 function _defu(baseObject, defaults, namespace = ".", merger) {
 	if (!isPlainObject(defaults)) return _defu(baseObject, {}, namespace, merger);
-	const object = Object.assign({}, defaults);
-	for (const key in baseObject) {
+	const object = { ...defaults };
+	for (const key of Object.keys(baseObject)) {
 		if (key === "__proto__" || key === "constructor") continue;
 		const value = baseObject[key];
 		if (value === null || value === void 0) continue;
@@ -539,6 +539,29 @@ function getPresets(options, mode) {
 	return [resolved, ...presets];
 }
 //#endregion
+//#region src/polyfills.ts
+function createObjectGroupBy() {
+	return function groupBy(items, callback) {
+		const groups = {};
+		let index = 0;
+		for (const item of items) {
+			const key = callback(item, index++);
+			groups[key] ??= [];
+			groups[key].push(item);
+		}
+		return groups;
+	};
+}
+function ensureObjectGroupBy() {
+	if (typeof Object.groupBy === "function") return;
+	Object.defineProperty(Object, "groupBy", {
+		value: createObjectGroupBy(),
+		configurable: true,
+		writable: true
+	});
+}
+ensureObjectGroupBy();
+//#endregion
 //#region src/factory.ts
 const OPTIONAL_ANTFU_FEATURE_PACKAGES = {
 	react: [
@@ -554,13 +577,42 @@ 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);
+	});
+	const resolvedUserConfig = userConfig;
+	return isComposer(resolvedUserConfig) ? resolvedUserConfig : normalizeResolvedUserConfig(resolvedUserConfig);
+}
 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": "3.0.0",
+  "version": "4.0.0",
   "description": "ESLint preset from Icebreaker's dev-configs",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -39,7 +39,7 @@
     "index.d.ts"
   ],
   "engines": {
-    "node": ">=22.0.0"
+    "node": "^20.19.0 || >=22.12.0"
   },
   "peerDependencies": {
     "eslint-plugin-pnpm": "^1.4.3"
@@ -59,8 +59,8 @@
     "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.3"
+    "@icebreakers/stylelint-config": "3.0.0",
+    "eslint-plugin-better-stylelint": "1.0.0"
   },
   "optionalDependencies": {
     "@next/eslint-plugin-next": "^16.2.2",