weapp-tailwindcss 2.8.0 → 2.8.2

package/dist/cli.js

@@ -1,20 +1,21 @@
 'use strict';
 
-var options = require('./options-7b804be0.js');
+var options = require('./options-50d69eba.js');
 require('micromatch');
 require('magic-string');
 require('./replace.js');
 require('@weapp-core/escape');
-require('./shared-df9de23f.js');
+require('@ast-core/escape');
+require('./shared-8b9be5f0.js');
 require('@weapp-core/regex');
 require('@babel/generator');
 require('@babel/parser');
 require('@babel/traverse');
-require('./defaults-c6437917.js');
+require('./defaults-263271f9.js');
 require('@babel/types');
 require('htmlparser2');
 require('postcss');
-require('./postcss-4e99a8e8.js');
+require('./postcss-8d7f67b4.js');
 require('postcss-selector-parser');
 require('@csstools/postcss-is-pseudo-class');
 require('node:path');

package/dist/cli.mjs

@@ -1,18 +1,19 @@
-import { g as getOptions, c as createPatch } from './options-70759e98.mjs';
+import { g as getOptions, c as createPatch } from './options-8a945166.mjs';
 import 'micromatch';
 import 'magic-string';
 import './replace.mjs';
 import '@weapp-core/escape';
-import './shared-fd149084.mjs';
+import '@ast-core/escape';
+import './shared-283aac78.mjs';
 import '@weapp-core/regex';
 import '@babel/generator';
 import '@babel/parser';
 import '@babel/traverse';
-import './defaults-72ea9566.mjs';
+import './defaults-dc8a0e3d.mjs';
 import '@babel/types';
 import 'htmlparser2';
 import 'postcss';
-import './postcss-a551ddc0.mjs';
+import './postcss-55ed4d42.mjs';
 import 'postcss-selector-parser';
 import '@csstools/postcss-is-pseudo-class';
 import 'node:path';

package/dist/{defaults-c6437917.js → defaults-263271f9.js}

@@ -1,6 +1,7 @@
 'use strict';
 
 var escape = require('@weapp-core/escape');
+require('@ast-core/escape');
 
 function isMap(value) {
     return Object.prototype.toString.call(value) === '[object Map]';
@@ -128,7 +129,11 @@ const defaultOptions = {
         return false;
     },
     disabledDefaultTemplateHandler: false,
-    jsEscapeStrategy: 'replace'
+    jsEscapeStrategy: 'replace',
+    cssSelectorReplacement: {
+        root: 'page',
+        universal: 'view'
+    }
 };
 
 exports.defaultOptions = defaultOptions;

package/dist/{defaults-72ea9566.mjs → defaults-dc8a0e3d.mjs}

@@ -1,4 +1,5 @@
 import { SimpleMappingChars2String } from '@weapp-core/escape';
+import '@ast-core/escape';
 
 function isMap(value) {
     return Object.prototype.toString.call(value) === '[object Map]';
@@ -126,7 +127,11 @@ const defaultOptions = {
         return false;
     },
     disabledDefaultTemplateHandler: false,
-    jsEscapeStrategy: 'replace'
+    jsEscapeStrategy: 'replace',
+    cssSelectorReplacement: {
+        root: 'page',
+        universal: 'view'
+    }
 };
 
 export { defaultOptions as d, getGroupedEntries as g, isMap as i, noop as n };

package/dist/defaults.js

@@ -2,8 +2,9 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var defaults = require('./defaults-c6437917.js');
+var defaults = require('./defaults-263271f9.js');
 require('@weapp-core/escape');
+require('@ast-core/escape');
 
 
 

package/dist/defaults.mjs

@@ -1,2 +1,3 @@
-export { d as defaultOptions } from './defaults-72ea9566.mjs';
+export { d as defaultOptions } from './defaults-dc8a0e3d.mjs';
 import '@weapp-core/escape';
+import '@ast-core/escape';

package/dist/escape.d.ts

@@ -1 +1,2 @@
 export * from '@weapp-core/escape';
+export { jsStringEscape } from '@ast-core/escape';

package/dist/gulp.js

@@ -3,21 +3,22 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var stream = require('node:stream');
-var options = require('./options-7b804be0.js');
+var options = require('./options-50d69eba.js');
 require('micromatch');
 require('magic-string');
 require('./replace.js');
 require('@weapp-core/escape');
-require('./shared-df9de23f.js');
+require('@ast-core/escape');
+require('./shared-8b9be5f0.js');
 require('@weapp-core/regex');
 require('@babel/generator');
 require('@babel/parser');
 require('@babel/traverse');
-require('./defaults-c6437917.js');
+require('./defaults-263271f9.js');
 require('@babel/types');
 require('htmlparser2');
 require('postcss');
-require('./postcss-4e99a8e8.js');
+require('./postcss-8d7f67b4.js');
 require('postcss-selector-parser');
 require('@csstools/postcss-is-pseudo-class');
 require('node:path');

package/dist/gulp.mjs

@@ -1,19 +1,20 @@
 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-8a945166.mjs';
 import 'micromatch';
 import 'magic-string';
 import './replace.mjs';
 import '@weapp-core/escape';
-import './shared-fd149084.mjs';
+import '@ast-core/escape';
+import './shared-283aac78.mjs';
 import '@weapp-core/regex';
 import '@babel/generator';
 import '@babel/parser';
 import '@babel/traverse';
-import './defaults-72ea9566.mjs';
+import './defaults-dc8a0e3d.mjs';
 import '@babel/types';
 import 'htmlparser2';
 import 'postcss';
-import './postcss-a551ddc0.mjs';
+import './postcss-55ed4d42.mjs';
 import 'postcss-selector-parser';
 import '@csstools/postcss-is-pseudo-class';
 import 'node:path';

package/dist/index.js

@@ -7,21 +7,22 @@ var vite = require('./vite.js');
 var gulp = require('./gulp.js');
 require('node:path');
 require('node:fs');
-require('./options-7b804be0.js');
+require('./options-50d69eba.js');
 require('micromatch');
 require('magic-string');
 require('./replace.js');
 require('@weapp-core/escape');
-require('./shared-df9de23f.js');
+require('@ast-core/escape');
+require('./shared-8b9be5f0.js');
 require('@weapp-core/regex');
 require('@babel/generator');
 require('@babel/parser');
 require('@babel/traverse');
-require('./defaults-c6437917.js');
+require('./defaults-263271f9.js');
 require('@babel/types');
 require('htmlparser2');
 require('postcss');
-require('./postcss-4e99a8e8.js');
+require('./postcss-8d7f67b4.js');
 require('postcss-selector-parser');
 require('@csstools/postcss-is-pseudo-class');
 require('semver');

package/dist/index.mjs

@@ -3,21 +3,22 @@ export { UnifiedViteWeappTailwindcssPlugin } from './vite.mjs';
 export { createPlugins } from './gulp.mjs';
 import 'node:path';
 import 'node:fs';
-import './options-70759e98.mjs';
+import './options-8a945166.mjs';
 import 'micromatch';
 import 'magic-string';
 import './replace.mjs';
 import '@weapp-core/escape';
-import './shared-fd149084.mjs';
+import '@ast-core/escape';
+import './shared-283aac78.mjs';
 import '@weapp-core/regex';
 import '@babel/generator';
 import '@babel/parser';
 import '@babel/traverse';
-import './defaults-72ea9566.mjs';
+import './defaults-dc8a0e3d.mjs';
 import '@babel/types';
 import 'htmlparser2';
 import 'postcss';
-import './postcss-a551ddc0.mjs';
+import './postcss-55ed4d42.mjs';
 import 'postcss-selector-parser';
 import '@csstools/postcss-is-pseudo-class';
 import 'semver';

package/dist/js/index.d.ts

@@ -1,7 +1,3 @@
-import type { IJsHandlerOptions } from "../types";
-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;
-};
+import type { CreateJsHandlerOptions, IJsHandlerOptions, JsHandlerResult } from "../types";
+export declare function jsHandler(rawSource: string, options: IJsHandlerOptions): JsHandlerResult;
+export declare function createJsHandler(options: CreateJsHandlerOptions): (rawSource: string, set: Set<string>, options?: CreateJsHandlerOptions) => JsHandlerResult;

package/dist/{options-7b804be0.js → options-50d69eba.js}

@@ -4,15 +4,16 @@ var micromatch = require('micromatch');
 var MagicString = require('magic-string');
 var replace = require('./replace.js');
 var regex = require('@weapp-core/regex');
-var escape = require('@weapp-core/escape');
+var escape$1 = require('@weapp-core/escape');
+var escape = require('@ast-core/escape');
 var generate = require('@babel/generator');
 var parser = require('@babel/parser');
 var traverse = require('@babel/traverse');
-var defaults = require('./defaults-c6437917.js');
+var defaults = require('./defaults-263271f9.js');
 var t = require('@babel/types');
 var htmlparser2 = require('htmlparser2');
 var postcss = require('postcss');
-var postcss$1 = require('./postcss-4e99a8e8.js');
+var postcss$1 = require('./postcss-8d7f67b4.js');
 var postcssIsPseudoClass = require('@csstools/postcss-is-pseudo-class');
 var path = require('node:path');
 var fs = require('node:fs');
@@ -113,8 +114,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 +124,55 @@ function replaceHandleValue(str, node, options, ms, offset = 0, needEscaped = fa
 
 const isProd = () => process.env.NODE_ENV === 'production';
 
+function isObject(value) {
+  return value !== null && typeof value === "object";
+}
+function _defu(baseObject, defaults, namespace = ".", merger) {
+  if (!isObject(defaults)) {
+    return _defu(baseObject, {}, namespace, merger);
+  }
+  const object = Object.assign({}, defaults);
+  for (const key in baseObject) {
+    if (key === "__proto__" || key === "constructor") {
+      continue;
+    }
+    const value = baseObject[key];
+    if (value === null || value === void 0) {
+      continue;
+    }
+    if (merger && merger(object, key, value, namespace)) {
+      continue;
+    }
+    if (Array.isArray(value) && Array.isArray(object[key])) {
+      object[key] = [...value, ...object[key]];
+    } else if (isObject(value) && isObject(object[key])) {
+      object[key] = _defu(
+        value,
+        object[key],
+        (namespace ? `${namespace}.` : "") + key.toString(),
+        merger
+      );
+    } else {
+      object[key] = value;
+    }
+  }
+  return object;
+}
+function createDefu(merger) {
+  return (...arguments_) => (
+    // eslint-disable-next-line unicorn/no-array-reduce
+    arguments_.reduce((p, c) => _defu(p, c, "", merger), {})
+  );
+}
+const defu = createDefu();
+
+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 +183,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, generateMap: 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, Object.assign(Object.assign({}, options), { generateMap: false }));
+                                    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;
+                                            }
+                                        }
                                     }
                                 }
                             }
@@ -161,28 +242,34 @@ function jsHandler(rawSource, options) {
             }
         };
         traverse__default["default"](ast, ropt);
-        return {
+        const result = {
             code: ms.toString()
         };
+        return result;
     }
     else {
         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 +278,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;
+                                    }
+                                }
                             }
                         });
                     }
@@ -203,63 +298,23 @@ function jsHandler(rawSource, options) {
         });
     }
 }
-function createjsHandler(options) {
-    const { mangleContext, arbitraryValues, minifiedJs, escapeMap, jsPreserveClass, strategy } = options;
-    return (rawSource, set) => {
-        return jsHandler(rawSource, {
+function createJsHandler(options) {
+    const { mangleContext, arbitraryValues, minifiedJs, escapeMap, jsPreserveClass, strategy, generateMap } = options;
+    return (rawSource, set, options) => {
+        const opts = defu(options, {
             classNameSet: set,
             minifiedJs,
             escapeMap,
             arbitraryValues,
             mangleContext,
             jsPreserveClass,
-            strategy
+            strategy,
+            generateMap
         });
+        return jsHandler(rawSource, opts);
     };
 }
 
-function isObject(value) {
-  return value !== null && typeof value === "object";
-}
-function _defu(baseObject, defaults, namespace = ".", merger) {
-  if (!isObject(defaults)) {
-    return _defu(baseObject, {}, namespace, merger);
-  }
-  const object = Object.assign({}, defaults);
-  for (const key in baseObject) {
-    if (key === "__proto__" || key === "constructor") {
-      continue;
-    }
-    const value = baseObject[key];
-    if (value === null || value === void 0) {
-      continue;
-    }
-    if (merger && merger(object, key, value, namespace)) {
-      continue;
-    }
-    if (Array.isArray(value) && Array.isArray(object[key])) {
-      object[key] = [...value, ...object[key]];
-    } else if (isObject(value) && isObject(object[key])) {
-      object[key] = _defu(
-        value,
-        object[key],
-        (namespace ? `${namespace}.` : "") + key.toString(),
-        merger
-      );
-    } else {
-      object[key] = value;
-    }
-  }
-  return object;
-}
-function createDefu(merger) {
-  return (...arguments_) => (
-    // eslint-disable-next-line unicorn/no-array-reduce
-    arguments_.reduce((p, c) => _defu(p, c, "", merger), {})
-  );
-}
-const defu = createDefu();
-
 function generateCode(match, options = {}) {
     const ast = parser.parseExpression(match);
     traverse__default["default"](ast, {
@@ -425,7 +480,7 @@ function createTemplateHandler(options = {}) {
 }
 
 function styleHandler(rawSource, options) {
-    return postcss__default["default"]([postcss$1.postcssWeappTailwindcss(options), postcssIsPseudoClass__default["default"]()]).process(rawSource).css;
+    return postcss__default["default"]([postcssIsPseudoClass__default["default"](), postcss$1.postcssWeappTailwindcss(options)]).process(rawSource).css;
 }
 function createStyleHandler(options) {
     return (rawSource, opt) => {
@@ -649,10 +704,10 @@ function getOptions(options = {}) {
         options.supportCustomLengthUnitsPatch = undefined;
     }
     if (options.customReplaceDictionary === 'simple') {
-        options.customReplaceDictionary = escape.SimpleMappingChars2String;
+        options.customReplaceDictionary = escape$1.SimpleMappingChars2String;
     }
     else if (options.customReplaceDictionary === 'complex') {
-        options.customReplaceDictionary = escape.MappingChars2String;
+        options.customReplaceDictionary = escape$1.MappingChars2String;
     }
     normalizeMatcher(options, 'cssMatcher');
     normalizeMatcher(options, 'htmlMatcher');
@@ -662,7 +717,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, jsEscapeStrategy } = result;
+    const { cssPreflight, customRuleCallback, cssPreflightRange, replaceUniversalSelectorWith, customAttributes, customReplaceDictionary, supportCustomLengthUnitsPatch, arbitraryValues, cssChildCombinatorReplaceValue, inlineWxs, injectAdditionalCssVarScope, jsPreserveClass, disabledDefaultTemplateHandler, jsEscapeStrategy, cssSelectorReplacement } = result;
     result.escapeMap = customReplaceDictionary;
     const cssInjectPreflight = createInjectPreflight(cssPreflight);
     const customAttributesEntities = defaults.isMap(options.customAttributes)
@@ -679,16 +734,18 @@ function getOptions(options = {}) {
         escapeMap,
         mangleContext,
         cssChildCombinatorReplaceValue,
-        injectAdditionalCssVarScope
+        injectAdditionalCssVarScope,
+        cssSelectorReplacement
     });
     result.styleHandler = styleHandler;
-    const jsHandler = createjsHandler({
+    const jsHandler = createJsHandler({
         minifiedJs,
         escapeMap,
         mangleContext,
         arbitraryValues,
         jsPreserveClass,
-        strategy: jsEscapeStrategy
+        strategy: jsEscapeStrategy,
+        generateMap: true
     });
     result.jsHandler = jsHandler;
     const templateHandler = createTemplateHandler({