create-zenbu-app 0.0.19 → 0.0.21

package/README.md

@@ -8,53 +8,3 @@ cd my-app
 pnpm dev
 ```
 
-## Interactive mode
-
-Run with no arguments to be prompted for a project name and config options:
-
-```bash
-pnpm create zenbu-app
-```
-
-You'll be asked for:
-
-- **Project name** — defaults to `my-zenbu-app` (just press enter to accept).
-- **Use Tailwind CSS?** — defaults to `yes`.
-
-Each prompt's default is selected when you press enter, so a default scaffold
-is just `enter, enter, enter`.
-
-## Flags
-
-| Flag | Description |
-|---|---|
-| `--yes`, `-y` | Skip every prompt and take each option's default. With no project name, scaffolds into the current directory. |
-| `--no-install` | Skip the post-copy `<pm> install` step. |
-
-A few common invocations:
-
-```bash
-pnpm create zenbu-app                  # interactive, then scaffolds ./my-zenbu-app
-pnpm create zenbu-app my-app           # interactive options, scaffolds ./my-app
-pnpm create zenbu-app .                # interactive options, scaffolds into cwd
-pnpm create zenbu-app --yes            # all defaults, scaffolds into cwd
-pnpm create zenbu-app my-app --yes     # all defaults, scaffolds ./my-app
-```
-
-## Templates
-
-The CLI ships full per-config copies of the project under `templates/<slug>/`
-— there are no in-template conditionals. Today:
-
-- `templates/tailwind/` — Tailwind CSS v4 wired up via `@tailwindcss/vite`.
-- `templates/vanilla/` — plain CSS, no utility framework.
-
-The selected slug is computed from the answered config options (Tailwind
-contributes `tailwind`; the empty set falls back to `vanilla`).
-
-## Package manager support
-
-The detected invoking package manager is recorded in `zenbu.config.ts` and
-used for the post-copy install. pnpm, npm, yarn, and bun are all supported,
-but the bundled `.app` re-installs from the project's lockfile at first
-launch — so currently the lockfile must be a pnpm one.

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.19",
+  "version": "0.0.21",
   "description": "Scaffold a new Zenbu app",
   "type": "module",
   "publishConfig": {

package/templates/tailwind/package.json

@@ -8,7 +8,8 @@
     "build:source": "zen build:source",
     "build:electron": "zen build:electron",
     "publish:source": "zen publish:source",
-    "link": "zen link"
+    "link": "zen link",
+    "db:generate": "zen db generate"
   },
   "dependencies": {
     "@zenbujs/core": "^0.0.20",

package/templates/tailwind/src/main/services/cwd.ts.tmpl

@@ -0,0 +1,7 @@
+import { Service } from "@zenbujs/core/runtime"
+
+export class CwdService extends Service.create({ key: "cwd" }) {
+  async get() {
+    return process.cwd()
+  }
+}

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

@@ -27,7 +27,7 @@ function Home() {
         className="bg-indigo-600 hover:bg-indigo-700 transition text-white font-semibold px-4 py-2 rounded text-sm"
         onClick={async () => {
           setCopied(false)
-          setCwd(await rpc.app.repo.getCwd())
+          setCwd(await rpc.app.cwd.get())
         }}
       >
         Get cwd

package/templates/vanilla/package.json

@@ -8,7 +8,8 @@
     "build:source": "zen build:source",
     "build:electron": "zen build:electron",
     "publish:source": "zen publish:source",
-    "link": "zen link"
+    "link": "zen link",
+    "db:generate": "zen db generate"
   },
   "dependencies": {
     "@zenbujs/core": "^0.0.20",

package/templates/vanilla/src/main/services/cwd.ts.tmpl

@@ -0,0 +1,7 @@
+import { Service } from "@zenbujs/core/runtime"
+
+export class CwdService extends Service.create({ key: "cwd" }) {
+  async get() {
+    return process.cwd()
+  }
+}

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

@@ -27,7 +27,7 @@ function Home() {
         className="primary-button"
         onClick={async () => {
           setCopied(false)
-          setCwd(await rpc.app.repo.getCwd())
+          setCwd(await rpc.app.cwd.get())
         }}
       >
         Get cwd

package/templates/tailwind/src/main/services/repo.ts.tmpl

@@ -1,11 +0,0 @@
-import { Service } from "@zenbujs/core/runtime"
-
-/**
- * Sample RPC service. Methods on the class are callable from the renderer
- * via `useRpc()` — see `src/renderer/App.tsx`.
- */
-export class Repo extends Service.create({ key: "repo" }) {
-  async getCwd() {
-    return process.cwd()
-  }
-}

package/templates/vanilla/src/main/services/repo.ts.tmpl

@@ -1,11 +0,0 @@
-import { Service } from "@zenbujs/core/runtime"
-
-/**
- * Sample RPC service. Methods on the class are callable from the renderer
- * via `useRpc()` — see `src/renderer/App.tsx`.
- */
-export class Repo extends Service.create({ key: "repo" }) {
-  async getCwd() {
-    return process.cwd()
-  }
-}