weapp-tailwindcss 5.2.8 → 5.2.9

package/dist/{vite-V86H6PZa.cjs → vite-Dcx59GRQ.cjs}

@@ -5273,7 +5273,7 @@ function normalizeRootMiniProgramImportShellAssets(bundle, options) {
 //#endregion
 //#region src/bundlers/vite/generate-bundle/finalize/bundle.ts
 async function finalizeGenerateBundle(options) {
-	const { activeProcessCacheKeys, activeProcessHashKeys, activeViteCssCacheFiles, bundle, bundleFiles, cache, cssTaskFactories, cssPipelineStrategy, createCssPipelineContext, debug, defaultStyleOutputExtension, formatIteration, generatorCandidateSignature, generatorRuntime, getCssHandlerOptions, getSourceCandidateSourcesForEntries, getSourceCandidatesForEntries, getViteCssCacheStats, getViteProcessedCssAssetResults, hmrTimingRecorder, hmrTimingStartedAt, isHarmonyAppStyleTarget, isNativeAppStyleTarget, isViteProcessedCssAsset, isWebGeneratorTarget, jsAfterCss, jsTaskFactories, lastCssResultByFile, lastCssSourceHashByFile, linkedByEntry, markCssAssetProcessed, metrics, onEnd, onUpdate, opts, outDir, pendingLinkedUpdates, pruneViteCssCaches, recordCssAssetResult, recordTimingDetail, recordViteProcessedCssAssetResult, rootDir, runtime, runtimeState, shouldPreserveAppCssExtension, snapshot, sourceCandidates, sourceRoot, state, styleHandler, tasks, timingDetails, transformRuntime, transformWebTargetCss, useIncrementalMode } = options;
+	const { activeProcessCacheKeys, activeProcessHashKeys, activeViteCssCacheFiles, bundle, bundleFiles, cache, cssTaskFactories, cssPipelineStrategy, createCssPipelineContext, debug, defaultStyleOutputExtension, formatIteration, generatorCandidateSignature, generatorRuntime, getCssHandlerOptions, getSourceCandidateSourcesForEntries, getSourceCandidatesForEntries, getViteCssCacheStats, getViteProcessedCssAssetResults, hmrTimingRecorder, hmrTimingStartedAt, isHarmonyAppStyleTarget, isNativeAppStyleTarget, isViteProcessedCssAsset, isWebGeneratorTarget, jsAfterCss, jsTaskFactories, lastCssResultByFile, lastCssSourceHashByFile, linkedByEntry, markCssAssetProcessed, metrics, onEnd, onUpdate, opts, outDir, pendingLinkedUpdates, pendingRememberedCssReplayUpdates, pruneViteCssCaches, recordCssAssetResult, recordTimingDetail, recordViteProcessedCssAssetResult, rootDir, runtime, runtimeState, shouldPreserveAppCssExtension, snapshot, sourceCandidates, sourceRoot, state, styleHandler, tasks, timingDetails, transformRuntime, transformWebTargetCss, useIncrementalMode } = options;
 	const tasksStart = performance.now();
 	if (cssTaskFactories.length > 0) {
 		const cssTask = require_v4_generation_core.runWithConcurrency(cssTaskFactories, resolveViteCssTaskConcurrency(useIncrementalMode, runtimeState.tailwindRuntime.majorVersion)).then(() => void 0);
@@ -5319,7 +5319,7 @@ async function finalizeGenerateBundle(options) {
 		});
 		recordTimingDetail("finalize.processedCss.collect", collectStartedAt);
 		const injectStartedAt = performance.now();
-		const injected = injectViteProcessedCssIntoMainCssAssets(bundle, {
+		let injected = injectViteProcessedCssIntoMainCssAssets(bundle, {
 			opts,
 			cssPipelineStrategy,
 			createCssPipelineContext,
@@ -5336,6 +5336,26 @@ async function finalizeGenerateBundle(options) {
 			onUpdate,
 			recordTimingDetail
 		});
+		if (pendingRememberedCssReplayUpdates.length > 0) {
+			for (const update of pendingRememberedCssReplayUpdates) recordViteProcessedCssAssetResult?.(update.file, update.css, update);
+			injected += injectViteProcessedCssIntoMainCssAssets(bundle, {
+				opts,
+				cssPipelineStrategy,
+				createCssPipelineContext,
+				getViteProcessedCssAssetResults: () => pendingRememberedCssReplayUpdates.map((update) => [update.file, {
+					css: update.css,
+					injectIntoMain: update.injectIntoMain,
+					outputFile: update.outputFile
+				}]),
+				markCssAssetProcessed,
+				recordCssAssetResult,
+				transformCss: transformWebTargetCss,
+				debug,
+				onUpdate,
+				recordTimingDetail
+			});
+			debug("inject remembered css replay updates after framework css collection: %d", pendingRememberedCssReplayUpdates.length);
+		}
 		recordTimingDetail("finalize.processedCss.inject", injectStartedAt);
 		return injected;
 	};
@@ -6143,11 +6163,22 @@ function resolveUniAppXCssTarget(id) {
 function isCssModuleExport(code) {
 	return CSS_MODULE_EXPORT_RE.test(code);
 }
+function resolvePreprocessorTransform(code, id, lang, options) {
+	if (!isPreprocessorRequest(id, lang)) return;
+	if (options.isIosPlatform) {
+		const normalizedCode = (0, _weapp_tailwindcss_postcss.normalizeTailwindcssV4InfinityCalcCss)(code);
+		return { result: normalizedCode === code ? void 0 : {
+			code: normalizedCode,
+			map: null
+		} };
+	}
+	if (options.isWebGeneratorTarget && !options.isNativeAppStyleTarget) return { result: void 0 };
+}
 //#endregion
 //#region src/uni-app-x/vite.ts
 let transformUVuePromise;
 function loadTransformUVue() {
-	transformUVuePromise ?? (transformUVuePromise = Promise.resolve().then(() => require("./transform-DzVJW6Dp.cjs")).then((mod) => mod.transformUVue));
+	transformUVuePromise ?? (transformUVuePromise = Promise.resolve().then(() => require("./transform-GzbxfNGA.cjs")).then((mod) => mod.transformUVue));
 	return transformUVuePromise;
 }
 const UVUE_NVUE_QUERY_RE = /\.(?:uvue|nvue)(?:\?.*)?$/;
@@ -6156,7 +6187,7 @@ function resolveUniAppXJsTransformEnabled(uniAppX) {
 	return uniAppX === void 0 ? true : require_options.isUniAppXEnabled(uniAppX);
 }
 function createUniAppXPlugins(options) {
-	const { appType, customAttributesEntities, disabledDefaultTemplateHandler, isIosPlatform: providedIosPlatform, mainCssChunkMatcher, runtimeState, styleHandler, syncSourceCandidatesForHotUpdate, tailwindRootCssModuleIds = [], generateCss, jsHandler, ensureRuntimeClassSet, getResolvedConfig, isEnabled = () => true, uniAppX, viteProcessedCssSourceFiles = [] } = options;
+	const { appType, customAttributesEntities, disabledDefaultTemplateHandler, isIosPlatform: providedIosPlatform, mainCssChunkMatcher, runtimeState, styleHandler, syncSourceCandidatesForHotUpdate, tailwindRootCssModuleIds = [], generateCss, jsHandler, ensureRuntimeClassSet, getResolvedConfig, isEnabled = () => true, isNativeAppStyleTarget = () => false, isWebGeneratorTarget = () => require_generator.resolveUniUtsPlatform().isWeb, uniAppX, viteProcessedCssSourceFiles = [] } = options;
 	const resolvedUniAppXOptions = require_options.resolveUniAppXOptions(uniAppX);
 	const utsPlatform = require_generator.resolveUniUtsPlatform();
 	const isIosPlatform = providedIosPlatform ?? utsPlatform.isAppIos;
@@ -6272,14 +6303,12 @@ function createUniAppXPlugins(options) {
 			if (!isEnabled()) return;
 			await runtimeState.readyPromise;
 			const { query } = parseVueRequest(id);
-			const lang = query.lang;
-			if (isIosPlatform && isPreprocessorRequest(id, lang)) {
-				const normalizedCode = (0, _weapp_tailwindcss_postcss.normalizeTailwindcssV4InfinityCalcCss)(code);
-				return normalizedCode === code ? void 0 : {
-					code: normalizedCode,
-					map: null
-				};
-			}
+			const preprocessor = resolvePreprocessorTransform(code, id, query.lang, {
+				isIosPlatform,
+				isNativeAppStyleTarget: isNativeAppStyleTarget(),
+				isWebGeneratorTarget: isWebGeneratorTarget()
+			});
+			if (preprocessor) return preprocessor.result;
 			return transformStyle(code, id, query, this);
 		}
 	}];
@@ -6564,10 +6593,33 @@ function shouldSkipRawRememberedCssSource(rawSource, sourceFile) {
 	const cleanSourceFile = sourceFile.replace(/[?#].*$/, "");
 	return SOURCE_STYLE_OUTPUT_EXT_RE.test(cleanSourceFile) && !canProcessViteSourceStyleAsCss(rawSource, sourceFile);
 }
+function resolveRememberedCssReplayOutputFile(outputFile, targetByFile) {
+	const outputKey = require_source_candidate_scan_signature.normalizeOutputPathKey(outputFile);
+	for (const [shellFile, targetFile] of targetByFile ?? []) if (require_source_candidate_scan_signature.normalizeOutputPathKey(shellFile) === outputKey) return targetFile;
+	return outputFile;
+}
+function createRememberedCssReplayUpdates(css, sourceFile, outputFile, injectIntoMain) {
+	const updates = [{
+		css,
+		file: sourceFile,
+		injectIntoMain,
+		outputFile
+	}];
+	if (outputFile !== sourceFile) updates.push({
+		css,
+		file: outputFile,
+		injectIntoMain,
+		outputFile
+	});
+	return updates;
+}
 async function processRememberedCssReplay(options) {
-	const { addWatchFile, activeViteCssCacheFiles, bundle, bundleFiles, cache, changedCssFiles = /* @__PURE__ */ new Set(), createScopedGeneratorRuntime, createScopedSourceCandidateGetter, createScopedSourceCandidateSourceGetter, cssTaskFactories, cssPipelineContext, cssPipelineStrategy, debug, defaultStyleOutputExtension, emitOrReplayCssAsset, generatorRuntime, generatorPlatform, getCssHandlerOptions, getCssUserHandlerOptions, getRememberedCssSignature, getRememberedCssSources, isNativeAppStyleTarget, isWebGeneratorTarget, lastCssRawSourceHashByFile = /* @__PURE__ */ new Map(), lastCssResultByFile, lastCssSourceHashByFile, markCssAssetProcessed, metrics, normalizeViteCssCacheKey, onUpdate, opts, recordCssAssetResult, recordViteProcessedCssAssetResult, rootDir, runtimeState, setRememberedCssSignature, shouldInjectCssIntoMainFromOutput, shouldPreserveAppCssExtension, sourceRoot, styleHandler, timeTask, useIncrementalMode } = options;
+	const { addWatchFile, activeViteCssCacheFiles, bundle, bundleFiles, cache, changedCssFiles = /* @__PURE__ */ new Set(), createScopedGeneratorRuntime, createScopedSourceCandidateGetter, createScopedSourceCandidateSourceGetter, cssTaskFactories, cssPipelineContext, cssPipelineStrategy, debug, defaultStyleOutputExtension, emitOrReplayCssAsset, generatorRuntime, generatorPlatform, getCssHandlerOptions, getCssUserHandlerOptions, getRememberedCssSignature, getRememberedCssSources, frameworkRootImportShellTargetByFile, isNativeAppStyleTarget, isWebGeneratorTarget, lastCssRawSourceHashByFile = /* @__PURE__ */ new Map(), lastCssResultByFile, lastCssSourceHashByFile, markCssAssetProcessed, metrics, normalizeViteCssCacheKey, onUpdate, opts, pendingRememberedCssReplayUpdates, recordCssAssetResult, recordViteProcessedCssAssetResult, rootDir, runtimeState, setRememberedCssSignature, shouldInjectCssIntoMainFromOutput, shouldPreserveAppCssExtension, sourceRoot, styleHandler, timeTask, useIncrementalMode } = options;
 	const rememberedReplayGroups = collectRememberedCssReplayGroups(getRememberedCssSources?.(), opts, rootDir, isWebGeneratorTarget, shouldPreserveAppCssExtension, sourceRoot, defaultStyleOutputExtension, bundleFiles);
-	for (const [outputFile, rememberedGroup] of rememberedReplayGroups) {
+	const normalizedBundleFiles = new Set(bundleFiles.map(require_source_candidate_scan_signature.normalizeOutputPathKey));
+	for (const [rememberedOutputFile, rememberedGroup] of rememberedReplayGroups) {
+		const outputFile = resolveRememberedCssReplayOutputFile(rememberedOutputFile, frameworkRootImportShellTargetByFile);
+		if (outputFile !== rememberedOutputFile) debug("css replay use framework root import shell target: %s -> %s", rememberedOutputFile, outputFile);
 		if (isHTMLRequest(outputFile) || options.opts.htmlMatcher(outputFile)) continue;
 		const replayableRememberedGroup = rememberedGroup.filter(({ remembered }) => {
 			const shouldSkip = shouldSkipRawRememberedCssSource(remembered.rawSource, remembered.sourceFile);
@@ -6581,7 +6633,7 @@ async function processRememberedCssReplay(options) {
 		const generatorRawSource = isWebGeneratorTarget ? rawSource : require_v4_generation_core.normalizeMiniProgramGeneratorCssSource(rawSource, outputFile);
 		activeViteCssCacheFiles.add(normalizeViteCssCacheKey(outputFile));
 		activeViteCssCacheFiles.add(normalizeViteCssCacheKey(sourceFile));
-		const outputCssHandlerOptions = getCssHandlerOptions(outputFile);
+		const outputCssHandlerOptions = getCssHandlerOptions(rememberedOutputFile);
 		const cssHandlerOptions = {
 			...getCssHandlerOptions(sourceFile),
 			isMainChunk: outputCssHandlerOptions.isMainChunk
@@ -6600,7 +6652,19 @@ async function processRememberedCssReplay(options) {
 		const cssSourceChanged = changedCssFiles.has(outputFile) || changedCssFiles.has(sourceFile) || previousRawSourceHash != null && previousRawSourceHash !== rawSourceHash;
 		const previousCss = useIncrementalMode && !cssSourceChanged && getLastCssSourceHash(lastCssSourceHashByFile, outputFile) === cssRuntimeAffectingHash ? getLastCssResult(lastCssResultByFile, outputFile) : void 0;
 		const allRememberedSignaturesFresh = rememberedKeys.length > 0 && rememberedKeys.every((key) => getRememberedCssSignature?.(key) === rememberedCssRuntimeSignature);
-		if (bundleFiles.includes(outputFile) || bundleFiles.includes(sourceFile) || allRememberedSignaturesFresh) continue;
+		if (bundleFiles.includes(rememberedOutputFile) || bundleFiles.includes(sourceFile)) continue;
+		const shouldMergeReplayIntoFrameworkRootTarget = outputFile !== rememberedOutputFile && normalizedBundleFiles.has(require_source_candidate_scan_signature.normalizeOutputPathKey(outputFile));
+		if (allRememberedSignaturesFresh) if (!shouldMergeReplayIntoFrameworkRootTarget) continue;
+		else {
+			const cachedCss = getLastCssResult(lastCssResultByFile, outputFile);
+			if (cachedCss != null) {
+				pendingRememberedCssReplayUpdates.push(...createRememberedCssReplayUpdates(cachedCss, sourceFile, outputFile, true));
+				metrics.css.cacheHits++;
+				debug("css replay cached result into framework root target: %s", outputFile);
+				continue;
+			}
+			debug("css replay framework root target cache miss, regenerate: %s", outputFile);
+		}
 		const sourceTraceSources = scopedSourceCandidateSourceGetter ? await require_source_candidate_scan_signature.createScopedGeneratorSourceTraceMap(generatorRawSource, sourceFile, scopedSourceCandidateSourceGetter) : void 0;
 		const sourceTraceTokenSources = sourceTraceSources ? require_v4_generation_core.createCssTokenSourceMap(sourceTraceSources, opts) : void 0;
 		const annotateCss = (css) => require_v4_generation_core.annotateCssSourceTrace(css, {
@@ -6608,7 +6672,7 @@ async function processRememberedCssReplay(options) {
 			tokenSources: sourceTraceTokenSources
 		});
 		const shouldRecordRememberedReplayCss = useIncrementalMode || isNativeAppStyleTarget;
-		const shouldEmitRememberedReplayCssAsset = shouldRecordRememberedReplayCss;
+		const shouldEmitRememberedReplayCssAsset = shouldRecordRememberedReplayCss && !shouldMergeReplayIntoFrameworkRootTarget;
 		if (!shouldRecordRememberedReplayCss) continue;
 		const shouldPreserveLocalImportWrapper = shouldPreserveFrameworkRootMiniProgramImportShell({
 			css: rawSource,
@@ -6676,14 +6740,10 @@ async function processRememberedCssReplay(options) {
 				registerGeneratorDependencies$1({ addWatchFile }, generated.dependencies);
 				recordCssAssetResult?.(outputFile, css);
 				const shouldInjectReplayCssIntoMain = shouldInjectCssIntoMainFromOutput(outputFile, sourceFile, outputCssHandlerOptions);
-				recordViteProcessedCssAssetResult?.(sourceFile, css, {
-					injectIntoMain: outputCssHandlerOptions.isMainChunk ? false : shouldInjectReplayCssIntoMain,
-					outputFile
-				});
-				if (outputFile !== sourceFile) recordViteProcessedCssAssetResult?.(outputFile, css, {
-					injectIntoMain: outputCssHandlerOptions.isMainChunk ? false : shouldInjectReplayCssIntoMain,
-					outputFile
-				});
+				const injectIntoMain = shouldMergeReplayIntoFrameworkRootTarget ? true : outputCssHandlerOptions.isMainChunk ? false : shouldInjectReplayCssIntoMain;
+				const replayUpdates = createRememberedCssReplayUpdates(css, sourceFile, outputFile, injectIntoMain);
+				if (shouldMergeReplayIntoFrameworkRootTarget) pendingRememberedCssReplayUpdates.push(...replayUpdates);
+				else for (const update of replayUpdates) recordViteProcessedCssAssetResult?.(update.file, update.css, update);
 				debug("css replay generated result: %s bytes=%d", outputFile, css.length);
 			}
 			if (shouldEmitRememberedReplayCssAsset) emitRememberedCssAsset(css);
@@ -7575,6 +7635,7 @@ function createGenerateBundleHook$1(context) {
 		const tasks = [];
 		const cssTaskFactories = [];
 		const jsTaskFactories = [];
+		const pendingRememberedCssReplayUpdates = [];
 		const entryPlanningStartedAt = performance.now();
 		for (const entry of snapshot.entries) {
 			const { file, output: originalSource, source: originalEntrySource, type } = entry;
@@ -7800,6 +7861,7 @@ function createGenerateBundleHook$1(context) {
 			debug,
 			defaultStyleOutputExtension,
 			emitOrReplayCssAsset,
+			frameworkRootImportShellTargetByFile,
 			generatorPlatform,
 			generatorRuntime,
 			getCssHandlerOptions,
@@ -7816,6 +7878,7 @@ function createGenerateBundleHook$1(context) {
 			normalizeViteCssCacheKey,
 			onUpdate,
 			opts,
+			pendingRememberedCssReplayUpdates,
 			recordCssAssetResult,
 			recordViteProcessedCssAssetResult,
 			rootDir,
@@ -7867,6 +7930,7 @@ function createGenerateBundleHook$1(context) {
 			opts,
 			outDir,
 			pendingLinkedUpdates,
+			pendingRememberedCssReplayUpdates,
 			pruneViteCssCaches,
 			recordCssAssetResult,
 			recordTimingDetail,
@@ -8931,24 +8995,27 @@ function wrapViteCssPostTransform(config, transformCss) {
 }
 //#endregion
 //#region src/bundlers/vite/shared/framework-hmr-candidate-state.ts
-const WEB_HMR_RUNTIME_AFFECTING_DIRECTIVE_RE = /@(?:theme|source|config|plugin|apply)\b/;
 function createViteHmrCandidateState(options) {
 	let pendingChange;
 	let pendingCssTargetFiles;
+	let pendingTargetsArmed = false;
 	let pendingFullRegeneration = false;
 	const normalizeCssTargetFile = (file) => normalizeVitePersistentCacheKey((0, _weapp_tailwindcss_shared.cleanUrl)(file));
 	const clear = () => {
 		pendingChange = void 0;
 		pendingCssTargetFiles = void 0;
+		pendingTargetsArmed = false;
 		pendingFullRegeneration = false;
 	};
 	const queueFullRegeneration = () => {
 		pendingChange = void 0;
 		pendingCssTargetFiles = void 0;
+		pendingTargetsArmed = false;
 		pendingFullRegeneration = true;
 	};
 	const queueChange = (change) => {
 		var _pendingChange;
+		if (pendingFullRegeneration) return;
 		pendingFullRegeneration = false;
 		if (!pendingChange) {
 			pendingChange = {
@@ -8970,7 +9037,7 @@ function createViteHmrCandidateState(options) {
 	const createChange = (file, change, changeOptions = {}) => ({
 		...change,
 		file,
-		runtimeAffecting: changeOptions.runtimeAffecting === true || options.isRuntimeAffectingSource?.(file) === true || require_v4_generation_core.isSourceStyleRequest(file) || WEB_HMR_RUNTIME_AFFECTING_DIRECTIVE_RE.test(options.getSourceCandidate(file) ?? "")
+		runtimeAffecting: changeOptions.runtimeAffecting === true || options.isRuntimeAffectingSource?.(file) === true || require_v4_generation_core.isSourceStyleRequest(file)
 	});
 	const apply = (change) => {
 		if (require_v4_generation_core.isSourceStyleRequest(change.file)) {
@@ -8984,7 +9051,7 @@ function createViteHmrCandidateState(options) {
 		const preserveDeletedCss = options.getGeneratorOptions().hmr.preserveDeletedCss;
 		if (preserveDeletedCss) {
 			if (change.addedCandidates.size > 0) queueChange(change);
-			else if (!pendingChange) clear();
+			else if (!pendingChange && !pendingFullRegeneration) clear();
 			return change;
 		}
 		clear();
@@ -8993,28 +9060,26 @@ function createViteHmrCandidateState(options) {
 	};
 	const resolve = (generatorCode, file) => {
 		const fileKey = normalizeCssTargetFile(file);
-		if (options.getCommand() !== "serve" || !pendingChange || pendingChange.runtimeAffecting || pendingChange.addedCandidates.size === 0 || options.getGeneratorOptions().target === "weapp" && require_generator.hasUserCssLayerBlocks(generatorCode) || !options.cleanGeneratedCssByFile.has(fileKey) || !options.generatedClassSetByFile.has(fileKey) || pendingCssTargetFiles !== void 0 && !pendingCssTargetFiles.has(fileKey)) return;
+		if (options.getCommand() !== "serve" || !pendingChange || pendingChange.runtimeAffecting || pendingChange.addedCandidates.size === 0 || options.getGeneratorOptions().target === "weapp" && require_generator.hasUserCssLayerBlocks(generatorCode) || !options.cleanGeneratedCssByFile.has(fileKey) || !options.generatedClassSetByFile.has(fileKey) || pendingTargetsArmed && !pendingCssTargetFiles?.has(fileKey)) return;
 		return pendingChange;
 	};
 	const finishTarget = (file) => {
-		if (!pendingChange) return;
-		if (!pendingCssTargetFiles) {
-			clear();
-			return;
-		}
+		if (!pendingChange && !pendingFullRegeneration) return;
+		if (!pendingTargetsArmed || !pendingCssTargetFiles) return;
 		pendingCssTargetFiles.delete(normalizeCssTargetFile(file));
 		if (pendingCssTargetFiles.size === 0) clear();
 	};
 	const armTargets = (cssModules, fallbackCssIds) => {
-		if (!pendingChange) {
+		if (!pendingChange && !pendingFullRegeneration) {
 			pendingCssTargetFiles = void 0;
+			pendingTargetsArmed = false;
 			return;
 		}
 		const targets = /* @__PURE__ */ new Set();
 		const addTarget = (file) => {
 			if (!file) return;
 			const key = normalizeCssTargetFile(file);
-			if (options.cleanGeneratedCssByFile.has(key)) targets.add(key);
+			if (pendingFullRegeneration || options.cleanGeneratedCssByFile.has(key)) targets.add(key);
 		};
 		for (const module of cssModules) {
 			addTarget(module.id);
@@ -9022,7 +9087,28 @@ function createViteHmrCandidateState(options) {
 			addTarget(module.url);
 		}
 		for (const id of fallbackCssIds) addTarget(id);
-		pendingCssTargetFiles = targets.size > 0 ? targets : void 0;
+		pendingCssTargetFiles = targets;
+		pendingTargetsArmed = true;
+	};
+	const reconcileRuntimeCandidates = (file, candidates, rootCssIds) => {
+		if (options.getCommand() !== "serve" || pendingFullRegeneration) return;
+		const generatedClassSets = [];
+		const seenFiles = /* @__PURE__ */ new Set();
+		for (const id of rootCssIds) {
+			const fileKey = normalizeCssTargetFile(id);
+			if (seenFiles.has(fileKey)) continue;
+			seenFiles.add(fileKey);
+			const classSet = options.generatedClassSetByFile.get(fileKey);
+			if (classSet) generatedClassSets.push(classSet);
+		}
+		if (generatedClassSets.length === 0) return;
+		const addedCandidates = /* @__PURE__ */ new Set();
+		for (const candidate of candidates) if (generatedClassSets.some((classSet) => !classSet.has(candidate))) addedCandidates.add(candidate);
+		if (addedCandidates.size === 0) return;
+		apply(createChange(file, {
+			addedCandidates,
+			removedCandidates: /* @__PURE__ */ new Set()
+		}));
 	};
 	return {
 		apply,
@@ -9031,13 +9117,19 @@ function createViteHmrCandidateState(options) {
 		createChange,
 		finishTarget,
 		hasPendingCandidateAppend: () => pendingChange != null && !pendingChange.runtimeAffecting && pendingChange.addedCandidates.size > 0,
-		hasPendingChange: () => pendingChange != null,
+		hasPendingChange: () => pendingChange != null || pendingFullRegeneration,
 		queueFullRegeneration,
+		reconcileRuntimeCandidates,
 		resolve,
-		shouldForceFullRegeneration: (resolved) => pendingFullRegeneration || options.getCommand() === "serve" && pendingChange != null && !resolved,
+		shouldForceFullRegeneration: (file, resolved) => {
+			if (options.getCommand() !== "serve") return false;
+			if (pendingFullRegeneration) return pendingTargetsArmed && pendingCssTargetFiles?.has(normalizeCssTargetFile(file)) === true;
+			return pendingChange != null && !resolved && pendingTargetsArmed && pendingCssTargetFiles?.has(normalizeCssTargetFile(file)) === true;
+		},
 		snapshotDebugState: () => ({
 			pendingAddedCandidates: pendingChange?.addedCandidates.size ?? 0,
-			pendingCssTargets: pendingCssTargetFiles?.size ?? 0
+			pendingCssTargets: pendingCssTargetFiles?.size ?? 0,
+			pendingFullRegeneration
 		})
 	};
 }
@@ -9331,6 +9423,7 @@ function createFrameworkSourceCandidatesPlugin(options) {
 						await options.refreshTailwindRootCssSource(ctx.file, hotSource);
 					}
 					const sourceCandidateChange = await options.sourceScanSession.syncChangedFile(ctx.file, hotSource);
+					options.sourceScanSession.consumeHotUpdateChange(ctx.file);
 					const isWebLikeHotUpdate = options.isCurrentWebLikeStylePlatform();
 					let canUseHmrCandidateAppend = false;
 					if (isSourceCandidateHotUpdate) {
@@ -9349,6 +9442,7 @@ function createFrameworkSourceCandidatesPlugin(options) {
 						}
 					}
 					if (isSourceCandidateHotUpdate) await options.sourceScanSession.waitForPendingSyncs();
+					if (isSourceCandidateHotUpdate && !require_v4_generation_core.isSourceStyleRequest(ctx.file)) options.hmrCandidateState.reconcileRuntimeCandidates(ctx.file, options.sourceCandidateCollector.values(), options.tailwindRootCssModuleIds);
 					const cssModules = await resolveHotTailwindCssModules(ctx, require_v4_generation_core.isSourceStyleRequest(ctx.file) ? [ctx.file] : options.tailwindRootCssModuleIds);
 					const hotRoot = ctx.server.config?.root ?? node_process.default.cwd();
 					const sourceModules = isSourceCandidateHotUpdate && !require_v4_generation_core.isSourceStyleRequest(ctx.file) ? await resolveHotSourceModules(ctx) : ctx.modules;
@@ -9367,7 +9461,7 @@ function createFrameworkSourceCandidatesPlugin(options) {
 					}
 					const shouldSendSupplementalCssHotUpdates = !(isWebLikeHotUpdate && isSourceCandidateHotUpdate && !require_v4_generation_core.isSourceStyleRequest(ctx.file) && sourceCandidateChange !== void 0 && options.resolveCurrentGeneratorOptions().hmr.preserveDeletedCss && !sourceCandidateChange.runtimeAffecting && sourceCandidateChange.addedCandidates.size === 0 && sourceCandidateChange.removedCandidates.size > 0);
 					const supplementalCssFallbackIds = /* @__PURE__ */ new Set([...options.tailwindRootCssModuleIds, ...options.viteProcessedCssSourceFiles]);
-					if (hasHmrCandidateAppend) options.hmrCandidateState.armTargets(cssModules, supplementalCssFallbackIds);
+					if (options.hmrCandidateState.hasPendingChange()) options.hmrCandidateState.armTargets(cssModules, supplementalCssFallbackIds);
 					if (shouldSendSupplementalCssHotUpdates) sendSupplementalCssHotUpdates(ctx, cssModules, supplementalCssFallbackIds);
 					if (isWebLikeHotUpdate && isSourceCandidateHotUpdate && !require_v4_generation_core.isSourceStyleRequest(ctx.file)) return cssModules.length > 0 ? mergeHotModulesByIdentity(hotRoot, sourceModules, cssModules) : hasDifferentHotModules(sourceModules, ctx.modules) ? sourceModules : void 0;
 					if (isSourceCandidateHotUpdate && !require_v4_generation_core.isSourceStyleRequest(ctx.file) && cssModules.length > 0) return mergeHotModulesByIdentity(hotRoot, sourceModules, cssModules);
@@ -9382,6 +9476,16 @@ function createFrameworkSourceCandidatesPlugin(options) {
 	};
 }
 //#endregion
+//#region src/bundlers/vite/shared/framework-hmr-runtime-signature.ts
+const WEB_HMR_RUNTIME_AFFECTING_DIRECTIVE_RE = /@(?:theme|source|config|plugin|apply)\b/;
+function createFrameworkHmrRuntimeSignature(file, source) {
+	if (!source || !WEB_HMR_RUNTIME_AFFECTING_DIRECTIVE_RE.test(source)) return "";
+	return (isSfcStyleSourceFile((0, _weapp_tailwindcss_shared.cleanUrl)(file)) ? extractSfcStyleSources(source).filter((styleSource) => WEB_HMR_RUNTIME_AFFECTING_DIRECTIVE_RE.test(styleSource)) : [source]).map((styleSource) => require_v4_generation_core.createRuntimeAffectingSourceSignature(styleSource, "css")).join("\0");
+}
+function hasFrameworkHmrRuntimeSourceChange(file, previousSource, nextSource) {
+	return createFrameworkHmrRuntimeSignature(file, previousSource) !== createFrameworkHmrRuntimeSignature(file, nextSource);
+}
+//#endregion
 //#region src/bundlers/vite/shared/framework-source-scan-session.ts
 const SOURCE_CANDIDATE_SCAN_CACHE_MAX = 8;
 const sourceCandidateScanSnapshotCache = new lru_cache.LRUCache({ max: SOURCE_CANDIDATE_SCAN_CACHE_MAX });
@@ -9400,6 +9504,7 @@ function createFrameworkSourceScanSession(options) {
 	let sourceCandidateScanInvalidated = true;
 	const pendingSourceCandidateSyncs = /* @__PURE__ */ new Set();
 	const pendingSourceCandidateSyncByFile = /* @__PURE__ */ new Map();
+	const pendingHotUpdateChangeByFile = /* @__PURE__ */ new Map();
 	const normalizeDependency = (file) => node_path.default.normalize(node_path.default.resolve((0, _weapp_tailwindcss_shared.cleanUrl)(file)));
 	const isDependency = (file) => sourceScanDependencies.has(normalizeDependency(file));
 	const invalidate = () => {
@@ -9501,6 +9606,26 @@ function createFrameworkSourceScanSession(options) {
 	const waitForPendingSyncs = async () => {
 		while (pendingSourceCandidateSyncs.size > 0) await Promise.all(pendingSourceCandidateSyncs);
 	};
+	const rememberHotUpdateChange = (change) => {
+		if (!change) return;
+		const previous = pendingHotUpdateChangeByFile.get(change.file);
+		if (!previous) {
+			const remembered = {
+				...change,
+				addedCandidates: new Set(change.addedCandidates),
+				removedCandidates: new Set(change.removedCandidates)
+			};
+			pendingHotUpdateChangeByFile.set(change.file, remembered);
+			return remembered;
+		}
+		for (const candidate of change.addedCandidates) {
+			previous.addedCandidates.add(candidate);
+			previous.removedCandidates.delete(candidate);
+		}
+		for (const candidate of change.removedCandidates) if (!previous.addedCandidates.delete(candidate)) previous.removedCandidates.add(candidate);
+		previous.runtimeAffecting || (previous.runtimeAffecting = change.runtimeAffecting);
+		return previous;
+	};
 	const syncChangedFile = (id, sourceOverride) => {
 		if (!options.shouldOwnTailwindGeneration || !options.isCandidateRequest(id)) return Promise.resolve(void 0);
 		const file = (0, _weapp_tailwindcss_shared.cleanUrl)(id);
@@ -9511,15 +9636,18 @@ function createFrameworkSourceScanSession(options) {
 			cacheCurrent();
 			return (require_v4_generation_core.isSourceStyleRequest(file) ? (0, node_fs_promises.readFile)(file, "utf8").then((source) => options.cssMemory.refreshRememberedCssSourceBySourceFile(file, source)).catch((error) => {
 				if ((typeof error === "object" && error !== null && "code" in error ? error.code : void 0) !== "ENOENT") options.debug("remembered css source watch refresh failed: %s %O", file, error);
-			}) : Promise.resolve()).then(() => options.cssMemory.refreshRememberedCssSourceByCurrentFile(file)).then(() => options.hmrCandidateState.apply(options.hmrCandidateState.createChange(file, change, { runtimeAffecting: true })));
+			}) : Promise.resolve()).then(() => options.cssMemory.refreshRememberedCssSourceByCurrentFile(file)).then(() => rememberHotUpdateChange(options.hmrCandidateState.apply(options.hmrCandidateState.createChange(file, change, { runtimeAffecting: true }))));
 		}
 		const existingTask = pendingSourceCandidateSyncByFile.get(file);
 		if (existingTask) return existingTask.then(() => syncChangedFile(id, sourceOverride));
+		const previousSource = options.sourceCandidateCollector.source(file);
 		const task = (sourceOverride === void 0 ? options.sourceCandidateCollector.syncCurrentFile(id) : options.sourceCandidateCollector.syncCurrentSource(id, sourceOverride)).catch((error) => {
 			options.debug("source candidate watch sync failed: %s %O", id, error);
 		}).then((change) => {
 			cacheCurrent();
-			return change ? options.hmrCandidateState.apply(options.hmrCandidateState.createChange(file, change, { runtimeAffecting: runtimeAffectingByDependency })) : void 0;
+			const runtimeAffectingBySource = hasFrameworkHmrRuntimeSourceChange(file, previousSource, options.sourceCandidateCollector.source(file));
+			const appliedChange = change ? options.hmrCandidateState.apply(options.hmrCandidateState.createChange(file, change, { runtimeAffecting: runtimeAffectingByDependency || runtimeAffectingBySource })) : void 0;
+			return rememberHotUpdateChange(appliedChange) ?? pendingHotUpdateChangeByFile.get(file);
 		}).finally(() => {
 			pendingSourceCandidateSyncs.delete(task);
 			pendingSourceCandidateSyncByFile.delete(file);
@@ -9533,9 +9661,11 @@ function createFrameworkSourceScanSession(options) {
 	};
 	return {
 		cacheCurrent,
+		consumeHotUpdateChange: (id) => pendingHotUpdateChangeByFile.delete((0, _weapp_tailwindcss_shared.cleanUrl)(id)),
 		getStats: () => ({
 			pendingSourceCandidateSyncByFile: pendingSourceCandidateSyncByFile.size,
 			pendingSourceCandidateSyncs: pendingSourceCandidateSyncs.size,
+			pendingHotUpdateChangeByFile: pendingHotUpdateChangeByFile.size,
 			sourceCandidateScanCache: sourceCandidateScanCache.size
 		}),
 		invalidate,
@@ -9861,8 +9991,7 @@ function createViteFrameworkPlugins$1(options = {}, frameworkBranch) {
 		generatedClassSetByFile,
 		getCommand: () => resolvedConfig?.command,
 		getGeneratorOptions: resolveCurrentGeneratorOptions,
-		getSourceCandidate: (file) => sourceCandidateCollector.source(file),
-		isRuntimeAffectingSource: (file) => uniAppXEnabled && /\.(?:uvue|nvue)$/i.test((0, _weapp_tailwindcss_shared.cleanUrl)(file))
+		isRuntimeAffectingSource: (file) => uniAppXEnabled && !resolveCurrentGeneratorBranch().isWeb && /\.(?:uvue|nvue)$/i.test((0, _weapp_tailwindcss_shared.cleanUrl)(file))
 	});
 	const sourceScanSession = createFrameworkSourceScanSession({
 		cssMemory,
@@ -9970,7 +10099,7 @@ function createViteFrameworkPlugins$1(options = {}, frameworkBranch) {
 		const fullRuntime = getSourceCandidates() ?? getRecordedGeneratorCandidates() ?? await ensureRuntimeClassSet();
 		const transient = hookContext?.transient === true;
 		const pendingHmrChange = transient ? void 0 : hmrCandidateState.resolve(generatorCode, file);
-		const forceFullHmrCssRegeneration = hmrCandidateState.shouldForceFullRegeneration(pendingHmrChange !== void 0);
+		const forceFullHmrCssRegeneration = hmrCandidateState.shouldForceFullRegeneration(file, pendingHmrChange !== void 0);
 		const runtime = hookContext?.sourceCandidates === void 0 ? fullRuntime : new Set(hookContext.sourceCandidates);
 		const importShellCss = resolveViteServeRootMiniProgramImportShell({
 			css: generatorTransformCode,
@@ -9990,7 +10119,7 @@ function createViteFrameworkPlugins$1(options = {}, frameworkBranch) {
 			markViteProcessedCssSource(file);
 			rememberTailwindRootCssModule(id);
 			recordGeneratorCandidates(fullRuntime);
-			if (pendingHmrChange) hmrCandidateState.finishTarget(file);
+			if (pendingHmrChange || forceFullHmrCssRegeneration) hmrCandidateState.finishTarget(file);
 			else if (!hmrCandidateState.hasPendingChange()) hmrCandidateState.clear();
 			cssMemory.rememberCssSource({
 				outputFile,
@@ -10101,7 +10230,7 @@ ${previousTracedCss}`;
 		markViteProcessedCssSource(file);
 		if (require_generator.hasTailwindRootDirectives(generatorTransformCode, { importFallback: currentGeneratorOptions.importFallback })) rememberTailwindRootCssModule(id);
 		recordGeneratorCandidates(fullRuntime);
-		if (pendingHmrChange) hmrCandidateState.finishTarget(file);
+		if (pendingHmrChange || forceFullHmrCssRegeneration) hmrCandidateState.finishTarget(file);
 		else if (!hmrCandidateState.hasPendingChange()) hmrCandidateState.clear();
 		cssMemory.rememberCssSource({
 			outputFile,
@@ -10220,6 +10349,8 @@ ${tracedCss}`;
 		getResolvedConfig,
 		isEnabled: shouldEnableFrameworkExtraPlugins,
 		isIosPlatform: extraPluginPlatform.isIosPlatform === true,
+		isNativeAppStyleTarget: () => frameworkCssPipelineStrategy?.isNativeAppStyleTarget?.(createCssPipelineContext()) === true,
+		isWebGeneratorTarget: () => resolveCurrentGeneratorBranch().isWeb,
 		jsHandler,
 		mainCssChunkMatcher,
 		runtimeState,
@@ -10638,6 +10769,8 @@ function createUniAppXVitePlugins(options = {}) {
 			getResolvedConfig: context.getResolvedConfig,
 			isEnabled: context.isEnabled,
 			isIosPlatform: context.isIosPlatform,
+			isNativeAppStyleTarget: context.isNativeAppStyleTarget,
+			isWebGeneratorTarget: context.isWebGeneratorTarget,
 			jsHandler: context.jsHandler,
 			mainCssChunkMatcher: context.mainCssChunkMatcher,
 			runtimeState: context.runtimeState,

package/dist/vite.cjs

@@ -1,4 +1,4 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_vite = require("./vite-V86H6PZa.cjs");
+const require_vite = require("./vite-Dcx59GRQ.cjs");
 exports.WeappTailwindcss = require_vite.WeappTailwindcss;
 exports.weappTailwindcss = require_vite.WeappTailwindcss;

package/dist/vite.js

@@ -1,2 +1,2 @@
-import { t as WeappTailwindcss } from "./vite-BJJqWc_F.js";
+import { t as WeappTailwindcss } from "./vite-8l9_S4Qi.js";
 export { WeappTailwindcss, WeappTailwindcss as weappTailwindcss };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "weapp-tailwindcss",
   "type": "module",
-  "version": "5.2.8",
+  "version": "5.2.9",
   "description": "把 tailwindcss 原子化样式思想，带给小程序开发者们! bring tailwindcss to miniprogram developers!",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -215,8 +215,8 @@
     "oxc-walker": "^1.1.1",
     "semver": "~7.8.5",
     "yaml": "^2.9.0",
-    "@weapp-tailwindcss/postcss": "3.2.6",
     "@weapp-tailwindcss/logger": "2.0.1",
+    "@weapp-tailwindcss/postcss": "3.2.7",
     "@weapp-tailwindcss/reset": "0.1.2",
     "@weapp-tailwindcss/shared": "2.0.1",
     "tailwindcss-config": "2.0.2",