weapp-tailwindcss 5.0.0-next.24 → 5.0.0-next.25

package/dist/{tailwindcss-DO-VVR5k.mjs → tailwindcss-ujlr9Iad.mjs}

@@ -1,5 +1,5 @@
-import { G as omitUndefined, H as readInstalledPackageMajorVersion, J as findWorkspaceRoot, K as findNearestPackageRoot, V as createTailwindcssPatcher, f as runtimeSignaturePatchersSymbol, q as findWorkspacePackageDir } from "./v3-engine-CXqgQZUc.mjs";
-import { n as defuOverrideArray } from "./utils-CGBVVNm6.mjs";
+import { G as normalizeStringListOption, H as readInstalledPackageMajorVersion, J as findNearestPackageRoot, V as createTailwindcssPatcher, X as findWorkspaceRoot, Y as findWorkspacePackageDir, f as runtimeSignaturePatchersSymbol, q as omitUndefined } from "./v3-engine-COw08vWd.mjs";
+import { n as defuOverrideArray } from "./utils-B2SJgA1L.mjs";
 import { createRequire } from "node:module";
 import { existsSync, readFileSync } from "node:fs";
 import path from "node:path";
@@ -107,14 +107,7 @@ function ensureDefaultsIncluded(value) {
 	return value;
 }
 function normalizeCssEntriesConfig(entries) {
-	if (!entries) return;
-	if (typeof entries === "string") {
-		const trimmed = entries.trim();
-		return trimmed ? [trimmed] : void 0;
-	}
-	if (!Array.isArray(entries)) return;
-	const normalized = entries.map((entry) => typeof entry === "string" ? entry.trim() : "").filter((entry) => entry.length > 0);
-	return normalized.length > 0 ? normalized : void 0;
+	return normalizeStringListOption(entries);
 }
 function hasConfiguredCssEntries(ctx) {
 	if (normalizeCssEntriesConfig(ctx.cssEntries)) return true;
@@ -368,24 +361,22 @@ function tryCreateMultiTailwindcssPatcher(groups, options) {
 }
 //#endregion
 //#region src/uni-app-x/options.ts
+const DEFAULT_COMPONENT_LOCAL_STYLES_OPTIONS = {
+	enabled: true,
+	onlyWhenStyleIsolationVersion2: true
+};
+const DISABLED_COMPONENT_LOCAL_STYLES_OPTIONS = {
+	enabled: false,
+	onlyWhenStyleIsolationVersion2: true
+};
+function isBooleanUniAppXShortcut(option) {
+	return option === true || option === false || option === void 0;
+}
 function resolveComponentLocalStyles(option) {
-	if (option === false) return {
-		enabled: false,
-		onlyWhenStyleIsolationVersion2: true
-	};
-	if (option === true || option === void 0) return {
-		enabled: false,
-		onlyWhenStyleIsolationVersion2: true
-	};
+	if (isBooleanUniAppXShortcut(option)) return DISABLED_COMPONENT_LOCAL_STYLES_OPTIONS;
 	const componentLocalStyles = option.componentLocalStyles;
-	if (componentLocalStyles === false) return {
-		enabled: false,
-		onlyWhenStyleIsolationVersion2: true
-	};
-	if (componentLocalStyles === true || componentLocalStyles === void 0) return {
-		enabled: true,
-		onlyWhenStyleIsolationVersion2: true
-	};
+	if (componentLocalStyles === false) return DISABLED_COMPONENT_LOCAL_STYLES_OPTIONS;
+	if (componentLocalStyles === true || componentLocalStyles === void 0) return DEFAULT_COMPONENT_LOCAL_STYLES_OPTIONS;
 	return {
 		enabled: componentLocalStyles.enabled !== false,
 		onlyWhenStyleIsolationVersion2: componentLocalStyles.onlyWhenStyleIsolationVersion2 !== false

package/dist/types/index.d.ts

@@ -10,7 +10,7 @@ import type { UniAppXComponentLocalStylesOptions, UniAppXOptions as UniAppXUserD
 type AsyncableMethod<T> = T extends (...args: infer A) => infer R ? (...args: A) => Promise<Awaited<R>> | Awaited<R> : never;
 export type { UniAppXComponentLocalStylesOptions, UniAppXUserDefinedOptions, UserDefinedOptions, };
 export type { CssPreflightOptions, IStyleHandlerOptions, ItemOrItemArray };
-export type { AppType, IArbitraryValues, ICustomAttributes, ICustomAttributesEntities } from './shared';
+export type { AppType, IArbitraryValues, ICustomAttributes, ICustomAttributesEntities, IUnocssCompatibilityOptions } from './shared';
 export type RequiredDefined<T> = {
     [K in keyof T]-?: Exclude<T[K], undefined>;
 };

package/dist/types/shared.d.ts

@@ -8,3 +8,6 @@ export interface IArbitraryValues {
         units?: string[];
     };
 }
+export interface IUnocssCompatibilityOptions {
+    bareArbitraryValues?: IArbitraryValues['bareArbitraryValues'];
+}

package/dist/types/user-defined-options/general.d.ts

@@ -3,11 +3,12 @@ import type { LoadedPostcssOptions } from '@weapp-tailwindcss/postcss/types';
 import type { ILengthUnitsPatchOptions, TailwindCssPatchOptions } from 'tailwindcss-patch';
 import type { ICreateCacheReturnType } from '../../cache';
 import type { WeappTailwindcssGeneratorUserOptions } from '../../generator';
-import type { AppType, IArbitraryValues } from '../shared';
+import type { AppType, IArbitraryValues, IUnocssCompatibilityOptions } from '../shared';
 export interface UserDefinedOptionsGeneralPart {
     supportCustomLengthUnitsPatch?: ILengthUnitsPatchOptions | boolean | undefined;
     appType?: AppType | undefined;
     arbitraryValues?: IArbitraryValues | undefined;
+    unocss?: boolean | IUnocssCompatibilityOptions | undefined;
     jsPreserveClass?: ((keyword: string) => boolean | undefined) | undefined;
     jsArbitraryValueFallback?: boolean | 'auto' | undefined;
     replaceRuntimePackages?: boolean | Record<string, string> | undefined;

package/dist/types/user-defined-options/important.d.ts

@@ -1,4 +1,4 @@
-import type { CssCalcOptions, CssPreflightOptions, IStyleHandlerOptions, PresetEnvOptions, Px2rpxOptions, Rem2rpxOptions, UniAppXUnsupportedMode, UnitsToPxOptions, WeappAutoprefixerOptions } from '@weapp-tailwindcss/postcss/types';
+import type { CssCalcOptions, CssPreflightOptions, IStyleHandlerOptions, PresetEnvOptions, Px2rpxOptions, Rem2rpxOptions, UniAppXUnsupportedMode, UnitConversionOptions, UnitsToPxOptions, WeappAutoprefixerOptions } from '@weapp-tailwindcss/postcss/types';
 import type { TailwindCssPatchOptions } from 'tailwindcss-patch';
 import type { ICustomAttributes } from '../shared';
 export interface UniAppXComponentLocalStylesOptions {
@@ -29,6 +29,8 @@ export interface UserDefinedOptionsImportantPart {
     rem2rpx?: boolean | Rem2rpxOptions | undefined;
     px2rpx?: boolean | Px2rpxOptions | undefined;
     unitsToPx?: boolean | UnitsToPxOptions | undefined;
+    platform?: IStyleHandlerOptions['platform'] | undefined;
+    unitConversion?: UnitConversionOptions | undefined;
     cssPresetEnv?: PresetEnvOptions | undefined;
     atRules?: IStyleHandlerOptions['atRules'] | undefined;
     autoprefixer?: WeappAutoprefixerOptions | undefined;

package/dist/unocss/index.d.ts

@@ -0,0 +1,2 @@
+import type { IArbitraryValues, UserDefinedOptions } from '../types';
+export declare function resolveUnocssBareArbitraryValues(arbitraryValues: IArbitraryValues | undefined, unocss: UserDefinedOptions['unocss']): IArbitraryValues;

package/dist/utils/options.d.ts

@@ -0,0 +1,2 @@
+export declare function resolveBooleanObjectOption<T extends object>(value: boolean | T | undefined, enabledValue: T): T | false;
+export declare function normalizeStringListOption(value: unknown): string[] | undefined;

package/dist/utils/regex.d.ts

@@ -0,0 +1 @@
+export declare function escapeStringRegexp(str: string): string;

package/dist/{v3-engine-vHlppqaZ.js → v3-engine-Bbsrez2w.js}

@@ -1,4 +1,5 @@
 const require_chunk = require("./chunk-8l464Juk.js");
+const require_auto = require("./auto-B11j1XiD.js");
 let node_fs = require("node:fs");
 node_fs = require_chunk.__toESM(node_fs);
 let node_module = require("node:module");
@@ -88,17 +89,31 @@ function omitUndefined(value) {
 	return Object.fromEntries(definedEntries(value));
 }
 //#endregion
+//#region src/utils/options.ts
+function resolveBooleanObjectOption(value, enabledValue) {
+	if (!value) return false;
+	if (value === true) return enabledValue;
+	return value;
+}
+function normalizeStringListOption(value) {
+	if (!value) return;
+	const values = typeof value === "string" ? [value] : Array.isArray(value) ? value : void 0;
+	if (!values) return;
+	const normalized = values.map((entry) => typeof entry === "string" ? entry.trim() : "").filter((entry) => entry.length > 0);
+	return normalized.length > 0 ? normalized : void 0;
+}
+//#endregion
 //#region src/tailwindcss/patcher-options.ts
 function resolveTailwindcssOptions(options) {
 	return options?.tailwindcss ?? options?.tailwind;
 }
 function normalizeExtendLengthUnits(value) {
-	if (value === false) return false;
-	if (value === true) return { enabled: true };
-	if (value && typeof value === "object") return {
+	if (value === void 0) return;
+	const resolved = resolveBooleanObjectOption(value, { enabled: true });
+	return resolved && typeof resolved === "object" ? {
 		enabled: true,
-		...value
-	};
+		...resolved
+	} : resolved;
 }
 function normalizeTailwindcssPatcherOptions(options) {
 	return options;
@@ -748,10 +763,12 @@ async function transformTailwindV4CssToWeapp(css, options) {
 		majorVersion: 4,
 		...options
 	});
-	return (0, _weapp_tailwindcss_postcss.pruneMiniProgramGeneratedCss)(protectedCss.restore(result.css));
+	const pruneOptions = { preserveConditionalComments: require_auto.hasCssMacroStyleOptions(options) };
+	return (0, _weapp_tailwindcss_postcss.pruneMiniProgramGeneratedCss)(protectedCss.restore(result.css), pruneOptions);
 }
 async function transformTailwindV4CssByTarget(css, target, options) {
-	return target === "weapp" ? transformTailwindV4CssToWeapp(css, options) : css;
+	if (target === "weapp") return transformTailwindV4CssToWeapp(css, options);
+	return require_auto.hasCssMacroStyleOptions(options) ? require_auto.transformCssMacroCss(css) : css;
 }
 //#endregion
 //#region src/tailwindcss/v4-engine/tailwind-v3-default-colors.ts
@@ -1652,6 +1669,9 @@ function createIncrementalStyleOptions(styleOptions) {
 		isMainChunk: false
 	};
 }
+function resolveStyleOptions$1(source, options) {
+	return require_auto.hasCssMacroTailwindV4Directive(source.css) ? require_auto.withCssMacroStyleOptions(options) : options;
+}
 function collectCustomPropertyValues(css) {
 	const values = /* @__PURE__ */ new Map();
 	try {
@@ -1805,6 +1825,7 @@ function removeUnsupportedThemeVendorKeyframes(css) {
 function createTailwindV4Engine(source) {
 	async function generateOnce(generateSource, options = {}) {
 		const { scanSources = true, styleOptions, tailwindcssV3Compatibility, target = "weapp", ...patchOptions } = options;
+		const resolvedStyleOptions = resolveStyleOptions$1(generateSource, styleOptions);
 		const engine = (0, tailwindcss_patch.createTailwindV4Engine)(createCompatibleSource(generateSource, target, tailwindcssV3Compatibility));
 		const resolvedScanSources = await resolveScanSources(generateSource, scanSources);
 		const filesystemCandidates = Array.isArray(resolvedScanSources) ? new Set(await (0, tailwindcss_patch.extractRawCandidates)(resolvedScanSources)) : void 0;
@@ -1815,7 +1836,7 @@ function createTailwindV4Engine(source) {
 			candidates: normalizedCandidates.candidates
 		}));
 		const rawCss = restoreRpxTextCssSelectors(result.css, normalizedCandidates.restoreCandidates);
-		const css = await transformTailwindV4CssByTarget(rawCss, target, styleOptions);
+		const css = await transformTailwindV4CssByTarget(rawCss, target, resolvedStyleOptions);
 		return {
 			...result,
 			classSet: restoreRpxTextCandidates(result.classSet, normalizedCandidates.restoreCandidates),
@@ -1829,8 +1850,9 @@ function createTailwindV4Engine(source) {
 		const target = options.target ?? "weapp";
 		const compatibleSource = createCompatibleSource(source, target, options.tailwindcssV3Compatibility);
 		const requestedCandidates = resolveTargetCandidates(options.candidates, target);
+		const styleOptions = resolveStyleOptions$1(source, options.styleOptions);
 		if ((options.sources?.length ?? 0) > 0 || options.bareArbitraryValues !== void 0 || Array.isArray(options.scanSources)) return generateOnce(source, options);
-		const cacheKey = createIncrementalGenerateCacheKey$1(compatibleSource, target, options.styleOptions, options.tailwindcssV3Compatibility);
+		const cacheKey = createIncrementalGenerateCacheKey$1(compatibleSource, target, styleOptions, options.tailwindcssV3Compatibility);
 		if (options.scanSources === true) return runIncrementalGenerateTask(cacheKey, requestedCandidates, options.scanSources, async () => {
 			const generated = await generateOnce(source, options);
 			seedIncrementalGenerateCache({
@@ -1875,7 +1897,7 @@ function createTailwindV4Engine(source) {
 				}
 				const rawCss = rawCssParts.join("\n");
 				const incrementalCss = rawCss.length > 0 ? await transformTailwindV4CssByTarget(rawCss, target, {
-					...createIncrementalStyleOptions(options.styleOptions),
+					...createIncrementalStyleOptions(styleOptions),
 					customPropertyValues: cached.customPropertyValues
 				}) : "";
 				for (const candidate of missingCandidates) cached.seenCandidates.add(candidate);
@@ -1903,7 +1925,7 @@ function createTailwindV4Engine(source) {
 				compatibleSource,
 				generated,
 				requestedCandidates,
-				styleOptions: options.styleOptions,
+				styleOptions,
 				tailwindcssV3Compatibility: options.tailwindcssV3Compatibility,
 				target
 			});
@@ -2802,16 +2824,22 @@ function ensureMiniProgramV3PreflightReset(css, cssPreflight) {
 	}
 }
 async function transformTailwindV3CssToWeapp(css, options) {
-	return ensureMiniProgramV3PreflightReset((0, _weapp_tailwindcss_postcss.pruneMiniProgramGeneratedCss)((await defaultStyleHandler(css, {
+	const result = await defaultStyleHandler(css, {
 		cssChildCombinatorReplaceValue: ["view", "text"],
 		cssRemoveHoverPseudoClass: true,
 		isMainChunk: true,
 		majorVersion: 3,
 		...options
-	})).css, { preservePreflight: true }), options?.cssPreflight);
+	});
+	const pruneOptions = {
+		preservePreflight: true,
+		preserveConditionalComments: require_auto.hasCssMacroStyleOptions(options)
+	};
+	return ensureMiniProgramV3PreflightReset((0, _weapp_tailwindcss_postcss.pruneMiniProgramGeneratedCss)(result.css, pruneOptions), options?.cssPreflight);
 }
 async function transformTailwindV3CssByTarget(css, target, options) {
-	return target === "weapp" ? transformTailwindV3CssToWeapp(css, options) : css;
+	if (target === "weapp") return transformTailwindV3CssToWeapp(css, options);
+	return require_auto.hasCssMacroStyleOptions(options) ? require_auto.transformCssMacroCss(css) : css;
 }
 //#endregion
 //#region src/tailwindcss/v3-engine/generator.ts
@@ -2874,7 +2902,7 @@ function extractClassCandidatesFromSelector(selector, candidates) {
 				escaped = true;
 				continue;
 			}
-			if (/[\w-]/.test(char)) {
+			if (char && /[\w-]/.test(char)) {
 				candidate += char;
 				continue;
 			}
@@ -2935,6 +2963,12 @@ function createTailwindConfig(source, options) {
 	config.content = hasExplicitContentInput(options) ? createExplicitContentConfig(rawEntries) : mergeContent(config.content, rawEntries);
 	return config;
 }
+function shouldAutoEnableCssMacro(source) {
+	return require_auto.hasCssMacroTailwindPlugin(normalizeConfigObject(source.configObject)?.plugins);
+}
+function resolveStyleOptions(source, options) {
+	return shouldAutoEnableCssMacro(source) ? require_auto.withCssMacroStyleOptions(options) : options;
+}
 function loadTailwindV3Internals(source) {
 	const requireFromProject = (0, node_module.createRequire)(`${source.cwd}/package.json`);
 	const requireFromRuntime = (0, node_module.createRequire)(require("url").pathToFileURL(__filename).href);
@@ -3069,6 +3103,7 @@ function createTailwindV3Engine(source) {
 		tailwindInternals ?? (tailwindInternals = loadTailwindV3Internals(source));
 		const internals = tailwindInternals;
 		const { styleOptions, target = "weapp" } = options;
+		const resolvedStyleOptions = resolveStyleOptions(generateSource, styleOptions);
 		const tailwindConfig = internals.validateConfig(internals.resolveConfig(createTailwindConfig(generateSource, options)));
 		const candidates = mergeGenerateCandidates(generateSource, options);
 		const changedContent = createChangedContentEntries(candidates, options.sources ?? []);
@@ -3093,7 +3128,7 @@ function createTailwindV3Engine(source) {
 			context = await internals.processTailwindFeatures(setupContext)(root, result);
 		}
 		const rawCss = root.toString();
-		const css = await transformTailwindV3CssByTarget(rawCss, target, styleOptions);
+		const css = await transformTailwindV3CssByTarget(rawCss, target, resolvedStyleOptions);
 		const dependencies = collectDependencyMessages(result);
 		for (const dependency of generateSource.dependencies) dependencies.add(dependency);
 		const classSet = collectClassSet(context);
@@ -3124,7 +3159,7 @@ function createTailwindV3Engine(source) {
 		internals.collapseDuplicateDeclarations(context)(root, result);
 		const rawCss = root.toString();
 		return {
-			css: await transformTailwindV3CssByTarget(rawCss, target, styleOptions),
+			css: await transformTailwindV3CssByTarget(rawCss, target, resolveStyleOptions(source, styleOptions)),
 			rawCss,
 			classSet: collectClassSet(context),
 			dependencies: collectDependencyMessages(result)
@@ -3135,7 +3170,8 @@ function createTailwindV3Engine(source) {
 		const target = options.target ?? "weapp";
 		const requestedCandidates = mergeGenerateCandidates(source, options);
 		if (requestedCandidates.size === 0) return generateOnce(source, options);
-		const cacheKey = createIncrementalGenerateCacheKey(source, target, options.styleOptions);
+		const styleOptions = resolveStyleOptions(source, options.styleOptions);
+		const cacheKey = createIncrementalGenerateCacheKey(source, target, styleOptions);
 		const cached = incrementalGenerateCache.get(cacheKey);
 		if (cached) {
 			const missingCandidates = [...requestedCandidates].filter((candidate) => !cached.seenCandidates.has(candidate));
@@ -3152,7 +3188,7 @@ function createTailwindV3Engine(source) {
 				target: cached.target,
 				version: 3
 			};
-			const generated = await generateIncrementalMissingUtilities(cached.context, missingCandidates, target, options.styleOptions);
+			const generated = await generateIncrementalMissingUtilities(cached.context, missingCandidates, target, styleOptions);
 			for (const candidate of missingCandidates) cached.seenCandidates.add(candidate);
 			for (const className of generated.classSet) cached.classSet.add(className);
 			cached.css = [cached.css, generated.css].filter(Boolean).join("\n");
@@ -3420,6 +3456,12 @@ Object.defineProperty(exports, "normalizeLegacyContentEntries", {
 		return normalizeLegacyContentEntries;
 	}
 });
+Object.defineProperty(exports, "normalizeStringListOption", {
+	enumerable: true,
+	get: function() {
+		return normalizeStringListOption;
+	}
+});
 Object.defineProperty(exports, "omitUndefined", {
 	enumerable: true,
 	get: function() {
@@ -3438,6 +3480,12 @@ Object.defineProperty(exports, "readInstalledPackageMajorVersion", {
 		return readInstalledPackageMajorVersion;
 	}
 });
+Object.defineProperty(exports, "resolveBooleanObjectOption", {
+	enumerable: true,
+	get: function() {
+		return resolveBooleanObjectOption;
+	}
+});
 Object.defineProperty(exports, "resolveCssSourceEntries", {
 	enumerable: true,
 	get: function() {

package/dist/{v3-engine-CXqgQZUc.mjs → v3-engine-COw08vWd.mjs}

@@ -1,3 +1,4 @@
+import { a as transformCssMacroCss, n as hasCssMacroTailwindPlugin, o as withCssMacroStyleOptions, r as hasCssMacroTailwindV4Directive, t as hasCssMacroStyleOptions } from "./auto-AduSz49t.mjs";
 import { createRequire } from "node:module";
 import fs, { existsSync, readFileSync, readdirSync, realpathSync, statSync } from "node:fs";
 import postcss from "postcss";
@@ -80,17 +81,31 @@ function omitUndefined(value) {
 	return Object.fromEntries(definedEntries(value));
 }
 //#endregion
+//#region src/utils/options.ts
+function resolveBooleanObjectOption(value, enabledValue) {
+	if (!value) return false;
+	if (value === true) return enabledValue;
+	return value;
+}
+function normalizeStringListOption(value) {
+	if (!value) return;
+	const values = typeof value === "string" ? [value] : Array.isArray(value) ? value : void 0;
+	if (!values) return;
+	const normalized = values.map((entry) => typeof entry === "string" ? entry.trim() : "").filter((entry) => entry.length > 0);
+	return normalized.length > 0 ? normalized : void 0;
+}
+//#endregion
 //#region src/tailwindcss/patcher-options.ts
 function resolveTailwindcssOptions(options) {
 	return options?.tailwindcss ?? options?.tailwind;
 }
 function normalizeExtendLengthUnits(value) {
-	if (value === false) return false;
-	if (value === true) return { enabled: true };
-	if (value && typeof value === "object") return {
+	if (value === void 0) return;
+	const resolved = resolveBooleanObjectOption(value, { enabled: true });
+	return resolved && typeof resolved === "object" ? {
 		enabled: true,
-		...value
-	};
+		...resolved
+	} : resolved;
 }
 function normalizeTailwindcssPatcherOptions(options) {
 	return options;
@@ -740,10 +755,12 @@ async function transformTailwindV4CssToWeapp(css, options) {
 		majorVersion: 4,
 		...options
 	});
-	return pruneMiniProgramGeneratedCss(protectedCss.restore(result.css));
+	const pruneOptions = { preserveConditionalComments: hasCssMacroStyleOptions(options) };
+	return pruneMiniProgramGeneratedCss(protectedCss.restore(result.css), pruneOptions);
 }
 async function transformTailwindV4CssByTarget(css, target, options) {
-	return target === "weapp" ? transformTailwindV4CssToWeapp(css, options) : css;
+	if (target === "weapp") return transformTailwindV4CssToWeapp(css, options);
+	return hasCssMacroStyleOptions(options) ? transformCssMacroCss(css) : css;
 }
 //#endregion
 //#region src/tailwindcss/v4-engine/tailwind-v3-default-colors.ts
@@ -1644,6 +1661,9 @@ function createIncrementalStyleOptions(styleOptions) {
 		isMainChunk: false
 	};
 }
+function resolveStyleOptions$1(source, options) {
+	return hasCssMacroTailwindV4Directive(source.css) ? withCssMacroStyleOptions(options) : options;
+}
 function collectCustomPropertyValues(css) {
 	const values = /* @__PURE__ */ new Map();
 	try {
@@ -1797,6 +1817,7 @@ function removeUnsupportedThemeVendorKeyframes(css) {
 function createTailwindV4Engine$1(source) {
 	async function generateOnce(generateSource, options = {}) {
 		const { scanSources = true, styleOptions, tailwindcssV3Compatibility, target = "weapp", ...patchOptions } = options;
+		const resolvedStyleOptions = resolveStyleOptions$1(generateSource, styleOptions);
 		const engine = createTailwindV4Engine(createCompatibleSource(generateSource, target, tailwindcssV3Compatibility));
 		const resolvedScanSources = await resolveScanSources(generateSource, scanSources);
 		const filesystemCandidates = Array.isArray(resolvedScanSources) ? new Set(await extractRawCandidates(resolvedScanSources)) : void 0;
@@ -1807,7 +1828,7 @@ function createTailwindV4Engine$1(source) {
 			candidates: normalizedCandidates.candidates
 		}));
 		const rawCss = restoreRpxTextCssSelectors(result.css, normalizedCandidates.restoreCandidates);
-		const css = await transformTailwindV4CssByTarget(rawCss, target, styleOptions);
+		const css = await transformTailwindV4CssByTarget(rawCss, target, resolvedStyleOptions);
 		return {
 			...result,
 			classSet: restoreRpxTextCandidates(result.classSet, normalizedCandidates.restoreCandidates),
@@ -1821,8 +1842,9 @@ function createTailwindV4Engine$1(source) {
 		const target = options.target ?? "weapp";
 		const compatibleSource = createCompatibleSource(source, target, options.tailwindcssV3Compatibility);
 		const requestedCandidates = resolveTargetCandidates(options.candidates, target);
+		const styleOptions = resolveStyleOptions$1(source, options.styleOptions);
 		if ((options.sources?.length ?? 0) > 0 || options.bareArbitraryValues !== void 0 || Array.isArray(options.scanSources)) return generateOnce(source, options);
-		const cacheKey = createIncrementalGenerateCacheKey$1(compatibleSource, target, options.styleOptions, options.tailwindcssV3Compatibility);
+		const cacheKey = createIncrementalGenerateCacheKey$1(compatibleSource, target, styleOptions, options.tailwindcssV3Compatibility);
 		if (options.scanSources === true) return runIncrementalGenerateTask(cacheKey, requestedCandidates, options.scanSources, async () => {
 			const generated = await generateOnce(source, options);
 			seedIncrementalGenerateCache({
@@ -1867,7 +1889,7 @@ function createTailwindV4Engine$1(source) {
 				}
 				const rawCss = rawCssParts.join("\n");
 				const incrementalCss = rawCss.length > 0 ? await transformTailwindV4CssByTarget(rawCss, target, {
-					...createIncrementalStyleOptions(options.styleOptions),
+					...createIncrementalStyleOptions(styleOptions),
 					customPropertyValues: cached.customPropertyValues
 				}) : "";
 				for (const candidate of missingCandidates) cached.seenCandidates.add(candidate);
@@ -1895,7 +1917,7 @@ function createTailwindV4Engine$1(source) {
 				compatibleSource,
 				generated,
 				requestedCandidates,
-				styleOptions: options.styleOptions,
+				styleOptions,
 				tailwindcssV3Compatibility: options.tailwindcssV3Compatibility,
 				target
 			});
@@ -2794,16 +2816,22 @@ function ensureMiniProgramV3PreflightReset(css, cssPreflight) {
 	}
 }
 async function transformTailwindV3CssToWeapp(css, options) {
-	return ensureMiniProgramV3PreflightReset(pruneMiniProgramGeneratedCss((await defaultStyleHandler(css, {
+	const result = await defaultStyleHandler(css, {
 		cssChildCombinatorReplaceValue: ["view", "text"],
 		cssRemoveHoverPseudoClass: true,
 		isMainChunk: true,
 		majorVersion: 3,
 		...options
-	})).css, { preservePreflight: true }), options?.cssPreflight);
+	});
+	const pruneOptions = {
+		preservePreflight: true,
+		preserveConditionalComments: hasCssMacroStyleOptions(options)
+	};
+	return ensureMiniProgramV3PreflightReset(pruneMiniProgramGeneratedCss(result.css, pruneOptions), options?.cssPreflight);
 }
 async function transformTailwindV3CssByTarget(css, target, options) {
-	return target === "weapp" ? transformTailwindV3CssToWeapp(css, options) : css;
+	if (target === "weapp") return transformTailwindV3CssToWeapp(css, options);
+	return hasCssMacroStyleOptions(options) ? transformCssMacroCss(css) : css;
 }
 //#endregion
 //#region src/tailwindcss/v3-engine/generator.ts
@@ -2866,7 +2894,7 @@ function extractClassCandidatesFromSelector(selector, candidates) {
 				escaped = true;
 				continue;
 			}
-			if (/[\w-]/.test(char)) {
+			if (char && /[\w-]/.test(char)) {
 				candidate += char;
 				continue;
 			}
@@ -2927,6 +2955,12 @@ function createTailwindConfig(source, options) {
 	config.content = hasExplicitContentInput(options) ? createExplicitContentConfig(rawEntries) : mergeContent(config.content, rawEntries);
 	return config;
 }
+function shouldAutoEnableCssMacro(source) {
+	return hasCssMacroTailwindPlugin(normalizeConfigObject(source.configObject)?.plugins);
+}
+function resolveStyleOptions(source, options) {
+	return shouldAutoEnableCssMacro(source) ? withCssMacroStyleOptions(options) : options;
+}
 function loadTailwindV3Internals(source) {
 	const requireFromProject = createRequire(`${source.cwd}/package.json`);
 	const requireFromRuntime = createRequire(import.meta.url);
@@ -3061,6 +3095,7 @@ function createTailwindV3Engine(source) {
 		tailwindInternals ?? (tailwindInternals = loadTailwindV3Internals(source));
 		const internals = tailwindInternals;
 		const { styleOptions, target = "weapp" } = options;
+		const resolvedStyleOptions = resolveStyleOptions(generateSource, styleOptions);
 		const tailwindConfig = internals.validateConfig(internals.resolveConfig(createTailwindConfig(generateSource, options)));
 		const candidates = mergeGenerateCandidates(generateSource, options);
 		const changedContent = createChangedContentEntries(candidates, options.sources ?? []);
@@ -3085,7 +3120,7 @@ function createTailwindV3Engine(source) {
 			context = await internals.processTailwindFeatures(setupContext)(root, result);
 		}
 		const rawCss = root.toString();
-		const css = await transformTailwindV3CssByTarget(rawCss, target, styleOptions);
+		const css = await transformTailwindV3CssByTarget(rawCss, target, resolvedStyleOptions);
 		const dependencies = collectDependencyMessages(result);
 		for (const dependency of generateSource.dependencies) dependencies.add(dependency);
 		const classSet = collectClassSet(context);
@@ -3116,7 +3151,7 @@ function createTailwindV3Engine(source) {
 		internals.collapseDuplicateDeclarations(context)(root, result);
 		const rawCss = root.toString();
 		return {
-			css: await transformTailwindV3CssByTarget(rawCss, target, styleOptions),
+			css: await transformTailwindV3CssByTarget(rawCss, target, resolveStyleOptions(source, styleOptions)),
 			rawCss,
 			classSet: collectClassSet(context),
 			dependencies: collectDependencyMessages(result)
@@ -3127,7 +3162,8 @@ function createTailwindV3Engine(source) {
 		const target = options.target ?? "weapp";
 		const requestedCandidates = mergeGenerateCandidates(source, options);
 		if (requestedCandidates.size === 0) return generateOnce(source, options);
-		const cacheKey = createIncrementalGenerateCacheKey(source, target, options.styleOptions);
+		const styleOptions = resolveStyleOptions(source, options.styleOptions);
+		const cacheKey = createIncrementalGenerateCacheKey(source, target, styleOptions);
 		const cached = incrementalGenerateCache.get(cacheKey);
 		if (cached) {
 			const missingCandidates = [...requestedCandidates].filter((candidate) => !cached.seenCandidates.has(candidate));
@@ -3144,7 +3180,7 @@ function createTailwindV3Engine(source) {
 				target: cached.target,
 				version: 3
 			};
-			const generated = await generateIncrementalMissingUtilities(cached.context, missingCandidates, target, options.styleOptions);
+			const generated = await generateIncrementalMissingUtilities(cached.context, missingCandidates, target, styleOptions);
 			for (const candidate of missingCandidates) cached.seenCandidates.add(candidate);
 			for (const className of generated.classSet) cached.classSet.add(className);
 			cached.css = [cached.css, generated.css].filter(Boolean).join("\n");
@@ -3274,4 +3310,4 @@ function resolveTailwindV3SourceFromPatcher(patcher) {
 	return resolveTailwindV3Source(resolveTailwindV3SourceOptionsFromPatcher(patcher));
 }
 //#endregion
-export { collectCssInlineSourceCandidates as A, createDebug as B, createTailwindV4Engine$1 as C, loadTailwindV4DesignSystem as D, filterUnsupportedMiniProgramTailwindV4Candidates as E, parseConfigParam$1 as F, omitUndefined as G, readInstalledPackageMajorVersion as H, resolveCssSourceEntries as I, findWorkspaceRoot as J, findNearestPackageRoot as K, resolveSourceScanPath as L, expandTailwindSourceEntries as M, isFileMatchedByTailwindSourceEntries as N, DEFAULT_SOURCE_SCAN_EXTENSIONS as O, normalizeLegacyContentEntries as P, resolveTailwindV4CssSourceBase as R, resolveTailwindV4SourceOptionsFromPatcher as S, transformTailwindV4CssToWeapp as T, findTailwindConfig as U, createTailwindcssPatcher as V, resolveTailwindcssOptions as W, resolveViteSourceScanEntries as _, transformTailwindV3CssByTarget as a, resolveTailwindV4SourceFromPatchOptions as b, getRuntimeClassSetCacheEntry as c, invalidateRuntimeClassSet as d, runtimeSignaturePatchersSymbol as f, resolveTailwindV4EntriesFromCssCached as g, resolveTailwindV4EntriesFromCss as h, createTailwindV3Engine as i, createSourceScanPattern as j, FULL_SOURCE_SCAN_EXTENSION_RE as k, getRuntimeClassSetSignature as l, discoverTailwindV4CssEntries as m, resolveTailwindV3SourceFromPatcher as n, transformTailwindV3CssToWeapp as o, createViteSourceScanMatcher as p, findWorkspacePackageDir as q, resolveTailwindV3SourceOptionsFromPatcher as r, ensureTailwindcssRuntimePatch as s, resolveTailwindV3Source as t, getRuntimeClassSetSignatureWithSources as u, resolveViteTailwindV4CssDependencies as v, transformTailwindV4CssByTarget as w, resolveTailwindV4SourceFromPatcher as x, resolveTailwindV4Source$1 as y, toPosixPath as z };
+export { collectCssInlineSourceCandidates as A, createDebug as B, createTailwindV4Engine$1 as C, loadTailwindV4DesignSystem as D, filterUnsupportedMiniProgramTailwindV4Candidates as E, parseConfigParam$1 as F, normalizeStringListOption as G, readInstalledPackageMajorVersion as H, resolveCssSourceEntries as I, findNearestPackageRoot as J, resolveBooleanObjectOption as K, resolveSourceScanPath as L, expandTailwindSourceEntries as M, isFileMatchedByTailwindSourceEntries as N, DEFAULT_SOURCE_SCAN_EXTENSIONS as O, normalizeLegacyContentEntries as P, resolveTailwindV4CssSourceBase as R, resolveTailwindV4SourceOptionsFromPatcher as S, transformTailwindV4CssToWeapp as T, findTailwindConfig as U, createTailwindcssPatcher as V, resolveTailwindcssOptions as W, findWorkspaceRoot as X, findWorkspacePackageDir as Y, resolveViteSourceScanEntries as _, transformTailwindV3CssByTarget as a, resolveTailwindV4SourceFromPatchOptions as b, getRuntimeClassSetCacheEntry as c, invalidateRuntimeClassSet as d, runtimeSignaturePatchersSymbol as f, resolveTailwindV4EntriesFromCssCached as g, resolveTailwindV4EntriesFromCss as h, createTailwindV3Engine as i, createSourceScanPattern as j, FULL_SOURCE_SCAN_EXTENSION_RE as k, getRuntimeClassSetSignature as l, discoverTailwindV4CssEntries as m, resolveTailwindV3SourceFromPatcher as n, transformTailwindV3CssToWeapp as o, createViteSourceScanMatcher as p, omitUndefined as q, resolveTailwindV3SourceOptionsFromPatcher as r, ensureTailwindcssRuntimePatch as s, resolveTailwindV3Source as t, getRuntimeClassSetSignatureWithSources as u, resolveViteTailwindV4CssDependencies as v, transformTailwindV4CssByTarget as w, resolveTailwindV4SourceFromPatcher as x, resolveTailwindV4Source$1 as y, toPosixPath as z };

package/dist/{vite-BkNDGBZ2.js → vite-DE8Vfzal.js}

@@ -1,13 +1,13 @@
 const require_chunk = require("./chunk-8l464Juk.js");
-const require_v3_engine = require("./v3-engine-vHlppqaZ.js");
-const require_generator = require("./generator-BcH28HU-.js");
-const require_incremental_runtime_class_set = require("./incremental-runtime-class-set-CWdfLHON.js");
-const require_precheck = require("./precheck-DtYqujIx.js");
-const require_utils = require("./utils-4ODFyoqD.js");
-const require_tailwindcss = require("./tailwindcss-BtUBeOes.js");
-const require_source_candidates = require("./source-candidates-lHtAHLQq.js");
-const require_bundle_state = require("./bundle-state-DXFq2nEo.js");
-require("./logger-EVNB9z7i.js");
+const require_v3_engine = require("./v3-engine-Bbsrez2w.js");
+const require_generator = require("./generator-DTPePQZ9.js");
+const require_incremental_runtime_class_set = require("./incremental-runtime-class-set-CERcE0fP.js");
+const require_precheck = require("./precheck-ezN3ovAq.js");
+const require_utils = require("./utils-CSA174-I.js");
+const require_tailwindcss = require("./tailwindcss-nQetCaPp.js");
+const require_source_candidates = require("./source-candidates-0jPRIPmC.js");
+const require_bundle_state = require("./bundle-state-BY7PWHAc.js");
+require("./logger-Cdzl3p8j.js");
 let node_fs = require("node:fs");
 node_fs = require_chunk.__toESM(node_fs);
 let postcss = require("postcss");

package/dist/{vite-BthAm8kt.mjs → vite-hZsQAY1a.mjs}

@@ -1,12 +1,12 @@
-import { B as createDebug, E as filterUnsupportedMiniProgramTailwindV4Candidates, G as omitUndefined, K as findNearestPackageRoot, U as findTailwindConfig, W as resolveTailwindcssOptions, _ as resolveViteSourceScanEntries, g as resolveTailwindV4EntriesFromCssCached, l as getRuntimeClassSetSignature, m as discoverTailwindV4CssEntries, p as createViteSourceScanMatcher, v as resolveViteTailwindV4CssDependencies } from "./v3-engine-CXqgQZUc.mjs";
-import { i as normalizeWeappTailwindcssGeneratorOptions } from "./generator-DdEgn8nG.mjs";
-import { a as validateCandidatesByGenerator, c as hasTailwindSourceDirectives, i as generateCssByGenerator, l as normalizeTailwindSourceForGenerator, n as createHmrTimingRecorder, o as processCachedTask, s as hasTailwindRootDirectives, t as createBundleRuntimeClassSetManager, u as hasTailwindGeneratedCssMarkers } from "./incremental-runtime-class-set-Bux7viee.mjs";
-import { a as analyzeSource, c as isClassContextLiteralPath, g as createTailwindRuntimeReadyPromise, h as collectRuntimeClassSet, i as createAttributeMatcher, l as replaceWxml, m as toCustomAttributesEntities, n as getCompilerContext, o as JsTokenUpdater, p as vitePluginName, r as generateCode, s as _defineProperty, t as shouldSkipJsTransform, u as babelParse, v as refreshTailwindRuntimeState } from "./precheck-DreRGvYH.mjs";
-import { o as resolveUniUtsPlatform } from "./utils-CGBVVNm6.mjs";
-import { c as upsertTailwindV4CssSource, i as resolveUniAppXOptions, r as isUniAppXEnabled, s as hasConfiguredTailwindV4CssRoots } from "./tailwindcss-DO-VVR5k.mjs";
-import { n as isSourceCandidateRequest, t as createSourceCandidateCollector } from "./source-candidates-B7wmEa-G.mjs";
-import { a as createBundleModuleGraphOptions, b as toAbsoluteOutputPath, c as hasBundlerGeneratedCssMarker, d as resolvePluginDisabledState, f as cleanUrl, g as isSourceStyleRequest, h as slash, i as applyLinkedResults, l as stripBundlerGeneratedCssMarkers, m as isCSSRequest, n as createBundleBuildState, o as pushConcurrentTaskFactories, p as formatPostcssSourceMap, r as updateBundleBuildState, s as createBundlerGeneratedCssMarker, t as buildBundleSnapshot, u as resolvePackageDir, v as normalizeOutputPathKey } from "./bundle-state-CP_BWXfx.mjs";
-import { t as logger$1 } from "./logger-CZUxvJJD.mjs";
+import { B as createDebug, E as filterUnsupportedMiniProgramTailwindV4Candidates, J as findNearestPackageRoot, U as findTailwindConfig, W as resolveTailwindcssOptions, _ as resolveViteSourceScanEntries, g as resolveTailwindV4EntriesFromCssCached, l as getRuntimeClassSetSignature, m as discoverTailwindV4CssEntries, p as createViteSourceScanMatcher, q as omitUndefined, v as resolveViteTailwindV4CssDependencies } from "./v3-engine-COw08vWd.mjs";
+import { i as normalizeWeappTailwindcssGeneratorOptions } from "./generator-CtqzN9L-.mjs";
+import { a as validateCandidatesByGenerator, c as hasTailwindSourceDirectives, i as generateCssByGenerator, l as normalizeTailwindSourceForGenerator, n as createHmrTimingRecorder, o as processCachedTask, s as hasTailwindRootDirectives, t as createBundleRuntimeClassSetManager, u as hasTailwindGeneratedCssMarkers } from "./incremental-runtime-class-set-BlJ86j-A.mjs";
+import { _ as createTailwindRuntimeReadyPromise, a as vitePluginName, c as analyzeSource, d as isClassContextLiteralPath, f as replaceWxml, g as collectRuntimeClassSet, h as toCustomAttributesEntities, l as JsTokenUpdater, n as getCompilerContext, o as generateCode, p as babelParse, s as createAttributeMatcher, t as shouldSkipJsTransform, u as _defineProperty, y as refreshTailwindRuntimeState } from "./precheck-B4CpMt_w.mjs";
+import { o as resolveUniUtsPlatform } from "./utils-B2SJgA1L.mjs";
+import { c as upsertTailwindV4CssSource, i as resolveUniAppXOptions, r as isUniAppXEnabled, s as hasConfiguredTailwindV4CssRoots } from "./tailwindcss-ujlr9Iad.mjs";
+import { n as isSourceCandidateRequest, t as createSourceCandidateCollector } from "./source-candidates-DoyOltpZ.mjs";
+import { a as createBundleModuleGraphOptions, b as toAbsoluteOutputPath, c as hasBundlerGeneratedCssMarker, d as resolvePluginDisabledState, f as cleanUrl, g as isSourceStyleRequest, h as slash, i as applyLinkedResults, l as stripBundlerGeneratedCssMarkers, m as isCSSRequest, n as createBundleBuildState, o as pushConcurrentTaskFactories, p as formatPostcssSourceMap, r as updateBundleBuildState, s as createBundlerGeneratedCssMarker, t as buildBundleSnapshot, u as resolvePackageDir, v as normalizeOutputPathKey } from "./bundle-state-CBouNDzi.mjs";
+import { t as logger$1 } from "./logger-Dr7IvyH2.mjs";
 import fs, { existsSync, readFileSync } from "node:fs";
 import postcss from "postcss";
 import path from "node:path";

package/dist/vite.js

@@ -1,4 +1,4 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_vite = require("./vite-BkNDGBZ2.js");
+const require_vite = require("./vite-DE8Vfzal.js");
 exports.WeappTailwindcss = require_vite.WeappTailwindcss;
 exports.weappTailwindcss = require_vite.WeappTailwindcss;

package/dist/vite.mjs

@@ -1,2 +1,2 @@
-import { t as WeappTailwindcss } from "./vite-BthAm8kt.mjs";
+import { t as WeappTailwindcss } from "./vite-hZsQAY1a.mjs";
 export { WeappTailwindcss, WeappTailwindcss as weappTailwindcss };