weapp-tailwindcss 5.1.0 → 5.1.1

package/dist/{hmr-timing-CogqkFaF.js → hmr-timing-CegXR9O4.js}

@@ -1,8 +1,8 @@
 const require_chunk = require("./chunk-emK7D4bc.js");
-const require_v4_engine = require("./v4-engine-D4ubP7N5.js");
-const require_generator = require("./generator-9rUz4Hcb.js");
-const require_context = require("./context-BHxLe743.js");
-const require_tailwindcss = require("./tailwindcss-DHIYcqXT.js");
+const require_v4_engine = require("./v4-engine-ON_oSLfO.js");
+const require_generator = require("./generator-6oMJtTDO.js");
+const require_context = require("./context-B6hVF7dr.js");
+const require_tailwindcss = require("./tailwindcss-dbrbY4cd.js");
 let node_fs = require("node:fs");
 let node_path = require("node:path");
 node_path = require_chunk.__toESM(node_path);
@@ -132,6 +132,30 @@ function annotateCssSourceTrace(css, options) {
 	}
 }
 //#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)));
+}
+function collectRawSourceClassSelectors(rawSource) {
+	const selectors = /* @__PURE__ */ new Set();
+	try {
+		_weapp_tailwindcss_postcss.postcss.parse(rawSource).walkRules((rule) => {
+			for (const selector of rule.selectors ?? [rule.selector]) for (const match of selector.matchAll(/\.((?:\\.|[_a-z\u00A0-\uFFFF-])(?:\\.|[\w\u00A0-\uFFFF-])*)/gi)) selectors.add(normalizeCssClassSelector(match[1]));
+		});
+	} catch {}
+	return selectors;
+}
+function collectGeneratedRawSourceCandidates(candidates, rawSource, escapeMap) {
+	const selectors = collectRawSourceClassSelectors(rawSource);
+	if (selectors.size === 0) return /* @__PURE__ */ new Set();
+	const matched = /* @__PURE__ */ new Set();
+	for (const candidate of candidates) {
+		const escaped = normalizeCssClassSelector(require_context.replaceWxml(candidate, { escapeMap }));
+		if (selectors.has(candidate) || selectors.has(escaped)) matched.add(candidate);
+	}
+	return matched;
+}
+//#endregion
 //#region src/bundlers/shared/generator-css/generation-helpers.ts
 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);
@@ -214,7 +238,7 @@ function shouldUseGeneratorForCurrentCss(_majorVersion, cssHandlerOptions, optio
 	const hasApplyDirectives = require_v4_engine.hasTailwindApplyDirective(options.rawSource);
 	const sourceCss = cssHandlerOptions.sourceOptions?.sourceCss;
 	const hasSourceCssDirectives = typeof sourceCss === "string" && (require_v4_engine.hasTailwindRootDirectives(sourceCss, { importFallback: true }) || require_v4_engine.hasTailwindSourceDirectives(sourceCss, { importFallback: true }) || require_v4_engine.hasTailwindApplyDirective(sourceCss));
-	return options.forceGenerator === true || options.hasGeneratedCss || options.hasGeneratedMarkers || options.hasSourceDirectives || hasApplyDirectives || hasSourceCssDirectives;
+	return options.forceGenerator === true || options.hasGeneratedCss || options.hasGeneratedMarkers || options.hasSourceDirectives || hasApplyDirectives || hasSourceCssDirectives || cssHandlerOptions.isMainChunk && (options.configuredCssSourceCount ?? 0) > 0 || cssHandlerOptions.isMainChunk && options.rawSource.includes("weapp-tailwindcss") || options.target === "web" && cssHandlerOptions.isMainChunk && (options.runtimeCandidateCount ?? 0) > 0;
 }
 function createRuntimeWithCurrentCssCandidates(runtime, currentCssCandidates, isolateCurrentCssCandidates) {
 	return isolateCurrentCssCandidates ? new Set(currentCssCandidates) : currentCssCandidates.length > 0 ? new Set([...runtime, ...currentCssCandidates]) : runtime;
@@ -624,7 +648,7 @@ function collectLocalStyleImportFiles(source, base) {
 		_weapp_tailwindcss_postcss.postcss.parse(styleSource).walkAtRules("import", (rule) => {
 			const request = require_v4_engine.parseImportRequest(rule.params);
 			if (!isLocalStyleImportRequest(request)) return;
-			const file = resolveLocalStyleImportFile(request, base);
+			const file = request ? resolveLocalStyleImportFile(request, base) : void 0;
 			if (file) files.push(file);
 		});
 	} catch {}
@@ -1885,7 +1909,7 @@ function hasConfiguredContainerCompatSource(source) {
 	if (cssEntrySource?.config) try {
 		if (/\bcontainer\b/.test((0, node_fs.readFileSync)(cssEntrySource.config, "utf8"))) return true;
 	} catch {}
-	if ("config" in source && source.config) try {
+	if ("config" in source && typeof source.config === "string") try {
 		if (/\bcontainer\b/.test((0, node_fs.readFileSync)(source.config, "utf8"))) return true;
 	} catch {}
 	return false;
@@ -2261,30 +2285,28 @@ function pushConcurrentTaskFactories(queue, factories, limit) {
 //#endregion
 //#region src/bundlers/shared/generator-css/validate.ts
 async function validateCandidatesByGenerator(options) {
-	const { candidates, cssHandlerOptions, debug, file, opts, rawSource, runtimeState, skipGenerateFallback } = options;
+	const { candidates, cssHandlerOptions, debug, file, opts, rawSource, runtimeState } = options;
 	const majorVersion = runtimeState.tailwindRuntime.majorVersion;
 	if (majorVersion !== 4 || candidates.size === 0) return /* @__PURE__ */ new Set();
-	const generatorOptions = {
-		...require_generator.normalizeWeappTailwindcssGeneratorOptions(opts.generator),
-		bareArbitraryValues: opts.arbitraryValues?.bareArbitraryValues
-	};
-	const sources = await resolveGeneratorSources(majorVersion, runtimeState, rawSource, file, cssHandlerOptions, generatorOptions, {
-		cssEntries: opts.cssEntries,
-		runtime: candidates
-	});
-	const classSets = await Promise.all(sources.map(async (source) => {
-		const generator = require_generator.createWeappTailwindcssGenerator(source);
-		if (generatorOptions.bareArbitraryValues === void 0 || generatorOptions.bareArbitraryValues === false) {
-			if (typeof generator.validateCandidates === "function") return generator.validateCandidates(candidates);
-		}
-		if (skipGenerateFallback) return /* @__PURE__ */ new Set();
-		return (await generator.generate({
-			bareArbitraryValues: generatorOptions.bareArbitraryValues,
-			candidates,
-			target: "web"
-		})).classSet;
-	}));
-	const classSet = new Set(classSets.flatMap((item) => [...item]));
+	const classSet = /* @__PURE__ */ new Set();
+	try {
+		const sources = await resolveGeneratorSources(majorVersion, runtimeState, rawSource, file, cssHandlerOptions, {
+			...require_generator.normalizeWeappTailwindcssGeneratorOptions(opts.generator),
+			bareArbitraryValues: opts.arbitraryValues?.bareArbitraryValues
+		}, {
+			cssEntries: opts.cssEntries,
+			runtime: candidates
+		});
+		const classSets = await Promise.all(sources.map(async (source) => {
+			const generator = require_generator.createWeappTailwindcssGenerator(source);
+			if (typeof generator.validateCandidates !== "function") return /* @__PURE__ */ new Set();
+			return generator.validateCandidates(candidates);
+		}));
+		for (const candidate of classSets.flatMap((item) => [...item])) classSet.add(candidate);
+	} catch {}
+	const rawSourceCandidates = collectGeneratedRawSourceCandidates(candidates, rawSource, opts.escapeMap);
+	for (const candidate of rawSourceCandidates) classSet.add(candidate);
+	for (const generatedCss of options.generatedCssSources ?? []) for (const candidate of collectGeneratedRawSourceCandidates(candidates, generatedCss, opts.escapeMap)) classSet.add(candidate);
 	debug("tailwind generator validated candidates: %s candidates=%d classSet=%d", file, candidates.size, classSet.size);
 	return classSet;
 }
@@ -2322,6 +2344,11 @@ function isCssAlreadyRepresentedByMarkers(css, source) {
 	for (const marker of sourceMarkers) if (!cssMarkers.has(marker)) return false;
 	return true;
 }
+function mergeGeneratedCssClassSet(classSet, candidates, css, escapeMap) {
+	const merged = new Set(classSet);
+	for (const candidate of collectGeneratedRawSourceCandidates(candidates, css, escapeMap)) merged.add(candidate);
+	return merged;
+}
 async function generateCssByGenerator(options) {
 	const { opts, runtimeState, runtime, rawSource, file, cssHandlerOptions, cssUserHandlerOptions, getSourceCandidatesForEntries, styleHandler, userRawSource, userRawSourceProcessed, debug } = options;
 	const generatorOptions = {
@@ -2348,8 +2375,10 @@ async function generateCssByGenerator(options) {
 	const rawUserSource = userRawSource === void 0 ? generatorRawSource : userRawSourceProcessed ? userRawSource : stripUnmatchedTailwindSourceMediaCloseFragments(stripTailwindSourceMediaFragments(require_v4_engine.normalizeTailwindSourceDirectives(userRawSource, { importFallback: generatorOptions.importFallback })));
 	const userSource = splitLocalCssImports(rawUserSource)?.source ?? rawUserSource;
 	const userCssRawSource = removeTailwindV4GeneratorAtRules(userSource);
-	const userCssOrderSource = require_v4_engine.GENERATOR_PLACEHOLDER_MARKER_RE.test(userSource) ? userSource : userCssRawSource;
-	const hasDistinctUserRawSource = typeof userRawSource === "string" && normalizeCssSourceForCompare(userCssRawSource) !== normalizeCssSourceForCompare(generatorRawSource);
+	const generatedUserCssOrderSource = require_v4_engine.hasTailwindGeneratedCss(userSource) ? require_v4_engine.splitTailwindV4GeneratedCssBySourceOrder(userSource, generatorRawSource) : void 0;
+	const generatedUserCssRawSource = generatedUserCssOrderSource ? require_v4_engine.createCssAppend(generatedUserCssOrderSource.before, generatedUserCssOrderSource.after) : require_v4_engine.hasTailwindGeneratedCss(userSource) ? "" : userCssRawSource;
+	const userCssOrderSource = require_v4_engine.GENERATOR_PLACEHOLDER_MARKER_RE.test(userSource) ? userSource : require_v4_engine.hasTailwindGeneratedCss(userSource) ? userSource : generatedUserCssRawSource;
+	const hasDistinctUserRawSource = typeof userRawSource === "string" && normalizeCssSourceForCompare(generatedUserCssRawSource) !== normalizeCssSourceForCompare(generatorRawSource);
 	const cleanedLocalImportWrapper = cleanLocalCssImportWrapperTailwindDirectives(effectiveRawSource);
 	if (cleanedLocalImportWrapper !== void 0) return {
 		css: require_generator.shouldUseMiniProgramCssBranch(generatorBranch) ? (0, _weapp_tailwindcss_postcss.removeUnsupportedMiniProgramAtRules)(cleanedLocalImportWrapper) : cleanedLocalImportWrapper,
@@ -2371,7 +2400,10 @@ async function generateCssByGenerator(options) {
 		hasGeneratedCss,
 		hasGeneratedMarkers,
 		hasSourceDirectives,
-		rawSource: generatorRawSource
+		rawSource: generatorRawSource,
+		runtimeCandidateCount: runtime.size,
+		target: generatorOptions.target,
+		configuredCssSourceCount: options.cssSources?.length
 	})) return;
 	try {
 		await runtimeState.readyPromise;
@@ -2427,12 +2459,13 @@ async function generateCssByGenerator(options) {
 		debug("tailwind generator result: %s rawBytes=%d cssBytes=%d candidates=%d", file, generated.rawCss.length, generated.css.length, generated.classSet.size);
 		if ((generated.target !== "weapp" || !hasUserCssLayerBlocks(generatorRawSource)) && typeof options.previousCss === "string" && typeof generated.incrementalCss === "string") {
 			const incrementalCss = require_v4_engine.stripTailwindBanner(generated.incrementalCss);
+			const finalCss = restoreLocalCssImports(incrementalCss.trim().length > 0 ? require_v4_engine.createCssAppend(options.previousCss, finalizeMiniProgramGeneratorCss(incrementalCss, generated.target, majorVersion, opts.cssPreflight, {
+				injectPreflight: false,
+				styleOptions: generatorStyleOptions
+			})) : options.previousCss, localImports);
 			return {
-				css: restoreLocalCssImports(incrementalCss.trim().length > 0 ? require_v4_engine.createCssAppend(options.previousCss, finalizeMiniProgramGeneratorCss(incrementalCss, generated.target, majorVersion, opts.cssPreflight, {
-					injectPreflight: false,
-					styleOptions: generatorStyleOptions
-				})) : options.previousCss, localImports),
-				classSet: generated.classSet,
+				css: finalCss,
+				classSet: mergeGeneratedCssClassSet(generated.classSet, runtimeWithCurrentCss, finalCss, opts.escapeMap),
 				target: generated.target,
 				source: "generator",
 				dependencies: generated.dependencies,
@@ -2485,28 +2518,29 @@ async function generateCssByGenerator(options) {
 				const missingUserCss = isCommentOnlyCss(userCss) ? "" : (0, _weapp_tailwindcss_postcss.filterExistingCssRules)(css, userCss);
 				css = createCssSourceOrderAppend$1(css, missingUserCss);
 			}
-			if (generated.target === "weapp" && isEmptyCssSourceOrderParts(orderedExtraCss) && hasDistinctUserRawSource && !hasGeneratedCss && !hasGeneratedMarkers && !require_v4_engine.hasTailwindApplyDirective(userCssRawSource)) {
-				const userCss = await transformGeneratorUserCss(userCssRawSource, userCssOptions);
-				const missingUserCss = isCssAlreadyRepresentedByMarkers(css, userCssRawSource) ? (0, _weapp_tailwindcss_postcss.filterExistingCssRules)(css, userCss) : userCss;
+			if (generated.target === "weapp" && isEmptyCssSourceOrderParts(orderedExtraCss) && hasDistinctUserRawSource && !hasGeneratedCss && !hasGeneratedMarkers && !require_v4_engine.hasTailwindApplyDirective(generatedUserCssRawSource)) {
+				const userCss = await transformGeneratorUserCss(generatedUserCssRawSource, userCssOptions);
+				const missingUserCss = isCssAlreadyRepresentedByMarkers(css, generatedUserCssRawSource) ? (0, _weapp_tailwindcss_postcss.filterExistingCssRules)(css, userCss) : userCss;
 				css = createCssSourceOrderAppend$1(css, missingUserCss);
 			}
 			if (generated.target === "weapp" && shouldAppendMatchedCssSourceCompat) {
 				if (shouldFinalizeMarkedUserLayerComponentsCss(file)) css = reorderMarkedUserLayerComponentsCss(css);
-				if (!shouldFilterApplyOnlyCss && !userRawSourceProcessed) {
-					css = await appendLegacyCompatCss(css, userCssRawSource, generated.target, styleHandler, cssHandlerOptions, generatorStyleOptions);
-					if (!isolateCurrentCssCandidates) css = await appendLegacyContainerCompatCss(css, userCssRawSource, file, runtime, configuredContainerCompat, generated.target, styleHandler, cssHandlerOptions, generatorStyleOptions);
+				if (!shouldFilterApplyOnlyCss && !userRawSourceProcessed && !hasGeneratedCss && !hasGeneratedMarkers) {
+					css = await appendLegacyCompatCss(css, generatedUserCssRawSource, generated.target, styleHandler, cssHandlerOptions, generatorStyleOptions);
+					if (!isolateCurrentCssCandidates) css = await appendLegacyContainerCompatCss(css, generatedUserCssRawSource, file, runtime, configuredContainerCompat, generated.target, styleHandler, cssHandlerOptions, generatorStyleOptions);
 				}
 			} else if (generated.target === "weapp" && shouldFinalizeMarkedUserLayerComponentsCss(file)) css = reorderMarkedUserLayerComponentsCss(css);
+			const finalCss = restoreLocalCssImports(finalizeMiniProgramGeneratorCss(css, generated.target, majorVersion, opts.cssPreflight, {
+				injectPreflight: shouldInjectMiniProgramPreflightForGeneratorCss(opts, {
+					cssHandlerOptions,
+					isolateCurrentCssCandidates,
+					localImports
+				}),
+				styleOptions: generatorStyleOptions
+			}), localImports);
 			return {
-				css: restoreLocalCssImports(finalizeMiniProgramGeneratorCss(css, generated.target, majorVersion, opts.cssPreflight, {
-					injectPreflight: shouldInjectMiniProgramPreflightForGeneratorCss(opts, {
-						cssHandlerOptions,
-						isolateCurrentCssCandidates,
-						localImports
-					}),
-					styleOptions: generatorStyleOptions
-				}), localImports),
-				classSet: generated.classSet,
+				css: finalCss,
+				classSet: mergeGeneratedCssClassSet(generated.classSet, runtimeWithCurrentCss, finalCss, opts.escapeMap),
 				target: generated.target,
 				source: "generator",
 				dependencies: generated.dependencies,
@@ -2519,7 +2553,7 @@ async function generateCssByGenerator(options) {
 		}
 		debug("tailwind direct css generation prefix mismatch, append transformed bundle css %s", file);
 		let css = generatedCss;
-		if (generated.target === "weapp" && generatorRawSource.includes("weapp-tailwindcss generator-placeholder") && !hasUserCssLayerBlocks(generatorRawSource)) css = createCssSourceOrderAppend$1(await transformGeneratorUserCss(userCssRawSource, {
+		if (generated.target === "weapp" && generatorRawSource.includes("weapp-tailwindcss generator-placeholder") && !hasUserCssLayerBlocks(generatorRawSource)) css = createCssSourceOrderAppend$1(await transformGeneratorUserCss(generatedUserCssRawSource, {
 			generatorTarget: generated.target,
 			generatorStyleOptions,
 			cssUserHandlerOptions,
@@ -2551,7 +2585,7 @@ async function generateCssByGenerator(options) {
 		}
 		if (hasMatchedCssSourceFile || generated.target === "web") {
 			if (generated.target === "weapp" && !hasGeneratedCss && !hasGeneratedMarkers) {
-				const userCss = await transformGeneratorUserCss(userCssRawSource, {
+				const userCss = await transformGeneratorUserCss(generatedUserCssRawSource, {
 					generatorTarget: generated.target,
 					generatorStyleOptions,
 					cssUserHandlerOptions,
@@ -2559,9 +2593,9 @@ async function generateCssByGenerator(options) {
 					importFallback: generatorOptions.importFallback,
 					processed: userRawSourceProcessed
 				});
-				const missingUserCss = isCssAlreadyRepresentedByMarkers(css, userCssRawSource) ? (0, _weapp_tailwindcss_postcss.filterExistingCssRules)(css, userCss) : userCss;
+				const missingUserCss = isCssAlreadyRepresentedByMarkers(css, generatedUserCssRawSource) ? (0, _weapp_tailwindcss_postcss.filterExistingCssRules)(css, userCss) : userCss;
 				css = createCssSourceOrderAppend$1(css, missingUserCss);
-			} else if (hasMatchedCssSourceFile && generated.target === "weapp" && hasGeneratedMarkers) {
+			} else if (hasMatchedCssSourceFile && generated.target === "weapp" && hasGeneratedMarkers && !hasGeneratedCss) {
 				const userCss = await transformGeneratorUserCss(removeTailwindV4GeneratedUserCssArtifacts(userCssRawSource), {
 					generatorTarget: generated.target,
 					generatorStyleOptions,
@@ -2572,8 +2606,8 @@ async function generateCssByGenerator(options) {
 				});
 				const missingUserCss = (0, _weapp_tailwindcss_postcss.filterExistingCssRules)(css, userCss);
 				css = createCssSourceOrderAppend$1(css, missingUserCss);
-			} else if (hasMatchedCssSourceFile && generated.target === "weapp" && hasUserCssLayerBlocks(userCssRawSource)) {
-				const layerUserCss = await transformGeneratorUserCss(splitUserCssLayerBlocks(userCssRawSource).layer, {
+			} else if (hasMatchedCssSourceFile && generated.target === "weapp" && hasUserCssLayerBlocks(generatedUserCssRawSource)) {
+				const layerUserCss = await transformGeneratorUserCss(splitUserCssLayerBlocks(generatedUserCssRawSource).layer, {
 					generatorTarget: generated.target,
 					generatorStyleOptions,
 					cssUserHandlerOptions,
@@ -2587,13 +2621,13 @@ async function generateCssByGenerator(options) {
 				}
 			}
 			if (hasMatchedCssSourceFile && generated.target === "weapp") {
-				if (!isolateCurrentCssCandidates && !shouldFilterApplyOnlyCss && !userRawSourceProcessed) css = await appendLegacyContainerCompatCss(css, userCssRawSource, file, runtime, configuredContainerCompat, generated.target, styleHandler, cssHandlerOptions, generatorStyleOptions);
+				if (!isolateCurrentCssCandidates && !shouldFilterApplyOnlyCss && !userRawSourceProcessed && !hasGeneratedCss && !hasGeneratedMarkers) css = await appendLegacyContainerCompatCss(css, generatedUserCssRawSource, file, runtime, configuredContainerCompat, generated.target, styleHandler, cssHandlerOptions, generatorStyleOptions);
 			}
 			if (shouldAppendWebBundleCssFallback(generated.target, {
 				hasSourceDirectives,
 				hasMatchedCssSourceFile
 			})) {
-				const userCss = await transformGeneratorUserCss(userCssRawSource, {
+				const userCss = await transformGeneratorUserCss(generatedUserCssRawSource, {
 					generatorTarget: generated.target,
 					generatorStyleOptions,
 					cssUserHandlerOptions,
@@ -2604,16 +2638,17 @@ async function generateCssByGenerator(options) {
 				const missingUserCss = isCommentOnlyCss(userCss) ? "" : (0, _weapp_tailwindcss_postcss.filterExistingCssRules)(css, userCss);
 				css = createCssSourceOrderAppend$1(css, missingUserCss);
 			}
+			const finalCss = restoreLocalCssImports(finalizeMiniProgramGeneratorCss(css, generated.target, majorVersion, opts.cssPreflight, {
+				injectPreflight: shouldInjectMiniProgramPreflightForGeneratorCss(opts, {
+					cssHandlerOptions,
+					isolateCurrentCssCandidates,
+					localImports
+				}),
+				styleOptions: generatorStyleOptions
+			}), localImports);
 			return {
-				css: restoreLocalCssImports(finalizeMiniProgramGeneratorCss(css, generated.target, majorVersion, opts.cssPreflight, {
-					injectPreflight: shouldInjectMiniProgramPreflightForGeneratorCss(opts, {
-						cssHandlerOptions,
-						isolateCurrentCssCandidates,
-						localImports
-					}),
-					styleOptions: generatorStyleOptions
-				}), localImports),
-				classSet: generated.classSet,
+				css: finalCss,
+				classSet: mergeGeneratedCssClassSet(generated.classSet, runtimeWithCurrentCss, finalCss, opts.escapeMap),
 				target: generated.target,
 				source: "generator",
 				dependencies: generated.dependencies,
@@ -2624,12 +2659,12 @@ async function generateCssByGenerator(options) {
 				}
 			};
 		}
-		if (!shouldFilterApplyOnlyCss && !userRawSourceProcessed) {
-			css = await appendLegacyCompatCss(css, userCssRawSource, generated.target, styleHandler, cssHandlerOptions, generatorStyleOptions);
-			css = await appendLegacyContainerCompatCss(css, userCssRawSource, file, runtime, configuredContainerCompat, generated.target, styleHandler, cssHandlerOptions, generatorStyleOptions);
+		if (!shouldFilterApplyOnlyCss && !userRawSourceProcessed && !hasGeneratedCss && !hasGeneratedMarkers) {
+			css = await appendLegacyCompatCss(css, generatedUserCssRawSource, generated.target, styleHandler, cssHandlerOptions, generatorStyleOptions);
+			css = await appendLegacyContainerCompatCss(css, generatedUserCssRawSource, file, runtime, configuredContainerCompat, generated.target, styleHandler, cssHandlerOptions, generatorStyleOptions);
 		}
-		if (generated.target === "weapp" && hasDistinctUserRawSource && !hasGeneratedCss && !hasGeneratedMarkers && !require_v4_engine.hasTailwindApplyDirective(userCssRawSource)) {
-			const userCss = await transformGeneratorUserCss(userCssRawSource, {
+		if (generated.target === "weapp" && hasDistinctUserRawSource && !hasGeneratedCss && !hasGeneratedMarkers && !require_v4_engine.hasTailwindApplyDirective(generatedUserCssRawSource)) {
+			const userCss = await transformGeneratorUserCss(generatedUserCssRawSource, {
 				generatorTarget: generated.target,
 				generatorStyleOptions,
 				cssUserHandlerOptions,
@@ -2637,19 +2672,20 @@ async function generateCssByGenerator(options) {
 				importFallback: generatorOptions.importFallback,
 				processed: userRawSourceProcessed
 			});
-			const missingUserCss = isCssAlreadyRepresentedByMarkers(css, userCssRawSource) ? (0, _weapp_tailwindcss_postcss.filterExistingCssRules)(css, userCss) : userCss;
+			const missingUserCss = isCssAlreadyRepresentedByMarkers(css, generatedUserCssRawSource) ? (0, _weapp_tailwindcss_postcss.filterExistingCssRules)(css, userCss) : userCss;
 			css = createCssSourceOrderAppend$1(css, missingUserCss);
 		}
+		const finalCss = restoreLocalCssImports(finalizeMiniProgramGeneratorCss(css, generated.target, majorVersion, opts.cssPreflight, {
+			injectPreflight: shouldInjectMiniProgramPreflightForGeneratorCss(opts, {
+				cssHandlerOptions,
+				isolateCurrentCssCandidates,
+				localImports
+			}),
+			styleOptions: generatorStyleOptions
+		}), localImports);
 		return {
-			css: restoreLocalCssImports(finalizeMiniProgramGeneratorCss(css, generated.target, majorVersion, opts.cssPreflight, {
-				injectPreflight: shouldInjectMiniProgramPreflightForGeneratorCss(opts, {
-					cssHandlerOptions,
-					isolateCurrentCssCandidates,
-					localImports
-				}),
-				styleOptions: generatorStyleOptions
-			}), localImports),
-			classSet: generated.classSet,
+			css: finalCss,
+			classSet: mergeGeneratedCssClassSet(generated.classSet, runtimeWithCurrentCss, finalCss, opts.escapeMap),
 			target: generated.target,
 			source: "generator",
 			dependencies: generated.dependencies,
@@ -3603,12 +3639,24 @@ Object.defineProperty(exports, "pushConcurrentTaskFactories", {
 		return pushConcurrentTaskFactories;
 	}
 });
+Object.defineProperty(exports, "removeGeneratedSelectorCompatCss", {
+	enumerable: true,
+	get: function() {
+		return removeGeneratedSelectorCompatCss;
+	}
+});
 Object.defineProperty(exports, "removeMiniProgramHoverSelectors", {
 	enumerable: true,
 	get: function() {
 		return removeMiniProgramHoverSelectors;
 	}
 });
+Object.defineProperty(exports, "removeTailwindV4GeneratedUserCssArtifacts", {
+	enumerable: true,
+	get: function() {
+		return removeTailwindV4GeneratedUserCssArtifacts;
+	}
+});
 Object.defineProperty(exports, "removeTailwindV4GeneratorAtRules", {
 	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-9rUz4Hcb.js");
-const require_gulp = require("./gulp-B_sdP6dx.js");
+const require_generator = require("./generator-6oMJtTDO.js");
+const require_gulp = require("./gulp-BtGq6LP9.js");
 const require_postcss = require("./postcss.js");
-const require_vite = require("./vite-CP0ylSxZ.js");
-const require_webpack = require("./webpack-Bsek8VhR.js");
+const require_vite = require("./vite-w-RkgaTY.js");
+const require_webpack = require("./webpack-CGgBOx9l.js");
 let _weapp_tailwindcss_postcss = require("@weapp-tailwindcss/postcss");
 exports.WeappTailwindcss = require_vite.WeappTailwindcss;
 exports.createPlugins = require_gulp.createPlugins;

package/dist/index.mjs

@@ -1,8 +1,8 @@
 import { detectAppType, detectAppTypeFromEnv, detectAppTypeFromPackageJson, isMpxPackage, isRunningInHBuilderX, isTaroPackage, isUniAppPackage, isUniAppVitePackage, isUniAppXManifest, isUniAppXPackage, isWeappVitePackage, resolveImplicitAppTypeFromViteRoot, resolveUniPlatform, resolveUniPlatformsFromEnv, resolveUniUtsPlatform } from "./framework.mjs";
-import { t as createWeappTailwindcssGenerator } from "./generator-Dc4qaPmT.mjs";
-import { t as createPlugins } from "./gulp-uM36oIJs.mjs";
+import { t as createWeappTailwindcssGenerator } from "./generator-CjzBK7h-.mjs";
+import { t as createPlugins } from "./gulp-DNU10Vtc.mjs";
 import weappTailwindcssPostcssPlugin from "./postcss.mjs";
-import { t as WeappTailwindcss } from "./vite-CPO83EhA.mjs";
-import { n as weappTailwindcssPackageDir } from "./webpack-BzqhJ8yK.mjs";
+import { t as WeappTailwindcss } from "./vite-CWRooooa.mjs";
+import { n as weappTailwindcssPackageDir } from "./webpack-8PaV1gG3.mjs";
 import { unitConversionComposeRules, unitConversionPresets } from "@weapp-tailwindcss/postcss";
 export { WeappTailwindcss, createPlugins, createWeappTailwindcssGenerator, detectAppType, detectAppTypeFromEnv, detectAppTypeFromPackageJson, isMpxPackage, isRunningInHBuilderX, isTaroPackage, isUniAppPackage, isUniAppVitePackage, isUniAppXManifest, isUniAppXPackage, isWeappVitePackage, resolveImplicitAppTypeFromViteRoot, resolveUniPlatform, resolveUniPlatformsFromEnv, resolveUniUtsPlatform, unitConversionComposeRules, unitConversionPresets, weappTailwindcssPackageDir, weappTailwindcssPostcssPlugin };

package/dist/postcss.js

@@ -2,8 +2,8 @@ Object.defineProperties(exports, {
 	__esModule: { value: true },
 	[Symbol.toStringTag]: { value: "Module" }
 });
-const require_v4_engine = require("./v4-engine-D4ubP7N5.js");
-const require_generator = require("./generator-9rUz4Hcb.js");
+const require_v4_engine = require("./v4-engine-ON_oSLfO.js");
+const require_generator = require("./generator-6oMJtTDO.js");
 const weappTailwindcssPostcssPlugin = (0, require("@weapp-tailwindcss/postcss").createWeappTailwindcssPostcssPlugin)({
 	createGenerator: (source) => {
 		return require_generator.createWeappTailwindcssGenerator(source);

package/dist/postcss.mjs

@@ -1,5 +1,5 @@
-import { t as resolveTailwindV4Source } from "./v4-engine-CF9zt4Cw.mjs";
-import { i as normalizeWeappTailwindcssGeneratorOptions, t as createWeappTailwindcssGenerator } from "./generator-Dc4qaPmT.mjs";
+import { t as resolveTailwindV4Source } from "./v4-engine-C3qSwQ-e.mjs";
+import { i as normalizeWeappTailwindcssGeneratorOptions, t as createWeappTailwindcssGenerator } from "./generator-CjzBK7h-.mjs";
 import { createWeappTailwindcssPostcssPlugin } from "@weapp-tailwindcss/postcss";
 const weappTailwindcssPostcssPlugin = createWeappTailwindcssPostcssPlugin({
 	createGenerator: (source) => {

package/dist/presets.js

@@ -1,8 +1,8 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_chunk = require("./chunk-emK7D4bc.js");
-const require_v4_engine = require("./v4-engine-D4ubP7N5.js");
+const require_v4_engine = require("./v4-engine-ON_oSLfO.js");
 const require_utils = require("./utils-BCa37Wqj.js");
-const require_tailwindcss = require("./tailwindcss-DHIYcqXT.js");
+const require_tailwindcss = require("./tailwindcss-dbrbY4cd.js");
 require("./logger-TlKT3xmR.js");
 let node_path = require("node:path");
 node_path = require_chunk.__toESM(node_path);

package/dist/presets.mjs

@@ -1,6 +1,6 @@
-import { ct as omitUndefined } from "./v4-engine-CF9zt4Cw.mjs";
+import { st as omitUndefined } from "./v4-engine-C3qSwQ-e.mjs";
 import { n as defuOverrideArray, o as resolveUniUtsPlatform } from "./utils-DodxWHGz.mjs";
-import { i as resolveUniAppXOptions, n as resolveTailwindcssBasedir } from "./tailwindcss-wyUHrfil.mjs";
+import { i as resolveUniAppXOptions, n as resolveTailwindcssBasedir } from "./tailwindcss-B5mRo0-M.mjs";
 import { t as logger } from "./logger-BNzxZbZj.mjs";
 import path from "node:path";
 import process from "node:process";

package/dist/{source-candidate-scan-signature-Cvb5z1ha.mjs → source-candidate-scan-signature-B5af2Ahe.mjs}

@@ -1,6 +1,6 @@
-import { a as Parser, h as traverse, m as babelParse } from "./context-Mbzkek1q.mjs";
-import { g as resolveTailwindV4EntriesFromCssCached } from "./tailwindcss-wyUHrfil.mjs";
-import { u as generateCssByGenerator } from "./hmr-timing-BXMLsF4b.mjs";
+import { g as traverse, h as babelParse, o as Parser } from "./context-DlpKD7aN.mjs";
+import { g as resolveTailwindV4EntriesFromCssCached } from "./tailwindcss-B5mRo0-M.mjs";
+import { u as generateCssByGenerator } from "./hmr-timing-B0KuWDjV.mjs";
 import { createRequire } from "node:module";
 import path from "node:path";
 import process from "node:process";

package/dist/{source-candidate-scan-signature-2ybpptAK.js → source-candidate-scan-signature-BKYb9jxa.js}

@@ -1,7 +1,7 @@
 const require_chunk = require("./chunk-emK7D4bc.js");
-const require_context = require("./context-BHxLe743.js");
-const require_tailwindcss = require("./tailwindcss-DHIYcqXT.js");
-const require_hmr_timing = require("./hmr-timing-CogqkFaF.js");
+const require_context = require("./context-B6hVF7dr.js");
+const require_tailwindcss = require("./tailwindcss-dbrbY4cd.js");
+const require_hmr_timing = require("./hmr-timing-CegXR9O4.js");
 let node_path = require("node:path");
 node_path = require_chunk.__toESM(node_path);
 let node_process = require("node:process");

package/dist/tailwindcss/runtime-types.d.ts

@@ -76,6 +76,7 @@ export interface TailwindcssExtractOptions extends ExtractOptions {
 export interface TailwindcssExtractResult {
     classList: string[];
     classSet: Set<string>;
+    filename?: string | undefined;
 }
 export interface TailwindContentTokenReport {
     entries: unknown[];

package/dist/tailwindcss/v4-engine/source.d.ts

@@ -1,17 +1,8 @@
-import type { TailwindV4SourceOptions, TailwindV4SourceOptionsWithSources } from './types';
+import type { TailwindV4ResolvedSource, TailwindV4SourceOptions, TailwindV4SourceOptionsWithSources } from './types';
 import type { TailwindcssRuntimeLike } from '../../types';
-export declare function normalizeTailwindV4SourceOptions(options: TailwindV4SourceOptions | undefined): TailwindV4SourceOptions | {
-    cssSources: import("@tailwindcss-mangle/engine").TailwindV4CssSource[] | undefined;
-    cssEntries?: string[];
-    css: string | undefined;
-    projectRoot?: string;
-    cwd?: string;
-    base?: string;
-    baseFallbacks?: string[];
-    packageName?: string;
-} | undefined;
+export declare function normalizeTailwindV4SourceOptions(options: TailwindV4SourceOptions | undefined): import("@tailwindcss-mangle/engine").TailwindV4SourceOptions | undefined;
 export declare function resolveTailwindV4SourceOptionsFromRuntime(runtime: TailwindcssRuntimeLike): TailwindV4SourceOptionsWithSources;
-export declare function resolveTailwindV4Source(options?: TailwindV4SourceOptions): Promise<import("@tailwindcss-mangle/engine").TailwindV4ResolvedSource>;
+export declare function resolveTailwindV4Source(options?: TailwindV4SourceOptions): Promise<TailwindV4ResolvedSource>;
 export declare function resolveTailwindV4SourceFromRuntimeOptions(options?: {
     projectRoot?: string;
     tailwindcss?: {
@@ -20,5 +11,5 @@ export declare function resolveTailwindV4SourceFromRuntimeOptions(options?: {
         config?: string;
         v4?: TailwindV4SourceOptions;
     };
-}): Promise<import("@tailwindcss-mangle/engine").TailwindV4ResolvedSource>;
-export declare function resolveTailwindV4SourceFromRuntime(runtime: TailwindcssRuntimeLike): Promise<import("@tailwindcss-mangle/engine").TailwindV4ResolvedSource>;
+}): Promise<TailwindV4ResolvedSource>;
+export declare function resolveTailwindV4SourceFromRuntime(runtime: TailwindcssRuntimeLike): Promise<TailwindV4ResolvedSource>;

package/dist/tailwindcss/v4-engine/types.d.ts

@@ -1,4 +1,4 @@
-import type { TailwindV4Engine as EngineTailwindV4Engine, TailwindV4GenerateOptions as EngineTailwindV4GenerateOptions, TailwindV4GenerateResult as EngineTailwindV4GenerateResult, TailwindV4CandidateSource, TailwindV4DesignSystem, TailwindV4ResolvedSource, TailwindV4SourceOptions } from '@tailwindcss-mangle/engine';
+import type { TailwindV4Engine as EngineTailwindV4Engine, TailwindV4GenerateOptions as EngineTailwindV4GenerateOptions, TailwindV4GenerateResult as EngineTailwindV4GenerateResult, TailwindV4ResolvedSource as EngineTailwindV4ResolvedSource, TailwindV4SourceOptions as EngineTailwindV4SourceOptions, TailwindV4CandidateSource, TailwindV4DesignSystem } from '@tailwindcss-mangle/engine';
 import type { IStyleHandlerOptions } from '@weapp-tailwindcss/postcss/types';
 export type TailwindV4GenerateTarget = 'weapp' | 'web';
 export interface TailwindV4SourcePattern {
@@ -7,6 +7,14 @@ export interface TailwindV4SourcePattern {
     negated: boolean;
 }
 type TailwindV4EngineGenerateOptions = Omit<EngineTailwindV4GenerateOptions, 'target' | 'styleOptions' | 'scanSources' | 'bareArbitraryValues'>;
+export type TailwindV4SourceOptions = EngineTailwindV4SourceOptions;
+export type TailwindV4CssSource = NonNullable<TailwindV4SourceOptions['cssSources']>[number];
+export interface TailwindV4ResolvedSource extends EngineTailwindV4ResolvedSource {
+    cwd?: string | undefined;
+    projectRoot: string;
+    cssSources?: TailwindV4CssSource[] | undefined;
+    sources?: TailwindV4SourcePattern[] | undefined;
+}
 export interface TailwindV4GenerateOptions extends TailwindV4EngineGenerateOptions {
     incrementalCache?: boolean | undefined;
     bareArbitraryValues?: EngineTailwindV4GenerateOptions['bareArbitraryValues'] | undefined;
@@ -28,4 +36,4 @@ export interface TailwindV4Engine extends Omit<EngineTailwindV4Engine, 'generate
     source: TailwindV4ResolvedSource;
     generate: (options?: TailwindV4GenerateOptions) => Promise<TailwindV4GenerateResult>;
 }
-export type { TailwindV4CandidateSource, TailwindV4DesignSystem, TailwindV4ResolvedSource, TailwindV4SourceOptions, };
+export type { TailwindV4CandidateSource, TailwindV4DesignSystem, };

package/dist/{tailwindcss-wyUHrfil.mjs → tailwindcss-B5mRo0-M.mjs}

@@ -1,10 +1,10 @@
-import { Q as expandTailwindSourceEntries, X as FULL_SOURCE_SCAN_PATTERN, Z as createTailwindSourceEntryMatcher, _ as resolveTailwindcssOptions, a as filterTailwindV4CssSourceRoots, c as groupCssEntriesByBase, ct as omitUndefined, d as normalizeCssEntries, et as normalizeLegacyContentEntries, f as findNearestPackageRoot, g as normalizeTailwindcssRuntimeOptions, h as normalizeExtendLengthUnits, i as resolveTailwindV4SourceOptionsFromRuntime, it as resolveTailwindV4CssSourceBase, l as guessBasedirFromEntries, m as findWorkspaceRoot, n as resolveTailwindV4SourceFromRuntime, nt as resolveCssSourceEntries, o as hasConfiguredTailwindV4CssRoots, ot as collectCssInlineSourceCandidates, p as findWorkspacePackageDir, tt as parseConfigParam, u as isTailwindV4CssEntry, v as normalizeStringListOption } from "./v4-engine-CF9zt4Cw.mjs";
+import { $ as normalizeLegacyContentEntries, X as createTailwindSourceEntryMatcher, Y as FULL_SOURCE_SCAN_PATTERN, Z as expandTailwindSourceEntries, _ as resolveTailwindcssOptions, a as filterTailwindV4CssSourceRoots, at as collectCssInlineSourceCandidates, c as groupCssEntriesByBase, d as normalizeCssEntries, et as parseConfigParam, f as findNearestPackageRoot, g as normalizeTailwindcssRuntimeOptions, h as normalizeExtendLengthUnits, i as resolveTailwindV4SourceOptionsFromRuntime, l as guessBasedirFromEntries, lt as loadTailwindV4DesignSystem, m as findWorkspaceRoot, n as resolveTailwindV4SourceFromRuntime, o as hasConfiguredTailwindV4CssRoots, p as findWorkspacePackageDir, rt as resolveTailwindV4CssSourceBase, st as omitUndefined, tt as resolveCssSourceEntries, u as isTailwindV4CssEntry, v as normalizeStringListOption } from "./v4-engine-C3qSwQ-e.mjs";
 import { n as defuOverrideArray$1 } from "./utils-DodxWHGz.mjs";
 import { createRequire } from "node:module";
 import { existsSync, readFileSync, statSync } from "node:fs";
 import path from "node:path";
 import process from "node:process";
-import { extractProjectCandidatesWithPositions } from "@tailwindcss-mangle/engine";
+import { extractProjectCandidatesWithPositions, resolveValidTailwindV4Candidates } from "@tailwindcss-mangle/engine";
 import { postcss } from "@weapp-tailwindcss/postcss";
 import { stat } from "node:fs/promises";
 import { defuOverrideArray } from "@weapp-tailwindcss/shared";
@@ -491,12 +491,14 @@ async function resolveViteSourceScanEntries(options, runtime, scanOptions = {})
 		}
 	}
 	const cssSourceInlineCandidates = mergeTailwindInlineSourceCandidates(cssInlineCandidates);
-	const cssSourceScanEntries = createMergedCssEntrySourceScanEntries(entries, { sourceCount: (sourceOptions.cssSources?.length ?? 0) + configuredCssSources.length });
-	if (cssSourceScanEntries.length > 0 || cssSourceInlineCandidates || explicit || sourceOptions.cssSources?.length || configuredCssSources.length > 0) return createResolvedViteSourceScan({
+	const cssSourceCount = (sourceOptions.cssSources?.length ?? 0) + configuredCssSources.length;
+	const cssSourceScanEntries = createMergedCssEntrySourceScanEntries(entries, { sourceCount: cssSourceCount });
+	if (cssSourceScanEntries.length > 0 || cssSourceInlineCandidates || explicit) return createResolvedViteSourceScan({
 		entries: explicit ? cssSourceScanEntries : cssSourceScanEntries.length > 0 ? cssSourceScanEntries : void 0,
 		explicit,
 		inlineCandidates: cssSourceInlineCandidates
 	}, dependencies);
+	if (cssSourceCount > 0) return;
 	const source = await resolveTailwindV4SourceFromRuntime(runtime);
 	addSourceScanDependency(dependencies, source.file);
 	addSourceScanDependencies(dependencies, source.dependencies);
@@ -940,9 +942,12 @@ function createEngineTailwindcssRuntime(options) {
 	}
 	async function collectClassSet() {
 		const report = await collectContentTokens();
-		const candidates = new Set(report.entries.map((entry) => {
+		const rawCandidates = new Set(report.entries.map((entry) => {
 			return typeof entry === "string" ? entry : entry.rawCandidate;
 		}).filter((entry) => typeof entry === "string" && entry.length > 0));
+		const source = await resolveTailwindV4SourceFromRuntime(runtime);
+		const designSystem = await loadTailwindV4DesignSystem(source);
+		const candidates = new Set(resolveValidTailwindV4Candidates(designSystem, rawCandidates, { ...source.bareArbitraryValues === void 0 ? {} : { bareArbitraryValues: source.bareArbitraryValues } }));
 		await collectTailwindV4CssCandidates(candidates);
 		return applyClassSetFilter(candidates);
 	}
@@ -968,12 +973,12 @@ function createEngineTailwindcssRuntime(options) {
 			baseFallbacks: source.baseFallbacks,
 			css: source.css,
 			cwd: source.projectRoot,
-			sources: source.sources
+			...source.sources === void 0 ? {} : { sources: source.sources }
 		});
 		return {
 			entries: report.entries,
 			filesScanned: report.filesScanned,
-			sources: source.sources,
+			sources: source.sources ?? [],
 			skippedFiles: report.skippedFiles
 		};
 	}