weapp-tailwindcss 2.6.1 → 2.6.3

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

@@ -4,139 +4,18 @@ import generate from '@babel/generator';
 import { parse, parseExpression } from '@babel/parser';
 import traverse from '@babel/traverse';
 import { replaceJs as replaceWxml } from './replace.mjs';
-import { i as isRegexp, n as noop, d as defaultOptions, a as isMap } from './defaults-c7f00aae.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 postcss from 'postcss';
-import { p as postcssWeappTailwindcss } from './postcss-53e2ad95.mjs';
+import { p as postcssWeappTailwindcss } from './postcss-a551ddc0.mjs';
 import postcssIsPseudoClass from '@csstools/postcss-is-pseudo-class';
-import { S as SimpleMappingChars2String, M as MappingChars2String } from './dic-3790a3a4.mjs';
+import { SimpleMappingChars2String, MappingChars2String } from '@weapp-core/escape';
 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';
 
-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 escapeStringRegexp(str) {
-    if (typeof str !== 'string') {
-        throw new TypeError('Expected a string');
-    }
-    return str.replaceAll(/[$()*+.?[\\\]^{|}]/g, '\\$&').replaceAll('-', '\\x2d');
-}
-const templateClassExactRegexp = /(?<=^|\s)(?:hover-)?class=(?:["']\W+\s*\w+\()?["']([^"]+)["']/gs;
-const tagWithEitherClassAndHoverClassRegexp = /<[a-z][a-z-]*[a-z]*\s+[^>]*?(?:hover-)?clas{2}="[^"]*"[^>]*?\/?>/g;
-function handleRegexp(reg) {
-    return `(?:${reg.source})`;
-}
-function getSourceString(input) {
-    let result;
-    if (typeof input === 'string') {
-        result = input;
-    }
-    else if (isRegexp(input)) {
-        result = input.source;
-    }
-    else {
-        result = input.toString();
-    }
-    return result;
-}
-function makePattern(arr) {
-    let pattern = '';
-    if (Array.isArray(arr)) {
-        pattern = arr
-            .reduce((acc, cur) => {
-            if (typeof cur === 'string') {
-                acc.push(cur);
-            }
-            else if (isRegexp(cur)) {
-                acc.push(handleRegexp(cur));
-            }
-            return acc;
-        }, [])
-            .join('|');
-    }
-    else if (typeof arr === 'string') {
-        pattern = arr;
-    }
-    else if (isRegexp(arr)) {
-        pattern = handleRegexp(arr);
-    }
-    return pattern;
-}
-function createTempleteHandlerMatchRegexp(tag, attrs, options = {}) {
-    const { exact = true } = options;
-    const prefix = exact ? '(?<=^|\\s)' : '';
-    const pattern = makePattern(attrs);
-    let tagPattern = getSourceString(tag);
-    if (tagPattern === '*') {
-        tagPattern = '[a-z][-a-z]*[a-z]*';
-    }
-    const source = `<(${tagPattern})\\s+[^>]*?(?:${prefix}(${pattern})="(?:[^"]*)")[^>]*?\\/?>`;
-    return new RegExp(source, 'g');
-}
-function createTemplateClassRegexp(attrs, options = {}) {
-    const { exact = true } = options;
-    const prefix = exact ? '(?<=^|\\s)' : '';
-    const pattern = makePattern(attrs);
-    const source = `(?:${prefix}${pattern})=(?:["']\\W+\\s*(?:\\w+)\\()?["']([^"]+)['"]`;
-    return new RegExp(source, 'gs');
-}
-function makeCustomAttributes(entries) {
-    if (Array.isArray(entries)) {
-        return entries.map(([k, v]) => {
-            return {
-                tagRegexp: createTempleteHandlerMatchRegexp(k, v),
-                attrRegexp: createTemplateClassRegexp(v),
-                tag: getSourceString(k),
-                attrs: v
-            };
-        });
-    }
-}
-const variableRegExp = /{{(.*?)}}/gs;
-const wxsTagRegexp = /<wxs\s*(?:[a-z][a-z-]*[a-z]*(?:\s*=\s*".*?")?)*\s*>(.*?)<\/wxs>/gs;
-
 const validateFilterRE = /[\w%-?\u00A0-\uFFFF-]/;
 function isValidSelector(selector = '') {
     return validateFilterRE.test(selector);
@@ -225,6 +104,48 @@ function createjsHandler(options) {
     };
 }
 
+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 = parseExpression(match);
     traverse(ast, {
@@ -268,7 +189,7 @@ function extract(original, reg) {
 function extractSource(original) {
     return extract(original, variableRegExp);
 }
-function templeteReplacer(original, options = {}) {
+function templateReplacer(original, options = {}) {
     const sources = extractSource(original);
     if (sources.length > 0) {
         const resultArray = [];
@@ -311,22 +232,25 @@ function templeteReplacer(original, options = {}) {
         });
     }
 }
-function templeteHandler(rawSource, options = {}) {
+function templateHandler(rawSource, options = {}) {
+    if (options.disabledDefaultTemplateHandler) {
+        return rawSource;
+    }
     return rawSource.replace(tagWithEitherClassAndHoverClassRegexp, (m0) => {
         return m0.replace(templateClassExactRegexp, (m1, className) => {
-            return m1.replace(className, templeteReplacer(className, options));
+            return m1.replace(className, templateReplacer(className, options));
         });
     });
 }
-function customTempleteHandler(rawSource, options) {
+function customTemplateHandler(rawSource, options) {
     const { customAttributesEntities, inlineWxs, runtimeSet, jsHandler } = options;
-    let source = templeteHandler(rawSource, options);
+    let source = templateHandler(rawSource, options);
     const regexps = makeCustomAttributes(customAttributesEntities);
     if (regexps && Array.isArray(regexps)) {
         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));
+                    return m1.replace(className, templateReplacer(className, options));
                 });
             });
         }
@@ -340,9 +264,9 @@ function customTempleteHandler(rawSource, options) {
     }
     return source;
 }
-function createTempleteHandler(options = {}) {
+function createTemplateHandler(options = {}) {
     return (rawSource, opt = {}) => {
-        return customTempleteHandler(rawSource, defu(opt, options));
+        return customTemplateHandler(rawSource, defu(opt, options));
     };
 }
 
@@ -472,11 +396,13 @@ function internalPatch(pkgJsonPath, options, overwrite = true) {
     if (pkgJsonPath) {
         const pkgJson = require(pkgJsonPath);
         const dangerousOptions = options.dangerousOptions;
-        if (gte(pkgJson.version, dangerousOptions.gteVersion)) {
+        const version = pkgJson.version;
+        if (gte(version, dangerousOptions.gteVersion)) {
             const rootDir = path.dirname(pkgJsonPath);
             const dataTypes = monkeyPatchForSupportingCustomUnit(rootDir, options);
             const result = monkeyPatchForExposingContext(rootDir, {
-                overwrite
+                overwrite,
+                version
             });
             return Object.assign(Object.assign({}, result), { dataTypes });
         }
@@ -582,7 +508,7 @@ function getOptions(options = {}) {
     const result = defu(options, defaultOptions, {
         minifiedJs: isProd()
     });
-    const { cssPreflight, customRuleCallback, cssPreflightRange, replaceUniversalSelectorWith, customAttributes, customReplaceDictionary, supportCustomLengthUnitsPatch, arbitraryValues, cssChildCombinatorReplaceValue, inlineWxs, injectAdditionalCssVarScope, jsPreserveClass } = result;
+    const { cssPreflight, customRuleCallback, cssPreflightRange, replaceUniversalSelectorWith, customAttributes, customReplaceDictionary, supportCustomLengthUnitsPatch, arbitraryValues, cssChildCombinatorReplaceValue, inlineWxs, injectAdditionalCssVarScope, jsPreserveClass, disabledDefaultTemplateHandler } = result;
     result.escapeMap = customReplaceDictionary;
     const cssInjectPreflight = createInjectPreflight(cssPreflight);
     const customAttributesEntities = isMap(options.customAttributes)
@@ -610,14 +536,15 @@ function getOptions(options = {}) {
         jsPreserveClass
     });
     result.jsHandler = jsHandler;
-    const templeteHandler = createTempleteHandler({
+    const templateHandler = createTemplateHandler({
         customAttributesEntities,
         escapeMap,
         mangleContext,
         inlineWxs,
-        jsHandler
+        jsHandler,
+        disabledDefaultTemplateHandler
     });
-    result.templeteHandler = templeteHandler;
+    result.templateHandler = templateHandler;
     result.patch = createPatch(supportCustomLengthUnitsPatch);
     result.setMangleRuntimeSet = setMangleRuntimeSet;
     return result;

package/dist/postcss/shared.d.ts

@@ -1,3 +1,2 @@
 import { InternalCssSelectorReplacerOptions } from "../types";
 export declare function internalCssSelectorReplacer(selectors: string, options?: InternalCssSelectorReplacerOptions): string;
-export declare const cssUnescape: (str: string) => string;

package/dist/{postcss-cf8b998a.js → postcss-4e99a8e8.js}

@@ -1,7 +1,7 @@
 'use strict';
 
 var selectorParser = require('postcss-selector-parser');
-var shared = require('./shared-4eed0e5c.js');
+var shared = require('./shared-df9de23f.js');
 var postcss = require('postcss');
 require('@csstools/postcss-is-pseudo-class');
 
@@ -84,15 +84,15 @@ var cssVars = [
     },
     {
         prop: '--tw-pan-x',
-        value: ' '
+        value: '  '
     },
     {
         prop: '--tw-pan-y',
-        value: ' '
+        value: '  '
     },
     {
         prop: '--tw-pinch-zoom',
-        value: ' '
+        value: '  '
     },
     {
         prop: '--tw-scroll-snap-strictness',
@@ -100,43 +100,43 @@ var cssVars = [
     },
     {
         prop: '--tw-gradient-from-position',
-        value: ' '
+        value: '  '
     },
     {
         prop: '--tw-gradient-via-position',
-        value: ' '
+        value: '  '
     },
     {
         prop: '--tw-gradient-to-position',
-        value: ' '
+        value: '  '
     },
     {
         prop: '--tw-ordinal',
-        value: ' '
+        value: '  '
     },
     {
         prop: '--tw-slashed-zero',
-        value: ' '
+        value: '  '
     },
     {
         prop: '--tw-numeric-figure',
-        value: ' '
+        value: '  '
     },
     {
         prop: '--tw-numeric-spacing',
-        value: ' '
+        value: '  '
     },
     {
         prop: '--tw-numeric-fraction',
-        value: ' '
+        value: '  '
     },
     {
         prop: '--tw-ring-inset',
-        value: ' '
+        value: '  '
     },
     {
         prop: '--tw-ring-offset-width',
-        value: '0rpx'
+        value: '0px'
     },
     {
         prop: '--tw-ring-offset-color',
@@ -144,7 +144,7 @@ var cssVars = [
     },
     {
         prop: '--tw-ring-color',
-        value: 'rgba(59, 130, 246, 0.5)'
+        value: 'rgb(59 130 246 / 0.5)'
     },
     {
         prop: '--tw-ring-offset-shadow',
@@ -164,75 +164,75 @@ var cssVars = [
     },
     {
         prop: '--tw-blur',
-        value: ' '
+        value: '  '
     },
     {
         prop: '--tw-brightness',
-        value: ' '
+        value: '  '
     },
     {
         prop: '--tw-contrast',
-        value: ' '
+        value: '  '
     },
     {
         prop: '--tw-grayscale',
-        value: ' '
+        value: '  '
     },
     {
         prop: '--tw-hue-rotate',
-        value: ' '
+        value: '  '
     },
     {
         prop: '--tw-invert',
-        value: ' '
+        value: '  '
     },
     {
         prop: '--tw-saturate',
-        value: ' '
+        value: '  '
     },
     {
         prop: '--tw-sepia',
-        value: ' '
+        value: '  '
     },
     {
         prop: '--tw-drop-shadow',
-        value: ' '
+        value: '  '
     },
     {
         prop: '--tw-backdrop-blur',
-        value: ' '
+        value: '  '
     },
     {
         prop: '--tw-backdrop-brightness',
-        value: ' '
+        value: '  '
     },
     {
         prop: '--tw-backdrop-contrast',
-        value: ' '
+        value: '  '
     },
     {
         prop: '--tw-backdrop-grayscale',
-        value: ' '
+        value: '  '
     },
     {
         prop: '--tw-backdrop-hue-rotate',
-        value: ' '
+        value: '  '
     },
     {
         prop: '--tw-backdrop-invert',
-        value: ' '
+        value: '  '
     },
     {
         prop: '--tw-backdrop-opacity',
-        value: ' '
+        value: '  '
     },
     {
         prop: '--tw-backdrop-saturate',
-        value: ' '
+        value: '  '
     },
     {
         prop: '--tw-backdrop-sepia',
-        value: ' '
+        value: '  '
     }
 ];
 
@@ -340,14 +340,14 @@ const postcssWeappTailwindcss = (options = {
     isMainChunk: true
 }) => {
     const { customRuleCallback, isMainChunk } = options;
-    const flag = typeof customRuleCallback === 'function';
+    const isCustomRuleCallbackFn = typeof customRuleCallback === 'function';
     return {
         postcssPlugin,
         Once(css) {
             css.walkRules((rule) => {
                 transformSync(rule, options);
                 isMainChunk && commonChunkPreflight(rule, options);
-                flag && customRuleCallback(rule, options);
+                isCustomRuleCallbackFn && customRuleCallback(rule, options);
             });
         }
     };

package/dist/{postcss-53e2ad95.mjs → postcss-a551ddc0.mjs}

@@ -1,5 +1,5 @@
 import selectorParser from 'postcss-selector-parser';
-import { i as internalCssSelectorReplacer } from './shared-686bfc32.mjs';
+import { i as internalCssSelectorReplacer } from './shared-fd149084.mjs';
 import { Declaration, Rule } from 'postcss';
 import '@csstools/postcss-is-pseudo-class';
 
@@ -78,15 +78,15 @@ var cssVars = [
     },
     {
         prop: '--tw-pan-x',
-        value: ' '
+        value: '  '
     },
     {
         prop: '--tw-pan-y',
-        value: ' '
+        value: '  '
     },
     {
         prop: '--tw-pinch-zoom',
-        value: ' '
+        value: '  '
     },
     {
         prop: '--tw-scroll-snap-strictness',
@@ -94,43 +94,43 @@ var cssVars = [
     },
     {
         prop: '--tw-gradient-from-position',
-        value: ' '
+        value: '  '
     },
     {
         prop: '--tw-gradient-via-position',
-        value: ' '
+        value: '  '
     },
     {
         prop: '--tw-gradient-to-position',
-        value: ' '
+        value: '  '
     },
     {
         prop: '--tw-ordinal',
-        value: ' '
+        value: '  '
     },
     {
         prop: '--tw-slashed-zero',
-        value: ' '
+        value: '  '
     },
     {
         prop: '--tw-numeric-figure',
-        value: ' '
+        value: '  '
     },
     {
         prop: '--tw-numeric-spacing',
-        value: ' '
+        value: '  '
     },
     {
         prop: '--tw-numeric-fraction',
-        value: ' '
+        value: '  '
     },
     {
         prop: '--tw-ring-inset',
-        value: ' '
+        value: '  '
     },
     {
         prop: '--tw-ring-offset-width',
-        value: '0rpx'
+        value: '0px'
     },
     {
         prop: '--tw-ring-offset-color',
@@ -138,7 +138,7 @@ var cssVars = [
     },
     {
         prop: '--tw-ring-color',
-        value: 'rgba(59, 130, 246, 0.5)'
+        value: 'rgb(59 130 246 / 0.5)'
     },
     {
         prop: '--tw-ring-offset-shadow',
@@ -158,75 +158,75 @@ var cssVars = [
     },
     {
         prop: '--tw-blur',
-        value: ' '
+        value: '  '
     },
     {
         prop: '--tw-brightness',
-        value: ' '
+        value: '  '
     },
     {
         prop: '--tw-contrast',
-        value: ' '
+        value: '  '
     },
     {
         prop: '--tw-grayscale',
-        value: ' '
+        value: '  '
     },
     {
         prop: '--tw-hue-rotate',
-        value: ' '
+        value: '  '
     },
     {
         prop: '--tw-invert',
-        value: ' '
+        value: '  '
     },
     {
         prop: '--tw-saturate',
-        value: ' '
+        value: '  '
     },
     {
         prop: '--tw-sepia',
-        value: ' '
+        value: '  '
     },
     {
         prop: '--tw-drop-shadow',
-        value: ' '
+        value: '  '
     },
     {
         prop: '--tw-backdrop-blur',
-        value: ' '
+        value: '  '
     },
     {
         prop: '--tw-backdrop-brightness',
-        value: ' '
+        value: '  '
     },
     {
         prop: '--tw-backdrop-contrast',
-        value: ' '
+        value: '  '
     },
     {
         prop: '--tw-backdrop-grayscale',
-        value: ' '
+        value: '  '
     },
     {
         prop: '--tw-backdrop-hue-rotate',
-        value: ' '
+        value: '  '
     },
     {
         prop: '--tw-backdrop-invert',
-        value: ' '
+        value: '  '
     },
     {
         prop: '--tw-backdrop-opacity',
-        value: ' '
+        value: '  '
     },
     {
         prop: '--tw-backdrop-saturate',
-        value: ' '
+        value: '  '
     },
     {
         prop: '--tw-backdrop-sepia',
-        value: ' '
+        value: '  '
     }
 ];
 
@@ -334,14 +334,14 @@ const postcssWeappTailwindcss = (options = {
     isMainChunk: true
 }) => {
     const { customRuleCallback, isMainChunk } = options;
-    const flag = typeof customRuleCallback === 'function';
+    const isCustomRuleCallbackFn = typeof customRuleCallback === 'function';
     return {
         postcssPlugin,
         Once(css) {
             css.walkRules((rule) => {
                 transformSync(rule, options);
                 isMainChunk && commonChunkPreflight(rule, options);
-                flag && customRuleCallback(rule, options);
+                isCustomRuleCallbackFn && customRuleCallback(rule, options);
             });
         }
     };