@weapp-tailwindcss/postcss 1.0.7 → 1.0.9

package/README.md

@@ -25,7 +25,7 @@
 >
 > 小程序原生工具链 `weapp-vite` 已经发布，使用它改善你的原生小程序开发体验吧，更多详见 [官方文档](https://vite.icebreaker.top/)
 
-\[[文档地址](https://tw.icebreaker.top)\] \| \[[加入技术交流群](https://tw.icebreaker.top/docs/community/group)\]
+\[[文档地址](https://tw.icebreaker.top)\] \| \[[备用文档地址](https://ice-tw.netlify.app/)\] \| \[[加入技术交流群](https://tw.icebreaker.top/docs/community/group)\]
 
 - [特性](#特性)
 - [版本对应](#版本对应)
@@ -56,7 +56,10 @@
 
 ## 版本对应
 
-目前，`weapp-tailwindcss` 的 `2.x` 和 `3.x` 支持最新版本的 `tailwindcss v3.x.x` 版本和 `webpack5`，`webpack4`, `vite` 和 `gulp`。从 `3.2.0` 开始，`weapp-tailwindcss` 支持最原生的小程序开发方式。
+目前，`weapp-tailwindcss` 的 `4.x` 版本
+
+- 支持最新版本的 `tailwindcss v4` 和 `v3` 还有 `v2 jit` 版本。
+- 支持 `webpack5`，`webpack4`, `vite` 和 `gulp` 这些打包工具，也支持纯 `Nodejs` API 的方式，集成到你自己的构建工具中。
 
 > 如果你还在使用 `tailwindcss@2` 版本，那你应该使用从 `weapp-tailwindcss/webpack4` 导出的本插件的 `postcss7` `webpack4` 版本。另外请确保你的 `nodejs` 版本 `>=16.6.0`。目前低于 `16` 的长期维护版本(`偶数版本`) 都已经结束了生命周期，建议安装 `nodejs` 的 `LTS` 版本，详见 [nodejs/release](https://github.com/nodejs/release)
 

package/dist/index.d.mts

@@ -1,5 +1,5 @@
-import { I as IStyleHandlerOptions, a as InternalCssSelectorReplacerOptions } from './types-DiXihH4o.mjs';
-export { d as CssPreflightOptions, C as CustomRuleCallback, b as IPropValue, L as LoadedPostcssOptions, R as RequiredStyleHandlerOptions, U as UserDefinedPostcssOptions, c as createInjectPreflight } from './types-DiXihH4o.mjs';
+import { I as IStyleHandlerOptions, a as InternalCssSelectorReplacerOptions } from './types-PPOinWpH.mjs';
+export { d as CssPreflightOptions, C as CustomRuleCallback, b as IPropValue, L as LoadedPostcssOptions, R as RequiredStyleHandlerOptions, U as UserDefinedPostcssOptions, c as createInjectPreflight } from './types-PPOinWpH.mjs';
 import postcss from 'postcss';
 import '@weapp-tailwindcss/mangle';
 import 'postcss-load-config';

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { I as IStyleHandlerOptions, a as InternalCssSelectorReplacerOptions } from './types-DiXihH4o.js';
-export { d as CssPreflightOptions, C as CustomRuleCallback, b as IPropValue, L as LoadedPostcssOptions, R as RequiredStyleHandlerOptions, U as UserDefinedPostcssOptions, c as createInjectPreflight } from './types-DiXihH4o.js';
+import { I as IStyleHandlerOptions, a as InternalCssSelectorReplacerOptions } from './types-PPOinWpH.js';
+export { d as CssPreflightOptions, C as CustomRuleCallback, b as IPropValue, L as LoadedPostcssOptions, R as RequiredStyleHandlerOptions, U as UserDefinedPostcssOptions, c as createInjectPreflight } from './types-PPOinWpH.js';
 import postcss from 'postcss';
 import '@weapp-tailwindcss/mangle';
 import 'postcss-load-config';

package/dist/index.js

@@ -20,7 +20,8 @@ function getDefaultOptions() {
       autoprefixer: {
         add: false
       }
-    }
+    },
+    cssRemoveProperty: true
   };
 }
 
@@ -44,6 +45,9 @@ function createContext() {
   };
 }
 
+// src/plugins/post.ts
+
+
 // src/constants.ts
 var postcssPlugin = "postcss-weapp-tailwindcss-rename-plugin";
 
@@ -289,14 +293,14 @@ function getFallbackRemove(rule) {
 
 // src/plugins/post.ts
 var OklabSuffix = "in oklab";
-var postcssWeappTailwindcssPostPlugin = (options = {
-  isMainChunk: true
-}) => {
-  const { customRuleCallback, isMainChunk } = options;
+var postcssWeappTailwindcssPostPlugin = (options) => {
+  const opts = _shared.defu.call(void 0, options, {
+    isMainChunk: true
+  });
   const p = {
     postcssPlugin
   };
-  if (isMainChunk) {
+  if (opts.isMainChunk) {
     p.OnceExit = (root) => {
       root.walkRules((rule) => {
         getFallbackRemove(rule).transformSync(rule, {
@@ -312,17 +316,23 @@ var postcssWeappTailwindcssPostPlugin = (options = {
           }
         });
       });
+      opts.cssRemoveProperty && root.walkAtRules("property", (rule) => {
+        rule.remove();
+      });
     };
   }
-  if (typeof customRuleCallback === "function") {
+  if (typeof opts.customRuleCallback === "function") {
     p.Rule = (rule) => {
-      customRuleCallback(rule, options);
+      _optionalChain([opts, 'access', _24 => _24.customRuleCallback, 'optionalCall', _25 => _25(rule, opts)]);
     };
   }
   return p;
 };
 postcssWeappTailwindcssPostPlugin.postcss = true;
 
+// src/plugins/pre.ts
+
+
 // src/mp.ts
 
 
@@ -607,7 +617,7 @@ function remakeCssVarSelector(selectors, options) {
 function commonChunkPreflight(node, options) {
   const { ctx, cssInjectPreflight, injectAdditionalCssVarScope } = options;
   if (testIfVariablesScope(node)) {
-    _optionalChain([ctx, 'optionalAccess', _24 => _24.markVariablesScope, 'call', _25 => _25(node)]);
+    _optionalChain([ctx, 'optionalAccess', _26 => _26.markVariablesScope, 'call', _27 => _27(node)]);
     node.selectors = remakeCssVarSelector(node.selectors, options);
     node.before(makePseudoVarRule());
     if (typeof cssInjectPreflight === "function") {
@@ -632,14 +642,15 @@ 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 postcssWeappTailwindcssPrePlugin = (options = {
-  isMainChunk: true
-}) => {
-  const { isMainChunk } = options;
+function isTailwindcssV4ModerCheck(atRule) {
+  return atRule.name === "supports" && atRule.params === "((-webkit-hyphens: none) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color:rgb(from red r g b))))";
+}
+var postcssWeappTailwindcssPrePlugin = (options) => {
+  const opts = _shared.defu.call(void 0, options, { isMainChunk: true });
   const p = {
     postcssPlugin,
     Rule(rule) {
-      ruleTransformSync(rule, options);
+      ruleTransformSync(rule, opts);
     },
     AtRule(atRule) {
       if (isAtMediaHover(atRule)) {
@@ -648,13 +659,17 @@ var postcssWeappTailwindcssPrePlugin = (options = {
         } else {
           atRule.remove();
         }
+      } else if (isTailwindcssV4ModerCheck(atRule)) {
+        if (_optionalChain([atRule, 'access', _28 => _28.first, 'optionalAccess', _29 => _29.type]) === "atrule" && atRule.first.name === "layer") {
+          atRule.replaceWith(atRule.first.nodes);
+        }
       }
     }
   };
-  if (isMainChunk) {
+  if (opts.isMainChunk) {
     p.Once = (root) => {
       root.walkRules((rule) => {
-        commonChunkPreflight(rule, options);
+        commonChunkPreflight(rule, opts);
       });
     };
   }
@@ -671,7 +686,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', _26 => _26.customSpecificity, 'optionalCall', _27 => _27(t2)]);
+  const i = _optionalChain([s, 'optionalAccess', _30 => _30.customSpecificity, 'optionalCall', _31 => _31(t2)]);
   if (i) return i;
   if (!t2) return { a: 0, b: 0, c: 0 };
   let c = 0, n = 0, o2 = 0;
@@ -747,7 +762,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', _28 => _28.nodes, 'optionalAccess', _29 => _29.length]) > 0 && t2.nodes.forEach((e3) => {
+  else _postcssselectorparser2.default.isContainer(t2) && _optionalChain([t2, 'access', _32 => _32.nodes, 'optionalAccess', _33 => _33.length]) > 0 && t2.nodes.forEach((e3) => {
     const t3 = selectorSpecificity(e3, s);
     c += t3.a, n += t3.b, o2 += t3.c;
   });
@@ -775,8 +790,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', _30 => _30.nodes, 'optionalAccess', _31 => _31.length]) || ":hover" !== e3.value.toLowerCase() && ":focus" !== e3.value.toLowerCase())) {
-      if ("pseudo" === e3.type && 1 === _optionalChain([e3, 'access', _32 => _32.nodes, 'optionalAccess', _33 => _33.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', _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()) {
         let s2 = true;
         if (e3.nodes[0].walkCombinators(() => {
           s2 = false;
@@ -888,8 +903,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', _34 => _34.parent, 'optionalAccess', _35 => _35.parent, 'optionalAccess', _36 => _36.type]) && ":not" === _optionalChain([e3, 'access', _37 => _37.parent, 'optionalAccess', _38 => _38.parent, 'optionalAccess', _39 => _39.value, 'optionalAccess', _40 => _40.toLowerCase, 'call', _41 => _41()])) 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', _42 => _42.parent, 'optionalAccess', _43 => _43.parent, 'optionalAccess', _44 => _44.type]) && ":has" === _optionalChain([e3, 'access', _45 => _45.parent, 'optionalAccess', _46 => _46.parent, 'optionalAccess', _47 => _47.value, 'optionalAccess', _48 => _48.toLowerCase, 'call', _49 => _49()])) return void (e3.value = ":-csstools-matches");
+      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");
       let o4 = e3.parent;
       for (; o4; ) {
         if (o4.value && ":is" === o4.value.toLowerCase() && "pseudo" === o4.type) return void (a = true);
@@ -911,7 +926,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', _50 => _50[t3 - 1], 'optionalAccess', _51 => _51.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', _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));
       }
       c.push(s);
     }), a && n < 10 && (c = splitSelectors(c, t2, n + 1)), c;
@@ -972,7 +987,7 @@ function getPlugins(options) {
   const ctx = createContext();
   options.ctx = ctx;
   const plugins = [
-    ..._nullishCoalesce(_optionalChain([options, 'access', _52 => _52.postcssOptions, 'optionalAccess', _53 => _53.plugins]), () => ( [])),
+    ..._nullishCoalesce(_optionalChain([options, 'access', _56 => _56.postcssOptions, 'optionalAccess', _57 => _57.plugins]), () => ( [])),
     postcssWeappTailwindcssPrePlugin(options),
     _postcsspresetenv2.default.call(void 0, options.cssPresetEnv)
   ];
@@ -1016,7 +1031,7 @@ function styleHandler(rawSource, options) {
     getPlugins(options)
   ).process(
     rawSource,
-    _nullishCoalesce(_optionalChain([options, 'access', _54 => _54.postcssOptions, 'optionalAccess', _55 => _55.options]), () => ( {
+    _nullishCoalesce(_optionalChain([options, 'access', _58 => _58.postcssOptions, 'optionalAccess', _59 => _59.options]), () => ( {
       from: void 0
     }))
   ).async();

package/dist/index.mjs

@@ -20,7 +20,8 @@ function getDefaultOptions() {
       autoprefixer: {
         add: false
       }
-    }
+    },
+    cssRemoveProperty: true
   };
 }
 
@@ -44,6 +45,9 @@ function createContext() {
   };
 }
 
+// src/plugins/post.ts
+import { defu } from "@weapp-tailwindcss/shared";
+
 // src/constants.ts
 var postcssPlugin = "postcss-weapp-tailwindcss-rename-plugin";
 
@@ -289,14 +293,14 @@ function getFallbackRemove(rule) {
 
 // src/plugins/post.ts
 var OklabSuffix = "in oklab";
-var postcssWeappTailwindcssPostPlugin = (options = {
-  isMainChunk: true
-}) => {
-  const { customRuleCallback, isMainChunk } = options;
+var postcssWeappTailwindcssPostPlugin = (options) => {
+  const opts = defu(options, {
+    isMainChunk: true
+  });
   const p = {
     postcssPlugin
   };
-  if (isMainChunk) {
+  if (opts.isMainChunk) {
     p.OnceExit = (root) => {
       root.walkRules((rule) => {
         getFallbackRemove(rule).transformSync(rule, {
@@ -312,17 +316,23 @@ var postcssWeappTailwindcssPostPlugin = (options = {
           }
         });
       });
+      opts.cssRemoveProperty && root.walkAtRules("property", (rule) => {
+        rule.remove();
+      });
     };
   }
-  if (typeof customRuleCallback === "function") {
+  if (typeof opts.customRuleCallback === "function") {
     p.Rule = (rule) => {
-      customRuleCallback(rule, options);
+      opts.customRuleCallback?.(rule, opts);
     };
   }
   return p;
 };
 postcssWeappTailwindcssPostPlugin.postcss = true;
 
+// src/plugins/pre.ts
+import { defu as defu2 } from "@weapp-tailwindcss/shared";
+
 // src/mp.ts
 import { Declaration, Rule } from "postcss";
 
@@ -632,14 +642,15 @@ 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 postcssWeappTailwindcssPrePlugin = (options = {
-  isMainChunk: true
-}) => {
-  const { isMainChunk } = options;
+function isTailwindcssV4ModerCheck(atRule) {
+  return atRule.name === "supports" && atRule.params === "((-webkit-hyphens: none) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color:rgb(from red r g b))))";
+}
+var postcssWeappTailwindcssPrePlugin = (options) => {
+  const opts = defu2(options, { isMainChunk: true });
   const p = {
     postcssPlugin,
     Rule(rule) {
-      ruleTransformSync(rule, options);
+      ruleTransformSync(rule, opts);
     },
     AtRule(atRule) {
       if (isAtMediaHover(atRule)) {
@@ -648,13 +659,17 @@ var postcssWeappTailwindcssPrePlugin = (options = {
         } else {
           atRule.remove();
         }
+      } else if (isTailwindcssV4ModerCheck(atRule)) {
+        if (atRule.first?.type === "atrule" && atRule.first.name === "layer") {
+          atRule.replaceWith(atRule.first.nodes);
+        }
       }
     }
   };
-  if (isMainChunk) {
+  if (opts.isMainChunk) {
     p.Once = (root) => {
       root.walkRules((rule) => {
-        commonChunkPreflight(rule, options);
+        commonChunkPreflight(rule, opts);
       });
     };
   }

package/dist/{types-DiXihH4o.d.mts → types-PPOinWpH.d.mts}

@@ -41,6 +41,7 @@ type IStyleHandlerOptions = {
     mangleContext?: IMangleScopeContext;
     ctx?: IContext;
     postcssOptions?: LoadedPostcssOptions;
+    cssRemoveProperty?: boolean;
     cssRemoveHoverPseudoClass?: boolean;
     cssPresetEnv?: pluginOptions;
 } & RequiredStyleHandlerOptions;
@@ -57,6 +58,7 @@ interface UserDefinedPostcssOptions {
     rem2rpx?: boolean | UserDefinedOptions;
     postcssOptions?: LoadedPostcssOptions;
     cssRemoveHoverPseudoClass?: boolean;
+    cssRemoveProperty?: boolean;
     customRuleCallback?: CustomRuleCallback;
 }
 

package/dist/{types-DiXihH4o.d.ts → types-PPOinWpH.d.ts}

@@ -41,6 +41,7 @@ type IStyleHandlerOptions = {
     mangleContext?: IMangleScopeContext;
     ctx?: IContext;
     postcssOptions?: LoadedPostcssOptions;
+    cssRemoveProperty?: boolean;
     cssRemoveHoverPseudoClass?: boolean;
     cssPresetEnv?: pluginOptions;
 } & RequiredStyleHandlerOptions;
@@ -57,6 +58,7 @@ interface UserDefinedPostcssOptions {
     rem2rpx?: boolean | UserDefinedOptions;
     postcssOptions?: LoadedPostcssOptions;
     cssRemoveHoverPseudoClass?: boolean;
+    cssRemoveProperty?: boolean;
     customRuleCallback?: CustomRuleCallback;
 }
 

package/dist/types.d.mts

@@ -3,4 +3,4 @@ import 'postcss';
 import 'postcss-load-config';
 import 'postcss-preset-env';
 import 'postcss-rem-to-responsive-pixel';
-export { d as CssPreflightOptions, C as CustomRuleCallback, b as IPropValue, I as IStyleHandlerOptions, a as InternalCssSelectorReplacerOptions, L as LoadedPostcssOptions, R as RequiredStyleHandlerOptions, U as UserDefinedPostcssOptions } from './types-DiXihH4o.mjs';
+export { d as CssPreflightOptions, C as CustomRuleCallback, b as IPropValue, I as IStyleHandlerOptions, a as InternalCssSelectorReplacerOptions, L as LoadedPostcssOptions, R as RequiredStyleHandlerOptions, U as UserDefinedPostcssOptions } from './types-PPOinWpH.mjs';

package/dist/types.d.ts

@@ -3,4 +3,4 @@ import 'postcss';
 import 'postcss-load-config';
 import 'postcss-preset-env';
 import 'postcss-rem-to-responsive-pixel';
-export { d as CssPreflightOptions, C as CustomRuleCallback, b as IPropValue, I as IStyleHandlerOptions, a as InternalCssSelectorReplacerOptions, L as LoadedPostcssOptions, R as RequiredStyleHandlerOptions, U as UserDefinedPostcssOptions } from './types-DiXihH4o.js';
+export { d as CssPreflightOptions, C as CustomRuleCallback, b as IPropValue, I as IStyleHandlerOptions, a as InternalCssSelectorReplacerOptions, L as LoadedPostcssOptions, R as RequiredStyleHandlerOptions, U as UserDefinedPostcssOptions } from './types-PPOinWpH.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@weapp-tailwindcss/postcss",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "description": "@weapp-tailwindcss/postcss",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -41,7 +41,7 @@
     "@weapp-tailwindcss/shared": "1.0.2"
   },
   "devDependencies": {
-    "@weapp-tailwindcss/mangle": "1.0.3"
+    "@weapp-tailwindcss/mangle": "1.0.4"
   },
   "scripts": {
     "dev": "tsup --watch --sourcemap",