weapp-tailwindcss 3.5.0 → 3.5.2

package/dist/index.js

@@ -2,42 +2,42 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var v5 = require('./v5-_VYyLdJC.js');
-var index = require('./index-Ddev8wez.js');
-var index$1 = require('./index-B8Pxc74h.js');
-require('./options-BjD225Hm.js');
+var index = require('./index-DzdjmBcg.js');
+var index$1 = require('./index-D_Im3H17.js');
+var v5 = require('./v5-CqteGjOW.js');
+require('./options-DgkOONy_.js');
+require('lru-cache');
+require('md5');
+require('./defaults-Bo5n6a1r.js');
+require('@ast-core/escape');
+require('@weapp-core/escape');
+require('./defu-Cdz2PomB.js');
 require('magic-string');
 require('@babel/generator');
 require('@babel/traverse');
 require('@babel/parser');
-require('@weapp-core/escape');
-require('@ast-core/escape');
-require('./defaults-DW-EahCC.js');
-require('./defu-Cdz2PomB.js');
-require('./replace.js');
-require('./shared-hzYeE1wX.js');
 require('@weapp-core/regex');
+require('./replace.js');
+require('./shared-r_GpWheO.js');
 require('@tailwindcss-mangle/shared');
-require('lru-cache');
-require('md5');
 require('postcss');
-require('./index-CCbEWRGc.js');
+require('./index-B2LUAr--.js');
 require('@csstools/postcss-is-pseudo-class');
 require('postcss-rem-to-responsive-pixel');
 require('postcss-selector-parser');
-require('@babel/types');
-require('htmlparser2');
 require('node:path');
 require('node:process');
 require('tailwindcss-patch');
-require('node:fs');
+require('@babel/types');
+require('htmlparser2');
+require('node:buffer');
+require('node:stream');
 require('./index-HC-Qkn0i.js');
 require('debug');
-require('node:stream');
-require('node:buffer');
+require('node:fs');
 
 
 
+exports.createPlugins = index.createPlugins;
+exports.UnifiedViteWeappTailwindcssPlugin = index$1.UnifiedViteWeappTailwindcssPlugin;
 exports.UnifiedWebpackPluginV5 = v5.UnifiedWebpackPluginV5;
-exports.UnifiedViteWeappTailwindcssPlugin = index.UnifiedViteWeappTailwindcssPlugin;
-exports.createPlugins = index$1.createPlugins;

package/dist/index.mjs

@@ -1,33 +1,33 @@
-export { U as UnifiedWebpackPluginV5 } from './v5-vdra_05U.mjs';
-export { U as UnifiedViteWeappTailwindcssPlugin } from './index-ClzClhjc.mjs';
-export { c as createPlugins } from './index-rwuSO4cM.mjs';
-import './options-BT2K7ro6.mjs';
+export { c as createPlugins } from './index-CMRC3rPR.mjs';
+export { U as UnifiedViteWeappTailwindcssPlugin } from './index-DnKMgPUl.mjs';
+export { U as UnifiedWebpackPluginV5 } from './v5-c6m3PupX.mjs';
+import './options-B9PPOdJv.mjs';
+import 'lru-cache';
+import 'md5';
+import './defaults-CWrYZAlE.mjs';
+import '@ast-core/escape';
+import '@weapp-core/escape';
+import './defu-n46TJT6t.mjs';
 import 'magic-string';
 import '@babel/generator';
 import '@babel/traverse';
 import '@babel/parser';
-import '@weapp-core/escape';
-import '@ast-core/escape';
-import './defaults-w3rlKQwe.mjs';
-import './defu-n46TJT6t.mjs';
-import './replace.mjs';
-import './shared-DbJl6i6a.mjs';
 import '@weapp-core/regex';
+import './replace.mjs';
+import './shared-COWjpokr.mjs';
 import '@tailwindcss-mangle/shared';
-import 'lru-cache';
-import 'md5';
 import 'postcss';
-import './index-szMvMylQ.mjs';
+import './index-zFq7tKDr.mjs';
 import '@csstools/postcss-is-pseudo-class';
 import 'postcss-rem-to-responsive-pixel';
 import 'postcss-selector-parser';
-import '@babel/types';
-import 'htmlparser2';
 import 'node:path';
 import 'node:process';
 import 'tailwindcss-patch';
-import 'node:fs';
+import '@babel/types';
+import 'htmlparser2';
+import 'node:buffer';
+import 'node:stream';
 import './index-BEIjgKpF.mjs';
 import 'debug';
-import 'node:stream';
-import 'node:buffer';
+import 'node:fs';

package/dist/{options-BT2K7ro6.mjs → options-B9PPOdJv.mjs}

@@ -1,22 +1,22 @@
+import { LRUCache } from 'lru-cache';
+import md5 from 'md5';
+import { d as defuOverrideArray, a as defaultOptions, i as isMap } from './defaults-CWrYZAlE.mjs';
 import MagicString from 'magic-string';
 import _babelGenerate from '@babel/generator';
 import _babelTraverse from '@babel/traverse';
 import { parse, parseExpression } from '@babel/parser';
-import '@weapp-core/escape';
 import { jsStringEscape } from '@ast-core/escape';
-import { d as defuOverrideArray, a as defaultOptions, i as isMap } from './defaults-w3rlKQwe.mjs';
+import '@weapp-core/escape';
+import { escapeStringRegexp } from '@weapp-core/regex';
 import { replaceJs as replaceWxml } from './replace.mjs';
-import { escapeStringRegexp, variableRegExp } from '@weapp-core/regex';
 import { ClassGenerator, defaultMangleClassFilter } from '@tailwindcss-mangle/shared';
-import { LRUCache } from 'lru-cache';
-import md5 from 'md5';
 import postcss from 'postcss';
-import { g as getPlugins } from './index-szMvMylQ.mjs';
-import * as t from '@babel/types';
-import { Parser } from 'htmlparser2';
+import { g as getPlugins } from './index-zFq7tKDr.mjs';
 import path from 'node:path';
 import process from 'node:process';
 import { TailwindcssPatcher } from 'tailwindcss-patch';
+import * as t from '@babel/types';
+import { Parser } from 'htmlparser2';
 
 /******************************************************************************
 Copyright (c) Microsoft Corporation.
@@ -32,7 +32,7 @@ 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 */
+/* global Reflect, Promise, SuppressedError, Symbol, Iterator */
 
 
 function __awaiter(thisArg, _arguments, P, generator) {
@@ -50,11 +50,79 @@ typeof SuppressedError === "function" ? SuppressedError : function (error, suppr
     return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
 };
 
-function _interopDefaultCompat(e) {
-    return e && typeof e === 'object' && 'default' in e ? e.default : e;
+function createCache(options) {
+    const disabled = options === false;
+    const hashMap = new Map();
+    const instance = new LRUCache({
+        max: 1024,
+        ttl: 0,
+        ttlAutopurge: false,
+    });
+    return {
+        hashMap,
+        instance,
+        hasHashKey(key) {
+            return hashMap.has(key);
+        },
+        getHashValue(key) {
+            return hashMap.get(key);
+        },
+        setHashValue(key, value) {
+            return hashMap.set(key, value);
+        },
+        get(key) {
+            return instance.get(key);
+        },
+        set(key, value) {
+            return instance.set(key, value);
+        },
+        computeHash(message) {
+            return md5(message);
+        },
+        calcHashValueChanged(key, hash) {
+            const hit = this.getHashValue(key);
+            if (hit) {
+                this.setHashValue(key, {
+                    changed: hash !== hit.hash,
+                    hash,
+                });
+            }
+            else {
+                this.setHashValue(key, {
+                    changed: true,
+                    hash,
+                });
+            }
+            return this;
+        },
+        has(key) {
+            return instance.has(key);
+        },
+        process(key, callback, fallback) {
+            return __awaiter(this, void 0, void 0, function* () {
+                if (disabled) {
+                    const res = yield fallback();
+                    if (res) {
+                        this.set(res.key, res.source);
+                    }
+                }
+                else {
+                    const hit = this.getHashValue(key);
+                    if (hit && !hit.changed) {
+                        const returnFlag = yield callback();
+                        if (returnFlag !== false) {
+                            return;
+                        }
+                    }
+                    const res = yield fallback();
+                    if (res) {
+                        this.set(res.key, res.source);
+                    }
+                }
+            });
+        },
+    };
 }
-_interopDefaultCompat(_babelGenerate);
-const traverse = _interopDefaultCompat(_babelTraverse);
 
 function decodeUnicode2(input) {
     try {
@@ -65,6 +133,12 @@ function decodeUnicode2(input) {
     }
 }
 
+function _interopDefaultCompat(e) {
+    return e && typeof e === 'object' && 'default' in e ? e.default : e;
+}
+_interopDefaultCompat(_babelGenerate);
+const traverse = _interopDefaultCompat(_babelTraverse);
+
 const validateFilterRE = /[\w\u00A0-\uFFFF%-?]/;
 function isValidSelector(selector = '') {
     return validateFilterRE.test(selector);
@@ -359,80 +433,6 @@ function useMangleStore() {
     };
 }
 
-function createCache(options) {
-    const disabled = options === false;
-    const hashMap = new Map();
-    const instance = new LRUCache({
-        max: 1024,
-        ttl: 0,
-        ttlAutopurge: false,
-    });
-    return {
-        hashMap,
-        instance,
-        hasHashKey(key) {
-            return hashMap.has(key);
-        },
-        getHashValue(key) {
-            return hashMap.get(key);
-        },
-        setHashValue(key, value) {
-            return hashMap.set(key, value);
-        },
-        get(key) {
-            return instance.get(key);
-        },
-        set(key, value) {
-            return instance.set(key, value);
-        },
-        computeHash(message) {
-            return md5(message);
-        },
-        calcHashValueChanged(key, hash) {
-            const hit = this.getHashValue(key);
-            if (hit) {
-                this.setHashValue(key, {
-                    changed: hash !== hit.hash,
-                    hash,
-                });
-            }
-            else {
-                this.setHashValue(key, {
-                    changed: true,
-                    hash,
-                });
-            }
-            return this;
-        },
-        has(key) {
-            return instance.has(key);
-        },
-        process(key, callback, fallback) {
-            return __awaiter(this, void 0, void 0, function* () {
-                if (disabled) {
-                    const res = yield fallback();
-                    if (res) {
-                        this.set(res.key, res.source);
-                    }
-                }
-                else {
-                    const hit = this.getHashValue(key);
-                    if (hit && !hit.changed) {
-                        const returnFlag = yield callback();
-                        if (returnFlag !== false) {
-                            return;
-                        }
-                    }
-                    const res = yield fallback();
-                    if (res) {
-                        this.set(res.key, res.source);
-                    }
-                }
-            });
-        },
-    };
-}
-
 function styleHandler(rawSource, options) {
     var _a, _b;
     return postcss(getPlugins(options))
@@ -465,6 +465,31 @@ function createInjectPreflight(options) {
     };
 }
 
+function createTailwindcssPatcher(basedir, cacheDir, supportCustomLengthUnitsPatch) {
+    const cache = {};
+    if (cacheDir) {
+        if (path.isAbsolute(cacheDir)) {
+            cache.dir = cacheDir;
+        }
+        else if (basedir) {
+            cache.dir = path.resolve(basedir, cacheDir);
+        }
+        else {
+            cache.dir = path.resolve(process.cwd(), cacheDir);
+        }
+    }
+    return new TailwindcssPatcher({
+        cache,
+        patch: {
+            basedir,
+            applyPatches: {
+                exportContext: true,
+                extendLengthUnits: supportCustomLengthUnitsPatch,
+            },
+        },
+    });
+}
+
 var State;
 (function (State) {
     State[State["START"] = 0] = "START";
@@ -630,78 +655,47 @@ function generateCode(match, options = {}) {
         return match;
     }
 }
-function extract(original, reg) {
-    let match = reg.exec(original);
-    const sources = [];
-    while (match !== null) {
-        const start = match.index;
-        const end = reg.lastIndex;
-        sources.push({
-            start,
-            end,
-            raw: match[1],
-        });
-        match = reg.exec(original);
-    }
-    return sources;
-}
-function extractSource(original) {
-    return extract(original, variableRegExp);
-}
-function handleEachClassFragment(original, options = {}) {
-    const sources = extractSource(original);
-    if (sources.length > 0) {
-        const resultArray = [];
-        let p = 0;
-        for (let i = 0; i < sources.length; i++) {
-            const m = sources[i];
-            const before = original.slice(p, m.start);
-            resultArray.push(replaceWxml(before, {
-                keepEOL: true,
-                escapeMap: options.escapeMap,
-                mangleContext: options.mangleContext,
-                ignoreHead: p > 0,
-            }));
-            p = m.start;
-            if (m.raw.trim().length > 0) {
-                const code = generateCode(m.raw, options);
-                const source = `{{${code}}}`;
-                m.source = source;
-            }
-            else {
-                m.source = '';
+function handleEachClassFragment(ms, tokens, options = {}) {
+    for (const token of tokens) {
+        let p = token.start;
+        if (token.expressions.length > 0) {
+            for (const exp of token.expressions) {
+                if (exp.start > token.start && p < exp.start) {
+                    ms.update(p, exp.start, replaceWxml(ms.slice(p, exp.start), {
+                        keepEOL: true,
+                        escapeMap: options.escapeMap,
+                        mangleContext: options.mangleContext,
+                        ignoreHead: p > 0,
+                    }));
+                }
+                const code = `{{${generateCode(exp.value.slice(2, -2), options)}}}`;
+                ms.update(exp.start, exp.end, code);
+                p = exp.end;
             }
-            resultArray.push(m.source);
-            p = m.end;
-            if (i === sources.length - 1) {
-                const after = original.slice(m.end);
-                resultArray.push(replaceWxml(after, {
-                    keepEOL: true,
+            if (token.end > p) {
+                ms.update(p, token.end, replaceWxml(ms.slice(p, token.end), {
+                    keepEOL: false,
                     escapeMap: options.escapeMap,
                     mangleContext: options.mangleContext,
                     ignoreHead: true,
                 }));
             }
         }
-        return resultArray.filter(Boolean).join('').trim();
-    }
-    else {
-        return replaceWxml(original, {
-            keepEOL: false,
-            escapeMap: options.escapeMap,
-            mangleContext: options.mangleContext,
-            ignoreHead: false,
-        });
+        else {
+            ms.update(token.start, token.end, replaceWxml(token.value, {
+                keepEOL: false,
+                escapeMap: options.escapeMap,
+                mangleContext: options.mangleContext,
+                ignoreHead: false,
+            }));
+        }
     }
 }
 function templateReplacer(original, options = {}) {
     const ms = new MagicString(original);
     const tokenizer = new Tokenizer();
     const tokens = tokenizer.run(ms.original);
-    for (const token of tokens) {
-        const target = handleEachClassFragment(token.value, options);
-        ms.update(token.start, token.end, target);
-    }
+    handleEachClassFragment(ms, tokens, options);
     return ms.toString();
 }
 function regTest(reg, str) {
@@ -791,31 +785,6 @@ function createTemplateHandler(options = {}) {
     };
 }
 
-function createTailwindcssPatcher(basedir, cacheDir, supportCustomLengthUnitsPatch) {
-    const cache = {};
-    if (cacheDir) {
-        if (path.isAbsolute(cacheDir)) {
-            cache.dir = cacheDir;
-        }
-        else if (basedir) {
-            cache.dir = path.resolve(basedir, cacheDir);
-        }
-        else {
-            cache.dir = path.resolve(process.cwd(), cacheDir);
-        }
-    }
-    return new TailwindcssPatcher({
-        cache,
-        patch: {
-            basedir,
-            applyPatches: {
-                exportContext: true,
-                extendLengthUnits: supportCustomLengthUnitsPatch,
-            },
-        },
-    });
-}
-
 function getOptions(opts) {
     const result = defuOverrideArray(opts, defaultOptions, {});
     result.escapeMap = result.customReplaceDictionary;