weapp-tailwindcss 5.5.8 → 5.5.10

package/dist/{hmr-timing-xPpat-km.js → hmr-timing-Bb54exB0.js}

@@ -1,7 +1,7 @@
-import { _ as resolveTailwindV4CssSourceBase, h as resolveTailwindV4EntriesFromCss, l as getRuntimeClassSetSignature, r as isUniAppXEnabled, v as source_scan_exports } from "./tailwindcss-kSd0ykiX.js";
-import { B as loadTailwindV4DesignSystem, R as filterUnsupportedMiniProgramTailwindV4Candidates, T as omitUndefined, a as resolveGeneratorRuntimeBranch, d as resolveTailwindV4SourceFromRuntime, i as normalizeWeappTailwindcssGeneratorOptions, p as resolveTailwindV4SourceOptionsFromRuntime, s as shouldUseMiniProgramCssBranch, u as resolveTailwindV4Source$1 } from "./generator-oKZ5mCJ5.js";
+import { _ as resolveTailwindV4CssSourceBase, h as resolveTailwindV4EntriesFromCss, l as getRuntimeClassSetSignature, r as isUniAppXEnabled, v as source_scan_exports } from "./tailwindcss-XNfJSlhp.js";
+import { B as stableSerialize, F as transformTailwindV4CssByTarget, H as loadTailwindV4DesignSystem, N as hasCssCalcVariables, T as omitUndefined, a as resolveGeneratorRuntimeBranch, d as resolveTailwindV4SourceFromRuntime, i as normalizeWeappTailwindcssGeneratorOptions, p as resolveTailwindV4SourceOptionsFromRuntime, s as shouldUseMiniProgramCssBranch, u as resolveTailwindV4Source$1, z as filterUnsupportedMiniProgramTailwindV4Candidates } from "./generator-LqofzXgr.js";
 import { o as transformCssMacroCss, r as hasCssMacroTailwindV4InternalAtRules, t as hasCssMacroStyleOptions } from "./auto-ENr4xzzw.js";
-import { C as babelParse, H as getTailwindGenerationSessionPool, J as createCssFragment, K as mergeCompilationDependencyChanges, L as composeGenerationArtifact, N as createDebug, P as normalizeFrameworkStylePlatform, R as consumeCompilationScopeChanges, S as replaceWxml, T as traverse, U as getCompilationSessionPool, W as runCompilerOwnerActivity, Y as createGenerationArtifact, l as recordCompilerShadowReport, m as resolveStyleOptionsFromContext, o as completeCompilerShadowReportRun, q as md5Hash, r as createStylePlatformAdapter, s as getCompilerShadowRunRevision, u as getFrameworkCompilerSession, v as createAttributeMatcher } from "./compiler-CThodfGH.js";
+import { C as babelParse, H as getTailwindGenerationSessionPool, J as createCssFragment, K as mergeCompilationDependencyChanges, L as composeGenerationArtifact, N as createDebug, P as normalizeFrameworkStylePlatform, R as consumeCompilationScopeChanges, S as replaceWxml, T as traverse, U as getCompilationSessionPool, W as runCompilerOwnerActivity, Y as createGenerationArtifact, l as recordCompilerShadowReport, m as resolveStyleOptionsFromContext, o as completeCompilerShadowReportRun, q as md5Hash, r as createStylePlatformAdapter, s as getCompilerShadowRunRevision, u as getFrameworkCompilerSession, v as createAttributeMatcher } from "./compiler-v9sYta8W.js";
 import { existsSync, readFileSync } from "node:fs";
 import path from "node:path";
 import process from "node:process";
@@ -500,6 +500,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, source_scan_exports.isFileExcludedByTailwindSourceEntries)(id, entries) : entries.length === 0 || !(0, source_scan_exports.isFileMatchedByTailwindSourceEntries)(id, entries))) return false;
@@ -559,6 +583,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;
@@ -767,22 +792,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++;
@@ -1389,15 +1414,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: deduplicateGeneratedCssRules(generatedResults.map((item) => item.css).join("\n")),
 		rawCss: 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
@@ -1462,12 +1496,12 @@ function collectRpxThemeRiskSources(sources) {
 	for (const css of new Set(sources)) for (const name of 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 = 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 = 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);
-	logger.warn(`[tailwindcss@4][rpx-theme] @theme 中使用 rpx 的主题变量：${variables.join(", ")}。${runtimeHint} 微信 WXSS 可能先独立换算或量化基数再乘法，造成尺寸偏差，具体取整算法尚未确认。固定像素尺寸优先使用 px，需要缩放时在构建期输出最终静态 rpx；偶数或较大 rpx 也不保证准确。请检查最终 WXSS 并在目标设备验证：https://tw.weapp.dev/docs/issues/spacing-rpx`);
+	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
@@ -2415,6 +2449,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 = {
+			...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: 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 = resolveCssEntrySource$1(rawSource, base, {
 		importFallback: generatorOptions?.importFallback ?? false,
@@ -2549,17 +2605,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 `${stableSerialize(options)}\0${source}`;
 }
 function resolveLegacyCompatCssSource(rawSource) {
 	const cached = legacyCompatSourceCache.get(rawSource);
@@ -2753,6 +2800,10 @@ async function finalizeDeferredGeneratorCss(context) {
 			const rawCss = stripTailwindBanner(css);
 			const generationCss = generated.target === "weapp" && (hasCssMacroStyleOptions(generatorStyleOptions) || hasCssMacroTailwindV4InternalAtRules(rawCss)) ? await transformCssMacroCss(rawCss, generatorStyleOptions) : rawCss;
 			const normalizedCss = generated.target === "weapp" ? await normalizeMiniProgramGeneratedCssForPostcss(generationCss, {
+				cssCalc: generatorStyleOptions.cssCalc,
+				cssOptions: generatorStyleOptions.cssOptions,
+				customPropertyValues: generatorStyleOptions.customPropertyValues,
+				contextCss: generated.customPropertyContextCss ?? generated.rawCss,
 				preservePreflight: true,
 				preserveRawClassRules: true
 			}) : generationCss;
@@ -3161,8 +3212,9 @@ async function prepareGeneratorInputs(context) {
 				...source,
 				css: sourceCss
 			};
+			const entryCssCandidates = Boolean(cssHandlerOptions.sourceOptions?.cssSources?.length) ? 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,
@@ -3174,7 +3226,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,
@@ -3191,6 +3243,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" || !hasCssCalcVariables(options)) return merged;
+	const css = await 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 runCompilerOwnerActivity(context.runtimeState, () => executeGeneratorPipelineWithOwner(context, getCompilationSessionPool(context.runtimeState), getTailwindGenerationSessionPool(context.runtimeState)));
@@ -3200,6 +3269,12 @@ async function executeGeneratorPipelineWithOwner(context, compilationPool, gener
 	await runtimeState.readyPromise;
 	const compilerSession = options.compilation?.enabled ? getFrameworkCompilerSession(runtimeState, opts) : void 0;
 	const { isolateCurrentCssCandidates, runtimeWithCurrentCss, generatorSourceRecords, generatorStyleOptions, configuredContainerCompat, sourceConcurrency, preparedGenerationInputs } = await prepareGeneratorInputs(context);
+	if (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);
@@ -3245,7 +3320,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)]),
@@ -3266,8 +3341,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/index.cjs

@@ -1,10 +1,10 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_framework = require("./framework.cjs");
-const require_generator = require("./generator-CxauQbx3.cjs");
-const require_gulp = require("./gulp-CngHA9cU.cjs");
+const require_generator = require("./generator-B1sYQpWu.cjs");
+const require_gulp = require("./gulp-DrX6QS3N.cjs");
 const require_postcss = require("./postcss.cjs");
-const require_vite = require("./vite-IX83wh_L.cjs");
-const require_webpack = require("./webpack-BetjemzT.cjs");
+const require_vite = require("./vite-C3Zh6iYK.cjs");
+const require_webpack = require("./webpack-Dbj2uykF.cjs");
 require("./webpack.cjs");
 let _weapp_tailwindcss_postcss_transform = require("@weapp-tailwindcss/postcss/transform");
 exports.WeappTailwindcss = require_vite.WeappTailwindcss;

package/dist/index.js

@@ -1,9 +1,9 @@
 import { detectAppType, detectAppTypeFromEnv, detectAppTypeFromPackageJson, isMpxPackage, isRunningInHBuilderX, isTaroPackage, isUniAppPackage, isUniAppVitePackage, isUniAppXManifest, isUniAppXPackage, isWeappVitePackage, resolveImplicitAppTypeFromViteRoot, resolveMpxPlatform, resolvePlatform, resolveTaroPlatform, resolveUniAppXPlatform, resolveUniPlatform, resolveUniPlatformsFromEnv, resolveUniUtsPlatform } from "./framework.js";
-import { t as createWeappTailwindcssGenerator } from "./generator-oKZ5mCJ5.js";
-import { t as createPlugins } from "./gulp-DhddVxGA.js";
+import { t as createWeappTailwindcssGenerator } from "./generator-LqofzXgr.js";
+import { t as createPlugins } from "./gulp-BCV0gOMb.js";
 import weappTailwindcssPostcssPlugin from "./postcss.js";
-import { t as WeappTailwindcss } from "./vite-D-RGkmOE.js";
-import { n as weappTailwindcssPackageDir } from "./webpack-Bhkd27Rs.js";
+import { t as WeappTailwindcss } from "./vite-D6_FxvdM.js";
+import { n as weappTailwindcssPackageDir } from "./webpack-BZBqKB4Y.js";
 import "./webpack.js";
 import { unitConversionComposeRules, unitConversionPresets } from "@weapp-tailwindcss/postcss/transform";
 export { WeappTailwindcss, createPlugins, createWeappTailwindcssGenerator, detectAppType, detectAppTypeFromEnv, detectAppTypeFromPackageJson, isMpxPackage, isRunningInHBuilderX, isTaroPackage, isUniAppPackage, isUniAppVitePackage, isUniAppXManifest, isUniAppXPackage, isWeappVitePackage, resolveImplicitAppTypeFromViteRoot, resolveMpxPlatform, resolvePlatform, resolveTaroPlatform, resolveUniAppXPlatform, resolveUniPlatform, resolveUniPlatformsFromEnv, resolveUniUtsPlatform, unitConversionComposeRules, unitConversionPresets, weappTailwindcssPackageDir, weappTailwindcssPostcssPlugin };

package/dist/{pipeline-helpers-EUud9R2K.cjs → pipeline-helpers-DJ3VZ01J.cjs}

@@ -1,8 +1,8 @@
 const require_rolldown_runtime = require("./rolldown-runtime-fg3euq-1.cjs");
-const require_generator = require("./generator-CxauQbx3.cjs");
-const require_compiler = require("./compiler-DbwS3329.cjs");
+const require_generator = require("./generator-B1sYQpWu.cjs");
+const require_compiler = require("./compiler-TvqqdOMD.cjs");
 const require_defaults = require("./defaults-CyX5iO9y.cjs");
-const require_generated_css_marker = require("./generated-css-marker-B0RyziOH.cjs");
+const require_generated_css_marker = require("./generated-css-marker-nqjR6ntO.cjs");
 require("./final-css-cleanup-B6FUJC3z.cjs");
 require("./css-cleanup-B6FUJC3z.cjs");
 let node_path = require("node:path");

package/dist/postcss.cjs

@@ -2,7 +2,7 @@ Object.defineProperties(exports, {
 	__esModule: { value: true },
 	[Symbol.toStringTag]: { value: "Module" }
 });
-const require_generator = require("./generator-CxauQbx3.cjs");
+const require_generator = require("./generator-B1sYQpWu.cjs");
 const weappTailwindcssPostcssPlugin = (0, require("@weapp-tailwindcss/postcss/plugin").createWeappTailwindcssPostcssPlugin)({
 	compiledSourceScan: true,
 	createGenerator: (source) => {

package/dist/postcss.js

@@ -1,4 +1,4 @@
-import { i as normalizeWeappTailwindcssGeneratorOptions, t as createWeappTailwindcssGenerator, u as resolveTailwindV4Source } from "./generator-oKZ5mCJ5.js";
+import { i as normalizeWeappTailwindcssGeneratorOptions, t as createWeappTailwindcssGenerator, u as resolveTailwindV4Source } from "./generator-LqofzXgr.js";
 import { createWeappTailwindcssPostcssPlugin } from "@weapp-tailwindcss/postcss/plugin";
 const weappTailwindcssPostcssPlugin = createWeappTailwindcssPostcssPlugin({
 	compiledSourceScan: true,

package/dist/presets.cjs

@@ -1,9 +1,9 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_rolldown_runtime = require("./rolldown-runtime-fg3euq-1.cjs");
 const require_framework = require("./framework.cjs");
-const require_generator = require("./generator-CxauQbx3.cjs");
+const require_generator = require("./generator-B1sYQpWu.cjs");
 require("./utils-CuKLf1Zv.cjs");
-const require_tailwindcss = require("./tailwindcss-U3KIUegn.cjs");
+const require_tailwindcss = require("./tailwindcss-uf04Iolj.cjs");
 require("./logger-TlKT3xmR.cjs");
 let node_path = require("node:path");
 node_path = require_rolldown_runtime.__toESM(node_path, 1);

package/dist/presets.js

@@ -1,6 +1,6 @@
-import { i as resolveUniAppXOptions, n as resolveTailwindcssBasedir } from "./tailwindcss-kSd0ykiX.js";
+import { i as resolveUniAppXOptions, n as resolveTailwindcssBasedir } from "./tailwindcss-XNfJSlhp.js";
 import { resolveTaroPlatform, resolveUniPlatformsFromEnv } from "./framework.js";
-import { T as omitUndefined } from "./generator-oKZ5mCJ5.js";
+import { T as omitUndefined } from "./generator-LqofzXgr.js";
 import { n as defuOverrideArray } from "./utils-MVwpU07P.js";
 import { t as logger } from "./logger-BNzxZbZj.js";
 import path from "node:path";

package/dist/project-sources/candidates/view-memo.d.ts

@@ -0,0 +1,7 @@
+import type { TailwindSourceEntry } from '../../tailwindcss/source-scan.js';
+interface CandidateViews {
+    values: Set<string>;
+    sources: Map<string, Set<string>>;
+}
+export declare function createCandidateViewMemo(): <K extends keyof CandidateViews>(kind: K, revision: number, entries: TailwindSourceEntry[] | undefined, excludeEntries: TailwindSourceEntry[] | undefined, collect: () => CandidateViews[K]) => CandidateViews[K];
+export {};

package/dist/rspack.cjs

@@ -1,7 +1,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_rolldown_runtime = require("./rolldown-runtime-fg3euq-1.cjs");
-const require_generated_css_marker = require("./generated-css-marker-B0RyziOH.cjs");
-const require_webpack = require("./webpack-BetjemzT.cjs");
+const require_generated_css_marker = require("./generated-css-marker-nqjR6ntO.cjs");
+const require_webpack = require("./webpack-Dbj2uykF.cjs");
 let node_path = require("node:path");
 node_path = require_rolldown_runtime.__toESM(node_path, 1);
 //#region src/bundlers/rspack/rule-match.ts

package/dist/rspack.js

@@ -1,5 +1,5 @@
-import { V as isSourceStyleRequest } from "./hmr-timing-xPpat-km.js";
-import { n as weappTailwindcssPackageDir, r as __dirname, t as WeappTailwindcss } from "./webpack-Bhkd27Rs.js";
+import { V as isSourceStyleRequest } from "./hmr-timing-Bb54exB0.js";
+import { n as weappTailwindcssPackageDir, r as __dirname, t as WeappTailwindcss } from "./webpack-BZBqKB4Y.js";
 import path from "node:path";
 //#region src/bundlers/rspack/rule-match.ts
 const STYLE_RULE_PROBES = [

package/dist/{scoped-generator-lbTwL6mD.cjs → scoped-generator-DqNb8nJG.cjs}

@@ -1,12 +1,11 @@
-const require_rolldown_runtime = require("./rolldown-runtime-fg3euq-1.cjs");
 const require_framework = require("./framework.cjs");
-const require_generator = require("./generator-CxauQbx3.cjs");
+const require_generator = require("./generator-B1sYQpWu.cjs");
 require("./auto-B1OyRrE8.cjs");
-const require_tailwindcss = require("./tailwindcss-U3KIUegn.cjs");
-const require_generated_css_marker = require("./generated-css-marker-B0RyziOH.cjs");
-const require_source_candidate_scan_signature = require("./source-candidate-scan-signature-nG-rg809.cjs");
-let node_path = require("node:path");
-node_path = require_rolldown_runtime.__toESM(node_path, 1);
+const require_tailwindcss = require("./tailwindcss-uf04Iolj.cjs");
+const require_generated_css_marker = require("./generated-css-marker-nqjR6ntO.cjs");
+const require_source_candidate_scan_signature = require("./source-candidate-scan-signature-_ohG0ePd.cjs");
+let _weapp_tailwindcss_postcss_transform = require("@weapp-tailwindcss/postcss/transform");
+let _weapp_tailwindcss_source_scan = require("@weapp-tailwindcss/source-scan");
 let weapp_style_injector_vite = require("weapp-style-injector/vite");
 let weapp_style_injector_vite_taro = require("weapp-style-injector/vite/taro");
 let weapp_style_injector_vite_uni_app = require("weapp-style-injector/vite/uni-app");
@@ -14,7 +13,6 @@ let weapp_style_injector_webpack = require("weapp-style-injector/webpack");
 let weapp_style_injector_webpack_mpx = require("weapp-style-injector/webpack/mpx");
 let weapp_style_injector_webpack_taro = require("weapp-style-injector/webpack/taro");
 let weapp_style_injector_webpack_uni_app = require("weapp-style-injector/webpack/uni-app");
-let _weapp_tailwindcss_postcss_transform = require("@weapp-tailwindcss/postcss/transform");
 //#region src/bundlers/framework-selector.ts
 function resolveBundlerAppType(options) {
 	if (options.appType) return options.appType;
@@ -284,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 = (0, _weapp_tailwindcss_postcss_transform.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: node_path.default.dirname(node_path.default.resolve(sourceFile.replace(/[?#].*$/, ""))),
+		base: (0, _weapp_tailwindcss_source_scan.sourcePathApi)(sourceFile).dirname((0, _weapp_tailwindcss_source_scan.sourcePathApi)(sourceFile).resolve(sourceFile.replace(/[?#].*$/, ""))),
 		negated: false,
 		pattern: "**/*"
 	}];
@@ -307,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 = node_path.default.dirname(node_path.default.resolve(sourceFile.replace(/[?#].*$/, "")));
-	return resolveScopedSourceEntries(rawSource, sourceFile, (await require_tailwindcss.resolveTailwindV4EntriesFromCssCached(rawSource, sourceBase))?.entries);
+async function resolveScopedGeneratorSourceEntries(rawSource, sourceFile, scopeToSource = false) {
+	const sourceBase = (0, _weapp_tailwindcss_source_scan.sourcePathApi)(sourceFile).dirname((0, _weapp_tailwindcss_source_scan.sourcePathApi)(sourceFile).resolve(sourceFile.replace(/[?#].*$/, "")));
+	return resolveScopedSourceEntries(rawSource, sourceFile, (await require_tailwindcss.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;
@@ -409,6 +410,12 @@ Object.defineProperty(exports, "getSnapshotHash", {
 		return getSnapshotHash;
 	}
 });
+Object.defineProperty(exports, "hasOwnSourceDirectives", {
+	enumerable: true,
+	get: function() {
+		return hasOwnSourceDirectives;
+	}
+});
 Object.defineProperty(exports, "hasRuntimeAffectingSourceChanges", {
 	enumerable: true,
 	get: function() {

package/dist/{source-candidate-scan-signature-BjVQYL-C.js → source-candidate-scan-signature-BWLf4tuO.js}

@@ -1,5 +1,5 @@
-import { v as source_scan_exports } from "./tailwindcss-kSd0ykiX.js";
-import { T as omitUndefined } from "./generator-oKZ5mCJ5.js";
+import { v as source_scan_exports } from "./tailwindcss-XNfJSlhp.js";
+import { T as omitUndefined } from "./generator-LqofzXgr.js";
 import { createRequire } from "node:module";
 import path from "node:path";
 //#region src/bundlers/vite/plugin-hook.ts

package/dist/{source-candidate-scan-signature-nG-rg809.cjs → source-candidate-scan-signature-_ohG0ePd.cjs}

@@ -1,6 +1,6 @@
 const require_rolldown_runtime = require("./rolldown-runtime-fg3euq-1.cjs");
-const require_generator = require("./generator-CxauQbx3.cjs");
-const require_tailwindcss = require("./tailwindcss-U3KIUegn.cjs");
+const require_generator = require("./generator-B1sYQpWu.cjs");
+const require_tailwindcss = require("./tailwindcss-uf04Iolj.cjs");
 let node_path = require("node:path");
 node_path = require_rolldown_runtime.__toESM(node_path, 1);
 let node_module = require("node:module");

package/dist/tailwindcss/v4/rpx-theme-warning.d.ts

@@ -1,4 +1,4 @@
 import type { InternalUserDefinedOptions } from '../../types/index.js';
 export declare function shouldCheckRpxThemeRisk(session: object, target: string, opts: Pick<InternalUserDefinedOptions, 'logLevel' | 'platform' | 'cssOptions' | 'appType'>, platform?: string): boolean;
 export declare function collectRpxThemeRiskSources(sources: Iterable<string>): string[];
-export declare function warnRpxThemeRisk(session: object, variables: readonly string[], outputCss: string): void;
+export declare function warnRpxThemeRisk(session: object, variables: readonly string[], generatedCss: string): void;

package/dist/tailwindcss/v4-engine/generator/raw-generation.d.ts

@@ -0,0 +1,30 @@
+import type { TailwindV4GenerateOptions, TailwindV4ResolvedSource } from '../types.js';
+import type { TailwindV4NativeSessionPool } from './native-session.js';
+export declare function generateRawArtifact(generationSessions: TailwindV4NativeSessionPool, generateSource: TailwindV4ResolvedSource, options?: TailwindV4GenerateOptions): Promise<{
+    classSet: Set<string>;
+    rawCandidates: Set<string>;
+    dependencies: string[];
+    root: "none" | {
+        base: string;
+        pattern: string;
+    } | null;
+    sources: import("@weapp-tailwindcss/engine").TailwindV4SourcePattern[];
+    rawCss: string;
+    target: import("../index.js").TailwindV4GenerateTarget;
+    styleContext: Partial<import("@weapp-tailwindcss/postcss").IStyleHandlerOptions> | undefined;
+}>;
+export declare function transformGeneratedArtifact(artifact: Awaited<ReturnType<typeof generateRawArtifact>>): Promise<{
+    customPropertyValues?: Map<string, string>;
+    css: string;
+    customPropertyContextCss: string | undefined;
+    classSet: Set<string>;
+    rawCandidates: Set<string>;
+    dependencies: string[];
+    root: "none" | {
+        base: string;
+        pattern: string;
+    } | null;
+    sources: import("@weapp-tailwindcss/engine").TailwindV4SourcePattern[];
+    rawCss: string;
+    target: import("../index.js").TailwindV4GenerateTarget;
+}>;

package/dist/tailwindcss/v4-engine/generator/style-context.d.ts

@@ -1,4 +1,7 @@
 import type { IStyleHandlerOptions } from '@weapp-tailwindcss/postcss/types';
 type GenerationStyleOptions = Partial<IStyleHandlerOptions>;
+export declare function hasCssCalcVariables(options?: GenerationStyleOptions): boolean;
 export declare function resolveGenerationStyleContext(sourceCss: string, generatedCss: string, options?: GenerationStyleOptions): GenerationStyleOptions | undefined;
+export declare function resolveIncrementalStyleContext(sourceCss: string, generatedCss: string, options?: GenerationStyleOptions): GenerationStyleOptions;
+export declare function hasChangedCssCalcContext(previousCss: string, nextCss: string, options?: GenerationStyleOptions): boolean;
 export {};

package/dist/tailwindcss/v4-engine/types.d.ts

@@ -30,6 +30,8 @@ export interface TailwindV4SourceOptionsWithSources extends TailwindV4SourceOpti
 export interface TailwindV4GenerateResult extends Omit<EngineTailwindV4GenerateResult, 'css'> {
     css: string;
     rawCss: string;
+    customPropertyValues?: ReadonlyMap<string, string> | undefined;
+    customPropertyContextCss?: string | undefined;
     incrementalCss?: string | undefined;
     incrementalRawCss?: string | undefined;
     target: TailwindV4GenerateTarget;

package/dist/{tailwindcss-kSd0ykiX.js → tailwindcss-XNfJSlhp.js}

@@ -1,4 +1,4 @@
-import { A as normalizeStringListOption, B as loadTailwindV4DesignSystem, C as findWorkspacePackageDir, D as normalizeTailwindcssRuntimeOptions, E as normalizeExtendLengthUnits, I as resolveCssMacroTailwindV4Source, O as resolveRuntimeBareArbitraryValues, S as findNearestPackageRoot, T as omitUndefined, b as isTailwindV4CssEntry, d as resolveTailwindV4SourceFromRuntime, h as hasConfiguredTailwindV4CssRoots, i as normalizeWeappTailwindcssGeneratorOptions, k as resolveTailwindcssOptions, m as filterTailwindV4CssSourceRoots, p as resolveTailwindV4SourceOptionsFromRuntime, v as groupCssEntriesByBase, w as findWorkspaceRoot, x as normalizeCssEntries, y as guessBasedirFromEntries } from "./generator-oKZ5mCJ5.js";
+import { A as normalizeStringListOption, C as findWorkspacePackageDir, D as normalizeTailwindcssRuntimeOptions, E as normalizeExtendLengthUnits, H as loadTailwindV4DesignSystem, L as resolveCssMacroTailwindV4Source, O as resolveRuntimeBareArbitraryValues, S as findNearestPackageRoot, T as omitUndefined, b as isTailwindV4CssEntry, d as resolveTailwindV4SourceFromRuntime, h as hasConfiguredTailwindV4CssRoots, i as normalizeWeappTailwindcssGeneratorOptions, k as resolveTailwindcssOptions, m as filterTailwindV4CssSourceRoots, p as resolveTailwindV4SourceOptionsFromRuntime, v as groupCssEntriesByBase, w as findWorkspaceRoot, x as normalizeCssEntries, y as guessBasedirFromEntries } from "./generator-LqofzXgr.js";
 import { n as defuOverrideArray$1 } from "./utils-MVwpU07P.js";
 import { createRequire } from "node:module";
 import { existsSync, readFileSync, statSync } from "node:fs";
@@ -689,7 +689,7 @@ function includesToken(list, token) {
 	});
 }
 function ensureDefaultsIncluded(value) {
-	if (value === true) return { includeCustomProperties: [...DEFAULT_CSS_CALC_CUSTOM_PROPERTIES] };
+	if (value === true) return true;
 	if (Array.isArray(value)) {
 		if (!DEFAULT_CSS_CALC_CUSTOM_PROPERTIES.length) return value;
 		const missing = DEFAULT_CSS_CALC_CUSTOM_PROPERTIES.filter((token) => !includesToken(value, token));

package/dist/{tailwindcss-U3KIUegn.cjs → tailwindcss-uf04Iolj.cjs}

@@ -1,5 +1,5 @@
 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("./utils-CuKLf1Zv.cjs");
 let node_fs = require("node:fs");
 let node_path = require("node:path");
@@ -666,7 +666,7 @@ function includesToken(list, token) {
 	});
 }
 function ensureDefaultsIncluded(value) {
-	if (value === true) return { includeCustomProperties: [...DEFAULT_CSS_CALC_CUSTOM_PROPERTIES] };
+	if (value === true) return true;
 	if (Array.isArray(value)) {
 		if (!DEFAULT_CSS_CALC_CUSTOM_PROPERTIES.length) return value;
 		const missing = DEFAULT_CSS_CALC_CUSTOM_PROPERTIES.filter((token) => !includesToken(value, token));

package/dist/{transform-DVg4q8hh.cjs → transform-CxVM0PfA.cjs}

@@ -1,6 +1,6 @@
-const require_generator = require("./generator-CxauQbx3.cjs");
-const require_compiler = require("./compiler-DbwS3329.cjs");
-const require_vite = require("./vite-IX83wh_L.cjs");
+const require_generator = require("./generator-B1sYQpWu.cjs");
+const require_compiler = require("./compiler-TvqqdOMD.cjs");
+const require_vite = require("./vite-C3Zh6iYK.cjs");
 let _weapp_tailwindcss_engine = require("@weapp-tailwindcss/engine");
 let _weapp_tailwindcss_postcss_transform = require("@weapp-tailwindcss/postcss/transform");
 let _vue_compiler_dom = require("@vue/compiler-dom");

package/dist/{transform-BAon9ykq.js → transform-D0NXKPmD.js}

@@ -1,6 +1,6 @@
-import { N as _defineProperty } from "./generator-oKZ5mCJ5.js";
-import { C as babelParse, S as replaceWxml, T as traverse$1, _ as generateCode, b as analyzeSource, v as createAttributeMatcher, w as JsTokenUpdater, x as isClassContextLiteralPath } from "./compiler-CThodfGH.js";
-import { a as shouldEnablePageLocalStyle, i as shouldEnableComponentLocalStyle, n as injectBorderPreflightClass, r as shouldInjectBorderPreflight } from "./vite-D-RGkmOE.js";
+import { P as _defineProperty } from "./generator-LqofzXgr.js";
+import { C as babelParse, S as replaceWxml, T as traverse$1, _ as generateCode, b as analyzeSource, v as createAttributeMatcher, w as JsTokenUpdater, x as isClassContextLiteralPath } from "./compiler-v9sYta8W.js";
+import { a as shouldEnablePageLocalStyle, i as shouldEnableComponentLocalStyle, n as injectBorderPreflightClass, r as shouldInjectBorderPreflight } from "./vite-D6_FxvdM.js";
 import { splitCandidateTokens } from "@weapp-tailwindcss/engine";
 import { UNI_APP_X_IMPORTANT_APPLY_MARKER, isUniAppXStyleSourceEmpty, normalizeUniAppXImportantApplyForSass } from "@weapp-tailwindcss/postcss/transform";
 import MagicString from "magic-string";

package/dist/utils/stable-serialize.d.ts

@@ -0,0 +1 @@
+export declare function stableSerialize(value: unknown, stack?: WeakSet<object>): string;