@weapp-tailwindcss/postcss 1.0.22-alpha.0 → 1.1.0

package/dist/index.js

@@ -59,6 +59,7 @@ function createContext() {
 var postcssPlugin = "postcss-weapp-tailwindcss-rename-plugin";
 
 // src/selectorParser.ts
+
 var _postcssselectorparser = require('postcss-selector-parser'); var _postcssselectorparser2 = _interopRequireDefault(_postcssselectorparser);
 
 // src/shared.ts
@@ -146,6 +147,9 @@ function createRuleTransform(rule, options) {
         if (selector.value === ":root" && _optionalChain([cssSelectorReplacement, 'optionalAccess', _2 => _2.root])) {
           selector.value = composeIsPseudo(cssSelectorReplacement.root);
         } else if (selector.value === ":where") {
+          if (uniAppX) {
+            selector.value = ":is";
+          }
           if (index === 0 && selector.length === 1) {
             selector.walk((node, idx) => {
               if (idx === 0 && node.type === "class") {
@@ -190,9 +194,6 @@ function createRuleTransform(rule, options) {
             }
           }
         }
-        if (uniAppX) {
-          selector.remove();
-        }
       } else if (selector.type === "combinator") {
         if (selector.value === ">") {
           const nodes2 = _optionalChain([selector, 'access', _5 => _5.parent, 'optionalAccess', _6 => _6.nodes]);
@@ -259,7 +260,8 @@ function isOnlyBeforeAndAfterPseudoElement(node) {
   }).astSync(node);
   return b && a;
 }
-function getFallbackRemove(rule) {
+function getFallbackRemove(rule, options) {
+  const { uniAppX } = _shared.defuOverrideArray.call(void 0, options, {});
   const fallbackRemove = _postcssselectorparser2.default.call(void 0, (selectors) => {
     let maybeImportantId = false;
     selectors.walk((selector, idx) => {
@@ -307,6 +309,10 @@ function getFallbackRemove(rule) {
           if (res) {
             selector.remove();
           }
+        } else if (selector.type === "pseudo") {
+          if (uniAppX) {
+            selector.remove();
+          }
         }
       }
     });
@@ -324,34 +330,32 @@ var postcssWeappTailwindcssPostPlugin = (options) => {
     postcssPlugin
   };
   if (opts.isMainChunk) {
-    p.OnceExit = (root) => {
-      root.walkRules((rule) => {
-        getFallbackRemove(rule).transformSync(rule, {
-          updateSelector: true,
-          lossless: false
-        });
-        if (rule.selectors.length === 0 || rule.selectors.length === 1 && rule.selector.trim() === "") {
-          rule.remove();
-        }
-        rule.walkDecls((decl) => {
-          if (decl.prop === "--tw-gradient-position" && decl.value.endsWith(OklabSuffix)) {
-            decl.value = decl.value.slice(0, decl.value.length - OklabSuffix.length);
-          } else if (/calc\(\s*infinity\s*\*\s*1px/.test(decl.value)) {
-            decl.value = "9999px";
-          }
-        });
-        if (opts.uniAppX) {
-          if (rule.nodes.length === 0) {
-            rule.remove();
-          }
-        }
+    p.RuleExit = (rule) => {
+      getFallbackRemove(rule, opts).transformSync(rule, {
+        updateSelector: true,
+        lossless: false
       });
-      root.walkAtRules((atRule) => {
-        if (opts.cssRemoveProperty && atRule.name === "property") {
-          atRule.remove();
+      if (rule.selectors.length === 0 || rule.selectors.length === 1 && rule.selector.trim() === "") {
+        rule.remove();
+      }
+      if (opts.uniAppX) {
+        if (rule.nodes.length === 0) {
+          rule.remove();
         }
-        _optionalChain([atRule, 'access', _24 => _24.nodes, 'optionalAccess', _25 => _25.length]) === 0 && atRule.remove();
-      });
+      }
+    };
+    p.DeclarationExit = (decl) => {
+      if (decl.prop === "--tw-gradient-position" && decl.value.endsWith(OklabSuffix)) {
+        decl.value = decl.value.slice(0, decl.value.length - OklabSuffix.length);
+      } else if (/calc\(\s*infinity\s*\*\s*1px/.test(decl.value)) {
+        decl.value = "9999px";
+      }
+    };
+    p.AtRuleExit = (atRule) => {
+      if (opts.cssRemoveProperty && atRule.name === "property") {
+        atRule.remove();
+      }
+      _optionalChain([atRule, 'access', _24 => _24.nodes, 'optionalAccess', _25 => _25.length]) === 0 && atRule.remove();
     };
   }
   if (typeof opts.customRuleCallback === "function") {

package/dist/index.mjs

@@ -1,7 +1,7 @@
 import "./chunk-WAXGOBY2.mjs";
 
 // src/handler.ts
-import { defu as defu3, defuOverrideArray } from "@weapp-tailwindcss/shared";
+import { defu as defu3, defuOverrideArray as defuOverrideArray2 } from "@weapp-tailwindcss/shared";
 import postcss from "postcss";
 
 // src/defaults.ts
@@ -59,6 +59,7 @@ import { defu } from "@weapp-tailwindcss/shared";
 var postcssPlugin = "postcss-weapp-tailwindcss-rename-plugin";
 
 // src/selectorParser.ts
+import { defuOverrideArray } from "@weapp-tailwindcss/shared";
 import psp from "postcss-selector-parser";
 
 // src/shared.ts
@@ -146,6 +147,9 @@ function createRuleTransform(rule, options) {
         if (selector.value === ":root" && cssSelectorReplacement?.root) {
           selector.value = composeIsPseudo(cssSelectorReplacement.root);
         } else if (selector.value === ":where") {
+          if (uniAppX) {
+            selector.value = ":is";
+          }
           if (index === 0 && selector.length === 1) {
             selector.walk((node, idx) => {
               if (idx === 0 && node.type === "class") {
@@ -190,9 +194,6 @@ function createRuleTransform(rule, options) {
             }
           }
         }
-        if (uniAppX) {
-          selector.remove();
-        }
       } else if (selector.type === "combinator") {
         if (selector.value === ">") {
           const nodes2 = selector.parent?.nodes;
@@ -259,7 +260,8 @@ function isOnlyBeforeAndAfterPseudoElement(node) {
   }).astSync(node);
   return b && a;
 }
-function getFallbackRemove(rule) {
+function getFallbackRemove(rule, options) {
+  const { uniAppX } = defuOverrideArray(options, {});
   const fallbackRemove = psp((selectors) => {
     let maybeImportantId = false;
     selectors.walk((selector, idx) => {
@@ -307,6 +309,10 @@ function getFallbackRemove(rule) {
           if (res) {
             selector.remove();
           }
+        } else if (selector.type === "pseudo") {
+          if (uniAppX) {
+            selector.remove();
+          }
         }
       }
     });
@@ -324,34 +330,32 @@ var postcssWeappTailwindcssPostPlugin = (options) => {
     postcssPlugin
   };
   if (opts.isMainChunk) {
-    p.OnceExit = (root) => {
-      root.walkRules((rule) => {
-        getFallbackRemove(rule).transformSync(rule, {
-          updateSelector: true,
-          lossless: false
-        });
-        if (rule.selectors.length === 0 || rule.selectors.length === 1 && rule.selector.trim() === "") {
-          rule.remove();
-        }
-        rule.walkDecls((decl) => {
-          if (decl.prop === "--tw-gradient-position" && decl.value.endsWith(OklabSuffix)) {
-            decl.value = decl.value.slice(0, decl.value.length - OklabSuffix.length);
-          } else if (/calc\(\s*infinity\s*\*\s*1px/.test(decl.value)) {
-            decl.value = "9999px";
-          }
-        });
-        if (opts.uniAppX) {
-          if (rule.nodes.length === 0) {
-            rule.remove();
-          }
-        }
+    p.RuleExit = (rule) => {
+      getFallbackRemove(rule, opts).transformSync(rule, {
+        updateSelector: true,
+        lossless: false
       });
-      root.walkAtRules((atRule) => {
-        if (opts.cssRemoveProperty && atRule.name === "property") {
-          atRule.remove();
+      if (rule.selectors.length === 0 || rule.selectors.length === 1 && rule.selector.trim() === "") {
+        rule.remove();
+      }
+      if (opts.uniAppX) {
+        if (rule.nodes.length === 0) {
+          rule.remove();
         }
-        atRule.nodes?.length === 0 && atRule.remove();
-      });
+      }
+    };
+    p.DeclarationExit = (decl) => {
+      if (decl.prop === "--tw-gradient-position" && decl.value.endsWith(OklabSuffix)) {
+        decl.value = decl.value.slice(0, decl.value.length - OklabSuffix.length);
+      } else if (/calc\(\s*infinity\s*\*\s*1px/.test(decl.value)) {
+        decl.value = "9999px";
+      }
+    };
+    p.AtRuleExit = (atRule) => {
+      if (opts.cssRemoveProperty && atRule.name === "property") {
+        atRule.remove();
+      }
+      atRule.nodes?.length === 0 && atRule.remove();
     };
   }
   if (typeof opts.customRuleCallback === "function") {
@@ -1289,7 +1293,7 @@ function styleHandler(rawSource, options) {
   ).async();
 }
 function createStyleHandler(options) {
-  const cachedOptions = defuOverrideArray(
+  const cachedOptions = defuOverrideArray2(
     options,
     getDefaultOptions()
   );
@@ -1297,7 +1301,7 @@ function createStyleHandler(options) {
   return (rawSource, opt) => {
     return styleHandler(
       rawSource,
-      defuOverrideArray(opt, cachedOptions)
+      defuOverrideArray2(opt, cachedOptions)
     );
   };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@weapp-tailwindcss/postcss",
-  "version": "1.0.22-alpha.0",
+  "version": "1.1.0",
   "description": "@weapp-tailwindcss/postcss",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -41,7 +41,7 @@
   "dependencies": {
     "@weapp-core/escape": "~4.0.1",
     "postcss": "~8.5.6",
-    "postcss-preset-env": "^10.2.4",
+    "postcss-preset-env": "^10.3.0",
     "postcss-rem-to-responsive-pixel": "~6.0.2",
     "postcss-selector-parser": "~7.1.0",
     "@weapp-tailwindcss/shared": "1.0.3"