create-zenbu-app 0.0.18 → 0.0.20

package/dist/index.mjs

@@ -138,6 +138,51 @@ function probeVersion(pm) {
 	const match = (res.stdout ?? "").trim().match(/\d+\.\d+\.\d+(?:[-+][\w.]+)?/);
 	return match ? match[0] : null;
 }
+/**
+* `npx`, `npm create`, and `npm exec` all set the same `npm/<version>`
+* user agent, so when `detectPackageManager` reports `npm` the user may
+* actually prefer a different installed pm. Probe all four candidates,
+* present only the ones present on the machine, and let the user pick
+* (or pick automatically when only one is installed / `--yes`).
+*/
+async function resolveNpmAmbiguity(detected, opts) {
+	const candidates = [
+		"pnpm",
+		"npm",
+		"yarn",
+		"bun"
+	];
+	const installed = [];
+	for (const c of candidates) {
+		if (c === "npm") {
+			installed.push({
+				type: "npm",
+				version: detected.version,
+				fallback: false
+			});
+			continue;
+		}
+		const v = probeVersion(c);
+		if (v) installed.push({
+			type: c,
+			version: v,
+			fallback: false
+		});
+	}
+	if (installed.length === 1) return installed[0];
+	const preferPnpm = installed.find((p) => p.type === "pnpm");
+	if (opts.yes) return preferPnpm ?? installed.find((p) => p.type === "npm");
+	const pick = await p.select({
+		message: "Which package manager should this app use?",
+		initialValue: preferPnpm?.type ?? "npm",
+		options: installed.map((p) => ({
+			value: p.type,
+			label: p.type === "pnpm" ? "pnpm (recommended)" : p.type
+		}))
+	});
+	if (p.isCancel(pick)) bail("Scaffolding cancelled.");
+	return installed.find((p) => p.type === pick);
+}
 function renderTemplate(value, ctx) {
 	return value.replace(/\{\{(\w+)\}\}/g, (full, key) => {
 		return Object.prototype.hasOwnProperty.call(ctx, key) ? ctx[key] : full;
@@ -407,7 +452,8 @@ async function main() {
 		templateDir = path.join(TEMPLATES_DIR, slug);
 	}
 	if (!fs.existsSync(templateDir)) bail(`No template found for configuration "${slug}".`);
-	const pm = detectPackageManager();
+	let pm = detectPackageManager();
+	if (pm.type === "npm") pm = await resolveNpmAmbiguity(pm, { yes });
 	p.log.step(`Scaffolding Zenbu ${pluginMode ? "plugin" : "app"} in "${displayName}" (template: ${slug})`);
 	const ctx = pluginMode ? {
 		projectName: displayName,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-zenbu-app",
-  "version": "0.0.18",
+  "version": "0.0.20",
   "description": "Scaffold a new Zenbu app",
   "type": "module",
   "publishConfig": {

package/templates/tailwind/src/renderer/App.tsx.tmpl

@@ -18,7 +18,7 @@ function Home() {
 
   return (
     <main className="flex-1 px-8 pt-6 pb-8 font-sans text-[#e5e5e5]">
-      <h1 className="text-2xl font-bold mb-2">Welcome to Zenbu</h1>
+      <h1 className="text-2xl font-bold mb-2">Welcome to Zenbu.js</h1>
       <p className="text-[#888] mb-6">
         Edit <code>src/renderer/App.tsx</code> to get started.
       </p>

package/templates/vanilla/src/renderer/App.tsx.tmpl

@@ -18,7 +18,7 @@ function Home() {
 
   return (
     <main className="home">
-      <h1>Welcome to Zenbu</h1>
+      <h1>Welcome to Zenbu.js</h1>
       <p className="lede">
         Edit <code>src/renderer/App.tsx</code> to get started.
       </p>