@zappdev/cli 0.5.0-alpha.5 → 0.5.0-alpha.7

package/package.json

@@ -1,10 +1,13 @@
 {
   "name": "@zappdev/cli",
-  "version": "0.5.0-alpha.5",
+  "version": "0.5.0-alpha.7",
   "type": "module",
   "bin": {
     "zapp": "./src/zapp-cli.ts"
   },
+  "exports": {
+    "./config": "./src/config.ts"
+  },
   "files": [
     "src/",
     "native/",

package/src/init.ts

@@ -102,13 +102,15 @@ fn main() -> int {
 }
 `);
 
-  // 3. Add zapp.config.ts
+  // 3. Add zapp.config.ts — typed via defineConfig for autocomplete
   const identifier = `com.zapp.${name.toLowerCase().replace(/[^a-z0-9]/g, "")}`;
-  await Bun.write(path.join(projectDir, "zapp.config.ts"), `export default {
+  await Bun.write(path.join(projectDir, "zapp.config.ts"), `import { defineConfig } from "@zappdev/cli/config";
+
+export default defineConfig({
   name: "${name}",
   identifier: "${identifier}",
   version: "0.1.0",
-};
+});
 `);
 
   // 4. Update package.json — add deps and scripts
@@ -135,16 +137,52 @@ fn main() -> int {
 
   await Bun.write(pkgPath, JSON.stringify(pkgObj, null, 2));
 
-  // 5. Overwrite vite.config.ts with Zapp plugin wiring
-  // The Vite scaffold creates a minimal one, but we need the zappWorkers()
-  // plugin for worker bundling support.
-  await Bun.write(path.join(projectDir, "vite.config.ts"), `import { defineConfig } from "vite";
+  // 5. Inject zappWorkers() into the template's vite.config.ts
+  // Templates like svelte-ts ship their own vite.config.ts with framework
+  // plugins (e.g. svelte()). We must preserve those and append ours.
+  const viteConfigPath = path.join(projectDir, "vite.config.ts");
+  // Also check .js — some templates use vite.config.js
+  const viteConfigJsPath = path.join(projectDir, "vite.config.js");
+  const configPath = existsSync(viteConfigPath) ? viteConfigPath
+    : existsSync(viteConfigJsPath) ? viteConfigJsPath
+    : null;
+
+  if (configPath) {
+    let viteConfig = await Bun.file(configPath).text();
+
+    // Add our import at the top (after existing imports)
+    const importLine = `import { zappWorkers } from "@zappdev/vite";\n`;
+    if (!viteConfig.includes("@zappdev/vite")) {
+      // Insert after the last import statement
+      const lastImportIdx = viteConfig.lastIndexOf("\nimport ");
+      if (lastImportIdx >= 0) {
+        const endOfLine = viteConfig.indexOf("\n", lastImportIdx + 1);
+        viteConfig = viteConfig.slice(0, endOfLine + 1) + importLine + viteConfig.slice(endOfLine + 1);
+      } else {
+        viteConfig = importLine + viteConfig;
+      }
+    }
+
+    // Append zappWorkers() to the plugins array
+    if (!viteConfig.includes("zappWorkers()")) {
+      // Match plugins: [...] and append inside the array
+      viteConfig = viteConfig.replace(
+        /plugins:\s*\[/,
+        "plugins: [zappWorkers(), "
+      );
+    }
+
+    await Bun.write(configPath, viteConfig);
+  } else {
+    // No vite.config found — create a minimal one
+    await Bun.write(viteConfigPath, `import { defineConfig } from "vite";
 import { zappWorkers } from "@zappdev/vite";
 
 export default defineConfig({
   plugins: [zappWorkers()],
 });
 `);
+  }
 
   // 6. Add .zapp/ to .gitignore
   const gitignorePath = path.join(projectDir, ".gitignore");