weapp-tailwindcss 3.2.1 → 3.3.0

package/dist/types.d.ts

@@ -1,10 +1,11 @@
 import type { Rule } from 'postcss';
-import type { IClassGeneratorOptions, ClassGenerator } from '@tailwindcss-mangle/shared';
+import type { ClassGenerator, IClassGeneratorOptions } from '@tailwindcss-mangle/shared';
 import type { SourceMap } from 'magic-string';
 import type { GeneratorResult } from '@babel/generator';
 import type { ParseError, ParserOptions } from '@babel/parser';
 import type { UserDefinedOptions as rem2rpxOptions } from 'postcss-rem-to-responsive-pixel';
 import type { Result } from 'postcss-load-config';
+import type { TailwindcssPatcher } from 'tailwindcss-patch';
 import type { InjectPreflight } from './postcss/preflight';
 import type { IContext as PostcssContext } from './postcss/plugins/ctx';
 import type { ICreateCacheReturnType } from "./cache";
@@ -36,16 +37,16 @@ export type IStyleHandlerOptions = {
     postcssOptions?: PostcssOptions;
     cssRemoveHoverPseudoClass?: boolean;
 } & RequiredStyleHandlerOptions;
-export type JsHandlerReplaceResult = {
+export interface JsHandlerReplaceResult {
     code: string;
     map?: SourceMap;
-};
+}
 export type JsHandlerResult = (JsHandlerReplaceResult | GeneratorResult) & {
     error?: ParseError;
 };
 export type ICustomAttributes = Record<string, ItemOrItemArray<string | RegExp>> | Map<string | RegExp, ItemOrItemArray<string | RegExp>>;
 export type ICustomAttributesEntities = [string | RegExp, ItemOrItemArray<string | RegExp>][];
-export type IJsHandlerOptions = {
+export interface IJsHandlerOptions {
     escapeMap?: Record<string, string>;
     classNameSet?: Set<string>;
     arbitraryValues?: IArbitraryValues;
@@ -57,7 +58,7 @@ export type IJsHandlerOptions = {
     jsAstTool?: 'babel' | 'ast-grep';
     unescapeUnicode?: boolean;
     babelParserOptions?: ParserOptions;
-};
+}
 export interface RawSource {
     start: number;
     end: number;
@@ -157,6 +158,7 @@ export type InternalUserDefinedOptions = Required<Omit<UserDefinedOptions, 'supp
     customReplaceDictionary: Record<string, string>;
     setMangleRuntimeSet: (runtimeSet: Set<string>) => void;
     cache: ICreateCacheReturnType;
+    twPatcher: TailwindcssPatcher;
 }>;
 export type InternalPostcssOptions = Pick<UserDefinedOptions, 'cssMatcher' | 'mainCssChunkMatcher' | 'cssPreflight' | 'cssPreflightRange' | 'customRuleCallback' | 'disabled'>;
 export interface IBaseWebpackPlugin {

package/dist/utils.d.ts

@@ -2,7 +2,7 @@ import type { InternalUserDefinedOptions } from "./types";
 export declare function isRegexp(value: unknown): boolean;
 export declare function isMap(value: unknown): boolean;
 export declare function regExpTest(arr: (string | RegExp)[] | undefined, str: string): boolean;
-export declare const noop: () => void;
+export declare function noop(): void;
 export declare function groupBy<T>(arr: T[], cb: (arg: T) => string): Record<string, T[]>;
 export declare function getGroupedEntries<T>(entries: [string, T][], options: InternalUserDefinedOptions): Record<"css" | "html" | "js" | "other", [string, T][]>;
 export declare function removeExt(file: string): string;

package/dist/{v5-C6FTqEeL.mjs → v5-CQUeTJ2W.mjs}

@@ -1,8 +1,8 @@
-import { g as getOptions, c as createTailwindcssPatcher, _ as __awaiter } from './options-D1IYbX_E.mjs';
+import { g as getOptions, _ as __awaiter } from './options-SmfRHxH0.mjs';
 import path from 'node:path';
 import fs from 'node:fs';
-import { b as pluginName } from './index-DC60ES8u.mjs';
-import { g as getGroupedEntries, r as removeExt } from './defaults-DOGbAFEj.mjs';
+import { b as pluginName } from './index-BPzIdybK.mjs';
+import { g as getGroupedEntries, r as removeExt } from './defaults-BDivGN-J.mjs';
 import { c as createDebug } from './index-BEIjgKpF.mjs';
 
 const debug = createDebug();
@@ -12,18 +12,15 @@ class UnifiedWebpackPluginV5 {
         this.appType = this.options.appType;
     }
     apply(compiler) {
-        const { mainCssChunkMatcher, disabled, onLoad, onUpdate, onEnd, onStart, styleHandler, patch, templateHandler, jsHandler, setMangleRuntimeSet, runtimeLoaderPath, cache, tailwindcssBasedir } = this.options;
+        const { mainCssChunkMatcher, disabled, onLoad, onUpdate, onEnd, onStart, styleHandler, patch, templateHandler, jsHandler, setMangleRuntimeSet, runtimeLoaderPath, cache, twPatcher, } = this.options;
         if (disabled) {
             return;
         }
         patch === null || patch === void 0 ? void 0 : patch();
         const { Compilation, sources, NormalModule } = compiler.webpack;
         const { ConcatSource, RawSource } = sources;
-        const twPatcher = createTailwindcssPatcher();
         function getClassSet() {
-            return twPatcher.getClassSet({
-                basedir: tailwindcssBasedir
-            });
+            return twPatcher.getClassSet();
         }
         onLoad();
         const loader = runtimeLoaderPath !== null && runtimeLoaderPath !== void 0 ? runtimeLoaderPath : path.resolve(__dirname, './weapp-tw-runtime-loader.js');
@@ -31,15 +28,15 @@ class UnifiedWebpackPluginV5 {
         const WeappTwRuntimeAopLoader = {
             loader,
             options: {
-                getClassSet
+                getClassSet,
             },
             ident: null,
-            type: 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'));
+                    const idx = module.loaders.findIndex(x => x.loader.includes('postcss-loader'));
                     if (idx > -1) {
                         module.loaders.unshift(WeappTwRuntimeAopLoader);
                     }
@@ -47,7 +44,7 @@ class UnifiedWebpackPluginV5 {
             });
             compilation.hooks.processAssets.tapPromise({
                 name: pluginName,
-                stage: Compilation.PROCESS_ASSETS_STAGE_SUMMARIZE
+                stage: Compilation.PROCESS_ASSETS_STAGE_SUMMARIZE,
             }, (assets) => __awaiter(this, void 0, void 0, function* () {
                 onStart();
                 debug('start');
@@ -80,7 +77,7 @@ class UnifiedWebpackPluginV5 {
                             }
                         }, () => __awaiter(this, void 0, void 0, function* () {
                             const wxml = yield templateHandler(rawSource, {
-                                runtimeSet
+                                runtimeSet,
                             });
                             const source = new ConcatSource(wxml);
                             compilation.updateAsset(file, source);
@@ -89,7 +86,7 @@ class UnifiedWebpackPluginV5 {
                             noCachedCount++;
                             return {
                                 key: cacheKey,
-                                source
+                                source,
                             };
                         }));
                     }
@@ -111,10 +108,10 @@ class UnifiedWebpackPluginV5 {
                             }
                         }, () => __awaiter(this, void 0, void 0, function* () {
                             const rawSource = originalSource.source().toString();
-                            const mapFilename = file + '.map';
+                            const mapFilename = `${file}.map`;
                             const hasMap = Boolean(assets[mapFilename]);
                             const { code, map } = yield jsHandler(rawSource, runtimeSet, {
-                                generateMap: hasMap
+                                generateMap: hasMap,
                             });
                             const source = new ConcatSource(code);
                             compilation.updateAsset(file, source);
@@ -127,7 +124,7 @@ class UnifiedWebpackPluginV5 {
                             }
                             return {
                                 key: cacheKey,
-                                source
+                                source,
                             };
                         }));
                     }
@@ -152,7 +149,7 @@ class UnifiedWebpackPluginV5 {
                             }
                         }, () => __awaiter(this, void 0, void 0, function* () {
                             const css = yield styleHandler(rawSource, {
-                                isMainChunk: mainCssChunkMatcher(file, this.appType)
+                                isMainChunk: mainCssChunkMatcher(file, this.appType),
                             });
                             const source = new ConcatSource(css);
                             compilation.updateAsset(file, source);
@@ -161,7 +158,7 @@ class UnifiedWebpackPluginV5 {
                             noCachedCount++;
                             return {
                                 key: cacheKey,
-                                source
+                                source,
                             };
                         }));
                     }

package/dist/{v5-DA4DSMKO.js → v5-ea_QoULz.js}

@@ -1,10 +1,10 @@
 'use strict';
 
-var options = require('./options-BjZGMFOk.js');
+var options = require('./options-DCor-e5I.js');
 var path = require('node:path');
 var fs = require('node:fs');
-var index = require('./index-6BUjj8Rl.js');
-var defaults = require('./defaults-CGBcgdIr.js');
+var index = require('./index-DwZHOkK3.js');
+var defaults = require('./defaults-z7wUEh47.js');
 var index$1 = require('./index-HC-Qkn0i.js');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
@@ -19,18 +19,15 @@ class UnifiedWebpackPluginV5 {
         this.appType = this.options.appType;
     }
     apply(compiler) {
-        const { mainCssChunkMatcher, disabled, onLoad, onUpdate, onEnd, onStart, styleHandler, patch, templateHandler, jsHandler, setMangleRuntimeSet, runtimeLoaderPath, cache, tailwindcssBasedir } = this.options;
+        const { mainCssChunkMatcher, disabled, onLoad, onUpdate, onEnd, onStart, styleHandler, patch, templateHandler, jsHandler, setMangleRuntimeSet, runtimeLoaderPath, cache, twPatcher, } = this.options;
         if (disabled) {
             return;
         }
         patch === null || patch === void 0 ? void 0 : patch();
         const { Compilation, sources, NormalModule } = compiler.webpack;
         const { ConcatSource, RawSource } = sources;
-        const twPatcher = options.createTailwindcssPatcher();
         function getClassSet() {
-            return twPatcher.getClassSet({
-                basedir: tailwindcssBasedir
-            });
+            return twPatcher.getClassSet();
         }
         onLoad();
         const loader = runtimeLoaderPath !== null && runtimeLoaderPath !== void 0 ? runtimeLoaderPath : path__default["default"].resolve(__dirname, './weapp-tw-runtime-loader.js');
@@ -38,15 +35,15 @@ class UnifiedWebpackPluginV5 {
         const WeappTwRuntimeAopLoader = {
             loader,
             options: {
-                getClassSet
+                getClassSet,
             },
             ident: null,
-            type: null
+            type: null,
         };
         compiler.hooks.compilation.tap(index.pluginName, (compilation) => {
             NormalModule.getCompilationHooks(compilation).loader.tap(index.pluginName, (loaderContext, module) => {
                 if (isExisted) {
-                    const idx = module.loaders.findIndex((x) => x.loader.includes('postcss-loader'));
+                    const idx = module.loaders.findIndex(x => x.loader.includes('postcss-loader'));
                     if (idx > -1) {
                         module.loaders.unshift(WeappTwRuntimeAopLoader);
                     }
@@ -54,7 +51,7 @@ class UnifiedWebpackPluginV5 {
             });
             compilation.hooks.processAssets.tapPromise({
                 name: index.pluginName,
-                stage: Compilation.PROCESS_ASSETS_STAGE_SUMMARIZE
+                stage: Compilation.PROCESS_ASSETS_STAGE_SUMMARIZE,
             }, (assets) => options.__awaiter(this, void 0, void 0, function* () {
                 onStart();
                 debug('start');
@@ -87,7 +84,7 @@ class UnifiedWebpackPluginV5 {
                             }
                         }, () => options.__awaiter(this, void 0, void 0, function* () {
                             const wxml = yield templateHandler(rawSource, {
-                                runtimeSet
+                                runtimeSet,
                             });
                             const source = new ConcatSource(wxml);
                             compilation.updateAsset(file, source);
@@ -96,7 +93,7 @@ class UnifiedWebpackPluginV5 {
                             noCachedCount++;
                             return {
                                 key: cacheKey,
-                                source
+                                source,
                             };
                         }));
                     }
@@ -118,10 +115,10 @@ class UnifiedWebpackPluginV5 {
                             }
                         }, () => options.__awaiter(this, void 0, void 0, function* () {
                             const rawSource = originalSource.source().toString();
-                            const mapFilename = file + '.map';
+                            const mapFilename = `${file}.map`;
                             const hasMap = Boolean(assets[mapFilename]);
                             const { code, map } = yield jsHandler(rawSource, runtimeSet, {
-                                generateMap: hasMap
+                                generateMap: hasMap,
                             });
                             const source = new ConcatSource(code);
                             compilation.updateAsset(file, source);
@@ -134,7 +131,7 @@ class UnifiedWebpackPluginV5 {
                             }
                             return {
                                 key: cacheKey,
-                                source
+                                source,
                             };
                         }));
                     }
@@ -159,7 +156,7 @@ class UnifiedWebpackPluginV5 {
                             }
                         }, () => options.__awaiter(this, void 0, void 0, function* () {
                             const css = yield styleHandler(rawSource, {
-                                isMainChunk: mainCssChunkMatcher(file, this.appType)
+                                isMainChunk: mainCssChunkMatcher(file, this.appType),
                             });
                             const source = new ConcatSource(css);
                             compilation.updateAsset(file, source);
@@ -168,7 +165,7 @@ class UnifiedWebpackPluginV5 {
                             noCachedCount++;
                             return {
                                 key: cacheKey,
-                                source
+                                source,
                             };
                         }));
                     }

package/dist/vite.js

@@ -2,28 +2,29 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var index = require('./index-iiM-deHl.js');
-require('./options-BjZGMFOk.js');
+var index = require('./index-CeRMFNvT.js');
+require('./options-DCor-e5I.js');
 require('magic-string');
 require('./replace.js');
 require('@weapp-core/escape');
 require('@ast-core/escape');
-require('./shared-BDew1Ric.js');
+require('./shared-hzYeE1wX.js');
 require('@weapp-core/regex');
 require('@babel/generator');
 require('@babel/traverse');
 require('@babel/parser');
-require('./defaults-CGBcgdIr.js');
+require('./defaults-z7wUEh47.js');
 require('./defu-Cdz2PomB.js');
 require('@babel/types');
 require('htmlparser2');
 require('postcss');
-require('./index-6BUjj8Rl.js');
+require('./index-DwZHOkK3.js');
 require('@csstools/postcss-is-pseudo-class');
 require('postcss-rem-to-responsive-pixel');
 require('postcss-selector-parser');
 require('node:path');
 require('node:fs');
+require('node:process');
 require('semver');
 require('tailwindcss-patch');
 require('@tailwindcss-mangle/shared');

package/dist/vite.mjs

@@ -1,25 +1,26 @@
-export { U as UnifiedViteWeappTailwindcssPlugin } from './index-UGtfFwsf.mjs';
-import './options-D1IYbX_E.mjs';
+export { U as UnifiedViteWeappTailwindcssPlugin } from './index-BMv1aBKz.mjs';
+import './options-SmfRHxH0.mjs';
 import 'magic-string';
 import './replace.mjs';
 import '@weapp-core/escape';
 import '@ast-core/escape';
-import './shared-BX0VV-pr.mjs';
+import './shared-DbJl6i6a.mjs';
 import '@weapp-core/regex';
 import '@babel/generator';
 import '@babel/traverse';
 import '@babel/parser';
-import './defaults-DOGbAFEj.mjs';
+import './defaults-BDivGN-J.mjs';
 import './defu-n46TJT6t.mjs';
 import '@babel/types';
 import 'htmlparser2';
 import 'postcss';
-import './index-DC60ES8u.mjs';
+import './index-BPzIdybK.mjs';
 import '@csstools/postcss-is-pseudo-class';
 import 'postcss-rem-to-responsive-pixel';
 import 'postcss-selector-parser';
 import 'node:path';
 import 'node:fs';
+import 'node:process';
 import 'semver';
 import 'tailwindcss-patch';
 import '@tailwindcss-mangle/shared';

package/dist/webpack.js

@@ -2,28 +2,29 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var v5 = require('./v5-DA4DSMKO.js');
-require('./options-BjZGMFOk.js');
+var v5 = require('./v5-ea_QoULz.js');
+require('./options-DCor-e5I.js');
 require('magic-string');
 require('./replace.js');
 require('@weapp-core/escape');
 require('@ast-core/escape');
-require('./shared-BDew1Ric.js');
+require('./shared-hzYeE1wX.js');
 require('@weapp-core/regex');
 require('@babel/generator');
 require('@babel/traverse');
 require('@babel/parser');
-require('./defaults-CGBcgdIr.js');
+require('./defaults-z7wUEh47.js');
 require('./defu-Cdz2PomB.js');
 require('@babel/types');
 require('htmlparser2');
 require('postcss');
-require('./index-6BUjj8Rl.js');
+require('./index-DwZHOkK3.js');
 require('@csstools/postcss-is-pseudo-class');
 require('postcss-rem-to-responsive-pixel');
 require('postcss-selector-parser');
 require('node:path');
 require('node:fs');
+require('node:process');
 require('semver');
 require('tailwindcss-patch');
 require('@tailwindcss-mangle/shared');

package/dist/webpack.mjs

@@ -1,25 +1,26 @@
-export { U as UnifiedWebpackPluginV5 } from './v5-C6FTqEeL.mjs';
-import './options-D1IYbX_E.mjs';
+export { U as UnifiedWebpackPluginV5 } from './v5-CQUeTJ2W.mjs';
+import './options-SmfRHxH0.mjs';
 import 'magic-string';
 import './replace.mjs';
 import '@weapp-core/escape';
 import '@ast-core/escape';
-import './shared-BX0VV-pr.mjs';
+import './shared-DbJl6i6a.mjs';
 import '@weapp-core/regex';
 import '@babel/generator';
 import '@babel/traverse';
 import '@babel/parser';
-import './defaults-DOGbAFEj.mjs';
+import './defaults-BDivGN-J.mjs';
 import './defu-n46TJT6t.mjs';
 import '@babel/types';
 import 'htmlparser2';
 import 'postcss';
-import './index-DC60ES8u.mjs';
+import './index-BPzIdybK.mjs';
 import '@csstools/postcss-is-pseudo-class';
 import 'postcss-rem-to-responsive-pixel';
 import 'postcss-selector-parser';
 import 'node:path';
 import 'node:fs';
+import 'node:process';
 import 'semver';
 import 'tailwindcss-patch';
 import '@tailwindcss-mangle/shared';

package/dist/webpack4.js

@@ -2,18 +2,18 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var options = require('./options-BjZGMFOk.js');
+var options = require('./options-DCor-e5I.js');
 var path = require('node:path');
 var fs = require('node:fs');
 var webpackSources = require('webpack-sources');
-var index = require('./index-6BUjj8Rl.js');
-var defaults = require('./defaults-CGBcgdIr.js');
+var index = require('./index-DwZHOkK3.js');
+var defaults = require('./defaults-z7wUEh47.js');
 var index$1 = require('./index-HC-Qkn0i.js');
 require('magic-string');
 require('./replace.js');
 require('@weapp-core/escape');
 require('@ast-core/escape');
-require('./shared-BDew1Ric.js');
+require('./shared-hzYeE1wX.js');
 require('@weapp-core/regex');
 require('@babel/generator');
 require('@babel/traverse');
@@ -21,6 +21,7 @@ require('@babel/parser');
 require('@babel/types');
 require('htmlparser2');
 require('postcss');
+require('node:process');
 require('semver');
 require('tailwindcss-patch');
 require('@tailwindcss-mangle/shared');
@@ -44,16 +45,13 @@ class UnifiedWebpackPluginV4 {
         this.appType = this.options.appType;
     }
     apply(compiler) {
-        const { mainCssChunkMatcher, disabled, onLoad, onUpdate, onEnd, onStart, styleHandler, patch, templateHandler, jsHandler, setMangleRuntimeSet, runtimeLoaderPath, cache, tailwindcssBasedir } = this.options;
+        const { mainCssChunkMatcher, disabled, onLoad, onUpdate, onEnd, onStart, styleHandler, patch, templateHandler, jsHandler, setMangleRuntimeSet, runtimeLoaderPath, cache, twPatcher, } = this.options;
         if (disabled) {
             return;
         }
         patch === null || patch === void 0 ? void 0 : patch();
-        const twPatcher = options.createTailwindcssPatcher();
         function getClassSet() {
-            return twPatcher.getClassSet({
-                basedir: tailwindcssBasedir
-            });
+            return twPatcher.getClassSet();
         }
         onLoad();
         const loader = runtimeLoaderPath !== null && runtimeLoaderPath !== void 0 ? runtimeLoaderPath : path__default["default"].resolve(__dirname, './weapp-tw-runtime-loader.js');
@@ -61,15 +59,15 @@ class UnifiedWebpackPluginV4 {
         const WeappTwRuntimeAopLoader = {
             loader,
             options: {
-                getClassSet
+                getClassSet,
             },
             ident: null,
-            type: null
+            type: null,
         };
         compiler.hooks.compilation.tap(index.pluginName, (compilation) => {
             compilation.hooks.normalModuleLoader.tap(index.pluginName, (loaderContext, module) => {
                 if (isExisted) {
-                    const idx = module.loaders.findIndex((x) => x.loader.includes('postcss-loader'));
+                    const idx = module.loaders.findIndex(x => x.loader.includes('postcss-loader'));
                     if (idx > -1) {
                         module.loaders.unshift(WeappTwRuntimeAopLoader);
                     }
@@ -109,7 +107,7 @@ class UnifiedWebpackPluginV4 {
                         }
                     }, () => options.__awaiter(this, void 0, void 0, function* () {
                         const wxml = yield templateHandler(rawSource, {
-                            runtimeSet
+                            runtimeSet,
                         });
                         const source = new webpackSources.ConcatSource(wxml);
                         compilation.updateAsset(file, source);
@@ -118,7 +116,7 @@ class UnifiedWebpackPluginV4 {
                         noCachedCount++;
                         return {
                             key: cacheKey,
-                            source
+                            source,
                         };
                     }));
                 }
@@ -140,10 +138,10 @@ class UnifiedWebpackPluginV4 {
                         }
                     }, () => options.__awaiter(this, void 0, void 0, function* () {
                         const rawSource = originalSource.source().toString();
-                        const mapFilename = file + '.map';
+                        const mapFilename = `${file}.map`;
                         const hasMap = Boolean(assets[mapFilename]);
                         const { code, map } = yield jsHandler(rawSource, runtimeSet, {
-                            generateMap: hasMap
+                            generateMap: hasMap,
                         });
                         const source = new webpackSources.ConcatSource(code);
                         compilation.updateAsset(file, source);
@@ -156,7 +154,7 @@ class UnifiedWebpackPluginV4 {
                         }
                         return {
                             key: cacheKey,
-                            source
+                            source,
                         };
                     }));
                 }
@@ -181,7 +179,7 @@ class UnifiedWebpackPluginV4 {
                         }
                     }, () => options.__awaiter(this, void 0, void 0, function* () {
                         const css = yield styleHandler(rawSource, {
-                            isMainChunk: mainCssChunkMatcher(file, this.appType)
+                            isMainChunk: mainCssChunkMatcher(file, this.appType),
                         });
                         const source = new webpackSources.ConcatSource(css);
                         compilation.updateAsset(file, source);
@@ -190,7 +188,7 @@ class UnifiedWebpackPluginV4 {
                         noCachedCount++;
                         return {
                             key: cacheKey,
-                            source
+                            source,
                         };
                     }));
                 }