create-nextblock 0.2.17 → 0.2.18

package/bin/create-nextblock.js

@@ -190,35 +190,15 @@ async function runSetupWizard(projectDir, projectName) {
   await execa('npx', ['supabase', 'login'], { stdio: 'inherit', cwd: projectPath });
 
   clack.note('Now, please select your NextBlock project when prompted.');
-  let linkOutput = '';
-  const linkProcess = execa('npx', ['supabase', 'link'], {
-    cwd: projectPath,
-    stdin: 'inherit',
-    stdout: 'pipe',
-    stderr: 'pipe',
-  });
-  if (linkProcess.stdout) {
-    linkProcess.stdout.on('data', (chunk) => {
-      const text = chunk.toString();
-      linkOutput += text;
-      process.stdout.write(text);
-    });
-  }
-  if (linkProcess.stderr) {
-    linkProcess.stderr.on('data', (chunk) => {
-      const text = chunk.toString();
-      linkOutput += text;
-      process.stderr.write(text);
-    });
-  }
-  await linkProcess;
+  await execa('npx', ['supabase', 'link'], { cwd: projectPath, stdio: 'inherit' });
 
   // 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 projectId = linkOutput.match(/Selected project:\s*([a-z0-9-]+)/i)?.[1] || null;
-  if (!projectId && (await fs.pathExists(configTomlPath))) {
+  let projectId = null;
+
+  if (await fs.pathExists(configTomlPath)) {
     const configToml = await fs.readFile(configTomlPath, 'utf8');
     const projectMatch = configToml.match(/project_id\s*=\s*"([^"]+)"/);
     if (projectMatch?.[1] && !projectMatch[1].includes('env(')) {
@@ -226,9 +206,17 @@ async function runSetupWizard(projectDir, projectName) {
     }
   }
 
-  const configContent = `project_id = "env(SUPABASE_PROJECT_ID)"\n`;
-  await fs.writeFile(configTomlPath, configContent);
-  clack.note('Created supabase/config.toml with project_id env binding.');
+  if (!projectId) {
+    const manual = await clack.text({
+      message:
+        'Enter your Supabase project ref (from the Supabase dashboard URL or the link output, e.g., abcdefghijklmnopqrstu):',
+      validate: (val) => (!val ? 'Project ref is required' : undefined),
+    });
+    if (clack.isCancel(manual)) {
+      handleWizardCancel('Setup cancelled.');
+    }
+    projectId = manual.trim();
+  }
 
   clack.note('Please go to your Supabase project dashboard to get the following secrets.');
   const supabaseKeys = await clack.group(
@@ -682,17 +670,15 @@ async function ensureSupabaseAssets(projectDir) {
   await fs.ensureDir(destSupabaseDir);
 
   const packageSupabaseDir = await resolvePackageSupabaseDir();
-  const templateSupabaseDir = resolve(TEMPLATE_DIR, 'supabase');
-
-  const sources = [packageSupabaseDir, templateSupabaseDir].filter(Boolean);
+  const sources = [packageSupabaseDir].filter(Boolean);
   if (sources.length === 0) {
-    clack.note('Warning: No supabase assets found in installed packages or template.');
+    clack.note('Warning: No supabase assets found in installed packages.');
   }
   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 });
+    if ((await fs.pathExists(sourceConfig)) && !(await fs.pathExists(destConfig))) {
+      await fs.copy(sourceConfig, destConfig, { overwrite: false });
     }
 
     const sourceMigrations = resolve(sourceSupabaseDir, 'migrations');
@@ -707,9 +693,11 @@ 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;
+    const candidates = [resolve(pkgDir, 'supabase'), resolve(pkgDir, 'lib', 'supabase')];
+    for (const candidate of candidates) {
+      if (await fs.pathExists(candidate)) {
+        return candidate;
+      }
     }
   } catch {
     return null;

package/package.json

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