create-tamagui 1.36.3 → 1.36.5

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.36.2",
+  version: "1.36.4",
   bin: "./run.js",
   main: "dist",
   files: [
@@ -6389,7 +6389,7 @@ var package_default = {
   },
   devDependencies: {
     "@playwright/test": "^1.29.0",
-    "@tamagui/build": "1.36.2",
+    "@tamagui/build": "1.36.4",
     "@types/async-retry": "1.4.2",
     "@types/cross-spawn": "^6.0.2",
     "@types/node": "^16.11.9",

package/dist/helpers/getTemplateInfo.js

@@ -5537,15 +5537,15 @@ var require_route = __commonJS({
       };
     }
     function wrapConversion(toModel, graph) {
-      const path = [graph[toModel].parent, toModel];
+      const path2 = [graph[toModel].parent, toModel];
       let fn = conversions[graph[toModel].parent][toModel];
       let cur = graph[toModel].parent;
       while (graph[cur].parent) {
-        path.unshift(graph[cur].parent);
+        path2.unshift(graph[cur].parent);
         fn = link(conversions[graph[cur].parent][cur], fn);
         cur = graph[cur].parent;
       }
-      fn.conversion = path;
+      fn.conversion = path2;
       return fn;
     }
     module2.exports = function(fromModel) {
@@ -6223,7 +6223,7 @@ module.exports = __toCommonJS(getTemplateInfo_exports);
 var import_prompts2 = __toESM(require_prompts3());
 
 // src/templates.ts
-var import_path = require("path");
+var import_path2 = require("path");
 var import_chalk6 = __toESM(require_source());
 
 // src/constants.ts
@@ -6295,7 +6295,9 @@ var simple_web_default = main2;
 
 // src/steps/takeout.ts
 var import_child_process = require("child_process");
+var import_fs = require("fs");
 var import_promises = __toESM(require("fs/promises"));
+var import_path = __toESM(require("path"));
 var import_chalk5 = __toESM(require_source());
 var import_prompts = __toESM(require_prompts3());
 
@@ -6331,7 +6333,7 @@ var takeoutAsciiArt = `\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2557\u2
 var packageManager3 = "yarn";
 var useYarn3 = packageManager3 === "yarn";
 var runCommand3 = (scriptName) => `${packageManager3} ${useYarn3 ? "" : "run "}${scriptName}`;
-var main3 = async ({ isFullClone, projectName }) => {
+var main3 = async ({ isFullClone, projectName, projectPath }) => {
   console.log(`
 ${tamaguiRainbowAsciiArt.split("\n").map((line) => `                ${line}`).join("\n")}
 ${takeoutAsciiArt}
@@ -6363,14 +6365,17 @@ ${takeoutAsciiArt}
           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
-            `
-          );
+          const envs = getEnvFromSupabaseStatus((0, import_child_process.execSync)("yarn supa status").toString());
+          const newEnvContent = Object.entries(envs).map(([key, value]) => `${key}=${value}`).join("\n");
+          if ((0, import_fs.existsSync)(import_path.default.join(projectPath, ".env.local"))) {
+            if ((0, import_fs.readFileSync)(import_path.default.join(projectPath, ".env.local")).toString() !== newEnvContent) {
+              (0, import_fs.renameSync)(
+                import_path.default.join(projectPath, ".env.local"),
+                import_path.default.join(projectPath, `.env.local.old-${Number(/* @__PURE__ */ new Date())}`)
+              );
+            }
+          }
+          await import_promises.default.writeFile(import_path.default.join(projectPath, "./.env.local"), newEnvContent);
         }
       }
     }
@@ -6451,7 +6456,7 @@ async function linkSupabase() {
     message: "Enter your supabase project's ID (e.g. abcdefghijklmnopqrst)",
     initial: true
   });
-  const cmd = `yarn supa link-project ${supabaseRefId.trim()}`;
+  const cmd = `npx supabase link --project-ref ${supabaseRefId.trim()}`;
   try {
     (0, import_child_process.execSync)(cmd, {
       stdio: "inherit"
@@ -6478,9 +6483,20 @@ async function linkSupabase() {
     }
   }
 }
+function getEnvFromSupabaseStatus(status) {
+  var _a, _b, _c, _d, _e, _f;
+  return {
+    NEXT_PUBLIC_SUPABASE_URL: (_a = status.match(/API URL: (.*)/)) == null ? void 0 : _a[1],
+    NEXT_PUBLIC_SUPABASE_GRAPHQL_URL: (_b = status.match(/GraphQL URL: (.*)/)) == null ? void 0 : _b[1],
+    SUPABASE_DB_URL: (_c = status.match(/DB URL: (.*)/)) == null ? void 0 : _c[1],
+    NEXT_PUBLIC_SUPABASE_ANON_KEY: (_d = status.match(/anon key: (.*)/)) == null ? void 0 : _d[1],
+    SUPABASE_SERVICE_ROLE: (_e = status.match(/service_role key: (.*)/)) == null ? void 0 : _e[1],
+    SUPABASE_JWT_SECRET: (_f = status.match(/JWT secret: (.*)/)) == null ? void 0 : _f[1]
+  };
+}
 
 // src/templates.ts
-var repoRoot = (0, import_path.join)(__dirname, "..", "..", "..");
+var repoRoot = (0, import_path2.join)(__dirname, "..", "..", "..");
 var templates = [
   {
     title: `Next + Expo + Solito (recommended for production) - Production-ready universal app with a monorepo.`,