weapp-tailwindcss 5.1.0 → 5.1.2

package/dist/vite.js

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

package/dist/vite.mjs

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

package/dist/weapp-tw-css-import-rewrite-loader.js

@@ -1649,12 +1649,8 @@ function resolveTargetCandidates(candidates, target) {
 	const collected = collectCandidates(candidates);
 	return target === "weapp" ? filterUnsupportedMiniProgramTailwindV4Candidates(collected) : collected;
 }
-function collectSeenCandidates(generated, requestedCandidates) {
-	return new Set([
-		...requestedCandidates,
-		...generated.rawCandidates,
-		...generated.classSet
-	]);
+function collectSeenCandidates(generated) {
+	return new Set(generated.classSet);
 }
 function shouldDelegateWebSourceScanToTailwind(target, scanSources) {
 	return target === "web" && scanSources !== false;
@@ -1692,7 +1688,7 @@ function seedIncrementalGenerateCache(options) {
 	const customPropertyValues = collectCustomPropertyValues(options.compatibleSource.css);
 	mergeCustomPropertyValues(customPropertyValues, options.generated.css);
 	incrementalGenerateCache.set(cacheKey, {
-		seenCandidates: collectSeenCandidates(options.generated, options.requestedCandidates),
+		seenCandidates: collectSeenCandidates(options.generated),
 		classSet: new Set(options.generated.classSet),
 		css: options.generated.css,
 		rawCss: options.generated.rawCss,
@@ -2061,9 +2057,9 @@ function normalizeTailwindV4SourceOptions(options) {
 	if (css === options.css && cssSources === options.cssSources && cssEntries === options.cssEntries) return options;
 	return {
 		...options,
-		css,
+		...css === void 0 ? {} : { css },
 		...cssEntries === void 0 ? {} : { cssEntries },
-		cssSources
+		...cssSources === void 0 ? {} : { cssSources }
 	};
 }
 function resolveTailwindCssImportTarget(runtime) {
@@ -2243,6 +2239,7 @@ function normalizeWeappTailwindcssGeneratorOptions(options, context = {}) {
 	if (options == null) return {
 		target,
 		branch,
+		webCompat: void 0,
 		importFallback: false,
 		bareArbitraryValues: void 0
 	};
@@ -2251,6 +2248,7 @@ function normalizeWeappTailwindcssGeneratorOptions(options, context = {}) {
 		branch,
 		config: options.config,
 		styleOptions: options.styleOptions,
+		webCompat: options.webCompat,
 		importFallback: options.importFallback ?? false,
 		bareArbitraryValues: options.bareArbitraryValues
 	};
@@ -2261,6 +2259,46 @@ function createWeappTailwindcssGenerator(source) {
 	return createTailwindV4Engine(source);
 }
 //#endregion
+//#region src/wxml/shared.ts
+const NEWLINE_RE = /[\n\r]+/g;
+function replaceWxml(original, options = {
+	keepEOL: false,
+	escapeMap: _weapp_core_escape.MappingChars2String
+}) {
+	const { keepEOL, escapeMap, ignoreHead } = options;
+	let res = original;
+	if (!keepEOL) res = res.replaceAll(NEWLINE_RE, "");
+	res = (0, _weapp_core_escape.escape)(res, omitUndefined({
+		map: escapeMap,
+		ignoreHead
+	}));
+	return res;
+}
+//#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(replaceWxml(candidate, { escapeMap }));
+		if (selectors.has(candidate) || selectors.has(escaped)) matched.add(candidate);
+	}
+	return matched;
+}
+//#endregion
 //#region src/uni-app-x/options.ts
 const DEFAULT_COMPONENT_LOCAL_STYLES_OPTIONS = {
 	enabled: true,
@@ -2300,6 +2338,9 @@ function isUniAppXEnabled(option) {
 }
 //#endregion
 //#region src/context/style-options.ts
+function normalizeStyleHandlerMajorVersion(majorVersion) {
+	return majorVersion === 4 ? 4 : void 0;
+}
 function resolveStyleOptionsFromContext(ctx, tailwindcssMajorVersion) {
 	const resolvedUniAppXOptions = resolveUniAppXOptions(ctx.uniAppX);
 	const branch = resolveGeneratorRuntimeBranch(normalizeWeappTailwindcssGeneratorOptions(ctx.generator, {
@@ -2438,7 +2479,7 @@ function shouldUseGeneratorForCurrentCss(_majorVersion, cssHandlerOptions, optio
 	const hasApplyDirectives = hasTailwindApplyDirective(options.rawSource);
 	const sourceCss = cssHandlerOptions.sourceOptions?.sourceCss;
 	const hasSourceCssDirectives = typeof sourceCss === "string" && (hasTailwindRootDirectives(sourceCss, { importFallback: true }) || hasTailwindSourceDirectives(sourceCss, { importFallback: true }) || 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;
@@ -2461,22 +2502,6 @@ function mergeGeneratorResults(generatedResults) {
 	};
 }
 //#endregion
-//#region src/wxml/shared.ts
-const NEWLINE_RE = /[\n\r]+/g;
-function replaceWxml(original, options = {
-	keepEOL: false,
-	escapeMap: _weapp_core_escape.MappingChars2String
-}) {
-	const { keepEOL, escapeMap, ignoreHead } = options;
-	let res = original;
-	if (!keepEOL) res = res.replaceAll(NEWLINE_RE, "");
-	res = (0, _weapp_core_escape.escape)(res, omitUndefined({
-		map: escapeMap,
-		ignoreHead
-	}));
-	return res;
-}
-//#endregion
 //#region src/babel/index.ts
 function _interopDefaultCompat(e) {
 	return e && typeof e === "object" && "default" in e ? e.default : e;
@@ -3752,7 +3777,7 @@ function collectLocalStyleImportFiles(source, base) {
 		_weapp_tailwindcss_postcss.postcss.parse(styleSource).walkAtRules("import", (rule) => {
 			const request = 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 {}
@@ -5013,7 +5038,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;
@@ -5320,6 +5345,14 @@ 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;
+}
+function finalizeWebGeneratorCss(css, target, webCompat) {
+	return target === "web" ? (0, _weapp_tailwindcss_postcss.transformWebCssCompat)(css, webCompat) : css;
+}
 async function generateCssByGenerator(options) {
 	const { opts, runtimeState, runtime, rawSource, file, cssHandlerOptions, cssUserHandlerOptions, getSourceCandidatesForEntries, styleHandler, userRawSource, userRawSourceProcessed, debug } = options;
 	const generatorOptions = {
@@ -5342,12 +5375,17 @@ async function generateCssByGenerator(options) {
 	const effectiveRawSource = stripUnmatchedTailwindSourceMediaCloseFragments(stripTailwindSourceMediaFragments(normalizeTailwindSourceDirectives(rawSource, { importFallback: generatorOptions.importFallback })));
 	const localImportParts = splitLocalCssImports(effectiveRawSource);
 	const localImports = options.restoreLocalCssImports === false ? void 0 : localImportParts?.imports;
+	const finalizeGeneratorCss = (css, target, finalizeOptions = {}) => {
+		return finalizeWebGeneratorCss(restoreLocalCssImports(finalizeMiniProgramGeneratorCss(css, target, majorVersion, opts.cssPreflight, finalizeOptions), localImports), target, generatorOptions.webCompat);
+	};
 	const generatorRawSource = localImportParts?.source ?? effectiveRawSource;
 	const rawUserSource = userRawSource === void 0 ? generatorRawSource : userRawSourceProcessed ? userRawSource : stripUnmatchedTailwindSourceMediaCloseFragments(stripTailwindSourceMediaFragments(normalizeTailwindSourceDirectives(userRawSource, { importFallback: generatorOptions.importFallback })));
 	const userSource = splitLocalCssImports(rawUserSource)?.source ?? rawUserSource;
 	const userCssRawSource = removeTailwindV4GeneratorAtRules(userSource);
-	const userCssOrderSource = GENERATOR_PLACEHOLDER_MARKER_RE.test(userSource) ? userSource : userCssRawSource;
-	const hasDistinctUserRawSource = typeof userRawSource === "string" && normalizeCssSourceForCompare(userCssRawSource) !== normalizeCssSourceForCompare(generatorRawSource);
+	const generatedUserCssOrderSource = hasTailwindGeneratedCss(userSource) ? splitTailwindV4GeneratedCssBySourceOrder(userSource, generatorRawSource) : void 0;
+	const generatedUserCssRawSource = generatedUserCssOrderSource ? createCssAppend(generatedUserCssOrderSource.before, generatedUserCssOrderSource.after) : hasTailwindGeneratedCss(userSource) ? "" : userCssRawSource;
+	const userCssOrderSource = GENERATOR_PLACEHOLDER_MARKER_RE.test(userSource) ? userSource : hasTailwindGeneratedCss(userSource) ? userSource : generatedUserCssRawSource;
+	const hasDistinctUserRawSource = typeof userRawSource === "string" && normalizeCssSourceForCompare(generatedUserCssRawSource) !== normalizeCssSourceForCompare(generatorRawSource);
 	const cleanedLocalImportWrapper = cleanLocalCssImportWrapperTailwindDirectives(effectiveRawSource);
 	if (cleanedLocalImportWrapper !== void 0) return {
 		css: shouldUseMiniProgramCssBranch(generatorBranch) ? (0, _weapp_tailwindcss_postcss.removeUnsupportedMiniProgramAtRules)(cleanedLocalImportWrapper) : cleanedLocalImportWrapper,
@@ -5369,7 +5407,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;
@@ -5425,12 +5466,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 = stripTailwindBanner(generated.incrementalCss);
+			const finalCss = finalizeWebGeneratorCss(restoreLocalCssImports(incrementalCss.trim().length > 0 ? createCssAppend(options.previousCss, finalizeMiniProgramGeneratorCss(incrementalCss, generated.target, majorVersion, opts.cssPreflight, {
+				injectPreflight: false,
+				styleOptions: generatorStyleOptions
+			})) : options.previousCss, localImports), generated.target, generatorOptions.webCompat);
 			return {
-				css: restoreLocalCssImports(incrementalCss.trim().length > 0 ? 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,
@@ -5483,28 +5525,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 && !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 && !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 = finalizeGeneratorCss(css, generated.target, {
+				injectPreflight: shouldInjectMiniProgramPreflightForGeneratorCss(opts, {
+					cssHandlerOptions,
+					isolateCurrentCssCandidates,
+					localImports
+				}),
+				styleOptions: generatorStyleOptions
+			});
 			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,
@@ -5517,7 +5560,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,
@@ -5549,7 +5592,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,
@@ -5557,9 +5600,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,
@@ -5570,8 +5613,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,
@@ -5585,13 +5628,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,
@@ -5602,16 +5645,17 @@ async function generateCssByGenerator(options) {
 				const missingUserCss = isCommentOnlyCss(userCss) ? "" : (0, _weapp_tailwindcss_postcss.filterExistingCssRules)(css, userCss);
 				css = createCssSourceOrderAppend$1(css, missingUserCss);
 			}
+			const finalCss = finalizeGeneratorCss(css, generated.target, {
+				injectPreflight: shouldInjectMiniProgramPreflightForGeneratorCss(opts, {
+					cssHandlerOptions,
+					isolateCurrentCssCandidates,
+					localImports
+				}),
+				styleOptions: generatorStyleOptions
+			});
 			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,
@@ -5622,12 +5666,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 && !hasTailwindApplyDirective(userCssRawSource)) {
-			const userCss = await transformGeneratorUserCss(userCssRawSource, {
+		if (generated.target === "weapp" && hasDistinctUserRawSource && !hasGeneratedCss && !hasGeneratedMarkers && !hasTailwindApplyDirective(generatedUserCssRawSource)) {
+			const userCss = await transformGeneratorUserCss(generatedUserCssRawSource, {
 				generatorTarget: generated.target,
 				generatorStyleOptions,
 				cssUserHandlerOptions,
@@ -5635,19 +5679,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 = finalizeGeneratorCss(css, generated.target, {
+			injectPreflight: shouldInjectMiniProgramPreflightForGeneratorCss(opts, {
+				cssHandlerOptions,
+				isolateCurrentCssCandidates,
+				localImports
+			}),
+			styleOptions: generatorStyleOptions
+		});
 		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,
@@ -7181,7 +7226,7 @@ function createCssHandlerOptions(options, majorVersion, file, appType) {
 	return {
 		isMainChunk: options.mainCssChunkMatcher(file, appType),
 		postcssOptions: { options: { from: file } },
-		...majorVersion === void 0 ? {} : { majorVersion }
+		...normalizeStyleHandlerMajorVersion(majorVersion) === void 0 ? {} : { majorVersion: 4 }
 	};
 }
 async function resolveWebpackLoaderSourceCandidates(source, loaderContext, options) {
@@ -7193,7 +7238,7 @@ async function resolveWebpackLoaderSourceCandidates(source, loaderContext, optio
 	if (!resolved) return;
 	const collector = createSourceCandidateStore({ bareArbitraryValues: compilerOptions.arbitraryValues?.bareArbitraryValues });
 	collector.syncInline(resolved.inlineCandidates);
-	const outDir = loaderContext.rootContext ? node_path.default.resolve(loaderContext.rootContext, compilerOptions.outputDir ?? "dist") : void 0;
+	const outDir = loaderContext.rootContext ? node_path.default.resolve(loaderContext.rootContext, "dist") : void 0;
 	const scanFiles = await resolveSourceCandidateScanFiles({
 		entries: resolved.entries,
 		explicit: resolved.explicit,