weapp-tailwindcss 5.0.0-next.31 → 5.0.0-next.33

package/dist/{v3-engine-CHItlVq5.js → v3-engine-DwY4Fixu.js}

@@ -1,14 +1,14 @@
 const require_chunk = require("./chunk-C5U5_Hdc.js");
-const require_auto = require("./auto-TH1jG2UW.js");
+const require_auto = require("./auto-dPpsm6FB.js");
 let node_fs = require("node:fs");
 node_fs = require_chunk.__toESM(node_fs);
 let node_module = require("node:module");
 let postcss = require("postcss");
 postcss = require_chunk.__toESM(postcss);
-let node_path = require("node:path");
-node_path = require_chunk.__toESM(node_path);
 let node_process = require("node:process");
 node_process = require_chunk.__toESM(node_process);
+let node_path = require("node:path");
+node_path = require_chunk.__toESM(node_path);
 let _weapp_tailwindcss_logger = require("@weapp-tailwindcss/logger");
 let _weapp_tailwindcss_shared = require("@weapp-tailwindcss/shared");
 let tailwindcss_patch = require("tailwindcss-patch");
@@ -755,7 +755,7 @@ function normalizeTailwindV4GeneratedUrlValues(css) {
 	});
 }
 async function transformTailwindV4CssToWeapp(css, options) {
-	const protectedCss = (0, _weapp_tailwindcss_postcss.protectDynamicColorMixAlpha)(normalizeTailwindV4GeneratedUrlValues(css), { customPropertyValues: options && "customPropertyValues" in options ? options.customPropertyValues : void 0 });
+	const protectedCss = (0, _weapp_tailwindcss_postcss.protectDynamicColorMixAlpha)(normalizeTailwindV4GeneratedUrlValues(require_auto.hasCssMacroStyleOptions(options) ? await require_auto.transformCssMacroCss(css, options) : css), { customPropertyValues: options && "customPropertyValues" in options ? options.customPropertyValues : void 0 });
 	const result = await defaultStyleHandler$1(protectedCss.css, {
 		cssChildCombinatorReplaceValue: ["view", "text"],
 		cssRemoveHoverPseudoClass: true,
@@ -768,7 +768,7 @@ async function transformTailwindV4CssToWeapp(css, options) {
 }
 async function transformTailwindV4CssByTarget(css, target, options) {
 	if (target === "weapp") return transformTailwindV4CssToWeapp(css, options);
-	return require_auto.hasCssMacroStyleOptions(options) ? require_auto.transformCssMacroCss(css) : css;
+	return require_auto.hasCssMacroStyleOptions(options) ? require_auto.transformCssMacroCss(css, options) : css;
 }
 //#endregion
 //#region src/tailwindcss/v4-engine/tailwind-v3-default-colors.ts
@@ -2832,7 +2832,7 @@ function ensureMiniProgramV3PreflightReset(css, cssPreflight) {
 	}
 }
 async function transformTailwindV3CssToWeapp(css, options) {
-	const result = await defaultStyleHandler(css, {
+	const result = await defaultStyleHandler(require_auto.hasCssMacroStyleOptions(options) ? await require_auto.transformCssMacroCss(css, options) : css, {
 		cssChildCombinatorReplaceValue: ["view", "text"],
 		cssRemoveHoverPseudoClass: true,
 		isMainChunk: true,
@@ -2847,7 +2847,7 @@ async function transformTailwindV3CssToWeapp(css, options) {
 }
 async function transformTailwindV3CssByTarget(css, target, options) {
 	if (target === "weapp") return transformTailwindV3CssToWeapp(css, options);
-	return require_auto.hasCssMacroStyleOptions(options) ? require_auto.transformCssMacroCss(css) : css;
+	return require_auto.hasCssMacroStyleOptions(options) ? require_auto.transformCssMacroCss(css, options) : css;
 }
 //#endregion
 //#region src/tailwindcss/v3-engine/generator.ts

package/dist/{vite-BgTPSkQS.js → vite-BVbIr2vs.js}

@@ -1,26 +1,26 @@
 const require_chunk = require("./chunk-C5U5_Hdc.js");
-const require_v3_engine = require("./v3-engine-CHItlVq5.js");
-const require_generator = require("./generator-CrU-Ghc1.js");
-const require_incremental_runtime_class_set = require("./incremental-runtime-class-set-FAOHZmzh.js");
-const require_precheck = require("./precheck-D7gJSmJz.js");
+const require_v3_engine = require("./v3-engine-DwY4Fixu.js");
+const require_generator = require("./generator-BEXaaUzP.js");
+const require_incremental_runtime_class_set = require("./incremental-runtime-class-set-BE8RVbuz.js");
+const require_precheck = require("./precheck-D_KT1pis.js");
 const require_utils = require("./utils-D7Ygohep.js");
-const require_tailwindcss = require("./tailwindcss-B-e2RiXr.js");
-const require_source_candidates = require("./source-candidates-DNM8iwXW.js");
-const require_bundle_state = require("./bundle-state-Ct_8GcSR.js");
+const require_tailwindcss = require("./tailwindcss-Cl7hUlYV.js");
+const require_source_candidates = require("./source-candidates-7Q-kTOSb.js");
+const require_bundle_state = require("./bundle-state-Co_ksa-C.js");
 require("./logger-TlKT3xmR.js");
 let node_fs = require("node:fs");
 node_fs = require_chunk.__toESM(node_fs);
 let postcss = require("postcss");
 postcss = require_chunk.__toESM(postcss);
-let node_path = require("node:path");
-node_path = require_chunk.__toESM(node_path);
 let node_process = require("node:process");
 node_process = require_chunk.__toESM(node_process);
+let node_path = require("node:path");
+node_path = require_chunk.__toESM(node_path);
 let _weapp_tailwindcss_logger = require("@weapp-tailwindcss/logger");
+let tailwindcss_patch = require("tailwindcss-patch");
 let node_fs_promises = require("node:fs/promises");
 let magic_string = require("magic-string");
 magic_string = require_chunk.__toESM(magic_string);
-let _weapp_tailwindcss_shared_extractors = require("@weapp-tailwindcss/shared/extractors");
 let _weapp_tailwindcss_postcss_html_transform = require("@weapp-tailwindcss/postcss/html-transform");
 _weapp_tailwindcss_postcss_html_transform = require_chunk.__toESM(_weapp_tailwindcss_postcss_html_transform);
 let comment_json = require("comment-json");
@@ -21916,14 +21916,11 @@ function createStableHash(input) {
 	return (hash >>> 0).toString(36);
 }
 function extractLiteralValue(path) {
-	const allowDoubleQuotes = path.isTemplateElement();
 	if (path.isStringLiteral()) return {
-		allowDoubleQuotes,
 		literal: path.node.value,
 		offset: 1
 	};
 	return {
-		allowDoubleQuotes,
 		literal: typeof path.node.value === "string" ? path.node.value : path.node.value.raw,
 		offset: 0
 	};
@@ -21955,7 +21952,7 @@ var UniAppXComponentLocalStyleCollector = class {
 		return alias;
 	}
 	rewriteLiteral(literal, shouldInclude) {
-		const candidates = (0, _weapp_tailwindcss_shared_extractors.splitCode)(literal);
+		const candidates = (0, tailwindcss_patch.splitCandidateTokens)(literal);
 		if (candidates.length === 0) return literal;
 		let rewritten = literal;
 		for (const candidate of candidates) {
@@ -21975,8 +21972,8 @@ var UniAppXComponentLocalStyleCollector = class {
 				sourceType: options.wrapExpression ? "module" : "unambiguous"
 			}), {}, void 0, false);
 			for (const path of analysis.targetPaths) {
-				const { literal, allowDoubleQuotes } = extractLiteralValue(path);
-				const candidates = (0, _weapp_tailwindcss_shared_extractors.splitCode)(literal, allowDoubleQuotes);
+				const { literal } = extractLiteralValue(path);
+				const candidates = (0, tailwindcss_patch.splitCandidateTokens)(literal);
 				const classContext = options.wrapExpression || require_precheck.isClassContextLiteralPath(path);
 				for (const candidate of candidates) {
 					if (!candidate || !classContext && !isRuntimeCandidate(candidate, this.runtimeSet)) continue;
@@ -21996,8 +21993,8 @@ var UniAppXComponentLocalStyleCollector = class {
 			if (analysis.targetPaths.length === 0) return rawSource;
 			const updater = new require_precheck.JsTokenUpdater();
 			for (const path of analysis.targetPaths) {
-				const { literal, allowDoubleQuotes, offset } = extractLiteralValue(path);
-				const candidates = (0, _weapp_tailwindcss_shared_extractors.splitCode)(literal, allowDoubleQuotes);
+				const { literal, offset } = extractLiteralValue(path);
+				const candidates = (0, tailwindcss_patch.splitCandidateTokens)(literal);
 				if (candidates.length === 0) continue;
 				let rewritten = literal;
 				let mutated = false;
@@ -22552,19 +22549,60 @@ function createViteCssFinalizerOutputPlugin(context) {
 //#region src/bundlers/vite/generate-bundle/candidates.ts
 const MUSTACHE_EXPRESSION_RE = /\{\{[\s\S]*?\}\}/g;
 const QUOTED_LITERAL_RE = /'([^']*)'|"([^"]*)"|`([^`]*)`/g;
+const CLASS_ATTRIBUTE_RE = /\bclass\s*=\s*/g;
+const MUSTACHE_OPEN = "{{";
+const MUSTACHE_CLOSE = "}}";
+function isUrlLikeCandidate(candidate) {
+	return candidate.startsWith("//") || candidate.startsWith("http://") || candidate.startsWith("https://");
+}
 function isArbitraryValueCandidate(candidate) {
-	return candidate.includes("[") && candidate.includes("]");
+	return candidate.includes("[") && candidate.includes("]") && !isUrlLikeCandidate(candidate.trim());
+}
+function collectClassAttributeValues(source) {
+	const values = [];
+	CLASS_ATTRIBUTE_RE.lastIndex = 0;
+	let matched = CLASS_ATTRIBUTE_RE.exec(source);
+	while (matched !== null) {
+		const quoteIndex = CLASS_ATTRIBUTE_RE.lastIndex;
+		const quote = source[quoteIndex];
+		if (quote !== "\"" && quote !== "'") {
+			matched = CLASS_ATTRIBUTE_RE.exec(source);
+			continue;
+		}
+		let expressionDepth = 0;
+		for (let index = quoteIndex + 1; index < source.length; index++) {
+			if (source.startsWith(MUSTACHE_OPEN, index)) {
+				expressionDepth++;
+				index += 1;
+				continue;
+			}
+			if (expressionDepth > 0 && source.startsWith(MUSTACHE_CLOSE, index)) {
+				expressionDepth--;
+				index += 1;
+				continue;
+			}
+			if (expressionDepth === 0 && source[index] === quote) {
+				values.push(source.slice(quoteIndex + 1, index));
+				CLASS_ATTRIBUTE_RE.lastIndex = index + 1;
+				break;
+			}
+		}
+		matched = CLASS_ATTRIBUTE_RE.exec(source);
+	}
+	return values;
 }
-function collectUnescapedDynamicCandidates(source) {
+function collectUnescapedDynamicCandidates(source, allowedCandidates) {
 	const matches = /* @__PURE__ */ new Set();
-	for (const expression of source.match(MUSTACHE_EXPRESSION_RE) ?? []) {
+	const shouldFilterByAllowedCandidates = allowedCandidates !== void 0 && allowedCandidates.size > 0;
+	for (const classValue of collectClassAttributeValues(source)) for (const expression of classValue.match(MUSTACHE_EXPRESSION_RE) ?? []) {
 		QUOTED_LITERAL_RE.lastIndex = 0;
 		let quoted = QUOTED_LITERAL_RE.exec(expression);
 		while (quoted !== null) {
 			const literal = quoted[1] ?? quoted[2] ?? quoted[3] ?? "";
-			for (const candidate of (0, _weapp_tailwindcss_shared_extractors.splitCode)(literal, true)) {
+			for (const candidate of (0, tailwindcss_patch.splitCandidateTokens)(literal)) {
 				const normalized = candidate.trim();
 				if (!normalized || !isArbitraryValueCandidate(normalized)) continue;
+				if (shouldFilterByAllowedCandidates && !allowedCandidates.has(normalized)) continue;
 				matches.add(normalized);
 			}
 			quoted = QUOTED_LITERAL_RE.exec(expression);
@@ -22942,6 +22980,7 @@ function createGenerateBundleHook(context) {
 		const hasRuntimeAffectingChanges = hasRuntimeAffectingSourceChanges(snapshot.runtimeAffectingChangedByType);
 		const useV3OxideSourceRuntime = runtimeState.twPatcher.majorVersion === 3 && sourceCandidates.size > 0 && hasCssAssetEntry && !forceRuntimeRefreshByEnv && !disableV3OxideSourceRuntime;
 		const runtimeStart = performance.now();
+		const transformBaseRuntime = useV3OxideSourceRuntime ? await ensureBundleRuntimeClassSet(snapshot, forceRuntimeRefreshByEnv, { transformOnly: true }) : void 0;
 		const runtime = isWebGeneratorTarget && !shouldGenerateWebCssByGenerator ? /* @__PURE__ */ new Set() : useV3OxideSourceRuntime ? await ensureBundleRuntimeClassSet(snapshot, forceRuntimeRefreshByEnv, {
 			allowBaselineOnlyInitialSync: true,
 			baseClassSet: sourceCandidates
@@ -22950,8 +22989,8 @@ function createGenerateBundleHook(context) {
 		const shouldFilterTailwindV4MiniProgramCandidates = runtimeState.twPatcher.majorVersion === 4 && generatorOptions.target === "weapp";
 		const collectedGeneratorCandidates = new Set([...runtime, ...sourceCandidates]);
 		let generatorRuntime = collectLegacyContainerCompatCandidates(sourceCandidates, shouldFilterTailwindV4MiniProgramCandidates ? require_v3_engine.filterUnsupportedMiniProgramTailwindV4Candidates(collectedGeneratorCandidates) : collectedGeneratorCandidates);
-		let transformRuntime = runtime;
-		if (runtimeState.twPatcher.majorVersion === 3 && generatorRuntime.size > 0 && !useV3OxideSourceRuntime) {
+		let transformRuntime = transformBaseRuntime ?? runtime;
+		if (runtimeState.twPatcher.majorVersion === 3 && generatorRuntime.size > 0) {
 			const cssEntries = snapshot.entries.filter((entry) => entry.type === "css" && entry.output.type === "asset");
 			const mainCssEntry = cssEntries.find((entry) => getCssHandlerOptions(entry.file).isMainChunk) ?? cssEntries[0];
 			if (mainCssEntry) {
@@ -22979,6 +23018,11 @@ function createGenerateBundleHook(context) {
 		const generatorCandidatesChanged = state.generatorCandidateSignature !== generatorCandidateSignature;
 		const runtimeLinkedCssFiles = collectRuntimeLinkedCssFiles(snapshot);
 		recordGeneratorCandidates?.(generatorRuntime);
+		const dynamicRetryCandidates = new Set([
+			...sourceCandidates,
+			...generatorRuntime,
+			...transformRuntime
+		]);
 		const defaultTemplateHandlerOptions = { runtimeSet: transformRuntime };
 		metrics.runtimeSet = measureElapsed(runtimeStart);
 		timingDetails["runtime"] = metrics.runtimeSet;
@@ -23025,11 +23069,18 @@ function createGenerateBundleHook(context) {
 						const start = performance.now();
 						let transformed = await templateHandler(rawSource, defaultTemplateHandlerOptions);
 						let unresolvedDynamicCandidates = collectUnescapedDynamicCandidates(transformed);
+						let retryRuntimeSet;
 						if (unresolvedDynamicCandidates.length > 0) {
-							_weapp_tailwindcss_logger.logger.warn("检测到 WXML 动态类名未完成转译，已回退到完整 runtimeSet 重试: %s -> %O", file, unresolvedDynamicCandidates);
-							transformed = await templateHandler(rawSource, { runtimeSet: new Set([...await context.ensureRuntimeClassSet(true), ...unresolvedDynamicCandidates]) });
-							unresolvedDynamicCandidates = collectUnescapedDynamicCandidates(transformed);
-							if (unresolvedDynamicCandidates.length > 0) _weapp_tailwindcss_logger.logger.warn("WXML 动态类名在完整 runtimeSet 重试后仍未完成转译: %s -> %O", file, unresolvedDynamicCandidates);
+							const fullRuntimeSet = await context.ensureRuntimeClassSet(true);
+							const allowedRetryCandidates = fullRuntimeSet.size === 0 ? unresolvedDynamicCandidates : unresolvedDynamicCandidates.filter((candidate) => dynamicRetryCandidates.has(candidate) || fullRuntimeSet.has(candidate));
+							retryRuntimeSet = new Set([...fullRuntimeSet, ...allowedRetryCandidates]);
+							unresolvedDynamicCandidates = unresolvedDynamicCandidates.filter((candidate) => retryRuntimeSet.has(candidate));
+						}
+						if (retryRuntimeSet && unresolvedDynamicCandidates.length > 0) {
+							_weapp_tailwindcss_logger.logger.warn("检测到已提取 WXML 动态类名未完成转译，已回退到完整 runtimeSet 重试: %s -> %O", file, unresolvedDynamicCandidates);
+							transformed = await templateHandler(rawSource, { runtimeSet: retryRuntimeSet });
+							unresolvedDynamicCandidates = collectUnescapedDynamicCandidates(transformed, retryRuntimeSet);
+							if (unresolvedDynamicCandidates.length > 0) _weapp_tailwindcss_logger.logger.warn("已提取 WXML 动态类名在完整 runtimeSet 重试后仍未完成转译: %s -> %O", file, unresolvedDynamicCandidates);
 						}
 						metrics.html.elapsed += measureElapsed(start);
 						metrics.html.transformed++;
@@ -23579,6 +23630,7 @@ function createViteRuntimeClassSet(options) {
 		refreshTailwindcssPatcher
 	};
 	const bundleRuntimeClassSetManager = require_incremental_runtime_class_set.createBundleRuntimeClassSetManager();
+	const transformRuntimeClassSetManager = require_incremental_runtime_class_set.createBundleRuntimeClassSetManager();
 	let runtimeSet;
 	let runtimeSetPromise;
 	let runtimeRefreshSignature;
@@ -23646,6 +23698,7 @@ function createViteRuntimeClassSet(options) {
 			runtimeSet = void 0;
 			runtimeSetPromise = void 0;
 			await bundleRuntimeClassSetManager.reset();
+			await transformRuntimeClassSetManager.reset();
 		}
 		if (runtimeState.twPatcher.majorVersion === 4 && !forceRuntimeRefresh) try {
 			const nextRuntimeSet = await bundleRuntimeClassSetManager.sync(runtimeState.twPatcher, snapshot);
@@ -23655,22 +23708,30 @@ function createViteRuntimeClassSet(options) {
 			debug("incremental runtime set sync failed, fallback to full collect: %O", error);
 			await bundleRuntimeClassSetManager.reset();
 		}
-		if (runtimeState.twPatcher.majorVersion === 3 && !forceRuntimeRefresh) try {
-			let baseClassSet = options.baseClassSet;
-			if (!baseClassSet && (!runtimeSet || shouldRefreshPatcher)) baseClassSet = await require_precheck.collectRuntimeClassSet(runtimeState.twPatcher, {
-				force: true,
-				skipRefresh: shouldRefreshPatcher,
-				clearCache: shouldRefreshPatcher
-			});
-			const nextRuntimeSet = await bundleRuntimeClassSetManager.sync(runtimeState.twPatcher, snapshot, {
-				baseClassSet: baseClassSet ?? (options.allowBaselineOnlyInitialSync === true ? runtimeSet : void 0),
-				skipInitialFullScanWithBase: options.allowBaselineOnlyInitialSync === true && Boolean(runtimeSet)
-			});
-			runtimeSet = nextRuntimeSet;
-			return nextRuntimeSet;
-		} catch (error) {
-			debug("incremental runtime set sync failed, fallback to full collect: %O", error);
-			await bundleRuntimeClassSetManager.reset();
+		if (runtimeState.twPatcher.majorVersion === 3 && !forceRuntimeRefresh) {
+			if (options.transformOnly) try {
+				return await transformRuntimeClassSetManager.sync(runtimeState.twPatcher, snapshot);
+			} catch (error) {
+				debug("incremental transform runtime set sync failed, fallback to full collect: %O", error);
+				await transformRuntimeClassSetManager.reset();
+			}
+			try {
+				let baseClassSet = options.baseClassSet;
+				if (!baseClassSet && (!runtimeSet || shouldRefreshPatcher)) baseClassSet = await require_precheck.collectRuntimeClassSet(runtimeState.twPatcher, {
+					force: true,
+					skipRefresh: shouldRefreshPatcher,
+					clearCache: shouldRefreshPatcher
+				});
+				const nextRuntimeSet = await bundleRuntimeClassSetManager.sync(runtimeState.twPatcher, snapshot, {
+					baseClassSet: baseClassSet ?? (options.allowBaselineOnlyInitialSync === true ? runtimeSet : void 0),
+					skipInitialFullScanWithBase: options.allowBaselineOnlyInitialSync === true && Boolean(runtimeSet)
+				});
+				runtimeSet = nextRuntimeSet;
+				return nextRuntimeSet;
+			} catch (error) {
+				debug("incremental runtime set sync failed, fallback to full collect: %O", error);
+				await bundleRuntimeClassSetManager.reset();
+			}
 		}
 		if (!forceRuntimeRefresh && !invalidation.changed && !forceCollectBySource && runtimeSet) return runtimeSet;
 		const task = require_precheck.collectRuntimeClassSet(runtimeState.twPatcher, {

package/dist/{vite-fFRpSvyz.mjs → vite-C8vSTuBQ.mjs}

@@ -1,20 +1,20 @@
-import { C as __esmMin, S as __commonJSMin, _ as toCustomAttributesEntities, a as vitePluginName, c as createAttributeMatcher, d as _defineProperty, f as init_defineProperty, h as babelParse, l as analyzeSource, m as replaceWxml, n as getCompilerContext, p as isClassContextLiteralPath, s as generateCode, t as shouldSkipJsTransform, u as JsTokenUpdater, v as collectRuntimeClassSet, w as __require, x as refreshTailwindRuntimeState, y as createTailwindRuntimeReadyPromise } from "./precheck-D7K12zeX.mjs";
-import { B as createDebug, E as filterUnsupportedMiniProgramTailwindV4Candidates, J as findNearestPackageRoot, U as findTailwindConfig, W as resolveTailwindcssOptions, _ as resolveViteSourceScanEntries, g as resolveTailwindV4EntriesFromCssCached, l as getRuntimeClassSetSignature, m as discoverTailwindV4CssEntries, p as createViteSourceScanMatcher, q as omitUndefined, v as resolveViteTailwindV4CssDependencies } from "./v3-engine-DcvCCHfs.mjs";
-import { i as normalizeWeappTailwindcssGeneratorOptions } from "./generator-Qw-tZ0Z2.mjs";
-import { a as validateCandidatesByGenerator, c as hasTailwindRootDirectives, d as hasTailwindGeneratedCssMarkers, i as generateCssByGenerator, l as hasTailwindSourceDirectives, n as createHmrTimingRecorder, o as mergeMarkedUserLayerComponentsCss, s as processCachedTask, t as createBundleRuntimeClassSetManager, u as normalizeTailwindSourceForGenerator } from "./incremental-runtime-class-set-Boqi1QlB.mjs";
+import { C as __esmMin, S as __commonJSMin, _ as toCustomAttributesEntities, a as vitePluginName, c as createAttributeMatcher, d as _defineProperty, f as init_defineProperty, h as babelParse, l as analyzeSource, m as replaceWxml, n as getCompilerContext, p as isClassContextLiteralPath, s as generateCode, t as shouldSkipJsTransform, u as JsTokenUpdater, v as collectRuntimeClassSet, w as __require, x as refreshTailwindRuntimeState, y as createTailwindRuntimeReadyPromise } from "./precheck-mM9IVd1f.mjs";
+import { B as createDebug, E as filterUnsupportedMiniProgramTailwindV4Candidates, J as findNearestPackageRoot, U as findTailwindConfig, W as resolveTailwindcssOptions, _ as resolveViteSourceScanEntries, g as resolveTailwindV4EntriesFromCssCached, l as getRuntimeClassSetSignature, m as discoverTailwindV4CssEntries, p as createViteSourceScanMatcher, q as omitUndefined, v as resolveViteTailwindV4CssDependencies } from "./v3-engine-C_KeUQG3.mjs";
+import { i as normalizeWeappTailwindcssGeneratorOptions } from "./generator-CpsHA4Wd.mjs";
+import { a as validateCandidatesByGenerator, c as hasTailwindRootDirectives, d as hasTailwindGeneratedCssMarkers, i as generateCssByGenerator, l as hasTailwindSourceDirectives, n as createHmrTimingRecorder, o as mergeMarkedUserLayerComponentsCss, s as processCachedTask, t as createBundleRuntimeClassSetManager, u as normalizeTailwindSourceForGenerator } from "./incremental-runtime-class-set-BXYUYjCd.mjs";
 import { o as resolveUniUtsPlatform } from "./utils-DsaS975I.mjs";
-import { c as upsertTailwindV4CssSource, i as resolveUniAppXOptions, r as isUniAppXEnabled, s as hasConfiguredTailwindV4CssRoots } from "./tailwindcss-C7dJHZ0G.mjs";
-import { n as isSourceCandidateRequest, t as createSourceCandidateCollector } from "./source-candidates-CX2ozpKM.mjs";
-import { a as createBundleModuleGraphOptions, b as toAbsoluteOutputPath, c as hasBundlerGeneratedCssMarker, d as resolvePluginDisabledState, f as cleanUrl, g as isSourceStyleRequest, h as slash, i as applyLinkedResults, l as stripBundlerGeneratedCssMarkers, m as isCSSRequest, n as createBundleBuildState, o as pushConcurrentTaskFactories, p as formatPostcssSourceMap, r as updateBundleBuildState, s as createBundlerGeneratedCssMarker, t as buildBundleSnapshot, u as resolvePackageDir, v as normalizeOutputPathKey } from "./bundle-state-Bi-cQua6.mjs";
+import { c as upsertTailwindV4CssSource, i as resolveUniAppXOptions, r as isUniAppXEnabled, s as hasConfiguredTailwindV4CssRoots } from "./tailwindcss-udhXxMX9.mjs";
+import { n as isSourceCandidateRequest, t as createSourceCandidateCollector } from "./source-candidates-_x8bq0Mz.mjs";
+import { a as createBundleModuleGraphOptions, b as toAbsoluteOutputPath, c as hasBundlerGeneratedCssMarker, d as resolvePluginDisabledState, f as cleanUrl, g as isSourceStyleRequest, h as slash, i as applyLinkedResults, l as stripBundlerGeneratedCssMarkers, m as isCSSRequest, n as createBundleBuildState, o as pushConcurrentTaskFactories, p as formatPostcssSourceMap, r as updateBundleBuildState, s as createBundlerGeneratedCssMarker, t as buildBundleSnapshot, u as resolvePackageDir, v as normalizeOutputPathKey } from "./bundle-state-DUIidcox.mjs";
 import { t as logger$1 } from "./logger-BNzxZbZj.mjs";
 import fs, { existsSync, readFileSync } from "node:fs";
 import postcss from "postcss";
-import path from "node:path";
 import process$1 from "node:process";
+import path from "node:path";
 import { logger } from "@weapp-tailwindcss/logger";
+import { splitCandidateTokens } from "tailwindcss-patch";
 import { readFile } from "node:fs/promises";
 import MagicString from "magic-string";
-import { splitCode } from "@weapp-tailwindcss/shared/extractors";
 import postcssHtmlTransform from "@weapp-tailwindcss/postcss/html-transform";
 import { parse } from "comment-json";
 import postcssrc from "postcss-load-config";
@@ -21907,14 +21907,11 @@ function createStableHash(input) {
 	return (hash >>> 0).toString(36);
 }
 function extractLiteralValue(path) {
-	const allowDoubleQuotes = path.isTemplateElement();
 	if (path.isStringLiteral()) return {
-		allowDoubleQuotes,
 		literal: path.node.value,
 		offset: 1
 	};
 	return {
-		allowDoubleQuotes,
 		literal: typeof path.node.value === "string" ? path.node.value : path.node.value.raw,
 		offset: 0
 	};
@@ -21946,7 +21943,7 @@ var UniAppXComponentLocalStyleCollector = class {
 		return alias;
 	}
 	rewriteLiteral(literal, shouldInclude) {
-		const candidates = splitCode(literal);
+		const candidates = splitCandidateTokens(literal);
 		if (candidates.length === 0) return literal;
 		let rewritten = literal;
 		for (const candidate of candidates) {
@@ -21966,8 +21963,8 @@ var UniAppXComponentLocalStyleCollector = class {
 				sourceType: options.wrapExpression ? "module" : "unambiguous"
 			}), {}, void 0, false);
 			for (const path of analysis.targetPaths) {
-				const { literal, allowDoubleQuotes } = extractLiteralValue(path);
-				const candidates = splitCode(literal, allowDoubleQuotes);
+				const { literal } = extractLiteralValue(path);
+				const candidates = splitCandidateTokens(literal);
 				const classContext = options.wrapExpression || isClassContextLiteralPath(path);
 				for (const candidate of candidates) {
 					if (!candidate || !classContext && !isRuntimeCandidate(candidate, this.runtimeSet)) continue;
@@ -21987,8 +21984,8 @@ var UniAppXComponentLocalStyleCollector = class {
 			if (analysis.targetPaths.length === 0) return rawSource;
 			const updater = new JsTokenUpdater();
 			for (const path of analysis.targetPaths) {
-				const { literal, allowDoubleQuotes, offset } = extractLiteralValue(path);
-				const candidates = splitCode(literal, allowDoubleQuotes);
+				const { literal, offset } = extractLiteralValue(path);
+				const candidates = splitCandidateTokens(literal);
 				if (candidates.length === 0) continue;
 				let rewritten = literal;
 				let mutated = false;
@@ -22543,19 +22540,60 @@ function createViteCssFinalizerOutputPlugin(context) {
 //#region src/bundlers/vite/generate-bundle/candidates.ts
 const MUSTACHE_EXPRESSION_RE = /\{\{[\s\S]*?\}\}/g;
 const QUOTED_LITERAL_RE = /'([^']*)'|"([^"]*)"|`([^`]*)`/g;
+const CLASS_ATTRIBUTE_RE = /\bclass\s*=\s*/g;
+const MUSTACHE_OPEN = "{{";
+const MUSTACHE_CLOSE = "}}";
+function isUrlLikeCandidate(candidate) {
+	return candidate.startsWith("//") || candidate.startsWith("http://") || candidate.startsWith("https://");
+}
 function isArbitraryValueCandidate(candidate) {
-	return candidate.includes("[") && candidate.includes("]");
+	return candidate.includes("[") && candidate.includes("]") && !isUrlLikeCandidate(candidate.trim());
+}
+function collectClassAttributeValues(source) {
+	const values = [];
+	CLASS_ATTRIBUTE_RE.lastIndex = 0;
+	let matched = CLASS_ATTRIBUTE_RE.exec(source);
+	while (matched !== null) {
+		const quoteIndex = CLASS_ATTRIBUTE_RE.lastIndex;
+		const quote = source[quoteIndex];
+		if (quote !== "\"" && quote !== "'") {
+			matched = CLASS_ATTRIBUTE_RE.exec(source);
+			continue;
+		}
+		let expressionDepth = 0;
+		for (let index = quoteIndex + 1; index < source.length; index++) {
+			if (source.startsWith(MUSTACHE_OPEN, index)) {
+				expressionDepth++;
+				index += 1;
+				continue;
+			}
+			if (expressionDepth > 0 && source.startsWith(MUSTACHE_CLOSE, index)) {
+				expressionDepth--;
+				index += 1;
+				continue;
+			}
+			if (expressionDepth === 0 && source[index] === quote) {
+				values.push(source.slice(quoteIndex + 1, index));
+				CLASS_ATTRIBUTE_RE.lastIndex = index + 1;
+				break;
+			}
+		}
+		matched = CLASS_ATTRIBUTE_RE.exec(source);
+	}
+	return values;
 }
-function collectUnescapedDynamicCandidates(source) {
+function collectUnescapedDynamicCandidates(source, allowedCandidates) {
 	const matches = /* @__PURE__ */ new Set();
-	for (const expression of source.match(MUSTACHE_EXPRESSION_RE) ?? []) {
+	const shouldFilterByAllowedCandidates = allowedCandidates !== void 0 && allowedCandidates.size > 0;
+	for (const classValue of collectClassAttributeValues(source)) for (const expression of classValue.match(MUSTACHE_EXPRESSION_RE) ?? []) {
 		QUOTED_LITERAL_RE.lastIndex = 0;
 		let quoted = QUOTED_LITERAL_RE.exec(expression);
 		while (quoted !== null) {
 			const literal = quoted[1] ?? quoted[2] ?? quoted[3] ?? "";
-			for (const candidate of splitCode(literal, true)) {
+			for (const candidate of splitCandidateTokens(literal)) {
 				const normalized = candidate.trim();
 				if (!normalized || !isArbitraryValueCandidate(normalized)) continue;
+				if (shouldFilterByAllowedCandidates && !allowedCandidates.has(normalized)) continue;
 				matches.add(normalized);
 			}
 			quoted = QUOTED_LITERAL_RE.exec(expression);
@@ -22933,6 +22971,7 @@ function createGenerateBundleHook(context) {
 		const hasRuntimeAffectingChanges = hasRuntimeAffectingSourceChanges(snapshot.runtimeAffectingChangedByType);
 		const useV3OxideSourceRuntime = runtimeState.twPatcher.majorVersion === 3 && sourceCandidates.size > 0 && hasCssAssetEntry && !forceRuntimeRefreshByEnv && !disableV3OxideSourceRuntime;
 		const runtimeStart = performance.now();
+		const transformBaseRuntime = useV3OxideSourceRuntime ? await ensureBundleRuntimeClassSet(snapshot, forceRuntimeRefreshByEnv, { transformOnly: true }) : void 0;
 		const runtime = isWebGeneratorTarget && !shouldGenerateWebCssByGenerator ? /* @__PURE__ */ new Set() : useV3OxideSourceRuntime ? await ensureBundleRuntimeClassSet(snapshot, forceRuntimeRefreshByEnv, {
 			allowBaselineOnlyInitialSync: true,
 			baseClassSet: sourceCandidates
@@ -22941,8 +22980,8 @@ function createGenerateBundleHook(context) {
 		const shouldFilterTailwindV4MiniProgramCandidates = runtimeState.twPatcher.majorVersion === 4 && generatorOptions.target === "weapp";
 		const collectedGeneratorCandidates = new Set([...runtime, ...sourceCandidates]);
 		let generatorRuntime = collectLegacyContainerCompatCandidates(sourceCandidates, shouldFilterTailwindV4MiniProgramCandidates ? filterUnsupportedMiniProgramTailwindV4Candidates(collectedGeneratorCandidates) : collectedGeneratorCandidates);
-		let transformRuntime = runtime;
-		if (runtimeState.twPatcher.majorVersion === 3 && generatorRuntime.size > 0 && !useV3OxideSourceRuntime) {
+		let transformRuntime = transformBaseRuntime ?? runtime;
+		if (runtimeState.twPatcher.majorVersion === 3 && generatorRuntime.size > 0) {
 			const cssEntries = snapshot.entries.filter((entry) => entry.type === "css" && entry.output.type === "asset");
 			const mainCssEntry = cssEntries.find((entry) => getCssHandlerOptions(entry.file).isMainChunk) ?? cssEntries[0];
 			if (mainCssEntry) {
@@ -22970,6 +23009,11 @@ function createGenerateBundleHook(context) {
 		const generatorCandidatesChanged = state.generatorCandidateSignature !== generatorCandidateSignature;
 		const runtimeLinkedCssFiles = collectRuntimeLinkedCssFiles(snapshot);
 		recordGeneratorCandidates?.(generatorRuntime);
+		const dynamicRetryCandidates = new Set([
+			...sourceCandidates,
+			...generatorRuntime,
+			...transformRuntime
+		]);
 		const defaultTemplateHandlerOptions = { runtimeSet: transformRuntime };
 		metrics.runtimeSet = measureElapsed(runtimeStart);
 		timingDetails["runtime"] = metrics.runtimeSet;
@@ -23016,11 +23060,18 @@ function createGenerateBundleHook(context) {
 						const start = performance.now();
 						let transformed = await templateHandler(rawSource, defaultTemplateHandlerOptions);
 						let unresolvedDynamicCandidates = collectUnescapedDynamicCandidates(transformed);
+						let retryRuntimeSet;
 						if (unresolvedDynamicCandidates.length > 0) {
-							logger.warn("检测到 WXML 动态类名未完成转译，已回退到完整 runtimeSet 重试: %s -> %O", file, unresolvedDynamicCandidates);
-							transformed = await templateHandler(rawSource, { runtimeSet: new Set([...await context.ensureRuntimeClassSet(true), ...unresolvedDynamicCandidates]) });
-							unresolvedDynamicCandidates = collectUnescapedDynamicCandidates(transformed);
-							if (unresolvedDynamicCandidates.length > 0) logger.warn("WXML 动态类名在完整 runtimeSet 重试后仍未完成转译: %s -> %O", file, unresolvedDynamicCandidates);
+							const fullRuntimeSet = await context.ensureRuntimeClassSet(true);
+							const allowedRetryCandidates = fullRuntimeSet.size === 0 ? unresolvedDynamicCandidates : unresolvedDynamicCandidates.filter((candidate) => dynamicRetryCandidates.has(candidate) || fullRuntimeSet.has(candidate));
+							retryRuntimeSet = new Set([...fullRuntimeSet, ...allowedRetryCandidates]);
+							unresolvedDynamicCandidates = unresolvedDynamicCandidates.filter((candidate) => retryRuntimeSet.has(candidate));
+						}
+						if (retryRuntimeSet && unresolvedDynamicCandidates.length > 0) {
+							logger.warn("检测到已提取 WXML 动态类名未完成转译，已回退到完整 runtimeSet 重试: %s -> %O", file, unresolvedDynamicCandidates);
+							transformed = await templateHandler(rawSource, { runtimeSet: retryRuntimeSet });
+							unresolvedDynamicCandidates = collectUnescapedDynamicCandidates(transformed, retryRuntimeSet);
+							if (unresolvedDynamicCandidates.length > 0) logger.warn("已提取 WXML 动态类名在完整 runtimeSet 重试后仍未完成转译: %s -> %O", file, unresolvedDynamicCandidates);
 						}
 						metrics.html.elapsed += measureElapsed(start);
 						metrics.html.transformed++;
@@ -23570,6 +23621,7 @@ function createViteRuntimeClassSet(options) {
 		refreshTailwindcssPatcher
 	};
 	const bundleRuntimeClassSetManager = createBundleRuntimeClassSetManager();
+	const transformRuntimeClassSetManager = createBundleRuntimeClassSetManager();
 	let runtimeSet;
 	let runtimeSetPromise;
 	let runtimeRefreshSignature;
@@ -23637,6 +23689,7 @@ function createViteRuntimeClassSet(options) {
 			runtimeSet = void 0;
 			runtimeSetPromise = void 0;
 			await bundleRuntimeClassSetManager.reset();
+			await transformRuntimeClassSetManager.reset();
 		}
 		if (runtimeState.twPatcher.majorVersion === 4 && !forceRuntimeRefresh) try {
 			const nextRuntimeSet = await bundleRuntimeClassSetManager.sync(runtimeState.twPatcher, snapshot);
@@ -23646,22 +23699,30 @@ function createViteRuntimeClassSet(options) {
 			debug("incremental runtime set sync failed, fallback to full collect: %O", error);
 			await bundleRuntimeClassSetManager.reset();
 		}
-		if (runtimeState.twPatcher.majorVersion === 3 && !forceRuntimeRefresh) try {
-			let baseClassSet = options.baseClassSet;
-			if (!baseClassSet && (!runtimeSet || shouldRefreshPatcher)) baseClassSet = await collectRuntimeClassSet(runtimeState.twPatcher, {
-				force: true,
-				skipRefresh: shouldRefreshPatcher,
-				clearCache: shouldRefreshPatcher
-			});
-			const nextRuntimeSet = await bundleRuntimeClassSetManager.sync(runtimeState.twPatcher, snapshot, {
-				baseClassSet: baseClassSet ?? (options.allowBaselineOnlyInitialSync === true ? runtimeSet : void 0),
-				skipInitialFullScanWithBase: options.allowBaselineOnlyInitialSync === true && Boolean(runtimeSet)
-			});
-			runtimeSet = nextRuntimeSet;
-			return nextRuntimeSet;
-		} catch (error) {
-			debug("incremental runtime set sync failed, fallback to full collect: %O", error);
-			await bundleRuntimeClassSetManager.reset();
+		if (runtimeState.twPatcher.majorVersion === 3 && !forceRuntimeRefresh) {
+			if (options.transformOnly) try {
+				return await transformRuntimeClassSetManager.sync(runtimeState.twPatcher, snapshot);
+			} catch (error) {
+				debug("incremental transform runtime set sync failed, fallback to full collect: %O", error);
+				await transformRuntimeClassSetManager.reset();
+			}
+			try {
+				let baseClassSet = options.baseClassSet;
+				if (!baseClassSet && (!runtimeSet || shouldRefreshPatcher)) baseClassSet = await collectRuntimeClassSet(runtimeState.twPatcher, {
+					force: true,
+					skipRefresh: shouldRefreshPatcher,
+					clearCache: shouldRefreshPatcher
+				});
+				const nextRuntimeSet = await bundleRuntimeClassSetManager.sync(runtimeState.twPatcher, snapshot, {
+					baseClassSet: baseClassSet ?? (options.allowBaselineOnlyInitialSync === true ? runtimeSet : void 0),
+					skipInitialFullScanWithBase: options.allowBaselineOnlyInitialSync === true && Boolean(runtimeSet)
+				});
+				runtimeSet = nextRuntimeSet;
+				return nextRuntimeSet;
+			} catch (error) {
+				debug("incremental runtime set sync failed, fallback to full collect: %O", error);
+				await bundleRuntimeClassSetManager.reset();
+			}
 		}
 		if (!forceRuntimeRefresh && !invalidation.changed && !forceCollectBySource && runtimeSet) return runtimeSet;
 		const task = collectRuntimeClassSet(runtimeState.twPatcher, {

package/dist/vite.js

@@ -1,4 +1,4 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_vite = require("./vite-BgTPSkQS.js");
+const require_vite = require("./vite-BVbIr2vs.js");
 exports.WeappTailwindcss = require_vite.WeappTailwindcss;
 exports.weappTailwindcss = require_vite.WeappTailwindcss;

package/dist/vite.mjs

@@ -1,2 +1,2 @@
-import { t as WeappTailwindcss } from "./vite-fFRpSvyz.mjs";
+import { t as WeappTailwindcss } from "./vite-C8vSTuBQ.mjs";
 export { WeappTailwindcss, WeappTailwindcss as weappTailwindcss };