weapp-tailwindcss 5.0.0-next.30 → 5.0.0-next.32

package/dist/{vite-rmL1rsA_.mjs → vite-BAHjBu8j.mjs}

@@ -1,16 +1,16 @@
-import { C as __esmMin, S as __commonJSMin, _ as toCustomAttributesEntities, a as vitePluginName, c as createAttributeMatcher, d as _defineProperty, f as init_defineProperty, h as babelParse, l as analyzeSource, m as replaceWxml, n as getCompilerContext, p as isClassContextLiteralPath, s as generateCode, t as shouldSkipJsTransform, u as JsTokenUpdater, v as collectRuntimeClassSet, w as __require, x as refreshTailwindRuntimeState, y as createTailwindRuntimeReadyPromise } from "./precheck-D7K12zeX.mjs";
-import { B as createDebug, E as filterUnsupportedMiniProgramTailwindV4Candidates, J as findNearestPackageRoot, U as findTailwindConfig, W as resolveTailwindcssOptions, _ as resolveViteSourceScanEntries, g as resolveTailwindV4EntriesFromCssCached, l as getRuntimeClassSetSignature, m as discoverTailwindV4CssEntries, p as createViteSourceScanMatcher, q as omitUndefined, v as resolveViteTailwindV4CssDependencies } from "./v3-engine-DcvCCHfs.mjs";
-import { i as normalizeWeappTailwindcssGeneratorOptions } from "./generator-Qw-tZ0Z2.mjs";
-import { a as validateCandidatesByGenerator, c as hasTailwindSourceDirectives, i as generateCssByGenerator, l as normalizeTailwindSourceForGenerator, n as createHmrTimingRecorder, o as processCachedTask, s as hasTailwindRootDirectives, t as createBundleRuntimeClassSetManager, u as hasTailwindGeneratedCssMarkers } from "./incremental-runtime-class-set-BdZHkoTs.mjs";
+import { C as __esmMin, S as __commonJSMin, _ as toCustomAttributesEntities, a as vitePluginName, c as createAttributeMatcher, d as _defineProperty, f as init_defineProperty, h as babelParse, l as analyzeSource, m as replaceWxml, n as getCompilerContext, p as isClassContextLiteralPath, s as generateCode, t as shouldSkipJsTransform, u as JsTokenUpdater, v as collectRuntimeClassSet, w as __require, x as refreshTailwindRuntimeState, y as createTailwindRuntimeReadyPromise } from "./precheck-nITnYBDn.mjs";
+import { B as createDebug, E as filterUnsupportedMiniProgramTailwindV4Candidates, J as findNearestPackageRoot, U as findTailwindConfig, W as resolveTailwindcssOptions, _ as resolveViteSourceScanEntries, g as resolveTailwindV4EntriesFromCssCached, l as getRuntimeClassSetSignature, m as discoverTailwindV4CssEntries, p as createViteSourceScanMatcher, q as omitUndefined, v as resolveViteTailwindV4CssDependencies } from "./v3-engine-C_KeUQG3.mjs";
+import { i as normalizeWeappTailwindcssGeneratorOptions } from "./generator-CpsHA4Wd.mjs";
+import { a as validateCandidatesByGenerator, c as hasTailwindRootDirectives, d as hasTailwindGeneratedCssMarkers, i as generateCssByGenerator, l as hasTailwindSourceDirectives, n as createHmrTimingRecorder, o as mergeMarkedUserLayerComponentsCss, s as processCachedTask, t as createBundleRuntimeClassSetManager, u as normalizeTailwindSourceForGenerator } from "./incremental-runtime-class-set-D2fsgk5t.mjs";
 import { o as resolveUniUtsPlatform } from "./utils-DsaS975I.mjs";
-import { c as upsertTailwindV4CssSource, i as resolveUniAppXOptions, r as isUniAppXEnabled, s as hasConfiguredTailwindV4CssRoots } from "./tailwindcss-C7dJHZ0G.mjs";
-import { n as isSourceCandidateRequest, t as createSourceCandidateCollector } from "./source-candidates-CX2ozpKM.mjs";
-import { a as createBundleModuleGraphOptions, b as toAbsoluteOutputPath, c as hasBundlerGeneratedCssMarker, d as resolvePluginDisabledState, f as cleanUrl, g as isSourceStyleRequest, h as slash, i as applyLinkedResults, l as stripBundlerGeneratedCssMarkers, m as isCSSRequest, n as createBundleBuildState, o as pushConcurrentTaskFactories, p as formatPostcssSourceMap, r as updateBundleBuildState, s as createBundlerGeneratedCssMarker, t as buildBundleSnapshot, u as resolvePackageDir, v as normalizeOutputPathKey } from "./bundle-state-Bi-cQua6.mjs";
+import { c as upsertTailwindV4CssSource, i as resolveUniAppXOptions, r as isUniAppXEnabled, s as hasConfiguredTailwindV4CssRoots } from "./tailwindcss-udhXxMX9.mjs";
+import { n as isSourceCandidateRequest, t as createSourceCandidateCollector } from "./source-candidates-_x8bq0Mz.mjs";
+import { a as createBundleModuleGraphOptions, b as toAbsoluteOutputPath, c as hasBundlerGeneratedCssMarker, d as resolvePluginDisabledState, f as cleanUrl, g as isSourceStyleRequest, h as slash, i as applyLinkedResults, l as stripBundlerGeneratedCssMarkers, m as isCSSRequest, n as createBundleBuildState, o as pushConcurrentTaskFactories, p as formatPostcssSourceMap, r as updateBundleBuildState, s as createBundlerGeneratedCssMarker, t as buildBundleSnapshot, u as resolvePackageDir, v as normalizeOutputPathKey } from "./bundle-state-BIsgsoNW.mjs";
 import { t as logger$1 } from "./logger-BNzxZbZj.mjs";
 import fs, { existsSync, readFileSync } from "node:fs";
 import postcss from "postcss";
-import path from "node:path";
 import process$1 from "node:process";
+import path from "node:path";
 import { logger } from "@weapp-tailwindcss/logger";
 import { readFile } from "node:fs/promises";
 import MagicString from "magic-string";
@@ -22380,7 +22380,7 @@ function collectViteProcessedCssAssetResults(bundle, options) {
 	return collected;
 }
 function injectViteProcessedCssIntoMainCssAssets(bundle, options) {
-	const viteCssResults = [...options.getViteProcessedCssAssetResults?.() ?? []].filter(([file, css]) => isCssOutputFile(file) && css.length > 0);
+	const viteCssResults = [...options.getViteProcessedCssAssetResults?.() ?? []].filter(([, css]) => css.length > 0);
 	if (viteCssResults.length === 0) return 0;
 	let injected = 0;
 	for (const [bundleFile, output] of Object.entries(bundle)) {
@@ -22393,7 +22393,13 @@ function injectViteProcessedCssIntoMainCssAssets(bundle, options) {
 		for (const [sourceFile, sourceCss] of viteCssResults) {
 			if (normalizeOutputPathKey(sourceFile) === mainFileKey || options.opts.mainCssChunkMatcher(sourceFile, options.opts.appType)) continue;
 			const css = stripBundlerGeneratedCssMarkers(sourceCss).trim();
-			if (css.length === 0 || nextCss.includes(css)) continue;
+			if (css.length === 0) continue;
+			const mergedLayerCss = mergeMarkedUserLayerComponentsCss(nextCss, css);
+			if (mergedLayerCss.merged) {
+				nextCss = mergedLayerCss.css;
+				continue;
+			}
+			if (nextCss.includes(css)) continue;
 			nextCss = appendCss(nextCss, css);
 		}
 		if (nextCss === originalSource) continue;
@@ -24209,6 +24215,7 @@ function WeappTailwindcss(options = {}) {
 		if (!generated) return;
 		for (const dependency of generated.dependencies) hookContext?.addWatchFile?.(dependency);
 		viteGeneratedCssByFile.set(file, generated.css);
+		if (generated.css.includes("weapp-tailwindcss layer components start")) recordViteProcessedCssAssetResult(file, generated.css);
 		markViteProcessedCssSource(file);
 		rememberTailwindRootCssModule(id);
 		recordGeneratorCandidates(runtime);

package/dist/{vite-C65DdWEj.js → vite-CYkkJZ3Q.js}

@@ -1,21 +1,21 @@
 const require_chunk = require("./chunk-C5U5_Hdc.js");
-const require_v3_engine = require("./v3-engine-CHItlVq5.js");
-const require_generator = require("./generator-CrU-Ghc1.js");
-const require_incremental_runtime_class_set = require("./incremental-runtime-class-set-BxvZONkv.js");
-const require_precheck = require("./precheck-D7gJSmJz.js");
+const require_v3_engine = require("./v3-engine-DwY4Fixu.js");
+const require_generator = require("./generator-BEXaaUzP.js");
+const require_incremental_runtime_class_set = require("./incremental-runtime-class-set-CLP1Qv8F.js");
+const require_precheck = require("./precheck-CQeqnfo5.js");
 const require_utils = require("./utils-D7Ygohep.js");
-const require_tailwindcss = require("./tailwindcss-B-e2RiXr.js");
-const require_source_candidates = require("./source-candidates-DNM8iwXW.js");
-const require_bundle_state = require("./bundle-state-Ct_8GcSR.js");
+const require_tailwindcss = require("./tailwindcss-Cl7hUlYV.js");
+const require_source_candidates = require("./source-candidates-7Q-kTOSb.js");
+const require_bundle_state = require("./bundle-state-C4ib5xPG.js");
 require("./logger-TlKT3xmR.js");
 let node_fs = require("node:fs");
 node_fs = require_chunk.__toESM(node_fs);
 let postcss = require("postcss");
 postcss = require_chunk.__toESM(postcss);
-let node_path = require("node:path");
-node_path = require_chunk.__toESM(node_path);
 let node_process = require("node:process");
 node_process = require_chunk.__toESM(node_process);
+let node_path = require("node:path");
+node_path = require_chunk.__toESM(node_path);
 let _weapp_tailwindcss_logger = require("@weapp-tailwindcss/logger");
 let node_fs_promises = require("node:fs/promises");
 let magic_string = require("magic-string");
@@ -22389,7 +22389,7 @@ function collectViteProcessedCssAssetResults(bundle, options) {
 	return collected;
 }
 function injectViteProcessedCssIntoMainCssAssets(bundle, options) {
-	const viteCssResults = [...options.getViteProcessedCssAssetResults?.() ?? []].filter(([file, css]) => isCssOutputFile(file) && css.length > 0);
+	const viteCssResults = [...options.getViteProcessedCssAssetResults?.() ?? []].filter(([, css]) => css.length > 0);
 	if (viteCssResults.length === 0) return 0;
 	let injected = 0;
 	for (const [bundleFile, output] of Object.entries(bundle)) {
@@ -22402,7 +22402,13 @@ function injectViteProcessedCssIntoMainCssAssets(bundle, options) {
 		for (const [sourceFile, sourceCss] of viteCssResults) {
 			if (require_bundle_state.normalizeOutputPathKey(sourceFile) === mainFileKey || options.opts.mainCssChunkMatcher(sourceFile, options.opts.appType)) continue;
 			const css = require_bundle_state.stripBundlerGeneratedCssMarkers(sourceCss).trim();
-			if (css.length === 0 || nextCss.includes(css)) continue;
+			if (css.length === 0) continue;
+			const mergedLayerCss = require_incremental_runtime_class_set.mergeMarkedUserLayerComponentsCss(nextCss, css);
+			if (mergedLayerCss.merged) {
+				nextCss = mergedLayerCss.css;
+				continue;
+			}
+			if (nextCss.includes(css)) continue;
 			nextCss = appendCss(nextCss, css);
 		}
 		if (nextCss === originalSource) continue;
@@ -24218,6 +24224,7 @@ function WeappTailwindcss(options = {}) {
 		if (!generated) return;
 		for (const dependency of generated.dependencies) hookContext?.addWatchFile?.(dependency);
 		viteGeneratedCssByFile.set(file, generated.css);
+		if (generated.css.includes("weapp-tailwindcss layer components start")) recordViteProcessedCssAssetResult(file, generated.css);
 		markViteProcessedCssSource(file);
 		rememberTailwindRootCssModule(id);
 		recordGeneratorCandidates(runtime);

package/dist/vite.js

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

package/dist/vite.mjs

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

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

@@ -278,6 +278,126 @@ const creator = () => {
 };
 creator.postcss = true;
 const CSS_MACRO_STYLE_OPTIONS_MARKER = "__weappTailwindcssCssMacroEnabled";
+const PLATFORM_ENV_KEYS = [
+	"WEAPP_TW_TARGET",
+	"WEAPP_TAILWINDCSS_TARGET",
+	"UNI_PLATFORM",
+	"UNI_UTS_PLATFORM",
+	"TARO_ENV",
+	"MPX_CLI_MODE",
+	"MPX_CURRENT_TARGET_MODE"
+];
+const CONDITIONAL_END_RE = /^\s*#endif\s*$/;
+function readEnvValue(key) {
+	return typeof node_process.default === "undefined" ? void 0 : node_process.default.env[key];
+}
+function normalizePlatformToken(value) {
+	return value?.trim().replaceAll("_", "-").toUpperCase() || void 0;
+}
+function resolveCssMacroPlatform(options) {
+	const explicit = normalizePlatformToken(options?.platform);
+	if (explicit) return explicit;
+	for (const key of PLATFORM_ENV_KEYS) {
+		const value = normalizePlatformToken(readEnvValue(key));
+		if (value) return value;
+	}
+}
+function createPlatformTokenSet(platform) {
+	const normalized = normalizePlatformToken(platform);
+	const tokens = /* @__PURE__ */ new Set();
+	if (!normalized) return tokens;
+	tokens.add(normalized);
+	if (normalized.startsWith("MP-")) tokens.add("MP");
+	if (normalized === "WEAPP" || normalized === "WEIXIN" || normalized === "WX") {
+		tokens.add("MP");
+		tokens.add("MP-WEIXIN");
+	}
+	if (normalized === "MP-WEIXIN") {
+		tokens.add("WEAPP");
+		tokens.add("WEIXIN");
+		tokens.add("WX");
+	}
+	if (normalized === "H5") tokens.add("WEB");
+	if (normalized === "WEB") tokens.add("H5");
+	if (normalized === "APP") tokens.add("APP-PLUS");
+	if (normalized.startsWith("APP-")) tokens.add("APP");
+	if (normalized.startsWith("QUICKAPP-WEBVIEW")) tokens.add("QUICKAPP-WEBVIEW");
+	return tokens;
+}
+function combineAnd(values) {
+	if (values.includes(false)) return false;
+	return values.every((value) => value === true) ? true : void 0;
+}
+function combineOr(values) {
+	if (values.includes(true)) return true;
+	return values.every((value) => value === false) ? false : void 0;
+}
+function evaluatePlatformExpression(expression, platformTokens) {
+	return combineOr(expression.split(/\s*\|\|\s*/).map((orPart) => {
+		return combineAnd(orPart.split(/\s*&&\s*/).map((part) => {
+			const token = normalizePlatformToken(part);
+			if (!token || /[<>=!()]/.test(token)) return;
+			return platformTokens.has(token);
+		}));
+	}));
+}
+function negateConditionalValue(value) {
+	return value === void 0 ? void 0 : !value;
+}
+function getActiveConditionalValue(stack) {
+	if (stack.includes(false)) return false;
+	return stack.includes(void 0) ? void 0 : true;
+}
+function parseConditionalStart(text) {
+	const normalized = text.trim();
+	if (!normalized.startsWith("#")) return;
+	const body = normalized.slice(1).trimStart();
+	for (const directive of ["ifndef", "ifdef"]) {
+		if (!body.startsWith(directive)) continue;
+		const expression = body.slice(directive.length).trim();
+		if (expression.length === 0) return;
+		return {
+			directive,
+			expression
+		};
+	}
+}
+function compileCssMacroConditionalComments(css, options) {
+	const platformTokens = createPlatformTokenSet(resolveCssMacroPlatform(options));
+	if (platformTokens.size === 0 || !css.includes("#if")) return css;
+	try {
+		const root = require_runtime_registry.postcss_default.parse(css);
+		const transformContainer = (container) => {
+			const stack = [];
+			for (const node of [...container.nodes ?? []]) {
+				if (node.type === "comment") {
+					const start = parseConditionalStart(node.text);
+					if (start) {
+						const value = start.directive === "ifndef" ? negateConditionalValue(evaluatePlatformExpression(start.expression, platformTokens)) : evaluatePlatformExpression(start.expression, platformTokens);
+						const parentActive = getActiveConditionalValue(stack);
+						stack.push(value);
+						if (parentActive !== void 0 && value !== void 0) node.remove();
+						continue;
+					}
+					if (CONDITIONAL_END_RE.test(node.text)) {
+						const value = stack.pop();
+						if (getActiveConditionalValue(stack) !== void 0 && value !== void 0) node.remove();
+						continue;
+					}
+				}
+				if (getActiveConditionalValue(stack) === false) {
+					node.remove();
+					continue;
+				}
+				if ("nodes" in node && node.nodes) transformContainer(node);
+			}
+		};
+		transformContainer(root);
+		return root.toString();
+	} catch {
+		return css;
+	}
+}
 function isCssMacroTailwindPlugin(value) {
 	return Boolean(value && (typeof value === "function" || typeof value === "object") && value["__weappTailwindcssCssMacro"] === true);
 }
@@ -338,8 +458,9 @@ function withCssMacroStyleOptions(options) {
 function hasCssMacroStyleOptions(options) {
 	return Boolean(options?.[CSS_MACRO_STYLE_OPTIONS_MARKER]);
 }
-async function transformCssMacroCss(css) {
-	return (await require_runtime_registry.postcss_default([creator()]).process(css, { from: void 0 })).css;
+async function transformCssMacroCss(css, options) {
+	const result = (await require_runtime_registry.postcss_default([creator()]).process(css, { from: void 0 })).css;
+	return compileCssMacroConditionalComments(result, options);
 }
 //#endregion
 //#region src/context/workspace.ts
@@ -912,7 +1033,7 @@ function normalizeTailwindV4GeneratedUrlValues(css) {
 	});
 }
 async function transformTailwindV4CssToWeapp(css, options) {
-	const protectedCss = (0, _weapp_tailwindcss_postcss.protectDynamicColorMixAlpha)(normalizeTailwindV4GeneratedUrlValues(css), { customPropertyValues: options && "customPropertyValues" in options ? options.customPropertyValues : void 0 });
+	const protectedCss = (0, _weapp_tailwindcss_postcss.protectDynamicColorMixAlpha)(normalizeTailwindV4GeneratedUrlValues(hasCssMacroStyleOptions(options) ? await transformCssMacroCss(css, options) : css), { customPropertyValues: options && "customPropertyValues" in options ? options.customPropertyValues : void 0 });
 	const result = await defaultStyleHandler$1(protectedCss.css, {
 		cssChildCombinatorReplaceValue: ["view", "text"],
 		cssRemoveHoverPseudoClass: true,
@@ -925,7 +1046,7 @@ async function transformTailwindV4CssToWeapp(css, options) {
 }
 async function transformTailwindV4CssByTarget(css, target, options) {
 	if (target === "weapp") return transformTailwindV4CssToWeapp(css, options);
-	return hasCssMacroStyleOptions(options) ? transformCssMacroCss(css) : css;
+	return hasCssMacroStyleOptions(options) ? transformCssMacroCss(css, options) : css;
 }
 //#endregion
 //#region src/tailwindcss/v4-engine/tailwind-v3-default-colors.ts
@@ -2625,7 +2746,7 @@ function ensureMiniProgramV3PreflightReset(css, cssPreflight) {
 	}
 }
 async function transformTailwindV3CssToWeapp(css, options) {
-	const result = await defaultStyleHandler(css, {
+	const result = await defaultStyleHandler(hasCssMacroStyleOptions(options) ? await transformCssMacroCss(css, options) : css, {
 		cssChildCombinatorReplaceValue: ["view", "text"],
 		cssRemoveHoverPseudoClass: true,
 		isMainChunk: true,
@@ -2640,7 +2761,7 @@ async function transformTailwindV3CssToWeapp(css, options) {
 }
 async function transformTailwindV3CssByTarget(css, target, options) {
 	if (target === "weapp") return transformTailwindV3CssToWeapp(css, options);
-	return hasCssMacroStyleOptions(options) ? transformCssMacroCss(css) : css;
+	return hasCssMacroStyleOptions(options) ? transformCssMacroCss(css, options) : css;
 }
 //#endregion
 //#region src/tailwindcss/v3-engine/generator.ts
@@ -3272,6 +3393,11 @@ const TAILWIND_ROOT_DIRECTIVE_RE = /@(?:import\s+(?:url\(\s*)?["']?tailwindcss4?
 const TAILWIND_EXTRACTABLE_DIRECTIVE_RE = /^\s*@(?:import|use|forward|tailwind|config|source|reference|plugin)\b[\s\S]*?(?:;|$)/;
 const TAILWIND_EXTRACTABLE_LAYER_STATEMENT_RE = /^\s*@layer\s[^;{]+;\s*$/;
 const TAILWIND_EXTRACTABLE_BLOCK_START_RE = /^\s*@(?:layer|theme|utility|variant|custom-variant)\b[\s\S]*\{/;
+const TAILWIND_V3_SUBPATH_IMPORT_LAYERS = new Map([
+	["tailwindcss/base", "base"],
+	["tailwindcss/components", "components"],
+	["tailwindcss/utilities", "utilities"]
+]);
 function parseImportRequest(params) {
 	return /^(?:url\(\s*)?(["']?)([^"')\s]+)\1\s*\)?/.exec(params.trim())?.[2];
 }
@@ -3451,6 +3577,24 @@ function hasPreprocessorOnlySyntax(rawSource) {
 function normalizeTailwindSourceForGenerator(rawSource, options = {}) {
 	return hasPreprocessorOnlySyntax(rawSource) ? extractTailwindSourceForPostcssFallback(rawSource, options) ?? rawSource : rawSource;
 }
+function normalizeTailwindV3CssEntrySource(rawSource) {
+	try {
+		const root = require_runtime_registry.postcss_default.parse(rawSource);
+		let changed = false;
+		root.walkAtRules("import", (node) => {
+			const layer = TAILWIND_V3_SUBPATH_IMPORT_LAYERS.get(parseImportRequest(node.params) ?? "");
+			if (!layer) return;
+			node.replaceWith(require_runtime_registry.postcss_default.atRule({
+				name: "tailwind",
+				params: layer
+			}));
+			changed = true;
+		});
+		return changed ? root.toString() : rawSource;
+	} catch {
+		return rawSource;
+	}
+}
 function normalizeTailwindSourceDirectives(rawSource, options = {}) {
 	if (!options.importFallback) return rawSource;
 	try {
@@ -4332,14 +4476,14 @@ async function resolveGeneratorSource(majorVersion, runtimeState, rawSource, fil
 			css: rawSource
 		} : void 0;
 		const sourceSideEntrySource = canResolveSourceSideCssEntry(file, cssHandlerOptions) ? resolveSourceSideCssEntrySource(file, mergedSourceOptions, { removeConfig: true }) : void 0;
-		const resolvedEntrySource = shouldResolveSourceSideCssEntry(rawSource) ? applyEntrySource ?? cssEntrySource ?? sourceSideEntrySource : shouldPreferTailwindV3SourceSideEntry(rawSource, sourceSideEntrySource) ? sourceSideEntrySource ?? cssEntrySource : cssEntrySource ?? applyEntrySource ?? sourceSideEntrySource;
+		const resolvedEntrySource = shouldResolveSourceSideCssEntry(rawSource) ? cssEntrySource ?? applyEntrySource ?? sourceSideEntrySource : shouldPreferTailwindV3SourceSideEntry(rawSource, sourceSideEntrySource) ? sourceSideEntrySource ?? cssEntrySource : cssEntrySource ?? applyEntrySource ?? sourceSideEntrySource;
 		if (!resolvedEntrySource) return generatorOptions?.config ? resolveTailwindV3Source(mergedSourceOptions) : resolveTailwindV3SourceFromPatcher(runtimeState.twPatcher);
 		if (cssEntrySource && !sourceSideEntrySource && !applyEntrySource && !hasTailwindRootDirectives(rawSource, { importFallback: true })) return generatorOptions?.config ? resolveTailwindV3Source(mergedSourceOptions) : resolveTailwindV3SourceFromPatcher(runtimeState.twPatcher);
 		const config = resolveExistingConfigPath(resolvedEntrySource.config, resolvedEntrySource.configRequest, file, omitUndefined(mergedSourceOptions));
 		return resolveTailwindV3Source({
 			...mergedSourceOptions,
 			base: resolvedEntrySource.base,
-			css: resolvedEntrySource.css,
+			css: normalizeTailwindV3CssEntrySource(resolvedEntrySource.css),
 			...config ? { config } : {}
 		});
 	}
@@ -4686,6 +4830,71 @@ function inheritLegacyUnitConvertedDeclarations(css, legacyCss) {
 	}
 }
 //#endregion
+//#region src/bundlers/shared/generator-css/user-layer-order.ts
+const USER_LAYER_COMPONENTS_START = "/*! weapp-tailwindcss layer components start */";
+const USER_LAYER_COMPONENTS_END = "/*! weapp-tailwindcss layer components end */";
+const UTILITY_LAYER_INSERTION_RES = [
+	/(^|\n)\.(?:fixed|absolute|relative|sticky|static)\s*\{/,
+	/(^|\n)\.(?:block|inline-block|inline|flex|inline-flex|grid|hidden)\s*\{/,
+	/(^|\n)\.(?:m|mx|my|mt|mr|mb|ml|p|px|py|pt|pr|pb|pl)-/,
+	/(^|\n)\.(?:w|h|min-w|min-h|max-w|max-h)-/,
+	/(^|\n)\.(?:bg|text|border|rounded|shadow|opacity|transition|transform|translate|scale|rotate|gap|items|justify|content)-/
+];
+function appendCss(base, extra) {
+	if (!base) return extra;
+	if (!extra) return base;
+	if (/\s$/.test(base) || /^\s/.test(extra)) return `${base}${extra}`;
+	return `${base}\n${extra}`;
+}
+function wrapUserLayerComponentsCss(css) {
+	return css.trim().length > 0 ? `${USER_LAYER_COMPONENTS_START}\n${css}\n${USER_LAYER_COMPONENTS_END}` : css;
+}
+function extractMarkedUserLayerComponentsCss(css) {
+	const layers = [];
+	let rest = "";
+	let cursor = 0;
+	while (cursor < css.length) {
+		const startIndex = css.indexOf(USER_LAYER_COMPONENTS_START, cursor);
+		if (startIndex === -1) {
+			rest += css.slice(cursor);
+			break;
+		}
+		rest += css.slice(cursor, startIndex);
+		const contentStart = startIndex + 47;
+		const endIndex = css.indexOf(USER_LAYER_COMPONENTS_END, contentStart);
+		if (endIndex === -1) {
+			rest += css.slice(startIndex);
+			break;
+		}
+		const layerCss = css.slice(contentStart, endIndex).trim();
+		if (layerCss) layers.push(layerCss);
+		cursor = endIndex + 45;
+	}
+	return {
+		layers,
+		rest
+	};
+}
+function findUtilityLayerInsertionIndex(css) {
+	let index = -1;
+	for (const pattern of UTILITY_LAYER_INSERTION_RES) {
+		const match = pattern.exec(css);
+		if (!match) continue;
+		const nextIndex = match.index + (match[1]?.length ?? 0);
+		index = index === -1 ? nextIndex : Math.min(index, nextIndex);
+	}
+	return index;
+}
+function reorderMarkedUserLayerComponentsCss(css) {
+	if (!css.includes(USER_LAYER_COMPONENTS_START)) return css;
+	const { layers, rest } = extractMarkedUserLayerComponentsCss(css);
+	if (layers.length === 0) return rest;
+	const layerCss = layers.join("\n");
+	const insertionIndex = findUtilityLayerInsertionIndex(rest);
+	if (insertionIndex === -1) return appendCss(rest, layerCss);
+	return appendCss(appendCss(rest.slice(0, insertionIndex), layerCss), rest.slice(insertionIndex));
+}
+//#endregion
 //#region src/bundlers/shared/generator-css.ts
 const SUPPORTED_GENERATOR_MAJOR_VERSIONS = new Set([3, 4]);
 const REMOTE_IMPORT_RE = /^(?:https?:)?\/\//i;
@@ -4759,6 +4968,9 @@ function createCssSourceOrderAppend(base, extra) {
 	if (/\s$/.test(base) || /^\s/.test(extra)) return `${base}${extra}`;
 	return `${base}\n${extra}`;
 }
+function shouldFinalizeMarkedUserLayerComponentsCss(file) {
+	return !/\.(?:vue|svelte|astro|scss|sass|less|styl)(?:[?#].*)?$/i.test(file);
+}
 function splitRawSourceByGeneratedCssOrder(rawSource, rawTailwindCss) {
 	const placeholderParts = splitGeneratorPlaceholderCssBySourceOrder(rawSource, rawTailwindCss);
 	if (placeholderParts) return placeholderParts;
@@ -4766,6 +4978,84 @@ function splitRawSourceByGeneratedCssOrder(rawSource, rawTailwindCss) {
 	if (exactParts) return exactParts;
 	return splitTailwindGeneratedCssByBanner(rawSource);
 }
+function splitUserCssLayerBlocks(source) {
+	if (!source.includes("@layer")) return {
+		layer: "",
+		rest: source
+	};
+	try {
+		const root = require_runtime_registry.postcss_default.parse(source);
+		const layerRoot = require_runtime_registry.postcss_default.root();
+		const restRoot = require_runtime_registry.postcss_default.root();
+		for (const node of root.nodes) (node.type === "atrule" && node.name === "layer" && node.nodes?.length ? layerRoot : restRoot).append(node.clone());
+		return {
+			layer: layerRoot.toString(),
+			rest: restRoot.toString()
+		};
+	} catch {
+		return {
+			layer: source,
+			rest: ""
+		};
+	}
+}
+function hasUserCssLayerBlocks(source) {
+	if (!source.includes("@layer")) return false;
+	try {
+		let hasLayerBlock = false;
+		require_runtime_registry.postcss_default.parse(source).walkAtRules("layer", (node) => {
+			if (node.nodes?.length) hasLayerBlock = true;
+		});
+		return hasLayerBlock;
+	} catch {
+		return true;
+	}
+}
+function collectUserLayerSelectors(source) {
+	const selectors = /* @__PURE__ */ new Set();
+	try {
+		require_runtime_registry.postcss_default.parse(source).walkRules((rule) => {
+			for (const selector of rule.selectors ?? [rule.selector]) {
+				const normalized = selector.trim();
+				if (normalized) selectors.add(normalized);
+			}
+		});
+	} catch {}
+	return selectors;
+}
+function matchesUserLayerSelector(selector, userLayerSelector) {
+	if (selector === userLayerSelector) return true;
+	if (!selector.startsWith(userLayerSelector)) return false;
+	const next = selector[userLayerSelector.length];
+	return next === ":" || next === "[";
+}
+function extractGeneratedCssForUserLayerSelectors(css, userLayerSource) {
+	const selectors = collectUserLayerSelectors(userLayerSource);
+	if (selectors.size === 0) return {
+		layer: "",
+		rest: css
+	};
+	try {
+		const root = require_runtime_registry.postcss_default.parse(css);
+		const layerRoot = require_runtime_registry.postcss_default.root();
+		const selectorList = [...selectors];
+		root.walkRules((rule) => {
+			if ((rule.selectors ?? [rule.selector]).some((selector) => selectorList.some((userSelector) => matchesUserLayerSelector(selector.trim(), userSelector)))) {
+				layerRoot.append(rule.clone());
+				rule.remove();
+			}
+		});
+		return {
+			layer: layerRoot.toString(),
+			rest: root.toString()
+		};
+	} catch {
+		return {
+			layer: "",
+			rest: css
+		};
+	}
+}
 async function transformGeneratorUserCss(source, options) {
 	if (source.trim().length === 0) return "";
 	const cleanedSource = removeTailwindSourceDirectives(stripUnmatchedTailwindSourceMediaCloseFragments(stripTailwindSourceMediaFragments(source)), { importFallback: options.importFallback });
@@ -4894,7 +5184,7 @@ async function generateCssByGenerator(options) {
 			sources: generatedResults.flatMap((item) => item.sources)
 		};
 		debug("tailwind generator result: %s rawBytes=%d cssBytes=%d candidates=%d", file, generated.rawCss.length, generated.css.length, generated.classSet.size);
-		if (typeof options.previousCss === "string" && typeof generated.incrementalCss === "string") {
+		if ((generated.target !== "weapp" || !hasUserCssLayerBlocks(effectiveRawSource)) && typeof options.previousCss === "string" && typeof generated.incrementalCss === "string") {
 			const incrementalCss = stripTailwindBanner(generated.incrementalCss);
 			return {
 				css: incrementalCss.trim().length > 0 ? createCssAppend(options.previousCss, finalizeMiniProgramGeneratorCss(incrementalCss, generated.target, majorVersion, opts.cssPreflight, { injectPreflight: false })) : options.previousCss,
@@ -4916,9 +5206,14 @@ async function generateCssByGenerator(options) {
 				styleHandler,
 				importFallback: generatorOptions.importFallback
 			};
+			const afterLayerParts = generated.target === "weapp" ? splitUserCssLayerBlocks(orderedExtraCss.after) : {
+				layer: "",
+				rest: orderedExtraCss.after
+			};
 			const beforeUserCss = await transformGeneratorUserCss(orderedExtraCss.before, userCssOptions);
-			const afterUserCss = await transformGeneratorUserCss(orderedExtraCss.after, userCssOptions);
-			css = createCssSourceOrderAppend(createCssSourceOrderAppend(beforeUserCss, css), afterUserCss);
+			const afterLayerUserCss = await transformGeneratorUserCss(afterLayerParts.layer, userCssOptions);
+			const afterUserCss = await transformGeneratorUserCss(afterLayerParts.rest, userCssOptions);
+			css = createCssSourceOrderAppend(createCssSourceOrderAppend(createCssSourceOrderAppend(beforeUserCss, generated.target === "weapp" ? wrapUserLayerComponentsCss(afterLayerUserCss) : afterLayerUserCss), css), afterUserCss);
 			if (isEmptyCssSourceOrderParts(orderedExtraCss) && shouldAppendWebBundleCssFallback(generated.target, {
 				hasSourceDirectives,
 				hasMatchedCssSourceFile
@@ -4927,6 +5222,7 @@ async function generateCssByGenerator(options) {
 				css = createCssSourceOrderAppend(css, userCss);
 			}
 			if (generated.target === "weapp") {
+				if (shouldFinalizeMarkedUserLayerComponentsCss(file)) css = reorderMarkedUserLayerComponentsCss(css);
 				css = await appendLegacyCompatCss(css, effectiveRawSource, generated.target, styleHandler, cssHandlerOptions, generatorStyleOptions);
 				css = await appendLegacyContainerCompatCss(css, effectiveRawSource, file, runtime, configuredContainerCompat, generated.target, styleHandler, cssHandlerOptions, generatorStyleOptions);
 			}
@@ -4939,7 +5235,27 @@ async function generateCssByGenerator(options) {
 		}
 		debug("tailwind direct css generation prefix mismatch, append transformed bundle css %s", file);
 		let css = stripTailwindBanner(generated.css);
-		if (generated.target === "weapp") css = inheritLegacyUnitConvertedDeclarations(css, effectiveRawSource);
+		if (generated.target === "weapp") {
+			css = inheritLegacyUnitConvertedDeclarations(css, effectiveRawSource);
+			if (hasUserCssLayerBlocks(effectiveRawSource)) {
+				const layerParts = splitUserCssLayerBlocks(effectiveRawSource);
+				const layerUserCss = await transformGeneratorUserCss(layerParts.layer, {
+					generatorTarget: generated.target,
+					generatorStyleOptions,
+					cssUserHandlerOptions,
+					styleHandler,
+					importFallback: generatorOptions.importFallback
+				});
+				const layerCss = layerUserCss.trim().length > 0 && !hasTailwindApplyDirective(layerUserCss) ? {
+					layer: layerUserCss,
+					rest: css
+				} : extractGeneratedCssForUserLayerSelectors(css, layerParts.layer);
+				if (layerCss.layer.trim().length > 0) {
+					css = createCssSourceOrderAppend(wrapUserLayerComponentsCss(layerCss.layer), layerCss.rest);
+					if (shouldFinalizeMarkedUserLayerComponentsCss(file)) css = reorderMarkedUserLayerComponentsCss(css);
+				}
+			}
+		}
 		if (hasMatchedCssSourceFile || generated.target === "web") {
 			if (shouldAppendWebBundleCssFallback(generated.target, {
 				hasSourceDirectives,

package/dist/{webpack-CqGvjvSQ.js → webpack-CPwDaKy3.js}

@@ -1,19 +1,19 @@
 const require_chunk = require("./chunk-C5U5_Hdc.js");
-const require_v3_engine = require("./v3-engine-CHItlVq5.js");
-const require_generator = require("./generator-CrU-Ghc1.js");
-const require_incremental_runtime_class_set = require("./incremental-runtime-class-set-BxvZONkv.js");
-const require_precheck = require("./precheck-D7gJSmJz.js");
+const require_v3_engine = require("./v3-engine-DwY4Fixu.js");
+const require_generator = require("./generator-BEXaaUzP.js");
+const require_incremental_runtime_class_set = require("./incremental-runtime-class-set-CLP1Qv8F.js");
+const require_precheck = require("./precheck-CQeqnfo5.js");
 const require_utils = require("./utils-D7Ygohep.js");
-const require_tailwindcss = require("./tailwindcss-B-e2RiXr.js");
-const require_bundle_state = require("./bundle-state-Ct_8GcSR.js");
+const require_tailwindcss = require("./tailwindcss-Cl7hUlYV.js");
+const require_bundle_state = require("./bundle-state-C4ib5xPG.js");
 let node_fs = require("node:fs");
 node_fs = require_chunk.__toESM(node_fs);
 let node_module = require("node:module");
 node_module = require_chunk.__toESM(node_module);
-let node_path = require("node:path");
-node_path = require_chunk.__toESM(node_path);
 let node_process = require("node:process");
 node_process = require_chunk.__toESM(node_process);
+let node_path = require("node:path");
+node_path = require_chunk.__toESM(node_path);
 //#region src/shared/tailwindcss-css-redirect.ts
 const moduleWithMutableResolve = node_module.default;
 const patched = /* @__PURE__ */ new WeakSet();

package/dist/{webpack-BU2Er4qg.mjs → webpack-xxmiRxcy.mjs}

@@ -1,14 +1,14 @@
-import { b as ensureRuntimeClassSet, d as _defineProperty, f as init_defineProperty, i as pluginName, n as getCompilerContext, t as shouldSkipJsTransform, x as refreshTailwindRuntimeState, y as createTailwindRuntimeReadyPromise } from "./precheck-D7K12zeX.mjs";
-import { B as createDebug, W as resolveTailwindcssOptions, l as getRuntimeClassSetSignature } from "./v3-engine-DcvCCHfs.mjs";
-import { i as normalizeWeappTailwindcssGeneratorOptions } from "./generator-Qw-tZ0Z2.mjs";
-import { i as generateCssByGenerator, o as processCachedTask, r as emitHmrTiming, t as createBundleRuntimeClassSetManager } from "./incremental-runtime-class-set-BdZHkoTs.mjs";
+import { b as ensureRuntimeClassSet, d as _defineProperty, f as init_defineProperty, i as pluginName, n as getCompilerContext, t as shouldSkipJsTransform, x as refreshTailwindRuntimeState, y as createTailwindRuntimeReadyPromise } from "./precheck-nITnYBDn.mjs";
+import { B as createDebug, W as resolveTailwindcssOptions, l as getRuntimeClassSetSignature } from "./v3-engine-C_KeUQG3.mjs";
+import { i as normalizeWeappTailwindcssGeneratorOptions } from "./generator-CpsHA4Wd.mjs";
+import { i as generateCssByGenerator, r as emitHmrTiming, s as processCachedTask, t as createBundleRuntimeClassSetManager } from "./incremental-runtime-class-set-D2fsgk5t.mjs";
 import { r as getGroupedEntries } from "./utils-DsaS975I.mjs";
-import { c as upsertTailwindV4CssSource, s as hasConfiguredTailwindV4CssRoots } from "./tailwindcss-C7dJHZ0G.mjs";
-import { _ as stripRequestQuery, b as toAbsoluteOutputPath, d as resolvePluginDisabledState, g as isSourceStyleRequest, l as stripBundlerGeneratedCssMarkers, n as createBundleBuildState, o as pushConcurrentTaskFactories, r as updateBundleBuildState, t as buildBundleSnapshot, u as resolvePackageDir, y as resolveOutputSpecifier } from "./bundle-state-Bi-cQua6.mjs";
+import { c as upsertTailwindV4CssSource, s as hasConfiguredTailwindV4CssRoots } from "./tailwindcss-udhXxMX9.mjs";
+import { _ as stripRequestQuery, b as toAbsoluteOutputPath, d as resolvePluginDisabledState, g as isSourceStyleRequest, l as stripBundlerGeneratedCssMarkers, n as createBundleBuildState, o as pushConcurrentTaskFactories, r as updateBundleBuildState, t as buildBundleSnapshot, u as resolvePackageDir, y as resolveOutputSpecifier } from "./bundle-state-BIsgsoNW.mjs";
 import Module, { createRequire } from "node:module";
 import fs from "node:fs";
-import path from "node:path";
 import process from "node:process";
+import path from "node:path";
 import { fileURLToPath } from "node:url";
 //#region src/shared/tailwindcss-css-redirect.ts
 const moduleWithMutableResolve = Module;

package/dist/webpack.js

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_webpack = require("./webpack-CqGvjvSQ.js");
+const require_webpack = require("./webpack-CPwDaKy3.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-BU2Er4qg.mjs";
+import { n as weappTailwindcssPackageDir, t as WeappTailwindcss } from "./webpack-xxmiRxcy.mjs";
 export { WeappTailwindcss, WeappTailwindcss as weappTailwindcss, weappTailwindcssPackageDir };