create-nextblock 0.2.2 → 0.2.4

package/bin/create-nextblock.js

@@ -131,6 +131,9 @@ async function handleCommand(projectDirectory, options) {
     await ensureEnvExample(projectDir);
     console.log(chalk.green('.env.example ready.'));
 
+    await ensureSupabaseAssets(projectDir);
+    console.log(chalk.green('Supabase migrations ready.'));
+
     if (!yes) {
       await runSetupWizard(projectDir, projectName);
     } else {
@@ -194,21 +197,41 @@ 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'], { stdio: 'inherit', cwd: projectPath });
+  let linkOutput = '';
+  const linkProcess = execa('npx', ['supabase', 'link'], {
+    cwd: projectPath,
+    stdin: 'inherit',
+    stdout: 'pipe',
+    stderr: 'inherit',
+  });
+  if (linkProcess.stdout) {
+    linkProcess.stdout.on('data', (chunk) => {
+      const text = chunk.toString();
+      linkOutput += text;
+      process.stdout.write(text);
+    });
+  }
+  await linkProcess;
 
   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 parsedRef = linkOutput.match(/Selected project:\s*([a-z0-9-]+)/i)?.[1];
+    let projectRef = parsedRef;
+
+    if (!projectRef) {
+      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.');
+      }
+      projectRef = manualProjectId.trim();
     }
-    const trimmed = manualProjectId.trim();
-    configToml = `project_id = "${trimmed}"\n`;
+
+    configToml = `project_id = "${projectRef}"\n`;
     await fs.writeFile(configTomlPath, configToml);
     clack.note('Created supabase/config.toml from the provided project ref.');
   } else {
@@ -287,7 +310,7 @@ async function runSetupWizard(projectDir, projectName) {
 
   if (canWriteEnv) {
     await fs.writeFile(envPath, envLines.join('\n'));
-    clack.success('Supabase configuration saved to .env');
+    clack.note('Supabase configuration saved to .env');
   }
 
   clack.note('Setting up your database...');
@@ -357,7 +380,7 @@ async function runSetupWizard(projectDir, projectName) {
 
     if (canWriteEnv) {
       await fs.appendFile(envPath, r2Env);
-      clack.success('Cloudflare R2 configuration saved!');
+      clack.note('Cloudflare R2 configuration saved!');
     } else {
       clack.note('Add the following R2 values to your existing .env:\n' + r2Env);
     }
@@ -419,7 +442,7 @@ async function runSetupWizard(projectDir, projectName) {
 
     if (canWriteEnv) {
       await fs.appendFile(envPath, smtpEnv);
-      clack.success('SMTP configuration saved!');
+      clack.note('SMTP configuration saved!');
     } else {
       clack.note('Add the following SMTP values to your existing .env:\n' + smtpEnv);
     }
@@ -605,11 +628,11 @@ async function ensureGitignore(projectDir) {
   }
 }
 
-async function ensureEnvExample(projectDir) {
-  const destination = resolve(projectDir, '.env.example');
-  if (await fs.pathExists(destination)) {
-    return;
-  }
+async function ensureEnvExample(projectDir) {
+  const destination = resolve(projectDir, '.env.example');
+  if (await fs.pathExists(destination)) {
+    return;
+  }
 
   const templatePaths = [
     resolve(TEMPLATE_DIR, '.env.example'),
@@ -653,12 +676,35 @@ SMTP_FROM_NAME=
 
   await fs.writeFile(destination, placeholder);
 }
-
-async function ensureClientComponents(projectDir) {
-  const relativePaths = [
-    'components/env-var-warning.tsx',
-    'app/providers.tsx',
-    'app/ToasterProvider.tsx',
+
+async function ensureSupabaseAssets(projectDir) {
+  const sourceSupabaseDir = resolve(REPO_ROOT, 'libs/db/src/supabase');
+  const destSupabaseDir = resolve(projectDir, 'supabase');
+
+  if (!(await fs.pathExists(sourceSupabaseDir))) {
+    return;
+  }
+
+  await fs.ensureDir(destSupabaseDir);
+
+  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: false, errorOnExist: false });
+  }
+}
+
+async function ensureClientComponents(projectDir) {
+  const relativePaths = [
+    'components/env-var-warning.tsx',
+    'app/providers.tsx',
+    'app/ToasterProvider.tsx',
     'context/AuthContext.tsx',
     'context/CurrentContentContext.tsx',
     'context/LanguageContext.tsx',

package/package.json

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