weapp-tailwindcss 5.0.0-next.9 → 5.0.1

package/dist/{webpack-DJazm5sT.mjs → webpack-D43aMQzO.mjs}

@@ -1,15 +1,16 @@
-import { c as resolveTailwindcssOptions, n as getRuntimeClassSetSignature } from "./cache-CHs4DXui.mjs";
-import { n as createDebug } from "./runtime-patch-CwN5ya72.mjs";
-import { r as processCachedTask, t as generateCssByGenerator } from "./generator-css-DeLLmp2N.mjs";
-import { _ as ensureRuntimeClassSet, f as pluginName, g as createTailwindRuntimeReadyPromise, n as getCompilerContext, s as _defineProperty, t as shouldSkipJsTransform, v as refreshTailwindRuntimeState } from "./precheck-B4RH6ZNN.mjs";
-import { r as getGroupedEntries } from "./utils-Btw1iOVV.mjs";
-import { c as upsertTailwindV4CssSource, s as hasConfiguredTailwindV4CssRoots } from "./tailwindcss-C5IgPlQ0.mjs";
-import { a as resolveOutputSpecifier, n as resolvePackageDir, o as toAbsoluteOutputPath, r as resolvePluginDisabledState, t as pushConcurrentTaskFactories } from "./run-tasks-DdNi-hkk.mjs";
+import { b as ensureRuntimeClassSet, d as _defineProperty, f as init_defineProperty, i as pluginName, n as getCompilerContext, t as shouldSkipJsTransform, x as refreshTailwindRuntimeState, y as createTailwindRuntimeReadyPromise } from "./precheck-jZvTVXXG.mjs";
+import { B as createDebug, W as resolveTailwindcssOptions, l as getRuntimeClassSetSignature } from "./v3-engine-DGBhUnjn.mjs";
+import { i as normalizeWeappTailwindcssGeneratorOptions } from "./generator-DDtsUvkH.mjs";
+import { d as removeTailwindSourceDirectives, i as generateCssByGenerator, r as emitHmrTiming, s as processCachedTask, t as createBundleRuntimeClassSetManager } from "./incremental-runtime-class-set-DArodvWs.mjs";
+import { r as getGroupedEntries } from "./utils-DsaS975I.mjs";
+import { c as upsertTailwindV4CssSource, s as hasConfiguredTailwindV4CssRoots } from "./tailwindcss-CCZcu0lr.mjs";
+import { _ as stripRequestQuery, b as toAbsoluteOutputPath, d as resolvePluginDisabledState, g as isSourceStyleRequest, l as stripBundlerGeneratedCssMarkers, n as createBundleBuildState, o as pushConcurrentTaskFactories, r as updateBundleBuildState, t as buildBundleSnapshot, u as resolvePackageDir, y as resolveOutputSpecifier } from "./bundle-state-CQmxxx0R.mjs";
 import Module, { createRequire } from "node:module";
-import path from "node:path";
-import process from "node:process";
 import fs from "node:fs";
+import process from "node:process";
+import path from "node:path";
 import { fileURLToPath } from "node:url";
+import micromatch from "micromatch";
 //#region src/shared/tailwindcss-css-redirect.ts
 const moduleWithMutableResolve = Module;
 const patched = /* @__PURE__ */ new WeakSet();
@@ -30,6 +31,7 @@ function installTailwindcssCssRedirect(pkgDir) {
 //#region src/shared/mpx.ts
 const localRequire = createRequire(import.meta.url);
 const MPX_STYLE_RESOURCE_QUERY_RE$1 = /(?:^|[?&])type=styles(?:&|$)/;
+const MPX_WEBPACK_PLUGIN_PACKAGE_RE = /@mpxjs[\\/]webpack-plugin[\\/]package\.json$/;
 function isMpxStyleResourceQuery(query) {
 	if (typeof query !== "string") return false;
 	return MPX_STYLE_RESOURCE_QUERY_RE$1.test(query);
@@ -50,19 +52,44 @@ function resolveMpxWebpackPluginDir(compiler) {
 		const projectRequire = createRequire(path.join(candidate, "package.json"));
 		return path.dirname(projectRequire.resolve("@mpxjs/webpack-plugin/package.json"));
 	} catch {}
-	return path.dirname(localRequire.resolve("@mpxjs/webpack-plugin/package.json"));
+	const cachedPackageJson = Object.keys(localRequire.cache).find((file) => MPX_WEBPACK_PLUGIN_PACKAGE_RE.test(file));
+	if (cachedPackageJson) return path.dirname(cachedPackageJson);
+	try {
+		return path.dirname(localRequire.resolve("@mpxjs/webpack-plugin/package.json"));
+	} catch {
+		return;
+	}
 }
 function isMpxWebpackPluginRequest(request) {
 	return request === "@mpxjs/webpack-plugin" || Boolean(request?.startsWith("@mpxjs/webpack-plugin/"));
 }
+function resolveMpxWebpackPluginRequest(request, mpxWebpackPluginDir) {
+	if (request === "@mpxjs/webpack-plugin") return mpxWebpackPluginDir;
+	return path.join(mpxWebpackPluginDir, request.slice(22));
+}
 function addMpxWebpackPluginAlias(alias, pkgDir) {
+	const recordLoader = path.join(pkgDir, "lib/record-loader");
+	const styleCompiler = path.join(pkgDir, "lib/style-compiler/index");
+	const stripConditionalLoader = path.join(pkgDir, "lib/style-compiler/strip-conditional-loader");
 	if (Array.isArray(alias)) alias.push({
+		name: "@mpxjs/webpack-plugin/lib/record-loader",
+		alias: recordLoader
+	}, {
+		name: "@mpxjs/webpack-plugin/lib/style-compiler/index",
+		alias: styleCompiler
+	}, {
+		name: "@mpxjs/webpack-plugin/lib/style-compiler/strip-conditional-loader",
+		alias: stripConditionalLoader
+	}, {
 		name: /^@mpxjs\/webpack-plugin\//,
 		alias: pkgDir
 	});
 	else {
 		alias["@mpxjs/webpack-plugin"] = pkgDir;
 		alias["@mpxjs/webpack-plugin$"] = pkgDir;
+		alias["@mpxjs/webpack-plugin/lib/record-loader"] = recordLoader;
+		alias["@mpxjs/webpack-plugin/lib/style-compiler/index"] = styleCompiler;
+		alias["@mpxjs/webpack-plugin/lib/style-compiler/strip-conditional-loader"] = stripConditionalLoader;
 	}
 }
 function ensureResolveLoaderAlias(compiler, mpxWebpackPluginDir) {
@@ -71,18 +98,48 @@ function ensureResolveLoaderAlias(compiler, mpxWebpackPluginDir) {
 	compiler.options.resolveLoader.alias = alias;
 	addMpxWebpackPluginAlias(alias, mpxWebpackPluginDir);
 }
+function resolveMpxWebpackPluginRequire(compiler) {
+	const candidates = [
+		compiler?.context,
+		compiler?.options?.context,
+		process.cwd()
+	].filter((item) => typeof item === "string" && item.length > 0);
+	for (const candidate of candidates) try {
+		const projectRequire = createRequire(path.join(candidate, "package.json"));
+		projectRequire.resolve("@mpxjs/webpack-plugin/package.json");
+		return projectRequire;
+	} catch {}
+	const cachedPackageJson = Object.keys(localRequire.cache).find((file) => MPX_WEBPACK_PLUGIN_PACKAGE_RE.test(file));
+	if (cachedPackageJson) return createRequire(cachedPackageJson);
+	return localRequire;
+}
+function patchMpxWebpackPluginNormalizeLib(compiler, mpxWebpackPluginDir) {
+	if (!mpxWebpackPluginDir) return false;
+	const projectRequire = resolveMpxWebpackPluginRequire(compiler);
+	let normalize;
+	try {
+		normalize = projectRequire("@mpxjs/webpack-plugin/lib/utils/normalize");
+	} catch {
+		return false;
+	}
+	if (typeof normalize.lib !== "function") return false;
+	if (normalize.lib.__weappTwPatched) return true;
+	const wrappedLib = (file) => path.join(mpxWebpackPluginDir, "lib", file);
+	wrappedLib.__weappTwPatched = true;
+	wrappedLib.__weappTwOriginal = normalize.lib;
+	normalize.lib = wrappedLib;
+	return true;
+}
 function ensureMpxTailwindcssAliases(compiler, pkgDir) {
 	const tailwindcssCssEntry = getTailwindcssCssEntry(pkgDir);
 	compiler.options = compiler.options || {};
 	compiler.options.resolve = compiler.options.resolve || {};
 	const mpxWebpackPluginDir = resolveMpxWebpackPluginDir(compiler);
-	ensureResolveLoaderAlias(compiler, mpxWebpackPluginDir);
+	patchMpxWebpackPluginNormalizeLib(compiler, mpxWebpackPluginDir);
+	if (mpxWebpackPluginDir) 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
 	}, {
@@ -90,11 +147,10 @@ function ensureMpxTailwindcssAliases(compiler, pkgDir) {
 		alias: tailwindcssCssEntry
 	});
 	else {
-		alias["@mpxjs/webpack-plugin"] = mpxWebpackPluginDir;
-		alias["@mpxjs/webpack-plugin$"] = mpxWebpackPluginDir;
 		alias.tailwindcss = tailwindcssCssEntry;
 		alias.tailwindcss$ = tailwindcssCssEntry;
 	}
+	if (mpxWebpackPluginDir) addMpxWebpackPluginAlias(alias, mpxWebpackPluginDir);
 	return tailwindcssCssEntry;
 }
 function patchMpxLoaderResolve(loaderContext, pkgDir, enabled) {
@@ -102,10 +158,11 @@ function patchMpxLoaderResolve(loaderContext, pkgDir, enabled) {
 	const originalResolve = loaderContext.resolve;
 	if (originalResolve.__weappTwPatched) return;
 	const tailwindcssCssEntry = getTailwindcssCssEntry(pkgDir);
+	const mpxWebpackPluginDir = resolveMpxWebpackPluginDir(loaderContext);
 	const wrappedResolve = function(context, request, callback) {
 		if (request === "tailwindcss" || request === "tailwindcss$") return callback(null, tailwindcssCssEntry);
 		if (request?.startsWith("tailwindcss/")) return callback(null, path.join(pkgDir, request.slice(12)));
-		if (isMpxWebpackPluginRequest(request)) return originalResolve.call(this, process.cwd(), request, callback);
+		if (mpxWebpackPluginDir && isMpxWebpackPluginRequest(request)) return callback(null, resolveMpxWebpackPluginRequest(request, mpxWebpackPluginDir));
 		return originalResolve.call(this, context, request, callback);
 	};
 	wrappedResolve.__weappTwPatched = true;
@@ -141,16 +198,13 @@ function getCacheKey(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;
+	return stripRequestQuery(resource);
 }
 function isCssLikeModuleResource(resource, cssMatcher, appType) {
 	if (typeof resource !== "string") return false;
 	const normalizedResource = stripResourceQuery(resource);
 	if (normalizedResource && cssMatcher(normalizedResource)) return true;
+	if (isSourceStyleRequest(resource)) return true;
 	if (appType === "mpx") return MPX_STYLE_RESOURCE_QUERY_RE.test(resource);
 	return false;
 }
@@ -158,6 +212,13 @@ function hasLoaderEntry(entries, target) {
 	if (!target) return false;
 	return entries.some((entry) => entry.loader?.includes?.(target));
 }
+function normalizeWatchPath(file) {
+	return path.resolve(file);
+}
+function isFileInContext(file, context) {
+	const relative = path.relative(normalizeWatchPath(context), normalizeWatchPath(file));
+	return relative.length > 0 && !relative.startsWith("..") && !path.isAbsolute(relative);
+}
 function toChunkFiles(files) {
 	if (!files) return [];
 	if (Array.isArray(files)) return files;
@@ -186,17 +247,38 @@ function createAssetHashByChunkMap(chunks) {
 function createRuntimeAwareCssHash(assetHash, sourceHash, runtimeSetHash) {
 	return `${assetHash ?? sourceHash}:${runtimeSetHash}`;
 }
-function hasWatchChanges(compiler) {
-	return (compiler.modifiedFiles?.size ?? 0) > 0 || (compiler.removedFiles?.size ?? 0) > 0;
+function isWatchFileInRuntimeDependencies(file, dependencies) {
+	const normalizedFile = normalizeWatchPath(file);
+	for (const dependency of dependencies.files ?? []) if (normalizeWatchPath(dependency) === normalizedFile) return true;
+	for (const context of dependencies.contexts ?? []) if (isFileInContext(normalizedFile, context)) return true;
+	return false;
 }
 //#endregion
 //#region src/bundlers/webpack/BaseUnifiedPlugin/v5-assets.ts
+function createWebpackSnapshotAssets(assets) {
+	return Object.fromEntries(Object.entries(assets).map(([file, asset]) => {
+		const source = asset.source();
+		return [file, {
+			fileName: file,
+			source: typeof source === "string" ? source : source?.toString() ?? "",
+			type: "asset"
+		}];
+	}));
+}
+function stringifyWebpackSource(source) {
+	if (typeof source === "string") return source;
+	return source?.toString() ?? "";
+}
 function setupWebpackV5ProcessAssetsHook(options) {
-	const { compiler, options: compilerOptions, appType, runtimeState, getRuntimeRefreshRequirement, refreshRuntimeMetadata, consumeRuntimeRefreshRequirement, debug } = options;
+	const { compiler, options: compilerOptions, appType, runtimeState, getRuntimeRefreshRequirement, refreshRuntimeMetadata, isWebpackProcessedCssAsset, consumeRuntimeRefreshRequirement, isWatchMode, runtimeClassSetManager, debug } = options;
 	const { Compilation, sources } = compiler.webpack;
 	const { ConcatSource } = sources;
+	const isWebGeneratorTarget = compilerOptions.generator?.target === "web";
 	const cssHandlerOptionsCache = /* @__PURE__ */ new Map();
 	const cssUserHandlerOptionsCache = /* @__PURE__ */ new Map();
+	const bundleBuildState = createBundleBuildState();
+	const bundleRuntimeClassSetManager = runtimeClassSetManager ?? createBundleRuntimeClassSetManager();
+	let webpackWatchRuntimeScanInitialized = false;
 	compiler.hooks.compilation.tap(pluginName, (compilation) => {
 		compilation.hooks.processAssets.tapPromise({
 			name: pluginName,
@@ -205,8 +287,25 @@ function setupWebpackV5ProcessAssetsHook(options) {
 			compilerOptions.onStart();
 			debug("start");
 			await runtimeState.readyPromise;
+			const hmrTimingStartedAt = performance.now();
 			for (const chunk of compilation.chunks) if (chunk.id && chunk.hash) compilerOptions.cache.calcHashValueChanged(chunk.id, chunk.hash);
 			const assetHashByChunk = createAssetHashByChunkMap(compilation.chunks);
+			const getCurrentAssetSource = (file) => {
+				const asset = compilation.getAsset(file);
+				if (!asset) return;
+				return stringifyWebpackSource(asset.source.source());
+			};
+			const updateAssetIfChanged = (file, source, { notifyUpdate = true } = {}) => {
+				const nextSource = stringifyWebpackSource(source.source());
+				const previousSource = getCurrentAssetSource(file);
+				if (previousSource === nextSource) {
+					debug("asset unchanged, skip update: %s", file);
+					return false;
+				}
+				compilation.updateAsset(file, source);
+				if (notifyUpdate) compilerOptions.onUpdate(file, previousSource ?? "", nextSource);
+				return true;
+			};
 			const entries = Object.entries(assets);
 			const compilerOutputPath = compilation.compiler?.outputPath ?? compiler.outputPath;
 			const outputDir = compilerOutputPath ? path.resolve(compilerOutputPath) : compilation.outputOptions?.path ?? process.cwd();
@@ -239,12 +338,8 @@ function setupWebpackV5ProcessAssetsHook(options) {
 					const asset = compilation.getAsset(assetName);
 					if (!asset) continue;
 					const previousSource = asset.source.source();
-					const previous = typeof previousSource === "string" ? previousSource : previousSource.toString();
-					if (previous === code) continue;
-					const source = new ConcatSource(code);
-					compilation.updateAsset(assetName, source);
-					compilerOptions.onUpdate(assetName, previous, code);
-					debug("js linked handle: %s", assetName);
+					if ((typeof previousSource === "string" ? previousSource : previousSource.toString()) === code) continue;
+					if (updateAssetIfChanged(assetName, new ConcatSource(code))) debug("js linked handle: %s", assetName);
 				}
 			};
 			const groupedEntries = getGroupedEntries(entries, compilerOptions);
@@ -257,7 +352,7 @@ function setupWebpackV5ProcessAssetsHook(options) {
 				const created = {
 					isMainChunk,
 					postcssOptions: { options: { from: file } },
-					majorVersion
+					...majorVersion === void 0 ? {} : { majorVersion }
 				};
 				cssHandlerOptionsCache.set(cacheKey, created);
 				return created;
@@ -273,21 +368,51 @@ function setupWebpackV5ProcessAssetsHook(options) {
 				cssUserHandlerOptionsCache.set(cacheKey, created);
 				return created;
 			};
+			const finalizeCssAssetSource = (source) => {
+				return removeTailwindSourceDirectives(stripBundlerGeneratedCssMarkers(source), { importFallback: true });
+			};
 			const forceRuntimeRefresh = getRuntimeRefreshRequirement();
 			debug("processAssets ensure runtime set forceRefresh=%s major=%s", forceRuntimeRefresh, runtimeState.twPatcher.majorVersion ?? "unknown");
-			const runtimeSet = await ensureRuntimeClassSet(runtimeState, {
-				forceRefresh: forceRuntimeRefresh,
-				forceCollect: true,
-				clearCache: forceRuntimeRefresh,
-				allowEmpty: false
-			});
+			let runtimeSet;
+			const watchMode = isWatchMode?.() === true;
+			if (watchMode && runtimeState.twPatcher.majorVersion === 4 && !forceRuntimeRefresh) {
+				const snapshot = buildBundleSnapshot(createWebpackSnapshotAssets(assets), compilerOptions, outputDir, bundleBuildState);
+				if (!webpackWatchRuntimeScanInitialized) {
+					for (const entry of snapshot.entries) if (entry.type === "html" || entry.type === "js") snapshot.runtimeAffectingChangedByType[entry.type].add(entry.file);
+				}
+				try {
+					runtimeSet = await bundleRuntimeClassSetManager.sync(runtimeState.twPatcher, snapshot);
+				} catch (error) {
+					debug("webpack incremental runtime set sync failed, fallback to full collect: %O", error);
+					await bundleRuntimeClassSetManager.reset();
+					runtimeSet = await ensureRuntimeClassSet(runtimeState, {
+						forceRefresh: false,
+						forceCollect: true,
+						clearCache: false,
+						allowEmpty: false
+					});
+				}
+				updateBundleBuildState(bundleBuildState, snapshot, /* @__PURE__ */ new Map(), { incremental: true });
+				webpackWatchRuntimeScanInitialized = true;
+			} else {
+				if (forceRuntimeRefresh) {
+					await bundleRuntimeClassSetManager.reset();
+					webpackWatchRuntimeScanInitialized = false;
+				}
+				runtimeSet = await ensureRuntimeClassSet(runtimeState, {
+					forceRefresh: forceRuntimeRefresh,
+					forceCollect: !watchMode || forceRuntimeRefresh,
+					clearCache: forceRuntimeRefresh,
+					allowEmpty: false
+				});
+			}
 			await refreshRuntimeMetadata(forceRuntimeRefresh);
 			consumeRuntimeRefreshRequirement();
 			const runtimeSetHash = compilerOptions.cache.computeHash([getRuntimeClassSetSignature(runtimeState.twPatcher), [...runtimeSet].sort().join("\n")].join("\n\n"));
 			const defaultTemplateHandlerOptions = { runtimeSet };
 			debug("get runtimeSet, class count: %d", runtimeSet.size);
 			const tasks = [];
-			if (Array.isArray(groupedEntries.html)) for (const element of groupedEntries.html) {
+			if (!isWebGeneratorTarget && Array.isArray(groupedEntries.html)) for (const element of groupedEntries.html) {
 				const [file, originalSource] = element;
 				const rawSource = originalSource.source().toString();
 				const cacheKey = file;
@@ -298,23 +423,21 @@ function setupWebpackV5ProcessAssetsHook(options) {
 					hashKey: `${file}:asset`,
 					rawSource,
 					hash: chunkHash,
-					applyResult(source) {
-						compilation.updateAsset(file, source);
+					applyResult(source, { cacheHit }) {
+						updateAssetIfChanged(file, source, { notifyUpdate: !cacheHit });
 					},
 					onCacheHit() {
 						debug("html cache hit: %s", file);
 					},
 					transform: async () => {
-						const wxml = await compilerOptions.templateHandler(rawSource, defaultTemplateHandlerOptions);
-						const source = new ConcatSource(wxml);
-						compilerOptions.onUpdate(file, rawSource, wxml);
+						const source = new ConcatSource(await compilerOptions.templateHandler(rawSource, defaultTemplateHandlerOptions));
 						debug("html handle: %s", file);
 						return { result: source };
 					}
 				}));
 			}
 			const jsTaskFactories = [];
-			if (Array.isArray(groupedEntries.js)) for (const [file] of groupedEntries.js) {
+			if (!isWebGeneratorTarget && Array.isArray(groupedEntries.js)) for (const [file] of groupedEntries.js) {
 				const cacheKey = getCacheKey(file);
 				const asset = compilation.getAsset(file);
 				if (!asset) continue;
@@ -329,8 +452,8 @@ function setupWebpackV5ProcessAssetsHook(options) {
 						hashKey: `${file}:asset`,
 						rawSource: initialRawSource,
 						hash: chunkHash,
-						applyResult(source) {
-							compilation.updateAsset(file, source);
+						applyResult(source, { cacheHit }) {
+							updateAssetIfChanged(file, source, { notifyUpdate: !cacheHit });
 						},
 						onCacheHit() {
 							debug("js cache hit: %s", file);
@@ -344,10 +467,12 @@ function setupWebpackV5ProcessAssetsHook(options) {
 								moduleGraph: moduleGraphOptions,
 								babelParserOptions: { sourceFilename: absoluteFile }
 							};
-							if (shouldSkipJsTransform(currentSource, handlerOptions)) return { result: new ConcatSource(currentSource) };
+							if (shouldSkipJsTransform(currentSource, {
+								...handlerOptions,
+								classNameSet: runtimeSet
+							})) return { result: new ConcatSource(currentSource) };
 							const { code, linked } = await compilerOptions.jsHandler(currentSource, runtimeSet, handlerOptions);
 							const source = new ConcatSource(code);
-							compilerOptions.onUpdate(file, currentSource, code);
 							debug("js handle: %s", file);
 							applyLinkedResults(linked);
 							return { result: source };
@@ -358,6 +483,27 @@ function setupWebpackV5ProcessAssetsHook(options) {
 			if (Array.isArray(groupedEntries.css)) for (const element of groupedEntries.css) {
 				const [file, originalSource] = element;
 				const rawSource = originalSource.source().toString();
+				if (isWebpackProcessedCssAsset?.(file, rawSource)) {
+					const nextCss = finalizeCssAssetSource(rawSource);
+					tasks.push(processCachedTask({
+						cache: compilerOptions.cache,
+						cacheKey: file,
+						hashKey: `${file}:asset`,
+						rawSource,
+						hash: createRuntimeAwareCssHash(assetHashByChunk.get(file), compilerOptions.cache.computeHash(rawSource), runtimeSetHash),
+						applyResult(source, { cacheHit }) {
+							updateAssetIfChanged(file, source, { notifyUpdate: !cacheHit });
+						},
+						onCacheHit() {
+							debug("css webpack-loader-pipeline cache hit: %s", file);
+						},
+						transform: async () => {
+							debug("css skip webpack-loader-pipeline asset: %s", file);
+							return { result: new ConcatSource(nextCss) };
+						}
+					}));
+					continue;
+				}
 				const cacheKey = file;
 				const runtimeAwareHash = createRuntimeAwareCssHash(assetHashByChunk.get(file), compilerOptions.cache.computeHash(rawSource), runtimeSetHash);
 				tasks.push(processCachedTask({
@@ -366,8 +512,8 @@ function setupWebpackV5ProcessAssetsHook(options) {
 					hashKey: `${file}:asset`,
 					rawSource,
 					hash: runtimeAwareHash,
-					applyResult(source) {
-						compilation.updateAsset(file, source);
+					applyResult(source, { cacheHit }) {
+						updateAssetIfChanged(file, source, { notifyUpdate: !cacheHit });
 					},
 					onCacheHit() {
 						debug("css cache hit: %s", file);
@@ -386,9 +532,7 @@ function setupWebpackV5ProcessAssetsHook(options) {
 							styleHandler: compilerOptions.styleHandler,
 							debug
 						});
-						const css = generated?.css ?? (await compilerOptions.styleHandler(rawSource, cssHandlerOptions)).css;
-						const source = new ConcatSource(css);
-						compilerOptions.onUpdate(file, rawSource, css);
+						const source = new ConcatSource(finalizeCssAssetSource(generated?.css ?? (await compilerOptions.styleHandler(rawSource, cssHandlerOptions)).css));
 						if (generated) debug("css handle via tailwind v%s engine(%s): %s", runtimeState.twPatcher.majorVersion, generated.target, file);
 						else debug("css handle: %s", file);
 						return { result: source };
@@ -398,16 +542,24 @@ function setupWebpackV5ProcessAssetsHook(options) {
 			pushConcurrentTaskFactories(tasks, jsTaskFactories);
 			await Promise.all(tasks);
 			debug("end");
+			emitHmrTiming("webpack", "processAssets", performance.now() - hmrTimingStartedAt);
 			compilerOptions.onEnd();
 		});
 	});
 }
 //#endregion
-//#region ../../node_modules/.pnpm/tsdown@0.22.0_tsx@4.21.0_typescript@6.0.3_unrun@0.2.37_synckit@0.11.12__vue-tsc@3.2.8_typescript@6.0.3_/node_modules/tsdown/esm-shims.js
+//#region ../../node_modules/.pnpm/tsdown@0.22.1_oxc-resolver@11.20.0_tsx@4.22.4_typescript@6.0.3_unrun@0.2.37_synckit@0.1_af1474666acd5eae3876d23fc3fbcf5c/node_modules/tsdown/esm-shims.js
 const getFilename = () => fileURLToPath(import.meta.url);
 const getDirname = () => path.dirname(getFilename());
 const __dirname = /* @__PURE__ */ getDirname();
 //#endregion
+//#region src/bundlers/webpack/loaders/runtime-registry.ts
+const runtimeRegistryHolder = globalThis;
+const runtimeRegistry = runtimeRegistryHolder.__WEAPP_TW_WEBPACK_LOADER_RUNTIME_REGISTRY__ ?? (runtimeRegistryHolder.__WEAPP_TW_WEBPACK_LOADER_RUNTIME_REGISTRY__ = /* @__PURE__ */ new Map());
+function setWebpackLoaderRuntime(key, entry) {
+	runtimeRegistry.set(key, entry);
+}
+//#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";
@@ -438,7 +590,7 @@ function createLoaderAnchorFinders(appType) {
 //#endregion
 //#region src/bundlers/webpack/BaseUnifiedPlugin/v5-loaders.ts
 function setupWebpackV5Loaders(options) {
-	const { compiler, options: compilerOptions, appType, weappTailwindcssPackageDir, shouldRewriteCssImports, runtimeLoaderPath, registerAutoCssSource, getClassSetInLoader, getRuntimeWatchDependencies, debug } = options;
+	const { compiler, options: compilerOptions, appType, weappTailwindcssPackageDir, shouldRewriteCssImports, runtimeLoaderPath, registerAutoCssSource, runtimeState, getClassSetInLoader, getRuntimeSetInLoader, markWebpackProcessedCssSource, getRuntimeWatchDependencies, runtimeRegistryKey = `weapp-tailwindcss-${Date.now()}-${Math.random().toString(36).slice(2)}`, debug } = options;
 	const isMpxApp = isMpx(appType);
 	if (shouldRewriteCssImports && isMpxApp) ensureMpxTailwindcssAliases(compiler, weappTailwindcssPackageDir);
 	const runtimeClassSetLoader = runtimeLoaderPath ?? path.resolve(__dirname, "./weapp-tw-runtime-classset-loader.js");
@@ -447,24 +599,31 @@ function setupWebpackV5Loaders(options) {
 	const runtimeCssImportRewriteLoaderExists = runtimeCssImportRewriteLoader ? fs.existsSync(runtimeCssImportRewriteLoader) : false;
 	const runtimeLoaderRewriteOptions = shouldRewriteCssImports ? {
 		pkgDir: weappTailwindcssPackageDir,
-		appType,
-		registerCssSource: registerAutoCssSource
+		compilerOptions,
+		runtimeState,
+		...appType === void 0 ? {} : { appType },
+		...registerAutoCssSource === void 0 ? {} : { registerCssSource: registerAutoCssSource },
+		getRuntimeSet: getRuntimeSetInLoader,
+		...markWebpackProcessedCssSource === void 0 ? {} : { markGeneratedCssSource: markWebpackProcessedCssSource }
 	} : void 0;
-	const classSetLoaderOptions = {
-		getClassSet: getClassSetInLoader,
-		getWatchDependencies: getRuntimeWatchDependencies
-	};
+	setWebpackLoaderRuntime(runtimeRegistryKey, {
+		classSet: {
+			getClassSet: getClassSetInLoader,
+			getWatchDependencies: getRuntimeWatchDependencies
+		},
+		...runtimeLoaderRewriteOptions === void 0 ? {} : { cssImportRewrite: runtimeLoaderRewriteOptions }
+	});
 	const { findRewriteAnchor, findClassSetAnchor } = createLoaderAnchorFinders(appType);
-	const cssImportRewriteLoaderOptions = runtimeLoaderRewriteOptions ? { tailwindcssImportRewrite: runtimeLoaderRewriteOptions } : void 0;
+	const cssImportRewriteLoaderOptions = runtimeLoaderRewriteOptions ? { tailwindcssImportRewriteRuntimeKey: runtimeRegistryKey } : void 0;
 	if (runtimeCssImportRewriteLoader && shouldRewriteCssImports && cssImportRewriteLoaderOptions && isMpxApp) injectMpxCssRewritePreRules(compiler, runtimeCssImportRewriteLoader, cssImportRewriteLoaderOptions);
 	const createRuntimeClassSetLoaderEntry = () => ({
 		loader: runtimeClassSetLoader,
-		options: classSetLoaderOptions,
+		options: { weappTailwindcssRuntimeKey: runtimeRegistryKey },
 		ident: null,
 		type: null
 	});
 	const createCssImportRewriteLoaderEntry = () => {
-		if (!runtimeCssImportRewriteLoader) return null;
+		if (!runtimeCssImportRewriteLoader || !cssImportRewriteLoaderOptions) return null;
 		return {
 			loader: runtimeCssImportRewriteLoader,
 			options: cssImportRewriteLoaderOptions,
@@ -481,15 +640,15 @@ function setupWebpackV5Loaders(options) {
 			let rewriteAnchorIdx = findRewriteAnchor(loaderEntries);
 			const classSetAnchorIdx = findClassSetAnchor(loaderEntries);
 			const isCssModule = isCssLikeModuleResource(module.resource, compilerOptions.cssMatcher, appType);
-			if (process.env.WEAPP_TW_LOADER_DEBUG && isCssModule) debug("loader hook css module: %s loaders=%o anchors=%o", module.resource, loaderEntries.map((x) => x.loader), {
+			if (process.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
 			});
-			if (process.env.WEAPP_TW_LOADER_DEBUG && typeof module.resource === "string" && module.resource.includes("app.css")) debug("app.css module loaders=%o anchors=%o", loaderEntries.map((x) => x.loader), {
+			if (process.env["WEAPP_TW_LOADER_DEBUG"] && typeof module.resource === "string" && module.resource.includes("app.css")) debug("app.css module loaders=%o anchors=%o", loaderEntries.map((x) => x.loader), {
 				rewriteAnchorIdx,
 				classSetAnchorIdx
 			});
-			else if (process.env.WEAPP_TW_LOADER_DEBUG && typeof module.resource === "string" && module.resource.endsWith(".css")) debug("css module seen: %s loaders=%o anchors=%o", module.resource, loaderEntries.map((x) => x.loader), {
+			else if (process.env["WEAPP_TW_LOADER_DEBUG"] && typeof module.resource === "string" && module.resource.endsWith(".css")) debug("css module seen: %s loaders=%o anchors=%o", module.resource, loaderEntries.map((x) => x.loader), {
 				rewriteAnchorIdx,
 				classSetAnchorIdx
 			});
@@ -522,14 +681,66 @@ function setupWebpackV5Loaders(options) {
 }
 //#endregion
 //#region src/bundlers/webpack/BaseUnifiedPlugin/v5.ts
+init_defineProperty();
 const debug = createDebug();
 const weappTailwindcssPackageDir = resolvePackageDir("weapp-tailwindcss");
+const outputIgnoredPredicatePath = Symbol("weapp-tailwindcss.outputIgnoredPredicatePath");
+function normalizeIgnoredList(ignored) {
+	if (Array.isArray(ignored)) return ignored.filter((item) => typeof item === "string" || item instanceof RegExp || typeof item === "function");
+	if (typeof ignored === "string" || ignored instanceof RegExp || typeof ignored === "function") return [ignored];
+	return [];
+}
+function createOutputIgnoredPredicate(ignoredList, ignoredPath) {
+	const predicate = (file) => {
+		const resolvedFile = path.resolve(file);
+		if (resolvedFile === ignoredPath || resolvedFile.startsWith(`${ignoredPath}${path.sep}`)) return true;
+		const normalizedFile = file.replace(/\\/g, "/");
+		return ignoredList.some((item) => {
+			if (typeof item === "string") {
+				const resolvedItem = path.resolve(item);
+				if (resolvedFile === resolvedItem || resolvedFile.startsWith(`${resolvedItem}${path.sep}`)) return true;
+				return micromatch.isMatch(normalizedFile, item);
+			}
+			if (item instanceof RegExp) return item.test(normalizedFile);
+			return item(file);
+		});
+	};
+	predicate[outputIgnoredPredicatePath] = ignoredPath;
+	return predicate;
+}
+function appendIgnoredPath(ignored, ignoredPath) {
+	if (typeof ignored === "function" && ignored[outputIgnoredPredicatePath] === ignoredPath) return ignored;
+	const ignoredList = normalizeIgnoredList(ignored);
+	if (ignoredList.some((item) => typeof item !== "string")) return createOutputIgnoredPredicate(ignoredList, ignoredPath);
+	if (ignoredList.some((item) => typeof item === "string" && path.resolve(item) === ignoredPath)) return ignored;
+	return [...ignoredList, ignoredPath];
+}
+function setupWebpackWatchOutputIgnore(compiler) {
+	const appendOutputIgnoredPath = (watchOptions) => {
+		const outputPath = compiler.outputPath || compiler.options?.output?.path;
+		const outputDir = outputPath ? path.resolve(outputPath) : void 0;
+		if (!outputDir) return watchOptions;
+		if (watchOptions && typeof watchOptions === "object") {
+			watchOptions.ignored = appendIgnoredPath(watchOptions.ignored, outputDir);
+			return watchOptions;
+		}
+		return { ignored: appendIgnoredPath(void 0, outputDir) };
+	};
+	compiler.options.watchOptions = appendOutputIgnoredPath(compiler.options.watchOptions);
+	const syncOutputIgnoredPath = () => {
+		const outputPath = compiler.outputPath || compiler.options?.output?.path;
+		if (!(outputPath ? path.resolve(outputPath) : void 0)) return;
+		const watchOptions = compiler.watching?.watchOptions;
+		if (watchOptions) appendOutputIgnoredPath(watchOptions);
+	};
+	compiler.hooks.watchRun?.tap(pluginName, syncOutputIgnoredPath);
+}
 /**
-* @name UnifiedWebpackPluginV5
+* @name WeappTailwindcss
 * @description webpack5 核心转义插件
 * @link https://tw.icebreaker.top/docs/intro
 */
-var UnifiedWebpackPluginV5 = class {
+var WeappTailwindcss = class {
 	constructor(options = {}) {
 		_defineProperty(this, "options", void 0);
 		_defineProperty(this, "appType", void 0);
@@ -545,10 +756,13 @@ var UnifiedWebpackPluginV5 = class {
 		compiler.options = compiler.options || {};
 		const { disabled, onLoad, runtimeLoaderPath, twPatcher: initialTwPatcher, refreshTailwindcssPatcher } = this.options;
 		const disabledOptions = resolvePluginDisabledState(disabled);
-		const shouldRewriteCssImports = (initialTwPatcher.majorVersion ?? 0) >= 4;
+		const isTailwindcssV4 = (initialTwPatcher.majorVersion ?? 0) >= 4;
+		const generatorOptions = normalizeWeappTailwindcssGeneratorOptions(this.options.generator);
+		const shouldRewriteCssImports = isTailwindcssV4 || generatorOptions.target === "web";
 		const isMpxApp = isMpx(this.appType);
 		if (shouldRewriteCssImports) setupMpxTailwindcssRedirect(weappTailwindcssPackageDir, isMpxApp);
 		if (disabledOptions.plugin) return;
+		setupWebpackWatchOutputIgnore(compiler);
 		const runtimeState = {
 			twPatcher: initialTwPatcher,
 			readyPromise: createTailwindRuntimeReadyPromise(initialTwPatcher),
@@ -557,8 +771,10 @@ var UnifiedWebpackPluginV5 = class {
 		let runtimeSetPrepared = false;
 		let runtimeSetSignature;
 		let runtimeRefreshRequiredForCompilation = false;
+		let watchRunObserved = false;
 		const runtimeWatchDependencyFiles = /* @__PURE__ */ new Set();
 		const runtimeWatchDependencyContexts = /* @__PURE__ */ new Set();
+		const webpackProcessedCssSourceFiles = /* @__PURE__ */ new Set();
 		let runtimeMetadataPrepared = false;
 		const updateRuntimeWatchDependencies = async () => {
 			runtimeWatchDependencyFiles.clear();
@@ -585,12 +801,24 @@ var UnifiedWebpackPluginV5 = class {
 			await updateRuntimeWatchDependencies();
 			runtimeMetadataPrepared = true;
 		};
-		const syncRuntimeRefreshRequirement = () => {
-			runtimeRefreshRequiredForCompilation = runtimeRefreshRequiredForCompilation || hasWatchChanges(compiler);
+		const collectWatchChangedFiles = () => {
+			const compilerLike = compiler;
+			return new Set([...compilerLike.modifiedFiles ?? [], ...compilerLike.removedFiles ?? []]);
+		};
+		const hasRuntimeDependencyChanges = (files) => {
+			for (const file of files) if (isWatchFileInRuntimeDependencies(file, {
+				contexts: runtimeWatchDependencyContexts,
+				files: runtimeWatchDependencyFiles
+			})) return true;
+			return false;
+		};
+		const syncRuntimeRefreshRequirement = (markWatchRun = false) => {
+			if (markWatchRun) watchRunObserved = true;
+			const changedFiles = collectWatchChangedFiles();
+			runtimeRefreshRequiredForCompilation = runtimeRefreshRequiredForCompilation || hasRuntimeDependencyChanges(changedFiles);
 		};
 		const resetRuntimePreparation = () => {
 			runtimeSetPrepared = false;
-			runtimeMetadataPrepared = false;
 			syncRuntimeRefreshRequirement();
 		};
 		const registerAutoCssSource = async (source) => {
@@ -605,10 +833,14 @@ var UnifiedWebpackPluginV5 = class {
 			});
 			debug("detected tailwindcss v4 css source from webpack css module: %s", source.file);
 		};
-		compiler.hooks.invalid?.tap?.(pluginName, () => {
-			runtimeRefreshRequiredForCompilation = true;
+		const markWebpackProcessedCssSource = (file) => {
+			webpackProcessedCssSourceFiles.add(path.resolve(file));
+		};
+		compiler.hooks.invalid?.tap?.(pluginName, (fileName) => {
+			if (!fileName) return;
+			runtimeRefreshRequiredForCompilation = runtimeRefreshRequiredForCompilation || hasRuntimeDependencyChanges([path.resolve(fileName)]);
 		});
-		compiler.hooks.watchRun?.tap?.(pluginName, syncRuntimeRefreshRequirement);
+		compiler.hooks.watchRun?.tap?.(pluginName, () => syncRuntimeRefreshRequirement(true));
 		if (compiler.hooks.thisCompilation?.tap) compiler.hooks.thisCompilation.tap(pluginName, resetRuntimePreparation);
 		else if (compiler.hooks.compilation?.tap) compiler.hooks.compilation.tap(pluginName, resetRuntimePreparation);
 		async function getClassSetInLoader() {
@@ -619,7 +851,7 @@ var UnifiedWebpackPluginV5 = class {
 			runtimeSetPrepared = true;
 			await ensureRuntimeClassSet(runtimeState, {
 				forceRefresh,
-				forceCollect: true,
+				forceCollect: forceRefresh || !watchRunObserved,
 				clearCache: forceRefresh,
 				allowEmpty: true
 			});
@@ -627,6 +859,10 @@ var UnifiedWebpackPluginV5 = class {
 			runtimeSetSignature = signature;
 			runtimeRefreshRequiredForCompilation = false;
 		}
+		async function getRuntimeSetInLoader() {
+			await getClassSetInLoader();
+			return ensureRuntimeClassSet(runtimeState, { allowEmpty: true });
+		}
 		onLoad();
 		setupWebpackV5Loaders({
 			compiler,
@@ -636,7 +872,10 @@ var UnifiedWebpackPluginV5 = class {
 			shouldRewriteCssImports,
 			runtimeLoaderPath,
 			registerAutoCssSource,
+			runtimeState,
 			getClassSetInLoader,
+			getRuntimeSetInLoader,
+			markWebpackProcessedCssSource,
 			getRuntimeWatchDependencies() {
 				return {
 					files: runtimeWatchDependencyFiles,
@@ -652,12 +891,17 @@ var UnifiedWebpackPluginV5 = class {
 			runtimeState,
 			getRuntimeRefreshRequirement: () => runtimeRefreshRequiredForCompilation,
 			refreshRuntimeMetadata: ensureRuntimeMetadata,
+			isWebpackProcessedCssAsset(file, rawSource) {
+				return webpackProcessedCssSourceFiles.has(path.resolve(file)) || rawSource.includes("weapp-tailwindcss webpack-generated-css");
+			},
 			consumeRuntimeRefreshRequirement() {
 				runtimeRefreshRequiredForCompilation = false;
 			},
+			isWatchMode: () => watchRunObserved || compiler.options?.watch === true,
+			runtimeClassSetManager: this.options.__internalWebpackRuntimeClassSetManager,
 			debug
 		});
 	}
 };
 //#endregion
-export { weappTailwindcssPackageDir as n, UnifiedWebpackPluginV5 as t };
+export { weappTailwindcssPackageDir as n, WeappTailwindcss as t };