create-nextblock 0.8.2 → 0.8.5

package/bin/create-nextblock.js

@@ -795,14 +795,15 @@ async function runSetupWizard(projectDir, projectName) {
   //    access token so no browser login is required.
   const supabaseBin = await getSupabaseBinary(projectPath);
   const command = supabaseBin === 'npx' ? 'npx' : supabaseBin;
-  const sbArgs = (args) => (supabaseBin === 'npx' ? ['supabase', ...args] : args);
+  // `--yes` skips npx's "Ok to proceed?" install prompt if it ever falls back to npx
+  // (i.e. the supabase devDependency somehow isn't installed) so it can't hang the wizard.
+  const sbArgs = (args) =>
+    supabaseBin === 'npx' ? ['--yes', 'supabase', ...args] : args;
   const supabaseEnv = {
     ...process.env,
     SUPABASE_ACCESS_TOKEN: supabase.accessToken,
     SUPABASE_DB_PASSWORD: dbPassword,
     POSTGRES_URL: postgresUrl,
-    // Available for env() substitution in supabase config.toml during `config push`.
-    NEXT_PUBLIC_URL: siteUrl,
   };
 
   const applySchema = await clack.confirm({
@@ -814,8 +815,9 @@ async function runSetupWizard(projectDir, projectName) {
     handleWizardCancel('Setup cancelled.');
   }
 
-  const dbSpinner = clack.spinner();
-  dbSpinner.start('Linking to your Supabase project...');
+  // Stream the Supabase CLI's own output (stdio: inherit) instead of hiding it behind a
+  // spinner — link/push are long-running and a spinner over inherited output looks frozen.
+  clack.log.step('Linking to your Supabase project...');
   try {
     await execa(
       command,
@@ -824,7 +826,9 @@ async function runSetupWizard(projectDir, projectName) {
     );
 
     if (applySchema) {
-      dbSpinner.message('Pushing database schema...');
+      clack.log.step(
+        'Applying the database schema — this can take a minute on a fresh project...',
+      );
       await execa(command, sbArgs(['db', 'push', '--include-all']), {
         stdio: ['pipe', 'inherit', 'inherit'],
         cwd: projectPath,
@@ -832,21 +836,14 @@ async function runSetupWizard(projectDir, projectName) {
         env: supabaseEnv,
       });
 
-      dbSpinner.message('Pushing Supabase config (auth settings)...');
-      await execa(command, sbArgs(['config', 'push']), {
-        stdio: ['pipe', 'inherit', 'inherit'],
-        cwd: projectPath,
-        env: supabaseEnv,
-      });
-
-      dbSpinner.stop('Database schema and config applied.');
+      clack.log.success('Database schema applied.');
     } else {
-      dbSpinner.stop(
+      clack.log.info(
         'Linked. Skipped schema push — run `npx supabase db push --include-all` when ready.',
       );
     }
   } catch (error) {
-    dbSpinner.stop(
+    clack.log.warn(
       'Database setup failed. You can run `npx supabase db push --include-all` manually.',
     );
     if (error instanceof Error) {
@@ -854,10 +851,11 @@ async function runSetupWizard(projectDir, projectName) {
     }
   }
 
-  // 7. Sync hosted Supabase Auth: custom SMTP + branded email templates. SMTP and the
-  //    access token are required, so this always runs (matching setup.mjs). This is what
-  //    lets Supabase email your first admin their confirmation link.
-  await enableSupabaseSmtpConfig(projectPath);
+  // 7. Configure hosted Supabase Auth via the Management API: site URL + custom SMTP +
+  //    branded email templates. This is the same mechanism as `npm run configure:supabase-auth`
+  //    in the monorepo, and it's what lets Supabase email your first admin's confirmation link.
+  //    (We deliberately do NOT `supabase config push` the whole config.toml — that pushes
+  //    local-only/unset values like env(TARGET_URL) and isn't what the monorepo does.)
   await configureHostedSupabaseAuth(projectPath, {
     projectId,
     siteUrl,
@@ -900,48 +898,6 @@ async function runSetupWizard(projectDir, projectName) {
   );
 }
 
-async function enableSupabaseSmtpConfig(projectDir) {
-  const configPath = resolve(projectDir, 'supabase', 'config.toml');
-
-  if (!(await fs.pathExists(configPath))) {
-    return;
-  }
-
-  const smtpBlock = `# [auth.email.smtp]
-# host = "env(SMTP_HOST)"
-# port = 587
-# user = "env(SMTP_USER)"
-# pass = "env(SMTP_PASS)"
-# admin_email = "env(SMTP_FROM_EMAIL)"
-# sender_name = "env(SMTP_FROM_NAME)"`;
-
-  const enabledSmtpBlock = `[auth.email.smtp]
-host = "env(SMTP_HOST)"
-port = 587
-user = "env(SMTP_USER)"
-pass = "env(SMTP_PASS)"
-admin_email = "env(SMTP_FROM_EMAIL)"
-sender_name = "env(SMTP_FROM_NAME)"`;
-
-  const configContents = await fs.readFile(configPath, 'utf8');
-
-  if (configContents.includes(enabledSmtpBlock)) {
-    return;
-  }
-
-  if (!configContents.includes(smtpBlock)) {
-    throw new Error(
-      `Could not find the SMTP placeholder block in ${configPath}.`,
-    );
-  }
-
-  await fs.writeFile(
-    configPath,
-    configContents.replace(smtpBlock, enabledSmtpBlock),
-    'utf8',
-  );
-}
-
 async function configureHostedSupabaseAuth(
   projectDir,
   { projectId, siteUrl, accessToken, smtpValues },
@@ -1830,17 +1786,31 @@ async function transformPackageJson(projectDir) {
     keygrip: 'npm:keygrip@latest',
   };
   let rootOverrides = FALLBACK_OVERRIDES;
+  let supabaseCliVersion = '^2.95.6'; // keep in sync with the repo root devDependency
   try {
     const rootPkg = await fs.readJSON(resolve(REPO_ROOT, 'package.json'));
     if (rootPkg?.overrides && Object.keys(rootPkg.overrides).length > 0) {
       rootOverrides = rootPkg.overrides;
     }
+    const rootSupabase =
+      rootPkg?.devDependencies?.supabase ?? rootPkg?.dependencies?.supabase;
+    if (rootSupabase) {
+      supabaseCliVersion = rootSupabase;
+    }
   } catch {
-    // Published CLI: repo root package.json not present — keep the baked-in fallback.
+    // Published CLI: repo root package.json not present — keep the baked-in fallbacks.
   }
   // Project-specific overrides (if any) win over the inherited defaults.
   packageJson.overrides = { ...rootOverrides, ...(packageJson.overrides ?? {}) };
 
+  // Ship the Supabase CLI as a devDependency so setup / link / db push use a locally-installed
+  // binary. Without it, `npx supabase` downloads the CLI (~40MB) and shows an "Ok to proceed?"
+  // prompt mid-wizard that looks like a hang.
+  packageJson.devDependencies = packageJson.devDependencies ?? {};
+  if (!packageJson.devDependencies.supabase) {
+    packageJson.devDependencies.supabase = supabaseCliVersion;
+  }
+
   // npm throws EOVERRIDE when a package is BOTH a direct dependency and has an override with a
   // different spec (e.g. dependencies.uuid ^11.0.4 vs overrides.uuid ^11.1.1). Align any such
   // direct (dev)dependency to the override value so they share the exact same spec — which is

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-nextblock",
-  "version": "0.8.2",
+  "version": "0.8.5",
   "description": "",
   "main": "index.js",
   "bin": {

package/templates/nextblock-template/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nextblock-cms/template",
-  "version": "0.8.2",
+  "version": "0.8.5",
   "private": true,
   "scripts": {
     "dev": "next dev",