@tamagui/to-tailwind 3.0.0-beta.924.1 → 3.0.0

package/dist/cjs/transform.cjs

@@ -100,6 +100,12 @@ function createTransformGrammarConfig(options, mediaKeys, shorthands) {
 			tokenNames[category] = names;
 		}
 	}
+	for (const group in import_tooling.propTokenGroupFallbacks) {
+		const own = options.tokens?.[group];
+		const names = own ? /* @__PURE__ */ new Set() : tokenNames[import_tooling.propTokenGroupFallbacks[group]];
+		if (own) addConfigNames(names, own);
+		if (names) tokenNames[group] = names;
+	}
 	if (options.fonts) {
 		tokenNames.fontFamily ||= /* @__PURE__ */ new Set();
 		tokenNames.fontSize ||= /* @__PURE__ */ new Set();
@@ -161,7 +167,8 @@ function tamaguiToTailwind(source, options = {}) {
 		componentAllow: new Set(options.components ?? []),
 		shorthands,
 		grammarConfig,
-		modifierRegistry: (0, import_tooling.createModifierRegistry)(grammarConfig).registry
+		modifierRegistry: (0, import_tooling.createModifierRegistry)(grammarConfig).registry,
+		rewriteImports: options.rewriteImports === true
 	};
 	let ast;
 	try {
@@ -281,9 +288,12 @@ function tamaguiToTailwind(source, options = {}) {
 			didTransform = true;
 		}
 	} });
+	if (options.rewriteImports && rewriteTailwindFrontendImports(ast)) {
+		didTransform = true;
+	}
 	if (!didTransform) return source;
 	const output = generate(ast, {
-		retainLines: true,
+		retainLines: options.retainLines !== false,
 		concise: false
 	});
 	return output.code;
@@ -299,6 +309,11 @@ const knownCompoundComponents = /* @__PURE__ */ new Set([
 	"Popover.Content",
 	"Tabs.Tab"
 ]);
+const tailwindFrontendImports = /* @__PURE__ */ new Set([
+	"html",
+	"View",
+	"Text"
+]);
 function isTamaguiSource(source) {
 	return source === "tamagui" || source.startsWith("@tamagui/");
 }
@@ -340,15 +355,20 @@ function resolveTamaguiComponent(path, ctx) {
 			} else {
 				return null;
 			}
+			if (ctx.rewriteImports && source !== "@tamagui/tailwind" && (source !== "tamagui" && source !== "@tamagui/core" || !tailwindFrontendImports.has(tamaguiBase) || !isTailwindFrontendOnlyBinding(binding, tamaguiBase))) {
+				return null;
+			}
 		} else {
 			return null;
 		}
 	} else {
 		tamaguiBase = baseName;
+		if (ctx.rewriteImports && !tailwindFrontendImports.has(tamaguiBase)) return null;
 	}
 	const name = memberChain.length ? [tamaguiBase, ...memberChain].join(".") : tamaguiBase;
 	const isSimpleKnown = memberChain.length === 0 && name in import_componentToTag.componentToTag;
-	if (!isSimpleKnown && !knownCompoundComponents.has(name) && !ctx.componentAllow.has(name)) {
+	const isHTMLPrimitive = tamaguiBase === "html" && memberChain.length === 1;
+	if (!isSimpleKnown && !isHTMLPrimitive && !knownCompoundComponents.has(name) && !ctx.componentAllow.has(name)) {
 		return null;
 	}
 	return {
@@ -357,6 +377,47 @@ function resolveTamaguiComponent(path, ctx) {
 		isPlainIdentifier
 	};
 }
+function isTailwindFrontendOnlyBinding(binding, importedName) {
+	return binding.referencePaths.every((referencePath) => {
+		const parent = referencePath.parent;
+		if (importedName === "html") {
+			return t.isJSXMemberExpression(parent) && parent.object === referencePath.node && (t.isJSXOpeningElement(referencePath.parentPath?.parent) || t.isJSXClosingElement(referencePath.parentPath?.parent));
+		}
+		return t.isJSXIdentifier(referencePath.node) && (t.isJSXOpeningElement(parent) || t.isJSXClosingElement(parent)) && parent.name === referencePath.node;
+	});
+}
+function rewriteTailwindFrontendImports(ast) {
+	let changed = false;
+	traverse(ast, { ImportDeclaration(path) {
+		const source = String(path.node.source.value);
+		if (source !== "tamagui" && source !== "@tamagui/core") return;
+		if (path.node.importKind === "type") return;
+		const moved = [];
+		const retained = [];
+		for (const specifier of path.node.specifiers) {
+			if (!t.isImportSpecifier(specifier) || specifier.importKind === "type") {
+				retained.push(specifier);
+				continue;
+			}
+			const importedName = t.isIdentifier(specifier.imported) ? specifier.imported.name : String(specifier.imported.value);
+			const binding = path.scope.getBinding(specifier.local.name);
+			if (!tailwindFrontendImports.has(importedName) || !binding || !isTailwindFrontendOnlyBinding(binding, importedName)) {
+				retained.push(specifier);
+				continue;
+			}
+			moved.push(specifier);
+		}
+		if (!moved.length) return;
+		changed = true;
+		if (!retained.length) {
+			path.node.source = t.stringLiteral("@tamagui/tailwind");
+			return;
+		}
+		path.node.specifiers = retained;
+		path.insertAfter(t.importDeclaration(moved, t.stringLiteral("@tamagui/tailwind")));
+	} });
+	return changed;
+}
 function classPrefixOf(token) {
 	const noMod = token.slice(token.lastIndexOf(":") + 1);
 	const core = noMod[0] === "-" ? noMod.slice(1) : noMod;
@@ -544,7 +605,12 @@ function formatStringValue(ctx, prop, value) {
 			valueKind: "convenience"
 		};
 	}
-	if (/^-?\d+(\.\d+)?$/.test(value)) return null;
+	if (/^-?\d+(\.\d+)?$/.test(value)) {
+		return prop === "lineHeight" ? {
+			value,
+			valueKind: "arbitrary"
+		} : null;
+	}
 	if (value.endsWith("%")) {
 		const exact = {
 			"100%": "full",
@@ -597,6 +663,12 @@ const pxLengthProps = /* @__PURE__ */ new Set([
 	"paddingRight",
 	"paddingBottom",
 	"paddingLeft",
+	"paddingStart",
+	"paddingEnd",
+	"paddingInlineStart",
+	"paddingInlineEnd",
+	"paddingBlockStart",
+	"paddingBlockEnd",
 	"paddingHorizontal",
 	"paddingVertical",
 	"margin",
@@ -604,6 +676,12 @@ const pxLengthProps = /* @__PURE__ */ new Set([
 	"marginRight",
 	"marginBottom",
 	"marginLeft",
+	"marginStart",
+	"marginEnd",
+	"marginInlineStart",
+	"marginInlineEnd",
+	"marginBlockStart",
+	"marginBlockEnd",
 	"marginHorizontal",
 	"marginVertical",
 	"gap",
@@ -614,14 +692,23 @@ const pxLengthProps = /* @__PURE__ */ new Set([
 	"bottom",
 	"left",
 	"inset",
+	"insetInlineStart",
+	"insetInlineEnd",
 	"borderRadius",
 	"borderTopLeftRadius",
 	"borderTopRightRadius",
 	"borderBottomLeftRadius",
 	"borderBottomRightRadius",
+	"borderTopStartRadius",
+	"borderTopEndRadius",
+	"borderBottomStartRadius",
+	"borderBottomEndRadius",
+	"borderStartStartRadius",
+	"borderStartEndRadius",
+	"borderEndStartRadius",
+	"borderEndEndRadius",
 	"fontSize",
-	"letterSpacing",
-	"lineHeight"
+	"letterSpacing"
 ]);
 function formatNumericValue(prop, value) {
 	if (prop === "opacity") {
@@ -634,10 +721,12 @@ function formatNumericValue(prop, value) {
 			valueKind: "arbitrary"
 		};
 	}
-	if (prop === "aspectRatio") return {
-		value: String(value),
-		valueKind: "arbitrary"
-	};
+	if (prop === "aspectRatio" || prop === "lineHeight") {
+		return {
+			value: String(value),
+			valueKind: "arbitrary"
+		};
+	}
 	if (prop === "scale" || prop === "scaleX" || prop === "scaleY") {
 		if (value === 0) return {
 			value: "0",

package/dist/cjs/transform.native.cjs

@@ -39,13 +39,6 @@ var t = __toESM(require("@babel/types"), 1);
 var import_tooling = require("@tamagui/style-grammar/tooling");
 var import_componentToTag = require("./maps/componentToTag.native.js");
 var import_v4 = require("@tamagui/shorthands/v4");
-function _instanceof(left, right) {
-	if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
-		return !!right[Symbol.hasInstance](left);
-	} else {
-		return left instanceof right;
-	}
-}
 var _traverse_default;
 var traverse = (_traverse_default = import_traverse.default.default) !== null && _traverse_default !== void 0 ? _traverse_default : import_traverse.default;
 var _generate_default;
@@ -63,7 +56,7 @@ function getV6ThemeName(name) {
 function namesToSet(names) {
 	if (!names) return /* @__PURE__ */ new Set();
 	if (Array.isArray(names)) return new Set(names);
-	if (_instanceof(names, Set)) return new Set(names);
+	if (names instanceof Set) return new Set(names);
 	return new Set(Object.keys(names));
 }
 function addConfigNames(target, source) {
@@ -133,6 +126,13 @@ function createTransformGrammarConfig(options, mediaKeys, shorthands) {
 			}
 		}
 	}
+	for (var group in import_tooling.propTokenGroupFallbacks) {
+		var _options_tokens1;
+		var own = (_options_tokens1 = options.tokens) === null || _options_tokens1 === void 0 ? void 0 : _options_tokens1[group];
+		var names1 = own ? /* @__PURE__ */ new Set() : tokenNames[import_tooling.propTokenGroupFallbacks[group]];
+		if (own) addConfigNames(names1, own);
+		if (names1) tokenNames[group] = names1;
+	}
 	if (options.fonts) {
 		var _tokenNames, _tokenNames1, _tokenNames2, _tokenNames3, _tokenNames4;
 		(_tokenNames = tokenNames).fontFamily || (_tokenNames.fontFamily = /* @__PURE__ */ new Set());
@@ -200,7 +200,8 @@ function tamaguiToTailwind(source) {
 		componentAllow: new Set((_options_components = options.components) !== null && _options_components !== void 0 ? _options_components : []),
 		shorthands,
 		grammarConfig,
-		modifierRegistry: (0, import_tooling.createModifierRegistry)(grammarConfig).registry
+		modifierRegistry: (0, import_tooling.createModifierRegistry)(grammarConfig).registry,
+		rewriteImports: options.rewriteImports === true
 	};
 	var ast;
 	try {
@@ -466,9 +467,12 @@ function tamaguiToTailwind(source) {
 			didTransform = true;
 		}
 	} });
+	if (options.rewriteImports && rewriteTailwindFrontendImports(ast)) {
+		didTransform = true;
+	}
 	if (!didTransform) return source;
 	var output = generate(ast, {
-		retainLines: true,
+		retainLines: options.retainLines !== false,
 		concise: false
 	});
 	return output.code;
@@ -484,6 +488,11 @@ var knownCompoundComponents = /* @__PURE__ */ new Set([
 	"Popover.Content",
 	"Tabs.Tab"
 ]);
+var tailwindFrontendImports = /* @__PURE__ */ new Set([
+	"html",
+	"View",
+	"Text"
+]);
 function isTamaguiSource(source) {
 	return source === "tamagui" || source.startsWith("@tamagui/");
 }
@@ -526,15 +535,20 @@ function resolveTamaguiComponent(path, ctx) {
 			} else {
 				return null;
 			}
+			if (ctx.rewriteImports && source !== "@tamagui/tailwind" && (source !== "tamagui" && source !== "@tamagui/core" || !tailwindFrontendImports.has(tamaguiBase) || !isTailwindFrontendOnlyBinding(binding, tamaguiBase))) {
+				return null;
+			}
 		} else {
 			return null;
 		}
 	} else {
 		tamaguiBase = baseName;
+		if (ctx.rewriteImports && !tailwindFrontendImports.has(tamaguiBase)) return null;
 	}
 	var name = memberChain.length ? [tamaguiBase, ...memberChain].join(".") : tamaguiBase;
 	var isSimpleKnown = memberChain.length === 0 && name in import_componentToTag.componentToTag;
-	if (!isSimpleKnown && !knownCompoundComponents.has(name) && !ctx.componentAllow.has(name)) {
+	var isHTMLPrimitive = tamaguiBase === "html" && memberChain.length === 1;
+	if (!isSimpleKnown && !isHTMLPrimitive && !knownCompoundComponents.has(name) && !ctx.componentAllow.has(name)) {
 		return null;
 	}
 	return {
@@ -543,6 +557,65 @@ function resolveTamaguiComponent(path, ctx) {
 		isPlainIdentifier
 	};
 }
+function isTailwindFrontendOnlyBinding(binding, importedName) {
+	return binding.referencePaths.every(function(referencePath) {
+		var parent = referencePath.parent;
+		if (importedName === "html") {
+			var _referencePath_parentPath, _referencePath_parentPath1;
+			return t.isJSXMemberExpression(parent) && parent.object === referencePath.node && (t.isJSXOpeningElement((_referencePath_parentPath = referencePath.parentPath) === null || _referencePath_parentPath === void 0 ? void 0 : _referencePath_parentPath.parent) || t.isJSXClosingElement((_referencePath_parentPath1 = referencePath.parentPath) === null || _referencePath_parentPath1 === void 0 ? void 0 : _referencePath_parentPath1.parent));
+		}
+		return t.isJSXIdentifier(referencePath.node) && (t.isJSXOpeningElement(parent) || t.isJSXClosingElement(parent)) && parent.name === referencePath.node;
+	});
+}
+function rewriteTailwindFrontendImports(ast) {
+	var changed = false;
+	traverse(ast, { ImportDeclaration(path) {
+		var source = String(path.node.source.value);
+		if (source !== "tamagui" && source !== "@tamagui/core") return;
+		if (path.node.importKind === "type") return;
+		var moved = [];
+		var retained = [];
+		var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
+		try {
+			for (var _iterator = path.node.specifiers[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+				var specifier = _step.value;
+				if (!t.isImportSpecifier(specifier) || specifier.importKind === "type") {
+					retained.push(specifier);
+					continue;
+				}
+				var importedName = t.isIdentifier(specifier.imported) ? specifier.imported.name : String(specifier.imported.value);
+				var binding = path.scope.getBinding(specifier.local.name);
+				if (!tailwindFrontendImports.has(importedName) || !binding || !isTailwindFrontendOnlyBinding(binding, importedName)) {
+					retained.push(specifier);
+					continue;
+				}
+				moved.push(specifier);
+			}
+		} catch (err) {
+			_didIteratorError = true;
+			_iteratorError = err;
+		} finally {
+			try {
+				if (!_iteratorNormalCompletion && _iterator.return != null) {
+					_iterator.return();
+				}
+			} finally {
+				if (_didIteratorError) {
+					throw _iteratorError;
+				}
+			}
+		}
+		if (!moved.length) return;
+		changed = true;
+		if (!retained.length) {
+			path.node.source = t.stringLiteral("@tamagui/tailwind");
+			return;
+		}
+		path.node.specifiers = retained;
+		path.insertAfter(t.importDeclaration(moved, t.stringLiteral("@tamagui/tailwind")));
+	} });
+	return changed;
+}
 function classPrefixOf(token) {
 	var noMod = token.slice(token.lastIndexOf(":") + 1);
 	var core = noMod[0] === "-" ? noMod.slice(1) : noMod;
@@ -740,7 +813,7 @@ function resolveShorthand(ctx, name) {
 function hasConfiguredName(names, value) {
 	if (!names) return false;
 	if (Array.isArray(names)) return names.includes(value);
-	if (_instanceof(names, Set)) return names.has(value);
+	if (names instanceof Set) return names.has(value);
 	return value in names;
 }
 function formatStringValue(ctx, prop, value) {
@@ -771,7 +844,12 @@ function formatStringValue(ctx, prop, value) {
 			valueKind: "convenience"
 		};
 	}
-	if (/^-?\d+(\.\d+)?$/.test(value)) return null;
+	if (/^-?\d+(\.\d+)?$/.test(value)) {
+		return prop === "lineHeight" ? {
+			value,
+			valueKind: "arbitrary"
+		} : null;
+	}
 	if (value.endsWith("%")) {
 		var exact = {
 			"100%": "full",
@@ -824,6 +902,12 @@ var pxLengthProps = /* @__PURE__ */ new Set([
 	"paddingRight",
 	"paddingBottom",
 	"paddingLeft",
+	"paddingStart",
+	"paddingEnd",
+	"paddingInlineStart",
+	"paddingInlineEnd",
+	"paddingBlockStart",
+	"paddingBlockEnd",
 	"paddingHorizontal",
 	"paddingVertical",
 	"margin",
@@ -831,6 +915,12 @@ var pxLengthProps = /* @__PURE__ */ new Set([
 	"marginRight",
 	"marginBottom",
 	"marginLeft",
+	"marginStart",
+	"marginEnd",
+	"marginInlineStart",
+	"marginInlineEnd",
+	"marginBlockStart",
+	"marginBlockEnd",
 	"marginHorizontal",
 	"marginVertical",
 	"gap",
@@ -841,14 +931,23 @@ var pxLengthProps = /* @__PURE__ */ new Set([
 	"bottom",
 	"left",
 	"inset",
+	"insetInlineStart",
+	"insetInlineEnd",
 	"borderRadius",
 	"borderTopLeftRadius",
 	"borderTopRightRadius",
 	"borderBottomLeftRadius",
 	"borderBottomRightRadius",
+	"borderTopStartRadius",
+	"borderTopEndRadius",
+	"borderBottomStartRadius",
+	"borderBottomEndRadius",
+	"borderStartStartRadius",
+	"borderStartEndRadius",
+	"borderEndStartRadius",
+	"borderEndEndRadius",
 	"fontSize",
-	"letterSpacing",
-	"lineHeight"
+	"letterSpacing"
 ]);
 function formatNumericValue(prop, value) {
 	if (prop === "opacity") {
@@ -861,10 +960,12 @@ function formatNumericValue(prop, value) {
 			valueKind: "arbitrary"
 		};
 	}
-	if (prop === "aspectRatio") return {
-		value: String(value),
-		valueKind: "arbitrary"
-	};
+	if (prop === "aspectRatio" || prop === "lineHeight") {
+		return {
+			value: String(value),
+			valueKind: "arbitrary"
+		};
+	}
 	if (prop === "scale" || prop === "scaleX" || prop === "scaleY") {
 		if (value === 0) return {
 			value: "0",

package/dist/cjs/transform.native.js

@@ -39,13 +39,6 @@ var t = __toESM(require("@babel/types"), 1);
 var import_tooling = require("@tamagui/style-grammar/tooling");
 var import_componentToTag = require("./maps/componentToTag.native.js");
 var import_v4 = require("@tamagui/shorthands/v4");
-function _instanceof(left, right) {
-	if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
-		return !!right[Symbol.hasInstance](left);
-	} else {
-		return left instanceof right;
-	}
-}
 var _traverse_default;
 var traverse = (_traverse_default = import_traverse.default.default) !== null && _traverse_default !== void 0 ? _traverse_default : import_traverse.default;
 var _generate_default;
@@ -63,7 +56,7 @@ function getV6ThemeName(name) {
 function namesToSet(names) {
 	if (!names) return /* @__PURE__ */ new Set();
 	if (Array.isArray(names)) return new Set(names);
-	if (_instanceof(names, Set)) return new Set(names);
+	if (names instanceof Set) return new Set(names);
 	return new Set(Object.keys(names));
 }
 function addConfigNames(target, source) {
@@ -133,6 +126,13 @@ function createTransformGrammarConfig(options, mediaKeys, shorthands) {
 			}
 		}
 	}
+	for (var group in import_tooling.propTokenGroupFallbacks) {
+		var _options_tokens1;
+		var own = (_options_tokens1 = options.tokens) === null || _options_tokens1 === void 0 ? void 0 : _options_tokens1[group];
+		var names1 = own ? /* @__PURE__ */ new Set() : tokenNames[import_tooling.propTokenGroupFallbacks[group]];
+		if (own) addConfigNames(names1, own);
+		if (names1) tokenNames[group] = names1;
+	}
 	if (options.fonts) {
 		var _tokenNames, _tokenNames1, _tokenNames2, _tokenNames3, _tokenNames4;
 		(_tokenNames = tokenNames).fontFamily || (_tokenNames.fontFamily = /* @__PURE__ */ new Set());
@@ -200,7 +200,8 @@ function tamaguiToTailwind(source) {
 		componentAllow: new Set((_options_components = options.components) !== null && _options_components !== void 0 ? _options_components : []),
 		shorthands,
 		grammarConfig,
-		modifierRegistry: (0, import_tooling.createModifierRegistry)(grammarConfig).registry
+		modifierRegistry: (0, import_tooling.createModifierRegistry)(grammarConfig).registry,
+		rewriteImports: options.rewriteImports === true
 	};
 	var ast;
 	try {
@@ -466,9 +467,12 @@ function tamaguiToTailwind(source) {
 			didTransform = true;
 		}
 	} });
+	if (options.rewriteImports && rewriteTailwindFrontendImports(ast)) {
+		didTransform = true;
+	}
 	if (!didTransform) return source;
 	var output = generate(ast, {
-		retainLines: true,
+		retainLines: options.retainLines !== false,
 		concise: false
 	});
 	return output.code;
@@ -484,6 +488,11 @@ var knownCompoundComponents = /* @__PURE__ */ new Set([
 	"Popover.Content",
 	"Tabs.Tab"
 ]);
+var tailwindFrontendImports = /* @__PURE__ */ new Set([
+	"html",
+	"View",
+	"Text"
+]);
 function isTamaguiSource(source) {
 	return source === "tamagui" || source.startsWith("@tamagui/");
 }
@@ -526,15 +535,20 @@ function resolveTamaguiComponent(path, ctx) {
 			} else {
 				return null;
 			}
+			if (ctx.rewriteImports && source !== "@tamagui/tailwind" && (source !== "tamagui" && source !== "@tamagui/core" || !tailwindFrontendImports.has(tamaguiBase) || !isTailwindFrontendOnlyBinding(binding, tamaguiBase))) {
+				return null;
+			}
 		} else {
 			return null;
 		}
 	} else {
 		tamaguiBase = baseName;
+		if (ctx.rewriteImports && !tailwindFrontendImports.has(tamaguiBase)) return null;
 	}
 	var name = memberChain.length ? [tamaguiBase, ...memberChain].join(".") : tamaguiBase;
 	var isSimpleKnown = memberChain.length === 0 && name in import_componentToTag.componentToTag;
-	if (!isSimpleKnown && !knownCompoundComponents.has(name) && !ctx.componentAllow.has(name)) {
+	var isHTMLPrimitive = tamaguiBase === "html" && memberChain.length === 1;
+	if (!isSimpleKnown && !isHTMLPrimitive && !knownCompoundComponents.has(name) && !ctx.componentAllow.has(name)) {
 		return null;
 	}
 	return {
@@ -543,6 +557,65 @@ function resolveTamaguiComponent(path, ctx) {
 		isPlainIdentifier
 	};
 }
+function isTailwindFrontendOnlyBinding(binding, importedName) {
+	return binding.referencePaths.every(function(referencePath) {
+		var parent = referencePath.parent;
+		if (importedName === "html") {
+			var _referencePath_parentPath, _referencePath_parentPath1;
+			return t.isJSXMemberExpression(parent) && parent.object === referencePath.node && (t.isJSXOpeningElement((_referencePath_parentPath = referencePath.parentPath) === null || _referencePath_parentPath === void 0 ? void 0 : _referencePath_parentPath.parent) || t.isJSXClosingElement((_referencePath_parentPath1 = referencePath.parentPath) === null || _referencePath_parentPath1 === void 0 ? void 0 : _referencePath_parentPath1.parent));
+		}
+		return t.isJSXIdentifier(referencePath.node) && (t.isJSXOpeningElement(parent) || t.isJSXClosingElement(parent)) && parent.name === referencePath.node;
+	});
+}
+function rewriteTailwindFrontendImports(ast) {
+	var changed = false;
+	traverse(ast, { ImportDeclaration(path) {
+		var source = String(path.node.source.value);
+		if (source !== "tamagui" && source !== "@tamagui/core") return;
+		if (path.node.importKind === "type") return;
+		var moved = [];
+		var retained = [];
+		var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
+		try {
+			for (var _iterator = path.node.specifiers[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+				var specifier = _step.value;
+				if (!t.isImportSpecifier(specifier) || specifier.importKind === "type") {
+					retained.push(specifier);
+					continue;
+				}
+				var importedName = t.isIdentifier(specifier.imported) ? specifier.imported.name : String(specifier.imported.value);
+				var binding = path.scope.getBinding(specifier.local.name);
+				if (!tailwindFrontendImports.has(importedName) || !binding || !isTailwindFrontendOnlyBinding(binding, importedName)) {
+					retained.push(specifier);
+					continue;
+				}
+				moved.push(specifier);
+			}
+		} catch (err) {
+			_didIteratorError = true;
+			_iteratorError = err;
+		} finally {
+			try {
+				if (!_iteratorNormalCompletion && _iterator.return != null) {
+					_iterator.return();
+				}
+			} finally {
+				if (_didIteratorError) {
+					throw _iteratorError;
+				}
+			}
+		}
+		if (!moved.length) return;
+		changed = true;
+		if (!retained.length) {
+			path.node.source = t.stringLiteral("@tamagui/tailwind");
+			return;
+		}
+		path.node.specifiers = retained;
+		path.insertAfter(t.importDeclaration(moved, t.stringLiteral("@tamagui/tailwind")));
+	} });
+	return changed;
+}
 function classPrefixOf(token) {
 	var noMod = token.slice(token.lastIndexOf(":") + 1);
 	var core = noMod[0] === "-" ? noMod.slice(1) : noMod;
@@ -740,7 +813,7 @@ function resolveShorthand(ctx, name) {
 function hasConfiguredName(names, value) {
 	if (!names) return false;
 	if (Array.isArray(names)) return names.includes(value);
-	if (_instanceof(names, Set)) return names.has(value);
+	if (names instanceof Set) return names.has(value);
 	return value in names;
 }
 function formatStringValue(ctx, prop, value) {
@@ -771,7 +844,12 @@ function formatStringValue(ctx, prop, value) {
 			valueKind: "convenience"
 		};
 	}
-	if (/^-?\d+(\.\d+)?$/.test(value)) return null;
+	if (/^-?\d+(\.\d+)?$/.test(value)) {
+		return prop === "lineHeight" ? {
+			value,
+			valueKind: "arbitrary"
+		} : null;
+	}
 	if (value.endsWith("%")) {
 		var exact = {
 			"100%": "full",
@@ -824,6 +902,12 @@ var pxLengthProps = /* @__PURE__ */ new Set([
 	"paddingRight",
 	"paddingBottom",
 	"paddingLeft",
+	"paddingStart",
+	"paddingEnd",
+	"paddingInlineStart",
+	"paddingInlineEnd",
+	"paddingBlockStart",
+	"paddingBlockEnd",
 	"paddingHorizontal",
 	"paddingVertical",
 	"margin",
@@ -831,6 +915,12 @@ var pxLengthProps = /* @__PURE__ */ new Set([
 	"marginRight",
 	"marginBottom",
 	"marginLeft",
+	"marginStart",
+	"marginEnd",
+	"marginInlineStart",
+	"marginInlineEnd",
+	"marginBlockStart",
+	"marginBlockEnd",
 	"marginHorizontal",
 	"marginVertical",
 	"gap",
@@ -841,14 +931,23 @@ var pxLengthProps = /* @__PURE__ */ new Set([
 	"bottom",
 	"left",
 	"inset",
+	"insetInlineStart",
+	"insetInlineEnd",
 	"borderRadius",
 	"borderTopLeftRadius",
 	"borderTopRightRadius",
 	"borderBottomLeftRadius",
 	"borderBottomRightRadius",
+	"borderTopStartRadius",
+	"borderTopEndRadius",
+	"borderBottomStartRadius",
+	"borderBottomEndRadius",
+	"borderStartStartRadius",
+	"borderStartEndRadius",
+	"borderEndStartRadius",
+	"borderEndEndRadius",
 	"fontSize",
-	"letterSpacing",
-	"lineHeight"
+	"letterSpacing"
 ]);
 function formatNumericValue(prop, value) {
 	if (prop === "opacity") {
@@ -861,10 +960,12 @@ function formatNumericValue(prop, value) {
 			valueKind: "arbitrary"
 		};
 	}
-	if (prop === "aspectRatio") return {
-		value: String(value),
-		valueKind: "arbitrary"
-	};
+	if (prop === "aspectRatio" || prop === "lineHeight") {
+		return {
+			value: String(value),
+			valueKind: "arbitrary"
+		};
+	}
 	if (prop === "scale" || prop === "scaleX" || prop === "scaleY") {
 		if (value === 0) return {
 			value: "0",