weapp-tailwindcss 2.4.3 → 2.5.2

package/dist/{postcss-b8952a11.js → postcss-fbdc673b.js}

@@ -1,7 +1,7 @@
 'use strict';
 
 var selectorParser = require('postcss-selector-parser');
-var shared = require('./shared-cdb5ee55.js');
+var shared = require('./shared-ae7dd073.js');
 var postcss = require('postcss');
 require('@csstools/postcss-is-pseudo-class');
 
@@ -63,7 +63,15 @@ function testIfVariablesScope(node, count = 1) {
     return false;
 }
 function commonChunkPreflight(node, options) {
-    node.selector = node.selector.replaceAll(BROAD_MATCH_GLOBAL_REGEXP, 'view + view');
+    let childCombinatorReplaceValue = 'view + view';
+    if (Array.isArray(options.cssChildCombinatorReplaceValue)) {
+        const part = options.cssChildCombinatorReplaceValue.join(',');
+        childCombinatorReplaceValue = [part, ' + ', part].join('');
+    }
+    else if (typeof options.cssChildCombinatorReplaceValue === 'string') {
+        childCombinatorReplaceValue = options.cssChildCombinatorReplaceValue;
+    }
+    node.selector = node.selector.replaceAll(BROAD_MATCH_GLOBAL_REGEXP, childCombinatorReplaceValue);
     if (testIfVariablesScope(node)) {
         const selectorParts = node.selector.split(',');
         if (!selectorParts.includes('view')) {
@@ -88,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';
@@ -111,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,10 +2,10 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var postcss = require('./postcss-b8952a11.js');
+var postcss = require('./postcss-fbdc673b.js');
 var postcssIsPseudoClass = require('@csstools/postcss-is-pseudo-class');
 require('postcss-selector-parser');
-require('./shared-cdb5ee55.js');
+require('./shared-ae7dd073.js');
 require('postcss');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }

package/dist/postcss.mjs

@@ -1,5 +1,5 @@
-export { p as postcssWeappTailwindcss } from './postcss-15e2ef2d.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-fc50603a.mjs';
+import './shared-7c88fb94.mjs';
 import 'postcss';

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/replace.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var shared = require('./shared-cdb5ee55.js');
+var shared = require('./shared-ae7dd073.js');
 
 function replaceWxml(original, options = {
     keepEOL: false,

package/dist/replace.mjs

@@ -1,5 +1,5 @@
-import { e as escape, S as SimpleMappingChars2String } from './shared-fc50603a.mjs';
-export { M as MappingChars2String, b as MappingChars2StringEntries, a as SYMBOL_TABLE, c as SimpleMappingChars2StringEntries, i as replaceCss } from './shared-fc50603a.mjs';
+import { e as escape, S as SimpleMappingChars2String } from './shared-7c88fb94.mjs';
+export { M as MappingChars2String, b as MappingChars2StringEntries, a as SYMBOL_TABLE, c as SimpleMappingChars2StringEntries, i as replaceCss } from './shared-7c88fb94.mjs';
 
 function replaceWxml(original, options = {
     keepEOL: false,

package/dist/{shared-fc50603a.mjs → shared-7c88fb94.mjs}

@@ -103,6 +103,9 @@ const SimpleMappingChars2String = {
 const SimpleMappingChars2StringEntries = Object.entries(SimpleMappingChars2String);
 
 const MAX_ASCII_CHAR_CODE = 127;
+function isAsciiNumber(code) {
+    return code >= 48 && code <= 57;
+}
 function escape(selectors, options = {
     map: SimpleMappingChars2String
 }) {
@@ -120,8 +123,22 @@ function escape(selectors, options = {
             else if (hit) {
                 sb[i] = hit;
             }
-            else if (i === 0 && code >= 48 && code <= 57) {
-                sb[i] = '_' + char;
+            else if (i === 0) {
+                if (isAsciiNumber(code)) {
+                    sb[i] = '_' + char;
+                }
+                else if (char === '-') {
+                    const nextChar = sb[i + 1];
+                    if (nextChar) {
+                        const nextCharCode = nextChar.codePointAt(0);
+                        if (nextCharCode && isAsciiNumber(nextCharCode)) {
+                            sb[i] = '_' + char;
+                        }
+                    }
+                    else if (nextChar === undefined) {
+                        sb[i] = '_' + char;
+                    }
+                }
             }
         }
     }

package/dist/{shared-cdb5ee55.js → shared-ae7dd073.js}

@@ -105,6 +105,9 @@ const SimpleMappingChars2String = {
 const SimpleMappingChars2StringEntries = Object.entries(SimpleMappingChars2String);
 
 const MAX_ASCII_CHAR_CODE = 127;
+function isAsciiNumber(code) {
+    return code >= 48 && code <= 57;
+}
 function escape(selectors, options = {
     map: SimpleMappingChars2String
 }) {
@@ -122,8 +125,22 @@ function escape(selectors, options = {
             else if (hit) {
                 sb[i] = hit;
             }
-            else if (i === 0 && code >= 48 && code <= 57) {
-                sb[i] = '_' + char;
+            else if (i === 0) {
+                if (isAsciiNumber(code)) {
+                    sb[i] = '_' + char;
+                }
+                else if (char === '-') {
+                    const nextChar = sb[i + 1];
+                    if (nextChar) {
+                        const nextCharCode = nextChar.codePointAt(0);
+                        if (nextCharCode && isAsciiNumber(nextCharCode)) {
+                            sb[i] = '_' + char;
+                        }
+                    }
+                    else if (nextChar === undefined) {
+                        sb[i] = '_' + char;
+                    }
+                }
             }
         }
     }

package/dist/types.d.ts

@@ -16,6 +16,7 @@ export type RequiredStyleHandlerOptions = {
     isMainChunk: boolean;
     cssInjectPreflight?: InjectPreflight;
     cssPreflightRange?: 'view' | 'all';
+    cssChildCombinatorReplaceValue?: string | string[];
     replaceUniversalSelectorWith?: string | false;
     escapeMap?: Record<string, string>;
 };
@@ -42,8 +43,6 @@ export interface RawSource {
     end: number;
     raw: string;
     source?: string;
-    prevConcatenated: boolean;
-    nextConcatenated: boolean;
 }
 export interface ILengthUnitsPatchDangerousOptions {
     packageName?: string;
@@ -87,6 +86,9 @@ export interface UserDefinedOptions {
     minifiedJs?: boolean;
     mangle?: boolean | IMangleOptions;
     arbitraryValues?: IArbitraryValues;
+    cssChildCombinatorReplaceValue?: string | string[];
+    wxsMatcher?: ((name: string) => boolean) | string | string[];
+    inlineWxs?: boolean;
 }
 export interface IMangleScopeContext {
     rawOptions: UserDefinedOptions['mangle'];
@@ -111,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,15 +2,15 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var options = require('./options-2e71e6b3.js');
-var postcss = require('./postcss-b8952a11.js');
+var options = require('./options-ad127e0c.js');
+var postcss = require('./postcss-fbdc673b.js');
 require('micromatch');
 require('@babel/types');
 require('@babel/generator');
 require('@babel/parser');
 require('@babel/traverse');
 require('./replace.js');
-require('./shared-cdb5ee55.js');
+require('./shared-ae7dd073.js');
 require('postcss');
 require('@csstools/postcss-is-pseudo-class');
 require('node:path');
@@ -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,12 +1,12 @@
-import { g as getOptions, a as createTailwindcssPatcher, b as getGroupedEntries } from './options-a2ba3653.mjs';
-import { v as vitePluginName } from './postcss-15e2ef2d.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';
 import '@babel/parser';
 import '@babel/traverse';
 import './replace.mjs';
-import './shared-fc50603a.mjs';
+import './shared-7c88fb94.mjs';
 import 'postcss';
 import '@csstools/postcss-is-pseudo-class';
 import 'node:path';
@@ -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,24 +2,29 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var options = require('./options-2e71e6b3.js');
-var postcss = require('./postcss-b8952a11.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');
 require('@babel/parser');
 require('@babel/traverse');
 require('./replace.js');
-require('./shared-cdb5ee55.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,16 +1,16 @@
-import { g as getOptions, a as createTailwindcssPatcher, b as getGroupedEntries } from './options-a2ba3653.mjs';
-import { a as pluginName, N as NS } from './postcss-15e2ef2d.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';
 import '@babel/parser';
 import '@babel/traverse';
 import './replace.mjs';
-import './shared-fc50603a.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;