betterstart-cli 0.0.83 → 0.0.85

package/dist/assets/shared-assets/react-admin/ui/dialog.tsx

@@ -30,7 +30,7 @@ function DialogOverlay({
     <DialogPrimitive.Overlay
       data-slot="dialog-overlay"
       className={cn(
-        'fixed inset-0 isolate z-50 bg-black/80 duration-100 supports-backdrop-filter:backdrop-blur-xs data-open:animate-in data-open:fade-in-0 data-closed:animate-out data-closed:fade-out-0',
+        'fixed inset-0 isolate z-200 bg-black/80 duration-100 supports-backdrop-filter:backdrop-blur-xs data-open:animate-in data-open:fade-in-0 data-closed:animate-out data-closed:fade-out-0',
         className
       )}
       {...props}
@@ -52,7 +52,7 @@ function DialogContent({
       <DialogPrimitive.Content
         data-slot="dialog-content"
         className={cn(
-          'fixed top-1/2 left-1/2 z-50 grid w-full max-w-[calc(100%-2rem)] -translate-x-1/2 -translate-y-1/2 gap-0 rounded-sm text-sm text-popover-foreground ring-1 ring-foreground/5 duration-100 outline-none sm:max-w-md data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95 data-closed:animate-out data-closed:fade-out-0 data-closed:zoom-out-95 overflow-hidden bg-card',
+          'fixed top-1/2 left-1/2 z-200 grid w-full max-w-[calc(100%-2rem)] -translate-x-1/2 -translate-y-1/2 gap-0 rounded-sm text-sm text-popover-foreground ring-1 ring-foreground/5 duration-100 outline-none sm:max-w-md data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95 data-closed:fade-out-0 data-closed:zoom-out-95 overflow-hidden bg-card',
           className
         )}
         {...props}
@@ -106,7 +106,7 @@ function DialogFooter({
     <div
       data-slot="dialog-footer"
       className={cn(
-        'flex flex-col-reverse gap-1 px-6 pt-4 items-center pb-5 bg-muted sm:flex-row sm:justify-between',
+        'flex flex-col-reverse gap-1 px-6 pt-2 items-center pb-3 bg-muted sm:flex-row sm:justify-between',
         className
       )}
       {...props}

package/dist/cli.js

@@ -25696,12 +25696,25 @@ function runVercel(runner, args, options) {
     let stdout = "";
     let stderr = "";
     let timedOut = false;
+    let closed = false;
+    let effectiveTimeoutMs = timeoutMs;
+    let timeout;
+    const armTimeout = (ms) => {
+      if (closed) return;
+      clearTimeout(timeout);
+      effectiveTimeoutMs = ms;
+      timeout = setTimeout(() => {
+        timedOut = true;
+        child.kill("SIGTERM");
+      }, ms);
+    };
+    const runControl = { extendTimeout: armTimeout };
     const onOutputLine = options.onOutputLine;
     const createOutputObserver = () => {
       if (!onOutputLine) return void 0;
       return createFilteredLineForwarder(
         (line) => line.length > 0,
-        (text7) => onOutputLine(stripVTControlCharacters3(text7).trim())
+        (text7) => onOutputLine(stripVTControlCharacters3(text7).trim(), runControl)
       );
     };
     const stdoutObserver = createOutputObserver();
@@ -25748,11 +25761,9 @@ function runVercel(runner, args, options) {
         errForwarder.flush();
       });
     }
-    const timeout = setTimeout(() => {
-      timedOut = true;
-      child.kill("SIGTERM");
-    }, timeoutMs);
+    armTimeout(timeoutMs);
     child.on("close", (code, signal) => {
+      closed = true;
       clearTimeout(timeout);
       stdoutObserver?.flush();
       stderrObserver?.flush();
@@ -25764,7 +25775,7 @@ function runVercel(runner, args, options) {
           stdout,
           stderr,
           timedOut: true,
-          errorMessage: `Vercel command timed out after ${Math.floor(timeoutMs / 1e3)}s`
+          errorMessage: `Vercel command timed out after ${Math.floor(effectiveTimeoutMs / 1e3)}s`
         });
         return;
       }
@@ -25779,6 +25790,7 @@ function runVercel(runner, args, options) {
       });
     });
     child.on("error", (err) => {
+      closed = true;
       clearTimeout(timeout);
       stdoutObserver?.flush();
       stderrObserver?.flush();
@@ -26288,6 +26300,8 @@ function ensureVercelJsonFramework(cwd) {
 }
 function parseDeployedUrl(stdout, stderr) {
   const plainErr = stripVTControlCharacters4(stderr);
+  const aliased = plainErr.match(/Aliased:\s+(https:\/\/\S+)/i)?.[1];
+  if (aliased) return aliased;
   const production = plainErr.match(/Production:\s+(https:\/\/\S+)/i)?.[1];
   if (production) return production;
   const fromStdout = stripVTControlCharacters4(stdout).match(/https:\/\/\S+/)?.[0];
@@ -26348,16 +26362,52 @@ import * as p20 from "@clack/prompts";
 import pc7 from "picocolors";
 var PROVISION_TIMEOUT_MS2 = 18e4;
 var INTERACTIVE_PROVISION_TIMEOUT_MS2 = 6e5;
+var ACCEPT_TERMS_URL_PATTERN = /https:\/\/vercel\.com\/\S+\/integrations\/accept-terms\/\S+/i;
+var TERMS_ACCEPTED_PATTERN = /terms accepted/i;
+function findAcceptTermsUrl(line) {
+  return ACCEPT_TERMS_URL_PATTERN.exec(line)?.[0];
+}
 async function provisionNeonInteractive(runner, cwd, options) {
   const quietSpinner = spinner2();
   quietSpinner.start("Creating your Neon database");
+  let termsNotice;
+  let termsResolved = false;
+  const settleTermsNotice = () => {
+    if (!termsNotice || termsResolved) return;
+    termsResolved = true;
+    quietSpinner.clear();
+    eraseRows(termsNotice.rows);
+    p20.log.step(termsNotice.text);
+  };
   const quiet = await runVercel(runner, neonAddArgs(options), {
     cwd,
     mode: "capture",
     timeoutMs: PROVISION_TIMEOUT_MS2,
-    env: options.env
+    env: options.env,
+    onOutputLine: (line, run) => {
+      if (!termsNotice) {
+        const termsUrl = findAcceptTermsUrl(line);
+        if (!termsUrl) return;
+        run.extendTimeout(INTERACTIVE_PROVISION_TIMEOUT_MS2);
+        const message = "Please accept the Neon terms in your browser";
+        termsNotice = {
+          text: `${message}
+${pc7.dim(termsUrl)}`,
+          rows: clackLogRows(message) + clackLogRows(termsUrl) - 1
+        };
+        quietSpinner.clear();
+        p20.log.info(termsNotice.text);
+        quietSpinner.start("Waiting for the terms to be accepted");
+        return;
+      }
+      if (TERMS_ACCEPTED_PATTERN.test(line)) {
+        settleTermsNotice();
+        quietSpinner.start("Creating your Neon database");
+      }
+    }
   });
   if (quiet.success) {
+    settleTermsNotice();
     quietSpinner.clear();
     return readNeonProvisionInfo(quiet.stdout);
   }