@zappdev/cli 0.5.0-alpha.2 → 0.5.0-alpha.4

package/native/app/app.zc

@@ -39,7 +39,7 @@ fn app_get_bootstrap_name() -> string {
 fn app_get_bootstrap_web_content_inspectable() -> bool {
     let app = (App*)app_get_active();
     if app == NULL { return false; }
-    match app.config.inspectable {
+    match app.config.webContentInspectable {
         ZappInspectable::On => { return true; },
         ZappInspectable::Off => { return false; },
         ZappInspectable::Auto => { return zapp_build_dev_tools_default() > 0; },
@@ -179,7 +179,7 @@ enum ZappInspectable {
 struct AppConfig {
     name: string;
     applicationShouldTerminateAfterLastWindowClosed: bool;
-    inspectable: ZappInspectable;
+    webContentInspectable: ZappInspectable;
     maxWorkers: int;
     qjsStackSize: int;
     backend: bool;  // enable backend worker (src/backend.ts)
@@ -189,13 +189,13 @@ struct AppConfig {
 // Zapp namespace — convenience accessors for framework enums and values.
 //
 // Usage:
-//   inspectable: Zapp::inspectable_auto(),
-//   inspectable: Zapp::inspectable_on(),
-//   inspectable: Zapp::inspectable_off(),
+//   webContentInspectable: Zapp::inspectable_auto(),
+//   webContentInspectable: Zapp::inspectable_on(),
+//   webContentInspectable: Zapp::inspectable_off(),
 //
 // These return the proper enum type so you get match exhaustiveness and
 // type checking. The enum constructors also work directly if you prefer:
-//   inspectable: ZappInspectable::Auto(),
+//   webContentInspectable: ZappInspectable::Auto(),
 //
 // As Zapp adds more framework-level options (log levels, security modes,
 // etc.), new accessors will appear here under the same Zapp:: namespace.
@@ -221,7 +221,7 @@ struct App {
 impl App {
     fn new(config: AppConfig) -> App {
         let wm = WindowManager::new();
-        match config.inspectable {
+        match config.webContentInspectable {
             ZappInspectable::On => { wm.webContentInspectable = true; },
             ZappInspectable::Off => { wm.webContentInspectable = false; },
             ZappInspectable::Auto => {

package/native/build.zc

@@ -53,7 +53,7 @@ fn main() -> int {
     let config = AppConfig{
         name: "Zapp v2 Test",
         applicationShouldTerminateAfterLastWindowClosed: true,
-        inspectable: Zapp::inspectable_on(),
+        webContentInspectable: Zapp::inspectable_on(),
         maxWorkers: 0,
         qjsStackSize: 0,
         backend: false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zappdev/cli",
-  "version": "0.5.0-alpha.2",
+  "version": "0.5.0-alpha.4",
   "type": "module",
   "bin": {
     "zapp": "./src/zapp-cli.ts"

package/src/config.ts

@@ -26,6 +26,7 @@ export interface ZappConfig {
   version?: string;
   assetDir?: string;  // Default: "./dist" (Vite), configurable for static sites
   devPort?: number;   // Default: 5173
+  backend?: string;   // Path to backend worker source (e.g. "src/server.ts"). Omit for no backend.
   deepLinkSchemes?: string[];  // e.g. ["myapp"] → registers myapp:// URL scheme
   macos?: MacOSConfig;
   security?: SecurityConfig;

package/src/init.ts

@@ -3,7 +3,7 @@
 // Does NOT modify the Vite template files — users add Zapp imports themselves.
 
 import path from "node:path";
-import { mkdir } from "node:fs/promises";
+import { mkdir, rm } from "node:fs/promises";
 import { existsSync } from "node:fs";
 
 interface InitOptions {
@@ -22,8 +22,11 @@ export async function runInit(opts: InitOptions) {
   }
 
   // 1. Create Vite project
+  // Use bunx create-vite (not `bun create vite`) to avoid auto-installing
+  // deps and triggering template postinstall scripts that can start a dev
+  // server. The user runs `bun install` themselves after init.
   process.stdout.write(`[zapp] creating ${name} with template ${template}...\n`);
-  const viteProc = Bun.spawn(["bun", "create", "vite", name, "--template", template], {
+  const viteProc = Bun.spawn(["bunx", "create-vite", name, "--template", template], {
     cwd: root,
     stdout: "inherit",
     stderr: "inherit",
@@ -33,6 +36,11 @@ export async function runInit(opts: InitOptions) {
     process.exit(1);
   }
 
+  // Remove node_modules if create-vite auto-installed — we modify
+  // package.json (add zapp deps/scripts) before the user installs.
+  const autoModules = path.join(projectDir, "node_modules");
+  try { await rm(autoModules, { recursive: true }); } catch {}
+
   // 2. Add zapp/ native code
   const zappDir = path.join(projectDir, "zapp");
   await mkdir(zappDir, { recursive: true });
@@ -51,7 +59,7 @@ fn run_app() -> int {
     let config = AppConfig{
         name: "${name}",
         applicationShouldTerminateAfterLastWindowClosed: true,
-        inspectable: Zapp::inspectable_auto(),
+        webContentInspectable: Zapp::inspectable_auto(),
         maxWorkers: 0,
         qjsStackSize: 0,
         backend: false,
@@ -117,17 +125,18 @@ fn main() -> int {
     ...pkgObj.scripts,
     "dev": "zapp dev",
     "build": "zapp build",
+    "package": "zapp package",
     "generate": "zapp generate",
   };
 
   pkgObj.dependencies = {
     ...(pkgObj.dependencies ?? {}),
-    "@zappdev/runtime": "^0.5.0",
+    "@zappdev/runtime": "^0.5.0-alpha.0",
   };
   pkgObj.devDependencies = {
     ...(pkgObj.devDependencies ?? {}),
-    "@zappdev/cli": "^0.5.0",
-    "@zappdev/vite": "^0.5.0",
+    "@zappdev/cli": "^0.5.0-alpha.0",
+    "@zappdev/vite": "^0.5.0-alpha.0",
   };
 
   await Bun.write(pkgPath, JSON.stringify(pkgObj, null, 2));
@@ -158,6 +167,7 @@ export default defineConfig({
   process.stdout.write(`  Then add to your entry file (e.g. src/main.ts):\n\n`);
   process.stdout.write(`    import { Window, WindowEvent, Services } from "@zappdev/runtime";\n\n`);
   process.stdout.write(`  Run:\n`);
-  process.stdout.write(`    zapp dev      # development with Vite HMR\n`);
-  process.stdout.write(`    zapp build    # production build\n\n`);
+  process.stdout.write(`    bun run dev      # development with Vite HMR\n`);
+  process.stdout.write(`    bun run build    # production build\n`);
+  process.stdout.write(`    bun run package  # .app bundle (macOS)\n\n`);
 }

package/src/workers.ts

@@ -45,7 +45,7 @@ async function discoverWorkers(srcDir: string): Promise<WorkerEntry[]> {
   return [...found.entries()].map(([entryPath, specifier]) => ({ entryPath, specifier }));
 }
 
-export async function bundleWorkers(root: string): Promise<number> {
+export async function bundleWorkers(root: string, backendConfig?: string): Promise<number> {
   const srcDir = path.join(root, "src");
   const outDir = path.join(root, ".zapp", "workers");
   await mkdir(outDir, { recursive: true });
@@ -81,8 +81,10 @@ export async function bundleWorkers(root: string): Promise<number> {
     }
   }
 
-  // Backend worker — convention: src/backend.ts
-  const backendPath = path.join(root, "src", "backend.ts");
+  // Backend worker — from config or fall back to src/backend.ts convention
+  const backendPath = backendConfig
+    ? path.resolve(root, backendConfig)
+    : path.join(root, "src", "backend.ts");
   try {
     await stat(backendPath);
     const outPath = path.join(outDir, "backend.mjs");
@@ -95,12 +97,12 @@ export async function bundleWorkers(root: string): Promise<number> {
       minify: false,
     });
     if (result.success) {
-      process.stdout.write("[zapp] backend worker detected: src/backend.ts\n");
+      process.stdout.write(`[zapp] backend worker: ${path.relative(root, backendPath)}\n`);
     } else {
       process.stderr.write("[zapp] backend bundle failed\n");
     }
   } catch {
-    // No backend.ts — that's fine, backend is optional
+    // No backend file — that's fine, backend is optional
   }
 
   return workers.length;