betterstart-cli 0.0.40 → 0.0.42

package/dist/cli.js

@@ -1508,8 +1508,15 @@ function runDrizzlePush(cwd, options = {}) {
     });
     let stdout = "";
     let stderr = "";
+    let outputNotified = false;
+    const notifyOutput = () => {
+      if (outputNotified) return;
+      outputNotified = true;
+      options.onOutput?.();
+    };
     const stderrFilter = createDrizzleNoiseFilter((chunk) => {
       if (options.interactive) {
+        notifyOutput();
         process.stderr.write(chunk);
         return;
       }
@@ -1517,6 +1524,7 @@ function runDrizzlePush(cwd, options = {}) {
     });
     const stdoutFilter = createDrizzleNoiseFilter((chunk) => {
       if (options.interactive) {
+        notifyOutput();
         process.stdout.write(chunk);
         return;
       }
@@ -22241,7 +22249,7 @@ async function promptPlugins(cwd, options = {}) {
     } else {
       if (existingToken) {
         p12.log.info(
-          `Using the existing Vercel Blob token from .env.local ${styleText(
+          `Using the existing BLOB_READ_WRITE_TOKEN from .env.local ${styleText(
             "dim",
             `(${maskBlobToken(existingToken)})`
           )}`
@@ -22270,30 +22278,13 @@ async function promptPlugins(cwd, options = {}) {
     process.exit(0);
   }
   const integrations = [];
-  const setupResend = await p12.confirm({
-    message: `Do you want to setup resend.com emails?
-${styleText(
-      "dim",
-      "This will be used for form submission confirmations, password resets etc."
-    )}`,
-    initialValue: true
+  sections.push({
+    header: "Email (Resend)",
+    vars: [
+      { key: "BETTERSTART_RESEND_API_KEY", value: "" },
+      { key: "BETTERSTART_EMAIL_FROM", value: "" }
+    ]
   });
-  if (p12.isCancel(setupResend)) {
-    p12.cancel("Setup cancelled.");
-    process.exit(0);
-  }
-  if (setupResend) {
-    integrations.push("resend");
-    mergeIntegrationConfig(await collectIntegrationConfig(cwd, ["resend"]));
-  } else {
-    sections.push({
-      header: "Email (Resend)",
-      vars: [
-        { key: "BETTERSTART_RESEND_API_KEY", value: "" },
-        { key: "BETTERSTART_EMAIL_FROM", value: "" }
-      ]
-    });
-  }
   if (storage === "r2") {
     integrations.push("r2");
   } else if (storage === "vercel-blob") {
@@ -25505,18 +25496,6 @@ function readNamespaceFromConfigSource(source) {
   const match = source.match(/\bnamespace\s*:\s*(['"`])([^'"`]+)\1/);
   return normalizeNamespaceForRemoval(match?.[2]);
 }
-function formatStorageProviderLabel(provider) {
-  switch (provider) {
-    case "vercel-blob":
-      return "Vercel Blob";
-    case "r2":
-      return "Cloudflare R2";
-    case "local":
-      return "local filesystem";
-    default:
-      return provider;
-  }
-}
 function resolveNonInteractiveProject(name) {
   const projectName = name?.trim() || "my-app";
   if (projectName !== "." && !/^[a-z0-9_-]+$/i.test(projectName)) {
@@ -25808,7 +25787,7 @@ async function runInitCommand(name, options) {
     }
   } else if (existingDbUrl) {
     const masked = maskDbUrl(existingDbUrl);
-    p18.log.info(`Using existing database URL from .env.local ${pc7.dim(`(${masked})`)}`);
+    p18.log.info(`Using the existing DATABASE_URL from .env.local ${pc7.dim(`(${masked})`)}`);
     databaseUrl = existingDbUrl;
   } else {
     const databaseStep = deferNextPromptCheck();
@@ -25913,35 +25892,21 @@ async function runInitCommand(name, options) {
   config.frameworkConfig.next.paths = deriveNamespacePaths(namespace, srcDir);
   config.paths = config.frameworkConfig.next.paths;
   config.database.migrationsDir = deriveMigrationsDir(namespace);
-  const results = [];
   const s = spinner2();
   s.start("Directory structure");
-  const baseFiles = scaffoldBase({
+  scaffoldBase({
     cwd,
     config,
     includeEmailTemplatesDir: pluginSelection.integrations.some(isEmailProviderIntegration)
   });
-  results.push({ label: "Directory structure", result: `${baseFiles.length} files` });
   s.message("TypeScript aliases");
-  const tsResult = scaffoldTsconfig(cwd, config);
-  results.push({
-    label: "TypeScript aliases",
-    result: tsResult.added.length > 0 ? `${tsResult.added.length} paths` : "already set"
-  });
+  scaffoldTsconfig(cwd, config);
   s.message("Tailwind CSS");
-  const twResult = scaffoldTailwind(cwd, srcDir, namespace);
-  results.push({
-    label: "Tailwind CSS",
-    result: twResult.appended ? "updated" : twResult.file ? "already set" : "no CSS file"
-  });
+  scaffoldTailwind(cwd, srcDir, namespace);
   s.message("Dev server");
-  const devServerResult = ensureDefaultDevScriptPort(cwd);
-  results.push({
-    label: "Dev server",
-    result: formatDevServerResult(devServerResult)
-  });
+  ensureDefaultDevScriptPort(cwd);
   s.message("Environment variables");
-  const envResult = scaffoldEnv(cwd, { databaseUrl, namespace });
+  scaffoldEnv(cwd, { databaseUrl, namespace });
   if (collectedIntegrationConfig.sections.length > 0) {
     appendEnvVars(
       cwd,
@@ -25949,49 +25914,26 @@ async function runInitCommand(name, options) {
       collectedIntegrationConfig.overwriteKeys
     );
   }
-  const envCount = envResult.added.length + envResult.updated.length;
-  results.push({
-    label: "Environment variables",
-    result: envCount > 0 ? `${envCount} vars` : "already set"
-  });
   s.message("Database");
   const dbFiles = scaffoldDatabase({ cwd, config });
-  results.push({ label: "Database", result: `${dbFiles.length} files` });
   s.message("Authentication");
-  const authFiles = scaffoldAuth({ cwd, config });
-  results.push({ label: "Authentication", result: `${authFiles.length} files` });
+  scaffoldAuth({ cwd, config });
   s.message("Components");
-  const compFiles = scaffoldComponents({ cwd, config });
-  results.push({ label: "Components", result: `${compFiles.length} files` });
+  scaffoldComponents({ cwd, config });
   s.message("Pages & layouts");
-  const layoutFiles = scaffoldLayout({ cwd, config });
-  results.push({ label: "Pages & layouts", result: `${layoutFiles.length} files` });
+  scaffoldLayout({ cwd, config });
   s.message("API routes");
-  const apiFiles = scaffoldApiRoutes({ cwd, config });
-  results.push({ label: "API routes", result: `${apiFiles.length} routes` });
+  scaffoldApiRoutes({ cwd, config });
   s.message("Linter");
-  let linterResult;
   if (project2.linter.type === "none") {
-    const biomeResult = scaffoldBiome(cwd, project2.linter);
-    linterResult = biomeResult.installed ? "biome (new)" : "none";
-  } else {
-    linterResult = project2.linter.type;
+    scaffoldBiome(cwd, project2.linter);
   }
-  results.push({ label: "Linter", result: linterResult });
   s.message("Next.js config");
   const nextConfigResult = scaffoldNextConfig({ cwd, nextMajorVersion });
-  results.push({
-    label: "Next.js config",
-    result: nextConfigResult.status === "created" ? "created" : nextConfigResult.status === "updated" ? "updated" : nextConfigResult.status === "already-set" ? "already set" : nextConfigResult.status === "not-needed" ? "not needed" : "manual setup needed"
-  });
-  const maxLabel = Math.max(...results.map((r) => r.label.length));
-  const noteLines = results.map((r) => {
-    const padded = r.label.padEnd(maxLabel + 3);
-    return `${pc7.green("\u2713")} ${padded}${pc7.dim(r.result)}`;
-  });
-  s.stop("");
-  process.stdout.write("\x1B[2A\x1B[J");
-  p18.note(noteLines.join("\n"), "Scaffolded admin");
+  s.clear();
+  if (nextConfigResult.status === "unsupported") {
+    p18.log.warn("The Next.js config could not be updated automatically \u2014 review it manually.");
+  }
   const drizzleConfigPath = path50.join(cwd, "drizzle.config.ts");
   if (!dbFiles.includes("drizzle.config.ts") && fs39.existsSync(drizzleConfigPath)) {
     if (forceMode) {
@@ -26096,42 +26038,20 @@ async function runInitCommand(name, options) {
   }
   writeConfigFile(cwd, resolvedIntegrationInstallResult.config);
   const usesLocalStorage = resolvedIntegrationInstallResult.config.storage.provider === "local";
-  const installLines = [];
-  if (depsInstalled) {
-    installLines.push(
-      `${pc7.green("\u2713")} Dependencies        ${pc7.dim(`${depsResult.dependencies.length} deps + ${depsResult.devDeps.length} dev deps`)}`
-    );
-  }
-  if (coreSchemasResult.errors.length > 0) {
-    installLines.push(
-      `${pc7.yellow("\u25B2")} Core schemas         ${pc7.dim(`${coreSchemasResult.errors.length} warning(s)`)}`
-    );
-    for (const err of coreSchemasResult.errors) {
-      installLines.push(`  ${pc7.dim(err)}`);
-    }
-  } else {
-    installLines.push(
-      `${pc7.green("\u2713")} Core schemas         ${pc7.dim(`${coreSchemasResult.schemas.length} schemas, ${coreSchemasResult.generatedFiles.length} files`)}`
-    );
+  for (const err of coreSchemasResult.errors) {
+    p18.log.warn(`Core schemas: ${err}`);
   }
-  installLines.push(
-    `${pc7.green("\u2713")} Plugins             ${pc7.dim(resolvedPluginInstallResult.installed.length > 0 ? resolvedPluginInstallResult.installed.join(", ") : "core only")}`
-  );
   for (const warning of resolvedPluginInstallResult.warnings) {
-    installLines.push(`  ${pc7.yellow("\u25B2")} ${warning}`);
+    p18.log.warn(warning);
   }
-  installLines.push(
-    `${pc7.green("\u2713")} Integrations        ${pc7.dim(resolvedIntegrationInstallResult.installed.length > 0 ? resolvedIntegrationInstallResult.installed.join(", ") : "none")}`
-  );
   for (const warning of resolvedIntegrationInstallResult.warnings) {
-    installLines.push(`  ${pc7.yellow("\u25B2")} ${warning}`);
+    p18.log.warn(warning);
   }
   if (usesLocalStorage) {
-    installLines.push(
-      `  ${pc7.yellow("\u25B2")} Local filesystem storage is only for development or self-hosted persistent-disk deployments. Use Vercel Blob or Cloudflare R2 for hosted/serverless production.`
+    p18.log.warn(
+      "Local filesystem storage is only for development or self-hosted persistent-disk deployments. Use Vercel Blob or Cloudflare R2 for hosted/serverless production."
     );
   }
-  p18.note(installLines.join("\n"), "Installed");
   let dbPushed = false;
   if (depsResult.success && options.skipMigration && hasDbUrl(cwd)) {
     p18.log.info(`Skipping database schema push ${pc7.dim("(--skip-migration)")}`);
@@ -26160,29 +26080,35 @@ async function runInitCommand(name, options) {
     }
     if (driverReady) {
       const useTerminalForDbPush = shouldUseTerminalForDbPush(options);
-      if (useTerminalForDbPush) {
-        p18.log.info(`Running ${pc7.cyan("drizzle-kit push --force")}`);
-      } else {
-        s.start("Pushing database schema (drizzle-kit push)");
-      }
-      const pushResult = await runDrizzlePush(cwd, { interactive: useTerminalForDbPush });
+      let dbSpinnerVisible = true;
+      const clearDbSpinner = () => {
+        if (!dbSpinnerVisible) return;
+        dbSpinnerVisible = false;
+        s.clear();
+      };
+      s.start(
+        useTerminalForDbPush ? "Setting up database" : "Pushing database schema (drizzle-kit push)"
+      );
+      const pushResult = await runDrizzlePush(cwd, {
+        interactive: useTerminalForDbPush,
+        onOutput: clearDbSpinner
+      });
       if (pushResult.success) {
         if (useTerminalForDbPush) {
           const verification = await verifyDatabaseReachable(cwd);
+          clearDbSpinner();
           if (!verification.success) {
             p18.log.warning(verification.error);
             p18.log.error("Database was not reachable. Aborting setup.");
             process.exit(1);
           }
-        }
-        if (useTerminalForDbPush) {
-          p18.log.success("Database schema pushed");
         } else {
-          s.stop(`${pc7.green("\u2713")} Database schema pushed`);
+          clearDbSpinner();
         }
         dbPushed = true;
       } else {
-        if (!useTerminalForDbPush) {
+        if (dbSpinnerVisible) {
+          dbSpinnerVisible = false;
           s.stop("Database push failed");
         }
         const pushError = pushResult.error ?? "Unknown error";
@@ -26208,7 +26134,9 @@ async function runInitCommand(name, options) {
     const adminDir = config.paths?.admin ?? "./admin";
     const authBasePath = `${resolveAdminNamespace(namespace).apiPath}/auth`;
     let replaceExistingAdmin = false;
+    s.start("Setting up database");
     const adminCheck = await checkExistingAdmin(cwd, adminDir, authBasePath);
+    s.clear();
     if (adminCheck.error) {
       p18.log.warning(`Could not verify existing admin account ${pc7.dim(`(${adminCheck.error})`)}`);
       if (isDatabaseReachabilityError(adminCheck.error)) {
@@ -26243,12 +26171,6 @@ async function runInitCommand(name, options) {
       }
     }
     if (!adminAccountReady) {
-      p18.note(
-        pc7.dim(
-          replaceExistingAdmin ? "Replace the existing admin account to access the admin." : "Create your first admin user to access the dashboard."
-        ),
-        "Admin account"
-      );
       const credentials = await p18.group(
         {
           email: () => p18.text({
@@ -26338,19 +26260,8 @@ Run manually: ${pc7.cyan(betterstartExecCommand(pm, "seed"))}`,
       s.stop("Git commit skipped");
     }
   }
-  const totalFiles = baseFiles.length + dbFiles.length + authFiles.length + compFiles.length + layoutFiles.length + apiFiles.length;
   const adminNamespace = resolveAdminNamespace(namespace);
   const adminLoginUrl = `http://localhost:${detectDevPort(cwd)}${adminNamespace.routePath}/login`;
-  const installedPluginList = resolvedPluginInstallResult.installed.length > 0 ? resolvedPluginInstallResult.installed.join(", ") : "core only";
-  const installedIntegrationList = resolvedIntegrationInstallResult.installed.length > 0 ? resolvedIntegrationInstallResult.installed.join(", ") : "none";
-  const summaryLines = [
-    `Plugins: ${pc7.cyan(installedPluginList)}`,
-    `Integrations: ${pc7.cyan(installedIntegrationList)}`,
-    `Storage: ${pc7.cyan(formatStorageProviderLabel(resolvedIntegrationInstallResult.config.storage.provider))}`,
-    `Files created: ${pc7.cyan(String(totalFiles))}`,
-    `Env vars: ${envResult.added.length} added, ${envResult.skipped.length} skipped`
-  ];
-  p18.note(summaryLines.join("\n"), "Admin scaffolded successfully");
   if (options.vercel !== false && !options.skipDeploy) {
     const linkedVercelProject = Boolean(readLinkedProjectId(cwd));
     if (!options.yes) {
@@ -26463,20 +26374,6 @@ function detectInstalledNextVersion(cwd) {
     return void 0;
   }
 }
-function formatDevServerResult(result) {
-  switch (result.status) {
-    case "updated":
-      return `set to ${result.port}`;
-    case "preserved":
-      return `using ${result.port}`;
-    case "skipped":
-      return `custom script preserved; BetterStart uses ${result.port}`;
-    case "missing-script":
-      return `no dev script; BetterStart uses ${result.port}`;
-    case "missing-package":
-      return `package.json missing; BetterStart uses ${result.port}`;
-  }
-}
 function shouldUseTerminalForDbPush(options) {
   return !options.yes && process.env.CI !== "true" && Boolean(process.stdin.isTTY) && Boolean(process.stdout.isTTY);
 }