weapp-tailwindcss 5.0.0-next.24 → 5.0.0-next.25

package/dist/postcss-DYktK8_T.mjs

@@ -0,0 +1,169 @@
+//#region src/css-macro/constants.ts
+const queryKey = "weapp-tw-platform";
+const ifdefAtRule = "weapp-tw-ifdef";
+const ifndefAtRule = "weapp-tw-ifndef";
+function quoteAtRuleParam(value) {
+	return `"${value.replaceAll("\\", "\\\\").replaceAll("\"", "\\\"")}"`;
+}
+function createConditionalAtRule(value) {
+	return `@${ifdefAtRule} ${quoteAtRuleParam(value)}{&}`;
+}
+function createNegativeConditionalAtRule(value) {
+	return `@${ifndefAtRule} ${quoteAtRuleParam(value)}{&}`;
+}
+const UNESCAPED_UNDERSCORE_RE = /(?<!\\)_/g;
+const WHITESPACE_RE = /\s+/g;
+const LOGICAL_OPERATOR_RE = /\s*(\|\||&&)\s*/g;
+function normalComment(text) {
+	if (typeof text === "string") {
+		const normalized = text.replaceAll(UNESCAPED_UNDERSCORE_RE, " ").replaceAll(WHITESPACE_RE, " ").trim();
+		if (normalized.includes("\\")) return normalized;
+		return normalized.replaceAll(LOGICAL_OPERATOR_RE, " $1 ").replaceAll(WHITESPACE_RE, " ").trim();
+	}
+	return text;
+}
+function ifdef(text) {
+	return {
+		start: `#ifdef ${normalComment(text)}`,
+		end: `#endif`
+	};
+}
+function ifndef(text) {
+	return {
+		start: `#ifndef ${normalComment(text)}`,
+		end: `#endif`
+	};
+}
+const QUERY_KEY_REGEX = new RegExp(`\\(\\s*${queryKey}\\s*:\\s*"([^)]*)"\\)`, "g");
+function matchCustomPropertyFromValue(str, cb) {
+	let index = 0;
+	QUERY_KEY_REGEX.lastIndex = 0;
+	let arr = QUERY_KEY_REGEX.exec(str);
+	while (arr !== null) {
+		cb(arr, index);
+		index++;
+		arr = QUERY_KEY_REGEX.exec(str);
+	}
+}
+function parseConditionalAtRuleParam(params) {
+	const value = params.trim();
+	const quoted = /^(['"])((?:\\.|(?!\1).)*)\1/.exec(value);
+	if (!quoted) return value;
+	return quoted[2]?.replaceAll(/\\(["'\\])/g, "$1") ?? "";
+}
+//#endregion
+//#region src/css-macro/postcss.ts
+const IFDEF_ENDIF_RE = /#(?:ifn?def|endif)/;
+const CONDITIONAL_COMMENT_SPACING = " ";
+const CSS_MACRO_POSTCSS_PLUGIN_NAME = "postcss-weapp-tw-css-macro-plugin";
+const creator = () => {
+	return {
+		postcssPlugin: CSS_MACRO_POSTCSS_PLUGIN_NAME,
+		prepare() {
+			function replaceAtRuleWithConditionalComments(atRule, helper, comment) {
+				const hasPreviousNode = Boolean(atRule.prev());
+				const clonedNodes = (atRule.nodes ?? []).map((node) => node.clone());
+				const startComment = helper.comment({
+					raws: {
+						left: CONDITIONAL_COMMENT_SPACING,
+						right: CONDITIONAL_COMMENT_SPACING
+					},
+					text: comment.start
+				});
+				const endComment = helper.comment({
+					raws: {
+						left: CONDITIONAL_COMMENT_SPACING,
+						right: CONDITIONAL_COMMENT_SPACING
+					},
+					text: comment.end
+				});
+				const nextNodes = [
+					startComment,
+					...clonedNodes,
+					endComment
+				];
+				atRule.replaceWith(nextNodes);
+				startComment.raws.before = hasPreviousNode ? "\n" : "";
+				startComment.raws.after = "\n";
+				if (clonedNodes[0]) clonedNodes[0].raws.before = "\n";
+				endComment.raws.before = "\n";
+				endComment.raws.after = "\n";
+				const nextNode = endComment?.next();
+				if (nextNode) nextNode.raws.before = "\n";
+			}
+			function replaceNestedAtRuleWithConditionalRule(atRule, helper, comment) {
+				if (atRule.parent?.type !== "rule") return false;
+				const parentRule = atRule.parent;
+				const clonedNodes = (atRule.nodes ?? []).map((node) => node.clone());
+				const conditionalRule = parentRule.clone();
+				conditionalRule.removeAll();
+				conditionalRule.append(...clonedNodes);
+				const startComment = helper.comment({
+					raws: {
+						left: CONDITIONAL_COMMENT_SPACING,
+						right: CONDITIONAL_COMMENT_SPACING
+					},
+					text: comment.start
+				});
+				const endComment = helper.comment({
+					raws: {
+						left: CONDITIONAL_COMMENT_SPACING,
+						right: CONDITIONAL_COMMENT_SPACING
+					},
+					text: comment.end
+				});
+				const nextNodes = [
+					startComment,
+					conditionalRule,
+					endComment
+				];
+				const hasPreviousNode = Boolean(parentRule.prev());
+				atRule.remove();
+				if ((parentRule.nodes?.length ?? 0) === 0) parentRule.replaceWith(nextNodes);
+				else parentRule.after(nextNodes);
+				startComment.raws.before = hasPreviousNode ? "\n" : "";
+				startComment.raws.after = "\n";
+				conditionalRule.raws.before = "\n";
+				endComment.raws.before = "\n";
+				endComment.raws.after = "\n";
+				const nextNode = endComment.next();
+				if (nextNode) nextNode.raws.before = "\n";
+				return true;
+			}
+			return {
+				AtRule(atRule, helper) {
+					if (atRule.name === "weapp-tw-ifdef" || atRule.name === "weapp-tw-ifndef") {
+						const text = parseConditionalAtRuleParam(atRule.params);
+						const comment = atRule.name === "weapp-tw-ifndef" ? ifndef(text) : ifdef(text);
+						if (replaceNestedAtRuleWithConditionalRule(atRule, helper, comment)) return;
+						replaceAtRuleWithConditionalComments(atRule, helper, comment);
+						return;
+					}
+					if (atRule.name === "media") {
+						const values = [];
+						matchCustomPropertyFromValue(atRule.params, (arr) => {
+							const value = arr[1];
+							if (value) values.push(value);
+						});
+						if (values.length > 0) {
+							const isNegative = atRule.params.includes("not");
+							const text = values.join(" ");
+							const comment = isNegative ? ifndef(text) : ifdef(text);
+							if (replaceNestedAtRuleWithConditionalRule(atRule, helper, comment)) return;
+							replaceAtRuleWithConditionalComments(atRule, helper, comment);
+						}
+					}
+				},
+				CommentExit(comment) {
+					if (IFDEF_ENDIF_RE.test(comment.text)) {
+						comment.raws.left = CONDITIONAL_COMMENT_SPACING;
+						comment.raws.right = CONDITIONAL_COMMENT_SPACING;
+					}
+				}
+			};
+		}
+	};
+};
+creator.postcss = true;
+//#endregion
+export { createNegativeConditionalAtRule as i, creator as n, createConditionalAtRule as r, CSS_MACRO_POSTCSS_PLUGIN_NAME as t };

package/dist/postcss.js

@@ -2,6 +2,6 @@ Object.defineProperties(exports, {
 	__esModule: { value: true },
 	[Symbol.toStringTag]: { value: "Module" }
 });
-const require_postcss = require("./postcss-cD5PXmMU.js");
+const require_postcss = require("./postcss-BAO9tGi5.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-nk5bhdoV.mjs";
+import { t as weappTailwindcssPostcssPlugin } from "./postcss-CYPHxj7a.mjs";
 export { weappTailwindcssPostcssPlugin as default, weappTailwindcssPostcssPlugin };

package/dist/{precheck-DreRGvYH.mjs → precheck-B4CpMt_w.mjs}

@@ -1,7 +1,7 @@
-import { B as createDebug, C as createTailwindV4Engine, G as omitUndefined, c as getRuntimeClassSetCacheEntry, d as invalidateRuntimeClassSet, s as ensureTailwindcssRuntimePatch, u as getRuntimeClassSetSignatureWithSources, x as resolveTailwindV4SourceFromPatcher } from "./v3-engine-CXqgQZUc.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-C6sIKXgC.mjs";
-import { i as isMap, n as defuOverrideArray } from "./utils-CGBVVNm6.mjs";
-import { a as applyV4CssCalcDefaults, i as resolveUniAppXOptions, o as warnMissingCssEntries, r as isUniAppXEnabled, t as createTailwindcssPatcherFromContext } from "./tailwindcss-DO-VVR5k.mjs";
+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-COw08vWd.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-B-1EEhdL.mjs";
+import { i as isMap, n as defuOverrideArray } from "./utils-B2SJgA1L.mjs";
+import { a as applyV4CssCalcDefaults, i as resolveUniAppXOptions, o as warnMissingCssEntries, t as createTailwindcssPatcherFromContext } from "./tailwindcss-ujlr9Iad.mjs";
 import path from "node:path";
 import process from "node:process";
 import { logger, pc } from "@weapp-tailwindcss/logger";
@@ -13,7 +13,6 @@ import { md5 as md5Hash } from "@weapp-tailwindcss/shared/node";
 import { MappingChars2String, escape } from "@weapp-core/escape";
 import _babelTraverse from "@babel/traverse";
 import { parse, parseExpression } from "@babel/parser";
-import { escapeStringRegexp } from "@weapp-core/regex";
 import MagicString from "magic-string";
 import { jsStringEscape } from "@ast-core/escape";
 import { splitCode } from "@weapp-tailwindcss/shared/extractors";
@@ -345,6 +344,23 @@ function logTailwindcssTarget(patcher, baseDir) {
 	logger.debug("%s 解析 Tailwind CSS -> %s%s", label, displayPath, version);
 }
 //#endregion
+//#region src/unocss/index.ts
+function normalizeUnocssOptions(unocss) {
+	return resolveBooleanObjectOption(unocss, {});
+}
+function resolveUnocssBareArbitraryValues(arbitraryValues, unocss) {
+	const baseArbitraryValues = arbitraryValues ?? {};
+	const options = normalizeUnocssOptions(unocss);
+	if (!options) return baseArbitraryValues;
+	if (baseArbitraryValues.bareArbitraryValues !== void 0 && baseArbitraryValues.bareArbitraryValues !== false) return baseArbitraryValues;
+	const bareArbitraryValues = options.bareArbitraryValues ?? true;
+	if (bareArbitraryValues === false) return baseArbitraryValues;
+	return {
+		...baseArbitraryValues,
+		bareArbitraryValues
+	};
+}
+//#endregion
 //#region src/context/compiler-context-cache.ts
 const PAREN_CONTENT_RE = /\(([^)]+)\)/u;
 const AT_LOCATION_RE = /at\s+(\S.*)$/u;
@@ -547,21 +563,18 @@ function toCustomAttributesEntities(customAttributes) {
 	return Object.entries(customAttributes);
 }
 //#endregion
-//#region src/constants.ts
-const pluginName = "weapp-tailwindcss";
-const vitePluginName = "weapp-tailwindcss:adaptor";
-const DEFAULT_RUNTIME_PACKAGE_REPLACEMENTS = {
-	"tailwind-merge": "@weapp-tailwindcss/merge",
-	"class-variance-authority": "@weapp-tailwindcss/cva",
-	"tailwind-variants": "@weapp-tailwindcss/variants"
-};
-//#endregion
 //#region src/babel/index.ts
 function _interopDefaultCompat(e) {
 	return e && typeof e === "object" && "default" in e ? e.default : e;
 }
 const traverse = _interopDefaultCompat(_babelTraverse);
 //#endregion
+//#region src/utils/regex.ts
+function escapeStringRegexp(str) {
+	if (typeof str !== "string") throw new TypeError("Expected a string");
+	return str.replaceAll(/[$()*+.?[\\\]^{|}]/g, "\\$&").replaceAll("-", "\\x2d");
+}
+//#endregion
 //#region src/utils/nameMatcher.ts
 const NEVER_MATCH_NAME$1 = () => false;
 const GLOBAL_FLAG_REGEXP = /g/g;
@@ -2498,10 +2511,19 @@ function createTemplateHandler(options = {}) {
 	};
 }
 //#endregion
-//#region src/context/handlers.ts
+//#region src/constants.ts
+const pluginName = "weapp-tailwindcss";
+const vitePluginName = "weapp-tailwindcss:adaptor";
+const DEFAULT_RUNTIME_PACKAGE_REPLACEMENTS = {
+	"tailwind-merge": "@weapp-tailwindcss/merge",
+	"class-variance-authority": "@weapp-tailwindcss/cva",
+	"tailwind-variants": "@weapp-tailwindcss/variants"
+};
+//#endregion
+//#region src/context/runtime-package-replacements.ts
 function resolveRuntimePackageReplacements(option) {
-	if (!option) return;
-	const mapping = option === true ? DEFAULT_RUNTIME_PACKAGE_REPLACEMENTS : option;
+	const mapping = resolveBooleanObjectOption(option, DEFAULT_RUNTIME_PACKAGE_REPLACEMENTS);
+	if (!mapping) return;
 	const normalized = {};
 	for (const [from, to] of Object.entries(mapping)) {
 		if (!from || typeof to !== "string" || to.length === 0) continue;
@@ -2509,29 +2531,43 @@ function resolveRuntimePackageReplacements(option) {
 	}
 	return Object.keys(normalized).length > 0 ? normalized : void 0;
 }
+//#endregion
+//#region src/context/style-options.ts
+function resolveStyleOptionsFromContext(ctx) {
+	const resolvedUniAppXOptions = resolveUniAppXOptions(ctx.uniAppX);
+	return {
+		cssPreflight: ctx.cssPreflight,
+		cssPreflightRange: ctx.cssPreflightRange,
+		cssChildCombinatorReplaceValue: ctx.cssChildCombinatorReplaceValue,
+		cssSelectorReplacement: ctx.cssSelectorReplacement,
+		rem2rpx: ctx.rem2rpx,
+		cssRemoveProperty: ctx.cssRemoveProperty,
+		cssRemoveHoverPseudoClass: ctx.cssRemoveHoverPseudoClass,
+		cssPresetEnv: ctx.cssPresetEnv,
+		autoprefixer: ctx.autoprefixer,
+		cssCalc: ctx.cssCalc,
+		uniAppX: resolvedUniAppXOptions.enabled,
+		platform: ctx.platform,
+		px2rpx: ctx.px2rpx,
+		unitsToPx: ctx.unitsToPx,
+		unitConversion: ctx.unitConversion
+	};
+}
+//#endregion
+//#region src/context/handlers.ts
 function createHandlersFromContext(ctx, customAttributesEntities, cssCalcOptions, tailwindcssMajorVersion) {
-	const { cssPreflight, cssPreflightRange, escapeMap, cssChildCombinatorReplaceValue, injectAdditionalCssVarScope, cssSelectorReplacement, rem2rpx, postcssOptions, cssRemoveProperty, cssRemoveHoverPseudoClass, cssPresetEnv, autoprefixer, uniAppX, px2rpx, unitsToPx, arbitraryValues, jsPreserveClass, jsArbitraryValueFallback, babelParserOptions, ignoreCallExpressionIdentifiers, ignoreTaggedTemplateExpressionIdentifiers, inlineWxs, disabledDefaultTemplateHandler, replaceRuntimePackages } = ctx;
-	const uniAppXEnabled = isUniAppXEnabled(uniAppX);
+	const { escapeMap, injectAdditionalCssVarScope, postcssOptions, uniAppX, arbitraryValues, jsPreserveClass, jsArbitraryValueFallback, babelParserOptions, ignoreCallExpressionIdentifiers, ignoreTaggedTemplateExpressionIdentifiers, inlineWxs, disabledDefaultTemplateHandler, replaceRuntimePackages } = ctx;
 	const resolvedUniAppXOptions = resolveUniAppXOptions(uniAppX);
+	const styleOptions = resolveStyleOptionsFromContext(ctx);
+	const uniAppXEnabled = styleOptions.uniAppX === true;
 	const moduleSpecifierReplacements = resolveRuntimePackageReplacements(replaceRuntimePackages);
 	const styleHandler = createStyleHandler({
-		cssPreflight,
-		cssPreflightRange,
+		...styleOptions,
 		escapeMap,
-		cssChildCombinatorReplaceValue,
 		injectAdditionalCssVarScope,
-		cssSelectorReplacement,
-		rem2rpx,
 		postcssOptions,
-		cssRemoveProperty,
-		cssRemoveHoverPseudoClass,
-		cssPresetEnv,
-		autoprefixer,
-		uniAppX: uniAppXEnabled,
 		uniAppXUnsupported: resolvedUniAppXOptions.uvueUnsupported,
 		cssCalc: cssCalcOptions,
-		px2rpx,
-		unitsToPx,
 		majorVersion: tailwindcssMajorVersion
 	});
 	const jsHandler = createJsHandler({
@@ -2602,6 +2638,7 @@ async function clearTailwindcssPatcherCache(patcher, options) {
 }
 function createInternalCompilerContext(opts) {
 	const ctx = defuOverrideArray(opts, getDefaultOptions(), {});
+	ctx.arbitraryValues = resolveUnocssBareArbitraryValues(ctx.arbitraryValues, ctx.unocss);
 	ctx.escapeMap = ctx.customReplaceDictionary;
 	applyLoggerLevel(ctx.logLevel);
 	const twPatcher = createTailwindcssPatcherFromContext(ctx);
@@ -2665,4 +2702,4 @@ function shouldSkipJsTransform(rawSource, options) {
 	return !FAST_JS_TRANSFORM_HINT_RE.test(rawSource);
 }
 //#endregion
-export { ensureRuntimeClassSet as _, analyzeSource as a, isClassContextLiteralPath as c, traverse as d, pluginName as f, createTailwindRuntimeReadyPromise as g, collectRuntimeClassSet as h, createAttributeMatcher as i, replaceWxml as l, toCustomAttributesEntities as m, getCompilerContext as n, JsTokenUpdater as o, vitePluginName as p, generateCode as r, _defineProperty as s, shouldSkipJsTransform as t, babelParse as u, refreshTailwindRuntimeState as v };
+export { createTailwindRuntimeReadyPromise as _, vitePluginName as a, analyzeSource as c, isClassContextLiteralPath as d, replaceWxml as f, collectRuntimeClassSet as g, toCustomAttributesEntities as h, pluginName as i, JsTokenUpdater as l, traverse as m, getCompilerContext as n, generateCode as o, babelParse as p, resolveStyleOptionsFromContext as r, createAttributeMatcher as s, shouldSkipJsTransform as t, _defineProperty as u, ensureRuntimeClassSet as v, refreshTailwindRuntimeState as y };

package/dist/{precheck-DtYqujIx.js → precheck-ezN3ovAq.js}

@@ -1,8 +1,8 @@
 const require_chunk = require("./chunk-8l464Juk.js");
-const require_v3_engine = require("./v3-engine-vHlppqaZ.js");
-const require_defaults = require("./defaults-D3cFX6Cq.js");
-require("./utils-4ODFyoqD.js");
-const require_tailwindcss = require("./tailwindcss-BtUBeOes.js");
+const require_v3_engine = require("./v3-engine-Bbsrez2w.js");
+const require_defaults = require("./defaults-C10hYUch.js");
+require("./utils-CSA174-I.js");
+const require_tailwindcss = require("./tailwindcss-nQetCaPp.js");
 let node_path = require("node:path");
 node_path = require_chunk.__toESM(node_path);
 let node_process = require("node:process");
@@ -17,7 +17,6 @@ let _weapp_core_escape = require("@weapp-core/escape");
 let _babel_traverse = require("@babel/traverse");
 _babel_traverse = require_chunk.__toESM(_babel_traverse);
 let _babel_parser = require("@babel/parser");
-let _weapp_core_regex = require("@weapp-core/regex");
 let magic_string = require("magic-string");
 magic_string = require_chunk.__toESM(magic_string);
 let _ast_core_escape = require("@ast-core/escape");
@@ -352,6 +351,23 @@ function logTailwindcssTarget(patcher, baseDir) {
 	_weapp_tailwindcss_logger.logger.debug("%s 解析 Tailwind CSS -> %s%s", label, displayPath, version);
 }
 //#endregion
+//#region src/unocss/index.ts
+function normalizeUnocssOptions(unocss) {
+	return require_v3_engine.resolveBooleanObjectOption(unocss, {});
+}
+function resolveUnocssBareArbitraryValues(arbitraryValues, unocss) {
+	const baseArbitraryValues = arbitraryValues ?? {};
+	const options = normalizeUnocssOptions(unocss);
+	if (!options) return baseArbitraryValues;
+	if (baseArbitraryValues.bareArbitraryValues !== void 0 && baseArbitraryValues.bareArbitraryValues !== false) return baseArbitraryValues;
+	const bareArbitraryValues = options.bareArbitraryValues ?? true;
+	if (bareArbitraryValues === false) return baseArbitraryValues;
+	return {
+		...baseArbitraryValues,
+		bareArbitraryValues
+	};
+}
+//#endregion
 //#region src/context/compiler-context-cache.ts
 const PAREN_CONTENT_RE = /\(([^)]+)\)/u;
 const AT_LOCATION_RE = /at\s+(\S.*)$/u;
@@ -554,21 +570,18 @@ function toCustomAttributesEntities(customAttributes) {
 	return Object.entries(customAttributes);
 }
 //#endregion
-//#region src/constants.ts
-const pluginName = "weapp-tailwindcss";
-const vitePluginName = "weapp-tailwindcss:adaptor";
-const DEFAULT_RUNTIME_PACKAGE_REPLACEMENTS = {
-	"tailwind-merge": "@weapp-tailwindcss/merge",
-	"class-variance-authority": "@weapp-tailwindcss/cva",
-	"tailwind-variants": "@weapp-tailwindcss/variants"
-};
-//#endregion
 //#region src/babel/index.ts
 function _interopDefaultCompat(e) {
 	return e && typeof e === "object" && "default" in e ? e.default : e;
 }
 const traverse = _interopDefaultCompat(_babel_traverse.default);
 //#endregion
+//#region src/utils/regex.ts
+function escapeStringRegexp(str) {
+	if (typeof str !== "string") throw new TypeError("Expected a string");
+	return str.replaceAll(/[$()*+.?[\\\]^{|}]/g, "\\$&").replaceAll("-", "\\x2d");
+}
+//#endregion
 //#region src/utils/nameMatcher.ts
 const NEVER_MATCH_NAME$1 = () => false;
 const GLOBAL_FLAG_REGEXP = /g/g;
@@ -580,7 +593,7 @@ function buildFuzzyMatcher(fuzzyStrings) {
 		return (value) => value.includes(needle);
 	}
 	const unique = [...new Set(fuzzyStrings)];
-	const pattern = new RegExp(unique.map(_weapp_core_regex.escapeStringRegexp).join("|"));
+	const pattern = new RegExp(unique.map(escapeStringRegexp).join("|"));
 	return (value) => pattern.test(value);
 }
 function normaliseRegex(regex) {
@@ -2505,10 +2518,19 @@ function createTemplateHandler(options = {}) {
 	};
 }
 //#endregion
-//#region src/context/handlers.ts
+//#region src/constants.ts
+const pluginName = "weapp-tailwindcss";
+const vitePluginName = "weapp-tailwindcss:adaptor";
+const DEFAULT_RUNTIME_PACKAGE_REPLACEMENTS = {
+	"tailwind-merge": "@weapp-tailwindcss/merge",
+	"class-variance-authority": "@weapp-tailwindcss/cva",
+	"tailwind-variants": "@weapp-tailwindcss/variants"
+};
+//#endregion
+//#region src/context/runtime-package-replacements.ts
 function resolveRuntimePackageReplacements(option) {
-	if (!option) return;
-	const mapping = option === true ? DEFAULT_RUNTIME_PACKAGE_REPLACEMENTS : option;
+	const mapping = require_v3_engine.resolveBooleanObjectOption(option, DEFAULT_RUNTIME_PACKAGE_REPLACEMENTS);
+	if (!mapping) return;
 	const normalized = {};
 	for (const [from, to] of Object.entries(mapping)) {
 		if (!from || typeof to !== "string" || to.length === 0) continue;
@@ -2516,29 +2538,43 @@ function resolveRuntimePackageReplacements(option) {
 	}
 	return Object.keys(normalized).length > 0 ? normalized : void 0;
 }
+//#endregion
+//#region src/context/style-options.ts
+function resolveStyleOptionsFromContext(ctx) {
+	const resolvedUniAppXOptions = require_tailwindcss.resolveUniAppXOptions(ctx.uniAppX);
+	return {
+		cssPreflight: ctx.cssPreflight,
+		cssPreflightRange: ctx.cssPreflightRange,
+		cssChildCombinatorReplaceValue: ctx.cssChildCombinatorReplaceValue,
+		cssSelectorReplacement: ctx.cssSelectorReplacement,
+		rem2rpx: ctx.rem2rpx,
+		cssRemoveProperty: ctx.cssRemoveProperty,
+		cssRemoveHoverPseudoClass: ctx.cssRemoveHoverPseudoClass,
+		cssPresetEnv: ctx.cssPresetEnv,
+		autoprefixer: ctx.autoprefixer,
+		cssCalc: ctx.cssCalc,
+		uniAppX: resolvedUniAppXOptions.enabled,
+		platform: ctx.platform,
+		px2rpx: ctx.px2rpx,
+		unitsToPx: ctx.unitsToPx,
+		unitConversion: ctx.unitConversion
+	};
+}
+//#endregion
+//#region src/context/handlers.ts
 function createHandlersFromContext(ctx, customAttributesEntities, cssCalcOptions, tailwindcssMajorVersion) {
-	const { cssPreflight, cssPreflightRange, escapeMap, cssChildCombinatorReplaceValue, injectAdditionalCssVarScope, cssSelectorReplacement, rem2rpx, postcssOptions, cssRemoveProperty, cssRemoveHoverPseudoClass, cssPresetEnv, autoprefixer, uniAppX, px2rpx, unitsToPx, arbitraryValues, jsPreserveClass, jsArbitraryValueFallback, babelParserOptions, ignoreCallExpressionIdentifiers, ignoreTaggedTemplateExpressionIdentifiers, inlineWxs, disabledDefaultTemplateHandler, replaceRuntimePackages } = ctx;
-	const uniAppXEnabled = require_tailwindcss.isUniAppXEnabled(uniAppX);
+	const { escapeMap, injectAdditionalCssVarScope, postcssOptions, uniAppX, arbitraryValues, jsPreserveClass, jsArbitraryValueFallback, babelParserOptions, ignoreCallExpressionIdentifiers, ignoreTaggedTemplateExpressionIdentifiers, inlineWxs, disabledDefaultTemplateHandler, replaceRuntimePackages } = ctx;
 	const resolvedUniAppXOptions = require_tailwindcss.resolveUniAppXOptions(uniAppX);
+	const styleOptions = resolveStyleOptionsFromContext(ctx);
+	const uniAppXEnabled = styleOptions.uniAppX === true;
 	const moduleSpecifierReplacements = resolveRuntimePackageReplacements(replaceRuntimePackages);
 	const styleHandler = (0, _weapp_tailwindcss_postcss.createStyleHandler)({
-		cssPreflight,
-		cssPreflightRange,
+		...styleOptions,
 		escapeMap,
-		cssChildCombinatorReplaceValue,
 		injectAdditionalCssVarScope,
-		cssSelectorReplacement,
-		rem2rpx,
 		postcssOptions,
-		cssRemoveProperty,
-		cssRemoveHoverPseudoClass,
-		cssPresetEnv,
-		autoprefixer,
-		uniAppX: uniAppXEnabled,
 		uniAppXUnsupported: resolvedUniAppXOptions.uvueUnsupported,
 		cssCalc: cssCalcOptions,
-		px2rpx,
-		unitsToPx,
 		majorVersion: tailwindcssMajorVersion
 	});
 	const jsHandler = createJsHandler({
@@ -2609,6 +2645,7 @@ async function clearTailwindcssPatcherCache(patcher, options) {
 }
 function createInternalCompilerContext(opts) {
 	const ctx = (0, _weapp_tailwindcss_shared.defuOverrideArray)(opts, require_defaults.getDefaultOptions(), {});
+	ctx.arbitraryValues = resolveUnocssBareArbitraryValues(ctx.arbitraryValues, ctx.unocss);
 	ctx.escapeMap = ctx.customReplaceDictionary;
 	applyLoggerLevel(ctx.logLevel);
 	const twPatcher = require_tailwindcss.createTailwindcssPatcherFromContext(ctx);
@@ -2756,6 +2793,12 @@ Object.defineProperty(exports, "replaceWxml", {
 		return replaceWxml;
 	}
 });
+Object.defineProperty(exports, "resolveStyleOptionsFromContext", {
+	enumerable: true,
+	get: function() {
+		return resolveStyleOptionsFromContext;
+	}
+});
 Object.defineProperty(exports, "shouldSkipJsTransform", {
 	enumerable: true,
 	get: function() {

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

@@ -6,6 +6,7 @@ export interface UniAppXOptions {
     rem2rpx?: UserDefinedOptions['rem2rpx'];
     generator?: UserDefinedOptions['generator'];
     unitsToPx?: UserDefinedOptions['unitsToPx'];
+    unitConversion?: UserDefinedOptions['unitConversion'];
     rawOptions?: UserDefinedOptions;
     resolve?: PackageResolvingOptions;
     customAttributes?: UserDefinedOptions['customAttributes'];

package/dist/presets.js

@@ -1,9 +1,9 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_chunk = require("./chunk-8l464Juk.js");
-const require_v3_engine = require("./v3-engine-vHlppqaZ.js");
-const require_utils = require("./utils-4ODFyoqD.js");
-const require_tailwindcss = require("./tailwindcss-BtUBeOes.js");
-require("./logger-EVNB9z7i.js");
+const require_v3_engine = require("./v3-engine-Bbsrez2w.js");
+const require_utils = require("./utils-CSA174-I.js");
+const require_tailwindcss = require("./tailwindcss-nQetCaPp.js");
+require("./logger-Cdzl3p8j.js");
 let node_process = require("node:process");
 node_process = require_chunk.__toESM(node_process);
 let local_pkg = require("local-pkg");
@@ -101,6 +101,7 @@ function uniAppX(options) {
 		...options.generator !== void 0 ? { generator: options.generator } : {},
 		rem2rpx: options.rem2rpx,
 		unitsToPx: options.unitsToPx,
+		unitConversion: options.unitConversion,
 		tailwindcssBasedir: options.base,
 		tailwindcssPatcherOptions: {
 			projectRoot: options.base,

package/dist/presets.mjs

@@ -1,7 +1,7 @@
-import { G as omitUndefined } from "./v3-engine-CXqgQZUc.mjs";
-import { n as defuOverrideArray, o as resolveUniUtsPlatform } from "./utils-CGBVVNm6.mjs";
-import { i as resolveUniAppXOptions, n as resolveTailwindcssBasedir } from "./tailwindcss-DO-VVR5k.mjs";
-import { t as logger } from "./logger-CZUxvJJD.mjs";
+import { q as omitUndefined } from "./v3-engine-COw08vWd.mjs";
+import { n as defuOverrideArray, o as resolveUniUtsPlatform } from "./utils-B2SJgA1L.mjs";
+import { i as resolveUniAppXOptions, n as resolveTailwindcssBasedir } from "./tailwindcss-ujlr9Iad.mjs";
+import { t as logger } from "./logger-Dr7IvyH2.mjs";
 import process from "node:process";
 import { getPackageInfoSync } from "local-pkg";
 //#region src/presets/shared.ts
@@ -96,6 +96,7 @@ function uniAppX(options) {
 		...options.generator !== void 0 ? { generator: options.generator } : {},
 		rem2rpx: options.rem2rpx,
 		unitsToPx: options.unitsToPx,
+		unitConversion: options.unitConversion,
 		tailwindcssBasedir: options.base,
 		tailwindcssPatcherOptions: {
 			projectRoot: options.base,

package/dist/{source-candidates-lHtAHLQq.js → source-candidates-0jPRIPmC.js}

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

package/dist/{source-candidates-B7wmEa-G.mjs → source-candidates-DoyOltpZ.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-CXqgQZUc.mjs";
+import { L as resolveSourceScanPath, N as isFileMatchedByTailwindSourceEntries, k as FULL_SOURCE_SCAN_EXTENSION_RE, z as toPosixPath } from "./v3-engine-COw08vWd.mjs";
 import path from "node:path";
 import { extractSourceCandidates, resolveProjectSourceFiles } from "tailwindcss-patch";
 import { readFile } from "node:fs/promises";

package/dist/{tailwindcss-BtUBeOes.js → tailwindcss-nQetCaPp.js}

@@ -1,6 +1,6 @@
 const require_chunk = require("./chunk-8l464Juk.js");
-const require_v3_engine = require("./v3-engine-vHlppqaZ.js");
-require("./utils-4ODFyoqD.js");
+const require_v3_engine = require("./v3-engine-Bbsrez2w.js");
+require("./utils-CSA174-I.js");
 let node_fs = require("node:fs");
 let node_module = require("node:module");
 let node_path = require("node:path");
@@ -111,14 +111,7 @@ function ensureDefaultsIncluded(value) {
 	return value;
 }
 function normalizeCssEntriesConfig(entries) {
-	if (!entries) return;
-	if (typeof entries === "string") {
-		const trimmed = entries.trim();
-		return trimmed ? [trimmed] : void 0;
-	}
-	if (!Array.isArray(entries)) return;
-	const normalized = entries.map((entry) => typeof entry === "string" ? entry.trim() : "").filter((entry) => entry.length > 0);
-	return normalized.length > 0 ? normalized : void 0;
+	return require_v3_engine.normalizeStringListOption(entries);
 }
 function hasConfiguredCssEntries(ctx) {
 	if (normalizeCssEntriesConfig(ctx.cssEntries)) return true;
@@ -372,24 +365,22 @@ function tryCreateMultiTailwindcssPatcher(groups, options) {
 }
 //#endregion
 //#region src/uni-app-x/options.ts
+const DEFAULT_COMPONENT_LOCAL_STYLES_OPTIONS = {
+	enabled: true,
+	onlyWhenStyleIsolationVersion2: true
+};
+const DISABLED_COMPONENT_LOCAL_STYLES_OPTIONS = {
+	enabled: false,
+	onlyWhenStyleIsolationVersion2: true
+};
+function isBooleanUniAppXShortcut(option) {
+	return option === true || option === false || option === void 0;
+}
 function resolveComponentLocalStyles(option) {
-	if (option === false) return {
-		enabled: false,
-		onlyWhenStyleIsolationVersion2: true
-	};
-	if (option === true || option === void 0) return {
-		enabled: false,
-		onlyWhenStyleIsolationVersion2: true
-	};
+	if (isBooleanUniAppXShortcut(option)) return DISABLED_COMPONENT_LOCAL_STYLES_OPTIONS;
 	const componentLocalStyles = option.componentLocalStyles;
-	if (componentLocalStyles === false) return {
-		enabled: false,
-		onlyWhenStyleIsolationVersion2: true
-	};
-	if (componentLocalStyles === true || componentLocalStyles === void 0) return {
-		enabled: true,
-		onlyWhenStyleIsolationVersion2: true
-	};
+	if (componentLocalStyles === false) return DISABLED_COMPONENT_LOCAL_STYLES_OPTIONS;
+	if (componentLocalStyles === true || componentLocalStyles === void 0) return DEFAULT_COMPONENT_LOCAL_STYLES_OPTIONS;
 	return {
 		enabled: componentLocalStyles.enabled !== false,
 		onlyWhenStyleIsolationVersion2: componentLocalStyles.onlyWhenStyleIsolationVersion2 !== false