@betterstart/cli 0.1.9 → 0.1.11

package/dist/cli.js

@@ -7630,6 +7630,18 @@ function runCommand(pm, script) {
       return `npm run ${script}`;
   }
 }
+function createNextAppCommand(pm) {
+  switch (pm) {
+    case "pnpm":
+      return { bin: "pnpm", prefix: ["create", "next-app@latest"] };
+    case "yarn":
+      return { bin: "yarn", prefix: ["create", "next-app@latest"] };
+    case "bun":
+      return { bin: "bunx", prefix: ["create-next-app@latest"] };
+    default:
+      return { bin: "npx", prefix: ["create-next-app@latest"] };
+  }
+}
 
 // src/generators/post-generate.ts
 function loadEnvFile(cwd) {
@@ -13626,31 +13638,30 @@ var initCommand = new Command3("init").description("Scaffold CMS into a new or e
         }
         pm = pmChoice;
       }
-      const cnaSpinner = p4.spinner();
       const displayName = projectPrompt.projectName === "." ? path37.basename(cwd) : projectPrompt.projectName;
-      cnaSpinner.start(`Creating Next.js app: ${displayName}...`);
+      const { bin, prefix } = createNextAppCommand(pm);
+      const cnaArgs = [
+        ...prefix,
+        projectPrompt.projectName,
+        "--yes",
+        "--typescript",
+        "--tailwind",
+        "--app",
+        "--no-git",
+        "--no-import-alias",
+        "--turbopack",
+        `--use-${pm}`
+      ];
+      if (srcDir) cnaArgs.push("--src-dir");
+      else cnaArgs.push("--no-src-dir");
+      p4.log.step(`Creating Next.js app: ${pc2.cyan(displayName)}`);
       try {
-        const cnaArgs = [
-          "create-next-app@latest",
-          projectPrompt.projectName,
-          "--typescript",
-          "--tailwind",
-          "--app",
-          "--no-git",
-          "--no-import-alias",
-          "--turbopack",
-          `--use-${pm}`
-        ];
-        if (srcDir) cnaArgs.push("--src-dir");
-        else cnaArgs.push("--no-src-dir");
-        execFileSync4("npx", cnaArgs, {
+        execFileSync4(bin, cnaArgs, {
           cwd,
-          stdio: "pipe",
+          stdio: "inherit",
           timeout: 12e4
         });
-        cnaSpinner.stop(`Created ${displayName}`);
       } catch (err) {
-        cnaSpinner.stop("Failed to create Next.js app");
         p4.log.error(err instanceof Error ? err.message : "create-next-app failed");
         p4.log.info(
           `You can create the project manually:
@@ -13660,6 +13671,23 @@ var initCommand = new Command3("init").description("Scaffold CMS into a new or e
         process.exit(1);
       }
       cwd = path37.resolve(cwd, projectPrompt.projectName);
+      const hasPackageJson = fs32.existsSync(path37.join(cwd, "package.json"));
+      const hasNextConfig = ["next.config.ts", "next.config.js", "next.config.mjs"].some(
+        (f) => fs32.existsSync(path37.join(cwd, f))
+      );
+      if (!hasPackageJson || !hasNextConfig) {
+        p4.log.error(
+          "create-next-app completed but the project was not created. This can happen with nested npx calls."
+        );
+        const manualCmd = `npx create-next-app@latest ${projectPrompt.projectName} --typescript --tailwind --app`;
+        p4.log.info(
+          `Create the project manually:
+  ${pc2.cyan(manualCmd)}
+  Then run ${pc2.cyan("betterstart init")} inside it.`
+        );
+        process.exit(1);
+      }
+      p4.log.success(`Created ${displayName} Next.js project`);
       project = detectProject(cwd);
     }
     const features = options.yes ? { includeEmail: true, preset: options.preset } : await promptFeatures(options.preset);