weapp-tailwindcss 5.3.1 → 5.3.2

package/dist/index.cjs

@@ -3,7 +3,7 @@ const require_framework = require("./framework.cjs");
 const require_generator = require("./generator-DKiYbTFR.cjs");
 const require_gulp = require("./gulp-QJ_oz-06.cjs");
 const require_postcss = require("./postcss.cjs");
-const require_vite = require("./vite-CtmGLZXy.cjs");
+const require_vite = require("./vite-Dy6THt54.cjs");
 const require_webpack = require("./webpack-Cf5RnhXt.cjs");
 require("./webpack.cjs");
 let _weapp_tailwindcss_postcss = require("@weapp-tailwindcss/postcss");

package/dist/index.js

@@ -2,7 +2,7 @@ import { detectAppType, detectAppTypeFromEnv, detectAppTypeFromPackageJson, isMp
 import { t as createWeappTailwindcssGenerator } from "./generator-EnTXLBlK.js";
 import { t as createPlugins } from "./gulp-vz36-uQP.js";
 import weappTailwindcssPostcssPlugin from "./postcss.js";
-import { t as WeappTailwindcss } from "./vite-Crz1mQR4.js";
+import { t as WeappTailwindcss } from "./vite-CVr0vIgh.js";
 import { n as weappTailwindcssPackageDir } from "./webpack-DwtdWqwr.js";
 import "./webpack.js";
 import { unitConversionComposeRules, unitConversionPresets } from "@weapp-tailwindcss/postcss";

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

@@ -0,0 +1,9 @@
+export interface HarmonyStyleInjectOptions {
+    cssSources?: Iterable<string | undefined> | undefined;
+    styleAssetFiles?: Iterable<string | undefined> | ((file: string) => Iterable<string | undefined>) | undefined;
+    excludeComponents?: boolean | undefined;
+    mapSources?: Iterable<string | undefined> | undefined;
+}
+export declare function resolveStyleAssetFile(file: string): string | undefined;
+export declare function resolveStylePlaceholderFallbackFiles(file: string): string[];
+export declare function injectUniAppXHarmonyGlobalStyles(file: string, code: string, getBundleSource?: (file: string) => string | undefined, options?: HarmonyStyleInjectOptions): string;

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

@@ -13,7 +13,5 @@ export declare function createStyleValueFromApplySources(sources: string[], util
 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 declare function createMergedStyleValues(code: string, localStyles: StyleValue[], appStyle: StyleValue): {
-    [x: string]: Record<string, StyleDeclarations>;
-}[] | undefined;
+export declare function createMergedStyleValues(code: string, localStyles: StyleValue[], appStyle: StyleValue): StyleValue[] | undefined;
 export {};

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

@@ -1,22 +1,17 @@
 import type { OutputAsset, OutputChunk } from 'rollup';
+import type { HarmonyStyleInjectOptions } from './style-asset/harmony-global.js';
 import { expandUniAppXHarmonyApplyStyles } from './style-asset/harmony-apply.js';
+import { injectUniAppXHarmonyGlobalStyles } from './style-asset/harmony-global.js';
 import { collectUniAppXHarmonyApplyStyleSourcesFromSource, collectUniAppXHarmonyApplyUtilitiesFromSources } from './style-asset/style-value.js';
 export declare const UNI_APP_X_STYLE_PLACEHOLDER_VERSION = "uni-app-x-style-placeholder-v3";
 type BundleItem = {
     type: string;
 } | OutputAsset | OutputChunk;
-interface HarmonyStyleInjectOptions {
-    cssSources?: Iterable<string | undefined> | undefined;
-    styleAssetFiles?: Iterable<string | undefined> | ((file: string) => Iterable<string | undefined>) | undefined;
-    excludeComponents?: boolean | undefined;
-    mapSources?: Iterable<string | undefined> | undefined;
-}
-export { collectUniAppXHarmonyApplyStyleSourcesFromSource, collectUniAppXHarmonyApplyUtilitiesFromSources, expandUniAppXHarmonyApplyStyles, };
+export { collectUniAppXHarmonyApplyStyleSourcesFromSource, collectUniAppXHarmonyApplyUtilitiesFromSources, expandUniAppXHarmonyApplyStyles, injectUniAppXHarmonyGlobalStyles, };
 export declare function createUniAppXHarmonyApplyGeneratorSource(applyStyleSources: string[], _applyUtilities: Iterable<string>): string;
 export declare function collectUniAppXHarmonyApplyUtilities(bundle: Record<string, BundleItem>): Set<string>;
 export declare function collectUniAppXHarmonyApplyStyleSources(bundle: Record<string, BundleItem>): string[];
 export declare function injectUniAppXStylePlaceholder(file: string, code: string, getAssetSource?: (file: string) => string | undefined, cssSources?: Iterable<string | undefined>): string;
-export declare function injectUniAppXHarmonyGlobalStyles(file: string, code: string, getBundleSource?: (file: string) => string | undefined, options?: HarmonyStyleInjectOptions): string;
 export declare function injectUniAppXHarmonyBundleStyles(bundle: Record<string, BundleItem>, options?: HarmonyStyleInjectOptions): boolean;
 export declare function isUniAppXHarmonyBundle(bundle: Record<string, BundleItem>): boolean;
 export declare function createUniAppXBundleAssetSourceGetter(bundle: Record<string, BundleItem>): (file: string) => string | undefined;

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

@@ -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);

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

@@ -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);

package/dist/vite.cjs

@@ -1,4 +1,4 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_vite = require("./vite-CtmGLZXy.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-Crz1mQR4.js";
+import { t as WeappTailwindcss } from "./vite-CVr0vIgh.js";
 export { WeappTailwindcss, WeappTailwindcss as weappTailwindcss };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "weapp-tailwindcss",
   "type": "module",
-  "version": "5.3.1",
+  "version": "5.3.2",
   "description": "Bring Tailwind CSS to every platform! 把 Tailwind CSS 的原子化开发体验带到全端！",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -211,8 +211,8 @@
     "oxc-walker": "^1.1.1",
     "semver": "~7.8.5",
     "yaml": "^2.9.0",
-    "@weapp-tailwindcss/postcss": "3.2.11",
     "@weapp-tailwindcss/logger": "2.0.2",
+    "@weapp-tailwindcss/postcss": "3.2.11",
     "tailwindcss-config": "2.0.3",
     "weapp-style-injector": "1.0.3",
     "@weapp-tailwindcss/shared": "2.0.2",