weapp-tailwindcss 5.5.4 → 5.5.6

package/dist/style-injector/internal.d.ts

@@ -4,17 +4,127 @@ import type { WeappTailwindcssStyleInjectorUserOptions } from './options.js';
 import { normalizeStyleInjectorOptions } from './options.js';
 export type ViteStyleInjectorDelegateFactory = (options: NonNullable<ReturnType<typeof normalizeStyleInjectorOptions>>) => Plugin[];
 export type WebpackStyleInjectorDelegateFactory = (options: NonNullable<ReturnType<typeof normalizeWebpackStyleInjectorOptions>>) => WebpackObjectPluginInstance;
-declare function normalizeWebpackStyleInjectorOptions(options: WeappTailwindcssStyleInjectorUserOptions | undefined): WebpackWeappStyleInjectorOptions | undefined;
+declare function normalizeWebpackStyleInjectorOptions(options: WeappTailwindcssStyleInjectorUserOptions | undefined): ({
+    pagesJsonPath?: string | string[];
+    appConfigPath?: string | string[];
+    appPath?: string | string[];
+    sourceRoot?: string;
+    subPackages?: import("weapp-style-injector").UniAppSubPackageConfig | import("weapp-style-injector").UniAppSubPackageConfig[] | import("weapp-style-injector").TaroSubPackageConfig | import("weapp-style-injector").TaroSubPackageConfig[] | import("weapp-style-injector").MpxSubPackageConfig | import("weapp-style-injector").MpxSubPackageConfig[];
+    uniAppSubPackages?: import("weapp-style-injector").UniAppSubPackageConfig | import("weapp-style-injector").UniAppSubPackageConfig[];
+    uniAppStyleScopes?: import("weapp-style-injector").UniAppManualStyleConfig | import("weapp-style-injector").UniAppManualStyleConfig[];
+    subpackageStyleScopes?: import("weapp-style-injector").ResolvedSubpackageStyleScope[];
+    sourceFileName?: string | string[];
+    outputName?: string;
+    files?: string | string[];
+    include?: string | string[];
+    exclude?: string | string[];
+    indexFileName?: string | string[];
+    indexFileNames?: string | string[];
+    styleScopes?: import("weapp-style-injector").UniAppStyleScopeInput | import("weapp-style-injector").UniAppStyleScopeInput[];
+    rules?: import("weapp-style-injector").SubpackageStyleRules;
+    preprocess?: boolean;
+    imports?: string[];
+    perFileImports?: import("weapp-style-injector").PerFileImportResolver;
+    dedupe?: boolean;
+} & Pick<WebpackWeappStyleInjectorOptions, "generateSubpackageStyle" | "loadSubpackageTargetStyle">) | undefined;
 export declare const viteStyleInjectorDelegates: {
-    generic: (options: import("./options.js").WeappTailwindcssStyleInjectorOptions) => import("vite").Plugin<any>[];
-    taro: (options: import("./options.js").WeappTailwindcssStyleInjectorOptions) => Plugin<any>[];
-    uniApp: (options: import("./options.js").WeappTailwindcssStyleInjectorOptions) => Plugin<any>[];
+    generic: (options: import("./options.js").DefinedStyleInjectorOptions) => Plugin<any>[];
+    taro: (options: import("./options.js").DefinedStyleInjectorOptions) => Plugin<any>[];
+    uniApp: (options: import("./options.js").DefinedStyleInjectorOptions) => Plugin<any>[];
 };
 export declare const webpackStyleInjectorDelegates: {
-    generic: (options: WebpackWeappStyleInjectorOptions) => WebpackObjectPluginInstance;
-    mpx: (options: WebpackWeappStyleInjectorOptions) => WebpackObjectPluginInstance;
-    taro: (options: WebpackWeappStyleInjectorOptions) => WebpackObjectPluginInstance;
-    uniApp: (options: WebpackWeappStyleInjectorOptions) => WebpackObjectPluginInstance;
+    generic: (options: {
+        pagesJsonPath?: string | string[];
+        appConfigPath?: string | string[];
+        appPath?: string | string[];
+        sourceRoot?: string;
+        subPackages?: import("weapp-style-injector").UniAppSubPackageConfig | import("weapp-style-injector").UniAppSubPackageConfig[] | import("weapp-style-injector").TaroSubPackageConfig | import("weapp-style-injector").TaroSubPackageConfig[] | import("weapp-style-injector").MpxSubPackageConfig | import("weapp-style-injector").MpxSubPackageConfig[];
+        uniAppSubPackages?: import("weapp-style-injector").UniAppSubPackageConfig | import("weapp-style-injector").UniAppSubPackageConfig[];
+        uniAppStyleScopes?: import("weapp-style-injector").UniAppManualStyleConfig | import("weapp-style-injector").UniAppManualStyleConfig[];
+        subpackageStyleScopes?: import("weapp-style-injector").ResolvedSubpackageStyleScope[];
+        sourceFileName?: string | string[];
+        outputName?: string;
+        files?: string | string[];
+        include?: string | string[];
+        exclude?: string | string[];
+        indexFileName?: string | string[];
+        indexFileNames?: string | string[];
+        styleScopes?: import("weapp-style-injector").UniAppStyleScopeInput | import("weapp-style-injector").UniAppStyleScopeInput[];
+        rules?: import("weapp-style-injector").SubpackageStyleRules;
+        preprocess?: boolean;
+        imports?: string[];
+        perFileImports?: import("weapp-style-injector").PerFileImportResolver;
+        dedupe?: boolean;
+    } & Pick<WebpackWeappStyleInjectorOptions, "generateSubpackageStyle" | "loadSubpackageTargetStyle">) => WebpackObjectPluginInstance;
+    mpx: (options: {
+        pagesJsonPath?: string | string[];
+        appConfigPath?: string | string[];
+        appPath?: string | string[];
+        sourceRoot?: string;
+        subPackages?: import("weapp-style-injector").UniAppSubPackageConfig | import("weapp-style-injector").UniAppSubPackageConfig[] | import("weapp-style-injector").TaroSubPackageConfig | import("weapp-style-injector").TaroSubPackageConfig[] | import("weapp-style-injector").MpxSubPackageConfig | import("weapp-style-injector").MpxSubPackageConfig[];
+        uniAppSubPackages?: import("weapp-style-injector").UniAppSubPackageConfig | import("weapp-style-injector").UniAppSubPackageConfig[];
+        uniAppStyleScopes?: import("weapp-style-injector").UniAppManualStyleConfig | import("weapp-style-injector").UniAppManualStyleConfig[];
+        subpackageStyleScopes?: import("weapp-style-injector").ResolvedSubpackageStyleScope[];
+        sourceFileName?: string | string[];
+        outputName?: string;
+        files?: string | string[];
+        include?: string | string[];
+        exclude?: string | string[];
+        indexFileName?: string | string[];
+        indexFileNames?: string | string[];
+        styleScopes?: import("weapp-style-injector").UniAppStyleScopeInput | import("weapp-style-injector").UniAppStyleScopeInput[];
+        rules?: import("weapp-style-injector").SubpackageStyleRules;
+        preprocess?: boolean;
+        imports?: string[];
+        perFileImports?: import("weapp-style-injector").PerFileImportResolver;
+        dedupe?: boolean;
+    } & Pick<WebpackWeappStyleInjectorOptions, "generateSubpackageStyle" | "loadSubpackageTargetStyle">) => WebpackObjectPluginInstance;
+    taro: (options: {
+        pagesJsonPath?: string | string[];
+        appConfigPath?: string | string[];
+        appPath?: string | string[];
+        sourceRoot?: string;
+        subPackages?: import("weapp-style-injector").UniAppSubPackageConfig | import("weapp-style-injector").UniAppSubPackageConfig[] | import("weapp-style-injector").TaroSubPackageConfig | import("weapp-style-injector").TaroSubPackageConfig[] | import("weapp-style-injector").MpxSubPackageConfig | import("weapp-style-injector").MpxSubPackageConfig[];
+        uniAppSubPackages?: import("weapp-style-injector").UniAppSubPackageConfig | import("weapp-style-injector").UniAppSubPackageConfig[];
+        uniAppStyleScopes?: import("weapp-style-injector").UniAppManualStyleConfig | import("weapp-style-injector").UniAppManualStyleConfig[];
+        subpackageStyleScopes?: import("weapp-style-injector").ResolvedSubpackageStyleScope[];
+        sourceFileName?: string | string[];
+        outputName?: string;
+        files?: string | string[];
+        include?: string | string[];
+        exclude?: string | string[];
+        indexFileName?: string | string[];
+        indexFileNames?: string | string[];
+        styleScopes?: import("weapp-style-injector").UniAppStyleScopeInput | import("weapp-style-injector").UniAppStyleScopeInput[];
+        rules?: import("weapp-style-injector").SubpackageStyleRules;
+        preprocess?: boolean;
+        imports?: string[];
+        perFileImports?: import("weapp-style-injector").PerFileImportResolver;
+        dedupe?: boolean;
+    } & Pick<WebpackWeappStyleInjectorOptions, "generateSubpackageStyle" | "loadSubpackageTargetStyle">) => WebpackObjectPluginInstance;
+    uniApp: (options: {
+        pagesJsonPath?: string | string[];
+        appConfigPath?: string | string[];
+        appPath?: string | string[];
+        sourceRoot?: string;
+        subPackages?: import("weapp-style-injector").UniAppSubPackageConfig | import("weapp-style-injector").UniAppSubPackageConfig[] | import("weapp-style-injector").TaroSubPackageConfig | import("weapp-style-injector").TaroSubPackageConfig[] | import("weapp-style-injector").MpxSubPackageConfig | import("weapp-style-injector").MpxSubPackageConfig[];
+        uniAppSubPackages?: import("weapp-style-injector").UniAppSubPackageConfig | import("weapp-style-injector").UniAppSubPackageConfig[];
+        uniAppStyleScopes?: import("weapp-style-injector").UniAppManualStyleConfig | import("weapp-style-injector").UniAppManualStyleConfig[];
+        subpackageStyleScopes?: import("weapp-style-injector").ResolvedSubpackageStyleScope[];
+        sourceFileName?: string | string[];
+        outputName?: string;
+        files?: string | string[];
+        include?: string | string[];
+        exclude?: string | string[];
+        indexFileName?: string | string[];
+        indexFileNames?: string | string[];
+        styleScopes?: import("weapp-style-injector").UniAppStyleScopeInput | import("weapp-style-injector").UniAppStyleScopeInput[];
+        rules?: import("weapp-style-injector").SubpackageStyleRules;
+        preprocess?: boolean;
+        imports?: string[];
+        perFileImports?: import("weapp-style-injector").PerFileImportResolver;
+        dedupe?: boolean;
+    } & Pick<WebpackWeappStyleInjectorOptions, "generateSubpackageStyle" | "loadSubpackageTargetStyle">) => WebpackObjectPluginInstance;
 };
 export declare function createBuiltinViteStyleInjectorPlugins(options: WeappTailwindcssStyleInjectorUserOptions | undefined, getDelegateFactory: () => ViteStyleInjectorDelegateFactory): Plugin[];
 export declare function createBuiltinWebpackStyleInjectorPlugin(options: WeappTailwindcssStyleInjectorUserOptions | undefined, delegateFactory: WebpackStyleInjectorDelegateFactory): WebpackObjectPluginInstance | undefined;

package/dist/style-injector/options.d.ts

@@ -1,4 +1,7 @@
 import type { MpxSubPackageConfig, ResolvedSubpackageStyleScope, SubpackageStyleGenerateContext, SubpackageStyleGenerator, SubpackageStyleRules, TaroSubPackageConfig, UniAppManualStyleConfig, UniAppStyleScopeInput, UniAppSubPackageConfig, WeappStyleInjectorOptions } from 'weapp-style-injector';
+export type DefinedStyleInjectorOptions = {
+    [K in keyof WeappTailwindcssStyleInjectorOptions]: Exclude<WeappTailwindcssStyleInjectorOptions[K], undefined>;
+};
 export type WeappTailwindcssStyleInjectorUserOptions = boolean | WeappTailwindcssStyleInjectorOptions;
 export interface WeappTailwindcssStyleInjectorOptions extends WeappStyleInjectorOptions {
     pagesJsonPath?: string | string[] | undefined;
@@ -22,4 +25,5 @@ export interface WeappTailwindcssStyleInjectorOptions extends WeappStyleInjector
     rules?: SubpackageStyleRules | undefined;
     preprocess?: boolean | undefined;
 }
-export declare function normalizeStyleInjectorOptions(options: WeappTailwindcssStyleInjectorUserOptions | undefined): WeappTailwindcssStyleInjectorOptions | undefined;
+export declare function normalizeStyleInjectorOptions(options: WeappTailwindcssStyleInjectorUserOptions | undefined): DefinedStyleInjectorOptions | undefined;
+export declare function resolveStyleInjectorSubPackages<K extends 'appConfigPath' | 'pagesJsonPath' | 'appPath'>(subPackages: DefinedStyleInjectorOptions['subPackages'], key: K): Extract<UniAppSubPackageConfig | TaroSubPackageConfig | MpxSubPackageConfig, Record<K, string>>[] | undefined;

package/dist/tailwindcss/runtime-options.d.ts

@@ -5,4 +5,9 @@ type TailwindExtendLengthUnitsOption = TailwindApplyOptions['extendLengthUnits']
 export declare function resolveTailwindcssOptions(options?: TailwindCssRuntimeOptions): TailwindUserOptions | undefined;
 export declare function normalizeExtendLengthUnits(value: boolean | LengthUnitsRuntimeOptions | undefined): TailwindExtendLengthUnitsOption | undefined;
 export declare function normalizeTailwindcssRuntimeOptions(options?: TailwindCssRuntimeOptions): TailwindCssRuntimeOptions | undefined;
+export declare function resolveRuntimeBareArbitraryValues(options?: TailwindCssRuntimeOptions): boolean | {
+    units?: never;
+} | {
+    units: string[];
+} | undefined;
 export {};

package/dist/tailwindcss/v4/preflight.d.ts

@@ -1,4 +1,3 @@
-export declare function parseCssImportSpecifier(params: string): string | undefined;
 export declare function isTailwindV4CssImportParam(params: string): boolean;
 export declare function isTailwindV4PreflightImportParam(params: string): boolean;
 export declare function includesTailwindV4PreflightDirective(css: string): boolean;

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

@@ -37,6 +37,7 @@ export declare function runIncrementalGenerateTask(cacheKey: string, requestedCa
 export declare function resolveTargetCandidates(candidates: Iterable<string> | undefined, target: TailwindV4GenerateTarget): Set<string>;
 export declare function createIncrementalStyleOptions(styleOptions: Partial<IStyleHandlerOptions> | undefined): Partial<IStyleHandlerOptions>;
 export declare function resolveStyleOptions(source: TailwindV4ResolvedSource, options: Partial<IStyleHandlerOptions> | undefined): Partial<IStyleHandlerOptions> | undefined;
+export declare function collectCustomPropertyValues(css: string): Map<string, string>;
 export declare function mergeCustomPropertyValues(target: Map<string, string>, css: string): void;
 export declare function summarizeIncrementalCacheKey(key: string): {
     keyHash: string;

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

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

package/dist/{tailwindcss-o3Xe-o7M.js → tailwindcss-B_4E52WF.js}

@@ -1,11 +1,11 @@
-import { At as resolveTailwindV4CssSourceBase, C as findWorkspacePackageDir, Ct as expandTailwindSourceEntries, D as normalizeTailwindcssRuntimeOptions, Dt as parseConfigParam, E as normalizeExtendLengthUnits, Et as normalizeLegacyContentEntries, Lt as resolveCssMacroTailwindV4Source, O as resolveTailwindcssOptions, Ot as resolveCssSourceEntries, S as findNearestPackageRoot, St as FULL_SOURCE_SCAN_PATTERN, T as omitUndefined, Vt as loadTailwindV4DesignSystem, b as isTailwindV4CssEntry, d as resolveTailwindV4SourceFromRuntime, h as hasConfiguredTailwindV4CssRoots, i as normalizeWeappTailwindcssGeneratorOptions, k as normalizeStringListOption, m as filterTailwindV4CssSourceRoots, p as resolveTailwindV4SourceOptionsFromRuntime, v as groupCssEntriesByBase, w as findWorkspaceRoot, x as normalizeCssEntries, y as guessBasedirFromEntries } from "./generator-BgbYHNgD.js";
+import { A as normalizeStringListOption, At as resolveCssSourceEntries, C as findWorkspacePackageDir, D as normalizeTailwindcssRuntimeOptions, E as normalizeExtendLengthUnits, Lt as resolveCssMacroTailwindV4Source, Mt as resolveTailwindV4CssSourceBase, O as resolveRuntimeBareArbitraryValues, Ot as normalizeLegacyContentEntries, S as findNearestPackageRoot, T as omitUndefined, Tt as expandTailwindSourceEntries, Vt as loadTailwindV4DesignSystem, b as isTailwindV4CssEntry, d as resolveTailwindV4SourceFromRuntime, h as hasConfiguredTailwindV4CssRoots, i as normalizeWeappTailwindcssGeneratorOptions, k as resolveTailwindcssOptions, kt as parseConfigParam, m as filterTailwindV4CssSourceRoots, p as resolveTailwindV4SourceOptionsFromRuntime, v as groupCssEntriesByBase, w as findWorkspaceRoot, wt as FULL_SOURCE_SCAN_PATTERN, x as normalizeCssEntries, y as guessBasedirFromEntries } from "./generator-C0BJjyLM.js";
 import { n as defuOverrideArray$1 } from "./utils-MVwpU07P.js";
 import { createRequire } from "node:module";
 import { existsSync, readFileSync, statSync } from "node:fs";
 import path from "node:path";
 import process from "node:process";
 import { extractProjectCandidatesWithPositions, resolveValidTailwindV4Candidates } from "@tailwindcss-mangle/engine";
-import { postcss } from "@weapp-tailwindcss/postcss";
+import { parseCssImportSpecifier, postcss } from "@weapp-tailwindcss/postcss";
 import { stat } from "node:fs/promises";
 import { defuOverrideArray } from "@weapp-tailwindcss/shared";
 import fg from "fast-glob";
@@ -142,15 +142,8 @@ function collectCssInlineSourceCandidates(root) {
 }
 //#endregion
 //#region src/tailwindcss/v4/preflight.ts
-function parseCssImportSpecifier(params) {
-	const value = params.trim();
-	const quoted = /^(['"])(.*?)\1/.exec(value);
-	if (quoted) return quoted[2];
-	const url = /^url\(\s*(?:(['"])(.*?)\1|([^'")\s]+))\s*\)/.exec(value);
-	return url?.[2] ?? url?.[3];
-}
 function normalizeTailwindImportSpecifier(params) {
-	return parseCssImportSpecifier(params)?.replaceAll("\\", "/");
+	return parseCssImportSpecifier(params)?.specifier.replaceAll("\\", "/");
 }
 function isTailwindV4CssImportParam(params) {
 	const specifier = normalizeTailwindImportSpecifier(params);
@@ -350,7 +343,7 @@ function readStaticConfigContent(configPath) {
 const SOURCE_CANDIDATE_PATTERN = FULL_SOURCE_SCAN_PATTERN;
 const TAILWIND_CSS_ENTRY_PATTERN = "**/*.css";
 const tailwindV4CssEntriesCache = /* @__PURE__ */ new Map();
-function parseImportSourceParam(params) {
+function parseImportSourceParam$1(params) {
 	const match = /\bsource\(\s*(none|(['"])(.*?)\2)\s*\)/.exec(params);
 	if (!match) return;
 	return {
@@ -456,7 +449,7 @@ async function resolveTailwindV4EntriesFromCss(css, base) {
 		if (!isTailwindV4CssImportParam(rule.params)) return;
 		hasTailwindCssImport = true;
 		includesPreflight || (includesPreflight = isTailwindV4PreflightImportParam(rule.params));
-		const sourceParam = parseImportSourceParam(rule.params);
+		const sourceParam = parseImportSourceParam$1(rule.params);
 		if (sourceParam?.none) hasSourceNone = true;
 		if (sourceParam?.sourcePath) importSourceBase = resolveSourceBase(base, sourceParam.sourcePath);
 	});
@@ -1123,8 +1116,9 @@ function createEngineTailwindcssRuntime(options) {
 			return typeof entry === "string" ? entry : entry.rawCandidate;
 		}).filter((entry) => typeof entry === "string" && entry.length > 0));
 		const source = resolveCssMacroTailwindV4Source(await resolveTailwindV4SourceFromRuntime(runtime));
+		const bareArbitraryValues = resolveRuntimeBareArbitraryValues(runtime.options);
 		const designSystem = await loadTailwindV4DesignSystem(source);
-		const candidates = new Set(resolveValidTailwindV4Candidates(designSystem, rawCandidates, { ...source.bareArbitraryValues === void 0 ? {} : { bareArbitraryValues: source.bareArbitraryValues } }));
+		const candidates = new Set(resolveValidTailwindV4Candidates(designSystem, rawCandidates, { ...bareArbitraryValues === void 0 ? {} : { bareArbitraryValues } }));
 		await collectTailwindV4CssCandidates(candidates);
 		return applyClassSetFilter(candidates);
 	}

package/dist/{tailwindcss-B03BGeTO.cjs → tailwindcss-CBYjzRmV.cjs}

@@ -1,5 +1,5 @@
 const require_rolldown_runtime = require("./rolldown-runtime-Ctb5zv51.cjs");
-const require_generator = require("./generator-RK2HtgOb.cjs");
+const require_generator = require("./generator-Bvr4WmuF.cjs");
 require("./utils-CuKLf1Zv.cjs");
 let node_fs = require("node:fs");
 let node_path = require("node:path");
@@ -146,15 +146,8 @@ function collectCssInlineSourceCandidates(root) {
 }
 //#endregion
 //#region src/tailwindcss/v4/preflight.ts
-function parseCssImportSpecifier(params) {
-	const value = params.trim();
-	const quoted = /^(['"])(.*?)\1/.exec(value);
-	if (quoted) return quoted[2];
-	const url = /^url\(\s*(?:(['"])(.*?)\1|([^'")\s]+))\s*\)/.exec(value);
-	return url?.[2] ?? url?.[3];
-}
 function normalizeTailwindImportSpecifier(params) {
-	return parseCssImportSpecifier(params)?.replaceAll("\\", "/");
+	return (0, _weapp_tailwindcss_postcss.parseCssImportSpecifier)(params)?.specifier.replaceAll("\\", "/");
 }
 function isTailwindV4CssImportParam(params) {
 	const specifier = normalizeTailwindImportSpecifier(params);
@@ -1127,8 +1120,9 @@ function createEngineTailwindcssRuntime(options) {
 			return typeof entry === "string" ? entry : entry.rawCandidate;
 		}).filter((entry) => typeof entry === "string" && entry.length > 0));
 		const source = require_generator.resolveCssMacroTailwindV4Source(await require_generator.resolveTailwindV4SourceFromRuntime(runtime));
+		const bareArbitraryValues = require_generator.resolveRuntimeBareArbitraryValues(runtime.options);
 		const designSystem = await (0, _tailwindcss_mangle_engine.loadTailwindV4DesignSystem)(source);
-		const candidates = new Set((0, _tailwindcss_mangle_engine.resolveValidTailwindV4Candidates)(designSystem, rawCandidates, { ...source.bareArbitraryValues === void 0 ? {} : { bareArbitraryValues: source.bareArbitraryValues } }));
+		const candidates = new Set((0, _tailwindcss_mangle_engine.resolveValidTailwindV4Candidates)(designSystem, rawCandidates, { ...bareArbitraryValues === void 0 ? {} : { bareArbitraryValues } }));
 		await collectTailwindV4CssCandidates(candidates);
 		return applyClassSetFilter(candidates);
 	}

package/dist/{transform-BVH7iLHn.js → transform-CkEnJYIP.js}

@@ -1,8 +1,8 @@
-import { Mt as _defineProperty } from "./generator-BgbYHNgD.js";
-import { G as replaceWxml, H as analyzeSource, J as traverse$1, U as JsTokenUpdater, V as createAttributeMatcher, W as isClassContextLiteralPath, _ as generateCode, q as babelParse } from "./compiler-CJ5yX-on.js";
-import { a as shouldEnablePageLocalStyle, i as shouldEnableComponentLocalStyle, n as injectBorderPreflightClass, o as isUniAppXStyleSourceEmpty, r as shouldInjectBorderPreflight } from "./vite-hGECCqfq.js";
+import { Pt as _defineProperty } from "./generator-C0BJjyLM.js";
+import { G as replaceWxml, H as analyzeSource, J as traverse$1, U as JsTokenUpdater, V as createAttributeMatcher, W as isClassContextLiteralPath, _ as generateCode, q as babelParse } from "./compiler-D3GBwxoa.js";
+import { a as shouldEnablePageLocalStyle, i as shouldEnableComponentLocalStyle, n as injectBorderPreflightClass, r as shouldInjectBorderPreflight } from "./vite-lP35OguX.js";
 import { splitCandidateTokens } from "@tailwindcss-mangle/engine";
-import { UNI_APP_X_IMPORTANT_APPLY_MARKER, normalizeUniAppXImportantApplyForSass } from "@weapp-tailwindcss/postcss";
+import { UNI_APP_X_IMPORTANT_APPLY_MARKER, isUniAppXStyleSourceEmpty, normalizeUniAppXImportantApplyForSass } from "@weapp-tailwindcss/postcss";
 import MagicString from "magic-string";
 import { NodeTypes, parse } from "@vue/compiler-dom";
 //#region src/uni-app-x/component-local-style-binding.ts
@@ -174,9 +174,10 @@ function hasTopLevelVariant(candidate) {
 	return false;
 }
 var UniAppXComponentLocalStyleCollector = class {
-	constructor(fileId, runtimeSet) {
+	constructor(fileId, runtimeSet, includeVariants = false) {
 		this.fileId = fileId;
 		this.runtimeSet = runtimeSet;
+		this.includeVariants = includeVariants;
 		_defineProperty(this, "aliasByUtility", /* @__PURE__ */ new Map());
 		_defineProperty(this, "aliasByLookup", /* @__PURE__ */ new Map());
 		_defineProperty(this, "classBindingNames", /* @__PURE__ */ new Set());
@@ -187,8 +188,9 @@ var UniAppXComponentLocalStyleCollector = class {
 		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(replaceWxml(utility), alias);
+		const replacement = hasTopLevelVariant(utility) ? `${replaceWxml(utility)} ${alias}` : alias;
+		this.aliasByLookup.set(utility, replacement);
+		this.aliasByLookup.set(replaceWxml(utility), replacement);
 		return alias;
 	}
 	rewriteLiteral(literal) {
@@ -197,7 +199,11 @@ var UniAppXComponentLocalStyleCollector = class {
 		let rewritten = literal;
 		for (const candidate of candidates) {
 			if (!isRuntimeCandidate(candidate, this.runtimeSet)) continue;
-			rewritten = rewritten.replace(candidate, hasTopLevelVariant(candidate) ? replaceWxml(candidate) : this.ensureAlias(candidate));
+			if (!this.includeVariants && hasTopLevelVariant(candidate)) rewritten = rewritten.replace(candidate, replaceWxml(candidate));
+			else {
+				this.ensureAlias(candidate);
+				rewritten = rewritten.replace(candidate, this.aliasByLookup.get(candidate));
+			}
 		}
 		return rewritten;
 	}
@@ -224,7 +230,7 @@ var UniAppXComponentLocalStyleCollector = class {
 				const classContext = options.wrapExpression || 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);
 					}
@@ -446,7 +452,7 @@ function transformUVue(code, id, jsHandler, runtimeSet, options = {}) {
 		const normalized = 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) : void 0;
 	if (descriptor.errors.length === 0) {
 		if (descriptor.template?.ast) {
 			const templateOffset = descriptor.template.start;
@@ -480,11 +486,11 @@ function transformUVue(code, id, jsHandler, runtimeSet, options = {}) {
 			const { code } = jsHandler(descriptor.scriptSetup.content, runtimeSet ?? /* @__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 || !isUniAppXStyleSourceEmpty(style.content)));
+		const scopedStyle = [...descriptor.styles].reverse().find((style) => STYLE_SCOPED_RE.test(style.attrs) && (!options.onWebLocalStyleRules || !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/{transform-MIhriZRr.cjs → transform-FkqbTBJR.cjs}

@@ -1,6 +1,6 @@
-const require_generator = require("./generator-RK2HtgOb.cjs");
-const require_compiler = require("./compiler-DFROuh5Z.cjs");
-const require_vite = require("./vite-4RznbXVI.cjs");
+const require_generator = require("./generator-Bvr4WmuF.cjs");
+const require_compiler = require("./compiler-C8FqI-P3.cjs");
+const require_vite = require("./vite-DxuKPZlp.cjs");
 let _tailwindcss_mangle_engine = require("@tailwindcss-mangle/engine");
 let _weapp_tailwindcss_postcss = require("@weapp-tailwindcss/postcss");
 let _vue_compiler_dom = require("@vue/compiler-dom");
@@ -173,9 +173,10 @@ function hasTopLevelVariant(candidate) {
 	return false;
 }
 var UniAppXComponentLocalStyleCollector = class {
-	constructor(fileId, runtimeSet) {
+	constructor(fileId, runtimeSet, includeVariants = false) {
 		this.fileId = fileId;
 		this.runtimeSet = runtimeSet;
+		this.includeVariants = includeVariants;
 		require_generator._defineProperty(this, "aliasByUtility", /* @__PURE__ */ new Map());
 		require_generator._defineProperty(this, "aliasByLookup", /* @__PURE__ */ new Map());
 		require_generator._defineProperty(this, "classBindingNames", /* @__PURE__ */ new Set());
@@ -186,8 +187,9 @@ var UniAppXComponentLocalStyleCollector = class {
 		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) ? `${require_compiler.replaceWxml(utility)} ${alias}` : alias;
+		this.aliasByLookup.set(utility, replacement);
+		this.aliasByLookup.set(require_compiler.replaceWxml(utility), replacement);
 		return alias;
 	}
 	rewriteLiteral(literal) {
@@ -196,7 +198,11 @@ var UniAppXComponentLocalStyleCollector = class {
 		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, require_compiler.replaceWxml(candidate));
+			else {
+				this.ensureAlias(candidate);
+				rewritten = rewritten.replace(candidate, this.aliasByLookup.get(candidate));
+			}
 		}
 		return rewritten;
 	}
@@ -223,7 +229,7 @@ var UniAppXComponentLocalStyleCollector = class {
 				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);
 					}
@@ -445,7 +451,7 @@ function transformUVue(code, id, jsHandler, runtimeSet, options = {}) {
 		const normalized = (0, _weapp_tailwindcss_postcss.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) : void 0;
 	if (descriptor.errors.length === 0) {
 		if (descriptor.template?.ast) {
 			const templateOffset = descriptor.template.start;
@@ -479,11 +485,11 @@ function transformUVue(code, id, jsHandler, runtimeSet, options = {}) {
 			const { code } = jsHandler(descriptor.scriptSetup.content, runtimeSet ?? /* @__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.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';
 import type { SourceMap } from 'magic-string';
 import type { ICreateCacheReturnType } from '../cache/index.js';
 import type { ItemOrItemArray } from './base.js';
@@ -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/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';
 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,12 @@ export declare function hasTopLevelVariant(candidate: string): boolean;
 export declare class UniAppXComponentLocalStyleCollector {
     private readonly fileId;
     private readonly runtimeSet?;
+    private readonly includeVariants;
     private aliasByUtility;
     private aliasByLookup;
     private classBindingNames;
     private deepUtilities;
-    constructor(fileId: string, runtimeSet?: Set<string> | undefined);
+    constructor(fileId: string, runtimeSet?: Set<string> | undefined, includeVariants?: boolean);
     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';
+export declare function createUniAppXStyleResult(id: string, result: postcss.Result): Promise<{
+    code: string;
+    map: string;
+}>;