@icebreakers/eslint-config 6.0.0 → 7.0.1

package/dist/index.js

@@ -1,8 +1,8 @@
-import { i as __reExport, o as __toESM, r as __exportAll } from "./rolldown-runtime-C8SNSOcs.js";
+import { n as __reExport, t as __exportAll } from "./rolldown-runtime-B4FMCO8f.js";
 import { createRequire } from "node:module";
 import path from "node:path";
-import process from "node:process";
 import fs from "node:fs";
+import process from "node:process";
 import { fileURLToPath } from "node:url";
 //#region src/antfu.ts
 var antfu_exports = /* @__PURE__ */ __exportAll({});
@@ -96,14 +96,14 @@ function getDefaultTypescriptOptions(opts) {
 }
 //#endregion
 //#region src/utils.ts
-const require$1 = createRequire(import.meta.url);
+const require$2 = createRequire(import.meta.url);
 const PACKAGE_DIR = path.dirname(fileURLToPath(import.meta.url));
 function isObject(o) {
 	return Object.prototype.toString.call(o) === "[object Object]";
 }
 function isPackageAvailable$1(name, searchPaths = [process.cwd(), PACKAGE_DIR]) {
 	try {
-		require$1.resolve(name, { paths: searchPaths });
+		require$2.resolve(name, { paths: searchPaths });
 		return true;
 	} catch {
 		const packageSegments = name.split("/");
@@ -125,13 +125,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",
@@ -149,38 +150,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$1 = createRequire(import.meta.url);
+function interopPluginDefault(modulePromise) {
+	return (0, antfu_exports.interopDefault)(modulePromise);
+}
 function resolveStylelintConfigLoader(moduleUrl = import.meta.url) {
 	return moduleUrl.endsWith(".ts") ? new URL("./stylelint.ts", moduleUrl).href : new URL("./stylelint.js", moduleUrl).href;
 }
+function resolveDefaultTailwindCssConfigPath() {
+	try {
+		return require$1.resolve("tailwindcss/index.css");
+	} catch {
+		return;
+	}
+}
+function normalizeGlobPath(filePath) {
+	return filePath.replaceAll(path.sep, "/").replace(/^\.\//, "");
+}
+function resolveBetterTailwindFiles(option) {
+	if (option.files?.length) return option.files;
+	if (!option.entryPoint || path.isAbsolute(option.entryPoint)) return BETTER_TAILWIND_FILES;
+	const sourceDir = normalizeGlobPath(path.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 ? path.dirname(option.entryPoint) : void 0) ?? process.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 : {};
@@ -222,7 +254,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({
@@ -238,10 +270,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)(import("./dist-DTWNkNCv.js").then((m) => /* @__PURE__ */ __toESM(m.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)(import("./lib-BOuqso-8.js").then((m) => /* @__PURE__ */ __toESM(m.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;
@@ -256,7 +288,7 @@ function resolveNestPresets(isEnabled) {
 function resolveQueryPresets(isEnabled) {
 	if (!isEnabled) return [];
 	if (!hasAllPackages(QUERY_PACKAGES)) return [];
-	return [(0, antfu_exports.interopDefault)(import("./modern-CoGNcL7O.js")).then((pluginQuery) => pluginQuery.configs["flat/recommended"])];
+	return [interopPluginDefault(import("./modern-RpY8mk7x.js")).then((pluginQuery) => pluginQuery.configs["flat/recommended"])];
 }
 //#endregion
 //#region ../../node_modules/.pnpm/defu@6.1.7/node_modules/defu/dist/defu.mjs
@@ -453,6 +485,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;
@@ -518,7 +555,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
@@ -643,7 +680,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;

package/dist/{modern-y8Mo-zyc.cjs → modern-Dnpu3mfI.cjs}

@@ -1,5 +1,5 @@
 let _typescript_eslint_utils = require("@typescript-eslint/utils");
-//#region ../../node_modules/.pnpm/@tanstack+eslint-plugin-query@5.101.1_eslint@10.5.0_jiti@2.7.0__typescript@6.0.3/node_modules/@tanstack/eslint-plugin-query/build/modern/chunk-VALYN6GR.js
+//#region ../../node_modules/.pnpm/@tanstack+eslint-plugin-query@5.101.2_eslint@10.6.0_jiti@2.7.0__typescript@6.0.3/node_modules/@tanstack/eslint-plugin-query/build/modern/chunk-VALYN6GR.js
 function uniqueBy(arr, fn) {
 	return arr.filter((x, i, a) => a.findIndex((y) => fn(x) === fn(y)) === i);
 }
@@ -1176,7 +1176,7 @@ var rules = {
 	[name8]: rule8
 };
 //#endregion
-//#region ../../node_modules/.pnpm/@tanstack+eslint-plugin-query@5.101.1_eslint@10.5.0_jiti@2.7.0__typescript@6.0.3/node_modules/@tanstack/eslint-plugin-query/build/modern/index.js
+//#region ../../node_modules/.pnpm/@tanstack+eslint-plugin-query@5.101.2_eslint@10.6.0_jiti@2.7.0__typescript@6.0.3/node_modules/@tanstack/eslint-plugin-query/build/modern/index.js
 var recommendedRules = {
 	"@tanstack/query/exhaustive-deps": "error",
 	"@tanstack/query/no-rest-destructuring": "warn",

package/dist/{modern-CoGNcL7O.js → modern-RpY8mk7x.js}

@@ -1,5 +1,5 @@
 import { AST_NODE_TYPES, ESLintUtils, TSESTree } from "@typescript-eslint/utils";
-//#region ../../node_modules/.pnpm/@tanstack+eslint-plugin-query@5.101.1_eslint@10.5.0_jiti@2.7.0__typescript@6.0.3/node_modules/@tanstack/eslint-plugin-query/build/modern/chunk-VALYN6GR.js
+//#region ../../node_modules/.pnpm/@tanstack+eslint-plugin-query@5.101.2_eslint@10.6.0_jiti@2.7.0__typescript@6.0.3/node_modules/@tanstack/eslint-plugin-query/build/modern/chunk-VALYN6GR.js
 function uniqueBy(arr, fn) {
 	return arr.filter((x, i, a) => a.findIndex((y) => fn(x) === fn(y)) === i);
 }
@@ -1176,7 +1176,7 @@ var rules = {
 	[name8]: rule8
 };
 //#endregion
-//#region ../../node_modules/.pnpm/@tanstack+eslint-plugin-query@5.101.1_eslint@10.5.0_jiti@2.7.0__typescript@6.0.3/node_modules/@tanstack/eslint-plugin-query/build/modern/index.js
+//#region ../../node_modules/.pnpm/@tanstack+eslint-plugin-query@5.101.2_eslint@10.6.0_jiti@2.7.0__typescript@6.0.3/node_modules/@tanstack/eslint-plugin-query/build/modern/index.js
 var recommendedRules = {
 	"@tanstack/query/exhaustive-deps": "error",
 	"@tanstack/query/no-rest-destructuring": "warn",

package/dist/{rolldown-runtime-C8SNSOcs.js → rolldown-runtime-B4FMCO8f.js}

@@ -1,20 +1,9 @@
-import { createRequire } from "node:module";
+import "node:module";
 //#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 __esmMin = (fn, res, err) => () => {
-	if (err) throw err[0];
-	try {
-		return fn && (res = fn(fn = 0)), res;
-	} catch (e) {
-		throw err = [e], e;
-	}
-};
-var __commonJSMin = (cb, mod) => () => (mod || (cb((mod = { exports: {} }).exports, mod), cb = null), mod.exports);
 var __exportAll = (all, no_symbols) => {
 	let target = {};
 	for (var name in all) __defProp(target, name, {
@@ -35,10 +24,5 @@ var __copyProps = (to, from, except, desc) => {
 	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));
-var __require = /* #__PURE__ */ (() => createRequire(import.meta.url))();
 //#endregion
-export { __require as a, __reExport as i, __esmMin as n, __toESM as o, __exportAll as r, __commonJSMin as t };
+export { __reExport as n, __exportAll as t };

package/index.d.ts

@@ -8,13 +8,16 @@ import type { IcebreakerStylelintOptions } from '@icebreakers/stylelint-config'
 import type { Linter } from 'eslint'
 import type { FlatConfigComposer } from 'eslint-flat-config-utils'
 
-export interface TailwindcssOption {
+export interface BetterTailwindcssOption {
   entryPoint?: string
+  files?: string[]
+  rules?: 'syntax' | 'recommended'
   cwd?: string
   tailwindConfig?: string
 }
 
-export type TailwindcssConfig = boolean | TailwindcssOption
+export type BetterTailwindcssConfig = boolean | BetterTailwindcssOption
+export type TailwindcssConfig = boolean
 export interface UnocssOption {
   configPath?: string
   attributify?: boolean
@@ -29,6 +32,7 @@ export type StylelintBridgeConfig = boolean | StylelintBridgeOption
 export type UserDefinedOptions = Omit<OptionsConfig, 'unocss'> & TypedFlatConfigItem & {
   miniProgram?: boolean
   tailwindcss?: TailwindcssConfig
+  betterTailwindcss?: BetterTailwindcssConfig
   unocss?: UnocssConfig
   stylelint?: StylelintBridgeConfig
   mdx?: boolean

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@icebreakers/eslint-config",
   "type": "module",
-  "version": "6.0.0",
+  "version": "7.0.1",
   "description": "ESLint preset from Icebreaker's dev-configs",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -42,28 +42,32 @@
     "node": ">=22.12.0"
   },
   "peerDependencies": {
-    "eslint-plugin-pnpm": "^1.6.0"
+    "eslint-plugin-pnpm": "^1.6.0",
+    "tailwindcss": "^3.3.0 || ^4.1.17"
   },
   "peerDependenciesMeta": {
     "eslint-plugin-pnpm": {
       "optional": true
+    },
+    "tailwindcss": {
+      "optional": true
     }
   },
   "dependencies": {
     "@antfu/eslint-config": "9.1.0",
-    "@eslint-react/eslint-plugin": "^5.9.4",
-    "@typescript-eslint/rule-tester": "^8.62.0",
-    "@typescript-eslint/typescript-estree": "^8.62.0",
-    "@typescript-eslint/utils": "^8.62.0",
+    "@eslint-react/eslint-plugin": "^5.11.2",
+    "@typescript-eslint/rule-tester": "^8.62.1",
+    "@typescript-eslint/typescript-estree": "^8.62.1",
+    "@typescript-eslint/utils": "^8.62.1",
     "@vue/compiler-sfc": "^3.5.39",
     "eslint-flat-config-utils": "3.2.0",
-    "eslint-plugin-better-tailwindcss": "^4.6.0",
+    "eslint-plugin-better-tailwindcss": "^4.6.1",
     "eslint-plugin-format": "2.0.1",
     "eslint-plugin-react-hooks": "^7.1.1",
     "eslint-plugin-react-refresh": "^0.5.3",
-    "eslint-plugin-tailwindcss": "4.0.4",
-    "@icebreakers/stylelint-config": "5.0.0",
-    "eslint-plugin-better-stylelint": "2.0.0"
+    "eslint-plugin-tailwindcss": "4.0.6",
+    "@icebreakers/stylelint-config": "5.0.2",
+    "eslint-plugin-better-stylelint": "2.0.1"
   },
   "publishConfig": {
     "access": "public",
@@ -85,6 +89,9 @@
       "skipLibCheck": true
     }
   },
+  "devDependencies": {
+    "semver": "^7.8.5"
+  },
   "scripts": {
     "dev": "tsdown --watch --sourcemap",
     "build": "tsdown",