weapp-tailwindcss 5.0.0-next.15 → 5.0.0-next.17

package/dist/{incremental-runtime-class-set-P-3ZoWW5.mjs → incremental-runtime-class-set-DC0RsBbK.mjs}

@@ -1,12 +1,13 @@
-import { B as omitUndefined, E as removeUnsupportedCascadeLayers, F as createDebug, O as loadTailwindV4DesignSystem, S as resolveTailwindV4SourceOptionsFromPatcher, h as resolveTailwindV4EntriesFromCss, l as getRuntimeClassSetSignature, n as resolveTailwindV3SourceFromPatcher, r as resolveTailwindV3SourceOptionsFromPatcher, t as resolveTailwindV3Source, x as resolveTailwindV4SourceFromPatcher, y as resolveTailwindV4Source$1 } from "./v3-engine-qoWtwjIj.mjs";
-import { i as normalizeWeappTailwindcssGeneratorOptions, t as createWeappTailwindcssGenerator } from "./generator-DSMdL4vg.mjs";
-import { l as replaceWxml } from "./precheck-DMXLnfTN.mjs";
-import { i as resolveUniAppXOptions } from "./tailwindcss-fe0rGj7T.mjs";
+import { B as omitUndefined, E as removeUnsupportedCascadeLayers, F as createDebug, O as loadTailwindV4DesignSystem, S as resolveTailwindV4SourceOptionsFromPatcher, h as resolveTailwindV4EntriesFromCss, l as getRuntimeClassSetSignature, n as resolveTailwindV3SourceFromPatcher, r as resolveTailwindV3SourceOptionsFromPatcher, t as resolveTailwindV3Source, x as resolveTailwindV4SourceFromPatcher, y as resolveTailwindV4Source$1 } from "./v3-engine-CCxDqZ8e.mjs";
+import { i as normalizeWeappTailwindcssGeneratorOptions, t as createWeappTailwindcssGenerator } from "./generator-Ber8UVgv.mjs";
+import { l as replaceWxml } from "./precheck-CX-5VqM1.mjs";
+import { i as resolveUniAppXOptions } from "./tailwindcss-D74Wk4ys.mjs";
 import { existsSync, readFileSync } from "node:fs";
 import postcss from "postcss";
 import path from "node:path";
 import process from "node:process";
 import { extractRawCandidatesWithPositions, extractValidCandidates } from "tailwindcss-patch";
+import { normalizeModernColorValue } from "@weapp-tailwindcss/postcss";
 //#region src/bundlers/shared/generator-css/markers.ts
 const TAILWIND_V4_BANNER_RE = /\/\*!\s*tailwindcss v4\./;
 const TAILWIND_GENERATED_CSS_MARKER_RE = /\/\*!\s*tailwindcss v|@property\s+--tw-|--tw-|:not\(#\\#\)|\.[^,{]*(?:\\:|\\\[|\\#)|(?::host|page|\.tw-root|wx-root-portal-content)[^{]*\{[^}]*--(?:color|spacing|text|font-weight|radius)-/;
@@ -39,6 +40,20 @@ function splitTailwindV4GeneratedCssBySourceOrder(rawSource, rawTailwindCss) {
 		after: rawSource.slice(start + rawTailwindCss.length)
 	};
 }
+function splitGeneratorPlaceholderCssBySourceOrder(rawSource, rawTailwindCss) {
+	const match = GENERATOR_PLACEHOLDER_MARKER_RE.exec(rawSource);
+	if (!match || match.index === void 0) return;
+	let afterStart = match.index + match[0].length;
+	while (/\s/.test(rawSource[afterStart] ?? "")) afterStart++;
+	if (rawTailwindCss && rawSource.slice(afterStart).startsWith(rawTailwindCss)) {
+		afterStart += rawTailwindCss.length;
+		while (/\s/.test(rawSource[afterStart] ?? "")) afterStart++;
+	}
+	return {
+		before: rawSource.slice(0, match.index),
+		after: rawSource.slice(afterStart)
+	};
+}
 function splitTailwindGeneratedCssByBanner(rawSource, start) {
 	const match = start === void 0 ? TAILWIND_BANNER_RE.exec(rawSource) : { index: start };
 	if (!match || match.index === void 0) return;
@@ -89,6 +104,7 @@ const TAILWIND_ROOT_DIRECTIVE_NAMES = new Set([
 const TAILWIND_ROOT_DIRECTIVE_RE = /@(?:import\s+(?:url\(\s*)?["']?tailwindcss4?(?:\/[^"')\s]*)?|tailwind|config|custom-variant|plugin|source|theme|utility|variant)\b/;
 const TAILWIND_EXTRACTABLE_DIRECTIVE_RE = /^\s*@(?:import|tailwind|config|source|reference|plugin)\b[\s\S]*?(?:;|$)/;
 const TAILWIND_EXTRACTABLE_BLOCK_DIRECTIVE_RE = /^\s*@(?:theme|utility|variant|custom-variant)\b[\s\S]*$/;
+const TAILWIND_EXTRACTABLE_LAYER_STATEMENT_RE = /^\s*@layer\s[^;{]+;\s*$/;
 function parseImportRequest(params) {
 	return /^(?:url\(\s*)?(["']?)([^"')\s]+)\1\s*\)?/.exec(params.trim())?.[2];
 }
@@ -145,7 +161,7 @@ function extractTailwindDirectiveLines(rawSource, options = {}) {
 	for (const line of stripGeneratorPlaceholderMarkers(rawSource).split(/\r?\n/)) {
 		const trimmed = line.trim();
 		if (!trimmed || trimmed.startsWith("//")) continue;
-		const directive = TAILWIND_EXTRACTABLE_DIRECTIVE_RE.exec(line)?.[0] ?? TAILWIND_EXTRACTABLE_BLOCK_DIRECTIVE_RE.exec(line)?.[0];
+		const directive = TAILWIND_EXTRACTABLE_DIRECTIVE_RE.exec(line)?.[0] ?? TAILWIND_EXTRACTABLE_BLOCK_DIRECTIVE_RE.exec(line)?.[0] ?? TAILWIND_EXTRACTABLE_LAYER_STATEMENT_RE.exec(line)?.[0];
 		if (!directive) continue;
 		const normalized = normalizeTailwindDirectiveLine(directive.trimEnd(), options);
 		const normalizedTrimmed = normalized.trim();
@@ -568,8 +584,19 @@ function removeDisplayP3Declarations(root) {
 			removeEmptyAtRuleAncestors(parent);
 		}
 	});
+}
+function removeUnsupportedModernColorDeclarations(root) {
+	const customPropertyValues = /* @__PURE__ */ new Map();
 	root.walkDecls((decl) => {
-		if (isDisplayP3Declaration(decl)) removeDeclarationAndEmptyRule(decl);
+		if (decl.prop.startsWith("--")) customPropertyValues.set(decl.prop, decl.value.trim());
+	});
+	root.walkDecls((decl) => {
+		const normalized = normalizeModernColorValue(decl.value, customPropertyValues);
+		if (normalized.changed) {
+			decl.value = normalized.value;
+			if (decl.prop.startsWith("--")) customPropertyValues.set(decl.prop, decl.value.trim());
+		}
+		if (normalized.hasUnsupported) removeDeclarationAndEmptyRule(decl);
 	});
 }
 //#endregion
@@ -584,6 +611,7 @@ const PREFLIGHT_RESET_PROPS = new Set([
 	"padding"
 ]);
 const CONTENT_VAR_RE = /var\(\s*--tw-content\b/;
+const HOIST_ANCHOR_COMMENT = "__weapp_tailwindcss_base_anchor__";
 function isMiniProgramThemeScopeSelector$1(selectors) {
 	return selectors.length > 0 && selectors.every((selector) => MINI_PROGRAM_THEME_SCOPE_SELECTORS$1.has(selector));
 }
@@ -701,11 +729,27 @@ function getTopDirectiveTail(root) {
 	}
 	return tail;
 }
-function insertHoistedRules(root, rules) {
-	if (rules.length === 0) return;
+function createHoistInsertionAnchor(root) {
+	for (const node of root.nodes ?? []) if (isTailwindPreflightRule(node) || isMiniProgramThemeVariableRule(node)) {
+		const anchor = postcss.comment({ text: HOIST_ANCHOR_COMMENT });
+		node.before(anchor);
+		return anchor;
+	}
+}
+function insertHoistedRules(root, rules, anchor) {
+	if (anchor && !anchor.parent) anchor = void 0;
+	if (rules.length === 0) {
+		anchor?.remove();
+		return;
+	}
 	const topDirectiveTail = getTopDirectiveTail(root);
 	const firstRule = rules[0];
 	if (!firstRule) return;
+	if (anchor) {
+		firstRule.raws.before = anchor.raws.before;
+		anchor.replaceWith(rules);
+		return;
+	}
 	firstRule.raws.before = topDirectiveTail ? "\n" : "";
 	if (topDirectiveTail) topDirectiveTail.after(rules);
 	else root.prepend(rules);
@@ -719,13 +763,15 @@ function finalizeMiniProgramCssRoot(root, options = {}) {
 	removeSpecificityPlaceholders(root);
 	removeUnsupportedBrowserSelectors(root);
 	removeDisplayP3Declarations(root);
+	removeUnsupportedModernColorDeclarations(root);
+	const hoistAnchor = createHoistInsertionAnchor(root);
 	const preflightRules = collectPreflightRules(root, options);
 	if (preflightRules.length === 0) {
 		const resetRule = createPreflightResetRule(options.cssPreflight);
 		if (resetRule) preflightRules.push(resetRule);
 	}
 	const themeRule = collectThemeVariableRule(root, options);
-	insertHoistedRules(root, themeRule ? [...preflightRules, themeRule] : preflightRules);
+	insertHoistedRules(root, themeRule ? [...preflightRules, themeRule] : preflightRules, hoistAnchor);
 }
 function unwrapTailwindSourceMedia(root) {
 	root.walkAtRules("media", (atRule) => {
@@ -1470,6 +1516,57 @@ function createStableJson(value) {
 function createLegacyCompatTransformCacheKey(source, options) {
 	return `${createStableJson(options)}\0${source}`;
 }
+function countUnclosedBlocks(source) {
+	let depth = 0;
+	let quote;
+	let inComment = false;
+	let escaped = false;
+	for (let index = 0; index < source.length; index += 1) {
+		const char = source[index];
+		const next = source[index + 1];
+		if (inComment) {
+			if (char === "*" && next === "/") {
+				inComment = false;
+				index += 1;
+			}
+			continue;
+		}
+		if (quote) {
+			if (escaped) {
+				escaped = false;
+				continue;
+			}
+			if (char === "\\") {
+				escaped = true;
+				continue;
+			}
+			if (char === quote) quote = void 0;
+			continue;
+		}
+		if (char === "/" && next === "*") {
+			inComment = true;
+			index += 1;
+			continue;
+		}
+		if (char === "\"" || char === "'") {
+			quote = char;
+			continue;
+		}
+		if (char === "{") depth += 1;
+		else if (char === "}" && depth > 0) depth -= 1;
+	}
+	return depth;
+}
+function closeTrailingUnclosedBlocks(source) {
+	try {
+		postcss.parse(source);
+		return source;
+	} catch (error) {
+		if (error.reason !== "Unclosed block") return source;
+		const unclosedBlocks = countUnclosedBlocks(source);
+		return unclosedBlocks > 0 ? `${source}${"}".repeat(unclosedBlocks)}` : source;
+	}
+}
 function removeTailwindApplyRules(rawSource) {
 	try {
 		const root = postcss.parse(rawSource);
@@ -1491,7 +1588,7 @@ function removeTailwindApplyRules(rawSource) {
 function resolveLegacyCompatCssSource(rawSource) {
 	const cached = legacyCompatSourceCache.get(rawSource);
 	if (cached !== void 0) return cached;
-	const resolved = removeUnsupportedMiniProgramAtRules(removeTailwindApplyRules(removeTailwindSourceDirectives(stripTailwindBanners(rawSource))));
+	const resolved = closeTrailingUnclosedBlocks(removeUnsupportedMiniProgramAtRules(removeTailwindApplyRules(removeTailwindSourceDirectives(closeTrailingUnclosedBlocks(stripTailwindBanners(rawSource))))));
 	setLimitedCacheValue(legacyCompatSourceCache, rawSource, resolved);
 	return resolved;
 }
@@ -1606,10 +1703,10 @@ function inheritLegacyUnitConvertedDeclarations(css, legacyCss) {
 //#region src/bundlers/shared/generator-css.ts
 const SUPPORTED_GENERATOR_MAJOR_VERSIONS = new Set([3, 4]);
 const REMOTE_IMPORT_RE = /^(?:https?:)?\/\//i;
-function finalizeMiniProgramGeneratorCss(css, target, majorVersion, cssPreflight) {
+function finalizeMiniProgramGeneratorCss(css, target, majorVersion, cssPreflight, options = {}) {
 	if (target !== "weapp") return css;
 	return finalizeMiniProgramCss(css, {
-		cssPreflight: majorVersion === 4 ? cssPreflight : void 0,
+		cssPreflight: majorVersion === 4 && options.injectPreflight !== false ? cssPreflight : void 0,
 		preservePseudoContentInit: majorVersion === 3
 	});
 }
@@ -1657,6 +1754,20 @@ function isCommentOnlyCss(source) {
 		return false;
 	}
 }
+function stripTailwindSourceMediaFragments(source) {
+	return source.replace(/^\s*@media\s+source\([^)]*\)\s*\{\s*$/gm, "").replace(/^\s*\}\s*(?=@(?:source|theme|config|plugin|utility|variant|custom-variant)\b)/gm, "").replace(/^\s*\}\s*\/\*\s*source\([^)]*\)\s*\*\/\s*$/gm, "");
+}
+function stripLeadingTailwindSourceMediaCloseFragment(source) {
+	return source.replace(/^\s*\}\s*(?:\n|$)/, "");
+}
+function stripUnmatchedTailwindSourceMediaCloseFragments(source) {
+	try {
+		postcss.parse(source);
+		return source;
+	} catch {
+		return stripLeadingTailwindSourceMediaCloseFragment(source).replace(/\s*\}\s*$/, "");
+	}
+}
 function createCssSourceOrderAppend(base, extra) {
 	if (!base) return extra;
 	if (!extra) return base;
@@ -1664,19 +1775,21 @@ function createCssSourceOrderAppend(base, extra) {
 	return `${base}\n${extra}`;
 }
 function splitRawSourceByGeneratedCssOrder(rawSource, rawTailwindCss) {
+	const placeholderParts = splitGeneratorPlaceholderCssBySourceOrder(rawSource, rawTailwindCss);
+	if (placeholderParts) return placeholderParts;
 	const exactParts = splitTailwindV4GeneratedCssBySourceOrder(rawSource, rawTailwindCss);
 	if (exactParts) return exactParts;
 	return splitTailwindGeneratedCssByBanner(rawSource);
 }
 async function transformGeneratorUserCss(source, options) {
 	if (source.trim().length === 0) return "";
-	const cleanedSource = removeTailwindSourceDirectives(source, { importFallback: options.importFallback });
+	const cleanedSource = removeTailwindSourceDirectives(stripUnmatchedTailwindSourceMediaCloseFragments(stripTailwindSourceMediaFragments(source)), { importFallback: options.importFallback });
 	if (cleanedSource.trim().length === 0) return "";
-	const extraSource = options.generatorTarget === "weapp" ? removeUnsupportedMiniProgramAtRules(cleanedSource) : cleanedSource;
-	if (extraSource.trim().length === 0) return "";
-	if (isCommentOnlyCss(extraSource)) return extraSource;
-	if (options.generatorTarget !== "weapp") return extraSource;
-	const { css } = await options.styleHandler(extraSource, {
+	const userSource = stripUnmatchedTailwindSourceMediaCloseFragments(removeTailwindSourceDirectives(stripUnmatchedTailwindSourceMediaCloseFragments(stripTailwindSourceMediaFragments(options.generatorTarget === "weapp" ? removeUnsupportedMiniProgramAtRules(cleanedSource) : cleanedSource)), { importFallback: options.importFallback }));
+	if (userSource.trim().length === 0) return "";
+	if (isCommentOnlyCss(userSource)) return userSource;
+	if (options.generatorTarget !== "weapp") return userSource;
+	const { css } = await options.styleHandler(userSource, {
 		...options.generatorStyleOptions,
 		...options.cssUserHandlerOptions
 	});
@@ -1738,7 +1851,7 @@ async function generateCssByGenerator(options) {
 	const { opts, runtimeState, runtime, rawSource, file, cssHandlerOptions, cssUserHandlerOptions, getSourceCandidatesForEntries, styleHandler, debug } = options;
 	const generatorOptions = normalizeWeappTailwindcssGeneratorOptions(opts.generator);
 	const majorVersion = runtimeState.twPatcher.majorVersion;
-	const effectiveRawSource = normalizeTailwindSourceDirectives(rawSource, { importFallback: generatorOptions.importFallback });
+	const effectiveRawSource = stripUnmatchedTailwindSourceMediaCloseFragments(stripTailwindSourceMediaFragments(normalizeTailwindSourceDirectives(rawSource, { importFallback: generatorOptions.importFallback })));
 	const cleanedLocalImportWrapper = cleanLocalCssImportWrapperTailwindDirectives(effectiveRawSource);
 	if (cleanedLocalImportWrapper !== void 0) return {
 		css: generatorOptions.target === "weapp" ? removeUnsupportedMiniProgramAtRules(cleanedLocalImportWrapper) : cleanedLocalImportWrapper,
@@ -1796,7 +1909,7 @@ async function generateCssByGenerator(options) {
 		if (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)) : options.previousCss,
+				css: incrementalCss.trim().length > 0 ? createCssAppend(options.previousCss, finalizeMiniProgramGeneratorCss(incrementalCss, generated.target, majorVersion, opts.cssPreflight, { injectPreflight: false })) : options.previousCss,
 				target: generated.target,
 				source: "generator",
 				dependencies: generated.dependencies,
@@ -1832,7 +1945,7 @@ 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 (hasMatchedCssSourceFile) return {
+		if (hasMatchedCssSourceFile || generated.target === "web") return {
 			css: finalizeMiniProgramGeneratorCss(css, generated.target, majorVersion, opts.cssPreflight),
 			target: generated.target,
 			source: "generator",

package/dist/index.js

@@ -1,9 +1,9 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_generator = require("./generator-CImaTibB.js");
+const require_generator = require("./generator-BIEhxFdv.js");
 const require_gulp = require("./gulp.js");
-const require_postcss = require("./postcss-k0BshZZQ.js");
-const require_vite = require("./vite-Bob_Mrva.js");
-const require_webpack = require("./webpack-BedfyGbF.js");
+const require_postcss = require("./postcss-DCOUtuwI.js");
+const require_vite = require("./vite-DnHdmHHD.js");
+const require_webpack = require("./webpack-SxEdWHlL.js");
 exports.UnifiedWebpackPluginV5 = require_webpack.UnifiedWebpackPluginV5;
 exports.WeappTailwindcss = require_vite.WeappTailwindcss;
 exports.createPlugins = require_gulp.createPlugins;

package/dist/index.mjs

@@ -1,6 +1,6 @@
-import { t as createWeappTailwindcssGenerator } from "./generator-DSMdL4vg.mjs";
+import { t as createWeappTailwindcssGenerator } from "./generator-Ber8UVgv.mjs";
 import { WeappTailwindcss as createPlugins } from "./gulp.mjs";
-import { t as weappTailwindcssPostcssPlugin } from "./postcss-CgFCqilE.mjs";
-import { t as WeappTailwindcss } from "./vite-cBjGYHFH.mjs";
-import { n as weappTailwindcssPackageDir, t as UnifiedWebpackPluginV5 } from "./webpack-Cq45BZzs.mjs";
+import { t as weappTailwindcssPostcssPlugin } from "./postcss-DW08tZXt.mjs";
+import { t as WeappTailwindcss } from "./vite-bmU2kkO6.mjs";
+import { n as weappTailwindcssPackageDir, t as UnifiedWebpackPluginV5 } from "./webpack-BkBoEn4k.mjs";
 export { UnifiedWebpackPluginV5, WeappTailwindcss, createPlugins, createWeappTailwindcssGenerator, weappTailwindcssPackageDir, weappTailwindcssPostcssPlugin };

package/dist/{postcss-k0BshZZQ.js → postcss-DCOUtuwI.js}

@@ -1,6 +1,6 @@
 const require_chunk = require("./chunk-8l464Juk.js");
-const require_v3_engine = require("./v3-engine-v__n8_Sd.js");
-const require_generator = require("./generator-CImaTibB.js");
+const require_v3_engine = require("./v3-engine-BRInt2DS.js");
+const require_generator = require("./generator-BIEhxFdv.js");
 let postcss = require("postcss");
 postcss = require_chunk.__toESM(postcss);
 let node_path = require("node:path");

package/dist/{postcss-CgFCqilE.mjs → postcss-DW08tZXt.mjs}

@@ -1,5 +1,5 @@
-import { A as createSourceScanPattern, L as readInstalledPackageMajorVersion, M as normalizeLegacyContentEntries, N as parseConfigParam, P as resolveCssSourceEntries, j as expandTailwindSourceEntries, k as collectCssInlineSourceCandidates, t as resolveTailwindV3Source, y as resolveTailwindV4Source$1 } from "./v3-engine-qoWtwjIj.mjs";
-import { i as normalizeWeappTailwindcssGeneratorOptions, t as createWeappTailwindcssGenerator } from "./generator-DSMdL4vg.mjs";
+import { A as createSourceScanPattern, L as readInstalledPackageMajorVersion, M as normalizeLegacyContentEntries, N as parseConfigParam, P as resolveCssSourceEntries, j as expandTailwindSourceEntries, k as collectCssInlineSourceCandidates, t as resolveTailwindV3Source, y as resolveTailwindV4Source$1 } from "./v3-engine-CCxDqZ8e.mjs";
+import { i as normalizeWeappTailwindcssGeneratorOptions, t as createWeappTailwindcssGenerator } from "./generator-Ber8UVgv.mjs";
 import postcss from "postcss";
 import path from "node:path";
 import process from "node:process";

package/dist/postcss.js

@@ -2,6 +2,6 @@ Object.defineProperties(exports, {
 	__esModule: { value: true },
 	[Symbol.toStringTag]: { value: "Module" }
 });
-const require_postcss = require("./postcss-k0BshZZQ.js");
+const require_postcss = require("./postcss-DCOUtuwI.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-CgFCqilE.mjs";
+import { t as weappTailwindcssPostcssPlugin } from "./postcss-DW08tZXt.mjs";
 export { weappTailwindcssPostcssPlugin as default, weappTailwindcssPostcssPlugin };

package/dist/{precheck-DMXLnfTN.mjs → precheck-CX-5VqM1.mjs}

@@ -1,7 +1,7 @@
-import { B as omitUndefined, C as createTailwindV4Engine, F as createDebug, c as getRuntimeClassSetCacheEntry, d as invalidateRuntimeClassSet, s as ensureTailwindcssRuntimePatch, u as getRuntimeClassSetSignatureWithSources, x as resolveTailwindV4SourceFromPatcher } from "./v3-engine-qoWtwjIj.mjs";
+import { B as omitUndefined, C as createTailwindV4Engine, F as createDebug, c as getRuntimeClassSetCacheEntry, d as invalidateRuntimeClassSet, s as ensureTailwindcssRuntimePatch, u as getRuntimeClassSetSignatureWithSources, x as resolveTailwindV4SourceFromPatcher } from "./v3-engine-CCxDqZ8e.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-B1igPF_e.mjs";
 import { i as isMap, n as defuOverrideArray } from "./utils-CGBVVNm6.mjs";
-import { a as applyV4CssCalcDefaults, i as resolveUniAppXOptions, o as warnMissingCssEntries, r as isUniAppXEnabled, t as createTailwindcssPatcherFromContext } from "./tailwindcss-fe0rGj7T.mjs";
+import { a as applyV4CssCalcDefaults, i as resolveUniAppXOptions, o as warnMissingCssEntries, r as isUniAppXEnabled, t as createTailwindcssPatcherFromContext } from "./tailwindcss-D74Wk4ys.mjs";
 import path from "node:path";
 import process from "node:process";
 import { logger, pc } from "@weapp-tailwindcss/logger";

package/dist/{precheck-GcUdX1BX.js → precheck-CZfnh4T6.js}

@@ -1,8 +1,8 @@
 const require_chunk = require("./chunk-8l464Juk.js");
-const require_v3_engine = require("./v3-engine-v__n8_Sd.js");
+const require_v3_engine = require("./v3-engine-BRInt2DS.js");
 const require_defaults = require("./defaults-IHhYxNeU.js");
 require("./utils-4ODFyoqD.js");
-const require_tailwindcss = require("./tailwindcss-CkTBauKa.js");
+const require_tailwindcss = require("./tailwindcss-BVoa7vx-.js");
 let node_path = require("node:path");
 node_path = require_chunk.__toESM(node_path);
 let node_process = require("node:process");

package/dist/presets.js

@@ -1,8 +1,8 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_chunk = require("./chunk-8l464Juk.js");
-const require_v3_engine = require("./v3-engine-v__n8_Sd.js");
+const require_v3_engine = require("./v3-engine-BRInt2DS.js");
 const require_utils = require("./utils-4ODFyoqD.js");
-const require_tailwindcss = require("./tailwindcss-CkTBauKa.js");
+const require_tailwindcss = require("./tailwindcss-BVoa7vx-.js");
 require("./logger-EVNB9z7i.js");
 let node_process = require("node:process");
 node_process = require_chunk.__toESM(node_process);

package/dist/presets.mjs

@@ -1,6 +1,6 @@
-import { B as omitUndefined } from "./v3-engine-qoWtwjIj.mjs";
+import { B as omitUndefined } from "./v3-engine-CCxDqZ8e.mjs";
 import { n as defuOverrideArray, o as resolveUniUtsPlatform } from "./utils-CGBVVNm6.mjs";
-import { i as resolveUniAppXOptions, n as resolveTailwindcssBasedir } from "./tailwindcss-fe0rGj7T.mjs";
+import { i as resolveUniAppXOptions, n as resolveTailwindcssBasedir } from "./tailwindcss-D74Wk4ys.mjs";
 import { t as logger } from "./logger-CZUxvJJD.mjs";
 import process from "node:process";
 import { getPackageInfoSync } from "local-pkg";

package/dist/{source-candidates-ES3ttZPe.js → source-candidates-BDyoPviV.js}

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

package/dist/{source-candidates-om5-wQJ0.mjs → source-candidates-DGlDzkvf.mjs}

@@ -1,4 +1,4 @@
-import { j as expandTailwindSourceEntries } from "./v3-engine-qoWtwjIj.mjs";
+import { j as expandTailwindSourceEntries } from "./v3-engine-CCxDqZ8e.mjs";
 import path from "node:path";
 import { extractSourceCandidates } from "tailwindcss-patch";
 import { readFile } from "node:fs/promises";

package/dist/{tailwindcss-CkTBauKa.js → tailwindcss-BVoa7vx-.js}

@@ -1,5 +1,5 @@
 const require_chunk = require("./chunk-8l464Juk.js");
-const require_v3_engine = require("./v3-engine-v__n8_Sd.js");
+const require_v3_engine = require("./v3-engine-BRInt2DS.js");
 require("./utils-4ODFyoqD.js");
 let node_fs = require("node:fs");
 let node_module = require("node:module");
@@ -295,6 +295,8 @@ function isTailwindVersionMismatchError(error) {
 function createPatcherForBase(baseDir, cssEntries, options) {
 	const { tailwindcss, tailwindcssPatcherOptions, supportCustomLengthUnitsPatch, bareArbitraryValues } = options;
 	const hasCssEntries = Boolean(cssEntries?.length);
+	const configuredV4Options = tailwindcss?.v4 ?? tailwindcssPatcherOptions?.tailwindcss?.v4;
+	const hasCssSources = Boolean(configuredV4Options?.cssSources?.length);
 	const defaultTailwindcssConfig = {
 		cwd: baseDir,
 		v2: { cwd: baseDir },
@@ -320,12 +322,12 @@ function createPatcherForBase(baseDir, cssEntries, options) {
 	const patchedOptions = overrideTailwindcssPatcherOptionsForBase(tailwindcssPatcherOptions, baseDir, cssEntries ?? []);
 	const configuredPackageName = tailwindcss?.packageName || tailwindcssPatcherOptions?.tailwindcss?.packageName;
 	const explicitTailwindVersion = resolveExplicitTailwindVersion(tailwindcss?.version || tailwindcssPatcherOptions?.tailwindcss?.version || mergedTailwindOptions.version, configuredPackageName);
-	const hasExplicitV4Signals = hasCssEntries || hasOwnV4Signal(tailwindcss) || hasOwnV4Signal(tailwindcssPatcherOptions?.tailwindcss);
+	const hasExplicitV4Signals = hasCssEntries || hasCssSources || hasOwnV4Signal(tailwindcss) || hasOwnV4Signal(tailwindcssPatcherOptions?.tailwindcss);
 	const packageNameForVersionDetection = configuredPackageName ?? mergedTailwindOptions.packageName ?? "tailwindcss";
 	const installedTailwindVersion = require_v3_engine.readInstalledPackageMajorVersion(packageNameForVersionDetection, baseDir);
 	const resolvedTailwindVersion = installedTailwindVersion ?? explicitTailwindVersion;
 	const supportedResolvedTailwindVersion = resolvedTailwindVersion === 2 || resolvedTailwindVersion === 3 || resolvedTailwindVersion === 4 ? resolvedTailwindVersion : void 0;
-	const shouldPatchV4PostcssPackage = (resolvedTailwindVersion === 4 && (installedTailwindVersion === 4 || explicitTailwindVersion === 4 || hasExplicitV4Signals && isTailwindcss4Package(packageNameForVersionDetection)) || resolvedTailwindVersion === void 0 && (hasCssEntries || hasOwnV4Signal(tailwindcss) || hasOwnV4Signal(tailwindcssPatcherOptions?.tailwindcss))) && !Boolean(configuredPackageName);
+	const shouldPatchV4PostcssPackage = (resolvedTailwindVersion === 4 && (installedTailwindVersion === 4 || explicitTailwindVersion === 4 || hasExplicitV4Signals && isTailwindcss4Package(packageNameForVersionDetection)) || resolvedTailwindVersion === void 0 && (hasCssEntries || hasCssSources || hasOwnV4Signal(tailwindcss) || hasOwnV4Signal(tailwindcssPatcherOptions?.tailwindcss))) && !Boolean(configuredPackageName);
 	const packageCandidates = /* @__PURE__ */ new Set();
 	if (shouldPatchV4PostcssPackage) packageCandidates.add("@tailwindcss/postcss");
 	packageCandidates.add(mergedTailwindOptions.packageName ?? configuredPackageName ?? "tailwindcss");

package/dist/{tailwindcss-fe0rGj7T.mjs → tailwindcss-D74Wk4ys.mjs}

@@ -1,4 +1,4 @@
-import { B as omitUndefined, H as findWorkspacePackageDir, I as createTailwindcssPatcher, L as readInstalledPackageMajorVersion, U as findWorkspaceRoot, V as findNearestPackageRoot, f as runtimeSignaturePatchersSymbol } from "./v3-engine-qoWtwjIj.mjs";
+import { B as omitUndefined, H as findWorkspacePackageDir, I as createTailwindcssPatcher, L as readInstalledPackageMajorVersion, U as findWorkspaceRoot, V as findNearestPackageRoot, f as runtimeSignaturePatchersSymbol } from "./v3-engine-CCxDqZ8e.mjs";
 import { n as defuOverrideArray } from "./utils-CGBVVNm6.mjs";
 import { createRequire } from "node:module";
 import { existsSync, readFileSync } from "node:fs";
@@ -291,6 +291,8 @@ function isTailwindVersionMismatchError(error) {
 function createPatcherForBase(baseDir, cssEntries, options) {
 	const { tailwindcss, tailwindcssPatcherOptions, supportCustomLengthUnitsPatch, bareArbitraryValues } = options;
 	const hasCssEntries = Boolean(cssEntries?.length);
+	const configuredV4Options = tailwindcss?.v4 ?? tailwindcssPatcherOptions?.tailwindcss?.v4;
+	const hasCssSources = Boolean(configuredV4Options?.cssSources?.length);
 	const defaultTailwindcssConfig = {
 		cwd: baseDir,
 		v2: { cwd: baseDir },
@@ -316,12 +318,12 @@ function createPatcherForBase(baseDir, cssEntries, options) {
 	const patchedOptions = overrideTailwindcssPatcherOptionsForBase(tailwindcssPatcherOptions, baseDir, cssEntries ?? []);
 	const configuredPackageName = tailwindcss?.packageName || tailwindcssPatcherOptions?.tailwindcss?.packageName;
 	const explicitTailwindVersion = resolveExplicitTailwindVersion(tailwindcss?.version || tailwindcssPatcherOptions?.tailwindcss?.version || mergedTailwindOptions.version, configuredPackageName);
-	const hasExplicitV4Signals = hasCssEntries || hasOwnV4Signal(tailwindcss) || hasOwnV4Signal(tailwindcssPatcherOptions?.tailwindcss);
+	const hasExplicitV4Signals = hasCssEntries || hasCssSources || hasOwnV4Signal(tailwindcss) || hasOwnV4Signal(tailwindcssPatcherOptions?.tailwindcss);
 	const packageNameForVersionDetection = configuredPackageName ?? mergedTailwindOptions.packageName ?? "tailwindcss";
 	const installedTailwindVersion = readInstalledPackageMajorVersion(packageNameForVersionDetection, baseDir);
 	const resolvedTailwindVersion = installedTailwindVersion ?? explicitTailwindVersion;
 	const supportedResolvedTailwindVersion = resolvedTailwindVersion === 2 || resolvedTailwindVersion === 3 || resolvedTailwindVersion === 4 ? resolvedTailwindVersion : void 0;
-	const shouldPatchV4PostcssPackage = (resolvedTailwindVersion === 4 && (installedTailwindVersion === 4 || explicitTailwindVersion === 4 || hasExplicitV4Signals && isTailwindcss4Package(packageNameForVersionDetection)) || resolvedTailwindVersion === void 0 && (hasCssEntries || hasOwnV4Signal(tailwindcss) || hasOwnV4Signal(tailwindcssPatcherOptions?.tailwindcss))) && !Boolean(configuredPackageName);
+	const shouldPatchV4PostcssPackage = (resolvedTailwindVersion === 4 && (installedTailwindVersion === 4 || explicitTailwindVersion === 4 || hasExplicitV4Signals && isTailwindcss4Package(packageNameForVersionDetection)) || resolvedTailwindVersion === void 0 && (hasCssEntries || hasCssSources || hasOwnV4Signal(tailwindcss) || hasOwnV4Signal(tailwindcssPatcherOptions?.tailwindcss))) && !Boolean(configuredPackageName);
 	const packageCandidates = /* @__PURE__ */ new Set();
 	if (shouldPatchV4PostcssPackage) packageCandidates.add("@tailwindcss/postcss");
 	packageCandidates.add(mergedTailwindOptions.packageName ?? configuredPackageName ?? "tailwindcss");