weapp-tailwindcss 5.2.11 → 5.2.12

package/dist/{style-options-COpQc8fr.cjs → style-options-D0NukP02.cjs}

@@ -1,17 +1,18 @@
-const require_generator = require("./generator-B0dCFlP1.cjs");
-const require_options = require("./options-zpZez7qe.cjs");
+const require_generator = require("./generator-CwMI20jy.cjs");
+const require_options = require("./options-CSqLm6U2.cjs");
 //#region src/context/style-options.ts
 function normalizeStyleHandlerMajorVersion(majorVersion) {
 	return majorVersion === 4 ? 4 : void 0;
 }
 function resolveStyleOptionsFromContext(ctx, tailwindcssMajorVersion) {
 	const resolvedUniAppXOptions = require_options.resolveUniAppXOptions(ctx.uniAppX);
-	const branch = require_generator.resolveGeneratorRuntimeBranch(require_generator.normalizeWeappTailwindcssGeneratorOptions(ctx.generator, {
+	const generatorOptions = require_generator.normalizeWeappTailwindcssGeneratorOptions(ctx.generator, {
 		appType: ctx.appType,
 		platform: ctx.cssOptions?.platform ?? ctx.platform,
 		tailwindcssMajorVersion,
 		uniAppX: resolvedUniAppXOptions
-	}), {
+	});
+	const branch = require_generator.resolveGeneratorRuntimeBranch(generatorOptions, {
 		appType: ctx.appType,
 		platform: ctx.cssOptions?.platform ?? ctx.platform,
 		tailwindcssMajorVersion,
@@ -27,7 +28,9 @@ function resolveStyleOptionsFromContext(ctx, tailwindcssMajorVersion) {
 		cssSelectorReplacement: ctx.cssOptions?.cssSelectorReplacement ?? ctx.cssSelectorReplacement,
 		rem2rpx,
 		cssRemoveProperty: ctx.cssOptions?.cssRemoveProperty ?? ctx.cssRemoveProperty,
+		cssRemoveActivePseudoClass: ctx.cssOptions?.cssRemoveActivePseudoClass ?? ctx.cssRemoveActivePseudoClass,
 		cssRemoveHoverPseudoClass: ctx.cssOptions?.cssRemoveHoverPseudoClass ?? ctx.cssRemoveHoverPseudoClass,
+		cssRemoveFocusPseudoClass: ctx.cssOptions?.cssRemoveFocusPseudoClass ?? ctx.cssRemoveFocusPseudoClass,
 		tailwindcssV4GradientFallback: ctx.cssOptions?.tailwindcssV4GradientFallback ?? ctx.tailwindcssV4GradientFallback,
 		cssPresetEnv: ctx.cssOptions?.cssPresetEnv ?? ctx.cssPresetEnv,
 		atRules: ctx.cssOptions?.atRules ?? ctx.atRules,
@@ -49,7 +52,9 @@ function resolveStyleOptionsFromContext(ctx, tailwindcssMajorVersion) {
 		rem2rpx: cssOptions.rem2rpx,
 		...hasCssOptions ? { cssOptions } : {},
 		cssRemoveProperty: cssOptions.cssRemoveProperty,
+		cssRemoveActivePseudoClass: cssOptions.cssRemoveActivePseudoClass,
 		cssRemoveHoverPseudoClass: cssOptions.cssRemoveHoverPseudoClass,
+		cssRemoveFocusPseudoClass: cssOptions.cssRemoveFocusPseudoClass,
 		tailwindcssV4GradientFallback: cssOptions.tailwindcssV4GradientFallback,
 		cssPresetEnv: cssOptions.cssPresetEnv,
 		atRules: cssOptions.atRules,

package/dist/{tailwindcss-LtnGCxF0.cjs → tailwindcss-B3lqgbln.cjs}

@@ -1,7 +1,7 @@
-const require_rolldown_runtime = require("./rolldown-runtime-CVvi-lCc.cjs");
-const require_generator = require("./generator-B0dCFlP1.cjs");
-const require_object = require("./object-C_Vr6_S5.cjs");
-const require_options = require("./options-zpZez7qe.cjs");
+const require_rolldown_runtime = require("./rolldown-runtime-Ctb5zv51.cjs");
+const require_generator = require("./generator-CwMI20jy.cjs");
+const require_object = require("./object-DbHtAXRk.cjs");
+const require_options = require("./options-CSqLm6U2.cjs");
 require("./utils-CuKLf1Zv.cjs");
 let node_fs = require("node:fs");
 let node_path = require("node:path");
@@ -80,7 +80,8 @@ async function collectTailwindV4TrackedSourceFiles(tailwindRuntime) {
 	const files = /* @__PURE__ */ new Set();
 	for (const cssEntry of tailwindOptions?.v4?.cssEntries ?? []) {
 		if (!(0, node_fs.existsSync)(cssEntry)) continue;
-		const resolved = await require_options.resolveTailwindV4EntriesFromCssCached((0, node_fs.readFileSync)(cssEntry, "utf8"), node_path.default.dirname(cssEntry));
+		const css = (0, node_fs.readFileSync)(cssEntry, "utf8");
+		const resolved = await require_options.resolveTailwindV4EntriesFromCssCached(css, node_path.default.dirname(cssEntry));
 		const expanded = resolved?.entries?.length ? await require_generator.expandTailwindSourceEntries(resolved.entries) : [];
 		for (const file of expanded) files.add(file);
 	}
@@ -536,10 +537,11 @@ function createTailwindcssRuntime(options) {
 	};
 	const normalizedBasedir = basedir ? node_path.default.resolve(basedir) : void 0;
 	const cacheRoot = require_generator.findNearestPackageRoot(normalizedBasedir) ?? normalizedBasedir ?? node_process.default.cwd();
-	if (cacheDir) if (node_path.default.isAbsolute(cacheDir)) cache.dir = cacheDir;
-	else if (normalizedBasedir) cache.dir = node_path.default.resolve(normalizedBasedir, cacheDir);
-	else cache.dir = node_path.default.resolve(node_process.default.cwd(), cacheDir);
-	else cache.dir = node_path.default.join(cacheRoot, "node_modules", ".cache", "@tailwindcss-mangle", "engine");
+	if (cacheDir) {
+		if (node_path.default.isAbsolute(cacheDir)) cache.dir = cacheDir;
+		else if (normalizedBasedir) cache.dir = node_path.default.resolve(normalizedBasedir, cacheDir);
+		else cache.dir = node_path.default.resolve(node_process.default.cwd(), cacheDir);
+	} else cache.dir = node_path.default.join(cacheRoot, "node_modules", ".cache", "@tailwindcss-mangle", "engine");
 	if (normalizedBasedir) cache.cwd = normalizedBasedir;
 	const resolvePaths = createDefaultResolvePaths(cache.cwd ?? normalizedBasedir ?? node_process.default.cwd());
 	const normalizedUserOptions = require_generator.normalizeTailwindcssRuntimeOptions(tailwindcssRuntimeOptions);
@@ -589,10 +591,12 @@ function createTailwindcssRuntime(options) {
 			searchRoots.add(parentDir);
 		}
 		const configPath = findTailwindConfig(searchRoots);
-		if (!resolvedTailwindOptions.config) if (configPath) resolvedTailwindOptions.config = configPath;
-		else {
-			const fallbackConfig = resolveTailwindConfigFallback(resolvedTailwindOptions.packageName, resolvedTailwindOptions.resolve.paths ?? resolvePaths);
-			if (fallbackConfig) resolvedTailwindOptions.config = fallbackConfig;
+		if (!resolvedTailwindOptions.config) {
+			if (configPath) resolvedTailwindOptions.config = configPath;
+			else {
+				const fallbackConfig = resolveTailwindConfigFallback(resolvedTailwindOptions.packageName, resolvedTailwindOptions.resolve.paths ?? resolvePaths);
+				if (fallbackConfig) resolvedTailwindOptions.config = fallbackConfig;
+			}
 		}
 		if (!resolvedTailwindOptions.cwd && configPath) resolvedTailwindOptions.cwd = node_path.default.dirname(configPath);
 		resolvedOptions.tailwindcss = resolvedTailwindOptions;

package/dist/{tailwindcss-2zdmASlM.js → tailwindcss-vbApajUH.js}

@@ -1,5 +1,5 @@
-import { C as findWorkspacePackageDir, Ct as expandTailwindSourceEntries, D as resolveTailwindcssOptions, Dt as resolveCssSourceEntries, E as normalizeTailwindcssRuntimeOptions, Et as parseConfigParam, Lt as loadTailwindV4DesignSystem, Nt as resolveCssMacroTailwindV4Source, O as normalizeStringListOption, S as findNearestPackageRoot, St as createTailwindSourceEntryMatcher, T as normalizeExtendLengthUnits, Tt as normalizeLegacyContentEntries, b as isTailwindV4CssEntry, d as resolveTailwindV4SourceFromRuntime, h as hasConfiguredTailwindV4CssRoots, i as normalizeWeappTailwindcssGeneratorOptions, kt as resolveTailwindV4CssSourceBase, m as filterTailwindV4CssSourceRoots, p as resolveTailwindV4SourceOptionsFromRuntime, v as groupCssEntriesByBase, w as findWorkspaceRoot, x as normalizeCssEntries, xt as FULL_SOURCE_SCAN_PATTERN, y as guessBasedirFromEntries } from "./generator-BLpOsd5O.js";
-import { t as omitUndefined } from "./object-Bvy6-w9r.js";
+import { C as findWorkspacePackageDir, Ct as expandTailwindSourceEntries, D as resolveTailwindcssOptions, Dt as resolveCssSourceEntries, E as normalizeTailwindcssRuntimeOptions, Et as parseConfigParam, Lt as loadTailwindV4DesignSystem, Nt as resolveCssMacroTailwindV4Source, O as normalizeStringListOption, S as findNearestPackageRoot, St as createTailwindSourceEntryMatcher, T as normalizeExtendLengthUnits, Tt as normalizeLegacyContentEntries, b as isTailwindV4CssEntry, d as resolveTailwindV4SourceFromRuntime, h as hasConfiguredTailwindV4CssRoots, i as normalizeWeappTailwindcssGeneratorOptions, kt as resolveTailwindV4CssSourceBase, m as filterTailwindV4CssSourceRoots, p as resolveTailwindV4SourceOptionsFromRuntime, v as groupCssEntriesByBase, w as findWorkspaceRoot, x as normalizeCssEntries, xt as FULL_SOURCE_SCAN_PATTERN, y as guessBasedirFromEntries } from "./generator-C2UFjlZ1.js";
+import { t as omitUndefined } from "./object-B-8IHefx.js";
 import { n as defuOverrideArray$1 } from "./utils-MVwpU07P.js";
 import { createRequire } from "node:module";
 import { existsSync, readFileSync, statSync } from "node:fs";
@@ -1200,10 +1200,11 @@ function createTailwindcssRuntime(options) {
 	};
 	const normalizedBasedir = basedir ? path.resolve(basedir) : void 0;
 	const cacheRoot = findNearestPackageRoot(normalizedBasedir) ?? normalizedBasedir ?? process.cwd();
-	if (cacheDir) if (path.isAbsolute(cacheDir)) cache.dir = cacheDir;
-	else if (normalizedBasedir) cache.dir = path.resolve(normalizedBasedir, cacheDir);
-	else cache.dir = path.resolve(process.cwd(), cacheDir);
-	else cache.dir = path.join(cacheRoot, "node_modules", ".cache", "@tailwindcss-mangle", "engine");
+	if (cacheDir) {
+		if (path.isAbsolute(cacheDir)) cache.dir = cacheDir;
+		else if (normalizedBasedir) cache.dir = path.resolve(normalizedBasedir, cacheDir);
+		else cache.dir = path.resolve(process.cwd(), cacheDir);
+	} else cache.dir = path.join(cacheRoot, "node_modules", ".cache", "@tailwindcss-mangle", "engine");
 	if (normalizedBasedir) cache.cwd = normalizedBasedir;
 	const resolvePaths = createDefaultResolvePaths(cache.cwd ?? normalizedBasedir ?? process.cwd());
 	const normalizedUserOptions = normalizeTailwindcssRuntimeOptions(tailwindcssRuntimeOptions);
@@ -1253,10 +1254,12 @@ function createTailwindcssRuntime(options) {
 			searchRoots.add(parentDir);
 		}
 		const configPath = findTailwindConfig(searchRoots);
-		if (!resolvedTailwindOptions.config) if (configPath) resolvedTailwindOptions.config = configPath;
-		else {
-			const fallbackConfig = resolveTailwindConfigFallback(resolvedTailwindOptions.packageName, resolvedTailwindOptions.resolve.paths ?? resolvePaths);
-			if (fallbackConfig) resolvedTailwindOptions.config = fallbackConfig;
+		if (!resolvedTailwindOptions.config) {
+			if (configPath) resolvedTailwindOptions.config = configPath;
+			else {
+				const fallbackConfig = resolveTailwindConfigFallback(resolvedTailwindOptions.packageName, resolvedTailwindOptions.resolve.paths ?? resolvePaths);
+				if (fallbackConfig) resolvedTailwindOptions.config = fallbackConfig;
+			}
 		}
 		if (!resolvedTailwindOptions.cwd && configPath) resolvedTailwindOptions.cwd = path.dirname(configPath);
 		resolvedOptions.tailwindcss = resolvedTailwindOptions;

package/dist/{transform-BlsDWgjt.js → transform-52FLRu-0.js}

@@ -1,5 +1,5 @@
-import { n as _defineProperty } from "./object-Bvy6-w9r.js";
-import { g as traverse$1, h as babelParse, i as analyzeSource, n as generateCode, o as JsTokenUpdater, p as replaceWxml, r as createAttributeMatcher, u as isClassContextLiteralPath } from "./wxml-CWJc0yY-.js";
+import { n as _defineProperty } from "./object-B-8IHefx.js";
+import { g as traverse$1, h as babelParse, i as analyzeSource, n as generateCode, o as JsTokenUpdater, p as replaceWxml, r as createAttributeMatcher, u as isClassContextLiteralPath } from "./wxml-B7OAVpXJ.js";
 import { splitCandidateTokens } from "@tailwindcss-mangle/engine";
 import MagicString from "magic-string";
 import { NodeTypes, parse } from "@vue/compiler-dom";

package/dist/{transform-9wbmvHcC.cjs → transform-BiHG42Rp.cjs}

@@ -1,5 +1,5 @@
-const require_object = require("./object-C_Vr6_S5.cjs");
-const require_wxml = require("./wxml-DUIdXCVa.cjs");
+const require_object = require("./object-DbHtAXRk.cjs");
+const require_wxml = require("./wxml-CQmBCjOR.cjs");
 let _tailwindcss_mangle_engine = require("@tailwindcss-mangle/engine");
 let _vue_compiler_dom = require("@vue/compiler-dom");
 //#region src/uni-app-x/component-local-style-binding.ts

package/dist/types/user-defined-options/general.d.ts

@@ -35,7 +35,9 @@ export interface UserDefinedOptionsGeneralPart {
     cssChildCombinatorReplaceValue?: string | string[] | undefined;
     postcssOptions?: LoadedPostcssOptions | undefined;
     cssOptions?: CssOptions | undefined;
+    cssRemoveActivePseudoClass?: boolean | undefined;
     cssRemoveHoverPseudoClass?: boolean | undefined;
+    cssRemoveFocusPseudoClass?: boolean | undefined;
     cssRemoveProperty?: boolean | undefined;
     tailwindcssV4GradientFallback?: boolean | undefined;
     tailwindcssRuntimeOptions?: TailwindCssRuntimeOptions | undefined;

package/dist/{v4-generation-core-D4zQcQqW.cjs → v4-generation-core-2AuNMweK.cjs}

@@ -1,10 +1,10 @@
-const require_rolldown_runtime = require("./rolldown-runtime-CVvi-lCc.cjs");
-const require_generator = require("./generator-B0dCFlP1.cjs");
+const require_rolldown_runtime = require("./rolldown-runtime-Ctb5zv51.cjs");
+const require_generator = require("./generator-CwMI20jy.cjs");
 require("./auto-DtU6f3X6.cjs");
-const require_object = require("./object-C_Vr6_S5.cjs");
-const require_options = require("./options-zpZez7qe.cjs");
-const require_wxml = require("./wxml-DUIdXCVa.cjs");
-const require_style_options = require("./style-options-COpQc8fr.cjs");
+const require_object = require("./object-DbHtAXRk.cjs");
+const require_options = require("./options-CSqLm6U2.cjs");
+const require_wxml = require("./wxml-CQmBCjOR.cjs");
+const require_style_options = require("./style-options-D0NukP02.cjs");
 let node_fs = require("node:fs");
 let node_path = require("node:path");
 node_path = require_rolldown_runtime.__toESM(node_path, 1);
@@ -201,12 +201,13 @@ async function extractScriptStringCandidates(source, extension, options) {
 	if (!SCRIPT_SOURCE_CANDIDATE_EXTENSIONS.has(extension)) return [];
 	const values = /* @__PURE__ */ new Set();
 	try {
-		require_wxml.traverse(require_wxml.babelParse(source, {
+		const ast = require_wxml.babelParse(source, {
 			cache: true,
 			cacheKey: `source-candidates:${extension}`,
 			plugins: ["jsx", "typescript"],
 			sourceType: "unambiguous"
-		}), {
+		});
+		require_wxml.traverse(ast, {
 			noScope: true,
 			StringLiteral(path) {
 				values.add(path.node.value);
@@ -3511,7 +3512,8 @@ function isSameTailwindV4CssSource(a, b) {
 //#endregion
 //#region src/bundlers/shared/generator-css/source-resolver/single-source.ts
 async function resolveSingleTailwindV4CssSource(cssSource, sourceOptions, options = {}) {
-	const sourceBase = require_generator.resolveTailwindV4CssSourceBase(cssSource, sourceOptions.base ?? sourceOptions.projectRoot ?? node_process.default.cwd());
+	const sourceBaseFallback = sourceOptions.base ?? sourceOptions.projectRoot ?? node_process.default.cwd();
+	const sourceBase = require_generator.resolveTailwindV4CssSourceBase(cssSource, sourceBaseFallback);
 	const normalizedCssSource = normalizeTailwindV4CssSourceConfig(cssSource, sourceBase);
 	const source = await require_generator.resolveTailwindV4Source(createSingleTailwindV4SourceOptions(sourceOptions, {
 		base: sourceBase,
@@ -3529,7 +3531,8 @@ async function resolveSingleTailwindV4CssSource(cssSource, sourceOptions, option
 }
 async function resolveTailwindV4CssSourceEntries(cssSource, sourceOptions) {
 	if (typeof cssSource.css !== "string" || cssSource.css.length === 0) return;
-	const sourceBase = require_generator.resolveTailwindV4CssSourceBase(cssSource, sourceOptions.base ?? sourceOptions.projectRoot ?? node_process.default.cwd());
+	const sourceBaseFallback = sourceOptions.base ?? sourceOptions.projectRoot ?? node_process.default.cwd();
+	const sourceBase = require_generator.resolveTailwindV4CssSourceBase(cssSource, sourceBaseFallback);
 	return require_options.resolveTailwindV4EntriesFromCss(cssSource.css, sourceBase);
 }
 function countRuntimeCandidateHits(candidates, runtime) {
@@ -3775,7 +3778,8 @@ async function resolveGeneratorSource(_majorVersion, runtimeState, rawSource, fi
 //#endregion
 //#region src/bundlers/shared/generator-css/source-resolver/resolve-sources.ts
 async function resolveGeneratorResolvedSources(majorVersion, runtimeState, rawSource, file, cssHandlerOptions, generatorOptions, selectionOptions) {
-	const cssEntrySource = require_generator.resolveCssEntrySource(rawSource, resolveCssSourceBase(file, cssHandlerOptions), {
+	const base = resolveCssSourceBase(file, cssHandlerOptions);
+	const cssEntrySource = require_generator.resolveCssEntrySource(rawSource, base, {
 		importFallback: generatorOptions?.importFallback ?? false,
 		removeConfig: false
 	});
@@ -3992,7 +3996,9 @@ function removeTailwindApplyRules(rawSource) {
 function resolveLegacyCompatCssSource(rawSource) {
 	const cached = legacyCompatSourceCache.get(rawSource);
 	if (cached !== void 0) return cached;
-	const resolved = closeTrailingUnclosedBlocks(require_generator.removeTailwindV4GeneratedUserCssArtifacts((0, _weapp_tailwindcss_postcss.removeUnsupportedMiniProgramAtRules)(removeTailwindApplyRules(require_generator.removeTailwindSourceDirectives(closeTrailingUnclosedBlocks(require_generator.stripTailwindBanners(rawSource)))))));
+	const parseableSource = closeTrailingUnclosedBlocks(require_generator.stripTailwindBanners(rawSource));
+	const source = require_generator.removeTailwindSourceDirectives(parseableSource);
+	const resolved = closeTrailingUnclosedBlocks(require_generator.removeTailwindV4GeneratedUserCssArtifacts((0, _weapp_tailwindcss_postcss.removeUnsupportedMiniProgramAtRules)(removeTailwindApplyRules(source))));
 	setLimitedCacheValue(legacyCompatSourceCache, rawSource, resolved);
 	return resolved;
 }
@@ -4022,7 +4028,8 @@ function hasContainerConfigToken(rawSource) {
 }
 function hasConfiguredContainerCompat(rawSource, file, cssHandlerOptions) {
 	if (hasContainerConfigToken(rawSource)) return true;
-	const cssEntrySource = require_generator.resolveCssEntrySource(rawSource, resolveCssSourceBase(file, cssHandlerOptions));
+	const base = resolveCssSourceBase(file, cssHandlerOptions);
+	const cssEntrySource = require_generator.resolveCssEntrySource(rawSource, base);
 	if (!cssEntrySource?.config) return false;
 	try {
 		return /\bcontainer\b/.test((0, node_fs.readFileSync)(cssEntrySource.config, "utf8"));
@@ -4510,13 +4517,15 @@ async function finalizeDeferredGeneratorCss(context) {
 				const cssWithBeforeUserCss = createCssSourceOrderAppend((0, _weapp_tailwindcss_postcss.filterExistingCssRules)(css, beforeUserCss), css);
 				return reorderMarkedUserLayerComponentsCss(createCssSourceOrderAppend(cssWithBeforeUserCss, (0, _weapp_tailwindcss_postcss.filterExistingCssRules)(cssWithBeforeUserCss, afterUserCss)));
 			}
-			return reorderMarkedUserLayerComponentsCss(createCssSourceOrderAppend(css, (0, _weapp_tailwindcss_postcss.filterExistingCssRules)(css, await transformDeferredUserCss(generatedUserCssRawSource))));
+			const userCss = await transformDeferredUserCss(generatedUserCssRawSource);
+			return reorderMarkedUserLayerComponentsCss(createCssSourceOrderAppend(css, (0, _weapp_tailwindcss_postcss.filterExistingCssRules)(css, userCss)));
 		};
 		const canAppendIncrementalCss = generated.target !== "weapp" || !require_generator.hasUserCssLayerBlocks(generatorRawSource);
 		const incrementalRawCss = generated.incrementalRawCss ?? generated.incrementalCss;
 		const shouldAppendIncrementalCss = canAppendIncrementalCss && typeof options.previousCss === "string" && typeof incrementalRawCss === "string";
 		const normalizedCss = shouldAppendIncrementalCss ? incrementalRawCss.trim().length > 0 ? require_generator.createCssAppend(options.previousCss, await normalizeDeferredGeneratedCss(incrementalRawCss)) : options.previousCss : await normalizeDeferredGeneratedCss(generated.rawCss ?? generated.css);
-		const css = (0, _weapp_tailwindcss_postcss.restoreLocalCssImports)(shouldAppendIncrementalCss ? normalizedCss : await restoreDeferredUserCss(normalizedCss), localImports, { outputFile: file });
+		const intermediateCss = shouldAppendIncrementalCss ? normalizedCss : await restoreDeferredUserCss(normalizedCss);
+		const css = (0, _weapp_tailwindcss_postcss.restoreLocalCssImports)(intermediateCss, localImports, { outputFile: file });
 		return {
 			css,
 			classSet: resolveGeneratedCssClassSet(generated.target, generated.classSet, runtimeWithCurrentCss, css, opts.escapeMap, options.previousClassSet),
@@ -4601,7 +4610,8 @@ async function finalizeFallbackGeneratorCss(context) {
 			css = createCssSourceOrderAppend(css, missingUserCss);
 		} else if (hasMatchedCssSourceFile && generated.target === "weapp" && hasGeneratedMarkers && !hasGeneratedCss) {
 			const cleanedUserCssRawSource = require_generator.removeTailwindV4GeneratedUserCssArtifacts(userCssRawSource);
-			const userCss = await require_generator.transformGeneratorUserCss(restoredDistinctUserLayerCss && require_generator.hasUserCssLayerBlocks(cleanedUserCssRawSource) ? require_generator.splitUserCssLayerBlocks(cleanedUserCssRawSource).rest : cleanedUserCssRawSource, {
+			const cleanedUserCssRestSource = restoredDistinctUserLayerCss && require_generator.hasUserCssLayerBlocks(cleanedUserCssRawSource) ? require_generator.splitUserCssLayerBlocks(cleanedUserCssRawSource).rest : cleanedUserCssRawSource;
+			const userCss = await require_generator.transformGeneratorUserCss(cleanedUserCssRestSource, {
 				generatorTarget: generated.target,
 				generatorStyleOptions,
 				cssUserHandlerOptions,

package/dist/{vite-DTDbD-95.cjs → vite-BLB7vjKQ.cjs}

@@ -1,18 +1,18 @@
-const require_rolldown_runtime = require("./rolldown-runtime-CVvi-lCc.cjs");
+const require_rolldown_runtime = require("./rolldown-runtime-Ctb5zv51.cjs");
 const require_framework = require("./framework.cjs");
-const require_generator = require("./generator-B0dCFlP1.cjs");
-const require_object = require("./object-C_Vr6_S5.cjs");
-const require_options = require("./options-zpZez7qe.cjs");
+const require_generator = require("./generator-CwMI20jy.cjs");
+const require_object = require("./object-DbHtAXRk.cjs");
+const require_options = require("./options-CSqLm6U2.cjs");
 require("./utils-CuKLf1Zv.cjs");
-const require_v4_generation_core = require("./v4-generation-core-D4zQcQqW.cjs");
-const require_wxml = require("./wxml-DUIdXCVa.cjs");
-const require_hmr_timing = require("./hmr-timing-BnGBBJ6S.cjs");
-const require_context = require("./context-C3TryIjF.cjs");
-const require_tailwindcss = require("./tailwindcss-LtnGCxF0.cjs");
-const require_style_options = require("./style-options-COpQc8fr.cjs");
-const require_source_candidate_scan_signature = require("./source-candidate-scan-signature-GjsLzP8Z.cjs");
+const require_v4_generation_core = require("./v4-generation-core-2AuNMweK.cjs");
+const require_wxml = require("./wxml-CQmBCjOR.cjs");
+const require_hmr_timing = require("./hmr-timing-BjOxhci8.cjs");
+const require_context = require("./context-zWINV_E2.cjs");
+const require_tailwindcss = require("./tailwindcss-B3lqgbln.cjs");
+const require_style_options = require("./style-options-D0NukP02.cjs");
+const require_source_candidate_scan_signature = require("./source-candidate-scan-signature-uRHl5Ne9.cjs");
 require("./logger-TlKT3xmR.cjs");
-const require_css_imports = require("./css-imports-DfNC3e6a.cjs");
+const require_css_imports = require("./css-imports-BFMU7Hpd.cjs");
 let node_fs = require("node:fs");
 node_fs = require_rolldown_runtime.__toESM(node_fs, 1);
 let node_path = require("node:path");
@@ -982,7 +982,7 @@ let _lazyMatch = () => {
 				}
 				return u >= e;
 			})));
-		}, tr = (r, e) => C(r, 0, 1), f = (r, e) => C(r, 0, Infinity), x = (r, e) => {
+		}, tr = (r, e) => C(r, 0, 1), f = (r, e) => C(r, 0, 1 / 0), x = (r, e) => {
 			const n = r.map(v);
 			return g(_(M((a) => {
 				for (let t = 0, o = n.length; t < o; t++) if (!n[t](a)) return false;
@@ -1424,7 +1424,8 @@ function removeUnsupportedMiniProgramCssImportsFallback(css, file) {
 	return css.split(/\r?\n/).filter((line) => {
 		const trimmed = line.trim();
 		if (!trimmed.startsWith("@import")) return true;
-		const request = (0, _weapp_tailwindcss_postcss.parseTailwindCssDirectiveRequest)(trimmed.slice(7).trim().replace(/;$/, "").trim());
+		const params = trimmed.slice(7).trim().replace(/;$/, "").trim();
+		const request = (0, _weapp_tailwindcss_postcss.parseTailwindCssDirectiveRequest)(params);
 		return request === void 0 || (0, _weapp_tailwindcss_postcss.isMiniProgramLocalCssImportRequest)(request);
 	}).join("\n");
 }
@@ -1600,7 +1601,8 @@ function collectCssImportAtRuleCss(css) {
 function parseCssImportRequest(importCss) {
 	const trimmed = importCss.trim();
 	if (!trimmed.startsWith("@import")) return;
-	return (0, _weapp_tailwindcss_postcss.parseTailwindCssDirectiveRequest)(trimmed.slice(7).trim().replace(/;$/, "").trim());
+	const params = trimmed.slice(7).trim().replace(/;$/, "").trim();
+	return (0, _weapp_tailwindcss_postcss.parseTailwindCssDirectiveRequest)(params);
 }
 function shouldRestoreCssImportAtRule(importCss, file) {
 	if (file === void 0 || !isMiniProgramStyleOutputFile(file)) return true;
@@ -1857,7 +1859,8 @@ function resolveMiniProgramStyleOutputExtension(options = {}) {
 }
 function resolveReplayCssOutputFile(rootDir, file) {
 	const cleanFile = file.replace(/[?#].*$/, "");
-	const normalizedFile = require_source_candidate_scan_signature.normalizeOutputPathKey(node_path.default.isAbsolute(cleanFile) ? node_path.default.relative(resolveCssOutputRealPath(rootDir), resolveCssOutputRealPath(cleanFile)) : cleanFile);
+	const nextFile = node_path.default.isAbsolute(cleanFile) ? node_path.default.relative(resolveCssOutputRealPath(rootDir), resolveCssOutputRealPath(cleanFile)) : cleanFile;
+	const normalizedFile = require_source_candidate_scan_signature.normalizeOutputPathKey(nextFile);
 	if (normalizedFile.length === 0 || normalizedFile === "." || normalizedFile === ".." || normalizedFile.startsWith("../")) return require_source_candidate_scan_signature.normalizeOutputPathKey(node_path.default.basename(cleanFile));
 	return normalizedFile;
 }
@@ -3534,7 +3537,8 @@ function collectRememberedCssReplayGroups(sources, opts, rootDir, isWebGenerator
 		const cleanSourceFile = remembered.sourceFile.replace(/[?#].*$/, "");
 		const resolvedOutputFile = CSS_SOURCE_OUTPUT_EXT_RE.test(cleanSourceFile) ? resolveViteCssPipelineOutputFileFromSourceFile(remembered.sourceFile, opts, rootDir, isWebGeneratorTarget, preserveCssExtension, sourceRoot, styleOutputExtension, styleOutputFiles) : resolveViteCssPipelineOutputFileFromSourceFile(remembered.outputFile, opts, rootDir, isWebGeneratorTarget, preserveCssExtension, sourceRoot, styleOutputExtension, styleOutputFiles);
 		const rememberedOutputFile = remembered.outputFile.replace(/[?#].*$/, "");
-		const outputKey = require_source_candidate_scan_signature.normalizeOutputPathKey(opts.cssMatcher(rememberedOutputFile) && !require_source_candidate_scan_signature.normalizeOutputPathKey(rememberedOutputFile).includes("/") && require_source_candidate_scan_signature.normalizeOutputPathKey(rememberedOutputFile) !== require_source_candidate_scan_signature.normalizeOutputPathKey(resolvedOutputFile.replace(/[?#].*$/, "")) ? remembered.outputFile : resolvedOutputFile);
+		const outputFile = opts.cssMatcher(rememberedOutputFile) && !require_source_candidate_scan_signature.normalizeOutputPathKey(rememberedOutputFile).includes("/") && require_source_candidate_scan_signature.normalizeOutputPathKey(rememberedOutputFile) !== require_source_candidate_scan_signature.normalizeOutputPathKey(resolvedOutputFile.replace(/[?#].*$/, "")) ? remembered.outputFile : resolvedOutputFile;
+		const outputKey = require_source_candidate_scan_signature.normalizeOutputPathKey(outputFile);
 		const group = groups.get(outputKey) ?? [];
 		group.push({
 			key,
@@ -4939,7 +4943,8 @@ async function finalizeMiniProgramCssAssets(bundle, options) {
 		const rawSource = readAssetSource$1(output);
 		if (rawSource.trim().length === 0) continue;
 		if (options.lastCssResultByFile?.has(file)) {
-			const outputCss = (0, _weapp_tailwindcss_postcss.stripMiniProgramCssSpecificityPlaceholders)(require_v4_generation_core.finalizeMiniProgramCssStructure(rawSource));
+			const structurallyCleanSource = require_v4_generation_core.finalizeMiniProgramCssStructure(rawSource);
+			const outputCss = (0, _weapp_tailwindcss_postcss.stripMiniProgramCssSpecificityPlaceholders)(structurallyCleanSource);
 			if (outputCss !== rawSource) {
 				plan.write(file, outputCss);
 				writeTargets.set(file, output);
@@ -4973,7 +4978,8 @@ async function finalizeMiniProgramCssAssets(bundle, options) {
 			},
 			cssPresetEnv: {}
 		});
-		const outputCss = (0, _weapp_tailwindcss_postcss.stripMiniProgramCssSpecificityPlaceholders)(require_v4_generation_core.finalizeMiniProgramCssStructure(css));
+		const structurallyCleanCss = require_v4_generation_core.finalizeMiniProgramCssStructure(css);
+		const outputCss = (0, _weapp_tailwindcss_postcss.stripMiniProgramCssSpecificityPlaceholders)(structurallyCleanCss);
 		if (outputCss === rawSource) continue;
 		plan.write(file, outputCss);
 		writeTargets.set(file, output);
@@ -5286,7 +5292,8 @@ 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, pendingRememberedCssReplayUpdates, prepareJsTransformRuntime, 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);
+		const cssConcurrency = resolveViteCssTaskConcurrency(useIncrementalMode, runtimeState.tailwindRuntime.majorVersion);
+		const cssTask = require_v4_generation_core.runWithConcurrency(cssTaskFactories, cssConcurrency).then(() => void 0);
 		if (jsAfterCss) await cssTask;
 		else tasks.push(cssTask);
 	}
@@ -5686,7 +5693,8 @@ function resolveUniAppXStyleIsolationEnabled(root) {
 	const manifestPath = node_path.default.join(normalizedRoot, "manifest.json");
 	let enabled = false;
 	try {
-		enabled = `${(0, comment_json.parse)(node_fs.default.readFileSync(manifestPath, "utf8"))["uni-app-x"]?.styleIsolationVersion ?? ""}` === "2";
+		const raw = node_fs.default.readFileSync(manifestPath, "utf8");
+		enabled = `${(0, comment_json.parse)(raw)["uni-app-x"]?.styleIsolationVersion ?? ""}` === "2";
 	} catch {
 		enabled = false;
 	}
@@ -5958,12 +5966,13 @@ async function resolveHotSourceModulesByIds(ctx, ids) {
 	const root = ctx.server.config?.root ?? node_process.default.cwd();
 	const sourceIds = new Set(ids);
 	for (const id of ids) {
-		if (typeof id !== "string" || !/\.(?:uvue|nvue)(?:$|[?#])/i.test(id)) continue;
+		if (typeof id !== "string" || !/\.(?:uvue|nvue|vue|tsx?|jsx?)(?:$|[?#])/i.test(id)) continue;
 		const identity = resolveViteModuleIdentity(id, root);
 		for (const lookupId of identity.lookupIds) if (!/[?&]import(?:[=&]|$)/.test(lookupId)) sourceIds.add(`${(0, _weapp_tailwindcss_shared.cleanUrl)(lookupId)}?import`);
 	}
 	return resolveHotModulesByIds(ctx, sourceIds, (mod) => {
-		return !require_v4_generation_core.isSourceStyleRequest(mod.id ?? mod.url);
+		const modId = mod.id ?? mod.url;
+		return !require_v4_generation_core.isSourceStyleRequest(modId);
 	});
 }
 async function resolveHotSourceModules(ctx) {
@@ -5971,7 +5980,8 @@ async function resolveHotSourceModules(ctx) {
 	const seenModules = /* @__PURE__ */ new Set();
 	const collectModule = (mod) => {
 		if (mod == null || seenModules.has(mod)) return;
-		if (require_v4_generation_core.isSourceStyleRequest(mod.id ?? mod.url)) return;
+		const modId = mod.id ?? mod.url;
+		if (require_v4_generation_core.isSourceStyleRequest(modId)) return;
 		seenModules.add(mod);
 		modules.push(mod);
 	};
@@ -6055,7 +6065,8 @@ function createSupplementalHotUpdate(hotUrl, timestamp) {
 }
 function hasSelfAcceptingNonStyleHotModule(modules) {
 	return modules.some((mod) => {
-		return !require_v4_generation_core.isSourceStyleRequest(mod.id ?? mod.url) && mod.isSelfAccepting === true;
+		const modId = mod.id ?? mod.url;
+		return !require_v4_generation_core.isSourceStyleRequest(modId) && mod.isSelfAccepting === true;
 	});
 }
 function sendSupplementalCssHotUpdates(ctx, cssModules, fallbackCssIds = [], fallbackSourceIds = []) {
@@ -6189,7 +6200,7 @@ function resolvePreprocessorTransform(code, id, lang, options) {
 //#region src/uni-app-x/vite.ts
 let transformUVuePromise;
 function loadTransformUVue() {
-	transformUVuePromise ?? (transformUVuePromise = Promise.resolve().then(() => require("./transform-9wbmvHcC.cjs")).then((mod) => mod.transformUVue));
+	transformUVuePromise ?? (transformUVuePromise = Promise.resolve().then(() => require("./transform-BiHG42Rp.cjs")).then((mod) => mod.transformUVue));
 	return transformUVuePromise;
 }
 const UVUE_NVUE_QUERY_RE = /\.(?:uvue|nvue)(?:\?.*)?$/;
@@ -6431,11 +6442,12 @@ function createUniAppXAssetTask(file, originalSource, outDir, options) {
 		const { cache, hashKey, createHandlerOptions, debug, getAssetSource, getCssSources, injectStylePlaceholder = true, jsHandler, onUpdate, runtimeSet, applyLinkedResults } = options;
 		const absoluteFile = require_source_candidate_scan_signature.toAbsoluteOutputPath(file, outDir);
 		const rawSource = originalSource.source.toString();
+		const rawHashSource = options.hashSalt ? `${rawSource}\n/*${options.hashSalt}*/` : rawSource;
 		await require_hmr_timing.processCachedTask({
 			cache,
 			cacheKey: file,
 			hashKey,
-			rawSource: options.hashSalt ? `${rawSource}\n/*${options.hashSalt}*/` : rawSource,
+			rawSource: rawHashSource,
 			applyResult(source) {
 				originalSource.source = source;
 			},
@@ -6665,16 +6677,18 @@ async function processRememberedCssReplay(options) {
 		const allRememberedSignaturesFresh = rememberedKeys.length > 0 && rememberedKeys.every((key) => getRememberedCssSignature?.(key) === rememberedCssRuntimeSignature);
 		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;
+		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);
 			}
-			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;
@@ -7149,7 +7163,8 @@ function resolveCurrentSourceCandidateFile(options) {
 }
 function resolveCurrentSourceCandidateSource(options) {
 	const { file, getSourceCandidateSource, getSourceCandidateSources } = options;
-	const normalizedFile = require_source_candidate_scan_signature.normalizeOutputPathKey(file.replace(/[?#].*$/, ""));
+	const cleanedFile = file.replace(/[?#].*$/, "");
+	const normalizedFile = require_source_candidate_scan_signature.normalizeOutputPathKey(cleanedFile);
 	const sourceCandidates = createSourceCandidateFiles(options);
 	const explicitSource = sourceCandidates.reduce((source, candidate) => {
 		if (source || !candidate) return source;
@@ -9363,12 +9378,36 @@ function createFrameworkSourceCandidatesPlugin(options) {
 		const request = mod.url ?? mod.id;
 		return typeof request === "string" && /\.(?:uvue|nvue)(?:\?import)?$/i.test(request);
 	});
+	const sendSupplementalSourceHotUpdates = (ctx, modules) => {
+		const root = ctx.server.config?.root ?? node_process.default.cwd();
+		const updates = modules.flatMap((mod) => [mod, ...mod.importedModules ?? []]).filter((mod) => !require_v4_generation_core.isSourceStyleRequest(mod.id ?? mod.url)).map((mod) => {
+			let hotPath;
+			if (typeof mod.id === "string" && node_path.default.isAbsolute(mod.id)) {
+				const relative = typeof mod.url === "string" && mod.url.startsWith("/pages/") ? node_path.default.relative(node_path.default.dirname(root), mod.id) : node_path.default.relative(root, mod.id);
+				if (relative && !relative.startsWith("..") && !node_path.default.isAbsolute(relative)) hotPath = `/${relative.split(node_path.default.sep).join("/")}`;
+			}
+			hotPath ?? (hotPath = mod.url ?? (typeof mod.id === "string" && mod.id.startsWith("/") ? mod.id : void 0));
+			return hotPath ? {
+				acceptedPath: hotPath,
+				explicitImportRequired: false,
+				isWithinCircularImport: false,
+				path: hotPath,
+				timestamp: ctx.timestamp,
+				type: "js-update"
+			} : void 0;
+		}).filter((update) => update !== void 0);
+		if (updates.length > 0) ctx.server.ws?.send?.({
+			type: "update",
+			updates
+		});
+	};
 	return {
 		name: `${require_context.vitePluginName}:source-candidates`,
 		enforce: "pre",
 		async load(id) {
 			if (!options.shouldOwnTailwindGeneration || options.isWebOrNativeAppPlatform(options.resolveViteStylePlatform()) || !isCSSRequest(id) || !shouldCollectTransformedSourceCandidates(id)) return;
-			const rawCode = await (0, node_fs_promises.readFile)((0, _weapp_tailwindcss_shared.cleanUrl)(id), "utf8").catch(() => void 0);
+			const file = (0, _weapp_tailwindcss_shared.cleanUrl)(id);
+			const rawCode = await (0, node_fs_promises.readFile)(file, "utf8").catch(() => void 0);
 			if (typeof rawCode !== "string") return;
 			options.rememberOriginalCssLayerSource(id, rawCode);
 			const transformedCode = options.transformEarlyMiniProgramCss(rawCode);
@@ -9470,12 +9509,22 @@ function createFrameworkSourceCandidatesPlugin(options) {
 					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;
+					if (isWebLikeHotUpdate && isSourceCandidateHotUpdate && !require_v4_generation_core.isSourceStyleRequest(ctx.file)) {
+						sendSupplementalSourceHotUpdates(ctx, sourceModules);
+						if (sourceModules.some((mod) => {
+							const id = mod.id ?? mod.url;
+							return typeof id === "string" && /[?&]macro=true(?:&|$)/.test(id) === false && typeof mod.url === "string" && mod.url.startsWith("/pages/") && /\.vue(?:$|[?#])/i.test(id);
+						})) {
+							queueMicrotask(() => sendFullReloadForUnresolvedHotUpdate(ctx));
+							return [];
+						}
+					}
 					const hasHmrCandidateAppend = options.hmrCandidateState.hasPendingCandidateAppend() || canUseHmrCandidateAppend && sourceCandidateChange !== void 0 && sourceCandidateChange.addedCandidates.size > 0;
 					if (isSourceCandidateHotUpdate && !require_v4_generation_core.isSourceStyleRequest(ctx.file) && !hasHmrCandidateAppend && !isWebLikeHotUpdate && (!hasSelfAcceptingNonStyleHotModule(sourceModules) && cssModules.length === 0 || cssModules.length > 0 && options.isUniViteProject())) {
 						sendFullReloadForUnresolvedHotUpdate(ctx);
 						return [];
 					}
-					if (isWebLikeHotUpdate && isSourceCandidateHotUpdate && !require_v4_generation_core.isSourceStyleRequest(ctx.file) && sourceModules.some((mod) => options.isNuxtPageMacroHotModule(mod.id ?? mod.url))) {
+					if (isWebLikeHotUpdate && isSourceCandidateHotUpdate && !require_v4_generation_core.isSourceStyleRequest(ctx.file) && sourceModules.some((mod) => options.isNuxtPageHotModule?.(mod.id ?? mod.url))) {
 						sendFullReloadForUnresolvedHotUpdate(ctx);
 						return [];
 					}
@@ -10004,9 +10053,11 @@ function createViteFrameworkPlugins$1(options = {}, frameworkBranch) {
 		const platform = resolveViteStylePlatform();
 		return platform ? isWebOrNativeAppPlatform(platform) : resolveCurrentGeneratorBranch().isWeb;
 	};
-	const isNuxtPageMacroHotModule = (id) => {
-		if (typeof id !== "string" || !/[?&]macro=true(?:&|$)/.test(id)) return false;
-		const cleanId = (0, _weapp_tailwindcss_shared.cleanUrl)(id);
+	const isNuxtPageHotModule = (id) => {
+		if (typeof id !== "string") return false;
+		const cleanId = (0, _weapp_tailwindcss_shared.cleanUrl)(id).replace(/%2F/gi, "/");
+		if (cleanId.includes("virtual:nuxt:") && /(?:^|\/)routes\.mjs$/.test(cleanId)) return true;
+		if (!/[?&]macro=true(?:&|$)/.test(id)) return false;
 		return cleanId.includes("/pages/") && /\.(?:vue|tsx?|jsx?)$/.test(cleanId);
 	};
 	const normalizeGeneratedCssCacheFile = (file) => normalizeVitePersistentCacheKey((0, _weapp_tailwindcss_shared.cleanUrl)(file));
@@ -10406,7 +10457,7 @@ ${tracedCss}`;
 		hmrTimingRecorder,
 		invalidateRecordedGeneratorCandidates,
 		isCurrentWebLikeStylePlatform,
-		isNuxtPageMacroHotModule,
+		isNuxtPageHotModule,
 		isUniViteProject,
 		isWebOrNativeAppPlatform,
 		prepareTailwindGeneration,
@@ -10720,17 +10771,19 @@ function withUniAppXWebPreflightReset(css, enabled) {
 //#region src/bundlers/vite/uni-app-x-css-options.ts
 function resolveUniAppXNativeCssHandlerOptions(opts) {
 	const uniUtsPlatform = require_generator.resolveUniUtsPlatform();
-	if (!require_generator.shouldUseNativeAppCssBranch(require_generator.resolveGeneratorRuntimeBranch(require_generator.normalizeWeappTailwindcssGeneratorOptions(opts.generator, {
+	const branch = require_generator.normalizeWeappTailwindcssGeneratorOptions(opts.generator, {
 		appType: opts.appType,
 		platform: opts.cssOptions?.platform ?? opts.platform,
 		uniAppX: require_options.resolveUniAppXOptions(opts.uniAppX),
 		uniUtsPlatform
-	}), {
+	});
+	const runtimeBranch = require_generator.resolveGeneratorRuntimeBranch(branch, {
 		appType: opts.appType,
 		platform: opts.cssOptions?.platform ?? opts.platform,
 		uniAppX: require_options.resolveUniAppXOptions(opts.uniAppX),
 		uniUtsPlatform
-	})) || !require_options.isUniAppXEnabled(opts.uniAppX)) return {};
+	});
+	if (!require_generator.shouldUseNativeAppCssBranch(runtimeBranch) || !require_options.isUniAppXEnabled(opts.uniAppX)) return {};
 	return {
 		uniAppX: true,
 		uniAppXCssTarget: "uvue",