weapp-tailwindcss 5.3.0 → 5.3.2

package/dist/{vite-DBgbFsei.js → vite-CVr0vIgh.js}

@@ -1,14 +1,14 @@
 import { resolveImplicitAppTypeFromViteRoot } from "./framework.js";
-import { $ as hasTailwindSourceDirectives, B as stripMiniProgramCssSpecificityPlaceholders, D as resolveTailwindcssOptions, Ft as filterUnsupportedMiniProgramTailwindV4Candidates, K as hasUserCssLayerBlocks, L as hasMiniProgramCssSpecificityPlaceholders, Ot as resolveSourceScanPath, Pt as getTailwindV4IncrementalGenerateCacheStats, Q as hasTailwindRootDirectives, S as findNearestPackageRoot, U as normalizeEmptyTailwindCustomVariants, X as hasTailwindApplyDirective, Y as hasLocalCssImport, Z as hasTailwindNonRootGenerationDirectives, _ as upsertTailwindV4CssSource, a as resolveGeneratorRuntimeBranch, b as isTailwindV4CssEntry, c as shouldUseNativeAppCssBranch, et as normalizeTailwindConfigDirectives, h as hasConfiguredTailwindV4CssRoots, i as normalizeWeappTailwindcssGeneratorOptions, it as removeTailwindSourceDirectives, kt as resolveTailwindV4CssSourceBase, l as resolveUniUtsPlatform, lt as hasTailwindGeneratedCss, m as filterTailwindV4CssSourceRoots, mt as stripGeneratorPlaceholderMarkers, nt as normalizeTailwindSourceForGenerator, q as splitUserCssLayerBlocks, rt as parseImportRequest, s as shouldUseMiniProgramCssBranch, ut as hasTailwindGeneratedCssMarkers, wt as isFileMatchedByTailwindSourceEntries, x as normalizeCssEntries } from "./generator-BP4WmgIo.js";
+import { $ as hasTailwindSourceDirectives, B as stripMiniProgramCssSpecificityPlaceholders, D as resolveTailwindcssOptions, Ft as filterUnsupportedMiniProgramTailwindV4Candidates, K as hasUserCssLayerBlocks, L as hasMiniProgramCssSpecificityPlaceholders, Ot as resolveSourceScanPath, Pt as getTailwindV4IncrementalGenerateCacheStats, Q as hasTailwindRootDirectives, S as findNearestPackageRoot, U as normalizeEmptyTailwindCustomVariants, X as hasTailwindApplyDirective, Y as hasLocalCssImport, Z as hasTailwindNonRootGenerationDirectives, _ as upsertTailwindV4CssSource, a as resolveGeneratorRuntimeBranch, b as isTailwindV4CssEntry, c as shouldUseNativeAppCssBranch, et as normalizeTailwindConfigDirectives, h as hasConfiguredTailwindV4CssRoots, i as normalizeWeappTailwindcssGeneratorOptions, it as removeTailwindSourceDirectives, kt as resolveTailwindV4CssSourceBase, l as resolveUniUtsPlatform, lt as hasTailwindGeneratedCss, m as filterTailwindV4CssSourceRoots, mt as stripGeneratorPlaceholderMarkers, nt as normalizeTailwindSourceForGenerator, q as splitUserCssLayerBlocks, rt as parseImportRequest, s as shouldUseMiniProgramCssBranch, ut as hasTailwindGeneratedCssMarkers, wt as isFileMatchedByTailwindSourceEntries, x as normalizeCssEntries } from "./generator-EnTXLBlK.js";
 import { t as omitUndefined } from "./object-B-8IHefx.js";
-import { a as findTailwindConfig, f as resolveSourceScanEntries, g as resolveTailwindV4EntriesFromCssCached, i as resolveUniAppXOptions, l as getRuntimeClassSetSignature, m as resolveTailwindV4CssDependencies, p as discoverTailwindV4CssEntries, r as isUniAppXEnabled } from "./tailwindcss-C2K-vjJv.js";
+import { a as findTailwindConfig, f as resolveSourceScanEntries, g as resolveTailwindV4EntriesFromCssCached, i as resolveUniAppXOptions, l as getRuntimeClassSetSignature, m as resolveTailwindV4CssDependencies, p as discoverTailwindV4CssEntries, r as isUniAppXEnabled } from "./tailwindcss-BSEdWieh.js";
 import "./utils-MVwpU07P.js";
-import { A as annotateCssSourceTrace, C as stripRequestQuery, D as stripBundlerGeneratedCssMarkers, E as parseBundlerGeneratedCssMarkerBlocks, F as createRuntimeClassSetManager, H as buildRuntimeCompilationSnapshot, J as createRuntimeAffectingSourceSignature, M as createCssTokenSourceMap, O as finalizeMiniProgramCssStructure, P as processCachedTask, Q as AssetEmissionPlan, R as isPureLocalCssImportWrapper, S as isSourceStyleRequest, T as hasBundlerGeneratedCssMarker, V as finalizeCompilerShadowRun, W as createRuntimeCompilationBuildState, X as beginCompilerShadowRun, Y as disposeCompilerOwner, a as extractMarkedUserLayerComponentsCss, at as isSourceCandidateRequest, d as runWithConcurrency, f as normalizeMiniProgramGeneratorCssSource, g as captureFrameworkPostcssOptions, i as validateCandidatesByGenerator, j as createCssSourceTraceCacheSignature, k as hasEmptyAtRuleBlockCandidate, m as scoreTailwindV4CssSourceFileMatch, nt as createCompilationDependencyChanges, o as mergeMarkedUserLayerComponentsCss, ot as extractCandidatesFromSource, p as normalizeMiniProgramImportShell, q as updateRuntimeCompilationBuildState, r as generateTailwindV4Css, rt as createSourceCandidateCollector, s as collectGeneratedRawSourceCandidatesFromCss, st as createSourceCandidateEligibilityMatcher, t as createHmrTimingRecorder, tt as recordCompilationDependencyChanges, w as createBundlerGeneratedCssMarker } from "./hmr-timing-Dq1_msos.js";
+import { A as annotateCssSourceTrace, C as stripRequestQuery, D as stripBundlerGeneratedCssMarkers, E as parseBundlerGeneratedCssMarkerBlocks, F as createRuntimeClassSetManager, H as buildRuntimeCompilationSnapshot, J as createRuntimeAffectingSourceSignature, M as createCssTokenSourceMap, O as finalizeMiniProgramCssStructure, P as processCachedTask, Q as AssetEmissionPlan, R as isPureLocalCssImportWrapper, S as isSourceStyleRequest, T as hasBundlerGeneratedCssMarker, V as finalizeCompilerShadowRun, W as createRuntimeCompilationBuildState, X as beginCompilerShadowRun, Y as disposeCompilerOwner, a as extractMarkedUserLayerComponentsCss, at as isSourceCandidateRequest, d as runWithConcurrency, f as normalizeMiniProgramGeneratorCssSource, g as captureFrameworkPostcssOptions, i as validateCandidatesByGenerator, j as createCssSourceTraceCacheSignature, k as hasEmptyAtRuleBlockCandidate, m as scoreTailwindV4CssSourceFileMatch, nt as createCompilationDependencyChanges, o as mergeMarkedUserLayerComponentsCss, ot as extractCandidatesFromSource, p as normalizeMiniProgramImportShell, q as updateRuntimeCompilationBuildState, r as generateTailwindV4Css, rt as createSourceCandidateCollector, s as collectGeneratedRawSourceCandidatesFromCss, st as createSourceCandidateEligibilityMatcher, t as createHmrTimingRecorder, tt as recordCompilationDependencyChanges, w as createBundlerGeneratedCssMarker } from "./hmr-timing-HGlM4hX3.js";
 import { m as createDebug, p as replaceWxml } from "./wxml-B7OAVpXJ.js";
-import { a as vitePluginName, c as collectRuntimeClassSet, d as refreshTailwindRuntimeState, f as normalizeFrameworkStylePlatform, l as createTailwindRuntimeReadyPromise, n as normalizeStyleHandlerMajorVersion, o as shouldSkipJsTransform, s as toCustomAttributesEntities, t as getCompilerContext } from "./context-CKQKq4Mv.js";
-import { _ as createBuiltinViteStyleInjectorPlugins, a as createCandidateSignature, c as getSnapshotHash, d as classifyRuntimeEntry, f as resolvePackageDir, g as toAbsoluteOutputPath, h as resolveOutputSpecifier, i as createScopedGeneratorSourceTraceMap, l as hasRuntimeAffectingSourceChanges, m as normalizeOutputPathKey, n as createScopedGeneratorCandidateSignature, o as createJsHashSalt, p as resolvePluginDisabledState, r as createScopedGeneratorRuntime, s as createLinkedImpactSignature, t as createSourceCandidateScanSignature, u as summarizeStringDiff, x as resolveViteFrameworkProfile, y as viteStyleInjectorDelegates } from "./source-candidate-scan-signature-DSsjYtlq.js";
+import { a as vitePluginName, c as collectRuntimeClassSet, d as refreshTailwindRuntimeState, f as normalizeFrameworkStylePlatform, l as createTailwindRuntimeReadyPromise, n as normalizeStyleHandlerMajorVersion, o as shouldSkipJsTransform, s as toCustomAttributesEntities, t as getCompilerContext } from "./context-Kvr3lLEC.js";
+import { _ as createBuiltinViteStyleInjectorPlugins, a as createCandidateSignature, c as getSnapshotHash, d as classifyRuntimeEntry, f as resolvePackageDir, g as toAbsoluteOutputPath, h as resolveOutputSpecifier, i as createScopedGeneratorSourceTraceMap, l as hasRuntimeAffectingSourceChanges, m as normalizeOutputPathKey, n as createScopedGeneratorCandidateSignature, o as createJsHashSalt, p as resolvePluginDisabledState, r as createScopedGeneratorRuntime, s as createLinkedImpactSignature, t as createSourceCandidateScanSignature, u as summarizeStringDiff, x as resolveViteFrameworkProfile, y as viteStyleInjectorDelegates } from "./source-candidate-scan-signature-BHCPQVoD.js";
 import { t as logger$1 } from "./logger-BNzxZbZj.js";
-import { r as shouldEnablePageLocalStyle } from "./component-local-style-CFL4ClhS.js";
+import { r as shouldEnablePageLocalStyle } from "./component-local-style-C2wC8o9F.js";
 import fs, { existsSync, readFileSync, realpathSync } from "node:fs";
 import path from "node:path";
 import process$1 from "node:process";
@@ -234,6 +234,20 @@ const STRING_LITERAL_RE = /(['"`])((?:\\.|(?!\1)[\s\S])*?)\1/g;
 const SFC_STYLE_BLOCK_RE$2 = /<style\b[^>]*>([\s\S]*?)<\/style>/gi;
 const STYLE_EXPORT_PREFIX_RE = /^\s*export\s+default\s+/;
 const CLASS_SELECTOR_PREFIX_RE = /^\.((?:\\[^\n\r\f]|[\w-])+)(?=$|[.:#[])/;
+function cloneStyleEntry(entry) {
+	return Object.fromEntries(Object.entries(entry).map(([state, declarations]) => [state, { ...declarations }]));
+}
+function mergeStyleEntry(local, generated) {
+	const merged = local ? cloneStyleEntry(local) : {};
+	for (const [state, declarations] of Object.entries(generated)) merged[state] = {
+		...merged[state] ?? {},
+		...declarations
+	};
+	return merged;
+}
+function cloneStyleValue(style) {
+	return Object.fromEntries(Object.entries(style).map(([className, entry]) => [className, cloneStyleEntry(entry)]));
+}
 function toCamelCase(prop) {
 	return prop.replace(/-([a-z])/g, (_, char) => char.toUpperCase());
 }
@@ -440,11 +454,14 @@ function collectUniAppXHarmonyApplyUtilitiesFromSources(sources) {
 function createMergedStyleValue(code, localStyle, appStyle) {
 	const used = collectUsedStyleKeys(code, appStyle);
 	if (used.size === 0) return;
-	const merged = { ...localStyle ?? {} };
+	const merged = localStyle ? cloneStyleValue(localStyle) : {};
 	let changed = false;
 	for (const className of used) {
-		if (merged[className] || !appStyle[className]) continue;
-		merged[className] = appStyle[className];
+		const generatedStyle = appStyle[className];
+		if (!generatedStyle) continue;
+		const next = mergeStyleEntry(merged[className], generatedStyle);
+		if (JSON.stringify(next) === JSON.stringify(merged[className])) continue;
+		merged[className] = next;
 		changed = true;
 	}
 	return changed ? merged : void 0;
@@ -453,88 +470,34 @@ function createMergedStyleValues(code, localStyles, appStyle) {
 	if (localStyles.length === 0) return;
 	const used = collectUsedStyleKeys(code, appStyle);
 	if (used.size === 0) return;
-	const merged = localStyles.map((style) => ({ ...style }));
+	const merged = localStyles.map(cloneStyleValue);
 	let changed = false;
 	for (const className of used) {
 		const generatedStyle = appStyle[className];
 		if (!generatedStyle) continue;
 		const indexes = merged.flatMap((style, index) => style[className] ? [index] : []);
 		if (indexes.length === 0) {
-			merged[0][className] = generatedStyle;
+			merged[0][className] = mergeStyleEntry(void 0, generatedStyle);
 			changed = true;
 			continue;
 		}
 		for (const index of indexes) {
-			if (JSON.stringify(merged[index][className]) === JSON.stringify(generatedStyle)) continue;
-			merged[index][className] = generatedStyle;
+			const next = mergeStyleEntry(merged[index][className], generatedStyle);
+			if (JSON.stringify(merged[index][className]) === JSON.stringify(next)) continue;
+			merged[index][className] = next;
 			changed = true;
 		}
 	}
 	return changed ? merged : void 0;
 }
 //#endregion
-//#region src/uni-app-x/style-asset.ts
-const GEN_STYLES_PLACEHOLDER_RE = /\/\*(Gen[A-Za-z0-9]+Styles)\*\/|const\s+(Gen[A-Za-z0-9]+Styles)\s*=\s*\[\]/;
+//#region src/uni-app-x/style-asset/harmony-global.ts
 const UVUE_TS_RE = /\.uvue\.ts$/;
 const JS_RE = /\.js$/;
-const APP_JS_RE = /(?:^|\/)App\.js$/;
+const APP_JS_RE$1 = /(?:^|\/)App\.js$/;
 const COMPONENT_JS_RE = /(?:^|\/)components\/.+\.js$/;
-const HARMONY_BUNDLE_MARKER_FILES = /* @__PURE__ */ new Set([
-	"import/app-service.ets",
-	"import/dynamic.ets",
-	"uni_modules/oh-package.json5"
-]);
 const STYLE_DECL_RE = /const\s+(_style_\d+)\s*=\s*\{/g;
 const EXPORT_SFC_RE = /_export_sfc\(_sfc_main\s*,\s*\[/;
-const UNI_APP_X_STYLE_PLACEHOLDER_VERSION = "uni-app-x-style-placeholder-v3";
-function createUniAppXHarmonyApplyGeneratorSource(applyStyleSources, _applyUtilities) {
-	return applyStyleSources.map((source) => {
-		let root;
-		try {
-			root = postcss.parse(source);
-		} catch {
-			return source;
-		}
-		root.walkAtRules("reference", (rule) => {
-			if (rule.params.match(/^(['"])(.+?)\1/)?.[2]?.startsWith(".")) rule.remove();
-		});
-		return root.toString();
-	}).join("\n");
-}
-function collectUniAppXHarmonyApplyUtilities(bundle) {
-	const utilities = /* @__PURE__ */ new Set();
-	const getBundleSource = createUniAppXBundleAssetSourceGetter(bundle);
-	for (const [file, item] of Object.entries(bundle)) {
-		if (item.type !== "chunk" || !file.endsWith(".js") || APP_JS_RE.test(file)) continue;
-		const mapSources = collectChunkMapSourcesContent(item).concat(resolveSourceMapFiles(file).flatMap((mapFile) => {
-			const source = getBundleSource(mapFile);
-			return source ? parseSourceMapSourcesContent(source) : [];
-		}));
-		for (const source of mapSources) for (const utility of collectUniAppXHarmonyApplyUtilitiesFromSources([source])) utilities.add(utility);
-	}
-	return utilities;
-}
-function collectUniAppXHarmonyApplyStyleSources(bundle) {
-	const sources = /* @__PURE__ */ new Set();
-	const getBundleSource = createUniAppXBundleAssetSourceGetter(bundle);
-	const addSource = (source) => {
-		for (const styleSource of collectUniAppXHarmonyApplyStyleSourcesFromSource(source)) sources.add(styleSource);
-	};
-	for (const [file, item] of Object.entries(bundle)) {
-		if (item.type === "asset" && file.endsWith(".uvue")) {
-			addSource(String(item.source));
-			continue;
-		}
-		if (item.type !== "chunk" || !file.endsWith(".js") || APP_JS_RE.test(file)) continue;
-		for (const sourceContent of collectChunkMapSourcesContent(item)) addSource(sourceContent);
-		for (const mapFile of resolveSourceMapFiles(file)) {
-			const source = getBundleSource(mapFile);
-			if (!source) continue;
-			for (const sourceContent of parseSourceMapSourcesContent(source)) addSource(sourceContent);
-		}
-	}
-	return [...sources];
-}
 function resolveStyleAssetFile(file) {
 	if (!UVUE_TS_RE.test(file)) return;
 	return file.replace(/\.uvue\.ts$/, ".uvue");
@@ -605,19 +568,19 @@ function resolveCssFallbackFiles(styleAssetFiles = []) {
 function resolveStyleAssetFilesForChunk(file, styleAssetFiles) {
 	return typeof styleAssetFiles === "function" ? styleAssetFiles(file) : styleAssetFiles;
 }
-function resolveSourceMapFiles(file) {
+function resolveSourceMapFiles$1(file) {
 	return [
 		`${file}.map`,
 		file.startsWith("assets/") ? `${file.slice(7)}.map` : void 0,
 		file.startsWith("assets/") ? void 0 : `assets/${file}.map`
 	].filter((item) => typeof item === "string");
 }
-function createStyleValueFromBundleSources(file, _code, getBundleSource, options = {}) {
+function createStyleValueFromBundleSources(file, getBundleSource, options = {}) {
 	const cssStyles = mergeStyleValues(...[...options.cssSources ?? []].map((source) => source ? cssSourceToStyleValue(source) : void 0), ...resolveCssFallbackFiles(resolveStyleAssetFilesForChunk(file, options.styleAssetFiles)).map((cssFile) => {
 		const source = getBundleSource?.(cssFile);
 		return source ? cssSourceToStyleValue(source) : void 0;
 	}));
-	return mergeStyleValues(cssStyles, createStyleValueFromApplySources([...options.mapSources ?? [], ...resolveSourceMapFiles(file).flatMap((mapFile) => {
+	return mergeStyleValues(cssStyles, createStyleValueFromApplySources([...options.mapSources ?? [], ...resolveSourceMapFiles$1(file).flatMap((mapFile) => {
 		const source = getBundleSource?.(mapFile);
 		return source ? parseSourceMapSourcesContent(source) : [];
 	})].filter((source) => typeof source === "string"), cssStyles));
@@ -636,21 +599,8 @@ function injectStyleOption(code, styleVarName) {
 	if (fileOptionIndex < 0) return code;
 	return `${code.slice(0, fileOptionIndex)}["styles", [${styleVarName}]], ${code.slice(fileOptionIndex)}`;
 }
-function injectUniAppXStylePlaceholder(file, code, getAssetSource, cssSources = []) {
-	const match = code.match(GEN_STYLES_PLACEHOLDER_RE);
-	const stylesName = match?.[1] ?? match?.[2];
-	if (!stylesName) return code;
-	if (!resolveStyleAssetFile(file)) return code;
-	const appStyleArray = createUtsStyleArrayFromAppStyles(code, getAssetSource?.("App.uvue.ts"));
-	const fallbackStyleSources = resolveStylePlaceholderFallbackFiles(file).map((candidate) => getAssetSource?.(candidate));
-	const styleExport = mergeStyleValues(...[...cssSources, ...fallbackStyleSources].map((source) => source ? cssSourceToStyleValue(source) : void 0));
-	const styleArrays = [appStyleArray, styleExport ? styleExportToUtsMap(styleExport) : void 0].filter((item) => Boolean(item));
-	if (styleArrays.length === 0) return code;
-	const mergedStyleArray = styleArrays.length === 1 ? styleArrays[0] : `[${styleArrays.map((item) => item.slice(1, -1)).filter(Boolean).join(", ")}]`;
-	return code.replace(GEN_STYLES_PLACEHOLDER_RE, `const ${stylesName} = ${mergedStyleArray}`);
-}
 function injectUniAppXHarmonyGlobalStyles(file, code, getBundleSource, options = {}) {
-	if (!JS_RE.test(file) || APP_JS_RE.test(file)) return code;
+	if (!JS_RE.test(file) || APP_JS_RE$1.test(file)) return code;
 	if (options.excludeComponents && COMPONENT_JS_RE.test(file)) return code;
 	const appSource = getBundleSource?.("assets/App.js") ?? getBundleSource?.("App.js");
 	const appStyle = appSource ? mergeStyleValues(...findStyleObjectDecls(appSource).map((decl) => parseStyleObject(decl.objectText))) : void 0;
@@ -661,7 +611,7 @@ function injectUniAppXHarmonyGlobalStyles(file, code, getBundleSource, options =
 			style
 		}] : [];
 	});
-	const styleSource = mergeStyleValues(createStyleValueFromBundleSources(file, code, getBundleSource, options), appStyle);
+	const styleSource = mergeStyleValues(createStyleValueFromBundleSources(file, getBundleSource, options), appStyle);
 	if (!styleSource) return code;
 	const mergedStyles = createMergedStyleValues(code, parseableLocalStyles.map((item) => item.style), styleSource);
 	if (mergedStyles) {
@@ -678,7 +628,87 @@ function injectUniAppXHarmonyGlobalStyles(file, code, getBundleSource, options =
 	const exportMatch = code.match(EXPORT_SFC_RE);
 	if (!exportMatch || exportMatch.index === void 0) return code;
 	const styleVarName = "_style_wt";
-	return injectStyleOption(`${code.slice(0, exportMatch.index)}const ${styleVarName} = ${JSON.stringify(newStyle)};\n${code.slice(exportMatch.index)}`, styleVarName);
+	const statementStart = code.lastIndexOf("\n", exportMatch.index);
+	const insertPos = statementStart === -1 ? 0 : statementStart + 1;
+	return injectStyleOption(new RegExp(`\\b(?:const|let|var)\\s+${styleVarName}\\s*=`).test(code) ? code : `${code.slice(0, insertPos)}const ${styleVarName} = ${JSON.stringify(newStyle)};\n${code.slice(insertPos)}`, styleVarName);
+}
+//#endregion
+//#region src/uni-app-x/style-asset.ts
+const GEN_STYLES_PLACEHOLDER_RE = /\/\*(Gen[A-Za-z0-9]+Styles)\*\/|const\s+(Gen[A-Za-z0-9]+Styles)\s*=\s*\[\]/;
+const APP_JS_RE = /(?:^|\/)App\.js$/;
+const HARMONY_BUNDLE_MARKER_FILES = /* @__PURE__ */ new Set([
+	"import/app-service.ets",
+	"import/dynamic.ets",
+	"uni_modules/oh-package.json5"
+]);
+function resolveSourceMapFiles(file) {
+	return [
+		`${file}.map`,
+		file.startsWith("assets/") ? `${file.slice(7)}.map` : void 0,
+		file.startsWith("assets/") ? void 0 : `assets/${file}.map`
+	].filter((item) => typeof item === "string");
+}
+const UNI_APP_X_STYLE_PLACEHOLDER_VERSION = "uni-app-x-style-placeholder-v3";
+function createUniAppXHarmonyApplyGeneratorSource(applyStyleSources, _applyUtilities) {
+	return applyStyleSources.map((source) => {
+		let root;
+		try {
+			root = postcss.parse(source);
+		} catch {
+			return source;
+		}
+		root.walkAtRules("reference", (rule) => {
+			if (rule.params.match(/^(['"])(.+?)\1/)?.[2]?.startsWith(".")) rule.remove();
+		});
+		return root.toString();
+	}).join("\n");
+}
+function collectUniAppXHarmonyApplyUtilities(bundle) {
+	const utilities = /* @__PURE__ */ new Set();
+	const getBundleSource = createUniAppXBundleAssetSourceGetter(bundle);
+	for (const [file, item] of Object.entries(bundle)) {
+		if (item.type !== "chunk" || !file.endsWith(".js") || APP_JS_RE.test(file)) continue;
+		const mapSources = collectChunkMapSourcesContent(item).concat(resolveSourceMapFiles(file).flatMap((mapFile) => {
+			const source = getBundleSource(mapFile);
+			return source ? parseSourceMapSourcesContent(source) : [];
+		}));
+		for (const source of mapSources) for (const utility of collectUniAppXHarmonyApplyUtilitiesFromSources([source])) utilities.add(utility);
+	}
+	return utilities;
+}
+function collectUniAppXHarmonyApplyStyleSources(bundle) {
+	const sources = /* @__PURE__ */ new Set();
+	const getBundleSource = createUniAppXBundleAssetSourceGetter(bundle);
+	const addSource = (source) => {
+		for (const styleSource of collectUniAppXHarmonyApplyStyleSourcesFromSource(source)) sources.add(styleSource);
+	};
+	for (const [file, item] of Object.entries(bundle)) {
+		if (item.type === "asset" && file.endsWith(".uvue")) {
+			addSource(String(item.source));
+			continue;
+		}
+		if (item.type !== "chunk" || !file.endsWith(".js") || APP_JS_RE.test(file)) continue;
+		for (const sourceContent of collectChunkMapSourcesContent(item)) addSource(sourceContent);
+		for (const mapFile of resolveSourceMapFiles(file)) {
+			const source = getBundleSource(mapFile);
+			if (!source) continue;
+			for (const sourceContent of parseSourceMapSourcesContent(source)) addSource(sourceContent);
+		}
+	}
+	return [...sources];
+}
+function injectUniAppXStylePlaceholder(file, code, getAssetSource, cssSources = []) {
+	const match = code.match(GEN_STYLES_PLACEHOLDER_RE);
+	const stylesName = match?.[1] ?? match?.[2];
+	if (!stylesName) return code;
+	if (!resolveStyleAssetFile(file)) return code;
+	const appStyleArray = createUtsStyleArrayFromAppStyles(code, getAssetSource?.("App.uvue.ts"));
+	const fallbackStyleSources = resolveStylePlaceholderFallbackFiles(file).map((candidate) => getAssetSource?.(candidate));
+	const styleExport = mergeStyleValues(...[...cssSources, ...fallbackStyleSources].map((source) => source ? cssSourceToStyleValue(source) : void 0));
+	const styleArrays = [appStyleArray, styleExport ? styleExportToUtsMap(styleExport) : void 0].filter((item) => Boolean(item));
+	if (styleArrays.length === 0) return code;
+	const mergedStyleArray = styleArrays.length === 1 ? styleArrays[0] : `[${styleArrays.map((item) => item.slice(1, -1)).filter(Boolean).join(", ")}]`;
+	return code.replace(GEN_STYLES_PLACEHOLDER_RE, `const ${stylesName} = ${mergedStyleArray}`);
 }
 function injectUniAppXHarmonyBundleStyles(bundle, options = {}) {
 	const getBundleSource = createUniAppXBundleAssetSourceGetter(bundle);
@@ -6276,7 +6306,7 @@ function createUniAppXWebLocalStyleBridge(isEnabled) {
 //#region src/uni-app-x/vite.ts
 let transformUVuePromise;
 function loadTransformUVue() {
-	transformUVuePromise ?? (transformUVuePromise = import("./transform-Ck31voUU.js").then((mod) => mod.transformUVue));
+	transformUVuePromise ?? (transformUVuePromise = import("./transform-DSRPiBWz.js").then((mod) => mod.transformUVue));
 	return transformUVuePromise;
 }
 const UVUE_NVUE_QUERY_RE = /\.(?:uvue|nvue)(?:\?.*)?$/;

package/dist/{vite-jftHIupF.cjs → vite-Dy6THt54.cjs}

@@ -1,18 +1,18 @@
 const require_rolldown_runtime = require("./rolldown-runtime-Ctb5zv51.cjs");
 const require_framework = require("./framework.cjs");
-const require_generator = require("./generator-BXrWA7Sj.cjs");
+const require_generator = require("./generator-DKiYbTFR.cjs");
 const require_object = require("./object-DbHtAXRk.cjs");
-const require_options = require("./options-DbYws6lr.cjs");
+const require_options = require("./options-CKZW99r4.cjs");
 require("./utils-CuKLf1Zv.cjs");
-const require_v4_generation_core = require("./v4-generation-core-BEYGV4eB.cjs");
+const require_v4_generation_core = require("./v4-generation-core-BfeXEc6R.cjs");
 const require_wxml = require("./wxml-CQmBCjOR.cjs");
-const require_hmr_timing = require("./hmr-timing-pF6k35pP.cjs");
-const require_context = require("./context-vWlNv-Cf.cjs");
-const require_tailwindcss = require("./tailwindcss-D1M2xj5O.cjs");
-const require_style_options = require("./style-options-Cta1OP3i.cjs");
-const require_source_candidate_scan_signature = require("./source-candidate-scan-signature-DGQufJk3.cjs");
+const require_hmr_timing = require("./hmr-timing-W3kro20F.cjs");
+const require_context = require("./context-CB4Ef9U0.cjs");
+const require_tailwindcss = require("./tailwindcss-jKzY37Sk.cjs");
+const require_style_options = require("./style-options-PCgz2ywM.cjs");
+const require_source_candidate_scan_signature = require("./source-candidate-scan-signature-BSad7bMQ.cjs");
 require("./logger-TlKT3xmR.cjs");
-const require_component_local_style = require("./component-local-style-BirkN5f8.cjs");
+const require_component_local_style = require("./component-local-style-CNhEhd2B.cjs");
 const require_css_imports = require("./css-imports-BFMU7Hpd.cjs");
 let node_fs = require("node:fs");
 node_fs = require_rolldown_runtime.__toESM(node_fs, 1);
@@ -243,6 +243,20 @@ const STRING_LITERAL_RE = /(['"`])((?:\\.|(?!\1)[\s\S])*?)\1/g;
 const SFC_STYLE_BLOCK_RE$2 = /<style\b[^>]*>([\s\S]*?)<\/style>/gi;
 const STYLE_EXPORT_PREFIX_RE = /^\s*export\s+default\s+/;
 const CLASS_SELECTOR_PREFIX_RE = /^\.((?:\\[^\n\r\f]|[\w-])+)(?=$|[.:#[])/;
+function cloneStyleEntry(entry) {
+	return Object.fromEntries(Object.entries(entry).map(([state, declarations]) => [state, { ...declarations }]));
+}
+function mergeStyleEntry(local, generated) {
+	const merged = local ? cloneStyleEntry(local) : {};
+	for (const [state, declarations] of Object.entries(generated)) merged[state] = {
+		...merged[state] ?? {},
+		...declarations
+	};
+	return merged;
+}
+function cloneStyleValue(style) {
+	return Object.fromEntries(Object.entries(style).map(([className, entry]) => [className, cloneStyleEntry(entry)]));
+}
 function toCamelCase(prop) {
 	return prop.replace(/-([a-z])/g, (_, char) => char.toUpperCase());
 }
@@ -449,11 +463,14 @@ function collectUniAppXHarmonyApplyUtilitiesFromSources(sources) {
 function createMergedStyleValue(code, localStyle, appStyle) {
 	const used = collectUsedStyleKeys(code, appStyle);
 	if (used.size === 0) return;
-	const merged = { ...localStyle ?? {} };
+	const merged = localStyle ? cloneStyleValue(localStyle) : {};
 	let changed = false;
 	for (const className of used) {
-		if (merged[className] || !appStyle[className]) continue;
-		merged[className] = appStyle[className];
+		const generatedStyle = appStyle[className];
+		if (!generatedStyle) continue;
+		const next = mergeStyleEntry(merged[className], generatedStyle);
+		if (JSON.stringify(next) === JSON.stringify(merged[className])) continue;
+		merged[className] = next;
 		changed = true;
 	}
 	return changed ? merged : void 0;
@@ -462,88 +479,34 @@ function createMergedStyleValues(code, localStyles, appStyle) {
 	if (localStyles.length === 0) return;
 	const used = collectUsedStyleKeys(code, appStyle);
 	if (used.size === 0) return;
-	const merged = localStyles.map((style) => ({ ...style }));
+	const merged = localStyles.map(cloneStyleValue);
 	let changed = false;
 	for (const className of used) {
 		const generatedStyle = appStyle[className];
 		if (!generatedStyle) continue;
 		const indexes = merged.flatMap((style, index) => style[className] ? [index] : []);
 		if (indexes.length === 0) {
-			merged[0][className] = generatedStyle;
+			merged[0][className] = mergeStyleEntry(void 0, generatedStyle);
 			changed = true;
 			continue;
 		}
 		for (const index of indexes) {
-			if (JSON.stringify(merged[index][className]) === JSON.stringify(generatedStyle)) continue;
-			merged[index][className] = generatedStyle;
+			const next = mergeStyleEntry(merged[index][className], generatedStyle);
+			if (JSON.stringify(merged[index][className]) === JSON.stringify(next)) continue;
+			merged[index][className] = next;
 			changed = true;
 		}
 	}
 	return changed ? merged : void 0;
 }
 //#endregion
-//#region src/uni-app-x/style-asset.ts
-const GEN_STYLES_PLACEHOLDER_RE = /\/\*(Gen[A-Za-z0-9]+Styles)\*\/|const\s+(Gen[A-Za-z0-9]+Styles)\s*=\s*\[\]/;
+//#region src/uni-app-x/style-asset/harmony-global.ts
 const UVUE_TS_RE = /\.uvue\.ts$/;
 const JS_RE = /\.js$/;
-const APP_JS_RE = /(?:^|\/)App\.js$/;
+const APP_JS_RE$1 = /(?:^|\/)App\.js$/;
 const COMPONENT_JS_RE = /(?:^|\/)components\/.+\.js$/;
-const HARMONY_BUNDLE_MARKER_FILES = /* @__PURE__ */ new Set([
-	"import/app-service.ets",
-	"import/dynamic.ets",
-	"uni_modules/oh-package.json5"
-]);
 const STYLE_DECL_RE = /const\s+(_style_\d+)\s*=\s*\{/g;
 const EXPORT_SFC_RE = /_export_sfc\(_sfc_main\s*,\s*\[/;
-const UNI_APP_X_STYLE_PLACEHOLDER_VERSION = "uni-app-x-style-placeholder-v3";
-function createUniAppXHarmonyApplyGeneratorSource(applyStyleSources, _applyUtilities) {
-	return applyStyleSources.map((source) => {
-		let root;
-		try {
-			root = _weapp_tailwindcss_postcss.postcss.parse(source);
-		} catch {
-			return source;
-		}
-		root.walkAtRules("reference", (rule) => {
-			if (rule.params.match(/^(['"])(.+?)\1/)?.[2]?.startsWith(".")) rule.remove();
-		});
-		return root.toString();
-	}).join("\n");
-}
-function collectUniAppXHarmonyApplyUtilities(bundle) {
-	const utilities = /* @__PURE__ */ new Set();
-	const getBundleSource = createUniAppXBundleAssetSourceGetter(bundle);
-	for (const [file, item] of Object.entries(bundle)) {
-		if (item.type !== "chunk" || !file.endsWith(".js") || APP_JS_RE.test(file)) continue;
-		const mapSources = collectChunkMapSourcesContent(item).concat(resolveSourceMapFiles(file).flatMap((mapFile) => {
-			const source = getBundleSource(mapFile);
-			return source ? parseSourceMapSourcesContent(source) : [];
-		}));
-		for (const source of mapSources) for (const utility of collectUniAppXHarmonyApplyUtilitiesFromSources([source])) utilities.add(utility);
-	}
-	return utilities;
-}
-function collectUniAppXHarmonyApplyStyleSources(bundle) {
-	const sources = /* @__PURE__ */ new Set();
-	const getBundleSource = createUniAppXBundleAssetSourceGetter(bundle);
-	const addSource = (source) => {
-		for (const styleSource of collectUniAppXHarmonyApplyStyleSourcesFromSource(source)) sources.add(styleSource);
-	};
-	for (const [file, item] of Object.entries(bundle)) {
-		if (item.type === "asset" && file.endsWith(".uvue")) {
-			addSource(String(item.source));
-			continue;
-		}
-		if (item.type !== "chunk" || !file.endsWith(".js") || APP_JS_RE.test(file)) continue;
-		for (const sourceContent of collectChunkMapSourcesContent(item)) addSource(sourceContent);
-		for (const mapFile of resolveSourceMapFiles(file)) {
-			const source = getBundleSource(mapFile);
-			if (!source) continue;
-			for (const sourceContent of parseSourceMapSourcesContent(source)) addSource(sourceContent);
-		}
-	}
-	return [...sources];
-}
 function resolveStyleAssetFile(file) {
 	if (!UVUE_TS_RE.test(file)) return;
 	return file.replace(/\.uvue\.ts$/, ".uvue");
@@ -614,19 +577,19 @@ function resolveCssFallbackFiles(styleAssetFiles = []) {
 function resolveStyleAssetFilesForChunk(file, styleAssetFiles) {
 	return typeof styleAssetFiles === "function" ? styleAssetFiles(file) : styleAssetFiles;
 }
-function resolveSourceMapFiles(file) {
+function resolveSourceMapFiles$1(file) {
 	return [
 		`${file}.map`,
 		file.startsWith("assets/") ? `${file.slice(7)}.map` : void 0,
 		file.startsWith("assets/") ? void 0 : `assets/${file}.map`
 	].filter((item) => typeof item === "string");
 }
-function createStyleValueFromBundleSources(file, _code, getBundleSource, options = {}) {
+function createStyleValueFromBundleSources(file, getBundleSource, options = {}) {
 	const cssStyles = mergeStyleValues(...[...options.cssSources ?? []].map((source) => source ? cssSourceToStyleValue(source) : void 0), ...resolveCssFallbackFiles(resolveStyleAssetFilesForChunk(file, options.styleAssetFiles)).map((cssFile) => {
 		const source = getBundleSource?.(cssFile);
 		return source ? cssSourceToStyleValue(source) : void 0;
 	}));
-	return mergeStyleValues(cssStyles, createStyleValueFromApplySources([...options.mapSources ?? [], ...resolveSourceMapFiles(file).flatMap((mapFile) => {
+	return mergeStyleValues(cssStyles, createStyleValueFromApplySources([...options.mapSources ?? [], ...resolveSourceMapFiles$1(file).flatMap((mapFile) => {
 		const source = getBundleSource?.(mapFile);
 		return source ? parseSourceMapSourcesContent(source) : [];
 	})].filter((source) => typeof source === "string"), cssStyles));
@@ -645,21 +608,8 @@ function injectStyleOption(code, styleVarName) {
 	if (fileOptionIndex < 0) return code;
 	return `${code.slice(0, fileOptionIndex)}["styles", [${styleVarName}]], ${code.slice(fileOptionIndex)}`;
 }
-function injectUniAppXStylePlaceholder(file, code, getAssetSource, cssSources = []) {
-	const match = code.match(GEN_STYLES_PLACEHOLDER_RE);
-	const stylesName = match?.[1] ?? match?.[2];
-	if (!stylesName) return code;
-	if (!resolveStyleAssetFile(file)) return code;
-	const appStyleArray = createUtsStyleArrayFromAppStyles(code, getAssetSource?.("App.uvue.ts"));
-	const fallbackStyleSources = resolveStylePlaceholderFallbackFiles(file).map((candidate) => getAssetSource?.(candidate));
-	const styleExport = mergeStyleValues(...[...cssSources, ...fallbackStyleSources].map((source) => source ? cssSourceToStyleValue(source) : void 0));
-	const styleArrays = [appStyleArray, styleExport ? styleExportToUtsMap(styleExport) : void 0].filter((item) => Boolean(item));
-	if (styleArrays.length === 0) return code;
-	const mergedStyleArray = styleArrays.length === 1 ? styleArrays[0] : `[${styleArrays.map((item) => item.slice(1, -1)).filter(Boolean).join(", ")}]`;
-	return code.replace(GEN_STYLES_PLACEHOLDER_RE, `const ${stylesName} = ${mergedStyleArray}`);
-}
 function injectUniAppXHarmonyGlobalStyles(file, code, getBundleSource, options = {}) {
-	if (!JS_RE.test(file) || APP_JS_RE.test(file)) return code;
+	if (!JS_RE.test(file) || APP_JS_RE$1.test(file)) return code;
 	if (options.excludeComponents && COMPONENT_JS_RE.test(file)) return code;
 	const appSource = getBundleSource?.("assets/App.js") ?? getBundleSource?.("App.js");
 	const appStyle = appSource ? mergeStyleValues(...findStyleObjectDecls(appSource).map((decl) => parseStyleObject(decl.objectText))) : void 0;
@@ -670,7 +620,7 @@ function injectUniAppXHarmonyGlobalStyles(file, code, getBundleSource, options =
 			style
 		}] : [];
 	});
-	const styleSource = mergeStyleValues(createStyleValueFromBundleSources(file, code, getBundleSource, options), appStyle);
+	const styleSource = mergeStyleValues(createStyleValueFromBundleSources(file, getBundleSource, options), appStyle);
 	if (!styleSource) return code;
 	const mergedStyles = createMergedStyleValues(code, parseableLocalStyles.map((item) => item.style), styleSource);
 	if (mergedStyles) {
@@ -687,7 +637,87 @@ function injectUniAppXHarmonyGlobalStyles(file, code, getBundleSource, options =
 	const exportMatch = code.match(EXPORT_SFC_RE);
 	if (!exportMatch || exportMatch.index === void 0) return code;
 	const styleVarName = "_style_wt";
-	return injectStyleOption(`${code.slice(0, exportMatch.index)}const ${styleVarName} = ${JSON.stringify(newStyle)};\n${code.slice(exportMatch.index)}`, styleVarName);
+	const statementStart = code.lastIndexOf("\n", exportMatch.index);
+	const insertPos = statementStart === -1 ? 0 : statementStart + 1;
+	return injectStyleOption(new RegExp(`\\b(?:const|let|var)\\s+${styleVarName}\\s*=`).test(code) ? code : `${code.slice(0, insertPos)}const ${styleVarName} = ${JSON.stringify(newStyle)};\n${code.slice(insertPos)}`, styleVarName);
+}
+//#endregion
+//#region src/uni-app-x/style-asset.ts
+const GEN_STYLES_PLACEHOLDER_RE = /\/\*(Gen[A-Za-z0-9]+Styles)\*\/|const\s+(Gen[A-Za-z0-9]+Styles)\s*=\s*\[\]/;
+const APP_JS_RE = /(?:^|\/)App\.js$/;
+const HARMONY_BUNDLE_MARKER_FILES = /* @__PURE__ */ new Set([
+	"import/app-service.ets",
+	"import/dynamic.ets",
+	"uni_modules/oh-package.json5"
+]);
+function resolveSourceMapFiles(file) {
+	return [
+		`${file}.map`,
+		file.startsWith("assets/") ? `${file.slice(7)}.map` : void 0,
+		file.startsWith("assets/") ? void 0 : `assets/${file}.map`
+	].filter((item) => typeof item === "string");
+}
+const UNI_APP_X_STYLE_PLACEHOLDER_VERSION = "uni-app-x-style-placeholder-v3";
+function createUniAppXHarmonyApplyGeneratorSource(applyStyleSources, _applyUtilities) {
+	return applyStyleSources.map((source) => {
+		let root;
+		try {
+			root = _weapp_tailwindcss_postcss.postcss.parse(source);
+		} catch {
+			return source;
+		}
+		root.walkAtRules("reference", (rule) => {
+			if (rule.params.match(/^(['"])(.+?)\1/)?.[2]?.startsWith(".")) rule.remove();
+		});
+		return root.toString();
+	}).join("\n");
+}
+function collectUniAppXHarmonyApplyUtilities(bundle) {
+	const utilities = /* @__PURE__ */ new Set();
+	const getBundleSource = createUniAppXBundleAssetSourceGetter(bundle);
+	for (const [file, item] of Object.entries(bundle)) {
+		if (item.type !== "chunk" || !file.endsWith(".js") || APP_JS_RE.test(file)) continue;
+		const mapSources = collectChunkMapSourcesContent(item).concat(resolveSourceMapFiles(file).flatMap((mapFile) => {
+			const source = getBundleSource(mapFile);
+			return source ? parseSourceMapSourcesContent(source) : [];
+		}));
+		for (const source of mapSources) for (const utility of collectUniAppXHarmonyApplyUtilitiesFromSources([source])) utilities.add(utility);
+	}
+	return utilities;
+}
+function collectUniAppXHarmonyApplyStyleSources(bundle) {
+	const sources = /* @__PURE__ */ new Set();
+	const getBundleSource = createUniAppXBundleAssetSourceGetter(bundle);
+	const addSource = (source) => {
+		for (const styleSource of collectUniAppXHarmonyApplyStyleSourcesFromSource(source)) sources.add(styleSource);
+	};
+	for (const [file, item] of Object.entries(bundle)) {
+		if (item.type === "asset" && file.endsWith(".uvue")) {
+			addSource(String(item.source));
+			continue;
+		}
+		if (item.type !== "chunk" || !file.endsWith(".js") || APP_JS_RE.test(file)) continue;
+		for (const sourceContent of collectChunkMapSourcesContent(item)) addSource(sourceContent);
+		for (const mapFile of resolveSourceMapFiles(file)) {
+			const source = getBundleSource(mapFile);
+			if (!source) continue;
+			for (const sourceContent of parseSourceMapSourcesContent(source)) addSource(sourceContent);
+		}
+	}
+	return [...sources];
+}
+function injectUniAppXStylePlaceholder(file, code, getAssetSource, cssSources = []) {
+	const match = code.match(GEN_STYLES_PLACEHOLDER_RE);
+	const stylesName = match?.[1] ?? match?.[2];
+	if (!stylesName) return code;
+	if (!resolveStyleAssetFile(file)) return code;
+	const appStyleArray = createUtsStyleArrayFromAppStyles(code, getAssetSource?.("App.uvue.ts"));
+	const fallbackStyleSources = resolveStylePlaceholderFallbackFiles(file).map((candidate) => getAssetSource?.(candidate));
+	const styleExport = mergeStyleValues(...[...cssSources, ...fallbackStyleSources].map((source) => source ? cssSourceToStyleValue(source) : void 0));
+	const styleArrays = [appStyleArray, styleExport ? styleExportToUtsMap(styleExport) : void 0].filter((item) => Boolean(item));
+	if (styleArrays.length === 0) return code;
+	const mergedStyleArray = styleArrays.length === 1 ? styleArrays[0] : `[${styleArrays.map((item) => item.slice(1, -1)).filter(Boolean).join(", ")}]`;
+	return code.replace(GEN_STYLES_PLACEHOLDER_RE, `const ${stylesName} = ${mergedStyleArray}`);
 }
 function injectUniAppXHarmonyBundleStyles(bundle, options = {}) {
 	const getBundleSource = createUniAppXBundleAssetSourceGetter(bundle);
@@ -6285,7 +6315,7 @@ function createUniAppXWebLocalStyleBridge(isEnabled) {
 //#region src/uni-app-x/vite.ts
 let transformUVuePromise;
 function loadTransformUVue() {
-	transformUVuePromise ?? (transformUVuePromise = Promise.resolve().then(() => require("./transform-BYhgJszj.cjs")).then((mod) => mod.transformUVue));
+	transformUVuePromise ?? (transformUVuePromise = Promise.resolve().then(() => require("./transform-CgohToUV.cjs")).then((mod) => mod.transformUVue));
 	return transformUVuePromise;
 }
 const UVUE_NVUE_QUERY_RE = /\.(?:uvue|nvue)(?:\?.*)?$/;

package/dist/vite.cjs

@@ -1,4 +1,4 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_vite = require("./vite-jftHIupF.cjs");
+const require_vite = require("./vite-Dy6THt54.cjs");
 exports.WeappTailwindcss = require_vite.WeappTailwindcss;
 exports.weappTailwindcss = require_vite.WeappTailwindcss;

package/dist/vite.js

@@ -1,2 +1,2 @@
-import { t as WeappTailwindcss } from "./vite-DBgbFsei.js";
+import { t as WeappTailwindcss } from "./vite-CVr0vIgh.js";
 export { WeappTailwindcss, WeappTailwindcss as weappTailwindcss };

package/dist/weapp-tw-css-generation-loader.cjs

@@ -1,4 +1,4 @@
-const require_generator = require("./generator-BXrWA7Sj.cjs");
+const require_generator = require("./generator-DKiYbTFR.cjs");
 const require_weapp_tw_css_import_rewrite_loader = require("./weapp-tw-css-import-rewrite-loader.cjs");
 let node_buffer = require("node:buffer");
 //#region src/bundlers/webpack/loaders/weapp-tw-css-generation-loader.ts