create-tamagui 1.35.12 → 1.36.0

package/dist/helpers/getProjectName.js

@@ -6354,7 +6354,7 @@ var import_prompts = __toESM(require_prompts3());
 // package.json
 var package_default = {
   name: "create-tamagui",
-  version: "1.35.11",
+  version: "1.35.12",
   bin: "./run.js",
   main: "dist",
   files: [
@@ -6389,7 +6389,7 @@ var package_default = {
   },
   devDependencies: {
     "@playwright/test": "^1.29.0",
-    "@tamagui/build": "1.35.11",
+    "@tamagui/build": "1.35.12",
     "@types/async-retry": "1.4.2",
     "@types/cross-spawn": "^6.0.2",
     "@types/node": "^16.11.9",

package/dist/helpers/getTemplateInfo.js

@@ -6247,15 +6247,15 @@ var import_chalk2 = __toESM(require_source());
 var packageManager = "yarn";
 var useYarn = packageManager === "yarn";
 var runCommand = (scriptName) => `${packageManager} ${useYarn ? "" : "run "}${scriptName}`;
-var main = async ({ projectName }) => {
-  console.log(`
-${import_chalk2.default.green.bold("Done!")} created a new project under ./${projectName}
+var main = async ({ isFullClone, projectName }) => {
+  if (isFullClone) {
+    console.log(`${import_chalk2.default.green.bold("Done!")} created a new project under ./${projectName}
 
 cd into the project using:
   ${import_chalk2.default.green("cd")} ${projectName}
-
-Inside that directory, you can run several commands:
-
+`);
+  }
+  console.log(`
   To start the Next.js development server, run:
     ${import_chalk2.default.green(runCommand("web"))}
     
@@ -6277,14 +6277,16 @@ var import_chalk3 = __toESM(require_source());
 var packageManager2 = "yarn";
 var useYarn2 = packageManager2 === "yarn";
 var runCommand2 = (scriptName) => `${packageManager2} ${useYarn2 ? "" : "run "}${scriptName}`;
-var main2 = async ({ projectName }) => {
-  console.log(`
-${import_chalk3.default.green.bold("Done!")} created a new project under ./${projectName}
+var main2 = async ({ isFullClone, projectName }) => {
+  if (isFullClone) {
+    console.log(`
+  ${import_chalk3.default.green.bold("Done!")} created a new project under ./${projectName}
 
 cd into the project using:
   ${import_chalk3.default.green("cd")} ${projectName}
-
-Inside that directory:
+`);
+  }
+  console.log(`
   To start the Next.js development server, run:
     ${import_chalk3.default.green(runCommand2("web"))}
 `);
@@ -6293,6 +6295,7 @@ var simple_web_default = main2;
 
 // src/steps/takeout.ts
 var import_child_process = require("child_process");
+var import_promises = __toESM(require("fs/promises"));
 var import_chalk5 = __toESM(require_source());
 var import_prompts = __toESM(require_prompts3());
 
@@ -6325,11 +6328,10 @@ var takeoutAsciiArt = `\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2557\u2
 \u2591\u2591\u2591\u255A\u2550\u255D\u2591\u2591\u2591\u255A\u2550\u255D\u2591\u2591\u255A\u2550\u255D\u255A\u2550\u255D\u2591\u2591\u255A\u2550\u255D\u255A\u2550\u2550\u2550\u2550\u2550\u2550\u255D\u2591\u255A\u2550\u2550\u2550\u2550\u255D\u2591\u2591\u255A\u2550\u2550\u2550\u2550\u2550\u255D\u2591\u2591\u2591\u2591\u255A\u2550\u255D\u2591\u2591\u2591`;
 
 // src/steps/takeout.ts
-var import_promises = __toESM(require("fs/promises"));
 var packageManager3 = "yarn";
 var useYarn3 = packageManager3 === "yarn";
 var runCommand3 = (scriptName) => `${packageManager3} ${useYarn3 ? "" : "run "}${scriptName}`;
-var main3 = async ({ projectName }) => {
+var main3 = async ({ isFullClone, projectName }) => {
   console.log(`
 ${tamaguiRainbowAsciiArt.split("\n").map((line) => `                ${line}`).join("\n")}
 ${takeoutAsciiArt}
@@ -6351,8 +6353,26 @@ ${takeoutAsciiArt}
       initial: true
     });
     if (startLocalSupabase) {
-      (0, import_child_process.execSync)(`yarn workspace @my/supabase start`, { stdio: "inherit" });
-      console.log("Don't forget to create storage bucket with the name `avatars`.");
+      const supabaseStarted = await runRetryableCommand(`yarn supa start`);
+      if (supabaseStarted) {
+        console.log();
+        const { setUpSupabaseEnv } = await (0, import_prompts.default)({
+          name: "setUpSupabaseEnv",
+          type: "confirm",
+          message: "Do you want us to add the local env variables for you? This will create a file called .env.local.",
+          initial: true
+        });
+        if (setUpSupabaseEnv) {
+          await import_promises.default.writeFile(
+            "./.env.local",
+            `NEXT_PUBLIC_SUPABASE_PROJECT_ID=default
+            NEXT_PUBLIC_SUPABASE_URL=http://localhost:54321
+            NEXT_PUBLIC_SUPABASE_ANON_KEY=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZS1kZW1vIiwicm9sZSI6ImFub24iLCJleHAiOjE5ODM4MTI5OTZ9.CRXP1A7WOeoJeXxjNni43kdQwgnWNReilDMblYTn_I0
+            SUPABASE_SERVICE_ROLE=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZS1kZW1vIiwicm9sZSI6InNlcnZpY2Vfcm9sZSIsImV4cCI6MTk4MzgxMjk5Nn0.EGIM96RAZx35lJzdJsyH-qQwv8Hdp7fsn3W0YpN81IU
+            `
+          );
+        }
+      }
     }
     console.log();
     const { setupRemoteSupabase } = await (0, import_prompts.default)({
@@ -6361,42 +6381,21 @@ ${takeoutAsciiArt}
       message: "Link remote Supabase instance for you? (Create a project on https://app.supabase.com/projects first)",
       initial: true
     });
-    console.log();
-    const { setUpSupabaseEnv } = await (0, import_prompts.default)({
-      name: "setUpSupabaseEnv",
-      type: "confirm",
-      message: "Do you want us to add the local env variables for you? This will create a file called .env.local.",
-      initial: true
-    });
-    if (setUpSupabaseEnv) {
-      await import_promises.default.writeFile("./.env.local", `NEXT_PUBLIC_SUPABASE_PROJECT_ID=default
-NEXT_PUBLIC_SUPABASE_URL=http://localhost:54321
-NEXT_PUBLIC_SUPABASE_ANON_KEY=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZS1kZW1vIiwicm9sZSI6ImFub24iLCJleHAiOjE5ODM4MTI5OTZ9.CRXP1A7WOeoJeXxjNni43kdQwgnWNReilDMblYTn_I0
-SUPABASE_SERVICE_ROLE=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZS1kZW1vIiwicm9sZSI6InNlcnZpY2Vfcm9sZSIsImV4cCI6MTk4MzgxMjk5Nn0.EGIM96RAZx35lJzdJsyH-qQwv8Hdp7fsn3W0YpN81IU
-`);
-    }
     if (setupRemoteSupabase) {
-      (0, import_child_process.execSync)(`npx supabase login`, { stdio: "inherit" });
+      await runRetryableCommand(`npx supabase login`);
       console.log();
-      const { supabaseRefId } = await (0, import_prompts.default)({
-        name: "supabaseRefId",
-        type: "text",
-        message: "Enter your supabase project's ID (e.g. abcdefghijklmnopqrst)",
-        initial: true
-      });
-      (0, import_child_process.execSync)(`yarn workspace @my/supabase link-project ${supabaseRefId.trim()}`, {
-        stdio: "inherit"
-      });
+      await linkSupabase();
     }
   }
-  console.log(`
-${import_chalk5.default.green.bold("Done!")} created a new project under ./${projectName}
+  if (isFullClone) {
+    console.log(`
+  ${import_chalk5.default.green.bold("Done!")} created a new project under ./${projectName}
 
 cd into the project using:
   ${import_chalk5.default.green("  cd")} ${projectName}
-
-Inside that directory, you can run several commands:
-
+  `);
+  }
+  console.log(`
   To start the Next.js development server, run:
     ${import_chalk5.default.green(runCommand3("web"))}
 
@@ -6420,6 +6419,65 @@ Inside that directory, you can run several commands:
   `);
 };
 var takeout_default = main3;
+async function runRetryableCommand(cmd, retriesCount = 0) {
+  try {
+    (0, import_child_process.execSync)(cmd, { stdio: "inherit" });
+    return true;
+  } catch (error) {
+    const { tryAgain } = await (0, import_prompts.default)({
+      name: "tryAgain",
+      message: "An error occurred. Do you want to try again?",
+      type: "confirm",
+      initial: true
+    });
+    if (tryAgain) {
+      await runRetryableCommand(cmd, retriesCount + 1);
+    } else {
+      console.log(
+        import_chalk5.default.yellow(
+          `\u26A0\uFE0F Skipping this step. You can try running this command later. The failed command was \`${import_chalk5.default.underline(
+            cmd
+          )}\`.`
+        )
+      );
+      return false;
+    }
+  }
+}
+async function linkSupabase() {
+  const { supabaseRefId } = await (0, import_prompts.default)({
+    name: "supabaseRefId",
+    type: "text",
+    message: "Enter your supabase project's ID (e.g. abcdefghijklmnopqrst)",
+    initial: true
+  });
+  const cmd = `yarn supa link-project ${supabaseRefId.trim()}`;
+  try {
+    (0, import_child_process.execSync)(cmd, {
+      stdio: "inherit"
+    });
+    return true;
+  } catch (error) {
+    const { tryAgain } = await (0, import_prompts.default)({
+      name: "tryAgain",
+      message: "An error occurred. Do you want to try again?",
+      type: "confirm",
+      initial: true
+    });
+    if (tryAgain) {
+      await linkSupabase();
+    } else {
+      console.log(
+        import_chalk5.default.yellow(
+          `\u26A0\uFE0F Skipping this step. You can try running this command later. The failed command was \`${import_chalk5.default.underline(
+            cmd
+          )}\`.`
+        )
+      );
+      return false;
+    }
+  }
+}
 
 // src/templates.ts
 var repoRoot = (0, import_path.join)(__dirname, "..", "..", "..");