weapp-tailwindcss 5.1.13 → 5.1.15

package/dist/{webpack-CTYm19zA.mjs → webpack-C_UUFRgj.mjs}

@@ -1,16 +1,16 @@
-import { B as stripUnmatchedTailwindSourceMediaCloseFragments, E as resolveTailwindcssOptions, F as removeTailwindV4GeneratedUserCssArtifacts, H as finalizeMiniProgramCss, I as removeTailwindV4GeneratorAtRules, J as hasTailwindApplyDirective, K as stripMiniProgramCssSpecificityPlaceholders, M as isCommentOnlyCss, P as removeMiniProgramHoverSelectors, Q as normalizeTailwindConfigDirectives, W as pruneMiniProgramGeneratedCss, X as hasTailwindRootDirectives, Z as hasTailwindSourceDirectives, ct as hasTailwindGeneratedCssMarkers, g as upsertTailwindV4CssSource, h as hasConfiguredTailwindV4CssRoots, i as normalizeWeappTailwindcssGeneratorOptions, kt as resolveSourceScanPath, nt as removeTailwindSourceDirectives, o as resolveRuntimeBranch, st as hasTailwindGeneratedCss, tt as parseImportRequest, vt as getTailwindV4IncrementalGenerateCacheStats, z as stripTailwindSourceMediaFragments } from "./generator-BvPcmqxU.mjs";
-import { g as resolveTailwindV4EntriesFromCssCached, l as getRuntimeClassSetSignature, p as resolveViteSourceScanEntries } from "./tailwindcss-DZT_pWrd.mjs";
+import { B as stripUnmatchedTailwindSourceMediaCloseFragments, E as resolveTailwindcssOptions, F as removeTailwindV4GeneratedUserCssArtifacts, H as finalizeMiniProgramCss, I as removeTailwindV4GeneratorAtRules, J as hasTailwindApplyDirective, K as stripMiniProgramCssSpecificityPlaceholders, M as isCommentOnlyCss, P as removeMiniProgramHoverSelectors, Q as normalizeTailwindConfigDirectives, W as pruneMiniProgramGeneratedCss, X as hasTailwindRootDirectives, Z as hasTailwindSourceDirectives, ct as hasTailwindGeneratedCssMarkers, g as upsertTailwindV4CssSource, h as hasConfiguredTailwindV4CssRoots, i as normalizeWeappTailwindcssGeneratorOptions, kt as resolveSourceScanPath, nt as removeTailwindSourceDirectives, o as resolveRuntimeBranch, st as hasTailwindGeneratedCss, tt as parseImportRequest, vt as getTailwindV4IncrementalGenerateCacheStats, z as stripTailwindSourceMediaFragments } from "./generator-CEo920So.mjs";
+import { g as resolveTailwindV4EntriesFromCssCached, l as getRuntimeClassSetSignature, p as resolveViteSourceScanEntries } from "./tailwindcss-xs704TRw.mjs";
 import { r as getGroupedEntries } from "./utils-MVwpU07P.mjs";
 import { b as md5Hash, c as _defineProperty, y as createDebug } from "./wxml-DdGdeqaH.mjs";
-import { d as refreshTailwindRuntimeState, i as pluginName, l as createTailwindRuntimeReadyPromise, n as normalizeStyleHandlerMajorVersion, o as shouldSkipJsTransform, r as resolveStyleOptionsFromContext, t as getCompilerContext, u as ensureRuntimeClassSet } from "./context-xSJE588m.mjs";
+import { d as refreshTailwindRuntimeState, i as pluginName, l as createTailwindRuntimeReadyPromise, n as normalizeStyleHandlerMajorVersion, o as shouldSkipJsTransform, r as resolveStyleOptionsFromContext, t as getCompilerContext, u as ensureRuntimeClassSet } from "./context-BgGWVAmN.mjs";
 import { getDefaultCssPreflight } from "./defaults.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-hRhRAjYV.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-t4XKAQ04.mjs";
+import { A as collectRawSourceClassSelectors, C as scoreTailwindV4CssSourceFileMatch, D as hasMiniProgramTailwindV4PreflightReset, F as annotateCssSourceTrace, I as createCssSourceTraceCacheSignature, L as createCssTokenSourceMap, M as hasBundlerGeneratedCssMarker, O as isSourceStyleRequest, P as stripBundlerGeneratedCssMarkers, R as isCssSourceTraceEnabled, T as createCssSourceOrderAppend, a as isSourceCandidateRequest, b as isPureLocalCssImportWrapper, c as createBundleRuntimeClassSetManager, i as createSourceCandidateStore, k as stripRequestQuery, l as collectStrictEscapedRuntimeCandidates, m as resolveTaskConcurrency, n as emitHmrTiming, o as resolveSourceCandidateScanFiles, p as pushConcurrentTaskFactories, u as createEscapeFragments, w as removeGeneratedSelectorCompatCss, z as processCachedTask } from "./hmr-timing-1aS6--U7.mjs";
+import { D as toAbsoluteOutputPath, E as resolveOutputSpecifier, F as resolveWebpackFrameworkProfile, N as webpackStyleInjectorDelegates, O as resolvePackageDir, a as createCandidateSignature, f as classifyBundleEntry, j as createBuiltinWebpackStyleInjectorPlugin, k as resolvePluginDisabledState, m as updateBundleBuildState, p as createBundleBuildState, r as createScopedGeneratorRuntime, t as createSourceCandidateScanSignature, w as generateTailwindV4Css, x as createRuntimeAffectingSourceSignature } from "./source-candidate-scan-signature-Cf7259PR.mjs";
 import Module, { createRequire } from "node:module";
 import fs from "node:fs";
 import path from "node:path";
 import process from "node:process";
-import { filterExistingCssRules, postcss } from "@weapp-tailwindcss/postcss";
+import { dedupeCoveredCssRules, filterExistingCssRules, mergeCoveredCssRuleDeclarations, postcss } from "@weapp-tailwindcss/postcss";
 import { readFile, stat } from "node:fs/promises";
 import micromatch from "micromatch";
 import { MappingChars2String } from "@weapp-core/escape";
@@ -67,17 +67,27 @@ function resolveSingleActiveWebpackCssResource(assetResources, activeWebpackAsse
 	const activeAssetResourceMatches = [...assetResources ?? []].map((sourceFile) => path.resolve(sourceFile)).filter((sourceFile) => activeWebpackAssetResourceFiles.has(sourceFile)).sort();
 	return activeAssetResourceMatches.length === 1 ? activeAssetResourceMatches[0] : void 0;
 }
-function createWebpackCssAssetResourceMap(chunks, chunkGraph, cssMatcher, normalizeResource) {
+function resolveWebpackCssModuleIdentifierResource(module) {
+	if (!module.type?.startsWith("css/") || typeof module.identifier !== "function") return;
+	const identifier = module.identifier();
+	const request = identifier.startsWith("css|") ? identifier.slice(4) : identifier;
+	const resourceWithMetadata = request.slice(request.lastIndexOf("!") + 1);
+	const metadataIndex = resourceWithMetadata.indexOf("|");
+	return metadataIndex === -1 ? resourceWithMetadata : resourceWithMetadata.slice(0, metadataIndex);
+}
+function createWebpackCssAssetResourceMapInternal(chunks, chunkGraph, cssMatcher, normalizeResource, onlyUnambiguousCssAssets) {
 	const resourcesByAsset = /* @__PURE__ */ new Map();
 	if (!chunkGraph?.getChunkModulesIterable) return resourcesByAsset;
 	const collectModuleResources = (module, resources, seen = /* @__PURE__ */ new Set()) => {
 		if (!module || seen.has(module)) return;
 		seen.add(module);
-		for (const candidate of [
+		const candidates = [
 			module.resource,
 			module.request,
 			module.userRequest
-		]) {
+		];
+		if (onlyUnambiguousCssAssets) candidates.push(resolveWebpackCssModuleIdentifierResource(module));
+		for (const candidate of candidates) {
 			if (typeof candidate !== "string") continue;
 			const normalized = normalizeResource(candidate, module);
 			if (normalized) resources.add(normalized);
@@ -97,7 +107,7 @@ function createWebpackCssAssetResourceMap(chunks, chunkGraph, cssMatcher, normal
 	};
 	for (const chunk of chunks) {
 		const cssFiles = toChunkFiles(chunk.files).filter((file) => cssMatcher(file));
-		if (cssFiles.length === 0) continue;
+		if (cssFiles.length === 0 || onlyUnambiguousCssAssets && cssFiles.length !== 1) continue;
 		const modules = chunkGraph.getChunkModulesIterable(chunk);
 		if (!modules) continue;
 		const cssResources = /* @__PURE__ */ new Set();
@@ -107,6 +117,12 @@ function createWebpackCssAssetResourceMap(chunks, chunkGraph, cssMatcher, normal
 	}
 	return resourcesByAsset;
 }
+function createWebpackCssAssetResourceMap(chunks, chunkGraph, cssMatcher, normalizeResource) {
+	return createWebpackCssAssetResourceMapInternal(chunks, chunkGraph, cssMatcher, normalizeResource, false);
+}
+function createWebpackDirectCssAssetResourceMap(chunks, chunkGraph, cssMatcher, normalizeResource) {
+	return createWebpackCssAssetResourceMapInternal(chunks, chunkGraph, cssMatcher, normalizeResource, true);
+}
 function createAssetHashByChunkMap(chunks) {
 	const partsByFile = /* @__PURE__ */ new Map();
 	for (const chunk of chunks) {
@@ -309,8 +325,15 @@ function resolveWebpackGeneratorRawSource(rawSource, cssHandlerOptions) {
 }
 function shouldConsumeWebpackLoaderGeneratedCss(options) {
 	if (!options.shouldRegenerateExplicitTailwindV4CssSource) return true;
-	if (options.watchMode === true && options.loaderGeneratedClassSet && options.sourceCandidates && (hasMissingRuntimeCandidates(options.loaderGeneratedClassSet, options.sourceCandidates) || hasStaleRuntimeCandidates(options.loaderGeneratedClassSet, options.sourceCandidates))) return false;
-	return options.hasBundlerGeneratedCssMarker;
+	if (options.watchMode === true && options.loaderGeneratedClassSet && options.sourceCandidates && hasStaleRuntimeCandidates(options.loaderGeneratedClassSet, options.sourceCandidates)) return false;
+	if (options.hasBundlerGeneratedCssMarker) return true;
+	if (options.watchMode === true && options.loaderGeneratedClassSet && options.sourceCandidates && hasMissingRuntimeCandidates(options.loaderGeneratedClassSet, options.sourceCandidates)) return false;
+	return Boolean(options.allowMarkerlessRegistryMatch && options.loaderGeneratedClassSet && options.sourceCandidates && !hasMissingRuntimeCandidates(options.loaderGeneratedClassSet, options.sourceCandidates) && !hasStaleRuntimeCandidates(options.loaderGeneratedClassSet, options.sourceCandidates));
+}
+function hasDeferredWebpackGeneratedCss(source, generatedClassSets) {
+	const selectors = collectRawSourceClassSelectors(source);
+	for (const classSet of generatedClassSets) for (const candidate of classSet) if (selectors.has(candidate)) return true;
+	return false;
 }
 function hasUsableWebpackGeneratorCssSources(cssSources) {
 	return Array.isArray(cssSources) && cssSources.some((source) => typeof source?.css === "string" && source.css.length > 0);
@@ -399,7 +422,8 @@ function isWebpackKeyframesRule(rule) {
 }
 function collectWebpackBareSelectorUserCss(source) {
 	try {
-		const root = postcss.parse(removeTailwindSourceDirectives(stripTailwindSourceMediaFragments(removeTailwindV4GeneratorAtRules(source)), { importFallback: true }));
+		const normalizedSource = removeTailwindSourceDirectives(stripTailwindSourceMediaFragments(removeTailwindV4GeneratorAtRules(source)), { importFallback: true });
+		const root = postcss.parse(normalizedSource);
 		let changed = false;
 		root.walkAtRules((rule) => {
 			if (rule.name === "import" || rule.name === "font-face" || rule.name.endsWith("keyframes")) {
@@ -419,7 +443,7 @@ function collectWebpackBareSelectorUserCss(source) {
 				changed = true;
 			}
 		});
-		return changed ? root.toString() : source;
+		return changed ? root.toString() : normalizedSource;
 	} catch {
 		return "";
 	}
@@ -699,7 +723,9 @@ function createWebpackGeneratorUserCssSourceAppend(...sources) {
 	let css = "";
 	const usedParts = [];
 	for (const source of parts) {
-		const nextCss = css.trim().length > 0 ? filterExistingCssRules(css, source.css) : source.css;
+		const merged = css.trim().length > 0 ? mergeCoveredCssRuleDeclarations(css, source.css) : void 0;
+		if (merged?.changed) css = merged.baseCss;
+		const nextCss = css.trim().length > 0 ? filterExistingCssRules(css, merged?.css ?? source.css) : source.css;
 		if (!(nextCss.trim().length > 0)) continue;
 		css = createCssSourceOrderAppend(css, nextCss);
 		usedParts.push(source);
@@ -877,7 +903,7 @@ function finalizeWebpackCssAssetSource(source, compilerOptions, isWebGeneratorTa
 function finalizeWebpackCssAssetOutputSource(source, compilerOptions, isWebGeneratorTarget) {
 	if (isWebGeneratorTarget) return source;
 	const styleOptions = resolveStyleOptionsFromContext(compilerOptions);
-	return stripMiniProgramCssSpecificityPlaceholders(removeMiniProgramHoverSelectors(dedupeMiniProgramPreflightSelectorRules(source), styleOptions.cssRemoveHoverPseudoClass));
+	return stripMiniProgramCssSpecificityPlaceholders(removeMiniProgramHoverSelectors(dedupeCoveredCssRules(dedupeMiniProgramPreflightSelectorRules(source)), styleOptions.cssRemoveHoverPseudoClass));
 }
 function collectWebpackJsRuntimeCandidatesFromAssets(options) {
 	if (options.isWebGeneratorTarget) return;
@@ -968,7 +994,7 @@ function collectMainImportedCssFiles(compilation, cssAssetFiles, cssMatcher, isM
 	return files;
 }
 function createWebpackCssSourceResolvers(options) {
-	const { activeWebpackAssetResourceFiles, appType, compilerOptions, compilation, cssAssetFiles, cssAssetResources, cssHandlerOptionsCache, cssSources, cssUserHandlerOptionsCache, groupedCssEntriesLength, singleCssAssetFile, isWebGeneratorTarget, outputDir, runtimeState } = options;
+	const { activeWebpackAssetResourceFiles, appType, compilerOptions, compilation, cssAssetFiles, cssAssetResources, directCssAssetResources, 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;
@@ -985,7 +1011,7 @@ function createWebpackCssSourceResolvers(options) {
 		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 isCssSourceAllowedForOutput = (file, sourceFile) => !isConfiguredMainCssEntryFile(sourceFile) || directCssAssetResources.get(file)?.has(sourceFile) === true || scoreCssSourceOutputMatch(file, sourceFile) > 0;
 	const inferredMainCssFiles = new Set([...inferWebpackMainCssFiles(compilation.chunks, compilerOptions.cssMatcher, {
 		mainSourceFiles: new Set(configuredMainCssEntryFiles),
 		resourcesByAsset: cssAssetResources
@@ -1026,6 +1052,12 @@ function createWebpackCssSourceResolvers(options) {
 			return resolveConfiguredMainCssSourceFile(file);
 		}
 		const resourceMatches = [...assetResources ?? []].filter((sourceFile) => cssSources.has(sourceFile)).filter((sourceFile) => isCssSourceAllowedForOutput(file, sourceFile)).sort();
+		const configuredResourceMatches = resourceMatches.filter((sourceFile) => configuredCssEntryFiles.some((entry) => path.resolve(entry) === path.resolve(sourceFile)));
+		if (configuredResourceMatches.length === 1) {
+			const sourceFile = configuredResourceMatches[0];
+			activeWebpackCssSourceFiles.add(sourceFile);
+			return sourceFile;
+		}
 		if (resourceMatches.length === 1) {
 			const sourceFile = resourceMatches[0];
 			activeWebpackCssSourceFiles.add(sourceFile);
@@ -1511,7 +1543,11 @@ async function refreshWebpackSourceCandidates(options) {
 	if (!sourceScan || !sourceScan.explicit && !sourceScan.entries?.length && !sourceScan.inlineCandidates) return;
 	return options.scanCache.resolve({
 		changedFiles: options.watchChangedFiles,
-		collector: createSourceCandidateStore({ bareArbitraryValues: options.compilerOptions.arbitraryValues?.bareArbitraryValues }),
+		collector: createSourceCandidateStore({
+			bareArbitraryValues: options.compilerOptions.arbitraryValues?.bareArbitraryValues,
+			customAttributesEntities: options.compilerOptions.customAttributesEntities,
+			disabledDefaultTemplateHandler: options.compilerOptions.disabledDefaultTemplateHandler
+		}),
 		outDir: options.outputDir,
 		root,
 		sourceScan,
@@ -1572,6 +1608,10 @@ function setupWebpackV5ProcessAssetsHook(options) {
 				appType,
 				cssMatcher: compilerOptions.cssMatcher
 			}));
+			const directCssAssetResources = createWebpackDirectCssAssetResourceMap(compilation.chunks, compilation.chunkGraph, compilerOptions.cssMatcher, (resource, issuer) => resolveWebpackCssAssetModuleResource(resource, issuer, {
+				appType,
+				cssMatcher: compilerOptions.cssMatcher
+			}));
 			const watchChangedFiles = new Set([...getWatchChangedFiles?.() ?? []].map((file) => path.resolve(file)));
 			const taskConcurrency = watchMode ? resolveTaskConcurrency(1) : void 0;
 			const activeProcessCacheKeys = /* @__PURE__ */ new Set();
@@ -1592,6 +1632,7 @@ function setupWebpackV5ProcessAssetsHook(options) {
 				compilation,
 				cssAssetFiles: entries.map(([file]) => file),
 				cssAssetResources,
+				directCssAssetResources,
 				cssHandlerOptionsCache,
 				cssSources,
 				cssUserHandlerOptionsCache,
@@ -1892,8 +1933,16 @@ function setupWebpackV5ProcessAssetsHook(options) {
 							},
 							transform: async () => {
 								const source = readCurrentProcessedRawSource();
-								const processedBareSelectorSourceCss = processedSourceCss ?? (hasTailwindGeneratedAssetCss ? removeWebpackTailwindGeneratedAssetCss(source) : void 0);
-								const handledCss = hasTailwindGeneratedAssetCss && !hasGeneratedCssMarker ? isWebGeneratorTarget ? source : (await compilerOptions.styleHandler(source, cssHandlerOptionsForProcessedAsset)).css : source;
+								const missingProcessedLoaderGeneratedCss = isWebGeneratorTarget && processedLoaderGeneratedCss ? filterExistingCssRules(source, stripBundlerGeneratedCssMarkers(processedLoaderGeneratedCss.css)) : "";
+								const sourceWithLoaderGeneratedCss = missingProcessedLoaderGeneratedCss.trim().length === 0 ? source : createWebpackGeneratorUserCssSourceAppend({
+									css: source,
+									processed: true
+								}, {
+									css: missingProcessedLoaderGeneratedCss,
+									processed: true
+								}).css;
+								const processedBareSelectorSourceCss = processedSourceCss ?? (hasTailwindGeneratedAssetCss ? removeWebpackTailwindGeneratedAssetCss(sourceWithLoaderGeneratedCss) : void 0);
+								const handledCss = hasTailwindGeneratedAssetCss && (!hasGeneratedCssMarker || !isWebGeneratorTarget && hasDeferredWebpackGeneratedCss(source, [...generatedCssSources.values()].map((item) => item.classSet))) ? isWebGeneratorTarget ? sourceWithLoaderGeneratedCss : (await compilerOptions.styleHandler(sourceWithLoaderGeneratedCss, cssHandlerOptionsForProcessedAsset)).css : sourceWithLoaderGeneratedCss;
 								const nextCss = stripTrailingLineWhitespace(finalizeCssAssetSource(handledCss, {
 									cssPreflight: cssHandlerOptionsForProcessedAsset.isMainChunk,
 									generatedCss: hasGeneratedCssMarker || hasTailwindGeneratedAssetCss
@@ -1986,10 +2035,11 @@ function setupWebpackV5ProcessAssetsHook(options) {
 							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 loaderGeneratedCss = sourceFile ? 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({
+								allowMarkerlessRegistryMatch: configuredCssEntryFiles.length === 1,
 								hasBundlerGeneratedCssMarker: hasBundlerGeneratedCssMarker(currentRawSource),
 								loaderGeneratedClassSet: loaderGeneratedCss.classSet,
 								sourceCandidates: explicitTailwindV4SourceCandidates,
@@ -2022,7 +2072,8 @@ function setupWebpackV5ProcessAssetsHook(options) {
 									css: currentAssetUserCss,
 									processed: true
 								}).css;
-								const finalizedLoaderCss = finalizeCssAssetSource(mergedLoaderCss, {
+								const handledLoaderCss = isWebGeneratorTarget ? mergedLoaderCss : (await compilerOptions.styleHandler(mergedLoaderCss, cssHandlerOptions)).css;
+								const finalizedLoaderCss = finalizeCssAssetSource(handledLoaderCss, {
 									cssPreflight: cssHandlerOptions.isMainChunk,
 									generatedCss: true,
 									preserveExistingPreflight: shouldPreserveExistingPreflight
@@ -2040,7 +2091,8 @@ function setupWebpackV5ProcessAssetsHook(options) {
 										processed: source.processed
 									};
 								}));
-								const finalizedLoaderSourceBareUserCss = loaderSourceBareUserCss === void 0 ? "" : finalizeCssAssetSource(loaderSourceBareUserCss.css, {
+								const handledLoaderSourceBareUserCss = loaderSourceBareUserCss === void 0 ? "" : loaderSourceBareUserCss.processed ? loaderSourceBareUserCss.css : (await compilerOptions.styleHandler(loaderSourceBareUserCss.css, cssHandlerOptions)).css;
+								const finalizedLoaderSourceBareUserCss = handledLoaderSourceBareUserCss.trim().length === 0 ? "" : finalizeCssAssetSource(handledLoaderSourceBareUserCss, {
 									cssPreflight: false,
 									generatedCss: false
 								});
@@ -2174,7 +2226,8 @@ function setupWebpackV5ProcessAssetsHook(options) {
 									processed: source.processed
 								};
 							}));
-							const finalizedSourceBareUserCss = sourceBareUserCss === void 0 ? "" : finalizeCssAssetSource(sourceBareUserCss.css, {
+							const handledSourceBareUserCss = sourceBareUserCss === void 0 ? "" : sourceBareUserCss.processed ? sourceBareUserCss.css : (await compilerOptions.styleHandler(sourceBareUserCss.css, cssHandlerOptions)).css;
+							const finalizedSourceBareUserCss = handledSourceBareUserCss.trim().length === 0 ? "" : finalizeCssAssetSource(handledSourceBareUserCss, {
 								cssPreflight: false,
 								generatedCss: false
 							});
@@ -2276,6 +2329,30 @@ function installTailwindcssCssRedirect(pkgDir) {
 const localRequire = createRequire(import.meta.url);
 const MPX_STYLE_RESOURCE_QUERY_RE = /(?:^|[?&])type=styles(?:&|$)/;
 const MPX_WEBPACK_PLUGIN_PACKAGE_RE = /@mpxjs[\\/]webpack-plugin[\\/]package\.json$/;
+const MPX_WEBPACK_PLUGIN_LIB_RE = /^(.*[\\/]@mpxjs[\\/]webpack-plugin)[\\/]lib[\\/]/;
+const MPX_WEBPACK_PLUGIN_REQUEST_RE = /@mpxjs\/webpack-plugin\/([^!?]+)/g;
+function findMpxWebpackPluginDirFromRules(rules) {
+	const visit = (value) => {
+		if (typeof value === "string") return value.match(MPX_WEBPACK_PLUGIN_LIB_RE)?.[1];
+		if (Array.isArray(value)) {
+			for (const item of value) {
+				const result = visit(item);
+				if (result) return result;
+			}
+			return;
+		}
+		if (value && typeof value === "object") for (const key of [
+			"loader",
+			"use",
+			"rules",
+			"oneOf"
+		]) {
+			const result = visit(value[key]);
+			if (result) return result;
+		}
+	};
+	return visit(rules);
+}
 function isMpxStyleResourceQuery(query) {
 	if (typeof query !== "string") return false;
 	return MPX_STYLE_RESOURCE_QUERY_RE.test(query);
@@ -2284,6 +2361,12 @@ function getTailwindcssCssEntry(pkgDir) {
 	return path.join(pkgDir, "index.css");
 }
 function resolveMpxWebpackPluginDir(compiler) {
+	const rulePluginDir = findMpxWebpackPluginDirFromRules([
+		compiler?._module?.loaders,
+		compiler?.loaders,
+		compiler?.options?.module?.rules
+	]);
+	if (rulePluginDir) return rulePluginDir;
 	const candidates = [
 		compiler?.context,
 		compiler?.options?.context,
@@ -2301,6 +2384,45 @@ function resolveMpxWebpackPluginDir(compiler) {
 		return;
 	}
 }
+function rewriteMpxWebpackPluginRequests(request, mpxWebpackPluginDir, pathImpl = path) {
+	return request.replace(MPX_WEBPACK_PLUGIN_REQUEST_RE, (_full, subpath) => {
+		return pathImpl.join(mpxWebpackPluginDir, ...subpath.split("/"));
+	});
+}
+function patchMpxWebpackPluginRequests(compiler, mpxWebpackPluginDir) {
+	if (!mpxWebpackPluginDir || !compiler) return false;
+	const pluginName = "weapp-tailwindcss-mpx-loader-resolve";
+	const patchedCompilers = /* @__PURE__ */ new WeakSet();
+	const patchedLoaderResolvers = /* @__PURE__ */ new WeakSet();
+	const patchedResolverFactories = /* @__PURE__ */ new WeakSet();
+	const install = (targetCompiler) => {
+		if (!targetCompiler || typeof targetCompiler !== "object" || patchedCompilers.has(targetCompiler)) return;
+		patchedCompilers.add(targetCompiler);
+		ensureResolveLoaderAlias(targetCompiler, mpxWebpackPluginDir);
+		const resolverFactory = targetCompiler.resolverFactory;
+		if (resolverFactory && typeof resolverFactory === "object" && !patchedResolverFactories.has(resolverFactory)) {
+			patchedResolverFactories.add(resolverFactory);
+			installMpxResolveLoaderAlias(targetCompiler, mpxWebpackPluginDir);
+		}
+		targetCompiler.hooks?.normalModuleFactory?.tap?.(pluginName, (normalModuleFactory) => {
+			const loaderResolver = normalModuleFactory.getResolver?.("loader");
+			if (loaderResolver && typeof loaderResolver === "object" && !patchedLoaderResolvers.has(loaderResolver)) {
+				patchedLoaderResolvers.add(loaderResolver);
+				patchMpxLoaderResolver(loaderResolver, mpxWebpackPluginDir);
+			}
+			normalModuleFactory.hooks.beforeResolve.tap(pluginName, (resolveData) => {
+				if (typeof resolveData?.request === "string") resolveData.request = rewriteMpxWebpackPluginRequests(resolveData.request, mpxWebpackPluginDir);
+			});
+		});
+		targetCompiler.hooks?.compilation?.tap?.(pluginName, (compilation) => {
+			compilation.hooks?.childCompiler?.tap?.(pluginName, (childCompiler) => {
+				install(childCompiler);
+			});
+		});
+	};
+	install(compiler);
+	return true;
+}
 function isMpxWebpackPluginRequest(request) {
 	return request === "@mpxjs/webpack-plugin" || Boolean(request?.startsWith("@mpxjs/webpack-plugin/"));
 }
@@ -2339,27 +2461,39 @@ function ensureResolveLoaderAlias(compiler, mpxWebpackPluginDir) {
 	compiler.options.resolveLoader.alias = alias;
 	addMpxWebpackPluginAlias(alias, mpxWebpackPluginDir);
 }
-function resolveMpxWebpackPluginRequire(compiler) {
-	const candidates = [
-		compiler?.context,
-		compiler?.options?.context,
-		process.cwd()
-	].filter((item) => typeof item === "string" && item.length > 0);
-	for (const candidate of candidates) try {
-		const projectRequire = createRequire(path.join(candidate, "package.json"));
-		projectRequire.resolve("@mpxjs/webpack-plugin/package.json");
-		return projectRequire;
-	} catch {}
-	const cachedPackageJson = Object.keys(localRequire.cache).find((file) => MPX_WEBPACK_PLUGIN_PACKAGE_RE.test(file));
-	if (cachedPackageJson) return createRequire(cachedPackageJson);
-	return localRequire;
+function installMpxResolveLoaderAlias(compiler, mpxWebpackPluginDir) {
+	const resolveOptionsHook = compiler?.resolverFactory?.hooks?.resolveOptions?.for?.("loader");
+	if (!resolveOptionsHook?.tap) return;
+	resolveOptionsHook.tap({
+		name: "weapp-tailwindcss-mpx-loader-resolve",
+		stage: 100
+	}, (resolveOptions) => {
+		const alias = Array.isArray(resolveOptions.alias) ? [...resolveOptions.alias] : { ...resolveOptions.alias };
+		addMpxWebpackPluginAlias(alias, mpxWebpackPluginDir);
+		return {
+			...resolveOptions,
+			alias
+		};
+	});
+}
+function patchMpxLoaderResolver(resolver, mpxWebpackPluginDir) {
+	const originalResolve = resolver?.resolve;
+	if (typeof originalResolve !== "function" || originalResolve.__weappTwPatched) return;
+	const wrappedResolve = function(...args) {
+		const requestIndex = typeof args[0] === "string" ? 1 : 2;
+		const request = args[requestIndex];
+		if (typeof request === "string" && isMpxWebpackPluginRequest(request)) args[requestIndex] = resolveMpxWebpackPluginRequest(request, mpxWebpackPluginDir);
+		return originalResolve.apply(this, args);
+	};
+	wrappedResolve.__weappTwPatched = true;
+	wrappedResolve.__weappTwOriginal = originalResolve;
+	resolver.resolve = wrappedResolve;
 }
-function patchMpxWebpackPluginNormalizeLib(compiler, mpxWebpackPluginDir) {
+function patchMpxWebpackPluginNormalizeLib(_compiler, mpxWebpackPluginDir) {
 	if (!mpxWebpackPluginDir) return false;
-	const projectRequire = resolveMpxWebpackPluginRequire(compiler);
 	let normalize;
 	try {
-		normalize = projectRequire("@mpxjs/webpack-plugin/lib/utils/normalize");
+		normalize = createRequire(path.join(mpxWebpackPluginDir, "package.json"))(path.join(mpxWebpackPluginDir, "lib/utils/normalize"));
 	} catch {
 		return false;
 	}
@@ -2377,6 +2511,7 @@ function ensureMpxTailwindcssAliases(compiler, pkgDir) {
 	compiler.options.resolve = compiler.options.resolve || {};
 	const mpxWebpackPluginDir = resolveMpxWebpackPluginDir(compiler);
 	patchMpxWebpackPluginNormalizeLib(compiler, mpxWebpackPluginDir);
+	patchMpxWebpackPluginRequests(compiler, mpxWebpackPluginDir);
 	if (mpxWebpackPluginDir) ensureResolveLoaderAlias(compiler, mpxWebpackPluginDir);
 	const alias = compiler.options.resolve.alias ?? {};
 	compiler.options.resolve.alias = alias;
@@ -2395,19 +2530,29 @@ function ensureMpxTailwindcssAliases(compiler, pkgDir) {
 	return tailwindcssCssEntry;
 }
 function patchMpxLoaderResolve(loaderContext, pkgDir, enabled) {
-	if (!enabled || typeof loaderContext.resolve !== "function") return;
-	const originalResolve = loaderContext.resolve;
-	if (originalResolve.__weappTwPatched) return;
+	if (!enabled) return;
 	const tailwindcssCssEntry = getTailwindcssCssEntry(pkgDir);
 	const mpxWebpackPluginDir = resolveMpxWebpackPluginDir(loaderContext);
-	const wrappedResolve = function(context, request, callback) {
-		if (request === "tailwindcss" || request === "tailwindcss$") return callback(null, tailwindcssCssEntry);
-		if (request?.startsWith("tailwindcss/")) return callback(null, path.join(pkgDir, request.slice(12)));
-		if (mpxWebpackPluginDir && isMpxWebpackPluginRequest(request)) return callback(null, resolveMpxWebpackPluginRequest(request, mpxWebpackPluginDir));
-		return originalResolve.call(this, context, request, callback);
-	};
-	wrappedResolve.__weappTwPatched = true;
-	loaderContext.resolve = wrappedResolve;
+	const originalResolve = loaderContext.resolve;
+	if (typeof originalResolve === "function" && !originalResolve.__weappTwPatched) {
+		const wrappedResolve = function(context, request, callback) {
+			if (request === "tailwindcss" || request === "tailwindcss$") return callback(null, tailwindcssCssEntry);
+			if (request?.startsWith("tailwindcss/")) return callback(null, path.join(pkgDir, request.slice(12)));
+			if (mpxWebpackPluginDir && isMpxWebpackPluginRequest(request)) return callback(null, resolveMpxWebpackPluginRequest(request, mpxWebpackPluginDir));
+			return originalResolve.call(this, context, request, callback);
+		};
+		wrappedResolve.__weappTwPatched = true;
+		loaderContext.resolve = wrappedResolve;
+	}
+	const originalImportModule = loaderContext.importModule;
+	if (mpxWebpackPluginDir && typeof originalImportModule === "function" && !originalImportModule.__weappTwPatched) {
+		const wrappedImportModule = function(request, ...args) {
+			const resolvedRequest = typeof request === "string" ? rewriteMpxWebpackPluginRequests(request, mpxWebpackPluginDir) : request;
+			return originalImportModule.call(this, resolvedRequest, ...args);
+		};
+		wrappedImportModule.__weappTwPatched = true;
+		loaderContext.importModule = wrappedImportModule;
+	}
 }
 function setupMpxTailwindcssRedirect(pkgDir, enabled) {
 	if (enabled) installTailwindcssCssRedirect(pkgDir);
@@ -2492,11 +2637,14 @@ 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 || generatorOptions.enabled && (!generatorBranch.isWeb || runtimeState.tailwindRuntime.majorVersion === 4);
+	const shouldInjectCssGenerationLoader = generatorOptions.enabled && runtimeState.tailwindRuntime.majorVersion === 4 && (generatorTarget === "web" || generatorTarget === "weapp");
+	const shouldInjectCssImportRewriteLoader = shouldRewriteCssImports || shouldInjectCssGenerationLoader;
+	const runtimeCssGenerationLoader = shouldInjectCssGenerationLoader ? path.resolve(__dirname, "./weapp-tw-css-generation-loader.js") : void 0;
 	const runtimeCssImportRewriteLoader = shouldInjectCssImportRewriteLoader ? path.resolve(__dirname, "./weapp-tw-css-import-rewrite-loader.js") : void 0;
 	const runtimeClassSetLoaderExists = fs.existsSync(runtimeClassSetLoader);
+	const runtimeCssGenerationLoaderExists = runtimeCssGenerationLoader ? fs.existsSync(runtimeCssGenerationLoader) : false;
 	const runtimeCssImportRewriteLoaderExists = runtimeCssImportRewriteLoader ? fs.existsSync(runtimeCssImportRewriteLoader) : false;
-	const runtimeLoaderRewriteOptions = shouldInjectCssImportRewriteLoader ? {
+	const runtimeLoaderRewriteOptions = shouldInjectCssImportRewriteLoader || shouldInjectCssGenerationLoader ? {
 		pkgDir: weappTailwindcssPackageDir,
 		compilerOptions,
 		runtimeState,
@@ -2521,7 +2669,11 @@ function setupWebpackV5Loaders(options) {
 	compiler.hooks.watchClose?.tap?.(pluginName, cleanupWebpackLoaderRuntime);
 	compiler.hooks.shutdown?.tap?.(pluginName, cleanupWebpackLoaderRuntime);
 	const { findRewriteAnchor, findClassSetAnchor } = loaderAnchorFinders;
-	const cssImportRewriteLoaderOptions = runtimeLoaderRewriteOptions ? { tailwindcssImportRewriteRuntimeKey: runtimeRegistryKey } : void 0;
+	const cssImportRewriteLoaderOptions = runtimeLoaderRewriteOptions && shouldInjectCssImportRewriteLoader ? {
+		generateCss: false,
+		tailwindcssImportRewriteRuntimeKey: runtimeRegistryKey
+	} : void 0;
+	const cssGenerationLoaderOptions = runtimeLoaderRewriteOptions && shouldInjectCssGenerationLoader ? { tailwindcssImportRewriteRuntimeKey: runtimeRegistryKey } : void 0;
 	if (runtimeCssImportRewriteLoader && shouldRewriteCssImports && cssImportRewriteLoaderOptions && mpxCssImportRewrite) injectMpxCssRewritePreRules(compiler, runtimeCssImportRewriteLoader, cssImportRewriteLoaderOptions);
 	const createRuntimeClassSetLoaderEntry = () => ({
 		loader: runtimeClassSetLoader,
@@ -2538,10 +2690,22 @@ function setupWebpackV5Loaders(options) {
 			type: null
 		};
 	};
+	const createCssGenerationLoaderEntry = () => {
+		if (!runtimeCssGenerationLoader || !cssGenerationLoaderOptions) return null;
+		return {
+			loader: runtimeCssGenerationLoader,
+			options: cssGenerationLoaderOptions,
+			ident: null,
+			type: null
+		};
+	};
 	const { NormalModule } = compiler.webpack;
 	compiler.hooks.compilation.tap(pluginName, (compilation) => {
-		NormalModule.getCompilationHooks(compilation).loader.tap(pluginName, (_loaderContext, module) => {
-			if (!(runtimeClassSetLoaderExists || runtimeCssImportRewriteLoaderExists)) return;
+		NormalModule.getCompilationHooks(compilation).loader.tap({
+			name: pluginName,
+			stage: 100
+		}, (_loaderContext, module) => {
+			if (!(runtimeClassSetLoaderExists || runtimeCssGenerationLoaderExists || runtimeCssImportRewriteLoaderExists)) return;
 			patchMpxLoaderResolve(_loaderContext, weappTailwindcssPackageDir, shouldRewriteCssImports && mpxCssImportRewrite);
 			const loaderEntries = module.loaders || [];
 			let rewriteAnchorIdx = findRewriteAnchor(loaderEntries);
@@ -2561,6 +2725,12 @@ function setupWebpackV5Loaders(options) {
 				if (position === "after") loaderEntries.push(entry);
 				else loaderEntries.unshift(entry);
 			};
+			if (cssGenerationLoaderOptions && runtimeCssGenerationLoaderExists && runtimeCssGenerationLoader && isCssModule && !hasLoaderEntry(loaderEntries, runtimeCssGenerationLoader)) {
+				const generationLoaderEntry = createCssGenerationLoaderEntry();
+				const anchorIndex = findRewriteAnchor(loaderEntries);
+				if (generationLoaderEntry) if (anchorIndex === -1) anchorlessInsert(generationLoaderEntry, "after");
+				else loaderEntries.splice(anchorIndex + 1, 0, generationLoaderEntry);
+			}
 			if (cssImportRewriteLoaderOptions && runtimeCssImportRewriteLoaderExists && runtimeCssImportRewriteLoader && isCssModule) {
 				const existingIndex = loaderEntries.findIndex((entry) => entry.loader?.includes?.(runtimeCssImportRewriteLoader));
 				const rewriteLoaderEntry = existingIndex !== -1 ? {