@weapp-tailwindcss/postcss 3.2.1 → 3.2.3

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 export { type PostcssAppType, type PostcssStyleBranch, type PostcssStyleBranchProfile, resolvePostcssStyleBranch, type ResolvePostcssStyleBranchOptions, resolvePostcssStyleBranchProfile, } from './branches/index.js';
-export { type DynamicColorMixAlphaProtection, type DynamicColorMixAlphaProtectionOptions, type ModernColorValueNormalization, normalizeModernColorValue, protectDynamicColorMixAlpha, } from './compat/color-mix.js';
+export { type DynamicColorMixAlphaProtection, type DynamicColorMixAlphaProtectionOptions, type ModernColorValueNormalization, normalizeModernColorValue, protectDynamicColorMixAlpha, protectDynamicVarFallbacks, } from './compat/color-mix.js';
 export { consumeCascadeLayers, finalizeMiniProgramCss, hasMiniProgramCssSpecificityPlaceholders, hoistTailwindPreflightBase, normalizeMiniProgramGeneratedCssForPostcss, pruneMiniProgramGeneratedCss, removeEmptyAtRules, removeUnsupportedAtSupports, removeUnsupportedCascadeLayers, removeUnsupportedMiniProgramAtRules, stripMiniProgramCssSpecificityPlaceholders, unwrapUnsupportedCascadeLayers, } from './compat/mini-program-css/index.js';
 export { normalizeMiniProgramPrefixedDeclaration, removeUnsupportedMiniProgramPrefixedAtRule, } from './compat/mini-program-prefixes.js';
 export { convertTailwindcssRpxDeclarationsToRem, convertTailwindcssRpxDeclarationToRem, convertTailwindcssRpxValueToRem, normalizeTailwindcssRpxDeclaration, normalizeTailwindcssRpxDeclarations, normalizeTailwindcssWebRpxDeclarations, type TailwindcssRpxToRemOptions, } from './compat/tailwindcss-rpx.js';

package/dist/index.js

@@ -282,6 +282,7 @@ const GRADIENT_BACKGROUND_RE = /^(linear|radial|conic)-gradient\(/i;
 const GRADIENT_STOPS_VAR_RE = /^(?:linear|radial|conic)-gradient\(\s*var\(\s*--tw-gradient-stops\b/i;
 const SIMPLE_CLASS_SELECTOR_RE = /^\.([_a-z\u00A0-\uFFFF\\-][\w\u00A0-\uFFFF\\-]*)$/i;
 const COLOR_VAR_RE = /^var\(\s*(--color-[\w-]+)\s*\)$/i;
+const TAILWIND_THEME_VARIABLE_RE = /^--(?:animate|aspect|blur|breakpoint|color|container|drop-shadow|ease|font|inset-shadow|leading|perspective|radius|shadow|spacing|text|tracking)(?:-|$)/;
 const GRADIENT_DIRECTION_CLASS_RE = /^(?:-?bg-linear|bg-gradient-to-|-?bg-conic|bg-radial)/;
 const RADIUS_VALUE_RE = /\b([+-]?(?:\d+(?:\.\d+)?|\.\d+)(?:e[+-]?\d+)?)\s*(r?px)\b/gi;
 const SCIENTIFIC_NOTATION_RE = /e/i;
@@ -306,6 +307,9 @@ const DEFAULT_VARIABLE_SCOPE_SELECTORS = /* @__PURE__ */ new Set([
 function isTailwindcssV4(options) {
 	return options?.majorVersion === 4;
 }
+function isTailwindcssV4ThemeVariable(property) {
+	return property.startsWith("--tw-") || TAILWIND_THEME_VARIABLE_RE.test(property);
+}
 function testIfRootHostForV4(node) {
 	return node.type === "rule" && node.selector.includes(":root") && node.selector.includes(":host");
 }
@@ -838,7 +842,7 @@ function resolveNodes(nodes, variables, resolving) {
 		const configured = variables.get(variable.value);
 		let replacement;
 		if (configured !== void 0 && !resolving.has(variable.value)) replacement = resolveThemeValue(configured, variables, /* @__PURE__ */ new Set([...resolving, variable.value]));
-		else if (variable.value.startsWith("--tw-") && fallback) replacement = resolveThemeValue(fallback, variables, resolving);
+		else if (fallback && isTailwindcssV4ThemeVariable(variable.value)) replacement = resolveThemeValue(fallback, variables, resolving);
 		if (replacement === void 0) {
 			resolveNodes(node.nodes, variables, resolving);
 			continue;
@@ -854,6 +858,36 @@ function resolveThemeValue(value, variables, resolving = /* @__PURE__ */ new Set
 	resolveNodes(parsed.nodes, variables, resolving);
 	return parsed.toString();
 }
+function getUnresolvedAuthorVariableFallback(value) {
+	const nodes = valueParser(value).nodes.filter((node) => node.type !== "space" && node.type !== "comment");
+	const variable = nodes.length === 1 ? nodes[0] : void 0;
+	if (variable?.type !== "function" || variable.value.toLowerCase() !== "var") return;
+	const variableNode = variable.nodes.find((node) => node.type === "word");
+	const commaIndex = variable.nodes.findIndex((node) => node.type === "div" && node.value === ",");
+	if (variableNode?.type !== "word" || !variableNode.value.startsWith("--") || isTailwindcssV4ThemeVariable(variableNode.value) || variableNode.value.startsWith("--default-") || commaIndex < 0) return;
+	const fallback = valueParser.stringify(variable.nodes.slice(commaIndex + 1)).trim();
+	if (!fallback) return;
+	return {
+		name: variableNode.value,
+		fallback
+	};
+}
+/**
+* HBuilderX 不接受带 fallback 的 var() 声明，拆成静态 fallback 与动态变量两条声明。
+*/
+function splitUnresolvedAuthorVariableFallbacks(root, variables) {
+	if (typeof root.walkDecls !== "function") return false;
+	let changed = false;
+	root.walkDecls((decl) => {
+		if (decl.prop.startsWith("--")) return;
+		const unresolved = getUnresolvedAuthorVariableFallback(decl.value);
+		if (!unresolved || variables.has(unresolved.name)) return;
+		decl.parent?.insertBefore(decl, decl.clone({ value: unresolved.fallback }));
+		decl.value = `var(${unresolved.name})`;
+		changed = true;
+	});
+	return changed;
+}
 /**
 * UVUE 不支持 Tailwind 的混合根选择器，因此先把根作用域中的静态主题 token
 * 内联到实际 utility，再移除仅用于变量承载的系统规则。
@@ -875,6 +909,7 @@ function consumeUniAppXSystemRootTheme(root, customPropertyValues) {
 			decl.value = resolveThemeValue(decl.value, variables);
 		});
 	}
+	splitUnresolvedAuthorVariableFallbacks(root, variables);
 	for (const rule of carrierRules) rule.remove();
 }
 //#endregion
@@ -892,6 +927,14 @@ function normalizeUnsupportedMode(mode) {
 function normalizeValue(value) {
 	return value.trim().toLowerCase().replace(IMPORTANT_SUFFIX_RE, "");
 }
+function hasCalcFunction(value) {
+	const parsed = valueParser(value);
+	let found = false;
+	parsed.walk((node) => {
+		if (node.type === "function" && node.value.toLowerCase() === "calc") found = true;
+	});
+	return found;
+}
 function normalizeUniAppXTransformValue(value) {
 	if (!value.toLowerCase().includes("translate(") || !value.includes(",")) return value;
 	const parsed = valueParser(value);
@@ -936,6 +979,7 @@ function hasOnlyClassSelectors(rule) {
 function getUnsupportedDeclarationReason(prop, value) {
 	const normalizedProp = prop.trim().toLowerCase();
 	const normalizedValue = normalizeValue(value);
+	if (hasCalcFunction(value)) return `${normalizedProp}: ${value}`;
 	if (normalizedProp === "display" && !ALLOWED_DISPLAY_VALUES.has(normalizedValue)) return `${normalizedProp}: ${value}`;
 	if (normalizedProp === "min-height" && normalizedValue === "100vh") return `${normalizedProp}: ${value}`;
 	if (normalizedProp === "grid-template-columns" || normalizedProp === "grid-template-rows" || normalizedProp === "grid-auto-columns" || normalizedProp === "grid-auto-rows" || normalizedProp === "grid-auto-flow") return `${normalizedProp}: ${value}`;
@@ -1309,6 +1353,51 @@ function tryResolveColorMix(node, customPropertyValues) {
 }
 //#endregion
 //#region src/compat/color-mix.ts
+const DYNAMIC_VAR_FALLBACK_PLACEHOLDER_PREFIX = "__weapp_tw_var_fallback_";
+function getStandaloneDynamicVarWithFallback(value) {
+	const nodes = valueParser(value).nodes.filter((node) => node.type !== "space" && node.type !== "comment");
+	const variable = nodes.length === 1 ? nodes[0] : void 0;
+	const property = variable?.type === "function" ? variable.nodes.find((node) => node.type === "word" && node.value.startsWith("--")) : void 0;
+	if (variable?.type !== "function" || variable.value.toLowerCase() !== "var" || property?.type !== "word" || isTailwindcssV4ThemeVariable(property.value) || !variable.nodes.some((node) => node.type === "div" && node.value === ",")) return;
+	return variable;
+}
+/**
+* 保护带 fallback 的作者 CSS 变量，避免兼容插件把它错误静态化。
+*/
+function protectDynamicVarFallbacks(css) {
+	if (!css.includes("var(") || !css.includes(",")) return {
+		css,
+		restore: (value) => value
+	};
+	const replacements = /* @__PURE__ */ new Map();
+	let root;
+	try {
+		root = postcss$1.parse(css);
+	} catch {
+		return {
+			css,
+			restore: (value) => value
+		};
+	}
+	root.walkDecls((decl) => {
+		if (!getStandaloneDynamicVarWithFallback(decl.value)) return;
+		const placeholder = `${DYNAMIC_VAR_FALLBACK_PLACEHOLDER_PREFIX}${replacements.size}__`;
+		replacements.set(placeholder, decl.value);
+		decl.value = placeholder;
+	});
+	if (replacements.size === 0) return {
+		css,
+		restore: (value) => value
+	};
+	return {
+		css: root.toString(),
+		restore(value) {
+			let restored = value;
+			for (const [placeholder, replacement] of replacements) restored = restored.split(placeholder).join(replacement);
+			return restored;
+		}
+	};
+}
 function normalizeModernColorValue(value, customPropertyValues = /* @__PURE__ */ new Map()) {
 	if (!hasUnsupportedModernColorFunction(value)) return {
 		value,
@@ -6355,9 +6444,14 @@ function createStyleHandler(options) {
 	}
 	function processSource(rawSource, root, cloneOutput, opt) {
 		const resolvedOptions = resolver.resolve(opt);
-		const protectedColorMix = resolvedOptions.majorVersion === 4 ? protectDynamicColorMixAlpha(rawSource) : void 0;
-		const source = protectedColorMix?.css ?? rawSource;
-		const processInput = protectedColorMix ? source : root?.clone() ?? source;
+		const isUniAppXFramework = resolvedOptions.appType === "uni-app-x";
+		const protectedVarFallbacks = resolvedOptions.uniAppX || isUniAppXFramework ? protectDynamicVarFallbacks(rawSource) : {
+			css: rawSource,
+			restore: (value) => value
+		};
+		const protectedColorMix = resolvedOptions.majorVersion === 4 ? protectDynamicColorMixAlpha(protectedVarFallbacks.css) : void 0;
+		const source = protectedColorMix?.css ?? protectedVarFallbacks.css;
+		const processInput = source !== rawSource ? source : root?.clone() ?? source;
 		let signal;
 		if (!hasUserPlugins) try {
 			signal = probeFeatures(source);
@@ -6384,8 +6478,8 @@ function createStyleHandler(options) {
 					finalResult = nextResult;
 				}
 			}
-			if (protectedColorMix) {
-				const restoredCss = protectedColorMix.restore(finalResult.css);
+			if (protectedColorMix || protectedVarFallbacks.css !== rawSource) {
+				const restoredCss = protectedVarFallbacks.restore(protectedColorMix?.restore(finalResult.css) ?? finalResult.css);
 				if (restoredCss !== finalResult.css) {
 					const nextResult = finalResult.root.clone().toResult(finalResult.opts);
 					nextResult.css = restoredCss;
@@ -6394,6 +6488,9 @@ function createStyleHandler(options) {
 					finalResult = nextResult;
 				}
 			}
+			if (resolvedOptions.uniAppX && (resolvedOptions.uniAppXCssTarget === "uvue" || !isUniAppXFramework) && finalResult.root) {
+				if (splitUnresolvedAuthorVariableFallbacks(finalResult.root, /* @__PURE__ */ new Map())) finalResult.css = finalResult.root.toString();
+			}
 			resultCache.set(cacheKey, finalResult);
 			return cloneOutput ? cloneResult(finalResult) : finalResult;
 		});
@@ -6906,4 +7003,4 @@ function mergeMiniProgramThemeScopeRuleDeclarations(baseCss, css) {
 	}
 }
 //#endregion
-export { CSS_MACRO_POSTCSS_PLUGIN_NAME, CSS_MACRO_STYLE_OPTIONS_MARKER, FULL_SOURCE_SCAN_EXTENSIONS, FULL_SOURCE_SCAN_EXTENSION_RE, FULL_SOURCE_SCAN_PATTERN, analyzeTailwindCssDirectives, cleanLocalCssImportWrapperTailwindDirectives, cleanLocalCssImportWrapperTailwindDirectivesRoot, collectApplyOnlyCssSelectors, collectApplyOnlyCssSelectorsRoot, collectCssImportRequestsRoot, collectCssInlineSourceCandidates, compileCssMacroConditionalComments, consumeCascadeLayers, containsCssAfterMinify, convertTailwindcssRpxDeclarationToRem, convertTailwindcssRpxDeclarationsToRem, convertTailwindcssRpxValueToRem, createCssSourceOrderAppend, createFallbackPlaceholderReplacer, createInjectPreflight, createPostcssStyleTargetProfile, createSourceScanPattern, createStyleHandler, createStylePipeline, createTailwindSourceEntryMatcher, createWeappTailwindcssPostcssPlugin, creator as cssMacroPostcssPlugin, dedupeCoveredCssRules, expandInlineSourceCandidatePattern, expandTailwindSourceEntries, filterApplyOnlyGeneratedCss, filterApplyOnlyGeneratedCssRoot, filterExistingCssRules, finalizeMiniProgramCss, getPostcssPluginName, hasCssMacroStyleOptions, hasCssMacroTailwindV4CustomVariantConditionalComments, hasCssMacroTailwindV4Directive, hasCssMacroTailwindV4InternalAtRules, hasCssMacroTailwindV4Source, hasMiniProgramCssSpecificityPlaceholders, hoistTailwindPreflightBase, internalCssSelectorReplacer, isFileExcludedByTailwindSourceEntries, isFileMatchedByTailwindSourceEntries, isLocalCssImportRequest, isMiniProgramLocalCssImportRequest, isPureLocalCssImportWrapper, isPureLocalCssImportWrapperRoot, isTailwindCssGenerationDirective, isTailwindCssImportAtRule, isTailwindCssImportRequest, isTailwindCssPackageJsonImportRequest, isWeappTailwindcssImportRequest, mergeCoveredCssRuleDeclarations, mergeMiniProgramPreflightRuleDeclarations, mergeMiniProgramThemeScopeRuleDeclarations, normalizeLegacyContentEntries, normalizeMiniProgramGeneratedCssForPostcss, normalizeMiniProgramPrefixedDeclaration, normalizeModernColorValue, normalizeOutputImportRequest, normalizeTailwindCssImportRequest, normalizeTailwindcssRpxDeclaration, normalizeTailwindcssRpxDeclarations, normalizeTailwindcssV4InfinityCalcCss, normalizeTailwindcssWebRpxDeclarations, normalizeWebCssCompatOptions, parseConfigParam, parseSourceFileParam, parseTailwindCssConfigRequest, parseTailwindCssDirectiveRequest, postcss, postcssHtmlTransform, prefixLocalCssImportsWithWebpackIgnoreRoot, protectDynamicColorMixAlpha, pruneMiniProgramGeneratedCss, removeEmptyAtRules, removeMatchingLocalCssImports, removeMatchingLocalCssImportsRoot, removeTailwindPostcssPlugins, removeTailwindSourceDirectivesRoot, removeUnsupportedAtSupports, removeUnsupportedCascadeLayers, removeUnsupportedMiniProgramAtRules, removeUnsupportedMiniProgramCssImportsRoot, removeUnsupportedMiniProgramPrefixedAtRule, resolveCssSourceEntries, resolveFilteredPostcssConfig, resolvePostcssConfig, resolvePostcssFrameworkProfile, resolvePostcssFrameworkStrategy, resolvePostcssStyleBranch, resolvePostcssStyleBranchProfile, resolvePostcssStyleTarget, resolveSourceScanPath, resolveTailwindSourceEntry, restoreLocalCssImports, rewriteLocalCssImportRequestsForOutput, rewriteLocalCssImportRequestsForOutputRoot, splitLocalCssImports, splitLocalCssImportsRoot, stripMiniProgramCssSpecificityPlaceholders, toPosixPath, transformCssMacroCss, transformCssMacroTailwindV4Source, transformWebCssCompat, transformWebCssSafeSelectors, unitConversionComposeRules, unitConversionPresets, unwrapUnsupportedCascadeLayers, withCssMacroStyleOptions };
+export { CSS_MACRO_POSTCSS_PLUGIN_NAME, CSS_MACRO_STYLE_OPTIONS_MARKER, FULL_SOURCE_SCAN_EXTENSIONS, FULL_SOURCE_SCAN_EXTENSION_RE, FULL_SOURCE_SCAN_PATTERN, analyzeTailwindCssDirectives, cleanLocalCssImportWrapperTailwindDirectives, cleanLocalCssImportWrapperTailwindDirectivesRoot, collectApplyOnlyCssSelectors, collectApplyOnlyCssSelectorsRoot, collectCssImportRequestsRoot, collectCssInlineSourceCandidates, compileCssMacroConditionalComments, consumeCascadeLayers, containsCssAfterMinify, convertTailwindcssRpxDeclarationToRem, convertTailwindcssRpxDeclarationsToRem, convertTailwindcssRpxValueToRem, createCssSourceOrderAppend, createFallbackPlaceholderReplacer, createInjectPreflight, createPostcssStyleTargetProfile, createSourceScanPattern, createStyleHandler, createStylePipeline, createTailwindSourceEntryMatcher, createWeappTailwindcssPostcssPlugin, creator as cssMacroPostcssPlugin, dedupeCoveredCssRules, expandInlineSourceCandidatePattern, expandTailwindSourceEntries, filterApplyOnlyGeneratedCss, filterApplyOnlyGeneratedCssRoot, filterExistingCssRules, finalizeMiniProgramCss, getPostcssPluginName, hasCssMacroStyleOptions, hasCssMacroTailwindV4CustomVariantConditionalComments, hasCssMacroTailwindV4Directive, hasCssMacroTailwindV4InternalAtRules, hasCssMacroTailwindV4Source, hasMiniProgramCssSpecificityPlaceholders, hoistTailwindPreflightBase, internalCssSelectorReplacer, isFileExcludedByTailwindSourceEntries, isFileMatchedByTailwindSourceEntries, isLocalCssImportRequest, isMiniProgramLocalCssImportRequest, isPureLocalCssImportWrapper, isPureLocalCssImportWrapperRoot, isTailwindCssGenerationDirective, isTailwindCssImportAtRule, isTailwindCssImportRequest, isTailwindCssPackageJsonImportRequest, isWeappTailwindcssImportRequest, mergeCoveredCssRuleDeclarations, mergeMiniProgramPreflightRuleDeclarations, mergeMiniProgramThemeScopeRuleDeclarations, normalizeLegacyContentEntries, normalizeMiniProgramGeneratedCssForPostcss, normalizeMiniProgramPrefixedDeclaration, normalizeModernColorValue, normalizeOutputImportRequest, normalizeTailwindCssImportRequest, normalizeTailwindcssRpxDeclaration, normalizeTailwindcssRpxDeclarations, normalizeTailwindcssV4InfinityCalcCss, normalizeTailwindcssWebRpxDeclarations, normalizeWebCssCompatOptions, parseConfigParam, parseSourceFileParam, parseTailwindCssConfigRequest, parseTailwindCssDirectiveRequest, postcss, postcssHtmlTransform, prefixLocalCssImportsWithWebpackIgnoreRoot, protectDynamicColorMixAlpha, protectDynamicVarFallbacks, pruneMiniProgramGeneratedCss, removeEmptyAtRules, removeMatchingLocalCssImports, removeMatchingLocalCssImportsRoot, removeTailwindPostcssPlugins, removeTailwindSourceDirectivesRoot, removeUnsupportedAtSupports, removeUnsupportedCascadeLayers, removeUnsupportedMiniProgramAtRules, removeUnsupportedMiniProgramCssImportsRoot, removeUnsupportedMiniProgramPrefixedAtRule, resolveCssSourceEntries, resolveFilteredPostcssConfig, resolvePostcssConfig, resolvePostcssFrameworkProfile, resolvePostcssFrameworkStrategy, resolvePostcssStyleBranch, resolvePostcssStyleBranchProfile, resolvePostcssStyleTarget, resolveSourceScanPath, resolveTailwindSourceEntry, restoreLocalCssImports, rewriteLocalCssImportRequestsForOutput, rewriteLocalCssImportRequestsForOutputRoot, splitLocalCssImports, splitLocalCssImportsRoot, stripMiniProgramCssSpecificityPlaceholders, toPosixPath, transformCssMacroCss, transformCssMacroTailwindV4Source, transformWebCssCompat, transformWebCssSafeSelectors, unitConversionComposeRules, unitConversionPresets, unwrapUnsupportedCascadeLayers, withCssMacroStyleOptions };

package/dist/{rolldown-runtime-emK7D4bc.cjs → rolldown-runtime-D6vf50IK.cjs}

@@ -5,7 +5,6 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __commonJSMin = (cb, mod) => () => (mod || (cb((mod = { exports: {} }).exports, mod), cb = null), mod.exports);
 var __copyProps = (to, from, except, desc) => {
 	if (from && typeof from === "object" || typeof from === "function") for (var keys = __getOwnPropNames(from), i = 0, n = keys.length, key; i < n; i++) {
 		key = keys[i];
@@ -21,12 +20,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 	enumerable: true
 }) : target, mod));
 //#endregion
-Object.defineProperty(exports, "__commonJSMin", {
-	enumerable: true,
-	get: function() {
-		return __commonJSMin;
-	}
-});
 Object.defineProperty(exports, "__toESM", {
 	enumerable: true,
 	get: function() {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@weapp-tailwindcss/postcss",
   "type": "module",
-  "version": "3.2.1",
+  "version": "3.2.3",
   "description": "@weapp-tailwindcss/postcss",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -78,8 +78,8 @@
     "postcss-load-config": "^6.0.1",
     "postcss-preset-env": "^11.3.2",
     "postcss-pxtrans": "^1.0.4",
-    "postcss-rem-to-responsive-pixel": "^7.0.4",
-    "postcss-rule-unit-converter": "^0.2.2",
+    "postcss-rem-to-responsive-pixel": "^7.0.5",
+    "postcss-rule-unit-converter": "^0.2.3",
     "postcss-selector-parser": "~7.1.4",
     "postcss-value-parser": "^4.2.0",
     "@weapp-tailwindcss/postcss-calc": "^1.0.3",