create-nextblock 0.2.24 → 0.2.25

package/bin/create-nextblock.js

@@ -179,16 +179,16 @@ async function runSetupWizard(projectDir, projectName) {
 
   clack.intro('🚀 Welcome to the NextBlock setup wizard!');
 
-  const supabaseDir = resolve(projectPath, 'supabase');
-  await fs.ensureDir(supabaseDir);
-  await resetSupabaseProjectRef(projectPath);
-
-  clack.note('Connecting to Supabase...');
-  clack.note('I will now open your browser to log into Supabase.');
-  await runSupabaseCli(['login'], { cwd: projectPath });
-
-  clack.note('Now, please select your NextBlock project when prompted.');
-  await runSupabaseCli(['link'], { cwd: projectPath });
+  const supabaseDir = resolve(projectPath, 'supabase');
+  await fs.ensureDir(supabaseDir);
+  await resetSupabaseProjectRef(projectPath);
+
+  clack.note('Connecting to Supabase...');
+  clack.note('I will now open your browser to log into Supabase.');
+  await runSupabaseCli(['login'], { cwd: projectPath });
+
+  clack.note('Now, please select your NextBlock project when prompted.');
+  await runSupabaseCli(['link'], { cwd: projectPath });
   if (process.stdin.isTTY) {
     try {
       process.stdin.setRawMode(false);
@@ -199,10 +199,10 @@ async function runSetupWizard(projectDir, projectName) {
     process.stdin.resume();
   }
 
-  let projectId = await readSupabaseProjectRef(projectPath);
-
-  if (!projectId) {
-    clack.note('I could not detect your Supabase project ref automatically.');
+  let projectId = await readSupabaseProjectRef(projectPath);
+
+  if (!projectId) {
+    clack.note('I could not detect your Supabase project ref automatically.');
     const manual = await clack.text({
       message:
         'Enter your Supabase project ref (from the Supabase dashboard URL or the link output, e.g., abcdefghijklmnopqrstu):',
@@ -212,8 +212,8 @@ async function runSetupWizard(projectDir, projectName) {
       handleWizardCancel('Setup cancelled.');
     }
     projectId = manual.trim();
-  }
-  await ensureSupabaseAssets(projectPath, { required: true });
+  }
+  await ensureSupabaseAssets(projectPath, { required: true });
 
   const siteUrlPrompt = await clack.text({
     message: 'What is the public URL of your site? (NEXT_PUBLIC_URL)',
@@ -304,7 +304,7 @@ async function runSetupWizard(projectDir, projectName) {
 
   clack.note('Setting up your database...');
   const dbPushSpinner = clack.spinner();
-  dbPushSpinner.start('Pushing database schema... (~10 minutes, please keep this terminal open)');
+  dbPushSpinner.start('Pushing database schema... (~10-15 minutes, please keep this terminal open)');
   try {
     process.env.POSTGRES_URL = postgresUrl;
     const migrationsDir = resolve(projectPath, 'supabase', 'migrations');
@@ -713,8 +713,8 @@ SMTP_FROM_NAME=
   await fs.writeFile(destination, placeholder);
 }
 
-async function ensureSupabaseAssets(projectDir, options = {}) {
-  const { required = false } = options;
+async function ensureSupabaseAssets(projectDir, options = {}) {
+  const { required = false } = options;
   const destSupabaseDir = resolve(projectDir, 'supabase');
   await fs.ensureDir(destSupabaseDir);
 
@@ -731,14 +731,14 @@ async function ensureSupabaseAssets(projectDir, options = {}) {
     }
   }
 
-  let migrationsCopied = false;
-  let configCopied = false;
+  let migrationsCopied = false;
+  let configCopied = false;
 
   const sourceConfigPath = resolve(packageSupabaseDir, 'config.toml');
   const destinationConfigPath = resolve(destSupabaseDir, 'config.toml');
   if (await fs.pathExists(sourceConfigPath)) {
-    await fs.copy(sourceConfigPath, destinationConfigPath, { overwrite: true, errorOnExist: false });
-    configCopied = true;
+    await fs.copy(sourceConfigPath, destinationConfigPath, { overwrite: true, errorOnExist: false });
+    configCopied = true;
   }
 
   const sourceMigrations = resolve(packageSupabaseDir, 'migrations');
@@ -748,11 +748,11 @@ async function ensureSupabaseAssets(projectDir, options = {}) {
     migrationsCopied = true;
   }
 
-  if (required) {
-    if (!configCopied) {
-      throw new Error(
-        `Missing supabase/config.toml in the installed @nextblock-cms/db package (checked ${packageSupabaseDir}).`,
-      );
+  if (required) {
+    if (!configCopied) {
+      throw new Error(
+        `Missing supabase/config.toml in the installed @nextblock-cms/db package (checked ${packageSupabaseDir}).`,
+      );
     }
     if (!migrationsCopied) {
       throw new Error(
@@ -761,8 +761,8 @@ async function ensureSupabaseAssets(projectDir, options = {}) {
     }
   }
 
-  return { migrationsCopied, configCopied };
-}
+  return { migrationsCopied, configCopied };
+}
 
 async function resolvePackageSupabaseDir(projectDir) {
   const triedPaths = [];
@@ -821,26 +821,26 @@ async function resolvePackageSupabaseDir(projectDir) {
   return { dir: null, triedPaths };
 }
 
-async function readSupabaseProjectRef(projectDir) {
-  const projectRefPath = resolve(projectDir, 'supabase', '.temp', 'project-ref');
-  if (await fs.pathExists(projectRefPath)) {
-    const value = (await fs.readFile(projectRefPath, 'utf8')).trim();
-    if (/^[a-z0-9]{20,}$/i.test(value)) {
-      return value;
-    }
-  }
-
-  return null;
-}
-
-async function resetSupabaseProjectRef(projectDir) {
-  const tempDir = resolve(projectDir, 'supabase', '.temp');
-  await fs.ensureDir(tempDir);
-  const projectRefPath = resolve(tempDir, 'project-ref');
-  if (await fs.pathExists(projectRefPath)) {
-    await fs.remove(projectRefPath);
-  }
-}
+async function readSupabaseProjectRef(projectDir) {
+  const projectRefPath = resolve(projectDir, 'supabase', '.temp', 'project-ref');
+  if (await fs.pathExists(projectRefPath)) {
+    const value = (await fs.readFile(projectRefPath, 'utf8')).trim();
+    if (/^[a-z0-9]{20,}$/i.test(value)) {
+      return value;
+    }
+  }
+
+  return null;
+}
+
+async function resetSupabaseProjectRef(projectDir) {
+  const tempDir = resolve(projectDir, 'supabase', '.temp');
+  await fs.ensureDir(tempDir);
+  const projectRefPath = resolve(tempDir, 'project-ref');
+  if (await fs.pathExists(projectRefPath)) {
+    await fs.remove(projectRefPath);
+  }
+}
 
 async function ensureClientComponents(projectDir) {
   const relativePaths = [

package/package.json

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

package/scripts/sync-template.js

@@ -36,16 +36,16 @@ const UI_PROXY_MODULES = [
   'ui',
 ];
 
-const IGNORED_SEGMENTS = new Set([
-  'node_modules',
-  '.git',
-  '.next',
-  'dist',
-  'tmp',
-  'coverage',
-  'backup',
-  'backups',
-]);
+const IGNORED_SEGMENTS = new Set([
+  'node_modules',
+  '.git',
+  '.next',
+  'dist',
+  'tmp',
+  'coverage',
+  'backup',
+  'backups',
+]);
 
 async function ensureTemplateSync() {
   const sourceExists = await fs.pathExists(SOURCE_DIR);
@@ -79,9 +79,10 @@ async function ensureTemplateSync() {
     },
   });
 
-  await ensureEnvExample();
-  await ensureGlobalStyles();
-  await ensureClientTranslations();
+  await ensureEnvExample();
+  await ensureTemplateGitignore();
+  await ensureGlobalStyles();
+  await ensureClientTranslations();
   await sanitizeBlockEditorImports();
   await sanitizeUiImports();
   await ensureUiProxies();
@@ -91,7 +92,7 @@ async function ensureTemplateSync() {
   console.log(chalk.green('Template sync complete.'));
 }
 
-async function ensureEnvExample() {
+async function ensureEnvExample() {
   const envTargets = [
     resolve(REPO_ROOT, '.env.example'),
     resolve(REPO_ROOT, '.env.exemple'),
@@ -117,8 +118,42 @@ NEXT_PUBLIC_URL=http://localhost:3000
 `;
 
   await fs.writeFile(destination, placeholder);
-}
-
+}
+
+async function ensureTemplateGitignore() {
+  const destination = resolve(TARGET_DIR, '.gitignore');
+  const content = `.DS_Store
+node_modules
+dist
+.next
+out
+build
+coverage
+*.log
+logs
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+
+.env
+.env.*
+.env.local
+.env.development.local
+.env.production.local
+.env.test.local
+
+.vscode
+.idea
+.swp
+*.sw?
+
+supabase/.temp
+supabase/.branches
+`;
+  await fs.outputFile(destination, content);
+}
+
 async function ensureGlobalStyles() {
   const destination = resolve(TARGET_DIR, 'app/globals.css');
 

package/templates/nextblock-template/.env.example

@@ -1,24 +0,0 @@
-NEXT_PUBLIC_URL=
-# Vercel / Supabase
-SUPABASE_PROJECT_ID=
-POSTGRES_URL=
-NEXT_PUBLIC_SUPABASE_URL=
-NEXT_PUBLIC_SUPABASE_ANON_KEY=
-SUPABASE_SERVICE_ROLE_KEY=
-
-# Cloudflare
-NEXT_PUBLIC_R2_BASE_URL=
-R2_ACCESS_KEY_ID=
-R2_SECRET_ACCESS_KEY=
-R2_BUCKET_NAME=
-R2_ACCOUNT_ID=
-
-REVALIDATE_SECRET_TOKEN=
-
-# Email SMTP Configuration
-SMTP_HOST=
-SMTP_PORT=
-SMTP_USER=
-SMTP_PASS=
-SMTP_FROM_EMAIL=
-SMTP_FROM_NAME=