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

package/dist/gulp.js

@@ -1,16 +1,16 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_chunk = require("./chunk-C5U5_Hdc.js");
-const require_v3_engine = require("./v3-engine-CHItlVq5.js");
-const require_incremental_runtime_class_set = require("./incremental-runtime-class-set-FAOHZmzh.js");
-const require_precheck = require("./precheck-D7gJSmJz.js");
-const require_tailwindcss = require("./tailwindcss-B-e2RiXr.js");
-const require_source_candidates = require("./source-candidates-DNM8iwXW.js");
+const require_v3_engine = require("./v3-engine-DwY4Fixu.js");
+const require_incremental_runtime_class_set = require("./incremental-runtime-class-set-BE8RVbuz.js");
+const require_precheck = require("./precheck-D_KT1pis.js");
+const require_tailwindcss = require("./tailwindcss-Cl7hUlYV.js");
+const require_source_candidates = require("./source-candidates-7Q-kTOSb.js");
 let node_fs = require("node:fs");
 node_fs = require_chunk.__toESM(node_fs);
-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 node_buffer = require("node:buffer");
 let node_stream = require("node:stream");
 node_stream = require_chunk.__toESM(node_stream);

package/dist/gulp.mjs

@@ -1,11 +1,11 @@
-import { b as ensureRuntimeClassSet, n as getCompilerContext, t as shouldSkipJsTransform, y as createTailwindRuntimeReadyPromise } from "./precheck-D7K12zeX.mjs";
-import { B as createDebug, _ as resolveViteSourceScanEntries, l as getRuntimeClassSetSignature } from "./v3-engine-DcvCCHfs.mjs";
-import { c as hasTailwindRootDirectives, i as generateCssByGenerator, r as emitHmrTiming, s as processCachedTask, t as createBundleRuntimeClassSetManager, u as normalizeTailwindSourceForGenerator } from "./incremental-runtime-class-set-Boqi1QlB.mjs";
-import { c as upsertTailwindV4CssSource, s as hasConfiguredTailwindV4CssRoots } from "./tailwindcss-C7dJHZ0G.mjs";
-import { t as createSourceCandidateCollector } from "./source-candidates-CX2ozpKM.mjs";
+import { b as ensureRuntimeClassSet, n as getCompilerContext, t as shouldSkipJsTransform, y as createTailwindRuntimeReadyPromise } from "./precheck-mM9IVd1f.mjs";
+import { B as createDebug, _ as resolveViteSourceScanEntries, l as getRuntimeClassSetSignature } from "./v3-engine-C_KeUQG3.mjs";
+import { c as hasTailwindRootDirectives, i as generateCssByGenerator, r as emitHmrTiming, s as processCachedTask, t as createBundleRuntimeClassSetManager, u as normalizeTailwindSourceForGenerator } from "./incremental-runtime-class-set-BXYUYjCd.mjs";
+import { c as upsertTailwindV4CssSource, s as hasConfiguredTailwindV4CssRoots } from "./tailwindcss-udhXxMX9.mjs";
+import { t as createSourceCandidateCollector } from "./source-candidates-_x8bq0Mz.mjs";
 import fs from "node:fs";
-import path from "node:path";
 import process from "node:process";
+import path from "node:path";
 import { Buffer } from "node:buffer";
 import stream from "node:stream";
 //#region src/bundlers/gulp/index.ts

package/dist/{incremental-runtime-class-set-FAOHZmzh.js → incremental-runtime-class-set-BE8RVbuz.js}

@@ -1,14 +1,14 @@
 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_precheck = require("./precheck-D7gJSmJz.js");
+const require_v3_engine = require("./v3-engine-DwY4Fixu.js");
+const require_generator = require("./generator-BEXaaUzP.js");
+const require_precheck = require("./precheck-D_KT1pis.js");
 let node_fs = require("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 tailwindcss_patch = require("tailwindcss-patch");
 let _weapp_tailwindcss_postcss = require("@weapp-tailwindcss/postcss");
 //#region src/bundlers/shared/generator-css/markers.ts
@@ -2095,6 +2095,63 @@ function createNonSourceBaseClassSet(baseClassSet, candidateCountByClass) {
 	for (const candidate of candidateCountByClass.keys()) nextBaseClassSet.delete(candidate);
 	return nextBaseClassSet;
 }
+function isHighConfidenceV3Candidate(candidate) {
+	return candidate.includes("[") || candidate.includes(":") || candidate.includes("/");
+}
+function isRawCandidateInClassContext(source, start, extension) {
+	if (typeof start !== "number" || start <= 0) return false;
+	const before = source.slice(Math.max(0, start - 200), start);
+	if (extension === "html") return /\bclass\s*=\s*["'][^"']*$/i.test(before);
+	return /\bclass(?:Name)?\s*[:=]\s*["'][^"']*$/i.test(before) || /\.classList\.(?:add|remove|toggle|contains)\([^)]*$/i.test(before);
+}
+function resolveQuotedLiteralRange(source, start) {
+	if (typeof start !== "number" || start <= 0) return;
+	let quote;
+	let literalStart = -1;
+	for (let index = start - 1; index >= 0; index--) {
+		const char = source[index];
+		if (char !== "\"" && char !== "'" && char !== "`") continue;
+		quote = char;
+		literalStart = index;
+		break;
+	}
+	if (!quote) return;
+	let escaped = false;
+	for (let index = literalStart + 1; index < source.length; index++) {
+		const char = source[index];
+		if (escaped) {
+			escaped = false;
+			continue;
+		}
+		if (char === "\\") {
+			escaped = true;
+			continue;
+		}
+		if (char === quote) {
+			if (start < index) return {
+				start: literalStart,
+				end: index
+			};
+			return;
+		}
+	}
+}
+function createHighConfidenceLiteralRanges(source, matches) {
+	const ranges = [];
+	for (const match of matches) {
+		const candidate = match?.rawCandidate;
+		if (typeof candidate !== "string" || !isHighConfidenceV3Candidate(candidate)) continue;
+		const range = resolveQuotedLiteralRange(source, match.start);
+		if (range) ranges.push(range);
+	}
+	return ranges;
+}
+function isRawCandidateInRanges(start, ranges) {
+	return typeof start === "number" && ranges.some((range) => start > range.start && start < range.end);
+}
+function isRawCandidateAllowedForV3(source, candidate, start, extension, knownSourceCandidates, highConfidenceLiteralRanges = []) {
+	return isHighConfidenceV3Candidate(candidate) || knownSourceCandidates?.has(candidate) === true || isRawCandidateInClassContext(source, start, extension) || isRawCandidateInRanges(start, highConfidenceLiteralRanges);
+}
 function createBundleRuntimeClassSetManager(options = {}) {
 	const customExtractCandidates = options.extractCandidates;
 	const extractCandidates = customExtractCandidates ?? tailwindcss_patch.extractValidCandidates;
@@ -2153,12 +2210,17 @@ function createBundleRuntimeClassSetManager(options = {}) {
 		const validCandidates = new Set(await extractCandidates(createExtractOptions(context, source)));
 		for (const candidate of unknownCandidates) candidateValidityCache.set(candidate, validCandidates.has(candidate));
 	}
-	async function extractEntryRawCandidates(entry) {
-		const matches = await extractRawCandidates(entry.source, resolveEntryExtension(entry));
+	async function extractEntryRawCandidates(entry, patcher, knownSourceCandidates) {
+		const extension = resolveEntryExtension(entry);
+		const matches = await extractRawCandidates(entry.source, extension);
+		const highConfidenceLiteralRanges = patcher.majorVersion === 3 && !customExtractCandidates ? createHighConfidenceLiteralRanges(entry.source, matches) : [];
 		const candidates = /* @__PURE__ */ new Set();
 		for (const match of matches) {
 			const candidate = match?.rawCandidate;
-			if (typeof candidate === "string" && candidate.length > 0) candidates.add(candidate);
+			if (typeof candidate === "string" && candidate.length > 0) {
+				if (patcher.majorVersion === 3 && !customExtractCandidates && !isRawCandidateAllowedForV3(entry.source, candidate, match.start, extension, knownSourceCandidates, highConfidenceLiteralRanges)) continue;
+				candidates.add(candidate);
+			}
 		}
 		return candidates;
 	}
@@ -2191,7 +2253,7 @@ function createBundleRuntimeClassSetManager(options = {}) {
 		await Promise.all(changedRuntimeFiles.map(async (file) => {
 			const entry = runtimeEntriesByFile.get(file);
 			if (!entry) return;
-			const candidates = await extractEntryRawCandidates(entry);
+			const candidates = await extractEntryRawCandidates(entry, patcher, nextBaseClassSet);
 			rawCandidatesByFile.set(file, candidates);
 			for (const candidate of candidates) if (!candidateValidityCache.has(candidate)) unknownCandidates.add(candidate);
 		}));

package/dist/{incremental-runtime-class-set-Boqi1QlB.mjs → incremental-runtime-class-set-BXYUYjCd.mjs}

@@ -1,10 +1,10 @@
-import { m as replaceWxml, r as resolveStyleOptionsFromContext } from "./precheck-D7K12zeX.mjs";
-import { B as createDebug, D as loadTailwindV4DesignSystem, E as filterUnsupportedMiniProgramTailwindV4Candidates, R as resolveTailwindV4CssSourceBase, S as resolveTailwindV4SourceOptionsFromPatcher, h as resolveTailwindV4EntriesFromCss, l as getRuntimeClassSetSignature, n as resolveTailwindV3SourceFromPatcher, q as omitUndefined, r as resolveTailwindV3SourceOptionsFromPatcher, t as resolveTailwindV3Source, x as resolveTailwindV4SourceFromPatcher, y as resolveTailwindV4Source$1 } from "./v3-engine-DcvCCHfs.mjs";
-import { i as normalizeWeappTailwindcssGeneratorOptions, t as createWeappTailwindcssGenerator } from "./generator-Qw-tZ0Z2.mjs";
+import { m as replaceWxml, r as resolveStyleOptionsFromContext } from "./precheck-mM9IVd1f.mjs";
+import { B as createDebug, D as loadTailwindV4DesignSystem, E as filterUnsupportedMiniProgramTailwindV4Candidates, R as resolveTailwindV4CssSourceBase, S as resolveTailwindV4SourceOptionsFromPatcher, h as resolveTailwindV4EntriesFromCss, l as getRuntimeClassSetSignature, n as resolveTailwindV3SourceFromPatcher, q as omitUndefined, r as resolveTailwindV3SourceOptionsFromPatcher, t as resolveTailwindV3Source, x as resolveTailwindV4SourceFromPatcher, y as resolveTailwindV4Source$1 } from "./v3-engine-C_KeUQG3.mjs";
+import { i as normalizeWeappTailwindcssGeneratorOptions, t as createWeappTailwindcssGenerator } from "./generator-CpsHA4Wd.mjs";
 import { existsSync, readFileSync } from "node:fs";
 import postcss from "postcss";
-import path from "node:path";
 import process from "node:process";
+import path from "node:path";
 import { extractRawCandidatesWithPositions, extractSourceCandidates, extractValidCandidates } from "tailwindcss-patch";
 import { finalizeMiniProgramCss, removeUnsupportedMiniProgramAtRules } from "@weapp-tailwindcss/postcss";
 //#region src/bundlers/shared/generator-css/markers.ts
@@ -2091,6 +2091,63 @@ function createNonSourceBaseClassSet(baseClassSet, candidateCountByClass) {
 	for (const candidate of candidateCountByClass.keys()) nextBaseClassSet.delete(candidate);
 	return nextBaseClassSet;
 }
+function isHighConfidenceV3Candidate(candidate) {
+	return candidate.includes("[") || candidate.includes(":") || candidate.includes("/");
+}
+function isRawCandidateInClassContext(source, start, extension) {
+	if (typeof start !== "number" || start <= 0) return false;
+	const before = source.slice(Math.max(0, start - 200), start);
+	if (extension === "html") return /\bclass\s*=\s*["'][^"']*$/i.test(before);
+	return /\bclass(?:Name)?\s*[:=]\s*["'][^"']*$/i.test(before) || /\.classList\.(?:add|remove|toggle|contains)\([^)]*$/i.test(before);
+}
+function resolveQuotedLiteralRange(source, start) {
+	if (typeof start !== "number" || start <= 0) return;
+	let quote;
+	let literalStart = -1;
+	for (let index = start - 1; index >= 0; index--) {
+		const char = source[index];
+		if (char !== "\"" && char !== "'" && char !== "`") continue;
+		quote = char;
+		literalStart = index;
+		break;
+	}
+	if (!quote) return;
+	let escaped = false;
+	for (let index = literalStart + 1; index < source.length; index++) {
+		const char = source[index];
+		if (escaped) {
+			escaped = false;
+			continue;
+		}
+		if (char === "\\") {
+			escaped = true;
+			continue;
+		}
+		if (char === quote) {
+			if (start < index) return {
+				start: literalStart,
+				end: index
+			};
+			return;
+		}
+	}
+}
+function createHighConfidenceLiteralRanges(source, matches) {
+	const ranges = [];
+	for (const match of matches) {
+		const candidate = match?.rawCandidate;
+		if (typeof candidate !== "string" || !isHighConfidenceV3Candidate(candidate)) continue;
+		const range = resolveQuotedLiteralRange(source, match.start);
+		if (range) ranges.push(range);
+	}
+	return ranges;
+}
+function isRawCandidateInRanges(start, ranges) {
+	return typeof start === "number" && ranges.some((range) => start > range.start && start < range.end);
+}
+function isRawCandidateAllowedForV3(source, candidate, start, extension, knownSourceCandidates, highConfidenceLiteralRanges = []) {
+	return isHighConfidenceV3Candidate(candidate) || knownSourceCandidates?.has(candidate) === true || isRawCandidateInClassContext(source, start, extension) || isRawCandidateInRanges(start, highConfidenceLiteralRanges);
+}
 function createBundleRuntimeClassSetManager(options = {}) {
 	const customExtractCandidates = options.extractCandidates;
 	const extractCandidates = customExtractCandidates ?? extractValidCandidates;
@@ -2149,12 +2206,17 @@ function createBundleRuntimeClassSetManager(options = {}) {
 		const validCandidates = new Set(await extractCandidates(createExtractOptions(context, source)));
 		for (const candidate of unknownCandidates) candidateValidityCache.set(candidate, validCandidates.has(candidate));
 	}
-	async function extractEntryRawCandidates(entry) {
-		const matches = await extractRawCandidates(entry.source, resolveEntryExtension(entry));
+	async function extractEntryRawCandidates(entry, patcher, knownSourceCandidates) {
+		const extension = resolveEntryExtension(entry);
+		const matches = await extractRawCandidates(entry.source, extension);
+		const highConfidenceLiteralRanges = patcher.majorVersion === 3 && !customExtractCandidates ? createHighConfidenceLiteralRanges(entry.source, matches) : [];
 		const candidates = /* @__PURE__ */ new Set();
 		for (const match of matches) {
 			const candidate = match?.rawCandidate;
-			if (typeof candidate === "string" && candidate.length > 0) candidates.add(candidate);
+			if (typeof candidate === "string" && candidate.length > 0) {
+				if (patcher.majorVersion === 3 && !customExtractCandidates && !isRawCandidateAllowedForV3(entry.source, candidate, match.start, extension, knownSourceCandidates, highConfidenceLiteralRanges)) continue;
+				candidates.add(candidate);
+			}
 		}
 		return candidates;
 	}
@@ -2187,7 +2249,7 @@ function createBundleRuntimeClassSetManager(options = {}) {
 		await Promise.all(changedRuntimeFiles.map(async (file) => {
 			const entry = runtimeEntriesByFile.get(file);
 			if (!entry) return;
-			const candidates = await extractEntryRawCandidates(entry);
+			const candidates = await extractEntryRawCandidates(entry, patcher, nextBaseClassSet);
 			rawCandidatesByFile.set(file, candidates);
 			for (const candidate of candidates) if (!candidateValidityCache.has(candidate)) unknownCandidates.add(candidate);
 		}));

package/dist/index.js

@@ -1,9 +1,9 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_generator = require("./generator-CrU-Ghc1.js");
+const require_generator = require("./generator-BEXaaUzP.js");
 const require_gulp = require("./gulp.js");
-const require_postcss = require("./postcss-DAWf9D3C.js");
-const require_vite = require("./vite-BgTPSkQS.js");
-const require_webpack = require("./webpack-BXSWVdXh.js");
+const require_postcss = require("./postcss-DN7IQzYb.js");
+const require_vite = require("./vite-BVbIr2vs.js");
+const require_webpack = require("./webpack-DlHo84RT.js");
 let _weapp_tailwindcss_postcss = require("@weapp-tailwindcss/postcss");
 exports.WeappTailwindcss = require_vite.WeappTailwindcss;
 exports.createPlugins = require_gulp.createPlugins;

package/dist/index.mjs

@@ -1,7 +1,7 @@
-import { t as createWeappTailwindcssGenerator } from "./generator-Qw-tZ0Z2.mjs";
+import { t as createWeappTailwindcssGenerator } from "./generator-CpsHA4Wd.mjs";
 import { WeappTailwindcss as createPlugins } from "./gulp.mjs";
-import { t as weappTailwindcssPostcssPlugin } from "./postcss-C6zOQqlL.mjs";
-import { t as WeappTailwindcss } from "./vite-fFRpSvyz.mjs";
-import { n as weappTailwindcssPackageDir } from "./webpack-Dx2AZpGU.mjs";
+import { t as weappTailwindcssPostcssPlugin } from "./postcss-BvkdIZr8.mjs";
+import { t as WeappTailwindcss } from "./vite-C8vSTuBQ.mjs";
+import { n as weappTailwindcssPackageDir } from "./webpack-dva53gYi.mjs";
 import { unitConversionComposeRules, unitConversionPresets } from "@weapp-tailwindcss/postcss";
 export { WeappTailwindcss, createPlugins, createWeappTailwindcssGenerator, unitConversionComposeRules, unitConversionPresets, weappTailwindcssPackageDir, weappTailwindcssPostcssPlugin };

package/dist/{postcss-C6zOQqlL.mjs → postcss-BvkdIZr8.mjs}

@@ -1,8 +1,8 @@
-import { A as collectCssInlineSourceCandidates, F as parseConfigParam, H as readInstalledPackageMajorVersion, I as resolveCssSourceEntries, M as expandTailwindSourceEntries, O as DEFAULT_SOURCE_SCAN_EXTENSIONS, P as normalizeLegacyContentEntries, j as createSourceScanPattern, t as resolveTailwindV3Source, y as resolveTailwindV4Source$1 } from "./v3-engine-DcvCCHfs.mjs";
-import { i as normalizeWeappTailwindcssGeneratorOptions, t as createWeappTailwindcssGenerator } from "./generator-Qw-tZ0Z2.mjs";
+import { A as collectCssInlineSourceCandidates, F as parseConfigParam, H as readInstalledPackageMajorVersion, I as resolveCssSourceEntries, M as expandTailwindSourceEntries, O as DEFAULT_SOURCE_SCAN_EXTENSIONS, P as normalizeLegacyContentEntries, j as createSourceScanPattern, t as resolveTailwindV3Source, y as resolveTailwindV4Source$1 } from "./v3-engine-C_KeUQG3.mjs";
+import { i as normalizeWeappTailwindcssGeneratorOptions, t as createWeappTailwindcssGenerator } from "./generator-CpsHA4Wd.mjs";
 import postcss from "postcss";
-import path from "node:path";
 import process from "node:process";
+import path from "node:path";
 import { extractRawCandidatesWithPositions, extractValidCandidates } from "tailwindcss-patch";
 import { readFile } from "node:fs/promises";
 import { loadConfig } from "tailwindcss-config";

package/dist/{postcss-DAWf9D3C.js → postcss-DN7IQzYb.js}

@@ -1,12 +1,12 @@
 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_v3_engine = require("./v3-engine-DwY4Fixu.js");
+const require_generator = require("./generator-BEXaaUzP.js");
 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 tailwindcss_patch = require("tailwindcss-patch");
 let node_fs_promises = require("node:fs/promises");
 let tailwindcss_config = require("tailwindcss-config");

package/dist/postcss.js

@@ -2,6 +2,6 @@ Object.defineProperties(exports, {
 	__esModule: { value: true },
 	[Symbol.toStringTag]: { value: "Module" }
 });
-const require_postcss = require("./postcss-DAWf9D3C.js");
+const require_postcss = require("./postcss-DN7IQzYb.js");
 exports.default = require_postcss.weappTailwindcssPostcssPlugin;
 exports.weappTailwindcssPostcssPlugin = require_postcss.weappTailwindcssPostcssPlugin;

package/dist/postcss.mjs

@@ -1,2 +1,2 @@
-import { t as weappTailwindcssPostcssPlugin } from "./postcss-C6zOQqlL.mjs";
+import { t as weappTailwindcssPostcssPlugin } from "./postcss-BvkdIZr8.mjs";
 export { weappTailwindcssPostcssPlugin as default, weappTailwindcssPostcssPlugin };

package/dist/{precheck-D7gJSmJz.js → precheck-D_KT1pis.js}

@@ -1,13 +1,14 @@
 const require_chunk = require("./chunk-C5U5_Hdc.js");
-const require_v3_engine = require("./v3-engine-CHItlVq5.js");
+const require_v3_engine = require("./v3-engine-DwY4Fixu.js");
 const require_defaults = require("./defaults-zKUH2mDe.js");
 require("./utils-D7Ygohep.js");
-const require_tailwindcss = require("./tailwindcss-B-e2RiXr.js");
-let node_path = require("node:path");
-node_path = require_chunk.__toESM(node_path);
+const require_tailwindcss = require("./tailwindcss-Cl7hUlYV.js");
 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 _weapp_tailwindcss_postcss = require("@weapp-tailwindcss/postcss");
 let node_buffer = require("node:buffer");
@@ -20,7 +21,6 @@ let _babel_parser = require("@babel/parser");
 let magic_string = require("magic-string");
 magic_string = require_chunk.__toESM(magic_string);
 let _ast_core_escape = require("@ast-core/escape");
-let _weapp_tailwindcss_shared_extractors = require("@weapp-tailwindcss/shared/extractors");
 let _babel_types = require("@babel/types");
 _babel_types = require_chunk.__toESM(_babel_types);
 let _weapp_tailwindcss_shared = require("@weapp-tailwindcss/shared");
@@ -920,8 +920,7 @@ function hasIgnoreComment(node) {
 	}
 	return false;
 }
-function extractLiteralValue(path, { unescapeUnicode, arbitraryValues }) {
-	const allowDoubleQuotes = arbitraryValues?.allowDoubleQuotes;
+function extractLiteralValue(path, { unescapeUnicode }) {
 	const { node } = path;
 	let offset = 0;
 	let original;
@@ -933,7 +932,6 @@ function extractLiteralValue(path, { unescapeUnicode, arbitraryValues }) {
 	let literal = original;
 	if (unescapeUnicode && original.includes("\\u")) literal = decodeUnicode2(original);
 	return {
-		allowDoubleQuotes,
 		literal,
 		offset,
 		original
@@ -987,8 +985,8 @@ function replaceHandleValue(path, options) {
 	const fallbackEnabled = shouldEnableArbitraryValueFallback(options);
 	if (!alwaysEscape && !fallbackEnabled && (!classNameSet || classNameSet.size === 0)) return;
 	if (hasIgnoreComment(path.node)) return;
-	const { literal, original, allowDoubleQuotes, offset } = extractLiteralValue(path, options);
-	const candidates = (0, _weapp_tailwindcss_shared_extractors.splitCode)(literal, allowDoubleQuotes);
+	const { literal, original, offset } = extractLiteralValue(path, options);
+	const candidates = (0, tailwindcss_patch.splitCandidateTokens)(literal);
 	if (candidates.length === 0) return;
 	const debugEnabled = debug.enabled;
 	const classContext = options.wrapExpression || isClassContextLiteralPath(path);

package/dist/{precheck-D7K12zeX.mjs → precheck-mM9IVd1f.mjs}

@@ -1,11 +1,12 @@
-import { B as createDebug, C as createTailwindV4Engine, K as resolveBooleanObjectOption, c as getRuntimeClassSetCacheEntry, d as invalidateRuntimeClassSet, q as omitUndefined, s as ensureTailwindcssRuntimePatch, u as getRuntimeClassSetSignatureWithSources, x as resolveTailwindV4SourceFromPatcher } from "./v3-engine-DcvCCHfs.mjs";
+import { B as createDebug, C as createTailwindV4Engine$1, K as resolveBooleanObjectOption, c as getRuntimeClassSetCacheEntry, d as invalidateRuntimeClassSet, q as omitUndefined, s as ensureTailwindcssRuntimePatch, u as getRuntimeClassSetSignatureWithSources, x as resolveTailwindV4SourceFromPatcher } from "./v3-engine-C_KeUQG3.mjs";
 import { a as resolveDefaultCssPreflight, i as getDefaultOptions, o as DEFAULT_PARSE_CACHE_MAX_SOURCE_LENGTH, s as HARD_PARSE_CACHE_MAX_ENTRIES } from "./defaults-8xrgzxFY.mjs";
 import { i as isMap, n as defuOverrideArray } from "./utils-DsaS975I.mjs";
-import { a as applyV4CssCalcDefaults, i as resolveUniAppXOptions, o as warnMissingCssEntries, t as createTailwindcssPatcherFromContext } from "./tailwindcss-C7dJHZ0G.mjs";
+import { a as applyV4CssCalcDefaults, i as resolveUniAppXOptions, o as warnMissingCssEntries, t as createTailwindcssPatcherFromContext } from "./tailwindcss-udhXxMX9.mjs";
 import { createRequire } from "node:module";
-import path from "node:path";
 import process from "node:process";
+import path from "node:path";
 import { logger, pc } from "@weapp-tailwindcss/logger";
+import { splitCandidateTokens } from "tailwindcss-patch";
 import { rm } from "node:fs/promises";
 import { createStyleHandler } from "@weapp-tailwindcss/postcss";
 import { Buffer as Buffer$1 } from "node:buffer";
@@ -16,7 +17,6 @@ import _babelTraverse from "@babel/traverse";
 import { parse, parseExpression } from "@babel/parser";
 import MagicString from "magic-string";
 import { jsStringEscape } from "@ast-core/escape";
-import { splitCode } from "@weapp-tailwindcss/shared/extractors";
 import * as t from "@babel/types";
 //#region \0rolldown/runtime.js
 var __esmMin = (fn, res) => () => (fn && (res = fn(fn = 0)), res);
@@ -207,7 +207,7 @@ function tryGetRuntimeClassSetSync(twPatcher) {
 }
 async function collectTailwindV4GeneratorClassSet(twPatcher) {
 	try {
-		const generated = await createTailwindV4Engine(await resolveTailwindV4SourceFromPatcher(twPatcher)).generate({
+		const generated = await createTailwindV4Engine$1(await resolveTailwindV4SourceFromPatcher(twPatcher)).generate({
 			scanSources: true,
 			target: "tailwind"
 		});
@@ -919,8 +919,7 @@ function hasIgnoreComment(node) {
 	}
 	return false;
 }
-function extractLiteralValue(path, { unescapeUnicode, arbitraryValues }) {
-	const allowDoubleQuotes = arbitraryValues?.allowDoubleQuotes;
+function extractLiteralValue(path, { unescapeUnicode }) {
 	const { node } = path;
 	let offset = 0;
 	let original;
@@ -932,7 +931,6 @@ function extractLiteralValue(path, { unescapeUnicode, arbitraryValues }) {
 	let literal = original;
 	if (unescapeUnicode && original.includes("\\u")) literal = decodeUnicode2(original);
 	return {
-		allowDoubleQuotes,
 		literal,
 		offset,
 		original
@@ -986,8 +984,8 @@ function replaceHandleValue(path, options) {
 	const fallbackEnabled = shouldEnableArbitraryValueFallback(options);
 	if (!alwaysEscape && !fallbackEnabled && (!classNameSet || classNameSet.size === 0)) return;
 	if (hasIgnoreComment(path.node)) return;
-	const { literal, original, allowDoubleQuotes, offset } = extractLiteralValue(path, options);
-	const candidates = splitCode(literal, allowDoubleQuotes);
+	const { literal, original, offset } = extractLiteralValue(path, options);
+	const candidates = splitCandidateTokens(literal);
 	if (candidates.length === 0) return;
 	const debugEnabled = debug.enabled;
 	const classContext = options.wrapExpression || isClassContextLiteralPath(path);

package/dist/presets.js

@@ -1,13 +1,13 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_chunk = require("./chunk-C5U5_Hdc.js");
-const require_v3_engine = require("./v3-engine-CHItlVq5.js");
+const require_v3_engine = require("./v3-engine-DwY4Fixu.js");
 const require_utils = require("./utils-D7Ygohep.js");
-const require_tailwindcss = require("./tailwindcss-B-e2RiXr.js");
+const require_tailwindcss = require("./tailwindcss-Cl7hUlYV.js");
 require("./logger-TlKT3xmR.js");
-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 local_pkg = require("local-pkg");
 let _weapp_tailwindcss_shared = require("@weapp-tailwindcss/shared");
 let _weapp_tailwindcss_logger = require("@weapp-tailwindcss/logger");

package/dist/presets.mjs

@@ -1,9 +1,9 @@
-import { q as omitUndefined } from "./v3-engine-DcvCCHfs.mjs";
+import { q as omitUndefined } from "./v3-engine-C_KeUQG3.mjs";
 import { n as defuOverrideArray, o as resolveUniUtsPlatform } from "./utils-DsaS975I.mjs";
-import { i as resolveUniAppXOptions, n as resolveTailwindcssBasedir } from "./tailwindcss-C7dJHZ0G.mjs";
+import { i as resolveUniAppXOptions, n as resolveTailwindcssBasedir } from "./tailwindcss-udhXxMX9.mjs";
 import { t as logger } from "./logger-BNzxZbZj.mjs";
-import path from "node:path";
 import process from "node:process";
+import path from "node:path";
 import { getPackageInfoSync } from "local-pkg";
 //#region src/presets/shared.ts
 function normalizeCssEntries(entries) {

package/dist/{source-candidates-DNM8iwXW.js → source-candidates-7Q-kTOSb.js}

@@ -1,5 +1,5 @@
 const require_chunk = require("./chunk-C5U5_Hdc.js");
-const require_v3_engine = require("./v3-engine-CHItlVq5.js");
+const require_v3_engine = require("./v3-engine-DwY4Fixu.js");
 let node_path = require("node:path");
 node_path = require_chunk.__toESM(node_path);
 let tailwindcss_patch = require("tailwindcss-patch");

package/dist/{source-candidates-CX2ozpKM.mjs → source-candidates-_x8bq0Mz.mjs}

@@ -1,4 +1,4 @@
-import { L as resolveSourceScanPath, N as isFileMatchedByTailwindSourceEntries, k as FULL_SOURCE_SCAN_EXTENSION_RE, z as toPosixPath } from "./v3-engine-DcvCCHfs.mjs";
+import { L as resolveSourceScanPath, N as isFileMatchedByTailwindSourceEntries, k as FULL_SOURCE_SCAN_EXTENSION_RE, z as toPosixPath } from "./v3-engine-C_KeUQG3.mjs";
 import path from "node:path";
 import { extractSourceCandidates, resolveProjectSourceFiles } from "tailwindcss-patch";
 import { readFile } from "node:fs/promises";

package/dist/{tailwindcss-B-e2RiXr.js → tailwindcss-Cl7hUlYV.js}

@@ -1,12 +1,12 @@
 const require_chunk = require("./chunk-C5U5_Hdc.js");
-const require_v3_engine = require("./v3-engine-CHItlVq5.js");
+const require_v3_engine = require("./v3-engine-DwY4Fixu.js");
 require("./utils-D7Ygohep.js");
 let node_fs = require("node:fs");
 let node_module = require("node:module");
-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 node_url = require("node:url");
 let _weapp_tailwindcss_shared = require("@weapp-tailwindcss/shared");

package/dist/{tailwindcss-C7dJHZ0G.mjs → tailwindcss-udhXxMX9.mjs}

@@ -1,9 +1,9 @@
-import { G as normalizeStringListOption, H as readInstalledPackageMajorVersion, J as findNearestPackageRoot, V as createTailwindcssPatcher, X as findWorkspaceRoot, Y as findWorkspacePackageDir, f as runtimeSignaturePatchersSymbol, q as omitUndefined } from "./v3-engine-DcvCCHfs.mjs";
+import { G as normalizeStringListOption, H as readInstalledPackageMajorVersion, J as findNearestPackageRoot, V as createTailwindcssPatcher, X as findWorkspaceRoot, Y as findWorkspacePackageDir, f as runtimeSignaturePatchersSymbol, q as omitUndefined } from "./v3-engine-C_KeUQG3.mjs";
 import { n as defuOverrideArray } from "./utils-DsaS975I.mjs";
 import { createRequire } from "node:module";
 import { existsSync, readFileSync } from "node:fs";
-import path from "node:path";
 import process from "node:process";
+import path from "node:path";
 import { logger } from "@weapp-tailwindcss/logger";
 import { fileURLToPath } from "node:url";
 //#region src/tailwindcss/v4/css-sources.ts

package/dist/{v3-engine-DcvCCHfs.mjs → v3-engine-C_KeUQG3.mjs}

@@ -1,9 +1,9 @@
-import { a as transformCssMacroCss, n as hasCssMacroTailwindPlugin, o as withCssMacroStyleOptions, r as hasCssMacroTailwindV4Directive, t as hasCssMacroStyleOptions } from "./auto-XyKTOP7B.mjs";
+import { a as transformCssMacroCss, n as hasCssMacroTailwindPlugin, o as withCssMacroStyleOptions, r as hasCssMacroTailwindV4Directive, t as hasCssMacroStyleOptions } from "./auto-DEHRmEAx.mjs";
 import { createRequire } from "node:module";
 import fs, { existsSync, readFileSync, readdirSync, realpathSync, statSync } from "node:fs";
 import postcss from "postcss";
-import path from "node:path";
 import process from "node:process";
+import path from "node:path";
 import { logger } from "@weapp-tailwindcss/logger";
 import { defuOverrideArray } from "@weapp-tailwindcss/shared";
 import { TailwindcssPatcher, createTailwindV4Engine, extractRawCandidates, loadTailwindV4DesignSystem, resolveProjectSourceFiles, resolveTailwindV4Source, resolveTailwindV4SourceFromPatchOptions } from "tailwindcss-patch";
@@ -747,7 +747,7 @@ function normalizeTailwindV4GeneratedUrlValues(css) {
 	});
 }
 async function transformTailwindV4CssToWeapp(css, options) {
-	const protectedCss = protectDynamicColorMixAlpha(normalizeTailwindV4GeneratedUrlValues(css), { customPropertyValues: options && "customPropertyValues" in options ? options.customPropertyValues : void 0 });
+	const protectedCss = protectDynamicColorMixAlpha(normalizeTailwindV4GeneratedUrlValues(hasCssMacroStyleOptions(options) ? await 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,
@@ -760,7 +760,7 @@ async function transformTailwindV4CssToWeapp(css, options) {
 }
 async function transformTailwindV4CssByTarget(css, target, options) {
 	if (target === "weapp") return transformTailwindV4CssToWeapp(css, options);
-	return hasCssMacroStyleOptions(options) ? transformCssMacroCss(css) : css;
+	return hasCssMacroStyleOptions(options) ? transformCssMacroCss(css, options) : css;
 }
 //#endregion
 //#region src/tailwindcss/v4-engine/tailwind-v3-default-colors.ts
@@ -2824,7 +2824,7 @@ function ensureMiniProgramV3PreflightReset(css, cssPreflight) {
 	}
 }
 async function transformTailwindV3CssToWeapp(css, options) {
-	const result = await defaultStyleHandler(css, {
+	const result = await defaultStyleHandler(hasCssMacroStyleOptions(options) ? await transformCssMacroCss(css, options) : css, {
 		cssChildCombinatorReplaceValue: ["view", "text"],
 		cssRemoveHoverPseudoClass: true,
 		isMainChunk: true,
@@ -2839,7 +2839,7 @@ async function transformTailwindV3CssToWeapp(css, options) {
 }
 async function transformTailwindV3CssByTarget(css, target, options) {
 	if (target === "weapp") return transformTailwindV3CssToWeapp(css, options);
-	return hasCssMacroStyleOptions(options) ? transformCssMacroCss(css) : css;
+	return hasCssMacroStyleOptions(options) ? transformCssMacroCss(css, options) : css;
 }
 //#endregion
 //#region src/tailwindcss/v3-engine/generator.ts