weapp-tailwindcss 3.0.10 → 3.1.0

package/dist/cache/index.d.ts

@@ -26,5 +26,6 @@ export interface ICreateCacheReturnType {
         source: CacheValue;
     }>) => void | Promise<void>;
 }
-declare function createCache(): ICreateCacheReturnType;
+export type ICreateCacheOptions = boolean;
+declare function createCache(options?: ICreateCacheOptions): ICreateCacheReturnType;
 export { createCache };

package/dist/cli.js

@@ -1,8 +1,8 @@
 'use strict';
 
 var semver = require('semver');
-var options = require('./options-Ce8c4jgF.js');
-var index = require('./index-CKzzVDhq.js');
+var options = require('./options-AIjWBFPo.js');
+var index = require('./index-CarwQa1I.js');
 require('magic-string');
 require('./replace.js');
 require('@weapp-core/escape');

package/dist/cli.mjs

@@ -1,6 +1,6 @@
 import semver from 'semver';
-import { g as getOptions, a as createPatch } from './options-D74YiXdv.mjs';
-import { W as WEAPP_TW_REQUIRED_NODE_VERSION } from './index-C7QwtXvo.mjs';
+import { g as getOptions, a as createPatch } from './options-D6Mza941.mjs';
+import { W as WEAPP_TW_REQUIRED_NODE_VERSION } from './index-DKNUquoz.mjs';
 import 'magic-string';
 import './replace.mjs';
 import '@weapp-core/escape';

package/dist/core.d.ts

@@ -1,8 +1,8 @@
 import { UserDefinedOptions } from "./types";
 export declare function createContext(options?: UserDefinedOptions): {
     transformWxss: (rawCss: string) => Promise<string>;
-    transformWxml: (rawWxml: string) => string;
+    transformWxml: (rawWxml: string) => Promise<string>;
     transformJs: (rawJs: string, options?: {
         runtimeSet?: Set<string> | undefined;
-    }) => string;
+    }) => Promise<string>;
 };

package/dist/core.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var options = require('./options-Ce8c4jgF.js');
+var options = require('./options-AIjWBFPo.js');
 require('magic-string');
 require('./replace.js');
 require('@weapp-core/escape');
@@ -17,7 +17,7 @@ require('./defu-Cdz2PomB.js');
 require('@babel/types');
 require('htmlparser2');
 require('postcss');
-require('./index-CKzzVDhq.js');
+require('./index-CarwQa1I.js');
 require('@csstools/postcss-is-pseudo-class');
 require('postcss-rem-to-responsive-pixel');
 require('postcss-selector-parser');
@@ -43,15 +43,17 @@ function createContext(options$1 = {}) {
             return code;
         });
     }
-    function transformJs(rawJs, options = {}) {
-        runtimeSet =
-            options && options.runtimeSet
-                ? options.runtimeSet
-                : twPatcher.getClassSet({
-                    basedir: tailwindcssBasedir
-                });
-        const { code } = jsHandler(rawJs, runtimeSet);
-        return code;
+    function transformJs(rawJs_1) {
+        return options.__awaiter(this, arguments, void 0, function* (rawJs, options = {}) {
+            runtimeSet =
+                options && options.runtimeSet
+                    ? options.runtimeSet
+                    : twPatcher.getClassSet({
+                        basedir: tailwindcssBasedir
+                    });
+            const { code } = yield jsHandler(rawJs, runtimeSet);
+            return code;
+        });
     }
     function transformWxml(rawWxml) {
         const code = templateHandler(rawWxml, {

package/dist/core.mjs

@@ -1,4 +1,4 @@
-import { g as getOptions, c as createTailwindcssPatcher, _ as __awaiter } from './options-D74YiXdv.mjs';
+import { g as getOptions, c as createTailwindcssPatcher, _ as __awaiter } from './options-D6Mza941.mjs';
 import 'magic-string';
 import './replace.mjs';
 import '@weapp-core/escape';
@@ -13,7 +13,7 @@ import './defu-n46TJT6t.mjs';
 import '@babel/types';
 import 'htmlparser2';
 import 'postcss';
-import './index-C7QwtXvo.mjs';
+import './index-DKNUquoz.mjs';
 import '@csstools/postcss-is-pseudo-class';
 import 'postcss-rem-to-responsive-pixel';
 import 'postcss-selector-parser';
@@ -39,15 +39,17 @@ function createContext(options = {}) {
             return code;
         });
     }
-    function transformJs(rawJs, options = {}) {
-        runtimeSet =
-            options && options.runtimeSet
-                ? options.runtimeSet
-                : twPatcher.getClassSet({
-                    basedir: tailwindcssBasedir
-                });
-        const { code } = jsHandler(rawJs, runtimeSet);
-        return code;
+    function transformJs(rawJs_1) {
+        return __awaiter(this, arguments, void 0, function* (rawJs, options = {}) {
+            runtimeSet =
+                options && options.runtimeSet
+                    ? options.runtimeSet
+                    : twPatcher.getClassSet({
+                        basedir: tailwindcssBasedir
+                    });
+            const { code } = yield jsHandler(rawJs, runtimeSet);
+            return code;
+        });
     }
     function transformWxml(rawWxml) {
         const code = templateHandler(rawWxml, {

package/dist/css-macro/postcss.js

@@ -8,6 +8,7 @@ const creator = () => {
         prepare() {
             return {
                 AtRule(atRule, helper) {
+                    var _a;
                     if (atRule.name === 'media') {
                         const values = [];
                         constants.matchCustomPropertyFromValue(atRule.params, (arr) => {
@@ -17,14 +18,14 @@ const creator = () => {
                             const isNegative = atRule.params.includes('not');
                             const text = values.join(' ');
                             const comment = isNegative ? constants.ifndef(text) : constants.ifdef(text);
-                            atRule.before([
+                            atRule.replaceWith([
                                 helper.comment({
                                     raws: {
                                         before: '\n'
                                     },
                                     text: comment.start
                                 }),
-                                ...atRule.nodes,
+                                ...((_a = atRule.nodes) !== null && _a !== void 0 ? _a : []),
                                 helper.comment({
                                     raws: {
                                         before: '\n'
@@ -32,7 +33,6 @@ const creator = () => {
                                     text: comment.end
                                 })
                             ]);
-                            atRule.remove();
                         }
                     }
                 },

package/dist/css-macro/postcss.mjs

@@ -6,6 +6,7 @@ const creator = () => {
         prepare() {
             return {
                 AtRule(atRule, helper) {
+                    var _a;
                     if (atRule.name === 'media') {
                         const values = [];
                         matchCustomPropertyFromValue(atRule.params, (arr) => {
@@ -15,14 +16,14 @@ const creator = () => {
                             const isNegative = atRule.params.includes('not');
                             const text = values.join(' ');
                             const comment = isNegative ? ifndef(text) : ifdef(text);
-                            atRule.before([
+                            atRule.replaceWith([
                                 helper.comment({
                                     raws: {
                                         before: '\n'
                                     },
                                     text: comment.start
                                 }),
-                                ...atRule.nodes,
+                                ...((_a = atRule.nodes) !== null && _a !== void 0 ? _a : []),
                                 helper.comment({
                                     raws: {
                                         before: '\n'
@@ -30,7 +31,6 @@ const creator = () => {
                                     text: comment.end
                                 })
                             ]);
-                            atRule.remove();
                         }
                     }
                 },

package/dist/gulp.js

@@ -2,8 +2,8 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var index = require('./index-DXyNWU95.js');
-require('./options-Ce8c4jgF.js');
+var index = require('./index-C9cFs8_u.js');
+require('./options-AIjWBFPo.js');
 require('magic-string');
 require('./replace.js');
 require('@weapp-core/escape');
@@ -18,7 +18,7 @@ require('./defu-Cdz2PomB.js');
 require('@babel/types');
 require('htmlparser2');
 require('postcss');
-require('./index-CKzzVDhq.js');
+require('./index-CarwQa1I.js');
 require('@csstools/postcss-is-pseudo-class');
 require('postcss-rem-to-responsive-pixel');
 require('postcss-selector-parser');
@@ -30,6 +30,8 @@ require('@tailwindcss-mangle/shared');
 require('lru-cache');
 require('md5');
 require('node:stream');
+require('./index-DyK5Vd4R.js');
+require('debug');
 
 
 

package/dist/gulp.mjs

@@ -1,5 +1,5 @@
-export { c as createPlugins } from './index-DMO3Y3vp.mjs';
-import './options-D74YiXdv.mjs';
+export { c as createPlugins } from './index-DEWZ8_xX.mjs';
+import './options-D6Mza941.mjs';
 import 'magic-string';
 import './replace.mjs';
 import '@weapp-core/escape';
@@ -14,7 +14,7 @@ import './defu-n46TJT6t.mjs';
 import '@babel/types';
 import 'htmlparser2';
 import 'postcss';
-import './index-C7QwtXvo.mjs';
+import './index-DKNUquoz.mjs';
 import '@csstools/postcss-is-pseudo-class';
 import 'postcss-rem-to-responsive-pixel';
 import 'postcss-selector-parser';
@@ -26,3 +26,5 @@ import '@tailwindcss-mangle/shared';
 import 'lru-cache';
 import 'md5';
 import 'node:stream';
+import './index-CsZGfl55.mjs';
+import 'debug';

package/dist/{index-DfbtBzIV.mjs → index-BatBMY3C.mjs}

@@ -1,9 +1,9 @@
-import { g as getOptions, c as createTailwindcssPatcher, _ as __awaiter } from './options-D74YiXdv.mjs';
-import { v as vitePluginName } from './index-C7QwtXvo.mjs';
+import { g as getOptions, c as createTailwindcssPatcher, _ as __awaiter } from './options-D6Mza941.mjs';
+import { v as vitePluginName } from './index-DKNUquoz.mjs';
 import { g as getGroupedEntries } from './defaults-CBb6_9nJ.mjs';
-import { c as createDebug } from './index-CLxBL7MC.mjs';
+import { c as createDebug } from './index-CsZGfl55.mjs';
 
-const debug = createDebug('generateBundle: ');
+const debug = createDebug();
 function UnifiedViteWeappTailwindcssPlugin(options = {}) {
     if (options.customReplaceDictionary === undefined) {
         options.customReplaceDictionary = 'simple';
@@ -46,8 +46,8 @@ function UnifiedViteWeappTailwindcssPlugin(options = {}) {
                             else {
                                 return false;
                             }
-                        }, () => {
-                            originalSource.source = templateHandler(oldVal, {
+                        }, () => __awaiter(this, void 0, void 0, function* () {
+                            originalSource.source = yield templateHandler(oldVal, {
                                 runtimeSet
                             });
                             onUpdate(file, oldVal, originalSource.source);
@@ -57,7 +57,7 @@ function UnifiedViteWeappTailwindcssPlugin(options = {}) {
                                 key: file,
                                 source: originalSource.source
                             };
-                        });
+                        }));
                     }
                     debug('html handle finish, total: %d, no-cached: %d', groupedEntries.html.length, noCachedCount);
                 }
@@ -77,10 +77,10 @@ function UnifiedViteWeappTailwindcssPlugin(options = {}) {
                             else {
                                 return false;
                             }
-                        }, () => {
+                        }, () => __awaiter(this, void 0, void 0, function* () {
                             const mapFilename = file + '.map';
                             const hasMap = Boolean(bundle[mapFilename]);
-                            const { code, map } = jsHandler(rawSource, runtimeSet, {
+                            const { code, map } = yield jsHandler(rawSource, runtimeSet, {
                                 generateMap: hasMap
                             });
                             originalSource.code = code;
@@ -94,7 +94,7 @@ function UnifiedViteWeappTailwindcssPlugin(options = {}) {
                                 key: file,
                                 source: code
                             };
-                        });
+                        }));
                     }
                     debug('js handle finish, total: %d, no-cached: %d', groupedEntries.js.length, noCachedCount);
                 }

package/dist/index-C9cFs8_u.js

@@ -0,0 +1,136 @@
+'use strict';
+
+var options = require('./options-AIjWBFPo.js');
+var stream = require('node:stream');
+var index = require('./index-DyK5Vd4R.js');
+
+function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
+
+var stream__default = /*#__PURE__*/_interopDefaultCompat(stream);
+
+const debug = index.createDebug();
+const Transform = stream__default["default"].Transform;
+function createPlugins(options$1 = {}) {
+    const opts = options.getOptions(options$1);
+    const { templateHandler, styleHandler, patch, jsHandler, setMangleRuntimeSet, tailwindcssBasedir, cache } = opts;
+    let runtimeSet = new Set();
+    patch === null || patch === void 0 ? void 0 : patch();
+    const twPatcher = options.createTailwindcssPatcher();
+    function transformWxss() {
+        return new Transform({
+            objectMode: true,
+            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 rawSource = file.contents.toString();
+                        const hash = cache.computeHash(rawSource);
+                        cache.calcHashValueChanged(file.path, hash);
+                        yield cache.process(file.path, () => {
+                            const source = cache.get(file.path);
+                            if (source) {
+                                file.contents = Buffer.from(source);
+                                debug('css cache hit: %s', file.path);
+                            }
+                            else {
+                                return false;
+                            }
+                        }, () => options.__awaiter(this, void 0, void 0, function* () {
+                            const code = yield styleHandler(rawSource, {
+                                isMainChunk: true
+                            });
+                            file.contents = Buffer.from(code);
+                            debug('css handle: %s', file.path);
+                            return {
+                                key: file.path,
+                                source: code
+                            };
+                        }));
+                    }
+                    callback(error, file);
+                });
+            }
+        });
+    }
+    function transformJs() {
+        return new Transform({
+            objectMode: true,
+            transform: function (file, encoding, callback) {
+                return options.__awaiter(this, void 0, void 0, function* () {
+                    const error = null;
+                    if (file.contents) {
+                        const rawSource = file.contents.toString();
+                        const hash = cache.computeHash(rawSource);
+                        cache.calcHashValueChanged(file.path, hash);
+                        yield cache.process(file.path, () => {
+                            const source = cache.get(file.path);
+                            if (source) {
+                                file.contents = Buffer.from(source);
+                                debug('js cache hit: %s', file.path);
+                            }
+                            else {
+                                return false;
+                            }
+                        }, () => options.__awaiter(this, void 0, void 0, function* () {
+                            const { code } = yield jsHandler(rawSource, runtimeSet);
+                            file.contents = Buffer.from(code);
+                            debug('js handle: %s', file.path);
+                            return {
+                                key: file.path,
+                                source: code
+                            };
+                        }));
+                    }
+                    callback(error, file);
+                });
+            }
+        });
+    }
+    function transformWxml() {
+        return new Transform({
+            objectMode: true,
+            transform: function (file, encoding, callback) {
+                return options.__awaiter(this, void 0, void 0, function* () {
+                    const error = null;
+                    if (file.contents) {
+                        const rawSource = file.contents.toString();
+                        const hash = cache.computeHash(rawSource);
+                        cache.calcHashValueChanged(file.path, hash);
+                        yield cache.process(file.path, () => {
+                            const source = cache.get(file.path);
+                            if (source) {
+                                file.contents = Buffer.from(source);
+                                debug('html cache hit: %s', file.path);
+                            }
+                            else {
+                                return false;
+                            }
+                        }, () => options.__awaiter(this, void 0, void 0, function* () {
+                            const code = yield templateHandler(rawSource, {
+                                runtimeSet
+                            });
+                            file.contents = Buffer.from(code);
+                            debug('html handle: %s', file.path);
+                            return {
+                                key: file.path,
+                                source: code
+                            };
+                        }));
+                    }
+                    callback(error, file);
+                });
+            }
+        });
+    }
+    return {
+        transformWxss,
+        transformWxml,
+        transformJs
+    };
+}
+
+exports.createPlugins = createPlugins;

package/dist/{index-CKzzVDhq.js → index-CarwQa1I.js}

@@ -396,8 +396,12 @@ const postcssWeappTailwindcssPrePlugin = (options = {
         },
         AtRule(atRule) {
             if (isAtMediaHover(atRule)) {
-                atRule.before(atRule.nodes);
-                atRule.remove();
+                if (atRule.nodes) {
+                    atRule.replaceWith(atRule.nodes);
+                }
+                else {
+                    atRule.remove();
+                }
             }
         }
     };

package/dist/{index-CLxBL7MC.mjs → index-CsZGfl55.mjs}

@@ -2,9 +2,10 @@ import _createDebug from 'debug';
 
 const _debug = _createDebug('weapp-tw');
 function createDebug(prefix) {
-    return function debug(formatter, ...args) {
+    function debug(formatter, ...args) {
         return _debug((prefix !== null && prefix !== void 0 ? prefix : '') + formatter, ...args);
-    };
+    }
+    return debug;
 }
 
 export { createDebug as c };

package/dist/index-DEWZ8_xX.mjs

@@ -0,0 +1,130 @@
+import { g as getOptions, c as createTailwindcssPatcher, _ as __awaiter } from './options-D6Mza941.mjs';
+import stream from 'node:stream';
+import { c as createDebug } from './index-CsZGfl55.mjs';
+
+const debug = createDebug();
+const Transform = stream.Transform;
+function createPlugins(options = {}) {
+    const opts = getOptions(options);
+    const { templateHandler, styleHandler, patch, jsHandler, setMangleRuntimeSet, tailwindcssBasedir, cache } = opts;
+    let runtimeSet = new Set();
+    patch === null || patch === void 0 ? void 0 : patch();
+    const twPatcher = createTailwindcssPatcher();
+    function transformWxss() {
+        return new Transform({
+            objectMode: true,
+            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 rawSource = file.contents.toString();
+                        const hash = cache.computeHash(rawSource);
+                        cache.calcHashValueChanged(file.path, hash);
+                        yield cache.process(file.path, () => {
+                            const source = cache.get(file.path);
+                            if (source) {
+                                file.contents = Buffer.from(source);
+                                debug('css cache hit: %s', file.path);
+                            }
+                            else {
+                                return false;
+                            }
+                        }, () => __awaiter(this, void 0, void 0, function* () {
+                            const code = yield styleHandler(rawSource, {
+                                isMainChunk: true
+                            });
+                            file.contents = Buffer.from(code);
+                            debug('css handle: %s', file.path);
+                            return {
+                                key: file.path,
+                                source: code
+                            };
+                        }));
+                    }
+                    callback(error, file);
+                });
+            }
+        });
+    }
+    function transformJs() {
+        return new Transform({
+            objectMode: true,
+            transform: function (file, encoding, callback) {
+                return __awaiter(this, void 0, void 0, function* () {
+                    const error = null;
+                    if (file.contents) {
+                        const rawSource = file.contents.toString();
+                        const hash = cache.computeHash(rawSource);
+                        cache.calcHashValueChanged(file.path, hash);
+                        yield cache.process(file.path, () => {
+                            const source = cache.get(file.path);
+                            if (source) {
+                                file.contents = Buffer.from(source);
+                                debug('js cache hit: %s', file.path);
+                            }
+                            else {
+                                return false;
+                            }
+                        }, () => __awaiter(this, void 0, void 0, function* () {
+                            const { code } = yield jsHandler(rawSource, runtimeSet);
+                            file.contents = Buffer.from(code);
+                            debug('js handle: %s', file.path);
+                            return {
+                                key: file.path,
+                                source: code
+                            };
+                        }));
+                    }
+                    callback(error, file);
+                });
+            }
+        });
+    }
+    function transformWxml() {
+        return new Transform({
+            objectMode: true,
+            transform: function (file, encoding, callback) {
+                return __awaiter(this, void 0, void 0, function* () {
+                    const error = null;
+                    if (file.contents) {
+                        const rawSource = file.contents.toString();
+                        const hash = cache.computeHash(rawSource);
+                        cache.calcHashValueChanged(file.path, hash);
+                        yield cache.process(file.path, () => {
+                            const source = cache.get(file.path);
+                            if (source) {
+                                file.contents = Buffer.from(source);
+                                debug('html cache hit: %s', file.path);
+                            }
+                            else {
+                                return false;
+                            }
+                        }, () => __awaiter(this, void 0, void 0, function* () {
+                            const code = yield templateHandler(rawSource, {
+                                runtimeSet
+                            });
+                            file.contents = Buffer.from(code);
+                            debug('html handle: %s', file.path);
+                            return {
+                                key: file.path,
+                                source: code
+                            };
+                        }));
+                    }
+                    callback(error, file);
+                });
+            }
+        });
+    }
+    return {
+        transformWxss,
+        transformWxml,
+        transformJs
+    };
+}
+
+export { createPlugins as c };

package/dist/{index-C7QwtXvo.mjs → index-DKNUquoz.mjs}

@@ -388,8 +388,12 @@ const postcssWeappTailwindcssPrePlugin = (options = {
         },
         AtRule(atRule) {
             if (isAtMediaHover(atRule)) {
-                atRule.before(atRule.nodes);
-                atRule.remove();
+                if (atRule.nodes) {
+                    atRule.replaceWith(atRule.nodes);
+                }
+                else {
+                    atRule.remove();
+                }
             }
         }
     };

package/dist/{index-CKXO21Qe.js → index-DyK5Vd4R.js}

@@ -8,9 +8,10 @@ var _createDebug__default = /*#__PURE__*/_interopDefaultCompat(_createDebug);
 
 const _debug = _createDebug__default["default"]('weapp-tw');
 function createDebug(prefix) {
-    return function debug(formatter, ...args) {
+    function debug(formatter, ...args) {
         return _debug((prefix !== null && prefix !== void 0 ? prefix : '') + formatter, ...args);
-    };
+    }
+    return debug;
 }
 
 exports.createDebug = createDebug;