@weapp-tailwindcss/postcss 3.2.4 → 3.2.6

package/dist/compat/mini-program-css/root-cleanups.d.ts

@@ -7,6 +7,7 @@ export declare function removeRootSpecificityPlaceholders(root: postcss.Root): v
 export declare function removeEmptyAtRules(root: postcss.Root): number;
 export declare function removeEmptyBlockAtRules(root: postcss.Root): number;
 export declare function removeUnsupportedBrowserSelectors(root: postcss.Root): void;
+export declare function removeEmptyStandardPropertyFallbacks(root: postcss.Root): void;
 export declare function removeDisplayP3Declarations(root: postcss.Root): void;
 interface RemoveTailwindContainerRulesOptions {
     generatedOnly?: boolean;

package/dist/index.cjs

@@ -937,15 +937,18 @@ function isTailwindPreflightDeclaration(decl) {
 	if (prop === "font-family" && value.startsWith("var(--default-font-family") || prop === "font-feature-settings" && value.startsWith("var(--default-font-feature-settings") || prop === "font-variation-settings" && value.startsWith("var(--default-font-variation-settings")) return true;
 	return TAILWIND_PREFLIGHT_DECLARATIONS.has(`${prop}:${value}`);
 }
-function isScopedTailwindThemeCarrierRule(rule) {
+function hasTailwindSourceEvidence(declarations, hasTailwindBanner) {
+	return hasTailwindBanner || declarations.some((decl) => decl.prop.startsWith("--tw-"));
+}
+function isScopedTailwindThemeCarrierRule(rule, hasTailwindBanner) {
 	const selectors = rule.selectors ?? [rule.selector];
 	const declarations = getDeclarations(rule);
 	return selectors.length > 0 && selectors.every((selector) => {
 		const normalized = normalizeCssSignatureValue(selector);
 		return hasVueScopedAttr(selector) && (normalized.startsWith(":root") || normalized.startsWith(":host"));
-	}) && declarations.length > 0 && declarations.every((decl) => decl.prop.startsWith("--"));
+	}) && declarations.length > 0 && declarations.every((decl) => decl.prop.startsWith("--")) && hasTailwindSourceEvidence(declarations, hasTailwindBanner);
 }
-function isScopedUniversalTailwindPreflightRule(rule) {
+function isScopedUniversalTailwindPreflightRule(rule, hasTailwindBanner) {
 	const selectors = rule.selectors ?? [rule.selector];
 	const declarations = getDeclarations(rule);
 	return selectors.length > 0 && selectors.every((selector) => hasVueScopedAttr(selector) && SCOPED_UNIVERSAL_PREFLIGHT_SELECTORS.has(normalizeCssSignatureValue(selector))) && declarations.length > 0 && declarations.every((decl) => decl.prop.startsWith("--tw-") || [
@@ -953,7 +956,7 @@ function isScopedUniversalTailwindPreflightRule(rule) {
 		"margin",
 		"padding",
 		"border"
-	].includes(decl.prop));
+	].includes(decl.prop)) && hasTailwindSourceEvidence(declarations, hasTailwindBanner);
 }
 function isScopedTailwindElementPreflightRule(rule, hasTailwindBanner) {
 	if (!hasTailwindBanner) return false;
@@ -961,7 +964,7 @@ function isScopedTailwindElementPreflightRule(rule, hasTailwindBanner) {
 	const declarations = getDeclarations(rule);
 	return selectors.length > 0 && selectors.every((selector) => hasVueScopedAttr(selector) && isLikelyTailwindGlobalSelector(selector)) && declarations.length > 0 && declarations.every(isTailwindPreflightDeclaration);
 }
-function isUnscopedMiniProgramTailwindPreflightRule(rule) {
+function isUnscopedMiniProgramTailwindPreflightRule(rule, hasTailwindBanner) {
 	const selectors = rule.selectors ?? [rule.selector];
 	if (selectors.length === 0 || !selectors.every((selector) => {
 		const normalized = normalizeCssSignatureValue(selector);
@@ -973,7 +976,7 @@ function isUnscopedMiniProgramTailwindPreflightRule(rule) {
 		"margin",
 		"padding",
 		"border"
-	].includes(decl.prop));
+	].includes(decl.prop)) && hasTailwindSourceEvidence(declarations, hasTailwindBanner);
 }
 function isScopedMiniProgramTailwindContentInitRule(rule) {
 	const selectors = rule.selectors ?? [rule.selector];
@@ -996,7 +999,7 @@ function stripScopedTailwindNoise(root) {
 		if (TAILWIND_VERSION_COMMENT_RE.test(comment.text)) comment.remove();
 	});
 	root.walkRules((rule) => {
-		if (isScopedTailwindThemeCarrierRule(rule) || isScopedUniversalTailwindPreflightRule(rule) || isScopedTailwindElementPreflightRule(rule, hasTailwindBanner) || isUnscopedMiniProgramTailwindPreflightRule(rule) || isScopedMiniProgramTailwindContentInitRule(rule)) rule.remove();
+		if (isScopedTailwindThemeCarrierRule(rule, hasTailwindBanner) || isScopedUniversalTailwindPreflightRule(rule, hasTailwindBanner) || isScopedTailwindElementPreflightRule(rule, hasTailwindBanner) || isUnscopedMiniProgramTailwindPreflightRule(rule, hasTailwindBanner) || isScopedMiniProgramTailwindContentInitRule(rule)) rule.remove();
 	});
 	root.walkAtRules((atRule) => {
 		if (isLikelyTailwindPropertyAtRule(atRule)) {
@@ -1217,9 +1220,15 @@ function applyUniAppXUvueCompatibility(result, options) {
 		root = calcResult.root;
 		calcMessages = calcResult.messages;
 	}
-	if (sfcStyleRequest) stripScopedTailwindNoise(root);
+	if (sfcStyleRequest) {
+		stripScopedTailwindNoise(root);
+		const nextResult = root.toResult(result.opts);
+		nextResult.messages.push(...result.messages);
+		nextResult.messages.push(...calcMessages);
+		return nextResult;
+	}
 	root.walkRules((rule) => {
-		if (!sfcStyleRequest && !hasOnlyClassSelectors(rule)) {
+		if (!hasOnlyClassSelectors(rule)) {
 			reportUnsupportedRule(rule, result, mode, warningCache, "selector must be class-only");
 			rule.remove();
 			return;
@@ -2539,6 +2548,11 @@ function removeDeclarationAndEmptyRule$1(decl) {
 		removeEmptyAtRuleAncestors(ruleParent);
 	}
 }
+function removeEmptyStandardPropertyFallbacks(root) {
+	root.walkDecls((decl) => {
+		if (!decl.prop.startsWith("--") && decl.value.trim().length === 0 && decl.parent?.nodes.some((node) => node !== decl && node.type === "decl" && node.prop === decl.prop && node.value.trim().length > 0)) removeDeclarationAndEmptyRule$1(decl);
+	});
+}
 function removeDisplayP3Declarations(root) {
 	root.walkAtRules((atRule) => {
 		if (isDisplayP3MediaRule(atRule)) {
@@ -2636,6 +2650,7 @@ function finalizeMiniProgramCssRoot(root, options = {}) {
 	removeRootSpecificityPlaceholders(root);
 	removeUnsupportedBrowserSelectors(root);
 	removeDisplayP3Declarations(root);
+	removeEmptyStandardPropertyFallbacks(root);
 	removeTailwindContainerMaxWidthMediaRules(root);
 	removeTailwindContainerWidthRules(root, { generatedOnly: true });
 	removeUnsupportedModernColorDeclarations(root);
@@ -3032,8 +3047,14 @@ function isWebCssCompatEnabled(options) {
 }
 function collectCustomPropertyValues(root) {
 	const values = /* @__PURE__ */ new Map();
-	root.walkDecls((decl) => {
-		if (decl.prop.startsWith("--")) values.set(decl.prop, decl.value.trim());
+	root.walkRules((rule) => {
+		if (!rule.selectors.some((selector) => selector.trim() === ":root" || selector.trim() === ":host")) return;
+		rule.each((node) => {
+			if (node.type === "decl" && node.prop.startsWith("--") && !node.prop.startsWith("--tw-")) {
+				const decl = node;
+				values.set(decl.prop, decl.value.trim());
+			}
+		});
 	});
 	return values;
 }
@@ -3183,6 +3204,16 @@ function removeEmptyAtRules$2(root) {
 		if (atRule.nodes && atRule.nodes.length === 0) atRule.remove();
 	});
 }
+function insertWebkitBackgroundClipText(root) {
+	root.walkDecls("background-clip", (decl) => {
+		if (decl.value.trim().toLowerCase() !== "text") return;
+		const parent = decl.parent;
+		if (!parent || !("nodes" in parent)) return;
+		if (!parent.nodes.some((node) => {
+			return node.type === "decl" && node.prop.toLowerCase() === "-webkit-background-clip" && node.value.trim().toLowerCase() === "text";
+		})) decl.cloneBefore({ prop: "-webkit-background-clip" });
+	});
+}
 function transformCssNesting(root) {
 	(0, postcss.default)([(0, postcss_preset_env.default)({
 		stage: false,
@@ -3192,7 +3223,7 @@ function transformCssNesting(root) {
 }
 function transformWebCssCompat(css, options) {
 	const normalized = normalizeWebCssCompatOptions(options);
-	if (!isWebCssCompatEnabled(normalized)) return css;
+	if (!isWebCssCompatEnabled(normalized) && normalized.preset !== "legacy-web") return css;
 	try {
 		const root = postcss.default.parse(css);
 		if (normalized.features.theme) unwrapThemeAtRules(root);
@@ -3206,6 +3237,7 @@ function transformWebCssCompat(css, options) {
 		normalizeTailwindcssV4GradientPositionDeclarations(root);
 		normalizeTailwindcssV4InfinityCalcDeclarations(root);
 		normalizeModernColorDeclarations(root, normalized.features);
+		if (normalized.preset === "legacy-web") insertWebkitBackgroundClipText(root);
 		if (normalized.features.layer) removeUnsupportedCascadeLayers(root);
 		removeEmptyAtRules$2(root);
 		return root.toString();
@@ -6481,8 +6513,27 @@ function shouldUseDefaultAutoprefixer(options, userPlugins) {
 	if (options.autoprefixer === true || typeof options.autoprefixer === "object") return true;
 	return options.majorVersion === 4;
 }
+function isUniAppXNativeAuthorStyle(options) {
+	const source = options.uniAppXCssSource;
+	return options.uniAppX === true && options.uniAppXCssTarget === "uvue" && (source === "author" || source === "author-apply");
+}
+function appendUniAppXNativeAuthorDeclarationNodes(preparedNodes, options) {
+	if (options.uniAppXCssSource !== "author-apply") return;
+	const declarationPlugins = [
+		["normal:units-to-px", getUnitsToPxPlugin(options)],
+		["normal:px-transform", getPxTransformPlugin(options)],
+		["normal:rem-transform", getRemTransformPlugin(options)],
+		["normal:unit-conversion", getUnitConversionPlugin(options)],
+		["normal:calc", getCalcPlugin(options)]
+	];
+	for (const [id, plugin] of declarationPlugins) if (plugin) preparedNodes.push(createPreparedNode(id, "normal", () => plugin));
+}
 function createPreparedNodes(options, signal) {
 	const preparedNodes = [];
+	if (isUniAppXNativeAuthorStyle(options)) {
+		appendUniAppXNativeAuthorDeclarationNodes(preparedNodes, options);
+		return preparedNodes;
+	}
 	const userPlugins = normalizeUserPlugins(options.postcssOptions?.plugins);
 	const presetEnvOptions = {
 		...options.cssPresetEnv,

package/dist/index.js

@@ -922,15 +922,18 @@ function isTailwindPreflightDeclaration(decl) {
 	if (prop === "font-family" && value.startsWith("var(--default-font-family") || prop === "font-feature-settings" && value.startsWith("var(--default-font-feature-settings") || prop === "font-variation-settings" && value.startsWith("var(--default-font-variation-settings")) return true;
 	return TAILWIND_PREFLIGHT_DECLARATIONS.has(`${prop}:${value}`);
 }
-function isScopedTailwindThemeCarrierRule(rule) {
+function hasTailwindSourceEvidence(declarations, hasTailwindBanner) {
+	return hasTailwindBanner || declarations.some((decl) => decl.prop.startsWith("--tw-"));
+}
+function isScopedTailwindThemeCarrierRule(rule, hasTailwindBanner) {
 	const selectors = rule.selectors ?? [rule.selector];
 	const declarations = getDeclarations(rule);
 	return selectors.length > 0 && selectors.every((selector) => {
 		const normalized = normalizeCssSignatureValue(selector);
 		return hasVueScopedAttr(selector) && (normalized.startsWith(":root") || normalized.startsWith(":host"));
-	}) && declarations.length > 0 && declarations.every((decl) => decl.prop.startsWith("--"));
+	}) && declarations.length > 0 && declarations.every((decl) => decl.prop.startsWith("--")) && hasTailwindSourceEvidence(declarations, hasTailwindBanner);
 }
-function isScopedUniversalTailwindPreflightRule(rule) {
+function isScopedUniversalTailwindPreflightRule(rule, hasTailwindBanner) {
 	const selectors = rule.selectors ?? [rule.selector];
 	const declarations = getDeclarations(rule);
 	return selectors.length > 0 && selectors.every((selector) => hasVueScopedAttr(selector) && SCOPED_UNIVERSAL_PREFLIGHT_SELECTORS.has(normalizeCssSignatureValue(selector))) && declarations.length > 0 && declarations.every((decl) => decl.prop.startsWith("--tw-") || [
@@ -938,7 +941,7 @@ function isScopedUniversalTailwindPreflightRule(rule) {
 		"margin",
 		"padding",
 		"border"
-	].includes(decl.prop));
+	].includes(decl.prop)) && hasTailwindSourceEvidence(declarations, hasTailwindBanner);
 }
 function isScopedTailwindElementPreflightRule(rule, hasTailwindBanner) {
 	if (!hasTailwindBanner) return false;
@@ -946,7 +949,7 @@ function isScopedTailwindElementPreflightRule(rule, hasTailwindBanner) {
 	const declarations = getDeclarations(rule);
 	return selectors.length > 0 && selectors.every((selector) => hasVueScopedAttr(selector) && isLikelyTailwindGlobalSelector(selector)) && declarations.length > 0 && declarations.every(isTailwindPreflightDeclaration);
 }
-function isUnscopedMiniProgramTailwindPreflightRule(rule) {
+function isUnscopedMiniProgramTailwindPreflightRule(rule, hasTailwindBanner) {
 	const selectors = rule.selectors ?? [rule.selector];
 	if (selectors.length === 0 || !selectors.every((selector) => {
 		const normalized = normalizeCssSignatureValue(selector);
@@ -958,7 +961,7 @@ function isUnscopedMiniProgramTailwindPreflightRule(rule) {
 		"margin",
 		"padding",
 		"border"
-	].includes(decl.prop));
+	].includes(decl.prop)) && hasTailwindSourceEvidence(declarations, hasTailwindBanner);
 }
 function isScopedMiniProgramTailwindContentInitRule(rule) {
 	const selectors = rule.selectors ?? [rule.selector];
@@ -981,7 +984,7 @@ function stripScopedTailwindNoise(root) {
 		if (TAILWIND_VERSION_COMMENT_RE.test(comment.text)) comment.remove();
 	});
 	root.walkRules((rule) => {
-		if (isScopedTailwindThemeCarrierRule(rule) || isScopedUniversalTailwindPreflightRule(rule) || isScopedTailwindElementPreflightRule(rule, hasTailwindBanner) || isUnscopedMiniProgramTailwindPreflightRule(rule) || isScopedMiniProgramTailwindContentInitRule(rule)) rule.remove();
+		if (isScopedTailwindThemeCarrierRule(rule, hasTailwindBanner) || isScopedUniversalTailwindPreflightRule(rule, hasTailwindBanner) || isScopedTailwindElementPreflightRule(rule, hasTailwindBanner) || isUnscopedMiniProgramTailwindPreflightRule(rule, hasTailwindBanner) || isScopedMiniProgramTailwindContentInitRule(rule)) rule.remove();
 	});
 	root.walkAtRules((atRule) => {
 		if (isLikelyTailwindPropertyAtRule(atRule)) {
@@ -1202,9 +1205,15 @@ function applyUniAppXUvueCompatibility(result, options) {
 		root = calcResult.root;
 		calcMessages = calcResult.messages;
 	}
-	if (sfcStyleRequest) stripScopedTailwindNoise(root);
+	if (sfcStyleRequest) {
+		stripScopedTailwindNoise(root);
+		const nextResult = root.toResult(result.opts);
+		nextResult.messages.push(...result.messages);
+		nextResult.messages.push(...calcMessages);
+		return nextResult;
+	}
 	root.walkRules((rule) => {
-		if (!sfcStyleRequest && !hasOnlyClassSelectors(rule)) {
+		if (!hasOnlyClassSelectors(rule)) {
 			reportUnsupportedRule(rule, result, mode, warningCache, "selector must be class-only");
 			rule.remove();
 			return;
@@ -2524,6 +2533,11 @@ function removeDeclarationAndEmptyRule$1(decl) {
 		removeEmptyAtRuleAncestors(ruleParent);
 	}
 }
+function removeEmptyStandardPropertyFallbacks(root) {
+	root.walkDecls((decl) => {
+		if (!decl.prop.startsWith("--") && decl.value.trim().length === 0 && decl.parent?.nodes.some((node) => node !== decl && node.type === "decl" && node.prop === decl.prop && node.value.trim().length > 0)) removeDeclarationAndEmptyRule$1(decl);
+	});
+}
 function removeDisplayP3Declarations(root) {
 	root.walkAtRules((atRule) => {
 		if (isDisplayP3MediaRule(atRule)) {
@@ -2621,6 +2635,7 @@ function finalizeMiniProgramCssRoot(root, options = {}) {
 	removeRootSpecificityPlaceholders(root);
 	removeUnsupportedBrowserSelectors(root);
 	removeDisplayP3Declarations(root);
+	removeEmptyStandardPropertyFallbacks(root);
 	removeTailwindContainerMaxWidthMediaRules(root);
 	removeTailwindContainerWidthRules(root, { generatedOnly: true });
 	removeUnsupportedModernColorDeclarations(root);
@@ -3017,8 +3032,14 @@ function isWebCssCompatEnabled(options) {
 }
 function collectCustomPropertyValues(root) {
 	const values = /* @__PURE__ */ new Map();
-	root.walkDecls((decl) => {
-		if (decl.prop.startsWith("--")) values.set(decl.prop, decl.value.trim());
+	root.walkRules((rule) => {
+		if (!rule.selectors.some((selector) => selector.trim() === ":root" || selector.trim() === ":host")) return;
+		rule.each((node) => {
+			if (node.type === "decl" && node.prop.startsWith("--") && !node.prop.startsWith("--tw-")) {
+				const decl = node;
+				values.set(decl.prop, decl.value.trim());
+			}
+		});
 	});
 	return values;
 }
@@ -3168,6 +3189,16 @@ function removeEmptyAtRules$2(root) {
 		if (atRule.nodes && atRule.nodes.length === 0) atRule.remove();
 	});
 }
+function insertWebkitBackgroundClipText(root) {
+	root.walkDecls("background-clip", (decl) => {
+		if (decl.value.trim().toLowerCase() !== "text") return;
+		const parent = decl.parent;
+		if (!parent || !("nodes" in parent)) return;
+		if (!parent.nodes.some((node) => {
+			return node.type === "decl" && node.prop.toLowerCase() === "-webkit-background-clip" && node.value.trim().toLowerCase() === "text";
+		})) decl.cloneBefore({ prop: "-webkit-background-clip" });
+	});
+}
 function transformCssNesting(root) {
 	postcss$1([postcssPresetEnv({
 		stage: false,
@@ -3177,7 +3208,7 @@ function transformCssNesting(root) {
 }
 function transformWebCssCompat(css, options) {
 	const normalized = normalizeWebCssCompatOptions(options);
-	if (!isWebCssCompatEnabled(normalized)) return css;
+	if (!isWebCssCompatEnabled(normalized) && normalized.preset !== "legacy-web") return css;
 	try {
 		const root = postcss$1.parse(css);
 		if (normalized.features.theme) unwrapThemeAtRules(root);
@@ -3191,6 +3222,7 @@ function transformWebCssCompat(css, options) {
 		normalizeTailwindcssV4GradientPositionDeclarations(root);
 		normalizeTailwindcssV4InfinityCalcDeclarations(root);
 		normalizeModernColorDeclarations(root, normalized.features);
+		if (normalized.preset === "legacy-web") insertWebkitBackgroundClipText(root);
 		if (normalized.features.layer) removeUnsupportedCascadeLayers(root);
 		removeEmptyAtRules$2(root);
 		return root.toString();
@@ -6466,8 +6498,27 @@ function shouldUseDefaultAutoprefixer(options, userPlugins) {
 	if (options.autoprefixer === true || typeof options.autoprefixer === "object") return true;
 	return options.majorVersion === 4;
 }
+function isUniAppXNativeAuthorStyle(options) {
+	const source = options.uniAppXCssSource;
+	return options.uniAppX === true && options.uniAppXCssTarget === "uvue" && (source === "author" || source === "author-apply");
+}
+function appendUniAppXNativeAuthorDeclarationNodes(preparedNodes, options) {
+	if (options.uniAppXCssSource !== "author-apply") return;
+	const declarationPlugins = [
+		["normal:units-to-px", getUnitsToPxPlugin(options)],
+		["normal:px-transform", getPxTransformPlugin(options)],
+		["normal:rem-transform", getRemTransformPlugin(options)],
+		["normal:unit-conversion", getUnitConversionPlugin(options)],
+		["normal:calc", getCalcPlugin(options)]
+	];
+	for (const [id, plugin] of declarationPlugins) if (plugin) preparedNodes.push(createPreparedNode(id, "normal", () => plugin));
+}
 function createPreparedNodes(options, signal) {
 	const preparedNodes = [];
+	if (isUniAppXNativeAuthorStyle(options)) {
+		appendUniAppXNativeAuthorDeclarationNodes(preparedNodes, options);
+		return preparedNodes;
+	}
 	const userPlugins = normalizeUserPlugins(options.postcssOptions?.plugins);
 	const presetEnvOptions = {
 		...options.cssPresetEnv,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@weapp-tailwindcss/postcss",
   "type": "module",
-  "version": "3.2.4",
+  "version": "3.2.6",
   "description": "@weapp-tailwindcss/postcss",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -71,10 +71,10 @@
     "@tailwindcss-mangle/engine": "0.2.0",
     "@weapp-core/escape": "~8.0.0",
     "autoprefixer": "^10.5.4",
-    "es-toolkit": "^1.49.0",
+    "es-toolkit": "^1.50.0",
     "lru-cache": "11.5.2",
     "micromatch": "^4.0.8",
-    "postcss": "^8.5.22",
+    "postcss": "^8.5.25",
     "postcss-load-config": "^6.0.1",
     "postcss-preset-env": "^11.3.2",
     "postcss-pxtrans": "^1.0.4",