create-sitekick 0.2.1 → 0.2.3

package/dist/index.js

@@ -1269,57 +1269,93 @@ function runInteractive(cmd, opts) {
 function isInstalled(cmd) {
   return run(`which ${cmd}`) !== null;
 }
+var scaffoldedDir = null;
+function abort(message = "Cancelled.") {
+  if (scaffoldedDir && fs.existsSync(scaffoldedDir)) {
+    fs.rmSync(scaffoldedDir, { recursive: true, force: true });
+  }
+  Ne(message);
+  process.exit(0);
+}
 async function cancelOrContinue(message) {
   const result = await Re({ message, initialValue: true });
-  if (Ct(result)) {
-    Ne("Cancelled.");
-    process.exit(0);
-  }
+  if (Ct(result))
+    abort();
   return result;
 }
 var TOOLS = {
   gh: {
     name: "GitHub CLI",
     cmd: "gh",
-    installHint: "Install from https://cli.github.com or run: brew install gh"
+    brewPkg: "gh"
   },
   vercel: {
     name: "Vercel CLI",
     cmd: "vercel",
-    installCmd: "bun add -g vercel"
+    bunPkg: "vercel"
   },
   neonctl: {
     name: "Neon CLI",
     cmd: "neonctl",
-    installCmd: "bun add -g neonctl"
+    bunPkg: "neonctl"
   },
   sanity: {
     name: "Sanity CLI",
     cmd: "sanity",
-    installCmd: "bun add -g sanity"
+    bunPkg: "sanity"
   }
 };
+async function ensureBrew(s) {
+  if (isInstalled("brew"))
+    return true;
+  const shouldInstall = await cancelOrContinue("Homebrew is needed to install some tools. Install it now?");
+  if (!shouldInstall)
+    return false;
+  s.start("Installing Homebrew...");
+  try {
+    execSync('/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"', { stdio: "inherit" });
+  } catch {
+    s.stop("Failed to install Homebrew");
+    return false;
+  }
+  const brewDirs = ["/opt/homebrew/bin", "/opt/homebrew/sbin", "/usr/local/bin", "/usr/local/sbin"];
+  const currentPath = process.env.PATH || "";
+  const newDirs = brewDirs.filter((d2) => !currentPath.includes(d2));
+  if (newDirs.length > 0) {
+    process.env.PATH = `${newDirs.join(":")}:${currentPath}`;
+  }
+  if (!isInstalled("brew")) {
+    s.stop("Homebrew installed but not found on PATH. Restart your terminal and try again.");
+    return false;
+  }
+  s.stop("Homebrew installed");
+  return true;
+}
 async function ensureTool(key, s) {
   const tool = TOOLS[key];
   if (isInstalled(tool.cmd))
     return true;
-  if (tool.installCmd) {
-    const shouldInstall = await cancelOrContinue(`${tool.name} (${tool.cmd}) is not installed. Install it now?`);
-    if (!shouldInstall)
-      return false;
-    s.start(`Installing ${tool.name}...`);
-    const result = run(tool.installCmd);
-    if (result === null) {
-      s.stop(`Failed to install ${tool.name}`);
+  const shouldInstall = await cancelOrContinue(`${tool.name} (${tool.cmd}) is not installed. Install it now?`);
+  if (!shouldInstall)
+    return false;
+  let installCmd;
+  if (tool.bunPkg) {
+    installCmd = `bun add -g ${tool.bunPkg}`;
+  } else if (tool.brewPkg) {
+    if (!await ensureBrew(s))
       return false;
-    }
-    s.stop(`${tool.name} installed`);
-    return true;
+    installCmd = `brew install ${tool.brewPkg}`;
+  } else {
+    return false;
   }
-  R2.warn(`${tool.name} (${import_picocolors3.default.cyan(tool.cmd)}) is not installed.
-  ${tool.installHint}`);
-  const ready = await cancelOrContinue(`Have you installed ${tool.cmd}? Continue?`);
-  return ready && isInstalled(tool.cmd);
+  s.start(`Installing ${tool.name}...`);
+  const result = run(installCmd);
+  if (result === null) {
+    s.stop(`Failed to install ${tool.name}`);
+    return false;
+  }
+  s.stop(`${tool.name} installed`);
+  return true;
 }
 async function ensureAuth(toolName, checkCmd, authCmd, s) {
   s.start(`Checking ${toolName} authentication...`);
@@ -1360,10 +1396,8 @@ async function selectGitHubOrg() {
       ...orgs.map((org) => ({ value: org, label: org }))
     ]
   });
-  if (Ct(selected)) {
-    Ne("Cancelled.");
-    process.exit(0);
-  }
+  if (Ct(selected))
+    abort();
   return selected === "__personal__" ? null : selected;
 }
 async function selectVercelTeam() {
@@ -1402,10 +1436,8 @@ async function selectVercelTeam() {
       }))
     ]
   });
-  if (Ct(selected)) {
-    Ne("Cancelled.");
-    process.exit(0);
-  }
+  if (Ct(selected))
+    abort();
   return selected === "__personal__" ? null : selected;
 }
 async function selectNeonOrg() {
@@ -1427,10 +1459,8 @@ async function selectNeonOrg() {
         }))
       ]
     });
-    if (Ct(selected)) {
-      Ne("Cancelled.");
-      process.exit(0);
-    }
+    if (Ct(selected))
+      abort();
     return selected === "__personal__" ? null : selected;
   } catch {
     return null;
@@ -1449,10 +1479,8 @@ async function setupGitHub(projectName, targetDir, s) {
       { value: "skip", label: "Skip GitHub setup" }
     ]
   });
-  if (Ct(existing)) {
-    Ne("Cancelled.");
-    process.exit(0);
-  }
+  if (Ct(existing))
+    abort();
   if (existing === "skip")
     return null;
   if (existing === "existing") {
@@ -1464,10 +1492,8 @@ async function setupGitHub(projectName, targetDir, s) {
           return "Repo URL is required";
       }
     });
-    if (Ct(repoUrl2)) {
-      Ne("Cancelled.");
-      process.exit(0);
-    }
+    if (Ct(repoUrl2))
+      abort();
     s.start("Linking to existing repo...");
     run(`git remote add origin ${repoUrl2}`, { cwd: targetDir });
     s.stop("Linked to existing repo");
@@ -1481,10 +1507,8 @@ async function setupGitHub(projectName, targetDir, s) {
       { value: "public", label: "Public" }
     ]
   });
-  if (Ct(visibility)) {
-    Ne("Cancelled.");
-    process.exit(0);
-  }
+  if (Ct(visibility))
+    abort();
   const repoFullName = ghOrg ? `${ghOrg}/${projectName}` : projectName;
   s.start(`Creating GitHub repo ${import_picocolors3.default.cyan(repoFullName)}...`);
   const result = run(`gh repo create ${repoFullName} --${visibility} --source . --remote origin`, { cwd: targetDir });
@@ -1509,10 +1533,8 @@ async function setupNeon(projectName, s) {
       { value: "skip", label: "Skip database setup" }
     ]
   });
-  if (Ct(existing)) {
-    Ne("Cancelled.");
-    process.exit(0);
-  }
+  if (Ct(existing))
+    abort();
   if (existing === "skip")
     return null;
   if (existing === "existing") {
@@ -1526,10 +1548,8 @@ async function setupNeon(projectName, s) {
           return "Must be a PostgreSQL connection string";
       }
     });
-    if (Ct(connStr)) {
-      Ne("Cancelled.");
-      process.exit(0);
-    }
+    if (Ct(connStr))
+      abort();
     return connStr;
   }
   const neonOrgId = await selectNeonOrg();
@@ -1583,10 +1603,8 @@ async function setupSanityProject(projectName, s) {
       { value: "skip", label: "Skip Sanity setup" }
     ]
   });
-  if (Ct(existing)) {
-    Ne("Cancelled.");
-    process.exit(0);
-  }
+  if (Ct(existing))
+    abort();
   if (existing === "skip")
     return null;
   if (existing === "existing") {
@@ -1598,19 +1616,15 @@ async function setupSanityProject(projectName, s) {
           return "Project ID is required";
       }
     });
-    if (Ct(projectId)) {
-      Ne("Cancelled.");
-      process.exit(0);
-    }
+    if (Ct(projectId))
+      abort();
     const dataset = await Ze({
       message: "Dataset name:",
       placeholder: "production",
       initialValue: "production"
     });
-    if (Ct(dataset)) {
-      Ne("Cancelled.");
-      process.exit(0);
-    }
+    if (Ct(dataset))
+      abort();
     return { projectId, dataset };
   }
   s.start(`Creating Sanity project ${import_picocolors3.default.cyan(projectName)}...`);
@@ -1647,10 +1661,8 @@ async function setupVercel(projectName, targetDir, repoUrl, s) {
       { value: "skip", label: "Skip Vercel setup" }
     ]
   });
-  if (Ct(existing)) {
-    Ne("Cancelled.");
-    process.exit(0);
-  }
+  if (Ct(existing))
+    abort();
   if (existing === "skip")
     return { url: null, scope: null };
   const vercelTeam = await selectVercelTeam();
@@ -1711,10 +1723,8 @@ async function askOpenAIKey() {
       { value: "skip", label: "Skip — set up later" }
     ]
   });
-  if (Ct(setup)) {
-    Ne("Cancelled.");
-    process.exit(0);
-  }
+  if (Ct(setup))
+    abort();
   if (setup === "skip")
     return null;
   const key = await Ze({
@@ -1727,10 +1737,8 @@ async function askOpenAIKey() {
         return "OpenAI keys start with sk-";
     }
   });
-  if (Ct(key)) {
-    Ne("Cancelled.");
-    process.exit(0);
-  }
+  if (Ct(key))
+    abort();
   return key;
 }
 function configureTemplate(targetDir, cms, projectName) {
@@ -1862,10 +1870,8 @@ async function main() {
         return "Use lowercase letters, numbers, and hyphens only";
     }
   });
-  if (Ct(projectName)) {
-    Ne("Cancelled.");
-    process.exit(0);
-  }
+  if (Ct(projectName))
+    abort();
   const cms = await Je({
     message: "Which CMS do you want to use?",
     options: [
@@ -1881,19 +1887,19 @@ async function main() {
       }
     ]
   });
-  if (Ct(cms)) {
-    Ne("Cancelled.");
-    process.exit(0);
-  }
+  if (Ct(cms))
+    abort();
   const targetDir = path.resolve(process.cwd(), projectName);
   if (fs.existsSync(targetDir)) {
     Ne(`Directory ${import_picocolors3.default.cyan(projectName)} already exists.`);
     process.exit(1);
   }
   const s = bt2();
+  await ensureBrew(s);
   s.start("Cloning sitekick-starter...");
   execSync(`git clone --depth 1 https://github.com/sitekickcodes/sitekick-starter.git ${targetDir}`, { stdio: "pipe" });
   fs.rmSync(path.join(targetDir, ".git"), { recursive: true, force: true });
+  scaffoldedDir = targetDir;
   s.stop("Cloned template");
   s.start(`Configuring for ${cms === "payload" ? "Payload CMS" : "Sanity"}...`);
   configureTemplate(targetDir, cms, projectName);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-sitekick",
-  "version": "0.2.1",
+  "version": "0.2.3",
   "description": "Scaffold a new Sitekick project with your choice of CMS",
   "type": "module",
   "bin": {