create-tamagui 2.7.7 → 3.0.0-beta.643.1

package/dist/index.native.js

@@ -24,7 +24,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 
 // src/index.ts
-var import_chalk10 = __toESM(require("chalk"));
+var import_chalk9 = __toESM(require("chalk"));
 var import_commander = __toESM(require("commander"));
 var import_detect_package_manager = require("detect-package-manager");
 var import_fs_extra2 = require("fs-extra");
@@ -38,7 +38,7 @@ var import_prompts4 = __toESM(require("prompts"));
 // package.json
 var package_default = {
   name: "create-tamagui",
-  version: "2.7.6",
+  version: "2.7.7",
   gitHead: "a49cc7ea6b93ba384e77a4880ae48ac4a5635c14",
   bin: {
     "create-tamagui": "run.js"
@@ -191,7 +191,7 @@ async function setupTamaguiDotDir(template) {
     } catch {
     }
   }
-  const branch = template.repo.branch;
+  const ref = template.repo.ref;
   await (0, import_fs_extra.ensureDir)(tamaguiDir);
   const isInSubDir = template.repo.dir.length > 0;
   const sourceGitRepo = template.repo.url;
@@ -199,7 +199,7 @@ async function setupTamaguiDotDir(template) {
   if (!await (0, import_fs_extra.pathExists)(targetGitDir)) {
     console.info(`Cloning tamagui base directory`);
     console.info();
-    const cmd = `git clone --branch ${branch} ${isInSubDir ? "--depth 1 --sparse --filter=blob:none " : ""}${sourceGitRepo} "${targetGitDir}"`;
+    const cmd = `git clone --branch ${ref} ${isInSubDir ? "--depth 1 --sparse --filter=blob:none " : ""}${sourceGitRepo} "${targetGitDir}"`;
     try {
       try {
         console.info(`$ ${cmd}`);
@@ -246,21 +246,11 @@ async function setupTamaguiDotDir(template) {
   try {
     const remoteName = getDefaultRemoteName();
     if (await (0, import_fs_extra.pathExists)((0, import_node_path.join)(targetGitDir, ".git"))) {
-      const cmd2 = `git pull --rebase --allow-unrelated-histories --depth 1 ${remoteName} ${branch}`;
-      try {
-        exec(cmd2, {
-          cwd: targetGitDir
-        });
-      } catch {
-        exec(cmd2, {
-          cwd: targetGitDir
-        });
-      }
+      exec(`git fetch --depth 1 ${remoteName} ${ref}`, { cwd: targetGitDir });
+      exec(`git checkout --detach FETCH_HEAD`, { cwd: targetGitDir });
       console.info();
     } else {
-      console.warn(
-        `Warning: ${targetGitDir} is not a git repository. Skipping pull operation.`
-      );
+      console.warn(`Warning: ${targetGitDir} is not a git repository. Skipping update.`);
     }
   } catch (err) {
     await (0, import_fs_extra.remove)(targetGitDir);
@@ -377,10 +367,12 @@ var getProjectName = async (projectPath2) => {
 var import_prompts3 = __toESM(require("prompts"));
 
 // src/templates.ts
-var import_chalk9 = __toESM(require("chalk"));
+var import_chalk8 = __toESM(require("chalk"));
 
-// src/steps/expo-router.ts
+// src/steps/remix.ts
 var import_chalk5 = __toESM(require("chalk"));
+var packageManager = "bun";
+var runCommand = (scriptName) => `${packageManager} run ${scriptName}`;
 var main = async ({ isFullClone, projectName }) => {
   if (isFullClone) {
     console.info(`
@@ -388,76 +380,60 @@ var main = async ({ isFullClone, projectName }) => {
 
 visit your project:
   ${import_chalk5.default.green("cd")} ${projectName}
-`);
-  }
-};
-var expo_router_default = main;
-
-// src/steps/remix.ts
-var import_chalk6 = __toESM(require("chalk"));
-var packageManager = "bun";
-var runCommand = (scriptName) => `${packageManager} run ${scriptName}`;
-var main2 = async ({ isFullClone, projectName }) => {
-  if (isFullClone) {
-    console.info(`
-  ${import_chalk6.default.green.bold("Done!")} created a new project under ./${projectName}
-
-visit your project:
-  ${import_chalk6.default.green("cd")} ${projectName}
 `);
   }
   console.info(`
   To start the Remix development server, run:
-    ${import_chalk6.default.green(runCommand("dev"))}
+    ${import_chalk5.default.green(runCommand("dev"))}
 `);
 };
-var remix_default = main2;
+var remix_default = main;
 
 // src/steps/starter-free.ts
-var import_chalk7 = __toESM(require("chalk"));
+var import_chalk6 = __toESM(require("chalk"));
 var packageManager2 = "bun";
 var runCommand2 = (scriptName) => `${packageManager2} run ${scriptName}`;
-var main3 = async ({ isFullClone, projectName }) => {
+var main2 = async ({ isFullClone, projectName }) => {
   console.info(`Note: you need bun for this repo.`);
   if (isFullClone) {
-    console.info(`${import_chalk7.default.green.bold(
+    console.info(`${import_chalk6.default.green.bold(
       "Done!"
     )} created a new project under ./${projectName}
 
 visit your project:
-  ${import_chalk7.default.green("cd")} ${projectName}
+  ${import_chalk6.default.green("cd")} ${projectName}
 `);
   }
   console.info(`
   To start the Next.js development server, run:
-    ${import_chalk7.default.green(runCommand2("web"))}
+    ${import_chalk6.default.green(runCommand2("web"))}
     
   To start Expo Go for mobile development, run:
-    ${import_chalk7.default.green(runCommand2("native"))}
+    ${import_chalk6.default.green(runCommand2("native"))}
 
   You can also create Expo development builds by doing:
   
-    ${import_chalk7.default.green(`cd apps/expo`)} 
+    ${import_chalk6.default.green(`cd apps/expo`)} 
     then:
-    ${import_chalk7.default.green(runCommand2("ios"))} 
+    ${import_chalk6.default.green(runCommand2("ios"))} 
     or...
-    ${import_chalk7.default.green(runCommand2("android"))}
+    ${import_chalk6.default.green(runCommand2("android"))}
 
   Be sure to replace yourprojectsname in app.json with the uid you'd like for your app.
 `);
 };
-var starter_free_default = main3;
+var starter_free_default = main2;
 
 // src/steps/takeout.ts
 var import_node_child_process2 = require("node:child_process");
 var import_node_fs2 = require("node:fs");
 var import_promises = __toESM(require("node:fs/promises"));
 var import_node_path3 = __toESM(require("node:path"));
-var import_chalk8 = __toESM(require("chalk"));
+var import_chalk7 = __toESM(require("chalk"));
 var import_prompts2 = __toESM(require("prompts"));
 var packageManager3 = "bun";
 var runCommand3 = (scriptName) => `${packageManager3} run ${scriptName}`;
-var main4 = async ({ isFullClone, projectName, projectPath: projectPath2 }) => {
+var main3 = async ({ isFullClone, projectName, projectPath: projectPath2 }) => {
   console.info(`
 ${tamaguiRainbowAsciiArt.split("\n").map((line) => `                ${line}`).join("\n")}
 ${takeoutAsciiArt}
@@ -520,37 +496,37 @@ ${takeoutAsciiArt}
   }
   if (isFullClone) {
     console.info(`
-  ${import_chalk8.default.green.bold("Done!")} created a new project under ./${projectName}
+  ${import_chalk7.default.green.bold("Done!")} created a new project under ./${projectName}
 
 visit your project:
-  ${import_chalk8.default.green("  cd")} ${projectName}
+  ${import_chalk7.default.green("  cd")} ${projectName}
   `);
   }
   console.info(`
   To start the Next.js development server, run:
-    ${import_chalk8.default.green(runCommand3("web"))}
+    ${import_chalk7.default.green(runCommand3("web"))}
 
   To start developing with Expo for native, run:
-    ${import_chalk8.default.green(runCommand3("native"))}
+    ${import_chalk7.default.green(runCommand3("native"))}
 
   To start developing for Expo dev build, run:
-    ${import_chalk8.default.green(runCommand3("ios"))}
-    ${import_chalk8.default.green(runCommand3("android"))}
+    ${import_chalk7.default.green(runCommand3("ios"))}
+    ${import_chalk7.default.green(runCommand3("android"))}
 
   To run Supabase scripts, cd into the supabase package:
-    ${import_chalk8.default.green("cd supabase")}
+    ${import_chalk7.default.green("cd supabase")}
 
-    ${import_chalk8.default.green("yarn reset")} - Resets local database
-    ${import_chalk8.default.green("yarn generate")} - Generates new types
+    ${import_chalk7.default.green("yarn reset")} - Resets local database
+    ${import_chalk7.default.green("yarn generate")} - Generates new types
 
-    Find info on the rest of the scripts in ${import_chalk8.default.cyan(`supabase/README.md`)}
+    Find info on the rest of the scripts in ${import_chalk7.default.cyan(`supabase/README.md`)}
 
     If you've purchased and gained access to font and icon packages, you can run:
-    ${import_chalk8.default.green("yarn add:icon")}
-    ${import_chalk8.default.green("yarn add:font")}
+    ${import_chalk7.default.green("yarn add:icon")}
+    ${import_chalk7.default.green("yarn add:font")}
   `);
 };
-var takeout_default = main4;
+var takeout_default = main3;
 async function runRetryableCommand(cmd, retriesCount = 0) {
   try {
     (0, import_node_child_process2.execSync)(cmd, { stdio: "inherit" });
@@ -566,8 +542,8 @@ async function runRetryableCommand(cmd, retriesCount = 0) {
       await runRetryableCommand(cmd, retriesCount + 1);
     } else {
       console.info(
-        import_chalk8.default.yellow(
-          `\u26A0\uFE0F Skipping this step. You can try running this command later. The failed command was \`${import_chalk8.default.underline(
+        import_chalk7.default.yellow(
+          `\u26A0\uFE0F Skipping this step. You can try running this command later. The failed command was \`${import_chalk7.default.underline(
             cmd
           )}\`.`
         )
@@ -600,8 +576,8 @@ async function linkSupabase() {
       await linkSupabase();
     } else {
       console.info(
-        import_chalk8.default.yellow(
-          `\u26A0\uFE0F Skipping this step. You can try running this command later. The failed command was \`${import_chalk8.default.underline(
+        import_chalk7.default.yellow(
+          `\u26A0\uFE0F Skipping this step. You can try running this command later. The failed command was \`${import_chalk7.default.underline(
             cmd
           )}\`.`
         )
@@ -622,10 +598,11 @@ function getEnvFromSupabaseStatus(status) {
 }
 
 // src/templates.ts
+var tamaguiStarterReleaseRef = "starter/v3-beta.3";
 var templates = [
   {
-    title: `${import_chalk9.default.bold.underline(
-      `\u{1F961} ${import_chalk9.default.magenta("Takeout")} ${import_chalk9.default.green("Free")}`
+    title: `${import_chalk8.default.bold.underline(
+      `\u{1F961} ${import_chalk8.default.magenta("Takeout")} ${import_chalk8.default.green("Free")}`
     )} - Full stack starter: https://tamagui.dev/takeout`,
     value: "takeout-free",
     type: "free",
@@ -635,13 +612,13 @@ var templates = [
       url: `https://github.com/tamagui/takeout-free`,
       sshFallback: `git@github.com:tamagui/takeout-free.git`,
       dir: [],
-      branch: "main"
+      ref: "main"
     },
     extraSteps: starter_free_default
   },
   {
-    title: `${import_chalk9.default.bold.underline(
-      `\u{1F961} ${import_chalk9.default.magenta("Takeout")} ${import_chalk9.default.red("Pro")}`
+    title: `${import_chalk8.default.bold.underline(
+      `\u{1F961} ${import_chalk8.default.magenta("Takeout")} ${import_chalk8.default.red("Pro")}`
     )} - Full featured starter: https://tamagui.dev/takeout`,
     value: `takeout-pro`,
     type: "premium",
@@ -651,13 +628,13 @@ var templates = [
       url: `https://github.com/tamagui/takeout2`,
       sshFallback: `git@github.com:tamagui/takeout2.git`,
       dir: [],
-      branch: "main"
+      ref: "main"
     },
     extraSteps: takeout_default
   },
   {
-    title: `${import_chalk9.default.bold.underline(
-      `\u{1F961} ${import_chalk9.default.magenta("Takeout")} ${import_chalk9.default.yellow("Pro Classic")}`
+    title: `${import_chalk8.default.bold.underline(
+      `\u{1F961} ${import_chalk8.default.magenta("Takeout")} ${import_chalk8.default.yellow("Pro Classic")}`
     )} - Original Pro starter: https://tamagui.dev/takeout`,
     value: `takeout-pro-classic`,
     type: "premium",
@@ -667,24 +644,10 @@ var templates = [
       url: `https://github.com/tamagui/takeout`,
       sshFallback: `git@github.com:tamagui/takeout.git`,
       dir: [],
-      branch: "main"
+      ref: "main"
     },
     extraSteps: takeout_default
   },
-  {
-    title: `Expo Router - Expo with file-based routing`,
-    value: "expo-router",
-    type: "free",
-    hidden: false,
-    packageManager: "bun",
-    repo: {
-      url: `https://github.com/tamagui/tamagui`,
-      sshFallback: `git@github.com:tamagui/tamagui.git`,
-      dir: ["code", "starters", "expo-router"],
-      branch: "main"
-    },
-    extraSteps: expo_router_default
-  },
   {
     title: `Remix - Remix with Vite`,
     value: "remix",
@@ -695,7 +658,7 @@ var templates = [
       url: `https://github.com/tamagui/tamagui`,
       sshFallback: `git@github.com:tamagui/tamagui.git`,
       dir: ["code", "starters", "remix"],
-      branch: "main"
+      ref: tamaguiStarterReleaseRef
     },
     extraSteps: remix_default
   },
@@ -709,7 +672,7 @@ var templates = [
       url: process.env.STARTER_FREE_REPO_SOURCE || `https://github.com/tamagui/starter-free.git`,
       sshFallback: `git@github.com:tamagui/starter-free.git`,
       dir: [],
-      branch: "main"
+      ref: "main"
     },
     extraSteps: starter_free_default
   }
@@ -776,11 +739,11 @@ var program = new import_commander.default.Command(package_default.name).version
   "Choose between four or more starter templates.",
   ""
 ).allowUnknownOption().usage(
-  `${import_chalk10.default.green("<project-directory>")} [options]
+  `${import_chalk9.default.green("<project-directory>")} [options]
 
 Example usage:
 
-${import_chalk10.default.blueBright(`npx ${package_default.name} next-expo`)}`
+${import_chalk9.default.blueBright(`npx ${package_default.name} next-expo`)}`
 ).parse(process.argv);
 if (process.argv.includes("--version")) {
   console.info(package_default.version);
@@ -802,14 +765,14 @@ async function run() {
     }
     console.info();
     console.info(
-      import_chalk10.default.bold(
+      import_chalk9.default.bold(
         ' Note: You may need to run "npm create tamagui@latest" to get the latest version!'
       )
     );
     console.info();
     console.info();
     console.info(tamaguiRainbowAsciiArt);
-    console.info(import_chalk10.default.bold("Creating tamagui app..."));
+    console.info(import_chalk9.default.bold("Creating tamagui app..."));
     const gitVersionString = Number.parseFloat(
       (0, import_node_child_process3.execSync)(`git --version`).toString().replace(`git version `, "").trim()
     );
@@ -845,33 +808,33 @@ Opening Takeout website - once you purchase you can restart the create process.
     const { valid, problems } = validateNpmName(projectName);
     if (!valid) {
       console.error(
-        `Could not create a project called ${import_chalk10.default.red(
+        `Could not create a project called ${import_chalk9.default.red(
           `"${projectName}"`
         )} because of npm naming restrictions:`
       );
-      problems.forEach((p) => console.error(`    ${import_chalk10.default.red.bold("*")} ${p}`));
+      problems.forEach((p) => console.error(`    ${import_chalk9.default.red.bold("*")} ${p}`));
       process.exit(1);
     }
     if (import_node_fs3.default.existsSync(resolvedProjectPath)) {
       console.info();
       console.info(
-        import_chalk10.default.red("\u{1F6A8} [tamagui] error"),
-        `You tried to make a project called ${import_chalk10.default.underline(
-          import_chalk10.default.blueBright(projectName)
-        )}, but a folder with that name already exists: ${import_chalk10.default.blueBright(
+        import_chalk9.default.red("\u{1F6A8} [tamagui] error"),
+        `You tried to make a project called ${import_chalk9.default.underline(
+          import_chalk9.default.blueBright(projectName)
+        )}, but a folder with that name already exists: ${import_chalk9.default.blueBright(
           resolvedProjectPath
         )}
 
-${import_chalk10.default.bold(import_chalk10.default.red(`Please pick a different project name \u{1F978}`))}`
+${import_chalk9.default.bold(import_chalk9.default.red(`Please pick a different project name \u{1F978}`))}`
       );
       console.info();
       console.info();
       process.exit(1);
     }
     console.info();
-    console.info(`Creating a new tamagui app ${import_chalk10.default.blueBright(resolvedProjectPath)}...`);
+    console.info(`Creating a new tamagui app ${import_chalk9.default.blueBright(resolvedProjectPath)}...`);
     import_node_fs3.default.mkdirSync(resolvedProjectPath);
-    console.info(import_chalk10.default.green(`${projectName} folder created.`));
+    console.info(import_chalk9.default.green(`${projectName} folder created.`));
     try {
       await cloneStarter(template, resolvedProjectPath, projectName);
       process.chdir(resolvedProjectPath);
@@ -900,7 +863,7 @@ ${e}`);
       projectPath: resolvedProjectPath
     });
     console.info();
-    console.info(import_chalk10.default.gray(tamaguiDuckAsciiArt));
+    console.info(import_chalk9.default.gray(tamaguiDuckAsciiArt));
     process.exit(0);
   } catch (error) {
     console.error("An unexpected error occurred:", error);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-tamagui",
-  "version": "2.7.7",
+  "version": "3.0.0-beta.643.1",
   "gitHead": "a49cc7ea6b93ba384e77a4880ae48ac4a5635c14",
   "bin": {
     "create-tamagui": "run.js"
@@ -42,7 +42,7 @@
   },
   "devDependencies": {
     "@playwright/test": "1.58.2",
-    "@tamagui/build": "2.7.7",
+    "@tamagui/build": "3.0.0-beta.643.1",
     "@types/node": "^22.1.0",
     "@types/opener": "^1.4.3",
     "@types/prompts": "2.0.1",