@icebreakers/eslint-config 6.0.0 → 7.0.1

package/README.md

@@ -50,8 +50,10 @@ export default icebreaker({
   query: true,
   typescript: true,
   test: true,
-  tailwindcss: {
-    tailwindConfig: './tailwind.config.ts',
+  tailwindcss: true,
+  betterTailwindcss: {
+    entryPoint: './src/tailwind.css',
+    rules: 'recommended',
   },
   unocss: {
     strict: true,
@@ -69,7 +71,8 @@ export default icebreaker({
 - `vue` – enables Vue + optionally version specific overrides (Vue 2/3) and ionic/miniProgram adjustments.
 - `react` – defers to the upstream React preset. The required React core lint plugins are bundled with this package; React accessibility still requires `eslint-plugin-jsx-a11y` when `a11y` is enabled.
 - `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.
+- `tailwindcss` – pass `true` to enable `eslint-plugin-tailwindcss`.
+- `betterTailwindcss` – pass `true` or `{ entryPoint, tailwindConfig }` to enable `eslint-plugin-better-tailwindcss` for Tailwind v4/v3 projects. Object mode defaults to fast syntax checks (`no-duplicate-classes` and `no-unnecessary-whitespace`) and scopes relative entry points to their source directory; set `rules: 'recommended'` to opt into the full recommended preset.
 - `unocss` – pass `true` to use the upstream Antfu UnoCSS preset, or provide `{ strict, attributify, configPath }` to keep the same preset while using the Icebreaker wrapper API.
 - `mdx` – activates MDX linting via `eslint-plugin-mdx`.
 - `a11y` – wires in JSX (React) and Vue accessibility plugins. Missing framework-specific plugins are skipped independently.

package/README.zh.md

@@ -76,8 +76,10 @@ export default icebreaker({
   query: true,
   typescript: true,
   test: true,
-  tailwindcss: {
-    tailwindConfig: './tailwind.config.ts',
+  tailwindcss: true,
+  betterTailwindcss: {
+    entryPoint: './src/tailwind.css',
+    rules: 'recommended',
   },
   mdx: process.env.LINT_MDX === 'true',
   a11y: true,
@@ -92,7 +94,8 @@ export default icebreaker({
 - `vue`：启用 Vue 规则，可根据 Vue 2/3 自动切换，并在 `ionic`、`miniProgram` 选项开启时追加对应覆盖。
 - `react`：复用上游 React 预设；React 核心 lint 插件已内置在当前包里，配合 `a11y` 使用的 React 无障碍插件仍需按需安装。
 - `query`：按需启用 TanStack Query 插件（`@tanstack/eslint-plugin-query`）及其推荐规则；缺少插件时按 no-op 处理。
-- `tailwindcss`：传入 `true` 使用内置 Tailwind flat 配置，或通过对象指定 Tailwind v4 的入口文件 / v3 的配置文件路径。
+- `tailwindcss`：传入 `true` 启用 `eslint-plugin-tailwindcss`。
+- `betterTailwindcss`：传入 `true` 或 `{ entryPoint, tailwindConfig }` 启用 `eslint-plugin-better-tailwindcss`，用于 Tailwind v4 / v3 项目。对象模式默认只启用较快的语法检查（`no-duplicate-classes` 和 `no-unnecessary-whitespace`），并会把相对入口文件限制到对应源码目录；如需完整推荐规则，可设置 `rules: 'recommended'`。
 - `mdx`：激活 `eslint-plugin-mdx` 处理 `.mdx` 文件。
 - `a11y`：按需引入 JSX 与 Vue 的无障碍规则，缺少某一侧插件时只跳过对应框架配置。
 - `typescript`：开启 TypeScript 预设，加强未使用诊断，可与 `nestjs` 搭配使用以获得 Nest 专属优化。

package/dist/index.cjs

@@ -1,16 +1,47 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_rolldown_runtime = require("./rolldown-runtime-DzWaZAza.cjs");
+//#region \0rolldown/runtime.js
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __exportAll = (all, no_symbols) => {
+	let target = {};
+	for (var name in all) __defProp(target, name, {
+		get: all[name],
+		enumerable: true
+	});
+	if (!no_symbols) __defProp(target, Symbol.toStringTag, { value: "Module" });
+	return target;
+};
+var __copyProps = (to, from, except, desc) => {
+	if (from && typeof from === "object" || typeof from === "function") for (var keys = __getOwnPropNames(from), i = 0, n = keys.length, key; i < n; i++) {
+		key = keys[i];
+		if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
+			get: ((k) => from[k]).bind(null, key),
+			enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
+		});
+	}
+	return to;
+};
+var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
+	value: mod,
+	enumerable: true
+}) : target, mod));
+//#endregion
+let node_module = require("node:module");
 let node_path = require("node:path");
-node_path = require_rolldown_runtime.__toESM(node_path, 1);
-let node_process = require("node:process");
-node_process = require_rolldown_runtime.__toESM(node_process, 1);
+node_path = __toESM(node_path, 1);
 let node_fs = require("node:fs");
-node_fs = require_rolldown_runtime.__toESM(node_fs, 1);
-let node_module = require("node:module");
+node_fs = __toESM(node_fs, 1);
+let node_process = require("node:process");
+node_process = __toESM(node_process, 1);
 let node_url = require("node:url");
 //#region src/antfu.ts
-var antfu_exports = /* @__PURE__ */ require_rolldown_runtime.__exportAll({});
-require_rolldown_runtime.__reExport(antfu_exports, require("@antfu/eslint-config"));
+var antfu_exports = /* @__PURE__ */ __exportAll({});
+__reExport(antfu_exports, require("@antfu/eslint-config"));
 //#endregion
 //#region src/defaults.ts
 const nestjsTypeScriptRules = {
@@ -99,14 +130,14 @@ function getDefaultTypescriptOptions(opts) {
 }
 //#endregion
 //#region src/utils.ts
-const require$2 = (0, node_module.createRequire)(require("url").pathToFileURL(__filename).href);
+const require$3 = (0, node_module.createRequire)(require("url").pathToFileURL(__filename).href);
 const PACKAGE_DIR = node_path.default.dirname((0, node_url.fileURLToPath)(require("url").pathToFileURL(__filename).href));
 function isObject(o) {
 	return Object.prototype.toString.call(o) === "[object Object]";
 }
 function isPackageAvailable$1(name, searchPaths = [node_process.default.cwd(), PACKAGE_DIR]) {
 	try {
-		require$2.resolve(name, { paths: searchPaths });
+		require$3.resolve(name, { paths: searchPaths });
 		return true;
 	} catch {
 		const packageSegments = name.split("/");
@@ -128,13 +159,14 @@ function hasAllPackages(names, searchPaths) {
 //#endregion
 //#region src/features.ts
 const BETTER_TAILWIND_PACKAGES = ["eslint-plugin-better-tailwindcss"];
-const TAILWIND_PACKAGES = ["eslint-plugin-tailwindcss"];
+const TAILWIND_PACKAGES = ["eslint-plugin-tailwindcss", "tailwindcss"];
 const STYLELINT_BRIDGE_PACKAGES = ["eslint-plugin-better-stylelint"];
 const MDX_PACKAGES = ["eslint-plugin-mdx"];
 const VUE_A11Y_PACKAGES = ["eslint-plugin-vuejs-accessibility"];
 const REACT_A11Y_PACKAGES = ["eslint-plugin-jsx-a11y"];
 const QUERY_PACKAGES = ["@tanstack/eslint-plugin-query"];
-const BETTER_TAILWIND_FILES = ["**/*.{js,mjs,cjs,ts,mts,cts,jsx,tsx,vue,html,md,mdx,astro,svelte}"];
+const BETTER_TAILWIND_EXTENSIONS = "js,mjs,cjs,ts,mts,cts,jsx,tsx,vue,html,md,mdx,astro,svelte";
+const BETTER_TAILWIND_FILES = [`**/*.{${BETTER_TAILWIND_EXTENSIONS}}`];
 const BETTER_TAILWIND_IGNORES = [
 	"**/*.json",
 	"**/*.json5",
@@ -152,38 +184,69 @@ const BETTER_TAILWIND_IGNORES = [
 	"**/Gemfile.lock",
 	"**/go.sum"
 ];
+const BETTER_TAILWIND_SYNTAX_RULES = {
+	"better-tailwindcss/no-duplicate-classes": "warn",
+	"better-tailwindcss/no-unnecessary-whitespace": "warn"
+};
+const require$2 = (0, node_module.createRequire)(require("url").pathToFileURL(__filename).href);
+function interopPluginDefault(modulePromise) {
+	return (0, antfu_exports.interopDefault)(modulePromise);
+}
 function resolveStylelintConfigLoader(moduleUrl = require("url").pathToFileURL(__filename).href) {
 	return moduleUrl.endsWith(".ts") ? new URL("./stylelint.ts", moduleUrl).href : new URL("./stylelint.js", moduleUrl).href;
 }
+function resolveDefaultTailwindCssConfigPath() {
+	try {
+		return require$2.resolve("tailwindcss/index.css");
+	} catch {
+		return;
+	}
+}
+function normalizeGlobPath(filePath) {
+	return filePath.replaceAll(node_path.default.sep, "/").replace(/^\.\//, "");
+}
+function resolveBetterTailwindFiles(option) {
+	if (option.files?.length) return option.files;
+	if (!option.entryPoint || node_path.default.isAbsolute(option.entryPoint)) return BETTER_TAILWIND_FILES;
+	const sourceDir = normalizeGlobPath(node_path.default.dirname(option.entryPoint));
+	if (!sourceDir || sourceDir === ".") return BETTER_TAILWIND_FILES;
+	return [`${sourceDir}/**/*.{${BETTER_TAILWIND_EXTENSIONS}}`];
+}
+function resolveBetterTailwindRules(plugin, option) {
+	if (option.rules === "recommended") return plugin.configs.recommended?.rules ?? {};
+	return BETTER_TAILWIND_SYNTAX_RULES;
+}
+function resolveBetterTailwindPresets(option) {
+	if (!option) return [];
+	if (!hasAllPackages(BETTER_TAILWIND_PACKAGES)) return [];
+	const betterTailwindcssOption = typeof option === "object" ? option : {};
+	return [interopPluginDefault(import("eslint-plugin-better-tailwindcss")).then((eslintPluginBetterTailwindcss) => {
+		const betterTailwindcssRules = resolveBetterTailwindRules(eslintPluginBetterTailwindcss, betterTailwindcssOption);
+		return {
+			name: "icebreaker/better-tailwindcss",
+			files: resolveBetterTailwindFiles(betterTailwindcssOption),
+			ignores: BETTER_TAILWIND_IGNORES,
+			plugins: { "better-tailwindcss": eslintPluginBetterTailwindcss },
+			rules: betterTailwindcssRules,
+			settings: { "better-tailwindcss": {
+				cwd: betterTailwindcssOption.cwd,
+				entryPoint: betterTailwindcssOption.entryPoint,
+				tailwindConfig: betterTailwindcssOption.tailwindConfig
+			} }
+		};
+	})];
+}
 function resolveTailwindPresets(option) {
 	if (!option) return [];
-	if (typeof option === "object") {
-		if (!hasAllPackages(BETTER_TAILWIND_PACKAGES)) return [];
-		return [(0, antfu_exports.interopDefault)(import("eslint-plugin-better-tailwindcss")).then((eslintPluginBetterTailwindcss) => {
-			const cwd = option.cwd ?? (option.entryPoint ? node_path.default.dirname(option.entryPoint) : void 0) ?? node_process.default.cwd();
-			const betterTailwindcssRules = {
-				...eslintPluginBetterTailwindcss.configs["recommended-warn"].rules,
-				...eslintPluginBetterTailwindcss.configs["recommended-error"].rules
-			};
-			return {
-				name: "icebreaker/better-tailwindcss",
-				files: BETTER_TAILWIND_FILES,
-				ignores: BETTER_TAILWIND_IGNORES,
-				plugins: { "better-tailwindcss": eslintPluginBetterTailwindcss },
-				rules: betterTailwindcssRules,
-				settings: { "better-tailwindcss": {
-					cwd,
-					entryPoint: option.entryPoint,
-					tailwindConfig: option.tailwindConfig
-				} }
-			};
-		})];
-	}
 	if (!hasAllPackages(TAILWIND_PACKAGES)) return [];
-	return [(0, antfu_exports.interopDefault)(import("eslint-plugin-tailwindcss")).then((tailwind) => {
+	const cssConfigPath = resolveDefaultTailwindCssConfigPath();
+	return [interopPluginDefault(import("eslint-plugin-tailwindcss")).then((tailwind) => {
 		const tailwindPlugin = tailwind;
 		return tailwindPlugin.configs["flat/recommended"] ?? tailwindPlugin.configs.recommended ?? [];
-	}), { rules: { "tailwindcss/no-custom-classname": "off" } }];
+	}), {
+		...cssConfigPath ? { settings: { tailwindcss: { cssConfigPath } } } : {},
+		rules: { "tailwindcss/no-custom-classname": "off" }
+	}];
 }
 function resolveStylelintBridgeOptions(option) {
 	const { cwd, ...stylelintConfigOptions } = typeof option === "object" ? option : {};
@@ -225,7 +288,7 @@ function resolveStylelintBridgePresets(option) {
 function resolveMdxPresets(isEnabled) {
 	if (!isEnabled) return [];
 	if (!hasAllPackages(MDX_PACKAGES)) return [];
-	return [(0, antfu_exports.interopDefault)(import("eslint-plugin-mdx")).then((mdx) => {
+	return [interopPluginDefault(import("eslint-plugin-mdx")).then((mdx) => {
 		return [{
 			...mdx.flat,
 			processor: mdx.createRemarkProcessor({
@@ -241,10 +304,10 @@ function resolveMdxPresets(isEnabled) {
 function resolveAccessibilityPresets(isEnabled, vueOption, reactOption) {
 	if (!isEnabled) return [];
 	const presets = [];
-	if (vueOption && hasAllPackages(VUE_A11Y_PACKAGES)) presets.push((0, antfu_exports.interopDefault)(Promise.resolve().then(() => /* @__PURE__ */ require_rolldown_runtime.__toESM(require("./dist-Cfcd4odI.cjs").default, 1))).then((pluginVueA11y) => {
+	if (vueOption && hasAllPackages(VUE_A11Y_PACKAGES)) presets.push((0, antfu_exports.interopDefault)(import("eslint-plugin-vuejs-accessibility")).then((pluginVueA11y) => {
 		return pluginVueA11y.configs["flat/recommended"];
 	}));
-	if (reactOption && hasAllPackages(REACT_A11Y_PACKAGES)) presets.push((0, antfu_exports.interopDefault)(Promise.resolve().then(() => /* @__PURE__ */ require_rolldown_runtime.__toESM(require("./lib-CcedSpss.cjs").default, 1))).then((jsxA11y) => {
+	if (reactOption && hasAllPackages(REACT_A11Y_PACKAGES)) presets.push((0, antfu_exports.interopDefault)(import("eslint-plugin-jsx-a11y")).then((jsxA11y) => {
 		return jsxA11y.flatConfigs.recommended;
 	}));
 	return presets;
@@ -259,7 +322,7 @@ function resolveNestPresets(isEnabled) {
 function resolveQueryPresets(isEnabled) {
 	if (!isEnabled) return [];
 	if (!hasAllPackages(QUERY_PACKAGES)) return [];
-	return [(0, antfu_exports.interopDefault)(Promise.resolve().then(() => require("./modern-y8Mo-zyc.cjs"))).then((pluginQuery) => pluginQuery.configs["flat/recommended"])];
+	return [interopPluginDefault(Promise.resolve().then(() => require("./modern-Dnpu3mfI.cjs"))).then((pluginQuery) => pluginQuery.configs["flat/recommended"])];
 }
 //#endregion
 //#region ../../node_modules/.pnpm/defu@6.1.7/node_modules/defu/dist/defu.mjs
@@ -456,6 +519,11 @@ function resolveUserOptions(options) {
 		resolved.miniProgram = true;
 		delete resolved.weapp;
 	}
+	const legacyTailwindcssOption = resolved.tailwindcss;
+	if (isObject(legacyTailwindcssOption)) {
+		resolved.betterTailwindcss ??= legacyTailwindcssOption;
+		delete resolved.tailwindcss;
+	}
 	const resolvedVue = mergeOptionWithDefaults(resolved.vue, getDefaultVueOptions(options), { postProcess: applyVueVersionSpecificRules });
 	if (resolvedVue === void 0) delete resolved.vue;
 	else resolved.vue = resolvedVue;
@@ -521,7 +589,7 @@ function getPresets(options, mode) {
 		languageOptions: { parser: antfu_exports.parserPlain },
 		rules: {}
 	});
-	presets.push(...resolveStylelintBridgePresets(resolved.stylelint), ...resolveTailwindPresets(resolved.tailwindcss), ...resolveMdxPresets(resolved.mdx), ...resolveNestPresets(resolved.nestjs), ...resolveQueryPresets(resolved.query), ...resolveAccessibilityPresets(resolved.a11y, resolved.vue, resolved.react));
+	presets.push(...resolveStylelintBridgePresets(resolved.stylelint), ...resolveTailwindPresets(resolved.tailwindcss), ...resolveBetterTailwindPresets(resolved.betterTailwindcss), ...resolveMdxPresets(resolved.mdx), ...resolveNestPresets(resolved.nestjs), ...resolveQueryPresets(resolved.query), ...resolveAccessibilityPresets(resolved.a11y, resolved.vue, resolved.react));
 	return [resolved, ...presets];
 }
 //#endregion
@@ -646,7 +714,7 @@ 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) => {
+	if (typeof userConfig?.then === "function") return userConfig.then((resolved) => {
 		return isComposer(resolved) ? resolved : normalizeResolvedUserConfig(resolved);
 	});
 	const resolvedUserConfig = userConfig;