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

package/dist/{incremental-runtime-class-set-BdZHkoTs.mjs → incremental-runtime-class-set-D2fsgk5t.mjs}

@@ -1,10 +1,10 @@
-import { m as replaceWxml, r as resolveStyleOptionsFromContext } from "./precheck-D7K12zeX.mjs";
-import { B as createDebug, D as loadTailwindV4DesignSystem, E as filterUnsupportedMiniProgramTailwindV4Candidates, R as resolveTailwindV4CssSourceBase, S as resolveTailwindV4SourceOptionsFromPatcher, h as resolveTailwindV4EntriesFromCss, l as getRuntimeClassSetSignature, n as resolveTailwindV3SourceFromPatcher, q as omitUndefined, r as resolveTailwindV3SourceOptionsFromPatcher, t as resolveTailwindV3Source, x as resolveTailwindV4SourceFromPatcher, y as resolveTailwindV4Source$1 } from "./v3-engine-DcvCCHfs.mjs";
-import { i as normalizeWeappTailwindcssGeneratorOptions, t as createWeappTailwindcssGenerator } from "./generator-Qw-tZ0Z2.mjs";
+import { m as replaceWxml, r as resolveStyleOptionsFromContext } from "./precheck-nITnYBDn.mjs";
+import { B as createDebug, D as loadTailwindV4DesignSystem, E as filterUnsupportedMiniProgramTailwindV4Candidates, R as resolveTailwindV4CssSourceBase, S as resolveTailwindV4SourceOptionsFromPatcher, h as resolveTailwindV4EntriesFromCss, l as getRuntimeClassSetSignature, n as resolveTailwindV3SourceFromPatcher, q as omitUndefined, r as resolveTailwindV3SourceOptionsFromPatcher, t as resolveTailwindV3Source, x as resolveTailwindV4SourceFromPatcher, y as resolveTailwindV4Source$1 } from "./v3-engine-C_KeUQG3.mjs";
+import { i as normalizeWeappTailwindcssGeneratorOptions, t as createWeappTailwindcssGenerator } from "./generator-CpsHA4Wd.mjs";
 import { existsSync, readFileSync } from "node:fs";
 import postcss from "postcss";
-import path from "node:path";
 import process from "node:process";
+import path from "node:path";
 import { extractRawCandidatesWithPositions, extractSourceCandidates, extractValidCandidates } from "tailwindcss-patch";
 import { finalizeMiniProgramCss, removeUnsupportedMiniProgramAtRules } from "@weapp-tailwindcss/postcss";
 //#region src/bundlers/shared/generator-css/markers.ts
@@ -104,6 +104,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];
 }
@@ -283,6 +288,24 @@ function hasPreprocessorOnlySyntax(rawSource) {
 function normalizeTailwindSourceForGenerator(rawSource, options = {}) {
 	return hasPreprocessorOnlySyntax(rawSource) ? extractTailwindSourceForPostcssFallback(rawSource, options) ?? rawSource : rawSource;
 }
+function normalizeTailwindV3CssEntrySource(rawSource) {
+	try {
+		const root = postcss.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(postcss.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 {
@@ -1018,14 +1041,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 } : {}
 		});
 	}
@@ -1372,6 +1395,125 @@ 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 removeFirstCssOccurrence(css, chunk) {
+	const trimmed = chunk.trim();
+	if (!trimmed) return css;
+	const index = css.indexOf(trimmed);
+	if (index === -1) return css;
+	return appendCss(css.slice(0, index).trimEnd(), css.slice(index + trimmed.length).trimStart());
+}
+function collectSelectorsFromCss(css) {
+	const selectors = /* @__PURE__ */ new Set();
+	try {
+		postcss.parse(css).walkRules((rule) => {
+			for (const selector of rule.selectors ?? [rule.selector]) {
+				const normalized = selector.trim();
+				if (normalized) selectors.add(normalized);
+			}
+		});
+	} catch {}
+	return selectors;
+}
+function matchesLayerSelector(selector, layerSelector) {
+	if (selector === layerSelector) return true;
+	if (!selector.startsWith(layerSelector)) return false;
+	const next = selector[layerSelector.length];
+	return next === ":" || next === "[";
+}
+function removeCssRulesForSelectors(css, layerCss) {
+	const selectors = [...collectSelectorsFromCss(layerCss)];
+	if (selectors.length === 0) return css;
+	try {
+		const root = postcss.parse(css);
+		root.walkRules((rule) => {
+			if ((rule.selectors ?? [rule.selector]).some((selector) => selectors.some((layerSelector) => matchesLayerSelector(selector.trim(), layerSelector)))) rule.remove();
+		});
+		return root.toString();
+	} catch {
+		return removeFirstCssOccurrence(css, layerCss);
+	}
+}
+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));
+}
+function mergeMarkedUserLayerComponentsCss(baseCss, markedCss) {
+	if (!markedCss.includes(USER_LAYER_COMPONENTS_START)) return {
+		css: baseCss,
+		merged: false
+	};
+	const { layers } = extractMarkedUserLayerComponentsCss(markedCss);
+	if (layers.length === 0) return {
+		css: baseCss,
+		merged: false
+	};
+	const layerCss = layers.join("\n");
+	return {
+		css: reorderMarkedUserLayerComponentsCss(appendCss(removeCssRulesForSelectors(baseCss, layerCss), wrapUserLayerComponentsCss(layerCss))),
+		merged: true
+	};
+}
+//#endregion
 //#region src/bundlers/shared/generator-css.ts
 const SUPPORTED_GENERATOR_MAJOR_VERSIONS = new Set([3, 4]);
 const REMOTE_IMPORT_RE = /^(?:https?:)?\/\//i;
@@ -1445,6 +1587,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;
@@ -1452,6 +1597,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 = postcss.parse(source);
+		const layerRoot = postcss.root();
+		const restRoot = postcss.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;
+		postcss.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 {
+		postcss.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 = postcss.parse(css);
+		const layerRoot = postcss.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 });
@@ -1580,7 +1803,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,
@@ -1602,9 +1825,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
@@ -1613,6 +1841,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);
 			}
@@ -1625,7 +1854,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,
@@ -1972,4 +2221,4 @@ function createBundleRuntimeClassSetManager(options = {}) {
 	};
 }
 //#endregion
-export { validateCandidatesByGenerator as a, hasTailwindSourceDirectives as c, generateCssByGenerator as i, normalizeTailwindSourceForGenerator as l, createHmrTimingRecorder as n, processCachedTask as o, emitHmrTiming as r, hasTailwindRootDirectives as s, createBundleRuntimeClassSetManager as t, hasTailwindGeneratedCssMarkers as u };
+export { validateCandidatesByGenerator as a, hasTailwindRootDirectives as c, hasTailwindGeneratedCssMarkers as d, generateCssByGenerator as i, hasTailwindSourceDirectives as l, createHmrTimingRecorder as n, mergeMarkedUserLayerComponentsCss as o, emitHmrTiming as r, processCachedTask as s, createBundleRuntimeClassSetManager as t, normalizeTailwindSourceForGenerator as u };

package/dist/index.js

@@ -1,9 +1,9 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_generator = require("./generator-CrU-Ghc1.js");
+const require_generator = require("./generator-BEXaaUzP.js");
 const require_gulp = require("./gulp.js");
-const require_postcss = require("./postcss-DAWf9D3C.js");
-const require_vite = require("./vite-C65DdWEj.js");
-const require_webpack = require("./webpack-CqGvjvSQ.js");
+const require_postcss = require("./postcss-DN7IQzYb.js");
+const require_vite = require("./vite-CYkkJZ3Q.js");
+const require_webpack = require("./webpack-CPwDaKy3.js");
 let _weapp_tailwindcss_postcss = require("@weapp-tailwindcss/postcss");
 exports.WeappTailwindcss = require_vite.WeappTailwindcss;
 exports.createPlugins = require_gulp.createPlugins;

package/dist/index.mjs

@@ -1,7 +1,7 @@
-import { t as createWeappTailwindcssGenerator } from "./generator-Qw-tZ0Z2.mjs";
+import { t as createWeappTailwindcssGenerator } from "./generator-CpsHA4Wd.mjs";
 import { WeappTailwindcss as createPlugins } from "./gulp.mjs";
-import { t as weappTailwindcssPostcssPlugin } from "./postcss-C6zOQqlL.mjs";
-import { t as WeappTailwindcss } from "./vite-rmL1rsA_.mjs";
-import { n as weappTailwindcssPackageDir } from "./webpack-BU2Er4qg.mjs";
+import { t as weappTailwindcssPostcssPlugin } from "./postcss-BvkdIZr8.mjs";
+import { t as WeappTailwindcss } from "./vite-BAHjBu8j.mjs";
+import { n as weappTailwindcssPackageDir } from "./webpack-xxmiRxcy.mjs";
 import { unitConversionComposeRules, unitConversionPresets } from "@weapp-tailwindcss/postcss";
 export { WeappTailwindcss, createPlugins, createWeappTailwindcssGenerator, unitConversionComposeRules, unitConversionPresets, weappTailwindcssPackageDir, weappTailwindcssPostcssPlugin };

package/dist/{postcss-C6zOQqlL.mjs → postcss-BvkdIZr8.mjs}

@@ -1,8 +1,8 @@
-import { A as collectCssInlineSourceCandidates, F as parseConfigParam, H as readInstalledPackageMajorVersion, I as resolveCssSourceEntries, M as expandTailwindSourceEntries, O as DEFAULT_SOURCE_SCAN_EXTENSIONS, P as normalizeLegacyContentEntries, j as createSourceScanPattern, t as resolveTailwindV3Source, y as resolveTailwindV4Source$1 } from "./v3-engine-DcvCCHfs.mjs";
-import { i as normalizeWeappTailwindcssGeneratorOptions, t as createWeappTailwindcssGenerator } from "./generator-Qw-tZ0Z2.mjs";
+import { A as collectCssInlineSourceCandidates, F as parseConfigParam, H as readInstalledPackageMajorVersion, I as resolveCssSourceEntries, M as expandTailwindSourceEntries, O as DEFAULT_SOURCE_SCAN_EXTENSIONS, P as normalizeLegacyContentEntries, j as createSourceScanPattern, t as resolveTailwindV3Source, y as resolveTailwindV4Source$1 } from "./v3-engine-C_KeUQG3.mjs";
+import { i as normalizeWeappTailwindcssGeneratorOptions, t as createWeappTailwindcssGenerator } from "./generator-CpsHA4Wd.mjs";
 import postcss from "postcss";
-import path from "node:path";
 import process from "node:process";
+import path from "node:path";
 import { extractRawCandidatesWithPositions, extractValidCandidates } from "tailwindcss-patch";
 import { readFile } from "node:fs/promises";
 import { loadConfig } from "tailwindcss-config";

package/dist/{postcss-DAWf9D3C.js → postcss-DN7IQzYb.js}

@@ -1,12 +1,12 @@
 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_v3_engine = require("./v3-engine-DwY4Fixu.js");
+const require_generator = require("./generator-BEXaaUzP.js");
 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 tailwindcss_patch = require("tailwindcss-patch");
 let node_fs_promises = require("node:fs/promises");
 let tailwindcss_config = require("tailwindcss-config");

package/dist/postcss.js

@@ -2,6 +2,6 @@ Object.defineProperties(exports, {
 	__esModule: { value: true },
 	[Symbol.toStringTag]: { value: "Module" }
 });
-const require_postcss = require("./postcss-DAWf9D3C.js");
+const require_postcss = require("./postcss-DN7IQzYb.js");
 exports.default = require_postcss.weappTailwindcssPostcssPlugin;
 exports.weappTailwindcssPostcssPlugin = require_postcss.weappTailwindcssPostcssPlugin;

package/dist/postcss.mjs

@@ -1,2 +1,2 @@
-import { t as weappTailwindcssPostcssPlugin } from "./postcss-C6zOQqlL.mjs";
+import { t as weappTailwindcssPostcssPlugin } from "./postcss-BvkdIZr8.mjs";
 export { weappTailwindcssPostcssPlugin as default, weappTailwindcssPostcssPlugin };

package/dist/{precheck-D7gJSmJz.js → precheck-CQeqnfo5.js}

@@ -1,12 +1,12 @@
 const require_chunk = require("./chunk-C5U5_Hdc.js");
-const require_v3_engine = require("./v3-engine-CHItlVq5.js");
+const require_v3_engine = require("./v3-engine-DwY4Fixu.js");
 const require_defaults = require("./defaults-zKUH2mDe.js");
 require("./utils-D7Ygohep.js");
-const require_tailwindcss = require("./tailwindcss-B-e2RiXr.js");
-let node_path = require("node:path");
-node_path = require_chunk.__toESM(node_path);
+const require_tailwindcss = require("./tailwindcss-Cl7hUlYV.js");
 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 _weapp_tailwindcss_postcss = require("@weapp-tailwindcss/postcss");

package/dist/{precheck-D7K12zeX.mjs → precheck-nITnYBDn.mjs}

@@ -1,10 +1,10 @@
-import { B as createDebug, C as createTailwindV4Engine, K as resolveBooleanObjectOption, c as getRuntimeClassSetCacheEntry, d as invalidateRuntimeClassSet, q as omitUndefined, s as ensureTailwindcssRuntimePatch, u as getRuntimeClassSetSignatureWithSources, x as resolveTailwindV4SourceFromPatcher } from "./v3-engine-DcvCCHfs.mjs";
+import { B as createDebug, C as createTailwindV4Engine, K as resolveBooleanObjectOption, c as getRuntimeClassSetCacheEntry, d as invalidateRuntimeClassSet, q as omitUndefined, s as ensureTailwindcssRuntimePatch, u as getRuntimeClassSetSignatureWithSources, x as resolveTailwindV4SourceFromPatcher } from "./v3-engine-C_KeUQG3.mjs";
 import { a as resolveDefaultCssPreflight, i as getDefaultOptions, o as DEFAULT_PARSE_CACHE_MAX_SOURCE_LENGTH, s as HARD_PARSE_CACHE_MAX_ENTRIES } from "./defaults-8xrgzxFY.mjs";
 import { i as isMap, n as defuOverrideArray } from "./utils-DsaS975I.mjs";
-import { a as applyV4CssCalcDefaults, i as resolveUniAppXOptions, o as warnMissingCssEntries, t as createTailwindcssPatcherFromContext } from "./tailwindcss-C7dJHZ0G.mjs";
+import { a as applyV4CssCalcDefaults, i as resolveUniAppXOptions, o as warnMissingCssEntries, t as createTailwindcssPatcherFromContext } from "./tailwindcss-udhXxMX9.mjs";
 import { createRequire } from "node:module";
-import path from "node:path";
 import process from "node:process";
+import path from "node:path";
 import { logger, pc } from "@weapp-tailwindcss/logger";
 import { rm } from "node:fs/promises";
 import { createStyleHandler } from "@weapp-tailwindcss/postcss";

package/dist/presets.js

@@ -1,13 +1,13 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_chunk = require("./chunk-C5U5_Hdc.js");
-const require_v3_engine = require("./v3-engine-CHItlVq5.js");
+const require_v3_engine = require("./v3-engine-DwY4Fixu.js");
 const require_utils = require("./utils-D7Ygohep.js");
-const require_tailwindcss = require("./tailwindcss-B-e2RiXr.js");
+const require_tailwindcss = require("./tailwindcss-Cl7hUlYV.js");
 require("./logger-TlKT3xmR.js");
-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 local_pkg = require("local-pkg");
 let _weapp_tailwindcss_shared = require("@weapp-tailwindcss/shared");
 let _weapp_tailwindcss_logger = require("@weapp-tailwindcss/logger");

package/dist/presets.mjs

@@ -1,9 +1,9 @@
-import { q as omitUndefined } from "./v3-engine-DcvCCHfs.mjs";
+import { q as omitUndefined } from "./v3-engine-C_KeUQG3.mjs";
 import { n as defuOverrideArray, o as resolveUniUtsPlatform } from "./utils-DsaS975I.mjs";
-import { i as resolveUniAppXOptions, n as resolveTailwindcssBasedir } from "./tailwindcss-C7dJHZ0G.mjs";
+import { i as resolveUniAppXOptions, n as resolveTailwindcssBasedir } from "./tailwindcss-udhXxMX9.mjs";
 import { t as logger } from "./logger-BNzxZbZj.mjs";
-import path from "node:path";
 import process from "node:process";
+import path from "node:path";
 import { getPackageInfoSync } from "local-pkg";
 //#region src/presets/shared.ts
 function normalizeCssEntries(entries) {

package/dist/{source-candidates-DNM8iwXW.js → source-candidates-7Q-kTOSb.js}

@@ -1,5 +1,5 @@
 const require_chunk = require("./chunk-C5U5_Hdc.js");
-const require_v3_engine = require("./v3-engine-CHItlVq5.js");
+const require_v3_engine = require("./v3-engine-DwY4Fixu.js");
 let node_path = require("node:path");
 node_path = require_chunk.__toESM(node_path);
 let tailwindcss_patch = require("tailwindcss-patch");

package/dist/{source-candidates-CX2ozpKM.mjs → source-candidates-_x8bq0Mz.mjs}

@@ -1,4 +1,4 @@
-import { L as resolveSourceScanPath, N as isFileMatchedByTailwindSourceEntries, k as FULL_SOURCE_SCAN_EXTENSION_RE, z as toPosixPath } from "./v3-engine-DcvCCHfs.mjs";
+import { L as resolveSourceScanPath, N as isFileMatchedByTailwindSourceEntries, k as FULL_SOURCE_SCAN_EXTENSION_RE, z as toPosixPath } from "./v3-engine-C_KeUQG3.mjs";
 import path from "node:path";
 import { extractSourceCandidates, resolveProjectSourceFiles } from "tailwindcss-patch";
 import { readFile } from "node:fs/promises";

package/dist/{tailwindcss-B-e2RiXr.js → tailwindcss-Cl7hUlYV.js}

@@ -1,12 +1,12 @@
 const require_chunk = require("./chunk-C5U5_Hdc.js");
-const require_v3_engine = require("./v3-engine-CHItlVq5.js");
+const require_v3_engine = require("./v3-engine-DwY4Fixu.js");
 require("./utils-D7Ygohep.js");
 let node_fs = require("node:fs");
 let node_module = require("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);
 let _weapp_tailwindcss_logger = require("@weapp-tailwindcss/logger");
 let node_url = require("node:url");
 let _weapp_tailwindcss_shared = require("@weapp-tailwindcss/shared");

package/dist/{tailwindcss-C7dJHZ0G.mjs → tailwindcss-udhXxMX9.mjs}

@@ -1,9 +1,9 @@
-import { G as normalizeStringListOption, H as readInstalledPackageMajorVersion, J as findNearestPackageRoot, V as createTailwindcssPatcher, X as findWorkspaceRoot, Y as findWorkspacePackageDir, f as runtimeSignaturePatchersSymbol, q as omitUndefined } from "./v3-engine-DcvCCHfs.mjs";
+import { G as normalizeStringListOption, H as readInstalledPackageMajorVersion, J as findNearestPackageRoot, V as createTailwindcssPatcher, X as findWorkspaceRoot, Y as findWorkspacePackageDir, f as runtimeSignaturePatchersSymbol, q as omitUndefined } from "./v3-engine-C_KeUQG3.mjs";
 import { n as defuOverrideArray } from "./utils-DsaS975I.mjs";
 import { createRequire } from "node:module";
 import { existsSync, readFileSync } from "node:fs";
-import path from "node:path";
 import process from "node:process";
+import path from "node:path";
 import { logger } from "@weapp-tailwindcss/logger";
 import { fileURLToPath } from "node:url";
 //#region src/tailwindcss/v4/css-sources.ts

package/dist/{v3-engine-DcvCCHfs.mjs → v3-engine-C_KeUQG3.mjs}

@@ -1,9 +1,9 @@
-import { a as transformCssMacroCss, n as hasCssMacroTailwindPlugin, o as withCssMacroStyleOptions, r as hasCssMacroTailwindV4Directive, t as hasCssMacroStyleOptions } from "./auto-XyKTOP7B.mjs";
+import { a as transformCssMacroCss, n as hasCssMacroTailwindPlugin, o as withCssMacroStyleOptions, r as hasCssMacroTailwindV4Directive, t as hasCssMacroStyleOptions } from "./auto-DEHRmEAx.mjs";
 import { createRequire } from "node:module";
 import fs, { existsSync, readFileSync, readdirSync, realpathSync, statSync } from "node:fs";
 import postcss from "postcss";
-import path from "node:path";
 import process from "node:process";
+import path from "node:path";
 import { logger } from "@weapp-tailwindcss/logger";
 import { defuOverrideArray } from "@weapp-tailwindcss/shared";
 import { TailwindcssPatcher, createTailwindV4Engine, extractRawCandidates, loadTailwindV4DesignSystem, resolveProjectSourceFiles, resolveTailwindV4Source, resolveTailwindV4SourceFromPatchOptions } from "tailwindcss-patch";
@@ -747,7 +747,7 @@ function normalizeTailwindV4GeneratedUrlValues(css) {
 	});
 }
 async function transformTailwindV4CssToWeapp(css, options) {
-	const protectedCss = protectDynamicColorMixAlpha(normalizeTailwindV4GeneratedUrlValues(css), { customPropertyValues: options && "customPropertyValues" in options ? options.customPropertyValues : void 0 });
+	const protectedCss = 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,
@@ -760,7 +760,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
@@ -2824,7 +2824,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,
@@ -2839,7 +2839,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

package/dist/{v3-engine-CHItlVq5.js → v3-engine-DwY4Fixu.js}

@@ -1,14 +1,14 @@
 const require_chunk = require("./chunk-C5U5_Hdc.js");
-const require_auto = require("./auto-TH1jG2UW.js");
+const require_auto = require("./auto-dPpsm6FB.js");
 let node_fs = require("node:fs");
 node_fs = require_chunk.__toESM(node_fs);
 let node_module = require("node:module");
 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 _weapp_tailwindcss_shared = require("@weapp-tailwindcss/shared");
 let tailwindcss_patch = require("tailwindcss-patch");
@@ -755,7 +755,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(require_auto.hasCssMacroStyleOptions(options) ? await require_auto.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,
@@ -768,7 +768,7 @@ async function transformTailwindV4CssToWeapp(css, options) {
 }
 async function transformTailwindV4CssByTarget(css, target, options) {
 	if (target === "weapp") return transformTailwindV4CssToWeapp(css, options);
-	return require_auto.hasCssMacroStyleOptions(options) ? require_auto.transformCssMacroCss(css) : css;
+	return require_auto.hasCssMacroStyleOptions(options) ? require_auto.transformCssMacroCss(css, options) : css;
 }
 //#endregion
 //#region src/tailwindcss/v4-engine/tailwind-v3-default-colors.ts
@@ -2832,7 +2832,7 @@ function ensureMiniProgramV3PreflightReset(css, cssPreflight) {
 	}
 }
 async function transformTailwindV3CssToWeapp(css, options) {
-	const result = await defaultStyleHandler(css, {
+	const result = await defaultStyleHandler(require_auto.hasCssMacroStyleOptions(options) ? await require_auto.transformCssMacroCss(css, options) : css, {
 		cssChildCombinatorReplaceValue: ["view", "text"],
 		cssRemoveHoverPseudoClass: true,
 		isMainChunk: true,
@@ -2847,7 +2847,7 @@ async function transformTailwindV3CssToWeapp(css, options) {
 }
 async function transformTailwindV3CssByTarget(css, target, options) {
 	if (target === "weapp") return transformTailwindV3CssToWeapp(css, options);
-	return require_auto.hasCssMacroStyleOptions(options) ? require_auto.transformCssMacroCss(css) : css;
+	return require_auto.hasCssMacroStyleOptions(options) ? require_auto.transformCssMacroCss(css, options) : css;
 }
 //#endregion
 //#region src/tailwindcss/v3-engine/generator.ts