@weapp-tailwindcss/postcss 3.0.0 → 3.0.2

package/dist/compat/mini-program-css/selectors.d.ts

@@ -1,11 +1,12 @@
 import type postcss from 'postcss';
 export declare const MINI_PROGRAM_THEME_SCOPE_SELECTOR = ":host,page,.tw-root,wx-root-portal-content";
-export declare const MINI_PROGRAM_ELEMENT_SCOPE_SELECTOR = "view,text,:after,:before";
+export declare const MINI_PROGRAM_ELEMENT_SCOPE_SELECTOR = "view,text,::after,::before";
 export declare const MINI_PROGRAM_ELEMENT_SCOPE_SELECTORS: Set<string>;
 export declare const MINI_PROGRAM_PREFLIGHT_SELECTORS: Set<string>;
 export declare const MINI_PROGRAM_THEME_SCOPE_SELECTORS: Set<string>;
 export declare const SPECIFICITY_PLACEHOLDER_SUFFIXES: string[];
 export declare function normalizeSelector(selector: string): string;
+export declare function normalizePseudoElementSelector(selector: string): string;
 export declare function getRuleSelectors(rule: postcss.Rule): string[];
 export declare function getSortedRuleSelectorKey(rule: postcss.Rule): string;
 export declare function isUnsupportedBrowserSelector(selector: string): boolean;

package/dist/index.js

@@ -7195,7 +7195,7 @@ function isTailwindcssV4DisplayP3Declaration(decl) {
 }
 function normalizeTailwindcssV4Declaration(decl) {
 	if (decl.prop === "--tw-gradient-position" && decl.value.endsWith(OKLAB_SUFFIX)) {
-		decl.value = decl.value.slice(0, decl.value.length - 8);
+		decl.value = decl.value.slice(0, decl.value.length - 8).trimEnd();
 		return true;
 	}
 	if (INFINITY_CALC_REGEXP.test(decl.value)) {
@@ -7230,7 +7230,7 @@ function isDisplayP3Declaration(decl) {
 //#endregion
 //#region src/compat/mini-program-css/selectors.ts
 const MINI_PROGRAM_THEME_SCOPE_SELECTOR = ":host,page,.tw-root,wx-root-portal-content";
-const MINI_PROGRAM_ELEMENT_SCOPE_SELECTOR = "view,text,:after,:before";
+const MINI_PROGRAM_ELEMENT_SCOPE_SELECTOR = "view,text,::after,::before";
 const MINI_PROGRAM_ELEMENT_SCOPE_SELECTORS = new Set([
 	"view",
 	"text",
@@ -7318,8 +7318,11 @@ const MINI_PROGRAM_UNSUPPORTED_BROWSER_TAG_SELECTORS = new Set([
 function normalizeSelector$1(selector) {
 	return selector.trim().replace(/\s+/g, "");
 }
+function normalizePseudoElementSelector(selector) {
+	return normalizeSelector$1(selector).replace(/^:(before|after)$/, "::$1");
+}
 function getRuleSelectors(rule) {
-	return rule.selector.split(",").map(normalizeSelector$1).filter(Boolean);
+	return rule.selector.split(",").map(normalizePseudoElementSelector).filter(Boolean);
 }
 function getSortedRuleSelectorKey(rule) {
 	return getRuleSelectors(rule).sort().join(",");
@@ -7356,13 +7359,6 @@ function hasTailwindPreflightDeclaration(rule) {
 	});
 	return hasTailwindVar || hasResetProp;
 }
-function hasTwContentDeclaration(rule) {
-	let hasContentInit = false;
-	rule.walkDecls("--tw-content", () => {
-		hasContentInit = true;
-	});
-	return hasContentInit;
-}
 function isCustomPropertyRule(rule) {
 	let hasDeclaration = false;
 	let allCustomProperties = true;
@@ -7476,8 +7472,10 @@ function removeUnsupportedModernColorDeclarations(root) {
 //#region src/compat/mini-program-css/finalize.ts
 const HOIST_ANCHOR_COMMENT = "__weapp_tailwindcss_base_anchor__";
 const TAILWIND_V4_BANNER_RE = /\/\*!\s*tailwindcss v4\./;
+const MINI_PROGRAM_PSEUDO_CONTENT_SCOPE_SELECTOR = "::before,\n::after";
+const MINI_PROGRAM_PSEUDO_CONTENT_SELECTORS = new Set(["::before", "::after"]);
 function createPseudoContentInitRule() {
-	const rule = postcss.default.rule({ selector: "::before,\n::after" });
+	const rule = postcss.default.rule({ selector: MINI_PROGRAM_PSEUDO_CONTENT_SCOPE_SELECTOR });
 	rule.append({
 		prop: "--tw-content",
 		value: "''"
@@ -7486,16 +7484,23 @@ function createPseudoContentInitRule() {
 }
 function collectPreflightRules(root, options = {}) {
 	const preflightNodes = [];
-	let hasContentInit = false;
-	for (const node of root.nodes ?? []) if (isMiniProgramPreflightRule(node)) {
-		preflightNodes.push(node);
-		if (hasTwContentDeclaration(node)) hasContentInit = true;
-	}
+	for (const node of root.nodes ?? []) if (isMiniProgramPreflightRule(node)) preflightNodes.push(node);
 	if (preflightNodes.length === 0) return [];
-	const clonedPreflightRules = preflightNodes.map((node) => node.clone());
-	const contentInitRules = options.preservePseudoContentInit ? clonedPreflightRules.filter((rule) => hasTwContentDeclaration(rule)) : [];
-	const otherPreflightRules = clonedPreflightRules.filter((rule) => !hasTwContentDeclaration(rule));
-	const preflightRules = hasContentInit ? [...contentInitRules, ...otherPreflightRules] : [...options.preservePseudoContentInit ? [createPseudoContentInitRule()] : [], ...otherPreflightRules];
+	const clonedPreflightRules = preflightNodes.map((node) => {
+		const rule = node.clone();
+		rule.walkDecls("--tw-content", (decl) => {
+			if (isEmptyTwContentDeclaration(decl)) decl.remove();
+		});
+		return rule;
+	});
+	for (const rule of clonedPreflightRules) {
+		const selectors = getRuleSelectors(rule);
+		const hasElementSelector = selectors.some((selector) => selector === "view" || selector === "text");
+		if (selectors.length > 0 && selectors.every((selector) => MINI_PROGRAM_PSEUDO_CONTENT_SELECTORS.has(selector))) rule.selector = MINI_PROGRAM_PSEUDO_CONTENT_SCOPE_SELECTOR;
+		else if (hasElementSelector && selectors.every((selector) => MINI_PROGRAM_ELEMENT_SCOPE_SELECTORS.has(selector))) rule.selector = MINI_PROGRAM_ELEMENT_SCOPE_SELECTOR;
+	}
+	const nonEmptyPreflightRules = clonedPreflightRules.filter((rule) => (rule.nodes?.length ?? 0) > 0);
+	const preflightRules = [...options.preservePseudoContentInit ? [createPseudoContentInitRule()] : [], ...nonEmptyPreflightRules];
 	for (const node of preflightNodes) node.remove();
 	return preflightRules;
 }
@@ -7600,7 +7605,8 @@ function unwrapTailwindSourceMedia(root) {
 	});
 }
 function finalizeMiniProgramCssRoot(root, options = {}) {
-	const tailwindcssV4DefaultNodes = options.isTailwindcssV4 === true ? createMissingCssVarsV4Nodes(root, collectUsedTailwindcssV4Variables(root)) : [];
+	const shouldInjectTailwindcssV4Defaults = options.isTailwindcssV4 === true;
+	const tailwindcssV4DefaultNodes = shouldInjectTailwindcssV4Defaults ? createMissingCssVarsV4Nodes(root, collectUsedTailwindcssV4Variables(root)) : [];
 	removeUnsupportedCascadeLayers(root);
 	unwrapTailwindSourceMedia(root);
 	root.walkAtRules("property", (atRule) => {
@@ -7611,6 +7617,7 @@ function finalizeMiniProgramCssRoot(root, options = {}) {
 	removeDisplayP3Declarations(root);
 	removeUnsupportedModernColorDeclarations(root);
 	root.walkDecls((decl) => {
+		if (shouldInjectTailwindcssV4Defaults) normalizeTailwindcssV4Declaration(decl);
 		normalizeMiniProgramPrefixedDeclaration(decl);
 	});
 	root.walkAtRules((atRule) => {
@@ -53198,6 +53205,7 @@ const MINI_PROGRAM_UNSUPPORTED_PSEUDO_ELEMENT_SELECTOR_SET = new Set([
 	"::-webkit-backdrop",
 	"::file-selector-button"
 ]);
+const NORMALIZED_PSEUDO_ELEMENT_SELECTOR = new Map([[":before", "::before"], [":after", "::after"]]);
 function shouldRemoveUnsupportedPseudoElementSelector(selector, options) {
 	if (!isUniAppXEnabled(options)) return selector.nodes.some((node) => node.type === "pseudo" && MINI_PROGRAM_UNSUPPORTED_PSEUDO_ELEMENT_SELECTOR_SET.has(node.value));
 	return selector.nodes.some((node) => node.type === "pseudo" && UNSUPPORTED_PSEUDO_ELEMENT_SELECTOR_SET.has(node.value));
@@ -53234,6 +53242,11 @@ function handlePseudoNode(node, index, context, parent) {
 		node.value = context.rootReplacement;
 		return;
 	}
+	const normalizedPseudoElement = NORMALIZED_PSEUDO_ELEMENT_SELECTOR.get(node.value);
+	if (normalizedPseudoElement) {
+		node.value = normalizedPseudoElement;
+		return;
+	}
 	if (node.value === ":where") flattenWherePseudo(node, context, index, parent);
 }
 function handleTagOrAttribute(node, context) {

package/dist/index.mjs

@@ -7207,7 +7207,7 @@ function isTailwindcssV4DisplayP3Declaration(decl) {
 }
 function normalizeTailwindcssV4Declaration(decl) {
 	if (decl.prop === "--tw-gradient-position" && decl.value.endsWith(OKLAB_SUFFIX)) {
-		decl.value = decl.value.slice(0, decl.value.length - 8);
+		decl.value = decl.value.slice(0, decl.value.length - 8).trimEnd();
 		return true;
 	}
 	if (INFINITY_CALC_REGEXP.test(decl.value)) {
@@ -7242,7 +7242,7 @@ function isDisplayP3Declaration(decl) {
 //#endregion
 //#region src/compat/mini-program-css/selectors.ts
 const MINI_PROGRAM_THEME_SCOPE_SELECTOR = ":host,page,.tw-root,wx-root-portal-content";
-const MINI_PROGRAM_ELEMENT_SCOPE_SELECTOR = "view,text,:after,:before";
+const MINI_PROGRAM_ELEMENT_SCOPE_SELECTOR = "view,text,::after,::before";
 const MINI_PROGRAM_ELEMENT_SCOPE_SELECTORS = new Set([
 	"view",
 	"text",
@@ -7330,8 +7330,11 @@ const MINI_PROGRAM_UNSUPPORTED_BROWSER_TAG_SELECTORS = new Set([
 function normalizeSelector$1(selector) {
 	return selector.trim().replace(/\s+/g, "");
 }
+function normalizePseudoElementSelector(selector) {
+	return normalizeSelector$1(selector).replace(/^:(before|after)$/, "::$1");
+}
 function getRuleSelectors(rule) {
-	return rule.selector.split(",").map(normalizeSelector$1).filter(Boolean);
+	return rule.selector.split(",").map(normalizePseudoElementSelector).filter(Boolean);
 }
 function getSortedRuleSelectorKey(rule) {
 	return getRuleSelectors(rule).sort().join(",");
@@ -7368,13 +7371,6 @@ function hasTailwindPreflightDeclaration(rule) {
 	});
 	return hasTailwindVar || hasResetProp;
 }
-function hasTwContentDeclaration(rule) {
-	let hasContentInit = false;
-	rule.walkDecls("--tw-content", () => {
-		hasContentInit = true;
-	});
-	return hasContentInit;
-}
 function isCustomPropertyRule(rule) {
 	let hasDeclaration = false;
 	let allCustomProperties = true;
@@ -7488,8 +7484,10 @@ function removeUnsupportedModernColorDeclarations(root) {
 //#region src/compat/mini-program-css/finalize.ts
 const HOIST_ANCHOR_COMMENT = "__weapp_tailwindcss_base_anchor__";
 const TAILWIND_V4_BANNER_RE = /\/\*!\s*tailwindcss v4\./;
+const MINI_PROGRAM_PSEUDO_CONTENT_SCOPE_SELECTOR = "::before,\n::after";
+const MINI_PROGRAM_PSEUDO_CONTENT_SELECTORS = new Set(["::before", "::after"]);
 function createPseudoContentInitRule() {
-	const rule = postcss.rule({ selector: "::before,\n::after" });
+	const rule = postcss.rule({ selector: MINI_PROGRAM_PSEUDO_CONTENT_SCOPE_SELECTOR });
 	rule.append({
 		prop: "--tw-content",
 		value: "''"
@@ -7498,16 +7496,23 @@ function createPseudoContentInitRule() {
 }
 function collectPreflightRules(root, options = {}) {
 	const preflightNodes = [];
-	let hasContentInit = false;
-	for (const node of root.nodes ?? []) if (isMiniProgramPreflightRule(node)) {
-		preflightNodes.push(node);
-		if (hasTwContentDeclaration(node)) hasContentInit = true;
-	}
+	for (const node of root.nodes ?? []) if (isMiniProgramPreflightRule(node)) preflightNodes.push(node);
 	if (preflightNodes.length === 0) return [];
-	const clonedPreflightRules = preflightNodes.map((node) => node.clone());
-	const contentInitRules = options.preservePseudoContentInit ? clonedPreflightRules.filter((rule) => hasTwContentDeclaration(rule)) : [];
-	const otherPreflightRules = clonedPreflightRules.filter((rule) => !hasTwContentDeclaration(rule));
-	const preflightRules = hasContentInit ? [...contentInitRules, ...otherPreflightRules] : [...options.preservePseudoContentInit ? [createPseudoContentInitRule()] : [], ...otherPreflightRules];
+	const clonedPreflightRules = preflightNodes.map((node) => {
+		const rule = node.clone();
+		rule.walkDecls("--tw-content", (decl) => {
+			if (isEmptyTwContentDeclaration(decl)) decl.remove();
+		});
+		return rule;
+	});
+	for (const rule of clonedPreflightRules) {
+		const selectors = getRuleSelectors(rule);
+		const hasElementSelector = selectors.some((selector) => selector === "view" || selector === "text");
+		if (selectors.length > 0 && selectors.every((selector) => MINI_PROGRAM_PSEUDO_CONTENT_SELECTORS.has(selector))) rule.selector = MINI_PROGRAM_PSEUDO_CONTENT_SCOPE_SELECTOR;
+		else if (hasElementSelector && selectors.every((selector) => MINI_PROGRAM_ELEMENT_SCOPE_SELECTORS.has(selector))) rule.selector = MINI_PROGRAM_ELEMENT_SCOPE_SELECTOR;
+	}
+	const nonEmptyPreflightRules = clonedPreflightRules.filter((rule) => (rule.nodes?.length ?? 0) > 0);
+	const preflightRules = [...options.preservePseudoContentInit ? [createPseudoContentInitRule()] : [], ...nonEmptyPreflightRules];
 	for (const node of preflightNodes) node.remove();
 	return preflightRules;
 }
@@ -7612,7 +7617,8 @@ function unwrapTailwindSourceMedia(root) {
 	});
 }
 function finalizeMiniProgramCssRoot(root, options = {}) {
-	const tailwindcssV4DefaultNodes = options.isTailwindcssV4 === true ? createMissingCssVarsV4Nodes(root, collectUsedTailwindcssV4Variables(root)) : [];
+	const shouldInjectTailwindcssV4Defaults = options.isTailwindcssV4 === true;
+	const tailwindcssV4DefaultNodes = shouldInjectTailwindcssV4Defaults ? createMissingCssVarsV4Nodes(root, collectUsedTailwindcssV4Variables(root)) : [];
 	removeUnsupportedCascadeLayers(root);
 	unwrapTailwindSourceMedia(root);
 	root.walkAtRules("property", (atRule) => {
@@ -7623,6 +7629,7 @@ function finalizeMiniProgramCssRoot(root, options = {}) {
 	removeDisplayP3Declarations(root);
 	removeUnsupportedModernColorDeclarations(root);
 	root.walkDecls((decl) => {
+		if (shouldInjectTailwindcssV4Defaults) normalizeTailwindcssV4Declaration(decl);
 		normalizeMiniProgramPrefixedDeclaration(decl);
 	});
 	root.walkAtRules((atRule) => {
@@ -53192,6 +53199,7 @@ const MINI_PROGRAM_UNSUPPORTED_PSEUDO_ELEMENT_SELECTOR_SET = new Set([
 	"::-webkit-backdrop",
 	"::file-selector-button"
 ]);
+const NORMALIZED_PSEUDO_ELEMENT_SELECTOR = new Map([[":before", "::before"], [":after", "::after"]]);
 function shouldRemoveUnsupportedPseudoElementSelector(selector, options) {
 	if (!isUniAppXEnabled(options)) return selector.nodes.some((node) => node.type === "pseudo" && MINI_PROGRAM_UNSUPPORTED_PSEUDO_ELEMENT_SELECTOR_SET.has(node.value));
 	return selector.nodes.some((node) => node.type === "pseudo" && UNSUPPORTED_PSEUDO_ELEMENT_SELECTOR_SET.has(node.value));
@@ -53228,6 +53236,11 @@ function handlePseudoNode(node, index, context, parent) {
 		node.value = context.rootReplacement;
 		return;
 	}
+	const normalizedPseudoElement = NORMALIZED_PSEUDO_ELEMENT_SELECTOR.get(node.value);
+	if (normalizedPseudoElement) {
+		node.value = normalizedPseudoElement;
+		return;
+	}
 	if (node.value === ":where") flattenWherePseudo(node, context, index, parent);
 }
 function handleTagOrAttribute(node, context) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@weapp-tailwindcss/postcss",
-  "version": "3.0.0",
+  "version": "3.0.2",
   "description": "@weapp-tailwindcss/postcss",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -57,7 +57,6 @@
   },
   "dependencies": {
     "@weapp-core/escape": "~8.0.0",
-    "@weapp-tailwindcss/postcss-calc": "^1.0.0",
     "autoprefixer": "^10.5.0",
     "lru-cache": "11.5.1",
     "postcss": "^8.5.15",
@@ -66,6 +65,7 @@
     "postcss-rule-unit-converter": "^0.2.2",
     "postcss-selector-parser": "~7.1.1",
     "postcss-value-parser": "^4.2.0",
+    "@weapp-tailwindcss/postcss-calc": "^1.0.1",
     "@weapp-tailwindcss/shared": "2.0.0"
   },
   "devDependencies": {