weapp-tailwindcss 5.1.13 → 5.1.15

package/dist/{hmr-timing-DW1g3zjl.js → hmr-timing-B8p4f0ca.js}

@@ -1,9 +1,10 @@
 const require_rolldown_runtime = require("./rolldown-runtime-emK7D4bc.js");
-const require_generator = require("./generator-CS10c9g1.js");
+const require_generator = require("./generator-CEnUsjed.js");
+require("./auto-DtU6f3X6.js");
 const require_object = require("./object-COs_Mw6p.js");
-const require_tailwindcss = require("./tailwindcss-z9JMF-qU.js");
+const require_tailwindcss = require("./tailwindcss-KBYPJ2DW.js");
 const require_wxml = require("./wxml-Ce10eREX.js");
-const require_context = require("./context-DRRgW7i2.js");
+const require_context = require("./context-VeFq_8vW.js");
 let node_fs = require("node:fs");
 let node_path = require("node:path");
 node_path = require_rolldown_runtime.__toESM(node_path);
@@ -133,6 +134,39 @@ function annotateCssSourceTrace(css, options) {
 	}
 }
 //#endregion
+//#region src/bundlers/shared/generated-css-marker.ts
+const BUNDLER_GENERATED_CSS_MARKER_RE = /\/\*!?\s*weapp-tailwindcss (?:gulp|vite|webpack)-generated-css(?:\s*:\s*[^\s*]+)?\s*\*\/\s*/i;
+const BUNDLER_GENERATED_CSS_MARKER_GLOBAL_RE = /\/\*!?\s*weapp-tailwindcss (?:gulp|vite|webpack)-generated-css(?:\s*:\s*[^\s*]+)?\s*\*\/\s*/gi;
+const BUNDLER_GENERATED_CSS_MARKER_CAPTURE_RE = /\/\*!?\s*weapp-tailwindcss (gulp|vite|webpack)-generated-css(?:\s*:\s*([^\s*]+))?\s*\*\/\s*/gi;
+const VITE_INTERNAL_CSS_MARKER_GLOBAL_RE = /\/\*\$vite\$:\d+\*\/\s*/g;
+function createBundlerGeneratedCssMarker(bundler, file) {
+	return `/*! weapp-tailwindcss ${bundler}-generated-css:${encodeURIComponent(file)} */`;
+}
+function hasBundlerGeneratedCssMarker(source) {
+	return typeof source === "string" && BUNDLER_GENERATED_CSS_MARKER_RE.test(source);
+}
+function stripBundlerGeneratedCssMarkers(source) {
+	return source.replace(BUNDLER_GENERATED_CSS_MARKER_GLOBAL_RE, "").replace(VITE_INTERNAL_CSS_MARKER_GLOBAL_RE, "");
+}
+function parseBundlerGeneratedCssMarkerBlocks(source) {
+	const blocks = [];
+	BUNDLER_GENERATED_CSS_MARKER_CAPTURE_RE.lastIndex = 0;
+	let match = BUNDLER_GENERATED_CSS_MARKER_CAPTURE_RE.exec(source);
+	while (match !== null) {
+		const cssStart = BUNDLER_GENERATED_CSS_MARKER_CAPTURE_RE.lastIndex;
+		const nextMatch = BUNDLER_GENERATED_CSS_MARKER_CAPTURE_RE.exec(source);
+		const cssEnd = nextMatch?.index ?? source.length;
+		const file = match[2] ? decodeURIComponent(match[2]) : void 0;
+		blocks.push({
+			bundler: match[1],
+			file,
+			css: source.slice(cssStart, cssEnd)
+		});
+		match = nextMatch;
+	}
+	return blocks;
+}
+//#endregion
 //#region src/bundlers/shared/generator-css/class-selectors.ts
 function normalizeCssClassSelector(value) {
 	return value.replace(/\\([^\da-f\r\n])/gi, "$1").replace(/\\([\da-f]{1,6})\s?/gi, (_, code) => String.fromCodePoint(Number.parseInt(code, 16)));
@@ -157,11 +191,47 @@ function collectGeneratedRawSourceCandidates(candidates, rawSource, escapeMap) {
 	return matched;
 }
 //#endregion
+//#region src/bundlers/shared/style-requests.ts
+const SOURCE_STYLE_EXT_RE = /\.(?:css|scss|sass|less|styl|stylus|pcss|postcss)$/i;
+const STYLE_QUERY_RE = /(?:^|&)type=styles?(?:&|$)/;
+const VUE_STYLE_QUERY_RE = /(?:^|&)type=style(?:&|$)/;
+const STYLE_LANG_QUERY_RE = /(?:^|&)lang(?:[.=](?:css|scss|sass|less|styl|stylus|pcss|postcss))?(?:&|$)/;
+function stripHash(request) {
+	const hashIndex = request.indexOf("#");
+	return hashIndex === -1 ? request : request.slice(0, hashIndex);
+}
+function stripRequestQuery(request) {
+	const normalized = stripHash(request);
+	const queryIndex = normalized.indexOf("?");
+	return queryIndex === -1 ? normalized : normalized.slice(0, queryIndex);
+}
+function isSourceStyleRequest(request) {
+	if (typeof request !== "string" || request.length === 0) return false;
+	const normalized = stripHash(request);
+	const queryIndex = normalized.indexOf("?");
+	const pathname = queryIndex === -1 ? normalized : normalized.slice(0, queryIndex);
+	if (SOURCE_STYLE_EXT_RE.test(pathname)) return true;
+	if (queryIndex === -1) return false;
+	const query = normalized.slice(queryIndex + 1);
+	return STYLE_QUERY_RE.test(query) || STYLE_LANG_QUERY_RE.test(query);
+}
+function isVueScopedStyleRequest(request) {
+	if (typeof request !== "string" || request.length === 0) return false;
+	const normalized = stripHash(request);
+	const queryIndex = normalized.indexOf("?");
+	if (queryIndex === -1) return false;
+	const query = normalized.slice(queryIndex + 1);
+	return VUE_STYLE_QUERY_RE.test(query) && /(?:^|&)scoped(?:=[^&]*)?(?:&|$)/.test(query);
+}
+//#endregion
 //#region src/bundlers/shared/generator-css/source-resolver/postcss-source.ts
 function resolvePostcssFromOption(cssHandlerOptions) {
 	const from = cssHandlerOptions.postcssOptions?.options?.from;
 	return typeof from === "string" && from.length > 0 ? from : void 0;
 }
+function resolvePostcssRequestOption(cssHandlerOptions) {
+	return resolveCssHandlerSourceOptions(cssHandlerOptions)?.requestFile ?? resolvePostcssFromOption(cssHandlerOptions);
+}
 function resolvePostcssSourceFile(cssHandlerOptions) {
 	const from = resolvePostcssFromOption(cssHandlerOptions);
 	if (!from || !node_path.default.isAbsolute(from)) return;
@@ -176,13 +246,6 @@ function resolveCssSourceBase(file, cssHandlerOptions) {
 }
 //#endregion
 //#region src/bundlers/shared/generator-css/generation-helpers.ts
-function isVueScopedStyleSource(from) {
-	if (typeof from !== "string" || from.length === 0) return false;
-	const queryIndex = from.indexOf("?");
-	if (queryIndex === -1) return false;
-	const query = from.slice(queryIndex + 1);
-	return /(?:^|&)type=style(?:&|$)/.test(query) && /(?:^|&)scoped(?:=[^&]*)?(?:&|$)/.test(query);
-}
 function hasMiniProgramTailwindV4PreflightReset(css) {
 	return /(?:^|[},])\s*view\s*,\s*text\s*,\s*::after\s*,\s*::before\s*\{[^}]*\bborder\s*:\s*0\s+solid\b/.test(css);
 }
@@ -191,7 +254,7 @@ function isMiniProgramGeneratorTarget(target) {
 }
 function finalizeMiniProgramGeneratorCss(css, target, _majorVersion, cssPreflight, options = {}) {
 	if (!isMiniProgramGeneratorTarget(target)) return css;
-	if (isVueScopedStyleSource(options.styleOptions?.postcssOptions?.options?.from)) return (0, _weapp_tailwindcss_postcss.finalizeMiniProgramCss)(css, {
+	if (options.styleOptions && isVueScopedStyleRequest(resolvePostcssRequestOption(options.styleOptions))) return (0, _weapp_tailwindcss_postcss.finalizeMiniProgramCss)(css, {
 		cssPreflight: false,
 		cssSelectorReplacement: options.styleOptions?.cssOptions?.cssSelectorReplacement ?? options.styleOptions?.cssSelectorReplacement,
 		isTailwindcssV4: true,
@@ -208,7 +271,7 @@ function finalizeMiniProgramGeneratorCss(css, target, _majorVersion, cssPrefligh
 	});
 }
 function resolveMiniProgramPreflightModeForGeneratorCss(opts, options) {
-	if (isVueScopedStyleSource(resolvePostcssFromOption(options.cssHandlerOptions))) return {
+	if (isVueScopedStyleRequest(resolvePostcssRequestOption(options.cssHandlerOptions))) return {
 		inject: false,
 		preserve: false
 	};
@@ -278,7 +341,7 @@ function isEmptyCssSourceOrderParts(parts) {
 }
 function resolveGeneratorStyleOptions(opts, cssHandlerOptions, generatorStyleOptions) {
 	const resolvedStyleOptions = require_context.resolveStyleOptionsFromContext(opts);
-	const scopedVueStyleSource = isVueScopedStyleSource(resolvePostcssFromOption(cssHandlerOptions));
+	const scopedVueStyleSource = isVueScopedStyleRequest(resolvePostcssRequestOption(cssHandlerOptions));
 	const preflightStyleOptions = {
 		cssPreflight: scopedVueStyleSource ? false : resolvedStyleOptions.cssPreflight,
 		cssPreflightRange: scopedVueStyleSource ? void 0 : resolvedStyleOptions.cssPreflightRange
@@ -1476,7 +1539,8 @@ async function resolveGeneratorSource(_majorVersion, runtimeState, rawSource, fi
 		index: 0,
 		matched: true
 	}) : void 0;
-	const configuredCssSource = normalizedSourceOptions && hasConfiguredTailwindV4CssSource(normalizedSourceOptions) && require_generator.hasTailwindGeneratedCssMarkers(rawSource) ? matchedCssSource ?? candidateMatchedCssSource ?? singleConfiguredCssSource ?? await require_generator.resolveTailwindV4Source(normalizedSourceOptions) : void 0;
+	const canResolveCombinedConfiguredCssSources = (normalizedSourceOptions?.cssSources?.length ?? 0) <= 1 || require_generator.hasTailwindGeneratedCss(rawSource);
+	const configuredCssSource = normalizedSourceOptions && hasConfiguredTailwindV4CssSource(normalizedSourceOptions) && require_generator.hasTailwindGeneratedCssMarkers(rawSource) ? matchedCssSource ?? candidateMatchedCssSource ?? singleConfiguredCssSource ?? (canResolveCombinedConfiguredCssSources ? await require_generator.resolveTailwindV4Source(normalizedSourceOptions) : void 0) : void 0;
 	if (configuredCssSource) return generatorOptions?.config ? {
 		...configuredCssSource,
 		css: require_generator.prependConfigDirective(configuredCssSource.css, generatorOptions.config)
@@ -2318,10 +2382,14 @@ async function generateCssByGenerator(options) {
 		const configuredContainerCompat = hasConfiguredContainerCompatSources(generatorSources);
 		const sourceConcurrency = resolveGeneratorSourceConcurrency();
 		const generated = mergeGeneratorResults((await runWithConcurrency(generatorSources.map((source) => async () => {
+			const sourceCss = options.deferCssAdaptation ? (0, _weapp_tailwindcss_postcss.removeMatchingLocalCssImports)(source.css, localImports) : source.css;
 			const generator = require_generator.createWeappTailwindcssGenerator(options.disableSourceScan === true ? {
 				...source,
-				css: require_generator.removeTailwindSourceDirectives(source.css, { importFallback: generatorOptions.importFallback })
-			} : source);
+				css: require_generator.removeTailwindSourceDirectives(sourceCss, { importFallback: generatorOptions.importFallback })
+			} : sourceCss === source.css ? source : {
+				...source,
+				css: sourceCss
+			});
 			const sourceEntries = getSourceCandidatesForEntries ? await resolveGeneratorSourceEntries(source, runtimeState) : void 0;
 			const sourceScopedRuntime = sourceEntries && sourceEntries.length > 0 ? getSourceCandidatesForEntries?.(sourceEntries) : void 0;
 			const scopedRuntime = resolveScopedRuntimeCandidates(options.sourceCandidates, sourceScopedRuntime);
@@ -2354,6 +2422,91 @@ async function generateCssByGenerator(options) {
 		}), sourceConcurrency)).filter((item) => Boolean(item)));
 		if (!generated) return;
 		debug("tailwind generator result: %s rawBytes=%d cssBytes=%d candidates=%d", file, generated.rawCss.length, generated.css.length, generated.classSet.size);
+		const hasMatchedCssSourceFile = generatorSources.some((source) => source.__weappTailwindcssMeta?.matchedCssSourceFile);
+		const hasExplicitCssSource = generatorSources.some((source) => {
+			const metadata = source.__weappTailwindcssMeta;
+			return metadata?.candidateMatchedCssSource !== true && (metadata?.cssEntryIndex !== void 0 || metadata?.cssSourceIndex !== void 0);
+		});
+		const hasPreflightCssSource = generatorSources.some((source) => {
+			const metadata = source.__weappTailwindcssMeta;
+			const appEntryMatchedByCandidates = metadata?.candidateMatchedCssSource === true && metadata.cssEntryIndex === 0 && metadata.cssSourceIndex === void 0;
+			return metadata?.includesPreflight === true && !appEntryMatchedByCandidates;
+		});
+		const hasPreflightRawSource = require_tailwindcss.includesTailwindV4PreflightDirective(generatorRawSource);
+		const hasOnlyPrimaryCssSource = generatorSources.length > 0 && generatorSources.every((source) => {
+			const metadata = source.__weappTailwindcssMeta;
+			return metadata?.candidateMatchedCssSource !== true && metadata?.primaryCssSource === true;
+		});
+		const shouldFilterApplyOnlyCss = require_generator.shouldFilterApplyOnlyGeneratedCss(majorVersion, generated.target, generatorRawSource, {
+			hasGeneratedCss,
+			hasGeneratedMarkers
+		});
+		const filterGeneratedApplyOnlyCss = (css) => {
+			if (!shouldFilterApplyOnlyCss) return css;
+			return require_generator.filterApplyOnlyGeneratedCss(css, generatorRawSource, { preserveVariables: generated.target !== "web" });
+		};
+		const preflightMode = resolveMiniProgramPreflightModeForGeneratorCss(opts, {
+			cssHandlerOptions,
+			isolateCurrentCssCandidates,
+			localImports,
+			explicitCssSource: hasExplicitCssSource,
+			primaryCssSource: hasOnlyPrimaryCssSource || hasPreflightCssSource || hasPreflightRawSource
+		});
+		if (options.deferCssAdaptation) {
+			const normalizeDeferredGeneratedCss = async (css) => {
+				const rawCss = require_generator.stripTailwindBanner(css);
+				const generationCss = generated.target === "weapp" && ((0, _weapp_tailwindcss_postcss.hasCssMacroStyleOptions)(generatorStyleOptions) || (0, _weapp_tailwindcss_postcss.hasCssMacroTailwindV4InternalAtRules)(rawCss)) ? await (0, _weapp_tailwindcss_postcss.transformCssMacroCss)(rawCss, generatorStyleOptions) : rawCss;
+				const normalizedCss = generated.target === "weapp" ? await (0, _weapp_tailwindcss_postcss.normalizeMiniProgramGeneratedCssForPostcss)(generationCss, {
+					preservePreflight: true,
+					preserveRawClassRules: true
+				}) : generationCss;
+				return filterGeneratedApplyOnlyCss(normalizedCss);
+			};
+			const restoreDeferredUserCss = async (css) => {
+				if (generated.target !== "weapp" || generatedUserCssRawSource.trim().length === 0) return css;
+				const userCssOptions = {
+					generatorTarget: generated.target,
+					generatorStyleOptions,
+					cssUserHandlerOptions,
+					styleHandler,
+					importFallback: generatorOptions.importFallback,
+					processed: userRawSourceProcessed
+				};
+				const transformDeferredUserCss = async (source) => {
+					const parts = require_generator.splitUserCssLayerBlocks(source);
+					const layerCss = await require_generator.transformGeneratorUserCss(parts.layer, userCssOptions);
+					const restCss = await require_generator.transformGeneratorUserCss(parts.rest, userCssOptions);
+					return createCssSourceOrderAppend$1(wrapUserLayerComponentsCss(layerCss), restCss);
+				};
+				const orderedUserCss = require_generator.splitGeneratorPlaceholderCssBySourceOrder(userCssOrderSource, generated.rawCss) ?? (hasMatchedCssSourceFile ? require_generator.splitTailwindV4GeneratedCssBySourceOrder(userCssOrderSource, generated.rawCss) : splitRawSourceByGeneratedCssOrder(userCssOrderSource, generated.rawCss));
+				if (orderedUserCss) {
+					const beforeUserCss = await transformDeferredUserCss(orderedUserCss.before);
+					const afterUserCss = await transformDeferredUserCss(orderedUserCss.after);
+					const cssWithBeforeUserCss = createCssSourceOrderAppend$1((0, _weapp_tailwindcss_postcss.filterExistingCssRules)(css, beforeUserCss), css);
+					return reorderMarkedUserLayerComponentsCss(createCssSourceOrderAppend$1(cssWithBeforeUserCss, (0, _weapp_tailwindcss_postcss.filterExistingCssRules)(cssWithBeforeUserCss, afterUserCss)));
+				}
+				return reorderMarkedUserLayerComponentsCss(createCssSourceOrderAppend$1(css, (0, _weapp_tailwindcss_postcss.filterExistingCssRules)(css, await transformDeferredUserCss(generatedUserCssRawSource))));
+			};
+			const canAppendIncrementalCss = generated.target !== "weapp" || !require_generator.hasUserCssLayerBlocks(generatorRawSource);
+			const incrementalRawCss = generated.incrementalRawCss ?? generated.incrementalCss;
+			const shouldAppendIncrementalCss = canAppendIncrementalCss && typeof options.previousCss === "string" && typeof incrementalRawCss === "string";
+			const normalizedCss = shouldAppendIncrementalCss ? incrementalRawCss.trim().length > 0 ? require_generator.createCssAppend(options.previousCss, await normalizeDeferredGeneratedCss(incrementalRawCss)) : options.previousCss : await normalizeDeferredGeneratedCss(generated.rawCss ?? generated.css);
+			const css = (0, _weapp_tailwindcss_postcss.restoreLocalCssImports)(shouldAppendIncrementalCss ? normalizedCss : await restoreDeferredUserCss(normalizedCss), localImports, { outputFile: file });
+			return {
+				css,
+				classSet: resolveGeneratedCssClassSet(generated.target, generated.classSet, runtimeWithCurrentCss, css, opts.escapeMap, options.previousClassSet),
+				target: generated.target,
+				source: "generator",
+				dependencies: generated.dependencies,
+				incremental: shouldAppendIncrementalCss,
+				metadata: {
+					file,
+					majorVersion,
+					preflightMode,
+					rawCss: generated.rawCss
+				}
+			};
+		}
 		if ((generated.target !== "weapp" || !require_generator.hasUserCssLayerBlocks(generatorRawSource)) && typeof options.previousCss === "string" && typeof generated.incrementalCss === "string") {
 			const incrementalCss = require_generator.stripTailwindBanner(generated.incrementalCss);
 			const css = incrementalCss.trim().length > 0 ? finalizeIncrementalGeneratorCss(options.previousCss, incrementalCss, generated.target, majorVersion, opts.cssPreflight, {
@@ -2375,33 +2528,7 @@ async function generateCssByGenerator(options) {
 				}
 			};
 		}
-		const shouldFilterApplyOnlyCss = require_generator.shouldFilterApplyOnlyGeneratedCss(majorVersion, generated.target, generatorRawSource, {
-			hasGeneratedCss,
-			hasGeneratedMarkers
-		});
-		const generatedCssSource = generated.target === "web" ? generated.css : require_generator.stripTailwindBanner(generated.css);
-		const generatedCss = shouldFilterApplyOnlyCss ? require_generator.filterApplyOnlyGeneratedCss(generatedCssSource, generatorRawSource, { preserveVariables: generated.target !== "web" }) : generatedCssSource;
-		const hasMatchedCssSourceFile = generatorSources.some((source) => source.__weappTailwindcssMeta?.matchedCssSourceFile);
-		const hasExplicitCssSource = generatorSources.some((source) => {
-			const metadata = source.__weappTailwindcssMeta;
-			return metadata?.candidateMatchedCssSource !== true && (metadata?.cssEntryIndex !== void 0 || metadata?.cssSourceIndex !== void 0);
-		});
-		const hasPreflightCssSource = generatorSources.some((source) => {
-			const metadata = source.__weappTailwindcssMeta;
-			const appEntryMatchedByCandidates = metadata?.candidateMatchedCssSource === true && metadata.cssEntryIndex === 0 && metadata.cssSourceIndex === void 0;
-			return metadata?.includesPreflight === true && !appEntryMatchedByCandidates;
-		});
-		const hasPreflightRawSource = require_tailwindcss.includesTailwindV4PreflightDirective(generatorRawSource);
-		const preflightMode = resolveMiniProgramPreflightModeForGeneratorCss(opts, {
-			cssHandlerOptions,
-			isolateCurrentCssCandidates,
-			localImports,
-			explicitCssSource: hasExplicitCssSource,
-			primaryCssSource: generatorSources.length > 0 && generatorSources.every((source) => {
-				const metadata = source.__weappTailwindcssMeta;
-				return metadata?.candidateMatchedCssSource !== true && metadata?.primaryCssSource === true;
-			}) || hasPreflightCssSource || hasPreflightRawSource
-		});
+		const generatedCss = filterGeneratedApplyOnlyCss(generated.target === "web" ? generated.css : require_generator.stripTailwindBanner(generated.css));
 		const orderedExtraCss = require_generator.splitGeneratorPlaceholderCssBySourceOrder(userCssOrderSource, generated.rawCss) ?? (hasMatchedCssSourceFile ? require_generator.splitTailwindV4GeneratedCssBySourceOrder(userCssOrderSource, generated.rawCss) : splitRawSourceByGeneratedCssOrder(userCssOrderSource, generated.rawCss));
 		const shouldAppendMatchedCssSourceCompat = !hasMatchedCssSourceFile || orderedExtraCss !== void 0;
 		if (orderedExtraCss) {
@@ -2468,6 +2595,8 @@ async function generateCssByGenerator(options) {
 		}
 		debug("tailwind direct css generation prefix mismatch, append transformed bundle css %s", file);
 		let css = generatedCss;
+		const distinctUserLayerParts = hasDistinctUserRawSource && require_generator.hasUserCssLayerBlocks(generatedUserCssRawSource) ? require_generator.splitUserCssLayerBlocks(generatedUserCssRawSource) : void 0;
+		let restoredDistinctUserLayerCss = false;
 		if (generated.target === "weapp" && generatorRawSource.includes("weapp-tailwindcss generator-placeholder") && !require_generator.hasUserCssLayerBlocks(generatorRawSource)) css = createCssSourceOrderAppend$1(await require_generator.transformGeneratorUserCss(generatedUserCssRawSource, {
 			generatorTarget: generated.target,
 			generatorStyleOptions,
@@ -2497,10 +2626,26 @@ async function generateCssByGenerator(options) {
 					if (shouldFinalizeMarkedUserLayerComponentsCss(file)) css = reorderMarkedUserLayerComponentsCss(css);
 				}
 			}
+			if (hasDistinctUserRawSource && distinctUserLayerParts) {
+				const layerUserCss = await require_generator.transformGeneratorUserCss(distinctUserLayerParts.layer, {
+					generatorTarget: generated.target,
+					generatorStyleOptions,
+					cssUserHandlerOptions,
+					styleHandler,
+					importFallback: generatorOptions.importFallback,
+					processed: userRawSourceProcessed
+				});
+				if ((0, _weapp_tailwindcss_postcss.filterExistingCssRules)(css, layerUserCss).trim().length > 0) {
+					css = createCssSourceOrderAppend$1(wrapUserLayerComponentsCss(layerUserCss), css);
+					restoredDistinctUserLayerCss = true;
+					if (shouldFinalizeMarkedUserLayerComponentsCss(file)) css = reorderMarkedUserLayerComponentsCss(css);
+				}
+			}
 		}
 		if (hasMatchedCssSourceFile || generated.target === "web") {
 			if (generated.target === "weapp" && !hasGeneratedCss && !hasGeneratedMarkers) {
-				const userCss = await require_generator.transformGeneratorUserCss(generatedUserCssRawSource, {
+				const distinctUserCssRawSource = restoredDistinctUserLayerCss ? distinctUserLayerParts?.rest ?? generatedUserCssRawSource : generatedUserCssRawSource;
+				const userCss = await require_generator.transformGeneratorUserCss(distinctUserCssRawSource, {
 					generatorTarget: generated.target,
 					generatorStyleOptions,
 					cssUserHandlerOptions,
@@ -2508,10 +2653,11 @@ async function generateCssByGenerator(options) {
 					importFallback: generatorOptions.importFallback,
 					processed: userRawSourceProcessed
 				});
-				const missingUserCss = isCssAlreadyRepresentedByMarkers(css, generatedUserCssRawSource) ? (0, _weapp_tailwindcss_postcss.filterExistingCssRules)(css, userCss) : userCss;
+				const missingUserCss = isCssAlreadyRepresentedByMarkers(css, distinctUserCssRawSource) ? (0, _weapp_tailwindcss_postcss.filterExistingCssRules)(css, userCss) : userCss;
 				css = createCssSourceOrderAppend$1(css, missingUserCss);
 			} else if (hasMatchedCssSourceFile && generated.target === "weapp" && hasGeneratedMarkers && !hasGeneratedCss) {
-				const userCss = await require_generator.transformGeneratorUserCss(require_generator.removeTailwindV4GeneratedUserCssArtifacts(userCssRawSource), {
+				const cleanedUserCssRawSource = require_generator.removeTailwindV4GeneratedUserCssArtifacts(userCssRawSource);
+				const userCss = await require_generator.transformGeneratorUserCss(restoredDistinctUserLayerCss && require_generator.hasUserCssLayerBlocks(cleanedUserCssRawSource) ? require_generator.splitUserCssLayerBlocks(cleanedUserCssRawSource).rest : cleanedUserCssRawSource, {
 					generatorTarget: generated.target,
 					generatorStyleOptions,
 					cssUserHandlerOptions,
@@ -2576,7 +2722,8 @@ async function generateCssByGenerator(options) {
 			css = await appendLegacyContainerCompatCss(css, generatedUserCssRawSource, file, runtime, configuredContainerCompat, generated.target, styleHandler, cssHandlerOptions, generatorStyleOptions);
 		}
 		if (generated.target === "weapp" && hasDistinctUserRawSource && !hasGeneratedCss && !hasGeneratedMarkers && !require_generator.hasTailwindApplyDirective(generatedUserCssRawSource)) {
-			const userCss = await require_generator.transformGeneratorUserCss(generatedUserCssRawSource, {
+			const distinctUserCssRawSource = restoredDistinctUserLayerCss ? distinctUserLayerParts?.rest ?? generatedUserCssRawSource : generatedUserCssRawSource;
+			const userCss = await require_generator.transformGeneratorUserCss(distinctUserCssRawSource, {
 				generatorTarget: generated.target,
 				generatorStyleOptions,
 				cssUserHandlerOptions,
@@ -2584,7 +2731,7 @@ async function generateCssByGenerator(options) {
 				importFallback: generatorOptions.importFallback,
 				processed: userRawSourceProcessed
 			});
-			const missingUserCss = isCssAlreadyRepresentedByMarkers(css, generatedUserCssRawSource) ? (0, _weapp_tailwindcss_postcss.filterExistingCssRules)(css, userCss) : userCss;
+			const missingUserCss = isCssAlreadyRepresentedByMarkers(css, distinctUserCssRawSource) ? (0, _weapp_tailwindcss_postcss.filterExistingCssRules)(css, userCss) : userCss;
 			css = createCssSourceOrderAppend$1(css, missingUserCss);
 		}
 		const finalCss = finalizeGeneratorCss(css, generated.target, {
@@ -2893,10 +3040,66 @@ const SCRIPT_SOURCE_CANDIDATE_EXTENSIONS = /* @__PURE__ */ new Set([
 	"mts",
 	"cts"
 ]);
+const TEMPLATE_SOURCE_CANDIDATE_EXTENSIONS = /* @__PURE__ */ new Set([
+	"html",
+	"wxml",
+	"axml",
+	"jxml",
+	"ksml",
+	"ttml",
+	"qml",
+	"tyml",
+	"xhsml",
+	"swan",
+	"vue",
+	"uvue",
+	"nvue",
+	"mpx"
+]);
 async function extractCandidatesFromSource(source, extension, options = {}) {
 	const candidates = options.extractor ? new Set(await options.extractor(source, extension)) : new Set(await (0, _tailwindcss_mangle_engine.extractSourceCandidates)(source, extension, { ...options.bareArbitraryValues === void 0 ? {} : { bareArbitraryValues: options.bareArbitraryValues } }));
 	const scriptCandidates = await extractScriptStringCandidates(source, extension, options);
 	for (const candidate of scriptCandidates) candidates.add(candidate);
+	const templateAttributeCandidates = await extractTemplateAttributeCandidates(source, extension, options);
+	for (const candidate of templateAttributeCandidates) candidates.add(candidate);
+	return candidates;
+}
+function isDefaultTemplateAttribute(name) {
+	if (name === "class" || name === "hover-class" || name === "virtualhostclass") return true;
+	const lowerName = name.toLowerCase();
+	return lowerName === "class" || lowerName === "hover-class" || lowerName === "virtualhostclass";
+}
+async function extractCandidateTokensFromTemplateAttributeValue(value, options) {
+	return options.extractor ? await options.extractor(value, "html") : await (0, _tailwindcss_mangle_engine.extractSourceCandidates)(value, "html", { ...options.bareArbitraryValues === void 0 ? {} : { bareArbitraryValues: options.bareArbitraryValues } });
+}
+async function extractTemplateAttributeCandidates(source, extension, options) {
+	if (!TEMPLATE_SOURCE_CANDIDATE_EXTENSIONS.has(extension)) return [];
+	if (!options.customAttributesEntities?.length) return [];
+	const candidates = /* @__PURE__ */ new Set();
+	const matchCustomAttribute = require_wxml.createAttributeMatcher(options.customAttributesEntities);
+	const defaultTemplateHandlerEnabled = !options.disabledDefaultTemplateHandler;
+	let tag = "";
+	const tasks = [];
+	const parser = new require_wxml.Parser({
+		onopentagname(name) {
+			tag = name;
+		},
+		onattribute(name, value) {
+			if (!value) return;
+			const shouldHandleDefault = defaultTemplateHandlerEnabled && isDefaultTemplateAttribute(name);
+			const shouldHandleCustom = matchCustomAttribute?.(tag, name) ?? false;
+			if (!shouldHandleDefault && !shouldHandleCustom) return;
+			tasks.push((async () => {
+				for (const candidate of await extractCandidateTokensFromTemplateAttributeValue(value, options)) candidates.add(candidate);
+			})());
+		},
+		onclosetag() {
+			tag = "";
+		}
+	}, { xmlMode: true });
+	parser.write(source);
+	parser.end();
+	await Promise.all(tasks);
 	return candidates;
 }
 async function extractScriptStringCandidates(source, extension, options) {
@@ -3046,8 +3249,21 @@ function resolveSourceCandidateExtension(id) {
 	const normalized = cleanUrl(id);
 	return /\.([^.\\/]+)$/.exec(normalized)?.[1] ?? "html";
 }
-function createSourceCandidateContentCacheKey(extension, source, bareArbitraryValues, extractor) {
-	return `${extension}\0${JSON.stringify(bareArbitraryValues ?? false)}\0${extractor ? "custom" : "default"}\0${(0, _weapp_tailwindcss_shared_node.md5)(source)}`;
+function createSourceCandidateContentCacheKey(extension, source, bareArbitraryValues, customAttributesEntities, disabledDefaultTemplateHandler, extractor) {
+	return [
+		extension,
+		JSON.stringify(bareArbitraryValues ?? false),
+		createCustomAttributesCacheSignature(customAttributesEntities),
+		disabledDefaultTemplateHandler === true ? "default-template:off" : "default-template:on",
+		extractor ? "custom" : "default",
+		(0, _weapp_tailwindcss_shared_node.md5)(source)
+	].join("\0");
+}
+function createCustomAttributesCacheSignature(customAttributesEntities) {
+	return JSON.stringify((customAttributesEntities ?? []).map(([selector, props]) => [stringifyCustomAttributeToken(selector), Array.isArray(props) ? props.map(stringifyCustomAttributeToken) : stringifyCustomAttributeToken(props)]));
+}
+function stringifyCustomAttributeToken(token) {
+	return typeof token === "string" ? `s:${token}` : `r:${token.source}/${token.flags}`;
 }
 async function extractCandidates(source, extension, options) {
 	return extractCandidatesFromSource(source, extension, options);
@@ -3094,7 +3310,7 @@ function createSourceCandidateStore(options = {}) {
 		const normalizedId = cleanUrl(id);
 		scanSourceById.set(normalizedId, source);
 		const extension = resolveSourceCandidateExtension(normalizedId);
-		const contentCacheKey = createSourceCandidateContentCacheKey(extension, source, options.bareArbitraryValues, options.extractor);
+		const contentCacheKey = createSourceCandidateContentCacheKey(extension, source, options.bareArbitraryValues, options.customAttributesEntities, options.disabledDefaultTemplateHandler, options.extractor);
 		const cachedCandidates = sourceCandidateContentCache.get(contentCacheKey);
 		if (cachedCandidates) {
 			replaceScanLayer(normalizedId, new Set(cachedCandidates));
@@ -3107,7 +3323,7 @@ function createSourceCandidateStore(options = {}) {
 	async function syncCss(id, source) {
 		const normalizedId = cleanUrl(id);
 		cssSourceById.set(normalizedId, source);
-		const contentCacheKey = createSourceCandidateContentCacheKey("css", source, options.bareArbitraryValues, options.extractor);
+		const contentCacheKey = createSourceCandidateContentCacheKey("css", source, options.bareArbitraryValues, options.customAttributesEntities, options.disabledDefaultTemplateHandler, options.extractor);
 		const cachedCandidates = sourceCandidateContentCache.get(contentCacheKey);
 		if (cachedCandidates) {
 			replaceCssLayer(normalizedId, new Set(cachedCandidates));
@@ -3121,7 +3337,7 @@ function createSourceCandidateStore(options = {}) {
 		const normalizedId = cleanUrl(id);
 		transformSourceById.set(normalizedId, source);
 		const extension = resolveSourceCandidateExtension(normalizedId);
-		const contentCacheKey = createSourceCandidateContentCacheKey(extension, source, options.bareArbitraryValues, options.extractor);
+		const contentCacheKey = createSourceCandidateContentCacheKey(extension, source, options.bareArbitraryValues, options.customAttributesEntities, options.disabledDefaultTemplateHandler, options.extractor);
 		const cachedCandidates = sourceCandidateContentCache.get(contentCacheKey);
 		const extractedCandidates = cachedCandidates ? new Set(cachedCandidates) : await extractCandidates(source, extension, options);
 		if (!cachedCandidates) sourceCandidateContentCache.set(contentCacheKey, [...extractedCandidates]);
@@ -3462,6 +3678,12 @@ Object.defineProperty(exports, "annotateCssSourceTrace", {
 		return annotateCssSourceTrace;
 	}
 });
+Object.defineProperty(exports, "collectRawSourceClassSelectors", {
+	enumerable: true,
+	get: function() {
+		return collectRawSourceClassSelectors;
+	}
+});
 Object.defineProperty(exports, "collectStrictEscapedRuntimeCandidates", {
 	enumerable: true,
 	get: function() {
@@ -3474,6 +3696,12 @@ Object.defineProperty(exports, "createBundleRuntimeClassSetManager", {
 		return createBundleRuntimeClassSetManager;
 	}
 });
+Object.defineProperty(exports, "createBundlerGeneratedCssMarker", {
+	enumerable: true,
+	get: function() {
+		return createBundlerGeneratedCssMarker;
+	}
+});
 Object.defineProperty(exports, "createCssSourceOrderAppend", {
 	enumerable: true,
 	get: function() {
@@ -3522,18 +3750,36 @@ Object.defineProperty(exports, "emitHmrTiming", {
 		return emitHmrTiming;
 	}
 });
+Object.defineProperty(exports, "extractCandidatesFromSource", {
+	enumerable: true,
+	get: function() {
+		return extractCandidatesFromSource;
+	}
+});
 Object.defineProperty(exports, "extractMarkedUserLayerComponentsCss", {
 	enumerable: true,
 	get: function() {
 		return extractMarkedUserLayerComponentsCss;
 	}
 });
+Object.defineProperty(exports, "finalizeMiniProgramGeneratorCss", {
+	enumerable: true,
+	get: function() {
+		return finalizeMiniProgramGeneratorCss;
+	}
+});
 Object.defineProperty(exports, "generateCssByGenerator", {
 	enumerable: true,
 	get: function() {
 		return generateCssByGenerator;
 	}
 });
+Object.defineProperty(exports, "hasBundlerGeneratedCssMarker", {
+	enumerable: true,
+	get: function() {
+		return hasBundlerGeneratedCssMarker;
+	}
+});
 Object.defineProperty(exports, "hasMiniProgramTailwindV4PreflightReset", {
 	enumerable: true,
 	get: function() {
@@ -3552,6 +3798,12 @@ Object.defineProperty(exports, "isSourceCandidateRequest", {
 		return isSourceCandidateRequest;
 	}
 });
+Object.defineProperty(exports, "isSourceStyleRequest", {
+	enumerable: true,
+	get: function() {
+		return isSourceStyleRequest;
+	}
+});
 Object.defineProperty(exports, "mergeMarkedUserLayerComponentsCss", {
 	enumerable: true,
 	get: function() {
@@ -3570,6 +3822,12 @@ Object.defineProperty(exports, "normalizeMiniProgramImportShell", {
 		return normalizeMiniProgramImportShell;
 	}
 });
+Object.defineProperty(exports, "parseBundlerGeneratedCssMarkerBlocks", {
+	enumerable: true,
+	get: function() {
+		return parseBundlerGeneratedCssMarkerBlocks;
+	}
+});
 Object.defineProperty(exports, "processCachedTask", {
 	enumerable: true,
 	get: function() {
@@ -3612,6 +3870,18 @@ Object.defineProperty(exports, "scoreTailwindV4CssSourceFileMatch", {
 		return scoreTailwindV4CssSourceFileMatch;
 	}
 });
+Object.defineProperty(exports, "stripBundlerGeneratedCssMarkers", {
+	enumerable: true,
+	get: function() {
+		return stripBundlerGeneratedCssMarkers;
+	}
+});
+Object.defineProperty(exports, "stripRequestQuery", {
+	enumerable: true,
+	get: function() {
+		return stripRequestQuery;
+	}
+});
 Object.defineProperty(exports, "validateCandidatesByGenerator", {
 	enumerable: true,
 	get: function() {

package/dist/index.js

@@ -1,10 +1,10 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_framework = require("./framework.js");
-const require_generator = require("./generator-CS10c9g1.js");
-const require_gulp = require("./gulp-DNZZvUMq.js");
+const require_generator = require("./generator-CEnUsjed.js");
+const require_gulp = require("./gulp-3m1dAiig.js");
 const require_postcss = require("./postcss.js");
-const require_vite = require("./vite-DnkObu2L.js");
-const require_webpack = require("./webpack-CzXjfvYS.js");
+const require_vite = require("./vite-DUVjMduj.js");
+const require_webpack = require("./webpack-nppysF4B.js");
 require("./webpack.js");
 let _weapp_tailwindcss_postcss = require("@weapp-tailwindcss/postcss");
 exports.WeappTailwindcss = require_vite.WeappTailwindcss;

package/dist/index.mjs

@@ -1,9 +1,9 @@
 import { detectAppType, detectAppTypeFromEnv, detectAppTypeFromPackageJson, isMpxPackage, isRunningInHBuilderX, isTaroPackage, isUniAppPackage, isUniAppVitePackage, isUniAppXManifest, isUniAppXPackage, isWeappVitePackage, resolveImplicitAppTypeFromViteRoot, resolveMpxPlatform, resolvePlatform, resolveTaroPlatform, resolveUniAppXPlatform, resolveUniPlatform, resolveUniPlatformsFromEnv, resolveUniUtsPlatform } from "./framework.mjs";
-import { t as createWeappTailwindcssGenerator } from "./generator-BvPcmqxU.mjs";
-import { t as createPlugins } from "./gulp-BEOzXrbp.mjs";
+import { t as createWeappTailwindcssGenerator } from "./generator-CEo920So.mjs";
+import { t as createPlugins } from "./gulp-DP71z1jG.mjs";
 import weappTailwindcssPostcssPlugin from "./postcss.mjs";
-import { t as WeappTailwindcss } from "./vite-Tpgi77vE.mjs";
-import { n as weappTailwindcssPackageDir } from "./webpack-CTYm19zA.mjs";
+import { t as WeappTailwindcss } from "./vite-nXZEiwG0.mjs";
+import { n as weappTailwindcssPackageDir } from "./webpack-C_UUFRgj.mjs";
 import "./webpack.mjs";
 import { unitConversionComposeRules, unitConversionPresets } from "@weapp-tailwindcss/postcss";
 export { WeappTailwindcss, createPlugins, createWeappTailwindcssGenerator, detectAppType, detectAppTypeFromEnv, detectAppTypeFromPackageJson, isMpxPackage, isRunningInHBuilderX, isTaroPackage, isUniAppPackage, isUniAppVitePackage, isUniAppXManifest, isUniAppXPackage, isWeappVitePackage, resolveImplicitAppTypeFromViteRoot, resolveMpxPlatform, resolvePlatform, resolveTaroPlatform, resolveUniAppXPlatform, resolveUniPlatform, resolveUniPlatformsFromEnv, resolveUniUtsPlatform, unitConversionComposeRules, unitConversionPresets, weappTailwindcssPackageDir, weappTailwindcssPostcssPlugin };

package/dist/postcss.js

@@ -2,7 +2,7 @@ Object.defineProperties(exports, {
 	__esModule: { value: true },
 	[Symbol.toStringTag]: { value: "Module" }
 });
-const require_generator = require("./generator-CS10c9g1.js");
+const require_generator = require("./generator-CEnUsjed.js");
 const weappTailwindcssPostcssPlugin = (0, require("@weapp-tailwindcss/postcss").createWeappTailwindcssPostcssPlugin)({
 	createGenerator: (source) => {
 		return require_generator.createWeappTailwindcssGenerator(source);

package/dist/postcss.mjs

@@ -1,4 +1,4 @@
-import { i as normalizeWeappTailwindcssGeneratorOptions, t as createWeappTailwindcssGenerator, u as resolveTailwindV4Source } from "./generator-BvPcmqxU.mjs";
+import { i as normalizeWeappTailwindcssGeneratorOptions, t as createWeappTailwindcssGenerator, u as resolveTailwindV4Source } from "./generator-CEo920So.mjs";
 import { createWeappTailwindcssPostcssPlugin } from "@weapp-tailwindcss/postcss";
 const weappTailwindcssPostcssPlugin = createWeappTailwindcssPostcssPlugin({
 	createGenerator: (source) => {

package/dist/presets.js

@@ -2,7 +2,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_rolldown_runtime = require("./rolldown-runtime-emK7D4bc.js");
 const require_framework = require("./framework.js");
 const require_object = require("./object-COs_Mw6p.js");
-const require_tailwindcss = require("./tailwindcss-z9JMF-qU.js");
+const require_tailwindcss = require("./tailwindcss-KBYPJ2DW.js");
 require("./utils-CuKLf1Zv.js");
 require("./logger-TlKT3xmR.js");
 let node_path = require("node:path");

package/dist/presets.mjs

@@ -1,6 +1,6 @@
 import { resolveTaroPlatform, resolveUniPlatformsFromEnv } from "./framework.mjs";
 import { t as omitUndefined } from "./object-BJSWl-E5.mjs";
-import { i as resolveUniAppXOptions, n as resolveTailwindcssBasedir } from "./tailwindcss-DZT_pWrd.mjs";
+import { i as resolveUniAppXOptions, n as resolveTailwindcssBasedir } from "./tailwindcss-xs704TRw.mjs";
 import { n as defuOverrideArray } from "./utils-MVwpU07P.mjs";
 import { t as logger } from "./logger-BNzxZbZj.mjs";
 import path from "node:path";