create-nextblock 0.2.5 → 0.2.7

package/bin/create-nextblock.js

@@ -5,6 +5,7 @@ import { spawn } from 'node:child_process';
 import crypto from 'node:crypto';
 import { dirname, resolve, relative, sep, basename } from 'node:path';
 import { fileURLToPath } from 'node:url';
+import { createRequire } from 'node:module';
 import { execa } from 'execa';
 import { program } from 'commander';
 import inquirer from 'inquirer';
@@ -12,11 +13,12 @@ import chalk from 'chalk';
 import fs from 'fs-extra';
 import open from 'open';
 
-const DEFAULT_PROJECT_NAME = 'nextblock-cms';
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);
-const TEMPLATE_DIR = resolve(__dirname, '../templates/nextblock-template');
-const REPO_ROOT = resolve(__dirname, '../../..');
+const DEFAULT_PROJECT_NAME = 'nextblock-cms';
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+const TEMPLATE_DIR = resolve(__dirname, '../templates/nextblock-template');
+const REPO_ROOT = resolve(__dirname, '../../..');
+const require = createRequire(import.meta.url);
 const EDITOR_UTILS_SOURCE_DIR = resolve(REPO_ROOT, 'libs/editor/src/lib/utils');
 const IS_WINDOWS = process.platform === 'win32';
 
@@ -161,19 +163,12 @@ async function handleCommand(projectDirectory, options) {
       console.log(chalk.yellow('Skipping dependency installation.'));
     }
 
-    await initializeGit(projectDir);
-    console.log(chalk.green('Initialized a new Git repository.'));
-
-    console.log(
-      chalk.green(
-        `\nSuccess! Your NextBlock CMS project "${projectName}" is ready.\n\n` +
-          'Next steps:\n' +
-          `1. \`cd ${projectName}\`\n` +
-          '2. Copy your existing `.env` file or rename `.env.example` to `.env` and fill in your credentials.\n' +
-          '3. `npm run dev` to start the development server.\n\n' +
-          'Happy building!',
-      ),
-    );
+    await initializeGit(projectDir);
+    console.log(chalk.green('Initialized a new Git repository.'));
+
+    console.log(chalk.green(`\nSuccess! Your NextBlock CMS project "${projectName}" is ready.\n`));
+    console.log(chalk.cyan('Next step:'));
+    console.log(chalk.cyan('  npm run dev'));
   } catch (error) {
     console.error(
       chalk.red(error instanceof Error ? error.message : 'An unexpected error occurred'),
@@ -225,9 +220,13 @@ async function runSetupWizard(projectDir, projectName) {
     } catch (_) {
       // ignore if not supported
     }
+    process.stdin.setEncoding('utf8');
   }
   process.stdin.resume();
 
+  // Ensure supabase assets exist (config + migrations) after link in case the CLI created/overrode files
+  await ensureSupabaseAssets(projectPath);
+
   const configTomlPath = resolve(projectPath, 'supabase', 'config.toml');
   let configToml = '';
   if (!(await fs.pathExists(configTomlPath))) {
@@ -333,8 +332,16 @@ async function runSetupWizard(projectDir, projectName) {
   dbPushSpinner.start('Pushing database schema... (This may take a minute)');
   try {
     process.env.POSTGRES_URL = postgresUrl;
-    await execa('npx', ['supabase', 'db', 'push'], { stdio: 'inherit', cwd: projectPath });
-    dbPushSpinner.stop('Database schema pushed successfully!');
+    const migrationsDir = resolve(projectPath, 'supabase', 'migrations');
+    const hasMigrations =
+      (await fs.pathExists(migrationsDir)) &&
+      (await fs.readdir(migrationsDir)).some((name) => name.endsWith('.sql'));
+    if (!hasMigrations) {
+      dbPushSpinner.stop('No migrations found in supabase/migrations; skipping db push.');
+    } else {
+      await execa('npx', ['supabase', 'db', 'push'], { stdio: 'inherit', cwd: projectPath });
+      dbPushSpinner.stop('Database schema pushed successfully!');
+    }
   } catch (error) {
     dbPushSpinner.stop('Database push failed. Please run `npx supabase db push` manually.');
     if (error instanceof Error) {
@@ -463,9 +470,7 @@ async function runSetupWizard(projectDir, projectName) {
     }
   }
 
-  clack.outro(
-    `🎉 Your NextBlock project ${projectName ? `"${projectName}" ` : ''}is ready!\n\nNext steps:\n  1. cd ${projectName || projectPath}\n  2. npm run dev`,
-  );
+  clack.outro(`🎉 Your NextBlock project ${projectName ? `"${projectName}" ` : ''}is ready!\n\nNext step:\n  npm run dev`);
 }
 
 function handleWizardCancel(message) {
@@ -693,26 +698,40 @@ SMTP_FROM_NAME=
 }
 
 async function ensureSupabaseAssets(projectDir) {
-  const sourceSupabaseDir = resolve(REPO_ROOT, 'libs/db/src/supabase');
   const destSupabaseDir = resolve(projectDir, 'supabase');
+  await fs.ensureDir(destSupabaseDir);
 
-  if (!(await fs.pathExists(sourceSupabaseDir))) {
-    return;
-  }
+  const packageSupabaseDir = await resolvePackageSupabaseDir();
+  const templateSupabaseDir = resolve(TEMPLATE_DIR, 'supabase');
 
-  await fs.ensureDir(destSupabaseDir);
+  const sources = [packageSupabaseDir, templateSupabaseDir].filter(Boolean);
+  for (const sourceSupabaseDir of sources) {
+    const sourceConfig = resolve(sourceSupabaseDir, 'config.toml');
+    const destConfig = resolve(destSupabaseDir, 'config.toml');
+    if (await fs.pathExists(sourceConfig)) {
+      await fs.copy(sourceConfig, destConfig, { overwrite: true });
+    }
 
-  const sourceConfig = resolve(sourceSupabaseDir, 'config.toml');
-  const destConfig = resolve(destSupabaseDir, 'config.toml');
-  if (!(await fs.pathExists(destConfig)) && (await fs.pathExists(sourceConfig))) {
-    await fs.copy(sourceConfig, destConfig);
+    const sourceMigrations = resolve(sourceSupabaseDir, 'migrations');
+    const destMigrations = resolve(destSupabaseDir, 'migrations');
+    if (await fs.pathExists(sourceMigrations)) {
+      await fs.copy(sourceMigrations, destMigrations, { overwrite: true, errorOnExist: false });
+    }
   }
+}
 
-  const sourceMigrations = resolve(sourceSupabaseDir, 'migrations');
-  const destMigrations = resolve(destSupabaseDir, 'migrations');
-  if (await fs.pathExists(sourceMigrations)) {
-    await fs.copy(sourceMigrations, destMigrations, { overwrite: false, errorOnExist: false });
+async function resolvePackageSupabaseDir() {
+  try {
+    const pkgPath = require.resolve('@nextblock-cms/db/package.json');
+    const pkgDir = dirname(pkgPath);
+    const candidate = resolve(pkgDir, 'supabase');
+    if (await fs.pathExists(candidate)) {
+      return candidate;
+    }
+  } catch {
+    return null;
   }
+  return null;
 }
 
 async function ensureClientComponents(projectDir) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-nextblock",
-  "version": "0.2.5",
+  "version": "0.2.7",
   "description": "",
   "main": "index.js",
   "bin": {
@@ -17,6 +17,7 @@
   "type": "module",
   "dependencies": {
     "@clack/prompts": "^0.8.1",
+    "@nextblock-cms/db": "latest",
     "chalk": "^5.6.2",
     "commander": "^14.0.1",
     "execa": "^9.3.0",