weapp-tailwindcss 5.1.3 → 5.1.4

package/dist/{hmr-timing-DOoHun3i.js → hmr-timing-BV6nFPoT.js}

@@ -1,8 +1,8 @@
 const require_rolldown_runtime = require("./rolldown-runtime-emK7D4bc.js");
-const require_v4_engine = require("./v4-engine-CKbS27-o.js");
-const require_generator = require("./generator-CV_0irKO.js");
-const require_context = require("./context-D75pwtBW.js");
-const require_tailwindcss = require("./tailwindcss-BSCvrs1p.js");
+const require_v4_engine = require("./v4-engine-CKtsdKxK.js");
+const require_generator = require("./generator-CilgHtxb.js");
+const require_context = require("./context-DCVMkTRj.js");
+const require_tailwindcss = require("./tailwindcss-D2xs4OEu.js");
 let node_fs = require("node:fs");
 let node_path = require("node:path");
 node_path = require_rolldown_runtime.__toESM(node_path);
@@ -162,8 +162,10 @@ function hasMiniProgramTailwindV4PreflightReset(css) {
 }
 function finalizeMiniProgramGeneratorCss(css, target, _majorVersion, cssPreflight, options = {}) {
 	if (target !== "weapp") return css;
+	const injectPreflight = options.injectPreflight !== false && !hasMiniProgramTailwindV4PreflightReset(css);
 	return (0, _weapp_tailwindcss_postcss.finalizeMiniProgramCss)(css, {
-		cssPreflight: options.injectPreflight !== false && !hasMiniProgramTailwindV4PreflightReset(css) ? cssPreflight : void 0,
+		cssPreflight: cssPreflight === false ? false : injectPreflight ? cssPreflight : void 0,
+		cssSelectorReplacement: options.styleOptions?.cssOptions?.cssSelectorReplacement ?? options.styleOptions?.cssSelectorReplacement,
 		isTailwindcssV4: true,
 		tailwindcssV4GradientFallback: options.styleOptions?.cssOptions?.tailwindcssV4GradientFallback ?? options.styleOptions?.tailwindcssV4GradientFallback
 	});
@@ -2003,133 +2005,6 @@ function inheritLegacyUnitConvertedDeclarations(css, legacyCss) {
 	}
 }
 //#endregion
-//#region src/bundlers/shared/generator-css/local-imports.ts
-const REMOTE_IMPORT_RE = /^(?:https?:)?\/\//i;
-const CSS_STYLE_EXTENSION_RE = /\.(?:css|wxss|acss|ttss|qss|jxss|tyss|scss|sass|less|styl|stylus|pcss|postcss)(?:$|[?#])/i;
-const SOURCE_STYLE_EXTENSION_RE = /\.(?:css|scss|sass|less|styl|stylus|pcss|postcss)(?:$|[?#])/i;
-function createCssSourceOrderAppend(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 isLocalImportRequest(request) {
-	return request.length > 0 && !request.startsWith("#") && !request.startsWith("tailwindcss") && !request.startsWith("weapp-tailwindcss") && !request.startsWith("data:") && !REMOTE_IMPORT_RE.test(request);
-}
-function isPureLocalCssImportWrapper(css) {
-	let hasImport = false;
-	try {
-		const root = _weapp_tailwindcss_postcss.postcss.parse(css);
-		for (const node of root.nodes) {
-			if (node.type === "comment") continue;
-			if (node.type !== "atrule" || node.name !== "import") return false;
-			const request = require_v4_engine.parseImportRequest(node.params);
-			if (!request || !isLocalImportRequest(request)) return false;
-			hasImport = true;
-		}
-	} catch {
-		return false;
-	}
-	return hasImport;
-}
-function cleanLocalCssImportWrapperTailwindDirectives(css) {
-	let hasLocalImport = false;
-	let hasTailwindDirective = false;
-	try {
-		const root = _weapp_tailwindcss_postcss.postcss.parse(css);
-		for (const node of root.nodes) {
-			if (node.type === "comment") continue;
-			if (node.type === "atrule" && node.name === "import") {
-				const request = require_v4_engine.parseImportRequest(node.params);
-				if (!request || !isLocalImportRequest(request)) return;
-				hasLocalImport = true;
-				continue;
-			}
-			if (node.type === "atrule" && node.name === "source") {
-				hasTailwindDirective = true;
-				continue;
-			}
-			return;
-		}
-	} catch {
-		return;
-	}
-	return hasLocalImport && hasTailwindDirective ? prefixLocalCssImportsWithWebpackIgnore(require_v4_engine.removeTailwindSourceDirectives(css)) : void 0;
-}
-function prefixLocalCssImportsWithWebpackIgnore(css) {
-	try {
-		const root = _weapp_tailwindcss_postcss.postcss.parse(css);
-		root.walkAtRules("import", (atRule) => {
-			const request = require_v4_engine.parseImportRequest(atRule.params);
-			if (request && isLocalImportRequest(request)) atRule.raws.before = `${atRule.raws.before ?? ""}/* webpackIgnore: true */\n`;
-		});
-		return root.toString();
-	} catch {
-		return css;
-	}
-}
-function splitLocalCssImports(source) {
-	try {
-		const root = _weapp_tailwindcss_postcss.postcss.parse(source);
-		const importRoot = _weapp_tailwindcss_postcss.postcss.root();
-		let changed = false;
-		for (const node of [...root.nodes]) {
-			if (node.type !== "atrule" || node.name !== "import") continue;
-			const request = require_v4_engine.parseImportRequest(node.params);
-			if (!request || !isLocalImportRequest(request)) continue;
-			importRoot.append(node.clone());
-			node.remove();
-			changed = true;
-		}
-		const imports = importRoot.nodes.filter((node) => node.type === "atrule" && node.name === "import").map((node) => `@import ${node.params};`).join("\n");
-		return changed ? {
-			imports,
-			source: root.toString()
-		} : void 0;
-	} catch {
-		return;
-	}
-}
-function restoreLocalCssImports(css, imports) {
-	if (!imports?.trim()) return css;
-	return createCssSourceOrderAppend(imports, css);
-}
-function splitRequestSuffix(request) {
-	const suffixIndexCandidates = [request.indexOf("?"), request.indexOf("#")].filter((index) => index >= 0);
-	const suffixIndex = suffixIndexCandidates.length > 0 ? Math.min(...suffixIndexCandidates) : -1;
-	if (suffixIndex < 0) return {
-		clean: request,
-		suffix: ""
-	};
-	return {
-		clean: request.slice(0, suffixIndex),
-		suffix: request.slice(suffixIndex)
-	};
-}
-function normalizeOutputImportRequest(request, styleOutputExtension) {
-	const normalizedStyleOutputExtension = styleOutputExtension?.startsWith(".") ? styleOutputExtension : styleOutputExtension ? `.${styleOutputExtension}` : void 0;
-	const { clean, suffix } = splitRequestSuffix(request.replace(/\\/g, "/"));
-	return `${clean.replace(/^(?:\.\/)?src\//, "./").replace(SOURCE_STYLE_EXTENSION_RE, normalizedStyleOutputExtension ?? ".css")}${suffix}`;
-}
-function rewriteLocalCssImportRequestsForOutput(css, options = {}) {
-	if (!css.includes("@import")) return css;
-	try {
-		const root = _weapp_tailwindcss_postcss.postcss.parse(css);
-		let changed = false;
-		root.walkAtRules("import", (atRule) => {
-			const request = require_v4_engine.parseImportRequest(atRule.params);
-			if (!request || !isLocalImportRequest(request) || !CSS_STYLE_EXTENSION_RE.test(request)) return;
-			const rewritten = normalizeOutputImportRequest(request, options.styleOutputExtension);
-			if (rewritten === request) return;
-			atRule.params = atRule.params.replace(request, rewritten);
-			changed = true;
-		});
-		return changed ? root.toString() : css;
-	} catch {
-		return css;
-	}
-}
-//#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 */";
@@ -2327,6 +2202,23 @@ function intersectCandidateSets(left, right) {
 	for (const candidate of small) if (large.has(candidate)) matched.add(candidate);
 	return matched;
 }
+function parseCssSourceRoot(rawSource) {
+	try {
+		return _weapp_tailwindcss_postcss.postcss.parse(rawSource);
+	} catch {
+		return;
+	}
+}
+function cleanLocalCssImportWrapperFromParsedRoot(rawSource, root) {
+	if (!root) return (0, _weapp_tailwindcss_postcss.cleanLocalCssImportWrapperTailwindDirectives)(rawSource);
+	return (0, _weapp_tailwindcss_postcss.cleanLocalCssImportWrapperTailwindDirectivesRoot)(root) ? root.toString() : void 0;
+}
+function isPureLocalCssImportWrapperFromParsedRoot(rawSource, root) {
+	return root ? (0, _weapp_tailwindcss_postcss.isPureLocalCssImportWrapperRoot)(root) : (0, _weapp_tailwindcss_postcss.isPureLocalCssImportWrapper)(rawSource);
+}
+function splitLocalCssImportsFromParsedRoot(rawSource, root) {
+	return root ? (0, _weapp_tailwindcss_postcss.splitLocalCssImportsRoot)(root) : (0, _weapp_tailwindcss_postcss.splitLocalCssImports)(rawSource);
+}
 function collectCssRuleIdentityMarkers(source) {
 	const markers = /* @__PURE__ */ new Set();
 	try {
@@ -2375,20 +2267,8 @@ async function generateCssByGenerator(options) {
 	const majorVersion = runtimeState.tailwindRuntime.majorVersion;
 	if (majorVersion !== 4) throw new Error("weapp-tailwindcss 生成管线仅支持 Tailwind CSS v4。");
 	const effectiveRawSource = stripUnmatchedTailwindSourceMediaCloseFragments(stripTailwindSourceMediaFragments(require_v4_engine.normalizeTailwindSourceDirectives(rawSource, { importFallback: generatorOptions.importFallback })));
-	const localImportParts = splitLocalCssImports(effectiveRawSource);
-	const localImports = options.restoreLocalCssImports === false ? void 0 : localImportParts?.imports;
-	const finalizeGeneratorCss = (css, target, finalizeOptions = {}) => {
-		return finalizeWebGeneratorCss(restoreLocalCssImports(finalizeMiniProgramGeneratorCss(css, target, majorVersion, opts.cssPreflight, finalizeOptions), localImports), target, generatorOptions.webCompat);
-	};
-	const generatorRawSource = localImportParts?.source ?? effectiveRawSource;
-	const rawUserSource = userRawSource === void 0 ? generatorRawSource : userRawSourceProcessed ? userRawSource : stripUnmatchedTailwindSourceMediaCloseFragments(stripTailwindSourceMediaFragments(require_v4_engine.normalizeTailwindSourceDirectives(userRawSource, { importFallback: generatorOptions.importFallback })));
-	const userSource = splitLocalCssImports(rawUserSource)?.source ?? rawUserSource;
-	const userCssRawSource = removeTailwindV4GeneratorAtRules(userSource);
-	const generatedUserCssOrderSource = require_v4_engine.hasTailwindGeneratedCss(userSource) ? require_v4_engine.splitTailwindV4GeneratedCssBySourceOrder(userSource, generatorRawSource) : void 0;
-	const generatedUserCssRawSource = generatedUserCssOrderSource ? require_v4_engine.createCssAppend(generatedUserCssOrderSource.before, generatedUserCssOrderSource.after) : require_v4_engine.hasTailwindGeneratedCss(userSource) ? "" : userCssRawSource;
-	const userCssOrderSource = require_v4_engine.GENERATOR_PLACEHOLDER_MARKER_RE.test(userSource) ? userSource : require_v4_engine.hasTailwindGeneratedCss(userSource) ? userSource : generatedUserCssRawSource;
-	const hasDistinctUserRawSource = typeof userRawSource === "string" && normalizeCssSourceForCompare(generatedUserCssRawSource) !== normalizeCssSourceForCompare(generatorRawSource);
-	const cleanedLocalImportWrapper = cleanLocalCssImportWrapperTailwindDirectives(effectiveRawSource);
+	const effectiveRawSourceRoot = parseCssSourceRoot(effectiveRawSource);
+	const cleanedLocalImportWrapper = cleanLocalCssImportWrapperFromParsedRoot(effectiveRawSource, effectiveRawSourceRoot);
 	if (cleanedLocalImportWrapper !== void 0) return {
 		css: require_generator.shouldUseMiniProgramCssBranch(generatorBranch) ? (0, _weapp_tailwindcss_postcss.removeUnsupportedMiniProgramAtRules)(cleanedLocalImportWrapper) : cleanedLocalImportWrapper,
 		classSet: /* @__PURE__ */ new Set(),
@@ -2400,7 +2280,20 @@ async function generateCssByGenerator(options) {
 			majorVersion
 		}
 	};
-	if (isPureLocalCssImportWrapper(effectiveRawSource)) return;
+	if (isPureLocalCssImportWrapperFromParsedRoot(effectiveRawSource, effectiveRawSourceRoot)) return;
+	const localImportParts = splitLocalCssImportsFromParsedRoot(effectiveRawSource, effectiveRawSourceRoot);
+	const localImports = options.restoreLocalCssImports === false ? void 0 : localImportParts?.imports;
+	const finalizeGeneratorCss = (css, target, finalizeOptions = {}) => {
+		return finalizeWebGeneratorCss((0, _weapp_tailwindcss_postcss.restoreLocalCssImports)(finalizeMiniProgramGeneratorCss(css, target, majorVersion, opts.cssPreflight, finalizeOptions), localImports), target, generatorOptions.webCompat);
+	};
+	const generatorRawSource = localImportParts?.source ?? effectiveRawSource;
+	const rawUserSource = userRawSource === void 0 ? generatorRawSource : userRawSourceProcessed ? userRawSource : stripUnmatchedTailwindSourceMediaCloseFragments(stripTailwindSourceMediaFragments(require_v4_engine.normalizeTailwindSourceDirectives(userRawSource, { importFallback: generatorOptions.importFallback })));
+	const userSource = (rawUserSource === generatorRawSource ? void 0 : (0, _weapp_tailwindcss_postcss.splitLocalCssImports)(rawUserSource))?.source ?? rawUserSource;
+	const userCssRawSource = removeTailwindV4GeneratorAtRules(userSource);
+	const generatedUserCssOrderSource = require_v4_engine.hasTailwindGeneratedCss(userSource) ? require_v4_engine.splitTailwindV4GeneratedCssBySourceOrder(userSource, generatorRawSource) : void 0;
+	const generatedUserCssRawSource = generatedUserCssOrderSource ? require_v4_engine.createCssAppend(generatedUserCssOrderSource.before, generatedUserCssOrderSource.after) : require_v4_engine.hasTailwindGeneratedCss(userSource) ? "" : userCssRawSource;
+	const userCssOrderSource = require_v4_engine.GENERATOR_PLACEHOLDER_MARKER_RE.test(userSource) ? userSource : require_v4_engine.hasTailwindGeneratedCss(userSource) ? userSource : generatedUserCssRawSource;
+	const hasDistinctUserRawSource = typeof userRawSource === "string" && normalizeCssSourceForCompare(generatedUserCssRawSource) !== normalizeCssSourceForCompare(generatorRawSource);
 	const hasGeneratedCss = require_v4_engine.hasTailwindGeneratedCss(generatorRawSource);
 	const hasSourceDirectives = require_v4_engine.hasTailwindSourceDirectives(generatorRawSource, { importFallback: generatorOptions.importFallback });
 	const hasGeneratedMarkers = require_v4_engine.hasTailwindGeneratedCssMarkers(generatorRawSource);
@@ -2468,7 +2361,7 @@ async function generateCssByGenerator(options) {
 		debug("tailwind generator result: %s rawBytes=%d cssBytes=%d candidates=%d", file, generated.rawCss.length, generated.css.length, generated.classSet.size);
 		if ((generated.target !== "weapp" || !hasUserCssLayerBlocks(generatorRawSource)) && typeof options.previousCss === "string" && typeof generated.incrementalCss === "string") {
 			const incrementalCss = require_v4_engine.stripTailwindBanner(generated.incrementalCss);
-			const finalCss = finalizeWebGeneratorCss(restoreLocalCssImports(incrementalCss.trim().length > 0 ? require_v4_engine.createCssAppend(options.previousCss, finalizeMiniProgramGeneratorCss(incrementalCss, generated.target, majorVersion, opts.cssPreflight, {
+			const finalCss = finalizeWebGeneratorCss((0, _weapp_tailwindcss_postcss.restoreLocalCssImports)(incrementalCss.trim().length > 0 ? require_v4_engine.createCssAppend(options.previousCss, finalizeMiniProgramGeneratorCss(incrementalCss, generated.target, majorVersion, opts.cssPreflight, {
 				injectPreflight: false,
 				styleOptions: generatorStyleOptions
 			})) : options.previousCss, localImports), generated.target, generatorOptions.webCompat);
@@ -3618,12 +3511,6 @@ Object.defineProperty(exports, "isCssSourceTraceEnabled", {
 		return isCssSourceTraceEnabled;
 	}
 });
-Object.defineProperty(exports, "isPureLocalCssImportWrapper", {
-	enumerable: true,
-	get: function() {
-		return isPureLocalCssImportWrapper;
-	}
-});
 Object.defineProperty(exports, "isSourceCandidateRequest", {
 	enumerable: true,
 	get: function() {
@@ -3684,12 +3571,6 @@ Object.defineProperty(exports, "resolveTaskConcurrency", {
 		return resolveTaskConcurrency;
 	}
 });
-Object.defineProperty(exports, "rewriteLocalCssImportRequestsForOutput", {
-	enumerable: true,
-	get: function() {
-		return rewriteLocalCssImportRequestsForOutput;
-	}
-});
 Object.defineProperty(exports, "runWithConcurrency", {
 	enumerable: true,
 	get: function() {
@@ -3702,12 +3583,6 @@ Object.defineProperty(exports, "scoreTailwindV4CssSourceFileMatch", {
 		return scoreTailwindV4CssSourceFileMatch;
 	}
 });
-Object.defineProperty(exports, "splitLocalCssImports", {
-	enumerable: true,
-	get: function() {
-		return splitLocalCssImports;
-	}
-});
 Object.defineProperty(exports, "stripTailwindSourceMediaFragments", {
 	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-CV_0irKO.js");
-const require_gulp = require("./gulp-B_u8NjQL.js");
+const require_generator = require("./generator-CilgHtxb.js");
+const require_gulp = require("./gulp-Bogfnoki.js");
 const require_postcss = require("./postcss.js");
-const require_vite = require("./vite-CkVMSDDp.js");
-const require_webpack = require("./webpack-hvSFaicc.js");
+const require_vite = require("./vite-BYgT1ir9.js");
+const require_webpack = require("./webpack-khSwkXP5.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-DNs6ekoC.mjs";
-import { t as createPlugins } from "./gulp-aQMZ0M7c.mjs";
+import { t as createWeappTailwindcssGenerator } from "./generator-24-HgU9F.mjs";
+import { t as createPlugins } from "./gulp-0RsqkF_d.mjs";
 import weappTailwindcssPostcssPlugin from "./postcss.mjs";
-import { t as WeappTailwindcss } from "./vite-5Wn0PIzJ.mjs";
-import { n as weappTailwindcssPackageDir } from "./webpack-DEag6ueE.mjs";
+import { t as WeappTailwindcss } from "./vite-B1SlBmqO.mjs";
+import { n as weappTailwindcssPackageDir } from "./webpack-Bg6pefpb.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.js

@@ -2,8 +2,8 @@ Object.defineProperties(exports, {
 	__esModule: { value: true },
 	[Symbol.toStringTag]: { value: "Module" }
 });
-const require_v4_engine = require("./v4-engine-CKbS27-o.js");
-const require_generator = require("./generator-CV_0irKO.js");
+const require_v4_engine = require("./v4-engine-CKtsdKxK.js");
+const require_generator = require("./generator-CilgHtxb.js");
 const weappTailwindcssPostcssPlugin = (0, require("@weapp-tailwindcss/postcss").createWeappTailwindcssPostcssPlugin)({
 	createGenerator: (source) => {
 		return require_generator.createWeappTailwindcssGenerator(source);

package/dist/postcss.mjs

@@ -1,5 +1,5 @@
-import { t as resolveTailwindV4Source } from "./v4-engine-BklH3CpJ.mjs";
-import { i as normalizeWeappTailwindcssGeneratorOptions, t as createWeappTailwindcssGenerator } from "./generator-DNs6ekoC.mjs";
+import { t as resolveTailwindV4Source } from "./v4-engine-BuuYDXt1.mjs";
+import { i as normalizeWeappTailwindcssGeneratorOptions, t as createWeappTailwindcssGenerator } from "./generator-24-HgU9F.mjs";
 import { createWeappTailwindcssPostcssPlugin } from "@weapp-tailwindcss/postcss";
 const weappTailwindcssPostcssPlugin = createWeappTailwindcssPostcssPlugin({
 	createGenerator: (source) => {

package/dist/presets.js

@@ -1,9 +1,9 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_rolldown_runtime = require("./rolldown-runtime-emK7D4bc.js");
 const require_framework = require("./framework.js");
-const require_v4_engine = require("./v4-engine-CKbS27-o.js");
+const require_v4_engine = require("./v4-engine-CKtsdKxK.js");
 require("./utils-D3h8j7Mk.js");
-const require_tailwindcss = require("./tailwindcss-BSCvrs1p.js");
+const require_tailwindcss = require("./tailwindcss-D2xs4OEu.js");
 require("./logger-TlKT3xmR.js");
 let node_path = require("node:path");
 node_path = require_rolldown_runtime.__toESM(node_path);

package/dist/presets.mjs

@@ -1,7 +1,7 @@
 import { resolveTaroPlatform, resolveUniPlatformsFromEnv } from "./framework.mjs";
-import { st as omitUndefined } from "./v4-engine-BklH3CpJ.mjs";
+import { ct as omitUndefined } from "./v4-engine-BuuYDXt1.mjs";
 import { n as defuOverrideArray } from "./utils-DodxWHGz.mjs";
-import { i as resolveUniAppXOptions, n as resolveTailwindcssBasedir } from "./tailwindcss-BwV3_Ryc.mjs";
+import { i as resolveUniAppXOptions, n as resolveTailwindcssBasedir } from "./tailwindcss-D0JF0fuZ.mjs";
 import { t as logger } from "./logger-BNzxZbZj.mjs";
 import path from "node:path";
 import process from "node:process";

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-hvSFaicc.js");
+const require_webpack = require("./webpack-khSwkXP5.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-DEag6ueE.mjs";
+import { n as weappTailwindcssPackageDir, r as __dirname, t as WeappTailwindcss } from "./webpack-Bg6pefpb.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/{source-candidate-scan-signature-pS87mdHZ.mjs → source-candidate-scan-signature-BB1hvW68.mjs}

@@ -1,6 +1,7 @@
-import { g as traverse, h as babelParse, o as Parser } from "./context-B07Vf584.mjs";
-import { g as resolveTailwindV4EntriesFromCssCached } from "./tailwindcss-BwV3_Ryc.mjs";
-import { u as generateCssByGenerator } from "./hmr-timing-DLYQTCDb.mjs";
+import { n as hasCssMacroTailwindV4CustomVariantConditionalComments } from "./auto-CrJJc5rK.mjs";
+import { g as traverse, h as babelParse, o as Parser } from "./context-Bkpmt3ja.mjs";
+import { g as resolveTailwindV4EntriesFromCssCached } from "./tailwindcss-D0JF0fuZ.mjs";
+import { u as generateCssByGenerator } from "./hmr-timing-BRNaz8Od.mjs";
 import { createRequire } from "node:module";
 import path from "node:path";
 import process from "node:process";
@@ -501,6 +502,9 @@ function intersectCandidates(first, second) {
 	for (const candidate of small) if (large.has(candidate)) scoped.add(candidate);
 	return scoped;
 }
+function mergeCandidates(first, second) {
+	return /* @__PURE__ */ new Set([...first, ...second]);
+}
 function resolveScopedSourceEntries(rawSource, sourceFile, resolvedEntries) {
 	if (!hasOwnSourceDirectives(rawSource)) return {
 		entries: resolvedEntries,
@@ -530,12 +534,14 @@ async function createScopedGeneratorRuntime(options) {
 		const { entries, localEntries } = resolveScopedSourceEntries(rawSource, sourceFile, (await resolveTailwindV4EntriesFromCssCached(rawSource, path.dirname(path.resolve(sourceFile.replace(/[?#].*$/, "")))))?.entries);
 		if (entries !== void 0 && (entries.length > 0 || hasOwnSourceDirectives(rawSource))) {
 			const scopedCandidates = scopedSourceCandidateGetter?.(entries) ?? getSourceCandidatesForEntries(entries);
-			if (!localEntries) return scopedCandidates;
-			return intersectCandidates(scopedCandidates, scopedSourceCandidateGetter?.(localEntries) ?? getSourceCandidatesForEntries(localEntries));
+			const shouldMergeFallbackRuntime = hasCssMacroTailwindV4CustomVariantConditionalComments(rawSource);
+			if (!localEntries) return shouldMergeFallbackRuntime ? mergeCandidates(scopedCandidates, fallbackRuntime) : scopedCandidates;
+			const scopedLocalCandidates = intersectCandidates(scopedCandidates, scopedSourceCandidateGetter?.(localEntries) ?? getSourceCandidatesForEntries(localEntries));
+			return shouldMergeFallbackRuntime ? mergeCandidates(scopedLocalCandidates, fallbackRuntime) : scopedLocalCandidates;
 		}
 	}
 	const scopedCandidates = scopedSourceCandidateGetter?.(void 0);
-	if (scopedCandidates && (scopedCandidates.size > 0 || shouldExcludeSubpackageSourceCandidates(outputFile, cssHandlerOptions))) return scopedCandidates;
+	if (scopedCandidates && (scopedCandidates.size > 0 || shouldExcludeSubpackageSourceCandidates(outputFile, cssHandlerOptions))) return shouldExcludeSubpackageSourceCandidates(outputFile, cssHandlerOptions) ? scopedCandidates : mergeCandidates(scopedCandidates, fallbackRuntime);
 	if (!shouldExcludeSubpackageSourceCandidates(outputFile, cssHandlerOptions)) return fallbackRuntime;
 	return fallbackRuntime;
 }

package/dist/{source-candidate-scan-signature-DzwebZrf.js → source-candidate-scan-signature-CaDT0gkj.js}

@@ -1,7 +1,8 @@
 const require_rolldown_runtime = require("./rolldown-runtime-emK7D4bc.js");
-const require_context = require("./context-D75pwtBW.js");
-const require_tailwindcss = require("./tailwindcss-BSCvrs1p.js");
-const require_hmr_timing = require("./hmr-timing-DOoHun3i.js");
+require("./auto-DtU6f3X6.js");
+const require_context = require("./context-DCVMkTRj.js");
+const require_tailwindcss = require("./tailwindcss-D2xs4OEu.js");
+const require_hmr_timing = require("./hmr-timing-BV6nFPoT.js");
 let node_path = require("node:path");
 node_path = require_rolldown_runtime.__toESM(node_path);
 let node_process = require("node:process");
@@ -9,6 +10,7 @@ node_process = require_rolldown_runtime.__toESM(node_process);
 let node_module = require("node:module");
 let _weapp_tailwindcss_shared = require("@weapp-tailwindcss/shared");
 let node_buffer = require("node:buffer");
+let _weapp_tailwindcss_postcss = require("@weapp-tailwindcss/postcss");
 //#region src/bundlers/shared/module-graph.ts
 const QUERY_HASH_RE = /[?#].*$/u;
 const PROTOCOL_RE = /^[a-z][a-z+.-]*:/iu;
@@ -504,6 +506,9 @@ function intersectCandidates(first, second) {
 	for (const candidate of small) if (large.has(candidate)) scoped.add(candidate);
 	return scoped;
 }
+function mergeCandidates(first, second) {
+	return /* @__PURE__ */ new Set([...first, ...second]);
+}
 function resolveScopedSourceEntries(rawSource, sourceFile, resolvedEntries) {
 	if (!hasOwnSourceDirectives(rawSource)) return {
 		entries: resolvedEntries,
@@ -533,12 +538,14 @@ async function createScopedGeneratorRuntime(options) {
 		const { entries, localEntries } = resolveScopedSourceEntries(rawSource, sourceFile, (await require_tailwindcss.resolveTailwindV4EntriesFromCssCached(rawSource, node_path.default.dirname(node_path.default.resolve(sourceFile.replace(/[?#].*$/, "")))))?.entries);
 		if (entries !== void 0 && (entries.length > 0 || hasOwnSourceDirectives(rawSource))) {
 			const scopedCandidates = scopedSourceCandidateGetter?.(entries) ?? getSourceCandidatesForEntries(entries);
-			if (!localEntries) return scopedCandidates;
-			return intersectCandidates(scopedCandidates, scopedSourceCandidateGetter?.(localEntries) ?? getSourceCandidatesForEntries(localEntries));
+			const shouldMergeFallbackRuntime = (0, _weapp_tailwindcss_postcss.hasCssMacroTailwindV4CustomVariantConditionalComments)(rawSource);
+			if (!localEntries) return shouldMergeFallbackRuntime ? mergeCandidates(scopedCandidates, fallbackRuntime) : scopedCandidates;
+			const scopedLocalCandidates = intersectCandidates(scopedCandidates, scopedSourceCandidateGetter?.(localEntries) ?? getSourceCandidatesForEntries(localEntries));
+			return shouldMergeFallbackRuntime ? mergeCandidates(scopedLocalCandidates, fallbackRuntime) : scopedLocalCandidates;
 		}
 	}
 	const scopedCandidates = scopedSourceCandidateGetter?.(void 0);
-	if (scopedCandidates && (scopedCandidates.size > 0 || shouldExcludeSubpackageSourceCandidates(outputFile, cssHandlerOptions))) return scopedCandidates;
+	if (scopedCandidates && (scopedCandidates.size > 0 || shouldExcludeSubpackageSourceCandidates(outputFile, cssHandlerOptions))) return shouldExcludeSubpackageSourceCandidates(outputFile, cssHandlerOptions) ? scopedCandidates : mergeCandidates(scopedCandidates, fallbackRuntime);
 	if (!shouldExcludeSubpackageSourceCandidates(outputFile, cssHandlerOptions)) return fallbackRuntime;
 	return fallbackRuntime;
 }

package/dist/tailwindcss/v4-engine/css-macro-source.d.ts

@@ -0,0 +1,2 @@
+import type { TailwindV4ResolvedSource } from './types';
+export declare function resolveCssMacroTailwindV4Source(source: TailwindV4ResolvedSource): TailwindV4ResolvedSource;

package/dist/{tailwindcss-BwV3_Ryc.mjs → tailwindcss-D0JF0fuZ.mjs}

@@ -1,4 +1,4 @@
-import { $ as normalizeLegacyContentEntries, X as createTailwindSourceEntryMatcher, Y as FULL_SOURCE_SCAN_PATTERN, Z as expandTailwindSourceEntries, _ as resolveTailwindcssOptions, a as filterTailwindV4CssSourceRoots, at as collectCssInlineSourceCandidates, c as groupCssEntriesByBase, d as normalizeCssEntries, et as parseConfigParam, f as findNearestPackageRoot, g as normalizeTailwindcssRuntimeOptions, h as normalizeExtendLengthUnits, i as resolveTailwindV4SourceOptionsFromRuntime, l as guessBasedirFromEntries, lt as loadTailwindV4DesignSystem, m as findWorkspaceRoot, n as resolveTailwindV4SourceFromRuntime, o as hasConfiguredTailwindV4CssRoots, p as findWorkspacePackageDir, rt as resolveTailwindV4CssSourceBase, st as omitUndefined, tt as resolveCssSourceEntries, u as isTailwindV4CssEntry, v as normalizeStringListOption } from "./v4-engine-BklH3CpJ.mjs";
+import { $ as normalizeLegacyContentEntries, X as createTailwindSourceEntryMatcher, Y as FULL_SOURCE_SCAN_PATTERN, Z as expandTailwindSourceEntries, _ as resolveTailwindcssOptions, a as filterTailwindV4CssSourceRoots, at as collectCssInlineSourceCandidates, c as groupCssEntriesByBase, ct as omitUndefined, d as normalizeCssEntries, et as parseConfigParam, f as findNearestPackageRoot, g as normalizeTailwindcssRuntimeOptions, h as normalizeExtendLengthUnits, i as resolveTailwindV4SourceOptionsFromRuntime, l as guessBasedirFromEntries, m as findWorkspaceRoot, n as resolveTailwindV4SourceFromRuntime, o as hasConfiguredTailwindV4CssRoots, ot as resolveCssMacroTailwindV4Source, p as findWorkspacePackageDir, rt as resolveTailwindV4CssSourceBase, tt as resolveCssSourceEntries, u as isTailwindV4CssEntry, ut as loadTailwindV4DesignSystem, v as normalizeStringListOption } from "./v4-engine-BuuYDXt1.mjs";
 import { n as defuOverrideArray$1 } from "./utils-DodxWHGz.mjs";
 import { createRequire } from "node:module";
 import { existsSync, readFileSync, statSync } from "node:fs";
@@ -945,14 +945,14 @@ function createEngineTailwindcssRuntime(options) {
 		const rawCandidates = new Set(report.entries.map((entry) => {
 			return typeof entry === "string" ? entry : entry.rawCandidate;
 		}).filter((entry) => typeof entry === "string" && entry.length > 0));
-		const source = await resolveTailwindV4SourceFromRuntime(runtime);
+		const source = resolveCssMacroTailwindV4Source(await resolveTailwindV4SourceFromRuntime(runtime));
 		const designSystem = await loadTailwindV4DesignSystem(source);
 		const candidates = new Set(resolveValidTailwindV4Candidates(designSystem, rawCandidates, { ...source.bareArbitraryValues === void 0 ? {} : { bareArbitraryValues: source.bareArbitraryValues } }));
 		await collectTailwindV4CssCandidates(candidates);
 		return applyClassSetFilter(candidates);
 	}
 	async function collectTailwindV4CssCandidates(candidates) {
-		const source = await resolveTailwindV4SourceFromRuntime(runtime);
+		const source = resolveCssMacroTailwindV4Source(await resolveTailwindV4SourceFromRuntime(runtime));
 		const cssList = [source.css, ...(source.cssSources ?? []).map((cssSource) => cssSource.css).filter((css) => typeof css === "string")];
 		for (const css of cssList) {
 			if (!css.includes("@apply")) continue;
@@ -967,7 +967,7 @@ function createEngineTailwindcssRuntime(options) {
 		}
 	}
 	async function collectContentTokens() {
-		const source = await resolveTailwindV4SourceFromRuntime(runtime);
+		const source = resolveCssMacroTailwindV4Source(await resolveTailwindV4SourceFromRuntime(runtime));
 		const report = await extractProjectCandidatesWithPositions({
 			base: source.base,
 			baseFallbacks: source.baseFallbacks,

package/dist/{tailwindcss-BSCvrs1p.js → tailwindcss-D2xs4OEu.js}

@@ -1,5 +1,5 @@
 const require_rolldown_runtime = require("./rolldown-runtime-emK7D4bc.js");
-const require_v4_engine = require("./v4-engine-CKbS27-o.js");
+const require_v4_engine = require("./v4-engine-CKtsdKxK.js");
 require("./utils-D3h8j7Mk.js");
 let node_fs = require("node:fs");
 let node_path = require("node:path");
@@ -949,14 +949,14 @@ function createEngineTailwindcssRuntime(options) {
 		const rawCandidates = new Set(report.entries.map((entry) => {
 			return typeof entry === "string" ? entry : entry.rawCandidate;
 		}).filter((entry) => typeof entry === "string" && entry.length > 0));
-		const source = await require_v4_engine.resolveTailwindV4SourceFromRuntime(runtime);
+		const source = require_v4_engine.resolveCssMacroTailwindV4Source(await require_v4_engine.resolveTailwindV4SourceFromRuntime(runtime));
 		const designSystem = await (0, _tailwindcss_mangle_engine.loadTailwindV4DesignSystem)(source);
 		const candidates = new Set((0, _tailwindcss_mangle_engine.resolveValidTailwindV4Candidates)(designSystem, rawCandidates, { ...source.bareArbitraryValues === void 0 ? {} : { bareArbitraryValues: source.bareArbitraryValues } }));
 		await collectTailwindV4CssCandidates(candidates);
 		return applyClassSetFilter(candidates);
 	}
 	async function collectTailwindV4CssCandidates(candidates) {
-		const source = await require_v4_engine.resolveTailwindV4SourceFromRuntime(runtime);
+		const source = require_v4_engine.resolveCssMacroTailwindV4Source(await require_v4_engine.resolveTailwindV4SourceFromRuntime(runtime));
 		const cssList = [source.css, ...(source.cssSources ?? []).map((cssSource) => cssSource.css).filter((css) => typeof css === "string")];
 		for (const css of cssList) {
 			if (!css.includes("@apply")) continue;
@@ -971,7 +971,7 @@ function createEngineTailwindcssRuntime(options) {
 		}
 	}
 	async function collectContentTokens() {
-		const source = await require_v4_engine.resolveTailwindV4SourceFromRuntime(runtime);
+		const source = require_v4_engine.resolveCssMacroTailwindV4Source(await require_v4_engine.resolveTailwindV4SourceFromRuntime(runtime));
 		const report = await (0, _tailwindcss_mangle_engine.extractProjectCandidatesWithPositions)({
 			base: source.base,
 			baseFallbacks: source.baseFallbacks,

package/dist/{transform-Clj7R818.mjs → transform-BP86eSZp.mjs}

@@ -1,4 +1,4 @@
-import { c as createAttributeMatcher, d as JsTokenUpdater, f as _defineProperty, h as babelParse, m as replaceWxml, p as isClassContextLiteralPath, s as generateCode, u as analyzeSource } from "./context-B07Vf584.mjs";
+import { c as createAttributeMatcher, d as JsTokenUpdater, f as _defineProperty, h as babelParse, m as replaceWxml, p as isClassContextLiteralPath, s as generateCode, u as analyzeSource } from "./context-Bkpmt3ja.mjs";
 import { createRequire } from "node:module";
 import { splitCandidateTokens } from "@tailwindcss-mangle/engine";
 import MagicString from "magic-string";

package/dist/{transform-fin-OTVD.js → transform-CXCQ28Tc.js}

@@ -1,5 +1,5 @@
 const require_rolldown_runtime = require("./rolldown-runtime-emK7D4bc.js");
-const require_context = require("./context-D75pwtBW.js");
+const require_context = require("./context-DCVMkTRj.js");
 let _tailwindcss_mangle_engine = require("@tailwindcss-mangle/engine");
 let magic_string = require("magic-string");
 magic_string = require_rolldown_runtime.__toESM(magic_string);