@marko/run 0.1.10 → 0.1.11

package/dist/adapter/index.cjs

@@ -66,7 +66,7 @@ async function createViteDevServer(config2) {
   const devServer = await (0, import_vite.createServer)({
     ...config2,
     appType: "custom",
-    server: { middlewareMode: true }
+    server: { ...config2 == null ? void 0 : config2.server, middlewareMode: true }
   });
   const originalClose = devServer.close;
   devServer.close = () => {
@@ -124,7 +124,10 @@ async function spawnServer(cmd, args = [], port = 0, env, cwd = process.cwd(), w
     proc.kill();
   };
   try {
-    await waitForServer(port, wait);
+    await Promise.race([
+      waitForError(proc, port),
+      waitForServer(port, wait)
+    ]);
   } catch (err) {
     close();
     throw err;
@@ -161,6 +164,14 @@ async function spawnServerWorker(module2, args = [], port = 0, env) {
     import_cluster.default.settings.execArgv = originalArgs;
   }
 }
+async function waitForError(proc, port) {
+  return new Promise((_, reject) => {
+    proc.once("error", reject);
+    proc.once("exit", (code) => {
+      reject(new Error(`Process exited with code ${code} while waiting for server to start on port "${port}".`));
+    });
+  });
+}
 async function waitForServer(port, wait = 0) {
   let remaining = wait > 0 ? wait : Infinity;
   let connection;
@@ -170,12 +181,29 @@ async function waitForServer(port, wait = 0) {
       await sleep(100);
     } else {
       throw new Error(
-        `site-write: timeout while wating for server to start on port "${port}".`
+        `Timeout while wating for server to start on port "${port}".`
       );
     }
   }
   return connection;
 }
+async function waitForWorker(worker, port) {
+  return new Promise((resolve, reject) => {
+    function listening(address) {
+      if (address.port === port) {
+        worker.off("listening", listening);
+        resolve();
+      }
+    }
+    worker.on("listening", listening).once("error", reject).once("exit", (code) => {
+      reject(
+        new Error(
+          `Worker exited with code ${code} while waiting for dev server to start on port "${port}".`
+        )
+      );
+    });
+  });
+}
 async function getConnection(port) {
   return new Promise((resolve) => {
     const connection = import_net.default.connect(port).setNoDelay(true).setKeepAlive(false).on("error", () => {
@@ -275,17 +303,6 @@ function adapter() {
     }
   };
 }
-async function waitForWorker(worker, port) {
-  return new Promise((resolve) => {
-    function listening(address) {
-      if (address.port === port) {
-        worker.off("listening", listening);
-        resolve();
-      }
-    }
-    worker.on("listening", listening);
-  });
-}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   activeDevServers,

package/dist/adapter/index.js

@@ -32,7 +32,7 @@ async function createViteDevServer(config2) {
   const devServer = await createServer({
     ...config2,
     appType: "custom",
-    server: { middlewareMode: true }
+    server: { ...config2 == null ? void 0 : config2.server, middlewareMode: true }
   });
   const originalClose = devServer.close;
   devServer.close = () => {
@@ -90,7 +90,10 @@ async function spawnServer(cmd, args = [], port = 0, env, cwd = process.cwd(), w
     proc.kill();
   };
   try {
-    await waitForServer(port, wait);
+    await Promise.race([
+      waitForError(proc, port),
+      waitForServer(port, wait)
+    ]);
   } catch (err) {
     close();
     throw err;
@@ -127,6 +130,14 @@ async function spawnServerWorker(module, args = [], port = 0, env) {
     cluster.settings.execArgv = originalArgs;
   }
 }
+async function waitForError(proc, port) {
+  return new Promise((_, reject) => {
+    proc.once("error", reject);
+    proc.once("exit", (code) => {
+      reject(new Error(`Process exited with code ${code} while waiting for server to start on port "${port}".`));
+    });
+  });
+}
 async function waitForServer(port, wait = 0) {
   let remaining = wait > 0 ? wait : Infinity;
   let connection;
@@ -136,12 +147,29 @@ async function waitForServer(port, wait = 0) {
       await sleep(100);
     } else {
       throw new Error(
-        `site-write: timeout while wating for server to start on port "${port}".`
+        `Timeout while wating for server to start on port "${port}".`
       );
     }
   }
   return connection;
 }
+async function waitForWorker(worker, port) {
+  return new Promise((resolve, reject) => {
+    function listening(address) {
+      if (address.port === port) {
+        worker.off("listening", listening);
+        resolve();
+      }
+    }
+    worker.on("listening", listening).once("error", reject).once("exit", (code) => {
+      reject(
+        new Error(
+          `Worker exited with code ${code} while waiting for dev server to start on port "${port}".`
+        )
+      );
+    });
+  });
+}
 async function getConnection(port) {
   return new Promise((resolve) => {
     const connection = net.connect(port).setNoDelay(true).setKeepAlive(false).on("error", () => {
@@ -240,17 +268,6 @@ function adapter() {
     }
   };
 }
-async function waitForWorker(worker, port) {
-  return new Promise((resolve) => {
-    function listening(address) {
-      if (address.port === port) {
-        worker.off("listening", listening);
-        resolve();
-      }
-    }
-    worker.on("listening", listening);
-  });
-}
 export {
   activeDevServers,
   createDevServer,

package/dist/vite/index.cjs

@@ -1379,7 +1379,7 @@ function markoRun(opts = {}) {
       const filepath = import_path2.default.join(typesDir, "routes.d.ts");
       const data = await renderRouteTypeInfo(
         routes,
-        import_path2.default.relative(typesDir, resolvedRoutesDir),
+        normalizePath(import_path2.default.relative(typesDir, resolvedRoutesDir)),
         adapter
       );
       if (data !== typesFile || !import_fs2.default.existsSync(filepath)) {
@@ -1852,7 +1852,10 @@ async function spawnServer(cmd, args = [], port = 0, env, cwd = process.cwd(), w
     proc.kill();
   };
   try {
-    await waitForServer(port, wait);
+    await Promise.race([
+      waitForError(proc, port),
+      waitForServer(port, wait)
+    ]);
   } catch (err) {
     close();
     throw err;
@@ -1862,6 +1865,14 @@ async function spawnServer(cmd, args = [], port = 0, env, cwd = process.cwd(), w
     close
   };
 }
+async function waitForError(proc, port) {
+  return new Promise((_, reject) => {
+    proc.once("error", reject);
+    proc.once("exit", (code) => {
+      reject(new Error(`Process exited with code ${code} while waiting for server to start on port "${port}".`));
+    });
+  });
+}
 async function waitForServer(port, wait = 0) {
   let remaining = wait > 0 ? wait : Infinity;
   let connection;
@@ -1871,7 +1882,7 @@ async function waitForServer(port, wait = 0) {
       await sleep(100);
     } else {
       throw new Error(
-        `site-write: timeout while wating for server to start on port "${port}".`
+        `Timeout while wating for server to start on port "${port}".`
       );
     }
   }

package/dist/vite/index.js

@@ -1341,7 +1341,7 @@ function markoRun(opts = {}) {
       const filepath = path2.join(typesDir, "routes.d.ts");
       const data = await renderRouteTypeInfo(
         routes,
-        path2.relative(typesDir, resolvedRoutesDir),
+        normalizePath(path2.relative(typesDir, resolvedRoutesDir)),
         adapter
       );
       if (data !== typesFile || !fs2.existsSync(filepath)) {
@@ -1814,7 +1814,10 @@ async function spawnServer(cmd, args = [], port = 0, env, cwd = process.cwd(), w
     proc.kill();
   };
   try {
-    await waitForServer(port, wait);
+    await Promise.race([
+      waitForError(proc, port),
+      waitForServer(port, wait)
+    ]);
   } catch (err) {
     close();
     throw err;
@@ -1824,6 +1827,14 @@ async function spawnServer(cmd, args = [], port = 0, env, cwd = process.cwd(), w
     close
   };
 }
+async function waitForError(proc, port) {
+  return new Promise((_, reject) => {
+    proc.once("error", reject);
+    proc.once("exit", (code) => {
+      reject(new Error(`Process exited with code ${code} while waiting for server to start on port "${port}".`));
+    });
+  });
+}
 async function waitForServer(port, wait = 0) {
   let remaining = wait > 0 ? wait : Infinity;
   let connection;
@@ -1833,7 +1844,7 @@ async function waitForServer(port, wait = 0) {
       await sleep(100);
     } else {
       throw new Error(
-        `site-write: timeout while wating for server to start on port "${port}".`
+        `Timeout while wating for server to start on port "${port}".`
       );
     }
   }

package/dist/vite/utils/server.d.ts

@@ -1,5 +1,7 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import { type Socket } from "net";
+import { ChildProcess } from "child_process";
 import { type Worker } from "cluster";
 export interface SpawnedServer {
     port: number;
@@ -9,7 +11,9 @@ export declare function parseEnv(envFile: string): Promise<import("dotenv").Dote
 export declare function loadEnv(envFile: string): void;
 export declare function spawnServer(cmd: string, args?: string[], port?: number, env?: string | Record<string, string>, cwd?: string, wait?: number): Promise<SpawnedServer>;
 export declare function spawnServerWorker(module: string, args?: string[], port?: number, env?: string | Record<string, string>): Promise<Worker>;
+export declare function waitForError(proc: ChildProcess, port: number): Promise<void>;
 export declare function waitForServer(port: number, wait?: number): Promise<Socket>;
+export declare function waitForWorker(worker: Worker, port: number): Promise<void>;
 export declare function getConnection(port: number): Promise<Socket | null>;
 export declare function isPortInUse(port: number): Promise<boolean>;
 export declare function getAvailablePort(): Promise<number>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marko/run",
-  "version": "0.1.10",
+  "version": "0.1.11",
   "description": "The Marko application framework.",
   "license": "MIT",
   "homepage": "https://github.com/marko-js/run/tree/main/packages/run",