@zappdev/vite 0.5.0-alpha.1 → 0.5.0-alpha.3

package/dist/index.js

@@ -73,7 +73,7 @@ async function bundleWorker(entry, outDir, aliases) {
     return false;
   }
 }
-function zappWorkers() {
+function zappWorkers(options) {
   let root = "";
   let srcDir = "";
   let workers = [];
@@ -81,10 +81,11 @@ function zappWorkers() {
   let aliases = {};
   let isDev = false;
   let outDir = "";
+  let backendFromConfig = options?.backend;
   return {
     name: "zapp-workers",
     enforce: "pre",
-    configResolved(config) {
+    async configResolved(config) {
       root = config.root;
       srcDir = path.join(root, "src");
       outDir = path.join(root, "dist", "_workers");
@@ -93,14 +94,24 @@ function zappWorkers() {
       if (resolvedAlias && typeof resolvedAlias === "object" && !Array.isArray(resolvedAlias)) {
         aliases = resolvedAlias;
       }
+      if (!backendFromConfig) {
+        try {
+          const configPath = path.join(root, "zapp.config.ts");
+          const mod = await import(configPath);
+          const zappConfig = typeof mod.default === "function" ? mod.default() : mod.default;
+          if (zappConfig?.backend) {
+            backendFromConfig = zappConfig.backend;
+          }
+        } catch {}
+      }
     },
     async buildStart() {
       workers = await discoverWorkers(srcDir);
-      const backendPath = path.join(srcDir, "backend.ts");
-      if (existsSync(backendPath)) {
+      const backendSrc = backendFromConfig ? path.resolve(root, backendFromConfig) : path.join(srcDir, "backend.ts");
+      if (existsSync(backendSrc)) {
         backendEntry = {
-          specifier: "./backend.ts",
-          sourcePath: backendPath,
+          specifier: path.relative(srcDir, backendSrc),
+          sourcePath: backendSrc,
           outputName: "backend.mjs",
           outputUrl: "/_workers/backend.mjs"
         };
@@ -109,7 +120,7 @@ function zappWorkers() {
         console.log(`[zapp] discovered ${workers.length} worker(s)`);
       }
       if (backendEntry) {
-        console.log("[zapp] backend worker: src/backend.ts");
+        console.log(`[zapp] backend worker: ${path.relative(root, backendSrc)}`);
       }
     },
     transform(code, id) {
@@ -134,11 +145,11 @@ function zappWorkers() {
       const devOutDir = path.join(root, ".zapp", "workers");
       await mkdir(devOutDir, { recursive: true });
       workers = await discoverWorkers(srcDir);
-      const backendPath = path.join(srcDir, "backend.ts");
-      if (existsSync(backendPath)) {
+      const backendSrc = backendFromConfig ? path.resolve(root, backendFromConfig) : path.join(srcDir, "backend.ts");
+      if (existsSync(backendSrc)) {
         backendEntry = {
-          specifier: "./backend.ts",
-          sourcePath: backendPath,
+          specifier: path.relative(srcDir, backendSrc),
+          sourcePath: backendSrc,
           outputName: "backend.mjs",
           outputUrl: "/_workers/backend.mjs"
         };

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "@zappdev/vite",
-  "version": "0.5.0-alpha.1",
+  "version": "0.5.0-alpha.3",
   "type": "module",
-  "main": "dist/index.js",
-  "types": "src/index.ts",
   "exports": {
-    ".": "./dist/index.js"
+    ".": {
+      "types": "./src/index.ts",
+      "default": "./dist/index.js"
+    }
   },
   "files": [
     "dist/",

package/src/index.ts

@@ -104,7 +104,12 @@ async function bundleWorker(entry: WorkerEntry, outDir: string, aliases: Record<
   }
 }
 
-export function zappWorkers(): Plugin {
+interface ZappWorkersOptions {
+  /** Path to backend worker source, relative to project root. Overrides zapp.config.ts. */
+  backend?: string;
+}
+
+export function zappWorkers(options?: ZappWorkersOptions): Plugin {
   let root = "";
   let srcDir = "";
   let workers: WorkerEntry[] = [];
@@ -112,12 +117,13 @@ export function zappWorkers(): Plugin {
   let aliases: Record<string, string> = {};
   let isDev = false;
   let outDir = "";
+  let backendFromConfig = options?.backend;
 
   return {
     name: "zapp-workers",
     enforce: "pre",
 
-    configResolved(config) {
+    async configResolved(config) {
       root = config.root;
       srcDir = path.join(root, "src");
       outDir = path.join(root, "dist", "_workers");
@@ -128,18 +134,34 @@ export function zappWorkers(): Plugin {
       if (resolvedAlias && typeof resolvedAlias === "object" && !Array.isArray(resolvedAlias)) {
         aliases = resolvedAlias as Record<string, string>;
       }
+
+      // Auto-read backend path from zapp.config.ts if not passed as option
+      if (!backendFromConfig) {
+        try {
+          const configPath = path.join(root, "zapp.config.ts");
+          const mod = await import(configPath);
+          const zappConfig = typeof mod.default === "function" ? mod.default() : mod.default;
+          if (zappConfig?.backend) {
+            backendFromConfig = zappConfig.backend;
+          }
+        } catch {
+          // No zapp.config.ts or no backend field — that's fine
+        }
+      }
     },
 
     async buildStart() {
       // Discover workers from source
       workers = await discoverWorkers(srcDir);
 
-      // Check for backend worker (convention: src/backend.ts)
-      const backendPath = path.join(srcDir, "backend.ts");
-      if (existsSync(backendPath)) {
+      // Backend worker — path from config, or fall back to src/backend.ts convention
+      const backendSrc = backendFromConfig
+        ? path.resolve(root, backendFromConfig)
+        : path.join(srcDir, "backend.ts");
+      if (existsSync(backendSrc)) {
         backendEntry = {
-          specifier: "./backend.ts",
-          sourcePath: backendPath,
+          specifier: path.relative(srcDir, backendSrc),
+          sourcePath: backendSrc,
           outputName: "backend.mjs",
           outputUrl: "/_workers/backend.mjs",
         };
@@ -149,7 +171,7 @@ export function zappWorkers(): Plugin {
         console.log(`[zapp] discovered ${workers.length} worker(s)`);
       }
       if (backendEntry) {
-        console.log("[zapp] backend worker: src/backend.ts");
+        console.log(`[zapp] backend worker: ${path.relative(root, backendSrc)}`);
       }
     },
 
@@ -187,11 +209,13 @@ export function zappWorkers(): Plugin {
       await mkdir(devOutDir, { recursive: true });
 
       workers = await discoverWorkers(srcDir);
-      const backendPath = path.join(srcDir, "backend.ts");
-      if (existsSync(backendPath)) {
+      const backendSrc = backendFromConfig
+        ? path.resolve(root, backendFromConfig)
+        : path.join(srcDir, "backend.ts");
+      if (existsSync(backendSrc)) {
         backendEntry = {
-          specifier: "./backend.ts",
-          sourcePath: backendPath,
+          specifier: path.relative(srcDir, backendSrc),
+          sourcePath: backendSrc,
           outputName: "backend.mjs",
           outputUrl: "/_workers/backend.mjs",
         };