weapp-tailwindcss 3.0.2 → 3.0.4

package/README.md

@@ -21,8 +21,12 @@
 [![test](https://github.com/sonofmagic/weapp-tailwindcss/actions/workflows/test.yml/badge.svg?branch=main)](https://github.com/sonofmagic/weapp-tailwindcss/actions/workflows/test.yml)
 [![codecov](https://codecov.io/gh/sonofmagic/weapp-tailwindcss/branch/main/graph/badge.svg?token=zn05qXYznt)](https://codecov.io/gh/sonofmagic/weapp-tailwindcss)
 
-> `小程序` + `tailwindcss` 全方面解决方案  
-> 想试试在小程序里使用 `CSS-in-JS` 思想？ 👉🏻👉🏻试试 [`weapp-pandacss`](https://github.com/sonofmagic/weapp-pandacss)
+> 降低开发维护成本，提升开发效率的 `小程序` `tailwindcss` 全方面解决方案
+>
+> 我的其他项目:  
+> `CSS UI` 生成器 [`@icestack/ui`](https://ui.icebreaker.top/zh-CN) 已经发布，快来用它管理你的`CSS` 组件吧！
+>
+> 想试试在小程序里使用**编译时**`CSS-in-JS` 工具？ 👉🏻👉🏻试试 [`weapp-pandacss`](https://github.com/sonofmagic/weapp-pandacss)
 
 \[[国内部署的文档地址](https://weapp-tw.icebreaker.top)\] \| \[[备用Github Page](https://sonofmagic.github.io/weapp-tailwindcss/)\] \| \[[1.x文档]('./v1.md')\]
 

package/dist/bundlers/webpack/BaseUnifiedPlugin/v4.d.ts

@@ -0,0 +1,8 @@
+import type { Compiler } from 'webpack4';
+import type { AppType, UserDefinedOptions, InternalUserDefinedOptions, IBaseWebpackPlugin } from "../../../types";
+export declare class UnifiedWebpackPluginV4 implements IBaseWebpackPlugin {
+    options: InternalUserDefinedOptions;
+    appType?: AppType;
+    constructor(options?: UserDefinedOptions);
+    apply(compiler: Compiler): void;
+}

package/dist/cli.js

@@ -1,6 +1,8 @@
 'use strict';
 
-var options = require('./options-5eiKwcXx.js');
+var semver = require('semver');
+var options = require('./options-N9g3FpWO.js');
+var index = require('./index-Fkmyt0Rc.js');
 require('magic-string');
 require('./replace.js');
 require('@weapp-core/escape');
@@ -15,20 +17,27 @@ require('./defu-KWuJnZLV.js');
 require('@babel/types');
 require('htmlparser2');
 require('postcss');
-require('./postcss-zkCNv4BC.js');
-require('@csstools/postcss-is-pseudo-class');
-require('postcss-rem-to-responsive-pixel');
-require('postcss-selector-parser');
 require('node:path');
 require('node:fs');
-require('semver');
 require('tailwindcss-patch');
 require('@tailwindcss-mangle/shared');
 require('lru-cache');
 require('md5');
+require('@csstools/postcss-is-pseudo-class');
+require('postcss-rem-to-responsive-pixel');
+require('postcss-selector-parser');
+
+function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
+
+var semver__default = /*#__PURE__*/_interopDefaultCompat(semver);
 
 const args = process.argv.slice(2);
-if (args[0] === 'patch') {
+if (semver__default["default"].lt(process.versions.node, index.WEAPP_TW_REQUIRED_NODE_VERSION)) {
+    console.error(`You are using Node.js ${process.versions.node}. For weapp-tailwindcss, Node.js version >= v${index.WEAPP_TW_REQUIRED_NODE_VERSION} is required.`);
+    process.exit(1);
+}
+const command = args[0];
+if (command === 'patch') {
     const options$1 = options.getOptions();
     const patch = options.createPatch(options$1.supportCustomLengthUnitsPatch);
     patch();

package/dist/cli.mjs

@@ -1,4 +1,6 @@
-import { g as getOptions, c as createPatch } from './options-UXRHB24i.mjs';
+import semver from 'semver';
+import { g as getOptions, a as createPatch } from './options-6YPFqoRJ.mjs';
+import { W as WEAPP_TW_REQUIRED_NODE_VERSION } from './index-_74RBzwy.mjs';
 import 'magic-string';
 import './replace.mjs';
 import '@weapp-core/escape';
@@ -13,20 +15,23 @@ import './defu-ms_ZBCiB.mjs';
 import '@babel/types';
 import 'htmlparser2';
 import 'postcss';
-import './postcss-irzTcRfl.mjs';
-import '@csstools/postcss-is-pseudo-class';
-import 'postcss-rem-to-responsive-pixel';
-import 'postcss-selector-parser';
 import 'node:path';
 import 'node:fs';
-import 'semver';
 import 'tailwindcss-patch';
 import '@tailwindcss-mangle/shared';
 import 'lru-cache';
 import 'md5';
+import '@csstools/postcss-is-pseudo-class';
+import 'postcss-rem-to-responsive-pixel';
+import 'postcss-selector-parser';
 
 const args = process.argv.slice(2);
-if (args[0] === 'patch') {
+if (semver.lt(process.versions.node, WEAPP_TW_REQUIRED_NODE_VERSION)) {
+    console.error(`You are using Node.js ${process.versions.node}. For weapp-tailwindcss, Node.js version >= v${WEAPP_TW_REQUIRED_NODE_VERSION} is required.`);
+    process.exit(1);
+}
+const command = args[0];
+if (command === 'patch') {
     const options = getOptions();
     const patch = createPatch(options.supportCustomLengthUnitsPatch);
     patch();

package/dist/constants.d.ts

@@ -4,3 +4,4 @@ export declare const ManglePluginHooks = "ManglePluginHooks";
 export declare const WeappTailwindcssWebpackPluginOptimizeChunkAssetsHooks = "WeappTailwindcssWebpackPluginOptimizeChunkAssetsHooks";
 export declare const pluginName = "weapp-tailwindcss-webpack-plugin";
 export declare const vitePluginName = "vite-plugin-uni-app-weapp-tailwindcss-adaptor";
+export declare const WEAPP_TW_REQUIRED_NODE_VERSION = "16.6.0";

package/dist/core.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var options = require('./options-5eiKwcXx.js');
+var options = require('./options-N9g3FpWO.js');
 require('magic-string');
 require('./replace.js');
 require('@weapp-core/escape');
@@ -17,7 +17,7 @@ require('./defu-KWuJnZLV.js');
 require('@babel/types');
 require('htmlparser2');
 require('postcss');
-require('./postcss-zkCNv4BC.js');
+require('./index-Fkmyt0Rc.js');
 require('@csstools/postcss-is-pseudo-class');
 require('postcss-rem-to-responsive-pixel');
 require('postcss-selector-parser');

package/dist/core.mjs

@@ -1,4 +1,4 @@
-import { g as getOptions, a as createTailwindcssPatcher, _ as __awaiter } from './options-UXRHB24i.mjs';
+import { g as getOptions, c as createTailwindcssPatcher, _ as __awaiter } from './options-6YPFqoRJ.mjs';
 import 'magic-string';
 import './replace.mjs';
 import '@weapp-core/escape';
@@ -13,7 +13,7 @@ import './defu-ms_ZBCiB.mjs';
 import '@babel/types';
 import 'htmlparser2';
 import 'postcss';
-import './postcss-irzTcRfl.mjs';
+import './index-_74RBzwy.mjs';
 import '@csstools/postcss-is-pseudo-class';
 import 'postcss-rem-to-responsive-pixel';
 import 'postcss-selector-parser';

package/dist/css-macro/index.js

@@ -4,7 +4,7 @@ var plugin = require('tailwindcss/plugin');
 var constants = require('../constants-EVxkHOXL.js');
 var defu = require('../defu-KWuJnZLV.js');
 
-function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
 
 var plugin__default = /*#__PURE__*/_interopDefaultCompat(plugin);
 

package/dist/gulp.js

@@ -2,8 +2,8 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var options = require('./options-5eiKwcXx.js');
-var stream = require('node:stream');
+var index = require('./index-8OJKpYld.js');
+require('./options-N9g3FpWO.js');
 require('magic-string');
 require('./replace.js');
 require('@weapp-core/escape');
@@ -18,7 +18,7 @@ require('./defu-KWuJnZLV.js');
 require('@babel/types');
 require('htmlparser2');
 require('postcss');
-require('./postcss-zkCNv4BC.js');
+require('./index-Fkmyt0Rc.js');
 require('@csstools/postcss-is-pseudo-class');
 require('postcss-rem-to-responsive-pixel');
 require('postcss-selector-parser');
@@ -29,69 +29,8 @@ require('tailwindcss-patch');
 require('@tailwindcss-mangle/shared');
 require('lru-cache');
 require('md5');
+require('node:stream');
 
-function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
-var stream__default = /*#__PURE__*/_interopDefaultCompat(stream);
 
-const Transform = stream__default["default"].Transform;
-function createPlugins(options$1 = {}) {
-    const opts = options.getOptions(options$1);
-    const { templateHandler, styleHandler, patch, jsHandler, setMangleRuntimeSet, tailwindcssBasedir } = opts;
-    let runtimeSet = new Set();
-    patch === null || patch === void 0 ? void 0 : patch();
-    const twPatcher = options.createTailwindcssPatcher();
-    function transformWxss() {
-        const transformStream = new Transform({ objectMode: true });
-        transformStream._transform = function (file, encoding, callback) {
-            return options.__awaiter(this, void 0, void 0, function* () {
-                runtimeSet = twPatcher.getClassSet({
-                    basedir: tailwindcssBasedir
-                });
-                setMangleRuntimeSet(runtimeSet);
-                const error = null;
-                if (file.contents) {
-                    const code = yield styleHandler(file.contents.toString(), {
-                        isMainChunk: true
-                    });
-                    file.contents = Buffer.from(code);
-                }
-                callback(error, file);
-            });
-        };
-        return transformStream;
-    }
-    function transformJs() {
-        const transformStream = new Transform({ objectMode: true });
-        transformStream._transform = function (file, encoding, callback) {
-            const error = null;
-            if (file.contents) {
-                const { code } = jsHandler(file.contents.toString(), runtimeSet);
-                file.contents = Buffer.from(code);
-            }
-            callback(error, file);
-        };
-        return transformStream;
-    }
-    function transformWxml() {
-        const transformStream = new Transform({ objectMode: true });
-        transformStream._transform = function (file, encoding, callback) {
-            const error = null;
-            if (file.contents) {
-                const code = templateHandler(file.contents.toString(), {
-                    runtimeSet
-                });
-                file.contents = Buffer.from(code);
-            }
-            callback(error, file);
-        };
-        return transformStream;
-    }
-    return {
-        transformWxss,
-        transformWxml,
-        transformJs
-    };
-}
-
-exports.createPlugins = createPlugins;
+exports.createPlugins = index.createPlugins;

package/dist/gulp.mjs

@@ -1,5 +1,5 @@
-import { g as getOptions, a as createTailwindcssPatcher, _ as __awaiter } from './options-UXRHB24i.mjs';
-import stream from 'node:stream';
+export { c as createPlugins } from './index-u-U9HdG6.mjs';
+import './options-6YPFqoRJ.mjs';
 import 'magic-string';
 import './replace.mjs';
 import '@weapp-core/escape';
@@ -14,7 +14,7 @@ import './defu-ms_ZBCiB.mjs';
 import '@babel/types';
 import 'htmlparser2';
 import 'postcss';
-import './postcss-irzTcRfl.mjs';
+import './index-_74RBzwy.mjs';
 import '@csstools/postcss-is-pseudo-class';
 import 'postcss-rem-to-responsive-pixel';
 import 'postcss-selector-parser';
@@ -25,65 +25,4 @@ import 'tailwindcss-patch';
 import '@tailwindcss-mangle/shared';
 import 'lru-cache';
 import 'md5';
-
-const Transform = stream.Transform;
-function createPlugins(options = {}) {
-    const opts = getOptions(options);
-    const { templateHandler, styleHandler, patch, jsHandler, setMangleRuntimeSet, tailwindcssBasedir } = opts;
-    let runtimeSet = new Set();
-    patch === null || patch === void 0 ? void 0 : patch();
-    const twPatcher = createTailwindcssPatcher();
-    function transformWxss() {
-        const transformStream = new Transform({ objectMode: true });
-        transformStream._transform = function (file, encoding, callback) {
-            return __awaiter(this, void 0, void 0, function* () {
-                runtimeSet = twPatcher.getClassSet({
-                    basedir: tailwindcssBasedir
-                });
-                setMangleRuntimeSet(runtimeSet);
-                const error = null;
-                if (file.contents) {
-                    const code = yield styleHandler(file.contents.toString(), {
-                        isMainChunk: true
-                    });
-                    file.contents = Buffer.from(code);
-                }
-                callback(error, file);
-            });
-        };
-        return transformStream;
-    }
-    function transformJs() {
-        const transformStream = new Transform({ objectMode: true });
-        transformStream._transform = function (file, encoding, callback) {
-            const error = null;
-            if (file.contents) {
-                const { code } = jsHandler(file.contents.toString(), runtimeSet);
-                file.contents = Buffer.from(code);
-            }
-            callback(error, file);
-        };
-        return transformStream;
-    }
-    function transformWxml() {
-        const transformStream = new Transform({ objectMode: true });
-        transformStream._transform = function (file, encoding, callback) {
-            const error = null;
-            if (file.contents) {
-                const code = templateHandler(file.contents.toString(), {
-                    runtimeSet
-                });
-                file.contents = Buffer.from(code);
-            }
-            callback(error, file);
-        };
-        return transformStream;
-    }
-    return {
-        transformWxss,
-        transformWxml,
-        transformJs
-    };
-}
-
-export { createPlugins };
+import 'node:stream';

package/dist/index-8OJKpYld.js

@@ -0,0 +1,70 @@
+'use strict';
+
+var options = require('./options-N9g3FpWO.js');
+var stream = require('node:stream');
+
+function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
+
+var stream__default = /*#__PURE__*/_interopDefaultCompat(stream);
+
+const Transform = stream__default["default"].Transform;
+function createPlugins(options$1 = {}) {
+    const opts = options.getOptions(options$1);
+    const { templateHandler, styleHandler, patch, jsHandler, setMangleRuntimeSet, tailwindcssBasedir } = opts;
+    let runtimeSet = new Set();
+    patch === null || patch === void 0 ? void 0 : patch();
+    const twPatcher = options.createTailwindcssPatcher();
+    function transformWxss() {
+        const transformStream = new Transform({ objectMode: true });
+        transformStream._transform = function (file, encoding, callback) {
+            return options.__awaiter(this, void 0, void 0, function* () {
+                runtimeSet = twPatcher.getClassSet({
+                    basedir: tailwindcssBasedir
+                });
+                setMangleRuntimeSet(runtimeSet);
+                const error = null;
+                if (file.contents) {
+                    const code = yield styleHandler(file.contents.toString(), {
+                        isMainChunk: true
+                    });
+                    file.contents = Buffer.from(code);
+                }
+                callback(error, file);
+            });
+        };
+        return transformStream;
+    }
+    function transformJs() {
+        const transformStream = new Transform({ objectMode: true });
+        transformStream._transform = function (file, encoding, callback) {
+            const error = null;
+            if (file.contents) {
+                const { code } = jsHandler(file.contents.toString(), runtimeSet);
+                file.contents = Buffer.from(code);
+            }
+            callback(error, file);
+        };
+        return transformStream;
+    }
+    function transformWxml() {
+        const transformStream = new Transform({ objectMode: true });
+        transformStream._transform = function (file, encoding, callback) {
+            const error = null;
+            if (file.contents) {
+                const code = templateHandler(file.contents.toString(), {
+                    runtimeSet
+                });
+                file.contents = Buffer.from(code);
+            }
+            callback(error, file);
+        };
+        return transformStream;
+    }
+    return {
+        transformWxss,
+        transformWxml,
+        transformJs
+    };
+}
+
+exports.createPlugins = createPlugins;

package/dist/{postcss-zkCNv4BC.js → index-Fkmyt0Rc.js}

@@ -6,13 +6,13 @@ var selectorParser = require('postcss-selector-parser');
 var shared = require('./shared-AxeHlAoJ.js');
 var postcss = require('postcss');
 
-function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
 
 var postcssIsPseudoClass__default = /*#__PURE__*/_interopDefaultCompat(postcssIsPseudoClass);
 var postcssRem2rpx__default = /*#__PURE__*/_interopDefaultCompat(postcssRem2rpx);
 var selectorParser__default = /*#__PURE__*/_interopDefaultCompat(selectorParser);
 
-const createTransform = (rule, options) => {
+const createRuleTransform = (rule, options) => {
     const { escapeMap, mangleContext, cssSelectorReplacement } = options;
     const transform = (selectors) => {
         selectors.walk((selector) => {
@@ -39,16 +39,45 @@ const createTransform = (rule, options) => {
     };
     return transform;
 };
-const getTransformer = (rule, options) => {
-    return selectorParser__default["default"](createTransform(rule, options));
+const getRuleTransformer = (rule, options) => {
+    return selectorParser__default["default"](createRuleTransform(rule, options));
 };
-const transformSync = (rule, options) => {
-    const transformer = getTransformer(rule, options);
+const ruleTransformSync = (rule, options) => {
+    const transformer = getRuleTransformer(rule, options);
     return transformer.transformSync(rule, {
         lossless: false,
         updateSelector: true
     });
 };
+function isOnlyBeforeAndAfterPseudoElement(node) {
+    let b = false;
+    let a = false;
+    selectorParser__default["default"]((selectors) => {
+        selectors.walkPseudos((s) => {
+            var _a;
+            if (((_a = s.parent) === null || _a === void 0 ? void 0 : _a.length) === 1) {
+                if (/^:?:before$/.test(s.value)) {
+                    b = true;
+                }
+                if (/^:?:after$/.test(s.value)) {
+                    a = true;
+                }
+            }
+        });
+    }).astSync(node);
+    return b && a;
+}
+const fallbackRemove = selectorParser__default["default"]((selectors) => {
+    selectors.walk((selector) => {
+        var _a, _b;
+        if (selector.type === 'universal') {
+            (_a = selector.parent) === null || _a === void 0 ? void 0 : _a.remove();
+        }
+        if (selector.type === 'pseudo' && selector.value === ':is') {
+            (_b = selector.parent) === null || _b === void 0 ? void 0 : _b.remove();
+        }
+    });
+});
 
 var cssVars = [
     {
@@ -241,8 +270,6 @@ var cssVars = [
     }
 ];
 
-const VariablesScopeSymbol = Symbol('VariablesScope');
-
 const initialNodes = cssVars.map((x) => {
     return new postcss.Declaration({
         prop: x.prop,
@@ -252,7 +279,7 @@ const initialNodes = cssVars.map((x) => {
 const PATTERNS = [/:not\(template\)\s*[~+]\s*:not\(template\)/.source, /:not\(\[hidden\]\)\s*[~+]\s*:not\(\[hidden\]\)/.source].join('|');
 const BROAD_MATCH_GLOBAL_REGEXP = new RegExp(PATTERNS, 'g');
 function testIfVariablesScope(node, count = 2) {
-    if (/:?:before/.test(node.selector) && /:?:after/.test(node.selector)) {
+    if (isOnlyBeforeAndAfterPseudoElement(node)) {
         const nodes = node.nodes;
         let c = 0;
         for (const tryTestDecl of nodes) {
@@ -329,7 +356,7 @@ function commonChunkPreflight(node, options) {
     const { ctx, cssChildCombinatorReplaceValue, cssInjectPreflight, injectAdditionalCssVarScope } = options;
     node.selector = remakeCombinatorSelector(node.selector, cssChildCombinatorReplaceValue);
     if (testIfVariablesScope(node)) {
-        ctx === null || ctx === void 0 ? void 0 : ctx.variablesScopeWeakMap.set(node, VariablesScopeSymbol);
+        ctx === null || ctx === void 0 ? void 0 : ctx.markVariablesScope(node);
         node.selectors = remakeCssVarSelector(node.selectors, options);
         node.before(makePseudoVarRule());
         if (typeof cssInjectPreflight === 'function') {
@@ -353,6 +380,7 @@ function commonChunkPreflight(node, options) {
 const postcssPlugin = 'postcss-weapp-tailwindcss-rename-plugin';
 const pluginName = 'weapp-tailwindcss-webpack-plugin';
 const vitePluginName = 'vite-plugin-uni-app-weapp-tailwindcss-adaptor';
+const WEAPP_TW_REQUIRED_NODE_VERSION = '16.6.0';
 
 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));
@@ -364,7 +392,7 @@ const postcssWeappTailwindcssPrePlugin = (options = {
     const p = {
         postcssPlugin,
         Rule(rule) {
-            transformSync(rule, options);
+            ruleTransformSync(rule, options);
         },
         AtRule(atRule) {
             if (isAtMediaHover(atRule)) {
@@ -384,17 +412,6 @@ const postcssWeappTailwindcssPrePlugin = (options = {
 };
 postcssWeappTailwindcssPrePlugin.postcss = true;
 
-const fallback = selectorParser__default["default"]((selectors) => {
-    selectors.walk((selector) => {
-        var _a, _b;
-        if (selector.type === 'universal') {
-            (_a = selector.parent) === null || _a === void 0 ? void 0 : _a.remove();
-        }
-        if (selector.type === 'pseudo' && selector.value === ':is') {
-            (_b = selector.parent) === null || _b === void 0 ? void 0 : _b.remove();
-        }
-    });
-});
 const postcssWeappTailwindcssPostPlugin = (options = {
     isMainChunk: true
 }) => {
@@ -406,15 +423,15 @@ const postcssWeappTailwindcssPostPlugin = (options = {
         p.OnceExit = (root) => {
             root.walkRules((rule) => {
                 if (ctx) {
-                    if (ctx.variablesScopeWeakMap.get(rule) === VariablesScopeSymbol) {
-                        fallback.transformSync(rule, {
+                    if (ctx.isVariablesScope(rule)) {
+                        fallbackRemove.transformSync(rule, {
                             updateSelector: true,
                             lossless: false
                         });
                     }
                 }
                 else if (testIfVariablesScope(rule)) {
-                    fallback.transformSync(rule, {
+                    fallbackRemove.transformSync(rule, {
                         updateSelector: true,
                         lossless: false
                     });
@@ -431,9 +448,20 @@ const postcssWeappTailwindcssPostPlugin = (options = {
 };
 postcssWeappTailwindcssPostPlugin.postcss = true;
 
+const VariablesScopeSymbol = Symbol('VariablesScope');
+
 function createContext() {
+    const variablesScopeWeakMap = new WeakMap();
+    function isVariablesScope(rule) {
+        return variablesScopeWeakMap.get(rule) === VariablesScopeSymbol;
+    }
+    function markVariablesScope(rule) {
+        variablesScopeWeakMap.set(rule, VariablesScopeSymbol);
+    }
     return {
-        variablesScopeWeakMap: new WeakMap()
+        variablesScopeWeakMap,
+        isVariablesScope,
+        markVariablesScope
     };
 }
 
@@ -459,6 +487,7 @@ function getPlugins(options) {
     return plugins;
 }
 
+exports.WEAPP_TW_REQUIRED_NODE_VERSION = WEAPP_TW_REQUIRED_NODE_VERSION;
 exports.getPlugins = getPlugins;
 exports.pluginName = pluginName;
 exports.postcssWeappTailwindcssPostPlugin = postcssWeappTailwindcssPostPlugin;