weapp-tailwindcss 5.5.8 → 5.5.10

package/dist/{scoped-generator-DlQrVbuC.js → css-cleanup-B3xP5Qph.js}

@@ -1,11 +1,11 @@
-import { g as resolveTailwindV4EntriesFromCssCached, i as resolveUniAppXOptions } from "./tailwindcss-kSd0ykiX.js";
+import { g as resolveTailwindV4EntriesFromCssCached, i as resolveUniAppXOptions } from "./tailwindcss-XNfJSlhp.js";
 import { detectAppType } from "./framework.js";
-import { T as omitUndefined } from "./generator-oKZ5mCJ5.js";
+import { T as omitUndefined } from "./generator-LqofzXgr.js";
 import { n as hasCssMacroTailwindV4CustomVariantConditionalComments } from "./auto-ENr4xzzw.js";
-import { V as isSourceStyleRequest } from "./hmr-timing-xPpat-km.js";
-import { c as getViteHookHandler, o as normalizeStyleInjectorOptions, s as resolveStyleInjectorSubPackages } from "./source-candidate-scan-signature-BjVQYL-C.js";
-import path from "node:path";
-import { finalizeMiniProgramCss as finalizeMiniProgramCss$1, hasMiniProgramCssSpecificityPlaceholders, pruneMiniProgramGeneratedCss, stripMiniProgramCssSpecificityPlaceholders } from "@weapp-tailwindcss/postcss/transform";
+import { V as isSourceStyleRequest } from "./hmr-timing-Bb54exB0.js";
+import { c as getViteHookHandler, o as normalizeStyleInjectorOptions, s as resolveStyleInjectorSubPackages } from "./source-candidate-scan-signature-BWLf4tuO.js";
+import { analyzeTailwindV4EntrySource, finalizeMiniProgramCss as finalizeMiniProgramCss$1, hasMiniProgramCssSpecificityPlaceholders, pruneMiniProgramGeneratedCss, stripMiniProgramCssSpecificityPlaceholders } from "@weapp-tailwindcss/postcss/transform";
+import { sourcePathApi } from "@weapp-tailwindcss/source-scan";
 import { weappStyleInjector } from "weapp-style-injector/vite";
 import { StyleInjector } from "weapp-style-injector/vite/taro";
 import { StyleInjector as StyleInjector$1 } from "weapp-style-injector/vite/uni-app";
@@ -282,12 +282,15 @@ function hasRuntimeAffectingSourceChanges(changedByType) {
 }
 //#endregion
 //#region src/bundlers/vite/generate-bundle/scoped-generator.ts
-function hasOwnSourceDirectives(rawSource) {
-	return rawSource.includes("@source") || rawSource.includes("@config");
+function hasOwnSourceDirectives(rawSource, scopeToSource = false) {
+	const analysis = analyzeTailwindV4EntrySource(rawSource);
+	if (!analysis) return false;
+	const directives = analysis.getSourceDirectives();
+	return analysis.configRequests.length > 0 || scopeToSource && directives.hasSourceNone || Boolean(directives.importSourcePath) || directives.sourceRequests.length > 0 || directives.inlineCandidates.included.size > 0 || directives.inlineCandidates.excluded.size > 0;
 }
 function createLocalSourceEntries(sourceFile) {
 	return [{
-		base: path.dirname(path.resolve(sourceFile.replace(/[?#].*$/, ""))),
+		base: sourcePathApi(sourceFile).dirname(sourcePathApi(sourceFile).resolve(sourceFile.replace(/[?#].*$/, ""))),
 		negated: false,
 		pattern: "**/*"
 	}];
@@ -305,36 +308,36 @@ function mergeCandidates(first, second) {
 function canFallbackToOutputCandidates(rawSource, entries) {
 	return rawSource.includes("@source") && entries.length > 0 && entries.every((entry) => !entry.negated);
 }
-function resolveScopedSourceEntries(rawSource, sourceFile, resolvedEntries) {
-	if (!hasOwnSourceDirectives(rawSource)) return {
+function resolveScopedSourceEntries(rawSource, sourceFile, resolvedEntries, scopeToSource = false) {
+	if (!hasOwnSourceDirectives(rawSource, scopeToSource)) return {
 		entries: resolvedEntries,
 		localEntries: void 0
 	};
 	if (resolvedEntries !== void 0) return { entries: resolvedEntries };
 	return { entries: createLocalSourceEntries(sourceFile) };
 }
-async function resolveScopedGeneratorSourceEntries(rawSource, sourceFile) {
-	const sourceBase = path.dirname(path.resolve(sourceFile.replace(/[?#].*$/, "")));
-	return resolveScopedSourceEntries(rawSource, sourceFile, (await resolveTailwindV4EntriesFromCssCached(rawSource, sourceBase))?.entries);
+async function resolveScopedGeneratorSourceEntries(rawSource, sourceFile, scopeToSource = false) {
+	const sourceBase = sourcePathApi(sourceFile).dirname(sourcePathApi(sourceFile).resolve(sourceFile.replace(/[?#].*$/, "")));
+	return resolveScopedSourceEntries(rawSource, sourceFile, (await resolveTailwindV4EntriesFromCssCached(rawSource, sourceBase))?.entries, scopeToSource);
 }
 async function createScopedGeneratorCandidateSignature(rawSource, sourceFile, fallbackSignature, getSourceCandidatesForEntries, options = {}) {
-	if (!getSourceCandidatesForEntries || !hasOwnSourceDirectives(rawSource)) return fallbackSignature;
-	const { entries } = await resolveScopedGeneratorSourceEntries(rawSource, sourceFile);
+	if (!getSourceCandidatesForEntries || !hasOwnSourceDirectives(rawSource, options.scopeToSource)) return fallbackSignature;
+	const { entries } = await resolveScopedGeneratorSourceEntries(rawSource, sourceFile, options.scopeToSource);
 	if (entries === void 0) return fallbackSignature;
 	const scopedSignature = createCandidateSignature(getSourceCandidatesForEntries(entries));
 	return options.includeFallbackSignature === true ? `${scopedSignature}:${fallbackSignature}` : scopedSignature;
 }
-async function createScopedGeneratorSourceTraceMap(rawSource, sourceFile, getSourceCandidateSourcesForEntries) {
-	if (!getSourceCandidateSourcesForEntries || !hasOwnSourceDirectives(rawSource)) return getSourceCandidateSourcesForEntries?.(void 0);
-	const { entries } = await resolveScopedGeneratorSourceEntries(rawSource, sourceFile);
+async function createScopedGeneratorSourceTraceMap(rawSource, sourceFile, getSourceCandidateSourcesForEntries, options = {}) {
+	if (!getSourceCandidateSourcesForEntries || !hasOwnSourceDirectives(rawSource, options.scopeToSource)) return getSourceCandidateSourcesForEntries?.(void 0);
+	const { entries } = await resolveScopedGeneratorSourceEntries(rawSource, sourceFile, options.scopeToSource);
 	if (entries === void 0) return getSourceCandidateSourcesForEntries(void 0);
 	return getSourceCandidateSourcesForEntries(entries);
 }
 async function createScopedGeneratorRuntime(options) {
-	const { cssHandlerOptions, fallbackRuntime, getSourceCandidatesForEntries, outputFile, rawSource, shouldExcludeSubpackageSourceCandidates, sourceFile, scopedSourceCandidateGetter } = options;
+	const { cssHandlerOptions, fallbackRuntime, getSourceCandidatesForEntries, outputFile, rawSource, shouldExcludeSubpackageSourceCandidates, sourceFile, scopeToSource, scopedSourceCandidateGetter } = options;
 	if (getSourceCandidatesForEntries && rawSource && sourceFile) {
-		const { entries } = await resolveScopedGeneratorSourceEntries(rawSource, sourceFile);
-		if (entries !== void 0 && (entries.length > 0 || hasOwnSourceDirectives(rawSource))) {
+		const { entries } = await resolveScopedGeneratorSourceEntries(rawSource, sourceFile, scopeToSource);
+		if (entries !== void 0 && (entries.length > 0 || hasOwnSourceDirectives(rawSource, scopeToSource))) {
 			const explicitCandidates = getSourceCandidatesForEntries(entries);
 			const outputCandidates = scopedSourceCandidateGetter?.(void 0);
 			const scopedCandidates = outputCandidates ? explicitCandidates.size === 0 && canFallbackToOutputCandidates(rawSource, entries) ? outputCandidates : intersectCandidates(explicitCandidates, outputCandidates) : explicitCandidates;
@@ -347,4 +350,4 @@ async function createScopedGeneratorRuntime(options) {
 	return fallbackRuntime;
 }
 //#endregion
-export { createBuiltinWebpackStyleInjectorPlugin as _, hasMiniProgramCssSpecificityPlaceholders as a, resolveViteFrameworkProfile as b, createCandidateSignature as c, getSnapshotHash as d, hasRuntimeAffectingSourceChanges as f, createBuiltinViteStyleInjectorPlugins as g, resolvePluginDisabledState as h, finalizeMiniProgramCss$1 as i, createJsHashSalt as l, classifyRuntimeEntry as m, createScopedGeneratorRuntime as n, pruneMiniProgramGeneratedCss as o, summarizeStringDiff as p, createScopedGeneratorSourceTraceMap as r, stripMiniProgramCssSpecificityPlaceholders as s, createScopedGeneratorCandidateSignature as t, createLinkedImpactSignature as u, viteStyleInjectorDelegates as v, resolveWebpackFrameworkProfile as x, webpackStyleInjectorDelegates as y };
+export { resolveWebpackFrameworkProfile as S, createBuiltinViteStyleInjectorPlugins as _, createScopedGeneratorCandidateSignature as a, webpackStyleInjectorDelegates as b, hasOwnSourceDirectives as c, createLinkedImpactSignature as d, getSnapshotHash as f, resolvePluginDisabledState as g, classifyRuntimeEntry as h, stripMiniProgramCssSpecificityPlaceholders as i, createCandidateSignature as l, summarizeStringDiff as m, hasMiniProgramCssSpecificityPlaceholders as n, createScopedGeneratorRuntime as o, hasRuntimeAffectingSourceChanges as p, pruneMiniProgramGeneratedCss as r, createScopedGeneratorSourceTraceMap as s, finalizeMiniProgramCss$1 as t, createJsHashSalt as u, createBuiltinWebpackStyleInjectorPlugin as v, resolveViteFrameworkProfile as x, viteStyleInjectorDelegates as y };

package/dist/{generated-css-marker-B0RyziOH.cjs → generated-css-marker-nqjR6ntO.cjs}

@@ -1,8 +1,8 @@
 const require_rolldown_runtime = require("./rolldown-runtime-fg3euq-1.cjs");
-const require_generator = require("./generator-CxauQbx3.cjs");
+const require_generator = require("./generator-B1sYQpWu.cjs");
 require("./auto-B1OyRrE8.cjs");
-const require_compiler = require("./compiler-DbwS3329.cjs");
-const require_tailwindcss = require("./tailwindcss-U3KIUegn.cjs");
+const require_compiler = require("./compiler-TvqqdOMD.cjs");
+const require_tailwindcss = require("./tailwindcss-uf04Iolj.cjs");
 let node_fs = require("node:fs");
 let node_path = require("node:path");
 node_path = require_rolldown_runtime.__toESM(node_path, 1);
@@ -461,6 +461,30 @@ function diffCandidateSets(previous, next) {
 	};
 }
 //#endregion
+//#region src/project-sources/candidates/view-memo.ts
+/** 按候选版本和来源范围缓存视图，限制历史版本的驻留数量。 */
+function createCandidateViewMemo() {
+	const memo = /* @__PURE__ */ new Map();
+	return (kind, revision, entries, excludeEntries, collect) => {
+		if (entries === void 0 && !excludeEntries?.length) return collect();
+		const key = `${revision}\0${JSON.stringify(entries ?? null)}\0${JSON.stringify(excludeEntries ?? null)}`;
+		const cached = memo.get(key);
+		const view = cached?.[kind];
+		if (view) return view;
+		const result = collect();
+		const next = cached ?? {};
+		next[kind] = result;
+		memo.delete(key);
+		memo.set(key, next);
+		while (memo.size > 64) {
+			const oldest = memo.keys().next().value;
+			if (oldest === void 0) break;
+			memo.delete(oldest);
+		}
+		return result;
+	};
+}
+//#endregion
 //#region src/project-sources/candidates/views.ts
 function isIncludedFile(id, isActiveModule, entries, excludeEntries) {
 	if (entries !== void 0 && (isActiveModule ? (0, require_tailwindcss.source_scan_exports.isFileExcludedByTailwindSourceEntries)(id, entries) : entries.length === 0 || !(0, require_tailwindcss.source_scan_exports.isFileMatchedByTailwindSourceEntries)(id, entries))) return false;
@@ -520,6 +544,7 @@ function createSourceCandidateStore(options = {}) {
 	const moduleSourceById = /* @__PURE__ */ new Map();
 	const candidateCount = /* @__PURE__ */ new Map();
 	const fileCandidateMemo = /* @__PURE__ */ new Map();
+	const candidateViewMemo = createCandidateViewMemo();
 	let inlineIncludedCandidates = /* @__PURE__ */ new Set();
 	let inlineExcludedCandidates = /* @__PURE__ */ new Set();
 	let revision = 0;
@@ -728,22 +753,22 @@ function createSourceCandidateStore(options = {}) {
 		});
 	}
 	function valuesForEntries(entries, options = {}) {
-		return collectCandidateValues({
+		return candidateViewMemo("values", revision, entries, options.excludeEntries, () => collectCandidateValues({
 			candidatesById,
 			moduleCandidatesById,
 			candidateCount,
 			inlineIncludedCandidates,
 			inlineExcludedCandidates
-		}, entries, options.excludeEntries);
+		}, entries, options.excludeEntries));
 	}
 	function sourcesForEntries(entries, options = {}) {
-		return collectCandidateSources({
+		return candidateViewMemo("sources", revision, entries, options.excludeEntries, () => collectCandidateSources({
 			candidatesById,
 			moduleCandidatesById,
 			candidateCount,
 			inlineIncludedCandidates,
 			inlineExcludedCandidates
-		}, entries, options.excludeEntries);
+		}, entries, options.excludeEntries));
 	}
 	function clear() {
 		if (candidateCount.size > 0 || fileCandidateMemo.size > 0 || inlineIncludedCandidates.size > 0 || inlineExcludedCandidates.size > 0) revision++;
@@ -1171,15 +1196,24 @@ function mergeGeneratorResults(generatedResults) {
 	if (generatedResults.length === 1) return firstGenerated;
 	const incrementalCssResults = generatedResults.map((item) => item.incrementalCss).filter((css) => typeof css === "string");
 	const incrementalRawCssResults = generatedResults.map((item) => item.incrementalRawCss).filter((css) => typeof css === "string");
+	const customPropertyValues = /* @__PURE__ */ new Map();
+	const conflictingProperties = /* @__PURE__ */ new Set();
+	for (const result of generatedResults) for (const [name, value] of result.customPropertyValues ?? []) {
+		if (customPropertyValues.has(name) && customPropertyValues.get(name) !== value) conflictingProperties.add(name);
+		customPropertyValues.set(name, value);
+	}
+	for (const name of conflictingProperties) customPropertyValues.delete(name);
 	return {
 		...firstGenerated,
 		css: (0, _weapp_tailwindcss_postcss_transform.deduplicateGeneratedCssRules)(generatedResults.map((item) => item.css).join("\n")),
 		rawCss: (0, _weapp_tailwindcss_postcss_transform.deduplicateGeneratedCssRules)(generatedResults.map((item) => item.rawCss).join("\n")),
+		customPropertyContextCss: generatedResults.map((item) => item.customPropertyContextCss ?? item.rawCss).join("\n"),
 		incrementalCss: incrementalCssResults.length === generatedResults.length ? incrementalCssResults.filter(Boolean).join("\n") : void 0,
 		incrementalRawCss: incrementalRawCssResults.length === generatedResults.length ? incrementalRawCssResults.filter(Boolean).join("\n") : void 0,
 		classSet: new Set(generatedResults.flatMap((item) => [...item.classSet])),
 		dependencies: [...new Set(generatedResults.flatMap((item) => item.dependencies))],
-		sources: generatedResults.flatMap((item) => item.sources)
+		sources: generatedResults.flatMap((item) => item.sources),
+		customPropertyValues
 	};
 }
 //#endregion
@@ -1244,12 +1278,12 @@ function collectRpxThemeRiskSources(sources) {
 	for (const css of new Set(sources)) for (const name of (0, _weapp_tailwindcss_postcss_transform.collectRpxThemeVariables)(css)) variables.add(name);
 	return [...variables];
 }
-function warnRpxThemeRisk(session, variables, outputCss) {
+function warnRpxThemeRisk(session, variables, generatedCss) {
 	if (warnedSessions.has(session) || variables.length === 0) return;
-	const usage = (0, _weapp_tailwindcss_postcss_transform.inspectRpxCalcUsage)(outputCss, new Set(variables));
-	const runtimeHint = usage === void 0 ? "当前 CSS 无法完成诊断，请检查最终 WXSS。" : usage.variables.length > 0 || usage.inlineRpx ? `当前输出仍含运行时 calc：${[...usage.variables, ...usage.inlineRpx ? ["内联 rpx"] : []].join(", ")}。` : "当前输出未检测到相关运行时 calc；这不代表已验证所有作用域和设备。";
+	const usage = (0, _weapp_tailwindcss_postcss_transform.inspectRpxCalcUsage)(generatedCss, new Set(variables));
+	const generationHint = usage === void 0 ? "当前生成阶段的 CSS 无法完成诊断，请检查最终 WXSS。" : usage.variables.length > 0 || usage.inlineRpx ? `当前生成阶段仍含 calc：${[...usage.variables, ...usage.inlineRpx ? ["内联 rpx"] : []].join(", ")}；后续构建处理可能将其静态化，最终状态以 WXSS 为准。` : "当前生成阶段未检测到相关 calc；这不代表已验证最终产物、所有作用域和设备。";
 	warnedSessions.add(session);
-	_weapp_tailwindcss_logger.logger.warn(`[tailwindcss@4][rpx-theme] @theme 中使用 rpx 的主题变量：${variables.join(", ")}。${runtimeHint} 微信 WXSS 可能先独立换算或量化基数再乘法，造成尺寸偏差，具体取整算法尚未确认。固定像素尺寸优先使用 px，需要缩放时在构建期输出最终静态 rpx；偶数或较大 rpx 也不保证准确。请检查最终 WXSS 并在目标设备验证：https://tw.weapp.dev/docs/issues/spacing-rpx`);
+	_weapp_tailwindcss_logger.logger.warn(`[tailwindcss@4][rpx-theme] @theme 中使用 rpx 的主题变量：${variables.join(", ")}。${generationHint} 微信 WXSS 可能先独立换算或量化基数再乘法，造成尺寸偏差，具体取整算法尚未确认。固定像素尺寸优先使用 px，需要缩放时在构建期输出最终静态 rpx；偶数或较大 rpx 也不保证准确。请检查最终 WXSS 并在目标设备验证：https://tw.weapp.dev/docs/issues/spacing-rpx`);
 }
 //#endregion
 //#region src/generation/framework-postcss.ts
@@ -2197,6 +2231,28 @@ async function resolveGeneratorSource(_majorVersion, runtimeState, rawSource, fi
 //#endregion
 //#region src/generation/source-resolver/resolve-sources.ts
 async function resolveGeneratorResolvedSources(majorVersion, runtimeState, rawSource, file, cssHandlerOptions, generatorOptions, selectionOptions) {
+	const ownedSources = resolveCssHandlerSourceOptions(cssHandlerOptions)?.cssSources;
+	if (ownedSources?.length) {
+		const sourceOptions = {
+			...require_generator.resolveTailwindV4SourceOptionsFromRuntime(runtimeState.tailwindRuntime),
+			cssEntries: [],
+			cssSources: ownedSources
+		};
+		return Promise.all(ownedSources.map(async (source, index) => {
+			const resolved = await resolveSingleTailwindV4CssSource(source, sourceOptions, {
+				index,
+				matched: true,
+				primary: index === 0
+			});
+			return normalizeResolvedTailwindV4SourceConfig(withGeneratorSourceMetadata(generatorOptions?.config ? {
+				...resolved,
+				css: (0, _weapp_tailwindcss_postcss_transform.prependConfigDirective)(resolved.css, generatorOptions.config)
+			} : resolved, {
+				...getGeneratorSourceMetadata(resolved),
+				isolateCssSource: ownedSources.length > 1 || /source\(\s*none\s*\)/i.test(source.css)
+			}), source.file, sourceOptions);
+		}));
+	}
 	const base = resolveCssSourceBase(file, cssHandlerOptions);
 	const cssEntrySource = (0, _weapp_tailwindcss_postcss_transform.resolveCssEntrySource)(rawSource, base, {
 		importFallback: generatorOptions?.importFallback ?? false,
@@ -2331,17 +2387,8 @@ function setLimitedCacheValue(cache, key, value) {
 	}
 	cache.set(key, value);
 }
-function createStableJson(value) {
-	if (value === void 0) return "undefined";
-	if (value === null || typeof value !== "object") return JSON.stringify(value);
-	if (Array.isArray(value)) return `[${value.map((item) => createStableJson(item)).join(",")}]`;
-	return `{${Object.keys(value).sort().map((key) => {
-		const record = value;
-		return `${JSON.stringify(key)}:${createStableJson(record[key])}`;
-	}).join(",")}}`;
-}
 function createLegacyCompatTransformCacheKey(source, options) {
-	return `${createStableJson(options)}\0${source}`;
+	return `${require_generator.stableSerialize(options)}\0${source}`;
 }
 function resolveLegacyCompatCssSource(rawSource) {
 	const cached = legacyCompatSourceCache.get(rawSource);
@@ -2535,6 +2582,10 @@ async function finalizeDeferredGeneratorCss(context) {
 			const rawCss = (0, _weapp_tailwindcss_postcss_transform.stripTailwindBanner)(css);
 			const generationCss = generated.target === "weapp" && ((0, _weapp_tailwindcss_postcss_transform.hasCssMacroStyleOptions)(generatorStyleOptions) || (0, _weapp_tailwindcss_postcss_transform.hasCssMacroTailwindV4InternalAtRules)(rawCss)) ? await (0, _weapp_tailwindcss_postcss_transform.transformCssMacroCss)(rawCss, generatorStyleOptions) : rawCss;
 			const normalizedCss = generated.target === "weapp" ? await (0, _weapp_tailwindcss_postcss_transform.normalizeMiniProgramGeneratedCssForPostcss)(generationCss, {
+				cssCalc: generatorStyleOptions.cssCalc,
+				cssOptions: generatorStyleOptions.cssOptions,
+				customPropertyValues: generatorStyleOptions.customPropertyValues,
+				contextCss: generated.customPropertyContextCss ?? generated.rawCss,
 				preservePreflight: true,
 				preserveRawClassRules: true
 			}) : generationCss;
@@ -2943,8 +2994,9 @@ async function prepareGeneratorInputs(context) {
 				...source,
 				css: sourceCss
 			};
+			const entryCssCandidates = Boolean(cssHandlerOptions.sourceOptions?.cssSources?.length) ? (0, _weapp_tailwindcss_postcss_transform.collectGeneratorCssCandidates)(sourceMetadata.sourceCss ?? source.css) : currentCssCandidates;
 			const sourceEntries = getSourceCandidatesForEntries ? await resolveGeneratorSourceEntries(record, runtimeState) : void 0;
-			const sourceScopedRuntime = sourceEntries && sourceEntries.length > 0 ? getSourceCandidatesForEntries?.(sourceEntries) : void 0;
+			const sourceScopedRuntime = sourceEntries !== void 0 && (sourceEntries.length > 0 || sourceMetadata.isolateCssSource === true) ? getSourceCandidatesForEntries?.(sourceEntries) : void 0;
 			const scopedRuntime = resolveScopedRuntimeCandidates(options.sourceCandidates, sourceScopedRuntime);
 			const isolateCssSource = shouldIsolateScopedCssSource(majorVersion, record, sourceEntries, {
 				cssHandlerOptions,
@@ -2956,7 +3008,7 @@ async function prepareGeneratorInputs(context) {
 				return;
 			}
 			const sourceRuntime = scopedRuntime && (scopedRuntime.size > 0 || isolateCssSource) || isolateCssSource ? isolateCurrentCssCandidates ? runtimeWithCurrentCss : mergeScopedRuntimeWithCurrentRuntime(scopedRuntime ?? /* @__PURE__ */ new Set(), runtimeWithCurrentCss, {
-				currentCssCandidates,
+				currentCssCandidates: entryCssCandidates,
 				cssHandlerOptions,
 				isolateCssSource,
 				majorVersion,
@@ -2973,6 +3025,23 @@ async function prepareGeneratorInputs(context) {
 	};
 }
 //#endregion
+//#region src/generation/pipeline/style-context.ts
+/** 先确定同一输出的完整级联，再从原始声明生成兼容 CSS。 */
+async function mergeGeneratorResultsForOutput(results, options) {
+	const merged = mergeGeneratorResults(results);
+	if (!merged || results.length < 2 || merged.target === "tailwind" || !require_generator.hasCssCalcVariables(options)) return merged;
+	const css = await require_generator.transformTailwindV4CssByTarget(merged.rawCss, merged.target, {
+		...options,
+		customPropertyContextCss: [options.customPropertyContextCss, merged.customPropertyContextCss].filter(Boolean).join("\n")
+	});
+	return {
+		...merged,
+		css,
+		incrementalCss: void 0,
+		incrementalRawCss: void 0
+	};
+}
+//#endregion
 //#region src/generation/pipeline/execution.ts
 async function executeGeneratorPipeline(context) {
 	return require_compiler.runCompilerOwnerActivity(context.runtimeState, () => executeGeneratorPipelineWithOwner(context, require_compiler.getCompilationSessionPool(context.runtimeState), require_compiler.getTailwindGenerationSessionPool(context.runtimeState)));
@@ -2982,6 +3051,12 @@ async function executeGeneratorPipelineWithOwner(context, compilationPool, gener
 	await runtimeState.readyPromise;
 	const compilerSession = options.compilation?.enabled ? require_compiler.getFrameworkCompilerSession(runtimeState, opts) : void 0;
 	const { isolateCurrentCssCandidates, runtimeWithCurrentCss, generatorSourceRecords, generatorStyleOptions, configuredContainerCompat, sourceConcurrency, preparedGenerationInputs } = await prepareGeneratorInputs(context);
+	if (require_generator.hasCssCalcVariables(generatorStyleOptions)) generatorStyleOptions.customPropertyContextCss = [
+		generatorStyleOptions.customPropertyContextCss,
+		context.generatedUserCssRawSource,
+		options.frameworkProcessedUserCss,
+		...preparedGenerationInputs.map((input) => input.generatorSource.css)
+	].filter(Boolean).join("\n");
 	const generatePreparedInputs = async (candidateSets) => {
 		return runWithConcurrency(preparedGenerationInputs.map((input) => async () => {
 			const projectedCandidates = candidateSets?.get(input.sourceId);
@@ -3027,7 +3102,7 @@ async function executeGeneratorPipelineWithOwner(context, compilationPool, gener
 			if (compilerSession && options.compilation?.changes) compilerSession.invalidate(options.compilation.changes.map((change) => change.id));
 			await compilerSession?.syncScope(options.compilation?.scope.id ?? options.outputFile ?? file, preparedGenerationInputs.map((input) => input.sourceId));
 			const results = await generatePreparedInputs(compilation.candidatesBySource);
-			const merged = mergeGeneratorResults(results.map((result) => result.generated));
+			const merged = await mergeGeneratorResultsForOutput(results.map((result) => result.generated), generatorStyleOptions);
 			return merged ? {
 				classSet: merged.classSet,
 				dependenciesBySource: results.map((result) => [result.sourceId, resolveCompilationDependencies(result.generated.dependencies)]),
@@ -3048,8 +3123,9 @@ async function executeGeneratorPipelineWithOwner(context, compilationPool, gener
 			snapshot: execution.value.snapshot
 		};
 		compilationRevision = execution.compilation.revision;
-	} else generated = mergeGeneratorResults((await generatePreparedInputs()).map((result) => result.generated));
+	} else generated = await mergeGeneratorResultsForOutput((await generatePreparedInputs()).map((result) => result.generated), generatorStyleOptions);
 	if (!generated) return;
+	if (generated.customPropertyContextCss) generatorStyleOptions.customPropertyContextCss = generated.customPropertyContextCss;
 	debug("tailwind generator result: %s rawBytes=%d cssBytes=%d candidates=%d", file, generated.rawCss.length, generated.css.length, generated.classSet.size);
 	const hasMatchedCssSourceFile = generatorSourceRecords.some((record) => record.metadata.matchedCssSourceFile);
 	const hasExplicitCssSource = generatorSourceRecords.some(({ metadata }) => {

package/dist/generation/pipeline/style-context.d.ts

@@ -0,0 +1,3 @@
+import type { IStyleHandlerOptions } from '@weapp-tailwindcss/postcss/types';
+import type { GeneratorResult } from '../generation-helpers/results.js';
+export declare function mergeGeneratorResultsForOutput(results: GeneratorResult[], options: Partial<IStyleHandlerOptions>): Promise<GeneratorResult | undefined>;