create-nextblock 0.2.9 → 0.2.11

package/bin/create-nextblock.js

@@ -190,10 +190,28 @@ async function runSetupWizard(projectDir, projectName) {
   await execa('npx', ['supabase', 'login'], { stdio: 'inherit', cwd: projectPath });
 
   clack.note('Now, please select your NextBlock project in the browser.');
-  await execa('npx', ['supabase', 'link'], {
+  let linkOutput = '';
+  const linkProcess = execa('npx', ['supabase', 'link'], {
     cwd: projectPath,
-    stdio: 'inherit',
+    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;
   if (process.stdin.isTTY) {
     try {
       process.stdin.setRawMode(false);
@@ -201,8 +219,6 @@ async function runSetupWizard(projectDir, projectName) {
       // ignore if not supported
     }
     process.stdin.setEncoding('utf8');
-    process.stdin.pause();
-    process.stdin.resume();
   }
   process.stdin.resume();
 
@@ -210,31 +226,26 @@ async function runSetupWizard(projectDir, projectName) {
   await ensureSupabaseAssets(projectPath);
 
   const configTomlPath = resolve(projectPath, 'supabase', 'config.toml');
-  let configToml = '';
-  if (!(await fs.pathExists(configTomlPath))) {
-    const manualProjectId = await clack.text({
-      message:
-        'supabase/config.toml was not created. Enter your Supabase project ref (from the link output, e.g., abcdefghijklmnopqrstu):',
-      validate: (val) => (!val ? 'Project ref is required' : undefined),
-    });
-    if (clack.isCancel(manualProjectId)) {
-      handleWizardCancel('Setup cancelled.');
-    }
-    const projectRef = manualProjectId.trim();
+  const parsedRef = linkOutput.match(/Selected project:\s*([a-z0-9-]+)/i)?.[1];
+  if (!parsedRef) {
+    throw new Error('Could not read project ref from supabase link output. Please rerun `npx supabase link`.');
+  }
+  const projectId = parsedRef;
 
-    configToml = `project_id = "${projectRef}"\n`;
+  if (!(await fs.pathExists(configTomlPath))) {
+    const configToml = `project_id = "env(SUPABASE_PROJECT_ID)"\n`;
     await fs.writeFile(configTomlPath, configToml);
-    clack.note('Created supabase/config.toml from the provided project ref.');
-  } else {
-    configToml = await fs.readFile(configTomlPath, 'utf8');
-  }
-  const projectIdMatch = configToml.match(/project_id\s*=\s*"([^"]+)"/);
-  if (!projectIdMatch?.[1]) {
-    throw new Error('Could not parse project_id from supabase/config.toml. Please ensure Supabase is linked.');
+    clack.note(`Created supabase/config.toml with project_id env binding for ${projectId}.`);
   }
-  const projectId = projectIdMatch[1];
 
   clack.note('Please go to your Supabase project dashboard to get the following secrets.');
+  if (process.stdin.isTTY) {
+    try {
+      process.stdin.setRawMode(false);
+    } catch (_) {}
+    process.stdin.setEncoding('utf8');
+    process.stdin.resume();
+  }
   const supabaseKeys = await clack.group(
     {
       dbPassword: () =>
@@ -274,6 +285,7 @@ async function runSetupWizard(projectDir, projectName) {
     '',
     '# Supabase',
     `SUPABASE_PROJECT_ID=${projectId}`,
+    `SUPABASE_PROJECT_ID=${projectId}`,
     `NEXT_PUBLIC_SUPABASE_URL=${supabaseUrl}`,
     `NEXT_PUBLIC_SUPABASE_ANON_KEY=${supabaseKeys.anonKey}`,
     `SUPABASE_SERVICE_ROLE_KEY=${supabaseKeys.serviceKey}`,

package/package.json

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