weapp-tailwindcss 5.2.6 → 5.2.8

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

@@ -0,0 +1,27 @@
+import type { HmrContext, ResolvedConfig } from 'vite';
+import type { AppType, ICustomAttributesEntities, InternalUserDefinedOptions, JsHandler } from '../../types/index.js';
+export interface CreateUniAppXPluginsOptions {
+    appType: AppType;
+    customAttributesEntities: ICustomAttributesEntities;
+    disabledDefaultTemplateHandler: boolean | undefined;
+    mainCssChunkMatcher: NonNullable<InternalUserDefinedOptions['mainCssChunkMatcher']>;
+    runtimeState: {
+        readyPromise: Promise<unknown>;
+    };
+    styleHandler: InternalUserDefinedOptions['styleHandler'];
+    syncSourceCandidatesForHotUpdate?: ((ctx: HmrContext) => Promise<void>) | undefined;
+    tailwindRootCssModuleIds?: Iterable<string> | undefined;
+    generateCss?: ((id: string, code: string, hookContext?: {
+        addWatchFile?: (id: string) => void;
+        disableSourceScan?: boolean;
+        sourceCandidates?: Iterable<string>;
+        transient?: boolean;
+    }) => Promise<string | undefined> | string | undefined) | undefined;
+    jsHandler: JsHandler;
+    ensureRuntimeClassSet: (force?: boolean) => Promise<Set<string>>;
+    getResolvedConfig: () => ResolvedConfig | undefined;
+    isIosPlatform?: boolean;
+    isEnabled?: (() => boolean) | undefined;
+    uniAppX?: InternalUserDefinedOptions['uniAppX'];
+    viteProcessedCssSourceFiles?: Iterable<string> | undefined;
+}

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

@@ -0,0 +1,3 @@
+export declare function isPreprocessorRequest(id: string, lang?: string): boolean;
+export declare function resolveUniAppXCssTarget(id: string): "uvue" | undefined;
+export declare function isCssModuleExport(code: string): boolean;

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

@@ -1,29 +1,8 @@
 import type { OutputAsset } from 'rollup';
-import type { Plugin, ResolvedConfig } from 'vite';
+import type { Plugin } from 'vite';
+import type { CreateUniAppXPluginsOptions } from './vite/plugin-options.js';
 import type { ICreateCacheReturnType } from '../cache/index.js';
-import type { AppType, CreateJsHandlerOptions, ICustomAttributesEntities, InternalUserDefinedOptions, JsHandler, LinkedJsModuleResult } from '../types/index.js';
-interface CreateUniAppXPluginsOptions {
-    appType: AppType;
-    customAttributesEntities: ICustomAttributesEntities;
-    disabledDefaultTemplateHandler: boolean | undefined;
-    mainCssChunkMatcher: NonNullable<InternalUserDefinedOptions['mainCssChunkMatcher']>;
-    runtimeState: {
-        readyPromise: Promise<unknown>;
-    };
-    styleHandler: InternalUserDefinedOptions['styleHandler'];
-    tailwindRootCssModuleIds?: Iterable<string> | undefined;
-    generateCss?: ((id: string, code: string, hookContext?: {
-        addWatchFile?: (id: string) => void;
-        transient?: boolean;
-    }) => Promise<string | undefined> | string | undefined) | undefined;
-    jsHandler: JsHandler;
-    ensureRuntimeClassSet: (force?: boolean) => Promise<Set<string>>;
-    getResolvedConfig: () => ResolvedConfig | undefined;
-    isIosPlatform?: boolean;
-    isEnabled?: (() => boolean) | undefined;
-    uniAppX?: InternalUserDefinedOptions['uniAppX'];
-    viteProcessedCssSourceFiles?: Iterable<string> | undefined;
-}
+import type { CreateJsHandlerOptions, InternalUserDefinedOptions, JsHandler, LinkedJsModuleResult } from '../types/index.js';
 export declare function createUniAppXPlugins(options: CreateUniAppXPluginsOptions): Plugin[];
 type ApplyLinkedResults = (linked: Record<string, LinkedJsModuleResult> | undefined) => void;
 interface CreateUniAppXAssetTaskOptions {

package/dist/{v4-generation-core-Dtmu8Yax.cjs → v4-generation-core-BjHT6qGC.cjs}

@@ -1,10 +1,10 @@
 const require_rolldown_runtime = require("./rolldown-runtime-CVvi-lCc.cjs");
-const require_generator = require("./generator-BE34PYSC.cjs");
+const require_generator = require("./generator-B0dCFlP1.cjs");
 require("./auto-DtU6f3X6.cjs");
 const require_object = require("./object-C_Vr6_S5.cjs");
-const require_options = require("./options-hVsoTfwL.cjs");
+const require_options = require("./options-zpZez7qe.cjs");
 const require_wxml = require("./wxml-DSMNuUaP.cjs");
-const require_style_options = require("./style-options-B_ppaVIg.cjs");
+const require_style_options = require("./style-options-COpQc8fr.cjs");
 let node_fs = require("node:fs");
 let node_path = require("node:path");
 node_path = require_rolldown_runtime.__toESM(node_path, 1);
@@ -341,15 +341,17 @@ function createSourceCandidateStore(options = {}) {
 	}
 	async function syncCurrentSource(id, source) {
 		const normalizedId = cleanUrl(id);
-		transformCandidatesById.delete(normalizedId);
-		cssCandidatesById.delete(normalizedId);
-		transformSourceById.delete(normalizedId);
-		cssSourceById.delete(normalizedId);
-		recompute(normalizedId);
 		const previousFileCandidates = new Set(candidatesById.get(normalizedId) ?? []);
-		const nextCandidates = await resolveCandidates(source, resolveSourceCandidateExtension(normalizedId));
+		const extension = resolveSourceCandidateExtension(normalizedId);
+		const nextCandidates = await resolveCandidates(source, extension);
 		const affectedCandidates = /* @__PURE__ */ new Set([...previousFileCandidates, ...nextCandidates]);
 		const previousVisibleCandidates = collectVisibleCandidates(affectedCandidates);
+		if (extension !== "css") {
+			transformCandidatesById.delete(normalizedId);
+			cssCandidatesById.delete(normalizedId);
+			transformSourceById.delete(normalizedId);
+			cssSourceById.delete(normalizedId);
+		}
 		scanSourceById.set(normalizedId, source);
 		replaceScanLayer(normalizedId, nextCandidates);
 		return diffCandidateSets(previousVisibleCandidates, collectVisibleCandidates(affectedCandidates));
@@ -2041,6 +2043,104 @@ function annotateCssSourceTrace(css, options) {
 	}
 }
 //#endregion
+//#region src/bundlers/shared/final-css-cleanup.ts
+function isAtRuleNameCharacter(code) {
+	return code === 45 || code >= 65 && code <= 90 || code >= 97 && code <= 122;
+}
+function isCssWhitespace(code) {
+	return code === 9 || code === 10 || code === 12 || code === 13 || code === 32;
+}
+function findAtRuleBlockStart(css, start) {
+	let parenthesisDepth = 0;
+	let quote = 0;
+	let squareBracketDepth = 0;
+	for (let index = start; index < css.length; index++) {
+		const code = css.charCodeAt(index);
+		if (quote !== 0) {
+			if (code === 92) index++;
+			else if (code === quote) quote = 0;
+			continue;
+		}
+		if (code === 34 || code === 39) {
+			quote = code;
+			continue;
+		}
+		if (code === 92) {
+			index++;
+			continue;
+		}
+		if (code === 47 && css.charCodeAt(index + 1) === 42) {
+			const commentEnd = css.indexOf("*/", index + 2);
+			if (commentEnd < 0) return -1;
+			index = commentEnd + 1;
+			continue;
+		}
+		if (code === 40) {
+			parenthesisDepth++;
+			continue;
+		}
+		if (code === 41 && parenthesisDepth > 0) {
+			parenthesisDepth--;
+			continue;
+		}
+		if (code === 91) {
+			squareBracketDepth++;
+			continue;
+		}
+		if (code === 93 && squareBracketDepth > 0) {
+			squareBracketDepth--;
+			continue;
+		}
+		if (code === 123 && parenthesisDepth === 0 && squareBracketDepth === 0) return index;
+		if ((code === 59 || code === 125) && parenthesisDepth === 0 && squareBracketDepth === 0) return -1;
+	}
+	return -1;
+}
+function isEmptyAtRuleBody(css, blockStart) {
+	for (let index = blockStart + 1; index < css.length; index++) {
+		const code = css.charCodeAt(index);
+		if (isCssWhitespace(code)) continue;
+		if (code === 47 && css.charCodeAt(index + 1) === 42) {
+			const commentEnd = css.indexOf("*/", index + 2);
+			if (commentEnd < 0) return false;
+			index = commentEnd + 1;
+			continue;
+		}
+		return code === 125;
+	}
+	return false;
+}
+function hasEmptyAtRuleBlockCandidate(css) {
+	let searchFrom = 0;
+	while (searchFrom < css.length) {
+		const atRuleStart = css.indexOf("@", searchFrom);
+		if (atRuleStart < 0) return false;
+		searchFrom = atRuleStart + 1;
+		if (!isAtRuleNameCharacter(css.charCodeAt(searchFrom))) continue;
+		const blockStart = findAtRuleBlockStart(css, searchFrom + 1);
+		if (blockStart >= 0 && isEmptyAtRuleBody(css, blockStart)) return true;
+	}
+	return false;
+}
+/**
+* 在小程序样式进入最终产物图时递归清理空的块级 at-rule。
+*/
+function finalizeMiniProgramCssStructure(css) {
+	if (!hasEmptyAtRuleBlockCandidate(css)) return css;
+	try {
+		const root = _weapp_tailwindcss_postcss.postcss.parse(css);
+		let removed = 0;
+		let passRemoved = 0;
+		do {
+			passRemoved = (0, _weapp_tailwindcss_postcss.removeEmptyAtRules)(root);
+			removed += passRemoved;
+		} while (passRemoved > 0);
+		return removed > 0 ? root.toString() : css;
+	} catch {
+		return css;
+	}
+}
+//#endregion
 //#region src/bundlers/shared/generated-css-marker.ts
 const BUNDLER_GENERATED_CSS_MARKER_RE = /\/\*!?\s*weapp-tailwindcss (?:gulp|vite|webpack)-generated-css(?:\s*:\s*[^\s*]+)?\s*\*\/\s*/i;
 const BUNDLER_GENERATED_CSS_MARKER_GLOBAL_RE = /\/\*!?\s*weapp-tailwindcss (?:gulp|vite|webpack)-generated-css(?:\s*:\s*[^\s*]+)?\s*\*\/\s*/gi;
@@ -3101,14 +3201,17 @@ function collectGeneratorCssCandidates(css) {
 //#region src/bundlers/shared/generator-css/source-resolver/apply-reference.ts
 function resolveTailwindV4ApplyReference(options) {
 	const references = /* @__PURE__ */ new Set();
-	for (const source of options.cssSources ?? []) if (typeof source.file === "string" && source.file.length > 0 && typeof source.css === "string" && require_generator.hasTailwindRootDirectives(source.css, { importFallback: true }) && hasTailwindThemeDirective(source.css)) references.add(source.file);
+	for (const source of options.cssSources ?? []) if (typeof source.file === "string" && source.file.length > 0 && typeof source.css === "string" && require_generator.hasTailwindRootDirectives(source.css, { importFallback: true }) && hasTailwindApplyContextDirective(source.css)) references.add(source.file);
 	return references.size === 1 ? references.values().next().value : void 0;
 }
-function hasTailwindThemeDirective(css) {
+function hasTailwindApplyContextDirective(css) {
 	try {
 		let found = false;
-		_weapp_tailwindcss_postcss.postcss.parse(css).walkAtRules("theme", () => {
-			found = true;
+		_weapp_tailwindcss_postcss.postcss.parse(css).walkAtRules((rule) => {
+			if (rule.name === "theme" || rule.name === "config") {
+				found = true;
+				return false;
+			}
 		});
 		return found;
 	} catch {
@@ -4734,7 +4837,10 @@ async function executeGeneratorPipelineWithOwner(context) {
 		const sourceCss = options.deferCssAdaptation ? (0, _weapp_tailwindcss_postcss.removeMatchingLocalCssImports)(source.css, localImports) : source.css;
 		const generatorSource = options.disableSourceScan === true ? {
 			...source,
-			css: require_generator.removeTailwindSourceDirectives(sourceCss, { importFallback: generatorOptions.importFallback })
+			css: require_generator.removeTailwindSourceDirectives(sourceCss, {
+				importFallback: generatorOptions.importFallback,
+				preserveApplyContext: true
+			})
 		} : sourceCss === source.css ? source : {
 			...source,
 			css: sourceCss
@@ -5326,6 +5432,12 @@ Object.defineProperty(exports, "extractMarkedUserLayerComponentsCss", {
 		return extractMarkedUserLayerComponentsCss;
 	}
 });
+Object.defineProperty(exports, "finalizeMiniProgramCssStructure", {
+	enumerable: true,
+	get: function() {
+		return finalizeMiniProgramCssStructure;
+	}
+});
 Object.defineProperty(exports, "finalizeMiniProgramGeneratorCss", {
 	enumerable: true,
 	get: function() {
@@ -5356,6 +5468,12 @@ Object.defineProperty(exports, "hasBundlerGeneratedCssMarker", {
 		return hasBundlerGeneratedCssMarker;
 	}
 });
+Object.defineProperty(exports, "hasEmptyAtRuleBlockCandidate", {
+	enumerable: true,
+	get: function() {
+		return hasEmptyAtRuleBlockCandidate;
+	}
+});
 Object.defineProperty(exports, "hasMiniProgramTailwindV4PreflightReset", {
 	enumerable: true,
 	get: function() {