weapp-tailwindcss 5.0.6 → 5.0.8

package/dist/{webpack-CMJ7iqN7.mjs → webpack-CqnI4Ymw.mjs}

@@ -1,13 +1,13 @@
-import { M as removeTailwindSourceDirectives, l as getRuntimeClassSetSignature, lt as createDebug, pt as resolveTailwindcssOptions } from "./v3-engine-Ji6AXPh2.mjs";
-import { i as normalizeWeappTailwindcssGeneratorOptions } from "./generator-Bgn4m8An.mjs";
-import { b as refreshTailwindRuntimeState, d as _defineProperty, i as pluginName, n as getCompilerContext, t as shouldSkipJsTransform, v as createTailwindRuntimeReadyPromise, y as ensureRuntimeClassSet } from "./precheck-Copn2SqE.mjs";
+import { M as removeTailwindSourceDirectives, l as getRuntimeClassSetSignature, lt as createDebug, m as resolveViteSourceScanEntries, pt as resolveTailwindcssOptions } from "./v3-engine-ArQVHEau.mjs";
+import { i as normalizeWeappTailwindcssGeneratorOptions } from "./generator-DnwUQOXB.mjs";
+import { b as refreshTailwindRuntimeState, d as _defineProperty, i as pluginName, n as getCompilerContext, t as shouldSkipJsTransform, v as createTailwindRuntimeReadyPromise, y as ensureRuntimeClassSet } from "./precheck-CcxTR7E_.mjs";
 import { r as getGroupedEntries } from "./utils-DsaS975I.mjs";
-import { c as hasConfiguredTailwindV4CssRoots, l as upsertTailwindV4CssSource } from "./tailwindcss-C0Zgo3Es.mjs";
-import { i as generateCssByGenerator, r as emitHmrTiming, s as processCachedTask, t as createBundleRuntimeClassSetManager } from "./incremental-runtime-class-set-BEYHQkZc.mjs";
-import { C as toAbsoluteOutputPath, S as resolveOutputSpecifier, b as stripRequestQuery, d as stripBundlerGeneratedCssMarkers, f as resolvePackageDir, n as createBundleBuildState, p as resolvePluginDisabledState, r as updateBundleBuildState, s as pushConcurrentTaskFactories, t as buildBundleSnapshot, y as isSourceStyleRequest } from "./bundle-state-CdNXQl-o.mjs";
+import { c as hasConfiguredTailwindV4CssRoots, l as upsertTailwindV4CssSource } from "./tailwindcss-0DaftXcU.mjs";
+import { _ as isCssSourceTraceEnabled, a as createTailwindV3DefaultExtractor, d as isPureLocalCssImportWrapper, f as finalizeMiniProgramCss, g as createCssTokenSourceMap, h as createCssSourceTraceCacheSignature, m as annotateCssSourceTrace, n as emitHmrTiming, o as createBundleRuntimeClassSetManager, p as pruneMiniProgramGeneratedCss, r as createSourceCandidateCollector, s as generateCssByGenerator, v as processCachedTask } from "./hmr-timing-DK-mine6.mjs";
+import { C as toAbsoluteOutputPath, S as resolveOutputSpecifier, b as stripRequestQuery, d as stripBundlerGeneratedCssMarkers, f as resolvePackageDir, l as hasBundlerGeneratedCssMarker, n as createBundleBuildState, p as resolvePluginDisabledState, r as updateBundleBuildState, s as pushConcurrentTaskFactories, t as buildBundleSnapshot, y as isSourceStyleRequest } from "./bundle-state-5FtFktJr.mjs";
 import Module, { createRequire } from "node:module";
-import fs from "node:fs";
 import process from "node:process";
+import fs from "node:fs";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
 import micromatch from "micromatch";
@@ -254,7 +254,7 @@ function isWatchFileInRuntimeDependencies(file, dependencies) {
 	return false;
 }
 //#endregion
-//#region src/bundlers/webpack/BaseUnifiedPlugin/v5-assets.ts
+//#region src/bundlers/webpack/BaseUnifiedPlugin/v5-assets/helpers.ts
 function createWebpackSnapshotAssets(assets) {
 	return Object.fromEntries(Object.entries(assets).map(([file, asset]) => {
 		const source = asset.source();
@@ -269,6 +269,30 @@ function stringifyWebpackSource(source) {
 	if (typeof source === "string") return source;
 	return source?.toString() ?? "";
 }
+function createWebpackAssetUpdater(options) {
+	const getCurrentAssetSource = (file) => {
+		const asset = options.compilation.getAsset(file);
+		if (!asset) return;
+		return stringifyWebpackSource(asset.source.source());
+	};
+	const updateAssetIfChanged = (file, source, { notifyUpdate = true } = {}) => {
+		const nextSource = typeof source === "string" ? source : stringifyWebpackSource(source.source());
+		const previousSource = getCurrentAssetSource(file);
+		if (previousSource === nextSource) {
+			options.debug("asset unchanged, skip update: %s", file);
+			return false;
+		}
+		options.compilation.updateAsset(file, typeof source === "string" ? new options.ConcatSource(source) : source);
+		if (notifyUpdate) options.onUpdate(file, previousSource ?? "", nextSource);
+		return true;
+	};
+	return {
+		getCurrentAssetSource,
+		updateAssetIfChanged
+	};
+}
+//#endregion
+//#region src/bundlers/webpack/BaseUnifiedPlugin/v5-assets.ts
 function setupWebpackV5ProcessAssetsHook(options) {
 	const { compiler, options: compilerOptions, appType, runtimeState, getRuntimeRefreshRequirement, refreshRuntimeMetadata, isWebpackProcessedCssAsset, consumeRuntimeRefreshRequirement, isWatchMode, runtimeClassSetManager, debug } = options;
 	const { Compilation, sources } = compiler.webpack;
@@ -290,22 +314,12 @@ function setupWebpackV5ProcessAssetsHook(options) {
 			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 { updateAssetIfChanged } = createWebpackAssetUpdater({
+				compilation,
+				ConcatSource,
+				onUpdate: compilerOptions.onUpdate,
+				debug
+			});
 			const entries = Object.entries(assets);
 			const compilerOutputPath = compilation.compiler?.outputPath ?? compiler.outputPath;
 			const outputDir = compilerOutputPath ? path.resolve(compilerOutputPath) : compilation.outputOptions?.path ?? process.cwd();
@@ -368,8 +382,52 @@ function setupWebpackV5ProcessAssetsHook(options) {
 				cssUserHandlerOptionsCache.set(cacheKey, created);
 				return created;
 			};
-			const finalizeCssAssetSource = (source) => {
-				return removeTailwindSourceDirectives(stripBundlerGeneratedCssMarkers(source), { importFallback: true });
+			const finalizeCssAssetSource = (source, options = {}) => {
+				let finalized = removeTailwindSourceDirectives(stripBundlerGeneratedCssMarkers(source), { importFallback: true });
+				if (isWebGeneratorTarget || options.generatedCss !== true) return finalized;
+				try {
+					finalized = pruneMiniProgramGeneratedCss(finalized, { preservePreflight: runtimeState.twPatcher.majorVersion === 3 });
+				} catch {
+					finalized = finalizeMiniProgramCss(finalized, {
+						cssPreflight: runtimeState.twPatcher.majorVersion === 4 ? compilerOptions.cssPreflight : void 0,
+						isTailwindcssV4: runtimeState.twPatcher.majorVersion === 4,
+						preservePseudoContentInit: runtimeState.twPatcher.majorVersion === 3
+					});
+				}
+				return finalized;
+			};
+			const finalizeMiniProgramUserCssAssetSource = (source) => {
+				if (isWebGeneratorTarget) return source;
+				return finalizeMiniProgramCss(source, {
+					cssPreflight: runtimeState.twPatcher.majorVersion === 4 ? compilerOptions.cssPreflight : void 0,
+					isTailwindcssV4: runtimeState.twPatcher.majorVersion === 4,
+					preservePseudoContentInit: runtimeState.twPatcher.majorVersion === 3
+				});
+			};
+			const cssSourceTraceTokenSources = isCssSourceTraceEnabled(compilerOptions) ? await (async () => {
+				const root = compilerOptions.tailwindcssBasedir ?? process.cwd();
+				const sourceScan = await resolveViteSourceScanEntries(compilerOptions, runtimeState.twPatcher, { root });
+				const collector = createSourceCandidateCollector({
+					bareArbitraryValues: compilerOptions.arbitraryValues?.bareArbitraryValues,
+					extractor: runtimeState.twPatcher.majorVersion === 3 ? createTailwindV3DefaultExtractor() : void 0
+				});
+				await collector.scanRoot({
+					entries: sourceScan?.entries,
+					explicit: sourceScan?.explicit,
+					root
+				});
+				collector.syncInline(sourceScan?.inlineCandidates);
+				return createCssTokenSourceMap(collector.sourcesForEntries(sourceScan?.entries), compilerOptions);
+			})() : void 0;
+			const cssSourceTraceSignature = createCssSourceTraceCacheSignature(cssSourceTraceTokenSources, compilerOptions);
+			const annotateCss = (css) => annotateCssSourceTrace(css, {
+				opts: compilerOptions,
+				tokenSources: cssSourceTraceTokenSources
+			});
+			const finalizeTracedCss = (css) => {
+				const traced = annotateCss(css);
+				if (isWebGeneratorTarget || !isCssSourceTraceEnabled(compilerOptions)) return traced;
+				return finalizeMiniProgramUserCssAssetSource(traced);
 			};
 			const forceRuntimeRefresh = getRuntimeRefreshRequirement();
 			debug("processAssets ensure runtime set forceRefresh=%s major=%s", forceRuntimeRefresh, runtimeState.twPatcher.majorVersion ?? "unknown");
@@ -484,13 +542,13 @@ function setupWebpackV5ProcessAssetsHook(options) {
 				const [file, originalSource] = element;
 				const rawSource = originalSource.source().toString();
 				if (isWebpackProcessedCssAsset?.(file, rawSource)) {
-					const nextCss = finalizeCssAssetSource(rawSource);
+					const nextCss = finalizeCssAssetSource(rawSource, { generatedCss: hasBundlerGeneratedCssMarker(rawSource) });
 					tasks.push(processCachedTask({
 						cache: compilerOptions.cache,
 						cacheKey: file,
 						hashKey: `${file}:asset`,
 						rawSource,
-						hash: createRuntimeAwareCssHash(assetHashByChunk.get(file), compilerOptions.cache.computeHash(rawSource), runtimeSetHash),
+						hash: createRuntimeAwareCssHash(assetHashByChunk.get(file), compilerOptions.cache.computeHash(rawSource), `${runtimeSetHash}:${cssSourceTraceSignature}`),
 						applyResult(source, { cacheHit }) {
 							updateAssetIfChanged(file, source, { notifyUpdate: !cacheHit });
 						},
@@ -499,13 +557,13 @@ function setupWebpackV5ProcessAssetsHook(options) {
 						},
 						transform: async () => {
 							debug("css skip webpack-loader-pipeline asset: %s", file);
-							return { result: new ConcatSource(nextCss) };
+							return { result: new ConcatSource(finalizeTracedCss(nextCss)) };
 						}
 					}));
 					continue;
 				}
 				const cacheKey = file;
-				const runtimeAwareHash = createRuntimeAwareCssHash(assetHashByChunk.get(file), compilerOptions.cache.computeHash(rawSource), runtimeSetHash);
+				const runtimeAwareHash = createRuntimeAwareCssHash(assetHashByChunk.get(file), compilerOptions.cache.computeHash(rawSource), `${runtimeSetHash}:${cssSourceTraceSignature}`);
 				tasks.push(processCachedTask({
 					cache: compilerOptions.cache,
 					cacheKey,
@@ -521,6 +579,7 @@ function setupWebpackV5ProcessAssetsHook(options) {
 					transform: async () => {
 						await runtimeState.readyPromise;
 						const cssHandlerOptions = getCssHandlerOptions(file);
+						if (isPureLocalCssImportWrapper(rawSource)) return { result: new ConcatSource(removeTailwindSourceDirectives(stripBundlerGeneratedCssMarkers(rawSource), { importFallback: true })) };
 						const generated = await generateCssByGenerator({
 							opts: compilerOptions,
 							runtimeState,
@@ -532,7 +591,7 @@ function setupWebpackV5ProcessAssetsHook(options) {
 							styleHandler: compilerOptions.styleHandler,
 							debug
 						});
-						const source = new ConcatSource(finalizeCssAssetSource(generated?.css ?? (await compilerOptions.styleHandler(rawSource, cssHandlerOptions)).css));
+						const source = new ConcatSource(finalizeTracedCss(finalizeCssAssetSource(generated?.css ?? (await compilerOptions.styleHandler(rawSource, cssHandlerOptions)).css, { generatedCss: generated != null })));
 						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 };
@@ -685,9 +744,7 @@ 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 [];
+	return (Array.isArray(ignored) ? [...ignored] : [ignored]).filter((item) => typeof item === "string" || item instanceof RegExp || typeof item === "function");
 }
 function createOutputIgnoredPredicate(ignoredList, ignoredPath) {
 	const predicate = (file) => {
@@ -720,12 +777,15 @@ function setupWebpackWatchOutputIgnore(compiler) {
 		const outputDir = outputPath ? path.resolve(outputPath) : void 0;
 		if (!outputDir) return watchOptions;
 		if (watchOptions && typeof watchOptions === "object") {
-			watchOptions.ignored = appendIgnoredPath(watchOptions.ignored, outputDir);
+			const nextIgnored = appendIgnoredPath(watchOptions.ignored, outputDir);
+			if (nextIgnored === void 0) delete watchOptions.ignored;
+			else watchOptions.ignored = nextIgnored;
 			return watchOptions;
 		}
 		return { ignored: appendIgnoredPath(void 0, outputDir) };
 	};
-	compiler.options.watchOptions = appendOutputIgnoredPath(compiler.options.watchOptions);
+	const compilerWatchOptions = appendOutputIgnoredPath(compiler.options.watchOptions);
+	if (compilerWatchOptions) compiler.options.watchOptions = compilerWatchOptions;
 	const syncOutputIgnoredPath = () => {
 		const outputPath = compiler.outputPath || compiler.options?.output?.path;
 		if (!(outputPath ? path.resolve(outputPath) : void 0)) return;
@@ -835,6 +895,13 @@ var WeappTailwindcss = class {
 		const markWebpackProcessedCssSource = (file) => {
 			webpackProcessedCssSourceFiles.add(path.resolve(file));
 		};
+		const isWebpackProcessedTailwindEntryAsset = (file) => {
+			if ((runtimeState.twPatcher.majorVersion ?? 0) < 4 || !this.options.mainCssChunkMatcher(file, this.appType) || webpackProcessedCssSourceFiles.size === 0) return false;
+			const tailwindOptions = resolveTailwindcssOptions(runtimeState.twPatcher.options);
+			for (const entry of tailwindOptions?.v4?.cssEntries ?? []) if (webpackProcessedCssSourceFiles.has(path.resolve(entry))) return true;
+			for (const source of tailwindOptions?.v4?.cssSources ?? []) if (source.file && webpackProcessedCssSourceFiles.has(path.resolve(source.file))) return true;
+			return false;
+		};
 		compiler.hooks.invalid?.tap?.(pluginName, (fileName) => {
 			if (!fileName) return;
 			runtimeRefreshRequiredForCompilation = runtimeRefreshRequiredForCompilation || hasRuntimeDependencyChanges([path.resolve(fileName)]);
@@ -891,7 +958,7 @@ var WeappTailwindcss = class {
 			getRuntimeRefreshRequirement: () => runtimeRefreshRequiredForCompilation,
 			refreshRuntimeMetadata: ensureRuntimeMetadata,
 			isWebpackProcessedCssAsset(file, rawSource) {
-				return webpackProcessedCssSourceFiles.has(path.resolve(file)) || rawSource.includes("weapp-tailwindcss webpack-generated-css");
+				return webpackProcessedCssSourceFiles.has(path.resolve(file)) || isWebpackProcessedTailwindEntryAsset(file) || rawSource.includes("weapp-tailwindcss webpack-generated-css");
 			},
 			consumeRuntimeRefreshRequirement() {
 				runtimeRefreshRequiredForCompilation = false;

package/dist/{webpack-nn3P8_S_.js → webpack-KLoTb5Dr.js}

@@ -1,21 +1,22 @@
 const require_chunk = require("./chunk-emK7D4bc.js");
-const require_v3_engine = require("./v3-engine-6FVAcrZl.js");
-const require_generator = require("./generator-C56PJYxA.js");
-const require_precheck = require("./precheck-CyPbGn38.js");
+const require_v3_engine = require("./v3-engine-DdlvXpID.js");
+const require_generator = require("./generator-C--TrAod.js");
+const require_precheck = require("./precheck-B8y6tDvG.js");
 const require_utils = require("./utils-Dolmt8EO.js");
-const require_tailwindcss = require("./tailwindcss-Tw6CSVHL.js");
-const require_incremental_runtime_class_set = require("./incremental-runtime-class-set-Bmzdjlk0.js");
-const require_bundle_state = require("./bundle-state-CFgzVHFP.js");
-let node_fs = require("node:fs");
-node_fs = require_chunk.__toESM(node_fs);
+const require_tailwindcss = require("./tailwindcss-DbZ4o4m_.js");
+const require_hmr_timing = require("./hmr-timing-CscCNKb9.js");
+const require_bundle_state = require("./bundle-state-cHwTyrOS.js");
 let node_module = require("node:module");
 node_module = require_chunk.__toESM(node_module);
 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);
 let node_path = require("node:path");
 node_path = require_chunk.__toESM(node_path);
 let micromatch = require("micromatch");
 micromatch = require_chunk.__toESM(micromatch);
+let _weapp_tailwindcss_postcss = require("@weapp-tailwindcss/postcss");
 //#region src/shared/tailwindcss-css-redirect.ts
 const moduleWithMutableResolve = node_module.default;
 const patched = /* @__PURE__ */ new WeakSet();
@@ -259,7 +260,7 @@ function isWatchFileInRuntimeDependencies(file, dependencies) {
 	return false;
 }
 //#endregion
-//#region src/bundlers/webpack/BaseUnifiedPlugin/v5-assets.ts
+//#region src/bundlers/webpack/BaseUnifiedPlugin/v5-assets/helpers.ts
 function createWebpackSnapshotAssets(assets) {
 	return Object.fromEntries(Object.entries(assets).map(([file, asset]) => {
 		const source = asset.source();
@@ -274,6 +275,30 @@ function stringifyWebpackSource(source) {
 	if (typeof source === "string") return source;
 	return source?.toString() ?? "";
 }
+function createWebpackAssetUpdater(options) {
+	const getCurrentAssetSource = (file) => {
+		const asset = options.compilation.getAsset(file);
+		if (!asset) return;
+		return stringifyWebpackSource(asset.source.source());
+	};
+	const updateAssetIfChanged = (file, source, { notifyUpdate = true } = {}) => {
+		const nextSource = typeof source === "string" ? source : stringifyWebpackSource(source.source());
+		const previousSource = getCurrentAssetSource(file);
+		if (previousSource === nextSource) {
+			options.debug("asset unchanged, skip update: %s", file);
+			return false;
+		}
+		options.compilation.updateAsset(file, typeof source === "string" ? new options.ConcatSource(source) : source);
+		if (notifyUpdate) options.onUpdate(file, previousSource ?? "", nextSource);
+		return true;
+	};
+	return {
+		getCurrentAssetSource,
+		updateAssetIfChanged
+	};
+}
+//#endregion
+//#region src/bundlers/webpack/BaseUnifiedPlugin/v5-assets.ts
 function setupWebpackV5ProcessAssetsHook(options) {
 	const { compiler, options: compilerOptions, appType, runtimeState, getRuntimeRefreshRequirement, refreshRuntimeMetadata, isWebpackProcessedCssAsset, consumeRuntimeRefreshRequirement, isWatchMode, runtimeClassSetManager, debug } = options;
 	const { Compilation, sources } = compiler.webpack;
@@ -282,7 +307,7 @@ function setupWebpackV5ProcessAssetsHook(options) {
 	const cssHandlerOptionsCache = /* @__PURE__ */ new Map();
 	const cssUserHandlerOptionsCache = /* @__PURE__ */ new Map();
 	const bundleBuildState = require_bundle_state.createBundleBuildState();
-	const bundleRuntimeClassSetManager = runtimeClassSetManager ?? require_incremental_runtime_class_set.createBundleRuntimeClassSetManager();
+	const bundleRuntimeClassSetManager = runtimeClassSetManager ?? require_hmr_timing.createBundleRuntimeClassSetManager();
 	let webpackWatchRuntimeScanInitialized = false;
 	compiler.hooks.compilation.tap(require_precheck.pluginName, (compilation) => {
 		compilation.hooks.processAssets.tapPromise({
@@ -295,22 +320,12 @@ function setupWebpackV5ProcessAssetsHook(options) {
 			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 { updateAssetIfChanged } = createWebpackAssetUpdater({
+				compilation,
+				ConcatSource,
+				onUpdate: compilerOptions.onUpdate,
+				debug
+			});
 			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();
@@ -373,8 +388,52 @@ function setupWebpackV5ProcessAssetsHook(options) {
 				cssUserHandlerOptionsCache.set(cacheKey, created);
 				return created;
 			};
-			const finalizeCssAssetSource = (source) => {
-				return require_v3_engine.removeTailwindSourceDirectives(require_bundle_state.stripBundlerGeneratedCssMarkers(source), { importFallback: true });
+			const finalizeCssAssetSource = (source, options = {}) => {
+				let finalized = require_v3_engine.removeTailwindSourceDirectives(require_bundle_state.stripBundlerGeneratedCssMarkers(source), { importFallback: true });
+				if (isWebGeneratorTarget || options.generatedCss !== true) return finalized;
+				try {
+					finalized = (0, _weapp_tailwindcss_postcss.pruneMiniProgramGeneratedCss)(finalized, { preservePreflight: runtimeState.twPatcher.majorVersion === 3 });
+				} catch {
+					finalized = (0, _weapp_tailwindcss_postcss.finalizeMiniProgramCss)(finalized, {
+						cssPreflight: runtimeState.twPatcher.majorVersion === 4 ? compilerOptions.cssPreflight : void 0,
+						isTailwindcssV4: runtimeState.twPatcher.majorVersion === 4,
+						preservePseudoContentInit: runtimeState.twPatcher.majorVersion === 3
+					});
+				}
+				return finalized;
+			};
+			const finalizeMiniProgramUserCssAssetSource = (source) => {
+				if (isWebGeneratorTarget) return source;
+				return (0, _weapp_tailwindcss_postcss.finalizeMiniProgramCss)(source, {
+					cssPreflight: runtimeState.twPatcher.majorVersion === 4 ? compilerOptions.cssPreflight : void 0,
+					isTailwindcssV4: runtimeState.twPatcher.majorVersion === 4,
+					preservePseudoContentInit: runtimeState.twPatcher.majorVersion === 3
+				});
+			};
+			const cssSourceTraceTokenSources = require_hmr_timing.isCssSourceTraceEnabled(compilerOptions) ? await (async () => {
+				const root = compilerOptions.tailwindcssBasedir ?? node_process.default.cwd();
+				const sourceScan = await require_v3_engine.resolveViteSourceScanEntries(compilerOptions, runtimeState.twPatcher, { root });
+				const collector = require_hmr_timing.createSourceCandidateCollector({
+					bareArbitraryValues: compilerOptions.arbitraryValues?.bareArbitraryValues,
+					extractor: runtimeState.twPatcher.majorVersion === 3 ? require_hmr_timing.createTailwindV3DefaultExtractor() : void 0
+				});
+				await collector.scanRoot({
+					entries: sourceScan?.entries,
+					explicit: sourceScan?.explicit,
+					root
+				});
+				collector.syncInline(sourceScan?.inlineCandidates);
+				return require_hmr_timing.createCssTokenSourceMap(collector.sourcesForEntries(sourceScan?.entries), compilerOptions);
+			})() : void 0;
+			const cssSourceTraceSignature = require_hmr_timing.createCssSourceTraceCacheSignature(cssSourceTraceTokenSources, compilerOptions);
+			const annotateCss = (css) => require_hmr_timing.annotateCssSourceTrace(css, {
+				opts: compilerOptions,
+				tokenSources: cssSourceTraceTokenSources
+			});
+			const finalizeTracedCss = (css) => {
+				const traced = annotateCss(css);
+				if (isWebGeneratorTarget || !require_hmr_timing.isCssSourceTraceEnabled(compilerOptions)) return traced;
+				return finalizeMiniProgramUserCssAssetSource(traced);
 			};
 			const forceRuntimeRefresh = getRuntimeRefreshRequirement();
 			debug("processAssets ensure runtime set forceRefresh=%s major=%s", forceRuntimeRefresh, runtimeState.twPatcher.majorVersion ?? "unknown");
@@ -422,7 +481,7 @@ function setupWebpackV5ProcessAssetsHook(options) {
 				const rawSource = originalSource.source().toString();
 				const cacheKey = file;
 				const chunkHash = assetHashByChunk.get(file);
-				tasks.push(require_incremental_runtime_class_set.processCachedTask({
+				tasks.push(require_hmr_timing.processCachedTask({
 					cache: compilerOptions.cache,
 					cacheKey,
 					hashKey: `${file}:asset`,
@@ -451,7 +510,7 @@ function setupWebpackV5ProcessAssetsHook(options) {
 				const initialRawSource = typeof initialSource === "string" ? initialSource : initialSource.toString();
 				const chunkHash = assetHashByChunk.get(file);
 				jsTaskFactories.push(async () => {
-					await require_incremental_runtime_class_set.processCachedTask({
+					await require_hmr_timing.processCachedTask({
 						cache: compilerOptions.cache,
 						cacheKey,
 						hashKey: `${file}:asset`,
@@ -489,13 +548,13 @@ function setupWebpackV5ProcessAssetsHook(options) {
 				const [file, originalSource] = element;
 				const rawSource = originalSource.source().toString();
 				if (isWebpackProcessedCssAsset?.(file, rawSource)) {
-					const nextCss = finalizeCssAssetSource(rawSource);
-					tasks.push(require_incremental_runtime_class_set.processCachedTask({
+					const nextCss = finalizeCssAssetSource(rawSource, { generatedCss: require_bundle_state.hasBundlerGeneratedCssMarker(rawSource) });
+					tasks.push(require_hmr_timing.processCachedTask({
 						cache: compilerOptions.cache,
 						cacheKey: file,
 						hashKey: `${file}:asset`,
 						rawSource,
-						hash: createRuntimeAwareCssHash(assetHashByChunk.get(file), compilerOptions.cache.computeHash(rawSource), runtimeSetHash),
+						hash: createRuntimeAwareCssHash(assetHashByChunk.get(file), compilerOptions.cache.computeHash(rawSource), `${runtimeSetHash}:${cssSourceTraceSignature}`),
 						applyResult(source, { cacheHit }) {
 							updateAssetIfChanged(file, source, { notifyUpdate: !cacheHit });
 						},
@@ -504,14 +563,14 @@ function setupWebpackV5ProcessAssetsHook(options) {
 						},
 						transform: async () => {
 							debug("css skip webpack-loader-pipeline asset: %s", file);
-							return { result: new ConcatSource(nextCss) };
+							return { result: new ConcatSource(finalizeTracedCss(nextCss)) };
 						}
 					}));
 					continue;
 				}
 				const cacheKey = file;
-				const runtimeAwareHash = createRuntimeAwareCssHash(assetHashByChunk.get(file), compilerOptions.cache.computeHash(rawSource), runtimeSetHash);
-				tasks.push(require_incremental_runtime_class_set.processCachedTask({
+				const runtimeAwareHash = createRuntimeAwareCssHash(assetHashByChunk.get(file), compilerOptions.cache.computeHash(rawSource), `${runtimeSetHash}:${cssSourceTraceSignature}`);
+				tasks.push(require_hmr_timing.processCachedTask({
 					cache: compilerOptions.cache,
 					cacheKey,
 					hashKey: `${file}:asset`,
@@ -526,7 +585,8 @@ function setupWebpackV5ProcessAssetsHook(options) {
 					transform: async () => {
 						await runtimeState.readyPromise;
 						const cssHandlerOptions = getCssHandlerOptions(file);
-						const generated = await require_incremental_runtime_class_set.generateCssByGenerator({
+						if (require_hmr_timing.isPureLocalCssImportWrapper(rawSource)) return { result: new ConcatSource(require_v3_engine.removeTailwindSourceDirectives(require_bundle_state.stripBundlerGeneratedCssMarkers(rawSource), { importFallback: true })) };
+						const generated = await require_hmr_timing.generateCssByGenerator({
 							opts: compilerOptions,
 							runtimeState,
 							runtime: runtimeSet,
@@ -537,7 +597,7 @@ function setupWebpackV5ProcessAssetsHook(options) {
 							styleHandler: compilerOptions.styleHandler,
 							debug
 						});
-						const source = new ConcatSource(finalizeCssAssetSource(generated?.css ?? (await compilerOptions.styleHandler(rawSource, cssHandlerOptions)).css));
+						const source = new ConcatSource(finalizeTracedCss(finalizeCssAssetSource(generated?.css ?? (await compilerOptions.styleHandler(rawSource, cssHandlerOptions)).css, { generatedCss: generated != null })));
 						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 };
@@ -547,7 +607,7 @@ function setupWebpackV5ProcessAssetsHook(options) {
 			require_bundle_state.pushConcurrentTaskFactories(tasks, jsTaskFactories);
 			await Promise.all(tasks);
 			debug("end");
-			require_incremental_runtime_class_set.emitHmrTiming("webpack", "processAssets", performance.now() - hmrTimingStartedAt);
+			require_hmr_timing.emitHmrTiming("webpack", "processAssets", performance.now() - hmrTimingStartedAt);
 			compilerOptions.onEnd();
 		});
 	});
@@ -685,9 +745,7 @@ const debug = require_v3_engine.createDebug();
 const weappTailwindcssPackageDir = require_bundle_state.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 [];
+	return (Array.isArray(ignored) ? [...ignored] : [ignored]).filter((item) => typeof item === "string" || item instanceof RegExp || typeof item === "function");
 }
 function createOutputIgnoredPredicate(ignoredList, ignoredPath) {
 	const predicate = (file) => {
@@ -720,12 +778,15 @@ function setupWebpackWatchOutputIgnore(compiler) {
 		const outputDir = outputPath ? node_path.default.resolve(outputPath) : void 0;
 		if (!outputDir) return watchOptions;
 		if (watchOptions && typeof watchOptions === "object") {
-			watchOptions.ignored = appendIgnoredPath(watchOptions.ignored, outputDir);
+			const nextIgnored = appendIgnoredPath(watchOptions.ignored, outputDir);
+			if (nextIgnored === void 0) delete watchOptions.ignored;
+			else watchOptions.ignored = nextIgnored;
 			return watchOptions;
 		}
 		return { ignored: appendIgnoredPath(void 0, outputDir) };
 	};
-	compiler.options.watchOptions = appendOutputIgnoredPath(compiler.options.watchOptions);
+	const compilerWatchOptions = appendOutputIgnoredPath(compiler.options.watchOptions);
+	if (compilerWatchOptions) compiler.options.watchOptions = compilerWatchOptions;
 	const syncOutputIgnoredPath = () => {
 		const outputPath = compiler.outputPath || compiler.options?.output?.path;
 		if (!(outputPath ? node_path.default.resolve(outputPath) : void 0)) return;
@@ -835,6 +896,13 @@ var WeappTailwindcss = class {
 		const markWebpackProcessedCssSource = (file) => {
 			webpackProcessedCssSourceFiles.add(node_path.default.resolve(file));
 		};
+		const isWebpackProcessedTailwindEntryAsset = (file) => {
+			if ((runtimeState.twPatcher.majorVersion ?? 0) < 4 || !this.options.mainCssChunkMatcher(file, this.appType) || webpackProcessedCssSourceFiles.size === 0) return false;
+			const tailwindOptions = require_v3_engine.resolveTailwindcssOptions(runtimeState.twPatcher.options);
+			for (const entry of tailwindOptions?.v4?.cssEntries ?? []) if (webpackProcessedCssSourceFiles.has(node_path.default.resolve(entry))) return true;
+			for (const source of tailwindOptions?.v4?.cssSources ?? []) if (source.file && webpackProcessedCssSourceFiles.has(node_path.default.resolve(source.file))) return true;
+			return false;
+		};
 		compiler.hooks.invalid?.tap?.(require_precheck.pluginName, (fileName) => {
 			if (!fileName) return;
 			runtimeRefreshRequiredForCompilation = runtimeRefreshRequiredForCompilation || hasRuntimeDependencyChanges([node_path.default.resolve(fileName)]);
@@ -891,7 +959,7 @@ var WeappTailwindcss = class {
 			getRuntimeRefreshRequirement: () => runtimeRefreshRequiredForCompilation,
 			refreshRuntimeMetadata: ensureRuntimeMetadata,
 			isWebpackProcessedCssAsset(file, rawSource) {
-				return webpackProcessedCssSourceFiles.has(node_path.default.resolve(file)) || rawSource.includes("weapp-tailwindcss webpack-generated-css");
+				return webpackProcessedCssSourceFiles.has(node_path.default.resolve(file)) || isWebpackProcessedTailwindEntryAsset(file) || rawSource.includes("weapp-tailwindcss webpack-generated-css");
 			},
 			consumeRuntimeRefreshRequirement() {
 				runtimeRefreshRequiredForCompilation = false;

package/dist/webpack.js

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

package/dist/webpack.mjs

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "weapp-tailwindcss",
-  "version": "5.0.6",
+  "version": "5.0.8",
   "description": "把 tailwindcss 原子化样式思想，带给小程序开发者们! bring tailwindcss to miniprogram developers!",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -182,13 +182,14 @@
     "magic-string": "0.30.21",
     "micromatch": "^4.0.8",
     "postcss-load-config": "^6.0.1",
-    "semver": "~7.8.2",
-    "tailwindcss-patch": "9.4.2",
+    "postcss-selector-parser": "^7.1.2",
+    "semver": "~7.8.4",
+    "tailwindcss-patch": "9.4.3",
     "yaml": "^2.9.0",
     "@weapp-tailwindcss/logger": "2.0.0",
-    "@weapp-tailwindcss/postcss": "3.0.3",
-    "@weapp-tailwindcss/shared": "2.0.0",
+    "@weapp-tailwindcss/postcss": "3.0.5",
     "@weapp-tailwindcss/reset": "0.1.1",
+    "@weapp-tailwindcss/shared": "2.0.0",
     "tailwindcss-config": "2.0.0"
   },
   "devDependencies": {