@weapp-tailwindcss/postcss 1.0.10-alpha.0 → 1.0.10-alpha.2

package/dist/index.js

@@ -642,9 +642,13 @@ function commonChunkPreflight(node, options) {
 function isAtMediaHover(atRule) {
   return /media\(\s*hover\s*:\s*hover\s*\)/.test(atRule.name) || atRule.name === "media" && /\(\s*hover\s*:\s*hover\s*\)/.test(atRule.params);
 }
-var TAILWIND_V4_MODERN_REGEX = /^\(\(-webkit-hyphens:\s*none\)\s+and\s+\(not\s+\(margin-trim:\s*inline\)\)\)\s+or\s+\(\(-moz-orient:\s*inline\)\s+and\s+\(not\s+\(color:\s*rgb\(from\s+red\s+r\s+g\s+b\)\)\)\)$/;
 function isTailwindcssV4ModernCheck(atRule) {
-  return atRule.name === "supports" && TAILWIND_V4_MODERN_REGEX.test(atRule.params);
+  return atRule.name === "supports" && [
+    /-webkit-hyphens\s*:\s*none/,
+    /margin-trim\s*:\s*inline/,
+    /-moz-orient\s*:\s*inline/,
+    /color\s*:\s*rgb\(\s*from\s+red\s+r\s+g\s+b\s*\)/
+  ].every((regex) => regex.test(atRule.params));
 }
 var postcssWeappTailwindcssPrePlugin = (options) => {
   const opts = _shared.defu.call(void 0, options, { isMainChunk: true });
@@ -660,18 +664,31 @@ var postcssWeappTailwindcssPrePlugin = (options) => {
         } else {
           atRule.remove();
         }
-      } else if (isTailwindcssV4ModernCheck(atRule)) {
-        if (_optionalChain([atRule, 'access', _28 => _28.first, 'optionalAccess', _29 => _29.type]) === "atrule" && atRule.first.name === "layer") {
-          atRule.replaceWith(atRule.first.nodes);
-        }
       }
     }
   };
   if (opts.isMainChunk) {
+    let layerProperties;
     p.Once = (root) => {
       root.walkRules((rule) => {
         commonChunkPreflight(rule, opts);
       });
+      root.walkAtRules((atRule) => {
+        if (atRule.name === "layer" && atRule.params === "properties") {
+          if (atRule.nodes === void 0 || _optionalChain([atRule, 'access', _28 => _28.nodes, 'optionalAccess', _29 => _29.length]) === 0) {
+            layerProperties = atRule;
+          } else if (_optionalChain([atRule, 'access', _30 => _30.first, 'optionalAccess', _31 => _31.type]) === "atrule" && isTailwindcssV4ModernCheck(atRule.first)) {
+            if (layerProperties) {
+              layerProperties.replaceWith(atRule.first.nodes);
+              atRule.remove();
+            }
+          }
+        } else if (isTailwindcssV4ModernCheck(atRule)) {
+          if (_optionalChain([atRule, 'access', _32 => _32.first, 'optionalAccess', _33 => _33.type]) === "atrule" && atRule.first.name === "layer") {
+            atRule.replaceWith(atRule.first.nodes);
+          }
+        }
+      });
     };
   }
   return p;
@@ -687,7 +704,7 @@ function compare(e3, t2) {
   return e3.a === t2.a ? e3.b === t2.b ? e3.c - t2.c : e3.b - t2.b : e3.a - t2.a;
 }
 function selectorSpecificity(t2, s) {
-  const i = _optionalChain([s, 'optionalAccess', _30 => _30.customSpecificity, 'optionalCall', _31 => _31(t2)]);
+  const i = _optionalChain([s, 'optionalAccess', _34 => _34.customSpecificity, 'optionalCall', _35 => _35(t2)]);
   if (i) return i;
   if (!t2) return { a: 0, b: 0, c: 0 };
   let c = 0, n = 0, o2 = 0;
@@ -763,7 +780,7 @@ function selectorSpecificity(t2, s) {
     case ":active-view-transition-type":
       return { a: 0, b: 1, c: 0 };
   }
-  else _postcssselectorparser2.default.isContainer(t2) && _optionalChain([t2, 'access', _32 => _32.nodes, 'optionalAccess', _33 => _33.length]) > 0 && t2.nodes.forEach((e3) => {
+  else _postcssselectorparser2.default.isContainer(t2) && _optionalChain([t2, 'access', _36 => _36.nodes, 'optionalAccess', _37 => _37.length]) > 0 && t2.nodes.forEach((e3) => {
     const t3 = selectorSpecificity(e3, s);
     c += t3.a, n += t3.b, o2 += t3.c;
   });
@@ -791,8 +808,8 @@ function alwaysValidSelector(s) {
   const o2 = _postcssselectorparser2.default.call(void 0, ).astSync(s);
   let t2 = true;
   return o2.walk((e3) => {
-    if ("class" !== e3.type && "comment" !== e3.type && "id" !== e3.type && "root" !== e3.type && "selector" !== e3.type && "string" !== e3.type && "tag" !== e3.type && "universal" !== e3.type && ("attribute" !== e3.type || e3.insensitive) && ("combinator" !== e3.type || "+" !== e3.value && ">" !== e3.value && "~" !== e3.value && " " !== e3.value) && ("pseudo" !== e3.type || _optionalChain([e3, 'access', _34 => _34.nodes, 'optionalAccess', _35 => _35.length]) || ":hover" !== e3.value.toLowerCase() && ":focus" !== e3.value.toLowerCase())) {
-      if ("pseudo" === e3.type && 1 === _optionalChain([e3, 'access', _36 => _36.nodes, 'optionalAccess', _37 => _37.length]) && ":not" === e3.value.toLowerCase()) {
+    if ("class" !== e3.type && "comment" !== e3.type && "id" !== e3.type && "root" !== e3.type && "selector" !== e3.type && "string" !== e3.type && "tag" !== e3.type && "universal" !== e3.type && ("attribute" !== e3.type || e3.insensitive) && ("combinator" !== e3.type || "+" !== e3.value && ">" !== e3.value && "~" !== e3.value && " " !== e3.value) && ("pseudo" !== e3.type || _optionalChain([e3, 'access', _38 => _38.nodes, 'optionalAccess', _39 => _39.length]) || ":hover" !== e3.value.toLowerCase() && ":focus" !== e3.value.toLowerCase())) {
+      if ("pseudo" === e3.type && 1 === _optionalChain([e3, 'access', _40 => _40.nodes, 'optionalAccess', _41 => _41.length]) && ":not" === e3.value.toLowerCase()) {
         let s2 = true;
         if (e3.nodes[0].walkCombinators(() => {
           s2 = false;
@@ -904,8 +921,8 @@ function splitSelectors(o2, t2, n = 0) {
     if (_postcssselectorparser2.default.call(void 0, ).astSync(o3).walkPseudos((e3) => {
       if (":is" !== e3.value.toLowerCase() || !e3.nodes || !e3.nodes.length) return;
       if ("selector" === e3.nodes[0].type && 0 === e3.nodes[0].nodes.length) return;
-      if ("pseudo" === _optionalChain([e3, 'access', _38 => _38.parent, 'optionalAccess', _39 => _39.parent, 'optionalAccess', _40 => _40.type]) && ":not" === _optionalChain([e3, 'access', _41 => _41.parent, 'optionalAccess', _42 => _42.parent, 'optionalAccess', _43 => _43.value, 'optionalAccess', _44 => _44.toLowerCase, 'call', _45 => _45()])) return void i.push([{ start: e3.parent.parent.sourceIndex, end: e3.parent.parent.sourceIndex + e3.parent.parent.toString().length, option: `:not(${e3.nodes.toString()})` }]);
-      if ("pseudo" === _optionalChain([e3, 'access', _46 => _46.parent, 'optionalAccess', _47 => _47.parent, 'optionalAccess', _48 => _48.type]) && ":has" === _optionalChain([e3, 'access', _49 => _49.parent, 'optionalAccess', _50 => _50.parent, 'optionalAccess', _51 => _51.value, 'optionalAccess', _52 => _52.toLowerCase, 'call', _53 => _53()])) return void (e3.value = ":-csstools-matches");
+      if ("pseudo" === _optionalChain([e3, 'access', _42 => _42.parent, 'optionalAccess', _43 => _43.parent, 'optionalAccess', _44 => _44.type]) && ":not" === _optionalChain([e3, 'access', _45 => _45.parent, 'optionalAccess', _46 => _46.parent, 'optionalAccess', _47 => _47.value, 'optionalAccess', _48 => _48.toLowerCase, 'call', _49 => _49()])) return void i.push([{ start: e3.parent.parent.sourceIndex, end: e3.parent.parent.sourceIndex + e3.parent.parent.toString().length, option: `:not(${e3.nodes.toString()})` }]);
+      if ("pseudo" === _optionalChain([e3, 'access', _50 => _50.parent, 'optionalAccess', _51 => _51.parent, 'optionalAccess', _52 => _52.type]) && ":has" === _optionalChain([e3, 'access', _53 => _53.parent, 'optionalAccess', _54 => _54.parent, 'optionalAccess', _55 => _55.value, 'optionalAccess', _56 => _56.toLowerCase, 'call', _57 => _57()])) return void (e3.value = ":-csstools-matches");
       let o4 = e3.parent;
       for (; o4; ) {
         if (o4.value && ":is" === o4.value.toLowerCase() && "pseudo" === o4.type) return void (a = true);
@@ -927,7 +944,7 @@ function splitSelectors(o2, t2, n = 0) {
       let s = "";
       for (let t3 = 0; t3 < e3.length; t3++) {
         const n2 = e3[t3];
-        s += o3.substring(_optionalChain([e3, 'access', _54 => _54[t3 - 1], 'optionalAccess', _55 => _55.end]) || 0, e3[t3].start), s += ":-csstools-matches(" + n2.option + ")", t3 === e3.length - 1 && (s += o3.substring(e3[t3].end));
+        s += o3.substring(_optionalChain([e3, 'access', _58 => _58[t3 - 1], 'optionalAccess', _59 => _59.end]) || 0, e3[t3].start), s += ":-csstools-matches(" + n2.option + ")", t3 === e3.length - 1 && (s += o3.substring(e3[t3].end));
       }
       c.push(s);
     }), a && n < 10 && (c = splitSelectors(c, t2, n + 1)), c;
@@ -988,7 +1005,7 @@ function getPlugins(options) {
   const ctx = createContext();
   options.ctx = ctx;
   const plugins = [
-    ..._nullishCoalesce(_optionalChain([options, 'access', _56 => _56.postcssOptions, 'optionalAccess', _57 => _57.plugins]), () => ( [])),
+    ..._nullishCoalesce(_optionalChain([options, 'access', _60 => _60.postcssOptions, 'optionalAccess', _61 => _61.plugins]), () => ( [])),
     postcssWeappTailwindcssPrePlugin(options),
     _postcsspresetenv2.default.call(void 0, options.cssPresetEnv)
   ];
@@ -1032,7 +1049,7 @@ function styleHandler(rawSource, options) {
     getPlugins(options)
   ).process(
     rawSource,
-    _nullishCoalesce(_optionalChain([options, 'access', _58 => _58.postcssOptions, 'optionalAccess', _59 => _59.options]), () => ( {
+    _nullishCoalesce(_optionalChain([options, 'access', _62 => _62.postcssOptions, 'optionalAccess', _63 => _63.options]), () => ( {
       from: void 0
     }))
   ).async();

package/dist/index.mjs

@@ -642,9 +642,13 @@ function commonChunkPreflight(node, options) {
 function isAtMediaHover(atRule) {
   return /media\(\s*hover\s*:\s*hover\s*\)/.test(atRule.name) || atRule.name === "media" && /\(\s*hover\s*:\s*hover\s*\)/.test(atRule.params);
 }
-var TAILWIND_V4_MODERN_REGEX = /^\(\(-webkit-hyphens:\s*none\)\s+and\s+\(not\s+\(margin-trim:\s*inline\)\)\)\s+or\s+\(\(-moz-orient:\s*inline\)\s+and\s+\(not\s+\(color:\s*rgb\(from\s+red\s+r\s+g\s+b\)\)\)\)$/;
 function isTailwindcssV4ModernCheck(atRule) {
-  return atRule.name === "supports" && TAILWIND_V4_MODERN_REGEX.test(atRule.params);
+  return atRule.name === "supports" && [
+    /-webkit-hyphens\s*:\s*none/,
+    /margin-trim\s*:\s*inline/,
+    /-moz-orient\s*:\s*inline/,
+    /color\s*:\s*rgb\(\s*from\s+red\s+r\s+g\s+b\s*\)/
+  ].every((regex) => regex.test(atRule.params));
 }
 var postcssWeappTailwindcssPrePlugin = (options) => {
   const opts = defu2(options, { isMainChunk: true });
@@ -660,18 +664,31 @@ var postcssWeappTailwindcssPrePlugin = (options) => {
         } else {
           atRule.remove();
         }
-      } else if (isTailwindcssV4ModernCheck(atRule)) {
-        if (atRule.first?.type === "atrule" && atRule.first.name === "layer") {
-          atRule.replaceWith(atRule.first.nodes);
-        }
       }
     }
   };
   if (opts.isMainChunk) {
+    let layerProperties;
     p.Once = (root) => {
       root.walkRules((rule) => {
         commonChunkPreflight(rule, opts);
       });
+      root.walkAtRules((atRule) => {
+        if (atRule.name === "layer" && atRule.params === "properties") {
+          if (atRule.nodes === void 0 || atRule.nodes?.length === 0) {
+            layerProperties = atRule;
+          } else if (atRule.first?.type === "atrule" && isTailwindcssV4ModernCheck(atRule.first)) {
+            if (layerProperties) {
+              layerProperties.replaceWith(atRule.first.nodes);
+              atRule.remove();
+            }
+          }
+        } else if (isTailwindcssV4ModernCheck(atRule)) {
+          if (atRule.first?.type === "atrule" && atRule.first.name === "layer") {
+            atRule.replaceWith(atRule.first.nodes);
+          }
+        }
+      });
     };
   }
   return p;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@weapp-tailwindcss/postcss",
-  "version": "1.0.10-alpha.0",
+  "version": "1.0.10-alpha.2",
   "description": "@weapp-tailwindcss/postcss",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",