betterstart-cli 0.0.43 → 0.0.45

package/dist/cli.js

@@ -24889,9 +24889,11 @@ import * as p16 from "@clack/prompts";
 import pc5 from "picocolors";
 var PROVISION_TIMEOUT_MS2 = 18e4;
 var INTERACTIVE_PROVISION_TIMEOUT_MS2 = 6e5;
+var RESOURCE_CONNECT_TIMEOUT_MS = 6e4;
+var NEON_FREE_PLAN_ID = "free_v3";
 async function provisionNeonInteractive(runner, cwd, options) {
-  const quietSpinner = spinner2();
-  quietSpinner.start("Creating your Neon database");
+  const provisionSpinner = spinner2();
+  provisionSpinner.start("Creating your Neon database");
   const quiet = await runVercel(runner, neonAddArgs(options), {
     cwd,
     mode: "capture",
@@ -24899,25 +24901,72 @@ async function provisionNeonInteractive(runner, cwd, options) {
     env: options.env
   });
   if (quiet.success) {
-    quietSpinner.clear();
+    provisionSpinner.clear();
     return readNeonProvisionInfo(quiet.stdout);
   }
-  quietSpinner.clear();
-  p16.log.info(
-    `Create your Neon database in the Vercel prompts below ${pc5.dim(
-      "(the Free plan is recommended)."
-    )}`
-  );
+  let promptsShown = false;
   const add = await runVercel(runner, connectedNeonAddArgs(options), {
     cwd,
-    mode: "inherit",
+    mode: "stream",
     timeoutMs: INTERACTIVE_PROVISION_TIMEOUT_MS2,
-    env: options.env
+    env: options.env,
+    streamLineFilter: (line) => {
+      if (!showNeonSetupLine(line)) return false;
+      if (!promptsShown) {
+        promptsShown = true;
+        provisionSpinner.clear();
+        p16.log.info(
+          `Finish the Neon database setup in the Vercel prompts below ${pc5.dim(
+            "(the Free plan is recommended)."
+          )}`
+        );
+      }
+      return true;
+    }
   });
+  if (!promptsShown) provisionSpinner.clear();
   if (!add.success) {
-    return { failure: add.timedOut ? "timeout" : "provision-failed" };
+    const combined = `${add.stdout}
+${add.stderr}`.trim();
+    return {
+      failure: add.timedOut ? "timeout" : "provision-failed",
+      // Lines the user already saw are not repeated as detail.
+      detail: promptsShown ? void 0 : combined || void 0
+    };
   }
-  return { usedTerminalFallback: true };
+  const info = readNeonFallbackInfo(`${add.stdout}
+${add.stderr}`);
+  if (promptsShown) info.usedTerminalFallback = true;
+  return info;
+}
+var NEON_SETUP_NOISE = [
+  /^$/,
+  /^Vercel CLI \d/,
+  /^>? ?Installing .+ under /,
+  /^Provisioning resource/,
+  /^Retrieving project/,
+  /^>? ?Success!/,
+  /^>? ?Guide: Run/,
+  /^>? ?Dashboard: https:\/\//,
+  /successfully connected to/i,
+  /^>? ?Overwriting existing \.env/,
+  /^>? ?Downloading/,
+  /^Changes:/,
+  /^\+ [A-Z][A-Z0-9_]*/,
+  /^[✓√] +(Updated|Created)/
+];
+function showNeonSetupLine(line) {
+  return !NEON_SETUP_NOISE.some((pattern) => pattern.test(line));
+}
+function readNeonFallbackInfo(output) {
+  const info = {};
+  const provisioned = output.match(/successfully provisioned: (\S+)/i)?.[1];
+  if (provisioned) info.resourceName = provisioned;
+  const dashboard = output.match(/Dashboard: (https:\/\/\S+)/i)?.[1];
+  if (dashboard) info.dashboardUrl = dashboard;
+  if (/failed to connect/i.test(output)) info.connectedToProject = false;
+  else if (/successfully connected to/i.test(output)) info.connectedToProject = true;
+  return info;
 }
 async function provisionNeon(runner, cwd, options) {
   const provisionSpinner = spinner2();
@@ -24953,17 +25002,57 @@ function readNeonProvisionInfo(stdout) {
   const info = {};
   if (meta.dashboardUrl) info.dashboardUrl = meta.dashboardUrl;
   if (meta.ssoUrl?.resource) info.resourceUrl = meta.ssoUrl.resource;
+  if (meta.resource?.name) info.resourceName = meta.resource.name;
+  const connectWarning = (meta.warnings ?? []).some((warning) => /failed to connect/i.test(warning));
+  if (meta.envPulled === false || connectWarning) info.connectedToProject = false;
+  else if (meta.envPulled === true) info.connectedToProject = true;
   return info;
 }
+async function replaceNeonProjectConnection(runner, cwd, resourceName, env) {
+  const list = await runVercel(runner, ["integration", "list", "--format", "json"], {
+    cwd,
+    mode: "capture",
+    timeoutMs: RESOURCE_CONNECT_TIMEOUT_MS,
+    env
+  });
+  if (list.success) {
+    const payload = parseVercelJson(list.stdout);
+    for (const resource of payload?.resources ?? []) {
+      if (!resource.name || resource.name === resourceName) continue;
+      if (resource.product && !/neon/i.test(resource.product)) continue;
+      await runVercel(runner, ["integration-resource", "disconnect", resource.name, "--yes"], {
+        cwd,
+        mode: "capture",
+        timeoutMs: RESOURCE_CONNECT_TIMEOUT_MS,
+        env
+      });
+    }
+  }
+  const connect = await runVercel(
+    runner,
+    ["integration-resource", "connect", resourceName, "--yes"],
+    {
+      cwd,
+      mode: "capture",
+      timeoutMs: RESOURCE_CONNECT_TIMEOUT_MS,
+      env
+    }
+  );
+  return connect.success;
+}
 function neonAddArgs(options) {
-  const addArgs = ["integration", "add", "neon", "--format", "json"];
-  if (options.plan) addArgs.push("--plan", options.plan);
-  return addArgs;
+  return [
+    "integration",
+    "add",
+    "neon",
+    "--format",
+    "json",
+    "--plan",
+    options.plan ?? NEON_FREE_PLAN_ID
+  ];
 }
 function connectedNeonAddArgs(options) {
-  const addArgs = ["integration", "add", "neon"];
-  if (options.plan) addArgs.push("--plan", options.plan);
-  return addArgs;
+  return ["integration", "add", "neon", "--plan", options.plan ?? NEON_FREE_PLAN_ID];
 }
 
 // adapters/next/init/vercel/flow.ts
@@ -24980,14 +25069,28 @@ async function runVercelNeonFlow(options) {
       p17.log.warn(authFailureMessage(auth.reason));
       return { ok: false };
     }
+    const linkPreExisted = Boolean(readLinkedProjectId(options.cwd));
     const linkLinePrinted = await ensureLinkedProject(runner, options.cwd, options.projectName, env);
+    const preExistingDbUrl = linkPreExisted ? await pullPreExistingDbUrl(runner, options.cwd, env) : void 0;
     const neon = await provisionNeonForMode(runner, options);
     if (neon.failure) {
       p17.log.warn(neonFailureMessage(neon.failure));
       if (neon.detail) p17.log.message(pc6.dim(neon.detail));
       return { ok: false };
     }
-    const databaseUrl = await pullNeonDatabaseUrl(runner, options.cwd, env);
+    if (neon.connectedToProject === false && neon.resourceName) {
+      const connectSpinner = spinner2();
+      connectSpinner.start("Connecting the database to your Vercel project");
+      await replaceNeonProjectConnection(runner, options.cwd, neon.resourceName, env);
+      connectSpinner.clear();
+    }
+    let databaseUrl = await pullNeonDatabaseUrl(runner, options.cwd, env);
+    if (databaseUrl && databaseUrl === preExistingDbUrl) {
+      databaseUrl = void 0;
+      p17.log.warn(
+        "The linked Vercel project still returns its previous DATABASE_URL \u2014 the new database could not be connected."
+      );
+    }
     const dismissSignedInNote = databaseUrl && auth.dismissNote && !neon.usedTerminalFallback ? () => auth.dismissNote?.({ linesBelow: linkLinePrinted ? 1 : 0 }) : void 0;
     return {
       ok: true,
@@ -25083,7 +25186,7 @@ async function runVercelDeployFlow(options) {
       );
     }
     const deploySpinner = spinner2();
-    deploySpinner.start("Deploying to Vercel (this may take a few minutes)");
+    deploySpinner.start("Deploying to Vercel, This may take a moment");
     let deploy;
     try {
       deploy = await deployVercelProject(runner, options.cwd, env);
@@ -25121,6 +25224,13 @@ async function ensureLinkedProject(runner, cwd, projectName, env) {
   );
   return true;
 }
+async function pullPreExistingDbUrl(runner, cwd, env) {
+  const snapshotSpinner = spinner2();
+  snapshotSpinner.start("Checking the linked Vercel project");
+  const url = await pullVercelEnvValue(runner, cwd, readDbUrlFromDotenv, env);
+  snapshotSpinner.clear();
+  return url;
+}
 async function pullNeonDatabaseUrl(runner, cwd, env) {
   const neonSpinner = spinner2();
   neonSpinner.start("Retrieving DATABASE_URL from Vercel");
@@ -25962,7 +26072,7 @@ async function runInitCommand(name, options) {
   }
   const coreDependencyPlan = getDependencyPlan([], [], project2.linter.type === "none");
   const cliDependencyPlan = getCliDependencySyncPlan(cwd);
-  s.start("Installing dependencies (this may take a minute)");
+  s.start("Installing dependencies, This may take a moment");
   const depsResult = await installDependenciesAsync({
     cwd,
     pm,