@tamagui/cli 3.0.0-beta.924.1 → 3.0.0

package/dist/setup-prompt.cjs

@@ -1,6 +1,8 @@
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
 	for (var name in all) __defProp(target, name, {
@@ -17,17 +19,74 @@ var __copyProps = (to, from, except, desc) => {
 	}
 	return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
+	value: mod,
+	enumerable: true
+}) : target, mod));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var setup_prompt_exports = {};
 __export(setup_prompt_exports, {
 	getSetupPrompt: () => getSetupPrompt,
-	printSetupPrompt: () => printSetupPrompt
+	printSetupPrompt: () => printSetupPrompt,
+	resolveStyleValueSyntax: () => resolveStyleValueSyntax,
+	setupPrompt: () => setupPrompt
 });
 module.exports = __toCommonJS(setup_prompt_exports);
-function printSetupPrompt() {
-	process.stdout.write(getSetupPrompt());
+var import_prompts = __toESM(require("prompts"));
+async function resolveStyleValueSyntax(setting) {
+	if (setting === "string" || setting === "object" || setting === "both") {
+		return setting;
+	}
+	if (!process.stdin.isTTY) {
+		return "both";
+	}
+	const response = await (0, import_prompts.default)({
+		type: "select",
+		name: "syntax",
+		message: "Which style value syntax would you like to document?",
+		choices: [
+			{
+				title: "both - document both string and object syntax",
+				value: "both"
+			},
+			{
+				title: "string - e.g. bg=\"red hover:blue\"",
+				value: "string"
+			},
+			{
+				title: "object - e.g. bg={{ default: \"red\", hover: \"blue\" }}",
+				value: "object"
+			}
+		],
+		initial: 0
+	});
+	return response.syntax || "both";
+}
+async function setupPrompt(options) {
+	const { generatePrompt } = require("./generate-prompt.cjs");
+	return await generatePrompt(options);
+}
+function printSetupPrompt(syntax) {
+	if (syntax) {
+		process.stdout.write(getSetupPrompt(syntax));
+		return;
+	}
+	if (!process.stdin.isTTY) {
+		process.stdout.write(getSetupPrompt("both"));
+		return;
+	}
+	resolveStyleValueSyntax().then((chosen) => {
+		process.stdout.write(getSetupPrompt(chosen));
+	});
 }
-function getSetupPrompt() {
+function getSetupPrompt(syntax = "both") {
+	const styleExample = syntax === "string" ? "```tsx\n<View bg=\"background hover:background-hover\" p=\"4 sm:6\" />\n```" : syntax === "object" ? "```tsx\n<View bg={{ default: 'background', hover: 'background-hover' }} p={{ default: '4', sm: '6' }} />\n```" : `\`\`\`tsx
+// string form
+<View bg="background hover:background-hover" p="4 sm:6" />
+
+// object form
+<View bg={{ default: 'background', hover: 'background-hover' }} p={{ default: '4', sm: '6' }} />
+\`\`\``;
 	return `You are adding Tamagui v3 to a project that does not use it yet.
 
 Work like a careful coding agent:
@@ -68,8 +127,10 @@ import { createTamagui } from 'tamagui'
 
 export const config = createTamagui(defaultConfig)
 
+type AppConfig = typeof config
+
 declare module 'tamagui' {
-  interface TamaguiCustomConfig extends typeof config {}
+  interface TamaguiCustomConfig extends AppConfig {}
 }
 \`\`\`
 
@@ -87,7 +148,7 @@ import { config } from './tamagui.config'
 export default function App() {
   return (
     <TamaguiProvider config={config} defaultTheme="light">
-      <View width={200} height={200} bg="background" />
+      <View w={200} h={200} bg="background" />
     </TamaguiProvider>
   )
 }
@@ -113,15 +174,13 @@ first.
 This is the part most likely to be written as if it were v2. In v3, token and
 theme names are bare, and conditions are flat clauses inside the value:
 
-\`\`\`tsx
-<View bg="background hover:background-hover" p="4 sm:6" />
-\`\`\`
+${styleExample}
 
 - No \`$\` sigils: \`bg="background"\`, not \`bg="$background"\`.
 - No condition objects: there is no \`hoverStyle={{ ... }}\` and no \`$sm={{ ... }}\`.
 - Modifiers chain left to right and read as prefixes: \`hover:sm:small\`.
 - Clauses work on variant props too, not just style props, so
-  \`size="large sm:small"\` selects a different variant value per condition.
+  \`size="lg sm:sm"\` selects a different variant value per condition.
 - When two clauses both apply, the winner is decided by specificity, not by
   source order: first by platform (\`ios:\` beats \`native:\` beats unprefixed),
   then by how many conditions the clause carries, then by category
@@ -132,15 +191,15 @@ theme names are bare, and conditions are flat clauses inside the value:
 ## 7. Verify before reporting success
 
 \`\`\`bash
-npx tamagui check
+npx tamagui check --strict
 \`\`\`
 
-\`tamagui check\` reports version mismatches, duplicate installs, lockfile
+\`tamagui check --strict\` reports version mismatches, duplicate installs, lockfile
 problems, a missing config, and any v2 style syntax left in source. Then run the
 project's own typecheck and build, and start the app and confirm a Tamagui
 component renders with its styles applied. A passing typecheck is not sufficient:
-flat values are strings, so a misspelled token compiles cleanly and only shows up
-at runtime.
+single-token values are checked when \`settings.allowedStyleValues\` is enabled,
+but conditional payloads also need the strict checker.
 
 ## 8. Give the agent the project's own vocabulary
 

package/dist/to-tailwind-default-config.cjs

@@ -94,13 +94,21 @@ const bundledDefaultGrammarConfig = {
 	],
 	themeNames: [
 		"light",
+		"light_white",
 		"dark_inverse",
+		"dark_white",
 		"light_level2",
+		"light_white_level2",
 		"dark_inverse_level2",
+		"dark_white_level2",
 		"light_level2_level2",
 		"light_level3",
+		"light_white_level2_level2",
+		"light_white_level3",
 		"dark_inverse_level2_level2",
 		"dark_inverse_level3",
+		"dark_white_level2_level2",
+		"dark_white_level3",
 		"light_level2_level2_level2",
 		"light_level2_level2_level3",
 		"light_level2_level2_level4",
@@ -110,6 +118,15 @@ const bundledDefaultGrammarConfig = {
 		"light_level3_level3",
 		"light_level3_level4",
 		"light_level4",
+		"light_white_level2_level2_level2",
+		"light_white_level2_level2_level3",
+		"light_white_level2_level2_level4",
+		"light_white_level2_level3",
+		"light_white_level2_level4",
+		"light_white_level3_level2",
+		"light_white_level3_level3",
+		"light_white_level3_level4",
+		"light_white_level4",
 		"dark_inverse_level2_level2_level2",
 		"dark_inverse_level2_level2_level3",
 		"dark_inverse_level2_level2_level4",
@@ -119,40 +136,64 @@ const bundledDefaultGrammarConfig = {
 		"dark_inverse_level3_level3",
 		"dark_inverse_level3_level4",
 		"dark_inverse_level4",
+		"dark_active",
+		"dark_active_level2",
+		"dark_active_level2_level2",
+		"dark_active_level2_level2_level2",
+		"dark_active_level2_level2_level3",
+		"dark_active_level2_level2_level4",
+		"dark_active_level2_level3",
+		"dark_active_level2_level4",
+		"dark_active_level3",
+		"dark_active_level3_level2",
+		"dark_active_level3_level3",
+		"dark_active_level3_level4",
+		"dark_active_level4",
+		"dark_white_level2_level2_level2",
+		"dark_white_level2_level2_level3",
+		"dark_white_level2_level2_level4",
+		"dark_white_level2_level3",
+		"dark_white_level2_level4",
+		"dark_white_level3_level2",
+		"dark_white_level3_level3",
+		"dark_white_level3_level4",
+		"dark_white_level4",
 		"light_accent",
 		"light_accent_level2",
 		"light_accent_level2_level2",
-		"light_accent_level3",
-		"light_accent_level2_level2_level2",
-		"light_accent_level2_level2_level3",
-		"light_accent_level2_level2_level4",
 		"light_accent_level2_level3",
 		"light_accent_level2_level4",
-		"light_accent_level3_level2",
-		"light_accent_level3_level3",
-		"light_accent_level3_level4",
+		"light_accent_level3",
 		"light_accent_level4",
 		"light_brand",
 		"light_brand_level2",
 		"light_brand_level2_level2",
-		"light_brand_level3",
 		"light_brand_level2_level2_level2",
 		"light_brand_level2_level2_level3",
 		"light_brand_level2_level2_level4",
 		"light_brand_level2_level3",
 		"light_brand_level2_level4",
+		"light_brand_level3",
 		"light_brand_level3_level2",
 		"light_brand_level3_level3",
 		"light_brand_level3_level4",
 		"light_brand_level4",
 		"light_inverse",
+		"light_black",
 		"dark",
+		"dark_black",
 		"light_inverse_level2",
+		"light_black_level2",
 		"dark_level2",
+		"dark_black_level2",
 		"light_inverse_level2_level2",
 		"light_inverse_level3",
+		"light_black_level2_level2",
+		"light_black_level3",
 		"dark_level2_level2",
 		"dark_level3",
+		"dark_black_level2_level2",
+		"dark_black_level3",
 		"light_inverse_level2_level2_level2",
 		"light_inverse_level2_level2_level3",
 		"light_inverse_level2_level2_level4",
@@ -162,6 +203,28 @@ const bundledDefaultGrammarConfig = {
 		"light_inverse_level3_level3",
 		"light_inverse_level3_level4",
 		"light_inverse_level4",
+		"light_active",
+		"light_active_level2",
+		"light_active_level2_level2",
+		"light_active_level2_level2_level2",
+		"light_active_level2_level2_level3",
+		"light_active_level2_level2_level4",
+		"light_active_level2_level3",
+		"light_active_level2_level4",
+		"light_active_level3",
+		"light_active_level3_level2",
+		"light_active_level3_level3",
+		"light_active_level3_level4",
+		"light_active_level4",
+		"light_black_level2_level2_level2",
+		"light_black_level2_level2_level3",
+		"light_black_level2_level2_level4",
+		"light_black_level2_level3",
+		"light_black_level2_level4",
+		"light_black_level3_level2",
+		"light_black_level3_level3",
+		"light_black_level3_level4",
+		"light_black_level4",
 		"dark_level2_level2_level2",
 		"dark_level2_level2_level3",
 		"dark_level2_level2_level4",
@@ -171,54 +234,75 @@ const bundledDefaultGrammarConfig = {
 		"dark_level3_level3",
 		"dark_level3_level4",
 		"dark_level4",
+		"dark_black_level2_level2_level2",
+		"dark_black_level2_level2_level3",
+		"dark_black_level2_level2_level4",
+		"dark_black_level2_level3",
+		"dark_black_level2_level4",
+		"dark_black_level3_level2",
+		"dark_black_level3_level3",
+		"dark_black_level3_level4",
+		"dark_black_level4",
 		"light_red",
 		"light_red_level2",
+		"light_red_level2_level2",
+		"light_red_level2_level3",
+		"light_red_level2_level4",
 		"light_red_level3",
 		"light_red_level4",
 		"light_yellow",
 		"light_yellow_level2",
+		"light_yellow_level2_level2",
+		"light_yellow_level2_level3",
+		"light_yellow_level2_level4",
 		"light_yellow_level3",
 		"light_yellow_level4",
 		"light_green",
 		"light_green_level2",
+		"light_green_level2_level2",
+		"light_green_level2_level3",
+		"light_green_level2_level4",
 		"light_green_level3",
 		"light_green_level4",
 		"dark_accent",
 		"dark_accent_level2",
 		"dark_accent_level2_level2",
-		"dark_accent_level3",
-		"dark_accent_level2_level2_level2",
-		"dark_accent_level2_level2_level3",
-		"dark_accent_level2_level2_level4",
 		"dark_accent_level2_level3",
 		"dark_accent_level2_level4",
-		"dark_accent_level3_level2",
-		"dark_accent_level3_level3",
-		"dark_accent_level3_level4",
+		"dark_accent_level3",
 		"dark_accent_level4",
 		"dark_brand",
 		"dark_brand_level2",
 		"dark_brand_level2_level2",
-		"dark_brand_level3",
 		"dark_brand_level2_level2_level2",
 		"dark_brand_level2_level2_level3",
 		"dark_brand_level2_level2_level4",
 		"dark_brand_level2_level3",
 		"dark_brand_level2_level4",
+		"dark_brand_level3",
 		"dark_brand_level3_level2",
 		"dark_brand_level3_level3",
 		"dark_brand_level3_level4",
 		"dark_brand_level4",
 		"dark_red",
 		"dark_red_level2",
+		"dark_red_level2_level2",
+		"dark_red_level2_level3",
+		"dark_red_level2_level4",
 		"dark_red_level3",
 		"dark_red_level4",
 		"dark_yellow",
 		"dark_yellow_level2",
+		"dark_yellow_level2_level2",
+		"dark_yellow_level2_level3",
+		"dark_yellow_level2_level4",
 		"dark_yellow_level3",
 		"dark_yellow_level4",
 		"dark_green",
 		"dark_green_level2",
+		"dark_green_level2_level2",
+		"dark_green_level2_level3",
+		"dark_green_level2_level4",
 		"dark_green_level3",
 		"dark_green_level4"
 	],
@@ -255,17 +339,25 @@ const bundledDefaultGrammarConfig = {
 			"80",
 			"96",
 			"px",
+			"0.5",
 			"0-5",
+			"1.5",
 			"1-5",
+			"2.5",
 			"2-5",
+			"3.5",
 			"3-5",
 			"-px",
+			"-0.5",
 			"-0-5",
 			"-1",
+			"-1.5",
 			"-1-5",
 			"-2",
+			"-2.5",
 			"-2-5",
 			"-3",
+			"-3.5",
 			"-3-5",
 			"-4",
 			"-5",
@@ -326,9 +418,13 @@ const bundledDefaultGrammarConfig = {
 			"80",
 			"96",
 			"px",
+			"0.5",
 			"0-5",
+			"1.5",
 			"1-5",
+			"2.5",
 			"2-5",
+			"3.5",
 			"3-5"
 		],
 		radius: [
@@ -656,28 +752,22 @@ const bundledDefaultGrammarConfig = {
 			"brand-800",
 			"brand-900",
 			"brand-950",
-			"shadow-1",
-			"shadow-2",
-			"shadow-3",
-			"shadow-4",
-			"shadow-5",
-			"shadow-6",
-			"shadow-7",
-			"color1",
-			"color2",
-			"color3",
-			"color4",
-			"color5",
-			"color6",
-			"color7",
-			"color8",
-			"color9",
-			"color10",
-			"color11",
+			"color-1",
+			"color-2",
+			"color-3",
+			"color-4",
+			"color-5",
+			"color-6",
+			"color-7",
+			"color-8",
+			"color-9",
+			"color-10",
+			"color-11",
 			"background",
 			"background-hover",
 			"background-press",
 			"background-focus",
+			"background-active",
 			"border-color",
 			"border-color-hover",
 			"border-color-press",
@@ -690,7 +780,14 @@ const bundledDefaultGrammarConfig = {
 			"outline-color",
 			"shadow-color",
 			"accent-background",
-			"accent-color"
+			"accent-color",
+			"shadow-1",
+			"shadow-2",
+			"shadow-3",
+			"shadow-4",
+			"shadow-5",
+			"shadow-6",
+			"shadow-7"
 		],
 		fontFamily: ["body", "heading"],
 		fontSize: [

package/dist/upgrade.cjs

@@ -29,8 +29,8 @@ __export(upgrade_exports, { upgrade: () => upgrade });
 module.exports = __toCommonJS(upgrade_exports);
 var import_chalk = __toESM(require("chalk"));
 var import_node_child_process = require("node:child_process");
+var import_glob = require("glob");
 var import_node_fs = require("node:fs");
-var import_node_path = require("node:path");
 const TAMAGUI_PACKAGES_PATTERN = /^(@tamagui\/|tamagui$)/;
 const COMMIT_TYPE_ORDER = [
 	"feat",
@@ -78,24 +78,18 @@ function parseVersionSpecifier(version) {
 		cleanVersion: version
 	};
 }
-function findPackageJsonFiles(root) {
-	const files = [];
-	const rootPkgPath = (0, import_node_path.join)(root, "package.json");
-	if ((0, import_node_fs.existsSync)(rootPkgPath)) {
-		files.push(rootPkgPath);
-	}
-	try {
-		const result = (0, import_node_child_process.execSync)(`find "${root}" -name "package.json" -not -path "*/node_modules/*" -not -path "*/.git/*" 2>/dev/null`, {
-			encoding: "utf-8",
-			maxBuffer: 10 * 1024 * 1024
-		});
-		const foundFiles = result.trim().split("\n").filter(Boolean);
-		files.push(...foundFiles.filter((f) => !files.includes(f)));
-	} catch {}
-	return files;
-}
 function findTamaguiPackages(root) {
-	const packageJsonFiles = findPackageJsonFiles(root);
+	const packageJsonFiles = (0, import_glob.globSync)("**/package.json", {
+		cwd: root,
+		absolute: true,
+		nodir: true,
+		ignore: [
+			"**/node_modules/**",
+			"**/.git/**",
+			"**/dist/**",
+			"**/build/**"
+		]
+	});
 	const packages = [];
 	for (const filePath of packageJsonFiles) {
 		try {
@@ -129,7 +123,11 @@ function findTamaguiPackages(root) {
 }
 async function getLatestVersion() {
 	try {
-		const result = (0, import_node_child_process.execSync)("npm view tamagui version", { encoding: "utf-8" });
+		const result = (0, import_node_child_process.execFileSync)("npm", [
+			"view",
+			"tamagui",
+			"version"
+		], { encoding: "utf-8" });
 		return result.trim();
 	} catch (err) {
 		throw new Error("Failed to fetch latest tamagui version from npm");
@@ -180,7 +178,7 @@ function getChangelogFromGit(fromVersion, toVersion, debug) {
 	const commits = [];
 	try {
 		try {
-			(0, import_node_child_process.execSync)("git fetch --tags 2>/dev/null", {
+			(0, import_node_child_process.execFileSync)("git", ["fetch", "--tags"], {
 				encoding: "utf-8",
 				stdio: "pipe"
 			});
@@ -192,7 +190,13 @@ function getChangelogFromGit(fromVersion, toVersion, debug) {
 		}
 		let result;
 		try {
-			result = (0, import_node_child_process.execSync)(`git log ${fromTag}..${toTag} --pretty=format:"%H|%ad|%s" --date=short 2>/dev/null`, {
+			result = (0, import_node_child_process.execFileSync)("git", [
+				"log",
+				`${fromTag}..${toTag}`,
+				"--pretty=format:%H|%ad|%s",
+				"--date=short",
+				"--"
+			], {
 				encoding: "utf-8",
 				maxBuffer: 10 * 1024 * 1024
 			});
@@ -395,6 +399,10 @@ async function upgrade(options = {}) {
 	console.log(import_chalk.default.gray(`  Current version: ${import_chalk.default.white(fromVersion)}`));
 	console.log(import_chalk.default.gray(`  Target version:  ${import_chalk.default.white(toVersion)}`));
 	console.log("");
+	if (fromVersion.startsWith("2.") && toVersion.startsWith("3.")) {
+		console.log(import_chalk.default.yellow("Run `tamagui migrate --from v2` for the required API and configuration migration."));
+		console.log("");
+	}
 	if (packages.length > 0 && !changelogOnly) {
 		displayPackageSummary(packages);
 	}

package/package.json

@@ -1,6 +1,7 @@
 {
   "name": "@tamagui/cli",
-  "version": "3.0.0-beta.924.1",
+  "version": "3.0.0",
+  "license": "MIT",
   "bin": {
     "tama": "dist/index.cjs",
     "tamagui": "dist/index.cjs"
@@ -51,12 +52,12 @@
     "test:web": "bun run test"
   },
   "dependencies": {
-    "@tamagui/generate-themes": "3.0.0-beta.924.1",
-    "@tamagui/metro-plugin": "3.0.0-beta.924.1",
-    "@tamagui/static": "3.0.0-beta.924.1",
-    "@tamagui/to-tailwind": "3.0.0-beta.924.1",
-    "@tamagui/types": "3.0.0-beta.924.1",
-    "@tamagui/vite-plugin": "3.0.0-beta.924.1",
+    "@tamagui/generate-themes": "3.0.0",
+    "@tamagui/metro-plugin": "3.0.0",
+    "@tamagui/static": "3.0.0",
+    "@tamagui/to-tailwind": "3.0.0",
+    "@tamagui/types": "3.0.0",
+    "@tamagui/vite-plugin": "3.0.0",
     "arg": "^5.0.2",
     "chalk": "^4.1.2",
     "change-case": "^4.1.2",
@@ -73,12 +74,12 @@
     "opener": "^1.5.2",
     "prompts": "2.1.0",
     "ts-morph": "^28.0.0",
-    "typescript": "~6.0.3",
+    "typescript": "7.0.2",
     "url": "^0.11.0",
-    "@tamagui/language-service": "3.0.0-beta.924.1"
+    "@tamagui/language-service": "3.0.0"
   },
   "devDependencies": {
-    "@tamagui/build": "3.0.0-beta.924.1",
+    "@tamagui/build": "3.0.0",
     "@types/chokidar": "^2.1.3",
     "@types/marked": "^5.0.0",
     "vitest": "4.1.0"
@@ -87,5 +88,6 @@
     "type": "git",
     "url": "git+https://github.com/tamagui/tamagui.git",
     "directory": "code/core/cli"
-  }
+  },
+  "releaseSourceCommit": "15fbca480b143f876f6975601e23a17d3f90d2ee"
 }

package/src/build.ts

@@ -1,5 +1,6 @@
 import {
   CompilerFrontend,
+  createTsconfigPathsMatcher,
   loadTamagui,
   loadTamaguiBuildConfigSync,
   compilerProjectStamp,
@@ -14,13 +15,6 @@ import { tmpdir } from 'node:os'
 import { spawn } from 'node:child_process'
 import { createHash } from 'node:crypto'
 import { createRequire } from 'node:module'
-import {
-  findConfigFile,
-  nodeModuleNameResolver,
-  parseJsonConfigFileContent,
-  readConfigFile,
-  sys,
-} from 'typescript'
 
 const cliVersion = (
   createRequire(typeof __filename === 'string' ? __filename : import.meta.url)(
@@ -163,24 +157,16 @@ export const build = async (
     const require = createRequire(
       typeof __filename === 'string' ? __filename : import.meta.url
     )
-    const configPath =
-      findConfigFile(root, sys.fileExists, 'tsconfig.json') ||
-      findConfigFile(root, sys.fileExists, 'jsconfig.json')
-    const compilerOptions = configPath
-      ? parseJsonConfigFileContent(
-          (() => {
-            const loaded = readConfigFile(configPath, sys.readFile)
-            if (loaded.error) throw new Error(String(loaded.error.messageText))
-            return loaded.config
-          })(),
-          sys,
-          dirname(configPath)
-        ).options
-      : {}
+    const tsconfigPaths = createTsconfigPathsMatcher(undefined, root)
     const resolveCompilerId = (specifier: string, importer: string): string | null => {
-      const resolved = nodeModuleNameResolver(specifier, importer, compilerOptions, sys)
-        .resolvedModule?.resolvedFileName
-      if (resolved && !resolved.endsWith('.d.ts')) return resolved
+      for (const candidate of tsconfigPaths?.(specifier) ?? []) {
+        try {
+          const resolved = require.resolve(candidate, {
+            paths: [dirname(importer), root],
+          })
+          if (!resolved.endsWith('.d.ts')) return resolved
+        } catch {}
+      }
       try {
         return require.resolve(specifier, { paths: [dirname(importer), root] })
       } catch {