weapp-tailwindcss 5.1.8 → 5.1.10

package/dist/{webpack-2s-TFhgm.mjs → webpack-CCapGlNg.mjs}

@@ -1,10 +1,10 @@
-import { $ as hasTailwindGeneratedCssMarkers, A as stripTailwindSourceMediaFragments, C as isCommentOnlyCss, D as removeTailwindV4GeneratorAtRules, Dt as inferGeneratorTargetFromEnv, E as removeTailwindV4GeneratedUserCssArtifacts, F as pruneMiniProgramGeneratedCss, H as hasTailwindSourceDirectives, K as parseImportRequest, L as stripMiniProgramCssSpecificityPlaceholders, N as finalizeMiniProgramCss, Q as hasTailwindGeneratedCss, T as removeMiniProgramHoverSelectors, U as normalizeTailwindConfigDirectives, V as hasTailwindRootDirectives, _ as resolveTailwindcssOptions, bt as resolveSourceScanPath, j as stripUnmatchedTailwindSourceMediaCloseFragments, lt as getTailwindV4IncrementalGenerateCacheStats, o as hasConfiguredTailwindV4CssRoots, q as removeTailwindSourceDirectives, s as upsertTailwindV4CssSource, z as hasTailwindApplyDirective } from "./v4-engine-CjjWONB0.mjs";
-import { o as resolveRuntimeBranch } from "./generator-DugIHBgl.mjs";
+import { F as removeTailwindV4GeneratorAtRules, G as stripMiniProgramCssSpecificityPlaceholders, N as removeMiniProgramHoverSelectors, Ot as resolveSourceScanPath, P as removeTailwindV4GeneratedUserCssArtifacts, R as stripTailwindSourceMediaFragments, T as resolveTailwindcssOptions, U as pruneMiniProgramGeneratedCss, V as finalizeMiniProgramCss, X as hasTailwindSourceDirectives, Y as hasTailwindRootDirectives, Z as normalizeTailwindConfigDirectives, _t as getTailwindV4IncrementalGenerateCacheStats, et as parseImportRequest, h as upsertTailwindV4CssSource, i as normalizeWeappTailwindcssGeneratorOptions, j as isCommentOnlyCss, m as hasConfiguredTailwindV4CssRoots, o as resolveRuntimeBranch, ot as hasTailwindGeneratedCss, q as hasTailwindApplyDirective, st as hasTailwindGeneratedCssMarkers, tt as removeTailwindSourceDirectives, z as stripUnmatchedTailwindSourceMediaCloseFragments } from "./generator-ROzBodj6.mjs";
 import { r as getGroupedEntries } from "./utils-DodxWHGz.mjs";
-import { S as createDebug, b as ensureRuntimeClassSet, f as _defineProperty, i as pluginName, l as shouldSkipJsTransform, n as normalizeStyleHandlerMajorVersion, r as resolveStyleOptionsFromContext, t as getCompilerContext, w as md5Hash, x as refreshTailwindRuntimeState, y as createTailwindRuntimeReadyPromise } from "./context-CfXr3hWz.mjs";
-import { g as resolveTailwindV4EntriesFromCssCached, l as getRuntimeClassSetSignature, p as resolveViteSourceScanEntries } from "./tailwindcss-PA2jHHpx.mjs";
-import { C as hasMiniProgramTailwindV4PreflightReset, D as isCssSourceTraceEnabled, E as createCssTokenSourceMap, O as processCachedTask, S as createCssSourceOrderAppend, T as createCssSourceTraceCacheSignature, _ as isPureLocalCssImportWrapper, a as isSourceCandidateRequest, b as scoreTailwindV4CssSourceFileMatch, c as collectStrictEscapedRuntimeCandidates, f as pushConcurrentTaskFactories, i as createSourceCandidateStore, l as createEscapeFragments, n as emitHmrTiming, o as resolveSourceCandidateScanFiles, p as resolveTaskConcurrency, s as createBundleRuntimeClassSetManager, w as annotateCssSourceTrace, x as removeGeneratedSelectorCompatCss } from "./hmr-timing-BecOXMd8.mjs";
-import { A as hasBundlerGeneratedCssMarker, B as resolveWebpackFrameworkProfile, C as generateTailwindV4Css, D as resolveOutputSpecifier, I as createBuiltinWebpackStyleInjectorPlugin, M as stripBundlerGeneratedCssMarkers, N as resolvePackageDir, O as toAbsoluteOutputPath, P as resolvePluginDisabledState, R as webpackStyleInjectorDelegates, T as stripRequestQuery, b as createRuntimeAffectingSourceSignature, d as classifyBundleEntry, f as createBundleBuildState, i as createCandidateSignature, p as updateBundleBuildState, r as createScopedGeneratorRuntime, t as createSourceCandidateScanSignature, w as isSourceStyleRequest } from "./source-candidate-scan-signature-DAg8QSgh.mjs";
+import { S as createDebug, b as ensureRuntimeClassSet, f as _defineProperty, i as pluginName, l as shouldSkipJsTransform, n as normalizeStyleHandlerMajorVersion, r as resolveStyleOptionsFromContext, t as getCompilerContext, w as md5Hash, x as refreshTailwindRuntimeState, y as createTailwindRuntimeReadyPromise } from "./context-DzkSFEVL.mjs";
+import { n as getDefaultCssPreflight } from "./defaults-9B6aMyZb.mjs";
+import { g as resolveTailwindV4EntriesFromCssCached, l as getRuntimeClassSetSignature, p as resolveViteSourceScanEntries } from "./tailwindcss-hzy_WaC9.mjs";
+import { A as processCachedTask, C as removeGeneratedSelectorCompatCss, D as createCssSourceTraceCacheSignature, E as annotateCssSourceTrace, O as createCssTokenSourceMap, S as scoreTailwindV4CssSourceFileMatch, T as hasMiniProgramTailwindV4PreflightReset, a as isSourceCandidateRequest, c as collectStrictEscapedRuntimeCandidates, f as pushConcurrentTaskFactories, i as createSourceCandidateStore, k as isCssSourceTraceEnabled, l as createEscapeFragments, n as emitHmrTiming, o as resolveSourceCandidateScanFiles, p as resolveTaskConcurrency, s as createBundleRuntimeClassSetManager, w as createCssSourceOrderAppend, y as isPureLocalCssImportWrapper } from "./hmr-timing-DwtYJdwb.mjs";
+import { E as stripRequestQuery, F as resolvePluginDisabledState, L as createBuiltinWebpackStyleInjectorPlugin, N as stripBundlerGeneratedCssMarkers, O as resolveOutputSpecifier, P as resolvePackageDir, T as isSourceStyleRequest, V as resolveWebpackFrameworkProfile, a as createCandidateSignature, f as classifyBundleEntry, j as hasBundlerGeneratedCssMarker, k as toAbsoluteOutputPath, m as updateBundleBuildState, p as createBundleBuildState, r as createScopedGeneratorRuntime, t as createSourceCandidateScanSignature, w as generateTailwindV4Css, x as createRuntimeAffectingSourceSignature, z as webpackStyleInjectorDelegates } from "./source-candidate-scan-signature-CQ04hiox.mjs";
 import Module, { createRequire } from "node:module";
 import fs from "node:fs";
 import path from "node:path";
@@ -143,6 +143,99 @@ function isWebpackCssLoaderRuntimeSource(source) {
 //#endregion
 //#region src/bundlers/webpack/BaseUnifiedPlugin/v5-assets/pipeline-helpers.ts
 const WEBPACK_CSS_HANDLER_OPTIONS_CACHE_MAX = 128;
+function resolveConfiguredWebpackCssPreflight(compilerOptions, styleOptions) {
+	return styleOptions.cssPreflight ?? compilerOptions.cssPreflight ?? getDefaultCssPreflight();
+}
+function resolveExistingWebpackCssPreflight(compilerOptions, styleOptions, source) {
+	return hasMiniProgramPreflightSelector(source) ? resolveConfiguredWebpackCssPreflight(compilerOptions, styleOptions) : void 0;
+}
+function removeMiniProgramPreflightSelectorRule(source) {
+	try {
+		const root = postcss.parse(source);
+		let changed = false;
+		root.walkRules((rule) => {
+			const selectors = new Set((rule.selectors ?? [rule.selector]).map((selector) => selector.trim().replace(/^:before$/, "::before").replace(/^:after$/, "::after")));
+			if (selectors.has("view") && selectors.has("text") && selectors.has("::before") && selectors.has("::after")) {
+				rule.remove();
+				changed = true;
+			}
+		});
+		return changed ? root.toString() : source;
+	} catch {
+		return source.replace(/(?:^|[}\s])\s*view\s*,\s*text\s*,\s*::after\s*,\s*::before\s*\{[^}]*\}/g, "");
+	}
+}
+function dedupeMiniProgramPreflightSelectorRules(source) {
+	try {
+		const root = postcss.parse(source);
+		let firstRule;
+		let changed = false;
+		root.walkRules((rule) => {
+			const selectors = new Set((rule.selectors ?? [rule.selector]).map((selector) => selector.trim().replace(/^:before$/, "::before").replace(/^:after$/, "::after")));
+			if (!selectors.has("view") || !selectors.has("text") || !selectors.has("::before") || !selectors.has("::after")) return;
+			if (!firstRule) {
+				firstRule = rule;
+				return;
+			}
+			const existingProps = /* @__PURE__ */ new Set();
+			firstRule.walkDecls((decl) => {
+				existingProps.add(decl.prop);
+			});
+			rule.walkDecls((decl) => {
+				if (!existingProps.has(decl.prop)) {
+					firstRule?.append(decl.clone());
+					existingProps.add(decl.prop);
+				}
+			});
+			rule.remove();
+			changed = true;
+		});
+		return changed ? root.toString() : source;
+	} catch {
+		return source;
+	}
+}
+function hasMiniProgramPreflightSelector(source) {
+	try {
+		let found = false;
+		postcss.parse(source).walkRules((rule) => {
+			const selectors = new Set((rule.selectors ?? [rule.selector]).map((selector) => selector.trim().replace(/^:before$/, "::before").replace(/^:after$/, "::after")));
+			if (selectors.has("view") && selectors.has("text") && selectors.has("::before") && selectors.has("::after")) {
+				found = true;
+				return false;
+			}
+		});
+		return found;
+	} catch {
+		return /(?:^|[},])\s*view\s*,\s*text\s*,\s*::after\s*,\s*::before\s*\{/.test(source);
+	}
+}
+function ensureWebpackMiniProgramTwContentInit(source) {
+	if (!source.includes("var(--tw-content)")) return source;
+	try {
+		const root = postcss.parse(source);
+		let changed = false;
+		root.walkRules((rule) => {
+			const selectors = new Set((rule.selectors ?? [rule.selector]).map((selector) => selector.trim().replace(/^:before$/, "::before").replace(/^:after$/, "::after")));
+			if (!selectors.has("view") || !selectors.has("text") || !selectors.has("::before") || !selectors.has("::after")) return;
+			let hasContentInit = false;
+			rule.walkDecls("--tw-content", () => {
+				hasContentInit = true;
+			});
+			if (!hasContentInit) {
+				rule.append(postcss.decl({
+					prop: "--tw-content",
+					value: "''"
+				}));
+				changed = true;
+			}
+			return false;
+		});
+		return changed ? root.toString() : source;
+	} catch {
+		return source;
+	}
+}
 function removeTailwindV4StandaloneHostPreflightRule(source) {
 	if (!source.includes("--theme(")) return source;
 	try {
@@ -678,7 +771,7 @@ function finalizeMiniProgramUserCssAssetSource(source, compilerOptions, isWebGen
 	const styleOptions = resolveStyleOptionsFromContext(compilerOptions);
 	if (isWebGeneratorTarget) return source;
 	return stripMiniProgramCssSpecificityPlaceholders(removeTailwindV4StandaloneHostPreflightRule(finalizeMiniProgramCss(removeMiniProgramHoverSelectors(source, styleOptions.cssRemoveHoverPseudoClass), {
-		cssPreflight: options.cssPreflight === false ? false : !hasMiniProgramTailwindV4PreflightReset(source) ? compilerOptions.cssPreflight : void 0,
+		cssPreflight: options.cssPreflight === false ? false : !hasMiniProgramTailwindV4PreflightReset(source) ? resolveConfiguredWebpackCssPreflight(compilerOptions, styleOptions) : void 0,
 		isTailwindcssV4: true,
 		tailwindcssV4GradientFallback: styleOptions.tailwindcssV4GradientFallback
 	})));
@@ -743,9 +836,10 @@ function createWebpackCurrentAssetUserRawSource(options) {
 	};
 }
 function finalizeTracedWebpackCssAsset(css, cssHandlerOptions, options) {
-	const traced = options.annotateCss(css);
-	if (options.isWebGeneratorTarget || !isCssSourceTraceEnabled(options.compilerOptions)) return traced;
-	return finalizeMiniProgramUserCssAssetSource(traced, options.compilerOptions, options.isWebGeneratorTarget, { cssPreflight: shouldInjectWebpackCssTracePreflight(options.compilerOptions.appType, cssHandlerOptions) });
+	if (options.finalized === true) return options.annotateCss(css);
+	if (options.isWebGeneratorTarget || !isCssSourceTraceEnabled(options.compilerOptions)) return options.annotateCss(css);
+	const finalized = finalizeMiniProgramUserCssAssetSource(css, options.compilerOptions, options.isWebGeneratorTarget, { cssPreflight: shouldInjectWebpackCssTracePreflight(options.compilerOptions.appType, cssHandlerOptions) });
+	return options.annotateCss(finalized);
 }
 function finalizeWebpackCssAssetSource(source, compilerOptions, isWebGeneratorTarget, options = {}) {
 	const styleOptions = resolveStyleOptionsFromContext(compilerOptions);
@@ -754,17 +848,36 @@ function finalizeWebpackCssAssetSource(source, compilerOptions, isWebGeneratorTa
 		return stripTrailingLineWhitespace(stripUnmatchedTailwindSourceMediaCloseFragments(stripTailwindSourceMediaFragments(removeTailwindV4GeneratorAtRules(removeTailwindSourceDirectives(stripBundlerGeneratedCssMarkers(source), { importFallback: true })))));
 	}
 	let finalized = removeTailwindSourceDirectives(stripBundlerGeneratedCssMarkers(source), { importFallback: true });
-	if (options.generatedCss !== true) return stripMiniProgramCssSpecificityPlaceholders(removeMiniProgramHoverSelectors(finalized, styleOptions.cssRemoveHoverPseudoClass));
+	if (options.generatedCss !== true) {
+		finalized = finalizeMiniProgramCss(finalized, {
+			cssPreflight: false,
+			isTailwindcssV4: true,
+			tailwindcssV4GradientFallback: styleOptions.tailwindcssV4GradientFallback
+		});
+		finalized = dedupeMiniProgramPreflightSelectorRules(finalized);
+		return stripMiniProgramCssSpecificityPlaceholders(removeMiniProgramHoverSelectors(finalized, styleOptions.cssRemoveHoverPseudoClass));
+	}
 	try {
 		finalized = pruneMiniProgramGeneratedCss(finalized, { preservePreflight: options.cssPreflight !== false });
 	} catch {}
+	const shouldRemoveExistingPreflight = options.cssPreflight === false && options.preserveExistingPreflight === false;
+	if (shouldRemoveExistingPreflight) finalized = removeMiniProgramPreflightSelectorRule(finalized);
+	const hasExistingMiniProgramPreflight = options.preserveExistingPreflight !== false && hasMiniProgramPreflightSelector(source);
 	finalized = finalizeMiniProgramCss(finalized, {
-		cssPreflight: options.cssPreflight === false ? false : !hasMiniProgramTailwindV4PreflightReset(finalized) ? compilerOptions.cssPreflight : void 0,
+		cssPreflight: options.cssPreflight === false && !hasExistingMiniProgramPreflight ? false : !hasMiniProgramTailwindV4PreflightReset(finalized) ? resolveExistingWebpackCssPreflight(compilerOptions, styleOptions, source) : void 0,
 		isTailwindcssV4: true,
 		tailwindcssV4GradientFallback: styleOptions.tailwindcssV4GradientFallback
 	});
+	finalized = ensureWebpackMiniProgramTwContentInit(finalized);
+	if (shouldRemoveExistingPreflight) finalized = removeMiniProgramPreflightSelectorRule(finalized);
+	else finalized = dedupeMiniProgramPreflightSelectorRules(finalized);
 	return stripMiniProgramCssSpecificityPlaceholders(removeMiniProgramHoverSelectors(finalized, styleOptions.cssRemoveHoverPseudoClass));
 }
+function finalizeWebpackCssAssetOutputSource(source, compilerOptions, isWebGeneratorTarget) {
+	if (isWebGeneratorTarget) return source;
+	const styleOptions = resolveStyleOptionsFromContext(compilerOptions);
+	return stripMiniProgramCssSpecificityPlaceholders(removeMiniProgramHoverSelectors(dedupeMiniProgramPreflightSelectorRules(source), styleOptions.cssRemoveHoverPseudoClass));
+}
 function collectWebpackJsRuntimeCandidatesFromAssets(options) {
 	if (options.isWebGeneratorTarget) return;
 	const candidates = /* @__PURE__ */ new Set();
@@ -824,8 +937,37 @@ function collectWebpackCssTokenSourceRefs(source) {
 	}
 	return refs;
 }
+function readWebpackCompilationAssetSource(compilation, file) {
+	const source = compilation.getAsset?.(file)?.source?.source?.();
+	if (source === void 0) return;
+	return typeof source === "string" ? source : source.toString();
+}
+function resolveWebpackCssImportFile(file, request) {
+	if (/^(?:https?:)?\/\//i.test(request) || request.startsWith("/")) return;
+	if (!/\.(?:css|wxss|acss|ttss|qss|jxss|tyss)(?:$|[?#])/i.test(request)) return;
+	const cleanRequest = request.replace(/[?#].*$/, "");
+	return normalizeWebpackCssSourceRef(path.posix.join(path.posix.dirname(normalizeWebpackCssSourceRef(file)), cleanRequest));
+}
+function collectCssImportRequests(source) {
+	return [...source.matchAll(/@import\s+(?:url\(\s*)?(?:"([^"]+)"|'([^']+)'|([^\s;)]+))/g)].map((match) => match[1] ?? match[2] ?? match[3]).filter((request) => typeof request === "string" && request.length > 0);
+}
+function collectMainImportedCssFiles(compilation, cssAssetFiles, cssMatcher, isMainCssFile) {
+	const files = /* @__PURE__ */ new Set();
+	const candidates = new Set(cssAssetFiles);
+	for (const chunk of compilation.chunks) for (const file of chunk.files ?? []) candidates.add(file);
+	for (const file of candidates) {
+		if (!cssMatcher(file) || !isMainCssFile(file)) continue;
+		const source = readWebpackCompilationAssetSource(compilation, file);
+		if (!source?.includes("@import")) continue;
+		for (const request of collectCssImportRequests(source)) {
+			const importedFile = resolveWebpackCssImportFile(file, request);
+			if (importedFile) files.add(importedFile);
+		}
+	}
+	return files;
+}
 function createWebpackCssSourceResolvers(options) {
-	const { activeWebpackAssetResourceFiles, appType, compilerOptions, compilation, cssAssetResources, cssHandlerOptionsCache, cssSources, cssUserHandlerOptionsCache, groupedCssEntriesLength, singleCssAssetFile, isWebGeneratorTarget, outputDir, runtimeState } = options;
+	const { activeWebpackAssetResourceFiles, appType, compilerOptions, compilation, cssAssetFiles, cssAssetResources, cssHandlerOptionsCache, cssSources, cssUserHandlerOptionsCache, groupedCssEntriesLength, singleCssAssetFile, isWebGeneratorTarget, outputDir, runtimeState } = options;
 	const hasConfiguredTailwindV4SourceRoots = () => {
 		const tailwindOptions = resolveTailwindcssOptions(runtimeState.tailwindRuntime.options);
 		return (tailwindOptions?.v4?.cssEntries?.length ?? 0) > 0 || (tailwindOptions?.v4?.cssSources?.length ?? 0) > 0;
@@ -836,10 +978,21 @@ function createWebpackCssSourceResolvers(options) {
 		return [...new Set(entries)];
 	})();
 	const configuredMainCssEntryFiles = configuredCssEntryFiles.slice(0, 1);
-	const inferredMainCssFiles = inferWebpackMainCssFiles(compilation.chunks, compilerOptions.cssMatcher, {
+	const scoreCssSourceOutputMatch = (file, sourceFile) => scoreTailwindV4CssSourceFileMatch(file, sourceFile, {
+		outputRoot: outputDir,
+		projectRoot: compilerOptions.tailwindcssBasedir,
+		cwd: compilerOptions.tailwindcssBasedir
+	});
+	const isConfiguredMainCssEntryFile = (sourceFile) => configuredMainCssEntryFiles.some((entry) => path.resolve(entry) === path.resolve(sourceFile));
+	const isCssSourceAllowedForOutput = (file, sourceFile) => !isConfiguredMainCssEntryFile(sourceFile) || scoreCssSourceOutputMatch(file, sourceFile) > 0;
+	const inferredMainCssFiles = new Set([...inferWebpackMainCssFiles(compilation.chunks, compilerOptions.cssMatcher, {
 		mainSourceFiles: new Set(configuredMainCssEntryFiles),
 		resourcesByAsset: cssAssetResources
-	});
+	})].filter((file) => {
+		if (configuredMainCssEntryFiles.length === 0) return true;
+		return [...cssAssetResources.get(file) ?? []].some((resource) => isConfiguredMainCssEntryFile(resource) && isCssSourceAllowedForOutput(file, resource));
+	}));
+	const mainImportedCssFiles = collectMainImportedCssFiles(compilation, cssAssetFiles, compilerOptions.cssMatcher, (file) => compilerOptions.mainCssChunkMatcher(file, appType) || inferredMainCssFiles.has(file));
 	const singleConfiguredCssAsset = isWebGeneratorTarget && configuredMainCssEntryFiles.length > 0 && groupedCssEntriesLength === 1 ? singleCssAssetFile : void 0;
 	const isMainCssChunk = (file) => {
 		const resources = cssAssetResources.get(file);
@@ -848,7 +1001,7 @@ function createWebpackCssSourceResolvers(options) {
 			if (index >= 0) return index === 0;
 		}
 		if (configuredCssEntryFiles.length > 1) return false;
-		return compilerOptions.mainCssChunkMatcher(file, appType) || inferredMainCssFiles.has(file) || file === singleConfiguredCssAsset;
+		return compilerOptions.mainCssChunkMatcher(file, appType) || inferredMainCssFiles.has(file) || mainImportedCssFiles.has(normalizeWebpackCssSourceRef(file)) || file === singleConfiguredCssAsset;
 	};
 	const activeWebpackCssSourceFiles = /* @__PURE__ */ new Set();
 	const resolveConfiguredMainCssSourceFile = (file) => {
@@ -864,14 +1017,14 @@ function createWebpackCssSourceResolvers(options) {
 		const assetResources = cssAssetResources.get(file);
 		const activeAssetResource = resolveSingleActiveWebpackCssResource(assetResources, activeWebpackAssetResourceFiles);
 		if (cssSources.size === 0) {
-			if (activeAssetResource) {
+			if (activeAssetResource && isCssSourceAllowedForOutput(file, activeAssetResource)) {
 				activeWebpackCssSourceFiles.add(activeAssetResource);
 				return activeAssetResource;
 			}
 			if (assetResources && assetResources.size > 0) return;
 			return resolveConfiguredMainCssSourceFile(file);
 		}
-		const resourceMatches = [...assetResources ?? []].filter((sourceFile) => cssSources.has(sourceFile)).sort();
+		const resourceMatches = [...assetResources ?? []].filter((sourceFile) => cssSources.has(sourceFile)).filter((sourceFile) => isCssSourceAllowedForOutput(file, sourceFile)).sort();
 		if (resourceMatches.length === 1) {
 			const sourceFile = resourceMatches[0];
 			activeWebpackCssSourceFiles.add(sourceFile);
@@ -886,7 +1039,7 @@ function createWebpackCssSourceResolvers(options) {
 			activeWebpackCssSourceFiles.add(sourceFile);
 			return sourceFile;
 		}
-		if (activeAssetResource) {
+		if (activeAssetResource && isCssSourceAllowedForOutput(file, activeAssetResource)) {
 			activeWebpackCssSourceFiles.add(activeAssetResource);
 			return activeAssetResource;
 		}
@@ -946,8 +1099,10 @@ function createWebpackCssSourceResolvers(options) {
 	});
 	const getCssHandlerOptions = (file, rawSource) => {
 		const majorVersion = runtimeState.tailwindRuntime.majorVersion;
-		const isMainChunk = isMainCssChunk(file);
+		const isMainCssAsset = isMainCssChunk(file);
 		const sourceFile = resolveWebpackCssSourceFile(file, rawSource);
+		const sourceMatchedMainCssEntry = sourceFile !== void 0 && isConfiguredMainCssEntryFile(sourceFile) && isCssSourceAllowedForOutput(file, sourceFile);
+		const isMainChunk = isMainCssAsset || sourceMatchedMainCssEntry;
 		const sourceCss = sourceFile ? cssSources.get(sourceFile)?.css : void 0;
 		const generatorSourceCss = removeWebpackGeneratorNonTailwindImports(sourceCss);
 		const generatorCssSource = createWebpackGeneratorCssSource(sourceFile, generatorSourceCss);
@@ -998,6 +1153,7 @@ function createWebpackCssSourceResolvers(options) {
 	};
 	return {
 		activeWebpackCssSourceFiles,
+		configuredCssEntryFiles,
 		configuredMainCssEntryFiles,
 		getCssHandlerOptions,
 		getCssUserHandlerOptions,
@@ -1367,7 +1523,12 @@ function setupWebpackV5ProcessAssetsHook(options) {
 	const { compiler, options: compilerOptions, appType, runtimeState, getRuntimeRefreshRequirement, refreshRuntimeMetadata, isKnownWebpackProcessedCssAsset, isWebpackProcessedCssAsset, consumeRuntimeRefreshRequirement, isWatchMode, getWatchChangedFiles, runtimeClassSetManager, getWebpackCssSources, getWebpackGeneratedCssSources, pruneWebpackCssSources, prepareWebpackCssSources, debug } = options;
 	const { Compilation, sources } = compiler.webpack;
 	const { ConcatSource } = sources;
-	const isWebGeneratorTarget = compilerOptions.generator?.target === "web";
+	const isWebGeneratorTarget = normalizeWeappTailwindcssGeneratorOptions(compilerOptions.generator, {
+		appType: compilerOptions.appType,
+		platform: compilerOptions.cssOptions?.platform ?? compilerOptions.platform,
+		tailwindcssMajorVersion: runtimeState.tailwindRuntime.majorVersion,
+		uniAppX: compilerOptions.uniAppX
+	}).target === "web";
 	const cssHandlerOptionsCache = /* @__PURE__ */ new Map();
 	const cssUserHandlerOptionsCache = /* @__PURE__ */ new Map();
 	const webpackSourceCandidateScanCache = createWebpackSourceCandidateScanCache();
@@ -1423,11 +1584,12 @@ function setupWebpackV5ProcessAssetsHook(options) {
 			for (const chunk of compilation.chunks) if (chunk.id) activeProcessHashKeys.add(chunk.id);
 			const cssSources = new Map([...getWebpackCssSources?.() ?? []].map(([file, source]) => [path.resolve(file), source]));
 			const generatedCssSources = new Map([...getWebpackGeneratedCssSources?.() ?? []].map(([file, source]) => [path.resolve(file), source]));
-			const { activeWebpackCssSourceFiles, configuredMainCssEntryFiles, getCssHandlerOptions, getCssUserHandlerOptions, hasConfiguredTailwindV4SourceRoots, isSameWebpackSourceScope, resolveWebpackCssSourceFile } = createWebpackCssSourceResolvers({
+			const { activeWebpackCssSourceFiles, configuredCssEntryFiles, configuredMainCssEntryFiles, getCssHandlerOptions, getCssUserHandlerOptions, hasConfiguredTailwindV4SourceRoots, isSameWebpackSourceScope, resolveWebpackCssSourceFile } = createWebpackCssSourceResolvers({
 				activeWebpackAssetResourceFiles,
 				appType,
 				compilerOptions,
 				compilation,
+				cssAssetFiles: entries.map(([file]) => file),
 				cssAssetResources,
 				cssHandlerOptionsCache,
 				cssSources,
@@ -1455,9 +1617,10 @@ function setupWebpackV5ProcessAssetsHook(options) {
 				opts: compilerOptions,
 				tokenSources: cssSourceTraceTokenSources
 			});
-			const finalizeTracedCss = (css, cssHandlerOptions) => finalizeTracedWebpackCssAsset(css, cssHandlerOptions, {
+			const finalizeTracedCss = (css, cssHandlerOptions, options = {}) => finalizeTracedWebpackCssAsset(css, cssHandlerOptions, {
 				annotateCss,
 				compilerOptions,
+				...options,
 				isWebGeneratorTarget
 			});
 			const hasRuntimeTransformAssets = Boolean(!isWebGeneratorTarget && ((groupedEntries.html?.length ?? 0) > 0 || (groupedEntries.js?.length ?? 0) > 0));
@@ -1749,7 +1912,7 @@ function setupWebpackV5ProcessAssetsHook(options) {
 									processed: true
 								}).css;
 								debug("css skip webpack-loader-pipeline asset: %s", file);
-								return { result: new ConcatSource(finalizeTracedCss(css, cssHandlerOptionsForProcessedAsset)) };
+								return { result: new ConcatSource(finalizeTracedCss(css, cssHandlerOptionsForProcessedAsset, { finalized: true })) };
 							}
 						});
 					}, cssTaskFactories);
@@ -1815,8 +1978,12 @@ function setupWebpackV5ProcessAssetsHook(options) {
 							const generatorRawSource = resolveWebpackGeneratorRawSource(currentRawSource, cssHandlerOptions);
 							if (isWebpackCssLoaderRuntimeSource(generatorRawSource)) return { result: new ConcatSource(currentRawSource) };
 							const sourceFile = cssHandlerOptions.sourceOptions?.sourceFile;
-							const loaderGeneratedCss = sourceFile && !isWebGeneratorTarget ? generatedCssSources.get(path.resolve(sourceFile)) : void 0;
 							const sourceCss = sourceFile ? cssSources.get(path.resolve(sourceFile))?.css : void 0;
+							const isConfiguredCssSource = sourceFile !== void 0 && configuredCssEntryFiles.some((entry) => path.resolve(entry) === path.resolve(sourceFile));
+							const isConfiguredMainCssSource = sourceFile !== void 0 && configuredMainCssEntryFiles.some((entry) => path.resolve(entry) === path.resolve(sourceFile));
+							const sourceCssHasTailwindRoot = sourceCss !== void 0 && hasTailwindRootDirectives(sourceCss, { importFallback: true });
+							const shouldPreserveExistingPreflight = cssHandlerOptions.isMainChunk || !isConfiguredMainCssSource && (isConfiguredCssSource || sourceCssHasTailwindRoot);
+							const loaderGeneratedCss = sourceFile && !isWebGeneratorTarget ? generatedCssSources.get(path.resolve(sourceFile)) : void 0;
 							const shouldRegenerateExplicitTailwindV4CssSource = sourceCss !== void 0 && (hasTailwindSourceDirectives(sourceCss, { importFallback: true }) || sourceCss.includes("@config"));
 							const explicitTailwindV4SourceCandidates = shouldRegenerateExplicitTailwindV4CssSource && sourceCss && sourceFile && webpackSourceCandidates?.getSourceCandidatesForEntries ? await resolveTailwindV4EntriesFromCssCached(sourceCss, path.dirname(sourceFile)).then((resolved) => resolved?.entries ? webpackSourceCandidates.getSourceCandidatesForEntries(resolved.entries) : void 0) : void 0;
 							if (loaderGeneratedCss && shouldConsumeWebpackLoaderGeneratedCss({
@@ -1834,13 +2001,15 @@ function setupWebpackV5ProcessAssetsHook(options) {
 								const currentRawSourceWithoutBundlerMarkers = stripBundlerGeneratedCssMarkers(currentRawSource);
 								const currentAssetHasProcessedUrl = hasProcessedCssAssetUrl(currentRawSourceWithoutBundlerMarkers) && currentRawSourceWithoutBundlerMarkers !== loaderGeneratedCss.css;
 								const currentAssetUserCss = currentAssetHasProcessedUrl ? currentRawSourceWithoutBundlerMarkers : shouldUseWebpackAssetAsGeneratorUserCss(currentRawSourceWithoutBundlerMarkers, loaderGeneratedCss.css, { processed: true }) ? removeGeneratedSelectorCompatCss(currentRawSourceWithoutBundlerMarkers, loaderGeneratedCss.css) : void 0;
-								const isConfiguredMainCssSource = configuredMainCssEntryFiles.some((entry) => path.resolve(entry) === path.resolve(sourceFile));
 								const loaderGeneratedCssWithoutMarkers = stripBundlerGeneratedCssMarkers(loaderGeneratedCss.css);
 								const currentAssetUserCssWithoutMarkers = currentAssetUserCss === void 0 ? "" : stripBundlerGeneratedCssMarkers(currentAssetUserCss);
 								const currentAssetMissingUserCss = !(currentAssetUserCssWithoutMarkers.trim().length > 0 && !isCommentOnlyCss(currentAssetUserCssWithoutMarkers)) ? "" : filterExistingCssRules(currentAssetUserCssWithoutMarkers, loaderGeneratedCssWithoutMarkers);
-								if (isConfiguredMainCssSource && !cssHandlerOptions.isMainChunk && (currentAssetMissingUserCss.trim().length === 0 || isCommentOnlyCss(currentAssetMissingUserCss))) {
+								if (isConfiguredMainCssSource && !cssHandlerOptions.isMainChunk) {
 									debug("css skip duplicate webpack loader main generation: %s <- %s", file, sourceFile);
-									return { result: new ConcatSource(finalizeTracedCss("", cssHandlerOptions)) };
+									return { result: new ConcatSource(finalizeTracedCss(currentAssetMissingUserCss.trim().length === 0 || isCommentOnlyCss(currentAssetMissingUserCss) ? "" : finalizeCssAssetSource(currentAssetMissingUserCss, {
+										cssPreflight: false,
+										generatedCss: false
+									}), cssHandlerOptions)) };
 								}
 								const finalizedLoaderCss = finalizeCssAssetSource(currentAssetUserCss === void 0 ? loaderGeneratedCss.css : createWebpackGeneratorUserCssSourceAppend({
 									css: currentAssetUserCss === void 0 ? loaderGeneratedCss.css : currentAssetHasProcessedUrl ? removeGeneratedSelectorCompatCss(loaderGeneratedCss.css, currentAssetUserCss) : filterExistingCssRules(currentAssetUserCss, loaderGeneratedCss.css),
@@ -1850,7 +2019,8 @@ function setupWebpackV5ProcessAssetsHook(options) {
 									processed: true
 								}).css, {
 									cssPreflight: cssHandlerOptions.isMainChunk,
-									generatedCss: true
+									generatedCss: true,
+									preserveExistingPreflight: shouldPreserveExistingPreflight
 								});
 								const loaderSourceBareUserCss = isWebGeneratorTarget ? void 0 : createWebpackGeneratorUserCssSourceAppend(...[currentAssetUserCss === void 0 ? void 0 : {
 									css: currentAssetUserCss,
@@ -1876,7 +2046,7 @@ function setupWebpackV5ProcessAssetsHook(options) {
 								}, {
 									css: missingLoaderSourceBareUserCss,
 									processed: true
-								}).css, cssHandlerOptions);
+								}).css, cssHandlerOptions, { finalized: true });
 								debug("css consume webpack loader generation: %s <- %s", file, sourceFile);
 								return { result: new ConcatSource(css) };
 							}
@@ -1888,6 +2058,7 @@ function setupWebpackV5ProcessAssetsHook(options) {
 							const currentAssetLooksGenerated = hasTailwindGeneratedCss(currentRawSource) || hasTailwindGeneratedCssMarkers(currentRawSource);
 							const currentAssetHasBundlerGeneratedMarker = hasBundlerGeneratedCssMarker(currentRawSource);
 							const currentAssetUserCssSource = currentAssetLooksGenerated ? removeWebpackTailwindGeneratedAssetCss(currentRawSource) : currentRawSource;
+							if (sourceFile === void 0 && currentAssetHasBundlerGeneratedMarker && (currentAssetUserCssSource.trim().length === 0 || isCommentOnlyCss(currentAssetUserCssSource))) return { result: new ConcatSource(finalizeTracedCss("", cssHandlerOptions)) };
 							const currentAssetHasAdditionalUserCss = currentAssetLooksGenerated && (hasAdditionalWebpackAssetUserCssMarkers(currentAssetUserCssSource, generatorRawSource) || currentAssetUserCssSource.trim().length > 0);
 							const shouldPreserveGeneratedWebAssetUserCss = isWebGeneratorTarget && currentAssetLooksGenerated && !currentAssetHasBundlerGeneratedMarker && !currentAssetHasAdditionalUserCss;
 							const hasExplicitSourceCssForCurrentAsset = sourceCss !== void 0 && (hasTailwindRootDirectives(sourceCss, { importFallback: true }) || hasTailwindSourceDirectives(sourceCss, { importFallback: true }) || hasTailwindApplyDirective(sourceCss));
@@ -1912,9 +2083,12 @@ function setupWebpackV5ProcessAssetsHook(options) {
 							const currentAssetHasTailwindDirectives = hasTailwindRootDirectives(generatorRawSource, { importFallback: true }) || hasTailwindSourceDirectives(generatorRawSource, { importFallback: true }) || hasTailwindApplyDirective(generatorRawSource);
 							const shouldForceTailwindV4Generation = hasConfiguredTailwindV4SourceRoots() && (configuredMainCssEntryFiles.length > 0 && sourceFile !== void 0 || currentAssetHasTailwindDirectives || hasExplicitTailwindV4SourceCss);
 							const shouldSkipUnmatchedMainCssGeneration = !isWebGeneratorTarget && cssHandlerOptions.isMainChunk && sourceFile === void 0 && configuredMainCssEntryFiles.length > 0 && !currentAssetHasTailwindDirectives;
+							const shouldSkipPlainNonMainCssGeneration = !cssHandlerOptions.isMainChunk && sourceCss !== void 0 && !hasExplicitSourceCssForCurrentAsset && !hasExplicitTailwindV4SourceCss && !currentAssetHasTailwindDirectives;
+							const shouldMergeFallbackGeneratorRuntime = cssHandlerOptions.isMainChunk || currentAssetHasTailwindDirectives || hasExplicitSourceCssForCurrentAsset;
+							const scopedFallbackGeneratorRuntimeSet = hasExplicitTailwindV4SourceCss || !shouldMergeFallbackGeneratorRuntime ? /* @__PURE__ */ new Set() : fallbackGeneratorRuntimeSet;
 							const resolvedScopedGeneratorRuntimeSet = await createScopedGeneratorRuntime({
 								cssHandlerOptions,
-								fallbackRuntime: hasExplicitTailwindV4SourceCss ? /* @__PURE__ */ new Set() : fallbackGeneratorRuntimeSet,
+								fallbackRuntime: scopedFallbackGeneratorRuntimeSet,
 								getSourceCandidatesForEntries: webpackSourceCandidates?.getSourceCandidatesForEntries,
 								majorVersion: runtimeState.tailwindRuntime.majorVersion,
 								outputFile: file,
@@ -1923,7 +2097,7 @@ function setupWebpackV5ProcessAssetsHook(options) {
 								sourceFile: sourceFile ?? file,
 								scopedSourceCandidateGetter: webpackSourceCandidates?.getSourceCandidatesForEntries
 							});
-							const scopedGeneratorRuntimeSet = !hasExplicitTailwindV4SourceCss && resolvedScopedGeneratorRuntimeSet !== fallbackGeneratorRuntimeSet ? /* @__PURE__ */ new Set([...fallbackGeneratorRuntimeSet, ...resolvedScopedGeneratorRuntimeSet]) : resolvedScopedGeneratorRuntimeSet;
+							const scopedGeneratorRuntimeSet = !hasExplicitTailwindV4SourceCss && resolvedScopedGeneratorRuntimeSet !== scopedFallbackGeneratorRuntimeSet && shouldMergeFallbackGeneratorRuntime ? /* @__PURE__ */ new Set([...fallbackGeneratorRuntimeSet, ...resolvedScopedGeneratorRuntimeSet]) : resolvedScopedGeneratorRuntimeSet;
 							const generatorCssSources = normalizeWebpackGeneratorCssSources(cssHandlerOptions.sourceOptions?.cssSources);
 							const scopedGeneratorCompilerOptions = scopeWebpackGeneratorOptionsToCssSource(compilerOptions, sourceFile, { disableUnmatchedCssEntries: !isWebGeneratorTarget && cssHandlerOptions.isMainChunk });
 							const generatorCssHandlerOptions = generatorCssSources === void 0 ? cssHandlerOptions : {
@@ -1952,7 +2126,7 @@ function setupWebpackV5ProcessAssetsHook(options) {
 								debug
 							};
 							let generated;
-							if (!shouldSkipUnmatchedMainCssGeneration) try {
+							if (!shouldSkipUnmatchedMainCssGeneration && !shouldSkipPlainNonMainCssGeneration) try {
 								generated = await generateTailwindV4Css({
 									...generatorOptions,
 									outputFile: file
@@ -1966,7 +2140,7 @@ function setupWebpackV5ProcessAssetsHook(options) {
 								debug("css generator skipped for plain webpack css asset: %s %O", file, error);
 								generated = void 0;
 							}
-							else debug("css generator skipped for unmatched webpack main css asset: %s", file);
+							else debug("css generator skipped for plain webpack css asset: %s", file);
 							const finalizedGeneratedCss = generated ? finalizeCssAssetSource(isWebGeneratorTarget && currentRawSource.includes("tailwindcss v4.") ? createWebpackGeneratorUserCssSourceAppend({
 								css: generated.css,
 								processed: true
@@ -1975,7 +2149,8 @@ function setupWebpackV5ProcessAssetsHook(options) {
 								processed: true
 							})?.css ?? generated.css : generated.css, {
 								cssPreflight: cssHandlerOptions.isMainChunk,
-								generatedCss: true
+								generatedCss: true,
+								preserveExistingPreflight: shouldPreserveExistingPreflight
 							}) : isWebGeneratorTarget ? finalizeCssAssetSource(generatorRawSource, { generatedCss: false }) : finalizeCssAssetSource((await compilerOptions.styleHandler(generatorRawSource, cssHandlerOptions)).css, { generatedCss: false });
 							const sourceBareUserCss = isWebGeneratorTarget ? void 0 : createWebpackGeneratorUserCssSourceAppend(...[
 								userRawSource,
@@ -2005,7 +2180,7 @@ function setupWebpackV5ProcessAssetsHook(options) {
 							}, {
 								css: missingSourceBareUserCss,
 								processed: true
-							}).css, cssHandlerOptions));
+							}).css, cssHandlerOptions, { finalized: true }));
 							if (generated) {
 								for (const className of generated.classSet) generatorRuntimeSet.add(className);
 								debug("css handle via tailwind v%s engine(%s): %s", runtimeState.tailwindRuntime.majorVersion, generated.target, file);
@@ -2050,6 +2225,22 @@ function setupWebpackV5ProcessAssetsHook(options) {
 			}) });
 			compilerOptions.onEnd();
 		});
+		if (!isWebGeneratorTarget) compilation.hooks.processAssets.tapPromise({
+			name: `${pluginName}:finalize-css-assets`,
+			stage: Compilation.PROCESS_ASSETS_STAGE_OPTIMIZE_HASH
+		}, async (assets) => {
+			const entries = Object.entries(assets);
+			if (entries.length === 0) return;
+			const groupedEntries = getGroupedEntries(entries, compilerOptions);
+			if (groupedEntries.css.length === 0) return;
+			const { updateAssetIfChanged } = createWebpackAssetUpdater({
+				compilation,
+				ConcatSource,
+				onUpdate: compilerOptions.onUpdate,
+				debug
+			});
+			for (const [file, asset] of groupedEntries.css) updateAssetIfChanged(file, finalizeWebpackCssAssetOutputSource(stringifyWebpackSourceLike(compilation.getAsset(file)?.source.source() ?? asset.source()), compilerOptions, isWebGeneratorTarget));
+		});
 	});
 }
 //#endregion
@@ -2278,7 +2469,13 @@ function createDefaultLoaderAnchorFinders() {
 //#region src/bundlers/webpack/BaseUnifiedPlugin/v5-loaders.ts
 function setupWebpackV5Loaders(options) {
 	const { compiler, options: compilerOptions, appType, weappTailwindcssPackageDir, shouldRewriteCssImports, runtimeLoaderPath, registerAutoCssSource, runtimeState, getClassSetInLoader, getRuntimeSetInLoader, markWebpackProcessedCssSource, markWebpackCssSourceModule, registerWebpackGeneratedCss, registerWebpackCssSourceFile, getRuntimeWatchDependencies, loaderAnchorFinders = createDefaultLoaderAnchorFinders(), mpxCssImportRewrite = false, runtimeRegistryKey = `weapp-tailwindcss-${Date.now()}-${Math.random().toString(36).slice(2)}`, debug } = options;
-	const generatorTarget = compilerOptions.generator?.target ?? inferGeneratorTargetFromEnv();
+	const generatorOptions = normalizeWeappTailwindcssGeneratorOptions(compilerOptions.generator, {
+		appType: compilerOptions.appType,
+		platform: compilerOptions.cssOptions?.platform ?? compilerOptions.platform,
+		tailwindcssMajorVersion: runtimeState.tailwindRuntime.majorVersion,
+		uniAppX: compilerOptions.uniAppX
+	});
+	const generatorTarget = generatorOptions.target;
 	const generatorBranch = resolveRuntimeBranch({
 		appType: compilerOptions.appType,
 		generatorTarget,
@@ -2289,7 +2486,7 @@ function setupWebpackV5Loaders(options) {
 	if (shouldRewriteCssImports && mpxCssImportRewrite) ensureMpxTailwindcssAliases(compiler, weappTailwindcssPackageDir);
 	const runtimeClassSetLoader = runtimeLoaderPath ?? path.resolve(__dirname, "./weapp-tw-runtime-classset-loader.js");
 	const shouldInjectRuntimeClassSetLoader = !generatorBranch.isWeb;
-	const shouldInjectCssImportRewriteLoader = shouldRewriteCssImports || !generatorBranch.isWeb || runtimeState.tailwindRuntime.majorVersion === 4;
+	const shouldInjectCssImportRewriteLoader = shouldRewriteCssImports || generatorOptions.enabled && (!generatorBranch.isWeb || runtimeState.tailwindRuntime.majorVersion === 4);
 	const runtimeCssImportRewriteLoader = shouldInjectCssImportRewriteLoader ? path.resolve(__dirname, "./weapp-tw-css-import-rewrite-loader.js") : void 0;
 	const runtimeClassSetLoaderExists = fs.existsSync(runtimeClassSetLoader);
 	const runtimeCssImportRewriteLoaderExists = runtimeCssImportRewriteLoader ? fs.existsSync(runtimeCssImportRewriteLoader) : false;