create-nextblock 0.8.0 → 0.8.2

package/bin/create-nextblock.js

@@ -19,6 +19,7 @@ const TEMPLATE_DIR = resolve(__dirname, '../templates/nextblock-template');
 const REPO_ROOT = resolve(__dirname, '../../..');
 const EDITOR_UTILS_SOURCE_DIR = resolve(REPO_ROOT, 'libs/editor/src/lib/utils');
 const IS_WINDOWS = process.platform === 'win32';
+const CLI_VERSION = createRequire(import.meta.url)('../package.json').version;
 
 const UI_PROXY_MODULES = [
   'avatar',
@@ -52,7 +53,10 @@ const PACKAGE_VERSION_SOURCES = {
   '@nextblock-cms/sdk': resolve(REPO_ROOT, 'libs/sdk/package.json'),
 };
 
-program.name('create-nextblock').description('NextBlock™ CMS CLI');
+program
+  .name('create-nextblock')
+  .description('NextBlock™ CMS CLI')
+  .version(CLI_VERSION, '-v, --version');
 
 program
   .command('create [project-directory]', { isDefault: true })
@@ -77,6 +81,46 @@ async function handleCommand(projectDirectory, options) {
   const { skipInstall, yes } = options;
 
   try {
+    console.log(chalk.bold.cyan(`\n🧱 create-nextblock v${CLI_VERSION}\n`));
+
+    // Prerequisites gate (interactive only) — shown BEFORE we ask for a name, scaffold, or
+    // install, so anyone who isn't ready can cancel without creating anything.
+    if (!yes) {
+      clack.note(
+        [
+          '1. A Supabase project   https://supabase.com/dashboard',
+          '   • Reference ID             — Project Settings > General > "Reference ID"',
+          '   • Connection string        — Connect (top bar) > Direct connection > URI',
+          '   • anon + service_role keys — Project Settings > API Keys',
+          '   • Personal Access Token    — Account > Access Tokens > Generate new token',
+          '',
+          '2. A Cloudflare R2 bucket   https://dash.cloudflare.com  > R2',
+          '   • Create a bucket, then enable its Public Development URL (Bucket > Settings > General)',
+          '   • Create an R2 API token (Object Read & Write); copy the Access Key ID + Secret (shown once)',
+          '',
+          '3. SMTP credentials   SMTP2GO works very well: https://www.smtp2go.com',
+          '   • Required so Supabase can email the confirmation link your first admin needs to sign in',
+        ].join('\n'),
+        'Before you continue, have all of the following ready',
+      );
+
+      const ready = await clack.confirm({
+        message:
+          'Do you have your Supabase, Cloudflare R2, and SMTP details ready?',
+        initialValue: true,
+      });
+      if (clack.isCancel(ready)) {
+        handleWizardCancel('Setup cancelled.');
+      }
+      if (!ready) {
+        clack.note(
+          'No problem — nothing was created. Gather the items above, then run\n`npm create nextblock` again. Full guide: docs/05-DEVELOPER-GUIDE.md',
+          'Come back when ready',
+        );
+        return;
+      }
+    }
+
     let projectName = projectDirectory;
 
     if (!projectName) {
@@ -162,32 +206,35 @@ async function handleCommand(projectDirectory, options) {
     await ensurePublicNpmrc(projectDir);
     console.log(chalk.green('Enforced public registry for initial install.'));
 
+    await initializeGit(projectDir);
+
     if (!skipInstall) {
       await installDependencies(projectDir);
     } else {
       console.log(chalk.yellow('Skipping dependency installation.'));
     }
 
-    // Run setup wizard after dependencies are installed so package assets are available
+    // Run the setup wizard after dependencies are installed so package assets are available.
+    // When it runs, its own "next steps" outro (cd + npm run dev) is the final message, so we
+    // don't print a second closing block here — the whole flow completes in this one command.
     if (!yes) {
       await runSetupWizard(projectDir, projectName);
     } else {
+      // Non-interactive path: nothing was configured, so point the user at their env file.
+      console.log(
+        chalk.green(
+          `\nSuccess! Your NextBlock™ CMS project "${projectName}" is scaffolded.\n`,
+        ),
+      );
+      console.log(chalk.cyan('Next steps:'));
+      console.log(chalk.cyan(`  1. cd ${projectName}`));
       console.log(
-        chalk.yellow(
-          'Skipping interactive setup wizard because --yes was provided.',
+        chalk.gray(
+          '  2. Add your Supabase / R2 / SMTP values to .env.local (template in .env.example)',
         ),
       );
+      console.log(chalk.cyan('  3. npm run dev'));
     }
-
-    await initializeGit(projectDir);
-
-    console.log(
-      chalk.green(
-        `\nSuccess! Your NextBlock™ CMS project "${projectName}" is ready.\n`,
-      ),
-    );
-    console.log(chalk.cyan('Next step:'));
-    console.log(chalk.cyan(`  cd ${projectName} && npm run dev`));
   } catch (error) {
     console.error(
       chalk.red(
@@ -506,42 +553,9 @@ async function runSetupWizard(projectDir, projectName) {
   const projectPath = resolve(projectDir);
   process.chdir(projectPath);
 
-  clack.intro('🚀 NextBlock™ CMS setup wizard');
-
-  // 0. Prerequisites — mirror `npm run setup` (tools/scripts/setup.mjs). Make sure the
-  //    developer has everything BEFORE we start prompting.
-  clack.note(
-    [
-      '1. A Supabase project   https://supabase.com/dashboard',
-      '   • Reference ID             — Project Settings > General > "Reference ID"',
-      '   • Connection string        — Connect (top bar) > Direct connection > URI',
-      '   • anon + service_role keys — Project Settings > API Keys',
-      '   • Personal Access Token    — Account > Access Tokens > Generate new token',
-      '',
-      '2. A Cloudflare R2 bucket   https://dash.cloudflare.com  > R2',
-      '   • Create a bucket, then enable its Public Development URL (Bucket > Settings > General)',
-      '   • Create an R2 API token (Object Read & Write); copy the Access Key ID + Secret (shown once)',
-      '',
-      '3. SMTP credentials   SMTP2GO works very well: https://www.smtp2go.com',
-      '   • Required so Supabase can email the confirmation link your first admin needs to sign in',
-    ].join('\n'),
-    'Before you continue, have all of the following ready',
-  );
-
-  const ready = await clack.confirm({
-    message: 'Do you have your Supabase, Cloudflare R2, and SMTP details ready?',
-    initialValue: true,
-  });
-  if (clack.isCancel(ready)) {
-    handleWizardCancel('Setup cancelled.');
-  }
-  if (!ready) {
-    clack.note(
-      'No problem — your project files are ready. Gather the items above, then copy\n.env.example to .env.local and fill it in. Full guide: docs/05-DEVELOPER-GUIDE.md',
-      'Setup paused',
-    );
-    return;
-  }
+  // Prerequisites + readiness were already confirmed up front in handleCommand (before any
+  // scaffolding), so the wizard goes straight to collecting configuration.
+  clack.intro('🚀 NextBlock™ CMS setup');
 
   await fs.ensureDir(resolve(projectPath, 'supabase'));
 
@@ -1801,6 +1815,46 @@ async function transformPackageJson(projectDir) {
     }
   }
 
+  // Mirror the monorepo's defensive dependency overrides into the generated project so a
+  // fresh `npm install` reproduces the "0 vulnerabilities" posture and silences deprecated
+  // transitive deps (e.g. uuid@10). Read live from the repo root when available (local dev /
+  // `npm run test-create`); fall back to this baked-in set in the published CLI where the
+  // monorepo root is not on disk. Keep the fallback in sync with the root package.json.
+  const FALLBACK_OVERRIDES = {
+    postcss: '^8.5.12',
+    qs: '^6.15.2',
+    uuid: '^11.1.1',
+    glob: '^10.4.5',
+    'whatwg-encoding': 'npm:@exodus/bytes@latest',
+    'node-domexception': 'npm:domexception@latest',
+    keygrip: 'npm:keygrip@latest',
+  };
+  let rootOverrides = FALLBACK_OVERRIDES;
+  try {
+    const rootPkg = await fs.readJSON(resolve(REPO_ROOT, 'package.json'));
+    if (rootPkg?.overrides && Object.keys(rootPkg.overrides).length > 0) {
+      rootOverrides = rootPkg.overrides;
+    }
+  } catch {
+    // Published CLI: repo root package.json not present — keep the baked-in fallback.
+  }
+  // Project-specific overrides (if any) win over the inherited defaults.
+  packageJson.overrides = { ...rootOverrides, ...(packageJson.overrides ?? {}) };
+
+  // npm throws EOVERRIDE when a package is BOTH a direct dependency and has an override with a
+  // different spec (e.g. dependencies.uuid ^11.0.4 vs overrides.uuid ^11.1.1). Align any such
+  // direct (dev)dependency to the override value so they share the exact same spec — which is
+  // also what lets the override dedupe that package's transitive copies.
+  for (const [name, spec] of Object.entries(packageJson.overrides)) {
+    if (typeof spec !== 'string') continue;
+    if (packageJson.dependencies?.[name] !== undefined) {
+      packageJson.dependencies[name] = spec;
+    }
+    if (packageJson.devDependencies?.[name] !== undefined) {
+      packageJson.devDependencies[name] = spec;
+    }
+  }
+
   await fs.writeJSON(packageJsonPath, packageJson, { spaces: 2 });
 }
 

package/package.json

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

package/templates/nextblock-template/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nextblock-cms/template",
-  "version": "0.8.0",
+  "version": "0.8.2",
   "private": true,
   "scripts": {
     "dev": "next dev",