weapp-tailwindcss 5.1.4 → 5.1.5

package/dist/{tailwindcss-D0JF0fuZ.mjs → tailwindcss-C-uM4rB8.mjs}

@@ -12,6 +12,41 @@ import { logger } from "@weapp-tailwindcss/logger";
 import fg from "fast-glob";
 import { loadConfig } from "tailwindcss-config";
 import { fileURLToPath } from "node:url";
+//#region src/tailwindcss/v4/preflight.ts
+function parseCssImportSpecifier(params) {
+	const value = params.trim();
+	const quoted = /^(['"])(.*?)\1/.exec(value);
+	if (quoted) return quoted[2];
+	const url = /^url\(\s*(?:(['"])(.*?)\1|([^'")\s]+))\s*\)/.exec(value);
+	return url?.[2] ?? url?.[3];
+}
+function normalizeTailwindImportSpecifier(params) {
+	return parseCssImportSpecifier(params)?.replaceAll("\\", "/");
+}
+function isTailwindV4CssImportParam(params) {
+	const specifier = normalizeTailwindImportSpecifier(params);
+	return specifier === "tailwindcss" || specifier === "tailwindcss4" || specifier?.startsWith("tailwindcss/") === true || specifier?.startsWith("tailwindcss4/") === true || specifier?.endsWith("/tailwindcss/index.css") === true;
+}
+function isTailwindV4PreflightImportParam(params) {
+	const specifier = normalizeTailwindImportSpecifier(params);
+	return specifier === "tailwindcss" || specifier === "tailwindcss4" || specifier === "tailwindcss/preflight" || specifier === "tailwindcss/preflight.css" || specifier === "tailwindcss4/preflight" || specifier === "tailwindcss4/preflight.css" || specifier?.endsWith("/tailwindcss/index.css") === true || specifier?.endsWith("/tailwindcss/preflight.css") === true;
+}
+function includesTailwindV4PreflightDirective(css) {
+	try {
+		const root = postcss.parse(css);
+		let includesPreflight = false;
+		root.walkAtRules("import", (rule) => {
+			includesPreflight || (includesPreflight = isTailwindV4PreflightImportParam(rule.params));
+		});
+		root.walkAtRules("tailwind", (rule) => {
+			includesPreflight || (includesPreflight = rule.params.trim() === "base");
+		});
+		return includesPreflight;
+	} catch {
+		return /@import\s+(?:url\(\s*)?["']?tailwindcss4?(?:\/(?:preflight(?:\.css)?|index\.css))?["')\s;]/.test(css) || /@tailwind\s+base\b/.test(css);
+	}
+}
+//#endregion
 //#region src/bundlers/vite/static-config-content.ts
 function skipWhitespaceAndComments(source, start) {
 	let index = start;
@@ -194,17 +229,6 @@ function parseImportSourceParam(params) {
 		sourcePath: match[3]
 	};
 }
-function parseCssImportSpecifier(params) {
-	const value = params.trim();
-	const quoted = /^(['"])(.*?)\1/.exec(value);
-	if (quoted) return quoted[2];
-	const url = /^url\(\s*(?:(['"])(.*?)\1|([^'")\s]+))\s*\)/.exec(value);
-	return url?.[2] ?? url?.[3];
-}
-function isTailwindCssImport(params) {
-	const specifier = parseCssImportSpecifier(params);
-	return specifier === "tailwindcss" || specifier?.startsWith("tailwindcss/") || specifier?.replaceAll("\\", "/").endsWith("/tailwindcss/index.css");
-}
 function resolveSourceBase(base, sourcePath) {
 	return path.isAbsolute(sourcePath) ? sourcePath : path.resolve(base, sourcePath);
 }
@@ -294,17 +318,22 @@ async function resolveTailwindV4EntriesFromCss(css, base) {
 	let importSourceBase;
 	let hasSourceNone = false;
 	let hasTailwindCssImport = false;
+	let includesPreflight = false;
 	const [sourceEntries, configEntries] = await Promise.all([resolveCssSourceEntries(root, base, VITE_SOURCE_CANDIDATE_PATTERN), resolveConfigContentEntries(root, base)]);
 	const entries = [...configEntries.entries, ...sourceEntries];
 	const hasPositiveEntries = entries.some((entry) => !entry.negated);
 	const inlineCandidates = collectCssInlineSourceCandidates(root);
 	root.walkAtRules("import", (rule) => {
-		if (!isTailwindCssImport(rule.params)) return;
+		if (!isTailwindV4CssImportParam(rule.params)) return;
 		hasTailwindCssImport = true;
+		includesPreflight || (includesPreflight = isTailwindV4PreflightImportParam(rule.params));
 		const sourceParam = parseImportSourceParam(rule.params);
 		if (sourceParam?.none) hasSourceNone = true;
 		if (sourceParam?.sourcePath) importSourceBase = resolveSourceBase(base, sourceParam.sourcePath);
 	});
+	root.walkAtRules("tailwind", (rule) => {
+		includesPreflight || (includesPreflight = rule.params.trim() === "base");
+	});
 	if (importSourceBase) return {
 		entries: [{
 			base: importSourceBase,
@@ -312,30 +341,35 @@ async function resolveTailwindV4EntriesFromCss(css, base) {
 			pattern: VITE_SOURCE_CANDIDATE_PATTERN
 		}, ...entries],
 		explicit: true,
+		includesPreflight,
 		inlineCandidates,
 		dependencies: configEntries.dependencies
 	};
 	if (hasSourceNone) return {
 		entries,
 		explicit: true,
+		includesPreflight,
 		inlineCandidates,
 		dependencies: configEntries.dependencies
 	};
 	if (hasPositiveEntries) return {
 		entries,
 		explicit: true,
+		includesPreflight,
 		inlineCandidates,
 		dependencies: configEntries.dependencies
 	};
 	if (inlineCandidates.included.size > 0 || inlineCandidates.excluded.size > 0) return {
 		entries: [],
 		explicit: true,
+		includesPreflight,
 		inlineCandidates,
 		dependencies: configEntries.dependencies
 	};
 	return hasTailwindCssImport ? {
 		entries,
 		explicit: false,
+		includesPreflight,
 		inlineCandidates,
 		dependencies: configEntries.dependencies
 	} : void 0;
@@ -1420,4 +1454,4 @@ function createTailwindcssRuntimeFromContext(ctx) {
 	return createTailwindcssRuntimeForBase(resolvedTailwindcssBasedir, normalizedCssEntries ?? rawCssEntries, runtimeOptions);
 }
 //#endregion
-export { resolveViteTailwindV4CssDependencies as _, findTailwindConfig as a, getRuntimeClassSetCacheEntry as c, invalidateRuntimeClassSet as d, createViteSourceScanMatcher as f, resolveTailwindV4EntriesFromCssCached as g, resolveTailwindV4EntriesFromCss as h, resolveUniAppXOptions as i, getRuntimeClassSetSignature as l, discoverTailwindV4CssEntries as m, resolveTailwindcssBasedir as n, applyV4CssCalcDefaults as o, resolveViteSourceScanEntries as p, isUniAppXEnabled as r, warnMissingCssEntries as s, createTailwindcssRuntimeFromContext as t, getRuntimeClassSetSignatureWithSources as u };
+export { resolveViteTailwindV4CssDependencies as _, findTailwindConfig as a, getRuntimeClassSetCacheEntry as c, invalidateRuntimeClassSet as d, createViteSourceScanMatcher as f, resolveTailwindV4EntriesFromCssCached as g, resolveTailwindV4EntriesFromCss as h, resolveUniAppXOptions as i, getRuntimeClassSetSignature as l, discoverTailwindV4CssEntries as m, resolveTailwindcssBasedir as n, applyV4CssCalcDefaults as o, resolveViteSourceScanEntries as p, isUniAppXEnabled as r, warnMissingCssEntries as s, createTailwindcssRuntimeFromContext as t, getRuntimeClassSetSignatureWithSources as u, includesTailwindV4PreflightDirective as v };

package/dist/{transform-BP86eSZp.mjs → transform-DHLemtaX.mjs}

@@ -1,4 +1,4 @@
-import { c as createAttributeMatcher, d as JsTokenUpdater, f as _defineProperty, h as babelParse, m as replaceWxml, p as isClassContextLiteralPath, s as generateCode, u as analyzeSource } from "./context-Bkpmt3ja.mjs";
+import { c as createAttributeMatcher, d as JsTokenUpdater, f as _defineProperty, h as babelParse, m as replaceWxml, p as isClassContextLiteralPath, s as generateCode, u as analyzeSource } from "./context-rrYZuUBU.mjs";
 import { createRequire } from "node:module";
 import { splitCandidateTokens } from "@tailwindcss-mangle/engine";
 import MagicString from "magic-string";

package/dist/{transform-CXCQ28Tc.js → transform-KLD1tJdb.js}

@@ -1,5 +1,5 @@
 const require_rolldown_runtime = require("./rolldown-runtime-emK7D4bc.js");
-const require_context = require("./context-DCVMkTRj.js");
+const require_context = require("./context-BziwyWy1.js");
 let _tailwindcss_mangle_engine = require("@tailwindcss-mangle/engine");
 let magic_string = require("magic-string");
 magic_string = require_rolldown_runtime.__toESM(magic_string);

package/dist/typedoc.export.d.ts

@@ -1,3 +1,4 @@
 export type { WeappTailwindcssGenerateOptions, WeappTailwindcssGenerateResult, WeappTailwindcssGenerator, WeappTailwindcssGeneratorTarget, WeappTailwindcssPostcssPluginOptions, } from './index';
+export type { WeappTailwindcssStyleInjectorOptions } from './types';
 export type { ApplyOptions, CacheOptions, ExtractOptions, TailwindCssOptions, TailwindCssRuntimeOptions, TailwindV4Options, } from './types/typedoc-tailwindcss-runtime';
 export type { UserDefinedOptions } from './types/user-defined-options';

package/dist/types/index.d.ts

@@ -7,8 +7,9 @@ import type { AppType, IArbitraryValues, ICustomAttributesEntities } from './sha
 import type { UniAppXComponentLocalStylesOptions, UniAppXOptions as UniAppXUserDefinedOptions, UserDefinedOptions } from './user-defined-options';
 import type { LengthUnitsRuntimeOptions, TailwindContentTokenReport, TailwindcssExtractOptions, TailwindcssExtractResult, TailwindCssOptions, TailwindCssRuntimeOptions, TailwindPackageInfo } from '../tailwindcss/runtime-types';
 export type { TailwindCssOptions, TailwindCssRuntimeOptions, UniAppXComponentLocalStylesOptions, UniAppXUserDefinedOptions, UserDefinedOptions, };
-export type { CssPreflightOptions, IStyleHandlerOptions, ItemOrItemArray };
 export type { AppType, IArbitraryValues, ICustomAttributes, ICustomAttributesEntities, IUnocssCompatibilityOptions } from './shared';
+export type { CssPreflightOptions, IStyleHandlerOptions, ItemOrItemArray };
+export type { WeappTailwindcssStyleInjectorOptions } from '../style-injector/internal';
 export type RequiredDefined<T> = {
     [K in keyof T]-?: Exclude<T[K], undefined>;
 };

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

@@ -2,6 +2,7 @@ import type { ParserOptions } from '@babel/parser';
 import type { CssOptions, LoadedPostcssOptions } from '@weapp-tailwindcss/postcss/types';
 import type { ICreateCacheReturnType } from '../../cache';
 import type { WeappTailwindcssGeneratorUserOptions } from '../../generator';
+import type { WeappTailwindcssStyleInjectorUserOptions } from '../../style-injector/internal';
 import type { AppType, IArbitraryValues, IUnocssCompatibilityOptions } from '../shared';
 import type { LengthUnitsRuntimeOptions, TailwindCssRuntimeOptions } from '../../tailwindcss/runtime-types';
 export interface CssSourceTraceOptions {
@@ -18,6 +19,7 @@ export interface UserDefinedOptionsGeneralPart {
     replaceRuntimePackages?: boolean | Record<string, string> | undefined;
     rewriteCssImports?: boolean | undefined;
     generator?: WeappTailwindcssGeneratorUserOptions | undefined;
+    styleInjector?: WeappTailwindcssStyleInjectorUserOptions | undefined;
     cssSourceTrace?: CssSourceTraceUserOptions | undefined;
     disabledDefaultTemplateHandler?: boolean | undefined;
     runtimeLoaderPath?: string | undefined;

package/dist/{vite-BYgT1ir9.js → vite-Yp14HNyS.js}

@@ -3,10 +3,10 @@ const require_framework = require("./framework.js");
 const require_v4_engine = require("./v4-engine-CKtsdKxK.js");
 const require_generator = require("./generator-CilgHtxb.js");
 const require_utils = require("./utils-D3h8j7Mk.js");
-const require_context = require("./context-DCVMkTRj.js");
-const require_tailwindcss = require("./tailwindcss-D2xs4OEu.js");
-const require_hmr_timing = require("./hmr-timing-BV6nFPoT.js");
-const require_source_candidate_scan_signature = require("./source-candidate-scan-signature-CaDT0gkj.js");
+const require_context = require("./context-BziwyWy1.js");
+const require_tailwindcss = require("./tailwindcss-BwoNQ3t8.js");
+const require_hmr_timing = require("./hmr-timing-BKdCeIrn.js");
+const require_source_candidate_scan_signature = require("./source-candidate-scan-signature-DIj9m4wB.js");
 require("./logger-TlKT3xmR.js");
 let node_fs = require("node:fs");
 node_fs = require_rolldown_runtime.__toESM(node_fs);
@@ -515,7 +515,7 @@ function resolveUniAppXStyleIsolationEnabled(root) {
 //#region src/uni-app-x/vite.ts
 let transformUVuePromise;
 function loadTransformUVue() {
-	transformUVuePromise ?? (transformUVuePromise = Promise.resolve().then(() => require("./transform-CXCQ28Tc.js")).then((mod) => mod.transformUVue));
+	transformUVuePromise ?? (transformUVuePromise = Promise.resolve().then(() => require("./transform-KLD1tJdb.js")).then((mod) => mod.transformUVue));
 	return transformUVuePromise;
 }
 const preprocessorLangs = /* @__PURE__ */ new Set([
@@ -1928,8 +1928,14 @@ function resolveSourceStyleSourceFromOutputFile(outputFile, snapshot, outputRoot
 //#endregion
 //#region src/bundlers/vite/generate-bundle/subpackages.ts
 function readBundleAssetSource(output) {
-	if (output.type !== "asset") return;
-	return typeof output.source === "string" ? output.source : output.source.toString();
+	if ("type" in output && output.type !== "asset") return;
+	const source = output.source;
+	if (typeof source === "string") return source;
+	if (typeof source === "function") {
+		const value = source.call(output);
+		return typeof value === "string" ? value : value?.toString();
+	}
+	if (source != null && typeof source.toString === "function") return source.toString();
 }
 function normalizePackageRoot(root) {
 	return require_source_candidate_scan_signature.normalizeOutputPathKey(root).replace(/\/+$/, "");
@@ -3214,13 +3220,15 @@ function createRememberedCssRuntimeSignature(cssRuntimeSignature, cssRuntimeAffe
 function normalizeRememberedSourceIdentity(file) {
 	return require_source_candidate_scan_signature.normalizeOutputPathKey(file.replace(/[?#].*$/, ""));
 }
-function selectBestRememberedCssSourceMatches(sources, outputFile, outputRoot, sourceRoot) {
-	if (sources.length <= 1) return sources;
+function selectBestRememberedCssSourceMatches(sources, outputFile, outputRoot, sourceRoot, options = {}) {
+	const minimumScore = options.minimumScore ?? (options.requirePositiveScore ? 1 : 0);
 	const scoredMatches = sources.map((remembered) => ({
 		remembered,
 		score: Math.max(scoreMatchingStyleFileBase(outputFile, remembered.sourceFile, outputRoot, sourceRoot), scoreMatchingStyleFileBase(outputFile, remembered.outputFile, outputRoot, sourceRoot))
-	})).filter((match) => match.score > 0).sort((a, b) => b.score - a.score);
+	})).filter((match) => match.score >= minimumScore && match.score > 0).sort((a, b) => b.score - a.score);
 	const bestScore = scoredMatches[0]?.score;
+	if (!bestScore && minimumScore > 0) return [];
+	if (sources.length <= 1) return sources;
 	return bestScore ? scoredMatches.filter((match) => match.score === bestScore).map((match) => match.remembered) : sources;
 }
 function findRememberedCssSources(sources, outputFile, file, originalSource, outputRoot, sourceRoot) {
@@ -3238,11 +3246,16 @@ function findRememberedCssSources(sources, outputFile, file, originalSource, out
 		...originalSource.originalFileNames ?? []
 	].filter((item) => typeof item === "string" && item.length > 0);
 	const sourceMatched = rememberedSources.filter((remembered) => originalFiles.some((originalFile) => normalizeRememberedSourceIdentity(remembered.sourceFile) === normalizeRememberedSourceIdentity(originalFile)));
-	if (sourceMatched.length > 0) return sourceMatched;
+	if (sourceMatched.length > 0) {
+		const scoredSourceMatched = selectBestRememberedCssSourceMatches(sourceMatched, outputFile, outputRoot, sourceRoot, { requirePositiveScore: true });
+		if (scoredSourceMatched.length > 0) return scoredSourceMatched;
+	}
 	const outputMatched = rememberedSources.filter((remembered) => require_source_candidate_scan_signature.normalizeOutputPathKey(remembered.outputFile) === require_source_candidate_scan_signature.normalizeOutputPathKey(outputFile));
 	if (outputMatched.length > 0) return outputMatched;
 	if (!require_source_candidate_scan_signature.hasBundlerGeneratedCssMarker(source) && !hasTailwindGenerationSource(source)) return [];
 	const scoredMatches = selectBestRememberedCssSourceMatches(rememberedSources, outputFile, outputRoot, sourceRoot);
+	const strongScoredMatches = selectBestRememberedCssSourceMatches(rememberedSources, outputFile, outputRoot, sourceRoot, { minimumScore: 1e5 });
+	if (strongScoredMatches.length > 0 && strongScoredMatches.length < rememberedSources.length) return strongScoredMatches;
 	return scoredMatches.length === rememberedSources.length ? [] : scoredMatches;
 }
 function mergeRememberedCssSources(sources, outputFile) {
@@ -3644,16 +3657,24 @@ function scoreConfiguredTailwindV4SourceForRawSource(rawSource, entrySource) {
 	for (const token of entryTokens) if (rawTokens.has(token)) score += token.startsWith("config:") ? 100 : 1;
 	return score;
 }
-function resolveSubpackageRootForFile(file, subpackageRoots) {
-	if (!file || !subpackageRoots) return;
-	return [...subpackageRoots].find((root) => isSubpackageOutputFile(file, /* @__PURE__ */ new Set([root])));
-}
-function isSameSubpackageScope(outputFile, sourceFile, subpackageRoots) {
-	return resolveSubpackageRootForFile(outputFile, subpackageRoots) === resolveSubpackageRootForFile(sourceFile, subpackageRoots);
-}
-function selectTailwindV4GenerationCssSourceForOutput(outputFile, entries, rawSource, subpackageRoots) {
+function selectTailwindV4GenerationCssSourceForOutput(outputFile, entries, rawSource, options = {}) {
 	const generationSources = entries.filter((entry) => hasTailwindGenerationSource(entry.source));
 	if (generationSources.length <= 1) return generationSources[0];
+	const canMatchByOutputPath = Boolean(options.cwd || options.outputRoot || options.projectRoot);
+	const selectByOutputPath = (candidates) => {
+		if (!canMatchByOutputPath) return;
+		const scoredSources = candidates.map((entry) => ({
+			entry,
+			score: require_hmr_timing.scoreTailwindV4CssSourceFileMatch(outputFile, entry.file, {
+				cwd: options.cwd,
+				outputRoot: options.outputRoot,
+				projectRoot: options.projectRoot
+			})
+		})).filter((item) => item.score > 0).sort((a, b) => b.score - a.score);
+		const bestScore = scoredSources[0]?.score;
+		const bestSources = bestScore ? scoredSources.filter((item) => item.score === bestScore) : [];
+		return bestSources.length === 1 ? bestSources[0]?.entry : void 0;
+	};
 	const selectByRawSourceFingerprint = (candidates) => {
 		const scoredSources = candidates.map((entry) => ({
 			entry,
@@ -3665,14 +3686,10 @@ function selectTailwindV4GenerationCssSourceForOutput(outputFile, entries, rawSo
 	};
 	const rawSourceMatched = selectByRawSourceFingerprint(generationSources);
 	if (rawSourceMatched) return rawSourceMatched;
-	const scopedSources = subpackageRoots ? generationSources.filter((entry) => {
-		const outputMatchesSubpackage = isSubpackageOutputFile(outputFile, subpackageRoots);
-		const sourceMatchesSubpackage = isSubpackageOutputFile(entry.file, subpackageRoots);
-		if (!outputMatchesSubpackage) return !sourceMatchesSubpackage;
-		return sourceMatchesSubpackage && [...subpackageRoots].some((root) => isSubpackageOutputFile(outputFile, /* @__PURE__ */ new Set([root])) && isSubpackageOutputFile(entry.file, /* @__PURE__ */ new Set([root])));
-	}) : generationSources;
-	const explicitSources = scopedSources.filter((entry) => /@(?:config|source|plugin|custom-variant|theme|utility|variant|apply)\b/.test(entry.source));
-	const candidates = explicitSources.length === 1 ? explicitSources : scopedSources;
+	const explicitSources = generationSources.filter((entry) => /@(?:config|source|plugin|custom-variant|theme|utility|variant|apply)\b/.test(entry.source));
+	const candidates = explicitSources.length === 1 ? explicitSources : generationSources;
+	const outputPathMatched = selectByOutputPath(candidates);
+	if (outputPathMatched) return outputPathMatched;
 	if (candidates.length === 1) return candidates[0];
 	return selectByRawSourceFingerprint(candidates);
 }
@@ -4289,6 +4306,11 @@ function createGenerateBundleHook(context) {
 				if (rememberedCssSources.length > 0) rememberedCssSources = await Promise.all(rememberedCssSources.map(async (remembered) => {
 					return await refreshRememberedCssSource?.(remembered) ?? remembered;
 				}));
+				rememberedCssSources = rememberedCssSources.filter((remembered) => {
+					if (!configuredTailwindV4CssSourceFileKeysForScope.has(require_source_candidate_scan_signature.normalizeOutputPathKey(remembered.sourceFile.replace(/[?#].*$/, "")))) return true;
+					const matchedOutputFile = resolveMatchedOutputFileForCurrentAsset(remembered.sourceFile);
+					return !matchedOutputFile || require_source_candidate_scan_signature.normalizeOutputPathKey(matchedOutputFile) === require_source_candidate_scan_signature.normalizeOutputPathKey(outputFile);
+				});
 				let hasUsableRememberedTailwindSource = rememberedCssSources.some((remembered) => hasTailwindGenerationSource(remembered.rawSource) && require_source_candidate_scan_signature.normalizeOutputPathKey(remembered.sourceFile.replace(/[?#].*$/, "")) !== require_source_candidate_scan_signature.normalizeOutputPathKey(file));
 				const inferredSfcStyleSource = await resolveSfcStyleSourceFromOutputFile(outputFile, snapshot, outDir, opts.tailwindcssBasedir, opts.cssMatcher, getSfcSource, debug);
 				if (inferredSfcStyleSource) {
@@ -4301,10 +4323,6 @@ function createGenerateBundleHook(context) {
 					hasUsableRememberedTailwindSource = false;
 				}
 				let outputCssHandlerOptions = getCssHandlerOptions(outputFile);
-				if (currentSubpackageRoots && rememberedCssSources.length > 0 && rememberedCssSources.some((remembered) => configuredTailwindV4CssSourceFileKeysForScope.has(require_source_candidate_scan_signature.normalizeOutputPathKey(remembered.sourceFile.replace(/[?#].*$/, ""))) && !isSameSubpackageScope(outputFile, remembered.sourceFile, currentSubpackageRoots))) {
-					rememberedCssSources = [];
-					hasUsableRememberedTailwindSource = false;
-				}
 				if (isTemporaryCssAssetFile(outputFile) && hasTailwindGenerationSource(rawSource)) {
 					const resolvedTemporarySource = temporaryCssAssetSourceResolver.resolve(outputFile, rawSource);
 					if (resolvedTemporarySource) {
@@ -4358,7 +4376,11 @@ function createGenerateBundleHook(context) {
 						}
 					} else if (hasTailwindGenerationSource(rawSource) && (originalSource.originalFileNames?.length ?? 0) === 0) {
 						const availableConfiguredTailwindV4CssSourceEntries = configuredTailwindV4CssSourceEntries.filter((entry) => !usedConfiguredTailwindV4CssSourceFiles.has(require_source_candidate_scan_signature.normalizeOutputPathKey(entry.file)));
-						const configuredGenerationSource = selectTailwindV4GenerationCssSourceForOutput(outputFile, availableConfiguredTailwindV4CssSourceEntries, rawSource, currentSubpackageRoots);
+						const configuredGenerationSource = selectTailwindV4GenerationCssSourceForOutput(outputFile, availableConfiguredTailwindV4CssSourceEntries, rawSource, {
+							cwd: opts.tailwindcssBasedir,
+							outputRoot: outDir,
+							projectRoot: sourceRoot ?? rootDir
+						});
 						if (configuredGenerationSource && !hasViteProcessedCssResultForSource(configuredGenerationSource.file, getViteProcessedCssAssetResults)) {
 							outputFile = resolveMatchedOutputFileForCurrentAsset(configuredGenerationSource.file) ?? outputFile;
 							activeViteCssCacheFiles.add(normalizeViteCssCacheKey(outputFile));
@@ -4415,12 +4437,13 @@ function createGenerateBundleHook(context) {
 					...getCssHandlerOptions(generatorSourceFile),
 					isMainChunk: resolvedFromTemporaryCssAsset ? false : outputCssHandlerOptions.isMainChunk
 				} : getCssHandlerOptions(file);
+				const generatorCssEntries = configuredTailwindV4CssSourceFileKeysForScope.has(require_source_candidate_scan_signature.normalizeOutputPathKey(generatorSourceFile.replace(/[?#].*$/, ""))) ? [generatorSourceFile] : opts.cssEntries;
 				const generatorCssHandlerOptions = {
 					...cssHandlerOptions,
 					sourceOptions: {
 						...cssHandlerOptions.sourceOptions ?? {},
 						sourceFile: generatorSourceFile,
-						cssEntries: opts.cssEntries
+						cssEntries: generatorCssEntries
 					}
 				};
 				const scopedSourceCandidateGetter = createScopedSourceCandidateGetter(outputFile, generatorCssHandlerOptions);
@@ -5205,6 +5228,22 @@ function resolveHotTailwindCssModules(ctx, tailwindRootCssModuleIds) {
 	}
 	return modules;
 }
+function resolveHotSourceModules(ctx) {
+	const modules = [];
+	const seenModules = /* @__PURE__ */ new Set();
+	const collectModule = (mod) => {
+		if (mod == null || seenModules.has(mod)) return;
+		if (require_source_candidate_scan_signature.isSourceStyleRequest(mod.id ?? mod.url)) return;
+		seenModules.add(mod);
+		modules.push(mod);
+	};
+	for (const mod of ctx.modules) collectModule(mod);
+	for (const mod of ctx.server.moduleGraph.getModulesByFile(ctx.file) ?? []) collectModule(mod);
+	for (const mod of ctx.server.moduleGraph.getModulesByFile((0, _weapp_tailwindcss_shared.cleanUrl)(ctx.file)) ?? []) collectModule(mod);
+	collectModule(ctx.server.moduleGraph.getModuleById?.(ctx.file));
+	collectModule(ctx.server.moduleGraph.getModuleById?.((0, _weapp_tailwindcss_shared.cleanUrl)(ctx.file)));
+	return modules;
+}
 function resolveModuleHotUrl(mod) {
 	if (typeof mod.url === "string" && mod.url.length > 0) return mod.url;
 	if (typeof mod.id === "string" && mod.id.startsWith("/")) return mod.id;
@@ -5724,7 +5763,7 @@ function WeappTailwindcss(options = {}) {
 		return changed;
 	};
 	syncCssEntriesFromAnchor(opts.tailwindcssBasedir);
-	const { disabled, customAttributes, onLoad, mainCssChunkMatcher, styleHandler, jsHandler, tailwindRuntime, refreshTailwindcssRuntime, uniAppX, disabledDefaultTemplateHandler } = opts;
+	const { disabled, customAttributes, onLoad, mainCssChunkMatcher, styleHandler, jsHandler, tailwindRuntime, refreshTailwindcssRuntime, uniAppX, disabledDefaultTemplateHandler, styleInjector } = opts;
 	const initialTailwindRuntime = tailwindRuntime;
 	const refreshTailwindRuntime = refreshTailwindcssRuntime;
 	const uniAppXEnabled = require_tailwindcss.isUniAppXEnabled(uniAppX);
@@ -5903,6 +5942,15 @@ function WeappTailwindcss(options = {}) {
 	const getSourceCandidateSourcesForEntries = (entries, options) => sourceCandidateCollector.sourcesForEntries(entries, options);
 	const isWatchBuild = () => resolvedConfig?.command === "build" && resolvedConfig.build.watch != null;
 	const isWatchLikeBuild = () => isWatchBuild() || resolvedConfig?.command === "serve" || node_process.default.env["WEAPP_TW_WATCH_REGRESSION"] === "1" || node_process.default.env["WEAPP_TW_HMR_TIMING"] === "1";
+	const isCurrentWebLikeStylePlatform = () => {
+		const platform = resolveViteStylePlatform();
+		return platform ? isWebOrNativeAppPlatform(platform) : generatorBranch.isWeb;
+	};
+	const isNuxtPageMacroHotModule = (id) => {
+		if (typeof id !== "string" || !/[?&]macro=true(?:&|$)/.test(id)) return false;
+		const cleanId = (0, _weapp_tailwindcss_shared.cleanUrl)(id);
+		return cleanId.includes("/pages/") && /\.(?:vue|tsx?|jsx?)$/.test(cleanId);
+	};
 	const hasSourceCandidateScanState = () => sourceCandidateScanSignature !== void 0;
 	const normalizeSourceScanDependency = (file) => node_path.default.normalize(node_path.default.resolve((0, _weapp_tailwindcss_shared.cleanUrl)(file)));
 	const isSourceScanDependency = (file) => sourceScanDependencies.has(normalizeSourceScanDependency(file));
@@ -6147,7 +6195,8 @@ function WeappTailwindcss(options = {}) {
 			styleHandler,
 			debug,
 			previousCss: viteGeneratedCssByFile.get(file),
-			deferEmptyScopedCssSource: shouldDeferEmptyScopedCssSource
+			deferEmptyScopedCssSource: shouldDeferEmptyScopedCssSource,
+			restoreLocalCssImports: !generatorBranch.isWeb
 		});
 		if (!generated) return;
 		const tracedCss = require_hmr_timing.annotateCssSourceTrace(finalizeViteMiniProgramCss(generated.css), {
@@ -6330,13 +6379,27 @@ function WeappTailwindcss(options = {}) {
 				return hmrTimingRecorder.measure("sourceCandidates.handleHotUpdate", async () => {
 					const isSourceCandidateHotUpdate = shouldOwnTailwindGeneration && require_hmr_timing.isSourceCandidateRequest(ctx.file);
 					await syncChangedSourceCandidateFile(ctx.file);
-					if (isSourceCandidateHotUpdate) invalidateRecordedGeneratorCandidates();
+					const isWebLikeHotUpdate = isCurrentWebLikeStylePlatform();
+					if (isSourceCandidateHotUpdate) {
+						invalidateRecordedGeneratorCandidates();
+						if (isWebLikeHotUpdate) {
+							await refreshRuntimeStateForAutoCssSources?.(true);
+							await syncSourceCandidateScan({ force: true });
+						}
+					}
 					const cssModules = resolveHotTailwindCssModules(ctx, tailwindRootCssModuleIds);
-					if (isSourceCandidateHotUpdate && !require_source_candidate_scan_signature.isSourceStyleRequest(ctx.file) && (!hasSelfAcceptingNonStyleHotModule(ctx.modules) && cssModules.length === 0 || cssModules.length > 0 && isUniViteProject())) {
+					const sourceModules = isSourceCandidateHotUpdate && !require_source_candidate_scan_signature.isSourceStyleRequest(ctx.file) ? resolveHotSourceModules(ctx) : ctx.modules;
+					if (isSourceCandidateHotUpdate && !require_source_candidate_scan_signature.isSourceStyleRequest(ctx.file) && !isWebLikeHotUpdate && (!hasSelfAcceptingNonStyleHotModule(sourceModules) && cssModules.length === 0 || cssModules.length > 0 && isUniViteProject())) {
+						sendFullReloadForUnresolvedHotUpdate(ctx);
+						return [];
+					}
+					if (isWebLikeHotUpdate && isSourceCandidateHotUpdate && !require_source_candidate_scan_signature.isSourceStyleRequest(ctx.file) && ctx.modules.some((mod) => isNuxtPageMacroHotModule(mod.id ?? mod.url))) {
 						sendFullReloadForUnresolvedHotUpdate(ctx);
 						return [];
 					}
 					sendSupplementalCssHotUpdates(ctx, cssModules);
+					if (isWebLikeHotUpdate && isSourceCandidateHotUpdate && !require_source_candidate_scan_signature.isSourceStyleRequest(ctx.file)) return;
+					if (isSourceCandidateHotUpdate && !require_source_candidate_scan_signature.isSourceStyleRequest(ctx.file) && cssModules.length > 0) return [...sourceModules, ...cssModules];
 					return cssModules.length > 0 ? [...ctx.modules, ...cssModules] : void 0;
 				}, { emit: false });
 			},
@@ -6433,6 +6496,7 @@ function WeappTailwindcss(options = {}) {
 	];
 	if (uniAppXPlugins) plugins.push(...uniAppXPlugins);
 	plugins.push(cssFinalizerOutputPlugin);
+	plugins.push(...require_source_candidate_scan_signature.createBuiltinViteStyleInjectorPlugins(styleInjector, () => opts.appType));
 	return plugins;
 }
 //#endregion