weapp-tailwindcss 2.3.3 → 2.4.0

package/dist/{options-ed6f4a3a.mjs → options-5c083791.mjs}

@@ -1,15 +1,15 @@
-import { m as makeCustomAttributes, t as tagWithEitherClassAndHoverClassRegexp, a as templateClassExactRegexp, v as variableMatch, b as variableRegExp, n as noop, s as splitCode, e as escapeStringRegexp, u as useStore, S as SimpleMappingChars2String, M as MappingChars2String, i as isMap } from './shared-eae1dc7a.mjs';
 import { isMatch } from 'micromatch';
+import * as t from '@babel/types';
 import generate from '@babel/generator';
-import { parseExpression, parse } from '@babel/parser';
+import { parse, parseExpression } from '@babel/parser';
 import traverse from '@babel/traverse';
 import { replaceJs as replaceWxml } from './replace.mjs';
-import * as t from '@babel/types';
+import { s as splitCode, e as escapeStringRegexp, u as useStore, n as noop, S as SimpleMappingChars2String, m as makeCustomAttributes, t as tagWithEitherClassAndHoverClassRegexp, a as templateClassExactRegexp, v as variableMatch, b as variableRegExp, M as MappingChars2String, i as isMap } from './shared-89ea7f77.mjs';
 import postcss from 'postcss';
-import { p as postcssWeappTailwindcss } from './postcss-1f9a5153.mjs';
+import { p as postcssWeappTailwindcss } from './postcss-e3fcf6f1.mjs';
 import postcssIsPseudoClass from '@csstools/postcss-is-pseudo-class';
-import path from 'path';
-import fs from 'fs';
+import path from 'node:path';
+import fs from 'node:fs';
 import { gte } from 'semver';
 import { monkeyPatchForExposingContext, requireResolve, TailwindcssPatcher } from 'tailwindcss-patch';
 
@@ -55,6 +55,145 @@ function createDefu(merger) {
 }
 const defu = createDefu();
 
+const isProd = () => process.env.NODE_ENV === 'production';
+
+function handleValue(str, node, options) {
+    const set = options.classNameSet;
+    const escapeMap = options.escapeMap;
+    const arr = splitCode(str);
+    let rawStr = str;
+    for (const v of arr) {
+        if (set.has(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) {
+                const { jsHandler } = useStore();
+                rawStr = jsHandler(rawStr);
+                rawStr = rawStr.replaceAll(new RegExp(escapeStringRegexp(v), 'g'), replaceWxml(v, {
+                    escapeMap
+                }));
+            }
+        }
+    }
+    return rawStr;
+}
+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);
+            }
+        },
+        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;
+                    }
+                }
+            }
+        },
+        noScope: true
+    };
+    traverse(ast, topt);
+    return generate(ast, {
+        minified: (_a = options.minifiedJs) !== null && _a !== void 0 ? _a : isProd()
+    });
+}
+function createjsHandler(options) {
+    return (rawSource, set) => {
+        return jsHandler(rawSource, {
+            classNameSet: set,
+            minifiedJs: options.minifiedJs,
+            escapeMap: options.escapeMap
+        });
+    };
+}
+
+const defaultOptions = {
+    cssMatcher: (file) => /.+\.(?:wx|ac|jx|tt|q|c)ss$/.test(file),
+    htmlMatcher: (file) => /.+\.(?:(?:(?:wx|ax|jx|ks|tt|q)ml)|swan)$/.test(file),
+    jsMatcher: (file) => {
+        if (file.includes('node_modules')) {
+            return false;
+        }
+        return /.+\.[cm]?js?$/.test(file);
+    },
+    mainCssChunkMatcher: (file, appType) => {
+        switch (appType) {
+            case 'uni-app': {
+                return /^common\/main/.test(file);
+            }
+            case 'uni-app-vite': {
+                return file.startsWith('app') || /^common\/main/.test(file);
+            }
+            case 'mpx': {
+                return file.startsWith('app');
+            }
+            case 'taro': {
+                return file.startsWith('app');
+            }
+            case 'remax': {
+                return file.startsWith('app');
+            }
+            case 'rax': {
+                return file.startsWith('bundle');
+            }
+            case 'native': {
+                return file.startsWith('app');
+            }
+            case 'kbone': {
+                return /^(?:common\/)?miniprogram-app/.test(file);
+            }
+            default: {
+                return true;
+            }
+        }
+    },
+    cssPreflight: {
+        'box-sizing': 'border-box',
+        'border-width': '0',
+        'border-style': 'solid',
+        'border-color': 'currentColor'
+    },
+    cssPreflightRange: 'view',
+    replaceUniversalSelectorWith: 'view',
+    disabled: false,
+    customRuleCallback: noop,
+    onLoad: noop,
+    onStart: noop,
+    onEnd: noop,
+    onUpdate: noop,
+    customAttributes: {},
+    customReplaceDictionary: SimpleMappingChars2String,
+    supportCustomLengthUnitsPatch: {
+        units: ['rpx'],
+        dangerousOptions: {
+            gteVersion: '3.0.0',
+            lengthUnitsFilePath: 'lib/util/dataTypes.js',
+            packageName: 'tailwindcss',
+            variableName: 'lengthUnits',
+            overwrite: true
+        }
+    },
+    appType: undefined
+};
+
 function generateCode(match, options = {}) {
     const ast = parseExpression(match);
     traverse(ast, {
@@ -63,10 +202,8 @@ function generateCode(match, options = {}) {
             if (t.isMemberExpression(path.parent)) {
                 return;
             }
-            if (t.isBinaryExpression(path.parent)) {
-                if (t.isConditionalExpression((_a = path.parentPath) === null || _a === void 0 ? void 0 : _a.parent)) {
-                    return;
-                }
+            if (t.isBinaryExpression(path.parent) && t.isConditionalExpression((_a = path.parentPath) === null || _a === void 0 ? void 0 : _a.parent)) {
+                return;
             }
             path.node.value = replaceWxml(path.node.value, options);
         },
@@ -101,7 +238,7 @@ function extractSource(original) {
 }
 function templeteReplacer(original, options = {}) {
     const sources = extractSource(original);
-    if (sources.length) {
+    if (sources.length > 0) {
         const resultArray = [];
         let p = 0;
         for (let i = 0; i < sources.length; i++) {
@@ -112,7 +249,7 @@ function templeteReplacer(original, options = {}) {
                 escapeMap: options.escapeMap
             }));
             p = m.start;
-            if (m.raw.trim().length) {
+            if (m.raw.trim().length > 0) {
                 const code = generateCode(m.raw, options);
                 const source = `{{${code}}}`;
                 m.source = source;
@@ -131,7 +268,7 @@ function templeteReplacer(original, options = {}) {
             }
         }
         return resultArray
-            .filter((x) => x)
+            .filter(Boolean)
             .join('')
             .trim();
     }
@@ -154,8 +291,7 @@ function customTempleteHandler(rawSource, options = {}) {
     const regexps = makeCustomAttributes(options.customAttributesEntities);
     if (regexps) {
         if (Array.isArray(regexps)) {
-            for (let i = 0; i < regexps.length; i++) {
-                const regexp = regexps[i];
+            for (const regexp of regexps) {
                 source = source.replace(regexp.tagRegexp, (m0) => {
                     return m0.replace(regexp.attrRegexp, (m1, className) => {
                         return m1.replace(className, templeteReplacer(className, options));
@@ -188,8 +324,7 @@ const createInjectPreflight = (options) => {
     const result = [];
     if (options && typeof options === 'object') {
         const entries = Object.entries(options);
-        for (let i = 0; i < entries.length; i++) {
-            const [prop, value] = entries[i];
+        for (const [prop, value] of entries) {
             if (value !== false) {
                 result.push({
                     prop,
@@ -210,30 +345,26 @@ function findAstNode(content, options) {
     let changed = false;
     traverse(ast, {
         Identifier(path) {
-            if (path.node.name === DOPTS.variableName) {
-                if (t.isVariableDeclarator(path.parent)) {
-                    if (t.isArrayExpression(path.parent.init)) {
-                        arrayRef = path.parent.init;
-                        const set = new Set(path.parent.init.elements.map((x) => x.value));
-                        for (let i = 0; i < options.units.length; i++) {
-                            const unit = options.units[i];
-                            if (!set.has(unit)) {
-                                path.parent.init.elements = path.parent.init.elements.map((x) => {
-                                    if (t.isStringLiteral(x)) {
-                                        return {
-                                            type: x === null || x === void 0 ? void 0 : x.type,
-                                            value: x === null || x === void 0 ? void 0 : x.value
-                                        };
-                                    }
-                                    return x;
-                                });
-                                path.parent.init.elements.push({
-                                    type: 'StringLiteral',
-                                    value: unit
-                                });
-                                changed = true;
+            if (path.node.name === DOPTS.variableName && t.isVariableDeclarator(path.parent) && t.isArrayExpression(path.parent.init)) {
+                arrayRef = path.parent.init;
+                const set = new Set(path.parent.init.elements.map((x) => x.value));
+                for (let i = 0; i < options.units.length; i++) {
+                    const unit = options.units[i];
+                    if (!set.has(unit)) {
+                        path.parent.init.elements = path.parent.init.elements.map((x) => {
+                            if (t.isStringLiteral(x)) {
+                                return {
+                                    type: x === null || x === void 0 ? void 0 : x.type,
+                                    value: x === null || x === void 0 ? void 0 : x.value
+                                };
                             }
-                        }
+                            return x;
+                        });
+                        path.parent.init.elements.push({
+                            type: 'StringLiteral',
+                            value: unit
+                        });
+                        changed = true;
                     }
                 }
             }
@@ -279,7 +410,7 @@ function monkeyPatchForSupportingCustomUnit(rootDir, options) {
     const DOPTS = dangerousOptions;
     const dataTypesFilePath = path.resolve(rootDir, DOPTS.lengthUnitsFilePath);
     const dataTypesFileContent = fs.readFileSync(dataTypesFilePath, {
-        encoding: 'utf-8'
+        encoding: 'utf8'
     });
     const { arrayRef, changed } = findAstNode(dataTypesFileContent, options);
     if (arrayRef && changed) {
@@ -294,7 +425,7 @@ function monkeyPatchForSupportingCustomUnit(rootDir, options) {
             const newCode = prev + code + next;
             if (DOPTS.overwrite) {
                 fs.writeFileSync((_a = DOPTS.destPath) !== null && _a !== void 0 ? _a : dataTypesFilePath, newCode, {
-                    encoding: 'utf-8'
+                    encoding: 'utf8'
                 });
                 console.log('patch tailwindcss for custom length unit successfully!');
             }
@@ -322,148 +453,6 @@ function createTailwindcssPatcher() {
     });
 }
 
-const isProd = () => process.env.NODE_ENV === 'production';
-
-function handleValue(str, node, options) {
-    const set = options.classNameSet;
-    const escapeMap = options.escapeMap;
-    const arr = splitCode(str);
-    let rawStr = str;
-    for (let i = 0; i < arr.length; i++) {
-        const v = arr[i];
-        if (set.has(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) {
-                const { jsHandler } = useStore();
-                rawStr = jsHandler(rawStr);
-                rawStr = rawStr.replace(new RegExp(escapeStringRegexp(v), 'g'), replaceWxml(v, {
-                    escapeMap
-                }));
-            }
-        }
-    }
-    return rawStr;
-}
-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);
-            }
-        },
-        CallExpression: {
-            enter(p) {
-                const n = p.node;
-                if (t.isIdentifier(n.callee) && n.callee.name === 'eval') {
-                    if (t.isStringLiteral(n.arguments[0])) {
-                        const res = jsHandler(n.arguments[0].value, options);
-                        if (res.code) {
-                            n.arguments[0].value = res.code;
-                        }
-                    }
-                }
-            }
-        },
-        noScope: true
-    };
-    traverse(ast, topt);
-    return generate(ast, {
-        minified: (_a = options.minifiedJs) !== null && _a !== void 0 ? _a : isProd()
-    });
-}
-function createjsHandler(options) {
-    return (rawSource, set) => {
-        return jsHandler(rawSource, {
-            classNameSet: set,
-            minifiedJs: options.minifiedJs,
-            escapeMap: options.escapeMap
-        });
-    };
-}
-
-const defaultOptions = {
-    cssMatcher: (file) => /.+\.(?:wx|ac|jx|tt|q|c)ss$/.test(file),
-    htmlMatcher: (file) => /.+\.(?:(?:(?:wx|ax|jx|ks|tt|q)ml)|swan)$/.test(file),
-    jsMatcher: (file) => {
-        if (file.includes('node_modules')) {
-            return false;
-        }
-        return /.+\.[cm]?[jt]sx?$/.test(file);
-    },
-    mainCssChunkMatcher: (file, appType) => {
-        switch (appType) {
-            case 'uni-app': {
-                return /^common\/main/.test(file);
-            }
-            case 'uni-app-vite': {
-                return /^app/.test(file) || /^common\/main/.test(file);
-            }
-            case 'mpx': {
-                return /^app/.test(file);
-            }
-            case 'taro': {
-                return /^app/.test(file);
-            }
-            case 'remax': {
-                return /^app/.test(file);
-            }
-            case 'rax': {
-                return /^bundle/.test(file);
-            }
-            case 'native': {
-                return /^app/.test(file);
-            }
-            case 'kbone': {
-                return /^(?:common\/)?miniprogram-app/.test(file);
-            }
-            default: {
-                return true;
-            }
-        }
-    },
-    cssPreflight: {
-        'box-sizing': 'border-box',
-        'border-width': '0',
-        'border-style': 'solid',
-        'border-color': 'currentColor'
-    },
-    cssPreflightRange: 'view',
-    replaceUniversalSelectorWith: 'view',
-    disabled: false,
-    customRuleCallback: noop,
-    onLoad: noop,
-    onStart: noop,
-    onEnd: noop,
-    onUpdate: noop,
-    customAttributes: {},
-    customReplaceDictionary: SimpleMappingChars2String,
-    supportCustomLengthUnitsPatch: {
-        units: ['rpx'],
-        dangerousOptions: {
-            gteVersion: '3.0.0',
-            lengthUnitsFilePath: 'lib/util/dataTypes.js',
-            packageName: 'tailwindcss',
-            variableName: 'lengthUnits',
-            overwrite: true
-        }
-    },
-    appType: undefined
-};
-
 function createGlobMatcher(pattern) {
     return function (file) {
         return isMatch(file, pattern);
@@ -505,17 +494,12 @@ function getOptions(options = {}, modules = ['style', 'templete', 'patch', 'js']
     const { cssPreflight, customRuleCallback, cssPreflightRange, replaceUniversalSelectorWith, customAttributes, customReplaceDictionary, supportCustomLengthUnitsPatch } = result;
     result.escapeMap = customReplaceDictionary;
     const cssInjectPreflight = createInjectPreflight(cssPreflight);
-    let customAttributesEntities;
-    if (isMap(options.customAttributes)) {
-        customAttributesEntities = Array.from(options.customAttributes.entries());
-    }
-    else {
-        customAttributesEntities = Object.entries(customAttributes);
-    }
+    const customAttributesEntities = isMap(options.customAttributes) ? [...options.customAttributes.entries()] : Object.entries(customAttributes);
+    const { escapeMap, minifiedJs } = result;
     if (registerModules.templete) {
         result.templeteHandler = createTempleteHandler({
             customAttributesEntities,
-            escapeMap: result.escapeMap
+            escapeMap
         });
     }
     if (registerModules.style) {
@@ -524,13 +508,13 @@ function getOptions(options = {}, modules = ['style', 'templete', 'patch', 'js']
             customRuleCallback,
             cssPreflightRange,
             replaceUniversalSelectorWith,
-            escapeMap: result.escapeMap
+            escapeMap
         });
     }
     if (registerModules.js) {
         result.jsHandler = createjsHandler({
-            minifiedJs: result.minifiedJs,
-            escapeMap: result.escapeMap
+            minifiedJs,
+            escapeMap
         });
     }
     if (registerModules.patch) {

package/dist/postcss/plugin.d.ts

@@ -1,6 +1,6 @@
 import type { PluginCreator } from 'postcss';
 import type { IStyleHandlerOptions } from "../types";
-import postcssIsPseudoClass from '@csstools/postcss-is-pseudo-class';
 export type PostcssWeappTailwindcssRenamePlugin = PluginCreator<IStyleHandlerOptions>;
 declare const postcssWeappTailwindcss: PostcssWeappTailwindcssRenamePlugin;
-export { postcssWeappTailwindcss, postcssIsPseudoClass };
+export { postcssWeappTailwindcss, };
+export { default as postcssIsPseudoClass } from '@csstools/postcss-is-pseudo-class';

package/dist/{postcss-dc9eeafc.js → postcss-0c103b15.js}

@@ -1,7 +1,7 @@
 'use strict';
 
 var selectorParser = require('postcss-selector-parser');
-var shared = require('./shared-c2953d9d.js');
+var shared = require('./shared-9744fdd1.js');
 var postcss = require('postcss');
 require('@csstools/postcss-is-pseudo-class');
 
@@ -59,16 +59,15 @@ function testIfVariablesScope(node, count = 1) {
     return false;
 }
 function commonChunkPreflight(node, options) {
-    node.selector = node.selector.replace(BROAD_MATCH_GLOBAL_REGEXP, 'view + view');
+    node.selector = node.selector.replaceAll(BROAD_MATCH_GLOBAL_REGEXP, 'view + view');
     if (testIfVariablesScope(node)) {
         const selectorParts = node.selector.split(',');
         if (!selectorParts.includes('view')) {
             selectorParts.push('view');
         }
-        if (options.cssPreflightRange === 'all') {
-            if (!selectorParts.includes(':not(not)')) {
-                selectorParts.push(':not(not)');
-            }
+        if (options.cssPreflightRange === 'all' &&
+            !selectorParts.includes(':not(not)')) {
+            selectorParts.push(':not(not)');
         }
         node.selector = selectorParts.join(',');
         if (typeof options.cssInjectPreflight === 'function') {

package/dist/{postcss-1f9a5153.mjs → postcss-e3fcf6f1.mjs}

@@ -1,5 +1,5 @@
 import selectorParser from 'postcss-selector-parser';
-import { f as internalCssSelectorReplacer } from './shared-eae1dc7a.mjs';
+import { f as internalCssSelectorReplacer } from './shared-89ea7f77.mjs';
 import { Rule, Declaration } from 'postcss';
 import '@csstools/postcss-is-pseudo-class';
 
@@ -53,16 +53,15 @@ function testIfVariablesScope(node, count = 1) {
     return false;
 }
 function commonChunkPreflight(node, options) {
-    node.selector = node.selector.replace(BROAD_MATCH_GLOBAL_REGEXP, 'view + view');
+    node.selector = node.selector.replaceAll(BROAD_MATCH_GLOBAL_REGEXP, 'view + view');
     if (testIfVariablesScope(node)) {
         const selectorParts = node.selector.split(',');
         if (!selectorParts.includes('view')) {
             selectorParts.push('view');
         }
-        if (options.cssPreflightRange === 'all') {
-            if (!selectorParts.includes(':not(not)')) {
-                selectorParts.push(':not(not)');
-            }
+        if (options.cssPreflightRange === 'all' &&
+            !selectorParts.includes(':not(not)')) {
+            selectorParts.push(':not(not)');
         }
         node.selector = selectorParts.join(',');
         if (typeof options.cssInjectPreflight === 'function') {

package/dist/postcss.js

@@ -2,10 +2,10 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var postcss = require('./postcss-dc9eeafc.js');
+var postcss = require('./postcss-0c103b15.js');
 var postcssIsPseudoClass = require('@csstools/postcss-is-pseudo-class');
 require('postcss-selector-parser');
-require('./shared-c2953d9d.js');
+require('./shared-9744fdd1.js');
 require('tailwindcss-mangle-shared');
 require('postcss');
 

package/dist/postcss.mjs

@@ -1,6 +1,6 @@
-export { p as postcssWeappTailwindcss } from './postcss-1f9a5153.mjs';
+export { p as postcssWeappTailwindcss } from './postcss-e3fcf6f1.mjs';
 export { default as postcssIsPseudoClass } from '@csstools/postcss-is-pseudo-class';
 import 'postcss-selector-parser';
-import './shared-eae1dc7a.mjs';
+import './shared-89ea7f77.mjs';
 import 'tailwindcss-mangle-shared';
 import 'postcss';

package/dist/replace.d.ts

@@ -1,4 +1,3 @@
-import { replaceWxml as replaceJs } from './wxml/shared';
-import { internalCssSelectorReplacer as replaceCss } from './postcss/shared';
 export * from './dic';
-export { replaceJs, replaceCss };
+export { replaceWxml as replaceJs } from './wxml/shared';
+export { internalCssSelectorReplacer as replaceCss } from './postcss/shared';

package/dist/replace.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var shared = require('./shared-c2953d9d.js');
+var shared = require('./shared-9744fdd1.js');
 require('tailwindcss-mangle-shared');
 
 function replaceWxml(original, options = {
@@ -17,7 +17,7 @@ function replaceWxml(original, options = {
     let res = original;
     if (!options.keepEOL) {
         res = res
-            .replace(/[\r\n]+/g, '');
+            .replaceAll(/[\n\r]+/g, '');
     }
     const { wxmlHandler } = shared.useStore();
     res = wxmlHandler(res);

package/dist/replace.mjs

@@ -1,5 +1,5 @@
-import { h as escape, S as SimpleMappingChars2String, u as useStore } from './shared-eae1dc7a.mjs';
-export { M as MappingChars2String, k as MappingChars2StringEntries, j as SYMBOL_TABLE, l as SimpleMappingChars2StringEntries, f as replaceCss } from './shared-eae1dc7a.mjs';
+import { h as escape, S as SimpleMappingChars2String, u as useStore } from './shared-89ea7f77.mjs';
+export { M as MappingChars2String, k as MappingChars2StringEntries, j as SYMBOL_TABLE, l as SimpleMappingChars2StringEntries, f as replaceCss } from './shared-89ea7f77.mjs';
 import 'tailwindcss-mangle-shared';
 
 function replaceWxml(original, options = {
@@ -14,7 +14,7 @@ function replaceWxml(original, options = {
     let res = original;
     if (!options.keepEOL) {
         res = res
-            .replace(/[\r\n]+/g, '');
+            .replaceAll(/[\n\r]+/g, '');
     }
     const { wxmlHandler } = useStore();
     res = wxmlHandler(res);