weapp-tailwindcss 5.1.14 → 5.1.15

package/dist/{hmr-timing-BZ5sWIqO.js → hmr-timing-B8p4f0ca.js}

@@ -1,5 +1,6 @@
 const require_rolldown_runtime = require("./rolldown-runtime-emK7D4bc.js");
 const require_generator = require("./generator-CEnUsjed.js");
+require("./auto-DtU6f3X6.js");
 const require_object = require("./object-COs_Mw6p.js");
 const require_tailwindcss = require("./tailwindcss-KBYPJ2DW.js");
 const require_wxml = require("./wxml-Ce10eREX.js");
@@ -133,6 +134,39 @@ function annotateCssSourceTrace(css, options) {
 	}
 }
 //#endregion
+//#region src/bundlers/shared/generated-css-marker.ts
+const BUNDLER_GENERATED_CSS_MARKER_RE = /\/\*!?\s*weapp-tailwindcss (?:gulp|vite|webpack)-generated-css(?:\s*:\s*[^\s*]+)?\s*\*\/\s*/i;
+const BUNDLER_GENERATED_CSS_MARKER_GLOBAL_RE = /\/\*!?\s*weapp-tailwindcss (?:gulp|vite|webpack)-generated-css(?:\s*:\s*[^\s*]+)?\s*\*\/\s*/gi;
+const BUNDLER_GENERATED_CSS_MARKER_CAPTURE_RE = /\/\*!?\s*weapp-tailwindcss (gulp|vite|webpack)-generated-css(?:\s*:\s*([^\s*]+))?\s*\*\/\s*/gi;
+const VITE_INTERNAL_CSS_MARKER_GLOBAL_RE = /\/\*\$vite\$:\d+\*\/\s*/g;
+function createBundlerGeneratedCssMarker(bundler, file) {
+	return `/*! weapp-tailwindcss ${bundler}-generated-css:${encodeURIComponent(file)} */`;
+}
+function hasBundlerGeneratedCssMarker(source) {
+	return typeof source === "string" && BUNDLER_GENERATED_CSS_MARKER_RE.test(source);
+}
+function stripBundlerGeneratedCssMarkers(source) {
+	return source.replace(BUNDLER_GENERATED_CSS_MARKER_GLOBAL_RE, "").replace(VITE_INTERNAL_CSS_MARKER_GLOBAL_RE, "");
+}
+function parseBundlerGeneratedCssMarkerBlocks(source) {
+	const blocks = [];
+	BUNDLER_GENERATED_CSS_MARKER_CAPTURE_RE.lastIndex = 0;
+	let match = BUNDLER_GENERATED_CSS_MARKER_CAPTURE_RE.exec(source);
+	while (match !== null) {
+		const cssStart = BUNDLER_GENERATED_CSS_MARKER_CAPTURE_RE.lastIndex;
+		const nextMatch = BUNDLER_GENERATED_CSS_MARKER_CAPTURE_RE.exec(source);
+		const cssEnd = nextMatch?.index ?? source.length;
+		const file = match[2] ? decodeURIComponent(match[2]) : void 0;
+		blocks.push({
+			bundler: match[1],
+			file,
+			css: source.slice(cssStart, cssEnd)
+		});
+		match = nextMatch;
+	}
+	return blocks;
+}
+//#endregion
 //#region src/bundlers/shared/generator-css/class-selectors.ts
 function normalizeCssClassSelector(value) {
 	return value.replace(/\\([^\da-f\r\n])/gi, "$1").replace(/\\([\da-f]{1,6})\s?/gi, (_, code) => String.fromCodePoint(Number.parseInt(code, 16)));
@@ -157,11 +191,47 @@ function collectGeneratedRawSourceCandidates(candidates, rawSource, escapeMap) {
 	return matched;
 }
 //#endregion
+//#region src/bundlers/shared/style-requests.ts
+const SOURCE_STYLE_EXT_RE = /\.(?:css|scss|sass|less|styl|stylus|pcss|postcss)$/i;
+const STYLE_QUERY_RE = /(?:^|&)type=styles?(?:&|$)/;
+const VUE_STYLE_QUERY_RE = /(?:^|&)type=style(?:&|$)/;
+const STYLE_LANG_QUERY_RE = /(?:^|&)lang(?:[.=](?:css|scss|sass|less|styl|stylus|pcss|postcss))?(?:&|$)/;
+function stripHash(request) {
+	const hashIndex = request.indexOf("#");
+	return hashIndex === -1 ? request : request.slice(0, hashIndex);
+}
+function stripRequestQuery(request) {
+	const normalized = stripHash(request);
+	const queryIndex = normalized.indexOf("?");
+	return queryIndex === -1 ? normalized : normalized.slice(0, queryIndex);
+}
+function isSourceStyleRequest(request) {
+	if (typeof request !== "string" || request.length === 0) return false;
+	const normalized = stripHash(request);
+	const queryIndex = normalized.indexOf("?");
+	const pathname = queryIndex === -1 ? normalized : normalized.slice(0, queryIndex);
+	if (SOURCE_STYLE_EXT_RE.test(pathname)) return true;
+	if (queryIndex === -1) return false;
+	const query = normalized.slice(queryIndex + 1);
+	return STYLE_QUERY_RE.test(query) || STYLE_LANG_QUERY_RE.test(query);
+}
+function isVueScopedStyleRequest(request) {
+	if (typeof request !== "string" || request.length === 0) return false;
+	const normalized = stripHash(request);
+	const queryIndex = normalized.indexOf("?");
+	if (queryIndex === -1) return false;
+	const query = normalized.slice(queryIndex + 1);
+	return VUE_STYLE_QUERY_RE.test(query) && /(?:^|&)scoped(?:=[^&]*)?(?:&|$)/.test(query);
+}
+//#endregion
 //#region src/bundlers/shared/generator-css/source-resolver/postcss-source.ts
 function resolvePostcssFromOption(cssHandlerOptions) {
 	const from = cssHandlerOptions.postcssOptions?.options?.from;
 	return typeof from === "string" && from.length > 0 ? from : void 0;
 }
+function resolvePostcssRequestOption(cssHandlerOptions) {
+	return resolveCssHandlerSourceOptions(cssHandlerOptions)?.requestFile ?? resolvePostcssFromOption(cssHandlerOptions);
+}
 function resolvePostcssSourceFile(cssHandlerOptions) {
 	const from = resolvePostcssFromOption(cssHandlerOptions);
 	if (!from || !node_path.default.isAbsolute(from)) return;
@@ -176,13 +246,6 @@ function resolveCssSourceBase(file, cssHandlerOptions) {
 }
 //#endregion
 //#region src/bundlers/shared/generator-css/generation-helpers.ts
-function isVueScopedStyleSource(from) {
-	if (typeof from !== "string" || from.length === 0) return false;
-	const queryIndex = from.indexOf("?");
-	if (queryIndex === -1) return false;
-	const query = from.slice(queryIndex + 1);
-	return /(?:^|&)type=style(?:&|$)/.test(query) && /(?:^|&)scoped(?:=[^&]*)?(?:&|$)/.test(query);
-}
 function hasMiniProgramTailwindV4PreflightReset(css) {
 	return /(?:^|[},])\s*view\s*,\s*text\s*,\s*::after\s*,\s*::before\s*\{[^}]*\bborder\s*:\s*0\s+solid\b/.test(css);
 }
@@ -191,7 +254,7 @@ function isMiniProgramGeneratorTarget(target) {
 }
 function finalizeMiniProgramGeneratorCss(css, target, _majorVersion, cssPreflight, options = {}) {
 	if (!isMiniProgramGeneratorTarget(target)) return css;
-	if (isVueScopedStyleSource(options.styleOptions?.postcssOptions?.options?.from)) return (0, _weapp_tailwindcss_postcss.finalizeMiniProgramCss)(css, {
+	if (options.styleOptions && isVueScopedStyleRequest(resolvePostcssRequestOption(options.styleOptions))) return (0, _weapp_tailwindcss_postcss.finalizeMiniProgramCss)(css, {
 		cssPreflight: false,
 		cssSelectorReplacement: options.styleOptions?.cssOptions?.cssSelectorReplacement ?? options.styleOptions?.cssSelectorReplacement,
 		isTailwindcssV4: true,
@@ -208,7 +271,7 @@ function finalizeMiniProgramGeneratorCss(css, target, _majorVersion, cssPrefligh
 	});
 }
 function resolveMiniProgramPreflightModeForGeneratorCss(opts, options) {
-	if (isVueScopedStyleSource(resolvePostcssFromOption(options.cssHandlerOptions))) return {
+	if (isVueScopedStyleRequest(resolvePostcssRequestOption(options.cssHandlerOptions))) return {
 		inject: false,
 		preserve: false
 	};
@@ -278,7 +341,7 @@ function isEmptyCssSourceOrderParts(parts) {
 }
 function resolveGeneratorStyleOptions(opts, cssHandlerOptions, generatorStyleOptions) {
 	const resolvedStyleOptions = require_context.resolveStyleOptionsFromContext(opts);
-	const scopedVueStyleSource = isVueScopedStyleSource(resolvePostcssFromOption(cssHandlerOptions));
+	const scopedVueStyleSource = isVueScopedStyleRequest(resolvePostcssRequestOption(cssHandlerOptions));
 	const preflightStyleOptions = {
 		cssPreflight: scopedVueStyleSource ? false : resolvedStyleOptions.cssPreflight,
 		cssPreflightRange: scopedVueStyleSource ? void 0 : resolvedStyleOptions.cssPreflightRange
@@ -2319,10 +2382,14 @@ async function generateCssByGenerator(options) {
 		const configuredContainerCompat = hasConfiguredContainerCompatSources(generatorSources);
 		const sourceConcurrency = resolveGeneratorSourceConcurrency();
 		const generated = mergeGeneratorResults((await runWithConcurrency(generatorSources.map((source) => async () => {
+			const sourceCss = options.deferCssAdaptation ? (0, _weapp_tailwindcss_postcss.removeMatchingLocalCssImports)(source.css, localImports) : source.css;
 			const generator = require_generator.createWeappTailwindcssGenerator(options.disableSourceScan === true ? {
 				...source,
-				css: require_generator.removeTailwindSourceDirectives(source.css, { importFallback: generatorOptions.importFallback })
-			} : source);
+				css: require_generator.removeTailwindSourceDirectives(sourceCss, { importFallback: generatorOptions.importFallback })
+			} : sourceCss === source.css ? source : {
+				...source,
+				css: sourceCss
+			});
 			const sourceEntries = getSourceCandidatesForEntries ? await resolveGeneratorSourceEntries(source, runtimeState) : void 0;
 			const sourceScopedRuntime = sourceEntries && sourceEntries.length > 0 ? getSourceCandidatesForEntries?.(sourceEntries) : void 0;
 			const scopedRuntime = resolveScopedRuntimeCandidates(options.sourceCandidates, sourceScopedRuntime);
@@ -2355,6 +2422,91 @@ async function generateCssByGenerator(options) {
 		}), sourceConcurrency)).filter((item) => Boolean(item)));
 		if (!generated) return;
 		debug("tailwind generator result: %s rawBytes=%d cssBytes=%d candidates=%d", file, generated.rawCss.length, generated.css.length, generated.classSet.size);
+		const hasMatchedCssSourceFile = generatorSources.some((source) => source.__weappTailwindcssMeta?.matchedCssSourceFile);
+		const hasExplicitCssSource = generatorSources.some((source) => {
+			const metadata = source.__weappTailwindcssMeta;
+			return metadata?.candidateMatchedCssSource !== true && (metadata?.cssEntryIndex !== void 0 || metadata?.cssSourceIndex !== void 0);
+		});
+		const hasPreflightCssSource = generatorSources.some((source) => {
+			const metadata = source.__weappTailwindcssMeta;
+			const appEntryMatchedByCandidates = metadata?.candidateMatchedCssSource === true && metadata.cssEntryIndex === 0 && metadata.cssSourceIndex === void 0;
+			return metadata?.includesPreflight === true && !appEntryMatchedByCandidates;
+		});
+		const hasPreflightRawSource = require_tailwindcss.includesTailwindV4PreflightDirective(generatorRawSource);
+		const hasOnlyPrimaryCssSource = generatorSources.length > 0 && generatorSources.every((source) => {
+			const metadata = source.__weappTailwindcssMeta;
+			return metadata?.candidateMatchedCssSource !== true && metadata?.primaryCssSource === true;
+		});
+		const shouldFilterApplyOnlyCss = require_generator.shouldFilterApplyOnlyGeneratedCss(majorVersion, generated.target, generatorRawSource, {
+			hasGeneratedCss,
+			hasGeneratedMarkers
+		});
+		const filterGeneratedApplyOnlyCss = (css) => {
+			if (!shouldFilterApplyOnlyCss) return css;
+			return require_generator.filterApplyOnlyGeneratedCss(css, generatorRawSource, { preserveVariables: generated.target !== "web" });
+		};
+		const preflightMode = resolveMiniProgramPreflightModeForGeneratorCss(opts, {
+			cssHandlerOptions,
+			isolateCurrentCssCandidates,
+			localImports,
+			explicitCssSource: hasExplicitCssSource,
+			primaryCssSource: hasOnlyPrimaryCssSource || hasPreflightCssSource || hasPreflightRawSource
+		});
+		if (options.deferCssAdaptation) {
+			const normalizeDeferredGeneratedCss = async (css) => {
+				const rawCss = require_generator.stripTailwindBanner(css);
+				const generationCss = generated.target === "weapp" && ((0, _weapp_tailwindcss_postcss.hasCssMacroStyleOptions)(generatorStyleOptions) || (0, _weapp_tailwindcss_postcss.hasCssMacroTailwindV4InternalAtRules)(rawCss)) ? await (0, _weapp_tailwindcss_postcss.transformCssMacroCss)(rawCss, generatorStyleOptions) : rawCss;
+				const normalizedCss = generated.target === "weapp" ? await (0, _weapp_tailwindcss_postcss.normalizeMiniProgramGeneratedCssForPostcss)(generationCss, {
+					preservePreflight: true,
+					preserveRawClassRules: true
+				}) : generationCss;
+				return filterGeneratedApplyOnlyCss(normalizedCss);
+			};
+			const restoreDeferredUserCss = async (css) => {
+				if (generated.target !== "weapp" || generatedUserCssRawSource.trim().length === 0) return css;
+				const userCssOptions = {
+					generatorTarget: generated.target,
+					generatorStyleOptions,
+					cssUserHandlerOptions,
+					styleHandler,
+					importFallback: generatorOptions.importFallback,
+					processed: userRawSourceProcessed
+				};
+				const transformDeferredUserCss = async (source) => {
+					const parts = require_generator.splitUserCssLayerBlocks(source);
+					const layerCss = await require_generator.transformGeneratorUserCss(parts.layer, userCssOptions);
+					const restCss = await require_generator.transformGeneratorUserCss(parts.rest, userCssOptions);
+					return createCssSourceOrderAppend$1(wrapUserLayerComponentsCss(layerCss), restCss);
+				};
+				const orderedUserCss = require_generator.splitGeneratorPlaceholderCssBySourceOrder(userCssOrderSource, generated.rawCss) ?? (hasMatchedCssSourceFile ? require_generator.splitTailwindV4GeneratedCssBySourceOrder(userCssOrderSource, generated.rawCss) : splitRawSourceByGeneratedCssOrder(userCssOrderSource, generated.rawCss));
+				if (orderedUserCss) {
+					const beforeUserCss = await transformDeferredUserCss(orderedUserCss.before);
+					const afterUserCss = await transformDeferredUserCss(orderedUserCss.after);
+					const cssWithBeforeUserCss = createCssSourceOrderAppend$1((0, _weapp_tailwindcss_postcss.filterExistingCssRules)(css, beforeUserCss), css);
+					return reorderMarkedUserLayerComponentsCss(createCssSourceOrderAppend$1(cssWithBeforeUserCss, (0, _weapp_tailwindcss_postcss.filterExistingCssRules)(cssWithBeforeUserCss, afterUserCss)));
+				}
+				return reorderMarkedUserLayerComponentsCss(createCssSourceOrderAppend$1(css, (0, _weapp_tailwindcss_postcss.filterExistingCssRules)(css, await transformDeferredUserCss(generatedUserCssRawSource))));
+			};
+			const canAppendIncrementalCss = generated.target !== "weapp" || !require_generator.hasUserCssLayerBlocks(generatorRawSource);
+			const incrementalRawCss = generated.incrementalRawCss ?? generated.incrementalCss;
+			const shouldAppendIncrementalCss = canAppendIncrementalCss && typeof options.previousCss === "string" && typeof incrementalRawCss === "string";
+			const normalizedCss = shouldAppendIncrementalCss ? incrementalRawCss.trim().length > 0 ? require_generator.createCssAppend(options.previousCss, await normalizeDeferredGeneratedCss(incrementalRawCss)) : options.previousCss : await normalizeDeferredGeneratedCss(generated.rawCss ?? generated.css);
+			const css = (0, _weapp_tailwindcss_postcss.restoreLocalCssImports)(shouldAppendIncrementalCss ? normalizedCss : await restoreDeferredUserCss(normalizedCss), localImports, { outputFile: file });
+			return {
+				css,
+				classSet: resolveGeneratedCssClassSet(generated.target, generated.classSet, runtimeWithCurrentCss, css, opts.escapeMap, options.previousClassSet),
+				target: generated.target,
+				source: "generator",
+				dependencies: generated.dependencies,
+				incremental: shouldAppendIncrementalCss,
+				metadata: {
+					file,
+					majorVersion,
+					preflightMode,
+					rawCss: generated.rawCss
+				}
+			};
+		}
 		if ((generated.target !== "weapp" || !require_generator.hasUserCssLayerBlocks(generatorRawSource)) && typeof options.previousCss === "string" && typeof generated.incrementalCss === "string") {
 			const incrementalCss = require_generator.stripTailwindBanner(generated.incrementalCss);
 			const css = incrementalCss.trim().length > 0 ? finalizeIncrementalGeneratorCss(options.previousCss, incrementalCss, generated.target, majorVersion, opts.cssPreflight, {
@@ -2376,33 +2528,7 @@ async function generateCssByGenerator(options) {
 				}
 			};
 		}
-		const shouldFilterApplyOnlyCss = require_generator.shouldFilterApplyOnlyGeneratedCss(majorVersion, generated.target, generatorRawSource, {
-			hasGeneratedCss,
-			hasGeneratedMarkers
-		});
-		const generatedCssSource = generated.target === "web" ? generated.css : require_generator.stripTailwindBanner(generated.css);
-		const generatedCss = shouldFilterApplyOnlyCss ? require_generator.filterApplyOnlyGeneratedCss(generatedCssSource, generatorRawSource, { preserveVariables: generated.target !== "web" }) : generatedCssSource;
-		const hasMatchedCssSourceFile = generatorSources.some((source) => source.__weappTailwindcssMeta?.matchedCssSourceFile);
-		const hasExplicitCssSource = generatorSources.some((source) => {
-			const metadata = source.__weappTailwindcssMeta;
-			return metadata?.candidateMatchedCssSource !== true && (metadata?.cssEntryIndex !== void 0 || metadata?.cssSourceIndex !== void 0);
-		});
-		const hasPreflightCssSource = generatorSources.some((source) => {
-			const metadata = source.__weappTailwindcssMeta;
-			const appEntryMatchedByCandidates = metadata?.candidateMatchedCssSource === true && metadata.cssEntryIndex === 0 && metadata.cssSourceIndex === void 0;
-			return metadata?.includesPreflight === true && !appEntryMatchedByCandidates;
-		});
-		const hasPreflightRawSource = require_tailwindcss.includesTailwindV4PreflightDirective(generatorRawSource);
-		const preflightMode = resolveMiniProgramPreflightModeForGeneratorCss(opts, {
-			cssHandlerOptions,
-			isolateCurrentCssCandidates,
-			localImports,
-			explicitCssSource: hasExplicitCssSource,
-			primaryCssSource: generatorSources.length > 0 && generatorSources.every((source) => {
-				const metadata = source.__weappTailwindcssMeta;
-				return metadata?.candidateMatchedCssSource !== true && metadata?.primaryCssSource === true;
-			}) || hasPreflightCssSource || hasPreflightRawSource
-		});
+		const generatedCss = filterGeneratedApplyOnlyCss(generated.target === "web" ? generated.css : require_generator.stripTailwindBanner(generated.css));
 		const orderedExtraCss = require_generator.splitGeneratorPlaceholderCssBySourceOrder(userCssOrderSource, generated.rawCss) ?? (hasMatchedCssSourceFile ? require_generator.splitTailwindV4GeneratedCssBySourceOrder(userCssOrderSource, generated.rawCss) : splitRawSourceByGeneratedCssOrder(userCssOrderSource, generated.rawCss));
 		const shouldAppendMatchedCssSourceCompat = !hasMatchedCssSourceFile || orderedExtraCss !== void 0;
 		if (orderedExtraCss) {
@@ -3552,6 +3678,12 @@ Object.defineProperty(exports, "annotateCssSourceTrace", {
 		return annotateCssSourceTrace;
 	}
 });
+Object.defineProperty(exports, "collectRawSourceClassSelectors", {
+	enumerable: true,
+	get: function() {
+		return collectRawSourceClassSelectors;
+	}
+});
 Object.defineProperty(exports, "collectStrictEscapedRuntimeCandidates", {
 	enumerable: true,
 	get: function() {
@@ -3564,6 +3696,12 @@ Object.defineProperty(exports, "createBundleRuntimeClassSetManager", {
 		return createBundleRuntimeClassSetManager;
 	}
 });
+Object.defineProperty(exports, "createBundlerGeneratedCssMarker", {
+	enumerable: true,
+	get: function() {
+		return createBundlerGeneratedCssMarker;
+	}
+});
 Object.defineProperty(exports, "createCssSourceOrderAppend", {
 	enumerable: true,
 	get: function() {
@@ -3612,18 +3750,36 @@ Object.defineProperty(exports, "emitHmrTiming", {
 		return emitHmrTiming;
 	}
 });
+Object.defineProperty(exports, "extractCandidatesFromSource", {
+	enumerable: true,
+	get: function() {
+		return extractCandidatesFromSource;
+	}
+});
 Object.defineProperty(exports, "extractMarkedUserLayerComponentsCss", {
 	enumerable: true,
 	get: function() {
 		return extractMarkedUserLayerComponentsCss;
 	}
 });
+Object.defineProperty(exports, "finalizeMiniProgramGeneratorCss", {
+	enumerable: true,
+	get: function() {
+		return finalizeMiniProgramGeneratorCss;
+	}
+});
 Object.defineProperty(exports, "generateCssByGenerator", {
 	enumerable: true,
 	get: function() {
 		return generateCssByGenerator;
 	}
 });
+Object.defineProperty(exports, "hasBundlerGeneratedCssMarker", {
+	enumerable: true,
+	get: function() {
+		return hasBundlerGeneratedCssMarker;
+	}
+});
 Object.defineProperty(exports, "hasMiniProgramTailwindV4PreflightReset", {
 	enumerable: true,
 	get: function() {
@@ -3642,6 +3798,12 @@ Object.defineProperty(exports, "isSourceCandidateRequest", {
 		return isSourceCandidateRequest;
 	}
 });
+Object.defineProperty(exports, "isSourceStyleRequest", {
+	enumerable: true,
+	get: function() {
+		return isSourceStyleRequest;
+	}
+});
 Object.defineProperty(exports, "mergeMarkedUserLayerComponentsCss", {
 	enumerable: true,
 	get: function() {
@@ -3660,6 +3822,12 @@ Object.defineProperty(exports, "normalizeMiniProgramImportShell", {
 		return normalizeMiniProgramImportShell;
 	}
 });
+Object.defineProperty(exports, "parseBundlerGeneratedCssMarkerBlocks", {
+	enumerable: true,
+	get: function() {
+		return parseBundlerGeneratedCssMarkerBlocks;
+	}
+});
 Object.defineProperty(exports, "processCachedTask", {
 	enumerable: true,
 	get: function() {
@@ -3702,6 +3870,18 @@ Object.defineProperty(exports, "scoreTailwindV4CssSourceFileMatch", {
 		return scoreTailwindV4CssSourceFileMatch;
 	}
 });
+Object.defineProperty(exports, "stripBundlerGeneratedCssMarkers", {
+	enumerable: true,
+	get: function() {
+		return stripBundlerGeneratedCssMarkers;
+	}
+});
+Object.defineProperty(exports, "stripRequestQuery", {
+	enumerable: true,
+	get: function() {
+		return stripRequestQuery;
+	}
+});
 Object.defineProperty(exports, "validateCandidatesByGenerator", {
 	enumerable: true,
 	get: function() {

package/dist/index.js

@@ -1,10 +1,10 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_framework = require("./framework.js");
 const require_generator = require("./generator-CEnUsjed.js");
-const require_gulp = require("./gulp-C1Q3LRzg.js");
+const require_gulp = require("./gulp-3m1dAiig.js");
 const require_postcss = require("./postcss.js");
-const require_vite = require("./vite-BNlPdsGM.js");
-const require_webpack = require("./webpack-Jpe048pQ.js");
+const require_vite = require("./vite-DUVjMduj.js");
+const require_webpack = require("./webpack-nppysF4B.js");
 require("./webpack.js");
 let _weapp_tailwindcss_postcss = require("@weapp-tailwindcss/postcss");
 exports.WeappTailwindcss = require_vite.WeappTailwindcss;

package/dist/index.mjs

@@ -1,9 +1,9 @@
 import { detectAppType, detectAppTypeFromEnv, detectAppTypeFromPackageJson, isMpxPackage, isRunningInHBuilderX, isTaroPackage, isUniAppPackage, isUniAppVitePackage, isUniAppXManifest, isUniAppXPackage, isWeappVitePackage, resolveImplicitAppTypeFromViteRoot, resolveMpxPlatform, resolvePlatform, resolveTaroPlatform, resolveUniAppXPlatform, resolveUniPlatform, resolveUniPlatformsFromEnv, resolveUniUtsPlatform } from "./framework.mjs";
-import { t as createWeappTailwindcssGenerator } from "./generator-B59OA64h.mjs";
-import { t as createPlugins } from "./gulp-DUYWxmZC.mjs";
+import { t as createWeappTailwindcssGenerator } from "./generator-CEo920So.mjs";
+import { t as createPlugins } from "./gulp-DP71z1jG.mjs";
 import weappTailwindcssPostcssPlugin from "./postcss.mjs";
-import { t as WeappTailwindcss } from "./vite-CBU5NXTX.mjs";
-import { n as weappTailwindcssPackageDir } from "./webpack-CZ38fMGC.mjs";
+import { t as WeappTailwindcss } from "./vite-nXZEiwG0.mjs";
+import { n as weappTailwindcssPackageDir } from "./webpack-C_UUFRgj.mjs";
 import "./webpack.mjs";
 import { unitConversionComposeRules, unitConversionPresets } from "@weapp-tailwindcss/postcss";
 export { WeappTailwindcss, createPlugins, createWeappTailwindcssGenerator, detectAppType, detectAppTypeFromEnv, detectAppTypeFromPackageJson, isMpxPackage, isRunningInHBuilderX, isTaroPackage, isUniAppPackage, isUniAppVitePackage, isUniAppXManifest, isUniAppXPackage, isWeappVitePackage, resolveImplicitAppTypeFromViteRoot, resolveMpxPlatform, resolvePlatform, resolveTaroPlatform, resolveUniAppXPlatform, resolveUniPlatform, resolveUniPlatformsFromEnv, resolveUniUtsPlatform, unitConversionComposeRules, unitConversionPresets, weappTailwindcssPackageDir, weappTailwindcssPostcssPlugin };

package/dist/postcss.mjs

@@ -1,4 +1,4 @@
-import { i as normalizeWeappTailwindcssGeneratorOptions, t as createWeappTailwindcssGenerator, u as resolveTailwindV4Source } from "./generator-B59OA64h.mjs";
+import { i as normalizeWeappTailwindcssGeneratorOptions, t as createWeappTailwindcssGenerator, u as resolveTailwindV4Source } from "./generator-CEo920So.mjs";
 import { createWeappTailwindcssPostcssPlugin } from "@weapp-tailwindcss/postcss";
 const weappTailwindcssPostcssPlugin = createWeappTailwindcssPostcssPlugin({
 	createGenerator: (source) => {

package/dist/presets.mjs

@@ -1,6 +1,6 @@
 import { resolveTaroPlatform, resolveUniPlatformsFromEnv } from "./framework.mjs";
 import { t as omitUndefined } from "./object-BJSWl-E5.mjs";
-import { i as resolveUniAppXOptions, n as resolveTailwindcssBasedir } from "./tailwindcss-DPcKMLxL.mjs";
+import { i as resolveUniAppXOptions, n as resolveTailwindcssBasedir } from "./tailwindcss-xs704TRw.mjs";
 import { n as defuOverrideArray } from "./utils-MVwpU07P.mjs";
 import { t as logger } from "./logger-BNzxZbZj.mjs";
 import path from "node:path";

package/dist/rspack.js

@@ -1,6 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_rolldown_runtime = require("./rolldown-runtime-emK7D4bc.js");
-const require_webpack = require("./webpack-Jpe048pQ.js");
+const require_webpack = require("./webpack-nppysF4B.js");
 let node_path = require("node:path");
 node_path = require_rolldown_runtime.__toESM(node_path);
 //#region src/bundlers/rspack/index.ts

package/dist/rspack.mjs

@@ -1,4 +1,4 @@
-import { n as weappTailwindcssPackageDir, r as __dirname, t as WeappTailwindcss } from "./webpack-CZ38fMGC.mjs";
+import { n as weappTailwindcssPackageDir, r as __dirname, t as WeappTailwindcss } from "./webpack-C_UUFRgj.mjs";
 import path from "node:path";
 //#region src/bundlers/rspack/index.ts
 const CSS_IMPORT_REWRITE_LOADER_NAME = "weapp-tw-css-import-rewrite-loader";

package/dist/shared/mpx.d.ts

@@ -1,7 +1,10 @@
 import type { AppType } from '../types';
+import path from 'node:path';
 export declare function isMpx(appType?: AppType): appType is "mpx";
 export declare function getTailwindcssCssEntry(pkgDir: string): string;
-export declare function patchMpxWebpackPluginNormalizeLib(compiler: any, mpxWebpackPluginDir: string | undefined): boolean;
+export declare function rewriteMpxWebpackPluginRequests(request: string, mpxWebpackPluginDir: string, pathImpl?: Pick<typeof path, 'join'>): string;
+export declare function patchMpxWebpackPluginRequests(compiler: any, mpxWebpackPluginDir: string | undefined): boolean;
+export declare function patchMpxWebpackPluginNormalizeLib(_compiler: any, mpxWebpackPluginDir: string | undefined): boolean;
 export declare function ensureMpxTailwindcssAliases(compiler: any, pkgDir: string): string;
 export declare function patchMpxLoaderResolve(loaderContext: any, pkgDir: string, enabled: boolean): void;
 export declare function setupMpxTailwindcssRedirect(pkgDir: string, enabled: boolean): void;

package/dist/{source-candidate-scan-signature-R3dzamcm.js → source-candidate-scan-signature-BAahhiwb.js}

@@ -3,7 +3,7 @@ const require_framework = require("./framework.js");
 require("./auto-DtU6f3X6.js");
 const require_tailwindcss = require("./tailwindcss-KBYPJ2DW.js");
 const require_wxml = require("./wxml-Ce10eREX.js");
-const require_hmr_timing = require("./hmr-timing-BZ5sWIqO.js");
+const require_hmr_timing = require("./hmr-timing-B8p4f0ca.js");
 let node_path = require("node:path");
 node_path = require_rolldown_runtime.__toESM(node_path);
 let node_process = require("node:process");
@@ -229,39 +229,6 @@ function resolvePackageDir(name) {
 	return node_path.default.dirname(pkgPath);
 }
 //#endregion
-//#region src/bundlers/shared/generated-css-marker.ts
-const BUNDLER_GENERATED_CSS_MARKER_RE = /\/\*!?\s*weapp-tailwindcss (?:vite|webpack)-generated-css(?:\s*:\s*[^\s*]+)?\s*\*\/\s*/i;
-const BUNDLER_GENERATED_CSS_MARKER_GLOBAL_RE = /\/\*!?\s*weapp-tailwindcss (?:vite|webpack)-generated-css(?:\s*:\s*[^\s*]+)?\s*\*\/\s*/gi;
-const BUNDLER_GENERATED_CSS_MARKER_CAPTURE_RE = /\/\*!?\s*weapp-tailwindcss (vite|webpack)-generated-css(?:\s*:\s*([^\s*]+))?\s*\*\/\s*/gi;
-const VITE_INTERNAL_CSS_MARKER_GLOBAL_RE = /\/\*\$vite\$:\d+\*\/\s*/g;
-function createBundlerGeneratedCssMarker(bundler, file) {
-	return `/*! weapp-tailwindcss ${bundler}-generated-css:${encodeURIComponent(file)} */`;
-}
-function hasBundlerGeneratedCssMarker(source) {
-	return typeof source === "string" && BUNDLER_GENERATED_CSS_MARKER_RE.test(source);
-}
-function stripBundlerGeneratedCssMarkers(source) {
-	return source.replace(BUNDLER_GENERATED_CSS_MARKER_GLOBAL_RE, "").replace(VITE_INTERNAL_CSS_MARKER_GLOBAL_RE, "");
-}
-function parseBundlerGeneratedCssMarkerBlocks(source) {
-	const blocks = [];
-	BUNDLER_GENERATED_CSS_MARKER_CAPTURE_RE.lastIndex = 0;
-	let match = BUNDLER_GENERATED_CSS_MARKER_CAPTURE_RE.exec(source);
-	while (match !== null) {
-		const cssStart = BUNDLER_GENERATED_CSS_MARKER_CAPTURE_RE.lastIndex;
-		const nextMatch = BUNDLER_GENERATED_CSS_MARKER_CAPTURE_RE.exec(source);
-		const cssEnd = nextMatch?.index ?? source.length;
-		const file = match[2] ? decodeURIComponent(match[2]) : void 0;
-		blocks.push({
-			bundler: match[1],
-			file,
-			css: source.slice(cssStart, cssEnd)
-		});
-		match = nextMatch;
-	}
-	return blocks;
-}
-//#endregion
 //#region src/bundlers/shared/module-graph.ts
 const QUERY_HASH_RE = /[?#].*$/u;
 const PROTOCOL_RE = /^[a-z][a-z+.-]*:/iu;
@@ -306,30 +273,6 @@ function resolveOutputSpecifier(specifier, importer, outDir, hasOutput) {
 	return matchWithExtensions(candidate, hasOutput);
 }
 //#endregion
-//#region src/bundlers/shared/style-requests.ts
-const SOURCE_STYLE_EXT_RE = /\.(?:css|scss|sass|less|styl|stylus|pcss|postcss)$/i;
-const STYLE_QUERY_RE = /(?:^|&)type=styles?(?:&|$)/;
-const STYLE_LANG_QUERY_RE = /(?:^|&)lang(?:[.=](?:css|scss|sass|less|styl|stylus|pcss|postcss))?(?:&|$)/;
-function stripHash(request) {
-	const hashIndex = request.indexOf("#");
-	return hashIndex === -1 ? request : request.slice(0, hashIndex);
-}
-function stripRequestQuery(request) {
-	const normalized = stripHash(request);
-	const queryIndex = normalized.indexOf("?");
-	return queryIndex === -1 ? normalized : normalized.slice(0, queryIndex);
-}
-function isSourceStyleRequest(request) {
-	if (typeof request !== "string" || request.length === 0) return false;
-	const normalized = stripHash(request);
-	const queryIndex = normalized.indexOf("?");
-	const pathname = queryIndex === -1 ? normalized : normalized.slice(0, queryIndex);
-	if (SOURCE_STYLE_EXT_RE.test(pathname)) return true;
-	if (queryIndex === -1) return false;
-	const query = normalized.slice(queryIndex + 1);
-	return STYLE_QUERY_RE.test(query) || STYLE_LANG_QUERY_RE.test(query);
-}
-//#endregion
 //#region src/bundlers/shared/v4-generation-core.ts
 async function generateTailwindV4Css(options) {
 	const majorVersion = options.runtimeState.tailwindRuntime.majorVersion;
@@ -476,7 +419,7 @@ const isWindows = node_process.default.platform === "win32";
 const cssLangRE = new RegExp(`\\.(?:css|less|sass|scss|styl|stylus|pcss|postcss)(?:$|\\?)`);
 const htmlLangRE = /\.html?(?:$|\?)/;
 function isCSSRequest(request) {
-	return cssLangRE.test(request) || isSourceStyleRequest(request);
+	return cssLangRE.test(request) || require_hmr_timing.isSourceStyleRequest(request);
 }
 function isHTMLRequest(request) {
 	return htmlLangRE.test(request);
@@ -510,6 +453,7 @@ function createBundleBuildState() {
 		runtimeAffectingHashByFile: /* @__PURE__ */ new Map(),
 		linkedByEntry: /* @__PURE__ */ new Map(),
 		dependentsByLinkedFile: /* @__PURE__ */ new Map(),
+		bundleMarkupCandidatesByFile: /* @__PURE__ */ new Map(),
 		generatorCandidateSignature: void 0
 	};
 }
@@ -530,7 +474,7 @@ function createProcessFiles() {
 }
 function readEntrySource(output) {
 	if (output.type === "chunk") return output.code;
-	return output.source.toString();
+	return typeof output.source === "string" ? output.source : node_buffer.Buffer.from(output.source).toString();
 }
 function classifyBundleEntry(file, opts) {
 	if (opts.htmlMatcher(file) || isHTMLRequest(file)) return "html";
@@ -830,12 +774,6 @@ Object.defineProperty(exports, "createBundleModuleGraphOptions", {
 		return createBundleModuleGraphOptions;
 	}
 });
-Object.defineProperty(exports, "createBundlerGeneratedCssMarker", {
-	enumerable: true,
-	get: function() {
-		return createBundlerGeneratedCssMarker;
-	}
-});
 Object.defineProperty(exports, "createCandidateSignature", {
 	enumerable: true,
 	get: function() {
@@ -902,12 +840,6 @@ Object.defineProperty(exports, "getSnapshotHash", {
 		return getSnapshotHash;
 	}
 });
-Object.defineProperty(exports, "hasBundlerGeneratedCssMarker", {
-	enumerable: true,
-	get: function() {
-		return hasBundlerGeneratedCssMarker;
-	}
-});
 Object.defineProperty(exports, "hasRuntimeAffectingSourceChanges", {
 	enumerable: true,
 	get: function() {
@@ -926,12 +858,6 @@ Object.defineProperty(exports, "isHTMLRequest", {
 		return isHTMLRequest;
 	}
 });
-Object.defineProperty(exports, "isSourceStyleRequest", {
-	enumerable: true,
-	get: function() {
-		return isSourceStyleRequest;
-	}
-});
 Object.defineProperty(exports, "normalizeOutputPathKey", {
 	enumerable: true,
 	get: function() {
@@ -944,12 +870,6 @@ Object.defineProperty(exports, "normalizePath", {
 		return normalizePath;
 	}
 });
-Object.defineProperty(exports, "parseBundlerGeneratedCssMarkerBlocks", {
-	enumerable: true,
-	get: function() {
-		return parseBundlerGeneratedCssMarkerBlocks;
-	}
-});
 Object.defineProperty(exports, "resolveOutputSpecifier", {
 	enumerable: true,
 	get: function() {
@@ -986,18 +906,6 @@ Object.defineProperty(exports, "slash", {
 		return slash;
 	}
 });
-Object.defineProperty(exports, "stripBundlerGeneratedCssMarkers", {
-	enumerable: true,
-	get: function() {
-		return stripBundlerGeneratedCssMarkers;
-	}
-});
-Object.defineProperty(exports, "stripRequestQuery", {
-	enumerable: true,
-	get: function() {
-		return stripRequestQuery;
-	}
-});
 Object.defineProperty(exports, "summarizeStringDiff", {
 	enumerable: true,
 	get: function() {