weapp-tailwindcss 5.0.0-next.3 → 5.0.0-next.7

package/dist/{webpack-CAJR4hhP.js → webpack-D-sUCY0u.js}

@@ -1,49 +1,214 @@
 const require_chunk = require("./chunk-8l464Juk.js");
-const require_patcher_options = require("./patcher-options-6gJN2EXy.js");
-const require_recorder = require("./recorder-GdTJ3QqX.js");
-const require_utils = require("./utils-DmC9_In3.js");
-const require_logger = require("./logger-BZ45DZJT.js");
-const require_generator_css = require("./generator-css-CRLrHW4F.js");
-const require_css_imports = require("./css-imports-BbrbluP9.js");
-const require_loader_anchors = require("./loader-anchors-TrFvT6g1.js");
+const require_cache = require("./cache-DPN5yKSX.js");
+const require_runtime_patch = require("./runtime-patch-qwuisukL.js");
+const require_precheck = require("./precheck-Dka94ArV.js");
+const require_utils = require("./utils-VZvGusYs.js");
+const require_generator_css = require("./generator-css-Dnpl-IY2.js");
+const require_run_tasks = require("./run-tasks-B50A3pxt.js");
+let node_module = require("node:module");
+node_module = require_chunk.__toESM(node_module);
 let node_path = require("node:path");
 node_path = require_chunk.__toESM(node_path);
 let node_process = require("node:process");
 node_process = require_chunk.__toESM(node_process);
 let node_fs = require("node:fs");
 node_fs = require_chunk.__toESM(node_fs);
-//#region src/bundlers/webpack/BaseUnifiedPlugin/v5-assets.ts
-function resolveWebpackStaleClassNameFallback(option, _compiler) {
-	if (typeof option === "boolean") return option;
+//#region src/shared/tailwindcss-css-redirect.ts
+const moduleWithMutableResolve = node_module.default;
+const patched = /* @__PURE__ */ new WeakSet();
+function installTailwindcssCssRedirect(pkgDir) {
+	const target = node_path.default.join(pkgDir, "index.css");
+	const original = moduleWithMutableResolve._resolveFilename;
+	if (patched.has(original)) return;
+	const replacements = new Set(["tailwindcss", "tailwindcss$"]);
+	const resolveTailwindcssCss = (request, parent, isMain, options) => {
+		if (replacements.has(request)) return target;
+		if (request.startsWith("tailwindcss/")) return node_path.default.join(pkgDir, request.slice(12));
+		return original(request, parent, isMain, options);
+	};
+	moduleWithMutableResolve._resolveFilename = resolveTailwindcssCss;
+	patched.add(moduleWithMutableResolve._resolveFilename);
+}
+//#endregion
+//#region src/shared/mpx.ts
+const require$1 = (0, node_module.createRequire)(require("url").pathToFileURL(__filename).href);
+const MPX_STYLE_RESOURCE_QUERY_RE$1 = /(?:^|[?&])type=styles(?:&|$)/;
+function isMpxStyleResourceQuery(query) {
+	if (typeof query !== "string") return false;
+	return MPX_STYLE_RESOURCE_QUERY_RE$1.test(query);
+}
+function isMpx(appType) {
+	return appType === "mpx";
+}
+function getTailwindcssCssEntry(pkgDir) {
+	return node_path.default.join(pkgDir, "index.css");
+}
+function isMpxWebpackPluginRequest(request) {
+	return request === "@mpxjs/webpack-plugin" || Boolean(request?.startsWith("@mpxjs/webpack-plugin/"));
+}
+function addMpxWebpackPluginAlias(alias, pkgDir) {
+	if (Array.isArray(alias)) alias.push({
+		name: /^@mpxjs\/webpack-plugin\//,
+		alias: pkgDir
+	});
+	else {
+		alias["@mpxjs/webpack-plugin"] = pkgDir;
+		alias["@mpxjs/webpack-plugin$"] = pkgDir;
+	}
+}
+function ensureResolveLoaderAlias(compiler, mpxWebpackPluginDir) {
+	compiler.options.resolveLoader = compiler.options.resolveLoader || {};
+	const alias = compiler.options.resolveLoader.alias ?? {};
+	compiler.options.resolveLoader.alias = alias;
+	addMpxWebpackPluginAlias(alias, mpxWebpackPluginDir);
+}
+function ensureMpxTailwindcssAliases(compiler, pkgDir) {
+	const tailwindcssCssEntry = getTailwindcssCssEntry(pkgDir);
+	const mpxWebpackPluginDir = node_path.default.dirname(require$1.resolve("@mpxjs/webpack-plugin/package.json"));
+	compiler.options = compiler.options || {};
+	compiler.options.resolve = compiler.options.resolve || {};
+	ensureResolveLoaderAlias(compiler, mpxWebpackPluginDir);
+	const alias = compiler.options.resolve.alias ?? {};
+	compiler.options.resolve.alias = alias;
+	if (Array.isArray(alias)) alias.push({
+		name: /^@mpxjs\/webpack-plugin\//,
+		alias: mpxWebpackPluginDir
+	}, {
+		name: "tailwindcss",
+		alias: tailwindcssCssEntry
+	}, {
+		name: "tailwindcss$",
+		alias: tailwindcssCssEntry
+	});
+	else {
+		alias["@mpxjs/webpack-plugin"] = mpxWebpackPluginDir;
+		alias["@mpxjs/webpack-plugin$"] = mpxWebpackPluginDir;
+		alias.tailwindcss = tailwindcssCssEntry;
+		alias.tailwindcss$ = tailwindcssCssEntry;
+	}
+	return tailwindcssCssEntry;
+}
+function patchMpxLoaderResolve(loaderContext, pkgDir, enabled) {
+	if (!enabled || typeof loaderContext.resolve !== "function") return;
+	const originalResolve = loaderContext.resolve;
+	if (originalResolve.__weappTwPatched) return;
+	const tailwindcssCssEntry = getTailwindcssCssEntry(pkgDir);
+	const wrappedResolve = function(context, request, callback) {
+		if (request === "tailwindcss" || request === "tailwindcss$") return callback(null, tailwindcssCssEntry);
+		if (request?.startsWith("tailwindcss/")) return callback(null, node_path.default.join(pkgDir, request.slice(12)));
+		if (isMpxWebpackPluginRequest(request)) return originalResolve.call(this, node_process.default.cwd(), request, callback);
+		return originalResolve.call(this, context, request, callback);
+	};
+	wrappedResolve.__weappTwPatched = true;
+	loaderContext.resolve = wrappedResolve;
+}
+function setupMpxTailwindcssRedirect(pkgDir, enabled) {
+	if (enabled) installTailwindcssCssRedirect(pkgDir);
+}
+const CSS_EXT_RE = /\.css$/i;
+function injectMpxCssRewritePreRules(compiler, loader, loaderOptions) {
+	var _compiler$options;
+	if (!loader) return;
+	const moduleOptions = (_compiler$options = compiler.options).module ?? (_compiler$options.module = { rules: [] });
+	moduleOptions.rules = moduleOptions.rules || [];
+	const createRule = (match) => ({
+		...match,
+		enforce: "pre",
+		use: [{
+			loader,
+			options: loaderOptions
+		}]
+	});
+	moduleOptions.rules.unshift(createRule({ resourceQuery: (query) => isMpxStyleResourceQuery(query) }), createRule({
+		test: CSS_EXT_RE,
+		resourceQuery: (query) => !isMpxStyleResourceQuery(query)
+	}));
+}
+//#endregion
+//#region src/bundlers/webpack/BaseUnifiedPlugin/shared.ts
+const MPX_STYLE_RESOURCE_QUERY_RE = /(?:\?|&)type=styles\b/;
+function getCacheKey(filename) {
+	return filename;
+}
+function stripResourceQuery(resource) {
+	if (typeof resource !== "string") return resource;
+	const queryIndex = resource.indexOf("?");
+	if (queryIndex !== -1) return resource.slice(0, queryIndex);
+	const hashIndex = resource.indexOf("#");
+	if (hashIndex !== -1) return resource.slice(0, hashIndex);
+	return resource;
+}
+function isCssLikeModuleResource(resource, cssMatcher, appType) {
+	if (typeof resource !== "string") return false;
+	const normalizedResource = stripResourceQuery(resource);
+	if (normalizedResource && cssMatcher(normalizedResource)) return true;
+	if (appType === "mpx") return MPX_STYLE_RESOURCE_QUERY_RE.test(resource);
 	return false;
 }
+function hasLoaderEntry(entries, target) {
+	if (!target) return false;
+	return entries.some((entry) => entry.loader?.includes?.(target));
+}
+function toChunkFiles(files) {
+	if (!files) return [];
+	if (Array.isArray(files)) return files;
+	return [...files];
+}
+function createAssetHashByChunkMap(chunks) {
+	const partsByFile = /* @__PURE__ */ new Map();
+	for (const chunk of chunks) {
+		const hash = typeof chunk.hash === "string" ? chunk.hash : void 0;
+		if (!hash) continue;
+		const chunkId = String(chunk.id ?? chunk.name ?? "");
+		for (const file of toChunkFiles(chunk.files)) {
+			if (!file) continue;
+			let parts = partsByFile.get(file);
+			if (!parts) {
+				parts = [];
+				partsByFile.set(file, parts);
+			}
+			parts.push(`${chunkId}:${hash}`);
+		}
+	}
+	const hashByFile = /* @__PURE__ */ new Map();
+	for (const [file, parts] of partsByFile.entries()) hashByFile.set(file, parts.sort().join("|"));
+	return hashByFile;
+}
+function createRuntimeAwareCssHash(assetHash, sourceHash, runtimeSetHash) {
+	return `${assetHash ?? sourceHash}:${runtimeSetHash}`;
+}
+function hasWatchChanges(compiler) {
+	return (compiler.modifiedFiles?.size ?? 0) > 0 || (compiler.removedFiles?.size ?? 0) > 0;
+}
+//#endregion
+//#region src/bundlers/webpack/BaseUnifiedPlugin/v5-assets.ts
 function setupWebpackV5ProcessAssetsHook(options) {
 	const { compiler, options: compilerOptions, appType, runtimeState, getRuntimeRefreshRequirement, refreshRuntimeMetadata, consumeRuntimeRefreshRequirement, debug } = options;
 	const { Compilation, sources } = compiler.webpack;
 	const { ConcatSource } = sources;
 	const cssHandlerOptionsCache = /* @__PURE__ */ new Map();
 	const cssUserHandlerOptionsCache = /* @__PURE__ */ new Map();
-	compiler.hooks.compilation.tap(require_recorder.pluginName, (compilation) => {
+	compiler.hooks.compilation.tap(require_precheck.pluginName, (compilation) => {
 		compilation.hooks.processAssets.tapPromise({
-			name: require_recorder.pluginName,
+			name: require_precheck.pluginName,
 			stage: Compilation.PROCESS_ASSETS_STAGE_SUMMARIZE
 		}, async (assets) => {
 			compilerOptions.onStart();
 			debug("start");
-			await runtimeState.patchPromise;
+			await runtimeState.readyPromise;
 			for (const chunk of compilation.chunks) if (chunk.id && chunk.hash) compilerOptions.cache.calcHashValueChanged(chunk.id, chunk.hash);
-			const assetHashByChunk = require_loader_anchors.createAssetHashByChunkMap(compilation.chunks);
+			const assetHashByChunk = createAssetHashByChunkMap(compilation.chunks);
 			const entries = Object.entries(assets);
 			const compilerOutputPath = compilation.compiler?.outputPath ?? compiler.outputPath;
 			const outputDir = compilerOutputPath ? node_path.default.resolve(compilerOutputPath) : compilation.outputOptions?.path ?? node_process.default.cwd();
 			const jsAssets = /* @__PURE__ */ new Map();
 			for (const [file] of entries) if (compilerOptions.jsMatcher(file) || compilerOptions.wxsMatcher(file)) {
-				const absolute = require_css_imports.toAbsoluteOutputPath(file, outputDir);
+				const absolute = require_run_tasks.toAbsoluteOutputPath(file, outputDir);
 				jsAssets.set(absolute, file);
 			}
 			const moduleGraphOptions = {
 				resolve(specifier, importer) {
-					return require_css_imports.resolveOutputSpecifier(specifier, importer, outputDir, (candidate) => jsAssets.has(candidate));
+					return require_run_tasks.resolveOutputSpecifier(specifier, importer, outputDir, (candidate) => jsAssets.has(candidate));
 				},
 				load: (id) => {
 					const assetName = jsAssets.get(id);
@@ -99,10 +264,9 @@ function setupWebpackV5ProcessAssetsHook(options) {
 				cssUserHandlerOptionsCache.set(cacheKey, created);
 				return created;
 			};
-			const staleClassNameFallback = resolveWebpackStaleClassNameFallback(compilerOptions.staleClassNameFallback, compiler);
 			const forceRuntimeRefresh = getRuntimeRefreshRequirement();
 			debug("processAssets ensure runtime set forceRefresh=%s major=%s", forceRuntimeRefresh, runtimeState.twPatcher.majorVersion ?? "unknown");
-			const runtimeSet = await require_recorder.ensureRuntimeClassSet(runtimeState, {
+			const runtimeSet = await require_precheck.ensureRuntimeClassSet(runtimeState, {
 				forceRefresh: forceRuntimeRefresh,
 				forceCollect: true,
 				clearCache: forceRuntimeRefresh,
@@ -110,6 +274,7 @@ function setupWebpackV5ProcessAssetsHook(options) {
 			});
 			await refreshRuntimeMetadata(forceRuntimeRefresh);
 			consumeRuntimeRefreshRequirement();
+			const runtimeSetHash = compilerOptions.cache.computeHash([require_cache.getRuntimeClassSetSignature(runtimeState.twPatcher), [...runtimeSet].sort().join("\n")].join("\n\n"));
 			const defaultTemplateHandlerOptions = { runtimeSet };
 			debug("get runtimeSet, class count: %d", runtimeSet.size);
 			const tasks = [];
@@ -141,10 +306,10 @@ function setupWebpackV5ProcessAssetsHook(options) {
 			}
 			const jsTaskFactories = [];
 			if (Array.isArray(groupedEntries.js)) for (const [file] of groupedEntries.js) {
-				const cacheKey = require_loader_anchors.getCacheKey(file);
+				const cacheKey = getCacheKey(file);
 				const asset = compilation.getAsset(file);
 				if (!asset) continue;
-				const absoluteFile = require_css_imports.toAbsoluteOutputPath(file, outputDir);
+				const absoluteFile = require_run_tasks.toAbsoluteOutputPath(file, outputDir);
 				const initialSource = asset.source.source();
 				const initialRawSource = typeof initialSource === "string" ? initialSource : initialSource.toString();
 				const chunkHash = assetHashByChunk.get(file);
@@ -165,13 +330,12 @@ function setupWebpackV5ProcessAssetsHook(options) {
 							const currentSourceValue = compilation.getAsset(file)?.source.source();
 							const currentSource = typeof currentSourceValue === "string" ? currentSourceValue : currentSourceValue?.toString() ?? "";
 							const handlerOptions = {
-								staleClassNameFallback,
 								tailwindcssMajorVersion: runtimeState.twPatcher.majorVersion,
 								filename: absoluteFile,
 								moduleGraph: moduleGraphOptions,
 								babelParserOptions: { sourceFilename: absoluteFile }
 							};
-							if (require_recorder.shouldSkipJsTransform(currentSource, handlerOptions)) return { result: new ConcatSource(currentSource) };
+							if (require_precheck.shouldSkipJsTransform(currentSource, handlerOptions)) return { result: new ConcatSource(currentSource) };
 							const { code, linked } = await compilerOptions.jsHandler(currentSource, runtimeSet, handlerOptions);
 							const source = new ConcatSource(code);
 							compilerOptions.onUpdate(file, currentSource, code);
@@ -186,13 +350,13 @@ function setupWebpackV5ProcessAssetsHook(options) {
 				const [file, originalSource] = element;
 				const rawSource = originalSource.source().toString();
 				const cacheKey = file;
-				const chunkHash = assetHashByChunk.get(file);
+				const runtimeAwareHash = createRuntimeAwareCssHash(assetHashByChunk.get(file), compilerOptions.cache.computeHash(rawSource), runtimeSetHash);
 				tasks.push(require_generator_css.processCachedTask({
 					cache: compilerOptions.cache,
 					cacheKey,
 					hashKey: `${file}:asset`,
 					rawSource,
-					hash: chunkHash,
+					hash: runtimeAwareHash,
 					applyResult(source) {
 						compilation.updateAsset(file, source);
 					},
@@ -200,7 +364,7 @@ function setupWebpackV5ProcessAssetsHook(options) {
 						debug("css cache hit: %s", file);
 					},
 					transform: async () => {
-						await runtimeState.patchPromise;
+						await runtimeState.readyPromise;
 						const cssHandlerOptions = getCssHandlerOptions(file);
 						const generated = await require_generator_css.generateCssByGenerator({
 							opts: compilerOptions,
@@ -222,7 +386,7 @@ function setupWebpackV5ProcessAssetsHook(options) {
 					}
 				}));
 			}
-			require_css_imports.pushConcurrentTaskFactories(tasks, jsTaskFactories);
+			require_run_tasks.pushConcurrentTaskFactories(tasks, jsTaskFactories);
 			await Promise.all(tasks);
 			debug("end");
 			compilerOptions.onEnd();
@@ -230,13 +394,41 @@ function setupWebpackV5ProcessAssetsHook(options) {
 	});
 }
 //#endregion
+//#region src/bundlers/webpack/shared/loader-anchors.ts
+const MPX_STRIP_CONDITIONAL_LOADER = "@mpxjs/webpack-plugin/lib/style-compiler/strip-conditional-loader";
+const MPX_STYLE_COMPILER_LOADER = "@mpxjs/webpack-plugin/lib/style-compiler/index";
+const MPX_REWRITE_PRECEDENCE_LOADERS = [MPX_STYLE_COMPILER_LOADER, MPX_STRIP_CONDITIONAL_LOADER];
+function createFinder(targets) {
+	return (entries) => entries.findIndex((entry) => targets.some((target) => entry?.loader?.includes?.(target)));
+}
+function createPrioritizedFinder(targets) {
+	return (entries) => {
+		for (const target of targets) {
+			const idx = entries.findIndex((entry) => entry?.loader?.includes?.(target));
+			if (idx !== -1) return idx;
+		}
+		return -1;
+	};
+}
+function createLoaderAnchorFinders(appType) {
+	if (isMpx(appType)) return {
+		findRewriteAnchor: createPrioritizedFinder(MPX_REWRITE_PRECEDENCE_LOADERS),
+		findClassSetAnchor: createFinder([MPX_STYLE_COMPILER_LOADER])
+	};
+	const fallbackFinder = createFinder(["postcss-loader"]);
+	return {
+		findRewriteAnchor: fallbackFinder,
+		findClassSetAnchor: fallbackFinder
+	};
+}
+//#endregion
 //#region src/bundlers/webpack/BaseUnifiedPlugin/v5-loaders.ts
 function setupWebpackV5Loaders(options) {
-	const { compiler, options: compilerOptions, appType, weappTailwindcssPackageDir, shouldRewriteCssImports, runtimeLoaderPath, runtimeCssImportRewriteLoaderPath, getClassSetInLoader, getRuntimeWatchDependencies, debug } = options;
-	const isMpxApp = require_loader_anchors.isMpx(appType);
-	if (shouldRewriteCssImports && isMpxApp) require_loader_anchors.ensureMpxTailwindcssAliases(compiler, weappTailwindcssPackageDir);
+	const { compiler, options: compilerOptions, appType, weappTailwindcssPackageDir, shouldRewriteCssImports, runtimeLoaderPath, getClassSetInLoader, getRuntimeWatchDependencies, debug } = options;
+	const isMpxApp = isMpx(appType);
+	if (shouldRewriteCssImports && isMpxApp) ensureMpxTailwindcssAliases(compiler, weappTailwindcssPackageDir);
 	const runtimeClassSetLoader = runtimeLoaderPath ?? node_path.default.resolve(__dirname, "./weapp-tw-runtime-classset-loader.js");
-	const runtimeCssImportRewriteLoader = shouldRewriteCssImports ? runtimeCssImportRewriteLoaderPath ?? node_path.default.resolve(__dirname, "./weapp-tw-css-import-rewrite-loader.js") : void 0;
+	const runtimeCssImportRewriteLoader = shouldRewriteCssImports ? node_path.default.resolve(__dirname, "./weapp-tw-css-import-rewrite-loader.js") : void 0;
 	const runtimeClassSetLoaderExists = node_fs.default.existsSync(runtimeClassSetLoader);
 	const runtimeCssImportRewriteLoaderExists = runtimeCssImportRewriteLoader ? node_fs.default.existsSync(runtimeCssImportRewriteLoader) : false;
 	const runtimeLoaderRewriteOptions = shouldRewriteCssImports ? {
@@ -247,9 +439,9 @@ function setupWebpackV5Loaders(options) {
 		getClassSet: getClassSetInLoader,
 		getWatchDependencies: getRuntimeWatchDependencies
 	};
-	const { findRewriteAnchor, findClassSetAnchor } = require_loader_anchors.createLoaderAnchorFinders(appType);
-	const cssImportRewriteLoaderOptions = runtimeLoaderRewriteOptions ? { rewriteCssImports: runtimeLoaderRewriteOptions } : void 0;
-	if (runtimeCssImportRewriteLoader && shouldRewriteCssImports && cssImportRewriteLoaderOptions && isMpxApp) require_loader_anchors.injectMpxCssRewritePreRules(compiler, runtimeCssImportRewriteLoader, cssImportRewriteLoaderOptions);
+	const { findRewriteAnchor, findClassSetAnchor } = createLoaderAnchorFinders(appType);
+	const cssImportRewriteLoaderOptions = runtimeLoaderRewriteOptions ? { tailwindcssImportRewrite: runtimeLoaderRewriteOptions } : void 0;
+	if (runtimeCssImportRewriteLoader && shouldRewriteCssImports && cssImportRewriteLoaderOptions && isMpxApp) injectMpxCssRewritePreRules(compiler, runtimeCssImportRewriteLoader, cssImportRewriteLoaderOptions);
 	const createRuntimeClassSetLoaderEntry = () => ({
 		loader: runtimeClassSetLoader,
 		options: classSetLoaderOptions,
@@ -266,14 +458,14 @@ function setupWebpackV5Loaders(options) {
 		};
 	};
 	const { NormalModule } = compiler.webpack;
-	compiler.hooks.compilation.tap(require_recorder.pluginName, (compilation) => {
-		NormalModule.getCompilationHooks(compilation).loader.tap(require_recorder.pluginName, (_loaderContext, module) => {
+	compiler.hooks.compilation.tap(require_precheck.pluginName, (compilation) => {
+		NormalModule.getCompilationHooks(compilation).loader.tap(require_precheck.pluginName, (_loaderContext, module) => {
 			if (!(runtimeClassSetLoaderExists || runtimeCssImportRewriteLoaderExists)) return;
-			require_loader_anchors.patchMpxLoaderResolve(_loaderContext, weappTailwindcssPackageDir, shouldRewriteCssImports && isMpxApp);
+			patchMpxLoaderResolve(_loaderContext, weappTailwindcssPackageDir, shouldRewriteCssImports && isMpxApp);
 			const loaderEntries = module.loaders || [];
 			let rewriteAnchorIdx = findRewriteAnchor(loaderEntries);
 			const classSetAnchorIdx = findClassSetAnchor(loaderEntries);
-			const isCssModule = require_loader_anchors.isCssLikeModuleResource(module.resource, compilerOptions.cssMatcher, appType);
+			const isCssModule = isCssLikeModuleResource(module.resource, compilerOptions.cssMatcher, appType);
 			if (node_process.default.env.WEAPP_TW_LOADER_DEBUG && isCssModule) debug("loader hook css module: %s loaders=%o anchors=%o", module.resource, loaderEntries.map((x) => x.loader), {
 				rewriteAnchorIdx,
 				classSetAnchorIdx
@@ -301,7 +493,7 @@ function setupWebpackV5Loaders(options) {
 					rewriteAnchorIdx = findRewriteAnchor(loaderEntries);
 				}
 			}
-			if (runtimeClassSetLoaderExists && !require_loader_anchors.hasLoaderEntry(loaderEntries, runtimeClassSetLoader)) {
+			if (runtimeClassSetLoaderExists && !hasLoaderEntry(loaderEntries, runtimeClassSetLoader)) {
 				const classSetLoaderEntry = createRuntimeClassSetLoaderEntry();
 				const anchorIndex = findClassSetAnchor(loaderEntries);
 				if (anchorIndex === -1) anchorlessInsert(classSetLoaderEntry, "before");
@@ -315,8 +507,8 @@ function setupWebpackV5Loaders(options) {
 }
 //#endregion
 //#region src/bundlers/webpack/BaseUnifiedPlugin/v5.ts
-const debug = require_recorder.createDebug();
-const weappTailwindcssPackageDir = require_css_imports.resolvePackageDir("weapp-tailwindcss");
+const debug = require_runtime_patch.createDebug();
+const weappTailwindcssPackageDir = require_run_tasks.resolvePackageDir("weapp-tailwindcss");
 /**
 * @name UnifiedWebpackPluginV5
 * @description webpack5 核心转义插件
@@ -324,33 +516,23 @@ const weappTailwindcssPackageDir = require_css_imports.resolvePackageDir("weapp-
 */
 var UnifiedWebpackPluginV5 = class {
 	constructor(options = {}) {
-		this.options = require_recorder.getCompilerContext(options);
+		require_precheck._defineProperty(this, "options", void 0);
+		require_precheck._defineProperty(this, "appType", void 0);
+		this.options = require_precheck.getCompilerContext(options);
 		this.appType = this.options.appType;
 	}
 	apply(compiler) {
 		compiler.options = compiler.options || {};
-		const { disabled, onLoad, runtimeLoaderPath, runtimeCssImportRewriteLoaderPath, twPatcher: initialTwPatcher, refreshTailwindcssPatcher } = this.options;
-		const disabledOptions = require_css_imports.resolveDisabledOptions(disabled);
-		const shouldRewriteCssImports = (initialTwPatcher.majorVersion ?? 0) >= 4 && this.options.rewriteCssImports !== false && !disabledOptions.rewriteCssImports;
-		const isMpxApp = require_loader_anchors.isMpx(this.appType);
-		if (shouldRewriteCssImports) {
-			require_loader_anchors.applyTailwindcssCssImportRewrite(compiler, {
-				pkgDir: weappTailwindcssPackageDir,
-				enabled: true,
-				appType: this.appType
-			});
-			require_loader_anchors.setupMpxTailwindcssRedirect(weappTailwindcssPackageDir, isMpxApp);
-		}
+		const { disabled, onLoad, runtimeLoaderPath, twPatcher: initialTwPatcher, refreshTailwindcssPatcher } = this.options;
+		const disabledOptions = require_run_tasks.resolvePluginDisabledState(disabled);
+		const shouldRewriteCssImports = (initialTwPatcher.majorVersion ?? 0) >= 4;
+		const isMpxApp = isMpx(this.appType);
+		if (shouldRewriteCssImports) setupMpxTailwindcssRedirect(weappTailwindcssPackageDir, isMpxApp);
 		if (disabledOptions.plugin) return;
-		const patchRecorderState = require_recorder.setupPatchRecorder(initialTwPatcher, this.options.tailwindcssBasedir, {
-			source: "runtime",
-			cwd: this.options.tailwindcssBasedir ?? node_process.default.cwd()
-		});
 		const runtimeState = {
 			twPatcher: initialTwPatcher,
-			patchPromise: patchRecorderState.patchPromise,
-			refreshTailwindcssPatcher,
-			onPatchCompleted: patchRecorderState.onPatchCompleted
+			readyPromise: require_precheck.createTailwindRuntimeReadyPromise(initialTwPatcher),
+			refreshTailwindcssPatcher
 		};
 		let runtimeSetPrepared = false;
 		let runtimeSetSignature;
@@ -361,7 +543,7 @@ var UnifiedWebpackPluginV5 = class {
 		const updateRuntimeWatchDependencies = async () => {
 			runtimeWatchDependencyFiles.clear();
 			runtimeWatchDependencyContexts.clear();
-			const tailwindOptions = require_patcher_options.resolveTailwindcssOptions(runtimeState.twPatcher.options);
+			const tailwindOptions = require_cache.resolveTailwindcssOptions(runtimeState.twPatcher.options);
 			if (tailwindOptions?.config) runtimeWatchDependencyFiles.add(tailwindOptions.config);
 			for (const entry of tailwindOptions?.v4?.cssEntries ?? []) runtimeWatchDependencyFiles.add(entry);
 			for (const source of tailwindOptions?.v4?.sources ?? []) if (source?.base) runtimeWatchDependencyContexts.add(source.base);
@@ -380,26 +562,26 @@ var UnifiedWebpackPluginV5 = class {
 			runtimeMetadataPrepared = true;
 		};
 		const syncRuntimeRefreshRequirement = () => {
-			runtimeRefreshRequiredForCompilation = runtimeRefreshRequiredForCompilation || require_loader_anchors.hasWatchChanges(compiler);
+			runtimeRefreshRequiredForCompilation = runtimeRefreshRequiredForCompilation || hasWatchChanges(compiler);
 		};
 		const resetRuntimePreparation = () => {
 			runtimeSetPrepared = false;
 			runtimeMetadataPrepared = false;
 			syncRuntimeRefreshRequirement();
 		};
-		compiler.hooks.invalid?.tap?.(require_recorder.pluginName, () => {
+		compiler.hooks.invalid?.tap?.(require_precheck.pluginName, () => {
 			runtimeRefreshRequiredForCompilation = true;
 		});
-		compiler.hooks.watchRun?.tap?.(require_recorder.pluginName, syncRuntimeRefreshRequirement);
-		if (compiler.hooks.thisCompilation?.tap) compiler.hooks.thisCompilation.tap(require_recorder.pluginName, resetRuntimePreparation);
-		else if (compiler.hooks.compilation?.tap) compiler.hooks.compilation.tap(require_recorder.pluginName, resetRuntimePreparation);
+		compiler.hooks.watchRun?.tap?.(require_precheck.pluginName, syncRuntimeRefreshRequirement);
+		if (compiler.hooks.thisCompilation?.tap) compiler.hooks.thisCompilation.tap(require_precheck.pluginName, resetRuntimePreparation);
+		else if (compiler.hooks.compilation?.tap) compiler.hooks.compilation.tap(require_precheck.pluginName, resetRuntimePreparation);
 		async function getClassSetInLoader() {
 			if (runtimeSetPrepared) return;
-			const signature = require_logger.getRuntimeClassSetSignature(runtimeState.twPatcher);
+			const signature = require_cache.getRuntimeClassSetSignature(runtimeState.twPatcher);
 			const forceRefresh = runtimeRefreshRequiredForCompilation || signature !== runtimeSetSignature;
 			debug("runtime loader ensure class set forceRefresh=%s watchDirty=%s signatureChanged=%s", forceRefresh, runtimeRefreshRequiredForCompilation, signature !== runtimeSetSignature);
 			runtimeSetPrepared = true;
-			await require_recorder.ensureRuntimeClassSet(runtimeState, {
+			await require_precheck.ensureRuntimeClassSet(runtimeState, {
 				forceRefresh,
 				forceCollect: true,
 				clearCache: forceRefresh,
@@ -417,7 +599,6 @@ var UnifiedWebpackPluginV5 = class {
 			weappTailwindcssPackageDir,
 			shouldRewriteCssImports,
 			runtimeLoaderPath,
-			runtimeCssImportRewriteLoaderPath,
 			getClassSetInLoader,
 			getRuntimeWatchDependencies() {
 				return {

package/dist/webpack.js

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_webpack = require("./webpack-CAJR4hhP.js");
+const require_webpack = require("./webpack-D-sUCY0u.js");
 exports.UnifiedWebpackPluginV5 = require_webpack.UnifiedWebpackPluginV5;
 exports.WeappTailwindcss = require_webpack.UnifiedWebpackPluginV5;
 exports.weappTailwindcss = require_webpack.UnifiedWebpackPluginV5;

package/dist/webpack.mjs

@@ -1,2 +1,2 @@
-import { n as weappTailwindcssPackageDir, t as UnifiedWebpackPluginV5 } from "./webpack-CiHqVZTg.mjs";
+import { n as weappTailwindcssPackageDir, t as UnifiedWebpackPluginV5 } from "./webpack-BNdGm9KL.mjs";
 export { UnifiedWebpackPluginV5, UnifiedWebpackPluginV5 as WeappTailwindcss, UnifiedWebpackPluginV5 as weappTailwindcss, weappTailwindcssPackageDir };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "weapp-tailwindcss",
-  "version": "5.0.0-next.3",
+  "version": "5.0.0-next.7",
   "description": "把 tailwindcss 原子化样式思想，带给小程序开发者们! bring tailwindcss to miniprogram developers!",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -61,11 +61,6 @@
       "import": "./dist/webpack.mjs",
       "require": "./dist/webpack.js"
     },
-    "./webpack4": {
-      "types": "./dist/webpack4.d.ts",
-      "import": "./dist/webpack4.mjs",
-      "require": "./dist/webpack4.js"
-    },
     "./core": {
       "types": "./dist/core.d.ts",
       "import": "./dist/core.mjs",
@@ -150,7 +145,6 @@
     }
   },
   "bin": {
-    "weapp-tailwindcss-webpack-plugin": "bin/weapp-tailwindcss.js",
     "weapp-tailwindcss": "bin/weapp-tailwindcss.js",
     "weapp-tw": "bin/weapp-tailwindcss.js"
   },
@@ -161,7 +155,6 @@
     "generator-placeholder.css",
     "index.css",
     "preflight.css",
-    "scripts/postinstall.mjs",
     "theme.css",
     "uni-app-x.css",
     "utilities.css",
@@ -179,12 +172,10 @@
     "@babel/parser": "~7.29.3",
     "@babel/traverse": "~7.29.0",
     "@babel/types": "~7.29.0",
-    "@tailwindcss-mangle/config": "^7.0.1",
     "@vue/compiler-dom": "^3.5.34",
     "@vue/compiler-sfc": "^3.5.34",
     "@weapp-core/escape": "~7.0.0",
     "@weapp-core/regex": "~1.0.1",
-    "cac": "6.7.14",
     "comment-json": "^4.6.2",
     "debug": "~4.4.3",
     "fast-glob": "^3.3.3",
@@ -194,43 +185,40 @@
     "lru-cache": "10.4.3",
     "magic-string": "0.30.21",
     "postcss-load-config": "^6.0.1",
-    "semver": "~7.7.4",
-    "tailwindcss-patch": "9.2.0",
-    "webpack-sources": "3.3.4",
-    "yaml": "^2.8.4",
+    "semver": "~7.8.0",
+    "tailwindcss-patch": "9.3.2",
+    "yaml": "^2.9.0",
+    "@weapp-tailwindcss/postcss": "2.2.1-next.0",
     "@weapp-tailwindcss/logger": "1.1.0",
-    "@weapp-tailwindcss/postcss": "2.2.0",
-    "@weapp-tailwindcss/reset": "0.1.0",
-    "tailwindcss-config": "1.1.6-next.0",
-    "@weapp-tailwindcss/shared": "1.1.3"
+    "@weapp-tailwindcss/reset": "0.1.1-next.0",
+    "@weapp-tailwindcss/shared": "1.1.3",
+    "tailwindcss-config": "1.1.6-next.0"
   },
   "scripts": {
     "dev": "tsdown --watch --sourcemap",
-    "build": "tsdown && pnpm run build:types && node scripts/ensure-escape-dts.mjs",
-    "build:types": "tsc -p tsconfig.build.json --declaration --emitDeclarationOnly --declarationDir dist --noEmit false && node scripts/rewrite-dts-aliases.mjs && node scripts/create-entry-dts.mjs",
+    "build": "tsdown && pnpm run build:types && pnpm --filter @weapp-tailwindcss/scripts ensure-escape-dts",
+    "build:types": "tsc -p tsconfig.build.json --declaration --emitDeclarationOnly --declarationDir dist --noEmit false && pnpm --filter @weapp-tailwindcss/scripts build:types",
     "build:tsc": "cross-env NODE_ENV=development tsc --build tsconfig.json",
     "build:cli": "cd plugins/cli && pnpm run build",
-    "build:css": "tsx scripts/build-css.ts",
-    "build:weapp-theme": "tsx scripts/build-weapp-theme.ts",
-    "test": "pnpm run cli:patch && vitest run",
+    "build:css": "pnpm --filter @weapp-tailwindcss/scripts build:css",
+    "build:weapp-theme": "pnpm --filter @weapp-tailwindcss/scripts build:weapp-theme",
+    "test": "vitest run",
     "test:dev": "vitest",
     "test:ui": "vitest --ui",
     "bench": "vitest bench --config ./vitest.config.ts",
-    "bench:vite-perf": "tsx scripts/vite-perf-bench.ts",
-    "bench:vite-perf:summary": "tsx scripts/vite-perf-summary.ts",
-    "bench:js-handlers": "tsx scripts/js-bench.ts",
-    "bench:js-diff": "tsx scripts/js-bench-diff.ts",
+    "bench:vite-perf": "pnpm --filter @weapp-tailwindcss/scripts bench:vite-perf",
+    "bench:vite-perf:summary": "pnpm --filter @weapp-tailwindcss/scripts bench:vite-perf:summary",
+    "bench:js-handlers": "pnpm --filter @weapp-tailwindcss/scripts bench:js-handlers",
+    "bench:js-diff": "pnpm --filter @weapp-tailwindcss/scripts bench:js-diff",
     "tsd": "tsd",
-    "clean": "tsx scripts/clean.ts",
-    "get-decl": "tsx scripts/get-decl.ts",
+    "clean": "pnpm --filter @weapp-tailwindcss/scripts clean:core",
+    "get-decl": "pnpm --filter @weapp-tailwindcss/scripts get-decl",
     "ls:pack": "npm pack --dry-run",
-    "cli:patch": "node bin/weapp-tailwindcss.js patch",
-    "colors": "tsx scripts/colors.ts",
-    "release": "tsx scripts/release.ts",
+    "colors": "pnpm --filter @weapp-tailwindcss/scripts colors",
+    "release": "pnpm --filter @weapp-tailwindcss/scripts release",
     "lint": "eslint .",
     "lint:fix": "eslint ./src --fix",
-    "postinstall": "node scripts/postinstall.mjs",
-    "bench:vite-dev-hmr": "tsx scripts/vite-dev-hmr-bench.ts",
-    "test:watch-hmr": "node --import tsx scripts/watch-hmr-regression/index.ts"
+    "bench:vite-dev-hmr": "pnpm --filter @weapp-tailwindcss/scripts bench:vite-dev-hmr",
+    "test:watch-hmr": "pnpm --filter @weapp-tailwindcss/scripts test:watch-hmr"
   }
 }

package/dist/bundlers/shared/generator-candidates.d.ts

@@ -1,5 +0,0 @@
-export interface GeneratorCandidateSource {
-    content: string;
-    extension?: string;
-}
-export declare function collectGeneratorCandidatesFromSources(sources: GeneratorCandidateSource[], baseCandidates?: Iterable<string>): Promise<Set<string>>;

package/dist/bundlers/webpack/BaseUnifiedPlugin/v4-assets.d.ts

@@ -1,14 +0,0 @@
-import type { Compiler } from 'webpack4';
-import type { AppType, InternalUserDefinedOptions } from '../../../types';
-interface SetupWebpackV4EmitHookOptions {
-    compiler: Compiler;
-    options: InternalUserDefinedOptions;
-    appType?: AppType;
-    runtimeState: {
-        twPatcher: InternalUserDefinedOptions['twPatcher'];
-        patchPromise: Promise<void>;
-    };
-    debug: (format: string, ...args: unknown[]) => void;
-}
-export declare function setupWebpackV4EmitHook(options: SetupWebpackV4EmitHookOptions): void;
-export {};