create-kofi-stack 2.1.0 → 2.1.2

package/dist/index.js

@@ -409,17 +409,54 @@ async function generateProject(config, options = {}) {
   p2.log.info(`Creating project in ${pc2.cyan(config.targetDir)}`);
   console.log();
   try {
-    spinner.start("Generating project files...");
-    const result = await generateVirtualProject(config);
-    if (!result.success) {
-      spinner.fail("Failed to generate project");
-      console.error(pc2.red("Errors:"), result.errors?.join("\n"));
-      process.exit(1);
+    const presetUrl = buildShadcnPresetUrl(config);
+    if (config.structure === "standalone") {
+      spinner.start("Creating project with shadcn/ui...");
+      try {
+        await execa("pnpm", ["dlx", "shadcn@latest", "create", config.projectName, "--template", "next", "--preset", presetUrl, "--src-dir"], {
+          cwd: path2.dirname(config.targetDir),
+          stdio: "pipe"
+        });
+        spinner.succeed("Base project created with shadcn/ui");
+      } catch {
+        if (await fs.pathExists(config.targetDir)) {
+          spinner.succeed("Base project created with shadcn/ui");
+        } else {
+          spinner.fail("Failed to create project with shadcn");
+          throw new Error("shadcn create failed and project directory was not created");
+        }
+      }
+      const workspaceFile = path2.join(config.targetDir, "pnpm-workspace.yaml");
+      if (await fs.pathExists(workspaceFile)) {
+        await fs.remove(workspaceFile);
+      }
+      spinner.start("Adding Convex and authentication...");
+      const result = await generateVirtualProject(config);
+      if (!result.success) {
+        spinner.fail("Failed to generate project files");
+        console.error(pc2.red("Errors:"), result.errors?.join("\n"));
+        process.exit(1);
+      }
+      await writeNodeToDisk(result.tree.root, config.targetDir, {
+        skipExisting: ["src/app/globals.css", "tailwind.config.ts", "components.json", "next.config.ts", "postcss.config.mjs"]
+      });
+      spinner.succeed("Convex and authentication added");
+      spinner.start("Merging dependencies...");
+      await mergePackageJson(config.targetDir, result.tree.root);
+      spinner.succeed("Dependencies merged");
+    } else {
+      spinner.start("Generating project files...");
+      const result = await generateVirtualProject(config);
+      if (!result.success) {
+        spinner.fail("Failed to generate project");
+        console.error(pc2.red("Errors:"), result.errors?.join("\n"));
+        process.exit(1);
+      }
+      spinner.succeed("Project files generated");
+      spinner.start("Writing files to disk...");
+      await writeNodeToDisk(result.tree.root, config.targetDir);
+      spinner.succeed("Files written to disk");
     }
-    spinner.succeed("Project files generated");
-    spinner.start("Writing files to disk...");
-    await writeNodeToDisk(result.tree.root, config.targetDir);
-    spinner.succeed("Files written to disk");
     spinner.start("Generating secrets...");
     const backendEnvPath = config.structure === "monorepo" ? path2.join(config.targetDir, "packages/backend/.env.local") : path2.join(config.targetDir, ".env.local");
     await updateEnvWithSecrets(backendEnvPath, {
@@ -449,18 +486,18 @@ async function generateProject(config, options = {}) {
     } catch {
       spinner.warn("Failed to install dependencies. Run pnpm install manually.");
     }
-    const shadcnDir = config.structure === "monorepo" ? path2.join(config.targetDir, "packages/ui") : config.targetDir;
-    const presetUrl = buildShadcnPresetUrl(config);
-    spinner.start("Initializing shadcn/ui...");
-    try {
-      await execa("pnpm", ["dlx", "shadcn@latest", "init", "--yes", "--preset", presetUrl], {
-        cwd: shadcnDir,
-        stdio: "pipe"
-      });
-      spinner.succeed("shadcn/ui initialized");
-    } catch {
-      spinner.warn(`Failed to initialize shadcn. Run manually:
-pnpm dlx shadcn@latest init --preset "${presetUrl}"`);
+    const shadcnDir = config.structure === "monorepo" ? path2.join(config.targetDir, "apps/web") : config.targetDir;
+    if (config.structure === "monorepo") {
+      spinner.start("Initializing shadcn/ui in apps/web...");
+      try {
+        await execa("pnpm", ["dlx", "shadcn@latest", "init", "--defaults", "--force"], {
+          cwd: shadcnDir,
+          stdio: "pipe"
+        });
+        spinner.succeed("shadcn/ui initialized");
+      } catch {
+        spinner.warn("Failed to initialize shadcn. Run manually in apps/web: pnpm dlx shadcn@latest init");
+      }
     }
     spinner.start("Installing shadcn/ui components...");
     try {
@@ -630,8 +667,13 @@ async function setupPayload(config) {
   }
   p2.log.success("Payload CMS configured successfully!");
 }
-async function writeNodeToDisk(node, targetDir) {
+async function writeNodeToDisk(node, targetDir, options = {}) {
+  const { skipExisting = [], basePath = "" } = options;
   if (node.type === "file") {
+    const relativePath = basePath ? `${basePath}/${node.name}` : node.name;
+    if (skipExisting.includes(relativePath)) {
+      return;
+    }
     const filePath = path2.join(targetDir, node.name);
     await fs.ensureDir(path2.dirname(filePath));
     if (Buffer.isBuffer(node.content)) {
@@ -642,7 +684,11 @@ async function writeNodeToDisk(node, targetDir) {
   } else {
     await fs.ensureDir(targetDir);
     for (const child of node.children) {
+      const childRelativePath = basePath ? `${basePath}/${child.name}` : child.name;
       if (child.type === "file") {
+        if (skipExisting.includes(childRelativePath)) {
+          continue;
+        }
         const filePath = path2.join(targetDir, child.name);
         await fs.ensureDir(path2.dirname(filePath));
         if (Buffer.isBuffer(child.content)) {
@@ -651,11 +697,40 @@ async function writeNodeToDisk(node, targetDir) {
           await fs.writeFile(filePath, child.content, "utf-8");
         }
       } else {
-        await writeNodeToDisk(child, path2.join(targetDir, child.name));
+        await writeNodeToDisk(child, path2.join(targetDir, child.name), {
+          skipExisting,
+          basePath: childRelativePath
+        });
       }
     }
   }
 }
+async function mergePackageJson(targetDir, virtualRoot) {
+  const packageJsonPath = path2.join(targetDir, "package.json");
+  const existingPkg = await fs.readJson(packageJsonPath);
+  let ourPkgContent;
+  if (virtualRoot.type === "directory") {
+    const pkgFile = virtualRoot.children.find((c) => c.name === "package.json");
+    if (pkgFile?.type === "file" && typeof pkgFile.content === "string") {
+      ourPkgContent = pkgFile.content;
+    }
+  }
+  if (!ourPkgContent) return;
+  const ourPkg = JSON.parse(ourPkgContent);
+  existingPkg.dependencies = {
+    ...existingPkg.dependencies,
+    ...ourPkg.dependencies
+  };
+  existingPkg.devDependencies = {
+    ...existingPkg.devDependencies,
+    ...ourPkg.devDependencies
+  };
+  existingPkg.scripts = {
+    ...existingPkg.scripts,
+    ...ourPkg.scripts
+  };
+  await fs.writeJson(packageJsonPath, existingPkg, { spaces: 2 });
+}
 
 // src/index.ts
 import { readFileSync } from "fs";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-kofi-stack",
-  "version": "2.1.0",
+  "version": "2.1.2",
   "description": "Scaffold opinionated full-stack projects with Next.js, Convex, Better-Auth, and more",
   "type": "module",
   "bin": {