create-nextblock 0.2.21 → 0.2.23

package/bin/create-nextblock.js

@@ -161,7 +161,6 @@ async function handleCommand(projectDirectory, options) {
     }
 
     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:'));
@@ -188,7 +187,7 @@ async function runSetupWizard(projectDir, projectName) {
   clack.note('I will now open your browser to log into Supabase.');
   await runSupabaseCli(['login'], { cwd: projectPath });
 
-  const assetsState = await ensureSupabaseAssets(projectPath, { required: true, resetProjectRef: true });
+  await ensureSupabaseAssets(projectPath, { required: true, resetProjectRef: true });
   clack.note('Now, please select your NextBlock project when prompted.');
   await runSupabaseCli(['link'], { cwd: projectPath });
   if (process.stdin.isTTY) {
@@ -203,10 +202,6 @@ async function runSetupWizard(projectDir, projectName) {
 
   let projectId = await readSupabaseProjectRef(projectPath);
 
-  if (!projectId && assetsState.projectId) {
-    projectId = assetsState.projectId;
-  }
-
   if (!projectId) {
     clack.note('I could not detect your Supabase project ref automatically.');
     const manual = await clack.text({
@@ -309,7 +304,7 @@ async function runSetupWizard(projectDir, projectName) {
 
   clack.note('Setting up your database...');
   const dbPushSpinner = clack.spinner();
-  dbPushSpinner.start('Pushing database schema... (This may take a minute)');
+  dbPushSpinner.start('Pushing database schema... (6-9 minutes, please keep this terminal open)');
   try {
     process.env.POSTGRES_URL = postgresUrl;
     const migrationsDir = resolve(projectPath, 'supabase', 'migrations');
@@ -491,7 +486,7 @@ async function runSetupWizard(projectDir, projectName) {
     clack.note('SMTP placeholders added to .env. Configure them later when ready.');
   }
 
-  clack.outro(`🎉 Your NextBlock project ${projectName ? `"${projectName}" ` : ''}is ready!\n\nNext step:\n  npm run dev`);
+  clack.outro(`🎉 Your NextBlock project ${projectName ? `"${projectName}" ` : ''}is ready!`);
 }
 
 function handleWizardCancel(message) {
@@ -723,10 +718,11 @@ async function ensureSupabaseAssets(projectDir, options = {}) {
   const destSupabaseDir = resolve(projectDir, 'supabase');
   await fs.ensureDir(destSupabaseDir);
 
-  const packageSupabaseDir = await resolvePackageSupabaseDir();
+  const { dir: packageSupabaseDir, triedPaths } = await resolvePackageSupabaseDir(projectDir);
   if (!packageSupabaseDir) {
     const message =
-      'Unable to locate supabase assets in @nextblock-cms/db. Please reinstall dependencies and try again.';
+      'Unable to locate supabase assets in @nextblock-cms/db. Please ensure dependencies are installed.' +
+      (triedPaths.length > 0 ? `\nChecked:\n - ${triedPaths.join('\n - ')}` : '');
     if (required) {
       throw new Error(message);
     } else {
@@ -769,50 +765,78 @@ async function ensureSupabaseAssets(projectDir, options = {}) {
 
   if (required) {
     if (!configCopied) {
-      throw new Error('Missing supabase/config.toml in the installed @nextblock-cms/db package.');
+      throw new Error(
+        `Missing supabase/config.toml in the installed @nextblock-cms/db package (checked ${packageSupabaseDir}).`,
+      );
     }
     if (!migrationsCopied) {
-      throw new Error('Missing supabase/migrations in the installed @nextblock-cms/db package.');
+      throw new Error(
+        `Missing supabase/migrations in the installed @nextblock-cms/db package (checked ${packageSupabaseDir}).`,
+      );
     }
   }
 
   return { migrationsCopied, configCopied, projectId: detectedProjectId };
 }
 
-async function resolvePackageSupabaseDir() {
-  try {
-    const pkgPath = require.resolve('@nextblock-cms/db/package.json');
-    const pkgDir = dirname(pkgPath);
-    const candidateSegments = [
-      'supabase',
-      'src/supabase',
-      'dist/supabase',
-      'dist/libs/db/supabase',
-      'dist/lib/supabase',
-      'lib/supabase',
-    ];
-    const candidates = candidateSegments.map((segment) => resolve(pkgDir, segment));
-    for (const candidate of candidates) {
+async function resolvePackageSupabaseDir(projectDir) {
+  const triedPaths = [];
+  const candidateBases = new Set();
+
+  const installDir = resolve(projectDir, 'node_modules', '@nextblock-cms', 'db');
+  candidateBases.add(installDir);
+
+  const tryResolveFrom = (fromPath) => {
+    try {
+      const resolver = createRequire(fromPath);
+      const pkgPath = resolver.resolve('@nextblock-cms/db/package.json');
+      return dirname(pkgPath);
+    } catch {
+      return null;
+    }
+  };
+
+  const projectPkg = resolve(projectDir, 'package.json');
+  const resolvedProject = tryResolveFrom(projectPkg);
+  if (resolvedProject) {
+    candidateBases.add(resolvedProject);
+    const parent = dirname(resolvedProject);
+    candidateBases.add(parent);
+  }
+
+  const localResolve = tryResolveFrom(__filename);
+  if (localResolve) {
+    candidateBases.add(localResolve);
+    candidateBases.add(dirname(localResolve));
+  }
+
+  candidateBases.add(REPO_ROOT);
+  candidateBases.add(resolve(REPO_ROOT, 'libs', 'db'));
+  candidateBases.add(resolve(REPO_ROOT, 'dist', 'libs', 'db'));
+
+  const candidateSegments = [
+    'supabase',
+    'src/supabase',
+    'dist/supabase',
+    'dist/libs/db/supabase',
+    'dist/lib/supabase',
+    'lib/supabase',
+  ];
+
+  for (const base of Array.from(candidateBases).filter(Boolean)) {
+    for (const segment of candidateSegments) {
+      const candidate = resolve(base, segment);
+      triedPaths.push(candidate);
       if (await fs.pathExists(candidate)) {
-        return candidate;
+        return { dir: candidate, triedPaths };
       }
     }
-  } catch {
-    return null;
   }
-  return null;
+
+  return { dir: null, triedPaths };
 }
 
 async function readSupabaseProjectRef(projectDir) {
-  const configTomlPath = resolve(projectDir, 'supabase', 'config.toml');
-  if (await fs.pathExists(configTomlPath)) {
-    const config = await fs.readFile(configTomlPath, 'utf8');
-    const configMatch = config.match(/project_id\s*=\s*"([^"]+)"/);
-    if (configMatch?.[1] && !configMatch[1].includes('env(')) {
-      return configMatch[1];
-    }
-  }
-
   const projectRefPath = resolve(projectDir, 'supabase', '.temp', 'project-ref');
   if (await fs.pathExists(projectRefPath)) {
     const value = (await fs.readFile(projectRefPath, 'utf8')).trim();

package/package.json

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