betterstart-cli 0.0.45 → 0.0.47

package/dist/cli.js

@@ -3468,7 +3468,7 @@ function schemaManifestContainsMailchimpImports(cwd, config, schemaName) {
       return false;
     }
     const content = fs14.readFileSync(fullPath, "utf-8");
-    return markers.some((marker2) => content.includes(marker2));
+    return markers.some((marker) => content.includes(marker));
   });
 }
 function findBlockingIntegrationDependencies(cwd, config, integrationId) {
@@ -21868,80 +21868,20 @@ var GREEN_CHECK = "\x1B[32m\u2713\x1B[39m";
 function restyleStepSubmitSymbols(text7) {
   return text7.split(GREEN_STEP_SUBMIT).join(GREEN_CHECK);
 }
-var ROW_ESCAPES = /\u001B\[(\d*)([ABEF])/g;
-function rowDelta(text7) {
-  let delta = text7.split("\n").length - 1;
-  for (const match of text7.matchAll(ROW_ESCAPES)) {
-    const n = match[1] === "" ? 1 : Number(match[1]);
-    delta += match[2] === "A" || match[2] === "F" ? -n : n;
-  }
-  return delta;
-}
 var installed = false;
-var armed = false;
-var marker = null;
-var generation = 0;
-var rawStdoutWrite;
 function installPromptCheckmarks() {
   if (installed || !process.stdout.isTTY || process.env.CI === "true") return () => {
   };
   installed = true;
-  const unpatchedOut = process.stdout.write;
-  const unpatchedErr = process.stderr.write;
-  const writeOut = unpatchedOut.bind(process.stdout);
-  const writeErr = unpatchedErr.bind(process.stderr);
-  rawStdoutWrite = writeOut;
+  const unpatched = process.stdout.write;
+  const write = unpatched.bind(process.stdout);
   process.stdout.write = ((chunk, encoding, callback) => {
-    if (typeof chunk !== "string") return writeOut(chunk, encoding, callback);
-    const idx = armed ? chunk.indexOf(GREEN_STEP_SUBMIT) : -1;
-    if (idx === -1) {
-      if (marker) marker.rowsAbove += rowDelta(chunk);
-      return writeOut(restyleStepSubmitSymbols(chunk), encoding, callback);
-    }
-    armed = false;
-    const rest = chunk.slice(idx + GREEN_STEP_SUBMIT.length);
-    marker = { rowsAbove: rowDelta(rest) };
-    return writeOut(
-      restyleStepSubmitSymbols(chunk.slice(0, idx)) + GREEN_STEP_SUBMIT + restyleStepSubmitSymbols(rest),
-      encoding,
-      callback
-    );
-  });
-  process.stderr.write = ((chunk, encoding, callback) => {
-    if (typeof chunk === "string" && marker) marker.rowsAbove += rowDelta(chunk);
-    return writeErr(chunk, encoding, callback);
+    if (typeof chunk !== "string") return write(chunk, encoding, callback);
+    return write(restyleStepSubmitSymbols(chunk), encoding, callback);
   });
   return () => {
-    process.stdout.write = unpatchedOut;
-    process.stderr.write = unpatchedErr;
-    rawStdoutWrite = void 0;
+    process.stdout.write = unpatched;
     installed = false;
-    armed = false;
-    marker = null;
-  };
-}
-function deferNextPromptCheck() {
-  if (!installed) return { confirm() {
-  }, skip() {
-  } };
-  generation += 1;
-  const token = generation;
-  armed = true;
-  marker = null;
-  return {
-    confirm() {
-      if (token !== generation) return;
-      armed = false;
-      const rows = marker?.rowsAbove;
-      marker = null;
-      if (rows === void 0 || rows <= 0 || rows >= (process.stdout.rows ?? 24)) return;
-      rawStdoutWrite?.(`\x1B[${rows}A\r${GREEN_CHECK}\x1B[${rows}B\r`);
-    },
-    skip() {
-      if (token !== generation) return;
-      armed = false;
-      marker = null;
-    }
   };
 }
 
@@ -22198,7 +22138,6 @@ async function promptPresets(cwd, options = {}) {
       overwriteKeys.add(key);
     }
   };
-  const storageStep = deferNextPromptCheck();
   const storage = await p12.select({
     message: "Choose a file storage",
     options: [
@@ -22224,7 +22163,6 @@ async function promptPresets(cwd, options = {}) {
   }
   if (storage === "r2") {
     mergeIntegrationConfig(await collectIntegrationConfig(cwd, ["r2"]));
-    storageStep.confirm();
   } else if (storage === "vercel-blob") {
     const existingToken = readEnvVar(cwd, "BLOB_READ_WRITE_TOKEN")?.trim();
     const flow = !existingToken && options.provisionVercelBlob ? await options.provisionVercelBlob() : void 0;
@@ -22235,8 +22173,6 @@ async function promptPresets(cwd, options = {}) {
         vars: [{ key: "BLOB_READ_WRITE_TOKEN", value: flow.token }]
       });
       overwriteKeys.add("BLOB_READ_WRITE_TOKEN");
-      if (flow.usedTerminalFallback) storageStep.skip();
-      else storageStep.confirm();
     } else if (flow) {
       p12.log.warn(
         "Continuing without a Blob token \u2014 add BLOB_READ_WRITE_TOKEN to .env.local from the store on vercel.com/dashboard/stores."
@@ -22245,7 +22181,6 @@ async function promptPresets(cwd, options = {}) {
         header: "Storage (Vercel Blob)",
         vars: [{ key: "BLOB_READ_WRITE_TOKEN", value: "" }]
       });
-      storageStep.skip();
     } else {
       if (existingToken) {
         p12.log.info(
@@ -22256,10 +22191,7 @@ async function promptPresets(cwd, options = {}) {
         );
       }
       mergeIntegrationConfig(await collectIntegrationConfig(cwd, ["vercel-blob"]));
-      storageStep.confirm();
     }
-  } else {
-    storageStep.confirm();
   }
   const selectedPresets = await p12.multiselect({
     message: "Select presets",
@@ -24592,11 +24524,7 @@ async function provisionBlobStoreInteractive(runner, cwd, options) {
       return { ...storeName && { storeName }, failure: "env-pull-empty" };
     }
     activeSpinner.clear();
-    return {
-      token,
-      ...storeName && { storeName },
-      ...terminalFallbackRan && { usedTerminalFallback: true }
-    };
+    return { token, ...storeName && { storeName } };
   };
   for (let attempt = 1; attempt <= MAX_STORE_NAME_ATTEMPTS; attempt++) {
     const storeName = candidateStoreName(options.name, attempt);
@@ -24889,11 +24817,9 @@ 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 provisionSpinner = spinner2();
-  provisionSpinner.start("Creating your Neon database");
+  const quietSpinner = spinner2();
+  quietSpinner.start("Creating your Neon database");
   const quiet = await runVercel(runner, neonAddArgs(options), {
     cwd,
     mode: "capture",
@@ -24901,72 +24827,25 @@ async function provisionNeonInteractive(runner, cwd, options) {
     env: options.env
   });
   if (quiet.success) {
-    provisionSpinner.clear();
+    quietSpinner.clear();
     return readNeonProvisionInfo(quiet.stdout);
   }
-  let promptsShown = false;
+  quietSpinner.clear();
+  p16.log.info(
+    `Create your Neon database in the Vercel prompts below ${pc5.dim(
+      "(the Free plan is recommended)."
+    )}`
+  );
   const add = await runVercel(runner, connectedNeonAddArgs(options), {
     cwd,
-    mode: "stream",
+    mode: "inherit",
     timeoutMs: INTERACTIVE_PROVISION_TIMEOUT_MS2,
-    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;
-    }
+    env: options.env
   });
-  if (!promptsShown) provisionSpinner.clear();
   if (!add.success) {
-    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 { failure: add.timedOut ? "timeout" : "provision-failed" };
   }
-  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;
+  return { usedTerminalFallback: true };
 }
 async function provisionNeon(runner, cwd, options) {
   const provisionSpinner = spinner2();
@@ -25002,57 +24881,17 @@ 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) {
-  return [
-    "integration",
-    "add",
-    "neon",
-    "--format",
-    "json",
-    "--plan",
-    options.plan ?? NEON_FREE_PLAN_ID
-  ];
+  const addArgs = ["integration", "add", "neon", "--format", "json"];
+  if (options.plan) addArgs.push("--plan", options.plan);
+  return addArgs;
 }
 function connectedNeonAddArgs(options) {
-  return ["integration", "add", "neon", "--plan", options.plan ?? NEON_FREE_PLAN_ID];
+  const addArgs = ["integration", "add", "neon"];
+  if (options.plan) addArgs.push("--plan", options.plan);
+  return addArgs;
 }
 
 // adapters/next/init/vercel/flow.ts
@@ -25069,29 +24908,15 @@ 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;
+    await ensureLinkedProject(runner, options.cwd, options.projectName, env);
     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 };
     }
-    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;
+    const databaseUrl = await pullNeonDatabaseUrl(runner, options.cwd, env);
+    const dismissSignedInNote = databaseUrl && auth.dismissNote && !neon.usedTerminalFallback ? () => auth.dismissNote?.({ linesBelow: 0 }) : void 0;
     return {
       ok: true,
       databaseUrl,
@@ -25131,8 +24956,7 @@ async function runVercelBlobFlow(options) {
     return {
       ok: true,
       token: blob.token,
-      blobStoreName: blob.storeName,
-      usedTerminalFallback: blob.usedTerminalFallback
+      blobStoreName: blob.storeName
     };
   } catch (error) {
     p17.log.warn(
@@ -25168,9 +24992,7 @@ async function runVercelDeployFlow(options) {
     } else {
       envSpinner.clear();
     }
-    let printedWarnings = false;
     for (const key of sync.failed) {
-      printedWarnings = true;
       p17.log.warn(
         `Could not set ${pc6.cyan(key)} on Vercel \u2014 add it in the project's environment settings.`
       );
@@ -25180,13 +25002,12 @@ async function runVercelDeployFlow(options) {
     }
     const packageGuard = guardProjectForDeploy(options.cwd);
     for (const dep of packageGuard.localSpecDeps) {
-      printedWarnings = true;
       p17.log.warn(
         `Dependency ${pc6.cyan(dep)} uses a local spec that cannot install on Vercel \u2014 the remote build may fail.`
       );
     }
     const deploySpinner = spinner2();
-    deploySpinner.start("Deploying to Vercel, This may take a moment");
+    deploySpinner.start("Deploying to Vercel (this may take a few minutes)");
     let deploy;
     try {
       deploy = await deployVercelProject(runner, options.cwd, env);
@@ -25202,7 +25023,7 @@ async function runVercelDeployFlow(options) {
     const linkedName = readLinkedProjectName(options.cwd);
     const url = linkedName ? `https://${linkedName}.vercel.app` : deploy.url;
     deploySpinner.stop(url ? `Deployed ${pc6.cyan(url)}` : "Deployed to Vercel");
-    return { ok: true, url, syncedEnvKeys: sync.synced, cleanScreen: !printedWarnings };
+    return { ok: true, url, syncedEnvKeys: sync.synced };
   } catch (error) {
     p17.log.warn(`Vercel deploy failed: ${error instanceof Error ? error.message : String(error)}`);
     printManualDeployHint();
@@ -25215,21 +25036,11 @@ function printManualDeployHint() {
   p17.log.info(`You can deploy manually: ${pc6.cyan("vercel deploy --prod")}`);
 }
 async function ensureLinkedProject(runner, cwd, projectName, env) {
-  if (readLinkedProjectId(cwd)) return false;
+  if (readLinkedProjectId(cwd)) return;
   const projectSpinner = spinner2();
   projectSpinner.start(`Creating a Vercel project ${pc6.cyan(projectName)}`);
-  const project2 = await createVercelProject(runner, cwd, projectName, env);
-  projectSpinner.stop(
-    project2.linked ? `Linked Vercel project ${pc6.cyan(project2.name)}` : `Using Vercel project ${pc6.cyan(project2.name)}`
-  );
-  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;
+  await createVercelProject(runner, cwd, projectName, env);
+  projectSpinner.clear();
 }
 async function pullNeonDatabaseUrl(runner, cwd, env) {
   const neonSpinner = spinner2();
@@ -25900,7 +25711,6 @@ async function runInitCommand(name, options) {
     p18.log.info(`Using the existing DATABASE_URL from .env.local ${pc7.dim(`(${masked})`)}`);
     databaseUrl = existingDbUrl;
   } else {
-    const databaseStep = deferNextPromptCheck();
     const servicesResult = await promptServices({ allowVercel: options.vercel !== false });
     if (servicesResult.provider === "vercel-cli") {
       const flow = await runVercelNeonFlow({
@@ -25914,22 +25724,17 @@ async function runInitCommand(name, options) {
         databaseUrl = flow.databaseUrl;
         persistDatabaseUrl(cwd, databaseUrl);
         dismissVercelSignedInNote = flow.dismissSignedInNote;
-        if (flow.dismissSignedInNote) databaseStep.confirm();
-        else databaseStep.skip();
       } else if (flow.ok) {
-        databaseStep.skip();
         openBrowserVercelNeonResource(flow.dashboardUrl ?? flow.resourceUrl);
         databaseUrl = await promptConnectionString();
         persistDatabaseUrl(cwd, databaseUrl);
       } else {
-        databaseStep.skip();
         p18.log.info("Falling back to a manual database connection string.");
         openBrowserVercelNeon();
         databaseUrl = await promptConnectionString();
       }
     } else {
       databaseUrl = servicesResult.url;
-      databaseStep.confirm();
     }
   }
   const selectedPresets = (() => {
@@ -26072,7 +25877,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 moment");
+  s.start("Installing dependencies (this may take a minute)");
   const depsResult = await installDependenciesAsync({
     cwd,
     pm,
@@ -26375,17 +26180,12 @@ Run manually: ${pc7.cyan(betterstartExecCommand(pm, "seed"))}`,
   if (options.vercel !== false && !options.skipDeploy) {
     const linkedVercelProject = Boolean(readLinkedProjectId(cwd));
     if (!options.yes) {
-      const deployStep = deferNextPromptCheck();
       const deployNow = await p18.confirm({
         message: "Deploy to Vercel now?",
         initialValue: linkedVercelProject
       });
       if (!p18.isCancel(deployNow) && deployNow) {
-        const deployFlow = await runVercelDeployFlow({ cwd, projectName, env: process.env });
-        if (deployFlow.ok && deployFlow.cleanScreen) deployStep.confirm();
-        else deployStep.skip();
-      } else {
-        deployStep.confirm();
+        await runVercelDeployFlow({ cwd, projectName, env: process.env });
       }
     } else if (linkedVercelProject && process.env.VERCEL_TOKEN) {
       const deployFlow = await runVercelDeployFlow({