weapp-tailwindcss 2.8.0 → 2.8.1

package/dist/cli.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var options = require('./options-7b804be0.js');
+var options = require('./options-4284d635.js');
 require('micromatch');
 require('magic-string');
 require('./replace.js');

package/dist/cli.mjs

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

package/dist/gulp.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var stream = require('node:stream');
-var options = require('./options-7b804be0.js');
+var options = require('./options-4284d635.js');
 require('micromatch');
 require('magic-string');
 require('./replace.js');

package/dist/gulp.mjs

@@ -1,5 +1,5 @@
 import stream from 'node:stream';
-import { g as getOptions, a as createTailwindcssPatcher } from './options-70759e98.mjs';
+import { g as getOptions, a as createTailwindcssPatcher } from './options-ad0be036.mjs';
 import 'micromatch';
 import 'magic-string';
 import './replace.mjs';

package/dist/index.js

@@ -7,7 +7,7 @@ var vite = require('./vite.js');
 var gulp = require('./gulp.js');
 require('node:path');
 require('node:fs');
-require('./options-7b804be0.js');
+require('./options-4284d635.js');
 require('micromatch');
 require('magic-string');
 require('./replace.js');

package/dist/index.mjs

@@ -3,7 +3,7 @@ export { UnifiedViteWeappTailwindcssPlugin } from './vite.mjs';
 export { createPlugins } from './gulp.mjs';
 import 'node:path';
 import 'node:fs';
-import './options-70759e98.mjs';
+import './options-ad0be036.mjs';
 import 'micromatch';
 import 'magic-string';
 import './replace.mjs';

package/dist/{options-7b804be0.js → options-4284d635.js}

@@ -113,8 +113,9 @@ function replaceHandleValue(str, node, options, ms, offset = 0, needEscaped = fa
     if (typeof node.start === 'number' && typeof node.end === 'number') {
         const start = node.start + offset;
         const end = node.end - offset;
-        if (start < end) {
-            ms.update(start, end, needEscaped ? escape.jsStringEscape(rawStr) : rawStr);
+        if (start < end && str !== rawStr) {
+            const content = needEscaped ? escape.jsStringEscape(rawStr) : rawStr;
+            ms.update(start, end, content);
         }
     }
     return rawStr;
@@ -122,6 +123,13 @@ function replaceHandleValue(str, node, options, ms, offset = 0, needEscaped = fa
 
 const isProd = () => process.env.NODE_ENV === 'production';
 
+function isEvalPath(p) {
+    if (p.isCallExpression()) {
+        const calleePath = p.get('callee');
+        return calleePath.isIdentifier() && calleePath.node.name === 'eval';
+    }
+    return false;
+}
 function jsHandler(rawSource, options) {
     var _a;
     const ast = parser.parse(rawSource, {
@@ -132,26 +140,56 @@ function jsHandler(rawSource, options) {
         const ropt = {
             StringLiteral: {
                 enter(p) {
+                    var _a;
+                    if (isEvalPath(p.parentPath)) {
+                        return;
+                    }
                     const n = p.node;
-                    replaceHandleValue(n.value, n, options, ms, 1, true);
+                    replaceHandleValue(n.value, n, options, ms, 1, (_a = options.needEscaped) !== null && _a !== void 0 ? _a : true);
                 }
             },
             TemplateElement: {
                 enter(p) {
+                    if (p.parentPath.isTemplateLiteral() && isEvalPath(p.parentPath.parentPath)) {
+                        return;
+                    }
                     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') {
+                    if (isEvalPath(p)) {
                         p.traverse({
                             StringLiteral: {
                                 enter(s) {
-                                    const res = jsHandler(s.node.value, options);
+                                    const res = jsHandler(s.node.value, Object.assign(Object.assign({}, options), { needEscaped: false }));
                                     if (res.code) {
-                                        s.node.value = res.code;
+                                        const node = s.node;
+                                        if (typeof node.start === 'number' && typeof node.end === 'number') {
+                                            const start = node.start + 1;
+                                            const end = node.end - 1;
+                                            if (start < end && s.node.value !== res.code) {
+                                                ms.update(start, end, escape.jsStringEscape(res.code));
+                                                node.value = res.code;
+                                            }
+                                        }
+                                    }
+                                }
+                            },
+                            TemplateElement: {
+                                enter(s) {
+                                    const res = jsHandler(s.node.value.raw, options);
+                                    if (res.code) {
+                                        const node = s.node;
+                                        if (typeof node.start === 'number' && typeof node.end === 'number') {
+                                            const start = node.start;
+                                            const end = node.end;
+                                            if (start < end && s.node.value.raw !== res.code) {
+                                                ms.update(start, end, res.code);
+                                                s.node.value.raw = res.code;
+                                            }
+                                        }
                                     }
                                 }
                             }
@@ -169,20 +207,25 @@ function jsHandler(rawSource, options) {
         const gopt = {
             StringLiteral: {
                 enter(p) {
+                    if (isEvalPath(p.parentPath)) {
+                        return;
+                    }
                     const n = p.node;
                     n.value = regenerateHandleValue(n.value, n, options);
                 }
             },
             TemplateElement: {
                 enter(p) {
+                    if (p.parentPath.isTemplateLiteral() && isEvalPath(p.parentPath.parentPath)) {
+                        return;
+                    }
                     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') {
+                    if (isEvalPath(p)) {
                         p.traverse({
                             StringLiteral: {
                                 enter(s) {
@@ -191,6 +234,14 @@ function jsHandler(rawSource, options) {
                                         s.node.value = res.code;
                                     }
                                 }
+                            },
+                            TemplateElement: {
+                                enter(s) {
+                                    const res = jsHandler(s.node.value.raw, options);
+                                    if (res.code) {
+                                        s.node.value.raw = res.code;
+                                    }
+                                }
                             }
                         });
                     }

package/dist/{options-70759e98.mjs → options-ad0be036.mjs}

@@ -82,8 +82,9 @@ function replaceHandleValue(str, node, options, ms, offset = 0, needEscaped = fa
     if (typeof node.start === 'number' && typeof node.end === 'number') {
         const start = node.start + offset;
         const end = node.end - offset;
-        if (start < end) {
-            ms.update(start, end, needEscaped ? jsStringEscape(rawStr) : rawStr);
+        if (start < end && str !== rawStr) {
+            const content = needEscaped ? jsStringEscape(rawStr) : rawStr;
+            ms.update(start, end, content);
         }
     }
     return rawStr;
@@ -91,6 +92,13 @@ function replaceHandleValue(str, node, options, ms, offset = 0, needEscaped = fa
 
 const isProd = () => process.env.NODE_ENV === 'production';
 
+function isEvalPath(p) {
+    if (p.isCallExpression()) {
+        const calleePath = p.get('callee');
+        return calleePath.isIdentifier() && calleePath.node.name === 'eval';
+    }
+    return false;
+}
 function jsHandler(rawSource, options) {
     var _a;
     const ast = parse(rawSource, {
@@ -101,26 +109,56 @@ function jsHandler(rawSource, options) {
         const ropt = {
             StringLiteral: {
                 enter(p) {
+                    var _a;
+                    if (isEvalPath(p.parentPath)) {
+                        return;
+                    }
                     const n = p.node;
-                    replaceHandleValue(n.value, n, options, ms, 1, true);
+                    replaceHandleValue(n.value, n, options, ms, 1, (_a = options.needEscaped) !== null && _a !== void 0 ? _a : true);
                 }
             },
             TemplateElement: {
                 enter(p) {
+                    if (p.parentPath.isTemplateLiteral() && isEvalPath(p.parentPath.parentPath)) {
+                        return;
+                    }
                     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') {
+                    if (isEvalPath(p)) {
                         p.traverse({
                             StringLiteral: {
                                 enter(s) {
-                                    const res = jsHandler(s.node.value, options);
+                                    const res = jsHandler(s.node.value, Object.assign(Object.assign({}, options), { needEscaped: false }));
                                     if (res.code) {
-                                        s.node.value = res.code;
+                                        const node = s.node;
+                                        if (typeof node.start === 'number' && typeof node.end === 'number') {
+                                            const start = node.start + 1;
+                                            const end = node.end - 1;
+                                            if (start < end && s.node.value !== res.code) {
+                                                ms.update(start, end, jsStringEscape(res.code));
+                                                node.value = res.code;
+                                            }
+                                        }
+                                    }
+                                }
+                            },
+                            TemplateElement: {
+                                enter(s) {
+                                    const res = jsHandler(s.node.value.raw, options);
+                                    if (res.code) {
+                                        const node = s.node;
+                                        if (typeof node.start === 'number' && typeof node.end === 'number') {
+                                            const start = node.start;
+                                            const end = node.end;
+                                            if (start < end && s.node.value.raw !== res.code) {
+                                                ms.update(start, end, res.code);
+                                                s.node.value.raw = res.code;
+                                            }
+                                        }
                                     }
                                 }
                             }
@@ -138,20 +176,25 @@ function jsHandler(rawSource, options) {
         const gopt = {
             StringLiteral: {
                 enter(p) {
+                    if (isEvalPath(p.parentPath)) {
+                        return;
+                    }
                     const n = p.node;
                     n.value = regenerateHandleValue(n.value, n, options);
                 }
             },
             TemplateElement: {
                 enter(p) {
+                    if (p.parentPath.isTemplateLiteral() && isEvalPath(p.parentPath.parentPath)) {
+                        return;
+                    }
                     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') {
+                    if (isEvalPath(p)) {
                         p.traverse({
                             StringLiteral: {
                                 enter(s) {
@@ -160,6 +203,14 @@ function jsHandler(rawSource, options) {
                                         s.node.value = res.code;
                                     }
                                 }
+                            },
+                            TemplateElement: {
+                                enter(s) {
+                                    const res = jsHandler(s.node.value.raw, options);
+                                    if (res.code) {
+                                        s.node.value.raw = res.code;
+                                    }
+                                }
                             }
                         });
                     }

package/dist/types.d.ts

@@ -39,6 +39,7 @@ export type IJsHandlerOptions = {
     mangleContext?: IMangleScopeContext;
     jsPreserveClass?: (keyword: string) => boolean | undefined;
     strategy?: UserDefinedOptions['jsEscapeStrategy'];
+    needEscaped?: boolean;
 };
 export interface RawSource {
     start: number;
@@ -95,6 +96,7 @@ export interface UserDefinedOptions {
     jsPreserveClass?: (keyword: string) => boolean | undefined;
     disabledDefaultTemplateHandler?: boolean;
     jsEscapeStrategy?: 'regenerate' | 'replace';
+    runtimeLoaderPath?: string;
 }
 export interface IMangleScopeContext {
     rawOptions: UserDefinedOptions['mangle'];

package/dist/vite.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var options = require('./options-7b804be0.js');
+var options = require('./options-4284d635.js');
 var postcss = require('./postcss-4e99a8e8.js');
 var defaults = require('./defaults-c6437917.js');
 require('micromatch');

package/dist/vite.mjs

@@ -1,4 +1,4 @@
-import { g as getOptions, a as createTailwindcssPatcher } from './options-70759e98.mjs';
+import { g as getOptions, a as createTailwindcssPatcher } from './options-ad0be036.mjs';
 import { v as vitePluginName } from './postcss-a551ddc0.mjs';
 import { g as getGroupedEntries } from './defaults-72ea9566.mjs';
 import 'micromatch';

package/dist/webpack.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var path = require('node:path');
 var fs = require('node:fs');
-var options = require('./options-7b804be0.js');
+var options = require('./options-4284d635.js');
 var postcss = require('./postcss-4e99a8e8.js');
 var defaults = require('./defaults-c6437917.js');
 require('micromatch');
@@ -39,7 +39,7 @@ class UnifiedWebpackPluginV5 {
         this.appType = this.options.appType;
     }
     apply(compiler) {
-        const { mainCssChunkMatcher, disabled, onLoad, onUpdate, onEnd, onStart, styleHandler, patch, templateHandler, jsHandler, setMangleRuntimeSet } = this.options;
+        const { mainCssChunkMatcher, disabled, onLoad, onUpdate, onEnd, onStart, styleHandler, patch, templateHandler, jsHandler, setMangleRuntimeSet, runtimeLoaderPath } = this.options;
         if (disabled) {
             return;
         }
@@ -51,7 +51,7 @@ class UnifiedWebpackPluginV5 {
             return twPatcher.getClassSet();
         }
         onLoad();
-        const loader = path__default["default"].resolve(__dirname, './weapp-tw-runtime-loader.js');
+        const loader = runtimeLoaderPath !== null && runtimeLoaderPath !== void 0 ? runtimeLoaderPath : path__default["default"].resolve(__dirname, './weapp-tw-runtime-loader.js');
         const isExisted = fs__default["default"].existsSync(loader);
         const WeappTwRuntimeAopLoader = {
             loader,

package/dist/webpack.mjs

@@ -1,6 +1,6 @@
 import path from 'node:path';
 import fs from 'node:fs';
-import { g as getOptions, a as createTailwindcssPatcher } from './options-70759e98.mjs';
+import { g as getOptions, a as createTailwindcssPatcher } from './options-ad0be036.mjs';
 import { a as pluginName } from './postcss-a551ddc0.mjs';
 import { g as getGroupedEntries } from './defaults-72ea9566.mjs';
 import 'micromatch';
@@ -30,7 +30,7 @@ class UnifiedWebpackPluginV5 {
         this.appType = this.options.appType;
     }
     apply(compiler) {
-        const { mainCssChunkMatcher, disabled, onLoad, onUpdate, onEnd, onStart, styleHandler, patch, templateHandler, jsHandler, setMangleRuntimeSet } = this.options;
+        const { mainCssChunkMatcher, disabled, onLoad, onUpdate, onEnd, onStart, styleHandler, patch, templateHandler, jsHandler, setMangleRuntimeSet, runtimeLoaderPath } = this.options;
         if (disabled) {
             return;
         }
@@ -42,7 +42,7 @@ class UnifiedWebpackPluginV5 {
             return twPatcher.getClassSet();
         }
         onLoad();
-        const loader = path.resolve(__dirname, './weapp-tw-runtime-loader.js');
+        const loader = runtimeLoaderPath !== null && runtimeLoaderPath !== void 0 ? runtimeLoaderPath : path.resolve(__dirname, './weapp-tw-runtime-loader.js');
         const isExisted = fs.existsSync(loader);
         const WeappTwRuntimeAopLoader = {
             loader,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "weapp-tailwindcss",
-  "version": "2.8.0",
+  "version": "2.8.1",
   "description": "把tailwindcss jit引擎，带给小程序开发者们! bring tailwindcss jit engine to miniprogram developers!",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -108,7 +108,7 @@
     "@rollup/plugin-alias": "^5.0.0",
     "@rollup/plugin-commonjs": "^25.0.4",
     "@rollup/plugin-json": "^6.0.0",
-    "@rollup/plugin-node-resolve": "^15.1.0",
+    "@rollup/plugin-node-resolve": "^15.2.0",
     "@rollup/plugin-terser": "^0.4.3",
     "@rollup/plugin-typescript": "^11.1.2",
     "@tsconfig/recommended": "^1.0.2",
@@ -123,21 +123,22 @@
     "@types/loader-utils": "^2.0.3",
     "@types/lodash": "^4.14.197",
     "@types/micromatch": "^4.0.2",
-    "@types/node": "^20.5.0",
+    "@types/node": "^20.5.1",
     "@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.34.1",
+    "@vitest/coverage-v8": "^0.34.2",
     "autoprefixer": "^10.4.15",
     "babel-loader": "^9.1.3",
-    "bumpp": "^9.1.1",
+    "bumpp": "^9.2.0",
     "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",
+    "domhandler": "^5.0.3",
     "eslint": "8.47.0",
     "eslint-config-icebreaker": "^1.2.2",
     "eslint-config-prettier": "^9.0.0",
@@ -148,7 +149,7 @@
     "gulp": "^4.0.2",
     "gulp-postcss": "^9.0.1",
     "html-loader": "^4.2.0",
-    "jest": "^29.6.2",
+    "jest": "^29.6.3",
     "js-beautify": "^1.14.9",
     "klaw": "^4.1.0",
     "lodash": "^4.17.21",
@@ -158,7 +159,7 @@
     "postcss-load-config": "^4.0.1",
     "postcss-loader": "^7.3.3",
     "postcss-rem-to-responsive-pixel": "^5.1.3",
-    "prettier": "^3.0.1",
+    "prettier": "^3.0.2",
     "promisify-loader-runner": "^1.0.0",
     "rollup": "^3.28.0",
     "rollup-plugin-visualizer": "^5.9.2",
@@ -169,16 +170,15 @@
     "ts-node": "^10.9.1",
     "ts-patch": "^3.0.2",
     "tsd": "^0.28.1",
-    "tslib": "^2.6.1",
+    "tslib": "^2.6.2",
     "typescript": "^5.1.6",
     "typescript-transform-paths": "^3.4.6",
     "vinyl": "^3.0.0",
     "vite": "^4.4.9",
-    "vitest": "^0.34.1",
+    "vitest": "^0.34.2",
     "weapp-tailwindcss-children": "^0.1.0",
     "webpack": "^5.88.2",
-    "webpack-build-utils": "^0.0.4",
-    "domhandler": "^5.0.3"
+    "webpack-build-utils": "^0.0.4"
   },
   "dependencies": {
     "@babel/generator": "^7.22.10",
@@ -191,12 +191,12 @@
     "@weapp-core/regex": "^1.0.0",
     "htmlparser2": "^9.0.0",
     "loader-utils": "^2.0.3",
-    "magic-string": "^0.30.2",
+    "magic-string": "^0.30.3",
     "micromatch": "^4.0.5",
-    "postcss": "8.4.27",
+    "postcss": "8.4.28",
     "postcss-selector-parser": "^6.0.13",
     "semver": "^7.5.4",
-    "tailwindcss-patch": "^2.1.0"
+    "tailwindcss-patch": "^2.1.1"
   },
   "packageManager": "pnpm@8.6.12",
   "engines": {