weapp-tailwindcss 5.1.13 → 5.1.15

package/dist/{hmr-timing-hRhRAjYV.mjs → hmr-timing-1aS6--U7.mjs}

@@ -1,13 +1,14 @@
-import { $ as normalizeTailwindSourceDirectives, A as filterApplyOnlyGeneratedCss, At as resolveTailwindV4CssSourceBase, B as stripUnmatchedTailwindSourceMediaCloseFragments, F as removeTailwindV4GeneratedUserCssArtifacts, G as removeUnsupportedMiniProgramAtRules, H as finalizeMiniProgramCss, I as removeTailwindV4GeneratorAtRules, J as hasTailwindApplyDirective, L as shouldFilterApplyOnlyGeneratedCss, M as isCommentOnlyCss, N as normalizeEmptyTailwindCustomVariants, Nt as filterUnsupportedMiniProgramTailwindV4Candidates, Pt as loadTailwindV4DesignSystem, R as splitUserCssLayerBlocks, Tt as isFileMatchedByTailwindSourceEntries, V as transformGeneratorUserCss, X as hasTailwindRootDirectives, Z as hasTailwindSourceDirectives, a as resolveGeneratorRuntimeBranch, at as VITE_MARKER_RE, ct as hasTailwindGeneratedCssMarkers, d as resolveTailwindV4SourceFromRuntime, dt as splitTailwindV4GeneratedCssBySourceOrder, ft as stripGeneratorPlaceholderMarkers, gt as prependConfigDirective, ht as normalizeConfigDirective, i as normalizeWeappTailwindcssGeneratorOptions, it as GENERATOR_PLACEHOLDER_MARKER_RE, j as hasUserCssLayerBlocks, jt as toPosixPath$1, k as extractGeneratedCssForUserLayerSelectors, kt as resolveSourceScanPath, lt as splitGeneratorPlaceholderCssBySourceOrder, mt as stripTailwindBanners, nt as removeTailwindSourceDirectives, ot as createCssAppend, p as resolveTailwindV4SourceOptionsFromRuntime, pt as stripTailwindBanner, rt as resolveCssEntrySource, s as shouldUseMiniProgramCssBranch, st as hasTailwindGeneratedCss, t as createWeappTailwindcssGenerator, tt as parseImportRequest, u as resolveTailwindV4Source$1, ut as splitTailwindGeneratedCssByBanner, xt as FULL_SOURCE_SCAN_EXTENSION_RE, z as stripTailwindSourceMediaFragments } from "./generator-BvPcmqxU.mjs";
+import { $ as normalizeTailwindSourceDirectives, A as filterApplyOnlyGeneratedCss, At as resolveTailwindV4CssSourceBase, B as stripUnmatchedTailwindSourceMediaCloseFragments, F as removeTailwindV4GeneratedUserCssArtifacts, G as removeUnsupportedMiniProgramAtRules, H as finalizeMiniProgramCss, I as removeTailwindV4GeneratorAtRules, J as hasTailwindApplyDirective, L as shouldFilterApplyOnlyGeneratedCss, M as isCommentOnlyCss, N as normalizeEmptyTailwindCustomVariants, Nt as filterUnsupportedMiniProgramTailwindV4Candidates, Pt as loadTailwindV4DesignSystem, R as splitUserCssLayerBlocks, Tt as isFileMatchedByTailwindSourceEntries, V as transformGeneratorUserCss, X as hasTailwindRootDirectives, Z as hasTailwindSourceDirectives, a as resolveGeneratorRuntimeBranch, at as VITE_MARKER_RE, ct as hasTailwindGeneratedCssMarkers, d as resolveTailwindV4SourceFromRuntime, dt as splitTailwindV4GeneratedCssBySourceOrder, ft as stripGeneratorPlaceholderMarkers, gt as prependConfigDirective, ht as normalizeConfigDirective, i as normalizeWeappTailwindcssGeneratorOptions, it as GENERATOR_PLACEHOLDER_MARKER_RE, j as hasUserCssLayerBlocks, jt as toPosixPath$1, k as extractGeneratedCssForUserLayerSelectors, kt as resolveSourceScanPath, lt as splitGeneratorPlaceholderCssBySourceOrder, mt as stripTailwindBanners, nt as removeTailwindSourceDirectives, ot as createCssAppend, p as resolveTailwindV4SourceOptionsFromRuntime, pt as stripTailwindBanner, rt as resolveCssEntrySource, s as shouldUseMiniProgramCssBranch, st as hasTailwindGeneratedCss, t as createWeappTailwindcssGenerator, tt as parseImportRequest, u as resolveTailwindV4Source$1, ut as splitTailwindGeneratedCssByBanner, xt as FULL_SOURCE_SCAN_EXTENSION_RE, z as stripTailwindSourceMediaFragments } from "./generator-CEo920So.mjs";
+import { o as transformCssMacroCss, r as hasCssMacroTailwindV4InternalAtRules, t as hasCssMacroStyleOptions } from "./auto-2dg_uhEJ.mjs";
 import { t as omitUndefined } from "./object-BJSWl-E5.mjs";
-import { h as resolveTailwindV4EntriesFromCss, l as getRuntimeClassSetSignature, r as isUniAppXEnabled, v as includesTailwindV4PreflightDirective } from "./tailwindcss-DZT_pWrd.mjs";
-import { _ as babelParse, b as md5Hash, g as replaceWxml, v as traverse, y as createDebug } from "./wxml-DdGdeqaH.mjs";
-import { r as resolveStyleOptionsFromContext } from "./context-xSJE588m.mjs";
+import { h as resolveTailwindV4EntriesFromCss, l as getRuntimeClassSetSignature, r as isUniAppXEnabled, v as includesTailwindV4PreflightDirective } from "./tailwindcss-xs704TRw.mjs";
+import { _ as babelParse, b as md5Hash, g as replaceWxml, i as createAttributeMatcher, n as Parser, v as traverse, y as createDebug } from "./wxml-DdGdeqaH.mjs";
+import { r as resolveStyleOptionsFromContext } from "./context-BgGWVAmN.mjs";
 import { existsSync, readFileSync } from "node:fs";
 import path from "node:path";
 import process from "node:process";
 import { extractRawCandidatesWithPositions, extractSourceCandidates, extractValidCandidates, resolveProjectSourceFiles, resolveValidTailwindV4Candidates, splitCandidateTokens } from "@tailwindcss-mangle/engine";
-import { cleanLocalCssImportWrapperTailwindDirectives, cleanLocalCssImportWrapperTailwindDirectivesRoot, filterExistingCssRules, isPureLocalCssImportWrapper, isPureLocalCssImportWrapperRoot, postcss, restoreLocalCssImports, rewriteLocalCssImportRequestsForOutput, splitLocalCssImports, splitLocalCssImportsRoot, transformWebCssCompat } from "@weapp-tailwindcss/postcss";
+import { cleanLocalCssImportWrapperTailwindDirectives, cleanLocalCssImportWrapperTailwindDirectivesRoot, filterExistingCssRules, isPureLocalCssImportWrapper, isPureLocalCssImportWrapperRoot, normalizeMiniProgramGeneratedCssForPostcss, postcss, removeMatchingLocalCssImports, restoreLocalCssImports, rewriteLocalCssImportRequestsForOutput, splitLocalCssImports, splitLocalCssImportsRoot, transformWebCssCompat } from "@weapp-tailwindcss/postcss";
 import { LRUCache } from "lru-cache";
 import { readFile } from "node:fs/promises";
 import { MappingChars2String, unescape } from "@weapp-core/escape";
@@ -129,6 +130,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)));
@@ -153,11 +187,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 || !path.isAbsolute(from)) return;
@@ -172,13 +242,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);
 }
@@ -187,7 +250,7 @@ function isMiniProgramGeneratorTarget(target) {
 }
 function finalizeMiniProgramGeneratorCss(css, target, _majorVersion, cssPreflight, options = {}) {
 	if (!isMiniProgramGeneratorTarget(target)) return css;
-	if (isVueScopedStyleSource(options.styleOptions?.postcssOptions?.options?.from)) return finalizeMiniProgramCss(css, {
+	if (options.styleOptions && isVueScopedStyleRequest(resolvePostcssRequestOption(options.styleOptions))) return finalizeMiniProgramCss(css, {
 		cssPreflight: false,
 		cssSelectorReplacement: options.styleOptions?.cssOptions?.cssSelectorReplacement ?? options.styleOptions?.cssSelectorReplacement,
 		isTailwindcssV4: true,
@@ -204,7 +267,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
 	};
@@ -274,7 +337,7 @@ function isEmptyCssSourceOrderParts(parts) {
 }
 function resolveGeneratorStyleOptions(opts, cssHandlerOptions, generatorStyleOptions) {
 	const resolvedStyleOptions = 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
@@ -1472,7 +1535,8 @@ async function resolveGeneratorSource(_majorVersion, runtimeState, rawSource, fi
 		index: 0,
 		matched: true
 	}) : void 0;
-	const configuredCssSource = normalizedSourceOptions && hasConfiguredTailwindV4CssSource(normalizedSourceOptions) && hasTailwindGeneratedCssMarkers(rawSource) ? matchedCssSource ?? candidateMatchedCssSource ?? singleConfiguredCssSource ?? await resolveTailwindV4Source$1(normalizedSourceOptions) : void 0;
+	const canResolveCombinedConfiguredCssSources = (normalizedSourceOptions?.cssSources?.length ?? 0) <= 1 || hasTailwindGeneratedCss(rawSource);
+	const configuredCssSource = normalizedSourceOptions && hasConfiguredTailwindV4CssSource(normalizedSourceOptions) && hasTailwindGeneratedCssMarkers(rawSource) ? matchedCssSource ?? candidateMatchedCssSource ?? singleConfiguredCssSource ?? (canResolveCombinedConfiguredCssSources ? await resolveTailwindV4Source$1(normalizedSourceOptions) : void 0) : void 0;
 	if (configuredCssSource) return generatorOptions?.config ? {
 		...configuredCssSource,
 		css: prependConfigDirective(configuredCssSource.css, generatorOptions.config)
@@ -2314,10 +2378,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 ? removeMatchingLocalCssImports(source.css, localImports) : source.css;
 			const generator = createWeappTailwindcssGenerator(options.disableSourceScan === true ? {
 				...source,
-				css: removeTailwindSourceDirectives(source.css, { importFallback: generatorOptions.importFallback })
-			} : source);
+				css: 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);
@@ -2350,6 +2418,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 = includesTailwindV4PreflightDirective(generatorRawSource);
+		const hasOnlyPrimaryCssSource = generatorSources.length > 0 && generatorSources.every((source) => {
+			const metadata = source.__weappTailwindcssMeta;
+			return metadata?.candidateMatchedCssSource !== true && metadata?.primaryCssSource === true;
+		});
+		const shouldFilterApplyOnlyCss = shouldFilterApplyOnlyGeneratedCss(majorVersion, generated.target, generatorRawSource, {
+			hasGeneratedCss,
+			hasGeneratedMarkers
+		});
+		const filterGeneratedApplyOnlyCss = (css) => {
+			if (!shouldFilterApplyOnlyCss) return css;
+			return 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 = stripTailwindBanner(css);
+				const generationCss = generated.target === "weapp" && (hasCssMacroStyleOptions(generatorStyleOptions) || hasCssMacroTailwindV4InternalAtRules(rawCss)) ? await transformCssMacroCss(rawCss, generatorStyleOptions) : rawCss;
+				const normalizedCss = generated.target === "weapp" ? await 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 = splitUserCssLayerBlocks(source);
+					const layerCss = await transformGeneratorUserCss(parts.layer, userCssOptions);
+					const restCss = await transformGeneratorUserCss(parts.rest, userCssOptions);
+					return createCssSourceOrderAppend$1(wrapUserLayerComponentsCss(layerCss), restCss);
+				};
+				const orderedUserCss = splitGeneratorPlaceholderCssBySourceOrder(userCssOrderSource, generated.rawCss) ?? (hasMatchedCssSourceFile ? 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(filterExistingCssRules(css, beforeUserCss), css);
+					return reorderMarkedUserLayerComponentsCss(createCssSourceOrderAppend$1(cssWithBeforeUserCss, filterExistingCssRules(cssWithBeforeUserCss, afterUserCss)));
+				}
+				return reorderMarkedUserLayerComponentsCss(createCssSourceOrderAppend$1(css, filterExistingCssRules(css, await transformDeferredUserCss(generatedUserCssRawSource))));
+			};
+			const canAppendIncrementalCss = generated.target !== "weapp" || !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 ? createCssAppend(options.previousCss, await normalizeDeferredGeneratedCss(incrementalRawCss)) : options.previousCss : await normalizeDeferredGeneratedCss(generated.rawCss ?? generated.css);
+			const css = 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" || !hasUserCssLayerBlocks(generatorRawSource)) && typeof options.previousCss === "string" && typeof generated.incrementalCss === "string") {
 			const incrementalCss = stripTailwindBanner(generated.incrementalCss);
 			const css = incrementalCss.trim().length > 0 ? finalizeIncrementalGeneratorCss(options.previousCss, incrementalCss, generated.target, majorVersion, opts.cssPreflight, {
@@ -2371,33 +2524,7 @@ async function generateCssByGenerator(options) {
 				}
 			};
 		}
-		const shouldFilterApplyOnlyCss = shouldFilterApplyOnlyGeneratedCss(majorVersion, generated.target, generatorRawSource, {
-			hasGeneratedCss,
-			hasGeneratedMarkers
-		});
-		const generatedCssSource = generated.target === "web" ? generated.css : stripTailwindBanner(generated.css);
-		const generatedCss = shouldFilterApplyOnlyCss ? 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 = 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 : stripTailwindBanner(generated.css));
 		const orderedExtraCss = splitGeneratorPlaceholderCssBySourceOrder(userCssOrderSource, generated.rawCss) ?? (hasMatchedCssSourceFile ? splitTailwindV4GeneratedCssBySourceOrder(userCssOrderSource, generated.rawCss) : splitRawSourceByGeneratedCssOrder(userCssOrderSource, generated.rawCss));
 		const shouldAppendMatchedCssSourceCompat = !hasMatchedCssSourceFile || orderedExtraCss !== void 0;
 		if (orderedExtraCss) {
@@ -2464,6 +2591,8 @@ async function generateCssByGenerator(options) {
 		}
 		debug("tailwind direct css generation prefix mismatch, append transformed bundle css %s", file);
 		let css = generatedCss;
+		const distinctUserLayerParts = hasDistinctUserRawSource && hasUserCssLayerBlocks(generatedUserCssRawSource) ? splitUserCssLayerBlocks(generatedUserCssRawSource) : void 0;
+		let restoredDistinctUserLayerCss = false;
 		if (generated.target === "weapp" && generatorRawSource.includes("weapp-tailwindcss generator-placeholder") && !hasUserCssLayerBlocks(generatorRawSource)) css = createCssSourceOrderAppend$1(await transformGeneratorUserCss(generatedUserCssRawSource, {
 			generatorTarget: generated.target,
 			generatorStyleOptions,
@@ -2493,10 +2622,26 @@ async function generateCssByGenerator(options) {
 					if (shouldFinalizeMarkedUserLayerComponentsCss(file)) css = reorderMarkedUserLayerComponentsCss(css);
 				}
 			}
+			if (hasDistinctUserRawSource && distinctUserLayerParts) {
+				const layerUserCss = await transformGeneratorUserCss(distinctUserLayerParts.layer, {
+					generatorTarget: generated.target,
+					generatorStyleOptions,
+					cssUserHandlerOptions,
+					styleHandler,
+					importFallback: generatorOptions.importFallback,
+					processed: userRawSourceProcessed
+				});
+				if (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 transformGeneratorUserCss(generatedUserCssRawSource, {
+				const distinctUserCssRawSource = restoredDistinctUserLayerCss ? distinctUserLayerParts?.rest ?? generatedUserCssRawSource : generatedUserCssRawSource;
+				const userCss = await transformGeneratorUserCss(distinctUserCssRawSource, {
 					generatorTarget: generated.target,
 					generatorStyleOptions,
 					cssUserHandlerOptions,
@@ -2504,10 +2649,11 @@ async function generateCssByGenerator(options) {
 					importFallback: generatorOptions.importFallback,
 					processed: userRawSourceProcessed
 				});
-				const missingUserCss = isCssAlreadyRepresentedByMarkers(css, generatedUserCssRawSource) ? filterExistingCssRules(css, userCss) : userCss;
+				const missingUserCss = isCssAlreadyRepresentedByMarkers(css, distinctUserCssRawSource) ? filterExistingCssRules(css, userCss) : userCss;
 				css = createCssSourceOrderAppend$1(css, missingUserCss);
 			} else if (hasMatchedCssSourceFile && generated.target === "weapp" && hasGeneratedMarkers && !hasGeneratedCss) {
-				const userCss = await transformGeneratorUserCss(removeTailwindV4GeneratedUserCssArtifacts(userCssRawSource), {
+				const cleanedUserCssRawSource = removeTailwindV4GeneratedUserCssArtifacts(userCssRawSource);
+				const userCss = await transformGeneratorUserCss(restoredDistinctUserLayerCss && hasUserCssLayerBlocks(cleanedUserCssRawSource) ? splitUserCssLayerBlocks(cleanedUserCssRawSource).rest : cleanedUserCssRawSource, {
 					generatorTarget: generated.target,
 					generatorStyleOptions,
 					cssUserHandlerOptions,
@@ -2572,7 +2718,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 && !hasTailwindApplyDirective(generatedUserCssRawSource)) {
-			const userCss = await transformGeneratorUserCss(generatedUserCssRawSource, {
+			const distinctUserCssRawSource = restoredDistinctUserLayerCss ? distinctUserLayerParts?.rest ?? generatedUserCssRawSource : generatedUserCssRawSource;
+			const userCss = await transformGeneratorUserCss(distinctUserCssRawSource, {
 				generatorTarget: generated.target,
 				generatorStyleOptions,
 				cssUserHandlerOptions,
@@ -2580,7 +2727,7 @@ async function generateCssByGenerator(options) {
 				importFallback: generatorOptions.importFallback,
 				processed: userRawSourceProcessed
 			});
-			const missingUserCss = isCssAlreadyRepresentedByMarkers(css, generatedUserCssRawSource) ? filterExistingCssRules(css, userCss) : userCss;
+			const missingUserCss = isCssAlreadyRepresentedByMarkers(css, distinctUserCssRawSource) ? filterExistingCssRules(css, userCss) : userCss;
 			css = createCssSourceOrderAppend$1(css, missingUserCss);
 		}
 		const finalCss = finalizeGeneratorCss(css, generated.target, {
@@ -2889,10 +3036,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 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 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 = createAttributeMatcher(options.customAttributesEntities);
+	const defaultTemplateHandlerEnabled = !options.disabledDefaultTemplateHandler;
+	let tag = "";
+	const tasks = [];
+	const parser = new 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) {
@@ -3042,8 +3245,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${md5Hash(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",
+		md5Hash(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);
@@ -3090,7 +3306,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));
@@ -3103,7 +3319,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));
@@ -3117,7 +3333,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]);
@@ -3452,4 +3668,4 @@ function createHmrTimingRecorder(bundler) {
 	};
 }
 //#endregion
-export { processCachedTask as A, removeGeneratedSelectorCompatCss as C, createCssSourceTraceCacheSignature as D, annotateCssSourceTrace as E, createCssTokenSourceMap as O, scoreTailwindV4CssSourceFileMatch as S, hasMiniProgramTailwindV4PreflightReset as T, normalizeMiniProgramGeneratorCssSource as _, isSourceCandidateRequest as a, rewriteLocalCssImportRequestsForOutput as b, collectStrictEscapedRuntimeCandidates as c, validateCandidatesByGenerator as d, pushConcurrentTaskFactories as f, mergeMarkedUserLayerComponentsCss as g, extractMarkedUserLayerComponentsCss as h, createSourceCandidateStore as i, isCssSourceTraceEnabled as k, createEscapeFragments as l, runWithConcurrency as m, emitHmrTiming as n, resolveSourceCandidateScanFiles as o, resolveTaskConcurrency as p, createSourceCandidateCollector as r, createBundleRuntimeClassSetManager as s, createHmrTimingRecorder as t, generateCssByGenerator as u, normalizeMiniProgramImportShell as v, createCssSourceOrderAppend$1 as w, splitLocalCssImports as x, isPureLocalCssImportWrapper as y };
+export { collectRawSourceClassSelectors as A, scoreTailwindV4CssSourceFileMatch as C, hasMiniProgramTailwindV4PreflightReset as D, finalizeMiniProgramGeneratorCss as E, annotateCssSourceTrace as F, createCssSourceTraceCacheSignature as I, createCssTokenSourceMap as L, hasBundlerGeneratedCssMarker as M, parseBundlerGeneratedCssMarkerBlocks as N, isSourceStyleRequest as O, stripBundlerGeneratedCssMarkers as P, isCssSourceTraceEnabled as R, splitLocalCssImports as S, createCssSourceOrderAppend$1 as T, mergeMarkedUserLayerComponentsCss as _, isSourceCandidateRequest as a, isPureLocalCssImportWrapper as b, createBundleRuntimeClassSetManager as c, generateCssByGenerator as d, validateCandidatesByGenerator as f, extractMarkedUserLayerComponentsCss as g, runWithConcurrency as h, createSourceCandidateStore as i, createBundlerGeneratedCssMarker as j, stripRequestQuery as k, collectStrictEscapedRuntimeCandidates as l, resolveTaskConcurrency as m, emitHmrTiming as n, resolveSourceCandidateScanFiles as o, pushConcurrentTaskFactories as p, createSourceCandidateCollector as r, extractCandidatesFromSource as s, createHmrTimingRecorder as t, createEscapeFragments as u, normalizeMiniProgramGeneratorCssSource as v, removeGeneratedSelectorCompatCss as w, rewriteLocalCssImportRequestsForOutput as x, normalizeMiniProgramImportShell as y, processCachedTask as z };