@weapp-tailwindcss/postcss 2.2.1-next.3 → 2.2.1-next.5

package/dist/compat/mini-program-prefixes.d.ts

@@ -0,0 +1,6 @@
+import type { AtRule, Declaration } from 'postcss';
+/**
+ * 收敛小程序 CSS 中的 WebKit 前缀，只保留 WXSS 里有实际价值的兼容写法。
+ */
+export declare function normalizeMiniProgramPrefixedDeclaration(decl: Declaration): void;
+export declare function removeUnsupportedMiniProgramPrefixedAtRule(atRule: AtRule): void;

package/dist/index.d.ts

@@ -1,4 +1,5 @@
 export { type DynamicColorMixAlphaProtection, type DynamicColorMixAlphaProtectionOptions, type ModernColorValueNormalization, normalizeModernColorValue, protectDynamicColorMixAlpha, } from './compat/color-mix';
+export { normalizeMiniProgramPrefixedDeclaration, removeUnsupportedMiniProgramPrefixedAtRule, } from './compat/mini-program-prefixes';
 export * from './handler';
 export { default as postcssHtmlTransform, type IOptions as PostcssHtmlTransformOptions } from './html-transform';
 export { createStylePipeline, type PipelineNodeContext, type PipelineNodeCursor, type PipelineStage, type ResolvedPipelineNode, type StyleProcessingPipeline, } from './pipeline';

package/dist/index.js

@@ -274,6 +274,96 @@ function protectDynamicColorMixAlpha(css, options = {}) {
 	};
 }
 //#endregion
+//#region src/compat/mini-program-prefixes.ts
+const PRESERVED_WEBKIT_DECLARATION_PROPS = new Set([
+	"-webkit-box-orient",
+	"-webkit-line-clamp",
+	"-webkit-overflow-scrolling",
+	"-webkit-text-fill-color",
+	"-webkit-text-stroke",
+	"-webkit-text-stroke-color",
+	"-webkit-text-stroke-width"
+]);
+const PRESERVED_WEBKIT_VALUE_DECLARATIONS = new Map([["display", new Set(["-webkit-box"])], ["-webkit-background-clip", new Set(["text"])]]);
+const TRANSITION_PROPS = new Set(["transition", "transition-property"]);
+function splitTopLevelCommaList(value) {
+	const parts = [];
+	let start = 0;
+	let depth = 0;
+	let quote;
+	let escaped = false;
+	for (let i = 0; i < value.length; i++) {
+		const char = value[i];
+		if (escaped) {
+			escaped = false;
+			continue;
+		}
+		if (char === "\\") {
+			escaped = true;
+			continue;
+		}
+		if (quote) {
+			if (char === quote) quote = void 0;
+			continue;
+		}
+		if (char === "\"" || char === "'") {
+			quote = char;
+			continue;
+		}
+		if (char === "(") {
+			depth++;
+			continue;
+		}
+		if (char === ")") {
+			depth = Math.max(0, depth - 1);
+			continue;
+		}
+		if (char === "," && depth === 0) {
+			parts.push(value.slice(start, i));
+			start = i + 1;
+		}
+	}
+	parts.push(value.slice(start));
+	return parts;
+}
+function isPreservedWebkitDeclaration(decl) {
+	const prop = decl.prop.toLowerCase();
+	if (prop.startsWith("-webkit-mask")) return true;
+	if (PRESERVED_WEBKIT_DECLARATION_PROPS.has(prop)) return true;
+	return PRESERVED_WEBKIT_VALUE_DECLARATIONS.get(prop)?.has(decl.value.trim().toLowerCase()) ?? false;
+}
+function normalizeTransitionValue(value) {
+	return splitTopLevelCommaList(value).map((part) => part.trim()).filter((part) => part.length > 0 && !part.toLowerCase().startsWith("-webkit-")).join(", ");
+}
+function hasUnsupportedWebkitKeywordValue(decl) {
+	const value = decl.value.trim().toLowerCase();
+	if (!value.startsWith("-webkit-")) return false;
+	if (PRESERVED_WEBKIT_VALUE_DECLARATIONS.get(decl.prop.toLowerCase())?.has(value)) return false;
+	return /^-webkit-[\w-]+$/.test(value);
+}
+/**
+* 收敛小程序 CSS 中的 WebKit 前缀，只保留 WXSS 里有实际价值的兼容写法。
+*/
+function normalizeMiniProgramPrefixedDeclaration(decl) {
+	const prop = decl.prop.toLowerCase();
+	if (TRANSITION_PROPS.has(prop) && decl.value.toLowerCase().includes("-webkit-")) {
+		const value = normalizeTransitionValue(decl.value);
+		if (value.length === 0) {
+			decl.remove();
+			return;
+		}
+		decl.value = value;
+	}
+	if (prop.startsWith("-webkit-") && !isPreservedWebkitDeclaration(decl)) {
+		decl.remove();
+		return;
+	}
+	if (hasUnsupportedWebkitKeywordValue(decl)) decl.remove();
+}
+function removeUnsupportedMiniProgramPrefixedAtRule(atRule) {
+	if (atRule.name.toLowerCase() === "-webkit-keyframes") atRule.remove();
+}
+//#endregion
 //#region src/compat/uni-app-x.ts
 const UNI_APP_X_BASE_CARRIER_SELECTORS = new Set([
 	"*",
@@ -691,6 +781,13 @@ const WEAPP_AUTOPREFIXER_BROWSERS = [
 	"Android >= 4.4",
 	"ChromeAndroid >= 37"
 ];
+const WEAPP_AUTOPREFIXER_DEFAULT_OPTIONS = {
+	add: true,
+	flexbox: false,
+	grid: false,
+	remove: true,
+	supports: false
+};
 const AUTOPREFIXER_PLUGIN_NAME = "autoprefixer";
 function isAutoprefixerPlugin(plugin) {
 	return plugin?.postcssPlugin === AUTOPREFIXER_PLUGIN_NAME;
@@ -699,6 +796,7 @@ function resolveAutoprefixerPlugin(option) {
 	if (option === false) return;
 	const userOptions = option === true || option === void 0 ? {} : option;
 	return (0, autoprefixer.default)({
+		...WEAPP_AUTOPREFIXER_DEFAULT_OPTIONS,
 		...userOptions,
 		overrideBrowserslist: userOptions.overrideBrowserslist ?? WEAPP_AUTOPREFIXER_BROWSERS
 	});
@@ -1966,6 +2064,21 @@ const DEFAULT_ROOT_SELECTORS$1 = [
 	".tw-root",
 	"wx-root-portal-content"
 ];
+const LEGACY_FLEXBOX_DECLARATION_PROPS = new Set([
+	"-webkit-align-content",
+	"-webkit-align-items",
+	"-webkit-align-self",
+	"-webkit-flex",
+	"-webkit-flex-basis",
+	"-webkit-flex-direction",
+	"-webkit-flex-flow",
+	"-webkit-flex-grow",
+	"-webkit-flex-shrink",
+	"-webkit-flex-wrap",
+	"-webkit-justify-content",
+	"-webkit-order"
+]);
+const LEGACY_FLEXBOX_DISPLAY_VALUES = new Set(["-webkit-flex", "-webkit-inline-flex"]);
 function normalizeRootSelectors(value) {
 	if (value === void 0 || value === false) return [];
 	return Array.isArray(value) ? value.filter(Boolean) : [value];
@@ -1979,6 +2092,13 @@ function createHostSelectorAppender(options) {
 		return DEFAULT_ROOT_SELECTORS$1.every((selector) => selectors.includes(selector));
 	};
 }
+function removeLegacyFlexboxPrefix(decl) {
+	if (decl.prop === "display" && LEGACY_FLEXBOX_DISPLAY_VALUES.has(decl.value)) {
+		decl.remove();
+		return;
+	}
+	if (LEGACY_FLEXBOX_DECLARATION_PROPS.has(decl.prop)) decl.remove();
+}
 const postcssWeappTailwindcssPostPlugin = (options) => {
 	const opts = (0, _weapp_tailwindcss_shared.defu)(options, { isMainChunk: true });
 	const p = { postcssPlugin };
@@ -2007,17 +2127,30 @@ const postcssWeappTailwindcssPostPlugin = (options) => {
 		if (opts.majorVersion === void 0) normalizeTailwindcssRpxDeclaration(decl);
 		else normalizeTailwindcssRpxDeclaration(decl, { majorVersion: opts.majorVersion });
 		if (enableMainChunkTransforms) normalizeTailwindcssV4Declaration(decl);
+		removeLegacyFlexboxPrefix(decl);
+		if (enableMainChunkTransforms) normalizeMiniProgramPrefixedDeclaration(decl);
 	};
-	if (enableMainChunkTransforms) p.AtRuleExit = (atRule) => {
-		/**
-		* @description 移除 property
-		*/
-		if (opts.cssRemoveProperty && atRule.name === "property") atRule.remove();
-		/**
-		* 清除空节点
-		*/
-		atRule.nodes?.length === 0 && atRule.remove();
-	};
+	if (enableMainChunkTransforms) {
+		p.OnceExit = (root) => {
+			root.walkDecls((decl) => {
+				normalizeMiniProgramPrefixedDeclaration(decl);
+			});
+			root.walkAtRules((atRule) => {
+				removeUnsupportedMiniProgramPrefixedAtRule(atRule);
+			});
+		};
+		p.AtRuleExit = (atRule) => {
+			removeUnsupportedMiniProgramPrefixedAtRule(atRule);
+			/**
+			* @description 移除 property
+			*/
+			if (opts.cssRemoveProperty && atRule.name === "property") atRule.remove();
+			/**
+			* 清除空节点
+			*/
+			atRule.nodes?.length === 0 && atRule.remove();
+		};
+	}
 	return p;
 };
 postcssWeappTailwindcssPostPlugin.postcss = true;
@@ -2464,7 +2597,7 @@ function shouldUseDefaultAutoprefixer(options, userPlugins) {
 	if (options.autoprefixer === false) return false;
 	if (hasUserAutoprefixerPlugin(options.postcssOptions?.plugins, userPlugins)) return false;
 	if (options.autoprefixer === true || typeof options.autoprefixer === "object") return true;
-	return options.majorVersion === 4;
+	return options.majorVersion === 3 || options.majorVersion === 4;
 }
 function createPreparedNodes(options, signal) {
 	const preparedNodes = [];
@@ -2732,6 +2865,8 @@ exports.createInjectPreflight = createInjectPreflight;
 exports.createStyleHandler = createStyleHandler;
 exports.createStylePipeline = createStylePipeline;
 exports.internalCssSelectorReplacer = internalCssSelectorReplacer;
+exports.normalizeMiniProgramPrefixedDeclaration = normalizeMiniProgramPrefixedDeclaration;
 exports.normalizeModernColorValue = normalizeModernColorValue;
 exports.postcssHtmlTransform = require_html_transform.postcssHtmlTransform;
 exports.protectDynamicColorMixAlpha = protectDynamicColorMixAlpha;
+exports.removeUnsupportedMiniProgramPrefixedAtRule = removeUnsupportedMiniProgramPrefixedAtRule;

package/dist/index.mjs

@@ -264,6 +264,96 @@ function protectDynamicColorMixAlpha(css, options = {}) {
 	};
 }
 //#endregion
+//#region src/compat/mini-program-prefixes.ts
+const PRESERVED_WEBKIT_DECLARATION_PROPS = new Set([
+	"-webkit-box-orient",
+	"-webkit-line-clamp",
+	"-webkit-overflow-scrolling",
+	"-webkit-text-fill-color",
+	"-webkit-text-stroke",
+	"-webkit-text-stroke-color",
+	"-webkit-text-stroke-width"
+]);
+const PRESERVED_WEBKIT_VALUE_DECLARATIONS = new Map([["display", new Set(["-webkit-box"])], ["-webkit-background-clip", new Set(["text"])]]);
+const TRANSITION_PROPS = new Set(["transition", "transition-property"]);
+function splitTopLevelCommaList(value) {
+	const parts = [];
+	let start = 0;
+	let depth = 0;
+	let quote;
+	let escaped = false;
+	for (let i = 0; i < value.length; i++) {
+		const char = value[i];
+		if (escaped) {
+			escaped = false;
+			continue;
+		}
+		if (char === "\\") {
+			escaped = true;
+			continue;
+		}
+		if (quote) {
+			if (char === quote) quote = void 0;
+			continue;
+		}
+		if (char === "\"" || char === "'") {
+			quote = char;
+			continue;
+		}
+		if (char === "(") {
+			depth++;
+			continue;
+		}
+		if (char === ")") {
+			depth = Math.max(0, depth - 1);
+			continue;
+		}
+		if (char === "," && depth === 0) {
+			parts.push(value.slice(start, i));
+			start = i + 1;
+		}
+	}
+	parts.push(value.slice(start));
+	return parts;
+}
+function isPreservedWebkitDeclaration(decl) {
+	const prop = decl.prop.toLowerCase();
+	if (prop.startsWith("-webkit-mask")) return true;
+	if (PRESERVED_WEBKIT_DECLARATION_PROPS.has(prop)) return true;
+	return PRESERVED_WEBKIT_VALUE_DECLARATIONS.get(prop)?.has(decl.value.trim().toLowerCase()) ?? false;
+}
+function normalizeTransitionValue(value) {
+	return splitTopLevelCommaList(value).map((part) => part.trim()).filter((part) => part.length > 0 && !part.toLowerCase().startsWith("-webkit-")).join(", ");
+}
+function hasUnsupportedWebkitKeywordValue(decl) {
+	const value = decl.value.trim().toLowerCase();
+	if (!value.startsWith("-webkit-")) return false;
+	if (PRESERVED_WEBKIT_VALUE_DECLARATIONS.get(decl.prop.toLowerCase())?.has(value)) return false;
+	return /^-webkit-[\w-]+$/.test(value);
+}
+/**
+* 收敛小程序 CSS 中的 WebKit 前缀，只保留 WXSS 里有实际价值的兼容写法。
+*/
+function normalizeMiniProgramPrefixedDeclaration(decl) {
+	const prop = decl.prop.toLowerCase();
+	if (TRANSITION_PROPS.has(prop) && decl.value.toLowerCase().includes("-webkit-")) {
+		const value = normalizeTransitionValue(decl.value);
+		if (value.length === 0) {
+			decl.remove();
+			return;
+		}
+		decl.value = value;
+	}
+	if (prop.startsWith("-webkit-") && !isPreservedWebkitDeclaration(decl)) {
+		decl.remove();
+		return;
+	}
+	if (hasUnsupportedWebkitKeywordValue(decl)) decl.remove();
+}
+function removeUnsupportedMiniProgramPrefixedAtRule(atRule) {
+	if (atRule.name.toLowerCase() === "-webkit-keyframes") atRule.remove();
+}
+//#endregion
 //#region src/compat/uni-app-x.ts
 const UNI_APP_X_BASE_CARRIER_SELECTORS = new Set([
 	"*",
@@ -681,6 +771,13 @@ const WEAPP_AUTOPREFIXER_BROWSERS = [
 	"Android >= 4.4",
 	"ChromeAndroid >= 37"
 ];
+const WEAPP_AUTOPREFIXER_DEFAULT_OPTIONS = {
+	add: true,
+	flexbox: false,
+	grid: false,
+	remove: true,
+	supports: false
+};
 const AUTOPREFIXER_PLUGIN_NAME = "autoprefixer";
 function isAutoprefixerPlugin(plugin) {
 	return plugin?.postcssPlugin === AUTOPREFIXER_PLUGIN_NAME;
@@ -689,6 +786,7 @@ function resolveAutoprefixerPlugin(option) {
 	if (option === false) return;
 	const userOptions = option === true || option === void 0 ? {} : option;
 	return autoprefixerPlugin({
+		...WEAPP_AUTOPREFIXER_DEFAULT_OPTIONS,
 		...userOptions,
 		overrideBrowserslist: userOptions.overrideBrowserslist ?? WEAPP_AUTOPREFIXER_BROWSERS
 	});
@@ -1956,6 +2054,21 @@ const DEFAULT_ROOT_SELECTORS$1 = [
 	".tw-root",
 	"wx-root-portal-content"
 ];
+const LEGACY_FLEXBOX_DECLARATION_PROPS = new Set([
+	"-webkit-align-content",
+	"-webkit-align-items",
+	"-webkit-align-self",
+	"-webkit-flex",
+	"-webkit-flex-basis",
+	"-webkit-flex-direction",
+	"-webkit-flex-flow",
+	"-webkit-flex-grow",
+	"-webkit-flex-shrink",
+	"-webkit-flex-wrap",
+	"-webkit-justify-content",
+	"-webkit-order"
+]);
+const LEGACY_FLEXBOX_DISPLAY_VALUES = new Set(["-webkit-flex", "-webkit-inline-flex"]);
 function normalizeRootSelectors(value) {
 	if (value === void 0 || value === false) return [];
 	return Array.isArray(value) ? value.filter(Boolean) : [value];
@@ -1969,6 +2082,13 @@ function createHostSelectorAppender(options) {
 		return DEFAULT_ROOT_SELECTORS$1.every((selector) => selectors.includes(selector));
 	};
 }
+function removeLegacyFlexboxPrefix(decl) {
+	if (decl.prop === "display" && LEGACY_FLEXBOX_DISPLAY_VALUES.has(decl.value)) {
+		decl.remove();
+		return;
+	}
+	if (LEGACY_FLEXBOX_DECLARATION_PROPS.has(decl.prop)) decl.remove();
+}
 const postcssWeappTailwindcssPostPlugin = (options) => {
 	const opts = defu(options, { isMainChunk: true });
 	const p = { postcssPlugin };
@@ -1997,17 +2117,30 @@ const postcssWeappTailwindcssPostPlugin = (options) => {
 		if (opts.majorVersion === void 0) normalizeTailwindcssRpxDeclaration(decl);
 		else normalizeTailwindcssRpxDeclaration(decl, { majorVersion: opts.majorVersion });
 		if (enableMainChunkTransforms) normalizeTailwindcssV4Declaration(decl);
+		removeLegacyFlexboxPrefix(decl);
+		if (enableMainChunkTransforms) normalizeMiniProgramPrefixedDeclaration(decl);
 	};
-	if (enableMainChunkTransforms) p.AtRuleExit = (atRule) => {
-		/**
-		* @description 移除 property
-		*/
-		if (opts.cssRemoveProperty && atRule.name === "property") atRule.remove();
-		/**
-		* 清除空节点
-		*/
-		atRule.nodes?.length === 0 && atRule.remove();
-	};
+	if (enableMainChunkTransforms) {
+		p.OnceExit = (root) => {
+			root.walkDecls((decl) => {
+				normalizeMiniProgramPrefixedDeclaration(decl);
+			});
+			root.walkAtRules((atRule) => {
+				removeUnsupportedMiniProgramPrefixedAtRule(atRule);
+			});
+		};
+		p.AtRuleExit = (atRule) => {
+			removeUnsupportedMiniProgramPrefixedAtRule(atRule);
+			/**
+			* @description 移除 property
+			*/
+			if (opts.cssRemoveProperty && atRule.name === "property") atRule.remove();
+			/**
+			* 清除空节点
+			*/
+			atRule.nodes?.length === 0 && atRule.remove();
+		};
+	}
 	return p;
 };
 postcssWeappTailwindcssPostPlugin.postcss = true;
@@ -2454,7 +2587,7 @@ function shouldUseDefaultAutoprefixer(options, userPlugins) {
 	if (options.autoprefixer === false) return false;
 	if (hasUserAutoprefixerPlugin(options.postcssOptions?.plugins, userPlugins)) return false;
 	if (options.autoprefixer === true || typeof options.autoprefixer === "object") return true;
-	return options.majorVersion === 4;
+	return options.majorVersion === 3 || options.majorVersion === 4;
 }
 function createPreparedNodes(options, signal) {
 	const preparedNodes = [];
@@ -2717,4 +2850,4 @@ function createStyleHandler(options) {
 	return handler;
 }
 //#endregion
-export { createFallbackPlaceholderReplacer, createInjectPreflight, createStyleHandler, createStylePipeline, internalCssSelectorReplacer, normalizeModernColorValue, postcssHtmlTransform, protectDynamicColorMixAlpha };
+export { createFallbackPlaceholderReplacer, createInjectPreflight, createStyleHandler, createStylePipeline, internalCssSelectorReplacer, normalizeMiniProgramPrefixedDeclaration, normalizeModernColorValue, postcssHtmlTransform, protectDynamicColorMixAlpha, removeUnsupportedMiniProgramPrefixedAtRule };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@weapp-tailwindcss/postcss",
-  "version": "2.2.1-next.3",
+  "version": "2.2.1-next.5",
   "description": "@weapp-tailwindcss/postcss",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",