weapp-tailwindcss 2.4.4 → 2.5.2

package/dist/cli.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var options = require('./options-887b74ca.js');
+var options = require('./options-ad127e0c.js');
 require('micromatch');
 require('@babel/types');
 require('@babel/generator');
@@ -9,7 +9,7 @@ require('@babel/traverse');
 require('./replace.js');
 require('./shared-ae7dd073.js');
 require('postcss');
-require('./postcss-33ef0bd0.js');
+require('./postcss-fbdc673b.js');
 require('postcss-selector-parser');
 require('@csstools/postcss-is-pseudo-class');
 require('node:path');

package/dist/cli.mjs

@@ -1,4 +1,4 @@
-import { g as getOptions, c as createPatch } from './options-879de0a2.mjs';
+import { g as getOptions, c as createPatch } from './options-1e3a224a.mjs';
 import 'micromatch';
 import '@babel/types';
 import '@babel/generator';
@@ -7,7 +7,7 @@ import '@babel/traverse';
 import './replace.mjs';
 import './shared-7c88fb94.mjs';
 import 'postcss';
-import './postcss-ea625621.mjs';
+import './postcss-9a63df9d.mjs';
 import 'postcss-selector-parser';
 import '@csstools/postcss-is-pseudo-class';
 import 'node:path';

package/dist/constants.d.ts

@@ -1,4 +1,4 @@
-export declare const NS = "jsx-rename-loader";
+export declare const runtimeAopLoader = "weapp-tw-runtime-aop-loader";
 export declare const postcssPlugin = "postcss-weapp-tailwindcss-rename-plugin";
 export declare const ManglePluginHooks = "ManglePluginHooks";
 export declare const WeappTailwindcssWebpackPluginOptimizeChunkAssetsHooks = "WeappTailwindcssWebpackPluginOptimizeChunkAssetsHooks";

package/dist/gulp.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var stream = require('node:stream');
-var options = require('./options-887b74ca.js');
+var options = require('./options-ad127e0c.js');
 require('micromatch');
 require('@babel/types');
 require('@babel/generator');
@@ -12,7 +12,7 @@ require('@babel/traverse');
 require('./replace.js');
 require('./shared-ae7dd073.js');
 require('postcss');
-require('./postcss-33ef0bd0.js');
+require('./postcss-fbdc673b.js');
 require('postcss-selector-parser');
 require('@csstools/postcss-is-pseudo-class');
 require('node:path');
@@ -32,14 +32,14 @@ function createPlugins(options$1 = {}) {
     }
     const opts = options.getOptions(options$1);
     const { templeteHandler, styleHandler, patch, jsHandler, setMangleRuntimeSet } = opts;
-    let set = new Set();
+    let runtimeSet = new Set();
     patch === null || patch === void 0 ? void 0 : patch();
     const twPatcher = options.createTailwindcssPatcher();
     function transformWxss() {
         const transformStream = new Transform({ objectMode: true });
         transformStream._transform = function (file, encoding, callback) {
-            set = twPatcher.getClassSet();
-            setMangleRuntimeSet(set);
+            runtimeSet = twPatcher.getClassSet();
+            setMangleRuntimeSet(runtimeSet);
             const error = null;
             if (file.contents) {
                 const code = styleHandler(file.contents.toString(), {
@@ -56,7 +56,7 @@ function createPlugins(options$1 = {}) {
         transformStream._transform = function (file, encoding, callback) {
             const error = null;
             if (file.contents) {
-                const { code } = jsHandler(file.contents.toString(), set);
+                const { code } = jsHandler(file.contents.toString(), runtimeSet);
                 file.contents = Buffer.from(code);
             }
             callback(error, file);
@@ -68,7 +68,9 @@ function createPlugins(options$1 = {}) {
         transformStream._transform = function (file, encoding, callback) {
             const error = null;
             if (file.contents) {
-                const code = templeteHandler(file.contents.toString());
+                const code = templeteHandler(file.contents.toString(), {
+                    runtimeSet
+                });
                 file.contents = Buffer.from(code);
             }
             callback(error, file);

package/dist/gulp.mjs

@@ -1,5 +1,5 @@
 import stream from 'node:stream';
-import { g as getOptions, a as createTailwindcssPatcher } from './options-879de0a2.mjs';
+import { g as getOptions, a as createTailwindcssPatcher } from './options-1e3a224a.mjs';
 import 'micromatch';
 import '@babel/types';
 import '@babel/generator';
@@ -8,7 +8,7 @@ import '@babel/traverse';
 import './replace.mjs';
 import './shared-7c88fb94.mjs';
 import 'postcss';
-import './postcss-ea625621.mjs';
+import './postcss-9a63df9d.mjs';
 import 'postcss-selector-parser';
 import '@csstools/postcss-is-pseudo-class';
 import 'node:path';
@@ -24,14 +24,14 @@ function createPlugins(options = {}) {
     }
     const opts = getOptions(options);
     const { templeteHandler, styleHandler, patch, jsHandler, setMangleRuntimeSet } = opts;
-    let set = new Set();
+    let runtimeSet = new Set();
     patch === null || patch === void 0 ? void 0 : patch();
     const twPatcher = createTailwindcssPatcher();
     function transformWxss() {
         const transformStream = new Transform({ objectMode: true });
         transformStream._transform = function (file, encoding, callback) {
-            set = twPatcher.getClassSet();
-            setMangleRuntimeSet(set);
+            runtimeSet = twPatcher.getClassSet();
+            setMangleRuntimeSet(runtimeSet);
             const error = null;
             if (file.contents) {
                 const code = styleHandler(file.contents.toString(), {
@@ -48,7 +48,7 @@ function createPlugins(options = {}) {
         transformStream._transform = function (file, encoding, callback) {
             const error = null;
             if (file.contents) {
-                const { code } = jsHandler(file.contents.toString(), set);
+                const { code } = jsHandler(file.contents.toString(), runtimeSet);
                 file.contents = Buffer.from(code);
             }
             callback(error, file);
@@ -60,7 +60,9 @@ function createPlugins(options = {}) {
         transformStream._transform = function (file, encoding, callback) {
             const error = null;
             if (file.contents) {
-                const code = templeteHandler(file.contents.toString());
+                const code = templeteHandler(file.contents.toString(), {
+                    runtimeSet
+                });
                 file.contents = Buffer.from(code);
             }
             callback(error, file);

package/dist/index.js

@@ -5,7 +5,9 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var webpack = require('./webpack.js');
 var vite = require('./vite.js');
 var gulp = require('./gulp.js');
-require('./options-887b74ca.js');
+require('node:path');
+require('node:fs');
+require('./options-ad127e0c.js');
 require('micromatch');
 require('@babel/types');
 require('@babel/generator');
@@ -14,11 +16,9 @@ require('@babel/traverse');
 require('./replace.js');
 require('./shared-ae7dd073.js');
 require('postcss');
-require('./postcss-33ef0bd0.js');
+require('./postcss-fbdc673b.js');
 require('postcss-selector-parser');
 require('@csstools/postcss-is-pseudo-class');
-require('node:path');
-require('node:fs');
 require('semver');
 require('tailwindcss-patch');
 require('tailwindcss-mangle-shared');

package/dist/index.mjs

@@ -1,7 +1,9 @@
 export { UnifiedWebpackPluginV5 } from './webpack.mjs';
 export { UnifiedViteWeappTailwindcssPlugin } from './vite.mjs';
 export { createPlugins } from './gulp.mjs';
-import './options-879de0a2.mjs';
+import 'node:path';
+import 'node:fs';
+import './options-1e3a224a.mjs';
 import 'micromatch';
 import '@babel/types';
 import '@babel/generator';
@@ -10,11 +12,9 @@ import '@babel/traverse';
 import './replace.mjs';
 import './shared-7c88fb94.mjs';
 import 'postcss';
-import './postcss-ea625621.mjs';
+import './postcss-9a63df9d.mjs';
 import 'postcss-selector-parser';
 import '@csstools/postcss-is-pseudo-class';
-import 'node:path';
-import 'node:fs';
 import 'semver';
 import 'tailwindcss-patch';
 import 'tailwindcss-mangle-shared';

package/dist/{options-879de0a2.mjs → options-1e3a224a.mjs}

@@ -6,7 +6,7 @@ import traverse from '@babel/traverse';
 import { replaceJs as replaceWxml } from './replace.mjs';
 import { S as SimpleMappingChars2String, M as MappingChars2String } from './shared-7c88fb94.mjs';
 import postcss from 'postcss';
-import { p as postcssWeappTailwindcss } from './postcss-ea625621.mjs';
+import { p as postcssWeappTailwindcss } from './postcss-9a63df9d.mjs';
 import postcssIsPseudoClass from '@csstools/postcss-is-pseudo-class';
 import path from 'node:path';
 import fs from 'node:fs';
@@ -84,7 +84,7 @@ function groupBy(arr, cb) {
     return result;
 }
 function getGroupedEntries(entries, options) {
-    const { cssMatcher, htmlMatcher, jsMatcher } = options;
+    const { cssMatcher, htmlMatcher, jsMatcher, wxsMatcher } = options;
     const groupedEntries = groupBy(entries, ([file]) => {
         if (cssMatcher(file)) {
             return 'css';
@@ -92,7 +92,7 @@ function getGroupedEntries(entries, options) {
         else if (htmlMatcher(file)) {
             return 'html';
         }
-        else if (jsMatcher(file)) {
+        else if (jsMatcher(file) || wxsMatcher(file)) {
             return 'js';
         }
         else {
@@ -180,9 +180,7 @@ function makeCustomAttributes(entries) {
     }
 }
 const variableRegExp = /{{(.*?)}}/gs;
-function variableMatch(original) {
-    return variableRegExp.exec(original);
-}
+const wxsTagRegexp = /<wxs\s*(?:[a-z][a-z-]*[a-z]*(?:\s*=\s*".*?")?)*\s*>(.*?)<\/wxs>/gs;
 
 const validateFilterRE = /[\w%-?\u00A0-\uFFFF-]/;
 function isValidSelector(selector = '') {
@@ -310,6 +308,9 @@ const defaultOptions = {
             }
         }
     },
+    wxsMatcher: (file) => {
+        return false;
+    },
     cssPreflight: {
         'box-sizing': 'border-box',
         'border-width': '0',
@@ -340,7 +341,8 @@ const defaultOptions = {
     arbitraryValues: {
         allowDoubleQuotes: false
     },
-    cssChildCombinatorReplaceValue: 'view + view'
+    cssChildCombinatorReplaceValue: 'view + view',
+    inlineWxs: false
 };
 
 function generateCode(match, options = {}) {
@@ -368,23 +370,24 @@ function generateCode(match, options = {}) {
     });
     return code;
 }
-function extractSource(original) {
-    let match = variableMatch(original);
+function extract(original, reg) {
+    let match = reg.exec(original);
     const sources = [];
     while (match !== null) {
         const start = match.index;
-        const end = variableRegExp.lastIndex;
+        const end = reg.lastIndex;
         sources.push({
             start,
             end,
-            raw: match[1],
-            prevConcatenated: !/\s/.test(original[start - 1]),
-            nextConcatenated: !/\s/.test(original[end])
+            raw: match[1]
         });
-        match = variableMatch(original);
+        match = reg.exec(original);
     }
     return sources;
 }
+function extractSource(original) {
+    return extract(original, variableRegExp);
+}
 function templeteReplacer(original, options = {}) {
     const sources = extractSource(original);
     if (sources.length > 0) {
@@ -435,24 +438,27 @@ function templeteHandler(rawSource, options = {}) {
         });
     });
 }
-function customTempleteHandler(rawSource, options = {}) {
+function customTempleteHandler(rawSource, options) {
+    const { customAttributesEntities, inlineWxs, runtimeSet, jsHandler } = options;
     let source = templeteHandler(rawSource, options);
-    const regexps = makeCustomAttributes(options.customAttributesEntities);
-    if (regexps) {
-        if (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));
-                    });
+    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 source;
     }
-    else {
-        return source;
+    if (inlineWxs) {
+        const wxsTags = extract(source, wxsTagRegexp);
+        for (const x of wxsTags) {
+            const code = jsHandler(x.raw, runtimeSet).code;
+            source = source.replaceAll(x.raw, code);
+        }
     }
+    return source;
 }
 function createTempleteHandler(options = {}) {
     return (rawSource, opt = {}) => {
@@ -691,11 +697,12 @@ function getOptions(options = {}) {
     normalizeMatcher(options, 'cssMatcher');
     normalizeMatcher(options, 'htmlMatcher');
     normalizeMatcher(options, 'jsMatcher');
+    normalizeMatcher(options, 'wxsMatcher');
     normalizeMatcher(options, 'mainCssChunkMatcher');
     const result = defu(options, defaultOptions, {
         minifiedJs: isProd()
     });
-    const { cssPreflight, customRuleCallback, cssPreflightRange, replaceUniversalSelectorWith, customAttributes, customReplaceDictionary, supportCustomLengthUnitsPatch, arbitraryValues, cssChildCombinatorReplaceValue } = result;
+    const { cssPreflight, customRuleCallback, cssPreflightRange, replaceUniversalSelectorWith, customAttributes, customReplaceDictionary, supportCustomLengthUnitsPatch, arbitraryValues, cssChildCombinatorReplaceValue, inlineWxs } = result;
     result.escapeMap = customReplaceDictionary;
     const cssInjectPreflight = createInjectPreflight(cssPreflight);
     const customAttributesEntities = isMap(options.customAttributes)
@@ -704,12 +711,7 @@ function getOptions(options = {}) {
     const { escapeMap, minifiedJs } = result;
     const { initMangle, mangleContext, setMangleRuntimeSet } = useMangleStore();
     initMangle(options.mangle);
-    result.templeteHandler = createTempleteHandler({
-        customAttributesEntities,
-        escapeMap,
-        mangleContext
-    });
-    result.styleHandler = createStyleHandler({
+    const styleHandler = createStyleHandler({
         cssInjectPreflight,
         customRuleCallback,
         cssPreflightRange,
@@ -718,12 +720,22 @@ function getOptions(options = {}) {
         mangleContext,
         cssChildCombinatorReplaceValue
     });
-    result.jsHandler = createjsHandler({
+    result.styleHandler = styleHandler;
+    const jsHandler = createjsHandler({
         minifiedJs,
         escapeMap,
         mangleContext,
         arbitraryValues
     });
+    result.jsHandler = jsHandler;
+    const templeteHandler = createTempleteHandler({
+        customAttributesEntities,
+        escapeMap,
+        mangleContext,
+        inlineWxs,
+        jsHandler
+    });
+    result.templeteHandler = templeteHandler;
     result.patch = createPatch(supportCustomLengthUnitsPatch);
     result.setMangleRuntimeSet = setMangleRuntimeSet;
     return result;

package/dist/{options-887b74ca.js → options-ad127e0c.js}

@@ -8,7 +8,7 @@ var traverse = require('@babel/traverse');
 var replace = require('./replace.js');
 var shared = require('./shared-ae7dd073.js');
 var postcss = require('postcss');
-var postcss$1 = require('./postcss-33ef0bd0.js');
+var postcss$1 = require('./postcss-fbdc673b.js');
 var postcssIsPseudoClass = require('@csstools/postcss-is-pseudo-class');
 var path = require('node:path');
 var fs = require('node:fs');
@@ -114,7 +114,7 @@ function groupBy(arr, cb) {
     return result;
 }
 function getGroupedEntries(entries, options) {
-    const { cssMatcher, htmlMatcher, jsMatcher } = options;
+    const { cssMatcher, htmlMatcher, jsMatcher, wxsMatcher } = options;
     const groupedEntries = groupBy(entries, ([file]) => {
         if (cssMatcher(file)) {
             return 'css';
@@ -122,7 +122,7 @@ function getGroupedEntries(entries, options) {
         else if (htmlMatcher(file)) {
             return 'html';
         }
-        else if (jsMatcher(file)) {
+        else if (jsMatcher(file) || wxsMatcher(file)) {
             return 'js';
         }
         else {
@@ -210,9 +210,7 @@ function makeCustomAttributes(entries) {
     }
 }
 const variableRegExp = /{{(.*?)}}/gs;
-function variableMatch(original) {
-    return variableRegExp.exec(original);
-}
+const wxsTagRegexp = /<wxs\s*(?:[a-z][a-z-]*[a-z]*(?:\s*=\s*".*?")?)*\s*>(.*?)<\/wxs>/gs;
 
 const validateFilterRE = /[\w%-?\u00A0-\uFFFF-]/;
 function isValidSelector(selector = '') {
@@ -340,6 +338,9 @@ const defaultOptions = {
             }
         }
     },
+    wxsMatcher: (file) => {
+        return false;
+    },
     cssPreflight: {
         'box-sizing': 'border-box',
         'border-width': '0',
@@ -370,7 +371,8 @@ const defaultOptions = {
     arbitraryValues: {
         allowDoubleQuotes: false
     },
-    cssChildCombinatorReplaceValue: 'view + view'
+    cssChildCombinatorReplaceValue: 'view + view',
+    inlineWxs: false
 };
 
 function generateCode(match, options = {}) {
@@ -398,23 +400,24 @@ function generateCode(match, options = {}) {
     });
     return code;
 }
-function extractSource(original) {
-    let match = variableMatch(original);
+function extract(original, reg) {
+    let match = reg.exec(original);
     const sources = [];
     while (match !== null) {
         const start = match.index;
-        const end = variableRegExp.lastIndex;
+        const end = reg.lastIndex;
         sources.push({
             start,
             end,
-            raw: match[1],
-            prevConcatenated: !/\s/.test(original[start - 1]),
-            nextConcatenated: !/\s/.test(original[end])
+            raw: match[1]
         });
-        match = variableMatch(original);
+        match = reg.exec(original);
     }
     return sources;
 }
+function extractSource(original) {
+    return extract(original, variableRegExp);
+}
 function templeteReplacer(original, options = {}) {
     const sources = extractSource(original);
     if (sources.length > 0) {
@@ -465,24 +468,27 @@ function templeteHandler(rawSource, options = {}) {
         });
     });
 }
-function customTempleteHandler(rawSource, options = {}) {
+function customTempleteHandler(rawSource, options) {
+    const { customAttributesEntities, inlineWxs, runtimeSet, jsHandler } = options;
     let source = templeteHandler(rawSource, options);
-    const regexps = makeCustomAttributes(options.customAttributesEntities);
-    if (regexps) {
-        if (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));
-                    });
+    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 source;
     }
-    else {
-        return source;
+    if (inlineWxs) {
+        const wxsTags = extract(source, wxsTagRegexp);
+        for (const x of wxsTags) {
+            const code = jsHandler(x.raw, runtimeSet).code;
+            source = source.replaceAll(x.raw, code);
+        }
     }
+    return source;
 }
 function createTempleteHandler(options = {}) {
     return (rawSource, opt = {}) => {
@@ -721,11 +727,12 @@ function getOptions(options = {}) {
     normalizeMatcher(options, 'cssMatcher');
     normalizeMatcher(options, 'htmlMatcher');
     normalizeMatcher(options, 'jsMatcher');
+    normalizeMatcher(options, 'wxsMatcher');
     normalizeMatcher(options, 'mainCssChunkMatcher');
     const result = defu(options, defaultOptions, {
         minifiedJs: isProd()
     });
-    const { cssPreflight, customRuleCallback, cssPreflightRange, replaceUniversalSelectorWith, customAttributes, customReplaceDictionary, supportCustomLengthUnitsPatch, arbitraryValues, cssChildCombinatorReplaceValue } = result;
+    const { cssPreflight, customRuleCallback, cssPreflightRange, replaceUniversalSelectorWith, customAttributes, customReplaceDictionary, supportCustomLengthUnitsPatch, arbitraryValues, cssChildCombinatorReplaceValue, inlineWxs } = result;
     result.escapeMap = customReplaceDictionary;
     const cssInjectPreflight = createInjectPreflight(cssPreflight);
     const customAttributesEntities = isMap(options.customAttributes)
@@ -734,12 +741,7 @@ function getOptions(options = {}) {
     const { escapeMap, minifiedJs } = result;
     const { initMangle, mangleContext, setMangleRuntimeSet } = useMangleStore();
     initMangle(options.mangle);
-    result.templeteHandler = createTempleteHandler({
-        customAttributesEntities,
-        escapeMap,
-        mangleContext
-    });
-    result.styleHandler = createStyleHandler({
+    const styleHandler = createStyleHandler({
         cssInjectPreflight,
         customRuleCallback,
         cssPreflightRange,
@@ -748,12 +750,22 @@ function getOptions(options = {}) {
         mangleContext,
         cssChildCombinatorReplaceValue
     });
-    result.jsHandler = createjsHandler({
+    result.styleHandler = styleHandler;
+    const jsHandler = createjsHandler({
         minifiedJs,
         escapeMap,
         mangleContext,
         arbitraryValues
     });
+    result.jsHandler = jsHandler;
+    const templeteHandler = createTempleteHandler({
+        customAttributesEntities,
+        escapeMap,
+        mangleContext,
+        inlineWxs,
+        jsHandler
+    });
+    result.templeteHandler = templeteHandler;
     result.patch = createPatch(supportCustomLengthUnitsPatch);
     result.setMangleRuntimeSet = setMangleRuntimeSet;
     return result;

package/dist/{postcss-ea625621.mjs → postcss-9a63df9d.mjs}

@@ -90,7 +90,6 @@ function commonChunkPreflight(node, options) {
     }
 }
 
-const NS = 'jsx-rename-loader';
 const postcssPlugin = 'postcss-weapp-tailwindcss-rename-plugin';
 const pluginName = 'weapp-tailwindcss-webpack-plugin';
 const vitePluginName = 'vite-plugin-uni-app-weapp-tailwindcss-adaptor';
@@ -113,4 +112,4 @@ const postcssWeappTailwindcss = (options = {
 };
 postcssWeappTailwindcss.postcss = true;
 
-export { NS as N, pluginName as a, postcssWeappTailwindcss as p, vitePluginName as v };
+export { pluginName as a, postcssWeappTailwindcss as p, vitePluginName as v };

package/dist/{postcss-33ef0bd0.js → postcss-fbdc673b.js}

@@ -96,7 +96,6 @@ function commonChunkPreflight(node, options) {
     }
 }
 
-const NS = 'jsx-rename-loader';
 const postcssPlugin = 'postcss-weapp-tailwindcss-rename-plugin';
 const pluginName = 'weapp-tailwindcss-webpack-plugin';
 const vitePluginName = 'vite-plugin-uni-app-weapp-tailwindcss-adaptor';
@@ -119,7 +118,6 @@ const postcssWeappTailwindcss = (options = {
 };
 postcssWeappTailwindcss.postcss = true;
 
-exports.NS = NS;
 exports.pluginName = pluginName;
 exports.postcssWeappTailwindcss = postcssWeappTailwindcss;
 exports.vitePluginName = vitePluginName;

package/dist/postcss.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var postcss = require('./postcss-33ef0bd0.js');
+var postcss = require('./postcss-fbdc673b.js');
 var postcssIsPseudoClass = require('@csstools/postcss-is-pseudo-class');
 require('postcss-selector-parser');
 require('./shared-ae7dd073.js');

package/dist/postcss.mjs

@@ -1,4 +1,4 @@
-export { p as postcssWeappTailwindcss } from './postcss-ea625621.mjs';
+export { p as postcssWeappTailwindcss } from './postcss-9a63df9d.mjs';
 export { default as postcssIsPseudoClass } from '@csstools/postcss-is-pseudo-class';
 import 'postcss-selector-parser';
 import './shared-7c88fb94.mjs';

package/dist/reg.d.ts

@@ -12,13 +12,13 @@ export declare function createTempleteHandlerMatchRegexp(tag: string | RegExp, a
 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 function variableMatch(original: string): RegExpExecArray | null;
 export declare const classRegexp: RegExp;
 export declare const vueTemplateClassRegexp: RegExp;
 export declare const tagRegexp: RegExp;
 export declare const tagWithClassRegexp: RegExp;
 export declare function classStringReplace(str: string, replacement: (substring: string, ...args: any[]) => string): string;
 export declare function tagStringReplace(str: string, replacement: (substring: string, ...args: any[]) => string): string;
+export declare const wxsTagRegexp: RegExp;
 export declare const wxmlAllowClassCharsRegExp: RegExp;
 export declare function createWxmlAllowClassCharsRegExp(): RegExp;
 export declare const doubleQuoteRegexp: RegExp;

package/dist/types.d.ts

@@ -43,8 +43,6 @@ export interface RawSource {
     end: number;
     raw: string;
     source?: string;
-    prevConcatenated: boolean;
-    nextConcatenated: boolean;
 }
 export interface ILengthUnitsPatchDangerousOptions {
     packageName?: string;
@@ -89,6 +87,8 @@ export interface UserDefinedOptions {
     mangle?: boolean | IMangleOptions;
     arbitraryValues?: IArbitraryValues;
     cssChildCombinatorReplaceValue?: string | string[];
+    wxsMatcher?: ((name: string) => boolean) | string | string[];
+    inlineWxs?: boolean;
 }
 export interface IMangleScopeContext {
     rawOptions: UserDefinedOptions['mangle'];
@@ -113,8 +113,11 @@ export interface ITempleteHandlerOptions extends ICommonReplaceOptions {
     customAttributesEntities?: ICustomAttributesEntities;
     escapeMap?: Record<string, string>;
     mangleContext?: IMangleScopeContext;
+    inlineWxs?: boolean;
+    jsHandler?: (rawSource: string, set: Set<string>) => GeneratorResult;
+    runtimeSet?: Set<string>;
 }
-export type GlobOrFunctionMatchers = 'htmlMatcher' | 'cssMatcher' | 'jsMatcher' | 'mainCssChunkMatcher';
+export type GlobOrFunctionMatchers = 'htmlMatcher' | 'cssMatcher' | 'jsMatcher' | 'mainCssChunkMatcher' | 'wxsMatcher';
 export type InternalUserDefinedOptions = Required<Omit<UserDefinedOptions, GlobOrFunctionMatchers | 'supportCustomLengthUnitsPatch' | 'customReplaceDictionary'> & {
     [K in GlobOrFunctionMatchers]: K extends 'mainCssChunkMatcher' ? (name: string, appType?: AppType) => boolean : (name: string) => boolean;
 } & {

package/dist/vite.js

@@ -2,8 +2,8 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var options = require('./options-887b74ca.js');
-var postcss = require('./postcss-33ef0bd0.js');
+var options = require('./options-ad127e0c.js');
+var postcss = require('./postcss-fbdc673b.js');
 require('micromatch');
 require('@babel/types');
 require('@babel/generator');
@@ -41,13 +41,15 @@ function UnifiedViteWeappTailwindcssPlugin(options$1 = {}) {
         generateBundle(opt, bundle, isWrite) {
             const entries = Object.entries(bundle);
             const groupedEntries = options.getGroupedEntries(entries, opts);
-            const set = twPatcher.getClassSet();
-            setMangleRuntimeSet(set);
+            const runtimeSet = twPatcher.getClassSet();
+            setMangleRuntimeSet(runtimeSet);
             if (Array.isArray(groupedEntries.html)) {
                 for (let i = 0; i < groupedEntries.html.length; i++) {
                     const [file, originalSource] = groupedEntries.html[i];
                     const oldVal = originalSource.source.toString();
-                    originalSource.source = templeteHandler(oldVal);
+                    originalSource.source = templeteHandler(oldVal, {
+                        runtimeSet
+                    });
                     onUpdate(file, oldVal, originalSource.source);
                 }
             }
@@ -66,7 +68,7 @@ function UnifiedViteWeappTailwindcssPlugin(options$1 = {}) {
                 for (let i = 0; i < groupedEntries.js.length; i++) {
                     const [file, originalSource] = groupedEntries.js[i];
                     const rawSource = originalSource.code;
-                    const { code } = jsHandler(rawSource, set);
+                    const { code } = jsHandler(rawSource, runtimeSet);
                     originalSource.code = code;
                     onUpdate(file, rawSource, code);
                 }

package/dist/vite.mjs

@@ -1,5 +1,5 @@
-import { g as getOptions, a as createTailwindcssPatcher, b as getGroupedEntries } from './options-879de0a2.mjs';
-import { v as vitePluginName } from './postcss-ea625621.mjs';
+import { g as getOptions, a as createTailwindcssPatcher, b as getGroupedEntries } from './options-1e3a224a.mjs';
+import { v as vitePluginName } from './postcss-9a63df9d.mjs';
 import 'micromatch';
 import '@babel/types';
 import '@babel/generator';
@@ -37,13 +37,15 @@ function UnifiedViteWeappTailwindcssPlugin(options = {}) {
         generateBundle(opt, bundle, isWrite) {
             const entries = Object.entries(bundle);
             const groupedEntries = getGroupedEntries(entries, opts);
-            const set = twPatcher.getClassSet();
-            setMangleRuntimeSet(set);
+            const runtimeSet = twPatcher.getClassSet();
+            setMangleRuntimeSet(runtimeSet);
             if (Array.isArray(groupedEntries.html)) {
                 for (let i = 0; i < groupedEntries.html.length; i++) {
                     const [file, originalSource] = groupedEntries.html[i];
                     const oldVal = originalSource.source.toString();
-                    originalSource.source = templeteHandler(oldVal);
+                    originalSource.source = templeteHandler(oldVal, {
+                        runtimeSet
+                    });
                     onUpdate(file, oldVal, originalSource.source);
                 }
             }
@@ -62,7 +64,7 @@ function UnifiedViteWeappTailwindcssPlugin(options = {}) {
                 for (let i = 0; i < groupedEntries.js.length; i++) {
                     const [file, originalSource] = groupedEntries.js[i];
                     const rawSource = originalSource.code;
-                    const { code } = jsHandler(rawSource, set);
+                    const { code } = jsHandler(rawSource, runtimeSet);
                     originalSource.code = code;
                     onUpdate(file, rawSource, code);
                 }

package/dist/weapp-tw-runtime-loader.js

@@ -0,0 +1,16 @@
+'use strict';
+
+var loaderUtils = require('loader-utils');
+
+function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+var loaderUtils__default = /*#__PURE__*/_interopDefaultCompat(loaderUtils);
+
+const WeappTwRuntimeAopLoader = function (source) {
+    var _a;
+    const opt = loaderUtils__default["default"].getOptions(this);
+    (_a = opt === null || opt === void 0 ? void 0 : opt.getClassSet) === null || _a === void 0 ? void 0 : _a.call(opt);
+    return source;
+};
+
+module.exports = WeappTwRuntimeAopLoader;

package/dist/weapp-tw-runtime-loader.mjs

@@ -0,0 +1,10 @@
+import loaderUtils from 'loader-utils';
+
+const WeappTwRuntimeAopLoader = function (source) {
+    var _a;
+    const opt = loaderUtils.getOptions(this);
+    (_a = opt === null || opt === void 0 ? void 0 : opt.getClassSet) === null || _a === void 0 ? void 0 : _a.call(opt);
+    return source;
+};
+
+export { WeappTwRuntimeAopLoader as default };

package/dist/webpack/BaseUnifiedPlugin/v5.d.ts

@@ -3,7 +3,6 @@ import type { AppType, UserDefinedOptions, InternalUserDefinedOptions, IBaseWebp
 export declare class UnifiedWebpackPluginV5 implements IBaseWebpackPlugin {
     options: InternalUserDefinedOptions;
     appType?: AppType;
-    static NS: string;
     constructor(options?: UserDefinedOptions);
     apply(compiler: Compiler): void;
 }

package/dist/webpack/loaders/weapp-tw-runtime-loader.d.ts

@@ -0,0 +1,5 @@
+import type webpack from 'webpack';
+declare const WeappTwRuntimeAopLoader: webpack.LoaderDefinitionFunction<{
+    getClassSet: () => void;
+}>;
+export default WeappTwRuntimeAopLoader;

package/dist/webpack.js

@@ -2,8 +2,10 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var options = require('./options-887b74ca.js');
-var postcss = require('./postcss-33ef0bd0.js');
+var path = require('node:path');
+var fs = require('node:fs');
+var options = require('./options-ad127e0c.js');
+var postcss = require('./postcss-fbdc673b.js');
 require('micromatch');
 require('@babel/types');
 require('@babel/generator');
@@ -13,13 +15,16 @@ require('./replace.js');
 require('./shared-ae7dd073.js');
 require('postcss');
 require('@csstools/postcss-is-pseudo-class');
-require('node:path');
-require('node:fs');
 require('semver');
 require('tailwindcss-patch');
 require('tailwindcss-mangle-shared');
 require('postcss-selector-parser');
 
+function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+var path__default = /*#__PURE__*/_interopDefaultCompat(path);
+var fs__default = /*#__PURE__*/_interopDefaultCompat(fs);
+
 class UnifiedWebpackPluginV5 {
     constructor(options$1 = {}) {
         if (options$1.customReplaceDictionary === undefined) {
@@ -34,21 +39,32 @@ class UnifiedWebpackPluginV5 {
             return;
         }
         patch === null || patch === void 0 ? void 0 : patch();
-        const Compilation = compiler.webpack.Compilation;
-        const { ConcatSource } = compiler.webpack.sources;
+        const { Compilation, sources, NormalModule } = compiler.webpack;
+        const { ConcatSource } = sources;
         const twPatcher = options.createTailwindcssPatcher();
         function getClassSet() {
-            let set = twPatcher.getClassSet();
-            if (set.size === 0) {
-                const cacheSet = twPatcher.getCache();
-                if (cacheSet && cacheSet.size > 0) {
-                    set = cacheSet;
-                }
-            }
-            return set;
+            return twPatcher.getClassSet();
         }
         onLoad();
+        const loader = path__default["default"].resolve(__dirname, './weapp-tw-runtime-loader.js');
+        const isExisted = fs__default["default"].existsSync(loader);
+        const WeappTwRuntimeAopLoader = {
+            loader,
+            options: {
+                getClassSet
+            },
+            ident: null,
+            type: null
+        };
         compiler.hooks.compilation.tap(postcss.pluginName, (compilation) => {
+            NormalModule.getCompilationHooks(compilation).loader.tap(postcss.pluginName, (loaderContext, module) => {
+                if (isExisted) {
+                    const idx = module.loaders.findIndex((x) => x.loader.includes('postcss-loader'));
+                    if (idx > -1) {
+                        module.loaders.unshift(WeappTwRuntimeAopLoader);
+                    }
+                }
+            });
             compilation.hooks.processAssets.tap({
                 name: postcss.pluginName,
                 stage: Compilation.PROCESS_ASSETS_STAGE_SUMMARIZE
@@ -56,13 +72,15 @@ class UnifiedWebpackPluginV5 {
                 onStart();
                 const entries = Object.entries(assets);
                 const groupedEntries = options.getGroupedEntries(entries, this.options);
-                const set = getClassSet();
-                setMangleRuntimeSet(set);
+                const runtimeSet = getClassSet();
+                setMangleRuntimeSet(runtimeSet);
                 if (Array.isArray(groupedEntries.html)) {
                     for (let i = 0; i < groupedEntries.html.length; i++) {
                         const [file, originalSource] = groupedEntries.html[i];
                         const rawSource = originalSource.source().toString();
-                        const wxml = templeteHandler(rawSource);
+                        const wxml = templeteHandler(rawSource, {
+                            runtimeSet
+                        });
                         const source = new ConcatSource(wxml);
                         compilation.updateAsset(file, source);
                         onUpdate(file, rawSource, wxml);
@@ -72,7 +90,7 @@ class UnifiedWebpackPluginV5 {
                     for (let i = 0; i < groupedEntries.js.length; i++) {
                         const [file, originalSource] = groupedEntries.js[i];
                         const rawSource = originalSource.source().toString();
-                        const { code } = jsHandler(rawSource, set);
+                        const { code } = jsHandler(rawSource, runtimeSet);
                         const source = new ConcatSource(code);
                         compilation.updateAsset(file, source);
                         onUpdate(file, rawSource, code);
@@ -95,6 +113,5 @@ class UnifiedWebpackPluginV5 {
         });
     }
 }
-UnifiedWebpackPluginV5.NS = postcss.NS;
 
 exports.UnifiedWebpackPluginV5 = UnifiedWebpackPluginV5;

package/dist/webpack.mjs

@@ -1,5 +1,7 @@
-import { g as getOptions, a as createTailwindcssPatcher, b as getGroupedEntries } from './options-879de0a2.mjs';
-import { a as pluginName, N as NS } from './postcss-ea625621.mjs';
+import path from 'node:path';
+import fs from 'node:fs';
+import { g as getOptions, a as createTailwindcssPatcher, b as getGroupedEntries } from './options-1e3a224a.mjs';
+import { a as pluginName } from './postcss-9a63df9d.mjs';
 import 'micromatch';
 import '@babel/types';
 import '@babel/generator';
@@ -9,8 +11,6 @@ import './replace.mjs';
 import './shared-7c88fb94.mjs';
 import 'postcss';
 import '@csstools/postcss-is-pseudo-class';
-import 'node:path';
-import 'node:fs';
 import 'semver';
 import 'tailwindcss-patch';
 import 'tailwindcss-mangle-shared';
@@ -30,21 +30,32 @@ class UnifiedWebpackPluginV5 {
             return;
         }
         patch === null || patch === void 0 ? void 0 : patch();
-        const Compilation = compiler.webpack.Compilation;
-        const { ConcatSource } = compiler.webpack.sources;
+        const { Compilation, sources, NormalModule } = compiler.webpack;
+        const { ConcatSource } = sources;
         const twPatcher = createTailwindcssPatcher();
         function getClassSet() {
-            let set = twPatcher.getClassSet();
-            if (set.size === 0) {
-                const cacheSet = twPatcher.getCache();
-                if (cacheSet && cacheSet.size > 0) {
-                    set = cacheSet;
-                }
-            }
-            return set;
+            return twPatcher.getClassSet();
         }
         onLoad();
+        const loader = path.resolve(__dirname, './weapp-tw-runtime-loader.js');
+        const isExisted = fs.existsSync(loader);
+        const WeappTwRuntimeAopLoader = {
+            loader,
+            options: {
+                getClassSet
+            },
+            ident: null,
+            type: null
+        };
         compiler.hooks.compilation.tap(pluginName, (compilation) => {
+            NormalModule.getCompilationHooks(compilation).loader.tap(pluginName, (loaderContext, module) => {
+                if (isExisted) {
+                    const idx = module.loaders.findIndex((x) => x.loader.includes('postcss-loader'));
+                    if (idx > -1) {
+                        module.loaders.unshift(WeappTwRuntimeAopLoader);
+                    }
+                }
+            });
             compilation.hooks.processAssets.tap({
                 name: pluginName,
                 stage: Compilation.PROCESS_ASSETS_STAGE_SUMMARIZE
@@ -52,13 +63,15 @@ class UnifiedWebpackPluginV5 {
                 onStart();
                 const entries = Object.entries(assets);
                 const groupedEntries = getGroupedEntries(entries, this.options);
-                const set = getClassSet();
-                setMangleRuntimeSet(set);
+                const runtimeSet = getClassSet();
+                setMangleRuntimeSet(runtimeSet);
                 if (Array.isArray(groupedEntries.html)) {
                     for (let i = 0; i < groupedEntries.html.length; i++) {
                         const [file, originalSource] = groupedEntries.html[i];
                         const rawSource = originalSource.source().toString();
-                        const wxml = templeteHandler(rawSource);
+                        const wxml = templeteHandler(rawSource, {
+                            runtimeSet
+                        });
                         const source = new ConcatSource(wxml);
                         compilation.updateAsset(file, source);
                         onUpdate(file, rawSource, wxml);
@@ -68,7 +81,7 @@ class UnifiedWebpackPluginV5 {
                     for (let i = 0; i < groupedEntries.js.length; i++) {
                         const [file, originalSource] = groupedEntries.js[i];
                         const rawSource = originalSource.source().toString();
-                        const { code } = jsHandler(rawSource, set);
+                        const { code } = jsHandler(rawSource, runtimeSet);
                         const source = new ConcatSource(code);
                         compilation.updateAsset(file, source);
                         onUpdate(file, rawSource, code);
@@ -91,6 +104,5 @@ class UnifiedWebpackPluginV5 {
         });
     }
 }
-UnifiedWebpackPluginV5.NS = NS;
 
 export { UnifiedWebpackPluginV5 };

package/dist/wxml/index.d.ts

@@ -1,2 +1,2 @@
 export { replaceWxml } from './shared';
-export { generateCode, templeteHandler, templeteReplacer } from './utils';
+export { generateCode, templeteHandler, templeteReplacer, customTempleteHandler, createTempleteHandler, extractSource } from './utils';

package/dist/wxml/utils.d.ts

@@ -3,5 +3,5 @@ export declare function generateCode(match: string, options?: ITempleteHandlerOp
 export declare function extractSource(original: string): RawSource[];
 export declare function templeteReplacer(original: string, options?: ITempleteHandlerOptions): string;
 export declare function templeteHandler(rawSource: string, options?: ITempleteHandlerOptions): string;
-export declare function customTempleteHandler(rawSource: string, options?: ITempleteHandlerOptions): string;
-export declare function createTempleteHandler(options?: ITempleteHandlerOptions): (rawSource: string, opt?: ITempleteHandlerOptions) => string;
+export declare function customTempleteHandler(rawSource: string, options: Required<ITempleteHandlerOptions>): string;
+export declare function createTempleteHandler(options?: Omit<ITempleteHandlerOptions, 'runtimeSet'>): (rawSource: string, opt?: Pick<ITempleteHandlerOptions, 'runtimeSet'>) => string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "weapp-tailwindcss",
-  "version": "2.4.4",
+  "version": "2.5.2",
   "description": "把tailwindcss jit引擎，带给小程序开发者们\nbring tailwindcss jit engine to our miniprogram developers!",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -112,6 +112,8 @@
     "@types/gulp": "^4.0.11",
     "@types/gulp-postcss": "^8.0.3",
     "@types/jest": "^29.5.2",
+    "@types/klaw": "^3.0.3",
+    "@types/loader-utils": "^2.0.3",
     "@types/lodash": "^4.14.195",
     "@types/micromatch": "^4.0.2",
     "@types/node": "^20.3.1",
@@ -119,7 +121,7 @@
     "@types/vinyl": "^2.0.7",
     "@types/webpack": "^5.28.1",
     "@types/webpack-sources": "^3.2.0",
-    "@vitest/coverage-v8": "^0.32.0",
+    "@vitest/coverage-v8": "^0.32.2",
     "autoprefixer": "^10.4.14",
     "babel-loader": "^9.1.2",
     "bumpp": "^9.1.1",
@@ -128,7 +130,7 @@
     "css-loader": "^6.8.1",
     "defu": "6.1.2",
     "del": "^6.1.1",
-    "eslint": "8.42.0",
+    "eslint": "8.43.0",
     "eslint-config-icebreaker": "^1.1.0",
     "eslint-config-prettier": "^8.8.0",
     "eslint-plugin-prettier": "^4.2.1",
@@ -139,7 +141,9 @@
     "gulp-postcss": "^9.0.1",
     "html-loader": "^4.2.0",
     "jest": "^29.5.0",
+    "klaw": "^4.1.0",
     "lodash": "^4.17.21",
+    "magic-string": "^0.30.0",
     "mini-css-extract-plugin": "^2.7.6",
     "miniprogram-automator": "^0.12.0",
     "pkg-types": "^1.0.3",
@@ -147,6 +151,7 @@
     "postcss-loader": "^7.3.3",
     "postcss-rem-to-responsive-pixel": "^5.1.3",
     "prettier": "^2.8.8",
+    "promisify-loader-runner": "^1.0.0",
     "rollup": "^3.25.1",
     "rollup-plugin-visualizer": "^5.9.2",
     "style-loader": "^3.3.3",
@@ -154,18 +159,17 @@
     "tailwindcss": "^3.3.2",
     "ts-jest": "^29.1.0",
     "ts-node": "^10.9.1",
-    "ts-patch": "^2.1.0",
+    "ts-patch": "^3.0.0",
     "tsd": "^0.28.1",
     "tslib": "^2.5.3",
-    "ttypescript": "^1.5.15",
-    "typescript": "^4.9.5",
+    "typescript": "^5.1.3",
     "typescript-transform-paths": "^3.4.6",
     "vinyl": "^3.0.0",
     "vite": "^4.3.9",
-    "vitest": "^0.32.0",
+    "vitest": "^0.32.2",
     "weapp-tailwindcss-children": "^0.1.0",
-    "webpack": "^5.86.0",
-    "webpack-build-utils": "^0.0.1"
+    "webpack": "^5.87.0",
+    "webpack-build-utils": "^0.0.4"
   },
   "dependencies": {
     "@babel/generator": "^7.21.4",
@@ -173,14 +177,15 @@
     "@babel/traverse": "^7.21.4",
     "@babel/types": "^7.21.4",
     "@csstools/postcss-is-pseudo-class": "^3.2.1",
+    "loader-utils": "^2.0.3",
     "micromatch": "^4.0.5",
     "postcss": "8.4.24",
     "postcss-selector-parser": "^6.0.13",
-    "semver": "^7.5.1",
-    "tailwindcss-mangle-shared": "^1.2.5",
-    "tailwindcss-patch": "^1.2.5"
+    "semver": "^7.5.2",
+    "tailwindcss-mangle-shared": "^1.2.6",
+    "tailwindcss-patch": "^1.2.6"
   },
-  "packageManager": "pnpm@8.6.1",
+  "packageManager": "pnpm@8.6.2",
   "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",
@@ -189,6 +194,7 @@
     "dts": "tsc --emitDeclarationOnly -p tsconfig.dts.json",
     "test": "jest && vitest run",
     "jest-u": "jest -u",
+    "jest:u": "jest -u",
     "test:dev": "vitest",
     "vitest:coverage": "vitest run --coverage",
     "e2e": "vitest run -c ./vitest.e2e.config.ts",