weapp-tailwindcss 2.5.2 → 2.6.1

package/dist/{options-ad127e0c.js → options-6a265426.js}

@@ -6,10 +6,11 @@ var generate = require('@babel/generator');
 var parser = require('@babel/parser');
 var traverse = require('@babel/traverse');
 var replace = require('./replace.js');
-var shared = require('./shared-ae7dd073.js');
+var defaults = require('./defaults-0d9846f4.js');
 var postcss = require('postcss');
-var postcss$1 = require('./postcss-fbdc673b.js');
+var postcss$1 = require('./postcss-cf8b998a.js');
 var postcssIsPseudoClass = require('@csstools/postcss-is-pseudo-class');
+var dic = require('./dic-05980807.js');
 var path = require('node:path');
 var fs = require('node:fs');
 var semver = require('semver');
@@ -86,52 +87,6 @@ function createDefu(merger) {
 }
 const defu = createDefu();
 
-function isRegexp(value) {
-    return Object.prototype.toString.call(value) === '[object RegExp]';
-}
-function isMap(value) {
-    return Object.prototype.toString.call(value) === '[object Map]';
-}
-const noop = () => { };
-function groupBy(arr, cb) {
-    if (!Array.isArray(arr)) {
-        throw new TypeError('expected an array for first argument');
-    }
-    if (typeof cb !== 'function') {
-        throw new TypeError('expected a function for second argument');
-    }
-    const result = {};
-    for (const item of arr) {
-        const bucketCategory = cb(item);
-        const bucket = result[bucketCategory];
-        if (Array.isArray(bucket)) {
-            result[bucketCategory].push(item);
-        }
-        else {
-            result[bucketCategory] = [item];
-        }
-    }
-    return result;
-}
-function getGroupedEntries(entries, options) {
-    const { cssMatcher, htmlMatcher, jsMatcher, wxsMatcher } = options;
-    const groupedEntries = groupBy(entries, ([file]) => {
-        if (cssMatcher(file)) {
-            return 'css';
-        }
-        else if (htmlMatcher(file)) {
-            return 'html';
-        }
-        else if (jsMatcher(file) || wxsMatcher(file)) {
-            return 'js';
-        }
-        else {
-            return 'other';
-        }
-    });
-    return groupedEntries;
-}
-
 function escapeStringRegexp(str) {
     if (typeof str !== 'string') {
         throw new TypeError('Expected a string');
@@ -148,7 +103,7 @@ function getSourceString(input) {
     if (typeof input === 'string') {
         result = input;
     }
-    else if (isRegexp(input)) {
+    else if (defaults.isRegexp(input)) {
         result = input.source;
     }
     else {
@@ -164,7 +119,7 @@ function makePattern(arr) {
             if (typeof cur === 'string') {
                 acc.push(cur);
             }
-            else if (isRegexp(cur)) {
+            else if (defaults.isRegexp(cur)) {
                 acc.push(handleRegexp(cur));
             }
             return acc;
@@ -174,7 +129,7 @@ function makePattern(arr) {
     else if (typeof arr === 'string') {
         pattern = arr;
     }
-    else if (isRegexp(arr)) {
+    else if (defaults.isRegexp(arr)) {
         pattern = handleRegexp(arr);
     }
     return pattern;
@@ -229,10 +184,11 @@ function handleValue(str, node, options) {
     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)) {
+        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;
@@ -286,95 +242,19 @@ function jsHandler(rawSource, options) {
     });
 }
 function createjsHandler(options) {
-    const { mangleContext, arbitraryValues, minifiedJs, escapeMap } = options;
+    const { mangleContext, arbitraryValues, minifiedJs, escapeMap, jsPreserveClass } = options;
     return (rawSource, set) => {
         return jsHandler(rawSource, {
             classNameSet: set,
             minifiedJs,
             escapeMap,
             arbitraryValues,
-            mangleContext
+            mangleContext,
+            jsPreserveClass
         });
     };
 }
 
-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;
-            }
-        }
-    },
-    wxsMatcher: (file) => {
-        return false;
-    },
-    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: shared.SimpleMappingChars2String,
-    supportCustomLengthUnitsPatch: {
-        units: ['rpx'],
-        dangerousOptions: {
-            gteVersion: '3.0.0',
-            lengthUnitsFilePath: 'lib/util/dataTypes.js',
-            packageName: 'tailwindcss',
-            variableName: 'lengthUnits',
-            overwrite: true
-        }
-    },
-    appType: undefined,
-    arbitraryValues: {
-        allowDoubleQuotes: false
-    },
-    cssChildCombinatorReplaceValue: 'view + view',
-    inlineWxs: false
-};
-
 function generateCode(match, options = {}) {
     const ast = parser.parseExpression(match);
     traverse__default["default"](ast, {
@@ -578,7 +458,7 @@ function getInstalledPkgJsonPath(options) {
 }
 function createPatch(options) {
     if (options === false) {
-        return noop;
+        return defaults.noop;
     }
     return () => {
         try {
@@ -719,23 +599,23 @@ function getOptions(options = {}) {
         options.supportCustomLengthUnitsPatch = undefined;
     }
     if (options.customReplaceDictionary === 'simple') {
-        options.customReplaceDictionary = shared.SimpleMappingChars2String;
+        options.customReplaceDictionary = dic.SimpleMappingChars2String;
     }
     else if (options.customReplaceDictionary === 'complex') {
-        options.customReplaceDictionary = shared.MappingChars2String;
+        options.customReplaceDictionary = dic.MappingChars2String;
     }
     normalizeMatcher(options, 'cssMatcher');
     normalizeMatcher(options, 'htmlMatcher');
     normalizeMatcher(options, 'jsMatcher');
     normalizeMatcher(options, 'wxsMatcher');
     normalizeMatcher(options, 'mainCssChunkMatcher');
-    const result = defu(options, defaultOptions, {
+    const result = defu(options, defaults.defaultOptions, {
         minifiedJs: isProd()
     });
-    const { cssPreflight, customRuleCallback, cssPreflightRange, replaceUniversalSelectorWith, customAttributes, customReplaceDictionary, supportCustomLengthUnitsPatch, arbitraryValues, cssChildCombinatorReplaceValue, inlineWxs } = result;
+    const { cssPreflight, customRuleCallback, cssPreflightRange, replaceUniversalSelectorWith, customAttributes, customReplaceDictionary, supportCustomLengthUnitsPatch, arbitraryValues, cssChildCombinatorReplaceValue, inlineWxs, injectAdditionalCssVarScope, jsPreserveClass } = result;
     result.escapeMap = customReplaceDictionary;
     const cssInjectPreflight = createInjectPreflight(cssPreflight);
-    const customAttributesEntities = isMap(options.customAttributes)
+    const customAttributesEntities = defaults.isMap(options.customAttributes)
         ? [...options.customAttributes.entries()]
         : Object.entries(customAttributes);
     const { escapeMap, minifiedJs } = result;
@@ -748,14 +628,16 @@ function getOptions(options = {}) {
         replaceUniversalSelectorWith,
         escapeMap,
         mangleContext,
-        cssChildCombinatorReplaceValue
+        cssChildCombinatorReplaceValue,
+        injectAdditionalCssVarScope
     });
     result.styleHandler = styleHandler;
     const jsHandler = createjsHandler({
         minifiedJs,
         escapeMap,
         mangleContext,
-        arbitraryValues
+        arbitraryValues,
+        jsPreserveClass
     });
     result.jsHandler = jsHandler;
     const templeteHandler = createTempleteHandler({
@@ -773,5 +655,4 @@ function getOptions(options = {}) {
 
 exports.createPatch = createPatch;
 exports.createTailwindcssPatcher = createTailwindcssPatcher;
-exports.getGroupedEntries = getGroupedEntries;
 exports.getOptions = getOptions;

package/dist/{options-1e3a224a.mjs → options-800ea85a.mjs}

@@ -4,10 +4,11 @@ import generate from '@babel/generator';
 import { parse, parseExpression } from '@babel/parser';
 import traverse from '@babel/traverse';
 import { replaceJs as replaceWxml } from './replace.mjs';
-import { S as SimpleMappingChars2String, M as MappingChars2String } from './shared-7c88fb94.mjs';
+import { i as isRegexp, n as noop, d as defaultOptions, a as isMap } from './defaults-c7f00aae.mjs';
 import postcss from 'postcss';
-import { p as postcssWeappTailwindcss } from './postcss-9a63df9d.mjs';
+import { p as postcssWeappTailwindcss } from './postcss-53e2ad95.mjs';
 import postcssIsPseudoClass from '@csstools/postcss-is-pseudo-class';
+import { S as SimpleMappingChars2String, M as MappingChars2String } from './dic-3790a3a4.mjs';
 import path from 'node:path';
 import fs from 'node:fs';
 import { gte } from 'semver';
@@ -56,52 +57,6 @@ function createDefu(merger) {
 }
 const defu = createDefu();
 
-function isRegexp(value) {
-    return Object.prototype.toString.call(value) === '[object RegExp]';
-}
-function isMap(value) {
-    return Object.prototype.toString.call(value) === '[object Map]';
-}
-const noop = () => { };
-function groupBy(arr, cb) {
-    if (!Array.isArray(arr)) {
-        throw new TypeError('expected an array for first argument');
-    }
-    if (typeof cb !== 'function') {
-        throw new TypeError('expected a function for second argument');
-    }
-    const result = {};
-    for (const item of arr) {
-        const bucketCategory = cb(item);
-        const bucket = result[bucketCategory];
-        if (Array.isArray(bucket)) {
-            result[bucketCategory].push(item);
-        }
-        else {
-            result[bucketCategory] = [item];
-        }
-    }
-    return result;
-}
-function getGroupedEntries(entries, options) {
-    const { cssMatcher, htmlMatcher, jsMatcher, wxsMatcher } = options;
-    const groupedEntries = groupBy(entries, ([file]) => {
-        if (cssMatcher(file)) {
-            return 'css';
-        }
-        else if (htmlMatcher(file)) {
-            return 'html';
-        }
-        else if (jsMatcher(file) || wxsMatcher(file)) {
-            return 'js';
-        }
-        else {
-            return 'other';
-        }
-    });
-    return groupedEntries;
-}
-
 function escapeStringRegexp(str) {
     if (typeof str !== 'string') {
         throw new TypeError('Expected a string');
@@ -199,10 +154,11 @@ function handleValue(str, node, options) {
     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)) {
+        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;
@@ -256,95 +212,19 @@ function jsHandler(rawSource, options) {
     });
 }
 function createjsHandler(options) {
-    const { mangleContext, arbitraryValues, minifiedJs, escapeMap } = options;
+    const { mangleContext, arbitraryValues, minifiedJs, escapeMap, jsPreserveClass } = options;
     return (rawSource, set) => {
         return jsHandler(rawSource, {
             classNameSet: set,
             minifiedJs,
             escapeMap,
             arbitraryValues,
-            mangleContext
+            mangleContext,
+            jsPreserveClass
         });
     };
 }
 
-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;
-            }
-        }
-    },
-    wxsMatcher: (file) => {
-        return false;
-    },
-    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,
-    arbitraryValues: {
-        allowDoubleQuotes: false
-    },
-    cssChildCombinatorReplaceValue: 'view + view',
-    inlineWxs: false
-};
-
 function generateCode(match, options = {}) {
     const ast = parseExpression(match);
     traverse(ast, {
@@ -702,7 +582,7 @@ function getOptions(options = {}) {
     const result = defu(options, defaultOptions, {
         minifiedJs: isProd()
     });
-    const { cssPreflight, customRuleCallback, cssPreflightRange, replaceUniversalSelectorWith, customAttributes, customReplaceDictionary, supportCustomLengthUnitsPatch, arbitraryValues, cssChildCombinatorReplaceValue, inlineWxs } = result;
+    const { cssPreflight, customRuleCallback, cssPreflightRange, replaceUniversalSelectorWith, customAttributes, customReplaceDictionary, supportCustomLengthUnitsPatch, arbitraryValues, cssChildCombinatorReplaceValue, inlineWxs, injectAdditionalCssVarScope, jsPreserveClass } = result;
     result.escapeMap = customReplaceDictionary;
     const cssInjectPreflight = createInjectPreflight(cssPreflight);
     const customAttributesEntities = isMap(options.customAttributes)
@@ -718,14 +598,16 @@ function getOptions(options = {}) {
         replaceUniversalSelectorWith,
         escapeMap,
         mangleContext,
-        cssChildCombinatorReplaceValue
+        cssChildCombinatorReplaceValue,
+        injectAdditionalCssVarScope
     });
     result.styleHandler = styleHandler;
     const jsHandler = createjsHandler({
         minifiedJs,
         escapeMap,
         mangleContext,
-        arbitraryValues
+        arbitraryValues,
+        jsPreserveClass
     });
     result.jsHandler = jsHandler;
     const templeteHandler = createTempleteHandler({
@@ -741,4 +623,4 @@ function getOptions(options = {}) {
     return result;
 }
 
-export { createTailwindcssPatcher as a, getGroupedEntries as b, createPatch as c, getOptions as g };
+export { createTailwindcssPatcher as a, createPatch as c, getOptions as g };

package/dist/postcss/cssVars.d.ts

@@ -0,0 +1,5 @@
+declare const _default: {
+    prop: string;
+    value: string;
+}[];
+export default _default;

package/dist/postcss/mp.d.ts

@@ -1,4 +1,8 @@
 import { Rule } from 'postcss';
 import type { IStyleHandlerOptions } from "../types";
 export declare function testIfVariablesScope(node: Rule, count?: number): boolean;
+export declare function testIfTwBackdrop(node: Rule, count?: number): boolean;
+export declare function makePseudoVarRule(): Rule;
+export declare function remakeCssVarSelector(selectors: string[], cssPreflightRange: IStyleHandlerOptions['cssPreflightRange']): string[];
+export declare function remakeCombinatorSelector(selector: string, cssChildCombinatorReplaceValue: IStyleHandlerOptions['cssChildCombinatorReplaceValue']): string;
 export declare function commonChunkPreflight(node: Rule, options: IStyleHandlerOptions): void;