weapp-tailwindcss 5.3.5 → 5.4.0

package/dist/{tailwindcss-ChnpCv25.js → tailwindcss-BSKl0FTD.js}

@@ -1,4 +1,4 @@
-import { C as findWorkspacePackageDir, D as resolveTailwindcssOptions, Dt as resolveCssSourceEntries, E as normalizeTailwindcssRuntimeOptions, Et as parseConfigParam, Lt as loadTailwindV4DesignSystem, Nt as resolveCssMacroTailwindV4Source, O as normalizeStringListOption, S as findNearestPackageRoot, St as expandTailwindSourceEntries, T as normalizeExtendLengthUnits, Tt as normalizeLegacyContentEntries, b as isTailwindV4CssEntry, d as resolveTailwindV4SourceFromRuntime, h as hasConfiguredTailwindV4CssRoots, i as normalizeWeappTailwindcssGeneratorOptions, kt as resolveTailwindV4CssSourceBase, m as filterTailwindV4CssSourceRoots, p as resolveTailwindV4SourceOptionsFromRuntime, v as groupCssEntriesByBase, w as findWorkspaceRoot, x as normalizeCssEntries, xt as FULL_SOURCE_SCAN_PATTERN, y as guessBasedirFromEntries } from "./generator-EnTXLBlK.js";
+import { C as findWorkspacePackageDir, D as resolveTailwindcssOptions, Dt as resolveCssSourceEntries, E as normalizeTailwindcssRuntimeOptions, Et as parseConfigParam, Lt as loadTailwindV4DesignSystem, Nt as resolveCssMacroTailwindV4Source, O as normalizeStringListOption, S as findNearestPackageRoot, St as expandTailwindSourceEntries, T as normalizeExtendLengthUnits, Tt as normalizeLegacyContentEntries, b as isTailwindV4CssEntry, d as resolveTailwindV4SourceFromRuntime, h as hasConfiguredTailwindV4CssRoots, i as normalizeWeappTailwindcssGeneratorOptions, kt as resolveTailwindV4CssSourceBase, m as filterTailwindV4CssSourceRoots, p as resolveTailwindV4SourceOptionsFromRuntime, v as groupCssEntriesByBase, w as findWorkspaceRoot, x as normalizeCssEntries, xt as FULL_SOURCE_SCAN_PATTERN, y as guessBasedirFromEntries } from "./generator-C0m2S4WI.js";
 import { t as omitUndefined } from "./object-B-8IHefx.js";
 import { n as defuOverrideArray$1 } from "./utils-MVwpU07P.js";
 import { createRequire } from "node:module";

package/dist/{transform-AfnwH_yx.cjs → transform-C6k9zTQR.cjs}

@@ -1,7 +1,8 @@
 const require_object = require("./object-DbHtAXRk.cjs");
-const require_wxml = require("./wxml-PrK-8ARX.cjs");
+const require_wxml = require("./wxml-o-CUulAM.cjs");
 const require_local_style_matcher = require("./local-style-matcher-DRpFEu1s.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");
 //#region src/uni-app-x/component-local-style-binding.ts
 const OPTIONS_CLASS_SECTIONS = /* @__PURE__ */ new Set(["computed", "methods"]);
@@ -119,10 +120,11 @@ function extractLiteralValue(path) {
 function createAlias(fileId, utility, index) {
 	return `wtu-${createStableHash(`${fileId}:${utility}`)}-${index.toString(36)}`;
 }
-function serializeApplyUtility(utility) {
-	if (utility.startsWith("!") && !utility.startsWith("\\!")) return `${utility.slice(1)}#{'!'}`;
+function serializeApplyUtility(utility, options = {}) {
+	const importantSuffix = options.native ? _weapp_tailwindcss_postcss.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)}#{'!'}`;
+	return `${utility.slice(0, -1)}${importantSuffix}`;
 }
 function isRuntimeCandidate(candidate, runtimeSet) {
 	if (!runtimeSet || runtimeSet.size === 0) return false;
@@ -291,7 +293,7 @@ var UniAppXComponentLocalStyleCollector = class {
 			const localSelector = options.web ? `:global(.${alias})` : `.${alias}`;
 			const selector = this.deepUtilities.has(utility) ? `${localSelector}, :deep(.${alias})` : localSelector;
 			lines.push(`${selector} {`);
-			lines.push(`  @apply ${serializeApplyUtility(utility)};`);
+			lines.push(`  @apply ${serializeApplyUtility(utility, options)};`);
 			lines.push("}");
 		}
 		return `${lines.join("\n")}\n`;
@@ -439,6 +441,10 @@ function transformUVue(code, id, jsHandler, runtimeSet, options = {}) {
 	const matchCustomAttribute = require_wxml.createAttributeMatcher(customAttributesEntities);
 	const ms = new require_wxml.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);
+		if (normalized !== style.content) ms.update(style.start, style.end, normalized);
+	}
 	const localStyleCollector = shouldEnableLocalStyle(id, options) ? new UniAppXComponentLocalStyleCollector(id, runtimeSet) : void 0;
 	if (descriptor.errors.length === 0) {
 		if (descriptor.template?.ast) {
@@ -476,8 +482,11 @@ function transformUVue(code, id, jsHandler, runtimeSet, options = {}) {
 			if (scopedStyle && options.onWebLocalStyleRules) options.onWebLocalStyleRules(localStyleCollector.toStyleRules({ web: true }));
 			else if (scopedStyle) {
 				const separator = scopedStyle.content.endsWith("\n") ? "" : "\n";
-				ms.appendLeft(scopedStyle.end, `${separator}${localStyleCollector.toStyleRules()}`);
-			} else ms.append(`\n${localStyleCollector.toStyleBlock({ web: Boolean(options.onWebLocalStyleRules) })}`);
+				ms.appendLeft(scopedStyle.end, `${separator}${localStyleCollector.toStyleRules({ native: options.native })}`);
+			} else ms.append(`\n${localStyleCollector.toStyleBlock({
+				native: options.native || Boolean(options.onWebLocalStyleRules),
+				web: Boolean(options.onWebLocalStyleRules)
+			})}`);
 		}
 	}
 	const result = {

package/dist/{transform-BMPNt_vj.js → transform-DQhgAarN.js}

@@ -1,7 +1,8 @@
 import { n as _defineProperty } from "./object-B-8IHefx.js";
-import { g as traverse$1, h as babelParse, i as analyzeSource, n as generateCode, o as JsTokenUpdater, p as replaceWxml, r as createAttributeMatcher, u as isClassContextLiteralPath } from "./wxml-B7OAVpXJ.js";
+import { g as traverse$1, h as babelParse, i as analyzeSource, n as generateCode, o as JsTokenUpdater, p as replaceWxml, r as createAttributeMatcher, u as isClassContextLiteralPath } from "./wxml-CvKyV69S.js";
 import { n as shouldEnableComponentLocalStyle, r as shouldEnablePageLocalStyle } from "./local-style-matcher-DsiI2wIc.js";
 import { splitCandidateTokens } from "@tailwindcss-mangle/engine";
+import { UNI_APP_X_IMPORTANT_APPLY_MARKER, 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
@@ -120,10 +121,11 @@ function extractLiteralValue(path) {
 function createAlias(fileId, utility, index) {
 	return `wtu-${createStableHash(`${fileId}:${utility}`)}-${index.toString(36)}`;
 }
-function serializeApplyUtility(utility) {
-	if (utility.startsWith("!") && !utility.startsWith("\\!")) return `${utility.slice(1)}#{'!'}`;
+function serializeApplyUtility(utility, options = {}) {
+	const importantSuffix = options.native ? 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)}#{'!'}`;
+	return `${utility.slice(0, -1)}${importantSuffix}`;
 }
 function isRuntimeCandidate(candidate, runtimeSet) {
 	if (!runtimeSet || runtimeSet.size === 0) return false;
@@ -292,7 +294,7 @@ var UniAppXComponentLocalStyleCollector = class {
 			const localSelector = options.web ? `:global(.${alias})` : `.${alias}`;
 			const selector = this.deepUtilities.has(utility) ? `${localSelector}, :deep(.${alias})` : localSelector;
 			lines.push(`${selector} {`);
-			lines.push(`  @apply ${serializeApplyUtility(utility)};`);
+			lines.push(`  @apply ${serializeApplyUtility(utility, options)};`);
 			lines.push("}");
 		}
 		return `${lines.join("\n")}\n`;
@@ -440,6 +442,10 @@ function transformUVue(code, id, jsHandler, runtimeSet, options = {}) {
 	const matchCustomAttribute = createAttributeMatcher(customAttributesEntities);
 	const ms = new MagicString(code);
 	const descriptor = parseSfc(code);
+	if (options.native || options.onWebLocalStyleRules) for (const style of descriptor.styles) {
+		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;
 	if (descriptor.errors.length === 0) {
 		if (descriptor.template?.ast) {
@@ -477,8 +483,11 @@ function transformUVue(code, id, jsHandler, runtimeSet, options = {}) {
 			if (scopedStyle && options.onWebLocalStyleRules) options.onWebLocalStyleRules(localStyleCollector.toStyleRules({ web: true }));
 			else if (scopedStyle) {
 				const separator = scopedStyle.content.endsWith("\n") ? "" : "\n";
-				ms.appendLeft(scopedStyle.end, `${separator}${localStyleCollector.toStyleRules()}`);
-			} else ms.append(`\n${localStyleCollector.toStyleBlock({ web: Boolean(options.onWebLocalStyleRules) })}`);
+				ms.appendLeft(scopedStyle.end, `${separator}${localStyleCollector.toStyleRules({ native: options.native })}`);
+			} else ms.append(`\n${localStyleCollector.toStyleBlock({
+				native: options.native || Boolean(options.onWebLocalStyleRules),
+				web: Boolean(options.onWebLocalStyleRules)
+			})}`);
 		}
 	}
 	const result = {

package/dist/typedoc.export.d.ts

@@ -1,3 +1,4 @@
+export type { Compiler, CompilerCacheReuseState, CompilerGenerateRequest, CompilerGenerateResult, CompilerSnapshot, CompilerSnapshotRoot, CompilerSourcePattern, CompilerTarget, CompilerTemplateTransformOptions, CreateCompilerOptions, CreateCompilerSnapshotRequest, } from './core.js';
 export type { WeappTailwindcssGenerateOptions, WeappTailwindcssGenerateResult, WeappTailwindcssGenerator, WeappTailwindcssGeneratorTarget, WeappTailwindcssPostcssPluginOptions, } from './index.js';
 export type { WeappTailwindcssStyleInjectorOptions } from './types/index.js';
 export type { ApplyOptions, CacheOptions, ExtractOptions, TailwindCssOptions, TailwindCssRuntimeOptions, TailwindV4Options, } from './types/typedoc-tailwindcss-runtime.js';

package/dist/types/index.d.ts

@@ -70,6 +70,7 @@ export interface ICommonReplaceOptions {
     escapeMap?: Record<string, string> | undefined;
 }
 export interface ITemplateHandlerOptions extends ICommonReplaceOptions {
+    classSetMode?: 'all' | 'exact' | undefined;
     customAttributesEntities?: ICustomAttributesEntities | undefined;
     escapeMap?: Record<string, string> | undefined;
     inlineWxs?: boolean | undefined;

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

@@ -18,9 +18,11 @@ export declare class UniAppXComponentLocalStyleCollector {
     rewriteTransformedCode(rawSource: string, options?: RewriteCodeOptions): string;
     hasStyles(): boolean;
     toStyleBlock(options?: {
+        native?: boolean;
         web?: boolean;
     }): string;
     toStyleRules(options?: {
+        native?: boolean;
         web?: boolean;
     }): string;
 }

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

@@ -7,6 +7,7 @@ interface TransformUVueOptions {
     enableComponentLocalStyle?: boolean;
     enablePageLocalStyle?: boolean;
     pageMatcher?: (id: string) => boolean;
+    native?: boolean;
     webCustomAttributeDeep?: boolean;
     onWebLocalStyleRules?: (rules: string) => void;
 }

package/dist/uni-app-x/vite/asset-task.d.ts

@@ -0,0 +1,21 @@
+import type { OutputAsset } from 'rollup';
+import type { ICreateCacheReturnType } from '../../cache/index.js';
+import type { CreateJsHandlerOptions, InternalUserDefinedOptions, JsHandler, LinkedJsModuleResult } from '../../types/index.js';
+type ApplyLinkedResults = (linked: Record<string, LinkedJsModuleResult> | undefined) => void;
+export interface CreateUniAppXAssetTaskOptions {
+    cache: ICreateCacheReturnType;
+    hashKey?: string;
+    hashSalt?: string;
+    createHandlerOptions: (absoluteFilename: string, extra?: CreateJsHandlerOptions) => CreateJsHandlerOptions;
+    debug: (format: string, ...args: unknown[]) => void;
+    jsHandler: JsHandler;
+    onUpdate: (filename: string, oldVal: string, newVal: string) => void;
+    runtimeSet: Set<string>;
+    applyLinkedResults: ApplyLinkedResults;
+    uniAppX?: InternalUserDefinedOptions['uniAppX'];
+    getAssetSource?: (file: string) => string | undefined;
+    getCssSources?: () => Iterable<string | undefined>;
+    injectStylePlaceholder?: boolean;
+}
+export declare function createUniAppXAssetTask(file: string, originalSource: OutputAsset, outDir: string, options: CreateUniAppXAssetTaskOptions): () => Promise<void>;
+export {};

package/dist/uni-app-x/vite/plugin-options.d.ts

@@ -1,4 +1,5 @@
 import type { HmrContext, ResolvedConfig } from 'vite';
+import type { ViteHmrCssModuleVersionTracker } from '../../bundlers/vite/shared/framework-hmr-module-version.js';
 import type { AppType, ICustomAttributesEntities, InternalUserDefinedOptions, JsHandler } from '../../types/index.js';
 export interface CreateUniAppXPluginsOptions {
     appType: AppType;
@@ -21,10 +22,17 @@ export interface CreateUniAppXPluginsOptions {
     jsHandler: JsHandler;
     ensureRuntimeClassSet: (force?: boolean) => Promise<Set<string>>;
     getResolvedConfig: () => ResolvedConfig | undefined;
+    hmrCssModuleVersions?: ViteHmrCssModuleVersionTracker | undefined;
     isIosPlatform?: boolean;
     isNativeAppStyleTarget?: (() => boolean) | undefined;
     isWebGeneratorTarget?: (() => boolean) | undefined;
     isEnabled?: (() => boolean) | undefined;
     uniAppX?: InternalUserDefinedOptions['uniAppX'];
     viteProcessedCssSourceFiles?: Iterable<string> | undefined;
+    webCssEntryDiagnostics?: {
+        dispose: () => void;
+        flush: () => void;
+        observeSourceImports: (source: string, sourceId: string) => void;
+        requestCheck: () => void;
+    } | undefined;
 }

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

@@ -1,5 +1,6 @@
 import type { HmrContext, ModuleNode } from 'vite';
-export declare function createUniAppXWebLocalStyleBridge(isEnabled: () => boolean): {
+import type { ViteHmrCssModuleVersionTracker } from '../../bundlers/vite/shared/framework-hmr-module-version.js';
+export declare function createUniAppXWebLocalStyleBridge(isEnabled: () => boolean, hmrCssModuleVersions?: ViteHmrCssModuleVersionTracker): {
     appendToStyle(code: string, id: string): string;
     handleHotUpdate(ctx: HmrContext): ModuleNode[] | undefined;
     remember(id: string, rules: string): void;

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

@@ -1,24 +1,4 @@
-import type { OutputAsset } from 'rollup';
 import type { Plugin } from 'vite';
 import type { CreateUniAppXPluginsOptions } from './vite/plugin-options.js';
-import type { ICreateCacheReturnType } from '../cache/index.js';
-import type { CreateJsHandlerOptions, InternalUserDefinedOptions, JsHandler, LinkedJsModuleResult } from '../types/index.js';
+export { createUniAppXAssetTask } from './vite/asset-task.js';
 export declare function createUniAppXPlugins(options: CreateUniAppXPluginsOptions): Plugin[];
-type ApplyLinkedResults = (linked: Record<string, LinkedJsModuleResult> | undefined) => void;
-interface CreateUniAppXAssetTaskOptions {
-    cache: ICreateCacheReturnType;
-    hashKey?: string;
-    hashSalt?: string;
-    createHandlerOptions: (absoluteFilename: string, extra?: CreateJsHandlerOptions) => CreateJsHandlerOptions;
-    debug: (format: string, ...args: unknown[]) => void;
-    jsHandler: JsHandler;
-    onUpdate: (filename: string, oldVal: string, newVal: string) => void;
-    runtimeSet: Set<string>;
-    applyLinkedResults: ApplyLinkedResults;
-    uniAppX?: InternalUserDefinedOptions['uniAppX'];
-    getAssetSource?: (file: string) => string | undefined;
-    getCssSources?: () => Iterable<string | undefined>;
-    injectStylePlaceholder?: boolean;
-}
-export declare function createUniAppXAssetTask(file: string, originalSource: OutputAsset, outDir: string, options: CreateUniAppXAssetTaskOptions): () => Promise<void>;
-export {};