create-kide-app 0.0.17 → 0.0.18

package/index.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 import * as p from "@clack/prompts";
-import { execSync } from "node:child_process";
+import { execSync, spawn } from "node:child_process";
 import { cpSync, existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from "node:fs";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
@@ -9,6 +9,24 @@ import { fileURLToPath } from "node:url";
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const TEMPLATES_DIR = path.join(__dirname, "templates");
 
+// Async spawn wrapper so long-running commands don't block clack spinners
+const runAsync = (cmd, cwd) =>
+  new Promise((resolve, reject) => {
+    const child = spawn(cmd, { cwd, shell: true });
+    let stdout = "";
+    let stderr = "";
+    child.stdout.on("data", (d) => (stdout += d.toString()));
+    child.stderr.on("data", (d) => (stderr += d.toString()));
+    child.on("close", (code) => {
+      if (code === 0) resolve(stdout);
+      else {
+        const err = new Error(`Command failed: ${cmd}`);
+        err.stderr = stderr;
+        reject(err);
+      }
+    });
+  });
+
 // --- Package manager detection ---
 
 const pm = { name: "pnpm", exec: "pnpm dlx", run: "pnpm", install: "pnpm install" };
@@ -150,7 +168,7 @@ async function main() {
 
   s.start("Installing dependencies");
   try {
-    execSync(pm.install, { cwd: projectDir, stdio: "pipe" });
+    await runAsync(pm.install, projectDir);
     s.stop("Dependencies installed");
   } catch {
     s.stop(`${pm.install} failed — run it manually`);
@@ -199,7 +217,7 @@ async function main() {
 
   // --- Cloudflare resource setup ---
 
-  const cf = { d1Created: false, r2Created: false, migrationsApplied: false };
+  const cf = { d1Created: false, r2Created: false, migrationsApplied: false, deployed: false, url: null };
   if (target === "cloudflare") {
     const setupNow = await p.confirm({
       message: "Set up Cloudflare resources now? (creates D1 database and R2 bucket)",
@@ -299,6 +317,7 @@ async function main() {
             execSync(`${pm.exec} wrangler d1 migrations apply ${projectName}-db --remote`, {
               cwd: projectDir,
               stdio: "pipe",
+              input: "y\n",
             });
             cf.migrationsApplied = true;
             s.stop("Migrations applied");
@@ -306,6 +325,27 @@ async function main() {
             s.stop("Migration apply failed — run manually with: wrangler d1 migrations apply --remote");
           }
         }
+
+        // Deploy to Cloudflare
+        if (cf.migrationsApplied) {
+          const doDeploy = await p.confirm({
+            message: "Deploy to Cloudflare now?",
+            initialValue: true,
+          });
+          if (!p.isCancel(doDeploy) && doDeploy) {
+            s.start("Building and deploying to Cloudflare");
+            try {
+              const deployOutput = await runAsync(`${pm.run} deploy`, projectDir);
+              const urlMatch = deployOutput.match(/https:\/\/[^\s]+\.workers\.dev/);
+              if (urlMatch) cf.url = urlMatch[0];
+              cf.deployed = true;
+              s.stop("Deployed to Cloudflare");
+            } catch (err) {
+              s.stop("Deploy failed — run manually with: pnpm run deploy");
+              if (err.stderr) console.error(err.stderr.slice(-500));
+            }
+          }
+        }
       }
     }
   }
@@ -321,26 +361,34 @@ async function main() {
       console.log(`  To start again:   cd ${projectName} && pnpm dev\n`);
     }
   } else {
-    const lines = [`cd ${projectName}`];
-    const remaining = [];
-    if (!cf.d1Created) {
-      remaining.push(
-        `  ${pm.exec} wrangler d1 create ${projectName}-db`,
-        "  # Copy the database_id to wrangler.toml",
-      );
-    }
-    if (!cf.r2Created) {
-      remaining.push(`  ${pm.exec} wrangler r2 bucket create ${projectName}-assets`);
-    }
-    if (!cf.migrationsApplied) {
-      remaining.push(`  ${pm.exec} wrangler d1 migrations apply ${projectName}-db --remote`);
-    }
-    if (remaining.length > 0) {
-      lines.push("", "Remaining setup:", ...remaining);
+    if (cf.deployed && cf.url) {
+      p.note([`Live at: ${cf.url}`, `Admin:   ${cf.url}/admin`, "", `cd ${projectName}`, "", "Local development:", `  ${pm.run} dev`, "", "Redeploy:", "  pnpm run deploy"].join("\n"), "🎉 Your Kide CMS is live");
+      p.outro("Project created!");
+    } else {
+      const lines = [`cd ${projectName}`];
+      const remaining = [];
+      if (!cf.d1Created) {
+        remaining.push(
+          `  ${pm.exec} wrangler d1 create ${projectName}-db`,
+          "  # Copy the database_id to wrangler.toml",
+        );
+      }
+      if (!cf.r2Created) {
+        remaining.push(`  ${pm.exec} wrangler r2 bucket create ${projectName}-assets`);
+      }
+      if (!cf.migrationsApplied) {
+        remaining.push(`  ${pm.exec} wrangler d1 migrations apply ${projectName}-db --remote`);
+      }
+      if (!cf.deployed) {
+        remaining.push(`  ${pm.run} run deploy`);
+      }
+      if (remaining.length > 0) {
+        lines.push("", "Remaining setup:", ...remaining);
+      }
+      lines.push("", "Local development:", `  ${pm.run} dev`);
+      p.note(lines.join("\n"), "Next steps");
+      p.outro("Project created!");
     }
-    lines.push("", "Local development:", `  ${pm.run} dev`, "", "Deploy:", "  pnpm run deploy");
-    p.note(lines.join("\n"), "Next steps");
-    p.outro("Project created!");
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-kide-app",
-  "version": "0.0.17",
+  "version": "0.0.18",
   "description": "Scaffold a new Kide CMS project",
   "author": "Matti Hernesniemi",
   "license": "MIT",

package/templates/cloudflare/drizzle.config.ts

@@ -1,11 +1,17 @@
-import { readdirSync } from "node:fs";
+import { existsSync, readdirSync } from "node:fs";
 import { defineConfig } from "drizzle-kit";
 
-function getLocalD1Path() {
+// Look for the local D1 sqlite file (created by wrangler after first run).
+// Returns null if it doesn't exist yet — `drizzle-kit generate` doesn't need it.
+function getLocalD1Path(): string | null {
   const dir = ".wrangler/state/v3/d1/miniflare-D1DatabaseObject";
-  const file = readdirSync(dir).find((f) => f.endsWith(".sqlite") && f !== "*.sqlite");
-  if (!file) throw new Error(`No D1 sqlite file found in ${dir}`);
-  return `${dir}/${file}`;
+  if (!existsSync(dir)) return null;
+  try {
+    const file = readdirSync(dir).find((f) => f.endsWith(".sqlite") && f !== "*.sqlite");
+    return file ? `${dir}/${file}` : null;
+  } catch {
+    return null;
+  }
 }
 
 export default defineConfig({
@@ -13,6 +19,6 @@ export default defineConfig({
   out: "./src/cms/migrations",
   dialect: "sqlite",
   dbCredentials: {
-    url: getLocalD1Path(),
+    url: getLocalD1Path() ?? ":memory:",
   },
 });