@weapp-tailwindcss/postcss 3.2.2 → 3.2.4

package/dist/index.js

@@ -801,6 +801,197 @@ function isTailwindcssV4DisplayP3Declaration(decl) {
 	return DISPLAY_P3_VALUE_RE$1.test(decl.value);
 }
 //#endregion
+//#region src/compat/uni-app-x-uvue/scoped-style.ts
+const MINI_PROGRAM_PREFLIGHT_SELECTORS$1 = /* @__PURE__ */ new Set([
+	"view",
+	"text",
+	"::after",
+	"::before"
+]);
+const SCOPED_UNIVERSAL_PREFLIGHT_SELECTORS = /* @__PURE__ */ new Set([
+	"*",
+	"::after",
+	"::before",
+	"::backdrop",
+	"::file-selector-button"
+]);
+const TAILWIND_VERSION_COMMENT_RE = /tailwindcss v\d/i;
+const VUE_SCOPED_ATTR_RE = /\[data-v-[^\]]+\]/gi;
+const VUE_SCOPED_CLASS_RE = /\.data-v-[\w-]+/gi;
+const TAILWIND_PREFLIGHT_DECLARATIONS = /* @__PURE__ */ new Set([
+	"-moz-tab-size:4",
+	"-webkit-appearance:none",
+	"-webkit-appearance:button",
+	"-webkit-tap-highlight-color:transparent",
+	"-webkit-text-decoration:inherit",
+	"-webkit-text-decoration:underline dotted",
+	"-webkit-text-size-adjust:100%",
+	"-o-tab-size:4",
+	"appearance:button",
+	"background-color:transparent",
+	"border-collapse:collapse",
+	"border-color:inherit",
+	"border-radius:0",
+	"border-top-width:1px",
+	"bottom:-.25em",
+	"color:inherit",
+	"display:block",
+	"display:inline-flex",
+	"display:list-item",
+	"font:inherit",
+	"font-family:inherit",
+	"font-feature-settings:inherit",
+	"font-size:1em",
+	"font-size:75%",
+	"font-size:80%",
+	"font-size:inherit",
+	"font-variation-settings:inherit",
+	"font-weight:bolder",
+	"font-weight:inherit",
+	"height:0",
+	"height:auto",
+	"letter-spacing:inherit",
+	"line-height:1",
+	"line-height:1.5",
+	"line-height:0",
+	"line-height:inherit",
+	"list-style:none",
+	"margin-inline-end:4px",
+	"max-width:100%",
+	"min-height:1lh",
+	"opacity:1",
+	"outline:auto",
+	"padding:0",
+	"padding-block:0",
+	"position:relative",
+	"resize:vertical",
+	"tab-size:4",
+	"text-align:inherit",
+	"text-decoration:inherit",
+	"text-decoration:underline dotted",
+	"text-indent:0",
+	"text-transform:none",
+	"top:-.5em",
+	"vertical-align:baseline",
+	"vertical-align:middle"
+]);
+function hasVueScopedAttr(value) {
+	VUE_SCOPED_ATTR_RE.lastIndex = 0;
+	VUE_SCOPED_CLASS_RE.lastIndex = 0;
+	const matched = VUE_SCOPED_ATTR_RE.test(value) || VUE_SCOPED_CLASS_RE.test(value);
+	VUE_SCOPED_ATTR_RE.lastIndex = 0;
+	VUE_SCOPED_CLASS_RE.lastIndex = 0;
+	return matched;
+}
+function normalizeCssSignatureValue(value) {
+	return value.replace(VUE_SCOPED_ATTR_RE, "").replace(VUE_SCOPED_CLASS_RE, "").replace(/\s+/g, " ").replace(/\s*([>+~])\s*/g, "$1").replace(/\(\s+/g, "(").replace(/\s+\)/g, ")").trim();
+}
+function isSfcStyleRequestSource(source) {
+	if (typeof source !== "string") return false;
+	const queryIndex = source.indexOf("?");
+	if (queryIndex < 0 || !source.slice(0, queryIndex).toLowerCase().endsWith(".uvue")) return false;
+	const hashIndex = source.indexOf("#", queryIndex);
+	const query = source.slice(queryIndex + 1, hashIndex < 0 ? void 0 : hashIndex);
+	return new URLSearchParams(query).get("type") === "style";
+}
+function isUvueSfcStyleRequest(result) {
+	if (isSfcStyleRequestSource(result.opts.from)) return true;
+	if ((result.root.nodes ?? []).some((node) => isSfcStyleRequestSource(node.source?.input.from))) return true;
+	let hasScopedSelector = false;
+	result.root.walkRules((rule) => {
+		if ((rule.selectors ?? [rule.selector]).some(hasVueScopedAttr)) {
+			hasScopedSelector = true;
+			return false;
+		}
+	});
+	return hasScopedSelector;
+}
+function getDeclarations(rule) {
+	return rule.nodes?.filter((node) => node.type === "decl") ?? [];
+}
+function isLikelyTailwindGlobalSelector(selector) {
+	const normalized = normalizeCssSignatureValue(selector);
+	return normalized === "*" || normalized.startsWith("::") || normalized.startsWith(":root") || normalized.startsWith(":host") || /^(?:html|body|hr|abbr|h1|h2|h3|h4|h5|h6|a|b|strong|code|kbd|samp|pre|small|sub|sup|table|button|input|select|optgroup|textarea|summary|blockquote|dl|dd|fieldset|legend|ol|ul|menu|dialog|progress|video|audio|canvas|embed|iframe|img|object|svg|details|template|[uo]ni-progress)(?:$|[:,[\s>+~.#])/.test(normalized);
+}
+function isTailwindPreflightDeclaration(decl) {
+	const prop = decl.prop.trim().toLowerCase();
+	const value = normalizeCssSignatureValue(decl.value.trim().toLowerCase());
+	if (prop.startsWith("--tw-")) return true;
+	if (prop === "color" && value.startsWith("color-mix(") && value.includes("currentcolor") && value.includes("transparent")) return true;
+	if (prop === "color" && value === "currentcolor") return true;
+	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) {
+	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("--"));
+}
+function isScopedUniversalTailwindPreflightRule(rule) {
+	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-") || [
+		"box-sizing",
+		"margin",
+		"padding",
+		"border"
+	].includes(decl.prop));
+}
+function isScopedTailwindElementPreflightRule(rule, hasTailwindBanner) {
+	if (!hasTailwindBanner) return false;
+	const selectors = rule.selectors ?? [rule.selector];
+	const declarations = getDeclarations(rule);
+	return selectors.length > 0 && selectors.every((selector) => hasVueScopedAttr(selector) && isLikelyTailwindGlobalSelector(selector)) && declarations.length > 0 && declarations.every(isTailwindPreflightDeclaration);
+}
+function isUnscopedMiniProgramTailwindPreflightRule(rule) {
+	const selectors = rule.selectors ?? [rule.selector];
+	if (selectors.length === 0 || !selectors.every((selector) => {
+		const normalized = normalizeCssSignatureValue(selector);
+		return !hasVueScopedAttr(selector) && MINI_PROGRAM_PREFLIGHT_SELECTORS$1.has(normalized);
+	})) return false;
+	const declarations = getDeclarations(rule);
+	return declarations.length > 0 && declarations.every((decl) => decl.prop.startsWith("--tw-") || [
+		"box-sizing",
+		"margin",
+		"padding",
+		"border"
+	].includes(decl.prop));
+}
+function isScopedMiniProgramTailwindContentInitRule(rule) {
+	const selectors = rule.selectors ?? [rule.selector];
+	if (selectors.length === 0 || !selectors.every((selector) => {
+		const normalized = normalizeCssSignatureValue(selector);
+		return hasVueScopedAttr(selector) && MINI_PROGRAM_PREFLIGHT_SELECTORS$1.has(normalized);
+	})) return false;
+	const declarations = getDeclarations(rule);
+	return declarations.length > 0 && declarations.every((decl) => decl.prop === "--tw-content");
+}
+function isLikelyTailwindPropertyAtRule(atRule) {
+	return typeof atRule.name === "string" && atRule.name.toLowerCase() === "property" && normalizeCssSignatureValue(atRule.params).startsWith("--tw-");
+}
+function stripScopedTailwindNoise(root) {
+	let hasTailwindBanner = false;
+	root.walkComments((comment) => {
+		if (TAILWIND_VERSION_COMMENT_RE.test(comment.text)) hasTailwindBanner = true;
+	});
+	root.walkComments((comment) => {
+		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();
+	});
+	root.walkAtRules((atRule) => {
+		if (isLikelyTailwindPropertyAtRule(atRule)) {
+			atRule.remove();
+			return;
+		}
+		if ((atRule.nodes?.length ?? 0) === 0) atRule.remove();
+	});
+}
+//#endregion
 //#region src/compat/uni-app-x-uvue/theme.ts
 const SYSTEM_ROOT_SELECTORS = /* @__PURE__ */ new Set([
 	":host",
@@ -998,6 +1189,7 @@ function applyUniAppXUvueCompatibility(result, options) {
 	if (!isUniAppXUvueTarget(options)) return result;
 	const mode = normalizeUnsupportedMode(options?.uniAppXUnsupported);
 	const warningCache = /* @__PURE__ */ new Set();
+	const sfcStyleRequest = options?.isMainChunk !== true && isUvueSfcStyleRequest(result);
 	let root = result.root;
 	let calcMessages = [];
 	consumeUniAppXSystemRootTheme(root, options?.customPropertyValues);
@@ -1010,8 +1202,9 @@ function applyUniAppXUvueCompatibility(result, options) {
 		root = calcResult.root;
 		calcMessages = calcResult.messages;
 	}
+	if (sfcStyleRequest) stripScopedTailwindNoise(root);
 	root.walkRules((rule) => {
-		if (!hasOnlyClassSelectors(rule)) {
+		if (!sfcStyleRequest && !hasOnlyClassSelectors(rule)) {
 			reportUnsupportedRule(rule, result, mode, warningCache, "selector must be class-only");
 			rule.remove();
 			return;
@@ -4260,6 +4453,81 @@ function rewriteLocalCssImportRequestsForOutput(css, options = {}) {
 	}
 }
 //#endregion
+//#region src/compat/line-comments.ts
+/**
+* 将常见预处理器风格的行注释转换为 PostCSS 可解析的块注释。
+* 避免改写字符串、块注释和未加引号的 URL。
+*/
+function normalizeCssLineComments(source) {
+	if (!source.includes("//")) return source;
+	const parts = [];
+	let lastWriteIndex = 0;
+	const syntaxCharacter = /[/"'(]/g;
+	for (let match = syntaxCharacter.exec(source); match; match = syntaxCharacter.exec(source)) {
+		const index = match.index;
+		const char = match[0];
+		const next = source[index + 1];
+		if (char === "/" && next === "*" && !isEscaped(source, index)) {
+			const commentEnd = source.indexOf("*/", index + 2);
+			syntaxCharacter.lastIndex = commentEnd === -1 ? source.length : commentEnd + 2;
+			continue;
+		}
+		if ((char === "\"" || char === "'") && !isEscaped(source, index)) {
+			const quoteEnd = findUnescapedCharacter(source, char, index + 1);
+			syntaxCharacter.lastIndex = quoteEnd === -1 ? source.length : quoteEnd + 1;
+			continue;
+		}
+		if (char === "(" && isUrlFunctionStart(source, index)) {
+			let valueStart = index + 1;
+			while (valueStart < source.length && /\s/.test(source[valueStart] ?? "")) valueStart++;
+			const valueStartChar = source[valueStart];
+			if (valueStartChar !== "\"" && valueStartChar !== "'") {
+				const urlEnd = findUnescapedCharacter(source, ")", valueStart);
+				syntaxCharacter.lastIndex = urlEnd === -1 ? source.length : urlEnd + 1;
+			}
+			continue;
+		}
+		if (char === "/" && next === "/" && !isEscaped(source, index)) {
+			let lineStart = index - 1;
+			while (lineStart >= 0 && source[lineStart] !== "\n" && source[lineStart] !== "\r") lineStart--;
+			const linePrefix = source.slice(lineStart + 1, index);
+			const trimmedLinePrefix = linePrefix.trimEnd();
+			const needsSemicolon = trimmedLinePrefix.length > 0 && !/[;{}]$/.test(trimmedLinePrefix);
+			let unchangedPrefix = source.slice(lastWriteIndex, index);
+			if (needsSemicolon) {
+				const trailingWhitespaceLength = linePrefix.length - trimmedLinePrefix.length;
+				const insertionIndex = unchangedPrefix.length - trailingWhitespaceLength;
+				unchangedPrefix = `${unchangedPrefix.slice(0, insertionIndex)};${unchangedPrefix.slice(insertionIndex)}`;
+			}
+			let lineEnd = index + 2;
+			while (lineEnd < source.length && source[lineEnd] !== "\n" && source[lineEnd] !== "\r") lineEnd++;
+			parts.push(unchangedPrefix, "/*", source.slice(index + 2, lineEnd), "*/");
+			lastWriteIndex = lineEnd;
+			syntaxCharacter.lastIndex = lineEnd;
+			continue;
+		}
+	}
+	if (parts.length === 0) return source;
+	parts.push(source.slice(lastWriteIndex));
+	return parts.join("");
+}
+function isEscaped(source, index) {
+	let backslashCount = 0;
+	for (let cursor = index - 1; cursor >= 0 && source[cursor] === "\\"; cursor--) backslashCount++;
+	return backslashCount % 2 === 1;
+}
+function findUnescapedCharacter(source, character, fromIndex) {
+	let index = source.indexOf(character, fromIndex);
+	while (index !== -1 && isEscaped(source, index)) index = source.indexOf(character, index + 1);
+	return index;
+}
+function isUrlFunctionStart(source, index) {
+	if (isEscaped(source, index) || index < 3) return false;
+	const prefix = source.slice(index - 3, index);
+	const beforePrefix = source[index - 4];
+	return prefix.toLowerCase() === "url" && (beforePrefix === void 0 || !/\w/.test(beforePrefix));
+}
+//#endregion
 //#region src/content-probe.ts
 /**
 * 所有标志均为 false 的空信号
@@ -6444,14 +6712,15 @@ function createStyleHandler(options) {
 	}
 	function processSource(rawSource, root, cloneOutput, opt) {
 		const resolvedOptions = resolver.resolve(opt);
+		const normalizedRawSource = normalizeCssLineComments(rawSource);
 		const isUniAppXFramework = resolvedOptions.appType === "uni-app-x";
-		const protectedVarFallbacks = resolvedOptions.uniAppX || isUniAppXFramework ? protectDynamicVarFallbacks(rawSource) : {
-			css: rawSource,
+		const protectedVarFallbacks = resolvedOptions.uniAppX || isUniAppXFramework ? protectDynamicVarFallbacks(normalizedRawSource) : {
+			css: normalizedRawSource,
 			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;
+		const processInput = source !== normalizedRawSource ? source : root?.clone() ?? source;
 		let signal;
 		if (!hasUserPlugins) try {
 			signal = probeFeatures(source);
@@ -6478,7 +6747,7 @@ function createStyleHandler(options) {
 					finalResult = nextResult;
 				}
 			}
-			if (protectedColorMix || protectedVarFallbacks.css !== rawSource) {
+			if (protectedColorMix || protectedVarFallbacks.css !== normalizedRawSource) {
 				const restoredCss = protectedVarFallbacks.restore(protectedColorMix?.restore(finalResult.css) ?? finalResult.css);
 				if (restoredCss !== finalResult.css) {
 					const nextResult = finalResult.root.clone().toResult(finalResult.opts);

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.2",
+  "version": "3.2.4",
   "description": "@weapp-tailwindcss/postcss",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -78,13 +78,13 @@
     "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/shared": "2.0.1",
     "@weapp-tailwindcss/postcss-calc": "^1.0.3",
-    "tailwindcss-config": "2.0.2"
+    "tailwindcss-config": "2.0.2",
+    "@weapp-tailwindcss/shared": "2.0.1"
   },
   "devDependencies": {
     "@csstools/postcss-is-pseudo-class": "^6.0.0",