weapp-tailwindcss 5.5.5 → 5.5.7

package/dist/{transform-D21f8Dm8.cjs → transform-D2KFdA3C.cjs}

@@ -1,8 +1,8 @@
-const require_generator = require("./generator-BdSIvFEO.cjs");
-const require_compiler = require("./compiler-Cc0JXfbw.cjs");
-const require_vite = require("./vite-CaH7WjX6.cjs");
-let _tailwindcss_mangle_engine = require("@tailwindcss-mangle/engine");
-let _weapp_tailwindcss_postcss = require("@weapp-tailwindcss/postcss");
+const require_generator = require("./generator-CxauQbx3.cjs");
+const require_compiler = require("./compiler-DkGY5Nmh.cjs");
+const require_vite = require("./vite-BxW0qd7J.cjs");
+let _weapp_tailwindcss_engine = require("@weapp-tailwindcss/engine");
+let _weapp_tailwindcss_postcss_transform = require("@weapp-tailwindcss/postcss/transform");
 let _vue_compiler_dom = require("@vue/compiler-dom");
 //#region src/uni-app-x/component-local-style-binding.ts
 const OPTIONS_CLASS_SECTIONS = /* @__PURE__ */ new Set(["computed", "methods"]);
@@ -121,7 +121,7 @@ function createAlias(fileId, utility, index) {
 	return `wtu-${createStableHash(`${fileId}:${utility}`)}-${index.toString(36)}`;
 }
 function serializeApplyUtility(utility, options = {}) {
-	const importantSuffix = options.native ? _weapp_tailwindcss_postcss.UNI_APP_X_IMPORTANT_APPLY_MARKER : options.web ? "!" : "#{'!'}";
+	const importantSuffix = options.native ? _weapp_tailwindcss_postcss_transform.UNI_APP_X_IMPORTANT_APPLY_MARKER : options.web ? "!" : "#{'!'}";
 	if (utility.startsWith("!") && !utility.startsWith("\\!")) return `${utility.slice(1)}${importantSuffix}`;
 	if (!utility.endsWith("!") || utility.endsWith("\\!")) return utility;
 	return `${utility.slice(0, -1)}${importantSuffix}`;
@@ -173,37 +173,47 @@ function hasTopLevelVariant(candidate) {
 	return false;
 }
 var UniAppXComponentLocalStyleCollector = class {
-	constructor(fileId, runtimeSet) {
+	constructor(fileId, runtimeSet, includeVariants = false, preserveClassNames = false) {
 		this.fileId = fileId;
 		this.runtimeSet = runtimeSet;
+		this.includeVariants = includeVariants;
+		this.preserveClassNames = preserveClassNames;
 		require_generator._defineProperty(this, "aliasByUtility", /* @__PURE__ */ new Map());
 		require_generator._defineProperty(this, "aliasByLookup", /* @__PURE__ */ new Map());
 		require_generator._defineProperty(this, "classBindingNames", /* @__PURE__ */ new Set());
 		require_generator._defineProperty(this, "deepUtilities", /* @__PURE__ */ new Set());
 	}
+	runtimeClassName(utility) {
+		return this.preserveClassNames ? utility : require_compiler.replaceWxml(utility);
+	}
 	ensureAlias(utility) {
 		const cached = this.aliasByUtility.get(utility);
 		if (cached) return cached;
 		const alias = createAlias(this.fileId, utility, this.aliasByUtility.size);
 		this.aliasByUtility.set(utility, alias);
-		this.aliasByLookup.set(utility, alias);
-		this.aliasByLookup.set(require_compiler.replaceWxml(utility), alias);
+		const replacement = hasTopLevelVariant(utility) ? `${this.runtimeClassName(utility)} ${alias}` : alias;
+		this.aliasByLookup.set(utility, replacement);
+		this.aliasByLookup.set(require_compiler.replaceWxml(utility), replacement);
 		return alias;
 	}
 	rewriteLiteral(literal) {
-		const candidates = (0, _tailwindcss_mangle_engine.splitCandidateTokens)(literal);
+		const candidates = (0, _weapp_tailwindcss_engine.splitCandidateTokens)(literal);
 		if (candidates.length === 0) return literal;
 		let rewritten = literal;
 		for (const candidate of candidates) {
 			if (!isRuntimeCandidate(candidate, this.runtimeSet)) continue;
-			rewritten = rewritten.replace(candidate, hasTopLevelVariant(candidate) ? require_compiler.replaceWxml(candidate) : this.ensureAlias(candidate));
+			if (!this.includeVariants && hasTopLevelVariant(candidate)) rewritten = rewritten.replace(candidate, this.runtimeClassName(candidate));
+			else {
+				this.ensureAlias(candidate);
+				rewritten = rewritten.replace(candidate, this.aliasByLookup.get(candidate));
+			}
 		}
 		return rewritten;
 	}
 	collectAndRewriteStaticClass(literal, options = {}) {
 		const rewritten = this.rewriteLiteral(literal);
 		if (options.deep) {
-			for (const candidate of (0, _tailwindcss_mangle_engine.splitCandidateTokens)(literal)) if (this.aliasByUtility.has(candidate)) this.deepUtilities.add(candidate);
+			for (const candidate of (0, _weapp_tailwindcss_engine.splitCandidateTokens)(literal)) if (this.aliasByUtility.has(candidate)) this.deepUtilities.add(candidate);
 		}
 		return rewritten;
 	}
@@ -219,11 +229,11 @@ var UniAppXComponentLocalStyleCollector = class {
 			const analysis = require_compiler.analyzeSource(ast, {}, void 0, false);
 			for (const path of analysis.targetPaths) {
 				const { literal } = extractLiteralValue(path);
-				const candidates = (0, _tailwindcss_mangle_engine.splitCandidateTokens)(literal);
+				const candidates = (0, _weapp_tailwindcss_engine.splitCandidateTokens)(literal);
 				const classContext = options.wrapExpression || require_compiler.isClassContextLiteralPath(path) || isClassBindingLiteralPath(path, classBindingRoots);
 				for (const candidate of candidates) {
 					if (!candidate || !classContext || !isRuntimeCandidate(candidate, this.runtimeSet)) continue;
-					if (!hasTopLevelVariant(candidate)) {
+					if (this.includeVariants || !hasTopLevelVariant(candidate)) {
 						this.ensureAlias(candidate);
 						if (options.deep) this.deepUtilities.add(candidate);
 					}
@@ -246,7 +256,7 @@ var UniAppXComponentLocalStyleCollector = class {
 			for (const path of analysis.targetPaths) {
 				if (!options.wrapExpression && !require_compiler.isClassContextLiteralPath(path) && !isClassBindingLiteralPath(path, classBindingRoots)) continue;
 				const { literal, offset } = extractLiteralValue(path);
-				const candidates = (0, _tailwindcss_mangle_engine.splitCandidateTokens)(literal);
+				const candidates = (0, _weapp_tailwindcss_engine.splitCandidateTokens)(literal);
 				if (candidates.length === 0) continue;
 				let rewritten = literal;
 				let mutated = false;
@@ -307,11 +317,14 @@ function traverse(node, visitor) {
 		for (const child of node.children) if (child && typeof child === "object" && "type" in child) traverse(child, visitor);
 	}
 }
-function updateStaticAttribute(ms, prop, offset, content = prop.value?.content) {
+function updateStaticAttribute(ms, prop, offset, preserveClassNames) {
 	if (!prop.value) return;
 	const start = offset + prop.value.loc.start.offset + 1;
 	const end = offset + prop.value.loc.end.offset - 1;
-	if (start < end) ms.update(start, end, require_compiler.replaceWxml(content ?? ""));
+	if (start < end) {
+		const content = prop.value.content;
+		ms.update(start, end, preserveClassNames ? content : require_compiler.replaceWxml(content));
+	}
 }
 function updateStaticAttributeWithLocalStyle(ms, prop, offset, collector, deep, content = prop.value?.content) {
 	if (!prop.value) return;
@@ -438,14 +451,16 @@ function parseSfc(code) {
 function transformUVue(code, id, jsHandler, runtimeSet, options = {}) {
 	if (!UVUE_NVUE_RE.test(id)) return;
 	const { customAttributesEntities, disabledDefaultTemplateHandler = false } = options;
+	const isWeb = Boolean(options.onWebLocalStyleRules);
+	const jsRuntimeSet = isWeb ? /* @__PURE__ */ new Set() : runtimeSet;
 	const matchCustomAttribute = require_compiler.createAttributeMatcher(customAttributesEntities);
 	const ms = new require_compiler.MagicString(code);
 	const descriptor = parseSfc(code);
 	if (options.native || options.onWebLocalStyleRules) for (const style of descriptor.styles) {
-		const normalized = (0, _weapp_tailwindcss_postcss.normalizeUniAppXImportantApplyForSass)(style.content);
+		const normalized = (0, _weapp_tailwindcss_postcss_transform.normalizeUniAppXImportantApplyForSass)(style.content);
 		if (normalized !== style.content) ms.update(style.start, style.end, normalized);
 	}
-	const localStyleCollector = shouldEnableLocalStyle(id, options) ? new UniAppXComponentLocalStyleCollector(id, runtimeSet) : void 0;
+	const localStyleCollector = shouldEnableLocalStyle(id, options) ? new UniAppXComponentLocalStyleCollector(id, runtimeSet, options.localStyleVariants, isWeb) : void 0;
 	if (descriptor.errors.length === 0) {
 		if (descriptor.template?.ast) {
 			const templateOffset = descriptor.template.start;
@@ -456,14 +471,14 @@ function transformUVue(code, id, jsHandler, runtimeSet, options = {}) {
 					const { shouldHandle, shouldHandleCustom, shouldHandleDefault } = shouldHandleAttribute(tag, prop.name, disabledDefaultTemplateHandler, matchCustomAttribute);
 					if (!shouldHandle) continue;
 					if (localStyleCollector) updateStaticAttributeWithLocalStyle(ms, prop, templateOffset, localStyleCollector, options.webCustomAttributeDeep === true && shouldHandleCustom);
-					else updateStaticAttribute(ms, prop, templateOffset);
+					else updateStaticAttribute(ms, prop, templateOffset, isWeb);
 					if (shouldHandleDefault) continue;
 				} else if (prop.type === _vue_compiler_dom.NodeTypes.DIRECTIVE && prop.name === "bind" && prop.arg?.type === _vue_compiler_dom.NodeTypes.SIMPLE_EXPRESSION && prop.arg.isStatic) {
 					const attrName = prop.arg.content;
 					const { shouldHandle, shouldHandleCustom } = shouldHandleAttribute(tag, attrName, disabledDefaultTemplateHandler, matchCustomAttribute);
 					if (!shouldHandle) continue;
-					if (localStyleCollector) updateDirectiveExpressionWithLocalStyle(ms, prop, templateOffset, jsHandler, localStyleCollector, options.webCustomAttributeDeep === true && shouldHandleCustom, runtimeSet);
-					else updateDirectiveExpression(ms, prop, templateOffset, jsHandler, runtimeSet);
+					if (localStyleCollector) updateDirectiveExpressionWithLocalStyle(ms, prop, templateOffset, jsHandler, localStyleCollector, options.webCustomAttributeDeep === true && shouldHandleCustom, jsRuntimeSet);
+					else updateDirectiveExpression(ms, prop, templateOffset, jsHandler, jsRuntimeSet);
 				}
 				if (options.borderPreflight && require_vite.shouldInjectBorderPreflight(node, options.borderPreflightRange)) require_vite.injectBorderPreflightClass(ms, node, templateOffset);
 			});
@@ -471,19 +486,19 @@ function transformUVue(code, id, jsHandler, runtimeSet, options = {}) {
 		}
 		if (descriptor.script && descriptor.script.start < descriptor.script.end) {
 			localStyleCollector?.collectRuntimeClasses(descriptor.script.content);
-			const { code } = jsHandler(descriptor.script.content, runtimeSet ?? /* @__PURE__ */ new Set(), defaultCreateJsHandlerOptions);
+			const { code } = jsHandler(descriptor.script.content, jsRuntimeSet ?? /* @__PURE__ */ new Set(), defaultCreateJsHandlerOptions);
 			ms.update(descriptor.script.start, descriptor.script.end, localStyleCollector ? localStyleCollector.rewriteTransformedCode(code) : code);
 		}
 		if (descriptor.scriptSetup && descriptor.scriptSetup.start < descriptor.scriptSetup.end) {
 			localStyleCollector?.collectRuntimeClasses(descriptor.scriptSetup.content);
-			const { code } = jsHandler(descriptor.scriptSetup.content, runtimeSet ?? /* @__PURE__ */ new Set(), defaultCreateJsHandlerOptions);
+			const { code } = jsHandler(descriptor.scriptSetup.content, jsRuntimeSet ?? /* @__PURE__ */ new Set(), defaultCreateJsHandlerOptions);
 			ms.update(descriptor.scriptSetup.start, descriptor.scriptSetup.end, localStyleCollector ? localStyleCollector.rewriteTransformedCode(code) : code);
 		}
-		const scopedStyle = descriptor.styles.findLast((style) => STYLE_SCOPED_RE.test(style.attrs) && (!options.onWebLocalStyleRules || !require_vite.isUniAppXStyleSourceEmpty(style.content)));
+		const scopedStyle = [...descriptor.styles].reverse().find((style) => STYLE_SCOPED_RE.test(style.attrs) && (!options.onWebLocalStyleRules || !(0, _weapp_tailwindcss_postcss_transform.isUniAppXStyleSourceEmpty)(style.content)));
 		if (localStyleCollector && options.onWebLocalStyleRules && descriptor.template) options.onWebLocalStyleRules(localStyleCollector.hasStyles() ? localStyleCollector.toStyleRules({ web: true }) : "");
 		if (localStyleCollector?.hasStyles() && scopedStyle && !options.onWebLocalStyleRules) {
 			const separator = scopedStyle.content.endsWith("\n") ? "" : "\n";
-			ms.appendLeft(scopedStyle.end, `${separator}${localStyleCollector.toStyleRules({ native: options.native })}`);
+			ms.appendLeft(scopedStyle.end, `${separator}${localStyleCollector.toStyleRules({ native: options.native === true })}`);
 		} else if (localStyleCollector?.hasStyles() && !scopedStyle) ms.append(`\n${localStyleCollector.toStyleBlock({
 			native: options.native || Boolean(options.onWebLocalStyleRules),
 			web: Boolean(options.onWebLocalStyleRules)

package/dist/types/index.d.ts

@@ -1,5 +1,5 @@
 import type { ParseError, ParserOptions } from '@babel/parser';
-import type { CssPreflightOptions, Document, IStyleHandlerOptions, Result as PostcssResult, Root } from '@weapp-tailwindcss/postcss';
+import type { CssPreflightOptions, IStyleHandlerOptions, StyleHandler } from '@weapp-tailwindcss/postcss/transform';
 import type { SourceMap } from 'magic-string';
 import type { ICreateCacheReturnType } from '../cache/index.js';
 import type { ItemOrItemArray } from './base.js';
@@ -9,7 +9,7 @@ import type { LengthUnitsRuntimeOptions, TailwindContentTokenReport, Tailwindcss
 export type { TailwindCssOptions, TailwindCssRuntimeOptions, UniAppXComponentLocalStylesOptions, UniAppXUserDefinedOptions, UserDefinedOptions, };
 export type { AppType, IArbitraryValues, ICustomAttributes, ICustomAttributesEntities, IUnocssCompatibilityOptions } from './shared.js';
 export type { CssPreflightOptions, IStyleHandlerOptions, ItemOrItemArray };
-export type { WeappTailwindcssStyleInjectorOptions } from '../style-injector/internal.js';
+export type { WeappTailwindcssStyleInjectorOptions } from '../style-injector/options.js';
 export type RequiredDefined<T> = {
     [K in keyof T]-?: Exclude<T[K], undefined>;
 };
@@ -83,9 +83,10 @@ export interface ITemplateHandlerOptions extends ICommonReplaceOptions {
     filename?: string | undefined;
 }
 export interface InternalUserDefinedOptions extends InternalUserDefinedOptionsBase {
+    customAttributesEntities: ICustomAttributesEntities;
     supportCustomLengthUnits: LengthUnitsRuntimeOptions | boolean;
     templateHandler: (rawSource: string, options?: ITemplateHandlerOptions) => Promise<string>;
-    styleHandler: (rawSource: string, options?: IStyleHandlerOptions) => Promise<PostcssResult<Root | Document>>;
+    styleHandler: StyleHandler;
     jsHandler: JsHandler;
     escapeMap: Record<string, string>;
     customReplaceDictionary: Record<string, string>;

package/dist/types/user-defined-options/general.d.ts

@@ -2,7 +2,7 @@ import type { ParserOptions } from '@babel/parser';
 import type { CssOptions, LoadedPostcssOptions } from '@weapp-tailwindcss/postcss/types';
 import type { ICreateCacheReturnType } from '../../cache/index.js';
 import type { WeappTailwindcssGeneratorUserOptions } from '../../generator/index.js';
-import type { WeappTailwindcssStyleInjectorUserOptions } from '../../style-injector/internal.js';
+import type { WeappTailwindcssStyleInjectorUserOptions } from '../../style-injector/options.js';
 import type { AppType, IArbitraryValues, IUnocssCompatibilityOptions } from '../shared.js';
 import type { LengthUnitsRuntimeOptions, TailwindCssRuntimeOptions } from '../../tailwindcss/runtime-types.js';
 export interface CssSourceTraceOptions {

package/dist/uni-app-x/border-preflight.d.ts

@@ -1,9 +1,8 @@
 import type { ElementNode } from '@vue/compiler-dom';
 import type MagicString from 'magic-string';
 import type { CssPreflightOptions } from '../types/index.js';
+export { createUniAppXBorderPreflight, hoistUniAppXBorderPreflight, } from '@weapp-tailwindcss/postcss/transform';
 export declare const BORDER_PREFLIGHT_CLASS = "weapp-tw-border";
-export declare function hoistUniAppXBorderPreflight(css: string): string;
-export declare function createUniAppXBorderPreflight(options?: CssPreflightOptions): string | undefined;
 export declare function resolveUniAppXBorderPreflightOptions(options: {
     cssPreflight?: CssPreflightOptions;
     cssPreflightRange?: 'all';

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

@@ -6,11 +6,14 @@ export declare function hasTopLevelVariant(candidate: string): boolean;
 export declare class UniAppXComponentLocalStyleCollector {
     private readonly fileId;
     private readonly runtimeSet?;
+    private readonly includeVariants;
+    private readonly preserveClassNames;
     private aliasByUtility;
     private aliasByLookup;
     private classBindingNames;
     private deepUtilities;
-    constructor(fileId: string, runtimeSet?: Set<string> | undefined);
+    constructor(fileId: string, runtimeSet?: Set<string> | undefined, includeVariants?: boolean, preserveClassNames?: boolean);
+    private runtimeClassName;
     private ensureAlias;
     private rewriteLiteral;
     collectAndRewriteStaticClass(literal: string, options?: RewriteCodeOptions): string;

package/dist/uni-app-x/transform.d.ts

@@ -1,5 +1,6 @@
-import type { TransformResult } from 'vite';
+import type { SourceDescription } from 'rollup';
 import type { ICustomAttributesEntities, JsHandler } from '../types/index.js';
+type UniAppXTransformResult = Pick<SourceDescription, 'code' | 'map'>;
 interface TransformUVueOptions {
     componentMatcher?: (id: string) => boolean;
     customAttributesEntities?: ICustomAttributesEntities;
@@ -8,10 +9,11 @@ interface TransformUVueOptions {
     enablePageLocalStyle?: boolean;
     pageMatcher?: (id: string) => boolean;
     native?: boolean;
+    localStyleVariants?: boolean;
     borderPreflight?: string;
     borderPreflightRange?: 'all';
     webCustomAttributeDeep?: boolean;
     onWebLocalStyleRules?: (rules: string) => void;
 }
-export declare function transformUVue(code: string, id: string, jsHandler: JsHandler, runtimeSet?: Set<string>, options?: TransformUVueOptions): undefined | TransformResult;
+export declare function transformUVue(code: string, id: string, jsHandler: JsHandler, runtimeSet?: Set<string>, options?: TransformUVueOptions): undefined | UniAppXTransformResult;
 export {};

package/dist/uni-app-x/vite/author-apply.d.ts

@@ -1 +1,3 @@
-export declare function retainUniAppXAuthorApplyCss(generatedCss: string, authorCss: string): string;
+export declare function retainUniAppXAuthorApplyCss(generatedCss: string, authorCss: string, options?: {
+    preserveRuntimeProperties?: boolean;
+}): string;

package/dist/uni-app-x/vite/native-hmr.d.ts

@@ -3,7 +3,7 @@ interface CreateUniAppXNativeHmrReloaderOptions {
     ensureRuntimeClassSet: (force?: boolean) => Promise<Set<string>>;
     isNativeAppBuildTarget: (id?: string) => boolean;
     localStyleModuleIds: Iterable<string>;
-    syncSourceCandidates?: (ctx: HmrContext) => Promise<void>;
+    syncSourceCandidates?: ((ctx: HmrContext) => Promise<void>) | undefined;
     tailwindRootCssModuleIds: Iterable<string>;
     viteProcessedCssSourceFiles: Iterable<string>;
 }

package/dist/uni-app-x/vite/style-result.d.ts

@@ -0,0 +1,5 @@
+import type { postcss } from '@weapp-tailwindcss/postcss/transform';
+export declare function createUniAppXStyleResult(id: string, result: postcss.Result): Promise<{
+    code: string;
+    map: string;
+}>;

package/dist/utils/run-tasks.d.ts

@@ -0,0 +1,3 @@
+export declare function runWithConcurrency<T>(factories: Array<() => Promise<T>>, limit?: number): Promise<T[]>;
+export declare function resolveTaskConcurrency(defaultLimit?: number): number;
+export declare function pushConcurrentTaskFactories(queue: Array<Promise<void>>, factories: Array<() => Promise<unknown>>, limit?: number): void;

package/dist/vite/web.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_web = require("../web-CYs2Kcaa.cjs");
+const require_web = require("../web-Y-H6I1k6.cjs");
 //#region src/vite-web.ts
 /**
 * 创建面向普通 Vite Web 项目的 Tailwind 插件。

package/dist/vite/web.js

@@ -1,4 +1,4 @@
-import { t as createGenericWebVitePlugins } from "../web-CdXkY_VO.js";
+import { t as createGenericWebVitePlugins } from "../web--kA4HUTm.js";
 //#region src/vite-web.ts
 /**
 * 创建面向普通 Vite Web 项目的 Tailwind 插件。