create-tamagui 1.123.2 → 1.123.3

package/dist/index.cjs

@@ -26191,7 +26191,7 @@ var globby2 = Object.assign(function(patterns, options) {
 // package.json
 var package_default = {
   name: "create-tamagui",
-  version: "1.123.1",
+  version: "1.123.2",
   bin: "./run.js",
   main: "dist/index.cjs",
   files: [
@@ -26215,7 +26215,7 @@ var package_default = {
   devDependencies: {
     "@expo/package-manager": "^1.1.2",
     "@playwright/test": "^1.49.1",
-    "@tamagui/build": "1.123.1",
+    "@tamagui/build": "1.123.2",
     "@types/async-retry": "1.4.2",
     "@types/cross-spawn": "^6.0.2",
     "@types/node": "^22.1.0",
@@ -31165,17 +31165,17 @@ var rimraf_ = wrap((path6, opt) => useNative(opt) ? rimrafNative(path6, opt) : r
 rimraf.rimraf = rimraf;
 
 // src/helpers/cloneStarter.ts
-var open = require_opener(), exec = (cmd, options) => (0, import_node_child_process2.execSync)(cmd, {
+var open = require_opener(), exec = (cmd, options) => (console.info("$ ", cmd), (0, import_node_child_process2.execSync)(cmd, {
   stdio: process.env.DEBUG ? "inherit" : "ignore",
   ...options
-}), tamaguiDir = (0, import_node_path4.join)((0, import_node_os2.homedir)(), ".tamagui-repo-cache"), targetGitDir = "", cloneStarter = async (template, resolvedProjectPath, projectName) => {
+})), tamaguiDir = (0, import_node_path4.join)((0, import_node_os2.homedir)(), ".tamagui-repo-cache"), targetGitDir = "", cloneStarter = async (template, resolvedProjectPath, projectName) => {
   targetGitDir = (0, import_node_path4.join)(tamaguiDir, "tamagui", template.repo.url.split("/").at(-1)), console.info(), await setupTamaguiDotDir(template);
   let starterDir = (0, import_node_path4.join)(targetGitDir, ...template.repo.dir);
   console.info(), console.info(
     `Copying starter from ${starterDir} into ${import_chalk5.default.blueBright(projectName)}...`
   ), console.info(), await (0, import_fs_extra.copy)(starterDir, resolvedProjectPath), await rimraf(`${resolvedProjectPath}/.git`), console.info(import_chalk5.default.green(`${projectName} created!`)), console.info();
 };
-async function setupTamaguiDotDir(template, isRetry = !1) {
+async function setupTamaguiDotDir(template) {
   if (console.info(`Setting up ${import_chalk5.default.blueBright(targetGitDir)}...`), process.env.GITHUB_HEAD_REF)
     try {
       await $`cd ${targetGitDir} && git switch -c ${process.env.GITHUB_HEAD_REF}`;
@@ -31184,37 +31184,31 @@ async function setupTamaguiDotDir(template, isRetry = !1) {
   let branch = template.repo.branch;
   await (0, import_fs_extra.ensureDir)(tamaguiDir), cd(tamaguiDir);
   let isInSubDir = template.repo.dir.length > 0, sourceGitRepo = template.repo.url, sourceGitRepoSshFallback = template.repo.sshFallback;
-  if (isRetry)
-    await (0, import_fs_extra.pathExists)(targetGitDir) || exec(`git clone --branch ${branch} ${sourceGitRepo} "${targetGitDir}"`);
+  if (await (0, import_fs_extra.pathExists)(targetGitDir))
+    await (0, import_fs_extra.pathExists)((0, import_node_path4.join)(targetGitDir, ".git")) || (console.error(`Corrupt Tamagui directory, please delete ${targetGitDir} and re-run`), process.exit(1));
   else {
-    if (await (0, import_fs_extra.pathExists)(targetGitDir))
-      await (0, import_fs_extra.pathExists)((0, import_node_path4.join)(targetGitDir, ".git")) || (console.error(
-        `Corrupt Tamagui directory, please delete ${targetGitDir} and re-run`
-      ), process.exit(1));
-    else {
-      console.info("Cloning tamagui base directory"), console.info();
-      let cmd = `git clone --branch ${branch} ${isInSubDir ? "--depth 1 --sparse --filter=blob:none " : ""}${sourceGitRepo} "${targetGitDir}"`;
+    console.info("Cloning tamagui base directory"), console.info();
+    let cmd = `git clone --branch ${branch} ${isInSubDir ? "--depth 1 --sparse --filter=blob:none " : ""}${sourceGitRepo} "${targetGitDir}"`;
+    try {
       try {
-        try {
-          console.info(`$ ${cmd}`), console.info(), exec(cmd);
-        } catch (error) {
-          if (cmd.includes("https://")) {
-            console.info("https failed - trying with ssh now...");
-            let sshCmd = cmd.replace(sourceGitRepo, sourceGitRepoSshFallback);
-            console.info(`$ ${sshCmd}`), console.info(), exec(sshCmd);
-          } else
-            throw error;
-        }
+        console.info(`$ ${cmd}`), console.info(), exec(cmd);
       } catch (error) {
-        throw error instanceof Error && template.value === "takeout-starter" && error?.stderr?.includes("Repository not found") && (console.info(
-          import_chalk5.default.yellow(
-            "You don't have access to this starter. Check \u{1F961} Tamagui Takeout (https://tamagui.dev/takeout) for more info."
-          )
-        ), open("https://tamagui.dev/takeout"), process.exit(0)), error;
+        if (cmd.includes("https://")) {
+          console.info("https failed - trying with ssh now...");
+          let sshCmd = cmd.replace(sourceGitRepo, sourceGitRepoSshFallback);
+          console.info(`$ ${sshCmd}`), console.info(), exec(sshCmd);
+        } else
+          throw error;
       }
+    } catch (error) {
+      throw error instanceof Error && template.value === "takeout-starter" && error?.stderr?.includes("Repository not found") && (console.info(
+        import_chalk5.default.yellow(
+          "You don't have access to this starter. Check \u{1F961} Tamagui Takeout (https://tamagui.dev/takeout) for more info."
+        )
+      ), open("https://tamagui.dev/takeout"), process.exit(0)), error;
     }
-    isInSubDir && (exec("git sparse-checkout set code/starters", { cwd: targetGitDir }), console.info());
   }
+  isInSubDir && (exec("git sparse-checkout set code/starters", { cwd: targetGitDir }), console.info());
   try {
     let remoteName = getDefaultRemoteName();
     if (await (0, import_fs_extra.pathExists)((0, import_node_path4.join)(targetGitDir, ".git"))) {
@@ -31234,13 +31228,9 @@ async function setupTamaguiDotDir(template, isRetry = !1) {
         `Warning: ${targetGitDir} is not a git repository. Skipping pull operation.`
       );
   } catch (err) {
-    console.info(
-      `Error updating: ${err.message} ${err.stack}  ${isRetry ? "" : `
-
-retrying...`}`
-    ), isRetry && (console.info(
-      "Please file an issue: https://github.com/tamagui/tamagui/issues/new?assignees=&labels=&template=bug_report.md&title="
-    ), process.exit(1)), await (0, import_fs_extra.remove)(targetGitDir), await setupTamaguiDotDir(template, !0);
+    await (0, import_fs_extra.remove)(targetGitDir), console.info(`Error updating: ${err.message} ${err.stack}`), console.info(
+      "We removed the old template cache, so re-running may fix. If not, please file an issue: https://github.com/tamagui/tamagui/issues/new?assignees=&labels=&template=bug_report.md&title="
+    ), process.exit(1);
   }
 }
 var getDefaultRemoteName = () => {
@@ -31541,7 +31531,7 @@ var templates = [
       url: process.env.TAMAGUI_REPO_SOURCE || "https://github.com/tamagui/tamagui.git",
       sshFallback: "git@github.com:tamagui/tamagui.git",
       dir: ["code", "starters", "expo-router"],
-      branch: "master"
+      branch: "main"
     },
     extraSteps: expo_router_default
   },
@@ -31555,7 +31545,7 @@ var templates = [
       url: process.env.TAMAGUI_REPO_SOURCE || "https://github.com/tamagui/tamagui.git",
       sshFallback: "git@github.com:tamagui/tamagui.git",
       dir: ["code", "starters", "simple-web"],
-      branch: "master"
+      branch: "main"
     },
     extraSteps: simple_web_default
   },
@@ -31569,7 +31559,7 @@ var templates = [
       url: process.env.TAMAGUI_REPO_SOURCE || "https://github.com/tamagui/tamagui.git",
       sshFallback: "git@github.com:tamagui/tamagui.git",
       dir: ["code", "starters", "remix"],
-      branch: "master"
+      branch: "main"
     },
     extraSteps: remix_default
   }

package/dist/index.js

@@ -26191,7 +26191,7 @@ var globby2 = Object.assign(function(patterns, options) {
 // package.json
 var package_default = {
   name: "create-tamagui",
-  version: "1.123.1",
+  version: "1.123.2",
   bin: "./run.js",
   main: "dist/index.cjs",
   files: [
@@ -26215,7 +26215,7 @@ var package_default = {
   devDependencies: {
     "@expo/package-manager": "^1.1.2",
     "@playwright/test": "^1.49.1",
-    "@tamagui/build": "1.123.1",
+    "@tamagui/build": "1.123.2",
     "@types/async-retry": "1.4.2",
     "@types/cross-spawn": "^6.0.2",
     "@types/node": "^22.1.0",
@@ -31165,17 +31165,17 @@ var rimraf_ = wrap((path6, opt) => useNative(opt) ? rimrafNative(path6, opt) : r
 rimraf.rimraf = rimraf;
 
 // src/helpers/cloneStarter.ts
-var open = require_opener(), exec = (cmd, options) => (0, import_node_child_process2.execSync)(cmd, {
+var open = require_opener(), exec = (cmd, options) => (console.info("$ ", cmd), (0, import_node_child_process2.execSync)(cmd, {
   stdio: process.env.DEBUG ? "inherit" : "ignore",
   ...options
-}), tamaguiDir = (0, import_node_path4.join)((0, import_node_os2.homedir)(), ".tamagui-repo-cache"), targetGitDir = "", cloneStarter = async (template, resolvedProjectPath, projectName) => {
+})), tamaguiDir = (0, import_node_path4.join)((0, import_node_os2.homedir)(), ".tamagui-repo-cache"), targetGitDir = "", cloneStarter = async (template, resolvedProjectPath, projectName) => {
   targetGitDir = (0, import_node_path4.join)(tamaguiDir, "tamagui", template.repo.url.split("/").at(-1)), console.info(), await setupTamaguiDotDir(template);
   let starterDir = (0, import_node_path4.join)(targetGitDir, ...template.repo.dir);
   console.info(), console.info(
     `Copying starter from ${starterDir} into ${import_chalk5.default.blueBright(projectName)}...`
   ), console.info(), await (0, import_fs_extra.copy)(starterDir, resolvedProjectPath), await rimraf(`${resolvedProjectPath}/.git`), console.info(import_chalk5.default.green(`${projectName} created!`)), console.info();
 };
-async function setupTamaguiDotDir(template, isRetry = !1) {
+async function setupTamaguiDotDir(template) {
   if (console.info(`Setting up ${import_chalk5.default.blueBright(targetGitDir)}...`), process.env.GITHUB_HEAD_REF)
     try {
       await $`cd ${targetGitDir} && git switch -c ${process.env.GITHUB_HEAD_REF}`;
@@ -31184,37 +31184,31 @@ async function setupTamaguiDotDir(template, isRetry = !1) {
   let branch = template.repo.branch;
   await (0, import_fs_extra.ensureDir)(tamaguiDir), cd(tamaguiDir);
   let isInSubDir = template.repo.dir.length > 0, sourceGitRepo = template.repo.url, sourceGitRepoSshFallback = template.repo.sshFallback;
-  if (isRetry)
-    await (0, import_fs_extra.pathExists)(targetGitDir) || exec(`git clone --branch ${branch} ${sourceGitRepo} "${targetGitDir}"`);
+  if (await (0, import_fs_extra.pathExists)(targetGitDir))
+    await (0, import_fs_extra.pathExists)((0, import_node_path4.join)(targetGitDir, ".git")) || (console.error(`Corrupt Tamagui directory, please delete ${targetGitDir} and re-run`), process.exit(1));
   else {
-    if (await (0, import_fs_extra.pathExists)(targetGitDir))
-      await (0, import_fs_extra.pathExists)((0, import_node_path4.join)(targetGitDir, ".git")) || (console.error(
-        `Corrupt Tamagui directory, please delete ${targetGitDir} and re-run`
-      ), process.exit(1));
-    else {
-      console.info("Cloning tamagui base directory"), console.info();
-      let cmd = `git clone --branch ${branch} ${isInSubDir ? "--depth 1 --sparse --filter=blob:none " : ""}${sourceGitRepo} "${targetGitDir}"`;
+    console.info("Cloning tamagui base directory"), console.info();
+    let cmd = `git clone --branch ${branch} ${isInSubDir ? "--depth 1 --sparse --filter=blob:none " : ""}${sourceGitRepo} "${targetGitDir}"`;
+    try {
       try {
-        try {
-          console.info(`$ ${cmd}`), console.info(), exec(cmd);
-        } catch (error) {
-          if (cmd.includes("https://")) {
-            console.info("https failed - trying with ssh now...");
-            let sshCmd = cmd.replace(sourceGitRepo, sourceGitRepoSshFallback);
-            console.info(`$ ${sshCmd}`), console.info(), exec(sshCmd);
-          } else
-            throw error;
-        }
+        console.info(`$ ${cmd}`), console.info(), exec(cmd);
       } catch (error) {
-        throw error instanceof Error && template.value === "takeout-starter" && error?.stderr?.includes("Repository not found") && (console.info(
-          import_chalk5.default.yellow(
-            "You don't have access to this starter. Check \u{1F961} Tamagui Takeout (https://tamagui.dev/takeout) for more info."
-          )
-        ), open("https://tamagui.dev/takeout"), process.exit(0)), error;
+        if (cmd.includes("https://")) {
+          console.info("https failed - trying with ssh now...");
+          let sshCmd = cmd.replace(sourceGitRepo, sourceGitRepoSshFallback);
+          console.info(`$ ${sshCmd}`), console.info(), exec(sshCmd);
+        } else
+          throw error;
       }
+    } catch (error) {
+      throw error instanceof Error && template.value === "takeout-starter" && error?.stderr?.includes("Repository not found") && (console.info(
+        import_chalk5.default.yellow(
+          "You don't have access to this starter. Check \u{1F961} Tamagui Takeout (https://tamagui.dev/takeout) for more info."
+        )
+      ), open("https://tamagui.dev/takeout"), process.exit(0)), error;
     }
-    isInSubDir && (exec("git sparse-checkout set code/starters", { cwd: targetGitDir }), console.info());
   }
+  isInSubDir && (exec("git sparse-checkout set code/starters", { cwd: targetGitDir }), console.info());
   try {
     let remoteName = getDefaultRemoteName();
     if (await (0, import_fs_extra.pathExists)((0, import_node_path4.join)(targetGitDir, ".git"))) {
@@ -31234,13 +31228,9 @@ async function setupTamaguiDotDir(template, isRetry = !1) {
         `Warning: ${targetGitDir} is not a git repository. Skipping pull operation.`
       );
   } catch (err) {
-    console.info(
-      `Error updating: ${err.message} ${err.stack}  ${isRetry ? "" : `
-
-retrying...`}`
-    ), isRetry && (console.info(
-      "Please file an issue: https://github.com/tamagui/tamagui/issues/new?assignees=&labels=&template=bug_report.md&title="
-    ), process.exit(1)), await (0, import_fs_extra.remove)(targetGitDir), await setupTamaguiDotDir(template, !0);
+    await (0, import_fs_extra.remove)(targetGitDir), console.info(`Error updating: ${err.message} ${err.stack}`), console.info(
+      "We removed the old template cache, so re-running may fix. If not, please file an issue: https://github.com/tamagui/tamagui/issues/new?assignees=&labels=&template=bug_report.md&title="
+    ), process.exit(1);
   }
 }
 var getDefaultRemoteName = () => {
@@ -31541,7 +31531,7 @@ var templates = [
       url: process.env.TAMAGUI_REPO_SOURCE || "https://github.com/tamagui/tamagui.git",
       sshFallback: "git@github.com:tamagui/tamagui.git",
       dir: ["code", "starters", "expo-router"],
-      branch: "master"
+      branch: "main"
     },
     extraSteps: expo_router_default
   },
@@ -31555,7 +31545,7 @@ var templates = [
       url: process.env.TAMAGUI_REPO_SOURCE || "https://github.com/tamagui/tamagui.git",
       sshFallback: "git@github.com:tamagui/tamagui.git",
       dir: ["code", "starters", "simple-web"],
-      branch: "master"
+      branch: "main"
     },
     extraSteps: simple_web_default
   },
@@ -31569,7 +31559,7 @@ var templates = [
       url: process.env.TAMAGUI_REPO_SOURCE || "https://github.com/tamagui/tamagui.git",
       sshFallback: "git@github.com:tamagui/tamagui.git",
       dir: ["code", "starters", "remix"],
-      branch: "master"
+      branch: "main"
     },
     extraSteps: remix_default
   }