weapp-tailwindcss 5.1.11 → 5.1.13

package/dist/{vite-DODC15Fr.js → vite-DnkObu2L.js}

@@ -1,11 +1,13 @@
 const require_rolldown_runtime = require("./rolldown-runtime-emK7D4bc.js");
 const require_framework = require("./framework.js");
-const require_generator = require("./generator-Bz94KTkH.js");
-const require_utils = require("./utils-D3h8j7Mk.js");
-const require_context = require("./context-y2BGCok4.js");
-const require_tailwindcss = require("./tailwindcss-Dn5DVlkI.js");
-const require_hmr_timing = require("./hmr-timing-DOTdH18A.js");
-const require_source_candidate_scan_signature = require("./source-candidate-scan-signature-BrWuBTjY.js");
+const require_generator = require("./generator-CS10c9g1.js");
+const require_object = require("./object-COs_Mw6p.js");
+const require_tailwindcss = require("./tailwindcss-z9JMF-qU.js");
+require("./utils-CuKLf1Zv.js");
+const require_wxml = require("./wxml-Ce10eREX.js");
+const require_context = require("./context-DRRgW7i2.js");
+const require_hmr_timing = require("./hmr-timing-DW1g3zjl.js");
+const require_source_candidate_scan_signature = require("./source-candidate-scan-signature-CMgu5bJk.js");
 require("./logger-TlKT3xmR.js");
 let node_fs = require("node:fs");
 node_fs = require_rolldown_runtime.__toESM(node_fs);
@@ -141,7 +143,7 @@ function cssToStyleExport(source) {
 				result[match[1]] = { "": declarations };
 				const className = unescapeCssClassSelector(match[1]);
 				result[className] = { "": declarations };
-				result[require_context.replaceWxml(className)] = { "": declarations };
+				result[require_wxml.replaceWxml(className)] = { "": declarations };
 			}
 		}
 	});
@@ -179,14 +181,14 @@ function createStyleValueFromApplySources(sources, utilityStyles) {
 					if (!className) continue;
 					const declarations = {};
 					for (const applyRule of applyRules) for (const utility of (0, _tailwindcss_mangle_engine.splitCandidateTokens)(applyRule.params)) {
-						const utilityDeclarations = utilityStyles[utility]?.[""] ?? utilityStyles[require_context.replaceWxml(utility)]?.[""];
+						const utilityDeclarations = utilityStyles[utility]?.[""] ?? utilityStyles[require_wxml.replaceWxml(utility)]?.[""];
 						if (utilityDeclarations) Object.assign(declarations, utilityDeclarations);
 					}
 					if (Object.keys(declarations).length > 0) {
 						const unescapedClassName = unescapeCssClassSelector(className);
 						result[className] = { "": declarations };
 						result[unescapedClassName] = { "": declarations };
-						result[require_context.replaceWxml(unescapedClassName)] = { "": declarations };
+						result[require_wxml.replaceWxml(unescapedClassName)] = { "": declarations };
 					}
 				}
 			});
@@ -482,15 +484,19 @@ function collectExplicitTailwindV4CssEntries(opts) {
 	];
 	return [...new Set(entries.filter((entry) => typeof entry === "string" && entry.length > 0))];
 }
+function shouldKeepSingleExplicitCssEntrySource(source) {
+	return /@plugin\b/.test(source);
+}
 function collectConfiguredTailwindV4CssSourceEntries(opts, fallbackBase) {
 	const entries = [];
 	const seen = /* @__PURE__ */ new Set();
 	const explicitCssEntries = collectExplicitTailwindV4CssEntries(opts);
-	for (const cssEntry of explicitCssEntries.length > 1 ? explicitCssEntries : []) {
+	for (const cssEntry of explicitCssEntries) {
 		if (typeof cssEntry !== "string" || cssEntry.length === 0) continue;
 		const resolvedFile = node_path.default.isAbsolute(cssEntry) ? node_path.default.resolve(cssEntry) : node_path.default.resolve(fallbackBase, cssEntry);
 		if (!(0, node_fs.existsSync)(resolvedFile)) continue;
 		const source = (0, node_fs.readFileSync)(resolvedFile, "utf8");
+		if (explicitCssEntries.length <= 1 && !shouldKeepSingleExplicitCssEntrySource(source)) continue;
 		const key = `${resolvedFile}\0${source}`;
 		if (seen.has(key)) continue;
 		seen.add(key);
@@ -3460,7 +3466,7 @@ function resolveUniAppXStyleIsolationEnabled(root) {
 //#region src/uni-app-x/vite.ts
 let transformUVuePromise;
 function loadTransformUVue() {
-	transformUVuePromise ?? (transformUVuePromise = Promise.resolve().then(() => require("./transform-DZQETx51.js")).then((mod) => mod.transformUVue));
+	transformUVuePromise ?? (transformUVuePromise = Promise.resolve().then(() => require("./transform-COFRlmDF.js")).then((mod) => mod.transformUVue));
 	return transformUVuePromise;
 }
 const preprocessorLangs = /* @__PURE__ */ new Set([
@@ -3494,7 +3500,7 @@ function isCssModuleExport(code) {
 function createUniAppXPlugins(options) {
 	const { appType, customAttributesEntities, disabledDefaultTemplateHandler, isIosPlatform: providedIosPlatform, mainCssChunkMatcher, runtimeState, styleHandler, generateCss, jsHandler, ensureRuntimeClassSet, getResolvedConfig, isEnabled = () => true, uniAppX } = options;
 	const resolvedUniAppXOptions = require_tailwindcss.resolveUniAppXOptions(uniAppX);
-	const utsPlatform = require_utils.resolveUniUtsPlatform();
+	const utsPlatform = require_generator.resolveUniUtsPlatform();
 	const isIosPlatform = providedIosPlatform ?? utsPlatform.isAppIos;
 	const isHarmonyPlatform = utsPlatform.isAppHarmony;
 	const cssHandlerOptionsCache = /* @__PURE__ */ new Map();
@@ -3527,7 +3533,7 @@ function createUniAppXPlugins(options) {
 		return isHarmonyPlatform && resolvedUniAppXOptions.componentLocalStyles.enabled;
 	}
 	function isHarmonyBuildTarget() {
-		if (require_utils.resolveUniUtsPlatform().isAppHarmony) return true;
+		if (require_generator.resolveUniUtsPlatform().isAppHarmony) return true;
 		return isUniAppXHarmonyOutDir(getResolvedConfig()?.build?.outDir);
 	}
 	async function transformStyle(code, id, query, hookContext) {
@@ -3541,7 +3547,7 @@ function createUniAppXPlugins(options) {
 			const cacheKey = `${mainCssChunkMatcher(id, appType) ? "1" : "0"}:${id}`;
 			let styleHandlerOptions = cssHandlerOptionsCache.get(cacheKey);
 			if (!styleHandlerOptions) {
-				styleHandlerOptions = require_generator.omitUndefined({
+				styleHandlerOptions = require_object.omitUndefined({
 					isMainChunk: mainCssChunkMatcher(id, appType),
 					uniAppXCssTarget: resolveUniAppXCssTarget(id),
 					uniAppXUnsupported: resolvedUniAppXOptions.uvueUnsupported,
@@ -3604,7 +3610,7 @@ function createUniAppXPlugins(options) {
 			const transformUVue = await loadTransformUVue();
 			const enableComponentLocalStyle = shouldEnableComponentLocalStyle();
 			const enablePageLocalStyle = shouldEnableHarmonyPageLocalStyle();
-			if (customAttributesEntities.length > 0 || disabledDefaultTemplateHandler || enableComponentLocalStyle || enablePageLocalStyle) return transformUVue(code, id, jsHandler, currentRuntimeSet, require_generator.omitUndefined({
+			if (customAttributesEntities.length > 0 || disabledDefaultTemplateHandler || enableComponentLocalStyle || enablePageLocalStyle) return transformUVue(code, id, jsHandler, currentRuntimeSet, require_object.omitUndefined({
 				...customAttributesEntities.length > 0 ? { customAttributesEntities } : {},
 				...disabledDefaultTemplateHandler ? { disabledDefaultTemplateHandler } : {},
 				...enableComponentLocalStyle ? { enableComponentLocalStyle } : {},
@@ -3633,7 +3639,7 @@ function createUniAppXPlugins(options) {
 			order: "post",
 			async handler(_options, bundle) {
 				if (!isEnabled()) return;
-				const currentUtsPlatform = require_utils.resolveUniUtsPlatform();
+				const currentUtsPlatform = require_generator.resolveUniUtsPlatform();
 				const canInferHarmonyTarget = !currentUtsPlatform.normalized || currentUtsPlatform.isApp;
 				const isHarmonyTarget = currentUtsPlatform.isAppHarmony || canInferHarmonyTarget && isHarmonyBuildTarget();
 				if (!currentUtsPlatform.isApp && !isHarmonyTarget) return;
@@ -3806,7 +3812,8 @@ function processJsBundleEntry(options) {
 					return;
 				}
 				const currentSource = originalEntrySource;
-				const precheckOptions = createHandlerOptions(node_path.default.resolve(outDir, file), {
+				const absoluteFile = node_path.default.resolve(outDir, file);
+				const precheckOptions = createHandlerOptions(absoluteFile, {
 					uniAppX: resolveUniAppXJsTransformEnabled$1(uniAppX),
 					babelParserOptions: {
 						plugins: ["typescript"],
@@ -4665,6 +4672,9 @@ function inferPlatformFromViteOutDir$1(outDir) {
 	const normalized = segment.trim().toLowerCase();
 	if (normalized === "h5" || normalized === "web" || normalized === "app" || normalized === "app-plus" || normalized.startsWith("app-") || normalized.startsWith("mp-") || normalized.startsWith("quickapp-webview")) return normalized;
 }
+function hasTailwindPluginDirective(source) {
+	return /@plugin\b/.test(source);
+}
 function createGenerateBundleHook(context) {
 	const state = require_source_candidate_scan_signature.createBundleBuildState();
 	const lastCssResultByFile = /* @__PURE__ */ new Map();
@@ -4717,7 +4727,7 @@ function createGenerateBundleHook(context) {
 		const getCssSource = (sourceFile) => getKnownCssSource?.(sourceFile) ?? getSourceCandidateSource?.(sourceFile);
 		const { cache, onEnd, onStart, onUpdate, styleHandler, templateHandler, jsHandler, uniAppX } = opts;
 		const resolvedConfig = getResolvedConfig();
-		const uniUtsPlatform = require_utils.resolveUniUtsPlatform();
+		const uniUtsPlatform = require_generator.resolveUniUtsPlatform();
 		const generatorPlatform = opts.cssOptions?.platform ?? opts.platform ?? inferPlatformFromViteOutDir$1(resolvedConfig?.build?.outDir);
 		const generatorOptions = require_generator.normalizeWeappTailwindcssGeneratorOptions(opts.generator, {
 			appType: opts.appType,
@@ -5262,8 +5272,9 @@ function createGenerateBundleHook(context) {
 				if (!hasUsableRememberedTailwindSource) {
 					const configuredTailwindV4CssSourceEntries = getConfiguredTailwindV4CssSourceEntries();
 					const isCurrentRootMiniProgramStyleOutput = opts.cssMatcher(outputFile) && isMiniProgramStyleOutputFile(outputFile) && !require_source_candidate_scan_signature.normalizeOutputPathKey(outputFile.replace(/[?#].*$/, "")).includes("/");
-					if (isCurrentRootMiniProgramStyleOutput && hasTailwindGenerationSource(rawSource)) {
-						const configuredGenerationSource = selectTailwindV4GenerationCssSourceForOutput(outputFile, configuredTailwindV4CssSourceEntries, rawSource, {
+					const configuredEntriesForCurrentRootMiniProgramStyle = isCurrentRootMiniProgramStyleOutput && !hasTailwindGenerationSource(rawSource) ? configuredTailwindV4CssSourceEntries.filter((entry) => hasTailwindPluginDirective(entry.source)) : configuredTailwindV4CssSourceEntries;
+					if (isCurrentRootMiniProgramStyleOutput && (hasTailwindGenerationSource(rawSource) || configuredEntriesForCurrentRootMiniProgramStyle.length > 0)) {
+						const configuredGenerationSource = selectTailwindV4GenerationCssSourceForOutput(outputFile, configuredEntriesForCurrentRootMiniProgramStyle, rawSource, {
 							cwd: opts.tailwindcssBasedir,
 							outputRoot: outDir,
 							projectRoot: sourceRoot ?? rootDir
@@ -5507,7 +5518,7 @@ function createGenerateBundleHook(context) {
 						const runTransform = async () => {
 							const start = performance.now();
 							await runtimeState.readyPromise;
-							const previousCss = !vitePipelineCssAsset && useIncrementalMode && !hasRuntimeAffectingChanges && !snapshot.changedByType.css.has(file) ? getLastCssResult(lastCssResultByFile, outputFile, file) : void 0;
+							const previousCss = !vitePipelineCssAsset && useIncrementalMode && !generatorCandidatesChanged && !hasRuntimeAffectingChanges && !snapshot.changedByType.css.has(file) ? getLastCssResult(lastCssResultByFile, outputFile, file) : void 0;
 							const generatorTransformRawSource = generatorRawSource;
 							const previousGeneratorCss = previousCss && !isWebGeneratorTarget ? normalizeMiniProgramGeneratorRawSource(previousCss, outputFile) : previousCss;
 							const generated = hasTailwindGenerationSource(generatorTransformRawSource) || require_source_candidate_scan_signature.hasBundlerGeneratedCssMarker(rawSource) ? await require_source_candidate_scan_signature.generateTailwindV4Css({
@@ -5529,7 +5540,8 @@ function createGenerateBundleHook(context) {
 								...usesConfiguredTailwindV4FallbackSource ? { restoreLocalCssImports: false } : {}
 							}) : void 0;
 							if (generated) {
-								const tracedCss = removeRootCoveredCssFromScopedAsset(annotateCss(transformWebTargetCss(generated.css)));
+								const outputCss = transformWebTargetCss(generated.css);
+								const tracedCss = removeRootCoveredCssFromScopedAsset(annotateCss(outputCss));
 								registerGeneratorDependencies$1({ addWatchFile }, generated.dependencies);
 								if (envFlags.debugCssDiff) debug("css diff %s: %s", generatorSourceFile, require_source_candidate_scan_signature.summarizeStringDiff(generatorRawSource, tracedCss));
 								debug("css generated result: %s bytes=%d", file, tracedCss.length);
@@ -5788,7 +5800,7 @@ function createViteCssFinalizerOutputPlugin(context) {
 			async handler(_options, bundle) {
 				const { opts, runtimeState, ensureRuntimeClassSet, cssPipelineStrategy, isCssAssetProcessed, markCssAssetProcessed, debug, getResolvedConfig, recordCssAssetResult, recordViteProcessedCssAssetResult, getViteProcessedCssAssetResults, getRecordedGeneratorCandidates, getSourceCandidates, getSourceCandidatesForEntries, getSourceCandidateSourcesForEntries, waitForSourceCandidateSyncs, rememberMainCssSource, getRememberedMainCssSource, isViteProcessedCssAsset } = context;
 				const resolvedConfig = getResolvedConfig();
-				const uniUtsPlatform = require_utils.resolveUniUtsPlatform();
+				const uniUtsPlatform = require_generator.resolveUniUtsPlatform();
 				const generatorPlatform = opts.cssOptions?.platform ?? opts.platform ?? inferPlatformFromViteOutDir(resolvedConfig?.build?.outDir);
 				const generatorOptions = require_generator.normalizeWeappTailwindcssGeneratorOptions(opts.generator, {
 					appType: opts.appType,
@@ -6289,7 +6301,8 @@ function resolveHotTailwindCssModules(ctx, tailwindRootCssModuleIds) {
 	};
 	const collectModule = (mod) => {
 		if (mod == null || seenModules.has(mod)) return;
-		if (!isHotSourceStyleModule(mod.id ?? mod.url)) return;
+		const modId = mod.id ?? mod.url;
+		if (!isHotSourceStyleModule(modId)) return;
 		seenModules.add(mod);
 		ctx.server.moduleGraph.invalidateModule(mod);
 		modules.push(mod);
@@ -6618,8 +6631,9 @@ function createViteRuntimeClassSet(options) {
 	}
 	async function refreshRuntimeState(force) {
 		const invalidation = resolveRuntimeRefreshOptions();
+		const shouldRefresh = force || invalidation.changed;
 		const refreshed = await require_context.refreshTailwindRuntimeState(runtimeState, {
-			force: force || invalidation.changed,
+			force: shouldRefresh,
 			clearCache: force || invalidation.changed
 		});
 		if (invalidation.changed) debug("runtime signature changed, refresh triggered. signature: %s", invalidation.signature);
@@ -6832,7 +6846,7 @@ function resolveImplicitTailwindcssBasedirFromViteRoot(root) {
 }
 //#endregion
 //#region src/bundlers/vite/shared/create-framework-plugins.ts
-const debug = require_context.createDebug();
+const debug = require_wxml.createDebug();
 const weappTailwindcssPackageDir = require_source_candidate_scan_signature.resolvePackageDir("weapp-tailwindcss");
 const weappTailwindcssDirPosix = require_source_candidate_scan_signature.slash(weappTailwindcssPackageDir);
 const SOURCE_CANDIDATE_SCAN_CACHE_MAX = 8;
@@ -7025,11 +7039,12 @@ function createViteFrameworkPlugins(options = {}, frameworkBranch) {
 			if (autoCssSourceContent.get(sourceFile) === sourceCss) continue;
 			autoCssSourceContent.set(sourceFile, sourceCss);
 			await syncTailwindCssSourceCandidates(sourceFile, sourceCss);
+			const resolved = await require_tailwindcss.resolveTailwindV4EntriesFromCssCached(sourceCss, sourceBase);
 			changed = require_generator.upsertTailwindV4CssSource(opts, {
 				file: sourceFile,
 				base: sourceBase,
 				css: sourceCss,
-				dependencies: (await require_tailwindcss.resolveTailwindV4EntriesFromCssCached(sourceCss, sourceBase))?.dependencies ?? []
+				dependencies: resolved?.dependencies ?? []
 			}) || changed;
 		}
 		if (!changed) return;
@@ -7114,7 +7129,8 @@ function createViteFrameworkPlugins(options = {}, frameworkBranch) {
 	let pendingHmrCandidateChange;
 	let pendingHmrCssTargetFiles;
 	let pendingFullHmrCssRegeneration = false;
-	const normalizeHmrCssTargetFile = (file) => normalizeVitePersistentCacheKey((0, _weapp_tailwindcss_shared.cleanUrl)(file));
+	const normalizeGeneratedCssCacheFile = (file) => normalizeVitePersistentCacheKey((0, _weapp_tailwindcss_shared.cleanUrl)(file));
+	const normalizeHmrCssTargetFile = normalizeGeneratedCssCacheFile;
 	const collectPendingHmrCssTargetFiles = (cssModules, fallbackCssIds) => {
 		const targets = /* @__PURE__ */ new Set();
 		const addTarget = (file) => {
@@ -7187,7 +7203,8 @@ function createViteFrameworkPlugins(options = {}, frameworkBranch) {
 		return change;
 	};
 	const resolvePendingHmrCandidateChange = (generatorCode, file) => {
-		if (resolvedConfig?.command !== "serve" || !pendingHmrCandidateChange || pendingHmrCandidateChange.runtimeAffecting || pendingHmrCandidateChange.addedCandidates.size === 0 || resolveCurrentGeneratorOptions().target === "weapp" && require_generator.hasUserCssLayerBlocks(generatorCode) || !cleanGeneratedCssByFile.has(file) || !generatedClassSetByFile.has(file) || pendingHmrCssTargetFiles !== void 0 && !pendingHmrCssTargetFiles.has(normalizeHmrCssTargetFile(file))) return;
+		const fileKey = normalizeGeneratedCssCacheFile(file);
+		if (resolvedConfig?.command !== "serve" || !pendingHmrCandidateChange || pendingHmrCandidateChange.runtimeAffecting || pendingHmrCandidateChange.addedCandidates.size === 0 || resolveCurrentGeneratorOptions().target === "weapp" && require_generator.hasUserCssLayerBlocks(generatorCode) || !cleanGeneratedCssByFile.has(fileKey) || !generatedClassSetByFile.has(fileKey) || pendingHmrCssTargetFiles !== void 0 && !pendingHmrCssTargetFiles.has(fileKey)) return;
 		return pendingHmrCandidateChange;
 	};
 	const finishPendingHmrCssTargetFile = (file) => {
@@ -7342,9 +7359,10 @@ function createViteFrameworkPlugins(options = {}, frameworkBranch) {
 	const recordViteProcessedCssAssetResult = (file, css, options = {}) => {
 		const key = normalizeVitePersistentCacheKey(file);
 		const previous = viteProcessedCssAssetResults.get(key);
+		const injectIntoMain = previous?.injectIntoMain === true ? true : options.injectIntoMain ?? previous?.injectIntoMain;
 		touchMapEntry(viteProcessedCssAssetResults, key, {
 			css,
-			injectIntoMain: previous?.injectIntoMain === true ? true : options.injectIntoMain ?? previous?.injectIntoMain,
+			injectIntoMain,
 			outputFile: options.outputFile ?? previous?.outputFile
 		});
 	};
@@ -7440,12 +7458,13 @@ function createViteFrameworkPlugins(options = {}, frameworkBranch) {
 		const sourceRoot = resolveWeappViteSourceRoot(resolvedConfig, opts.appType);
 		const outputFile = resolveViteCssPipelineOutputFile(requestFile, opts, rootDir, currentGeneratorBranch.isWeb, shouldPreserveStyleOutputExtension, sourceRoot);
 		const generatorTransformCode = currentGeneratorBranch.isWeb ? generatorCode : require_hmr_timing.normalizeMiniProgramGeneratorCssSource(generatorCode, outputFile);
+		const fileKey = normalizeGeneratedCssCacheFile(file);
 		const fullRuntime = getSourceCandidates() ?? getRecordedGeneratorCandidates() ?? await ensureRuntimeClassSet();
 		const pendingHmrChange = resolvePendingHmrCandidateChange(generatorCode, file);
 		const forceFullHmrCssRegeneration = pendingFullHmrCssRegeneration || resolvedConfig?.command === "serve" && pendingHmrCandidateChange !== void 0 && pendingHmrChange === void 0;
-		const runtime = pendingHmrChange ? new Set(pendingHmrChange.addedCandidates) : fullRuntime;
+		const runtime = fullRuntime;
 		if (pendingHmrChange && currentGeneratorOptions.target === "weapp" && require_generator.filterUnsupportedMiniProgramTailwindV4Candidates(pendingHmrChange.addedCandidates).size === 0) {
-			const previousTracedCss = tracedGeneratedCssByFile.get(file);
+			const previousTracedCss = tracedGeneratedCssByFile.get(fileKey);
 			if (previousTracedCss !== void 0) {
 				finishPendingHmrCssTargetFile(file);
 				return `${require_source_candidate_scan_signature.createBundlerGeneratedCssMarker("vite", normalizeViteProcessedCssFile(file))}\n${previousTracedCss}`;
@@ -7467,8 +7486,6 @@ function createViteFrameworkPlugins(options = {}, frameworkBranch) {
 			cssHandlerOptions,
 			generatorCode: generatorTransformCode
 		}) ?? true);
-		const previousCss = pendingHmrChange && !forceFullHmrCssRegeneration ? cleanGeneratedCssByFile.get(file) : void 0;
-		const previousGeneratorCss = previousCss && !currentGeneratorBranch.isWeb ? require_hmr_timing.normalizeMiniProgramGeneratorCssSource(previousCss, outputFile) : previousCss;
 		const generated = await hmrTimingRecorder.measure("generateCss.serve", () => require_source_candidate_scan_signature.generateTailwindV4Css({
 			opts,
 			runtimeState,
@@ -7483,15 +7500,13 @@ function createViteFrameworkPlugins(options = {}, frameworkBranch) {
 			generatorPlatform: resolveGeneratorPlatform(),
 			styleHandler,
 			debug,
-			previousCss: previousGeneratorCss,
-			previousClassSet: pendingHmrChange && !forceFullHmrCssRegeneration ? generatedClassSetByFile.get(file) : void 0,
 			deferEmptyScopedCssSource: shouldDeferEmptyScopedCssSource,
-			disableSourceScan: pendingHmrChange !== void 0,
+			disableSourceScan: false,
 			restoreLocalCssImports: !currentGeneratorBranch.isWeb
 		}), {
 			file,
 			memoryDebug: {
-				cleanCacheHit: cleanGeneratedCssByFile.has(file),
+				cleanCacheHit: cleanGeneratedCssByFile.has(fileKey),
 				forceFullHmrCssRegeneration,
 				pendingAddedCandidates: pendingHmrCandidateChange?.addedCandidates.size ?? 0,
 				pendingCssTargets: pendingHmrCssTargetFiles?.size ?? 0,
@@ -7518,9 +7533,9 @@ function createViteFrameworkPlugins(options = {}, frameworkBranch) {
 			tokenSources: require_hmr_timing.createCssTokenSourceMap(getSourceCandidateSourcesForEntries(void 0), opts)
 		});
 		for (const dependency of generated.dependencies) hookContext?.addWatchFile?.(dependency);
-		cleanGeneratedCssByFile.set(file, outputCss);
-		tracedGeneratedCssByFile.set(file, tracedCss);
-		generatedClassSetByFile.set(file, new Set(generated.classSet));
+		cleanGeneratedCssByFile.set(fileKey, outputCss);
+		tracedGeneratedCssByFile.set(fileKey, tracedCss);
+		generatedClassSetByFile.set(fileKey, new Set(generated.classSet));
 		const shouldInjectGeneratedCssIntoMain = mainCssChunkMatcher(outputFile, opts.appType) || require_generator.hasTailwindRootDirectives(generatorTransformCode, { importFallback: currentGeneratorOptions.importFallback }) && !require_source_candidate_scan_signature.normalizeOutputPathKey(outputFile).includes("/");
 		recordViteProcessedCssAssetResult(file, tracedCss, {
 			injectIntoMain: shouldInjectGeneratedCssIntoMain,
@@ -8026,7 +8041,7 @@ function withUniAppXWebPreflightReset(css, enabled) {
 //#endregion
 //#region src/bundlers/vite/uni-app-x-css-options.ts
 function resolveUniAppXNativeCssHandlerOptions(opts) {
-	const uniUtsPlatform = require_utils.resolveUniUtsPlatform();
+	const uniUtsPlatform = require_generator.resolveUniUtsPlatform();
 	if (!require_generator.shouldUseNativeAppCssBranch(require_generator.resolveGeneratorRuntimeBranch(require_generator.normalizeWeappTailwindcssGeneratorOptions(opts.generator, {
 		appType: opts.appType,
 		platform: opts.cssOptions?.platform ?? opts.platform,
@@ -8047,10 +8062,10 @@ function resolveUniAppXNativeCssHandlerOptions(opts) {
 //#endregion
 //#region src/bundlers/vite/frameworks/uni-app-x/index.ts
 function isUniAppXNativeAppStyleTarget() {
-	return require_utils.resolveUniUtsPlatform().isApp;
+	return require_generator.resolveUniUtsPlatform().isApp;
 }
 function isUniAppXHarmonyAppStyleTarget(context) {
-	const uniUtsPlatform = require_utils.resolveUniUtsPlatform();
+	const uniUtsPlatform = require_generator.resolveUniUtsPlatform();
 	const canInferHarmonyAppStyleTarget = !uniUtsPlatform.normalized || uniUtsPlatform.isApp;
 	return uniUtsPlatform.isAppHarmony || canInferHarmonyAppStyleTarget && (context.bundle != null && isUniAppXHarmonyBundle(context.bundle) || isUniAppXHarmonyOutDir(context.resolvedConfig?.build?.outDir));
 }
@@ -8083,7 +8098,7 @@ function createUniAppXVitePlugins(options = {}) {
 	return createViteFrameworkPlugins(options, {
 		frameworkName: "uni-app-x",
 		cssPipelineStrategy: uniAppXCssPipelineStrategy,
-		getExtraPluginPlatform: () => ({ isIosPlatform: require_utils.resolveUniUtsPlatform().isAppIos }),
+		getExtraPluginPlatform: () => ({ isIosPlatform: require_generator.resolveUniUtsPlatform().isAppIos }),
 		styleInjectorDelegate: require_source_candidate_scan_signature.viteStyleInjectorDelegates.uniApp,
 		isRuntimeClassSetFeatureEnabled: () => true,
 		createExtraPlugins: (context) => createUniAppXPlugins({

package/dist/{vite-oI2ReOic.mjs → vite-Tpgi77vE.mjs}

@@ -1,10 +1,12 @@
 import { resolveImplicitAppTypeFromViteRoot } from "./framework.mjs";
-import { $ as normalizeTailwindSourceForGenerator, A as hasUserCssLayerBlocks, G as stripMiniProgramCssSpecificityPlaceholders, H as hasMiniProgramCssSpecificityPlaceholders, J as hasTailwindNonRootGenerationDirectives, K as hasLocalCssImport, M as normalizeEmptyTailwindCustomVariants, Nt as filterUnsupportedMiniProgramTailwindV4Candidates, Pt as omitUndefined, T as resolveTailwindcssOptions, X as hasTailwindSourceDirectives, Y as hasTailwindRootDirectives, Z as normalizeTailwindConfigDirectives, _t as getTailwindV4IncrementalGenerateCacheStats, a as resolveGeneratorRuntimeBranch, b as findNearestPackageRoot, c as shouldUseNativeAppCssBranch, dt as stripGeneratorPlaceholderMarkers, et as parseImportRequest, h as upsertTailwindV4CssSource, i as normalizeWeappTailwindcssGeneratorOptions, kt as resolveTailwindV4CssSourceBase, m as hasConfiguredTailwindV4CssRoots, p as filterTailwindV4CssSourceRoots, q as hasTailwindApplyDirective, s as shouldUseMiniProgramCssBranch, st as hasTailwindGeneratedCssMarkers, tt as removeTailwindSourceDirectives, v as isTailwindV4CssEntry, y as normalizeCssEntries } from "./generator-ROzBodj6.mjs";
-import { o as resolveUniUtsPlatform } from "./utils-DodxWHGz.mjs";
-import { C as normalizeFrameworkStylePlatform, S as createDebug, _ as toCustomAttributesEntities, a as vitePluginName, l as shouldSkipJsTransform, m as replaceWxml, n as normalizeStyleHandlerMajorVersion, t as getCompilerContext, v as collectRuntimeClassSet, x as refreshTailwindRuntimeState, y as createTailwindRuntimeReadyPromise } from "./context-DzkSFEVL.mjs";
-import { _ as resolveViteTailwindV4CssDependencies, a as findTailwindConfig, f as createViteSourceScanMatcher, g as resolveTailwindV4EntriesFromCssCached, i as resolveUniAppXOptions, l as getRuntimeClassSetSignature, m as discoverTailwindV4CssEntries, p as resolveViteSourceScanEntries, r as isUniAppXEnabled } from "./tailwindcss-hzy_WaC9.mjs";
-import { A as processCachedTask, D as createCssSourceTraceCacheSignature, E as annotateCssSourceTrace, O as createCssTokenSourceMap, S as scoreTailwindV4CssSourceFileMatch, _ as normalizeMiniProgramGeneratorCssSource, a as isSourceCandidateRequest, d as validateCandidatesByGenerator, g as mergeMarkedUserLayerComponentsCss, h as extractMarkedUserLayerComponentsCss, m as runWithConcurrency, r as createSourceCandidateCollector, s as createBundleRuntimeClassSetManager, t as createHmrTimingRecorder, v as normalizeMiniProgramImportShell, y as isPureLocalCssImportWrapper } from "./hmr-timing-DwtYJdwb.mjs";
-import { A as createBundlerGeneratedCssMarker, B as resolveViteFrameworkProfile, C as createBundleModuleGraphOptions, D as normalizeOutputPathKey, E as stripRequestQuery, F as resolvePluginDisabledState, I as createBuiltinViteStyleInjectorPlugins, M as parseBundlerGeneratedCssMarkerBlocks, N as stripBundlerGeneratedCssMarkers, P as resolvePackageDir, R as viteStyleInjectorDelegates, S as applyLinkedResults, T as isSourceStyleRequest, _ as isCSSRequest, a as createCandidateSignature, b as slash, c as getSnapshotHash, d as buildBundleSnapshot, g as formatPostcssSourceMap, h as cleanUrl, i as createScopedGeneratorSourceTraceMap, j as hasBundlerGeneratedCssMarker, k as toAbsoluteOutputPath, l as hasRuntimeAffectingSourceChanges, m as updateBundleBuildState, n as createScopedGeneratorCandidateSignature, o as createJsHashSalt, p as createBundleBuildState, r as createScopedGeneratorRuntime, s as createLinkedImpactSignature, t as createSourceCandidateScanSignature, u as summarizeStringDiff, v as isHTMLRequest, w as generateTailwindV4Css, x as createRuntimeAffectingSourceSignature, y as normalizePath } from "./source-candidate-scan-signature-CQ04hiox.mjs";
+import { At as resolveTailwindV4CssSourceBase, E as resolveTailwindcssOptions, J as hasTailwindApplyDirective, K as stripMiniProgramCssSpecificityPlaceholders, N as normalizeEmptyTailwindCustomVariants, Nt as filterUnsupportedMiniProgramTailwindV4Candidates, Q as normalizeTailwindConfigDirectives, U as hasMiniProgramCssSpecificityPlaceholders, X as hasTailwindRootDirectives, Y as hasTailwindNonRootGenerationDirectives, Z as hasTailwindSourceDirectives, a as resolveGeneratorRuntimeBranch, b as normalizeCssEntries, c as shouldUseNativeAppCssBranch, ct as hasTailwindGeneratedCssMarkers, et as normalizeTailwindSourceForGenerator, ft as stripGeneratorPlaceholderMarkers, g as upsertTailwindV4CssSource, h as hasConfiguredTailwindV4CssRoots, i as normalizeWeappTailwindcssGeneratorOptions, j as hasUserCssLayerBlocks, l as resolveUniUtsPlatform, m as filterTailwindV4CssSourceRoots, nt as removeTailwindSourceDirectives, q as hasLocalCssImport, s as shouldUseMiniProgramCssBranch, tt as parseImportRequest, vt as getTailwindV4IncrementalGenerateCacheStats, x as findNearestPackageRoot, y as isTailwindV4CssEntry } from "./generator-BvPcmqxU.mjs";
+import { t as omitUndefined } from "./object-BJSWl-E5.mjs";
+import { _ as resolveViteTailwindV4CssDependencies, a as findTailwindConfig, f as createViteSourceScanMatcher, g as resolveTailwindV4EntriesFromCssCached, i as resolveUniAppXOptions, l as getRuntimeClassSetSignature, m as discoverTailwindV4CssEntries, p as resolveViteSourceScanEntries, r as isUniAppXEnabled } from "./tailwindcss-DZT_pWrd.mjs";
+import "./utils-MVwpU07P.mjs";
+import { g as replaceWxml, y as createDebug } from "./wxml-DdGdeqaH.mjs";
+import { a as vitePluginName, c as collectRuntimeClassSet, d as refreshTailwindRuntimeState, f as normalizeFrameworkStylePlatform, l as createTailwindRuntimeReadyPromise, n as normalizeStyleHandlerMajorVersion, o as shouldSkipJsTransform, s as toCustomAttributesEntities, t as getCompilerContext } from "./context-xSJE588m.mjs";
+import { A as processCachedTask, D as createCssSourceTraceCacheSignature, E as annotateCssSourceTrace, O as createCssTokenSourceMap, S as scoreTailwindV4CssSourceFileMatch, _ as normalizeMiniProgramGeneratorCssSource, a as isSourceCandidateRequest, d as validateCandidatesByGenerator, g as mergeMarkedUserLayerComponentsCss, h as extractMarkedUserLayerComponentsCss, m as runWithConcurrency, r as createSourceCandidateCollector, s as createBundleRuntimeClassSetManager, t as createHmrTimingRecorder, v as normalizeMiniProgramImportShell, y as isPureLocalCssImportWrapper } from "./hmr-timing-hRhRAjYV.mjs";
+import { A as createBundlerGeneratedCssMarker, B as resolveViteFrameworkProfile, C as createBundleModuleGraphOptions, D as normalizeOutputPathKey, E as stripRequestQuery, F as resolvePluginDisabledState, I as createBuiltinViteStyleInjectorPlugins, M as parseBundlerGeneratedCssMarkerBlocks, N as stripBundlerGeneratedCssMarkers, P as resolvePackageDir, R as viteStyleInjectorDelegates, S as applyLinkedResults, T as isSourceStyleRequest, _ as isCSSRequest, a as createCandidateSignature, b as slash, c as getSnapshotHash, d as buildBundleSnapshot, g as formatPostcssSourceMap, h as cleanUrl, i as createScopedGeneratorSourceTraceMap, j as hasBundlerGeneratedCssMarker, k as toAbsoluteOutputPath, l as hasRuntimeAffectingSourceChanges, m as updateBundleBuildState, n as createScopedGeneratorCandidateSignature, o as createJsHashSalt, p as createBundleBuildState, r as createScopedGeneratorRuntime, s as createLinkedImpactSignature, t as createSourceCandidateScanSignature, u as summarizeStringDiff, v as isHTMLRequest, w as generateTailwindV4Css, x as createRuntimeAffectingSourceSignature, y as normalizePath } from "./source-candidate-scan-signature-t4XKAQ04.mjs";
 import { t as logger$1 } from "./logger-BNzxZbZj.mjs";
 import fs, { existsSync, readFileSync, realpathSync } from "node:fs";
 import path from "node:path";
@@ -476,15 +478,19 @@ function collectExplicitTailwindV4CssEntries(opts) {
 	];
 	return [...new Set(entries.filter((entry) => typeof entry === "string" && entry.length > 0))];
 }
+function shouldKeepSingleExplicitCssEntrySource(source) {
+	return /@plugin\b/.test(source);
+}
 function collectConfiguredTailwindV4CssSourceEntries(opts, fallbackBase) {
 	const entries = [];
 	const seen = /* @__PURE__ */ new Set();
 	const explicitCssEntries = collectExplicitTailwindV4CssEntries(opts);
-	for (const cssEntry of explicitCssEntries.length > 1 ? explicitCssEntries : []) {
+	for (const cssEntry of explicitCssEntries) {
 		if (typeof cssEntry !== "string" || cssEntry.length === 0) continue;
 		const resolvedFile = path.isAbsolute(cssEntry) ? path.resolve(cssEntry) : path.resolve(fallbackBase, cssEntry);
 		if (!existsSync(resolvedFile)) continue;
 		const source = readFileSync(resolvedFile, "utf8");
+		if (explicitCssEntries.length <= 1 && !shouldKeepSingleExplicitCssEntrySource(source)) continue;
 		const key = `${resolvedFile}\0${source}`;
 		if (seen.has(key)) continue;
 		seen.add(key);
@@ -3454,7 +3460,7 @@ function resolveUniAppXStyleIsolationEnabled(root) {
 //#region src/uni-app-x/vite.ts
 let transformUVuePromise;
 function loadTransformUVue() {
-	transformUVuePromise ?? (transformUVuePromise = import("./transform-BgnNYkIG.mjs").then((mod) => mod.transformUVue));
+	transformUVuePromise ?? (transformUVuePromise = import("./transform-D5JUgMpE.mjs").then((mod) => mod.transformUVue));
 	return transformUVuePromise;
 }
 const preprocessorLangs = /* @__PURE__ */ new Set([
@@ -3800,7 +3806,8 @@ function processJsBundleEntry(options) {
 					return;
 				}
 				const currentSource = originalEntrySource;
-				const precheckOptions = createHandlerOptions(path.resolve(outDir, file), {
+				const absoluteFile = path.resolve(outDir, file);
+				const precheckOptions = createHandlerOptions(absoluteFile, {
 					uniAppX: resolveUniAppXJsTransformEnabled$1(uniAppX),
 					babelParserOptions: {
 						plugins: ["typescript"],
@@ -4659,6 +4666,9 @@ function inferPlatformFromViteOutDir$1(outDir) {
 	const normalized = segment.trim().toLowerCase();
 	if (normalized === "h5" || normalized === "web" || normalized === "app" || normalized === "app-plus" || normalized.startsWith("app-") || normalized.startsWith("mp-") || normalized.startsWith("quickapp-webview")) return normalized;
 }
+function hasTailwindPluginDirective(source) {
+	return /@plugin\b/.test(source);
+}
 function createGenerateBundleHook(context) {
 	const state = createBundleBuildState();
 	const lastCssResultByFile = /* @__PURE__ */ new Map();
@@ -5256,8 +5266,9 @@ function createGenerateBundleHook(context) {
 				if (!hasUsableRememberedTailwindSource) {
 					const configuredTailwindV4CssSourceEntries = getConfiguredTailwindV4CssSourceEntries();
 					const isCurrentRootMiniProgramStyleOutput = opts.cssMatcher(outputFile) && isMiniProgramStyleOutputFile(outputFile) && !normalizeOutputPathKey(outputFile.replace(/[?#].*$/, "")).includes("/");
-					if (isCurrentRootMiniProgramStyleOutput && hasTailwindGenerationSource(rawSource)) {
-						const configuredGenerationSource = selectTailwindV4GenerationCssSourceForOutput(outputFile, configuredTailwindV4CssSourceEntries, rawSource, {
+					const configuredEntriesForCurrentRootMiniProgramStyle = isCurrentRootMiniProgramStyleOutput && !hasTailwindGenerationSource(rawSource) ? configuredTailwindV4CssSourceEntries.filter((entry) => hasTailwindPluginDirective(entry.source)) : configuredTailwindV4CssSourceEntries;
+					if (isCurrentRootMiniProgramStyleOutput && (hasTailwindGenerationSource(rawSource) || configuredEntriesForCurrentRootMiniProgramStyle.length > 0)) {
+						const configuredGenerationSource = selectTailwindV4GenerationCssSourceForOutput(outputFile, configuredEntriesForCurrentRootMiniProgramStyle, rawSource, {
 							cwd: opts.tailwindcssBasedir,
 							outputRoot: outDir,
 							projectRoot: sourceRoot ?? rootDir
@@ -5501,7 +5512,7 @@ function createGenerateBundleHook(context) {
 						const runTransform = async () => {
 							const start = performance.now();
 							await runtimeState.readyPromise;
-							const previousCss = !vitePipelineCssAsset && useIncrementalMode && !hasRuntimeAffectingChanges && !snapshot.changedByType.css.has(file) ? getLastCssResult(lastCssResultByFile, outputFile, file) : void 0;
+							const previousCss = !vitePipelineCssAsset && useIncrementalMode && !generatorCandidatesChanged && !hasRuntimeAffectingChanges && !snapshot.changedByType.css.has(file) ? getLastCssResult(lastCssResultByFile, outputFile, file) : void 0;
 							const generatorTransformRawSource = generatorRawSource;
 							const previousGeneratorCss = previousCss && !isWebGeneratorTarget ? normalizeMiniProgramGeneratorRawSource(previousCss, outputFile) : previousCss;
 							const generated = hasTailwindGenerationSource(generatorTransformRawSource) || hasBundlerGeneratedCssMarker(rawSource) ? await generateTailwindV4Css({
@@ -5523,7 +5534,8 @@ function createGenerateBundleHook(context) {
 								...usesConfiguredTailwindV4FallbackSource ? { restoreLocalCssImports: false } : {}
 							}) : void 0;
 							if (generated) {
-								const tracedCss = removeRootCoveredCssFromScopedAsset(annotateCss(transformWebTargetCss(generated.css)));
+								const outputCss = transformWebTargetCss(generated.css);
+								const tracedCss = removeRootCoveredCssFromScopedAsset(annotateCss(outputCss));
 								registerGeneratorDependencies$1({ addWatchFile }, generated.dependencies);
 								if (envFlags.debugCssDiff) debug("css diff %s: %s", generatorSourceFile, summarizeStringDiff(generatorRawSource, tracedCss));
 								debug("css generated result: %s bytes=%d", file, tracedCss.length);
@@ -6283,7 +6295,8 @@ function resolveHotTailwindCssModules(ctx, tailwindRootCssModuleIds) {
 	};
 	const collectModule = (mod) => {
 		if (mod == null || seenModules.has(mod)) return;
-		if (!isHotSourceStyleModule(mod.id ?? mod.url)) return;
+		const modId = mod.id ?? mod.url;
+		if (!isHotSourceStyleModule(modId)) return;
 		seenModules.add(mod);
 		ctx.server.moduleGraph.invalidateModule(mod);
 		modules.push(mod);
@@ -6612,8 +6625,9 @@ function createViteRuntimeClassSet(options) {
 	}
 	async function refreshRuntimeState(force) {
 		const invalidation = resolveRuntimeRefreshOptions();
+		const shouldRefresh = force || invalidation.changed;
 		const refreshed = await refreshTailwindRuntimeState(runtimeState, {
-			force: force || invalidation.changed,
+			force: shouldRefresh,
 			clearCache: force || invalidation.changed
 		});
 		if (invalidation.changed) debug("runtime signature changed, refresh triggered. signature: %s", invalidation.signature);
@@ -7019,11 +7033,12 @@ function createViteFrameworkPlugins(options = {}, frameworkBranch) {
 			if (autoCssSourceContent.get(sourceFile) === sourceCss) continue;
 			autoCssSourceContent.set(sourceFile, sourceCss);
 			await syncTailwindCssSourceCandidates(sourceFile, sourceCss);
+			const resolved = await resolveTailwindV4EntriesFromCssCached(sourceCss, sourceBase);
 			changed = upsertTailwindV4CssSource(opts, {
 				file: sourceFile,
 				base: sourceBase,
 				css: sourceCss,
-				dependencies: (await resolveTailwindV4EntriesFromCssCached(sourceCss, sourceBase))?.dependencies ?? []
+				dependencies: resolved?.dependencies ?? []
 			}) || changed;
 		}
 		if (!changed) return;
@@ -7108,7 +7123,8 @@ function createViteFrameworkPlugins(options = {}, frameworkBranch) {
 	let pendingHmrCandidateChange;
 	let pendingHmrCssTargetFiles;
 	let pendingFullHmrCssRegeneration = false;
-	const normalizeHmrCssTargetFile = (file) => normalizeVitePersistentCacheKey(cleanUrl(file));
+	const normalizeGeneratedCssCacheFile = (file) => normalizeVitePersistentCacheKey(cleanUrl(file));
+	const normalizeHmrCssTargetFile = normalizeGeneratedCssCacheFile;
 	const collectPendingHmrCssTargetFiles = (cssModules, fallbackCssIds) => {
 		const targets = /* @__PURE__ */ new Set();
 		const addTarget = (file) => {
@@ -7181,7 +7197,8 @@ function createViteFrameworkPlugins(options = {}, frameworkBranch) {
 		return change;
 	};
 	const resolvePendingHmrCandidateChange = (generatorCode, file) => {
-		if (resolvedConfig?.command !== "serve" || !pendingHmrCandidateChange || pendingHmrCandidateChange.runtimeAffecting || pendingHmrCandidateChange.addedCandidates.size === 0 || resolveCurrentGeneratorOptions().target === "weapp" && hasUserCssLayerBlocks(generatorCode) || !cleanGeneratedCssByFile.has(file) || !generatedClassSetByFile.has(file) || pendingHmrCssTargetFiles !== void 0 && !pendingHmrCssTargetFiles.has(normalizeHmrCssTargetFile(file))) return;
+		const fileKey = normalizeGeneratedCssCacheFile(file);
+		if (resolvedConfig?.command !== "serve" || !pendingHmrCandidateChange || pendingHmrCandidateChange.runtimeAffecting || pendingHmrCandidateChange.addedCandidates.size === 0 || resolveCurrentGeneratorOptions().target === "weapp" && hasUserCssLayerBlocks(generatorCode) || !cleanGeneratedCssByFile.has(fileKey) || !generatedClassSetByFile.has(fileKey) || pendingHmrCssTargetFiles !== void 0 && !pendingHmrCssTargetFiles.has(fileKey)) return;
 		return pendingHmrCandidateChange;
 	};
 	const finishPendingHmrCssTargetFile = (file) => {
@@ -7336,9 +7353,10 @@ function createViteFrameworkPlugins(options = {}, frameworkBranch) {
 	const recordViteProcessedCssAssetResult = (file, css, options = {}) => {
 		const key = normalizeVitePersistentCacheKey(file);
 		const previous = viteProcessedCssAssetResults.get(key);
+		const injectIntoMain = previous?.injectIntoMain === true ? true : options.injectIntoMain ?? previous?.injectIntoMain;
 		touchMapEntry(viteProcessedCssAssetResults, key, {
 			css,
-			injectIntoMain: previous?.injectIntoMain === true ? true : options.injectIntoMain ?? previous?.injectIntoMain,
+			injectIntoMain,
 			outputFile: options.outputFile ?? previous?.outputFile
 		});
 	};
@@ -7434,12 +7452,13 @@ function createViteFrameworkPlugins(options = {}, frameworkBranch) {
 		const sourceRoot = resolveWeappViteSourceRoot(resolvedConfig, opts.appType);
 		const outputFile = resolveViteCssPipelineOutputFile(requestFile, opts, rootDir, currentGeneratorBranch.isWeb, shouldPreserveStyleOutputExtension, sourceRoot);
 		const generatorTransformCode = currentGeneratorBranch.isWeb ? generatorCode : normalizeMiniProgramGeneratorCssSource(generatorCode, outputFile);
+		const fileKey = normalizeGeneratedCssCacheFile(file);
 		const fullRuntime = getSourceCandidates() ?? getRecordedGeneratorCandidates() ?? await ensureRuntimeClassSet();
 		const pendingHmrChange = resolvePendingHmrCandidateChange(generatorCode, file);
 		const forceFullHmrCssRegeneration = pendingFullHmrCssRegeneration || resolvedConfig?.command === "serve" && pendingHmrCandidateChange !== void 0 && pendingHmrChange === void 0;
-		const runtime = pendingHmrChange ? new Set(pendingHmrChange.addedCandidates) : fullRuntime;
+		const runtime = fullRuntime;
 		if (pendingHmrChange && currentGeneratorOptions.target === "weapp" && filterUnsupportedMiniProgramTailwindV4Candidates(pendingHmrChange.addedCandidates).size === 0) {
-			const previousTracedCss = tracedGeneratedCssByFile.get(file);
+			const previousTracedCss = tracedGeneratedCssByFile.get(fileKey);
 			if (previousTracedCss !== void 0) {
 				finishPendingHmrCssTargetFile(file);
 				return `${createBundlerGeneratedCssMarker("vite", normalizeViteProcessedCssFile(file))}\n${previousTracedCss}`;
@@ -7461,8 +7480,6 @@ function createViteFrameworkPlugins(options = {}, frameworkBranch) {
 			cssHandlerOptions,
 			generatorCode: generatorTransformCode
 		}) ?? true);
-		const previousCss = pendingHmrChange && !forceFullHmrCssRegeneration ? cleanGeneratedCssByFile.get(file) : void 0;
-		const previousGeneratorCss = previousCss && !currentGeneratorBranch.isWeb ? normalizeMiniProgramGeneratorCssSource(previousCss, outputFile) : previousCss;
 		const generated = await hmrTimingRecorder.measure("generateCss.serve", () => generateTailwindV4Css({
 			opts,
 			runtimeState,
@@ -7477,15 +7494,13 @@ function createViteFrameworkPlugins(options = {}, frameworkBranch) {
 			generatorPlatform: resolveGeneratorPlatform(),
 			styleHandler,
 			debug,
-			previousCss: previousGeneratorCss,
-			previousClassSet: pendingHmrChange && !forceFullHmrCssRegeneration ? generatedClassSetByFile.get(file) : void 0,
 			deferEmptyScopedCssSource: shouldDeferEmptyScopedCssSource,
-			disableSourceScan: pendingHmrChange !== void 0,
+			disableSourceScan: false,
 			restoreLocalCssImports: !currentGeneratorBranch.isWeb
 		}), {
 			file,
 			memoryDebug: {
-				cleanCacheHit: cleanGeneratedCssByFile.has(file),
+				cleanCacheHit: cleanGeneratedCssByFile.has(fileKey),
 				forceFullHmrCssRegeneration,
 				pendingAddedCandidates: pendingHmrCandidateChange?.addedCandidates.size ?? 0,
 				pendingCssTargets: pendingHmrCssTargetFiles?.size ?? 0,
@@ -7512,9 +7527,9 @@ function createViteFrameworkPlugins(options = {}, frameworkBranch) {
 			tokenSources: createCssTokenSourceMap(getSourceCandidateSourcesForEntries(void 0), opts)
 		});
 		for (const dependency of generated.dependencies) hookContext?.addWatchFile?.(dependency);
-		cleanGeneratedCssByFile.set(file, outputCss);
-		tracedGeneratedCssByFile.set(file, tracedCss);
-		generatedClassSetByFile.set(file, new Set(generated.classSet));
+		cleanGeneratedCssByFile.set(fileKey, outputCss);
+		tracedGeneratedCssByFile.set(fileKey, tracedCss);
+		generatedClassSetByFile.set(fileKey, new Set(generated.classSet));
 		const shouldInjectGeneratedCssIntoMain = mainCssChunkMatcher(outputFile, opts.appType) || hasTailwindRootDirectives(generatorTransformCode, { importFallback: currentGeneratorOptions.importFallback }) && !normalizeOutputPathKey(outputFile).includes("/");
 		recordViteProcessedCssAssetResult(file, tracedCss, {
 			injectIntoMain: shouldInjectGeneratedCssIntoMain,

package/dist/vite.js

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

package/dist/vite.mjs

@@ -1,2 +1,2 @@
-import { t as WeappTailwindcss } from "./vite-oI2ReOic.mjs";
+import { t as WeappTailwindcss } from "./vite-Tpgi77vE.mjs";
 export { WeappTailwindcss, WeappTailwindcss as weappTailwindcss };

package/dist/weapp-tw-css-import-rewrite-loader.js

@@ -7086,7 +7086,8 @@ function createTaggedTemplateIgnore({ matcher, names }) {
 		return false;
 	};
 	const resolvesMemberExpressionToIgnore = (path, seen) => {
-		if (propertyMatches(path.get("property"))) return true;
+		const propertyPath = path.get("property");
+		if (propertyMatches(propertyPath)) return true;
 		const objectPath = path.get("object");
 		if (objectPath.isIdentifier()) {
 			const binding = (objectPath?.scope)?.getBinding?.(objectPath.node.name);
@@ -7153,7 +7154,10 @@ function createTaggedTemplateIgnore({ matcher, names }) {
 		return current;
 	};
 	const evaluateTagPath = (tagPath, seen) => {
-		if (tagPath.isCallExpression?.() || tagPath.node.type === "CallExpression") return evaluateTagPath(tagPath.get("callee"), seen);
+		if (tagPath.isCallExpression?.() || tagPath.node.type === "CallExpression") {
+			const calleePath = tagPath.get("callee");
+			return evaluateTagPath(calleePath, seen);
+		}
 		if (tagPath.isIdentifier()) {
 			if (matchesIgnoreName(tagPath.node.name)) return true;
 			const binding = tagPath?.scope?.getBinding?.(tagPath.node.name);