weapp-tailwindcss 2.6.3 → 2.7.1

package/README.md

@@ -21,7 +21,8 @@
 [![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` 全方面解决方案
+> `小程序` + `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')\]
 
@@ -70,7 +71,7 @@
 
 目前，这些插件支持最新版本的 `tailwindcss v3.x.x` 版本和 `webpack5`，`vite` 和 `gulp`。
 
-> 如果你还在使用 `tailwindcss@2` 版本，那你应该使用本插件的 `1.x` 版本。另外请确保你的 `nodejs` 版本 `>=16`。目前低于 `16` 的长期维护版本(`偶数版本`) 都已经结束了生命周期，建议安装 `nodejs` 的 `LTS`版本，详见 [nodejs/release](https://github.com/nodejs/release)
+> 如果你还在使用 `tailwindcss@2` 版本，那你应该使用本插件的 `1.x` 版本。另外请确保你的 `nodejs` 版本 `>=16.6.0`。目前低于 `16` 的长期维护版本(`偶数版本`) 都已经结束了生命周期，建议安装 `nodejs` 的 `LTS`版本，详见 [nodejs/release](https://github.com/nodejs/release)
 
 ## [安装与使用方式](https://weapp-tw.icebreaker.top/docs/quick-start/install)
 

package/dist/cli.js

@@ -1,16 +1,17 @@
 'use strict';
 
-var options = require('./options-43afee21.js');
+var options = require('./options-b7411c31.js');
 require('micromatch');
-require('@babel/types');
-require('@babel/generator');
-require('@babel/parser');
-require('@babel/traverse');
+require('magic-string');
 require('./replace.js');
 require('@weapp-core/escape');
 require('./shared-df9de23f.js');
 require('@weapp-core/regex');
-require('./defaults-28cfeec8.js');
+require('@babel/generator');
+require('@babel/parser');
+require('@babel/traverse');
+require('./defaults-344ba6d9.js');
+require('@babel/types');
 require('postcss');
 require('./postcss-4e99a8e8.js');
 require('postcss-selector-parser');
@@ -19,7 +20,7 @@ require('node:path');
 require('node:fs');
 require('semver');
 require('tailwindcss-patch');
-require('tailwindcss-mangle-shared');
+require('@tailwindcss-mangle/shared');
 
 const args = process.argv.slice(2);
 if (args[0] === 'patch') {

package/dist/cli.mjs

@@ -1,14 +1,15 @@
-import { g as getOptions, c as createPatch } from './options-d8cb9e14.mjs';
+import { g as getOptions, c as createPatch } from './options-8805cf56.mjs';
 import 'micromatch';
-import '@babel/types';
-import '@babel/generator';
-import '@babel/parser';
-import '@babel/traverse';
+import 'magic-string';
 import './replace.mjs';
 import '@weapp-core/escape';
 import './shared-fd149084.mjs';
 import '@weapp-core/regex';
-import './defaults-702719e1.mjs';
+import '@babel/generator';
+import '@babel/parser';
+import '@babel/traverse';
+import './defaults-0743f523.mjs';
+import '@babel/types';
 import 'postcss';
 import './postcss-a551ddc0.mjs';
 import 'postcss-selector-parser';
@@ -17,7 +18,7 @@ import 'node:path';
 import 'node:fs';
 import 'semver';
 import 'tailwindcss-patch';
-import 'tailwindcss-mangle-shared';
+import '@tailwindcss-mangle/shared';
 
 const args = process.argv.slice(2);
 if (args[0] === 'patch') {

package/dist/{defaults-702719e1.mjs → defaults-0743f523.mjs}

@@ -125,7 +125,8 @@ const defaultOptions = {
         }
         return false;
     },
-    disabledDefaultTemplateHandler: false
+    disabledDefaultTemplateHandler: false,
+    jsEscapeStrategy: 'regenerate'
 };
 
 export { defaultOptions as d, getGroupedEntries as g, isMap as i, noop as n };

package/dist/{defaults-28cfeec8.js → defaults-344ba6d9.js}

@@ -127,7 +127,8 @@ const defaultOptions = {
         }
         return false;
     },
-    disabledDefaultTemplateHandler: false
+    disabledDefaultTemplateHandler: false,
+    jsEscapeStrategy: 'regenerate'
 };
 
 exports.defaultOptions = defaultOptions;

package/dist/defaults.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var defaults = require('./defaults-28cfeec8.js');
+var defaults = require('./defaults-344ba6d9.js');
 require('@weapp-core/escape');
 
 

package/dist/defaults.mjs

@@ -1,2 +1,2 @@
-export { d as defaultOptions } from './defaults-702719e1.mjs';
+export { d as defaultOptions } from './defaults-0743f523.mjs';
 import '@weapp-core/escape';

package/dist/gulp.js

@@ -3,17 +3,18 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var stream = require('node:stream');
-var options = require('./options-43afee21.js');
+var options = require('./options-b7411c31.js');
 require('micromatch');
-require('@babel/types');
-require('@babel/generator');
-require('@babel/parser');
-require('@babel/traverse');
+require('magic-string');
 require('./replace.js');
 require('@weapp-core/escape');
 require('./shared-df9de23f.js');
 require('@weapp-core/regex');
-require('./defaults-28cfeec8.js');
+require('@babel/generator');
+require('@babel/parser');
+require('@babel/traverse');
+require('./defaults-344ba6d9.js');
+require('@babel/types');
 require('postcss');
 require('./postcss-4e99a8e8.js');
 require('postcss-selector-parser');
@@ -22,7 +23,7 @@ require('node:path');
 require('node:fs');
 require('semver');
 require('tailwindcss-patch');
-require('tailwindcss-mangle-shared');
+require('@tailwindcss-mangle/shared');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 

package/dist/gulp.mjs

@@ -1,15 +1,16 @@
 import stream from 'node:stream';
-import { g as getOptions, a as createTailwindcssPatcher } from './options-d8cb9e14.mjs';
+import { g as getOptions, a as createTailwindcssPatcher } from './options-8805cf56.mjs';
 import 'micromatch';
-import '@babel/types';
-import '@babel/generator';
-import '@babel/parser';
-import '@babel/traverse';
+import 'magic-string';
 import './replace.mjs';
 import '@weapp-core/escape';
 import './shared-fd149084.mjs';
 import '@weapp-core/regex';
-import './defaults-702719e1.mjs';
+import '@babel/generator';
+import '@babel/parser';
+import '@babel/traverse';
+import './defaults-0743f523.mjs';
+import '@babel/types';
 import 'postcss';
 import './postcss-a551ddc0.mjs';
 import 'postcss-selector-parser';
@@ -18,7 +19,7 @@ import 'node:path';
 import 'node:fs';
 import 'semver';
 import 'tailwindcss-patch';
-import 'tailwindcss-mangle-shared';
+import '@tailwindcss-mangle/shared';
 
 const Transform = stream.Transform;
 function createPlugins(options = {}) {

package/dist/index.js

@@ -7,24 +7,25 @@ var vite = require('./vite.js');
 var gulp = require('./gulp.js');
 require('node:path');
 require('node:fs');
-require('./options-43afee21.js');
+require('./options-b7411c31.js');
 require('micromatch');
-require('@babel/types');
-require('@babel/generator');
-require('@babel/parser');
-require('@babel/traverse');
+require('magic-string');
 require('./replace.js');
 require('@weapp-core/escape');
 require('./shared-df9de23f.js');
 require('@weapp-core/regex');
-require('./defaults-28cfeec8.js');
+require('@babel/generator');
+require('@babel/parser');
+require('@babel/traverse');
+require('./defaults-344ba6d9.js');
+require('@babel/types');
 require('postcss');
 require('./postcss-4e99a8e8.js');
 require('postcss-selector-parser');
 require('@csstools/postcss-is-pseudo-class');
 require('semver');
 require('tailwindcss-patch');
-require('tailwindcss-mangle-shared');
+require('@tailwindcss-mangle/shared');
 require('node:stream');
 
 

package/dist/index.mjs

@@ -3,22 +3,23 @@ export { UnifiedViteWeappTailwindcssPlugin } from './vite.mjs';
 export { createPlugins } from './gulp.mjs';
 import 'node:path';
 import 'node:fs';
-import './options-d8cb9e14.mjs';
+import './options-8805cf56.mjs';
 import 'micromatch';
-import '@babel/types';
-import '@babel/generator';
-import '@babel/parser';
-import '@babel/traverse';
+import 'magic-string';
 import './replace.mjs';
 import '@weapp-core/escape';
 import './shared-fd149084.mjs';
 import '@weapp-core/regex';
-import './defaults-702719e1.mjs';
+import '@babel/generator';
+import '@babel/parser';
+import '@babel/traverse';
+import './defaults-0743f523.mjs';
+import '@babel/types';
 import 'postcss';
 import './postcss-a551ddc0.mjs';
 import 'postcss-selector-parser';
 import '@csstools/postcss-is-pseudo-class';
 import 'semver';
 import 'tailwindcss-patch';
-import 'tailwindcss-mangle-shared';
+import '@tailwindcss-mangle/shared';
 import 'node:stream';

package/dist/js/handlers.d.ts

@@ -0,0 +1,6 @@
+import type { StringLiteral, TemplateElement } from '@babel/types';
+import MagicString from 'magic-string';
+import type { IJsHandlerOptions } from "../types";
+export declare function jsStringEscape(str: unknown): string;
+export declare function regenerateHandleValue(str: string, node: StringLiteral | TemplateElement, options: IJsHandlerOptions): string;
+export declare function replaceHandleValue(str: string, node: StringLiteral | TemplateElement, options: IJsHandlerOptions, ms: MagicString, offset?: number, needEscaped?: boolean): string;

package/dist/js/index.d.ts

@@ -1,5 +1,7 @@
-import type { StringLiteral, TemplateElement } from '@babel/types';
 import type { IJsHandlerOptions } from "../types";
-export declare function handleValue(str: string, node: StringLiteral | TemplateElement, options: IJsHandlerOptions): string;
-export declare function jsHandler(rawSource: string, options: IJsHandlerOptions): import("@babel/generator").GeneratorResult;
-export declare function createjsHandler(options: Omit<IJsHandlerOptions, 'classNameSet'>): (rawSource: string, set: Set<string>) => import("@babel/generator").GeneratorResult;
+export declare function jsHandler(rawSource: string, options: IJsHandlerOptions): import("@babel/generator").GeneratorResult | {
+    code: string;
+};
+export declare function createjsHandler(options: Omit<IJsHandlerOptions, 'classNameSet'>): (rawSource: string, set: Set<string>) => import("@babel/generator").GeneratorResult | {
+    code: string;
+};

package/dist/{options-d8cb9e14.mjs → options-8805cf56.mjs}

@@ -1,11 +1,12 @@
 import { isMatch } from 'micromatch';
-import * as t from '@babel/types';
+import MagicString from 'magic-string';
+import { replaceJs as replaceWxml } from './replace.mjs';
+import { escapeStringRegexp, makeCustomAttributes, tagWithEitherClassAndHoverClassRegexp, templateClassExactRegexp, wxsTagRegexp, variableRegExp } from '@weapp-core/regex';
 import generate from '@babel/generator';
 import { parse, parseExpression } from '@babel/parser';
 import traverse from '@babel/traverse';
-import { replaceJs as replaceWxml } from './replace.mjs';
-import { escapeStringRegexp, makeCustomAttributes, tagWithEitherClassAndHoverClassRegexp, templateClassExactRegexp, wxsTagRegexp, variableRegExp } from '@weapp-core/regex';
-import { n as noop, d as defaultOptions, i as isMap } from './defaults-702719e1.mjs';
+import { n as noop, d as defaultOptions, i as isMap } from './defaults-0743f523.mjs';
+import * as t from '@babel/types';
 import postcss from 'postcss';
 import { p as postcssWeappTailwindcss } from './postcss-a551ddc0.mjs';
 import postcssIsPseudoClass from '@csstools/postcss-is-pseudo-class';
@@ -14,7 +15,7 @@ import path from 'node:path';
 import fs from 'node:fs';
 import { gte } from 'semver';
 import { monkeyPatchForExposingContext, requireResolve, TailwindcssPatcher } from 'tailwindcss-patch';
-import { ClassGenerator, defaultMangleClassFilter } from 'tailwindcss-mangle-shared';
+import { ClassGenerator, defaultMangleClassFilter } from '@tailwindcss-mangle/shared';
 
 const validateFilterRE = /[\w%-?\u00A0-\uFFFF-]/;
 function isValidSelector(selector = '') {
@@ -25,9 +26,33 @@ const splitCode = (code, allowDoubleQuotes = false) => {
     return code.split(splitter).filter((element) => isValidSelector(element));
 };
 
-const isProd = () => process.env.NODE_ENV === 'production';
-
-function handleValue(str, node, options) {
+function jsStringEscape(str) {
+    return ('' + str).replaceAll(/[\n\r"'\\\u2028\u2029]/g, (character) => {
+        switch (character) {
+            case '"':
+            case "'":
+            case '\\': {
+                return '\\' + character;
+            }
+            case '\n': {
+                return '\\n';
+            }
+            case '\r': {
+                return '\\r';
+            }
+            case '\u2028': {
+                return '\\u2028';
+            }
+            case '\u2029': {
+                return '\\u2029';
+            }
+            default: {
+                return character;
+            }
+        }
+    });
+}
+function regenerateHandleValue(str, node, options) {
     var _a;
     const set = options.classNameSet;
     const escapeMap = options.escapeMap;
@@ -54,44 +79,126 @@ function handleValue(str, node, options) {
     }
     return rawStr;
 }
+function replaceHandleValue(str, node, options, ms, offset = 0, needEscaped = false) {
+    var _a;
+    const set = options.classNameSet;
+    const escapeMap = options.escapeMap;
+    const allowDoubleQuotes = (_a = options.arbitraryValues) === null || _a === void 0 ? void 0 : _a.allowDoubleQuotes;
+    const ctx = options.mangleContext;
+    const jsPreserveClass = options.jsPreserveClass;
+    const arr = splitCode(str, allowDoubleQuotes);
+    let rawStr = str;
+    for (const v of arr) {
+        if (set.has(v) && !(jsPreserveClass === null || jsPreserveClass === void 0 ? void 0 : jsPreserveClass(v))) {
+            let ignoreFlag = false;
+            if (Array.isArray(node.leadingComments)) {
+                ignoreFlag = node.leadingComments.findIndex((x) => x.value.includes('weapp-tw') && x.value.includes('ignore')) > -1;
+            }
+            if (!ignoreFlag) {
+                if (ctx) {
+                    rawStr = ctx.jsHandler(rawStr);
+                }
+                rawStr = rawStr.replaceAll(new RegExp(escapeStringRegexp(v), 'g'), replaceWxml(v, {
+                    escapeMap
+                }));
+            }
+        }
+    }
+    if (typeof node.start === 'number' && typeof node.end === 'number') {
+        const start = node.start + offset;
+        const end = node.end - offset;
+        if (start < end) {
+            ms.update(node.start + offset, node.end - offset, needEscaped ? jsStringEscape(rawStr) : rawStr);
+        }
+    }
+    return rawStr;
+}
+
+const isProd = () => process.env.NODE_ENV === 'production';
+
 function jsHandler(rawSource, options) {
     var _a;
     const ast = parse(rawSource, {
         sourceType: 'unambiguous'
     });
-    const topt = {
-        StringLiteral: {
-            enter(p) {
-                const n = p.node;
-                n.value = handleValue(n.value, n, options);
-            }
-        },
-        TemplateElement: {
-            enter(p) {
-                const n = p.node;
-                n.value.raw = handleValue(n.value.raw, n, options);
+    if (options.strategy === 'replace') {
+        const ms = new MagicString(rawSource);
+        const ropt = {
+            StringLiteral: {
+                enter(p) {
+                    const n = p.node;
+                    replaceHandleValue(n.value, n, options, ms, 1, true);
+                }
+            },
+            TemplateElement: {
+                enter(p) {
+                    const n = p.node;
+                    replaceHandleValue(n.value.raw, n, options, ms, 0, false);
+                }
+            },
+            CallExpression: {
+                enter(p) {
+                    const calleePath = p.get('callee');
+                    if (calleePath.isIdentifier() && calleePath.node.name === 'eval') {
+                        p.traverse({
+                            StringLiteral: {
+                                enter(s) {
+                                    const res = jsHandler(s.node.value, options);
+                                    if (res.code) {
+                                        s.node.value = res.code;
+                                    }
+                                }
+                            }
+                        });
+                    }
+                }
             }
-        },
-        CallExpression: {
-            enter(p) {
-                const n = p.node;
-                if (t.isIdentifier(n.callee) && n.callee.name === 'eval' && t.isStringLiteral(n.arguments[0])) {
-                    const res = jsHandler(n.arguments[0].value, options);
-                    if (res.code) {
-                        n.arguments[0].value = res.code;
+        };
+        traverse(ast, ropt);
+        return {
+            code: ms.toString()
+        };
+    }
+    else {
+        const gopt = {
+            StringLiteral: {
+                enter(p) {
+                    const n = p.node;
+                    n.value = regenerateHandleValue(n.value, n, options);
+                }
+            },
+            TemplateElement: {
+                enter(p) {
+                    const n = p.node;
+                    n.value.raw = regenerateHandleValue(n.value.raw, n, options);
+                }
+            },
+            CallExpression: {
+                enter(p) {
+                    const calleePath = p.get('callee');
+                    if (calleePath.isIdentifier() && calleePath.node.name === 'eval') {
+                        p.traverse({
+                            StringLiteral: {
+                                enter(s) {
+                                    const res = jsHandler(s.node.value, options);
+                                    if (res.code) {
+                                        s.node.value = res.code;
+                                    }
+                                }
+                            }
+                        });
                     }
                 }
             }
-        },
-        noScope: true
-    };
-    traverse(ast, topt);
-    return generate(ast, {
-        minified: (_a = options.minifiedJs) !== null && _a !== void 0 ? _a : isProd()
-    });
+        };
+        traverse(ast, gopt);
+        return generate(ast, {
+            minified: (_a = options.minifiedJs) !== null && _a !== void 0 ? _a : isProd()
+        });
+    }
 }
 function createjsHandler(options) {
-    const { mangleContext, arbitraryValues, minifiedJs, escapeMap, jsPreserveClass } = options;
+    const { mangleContext, arbitraryValues, minifiedJs, escapeMap, jsPreserveClass, strategy } = options;
     return (rawSource, set) => {
         return jsHandler(rawSource, {
             classNameSet: set,
@@ -99,7 +206,8 @@ function createjsHandler(options) {
             escapeMap,
             arbitraryValues,
             mangleContext,
-            jsPreserveClass
+            jsPreserveClass,
+            strategy
         });
     };
 }
@@ -508,7 +616,7 @@ function getOptions(options = {}) {
     const result = defu(options, defaultOptions, {
         minifiedJs: isProd()
     });
-    const { cssPreflight, customRuleCallback, cssPreflightRange, replaceUniversalSelectorWith, customAttributes, customReplaceDictionary, supportCustomLengthUnitsPatch, arbitraryValues, cssChildCombinatorReplaceValue, inlineWxs, injectAdditionalCssVarScope, jsPreserveClass, disabledDefaultTemplateHandler } = result;
+    const { cssPreflight, customRuleCallback, cssPreflightRange, replaceUniversalSelectorWith, customAttributes, customReplaceDictionary, supportCustomLengthUnitsPatch, arbitraryValues, cssChildCombinatorReplaceValue, inlineWxs, injectAdditionalCssVarScope, jsPreserveClass, disabledDefaultTemplateHandler, jsEscapeStrategy } = result;
     result.escapeMap = customReplaceDictionary;
     const cssInjectPreflight = createInjectPreflight(cssPreflight);
     const customAttributesEntities = isMap(options.customAttributes)
@@ -533,7 +641,8 @@ function getOptions(options = {}) {
         escapeMap,
         mangleContext,
         arbitraryValues,
-        jsPreserveClass
+        jsPreserveClass,
+        strategy: jsEscapeStrategy
     });
     result.jsHandler = jsHandler;
     const templateHandler = createTemplateHandler({

package/dist/{options-43afee21.js → options-b7411c31.js}

@@ -1,13 +1,14 @@
 'use strict';
 
 var micromatch = require('micromatch');
-var t = require('@babel/types');
+var MagicString = require('magic-string');
+var replace = require('./replace.js');
+var regex = require('@weapp-core/regex');
 var generate = require('@babel/generator');
 var parser = require('@babel/parser');
 var traverse = require('@babel/traverse');
-var replace = require('./replace.js');
-var regex = require('@weapp-core/regex');
-var defaults = require('./defaults-28cfeec8.js');
+var defaults = require('./defaults-344ba6d9.js');
+var t = require('@babel/types');
 var postcss = require('postcss');
 var postcss$1 = require('./postcss-4e99a8e8.js');
 var postcssIsPseudoClass = require('@csstools/postcss-is-pseudo-class');
@@ -16,7 +17,7 @@ var path = require('node:path');
 var fs = require('node:fs');
 var semver = require('semver');
 var tailwindcssPatch = require('tailwindcss-patch');
-var tailwindcssMangleShared = require('tailwindcss-mangle-shared');
+var shared = require('@tailwindcss-mangle/shared');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -38,9 +39,10 @@ function _interopNamespaceCompat(e) {
     return Object.freeze(n);
 }
 
-var t__namespace = /*#__PURE__*/_interopNamespaceCompat(t);
+var MagicString__default = /*#__PURE__*/_interopDefaultCompat(MagicString);
 var generate__default = /*#__PURE__*/_interopDefaultCompat(generate);
 var traverse__default = /*#__PURE__*/_interopDefaultCompat(traverse);
+var t__namespace = /*#__PURE__*/_interopNamespaceCompat(t);
 var postcss__default = /*#__PURE__*/_interopDefaultCompat(postcss);
 var postcssIsPseudoClass__default = /*#__PURE__*/_interopDefaultCompat(postcssIsPseudoClass);
 var path__default = /*#__PURE__*/_interopDefaultCompat(path);
@@ -55,9 +57,33 @@ const splitCode = (code, allowDoubleQuotes = false) => {
     return code.split(splitter).filter((element) => isValidSelector(element));
 };
 
-const isProd = () => process.env.NODE_ENV === 'production';
-
-function handleValue(str, node, options) {
+function jsStringEscape(str) {
+    return ('' + str).replaceAll(/[\n\r"'\\\u2028\u2029]/g, (character) => {
+        switch (character) {
+            case '"':
+            case "'":
+            case '\\': {
+                return '\\' + character;
+            }
+            case '\n': {
+                return '\\n';
+            }
+            case '\r': {
+                return '\\r';
+            }
+            case '\u2028': {
+                return '\\u2028';
+            }
+            case '\u2029': {
+                return '\\u2029';
+            }
+            default: {
+                return character;
+            }
+        }
+    });
+}
+function regenerateHandleValue(str, node, options) {
     var _a;
     const set = options.classNameSet;
     const escapeMap = options.escapeMap;
@@ -84,44 +110,126 @@ function handleValue(str, node, options) {
     }
     return rawStr;
 }
+function replaceHandleValue(str, node, options, ms, offset = 0, needEscaped = false) {
+    var _a;
+    const set = options.classNameSet;
+    const escapeMap = options.escapeMap;
+    const allowDoubleQuotes = (_a = options.arbitraryValues) === null || _a === void 0 ? void 0 : _a.allowDoubleQuotes;
+    const ctx = options.mangleContext;
+    const jsPreserveClass = options.jsPreserveClass;
+    const arr = splitCode(str, allowDoubleQuotes);
+    let rawStr = str;
+    for (const v of arr) {
+        if (set.has(v) && !(jsPreserveClass === null || jsPreserveClass === void 0 ? void 0 : jsPreserveClass(v))) {
+            let ignoreFlag = false;
+            if (Array.isArray(node.leadingComments)) {
+                ignoreFlag = node.leadingComments.findIndex((x) => x.value.includes('weapp-tw') && x.value.includes('ignore')) > -1;
+            }
+            if (!ignoreFlag) {
+                if (ctx) {
+                    rawStr = ctx.jsHandler(rawStr);
+                }
+                rawStr = rawStr.replaceAll(new RegExp(regex.escapeStringRegexp(v), 'g'), replace.replaceJs(v, {
+                    escapeMap
+                }));
+            }
+        }
+    }
+    if (typeof node.start === 'number' && typeof node.end === 'number') {
+        const start = node.start + offset;
+        const end = node.end - offset;
+        if (start < end) {
+            ms.update(node.start + offset, node.end - offset, needEscaped ? jsStringEscape(rawStr) : rawStr);
+        }
+    }
+    return rawStr;
+}
+
+const isProd = () => process.env.NODE_ENV === 'production';
+
 function jsHandler(rawSource, options) {
     var _a;
     const ast = parser.parse(rawSource, {
         sourceType: 'unambiguous'
     });
-    const topt = {
-        StringLiteral: {
-            enter(p) {
-                const n = p.node;
-                n.value = handleValue(n.value, n, options);
-            }
-        },
-        TemplateElement: {
-            enter(p) {
-                const n = p.node;
-                n.value.raw = handleValue(n.value.raw, n, options);
+    if (options.strategy === 'replace') {
+        const ms = new MagicString__default["default"](rawSource);
+        const ropt = {
+            StringLiteral: {
+                enter(p) {
+                    const n = p.node;
+                    replaceHandleValue(n.value, n, options, ms, 1, true);
+                }
+            },
+            TemplateElement: {
+                enter(p) {
+                    const n = p.node;
+                    replaceHandleValue(n.value.raw, n, options, ms, 0, false);
+                }
+            },
+            CallExpression: {
+                enter(p) {
+                    const calleePath = p.get('callee');
+                    if (calleePath.isIdentifier() && calleePath.node.name === 'eval') {
+                        p.traverse({
+                            StringLiteral: {
+                                enter(s) {
+                                    const res = jsHandler(s.node.value, options);
+                                    if (res.code) {
+                                        s.node.value = res.code;
+                                    }
+                                }
+                            }
+                        });
+                    }
+                }
             }
-        },
-        CallExpression: {
-            enter(p) {
-                const n = p.node;
-                if (t__namespace.isIdentifier(n.callee) && n.callee.name === 'eval' && t__namespace.isStringLiteral(n.arguments[0])) {
-                    const res = jsHandler(n.arguments[0].value, options);
-                    if (res.code) {
-                        n.arguments[0].value = res.code;
+        };
+        traverse__default["default"](ast, ropt);
+        return {
+            code: ms.toString()
+        };
+    }
+    else {
+        const gopt = {
+            StringLiteral: {
+                enter(p) {
+                    const n = p.node;
+                    n.value = regenerateHandleValue(n.value, n, options);
+                }
+            },
+            TemplateElement: {
+                enter(p) {
+                    const n = p.node;
+                    n.value.raw = regenerateHandleValue(n.value.raw, n, options);
+                }
+            },
+            CallExpression: {
+                enter(p) {
+                    const calleePath = p.get('callee');
+                    if (calleePath.isIdentifier() && calleePath.node.name === 'eval') {
+                        p.traverse({
+                            StringLiteral: {
+                                enter(s) {
+                                    const res = jsHandler(s.node.value, options);
+                                    if (res.code) {
+                                        s.node.value = res.code;
+                                    }
+                                }
+                            }
+                        });
                     }
                 }
             }
-        },
-        noScope: true
-    };
-    traverse__default["default"](ast, topt);
-    return generate__default["default"](ast, {
-        minified: (_a = options.minifiedJs) !== null && _a !== void 0 ? _a : isProd()
-    });
+        };
+        traverse__default["default"](ast, gopt);
+        return generate__default["default"](ast, {
+            minified: (_a = options.minifiedJs) !== null && _a !== void 0 ? _a : isProd()
+        });
+    }
 }
 function createjsHandler(options) {
-    const { mangleContext, arbitraryValues, minifiedJs, escapeMap, jsPreserveClass } = options;
+    const { mangleContext, arbitraryValues, minifiedJs, escapeMap, jsPreserveClass, strategy } = options;
     return (rawSource, set) => {
         return jsHandler(rawSource, {
             classNameSet: set,
@@ -129,7 +237,8 @@ function createjsHandler(options) {
             escapeMap,
             arbitraryValues,
             mangleContext,
-            jsPreserveClass
+            jsPreserveClass,
+            strategy
         });
     };
 }
@@ -450,8 +559,8 @@ function getSelf(x) {
 const defaultMangleContext = {
     rawOptions: false,
     runtimeSet: new Set(),
-    classGenerator: new tailwindcssMangleShared.ClassGenerator(),
-    filter: tailwindcssMangleShared.defaultMangleClassFilter,
+    classGenerator: new shared.ClassGenerator(),
+    filter: shared.defaultMangleClassFilter,
     cssHandler: getSelf,
     jsHandler: getSelf,
     wxmlHandler: getSelf
@@ -477,11 +586,11 @@ function useMangleStore() {
             if (options === true) {
                 options = {
                     classGenerator: {},
-                    mangleClassFilter: tailwindcssMangleShared.defaultMangleClassFilter
+                    mangleClassFilter: shared.defaultMangleClassFilter
                 };
             }
-            ctx.classGenerator = new tailwindcssMangleShared.ClassGenerator(options.classGenerator);
-            ctx.filter = (_a = options.mangleClassFilter) !== null && _a !== void 0 ? _a : tailwindcssMangleShared.defaultMangleClassFilter;
+            ctx.classGenerator = new shared.ClassGenerator(options.classGenerator);
+            ctx.filter = (_a = options.mangleClassFilter) !== null && _a !== void 0 ? _a : shared.defaultMangleClassFilter;
             ctx.jsHandler = (rawSource) => {
                 return handleValue(rawSource);
             };
@@ -538,7 +647,7 @@ function getOptions(options = {}) {
     const result = defu(options, defaults.defaultOptions, {
         minifiedJs: isProd()
     });
-    const { cssPreflight, customRuleCallback, cssPreflightRange, replaceUniversalSelectorWith, customAttributes, customReplaceDictionary, supportCustomLengthUnitsPatch, arbitraryValues, cssChildCombinatorReplaceValue, inlineWxs, injectAdditionalCssVarScope, jsPreserveClass, disabledDefaultTemplateHandler } = result;
+    const { cssPreflight, customRuleCallback, cssPreflightRange, replaceUniversalSelectorWith, customAttributes, customReplaceDictionary, supportCustomLengthUnitsPatch, arbitraryValues, cssChildCombinatorReplaceValue, inlineWxs, injectAdditionalCssVarScope, jsPreserveClass, disabledDefaultTemplateHandler, jsEscapeStrategy } = result;
     result.escapeMap = customReplaceDictionary;
     const cssInjectPreflight = createInjectPreflight(cssPreflight);
     const customAttributesEntities = defaults.isMap(options.customAttributes)
@@ -563,7 +672,8 @@ function getOptions(options = {}) {
         escapeMap,
         mangleContext,
         arbitraryValues,
-        jsPreserveClass
+        jsPreserveClass,
+        strategy: jsEscapeStrategy
     });
     result.jsHandler = jsHandler;
     const templateHandler = createTemplateHandler({

package/dist/types.d.ts

@@ -1,6 +1,5 @@
 import type { Rule } from 'postcss';
-import type { IClassGeneratorOptions, ClassGenerator } from 'tailwindcss-mangle-shared';
-import type { GeneratorResult } from '@babel/generator';
+import type { IClassGeneratorOptions, ClassGenerator } from '@tailwindcss-mangle/shared';
 import type { InjectPreflight } from './postcss/preflight';
 export type ItemOrItemArray<T> = T | T[];
 export type AppType = 'uni-app' | 'uni-app-vite' | 'taro' | 'remax' | 'rax' | 'native' | 'kbone' | 'mpx';
@@ -39,6 +38,7 @@ export type IJsHandlerOptions = {
     arbitraryValues?: IArbitraryValues;
     mangleContext?: IMangleScopeContext;
     jsPreserveClass?: (keyword: string) => boolean | undefined;
+    strategy?: UserDefinedOptions['jsEscapeStrategy'];
 };
 export interface RawSource {
     start: number;
@@ -94,6 +94,7 @@ export interface UserDefinedOptions {
     injectAdditionalCssVarScope?: boolean;
     jsPreserveClass?: (keyword: string) => boolean | undefined;
     disabledDefaultTemplateHandler?: boolean;
+    jsEscapeStrategy?: 'regenerate' | 'replace';
 }
 export interface IMangleScopeContext {
     rawOptions: UserDefinedOptions['mangle'];
@@ -113,7 +114,9 @@ export interface ITemplateHandlerOptions extends ICommonReplaceOptions {
     escapeMap?: Record<string, string>;
     mangleContext?: IMangleScopeContext;
     inlineWxs?: boolean;
-    jsHandler?: (rawSource: string, set: Set<string>) => GeneratorResult;
+    jsHandler?: (rawSource: string, set: Set<string>) => {
+        code: string;
+    };
     runtimeSet?: Set<string>;
     disabledDefaultTemplateHandler?: boolean;
 }
@@ -124,7 +127,9 @@ export type InternalUserDefinedOptions = Required<Omit<UserDefinedOptions, GlobO
     supportCustomLengthUnitsPatch: ILengthUnitsPatchOptions | false;
     templateHandler: (rawSource: string, options?: ITemplateHandlerOptions) => string;
     styleHandler: (rawSource: string, options: IStyleHandlerOptions) => string;
-    jsHandler: (rawSource: string, set: Set<string>) => GeneratorResult;
+    jsHandler: (rawSource: string, set: Set<string>) => {
+        code: string;
+    };
     escapeMap: Record<string, string>;
     patch: () => void;
     customReplaceDictionary: Record<string, string>;

package/dist/vite.js

@@ -2,25 +2,26 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var options = require('./options-43afee21.js');
+var options = require('./options-b7411c31.js');
 var postcss = require('./postcss-4e99a8e8.js');
-var defaults = require('./defaults-28cfeec8.js');
+var defaults = require('./defaults-344ba6d9.js');
 require('micromatch');
-require('@babel/types');
-require('@babel/generator');
-require('@babel/parser');
-require('@babel/traverse');
+require('magic-string');
 require('./replace.js');
 require('@weapp-core/escape');
 require('./shared-df9de23f.js');
 require('@weapp-core/regex');
+require('@babel/generator');
+require('@babel/parser');
+require('@babel/traverse');
+require('@babel/types');
 require('postcss');
 require('@csstools/postcss-is-pseudo-class');
 require('node:path');
 require('node:fs');
 require('semver');
 require('tailwindcss-patch');
-require('tailwindcss-mangle-shared');
+require('@tailwindcss-mangle/shared');
 require('postcss-selector-parser');
 
 function UnifiedViteWeappTailwindcssPlugin(options$1 = {}) {

package/dist/vite.mjs

@@ -1,22 +1,23 @@
-import { g as getOptions, a as createTailwindcssPatcher } from './options-d8cb9e14.mjs';
+import { g as getOptions, a as createTailwindcssPatcher } from './options-8805cf56.mjs';
 import { v as vitePluginName } from './postcss-a551ddc0.mjs';
-import { g as getGroupedEntries } from './defaults-702719e1.mjs';
+import { g as getGroupedEntries } from './defaults-0743f523.mjs';
 import 'micromatch';
-import '@babel/types';
-import '@babel/generator';
-import '@babel/parser';
-import '@babel/traverse';
+import 'magic-string';
 import './replace.mjs';
 import '@weapp-core/escape';
 import './shared-fd149084.mjs';
 import '@weapp-core/regex';
+import '@babel/generator';
+import '@babel/parser';
+import '@babel/traverse';
+import '@babel/types';
 import 'postcss';
 import '@csstools/postcss-is-pseudo-class';
 import 'node:path';
 import 'node:fs';
 import 'semver';
 import 'tailwindcss-patch';
-import 'tailwindcss-mangle-shared';
+import '@tailwindcss-mangle/shared';
 import 'postcss-selector-parser';
 
 function UnifiedViteWeappTailwindcssPlugin(options = {}) {

package/dist/webpack.js

@@ -4,23 +4,24 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var path = require('node:path');
 var fs = require('node:fs');
-var options = require('./options-43afee21.js');
+var options = require('./options-b7411c31.js');
 var postcss = require('./postcss-4e99a8e8.js');
-var defaults = require('./defaults-28cfeec8.js');
+var defaults = require('./defaults-344ba6d9.js');
 require('micromatch');
-require('@babel/types');
-require('@babel/generator');
-require('@babel/parser');
-require('@babel/traverse');
+require('magic-string');
 require('./replace.js');
 require('@weapp-core/escape');
 require('./shared-df9de23f.js');
 require('@weapp-core/regex');
+require('@babel/generator');
+require('@babel/parser');
+require('@babel/traverse');
+require('@babel/types');
 require('postcss');
 require('@csstools/postcss-is-pseudo-class');
 require('semver');
 require('tailwindcss-patch');
-require('tailwindcss-mangle-shared');
+require('@tailwindcss-mangle/shared');
 require('postcss-selector-parser');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }

package/dist/webpack.mjs

@@ -1,22 +1,23 @@
 import path from 'node:path';
 import fs from 'node:fs';
-import { g as getOptions, a as createTailwindcssPatcher } from './options-d8cb9e14.mjs';
+import { g as getOptions, a as createTailwindcssPatcher } from './options-8805cf56.mjs';
 import { a as pluginName } from './postcss-a551ddc0.mjs';
-import { g as getGroupedEntries } from './defaults-702719e1.mjs';
+import { g as getGroupedEntries } from './defaults-0743f523.mjs';
 import 'micromatch';
-import '@babel/types';
-import '@babel/generator';
-import '@babel/parser';
-import '@babel/traverse';
+import 'magic-string';
 import './replace.mjs';
 import '@weapp-core/escape';
 import './shared-fd149084.mjs';
 import '@weapp-core/regex';
+import '@babel/generator';
+import '@babel/parser';
+import '@babel/traverse';
+import '@babel/types';
 import 'postcss';
 import '@csstools/postcss-is-pseudo-class';
 import 'semver';
 import 'tailwindcss-patch';
-import 'tailwindcss-mangle-shared';
+import '@tailwindcss-mangle/shared';
 import 'postcss-selector-parser';
 
 class UnifiedWebpackPluginV5 {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "weapp-tailwindcss",
-  "version": "2.6.3",
+  "version": "2.7.1",
   "description": "把tailwindcss jit引擎，带给小程序开发者们\nbring tailwindcss jit engine to our miniprogram developers!",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -102,8 +102,8 @@
   },
   "homepage": "https://weapp-tw.icebreaker.top",
   "devDependencies": {
-    "@babel/core": "^7.22.9",
-    "@icebreakers/cli": "^0.1.1",
+    "@babel/core": "^7.22.10",
+    "@icebreakers/cli": "0.1.1",
     "@icebreakers/readme": "0.1.0",
     "@rollup/plugin-alias": "^5.0.0",
     "@rollup/plugin-commonjs": "^25.0.3",
@@ -118,46 +118,49 @@
     "@types/gulp": "^4.0.13",
     "@types/gulp-postcss": "^8.0.3",
     "@types/jest": "^29.5.3",
+    "@types/js-beautify": "^1.14.0",
     "@types/klaw": "^3.0.3",
     "@types/loader-utils": "^2.0.3",
-    "@types/lodash": "^4.14.196",
+    "@types/lodash": "^4.14.197",
     "@types/micromatch": "^4.0.2",
-    "@types/node": "^20.4.5",
+    "@types/node": "^20.4.9",
     "@types/semver": "^7.5.0",
     "@types/vinyl": "^2.0.7",
     "@types/webpack": "^5.28.1",
     "@types/webpack-sources": "^3.2.0",
-    "@vitest/coverage-v8": "^0.33.0",
+    "@vitest/coverage-v8": "^0.34.1",
     "autoprefixer": "^10.4.14",
     "babel-loader": "^9.1.3",
     "bumpp": "^9.1.1",
     "colorette": "^2.0.20",
     "cross-env": "^7.0.3",
     "css-loader": "^6.8.1",
+    "dedent": "^1.5.1",
     "defu": "6.1.2",
     "del": "^7.0.0",
-    "eslint": "8.45.0",
+    "eslint": "8.46.0",
     "eslint-config-icebreaker": "^1.2.2",
-    "eslint-config-prettier": "^8.8.0",
-    "eslint-plugin-prettier": "^4.2.1",
+    "eslint-config-prettier": "^9.0.0",
+    "eslint-plugin-prettier": "^5.0.0",
+    "execa": "^7.2.0",
     "fast-glob": "^3.3.1",
     "fs-extra": "^11.1.1",
     "gulp": "^4.0.2",
     "gulp-postcss": "^9.0.1",
     "html-loader": "^4.2.0",
-    "jest": "^29.6.1",
+    "jest": "^29.6.2",
+    "js-beautify": "^1.14.9",
     "klaw": "^4.1.0",
     "lodash": "^4.17.21",
-    "magic-string": "^0.30.1",
     "mini-css-extract-plugin": "^2.7.6",
     "miniprogram-automator": "^0.12.0",
     "pkg-types": "^1.0.3",
     "postcss-load-config": "^4.0.1",
     "postcss-loader": "^7.3.3",
     "postcss-rem-to-responsive-pixel": "^5.1.3",
-    "prettier": "^2.8.8",
+    "prettier": "^3.0.1",
     "promisify-loader-runner": "^1.0.0",
-    "rollup": "^3.26.3",
+    "rollup": "^3.28.0",
     "rollup-plugin-visualizer": "^5.9.2",
     "style-loader": "^3.3.3",
     "tailwind-children": "^0.5.0",
@@ -170,29 +173,33 @@
     "typescript": "^5.1.6",
     "typescript-transform-paths": "^3.4.6",
     "vinyl": "^3.0.0",
-    "vite": "^4.4.7",
-    "vitest": "^0.33.0",
+    "vite": "^4.4.9",
+    "vitest": "^0.34.1",
     "weapp-tailwindcss-children": "^0.1.0",
     "webpack": "^5.88.2",
     "webpack-build-utils": "^0.0.4"
   },
   "dependencies": {
-    "@babel/generator": "^7.22.9",
-    "@babel/parser": "^7.22.7",
-    "@babel/traverse": "^7.22.8",
-    "@babel/types": "^7.22.5",
+    "@babel/generator": "^7.22.10",
+    "@babel/parser": "^7.22.10",
+    "@babel/traverse": "^7.22.10",
+    "@babel/types": "^7.22.10",
     "@csstools/postcss-is-pseudo-class": "^4.0.0",
+    "@tailwindcss-mangle/shared": "^2.0.4",
     "@weapp-core/escape": "^1.0.0",
     "@weapp-core/regex": "^1.0.0",
     "loader-utils": "^2.0.3",
+    "magic-string": "^0.30.2",
     "micromatch": "^4.0.5",
     "postcss": "8.4.27",
     "postcss-selector-parser": "^6.0.13",
     "semver": "^7.5.4",
-    "tailwindcss-mangle-shared": "^1.2.7",
-    "tailwindcss-patch": "^1.2.7"
+    "tailwindcss-patch": "^2.0.4"
+  },
+  "packageManager": "pnpm@8.6.11",
+  "engines": {
+    "node": ">=16.6.0"
   },
-  "packageManager": "pnpm@8.6.9",
   "scripts": {
     "dev": "yarn clean && yarn dts && cross-env NODE_ENV=development rollup -c rollup.config.ts --configPlugin typescript -w",
     "build": "yarn clean && cross-env NODE_ENV=production rollup -c rollup.config.ts --configPlugin typescript && yarn dts",