weapp-tailwindcss 5.1.14 → 5.1.16

package/dist/{source-candidate-scan-signature-D7RWjWsY.mjs → source-candidate-scan-signature-CtK-mB_C.mjs}

@@ -1,11 +1,13 @@
 import { detectAppType } from "./framework.mjs";
-import { n as hasCssMacroTailwindV4CustomVariantConditionalComments } from "./auto-CrJJc5rK.mjs";
-import { g as resolveTailwindV4EntriesFromCssCached, i as resolveUniAppXOptions } from "./tailwindcss-DPcKMLxL.mjs";
+import { i as normalizeWeappTailwindcssGeneratorOptions, q as preferScopedGeneratedCssRules } from "./generator-Bv7myuhY.mjs";
+import { n as hasCssMacroTailwindV4CustomVariantConditionalComments } from "./auto-2dg_uhEJ.mjs";
+import { g as resolveTailwindV4EntriesFromCssCached, i as resolveUniAppXOptions } from "./tailwindcss-BTcXX8Ka.mjs";
 import { _ as babelParse, n as Parser, v as traverse } from "./wxml-DdGdeqaH.mjs";
-import { u as generateCssByGenerator } from "./hmr-timing-C3ed5vCx.mjs";
+import { _ as isVueScopedStyleRequest, b as resolvePostcssRequestOption, g as isSourceStyleRequest, i as generateCssByGenerator, m as finalizeMiniProgramGeneratorCss } from "./hmr-timing-BXg7nI8N.mjs";
 import { createRequire } from "node:module";
 import path from "node:path";
 import process from "node:process";
+import { removeTailwindPostcssPlugins } from "@weapp-tailwindcss/postcss";
 import { cleanUrl, ensurePosix } from "@weapp-tailwindcss/shared";
 import { Buffer } from "node:buffer";
 import { weappStyleInjector } from "weapp-style-injector/vite";
@@ -225,37 +227,107 @@ function resolvePackageDir(name) {
 	return path.dirname(pkgPath);
 }
 //#endregion
-//#region src/bundlers/shared/generated-css-marker.ts
-const BUNDLER_GENERATED_CSS_MARKER_RE = /\/\*!?\s*weapp-tailwindcss (?:vite|webpack)-generated-css(?:\s*:\s*[^\s*]+)?\s*\*\/\s*/i;
-const BUNDLER_GENERATED_CSS_MARKER_GLOBAL_RE = /\/\*!?\s*weapp-tailwindcss (?:vite|webpack)-generated-css(?:\s*:\s*[^\s*]+)?\s*\*\/\s*/gi;
-const BUNDLER_GENERATED_CSS_MARKER_CAPTURE_RE = /\/\*!?\s*weapp-tailwindcss (vite|webpack)-generated-css(?:\s*:\s*([^\s*]+))?\s*\*\/\s*/gi;
-const VITE_INTERNAL_CSS_MARKER_GLOBAL_RE = /\/\*\$vite\$:\d+\*\/\s*/g;
-function createBundlerGeneratedCssMarker(bundler, file) {
-	return `/*! weapp-tailwindcss ${bundler}-generated-css:${encodeURIComponent(file)} */`;
-}
-function hasBundlerGeneratedCssMarker(source) {
-	return typeof source === "string" && BUNDLER_GENERATED_CSS_MARKER_RE.test(source);
-}
-function stripBundlerGeneratedCssMarkers(source) {
-	return source.replace(BUNDLER_GENERATED_CSS_MARKER_GLOBAL_RE, "").replace(VITE_INTERNAL_CSS_MARKER_GLOBAL_RE, "");
-}
-function parseBundlerGeneratedCssMarkerBlocks(source) {
-	const blocks = [];
-	BUNDLER_GENERATED_CSS_MARKER_CAPTURE_RE.lastIndex = 0;
-	let match = BUNDLER_GENERATED_CSS_MARKER_CAPTURE_RE.exec(source);
-	while (match !== null) {
-		const cssStart = BUNDLER_GENERATED_CSS_MARKER_CAPTURE_RE.lastIndex;
-		const nextMatch = BUNDLER_GENERATED_CSS_MARKER_CAPTURE_RE.exec(source);
-		const cssEnd = nextMatch?.index ?? source.length;
-		const file = match[2] ? decodeURIComponent(match[2]) : void 0;
-		blocks.push({
-			bundler: match[1],
-			file,
-			css: source.slice(cssStart, cssEnd)
-		});
-		match = nextMatch;
+//#region src/bundlers/shared/framework-postcss.ts
+const FRAMEWORK_POSTCSS_REGISTRY = Symbol.for("weapp-tailwindcss.framework-postcss-options");
+const registryHost = globalThis;
+const frameworkPostcssOptions = registryHost[FRAMEWORK_POSTCSS_REGISTRY] ?? (registryHost[FRAMEWORK_POSTCSS_REGISTRY] = /* @__PURE__ */ new WeakMap());
+function isObject(value) {
+	return typeof value === "object" && value !== null;
+}
+function normalizePlugins(plugins) {
+	const entries = Array.isArray(plugins) ? plugins : isObject(plugins) ? Object.values(plugins) : [];
+	const resolved = [...new Set(entries.filter(Boolean))];
+	removeTailwindPostcssPlugins(resolved);
+	return resolved;
+}
+function resolveFrameworkPostcssOptions(value) {
+	if (!isObject(value)) return;
+	const plugins = normalizePlugins(value["plugins"]);
+	const options = Object.fromEntries(Object.entries(value).filter(([key]) => key !== "plugins" && key !== "config"));
+	if (plugins.length === 0 && Object.keys(options).length === 0) return;
+	return {
+		plugins,
+		options
+	};
+}
+function mergeFrameworkPostcssOptions(left, right) {
+	if (!left) return right;
+	if (!right) return left;
+	return {
+		plugins: [.../* @__PURE__ */ new Set([...normalizePlugins(left.plugins), ...normalizePlugins(right.plugins)])],
+		options: {
+			...left.options ?? {},
+			...right.options ?? {}
+		}
+	};
+}
+function collectFrameworkPostcssOptionsFromLoaderEntries(entries, loaderContext) {
+	let resolved;
+	const visit = (value) => {
+		if (Array.isArray(value)) {
+			value.forEach(visit);
+			return;
+		}
+		if (!isObject(value)) return;
+		const loader = value["loader"];
+		if (typeof loader === "string" && loader.includes("postcss-loader")) {
+			const loaderOptions = value["options"];
+			const rawOptions = isObject(loaderOptions) ? loaderOptions["postcssOptions"] : void 0;
+			const options = typeof rawOptions === "function" ? rawOptions(loaderContext) : rawOptions;
+			resolved = mergeFrameworkPostcssOptions(resolved, resolveFrameworkPostcssOptions(options));
+			return;
+		}
+		visit(value["rules"]);
+		visit(value["oneOf"]);
+		visit(value["use"]);
+	};
+	entries.forEach(visit);
+	return resolved;
+}
+function captureFrameworkPostcssOptions(owner, options) {
+	const resolved = resolveFrameworkPostcssOptions(options);
+	if (!resolved) {
+		frameworkPostcssOptions.delete(owner);
+		return;
 	}
-	return blocks;
+	frameworkPostcssOptions.set(owner, resolved);
+	return resolved;
+}
+function captureResolvedFrameworkPostcssOptions(owner, options) {
+	if (!options) {
+		frameworkPostcssOptions.delete(owner);
+		return;
+	}
+	frameworkPostcssOptions.set(owner, options);
+	return options;
+}
+function hasFrameworkPostcssOptions(owner) {
+	return frameworkPostcssOptions.has(owner);
+}
+function createGeneratedCssHandlerOptions(owner, options, from) {
+	const frameworkOptions = frameworkPostcssOptions.get(owner);
+	const merged = mergeFrameworkPostcssOptions(options.postcssOptions, frameworkOptions);
+	return {
+		...options,
+		postcssOptions: {
+			...merged ?? {},
+			options: {
+				...merged?.options ?? {},
+				from
+			}
+		}
+	};
+}
+async function adaptGeneratedCssWithFrameworkPipeline(owner, generated, options) {
+	const handled = await options.styleHandler(generated.css, createGeneratedCssHandlerOptions(owner, options.cssHandlerOptions, options.file));
+	const preflightMode = generated.metadata?.preflightMode;
+	const injectPreflight = preflightMode?.inject ?? options.cssHandlerOptions.isMainChunk;
+	const preservePreflight = preflightMode?.preserve ?? options.cssHandlerOptions.isMainChunk;
+	return finalizeMiniProgramGeneratorCss(handled.css, generated.target, options.majorVersion, owner.cssPreflight, {
+		...injectPreflight === void 0 ? {} : { injectPreflight },
+		...preservePreflight === void 0 ? {} : { preservePreflight },
+		styleOptions: options.cssHandlerOptions
+	});
 }
 //#endregion
 //#region src/bundlers/shared/module-graph.ts
@@ -302,38 +374,32 @@ function resolveOutputSpecifier(specifier, importer, outDir, hasOutput) {
 	return matchWithExtensions(candidate, hasOutput);
 }
 //#endregion
-//#region src/bundlers/shared/style-requests.ts
-const SOURCE_STYLE_EXT_RE = /\.(?:css|scss|sass|less|styl|stylus|pcss|postcss)$/i;
-const STYLE_QUERY_RE = /(?:^|&)type=styles?(?:&|$)/;
-const STYLE_LANG_QUERY_RE = /(?:^|&)lang(?:[.=](?:css|scss|sass|less|styl|stylus|pcss|postcss))?(?:&|$)/;
-function stripHash(request) {
-	const hashIndex = request.indexOf("#");
-	return hashIndex === -1 ? request : request.slice(0, hashIndex);
-}
-function stripRequestQuery(request) {
-	const normalized = stripHash(request);
-	const queryIndex = normalized.indexOf("?");
-	return queryIndex === -1 ? normalized : normalized.slice(0, queryIndex);
-}
-function isSourceStyleRequest(request) {
-	if (typeof request !== "string" || request.length === 0) return false;
-	const normalized = stripHash(request);
-	const queryIndex = normalized.indexOf("?");
-	const pathname = queryIndex === -1 ? normalized : normalized.slice(0, queryIndex);
-	if (SOURCE_STYLE_EXT_RE.test(pathname)) return true;
-	if (queryIndex === -1) return false;
-	const query = normalized.slice(queryIndex + 1);
-	return STYLE_QUERY_RE.test(query) || STYLE_LANG_QUERY_RE.test(query);
-}
-//#endregion
 //#region src/bundlers/shared/v4-generation-core.ts
 async function generateTailwindV4Css(options) {
 	const majorVersion = options.runtimeState.tailwindRuntime.majorVersion;
 	if (majorVersion !== 4) throw new Error("weapp-tailwindcss 生成管线仅支持 Tailwind CSS v4。");
-	const generated = await generateCssByGenerator(options);
+	const frameworkPostcssOwner = options.frameworkPostcssOwner ?? options.opts;
+	const shouldReplayFrameworkPostcss = options.frameworkPostcssStage === "complete" && hasFrameworkPostcssOptions(frameworkPostcssOwner) && normalizeWeappTailwindcssGeneratorOptions(options.opts.generator, {
+		appType: options.opts.appType,
+		platform: options.generatorPlatform ?? options.opts.cssOptions?.platform ?? options.opts.platform,
+		tailwindcssMajorVersion: majorVersion,
+		uniAppX: options.opts.uniAppX
+	}).target === "weapp";
+	const generated = await generateCssByGenerator(shouldReplayFrameworkPostcss ? {
+		...options,
+		deferCssAdaptation: true
+	} : options);
 	if (!generated) return;
+	const adaptedCss = shouldReplayFrameworkPostcss ? await adaptGeneratedCssWithFrameworkPipeline(frameworkPostcssOwner, generated, {
+		cssHandlerOptions: options.cssHandlerOptions,
+		file: options.file,
+		majorVersion,
+		styleHandler: options.styleHandler
+	}) : generated.css;
+	const css = isVueScopedStyleRequest(resolvePostcssRequestOption(options.cssHandlerOptions)) ? preferScopedGeneratedCssRules(adaptedCss) : adaptedCss;
 	return {
 		...generated,
+		css,
 		classSet: generated.classSet,
 		dependencies: generated.dependencies,
 		metadata: {
@@ -506,6 +572,7 @@ function createBundleBuildState() {
 		runtimeAffectingHashByFile: /* @__PURE__ */ new Map(),
 		linkedByEntry: /* @__PURE__ */ new Map(),
 		dependentsByLinkedFile: /* @__PURE__ */ new Map(),
+		bundleMarkupCandidatesByFile: /* @__PURE__ */ new Map(),
 		generatorCandidateSignature: void 0
 	};
 }
@@ -526,7 +593,7 @@ function createProcessFiles() {
 }
 function readEntrySource(output) {
 	if (output.type === "chunk") return output.code;
-	return output.source.toString();
+	return typeof output.source === "string" ? output.source : Buffer.from(output.source).toString();
 }
 function classifyBundleEntry(file, opts) {
 	if (opts.htmlMatcher(file) || isHTMLRequest(file)) return "html";
@@ -784,4 +851,4 @@ function createSourceCandidateScanSignature(input) {
 	});
 }
 //#endregion
-export { createBundlerGeneratedCssMarker as A, resolveViteFrameworkProfile as B, createBundleModuleGraphOptions as C, normalizeOutputPathKey as D, stripRequestQuery as E, resolvePluginDisabledState as F, createBuiltinViteStyleInjectorPlugins as I, createBuiltinWebpackStyleInjectorPlugin as L, parseBundlerGeneratedCssMarkerBlocks as M, stripBundlerGeneratedCssMarkers as N, resolveOutputSpecifier as O, resolvePackageDir as P, viteStyleInjectorDelegates as R, applyLinkedResults as S, isSourceStyleRequest as T, resolveWebpackFrameworkProfile as V, isCSSRequest as _, createCandidateSignature as a, slash as b, getSnapshotHash as c, buildBundleSnapshot as d, classifyBundleEntry as f, formatPostcssSourceMap as g, cleanUrl as h, createScopedGeneratorSourceTraceMap as i, hasBundlerGeneratedCssMarker as j, toAbsoluteOutputPath as k, hasRuntimeAffectingSourceChanges as l, updateBundleBuildState as m, createScopedGeneratorCandidateSignature as n, createJsHashSalt as o, createBundleBuildState as p, createScopedGeneratorRuntime as r, createLinkedImpactSignature as s, createSourceCandidateScanSignature as t, summarizeStringDiff as u, isHTMLRequest as v, generateTailwindV4Css as w, createRuntimeAffectingSourceSignature as x, normalizePath as y, webpackStyleInjectorDelegates as z };
+export { collectFrameworkPostcssOptionsFromLoaderEntries as A, createBundleModuleGraphOptions as C, toAbsoluteOutputPath as D, resolveOutputSpecifier as E, viteStyleInjectorDelegates as F, webpackStyleInjectorDelegates as I, resolveViteFrameworkProfile as L, resolvePluginDisabledState as M, createBuiltinViteStyleInjectorPlugins as N, captureFrameworkPostcssOptions as O, createBuiltinWebpackStyleInjectorPlugin as P, resolveWebpackFrameworkProfile as R, applyLinkedResults as S, normalizeOutputPathKey as T, isCSSRequest as _, createCandidateSignature as a, slash as b, getSnapshotHash as c, buildBundleSnapshot as d, classifyBundleEntry as f, formatPostcssSourceMap as g, cleanUrl as h, createScopedGeneratorSourceTraceMap as i, resolvePackageDir as j, captureResolvedFrameworkPostcssOptions as k, hasRuntimeAffectingSourceChanges as l, updateBundleBuildState as m, createScopedGeneratorCandidateSignature as n, createJsHashSalt as o, createBundleBuildState as p, createScopedGeneratorRuntime as r, createLinkedImpactSignature as s, createSourceCandidateScanSignature as t, summarizeStringDiff as u, isHTMLRequest as v, generateTailwindV4Css as w, createRuntimeAffectingSourceSignature as x, normalizePath as y };

package/dist/tailwindcss/v4-engine/generator/cache-stats.d.ts

@@ -0,0 +1,26 @@
+export declare function getTailwindV4IncrementalGenerateCacheStats(): {
+    max: number;
+    entryCandidatesMax: number;
+    entryCssBytesMax: number;
+    size: number;
+    taskMax: number;
+    taskSize: number;
+    entries: {
+        candidates: number;
+        classSet: number;
+        cssBytes: number;
+        rawCssBytes: number;
+        keyHash: string;
+        keyBytes: number;
+    }[];
+    keys: {
+        keyHash: string;
+        keyBytes: number;
+    }[];
+    taskKeys: {
+        keyHash: string;
+        keyBytes: number;
+    }[];
+};
+export declare const getTailwindV4IncrementalGenerateCacheStatsForTest: typeof getTailwindV4IncrementalGenerateCacheStats;
+export declare function clearTailwindV4IncrementalGenerateCacheForTest(): void;

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

@@ -0,0 +1,2 @@
+import type { TailwindV4Engine, TailwindV4ResolvedSource } from '../types';
+export declare function createTailwindV4Engine(source: TailwindV4ResolvedSource): TailwindV4Engine;

package/dist/tailwindcss/v4-engine/generator/incremental-cache.d.ts

@@ -0,0 +1,52 @@
+import type { IStyleHandlerOptions } from '@weapp-tailwindcss/postcss/types';
+import type { TailwindV4DesignSystem, TailwindV4Engine, TailwindV4GenerateOptions, TailwindV4GenerateTarget, TailwindV4ResolvedSource, TailwindV4SourcePattern } from '../types';
+import { LRUCache } from 'lru-cache';
+export declare const INCREMENTAL_GENERATE_CACHE_MAX = 8;
+export declare const INCREMENTAL_GENERATE_TASK_CACHE_MAX = 32;
+export declare const INCREMENTAL_GENERATE_ENTRY_CANDIDATES_MAX = 12000;
+export declare const INCREMENTAL_GENERATE_ENTRY_CSS_BYTES_MAX: number;
+export declare const incrementalGenerateCache: LRUCache<string, TailwindV4IncrementalGenerateCacheEntry, unknown>;
+export declare const incrementalGenerateTaskCache: LRUCache<string, Promise<import("..").TailwindV4GenerateResult>, unknown>;
+interface TailwindV4IncrementalGenerateCacheEntry {
+    seenCandidates: Set<string>;
+    classSet: Set<string>;
+    css: string;
+    rawCss: string;
+    customPropertyValues: Map<string, string>;
+    designSystemPromise: Promise<TailwindV4DesignSystem>;
+    dependencies: string[];
+    sources: TailwindV4SourcePattern[];
+    root: null | 'none' | {
+        base: string;
+        pattern: string;
+    };
+    target: TailwindV4GenerateTarget;
+}
+interface TailwindV4IncrementalCacheSeedOptions {
+    compatibleSource: TailwindV4ResolvedSource;
+    generated: Awaited<ReturnType<TailwindV4Engine['generate']>>;
+    requestedCandidates: Set<string>;
+    styleOptions: Partial<IStyleHandlerOptions> | undefined;
+    target: TailwindV4GenerateTarget;
+}
+export declare function collectCandidates(candidates: Iterable<string> | undefined): Set<string>;
+export declare function hasRemovedCandidates(previousCandidates: Set<string>, nextCandidates: Set<string>): boolean;
+export declare function createIncrementalGenerateCacheKey(source: TailwindV4ResolvedSource, target: TailwindV4GenerateTarget, styleOptions: Partial<IStyleHandlerOptions> | undefined): string;
+export declare function runIncrementalGenerateTask(cacheKey: string, requestedCandidates: Set<string>, scanSources: TailwindV4GenerateOptions['scanSources'], task: () => Promise<Awaited<ReturnType<TailwindV4Engine['generate']>>>): Promise<import("..").TailwindV4GenerateResult>;
+export declare function resolveTargetCandidates(candidates: Iterable<string> | undefined, target: TailwindV4GenerateTarget): Set<string>;
+export declare function shouldDelegateWebSourceScanToTailwind(target: TailwindV4GenerateTarget, scanSources: TailwindV4GenerateOptions['scanSources']): boolean;
+export declare function createIncrementalStyleOptions(styleOptions: Partial<IStyleHandlerOptions> | undefined): Partial<IStyleHandlerOptions>;
+export declare function resolveStyleOptions(source: TailwindV4ResolvedSource, options: Partial<IStyleHandlerOptions> | undefined): Partial<IStyleHandlerOptions> | undefined;
+export declare function mergeCustomPropertyValues(target: Map<string, string>, css: string): void;
+export declare function summarizeIncrementalCacheKey(key: string): {
+    keyHash: string;
+    keyBytes: number;
+};
+export declare function shouldRebuildIncrementalEntry(cached: TailwindV4IncrementalGenerateCacheEntry, requestedCandidates: Set<string>, missingCandidates: string[]): boolean;
+export declare function seedIncrementalGenerateCache(options: TailwindV4IncrementalCacheSeedOptions): boolean;
+export declare function normalizeTargetRpxLengthCandidates(candidates: Iterable<string>, target: TailwindV4GenerateTarget, styleOptions: Partial<IStyleHandlerOptions> | undefined): {
+    candidates: Set<string>;
+    restoreCandidates: Map<string, string>;
+};
+export declare function resolveGeneratedSourcePatterns(generatedSources: TailwindV4SourcePattern[], scanSources: TailwindV4GenerateOptions['scanSources']): import("@tailwindcss-mangle/engine").TailwindV4SourcePattern[];
+export {};

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

@@ -1,28 +1,2 @@
-import type { TailwindV4Engine, TailwindV4ResolvedSource } from './types';
-export declare function createTailwindV4Engine(source: TailwindV4ResolvedSource): TailwindV4Engine;
-export declare function getTailwindV4IncrementalGenerateCacheStats(): {
-    max: number;
-    entryCandidatesMax: number;
-    entryCssBytesMax: number;
-    size: number;
-    taskMax: number;
-    taskSize: number;
-    entries: {
-        candidates: number;
-        classSet: number;
-        cssBytes: number;
-        rawCssBytes: number;
-        keyHash: string;
-        keyBytes: number;
-    }[];
-    keys: {
-        keyHash: string;
-        keyBytes: number;
-    }[];
-    taskKeys: {
-        keyHash: string;
-        keyBytes: number;
-    }[];
-};
-export declare const getTailwindV4IncrementalGenerateCacheStatsForTest: typeof getTailwindV4IncrementalGenerateCacheStats;
-export declare function clearTailwindV4IncrementalGenerateCacheForTest(): void;
+export { clearTailwindV4IncrementalGenerateCacheForTest, getTailwindV4IncrementalGenerateCacheStats, getTailwindV4IncrementalGenerateCacheStatsForTest } from './generator/cache-stats';
+export { createTailwindV4Engine } from './generator/engine';

package/dist/{tailwindcss-KBYPJ2DW.js → tailwindcss-B4phC0kB.js}

@@ -1,5 +1,5 @@
 const require_rolldown_runtime = require("./rolldown-runtime-emK7D4bc.js");
-const require_generator = require("./generator-CEnUsjed.js");
+const require_generator = require("./generator-B91GhUJQ.js");
 const require_object = require("./object-COs_Mw6p.js");
 require("./utils-CuKLf1Zv.js");
 let node_fs = require("node:fs");
@@ -896,7 +896,7 @@ function warnMissingCssEntries(ctx, tailwindRuntime) {
 	_weapp_tailwindcss_logger.logger.warn("[tailwindcss@4] 未检测到 cssEntries 配置。请传入包含 tailwindcss 引用的 CSS 绝对路径，例如 cssEntries: [\"/absolute/path/to/src/app.css\"]，否则 tailwindcss 生成的类名不会参与转译。");
 }
 function applyV4CssCalcDefaults(cssCalc, tailwindRuntime) {
-	const cssCalcOptions = cssCalc ?? true;
+	const cssCalcOptions = cssCalc ?? false;
 	if (tailwindRuntime && cssCalcOptions) return ensureDefaultsIncluded(cssCalcOptions);
 	return cssCalcOptions;
 }

package/dist/{tailwindcss-DPcKMLxL.mjs → tailwindcss-BTcXX8Ka.mjs}

@@ -1,4 +1,4 @@
-import { At as resolveTailwindV4CssSourceBase, C as findWorkspaceRoot, Ct as createTailwindSourceEntryMatcher, D as normalizeStringListOption, Dt as parseConfigParam, E as resolveTailwindcssOptions, Et as normalizeLegacyContentEntries, Mt as resolveCssMacroTailwindV4Source, Ot as resolveCssSourceEntries, Pt as loadTailwindV4DesignSystem, S as findWorkspacePackageDir, St as FULL_SOURCE_SCAN_PATTERN, T as normalizeTailwindcssRuntimeOptions, _ as groupCssEntriesByBase, b as normalizeCssEntries, d as resolveTailwindV4SourceFromRuntime, h as hasConfiguredTailwindV4CssRoots, i as normalizeWeappTailwindcssGeneratorOptions, m as filterTailwindV4CssSourceRoots, p as resolveTailwindV4SourceOptionsFromRuntime, v as guessBasedirFromEntries, w as normalizeExtendLengthUnits, wt as expandTailwindSourceEntries, x as findNearestPackageRoot, y as isTailwindV4CssEntry } from "./generator-B59OA64h.mjs";
+import { C as findWorkspaceRoot, D as normalizeStringListOption, E as resolveTailwindcssOptions, Et as resolveCssSourceEntries, Ft as loadTailwindV4DesignSystem, Mt as resolveCssMacroTailwindV4Source, Ot as resolveTailwindV4CssSourceBase, S as findWorkspacePackageDir, St as expandTailwindSourceEntries, T as normalizeTailwindcssRuntimeOptions, Tt as parseConfigParam, _ as groupCssEntriesByBase, b as normalizeCssEntries, bt as FULL_SOURCE_SCAN_PATTERN, d as resolveTailwindV4SourceFromRuntime, h as hasConfiguredTailwindV4CssRoots, i as normalizeWeappTailwindcssGeneratorOptions, m as filterTailwindV4CssSourceRoots, p as resolveTailwindV4SourceOptionsFromRuntime, v as guessBasedirFromEntries, w as normalizeExtendLengthUnits, wt as normalizeLegacyContentEntries, x as findNearestPackageRoot, xt as createTailwindSourceEntryMatcher, y as isTailwindV4CssEntry } from "./generator-Bv7myuhY.mjs";
 import { t as omitUndefined } from "./object-BJSWl-E5.mjs";
 import { n as defuOverrideArray$1 } from "./utils-MVwpU07P.mjs";
 import { createRequire } from "node:module";
@@ -892,7 +892,7 @@ function warnMissingCssEntries(ctx, tailwindRuntime) {
 	logger.warn("[tailwindcss@4] 未检测到 cssEntries 配置。请传入包含 tailwindcss 引用的 CSS 绝对路径，例如 cssEntries: [\"/absolute/path/to/src/app.css\"]，否则 tailwindcss 生成的类名不会参与转译。");
 }
 function applyV4CssCalcDefaults(cssCalc, tailwindRuntime) {
-	const cssCalcOptions = cssCalc ?? true;
+	const cssCalcOptions = cssCalc ?? false;
 	if (tailwindRuntime && cssCalcOptions) return ensureDefaultsIncluded(cssCalcOptions);
 	return cssCalcOptions;
 }

package/dist/{transform-D5JUgMpE.mjs → transform-B_KM9sLX.mjs}

@@ -14621,6 +14621,48 @@ function isRuntimeCandidate(candidate, runtimeSet) {
 	if (!runtimeSet || runtimeSet.size === 0) return false;
 	return runtimeSet.has(candidate) || runtimeSet.has(replaceWxml(candidate));
 }
+function hasTopLevelVariant(candidate) {
+	let bracketDepth = 0;
+	let parenthesisDepth = 0;
+	let quote = "";
+	let escaped = false;
+	for (const char of candidate) {
+		if (escaped) {
+			escaped = false;
+			continue;
+		}
+		if (char === "\\") {
+			escaped = true;
+			continue;
+		}
+		if (quote) {
+			if (char === quote) quote = "";
+			continue;
+		}
+		if (char === "\"" || char === "'") {
+			quote = char;
+			continue;
+		}
+		if (char === "[") {
+			bracketDepth += 1;
+			continue;
+		}
+		if (char === "]") {
+			bracketDepth = Math.max(0, bracketDepth - 1);
+			continue;
+		}
+		if (char === "(") {
+			parenthesisDepth += 1;
+			continue;
+		}
+		if (char === ")") {
+			parenthesisDepth = Math.max(0, parenthesisDepth - 1);
+			continue;
+		}
+		if (char === ":" && bracketDepth === 0 && parenthesisDepth === 0) return true;
+	}
+	return false;
+}
 function shouldEnableComponentLocalStyle(id) {
 	return COMPONENT_RE.test(id);
 }
@@ -14643,18 +14685,18 @@ var UniAppXComponentLocalStyleCollector = class {
 		this.aliasByLookup.set(replaceWxml(utility), alias);
 		return alias;
 	}
-	rewriteLiteral(literal, shouldInclude) {
+	rewriteLiteral(literal) {
 		const candidates = splitCandidateTokens(literal);
 		if (candidates.length === 0) return literal;
 		let rewritten = literal;
 		for (const candidate of candidates) {
-			if (!shouldInclude(candidate)) continue;
-			rewritten = rewritten.replace(candidate, this.ensureAlias(candidate));
+			if (!isRuntimeCandidate(candidate, this.runtimeSet)) continue;
+			rewritten = rewritten.replace(candidate, hasTopLevelVariant(candidate) ? replaceWxml(candidate) : this.ensureAlias(candidate));
 		}
 		return rewritten;
 	}
 	collectAndRewriteStaticClass(literal) {
-		return this.rewriteLiteral(literal, (candidate) => isRuntimeCandidate(candidate, this.runtimeSet));
+		return this.rewriteLiteral(literal);
 	}
 	collectRuntimeClasses(rawSource, options = {}) {
 		const wrapped = options.wrapExpression ? `${EXPRESSION_WRAPPER_PREFIX}${rawSource}${EXPRESSION_WRAPPER_SUFFIX}` : rawSource;
@@ -14669,7 +14711,7 @@ var UniAppXComponentLocalStyleCollector = class {
 				const classContext = options.wrapExpression || isClassContextLiteralPath(path);
 				for (const candidate of candidates) {
 					if (!candidate || !classContext && !isRuntimeCandidate(candidate, this.runtimeSet)) continue;
-					if (isRuntimeCandidate(candidate, this.runtimeSet)) this.ensureAlias(candidate);
+					if (isRuntimeCandidate(candidate, this.runtimeSet) && !hasTopLevelVariant(candidate)) this.ensureAlias(candidate);
 				}
 			}
 		} catch {}

package/dist/{transform-COFRlmDF.js → transform-CcYptivi.js}

@@ -14618,6 +14618,48 @@ function isRuntimeCandidate(candidate, runtimeSet) {
 	if (!runtimeSet || runtimeSet.size === 0) return false;
 	return runtimeSet.has(candidate) || runtimeSet.has(require_wxml.replaceWxml(candidate));
 }
+function hasTopLevelVariant(candidate) {
+	let bracketDepth = 0;
+	let parenthesisDepth = 0;
+	let quote = "";
+	let escaped = false;
+	for (const char of candidate) {
+		if (escaped) {
+			escaped = false;
+			continue;
+		}
+		if (char === "\\") {
+			escaped = true;
+			continue;
+		}
+		if (quote) {
+			if (char === quote) quote = "";
+			continue;
+		}
+		if (char === "\"" || char === "'") {
+			quote = char;
+			continue;
+		}
+		if (char === "[") {
+			bracketDepth += 1;
+			continue;
+		}
+		if (char === "]") {
+			bracketDepth = Math.max(0, bracketDepth - 1);
+			continue;
+		}
+		if (char === "(") {
+			parenthesisDepth += 1;
+			continue;
+		}
+		if (char === ")") {
+			parenthesisDepth = Math.max(0, parenthesisDepth - 1);
+			continue;
+		}
+		if (char === ":" && bracketDepth === 0 && parenthesisDepth === 0) return true;
+	}
+	return false;
+}
 function shouldEnableComponentLocalStyle(id) {
 	return COMPONENT_RE.test(id);
 }
@@ -14640,18 +14682,18 @@ var UniAppXComponentLocalStyleCollector = class {
 		this.aliasByLookup.set(require_wxml.replaceWxml(utility), alias);
 		return alias;
 	}
-	rewriteLiteral(literal, shouldInclude) {
+	rewriteLiteral(literal) {
 		const candidates = (0, _tailwindcss_mangle_engine.splitCandidateTokens)(literal);
 		if (candidates.length === 0) return literal;
 		let rewritten = literal;
 		for (const candidate of candidates) {
-			if (!shouldInclude(candidate)) continue;
-			rewritten = rewritten.replace(candidate, this.ensureAlias(candidate));
+			if (!isRuntimeCandidate(candidate, this.runtimeSet)) continue;
+			rewritten = rewritten.replace(candidate, hasTopLevelVariant(candidate) ? require_wxml.replaceWxml(candidate) : this.ensureAlias(candidate));
 		}
 		return rewritten;
 	}
 	collectAndRewriteStaticClass(literal) {
-		return this.rewriteLiteral(literal, (candidate) => isRuntimeCandidate(candidate, this.runtimeSet));
+		return this.rewriteLiteral(literal);
 	}
 	collectRuntimeClasses(rawSource, options = {}) {
 		const wrapped = options.wrapExpression ? `${EXPRESSION_WRAPPER_PREFIX}${rawSource}${EXPRESSION_WRAPPER_SUFFIX}` : rawSource;
@@ -14666,7 +14708,7 @@ var UniAppXComponentLocalStyleCollector = class {
 				const classContext = options.wrapExpression || require_wxml.isClassContextLiteralPath(path);
 				for (const candidate of candidates) {
 					if (!candidate || !classContext && !isRuntimeCandidate(candidate, this.runtimeSet)) continue;
-					if (isRuntimeCandidate(candidate, this.runtimeSet)) this.ensureAlias(candidate);
+					if (isRuntimeCandidate(candidate, this.runtimeSet) && !hasTopLevelVariant(candidate)) this.ensureAlias(candidate);
 				}
 			}
 		} catch {}

package/dist/uni-app-x/component-local-style.d.ts

@@ -1,6 +1,7 @@
 interface RewriteCodeOptions {
     wrapExpression?: boolean;
 }
+export declare function hasTopLevelVariant(candidate: string): boolean;
 export declare function shouldEnableComponentLocalStyle(id: string): boolean;
 export declare function shouldEnablePageLocalStyle(id: string): boolean;
 export declare class UniAppXComponentLocalStyleCollector {

package/dist/uni-app-x/style-asset/style-value.d.ts

@@ -10,7 +10,7 @@ export declare function createUtsStyleArrayFromAppStyles(code: string, appSource
 export declare function cssSourceToStyleValue(source: string): StyleValue | undefined;
 export declare function mergeStyleValues(...items: Array<StyleValue | undefined>): StyleValue | undefined;
 export declare function createStyleValueFromApplySources(sources: string[], utilityStyles: StyleValue | undefined): StyleValue | undefined;
-export declare function collectUniAppXHarmonyApplyStyleSourcesFromSource(source: string): string[];
+export declare function collectUniAppXHarmonyApplyStyleSourcesFromSource(source: string, sourceId?: string): string[];
 export declare function collectUniAppXHarmonyApplyUtilitiesFromSources(sources: Iterable<string>): Set<string>;
 export declare function createMergedStyleValue(code: string, localStyle: StyleValue | undefined, appStyle: StyleValue): StyleValue | undefined;
 export {};