weapp-tailwindcss 3.5.1 → 3.5.2

package/dist/{options-GppthPlx.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 { replaceJs as replaceWxml } from './replace.mjs';
+import '@weapp-core/escape';
 import { escapeStringRegexp } from '@weapp-core/regex';
+import { replaceJs as replaceWxml } from './replace.mjs';
 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.
@@ -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";
@@ -635,7 +660,7 @@ function handleEachClassFragment(ms, tokens, options = {}) {
         let p = token.start;
         if (token.expressions.length > 0) {
             for (const exp of token.expressions) {
-                if (exp.start > token.start) {
+                if (exp.start > token.start && p < exp.start) {
                     ms.update(p, exp.start, replaceWxml(ms.slice(p, exp.start), {
                         keepEOL: true,
                         escapeMap: options.escapeMap,
@@ -760,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;

package/dist/{options-Uv-owbdp.js → options-DgkOONy_.js}

@@ -1,24 +1,24 @@
 'use strict';
 
+var lruCache = require('lru-cache');
+var md5 = require('md5');
+var defaults = require('./defaults-Bo5n6a1r.js');
 var MagicString = require('magic-string');
 var _babelGenerate = require('@babel/generator');
 var _babelTraverse = require('@babel/traverse');
 var parser = require('@babel/parser');
-require('@weapp-core/escape');
 var escape = require('@ast-core/escape');
-var defaults = require('./defaults-DW-EahCC.js');
-var replace = require('./replace.js');
+require('@weapp-core/escape');
 var regex = require('@weapp-core/regex');
+var replace = require('./replace.js');
 var shared = require('@tailwindcss-mangle/shared');
-var lruCache = require('lru-cache');
-var md5 = require('md5');
 var postcss = require('postcss');
-var index = require('./index-CCbEWRGc.js');
-var t = require('@babel/types');
-var htmlparser2 = require('htmlparser2');
+var index = require('./index-B2LUAr--.js');
 var path = require('node:path');
 var process = require('node:process');
 var tailwindcssPatch = require('tailwindcss-patch');
+var t = require('@babel/types');
+var htmlparser2 = require('htmlparser2');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
 
@@ -40,14 +40,14 @@ function _interopNamespaceCompat(e) {
     return Object.freeze(n);
 }
 
+var md5__default = /*#__PURE__*/_interopDefaultCompat(md5);
 var MagicString__default = /*#__PURE__*/_interopDefaultCompat(MagicString);
 var _babelGenerate__default = /*#__PURE__*/_interopDefaultCompat(_babelGenerate);
 var _babelTraverse__default = /*#__PURE__*/_interopDefaultCompat(_babelTraverse);
-var md5__default = /*#__PURE__*/_interopDefaultCompat(md5);
 var postcss__default = /*#__PURE__*/_interopDefaultCompat(postcss);
-var t__namespace = /*#__PURE__*/_interopNamespaceCompat(t);
 var path__default = /*#__PURE__*/_interopDefaultCompat(path);
 var process__default = /*#__PURE__*/_interopDefaultCompat(process);
+var t__namespace = /*#__PURE__*/_interopNamespaceCompat(t);
 
 /******************************************************************************
 Copyright (c) Microsoft Corporation.
@@ -81,11 +81,79 @@ typeof SuppressedError === "function" ? SuppressedError : function (error, suppr
     return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
 };
 
-function _interopDefaultCompat$1(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.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__default["default"](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$1(_babelGenerate__default["default"]);
-const traverse = _interopDefaultCompat$1(_babelTraverse__default["default"]);
 
 function decodeUnicode2(input) {
     try {
@@ -96,6 +164,12 @@ function decodeUnicode2(input) {
     }
 }
 
+function _interopDefaultCompat$1(e) {
+    return e && typeof e === 'object' && 'default' in e ? e.default : e;
+}
+_interopDefaultCompat$1(_babelGenerate__default["default"]);
+const traverse = _interopDefaultCompat$1(_babelTraverse__default["default"]);
+
 const validateFilterRE = /[\w\u00A0-\uFFFF%-?]/;
 function isValidSelector(selector = '') {
     return validateFilterRE.test(selector);
@@ -390,80 +464,6 @@ function useMangleStore() {
     };
 }
 
-function createCache(options) {
-    const disabled = options === false;
-    const hashMap = new Map();
-    const instance = new lruCache.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__default["default"](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__default["default"](index.getPlugins(options))
@@ -496,6 +496,31 @@ function createInjectPreflight(options) {
     };
 }
 
+function createTailwindcssPatcher(basedir, cacheDir, supportCustomLengthUnitsPatch) {
+    const cache = {};
+    if (cacheDir) {
+        if (path__default["default"].isAbsolute(cacheDir)) {
+            cache.dir = cacheDir;
+        }
+        else if (basedir) {
+            cache.dir = path__default["default"].resolve(basedir, cacheDir);
+        }
+        else {
+            cache.dir = path__default["default"].resolve(process__default["default"].cwd(), cacheDir);
+        }
+    }
+    return new tailwindcssPatch.TailwindcssPatcher({
+        cache,
+        patch: {
+            basedir,
+            applyPatches: {
+                exportContext: true,
+                extendLengthUnits: supportCustomLengthUnitsPatch,
+            },
+        },
+    });
+}
+
 var State;
 (function (State) {
     State[State["START"] = 0] = "START";
@@ -666,7 +691,7 @@ function handleEachClassFragment(ms, tokens, options = {}) {
         let p = token.start;
         if (token.expressions.length > 0) {
             for (const exp of token.expressions) {
-                if (exp.start > token.start) {
+                if (exp.start > token.start && p < exp.start) {
                     ms.update(p, exp.start, replace.replaceJs(ms.slice(p, exp.start), {
                         keepEOL: true,
                         escapeMap: options.escapeMap,
@@ -791,31 +816,6 @@ function createTemplateHandler(options = {}) {
     };
 }
 
-function createTailwindcssPatcher(basedir, cacheDir, supportCustomLengthUnitsPatch) {
-    const cache = {};
-    if (cacheDir) {
-        if (path__default["default"].isAbsolute(cacheDir)) {
-            cache.dir = cacheDir;
-        }
-        else if (basedir) {
-            cache.dir = path__default["default"].resolve(basedir, cacheDir);
-        }
-        else {
-            cache.dir = path__default["default"].resolve(process__default["default"].cwd(), cacheDir);
-        }
-    }
-    return new tailwindcssPatch.TailwindcssPatcher({
-        cache,
-        patch: {
-            basedir,
-            applyPatches: {
-                exportContext: true,
-                extendLengthUnits: supportCustomLengthUnitsPatch,
-            },
-        },
-    });
-}
-
 function getOptions(opts) {
     const result = defaults.defuOverrideArray(opts, defaults.defaultOptions, {});
     result.escapeMap = result.customReplaceDictionary;

package/dist/postcss.js

@@ -2,14 +2,14 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var index = require('./index-CCbEWRGc.js');
+var index = require('./index-B2LUAr--.js');
 var postcssIsPseudoClass = require('@csstools/postcss-is-pseudo-class');
 var postcssRem2rpx = require('postcss-rem-to-responsive-pixel');
+require('postcss');
 require('postcss-selector-parser');
-require('./shared-hzYeE1wX.js');
-require('@weapp-core/escape');
+require('./shared-r_GpWheO.js');
 require('@ast-core/escape');
-require('postcss');
+require('@weapp-core/escape');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
 

package/dist/postcss.mjs

@@ -1,8 +1,8 @@
-export { g as getPlugins, p as postcssWeappTailwindcssPostPlugin, a as postcssWeappTailwindcssPrePlugin } from './index-szMvMylQ.mjs';
+export { g as getPlugins, p as postcssWeappTailwindcssPostPlugin, a as postcssWeappTailwindcssPrePlugin } from './index-zFq7tKDr.mjs';
 export { default as postcssIsPseudoClass } from '@csstools/postcss-is-pseudo-class';
 export { default as postcssRem2rpx } from 'postcss-rem-to-responsive-pixel';
+import 'postcss';
 import 'postcss-selector-parser';
-import './shared-DbJl6i6a.mjs';
-import '@weapp-core/escape';
+import './shared-COWjpokr.mjs';
 import '@ast-core/escape';
-import 'postcss';
+import '@weapp-core/escape';

package/dist/replace.d.ts

@@ -1,3 +1,3 @@
-export { MappingChars2String, MappingChars2StringEntries, MappingStringDictionary, SYMBOL_TABLE, SYMBOL_TABLE_TYPE, SYMBOL_TABLE_TYPE_VALUES, SimpleMappingChars2String, SimpleMappingChars2StringEntries, } from './escape';
-export { replaceWxml as replaceJs } from './wxml/shared';
+export { MappingChars2String, MappingChars2StringEntries, MappingStringDictionary, SimpleMappingChars2String, SimpleMappingChars2StringEntries, SYMBOL_TABLE, SYMBOL_TABLE_TYPE, SYMBOL_TABLE_TYPE_VALUES, } from './escape';
 export { internalCssSelectorReplacer as replaceCss } from './postcss/shared';
+export { replaceWxml as replaceJs } from './wxml/shared';

package/dist/replace.js

@@ -2,9 +2,9 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var escape = require('@weapp-core/escape');
 require('@ast-core/escape');
-var shared = require('./shared-hzYeE1wX.js');
+var escape = require('@weapp-core/escape');
+var shared = require('./shared-r_GpWheO.js');
 
 function replaceWxml(original, options = {
     keepEOL: false,

package/dist/replace.mjs

@@ -1,7 +1,7 @@
+import '@ast-core/escape';
 import { escape, SimpleMappingChars2String } from '@weapp-core/escape';
 export { MappingChars2String, MappingChars2StringEntries, SYMBOL_TABLE, SimpleMappingChars2String, SimpleMappingChars2StringEntries } from '@weapp-core/escape';
-import '@ast-core/escape';
-export { i as replaceCss } from './shared-DbJl6i6a.mjs';
+export { i as replaceCss } from './shared-COWjpokr.mjs';
 
 function replaceWxml(original, options = {
     keepEOL: false,

package/dist/tailwindcss/patcher.d.ts

@@ -1,3 +1,3 @@
-import type { ILengthUnitsPatchOptions } from 'tailwindcss-patch';
 import { TailwindcssPatcher } from 'tailwindcss-patch';
+import type { ILengthUnitsPatchOptions } from 'tailwindcss-patch';
 export declare function createTailwindcssPatcher(basedir?: string, cacheDir?: string, supportCustomLengthUnitsPatch?: boolean | ILengthUnitsPatchOptions): TailwindcssPatcher;

package/dist/types.d.ts

@@ -1,14 +1,14 @@
-import type { Document, Result as PostcssResult, Root, Rule } from 'postcss';
-import type { ClassGenerator, IClassGeneratorOptions } from '@tailwindcss-mangle/shared';
-import type { SourceMap } from 'magic-string';
 import type { GeneratorResult } from '@babel/generator';
 import type { ParseError, ParserOptions } from '@babel/parser';
-import type { UserDefinedOptions as rem2rpxOptions } from 'postcss-rem-to-responsive-pixel';
+import type { ClassGenerator, IClassGeneratorOptions } from '@tailwindcss-mangle/shared';
+import type { SourceMap } from 'magic-string';
+import type { Document, Result as PostcssResult, Root, Rule } from 'postcss';
 import type { Result } from 'postcss-load-config';
+import type { UserDefinedOptions as rem2rpxOptions } from 'postcss-rem-to-responsive-pixel';
 import type { ILengthUnitsPatchOptions, TailwindcssPatcher } from 'tailwindcss-patch';
-import type { InjectPreflight } from './postcss/preflight';
-import type { IContext as PostcssContext } from './postcss/plugins/ctx';
 import type { ICreateCacheReturnType } from './cache';
+import type { IContext as PostcssContext } from './postcss/plugins/ctx';
+import type { InjectPreflight } from './postcss/preflight';
 type PostcssOptions = Partial<Omit<Result, 'file'>>;
 export type ItemOrItemArray<T> = T | T[];
 export type AppType = 'uni-app' | 'uni-app-vite' | 'taro' | 'remax' | 'rax' | 'native' | 'kbone' | 'mpx';

package/dist/{v5-C_U1pkH8.js → v5-CqteGjOW.js}

@@ -1,16 +1,16 @@
 'use strict';
 
-var options = require('./options-Uv-owbdp.js');
-var path = require('node:path');
+var options = require('./options-DgkOONy_.js');
 var fs = require('node:fs');
-var index = require('./index-CCbEWRGc.js');
-var defaults = require('./defaults-DW-EahCC.js');
+var path = require('node:path');
+var index = require('./index-B2LUAr--.js');
 var index$1 = require('./index-HC-Qkn0i.js');
+var defaults = require('./defaults-Bo5n6a1r.js');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
 
-var path__default = /*#__PURE__*/_interopDefaultCompat(path);
 var fs__default = /*#__PURE__*/_interopDefaultCompat(fs);
+var path__default = /*#__PURE__*/_interopDefaultCompat(path);
 
 const debug = index$1.createDebug();
 class UnifiedWebpackPluginV5 {