weapp-tailwindcss 5.1.5 → 5.1.7

package/dist/{webpack-DBhmJ-_P.mjs → webpack-eN8WzIT-.mjs}

@@ -1,10 +1,10 @@
-import { C as hasTailwindRootDirectives, F as hasTailwindGeneratedCssMarkers, G as getTailwindV4IncrementalGenerateCacheStats, O as parseImportRequest, P as hasTailwindGeneratedCss, T as normalizeTailwindConfigDirectives, _ as resolveTailwindcssOptions, k as removeTailwindSourceDirectives, lt as inferGeneratorTargetFromEnv, nt as resolveSourceScanPath, o as hasConfiguredTailwindV4CssRoots, s as upsertTailwindV4CssSource, w as hasTailwindSourceDirectives, x as hasTailwindApplyDirective } from "./v4-engine-BuuYDXt1.mjs";
-import { o as resolveRuntimeBranch } from "./generator-24-HgU9F.mjs";
+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-CYSrDVNp.mjs";
+import { o as resolveRuntimeBranch } from "./generator-BOt2Tvx3.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-rrYZuUBU.mjs";
-import { l as getRuntimeClassSetSignature, p as resolveViteSourceScanEntries } from "./tailwindcss-C-uM4rB8.mjs";
-import { C as stripTailwindSourceMediaFragments, D as createCssSourceOrderAppend, E as removeGeneratedSelectorCompatCss, F as createCssTokenSourceMap, I as isCssSourceTraceEnabled, L as processCachedTask, M as stripMiniProgramCssSpecificityPlaceholders, N as annotateCssSourceTrace, O as hasMiniProgramTailwindV4PreflightReset, P as createCssSourceTraceCacheSignature, S as removeTailwindV4GeneratorAtRules, T as scoreTailwindV4CssSourceFileMatch, _ as isPureLocalCssImportWrapper, a as isSourceCandidateRequest, b as removeMiniProgramHoverSelectors, c as collectStrictEscapedRuntimeCandidates, f as pushConcurrentTaskFactories, i as createSourceCandidateStore, j as pruneMiniProgramGeneratedCss, k as finalizeMiniProgramCss, l as createEscapeFragments, n as emitHmrTiming, o as resolveSourceCandidateScanFiles, p as resolveTaskConcurrency, s as createBundleRuntimeClassSetManager, w as stripUnmatchedTailwindSourceMediaCloseFragments, x as removeTailwindV4GeneratedUserCssArtifacts } from "./hmr-timing-Dh_nn3w5.mjs";
-import { A as isSourceStyleRequest, C as resolvePluginDisabledState, I as createBuiltinWebpackStyleInjectorPlugin, N as resolveOutputSpecifier, P as toAbsoluteOutputPath, S as resolvePackageDir, _ as generateTailwindV4Css, d as classifyBundleEntry, f as createBundleBuildState, i as createCandidateSignature, j as stripRequestQuery, m as createRuntimeAffectingSourceSignature, p as updateBundleBuildState, r as createScopedGeneratorRuntime, t as createSourceCandidateScanSignature, x as stripBundlerGeneratedCssMarkers, y as hasBundlerGeneratedCssMarker } from "./source-candidate-scan-signature-DATRnS1X.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-BqeDu1Ha.mjs";
+import { g as resolveTailwindV4EntriesFromCssCached, l as getRuntimeClassSetSignature, p as resolveViteSourceScanEntries } from "./tailwindcss-DDGD90w7.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-CYwVMRol.mjs";
+import { A as isSourceStyleRequest, C as resolvePluginDisabledState, I as createBuiltinWebpackStyleInjectorPlugin, N as resolveOutputSpecifier, P as toAbsoluteOutputPath, S as resolvePackageDir, _ as generateTailwindV4Css, d as classifyBundleEntry, f as createBundleBuildState, i as createCandidateSignature, j as stripRequestQuery, m as createRuntimeAffectingSourceSignature, p as updateBundleBuildState, r as createScopedGeneratorRuntime, t as createSourceCandidateScanSignature, x as stripBundlerGeneratedCssMarkers, y as hasBundlerGeneratedCssMarker } from "./source-candidate-scan-signature-D97ZEXcj.mjs";
 import Module, { createRequire } from "node:module";
 import fs from "node:fs";
 import path from "node:path";
@@ -390,6 +390,11 @@ function resolveWebpackGeneratorRawSource(rawSource, cssHandlerOptions) {
 	if (sourceCss && (hasTailwindRootDirectives(sourceCss, { importFallback: true }) || hasTailwindSourceDirectives(sourceCss, { importFallback: true }) || hasTailwindApplyDirective(sourceCss) || hasTailwindGeneratedCss(sourceCss) || hasTailwindGeneratedCssMarkers(sourceCss))) return sourceCss;
 	return rawSource;
 }
+function shouldConsumeWebpackLoaderGeneratedCss(options) {
+	if (!options.shouldRegenerateExplicitTailwindV4CssSource) return true;
+	if (options.watchMode === true && options.loaderGeneratedClassSet && options.sourceCandidates && hasMissingRuntimeCandidates(options.loaderGeneratedClassSet, options.sourceCandidates)) return false;
+	return options.hasBundlerGeneratedCssMarker;
+}
 function hasUsableWebpackGeneratorCssSources(cssSources) {
 	return Array.isArray(cssSources) && cssSources.some((source) => typeof source?.css === "string" && source.css.length > 0);
 }
@@ -441,7 +446,8 @@ function hasProcessedCssAssetUrl(css) {
 	return /url\(\s*["']?data:/i.test(css);
 }
 function shouldUseWebpackAssetAsGeneratorUserCss(rawSource, generatorRawSource, options = {}) {
-	return rawSource !== generatorRawSource && (options.processed === true || !rawSource.includes("data:")) && !hasTailwindRootDirectives(rawSource, { importFallback: true }) && !hasTailwindSourceDirectives(rawSource, { importFallback: true }) && !hasTailwindApplyDirective(rawSource) && /(?:^|[^\w-])\.[_a-z\u00A0-\uFFFF\\-]/i.test(rawSource) && (!hasTailwindGeneratedCssMarkers(rawSource) || hasAdditionalWebpackAssetUserCssMarkers(rawSource, generatorRawSource));
+	const rawMarkers = collectWebpackAssetUserCssMarkers(rawSource);
+	return rawSource !== generatorRawSource && (options.processed === true || !rawSource.includes("data:")) && !hasTailwindRootDirectives(rawSource, { importFallback: true }) && !hasTailwindSourceDirectives(rawSource, { importFallback: true }) && !hasTailwindApplyDirective(rawSource) && rawMarkers.size > 0 && !isOnlyWebpackTailwindGeneratedPreflightCss(rawSource) && (!hasTailwindGeneratedCssMarkers(rawSource) || hasAdditionalWebpackAssetUserCssMarkers(rawSource, generatorRawSource));
 }
 function collectWebpackAssetUserCssMarkers(source) {
 	const markers = /* @__PURE__ */ new Set();
@@ -463,6 +469,44 @@ function collectWebpackAssetUserCssMarkers(source) {
 	} catch {}
 	return markers;
 }
+function hasWebpackClassSelector(selector) {
+	return /(?:^|[^\w-])\.[_a-z\u00A0-\uFFFF\\-]/i.test(selector);
+}
+function isWebpackKeyframesRule(rule) {
+	let parent = rule.parent;
+	while (parent) {
+		if (parent.type === "atrule" && parent.name.endsWith("keyframes")) return true;
+		parent = parent.parent;
+	}
+	return false;
+}
+function collectWebpackBareSelectorUserCss(source) {
+	try {
+		const root = postcss.parse(removeTailwindSourceDirectives(stripTailwindSourceMediaFragments(removeTailwindV4GeneratorAtRules(source)), { importFallback: true }));
+		let changed = false;
+		root.walkAtRules((rule) => {
+			if (rule.name === "import" || rule.name === "font-face" || rule.name.endsWith("keyframes")) {
+				rule.remove();
+				changed = true;
+			}
+		});
+		root.walkRules((rule) => {
+			if (isWebpackKeyframesRule(rule) || rule.selectors.some((selector) => hasWebpackClassSelector(selector))) {
+				rule.remove();
+				changed = true;
+			}
+		});
+		root.walkAtRules((rule) => {
+			if (rule.nodes !== void 0 && rule.nodes.length === 0) {
+				rule.remove();
+				changed = true;
+			}
+		});
+		return changed ? root.toString() : source;
+	} catch {
+		return "";
+	}
+}
 const WEBPACK_TAILWIND_GENERATED_LAYER_NAMES = /* @__PURE__ */ new Set([
 	"theme",
 	"base",
@@ -471,6 +515,26 @@ const WEBPACK_TAILWIND_GENERATED_LAYER_NAMES = /* @__PURE__ */ new Set([
 const WEBPACK_TAILWIND_UTILITY_RULE_MARKER_RE = /(?:^|[^\w-])\.[^,{]{0,512}(?:\\:|\\\[|\\#)/;
 const WEBPACK_TAILWIND_UTILITY_PREFIX_RE = /^\.(?:-?(?:bg|text|border|ring|shadow|drop-shadow|[pmwhz]|px|py|pt|pr|pb|pl|mx|my|mt|mr|mb|ml|min-w|min-h|max-w|max-h|flex|grid|inline|block|hidden|rounded|opacity|translate|scale|rotate|skew|top|right|bottom|left|inset|gap|font|leading|tracking|underline|container)(?:[\-\\{]|$)|\\\[)/;
 const WEBPACK_TAILWIND_BANNER_RE = /tailwindcss v4\./;
+const WEBPACK_TAILWIND_PREFLIGHT_SELECTORS = /* @__PURE__ */ new Set([
+	"*",
+	":after",
+	":before",
+	"::after",
+	"::before",
+	"::backdrop",
+	"view",
+	"text"
+]);
+const WEBPACK_TAILWIND_PREFLIGHT_PROPS = /* @__PURE__ */ new Set([
+	"box-sizing",
+	"border",
+	"border-width",
+	"border-style",
+	"border-color",
+	"margin",
+	"padding"
+]);
+const WEBPACK_TAILWIND_THEME_TOKEN_RE = /^--(?:tw-|color-|spacing|breakpoint-|container-|text-|font-|tracking-|leading-|radius-|shadow-|inset-shadow-|drop-shadow-|ease-|animate-|blur-|perspective-|aspect-|default-)/;
 function parseWebpackCssLayerNames(params) {
 	return params.split(",").map((name) => name.trim()).filter(Boolean);
 }
@@ -506,18 +570,21 @@ function removeWebpackTailwindGeneratedAssetCss(source) {
 				return;
 			}
 			if (shouldRemoveLayer && !names.includes("utilities")) {
-				rule.remove();
-				changed = true;
+				for (const child of [...rule.nodes ?? []]) if (isWebpackTailwindGeneratedLayerNode(child, names)) {
+					child.remove();
+					changed = true;
+				}
+				if (rule.nodes?.length === 0) {
+					rule.remove();
+					changed = true;
+				}
 				return;
 			}
 			if (shouldRemoveLayer) {
-				rule.walkRules((nestedRule) => {
-					const selector = nestedRule.selector.trim();
-					if (WEBPACK_TAILWIND_UTILITY_RULE_MARKER_RE.test(selector) || WEBPACK_TAILWIND_UTILITY_PREFIX_RE.test(selector)) {
-						nestedRule.remove();
-						changed = true;
-					}
-				});
+				for (const child of [...rule.nodes ?? []]) if (isWebpackTailwindGeneratedLayerNode(child, names)) {
+					child.remove();
+					changed = true;
+				}
 				if (rule.nodes?.length === 0) {
 					rule.remove();
 					changed = true;
@@ -527,7 +594,7 @@ function removeWebpackTailwindGeneratedAssetCss(source) {
 		root.walkRules((rule) => {
 			if (rule.parent?.type === "atrule" && rule.parent.name === "layer") return;
 			const selector = rule.selector.trim();
-			if (WEBPACK_TAILWIND_UTILITY_RULE_MARKER_RE.test(selector)) {
+			if (WEBPACK_TAILWIND_UTILITY_RULE_MARKER_RE.test(selector) || isWebpackTailwindGeneratedPreflightRule(rule)) {
 				rule.remove();
 				changed = true;
 			}
@@ -550,14 +617,59 @@ function removeWebpackTailwindGeneratedAssetCss(source) {
 	}
 }
 function isWebpackTailwindGeneratedPrefixNode(node) {
-	if (node.type === "rule") return node.selectors.every((selector) => isWebpackTailwindGeneratedUtilitySelector(selector.trim(), true));
+	if (node.type === "rule") return isWebpackTailwindGeneratedRule(node, [
+		"theme",
+		"base",
+		"utilities"
+	], true);
 	if (node.type !== "atrule") return false;
 	const names = node.name === "layer" ? parseWebpackCssLayerNames(node.params) : [];
 	if (node.name === "property" && node.params.trim().startsWith("--tw-")) return true;
-	if (names.length > 0 && names.every((name) => WEBPACK_TAILWIND_GENERATED_LAYER_NAMES.has(name))) return true;
+	if (names.length > 0 && names.every((name) => WEBPACK_TAILWIND_GENERATED_LAYER_NAMES.has(name))) {
+		if (node.nodes === void 0) return true;
+		return node.nodes.length > 0 && node.nodes.every((child) => isWebpackTailwindGeneratedLayerNode(child, names));
+	}
 	if (node.nodes === void 0 || node.nodes.length === 0) return false;
 	return node.nodes.every((child) => isWebpackTailwindGeneratedPrefixNode(child));
 }
+function isWebpackTailwindGeneratedLayerNode(node, layerNames) {
+	if (node.type === "rule") return isWebpackTailwindGeneratedRule(node, layerNames, false);
+	if (node.type !== "atrule") return false;
+	if (node.name === "property" && node.params.trim().startsWith("--tw-")) return true;
+	if (node.nodes === void 0 || node.nodes.length === 0) return false;
+	return node.nodes.every((child) => isWebpackTailwindGeneratedLayerNode(child, layerNames));
+}
+function isWebpackTailwindGeneratedRule(rule, layerNames, includePrefix) {
+	const selectors = rule.selectors ?? [rule.selector];
+	if (selectors.every((selector) => isWebpackTailwindGeneratedUtilitySelector(selector.trim(), includePrefix))) return true;
+	if (selectors.every((selector) => isWebpackTailwindGeneratedUtilitySelector(selector.trim(), true))) return true;
+	if (layerNames.includes("theme") && isWebpackTailwindGeneratedThemeRule(rule)) return true;
+	if (layerNames.includes("base") && isWebpackTailwindGeneratedPreflightRule(rule)) return true;
+	return false;
+}
+function isWebpackTailwindGeneratedThemeRule(rule) {
+	const declarations = (rule.nodes ?? []).filter((node) => node.type === "decl");
+	return declarations.length > 0 && declarations.every((decl) => WEBPACK_TAILWIND_THEME_TOKEN_RE.test(decl.prop) || decl.value.includes("--theme("));
+}
+function isWebpackTailwindGeneratedPreflightRule(rule) {
+	const selectors = rule.selectors ?? [rule.selector];
+	const declarations = (rule.nodes ?? []).filter((node) => node.type === "decl");
+	return selectors.length > 0 && declarations.length > 0 && selectors.every((selector) => {
+		const normalized = selector.trim().replace(/\s+/g, " ");
+		return WEBPACK_TAILWIND_PREFLIGHT_SELECTORS.has(normalized);
+	}) && declarations.every((decl) => WEBPACK_TAILWIND_PREFLIGHT_PROPS.has(decl.prop));
+}
+function isOnlyWebpackTailwindGeneratedPreflightCss(source) {
+	try {
+		const nodes = postcss.parse(source).nodes ?? [];
+		return nodes.length > 0 && nodes.every((node) => {
+			if (node.type === "rule") return isWebpackTailwindGeneratedPreflightRule(node);
+			return node.type === "atrule" && (node.nodes === void 0 || node.nodes.length === 0);
+		});
+	} catch {
+		return false;
+	}
+}
 function isWebpackTailwindGeneratedUtilitySelector(selector, includePrefix) {
 	return WEBPACK_TAILWIND_UTILITY_RULE_MARKER_RE.test(selector) || includePrefix && WEBPACK_TAILWIND_UTILITY_PREFIX_RE.test(selector);
 }
@@ -822,13 +934,12 @@ function finalizeWebpackCssAssetSource(source, compilerOptions, isWebGeneratorTa
 	if (options.generatedCss !== true) return stripMiniProgramCssSpecificityPlaceholders(removeMiniProgramHoverSelectors(finalized, styleOptions.cssRemoveHoverPseudoClass));
 	try {
 		finalized = pruneMiniProgramGeneratedCss(finalized, { preservePreflight: options.cssPreflight !== false });
-	} catch {
-		finalized = finalizeMiniProgramCss(finalized, {
-			cssPreflight: options.cssPreflight === false ? false : !hasMiniProgramTailwindV4PreflightReset(finalized) ? compilerOptions.cssPreflight : void 0,
-			isTailwindcssV4: true,
-			tailwindcssV4GradientFallback: styleOptions.tailwindcssV4GradientFallback
-		});
-	}
+	} catch {}
+	finalized = finalizeMiniProgramCss(finalized, {
+		cssPreflight: options.cssPreflight === false ? false : !hasMiniProgramTailwindV4PreflightReset(finalized) ? compilerOptions.cssPreflight : void 0,
+		isTailwindcssV4: true,
+		tailwindcssV4GradientFallback: styleOptions.tailwindcssV4GradientFallback
+	});
 	return stripMiniProgramCssSpecificityPlaceholders(removeMiniProgramHoverSelectors(finalized, styleOptions.cssRemoveHoverPseudoClass));
 }
 function collectWebpackJsRuntimeCandidatesFromAssets(options) {
@@ -870,6 +981,26 @@ function stringifyWebpackSourceLike(source) {
 }
 //#endregion
 //#region src/bundlers/webpack/BaseUnifiedPlugin/v5-assets/css-source-resolvers.ts
+function normalizeWebpackCssSourceRef(file) {
+	return file.replaceAll("\\", "/");
+}
+function collectWebpackCssTokenSourceRefs(source) {
+	const refs = /* @__PURE__ */ new Set();
+	for (const line of source.split("\n")) {
+		if (!line.includes("/* tokens:") || !line.includes("<=")) continue;
+		const traceStart = line.indexOf("<=");
+		const traceEnd = line.indexOf("*/", traceStart);
+		const trace = line.slice(traceStart + 2, traceEnd >= 0 ? traceEnd : void 0);
+		for (const segment of trace.split("|")) {
+			const sourceList = segment.replace(/^[^<]*<=\s*/, "").split(",");
+			for (const ref of sourceList) {
+				const normalizedRef = ref.trim();
+				if (normalizedRef) refs.add(normalizeWebpackCssSourceRef(normalizedRef));
+			}
+		}
+	}
+	return refs;
+}
 function createWebpackCssSourceResolvers(options) {
 	const { activeWebpackAssetResourceFiles, appType, compilerOptions, compilation, cssAssetResources, cssHandlerOptionsCache, cssSources, cssUserHandlerOptionsCache, groupedCssEntriesLength, singleCssAssetFile, isWebGeneratorTarget, outputDir, runtimeState } = options;
 	const hasConfiguredTailwindV4SourceRoots = () => {
@@ -937,6 +1068,19 @@ function createWebpackCssSourceResolvers(options) {
 			return activeAssetResource;
 		}
 		if (rawSource) {
+			const tokenSourceRefs = collectWebpackCssTokenSourceRefs(rawSource);
+			if (tokenSourceRefs.size > 0) {
+				const tokenSourceMatches = [...cssSources.keys()].filter((sourceFile) => {
+					const relativeSourceFile = normalizeWebpackCssSourceRef(path.relative(compilerOptions.tailwindcssBasedir, sourceFile));
+					const absoluteSourceFile = normalizeWebpackCssSourceRef(path.resolve(sourceFile));
+					return tokenSourceRefs.has(relativeSourceFile) || tokenSourceRefs.has(absoluteSourceFile);
+				}).sort();
+				if (tokenSourceMatches.length === 1) {
+					const sourceFile = tokenSourceMatches[0];
+					activeWebpackCssSourceFiles.add(sourceFile);
+					return sourceFile;
+				}
+			}
 			const representedTailwindSourceMatches = [...cssSources.entries()].filter(([, source]) => isWebpackCssSourceRepresentedInAsset(rawSource, source.css)).map(([sourceFile]) => ({
 				sourceFile,
 				score: scoreTailwindV4CssSourceFileMatch(file, sourceFile, {
@@ -1697,7 +1841,7 @@ function setupWebpackV5ProcessAssetsHook(options) {
 					return rawSource;
 				};
 				const chunkHash = assetHashByChunk.get(file);
-				const cssHandlerOptionsForProcessedAsset = getCssHandlerOptions(file);
+				const cssHandlerOptionsForProcessedAsset = getCssHandlerOptions(file, readRawSource());
 				const processedCssAssetMetadata = { isMainCssChunk: cssHandlerOptionsForProcessedAsset.isMainChunk };
 				const processedSourceFile = cssHandlerOptionsForProcessedAsset.sourceOptions?.sourceFile;
 				const processedSourceCss = processedSourceFile ? cssSources.get(path.resolve(processedSourceFile))?.css : void 0;
@@ -1732,9 +1876,10 @@ function setupWebpackV5ProcessAssetsHook(options) {
 					...source,
 					file: sourceFile
 				})), readCurrentProcessedRawSource()) !== void 0;
+				const hasProcessedLoaderGeneratedUserCss = cachedSkipProcessedCssAsset === void 0 && processedLoaderGeneratedCss !== void 0 && hasAdditionalWebpackAssetUserCssMarkers(processedLoaderGeneratedCss.css, readCurrentProcessedRawSource());
 				const shouldFinalizeProcessedWebCssAsset = isWebGeneratorTarget && !shouldForceConfiguredMainCssGeneration && !shouldRegenerateProcessedTailwindV4SourceCss && hasTailwindSourceDirectives(readCurrentProcessedRawSource(), { importFallback: true });
 				const shouldPreserveFinalWebCssAsset = isWebGeneratorTarget && processedSourceFile === void 0 && !shouldForceConfiguredMainCssGeneration && (hasGeneratedCssMarker || hasTailwindGeneratedAssetCss);
-				const shouldSkipKnownProcessedCssAsset = !shouldForceConfiguredMainCssGeneration && !shouldRegenerateProcessedTailwindV4SourceCss && !shouldRegenerateStaleProcessedWebCssAsset && (processedCssAssetKnown || isWebpackProcessedCssAsset?.(file, readCurrentProcessedRawSource(), processedCssAssetMetadata)) && !hasProcessedMainAssetUserCss && (!cssHandlerOptionsForProcessedAsset.isMainChunk || hasGeneratedCssMarker || hasTailwindGeneratedAssetCss);
+				const shouldSkipKnownProcessedCssAsset = !shouldForceConfiguredMainCssGeneration && !shouldRegenerateProcessedTailwindV4SourceCss && !shouldRegenerateStaleProcessedWebCssAsset && (processedCssAssetKnown || isWebpackProcessedCssAsset?.(file, readCurrentProcessedRawSource(), processedCssAssetMetadata)) && !hasProcessedMainAssetUserCss && !hasProcessedLoaderGeneratedUserCss && (!cssHandlerOptionsForProcessedAsset.isMainChunk || hasGeneratedCssMarker || hasTailwindGeneratedAssetCss);
 				const shouldSkipProcessedCssAsset = cachedSkipProcessedCssAsset ?? (shouldFinalizeProcessedWebCssAsset || shouldPreserveFinalWebCssAsset || shouldSkipKnownProcessedCssAsset);
 				if (processedCssAssetKnown && cachedSkipProcessedCssAsset === void 0 && !shouldFinalizeProcessedWebCssAsset && !shouldPreserveFinalWebCssAsset) processedCssAssetSkipDecisionCache.set(processedCssDecisionCacheKey, shouldSkipProcessedCssAsset === true);
 				if (shouldSkipProcessedCssAsset) {
@@ -1759,12 +1904,29 @@ function setupWebpackV5ProcessAssetsHook(options) {
 							},
 							transform: async () => {
 								const source = readCurrentProcessedRawSource();
+								const processedBareSelectorSourceCss = processedSourceCss ?? (hasTailwindGeneratedAssetCss ? removeWebpackTailwindGeneratedAssetCss(source) : void 0);
 								const nextCss = stripTrailingLineWhitespace(finalizeCssAssetSource(hasTailwindGeneratedAssetCss && !hasGeneratedCssMarker ? isWebGeneratorTarget ? source : (await compilerOptions.styleHandler(source, cssHandlerOptionsForProcessedAsset)).css : source, {
 									cssPreflight: cssHandlerOptionsForProcessedAsset.isMainChunk,
 									generatedCss: hasGeneratedCssMarker || hasTailwindGeneratedAssetCss
 								}));
+								const processedSourceBareUserCss = isWebGeneratorTarget || processedBareSelectorSourceCss === void 0 ? void 0 : createWebpackGeneratorUserCssSourceAppend({
+									css: collectWebpackBareSelectorUserCss(processedBareSelectorSourceCss),
+									processed: false
+								});
+								const finalizedProcessedSourceBareUserCss = processedSourceBareUserCss === void 0 ? "" : finalizeCssAssetSource(processedSourceBareUserCss.css, {
+									cssPreflight: false,
+									generatedCss: false
+								});
+								const missingProcessedSourceBareUserCss = finalizedProcessedSourceBareUserCss.trim().length === 0 ? "" : filterExistingCssRules(nextCss, finalizedProcessedSourceBareUserCss);
+								const css = missingProcessedSourceBareUserCss.trim().length === 0 ? nextCss : createWebpackGeneratorUserCssSourceAppend({
+									css: nextCss,
+									processed: true
+								}, {
+									css: missingProcessedSourceBareUserCss,
+									processed: true
+								}).css;
 								debug("css skip webpack-loader-pipeline asset: %s", file);
-								return { result: new ConcatSource(finalizeTracedCss(nextCss, cssHandlerOptionsForProcessedAsset)) };
+								return { result: new ConcatSource(finalizeTracedCss(css, cssHandlerOptionsForProcessedAsset)) };
 							}
 						});
 					}, cssTaskFactories);
@@ -1833,7 +1995,14 @@ function setupWebpackV5ProcessAssetsHook(options) {
 							const loaderGeneratedCss = sourceFile && !isWebGeneratorTarget ? generatedCssSources.get(path.resolve(sourceFile)) : void 0;
 							const sourceCss = sourceFile ? cssSources.get(path.resolve(sourceFile))?.css : void 0;
 							const shouldRegenerateExplicitTailwindV4CssSource = sourceCss !== void 0 && (hasTailwindSourceDirectives(sourceCss, { importFallback: true }) || sourceCss.includes("@config"));
-							if (loaderGeneratedCss && (!shouldRegenerateExplicitTailwindV4CssSource || hasBundlerGeneratedCssMarker(currentRawSource))) {
+							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({
+								hasBundlerGeneratedCssMarker: hasBundlerGeneratedCssMarker(currentRawSource),
+								loaderGeneratedClassSet: loaderGeneratedCss.classSet,
+								sourceCandidates: explicitTailwindV4SourceCandidates,
+								shouldRegenerateExplicitTailwindV4CssSource,
+								watchMode
+							})) {
 								for (const className of loaderGeneratedCss.classSet) {
 									generatorRuntimeSet.add(className);
 									transformRuntimeSet.add(className);
@@ -1842,16 +2011,49 @@ 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 css = finalizeTracedCss(finalizeCssAssetSource(currentAssetUserCss === void 0 ? loaderGeneratedCss.css : createWebpackGeneratorUserCssSourceAppend({
-									css: currentAssetHasProcessedUrl ? removeGeneratedSelectorCompatCss(loaderGeneratedCss.css, currentAssetUserCss) : filterExistingCssRules(currentAssetUserCss, loaderGeneratedCss.css),
+								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))) {
+									debug("css skip duplicate webpack loader main generation: %s <- %s", file, sourceFile);
+									return { result: new ConcatSource(finalizeTracedCss("", 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),
 									processed: true
-								}, {
+								}, currentAssetUserCss === void 0 ? void 0 : {
 									css: currentAssetUserCss,
 									processed: true
 								}).css, {
 									cssPreflight: cssHandlerOptions.isMainChunk,
 									generatedCss: true
-								}), cssHandlerOptions);
+								});
+								const loaderSourceBareUserCss = isWebGeneratorTarget ? void 0 : createWebpackGeneratorUserCssSourceAppend(...[currentAssetUserCss === void 0 ? void 0 : {
+									css: currentAssetUserCss,
+									processed: true
+								}, sourceCss === void 0 ? void 0 : {
+									css: sourceCss,
+									processed: false
+								}].map((source) => {
+									if (source === void 0) return;
+									return {
+										css: collectWebpackBareSelectorUserCss(source.css),
+										processed: source.processed
+									};
+								}));
+								const finalizedLoaderSourceBareUserCss = loaderSourceBareUserCss === void 0 ? "" : finalizeCssAssetSource(loaderSourceBareUserCss.css, {
+									cssPreflight: false,
+									generatedCss: false
+								});
+								const missingLoaderSourceBareUserCss = finalizedLoaderSourceBareUserCss.trim().length === 0 ? "" : filterExistingCssRules(finalizedLoaderCss, finalizedLoaderSourceBareUserCss);
+								const css = finalizeTracedCss(missingLoaderSourceBareUserCss.trim().length === 0 ? finalizedLoaderCss : createWebpackGeneratorUserCssSourceAppend({
+									css: finalizedLoaderCss,
+									processed: true
+								}, {
+									css: missingLoaderSourceBareUserCss,
+									processed: true
+								}).css, cssHandlerOptions);
 								debug("css consume webpack loader generation: %s <- %s", file, sourceFile);
 								return { result: new ConcatSource(css) };
 							}
@@ -1942,7 +2144,7 @@ function setupWebpackV5ProcessAssetsHook(options) {
 								generated = void 0;
 							}
 							else debug("css generator skipped for unmatched webpack main css asset: %s", file);
-							const source = new ConcatSource(finalizeTracedCss(generated ? finalizeCssAssetSource(isWebGeneratorTarget && currentRawSource.includes("tailwindcss v4.") ? createWebpackGeneratorUserCssSourceAppend({
+							const finalizedGeneratedCss = generated ? finalizeCssAssetSource(isWebGeneratorTarget && currentRawSource.includes("tailwindcss v4.") ? createWebpackGeneratorUserCssSourceAppend({
 								css: generated.css,
 								processed: true
 							}, {
@@ -1951,7 +2153,36 @@ function setupWebpackV5ProcessAssetsHook(options) {
 							})?.css ?? generated.css : generated.css, {
 								cssPreflight: cssHandlerOptions.isMainChunk,
 								generatedCss: true
-							}) : isWebGeneratorTarget ? finalizeCssAssetSource(generatorRawSource, { generatedCss: false }) : finalizeCssAssetSource((await compilerOptions.styleHandler(generatorRawSource, cssHandlerOptions)).css, { generatedCss: false }), cssHandlerOptions));
+							}) : isWebGeneratorTarget ? finalizeCssAssetSource(generatorRawSource, { generatedCss: false }) : finalizeCssAssetSource((await compilerOptions.styleHandler(generatorRawSource, cssHandlerOptions)).css, { generatedCss: false });
+							const sourceBareUserCss = isWebGeneratorTarget ? void 0 : createWebpackGeneratorUserCssSourceAppend(...[
+								userRawSource,
+								sourceCss === void 0 ? void 0 : {
+									css: sourceCss,
+									processed: sourceCssProcessed
+								},
+								{
+									css: generatorRawSource,
+									processed: false
+								}
+							].map((source) => {
+								if (source === void 0) return;
+								return {
+									css: collectWebpackBareSelectorUserCss(source.css),
+									processed: source.processed
+								};
+							}));
+							const finalizedSourceBareUserCss = sourceBareUserCss === void 0 ? "" : finalizeCssAssetSource(sourceBareUserCss.css, {
+								cssPreflight: false,
+								generatedCss: false
+							});
+							const missingSourceBareUserCss = finalizedSourceBareUserCss.trim().length === 0 ? "" : filterExistingCssRules(finalizedGeneratedCss, finalizedSourceBareUserCss);
+							const source = new ConcatSource(finalizeTracedCss(missingSourceBareUserCss.trim().length === 0 ? finalizedGeneratedCss : createWebpackGeneratorUserCssSourceAppend({
+								css: finalizedGeneratedCss,
+								processed: true
+							}, {
+								css: missingSourceBareUserCss,
+								processed: true
+							}).css, cssHandlerOptions));
 							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);
@@ -2157,6 +2388,13 @@ function setupWebpackV5Loaders(options) {
 const debug = createDebug();
 const weappTailwindcssPackageDir = resolvePackageDir("weapp-tailwindcss");
 const outputIgnoredPredicatePath = Symbol("weapp-tailwindcss.outputIgnoredPredicatePath");
+function shouldKeepPreviousWebpackCssSource(previous, next) {
+	if (next.processed === true && previous.processed === false) return true;
+	if (previous.processed === true || next.processed === true || !previous.css || !next.css || previous.css === next.css) return false;
+	const previousMarkers = collectWebpackAssetUserCssMarkers(previous.css);
+	const nextMarkers = collectWebpackAssetUserCssMarkers(next.css);
+	return previousMarkers.size > nextMarkers.size && [...nextMarkers].every((marker) => previousMarkers.has(marker));
+}
 function normalizeIgnoredList(ignored) {
 	return (Array.isArray(ignored) ? [...ignored] : [ignored]).filter((item) => typeof item === "string" || item instanceof RegExp || typeof item === "function");
 }
@@ -2334,14 +2572,15 @@ var WeappTailwindcss = class {
 		const registerWebpackCssSourceFile = (source) => {
 			const file = path.resolve(source.file);
 			const previous = webpackCssSources.get(file);
-			if (source.processed === true && previous?.processed === false) {
+			const next = {
+				css: typeof source.css === "string" ? normalizeTailwindConfigDirectives(source.css, path.dirname(file)) : source.css,
+				processed: source.processed
+			};
+			if (previous && shouldKeepPreviousWebpackCssSource(previous, next)) {
 				currentWebpackCssSourceFiles.add(file);
 				return;
 			}
-			webpackCssSources.set(file, {
-				css: typeof source.css === "string" ? normalizeTailwindConfigDirectives(source.css, path.dirname(file)) : source.css,
-				processed: source.processed
-			});
+			webpackCssSources.set(file, next);
 			currentWebpackCssSourceFiles.add(file);
 		};
 		const registerWebpackGeneratedCss = (source) => {

package/dist/webpack.js

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_webpack = require("./webpack-DN3tgLbF.js");
+const require_webpack = require("./webpack-BxBOMUtY.js");
 exports.WeappTailwindcss = require_webpack.WeappTailwindcss;
 exports.weappTailwindcss = require_webpack.WeappTailwindcss;
 exports.weappTailwindcssPackageDir = require_webpack.weappTailwindcssPackageDir;

package/dist/webpack.mjs

@@ -1,2 +1,2 @@
-import { n as weappTailwindcssPackageDir, t as WeappTailwindcss } from "./webpack-DBhmJ-_P.mjs";
+import { n as weappTailwindcssPackageDir, t as WeappTailwindcss } from "./webpack-eN8WzIT-.mjs";
 export { WeappTailwindcss, WeappTailwindcss as weappTailwindcss, weappTailwindcssPackageDir };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "weapp-tailwindcss",
-  "version": "5.1.5",
+  "version": "5.1.7",
   "description": "把 tailwindcss 原子化样式思想，带给小程序开发者们! bring tailwindcss to miniprogram developers!",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -204,11 +204,11 @@
     "semver": "~7.8.5",
     "yaml": "^2.9.0",
     "@weapp-tailwindcss/logger": "2.0.0",
-    "@weapp-tailwindcss/postcss": "3.1.5",
+    "@weapp-tailwindcss/postcss": "3.1.6",
     "@weapp-tailwindcss/reset": "0.1.1",
     "@weapp-tailwindcss/shared": "2.0.0",
     "tailwindcss-config": "2.0.1",
-    "weapp-style-injector": "1.0.0"
+    "weapp-style-injector": "1.0.1"
   },
   "devDependencies": {
     "htmlparser2": "12.0.0"