weapp-tailwindcss 2.9.1 → 2.9.3

package/README.md

@@ -24,7 +24,7 @@
 > `小程序` + `tailwindcss` 全方面解决方案  
 > 想试试在小程序里使用 `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)\]
+\[[国内部署的文档地址](https://weapp-tw.icebreaker.top)\] \| \[[备用Github Page](https://sonofmagic.github.io/weapp-tailwindcss/)\] \| \[[1.x文档]('./v1.md')\]
 
 - [Tips](#tips)
 - [特性](#特性)
@@ -43,13 +43,15 @@
     - [使用`hbuilderx` 进行构建和开发](#使用hbuilderx-进行构建和开发)
     - [使用`tarojs`进行构建 `vscode`开发](#使用tarojs进行构建-vscode开发)
     - [原生小程序开发模板](#原生小程序开发模板)
-  - [tailwindcss plugin](#tailwindcss-plugin)
-  - [tailwindcss preset](#tailwindcss-preset)
+  - [tailwindcss plugin / util](#tailwindcss-plugin--util)
+  - [weapp-pandacss](#weapp-pandacss)
 - [Bugs \& Issues](#bugs--issues)
 
 ## Tips
 
-自从 `2.3.3` 版本开始，我发布了一个额外的包叫 `weapp-tailwindcss`,它和 `weapp-tailwindcss-webpack-plugin` 代码版本完全一致，且保持发布版本的同步。以后可以都去安装 `weapp-tailwindcss` 这个包(当然现在 `webpack-plugin` 这个包也不会废弃，也会时刻保持版本的同步)。为什么要这么做的原因，主要是因为 `weapp-tailwindcss-webpack-plugin` 这个名字，已经不适合描述现在这种，多插件并存的状态了，为了以后的发展改个名字哈哈。
+自从 `2.3.3` 版本开始，我发布了一个额外的包叫 `weapp-tailwindcss`,它和 `weapp-tailwindcss-webpack-plugin` 代码版本完全一致，且保持发布版本的同步。以后可以都去安装 `weapp-tailwindcss` 这个包(当然现在 `webpack-plugin` 这个包也不会废弃，也会时刻保持版本的同步)。为什么要这么做的原因，主要是因为 `weapp-tailwindcss-webpack-plugin` 这个名字，已经不适合描述现在这种，多插件并存的状态了，为了以后的发展就改了个名字。
+
+前沿阅读: [What’s Tailwind Oxide Engine? The Next Evolution of Tailwind CSS](https://medium.com/@bomber.marek/whats-tailwind-oxide-engine-the-next-evolution-of-tailwind-css-32e7ef8e19a1)，未来 `tailwindcss` 会切换到这个引擎来大幅加快构建和运行速度，当然等它发布正式版本的时候，我也会尽可能第一时间去进行兼容新的引擎。
 
 ## 特性
 
@@ -63,7 +65,7 @@
 
 ### 插件介绍
 
-从 `weapp-tailwindcss/webpack` 导出的`UnifiedWebpackPluginV5` 是一个核心插件，所有使用 `webpack` 进行打包的框架都可以使用它。
+从 `weapp-tailwindcss/webpack` 导出的`UnifiedWebpackPluginV5` 是一个核心插件，所有使用 `webpack5` 进行打包的框架都可以使用它。
 
 从 `weapp-tailwindcss/vite` 导出的`UnifiedViteWeappTailwindcssPlugin` 为 `vite` 专用插件，配置项和使用方式和 `webpack` 插件是一致的。
 
@@ -121,13 +123,15 @@
 
 [weapp-native-mina-tailwindcss-template(webpack打包)](https://github.com/sonofmagic/weapp-native-mina-tailwindcss-template)
 
-### tailwindcss plugin
+### tailwindcss plugin / util
+
+- [css-to-tailwindcss-plugin](./packages/css-to-tailwindcss-plugin/) transform your `css/scss` to `tailwindcss plugin`
 
-[weapp-tailwindcss-children](https://github.com/sonofmagic/weapp-tailwindcss-children)
+- [weapp-tailwindcss-children](https://github.com/sonofmagic/weapp-tailwindcss-children)
 
-### tailwindcss preset
+### weapp-pandacss
 
-[tailwindcss-miniprogram-preset](https://github.com/sonofmagic/tailwindcss-miniprogram-preset)
+[weapp-pandacss](https://github.com/sonofmagic/weapp-pandacss) `CSS-in-JS` 编译时框架的小程序适配器
 
 ## Bugs & Issues
 

package/dist/cache/index.d.ts

@@ -18,10 +18,13 @@ export interface ICreateCacheReturnType {
     set: <V extends CacheValue = sources.Source>(key: string, value: V) => this['instance'];
     has: (key: string) => boolean;
     calcHashValueChanged: (key: HashMapKey, hash: string) => this;
-    process: (key: string, callback: () => void | false, fallback: () => void | {
+    process: (key: string, callback: () => void | false | Promise<void | false>, fallback: () => void | {
         key: string;
         source: CacheValue;
-    }) => void;
+    } | Promise<void | {
+        key: string;
+        source: CacheValue;
+    }>) => void | Promise<void>;
 }
 declare function createCache(): ICreateCacheReturnType;
 export { createCache };

package/dist/cli.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var options = require('./options-b96f6338.js');
+var options = require('./options-09ebba08.js');
 require('micromatch');
 require('magic-string');
 require('./replace.js');

package/dist/cli.mjs

@@ -1,4 +1,4 @@
-import { g as getOptions, c as createPatch } from './options-f70d1c6f.mjs';
+import { g as getOptions, c as createPatch } from './options-63407615.mjs';
 import 'micromatch';
 import 'magic-string';
 import './replace.mjs';

package/dist/gulp.js

@@ -2,8 +2,8 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var options = require('./options-09ebba08.js');
 var stream = require('node:stream');
-var options = require('./options-b96f6338.js');
 require('micromatch');
 require('magic-string');
 require('./replace.js');
@@ -39,23 +39,27 @@ function createPlugins(options$1 = {}) {
         options$1.customReplaceDictionary = 'simple';
     }
     const opts = options.getOptions(options$1);
-    const { templateHandler, styleHandler, patch, jsHandler, setMangleRuntimeSet } = opts;
+    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) {
-            runtimeSet = twPatcher.getClassSet();
-            setMangleRuntimeSet(runtimeSet);
-            const error = null;
-            if (file.contents) {
-                const code = styleHandler(file.contents.toString(), {
-                    isMainChunk: true
+            return options.__awaiter(this, void 0, void 0, function* () {
+                runtimeSet = twPatcher.getClassSet({
+                    basedir: tailwindcssBasedir
                 });
-                file.contents = Buffer.from(code);
-            }
-            callback(error, file);
+                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;
     }

package/dist/gulp.mjs

@@ -1,5 +1,5 @@
+import { g as getOptions, a as createTailwindcssPatcher, _ as __awaiter } from './options-63407615.mjs';
 import stream from 'node:stream';
-import { g as getOptions, a as createTailwindcssPatcher } from './options-f70d1c6f.mjs';
 import 'micromatch';
 import 'magic-string';
 import './replace.mjs';
@@ -31,23 +31,27 @@ function createPlugins(options = {}) {
         options.customReplaceDictionary = 'simple';
     }
     const opts = getOptions(options);
-    const { templateHandler, styleHandler, patch, jsHandler, setMangleRuntimeSet } = opts;
+    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) {
-            runtimeSet = twPatcher.getClassSet();
-            setMangleRuntimeSet(runtimeSet);
-            const error = null;
-            if (file.contents) {
-                const code = styleHandler(file.contents.toString(), {
-                    isMainChunk: true
+            return __awaiter(this, void 0, void 0, function* () {
+                runtimeSet = twPatcher.getClassSet({
+                    basedir: tailwindcssBasedir
                 });
-                file.contents = Buffer.from(code);
-            }
-            callback(error, file);
+                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;
     }

package/dist/index.js

@@ -5,9 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var webpack = require('./webpack.js');
 var vite = require('./vite.js');
 var gulp = require('./gulp.js');
-require('node:path');
-require('node:fs');
-require('./options-b96f6338.js');
+require('./options-09ebba08.js');
 require('micromatch');
 require('magic-string');
 require('./replace.js');
@@ -25,6 +23,8 @@ require('postcss');
 require('./postcss-8d7f67b4.js');
 require('postcss-selector-parser');
 require('@csstools/postcss-is-pseudo-class');
+require('node:path');
+require('node:fs');
 require('semver');
 require('tailwindcss-patch');
 require('@tailwindcss-mangle/shared');

package/dist/index.mjs

@@ -1,9 +1,7 @@
 export { UnifiedWebpackPluginV5 } from './webpack.mjs';
 export { UnifiedViteWeappTailwindcssPlugin } from './vite.mjs';
 export { createPlugins } from './gulp.mjs';
-import 'node:path';
-import 'node:fs';
-import './options-f70d1c6f.mjs';
+import './options-63407615.mjs';
 import 'micromatch';
 import 'magic-string';
 import './replace.mjs';
@@ -21,6 +19,8 @@ import 'postcss';
 import './postcss-55ed4d42.mjs';
 import 'postcss-selector-parser';
 import '@csstools/postcss-is-pseudo-class';
+import 'node:path';
+import 'node:fs';
 import 'semver';
 import 'tailwindcss-patch';
 import '@tailwindcss-mangle/shared';

package/dist/{options-b96f6338.js → options-09ebba08.js}

@@ -53,6 +53,38 @@ var path__default = /*#__PURE__*/_interopDefaultCompat(path);
 var fs__default = /*#__PURE__*/_interopDefaultCompat(fs);
 var md5__default = /*#__PURE__*/_interopDefaultCompat(md5);
 
+/******************************************************************************
+Copyright (c) Microsoft Corporation.
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+***************************************************************************** */
+/* global Reflect, Promise, SuppressedError, Symbol */
+
+
+function __awaiter(thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+}
+
+typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
+    var e = new Error(message);
+    return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
+};
+
 const validateFilterRE = /[\w%-?\u00A0-\uFFFF-]/;
 function isValidSelector(selector = '') {
     return validateFilterRE.test(selector);
@@ -326,6 +358,10 @@ function createJsHandler(options) {
     };
 }
 
+function getQuotes(quote) {
+    const quotes = quote === "'" ? 'double' : 'single';
+    return quotes;
+}
 function generateCode(match, options = {}) {
     const ast = parser.parseExpression(match);
     traverse__default["default"](ast, {
@@ -345,7 +381,7 @@ function generateCode(match, options = {}) {
         compact: true,
         minified: true,
         jsescOption: {
-            quotes: 'single',
+            quotes: getQuotes(options.quote),
             minimal: true
         }
     });
@@ -443,12 +479,8 @@ function customTemplateHandler(rawSource, options) {
         },
         onattribute(name, value, quote) {
             if (value) {
-                if (quote === "'") {
-                    s.update(parser.startIndex + name.length + 1, parser.startIndex + name.length + 2, '"');
-                    s.update(parser.startIndex + name.length + value.length + 2, parser.startIndex + name.length + value.length + 3, '"');
-                }
                 function update() {
-                    s.update(parser.startIndex + name.length + 2, parser.endIndex, templateReplacer(value, options));
+                    s.update(parser.startIndex + name.length + 2, parser.endIndex, templateReplacer(value, Object.assign(Object.assign({}, options), { quote })));
                 }
                 if (!disabledDefaultTemplateHandler && (name === 'class' || name === 'hover-class' || name === 'virtualhostclass')) {
                     update();
@@ -491,7 +523,11 @@ function createTemplateHandler(options = {}) {
 }
 
 function styleHandler(rawSource, options) {
-    return postcss__default["default"]([postcssIsPseudoClass__default["default"](), postcss$1.postcssWeappTailwindcss(options)]).process(rawSource).css;
+    return __awaiter(this, void 0, void 0, function* () {
+        return (yield postcss__default["default"]([postcssIsPseudoClass__default["default"](), postcss$1.postcssWeappTailwindcss(options)])
+            .process(rawSource)
+            .async()).css;
+    });
 }
 function createStyleHandler(options) {
     return (rawSource, opt) => {
@@ -748,17 +784,19 @@ function createCache() {
             return instance.has(key);
         },
         process(key, callback, fallback) {
-            const hit = this.getHashValue(key);
-            if (hit && !hit.changed) {
-                const returnFlag = callback();
-                if (returnFlag !== false) {
-                    return;
+            return __awaiter(this, void 0, void 0, function* () {
+                const hit = this.getHashValue(key);
+                if (hit && !hit.changed) {
+                    const returnFlag = yield callback();
+                    if (returnFlag !== false) {
+                        return;
+                    }
                 }
-            }
-            const res = fallback();
-            if (res) {
-                this.set(res.key, res.source);
-            }
+                const res = yield fallback();
+                if (res) {
+                    this.set(res.key, res.source);
+                }
+            });
         }
     };
 }
@@ -837,6 +875,7 @@ function getOptions(options = {}) {
     return result;
 }
 
+exports.__awaiter = __awaiter;
 exports.createPatch = createPatch;
 exports.createTailwindcssPatcher = createTailwindcssPatcher;
 exports.getOptions = getOptions;

package/dist/{options-f70d1c6f.mjs → options-63407615.mjs}

@@ -21,6 +21,38 @@ import { ClassGenerator, defaultMangleClassFilter } from '@tailwindcss-mangle/sh
 import { LRUCache } from 'lru-cache';
 import md5 from 'md5';
 
+/******************************************************************************
+Copyright (c) Microsoft Corporation.
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+***************************************************************************** */
+/* global Reflect, Promise, SuppressedError, Symbol */
+
+
+function __awaiter(thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+}
+
+typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
+    var e = new Error(message);
+    return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
+};
+
 const validateFilterRE = /[\w%-?\u00A0-\uFFFF-]/;
 function isValidSelector(selector = '') {
     return validateFilterRE.test(selector);
@@ -294,6 +326,10 @@ function createJsHandler(options) {
     };
 }
 
+function getQuotes(quote) {
+    const quotes = quote === "'" ? 'double' : 'single';
+    return quotes;
+}
 function generateCode(match, options = {}) {
     const ast = parseExpression(match);
     traverse(ast, {
@@ -313,7 +349,7 @@ function generateCode(match, options = {}) {
         compact: true,
         minified: true,
         jsescOption: {
-            quotes: 'single',
+            quotes: getQuotes(options.quote),
             minimal: true
         }
     });
@@ -411,12 +447,8 @@ function customTemplateHandler(rawSource, options) {
         },
         onattribute(name, value, quote) {
             if (value) {
-                if (quote === "'") {
-                    s.update(parser.startIndex + name.length + 1, parser.startIndex + name.length + 2, '"');
-                    s.update(parser.startIndex + name.length + value.length + 2, parser.startIndex + name.length + value.length + 3, '"');
-                }
                 function update() {
-                    s.update(parser.startIndex + name.length + 2, parser.endIndex, templateReplacer(value, options));
+                    s.update(parser.startIndex + name.length + 2, parser.endIndex, templateReplacer(value, Object.assign(Object.assign({}, options), { quote })));
                 }
                 if (!disabledDefaultTemplateHandler && (name === 'class' || name === 'hover-class' || name === 'virtualhostclass')) {
                     update();
@@ -459,7 +491,11 @@ function createTemplateHandler(options = {}) {
 }
 
 function styleHandler(rawSource, options) {
-    return postcss([postcssIsPseudoClass(), postcssWeappTailwindcss(options)]).process(rawSource).css;
+    return __awaiter(this, void 0, void 0, function* () {
+        return (yield postcss([postcssIsPseudoClass(), postcssWeappTailwindcss(options)])
+            .process(rawSource)
+            .async()).css;
+    });
 }
 function createStyleHandler(options) {
     return (rawSource, opt) => {
@@ -716,17 +752,19 @@ function createCache() {
             return instance.has(key);
         },
         process(key, callback, fallback) {
-            const hit = this.getHashValue(key);
-            if (hit && !hit.changed) {
-                const returnFlag = callback();
-                if (returnFlag !== false) {
-                    return;
+            return __awaiter(this, void 0, void 0, function* () {
+                const hit = this.getHashValue(key);
+                if (hit && !hit.changed) {
+                    const returnFlag = yield callback();
+                    if (returnFlag !== false) {
+                        return;
+                    }
                 }
-            }
-            const res = fallback();
-            if (res) {
-                this.set(res.key, res.source);
-            }
+                const res = yield fallback();
+                if (res) {
+                    this.set(res.key, res.source);
+                }
+            });
         }
     };
 }
@@ -805,4 +843,4 @@ function getOptions(options = {}) {
     return result;
 }
 
-export { createTailwindcssPatcher as a, createPatch as c, getOptions as g };
+export { __awaiter as _, createTailwindcssPatcher as a, createPatch as c, getOptions as g };

package/dist/postcss/index.d.ts

@@ -1,3 +1,3 @@
 import type { IStyleHandlerOptions } from "../types";
-export declare function styleHandler(rawSource: string, options: IStyleHandlerOptions): string;
-export declare function createStyleHandler(options: Partial<IStyleHandlerOptions>): (rawSource: string, opt?: Partial<IStyleHandlerOptions>) => string;
+export declare function styleHandler(rawSource: string, options: IStyleHandlerOptions): Promise<string>;
+export declare function createStyleHandler(options: Partial<IStyleHandlerOptions>): (rawSource: string, opt?: Partial<IStyleHandlerOptions>) => Promise<string>;

package/dist/types.d.ts

@@ -106,6 +106,7 @@ export interface UserDefinedOptions {
         root?: string | false;
         universal?: string | false;
     };
+    tailwindcssBasedir?: string;
 }
 export type JsHandler = (rawSource: string, set: Set<string>, options?: CreateJsHandlerOptions) => JsHandlerResult;
 export interface IMangleScopeContext {
@@ -129,6 +130,7 @@ export interface ITemplateHandlerOptions extends ICommonReplaceOptions {
     jsHandler?: JsHandler;
     runtimeSet?: Set<string>;
     disabledDefaultTemplateHandler?: boolean;
+    quote?: string | null;
 }
 export type GlobOrFunctionMatchers = 'htmlMatcher' | 'cssMatcher' | 'jsMatcher' | 'mainCssChunkMatcher' | 'wxsMatcher';
 export type InternalUserDefinedOptions = Required<Omit<UserDefinedOptions, GlobOrFunctionMatchers | 'supportCustomLengthUnitsPatch' | 'customReplaceDictionary'> & {
@@ -136,7 +138,7 @@ export type InternalUserDefinedOptions = Required<Omit<UserDefinedOptions, GlobO
 } & {
     supportCustomLengthUnitsPatch: ILengthUnitsPatchOptions | false;
     templateHandler: (rawSource: string, options?: ITemplateHandlerOptions) => string;
-    styleHandler: (rawSource: string, options: IStyleHandlerOptions) => string;
+    styleHandler: (rawSource: string, options: IStyleHandlerOptions) => Promise<string>;
     jsHandler: JsHandler;
     escapeMap: Record<string, string>;
     patch: () => void;