weapp-tailwindcss 2.6.2 → 2.6.3

package/dist/{options-244dcceb.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-c397b5f9.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-99efb521.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-)?class="[^"]*"[^>]*?\/?>/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 createTemplateHandlerMatchRegexp(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: createTemplateHandlerMatchRegexp(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, {

package/dist/{postcss-4c88cd6d.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');
 

package/dist/{postcss-99efb521.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';
 

package/dist/postcss.js

@@ -2,11 +2,11 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var postcss = require('./postcss-4c88cd6d.js');
+var postcss = require('./postcss-4e99a8e8.js');
 var postcssIsPseudoClass = require('@csstools/postcss-is-pseudo-class');
 require('postcss-selector-parser');
-require('./shared-4eed0e5c.js');
-require('./dic-05980807.js');
+require('./shared-df9de23f.js');
+require('@weapp-core/escape');
 require('postcss');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }

package/dist/postcss.mjs

@@ -1,6 +1,6 @@
-export { p as postcssWeappTailwindcss } from './postcss-99efb521.mjs';
+export { p as postcssWeappTailwindcss } from './postcss-a551ddc0.mjs';
 export { default as postcssIsPseudoClass } from '@csstools/postcss-is-pseudo-class';
 import 'postcss-selector-parser';
-import './shared-686bfc32.mjs';
-import './dic-3790a3a4.mjs';
+import './shared-fd149084.mjs';
+import '@weapp-core/escape';
 import 'postcss';

package/dist/reg.d.ts

@@ -1,16 +1 @@
-import type { ICustomRegexp, ItemOrItemArray } from "./types";
-export declare function escapeStringRegexp(str: string): string;
-export declare const templateClassExactRegexp: RegExp;
-export declare const tagWithEitherClassAndHoverClassRegexp: RegExp;
-interface ICreateRegexpOptions {
-    exact?: boolean;
-}
-export declare function handleRegexp(reg: RegExp): string;
-export declare function getSourceString(input: string | RegExp): string;
-export declare function makePattern(arr: ItemOrItemArray<string | RegExp>): string;
-export declare function createTemplateHandlerMatchRegexp(tag: string | RegExp, attrs: ItemOrItemArray<string | RegExp>, options?: ICreateRegexpOptions): RegExp;
-export declare function createTemplateClassRegexp(attrs: ItemOrItemArray<string | RegExp>, options?: ICreateRegexpOptions): RegExp;
-export declare function makeCustomAttributes(entries?: [string | RegExp, ItemOrItemArray<string | RegExp>][]): ICustomRegexp[] | undefined;
-export declare const variableRegExp: RegExp;
-export declare const wxsTagRegexp: RegExp;
-export {};
+export * from '@weapp-core/regex';

package/dist/replace.d.ts

@@ -1,3 +1,3 @@
-export * from './dic';
+export { MappingChars2String, MappingChars2StringEntries, MappingStringDictionary, SYMBOL_TABLE, SYMBOL_TABLE_TYPE, SYMBOL_TABLE_TYPE_VALUES, SimpleMappingChars2String, SimpleMappingChars2StringEntries } from './escape';
 export { replaceWxml as replaceJs } from './wxml/shared';
 export { internalCssSelectorReplacer as replaceCss } from './postcss/shared';

package/dist/replace.js

@@ -2,12 +2,12 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var dic = require('./dic-05980807.js');
-var shared = require('./shared-4eed0e5c.js');
+var escape = require('@weapp-core/escape');
+var shared = require('./shared-df9de23f.js');
 
 function replaceWxml(original, options = {
     keepEOL: false,
-    escapeMap: dic.SimpleMappingChars2String
+    escapeMap: escape.SimpleMappingChars2String
 }) {
     const { keepEOL, escapeMap, mangleContext } = options;
     let res = original;
@@ -18,16 +18,31 @@ function replaceWxml(original, options = {
     if (mangleContext) {
         res = mangleContext.wxmlHandler(res);
     }
-    res = shared.escape(res, {
+    res = escape.escape(res, {
         map: escapeMap
     });
     return res;
 }
 
-exports.MappingChars2String = dic.MappingChars2String;
-exports.MappingChars2StringEntries = dic.MappingChars2StringEntries;
-exports.SYMBOL_TABLE = dic.SYMBOL_TABLE;
-exports.SimpleMappingChars2String = dic.SimpleMappingChars2String;
-exports.SimpleMappingChars2StringEntries = dic.SimpleMappingChars2StringEntries;
+Object.defineProperty(exports, 'MappingChars2String', {
+    enumerable: true,
+    get: function () { return escape.MappingChars2String; }
+});
+Object.defineProperty(exports, 'MappingChars2StringEntries', {
+    enumerable: true,
+    get: function () { return escape.MappingChars2StringEntries; }
+});
+Object.defineProperty(exports, 'SYMBOL_TABLE', {
+    enumerable: true,
+    get: function () { return escape.SYMBOL_TABLE; }
+});
+Object.defineProperty(exports, 'SimpleMappingChars2String', {
+    enumerable: true,
+    get: function () { return escape.SimpleMappingChars2String; }
+});
+Object.defineProperty(exports, 'SimpleMappingChars2StringEntries', {
+    enumerable: true,
+    get: function () { return escape.SimpleMappingChars2StringEntries; }
+});
 exports.replaceCss = shared.internalCssSelectorReplacer;
 exports.replaceJs = replaceWxml;

package/dist/replace.mjs

@@ -1,7 +1,6 @@
-import { S as SimpleMappingChars2String } from './dic-3790a3a4.mjs';
-export { M as MappingChars2String, b as MappingChars2StringEntries, a as SYMBOL_TABLE, c as SimpleMappingChars2StringEntries } from './dic-3790a3a4.mjs';
-import { e as escape } from './shared-686bfc32.mjs';
-export { i as replaceCss } from './shared-686bfc32.mjs';
+import { escape, SimpleMappingChars2String } from '@weapp-core/escape';
+export { MappingChars2String, MappingChars2StringEntries, SYMBOL_TABLE, SimpleMappingChars2String, SimpleMappingChars2StringEntries } from '@weapp-core/escape';
+export { i as replaceCss } from './shared-fd149084.mjs';
 
 function replaceWxml(original, options = {
     keepEOL: false,
@@ -22,4 +21,4 @@ function replaceWxml(original, options = {
     return res;
 }
 
-export { SimpleMappingChars2String, replaceWxml as replaceJs };
+export { replaceWxml as replaceJs };

package/dist/shared-df9de23f.js

@@ -0,0 +1,17 @@
+'use strict';
+
+var escape = require('@weapp-core/escape');
+
+function internalCssSelectorReplacer(selectors, options = {
+    escapeMap: escape.SimpleMappingChars2String
+}) {
+    const { mangleContext, escapeMap } = options;
+    if (mangleContext) {
+        selectors = mangleContext.cssHandler(selectors);
+    }
+    return escape.escape(selectors, {
+        map: escapeMap
+    });
+}
+
+exports.internalCssSelectorReplacer = internalCssSelectorReplacer;

package/dist/shared-fd149084.mjs

@@ -0,0 +1,15 @@
+import { escape, SimpleMappingChars2String } from '@weapp-core/escape';
+
+function internalCssSelectorReplacer(selectors, options = {
+    escapeMap: SimpleMappingChars2String
+}) {
+    const { mangleContext, escapeMap } = options;
+    if (mangleContext) {
+        selectors = mangleContext.cssHandler(selectors);
+    }
+    return escape(selectors, {
+        map: escapeMap
+    });
+}
+
+export { internalCssSelectorReplacer as i };

package/dist/types.d.ts

@@ -108,12 +108,6 @@ export interface ICommonReplaceOptions {
     keepEOL?: boolean;
     escapeMap?: Record<string, string>;
 }
-export type ICustomRegexp = {
-    tagRegexp: RegExp;
-    attrRegexp: RegExp;
-    tag: string;
-    attrs: ItemOrItemArray<string | RegExp>;
-};
 export interface ITemplateHandlerOptions extends ICommonReplaceOptions {
     customAttributesEntities?: ICustomAttributesEntities;
     escapeMap?: Record<string, string>;

package/dist/vite.js

@@ -2,17 +2,18 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var options = require('./options-c5e1d1b4.js');
-var postcss = require('./postcss-4c88cd6d.js');
-var defaults = require('./defaults-d79e9245.js');
+var options = require('./options-43afee21.js');
+var postcss = require('./postcss-4e99a8e8.js');
+var defaults = require('./defaults-28cfeec8.js');
 require('micromatch');
 require('@babel/types');
 require('@babel/generator');
 require('@babel/parser');
 require('@babel/traverse');
 require('./replace.js');
-require('./dic-05980807.js');
-require('./shared-4eed0e5c.js');
+require('@weapp-core/escape');
+require('./shared-df9de23f.js');
+require('@weapp-core/regex');
 require('postcss');
 require('@csstools/postcss-is-pseudo-class');
 require('node:path');

package/dist/vite.mjs

@@ -1,14 +1,15 @@
-import { g as getOptions, a as createTailwindcssPatcher } from './options-244dcceb.mjs';
-import { v as vitePluginName } from './postcss-99efb521.mjs';
-import { g as getGroupedEntries } from './defaults-c397b5f9.mjs';
+import { g as getOptions, a as createTailwindcssPatcher } from './options-d8cb9e14.mjs';
+import { v as vitePluginName } from './postcss-a551ddc0.mjs';
+import { g as getGroupedEntries } from './defaults-702719e1.mjs';
 import 'micromatch';
 import '@babel/types';
 import '@babel/generator';
 import '@babel/parser';
 import '@babel/traverse';
 import './replace.mjs';
-import './dic-3790a3a4.mjs';
-import './shared-686bfc32.mjs';
+import '@weapp-core/escape';
+import './shared-fd149084.mjs';
+import '@weapp-core/regex';
 import 'postcss';
 import '@csstools/postcss-is-pseudo-class';
 import 'node:path';

package/dist/webpack.js

@@ -4,17 +4,18 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var path = require('node:path');
 var fs = require('node:fs');
-var options = require('./options-c5e1d1b4.js');
-var postcss = require('./postcss-4c88cd6d.js');
-var defaults = require('./defaults-d79e9245.js');
+var options = require('./options-43afee21.js');
+var postcss = require('./postcss-4e99a8e8.js');
+var defaults = require('./defaults-28cfeec8.js');
 require('micromatch');
 require('@babel/types');
 require('@babel/generator');
 require('@babel/parser');
 require('@babel/traverse');
 require('./replace.js');
-require('./dic-05980807.js');
-require('./shared-4eed0e5c.js');
+require('@weapp-core/escape');
+require('./shared-df9de23f.js');
+require('@weapp-core/regex');
 require('postcss');
 require('@csstools/postcss-is-pseudo-class');
 require('semver');

package/dist/webpack.mjs

@@ -1,16 +1,17 @@
 import path from 'node:path';
 import fs from 'node:fs';
-import { g as getOptions, a as createTailwindcssPatcher } from './options-244dcceb.mjs';
-import { a as pluginName } from './postcss-99efb521.mjs';
-import { g as getGroupedEntries } from './defaults-c397b5f9.mjs';
+import { g as getOptions, a as createTailwindcssPatcher } from './options-d8cb9e14.mjs';
+import { a as pluginName } from './postcss-a551ddc0.mjs';
+import { g as getGroupedEntries } from './defaults-702719e1.mjs';
 import 'micromatch';
 import '@babel/types';
 import '@babel/generator';
 import '@babel/parser';
 import '@babel/traverse';
 import './replace.mjs';
-import './dic-3790a3a4.mjs';
-import './shared-686bfc32.mjs';
+import '@weapp-core/escape';
+import './shared-fd149084.mjs';
+import '@weapp-core/regex';
 import 'postcss';
 import '@csstools/postcss-is-pseudo-class';
 import 'semver';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "weapp-tailwindcss",
-  "version": "2.6.2",
+  "version": "2.6.3",
   "description": "把tailwindcss jit引擎，带给小程序开发者们\nbring tailwindcss jit engine to our miniprogram developers!",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -46,7 +46,8 @@
   "typesVersions": {
     "*": {
       "*": [
-        "./dist/*"
+        "./dist/*",
+        "./dist/index.d.ts"
       ]
     }
   },
@@ -119,9 +120,9 @@
     "@types/jest": "^29.5.3",
     "@types/klaw": "^3.0.3",
     "@types/loader-utils": "^2.0.3",
-    "@types/lodash": "^4.14.195",
+    "@types/lodash": "^4.14.196",
     "@types/micromatch": "^4.0.2",
-    "@types/node": "^20.4.2",
+    "@types/node": "^20.4.5",
     "@types/semver": "^7.5.0",
     "@types/vinyl": "^2.0.7",
     "@types/webpack": "^5.28.1",
@@ -130,17 +131,16 @@
     "autoprefixer": "^10.4.14",
     "babel-loader": "^9.1.3",
     "bumpp": "^9.1.1",
-    "chalk": "4.1.2",
+    "colorette": "^2.0.20",
     "cross-env": "^7.0.3",
     "css-loader": "^6.8.1",
     "defu": "6.1.2",
-    "del": "^6.1.1",
+    "del": "^7.0.0",
     "eslint": "8.45.0",
-    "eslint-config-icebreaker": "^1.1.0",
+    "eslint-config-icebreaker": "^1.2.2",
     "eslint-config-prettier": "^8.8.0",
     "eslint-plugin-prettier": "^4.2.1",
-    "execa": "5",
-    "fast-glob": "^3.3.0",
+    "fast-glob": "^3.3.1",
     "fs-extra": "^11.1.1",
     "gulp": "^4.0.2",
     "gulp-postcss": "^9.0.1",
@@ -164,13 +164,13 @@
     "tailwindcss": "^3.3.3",
     "ts-jest": "^29.1.1",
     "ts-node": "^10.9.1",
-    "ts-patch": "^3.0.1",
+    "ts-patch": "^3.0.2",
     "tsd": "^0.28.1",
-    "tslib": "^2.6.0",
+    "tslib": "^2.6.1",
     "typescript": "^5.1.6",
     "typescript-transform-paths": "^3.4.6",
     "vinyl": "^3.0.0",
-    "vite": "^4.4.4",
+    "vite": "^4.4.7",
     "vitest": "^0.33.0",
     "weapp-tailwindcss-children": "^0.1.0",
     "webpack": "^5.88.2",
@@ -182,15 +182,17 @@
     "@babel/traverse": "^7.22.8",
     "@babel/types": "^7.22.5",
     "@csstools/postcss-is-pseudo-class": "^4.0.0",
+    "@weapp-core/escape": "^1.0.0",
+    "@weapp-core/regex": "^1.0.0",
     "loader-utils": "^2.0.3",
     "micromatch": "^4.0.5",
-    "postcss": "8.4.26",
+    "postcss": "8.4.27",
     "postcss-selector-parser": "^6.0.13",
     "semver": "^7.5.4",
     "tailwindcss-mangle-shared": "^1.2.7",
     "tailwindcss-patch": "^1.2.7"
   },
-  "packageManager": "pnpm@8.6.3",
+  "packageManager": "pnpm@8.6.9",
   "scripts": {
     "dev": "yarn clean && yarn dts && cross-env NODE_ENV=development rollup -c rollup.config.ts --configPlugin typescript -w",
     "build": "yarn clean && cross-env NODE_ENV=production rollup -c rollup.config.ts --configPlugin typescript && yarn dts",