@marko/run 0.1.10 → 0.1.12

package/dist/adapter/index.cjs

@@ -33,8 +33,14 @@ __export(adapter_exports, {
   default: () => adapter
 });
 module.exports = __toCommonJS(adapter_exports);
-var import_path = __toESM(require("path"), 1);
+
+// scripts/importMetaURL.js
 var import_url = require("url");
+var __importMetaURL = (0, import_url.pathToFileURL)(__filename);
+
+// src/adapter/index.ts
+var import_path = __toESM(require("path"), 1);
+var import_url2 = require("url");
 
 // src/adapter/dev-server.ts
 var import_vite = require("vite");
@@ -66,7 +72,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 = () => {
@@ -105,7 +111,7 @@ async function parseEnv(envFile) {
 function loadEnv(envFile) {
   (0, import_dotenv.config)({ path: envFile });
 }
-async function spawnServer(cmd, args = [], port = 0, env, cwd = process.cwd(), wait = 3e4) {
+async function spawnServer(cmd, args = [], port = 0, env, cwd = process.cwd(), wait = 3e4, stdio = ["ignore", "inherit", "inherit"]) {
   if (port <= 0) {
     port = await getAvailablePort();
   }
@@ -115,7 +121,7 @@ async function spawnServer(cmd, args = [], port = 0, env, cwd = process.cwd(), w
   const proc = import_child_process.default.spawn(cmd, args, {
     cwd,
     shell: true,
-    stdio: "inherit",
+    stdio,
     windowsHide: true,
     env: { ...env, NODE_ENV: "development", ...process.env, PORT: `${port}` }
   });
@@ -124,7 +130,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 +170,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 +187,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", () => {
@@ -200,8 +234,7 @@ function sleep(ms) {
 
 // src/adapter/index.ts
 var import_parse_node_args = __toESM(require("parse-node-args"), 1);
-var import_meta = {};
-var __dirname = (0, import_url.fileURLToPath)(new URL(".", import_meta.url));
+var __dirname = import_path.default.dirname((0, import_url2.fileURLToPath)(__importMetaURL));
 var defaultEntry = import_path.default.join(__dirname, "default-entry");
 var loadDevWorker = import_path.default.join(__dirname, "load-dev-worker.mjs");
 function adapter() {
@@ -275,17 +308,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 = () => {
@@ -71,7 +71,7 @@ async function parseEnv(envFile) {
 function loadEnv(envFile) {
   config({ path: envFile });
 }
-async function spawnServer(cmd, args = [], port = 0, env, cwd = process.cwd(), wait = 3e4) {
+async function spawnServer(cmd, args = [], port = 0, env, cwd = process.cwd(), wait = 3e4, stdio = ["ignore", "inherit", "inherit"]) {
   if (port <= 0) {
     port = await getAvailablePort();
   }
@@ -81,7 +81,7 @@ async function spawnServer(cmd, args = [], port = 0, env, cwd = process.cwd(), w
   const proc = cp.spawn(cmd, args, {
     cwd,
     shell: true,
-    stdio: "inherit",
+    stdio,
     windowsHide: true,
     env: { ...env, NODE_ENV: "development", ...process.env, PORT: `${port}` }
   });
@@ -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", () => {
@@ -166,7 +194,7 @@ function sleep(ms) {
 
 // src/adapter/index.ts
 import parseNodeArgs from "parse-node-args";
-var __dirname = fileURLToPath(new URL(".", import.meta.url));
+var __dirname = path.dirname(fileURLToPath(import.meta.url));
 var defaultEntry = path.join(__dirname, "default-entry");
 var loadDevWorker = path.join(__dirname, "load-dev-worker.mjs");
 function adapter() {
@@ -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/adapter/load-dev-worker.mjs

@@ -14,9 +14,10 @@ process
   .send("ready");
 
 async function start(entry, config) {
+  globalThis.__marko_run_vite_config__ = config;
   let changed = false;
-  const loader = await createServer(config);
-  ({ activeDevServers } = await loader.ssrLoadModule("@marko/run/adapter"));
+  const loader = await createServer({ ...config, ssr: { external: ['@marko/run/router'] }});
+  ({ activeDevServers } = await import("@marko/run/adapter"));
   await loader.ssrLoadModule(entry);
 
   loader.watcher.on("change", (path) => {

package/dist/adapter/middleware.cjs

@@ -21,10 +21,15 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var middleware_exports = {};
 __export(middleware_exports, {
   createMiddleware: () => createMiddleware,
-  getOrigin: () => getOrigin
+  getOrigin: () => getOrigin,
+  setResponseHeaders: () => setResponseHeaders
 });
 module.exports = __toCommonJS(middleware_exports);
 
+// scripts/importMetaURL.js
+var import_url = require("url");
+var __importMetaURL = (0, import_url.pathToFileURL)(__filename);
+
 // src/adapter/polyfill.ts
 var import_web = require("stream/web");
 var import_crypto = require("crypto");
@@ -110,6 +115,30 @@ function getOrigin(req, protocol, host, trustProxy) {
   }
   return `${protocol}://${host}`;
 }
+var inExpiresDateRgs = /Expires\s*=\s*(?:Mon|Tue|Wed|Thu|Fri|Sat|Sun)\s*$/i;
+function setResponseHeaders(response, res) {
+  for (const [key, value] of response.headers) {
+    if (key === "set-cookie") {
+      let sepIndex = value.indexOf(",") + 1;
+      if (!sepIndex) {
+        res.setHeader(key, value);
+      } else {
+        let index = 0;
+        do {
+          const valuePart = value.slice(index, sepIndex - 1);
+          if (!inExpiresDateRgs.test(valuePart)) {
+            res.appendHeader(key, valuePart);
+            index = sepIndex;
+          }
+          sepIndex = value.indexOf(",", sepIndex) + 1;
+        } while (sepIndex);
+        res.appendHeader(key, value.slice(index));
+      }
+    } else {
+      res.setHeader(key, value);
+    }
+  }
+}
 function createMiddleware(fetch2, options = {}) {
   const { trustProxy = process.env.TRUST_PROXY === "1", devServer } = options;
   let { origin = process.env.ORIGIN } = options;
@@ -157,24 +186,7 @@ function createMiddleware(fetch2, options = {}) {
       return;
     }
     res.statusCode = response.status;
-    for (const [key, value] of response.headers) {
-      if (key === "set-cookie") {
-        let sepIndex = value.indexOf(",") + 1;
-        if (!sepIndex) {
-          res.setHeader(key, value);
-        } else {
-          let index = 0;
-          do {
-            res.appendHeader(key, value.slice(index, sepIndex - 1));
-            index = sepIndex;
-            sepIndex = value.indexOf(",", sepIndex) + 1;
-          } while (sepIndex);
-          res.appendHeader(key, value.slice(index));
-        }
-      } else {
-        res.setHeader(key, value);
-      }
-    }
+    setResponseHeaders(response, res);
     if (!response.body) {
       if (!response.headers.has("content-length")) {
         res.setHeader("content-length", "0");
@@ -233,5 +245,6 @@ function createMiddleware(fetch2, options = {}) {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   createMiddleware,
-  getOrigin
+  getOrigin,
+  setResponseHeaders
 });

package/dist/adapter/middleware.d.ts

@@ -2,6 +2,7 @@
 import type { Fetch } from "../runtime";
 import type { IncomingMessage, ServerResponse } from "http";
 import type { ViteDevServer } from "vite";
+import { OutgoingMessage } from "http";
 declare module "net" {
     interface Socket {
         encrypted?: boolean;
@@ -48,6 +49,7 @@ export interface NodeAdapterOptions {
     devServer?: ViteDevServer;
 }
 export declare function getOrigin(req: IncomingMessage, protocol?: string, host?: string, trustProxy?: boolean): string;
+export declare function setResponseHeaders(response: Response, res: OutgoingMessage): void;
 /**
  * Creates a request handler to be passed to http.createServer() or used as a
  * middleware in Connect-style frameworks like Express.

package/dist/adapter/middleware.js

@@ -83,6 +83,30 @@ function getOrigin(req, protocol, host, trustProxy) {
   }
   return `${protocol}://${host}`;
 }
+var inExpiresDateRgs = /Expires\s*=\s*(?:Mon|Tue|Wed|Thu|Fri|Sat|Sun)\s*$/i;
+function setResponseHeaders(response, res) {
+  for (const [key, value] of response.headers) {
+    if (key === "set-cookie") {
+      let sepIndex = value.indexOf(",") + 1;
+      if (!sepIndex) {
+        res.setHeader(key, value);
+      } else {
+        let index = 0;
+        do {
+          const valuePart = value.slice(index, sepIndex - 1);
+          if (!inExpiresDateRgs.test(valuePart)) {
+            res.appendHeader(key, valuePart);
+            index = sepIndex;
+          }
+          sepIndex = value.indexOf(",", sepIndex) + 1;
+        } while (sepIndex);
+        res.appendHeader(key, value.slice(index));
+      }
+    } else {
+      res.setHeader(key, value);
+    }
+  }
+}
 function createMiddleware(fetch2, options = {}) {
   const { trustProxy = process.env.TRUST_PROXY === "1", devServer } = options;
   let { origin = process.env.ORIGIN } = options;
@@ -130,24 +154,7 @@ function createMiddleware(fetch2, options = {}) {
       return;
     }
     res.statusCode = response.status;
-    for (const [key, value] of response.headers) {
-      if (key === "set-cookie") {
-        let sepIndex = value.indexOf(",") + 1;
-        if (!sepIndex) {
-          res.setHeader(key, value);
-        } else {
-          let index = 0;
-          do {
-            res.appendHeader(key, value.slice(index, sepIndex - 1));
-            index = sepIndex;
-            sepIndex = value.indexOf(",", sepIndex) + 1;
-          } while (sepIndex);
-          res.appendHeader(key, value.slice(index));
-        }
-      } else {
-        res.setHeader(key, value);
-      }
-    }
+    setResponseHeaders(response, res);
     if (!response.body) {
       if (!response.headers.has("content-length")) {
         res.setHeader("content-length", "0");
@@ -205,5 +212,6 @@ function createMiddleware(fetch2, options = {}) {
 }
 export {
   createMiddleware,
-  getOrigin
+  getOrigin,
+  setResponseHeaders
 };

package/dist/cli/index.mjs

@@ -78,23 +78,31 @@ var HttpVerbColors = {
 
 // src/vite/plugin.ts
 import { fileURLToPath } from "url";
-var __dirname = fileURLToPath(new URL(".", import.meta.url));
+var __dirname = path2.dirname(fileURLToPath(import.meta.url));
 var POSIX_SEP = "/";
 var WINDOWS_SEP = "\\";
 var normalizePath = path2.sep === WINDOWS_SEP ? (id) => id.replace(/\\/g, POSIX_SEP) : (id) => id;
+async function getPackageData(dir) {
+  do {
+    const pkgPath = path2.join(dir, "package.json");
+    if (fs2.existsSync(pkgPath)) {
+      return JSON.parse(await fs2.promises.readFile(pkgPath, "utf-8"));
+    }
+  } while (dir !== (dir = path2.dirname(dir)));
+  return null;
+}
 async function resolveAdapter(root, options, log) {
   const { adapter } = options;
   if (adapter !== void 0) {
     return adapter;
   }
-  const { resolvePackageData } = await import("vite");
-  const pkg = resolvePackageData(".", root);
+  const pkg = await getPackageData(root);
   if (pkg) {
-    const dependecies = {
-      ...pkg.data.dependecies,
-      ...pkg.data.devDependencies
-    };
-    for (const name of Object.keys(dependecies)) {
+    let dependecies = pkg.dependencies ? Object.keys(pkg.dependencies) : [];
+    if (pkg.devDependencies) {
+      dependecies = dependecies.concat(Object.keys(pkg.devDependencies));
+    }
+    for (const name of dependecies) {
       if (name.startsWith("@marko/run-adapter") || name.indexOf("marko-run-adapter") !== -1) {
         try {
           const module2 = await import(name);
@@ -115,7 +123,7 @@ async function resolveAdapter(root, options, log) {
 }
 
 // src/cli/commands.ts
-var __dirname2 = fileURLToPath2(new URL(".", import.meta.url));
+var __dirname2 = path3.dirname(fileURLToPath2(import.meta.url));
 var defaultPort = +process.env.PORT || 3e3;
 var defaultConfigFileBases = ["serve.config", "vite.config"];
 var defaultConfigFileExts = [".js", ".cjs", ".mjs", ".ts", ".mts"];

package/dist/runtime/index.cjs

@@ -16,3 +16,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/runtime/index.ts
 var runtime_exports = {};
 module.exports = __toCommonJS(runtime_exports);
+
+// scripts/importMetaURL.js
+var import_url = require("url");
+var __importMetaURL = (0, import_url.pathToFileURL)(__filename);

package/dist/runtime/internal.cjs

@@ -32,6 +32,12 @@ __export(internal_exports, {
   pageResponse: () => pageResponse
 });
 module.exports = __toCommonJS(internal_exports);
+
+// scripts/importMetaURL.js
+var import_url = require("url");
+var __importMetaURL = (0, import_url.pathToFileURL)(__filename);
+
+// src/runtime/internal.ts
 var pageResponseInit = {
   status: 200,
   headers: { "content-type": "text/html;charset=UTF-8" }

package/dist/runtime/router.cjs

@@ -25,6 +25,12 @@ __export(router_exports, {
   match: () => match
 });
 module.exports = __toCommonJS(router_exports);
+
+// scripts/importMetaURL.js
+var import_url = require("url");
+var __importMetaURL = (0, import_url.pathToFileURL)(__filename);
+
+// src/runtime/router.ts
 function fromRuntime(name) {
   return (...args) => {
     const runtime = globalThis.__marko_run__;

package/dist/vite/index.cjs

@@ -28,6 +28,7 @@ var vite_exports = {};
 __export(vite_exports, {
   default: () => markoRun,
   getAvailablePort: () => getAvailablePort,
+  getPackageData: () => getPackageData,
   isPortInUse: () => isPortInUse,
   loadEnv: () => loadEnv,
   parseEnv: () => parseEnv,
@@ -35,6 +36,10 @@ __export(vite_exports, {
 });
 module.exports = __toCommonJS(vite_exports);
 
+// scripts/importMetaURL.js
+var import_url = require("url");
+var __importMetaURL = (0, import_url.pathToFileURL)(__filename);
+
 // src/vite/plugin.ts
 var import_path2 = __toESM(require("path"), 1);
 var import_crypto = __toESM(require("crypto"), 1);
@@ -180,6 +185,7 @@ async function buildRoutes(walk, basePath) {
             meta: (_e = files.get(RoutableFileTypes.Meta)) == null ? void 0 : _e[0],
             page,
             handler,
+            entryName: `${markoRunFilePrefix}route__${key}`,
             score: scorePath(path3, index)
           });
           for (const mw of middlewareStack) {
@@ -197,6 +203,7 @@ async function buildRoutes(walk, basePath) {
               middleware: [],
               layouts: [...layoutsStack],
               page: entries[0],
+              entryName: `${markoRunFilePrefix}special__${type}`,
               score: 0
             };
           }
@@ -492,7 +499,7 @@ function renderRouteTemplate(route) {
   }
   const writer = createStringWriter();
   writer.writeLines(
-    `// ${virtualFilePrefix}/${markoRunFilePrefix}route__${route.key}.marko`
+    `// ${virtualFilePrefix}/${route.entryName}.marko`
   );
   writer.branch("imports");
   writer.writeLines("");
@@ -515,7 +522,7 @@ function writeRouteTemplateTag(writer, [file, ...rest], index = 1) {
 }
 function renderRouteEntry(route) {
   var _a;
-  const { key, index, handler, page, middleware, meta } = route;
+  const { key, index, handler, page, middleware, meta, entryName } = route;
   const verbs = getVerbs(route);
   if (!verbs) {
     throw new Error(
@@ -524,7 +531,7 @@ function renderRouteEntry(route) {
   }
   const writer = createStringWriter();
   writer.writeLines(
-    `// ${virtualFilePrefix}/${markoRunFilePrefix}route__${key}.js`
+    `// ${virtualFilePrefix}/${entryName}.js`
   );
   const imports = writer.branch("imports");
   const runtimeImports = [];
@@ -567,7 +574,7 @@ function renderRouteEntry(route) {
   }
   if (page) {
     imports.writeLines(
-      `import page from '${virtualFilePrefix}/${markoRunFilePrefix}route__${key}.marko${serverEntryQuery}';`
+      `import page from '${virtualFilePrefix}/${entryName}.marko${serverEntryQuery}';`
     );
   }
   if (meta) {
@@ -672,12 +679,12 @@ function renderRouter(routes, options = {
     imports.writeLines(
       `import { ${names.join(
         ", "
-      )} } from '${virtualFilePrefix}/${markoRunFilePrefix}route__${route.key}.js';`
+      )} } from '${virtualFilePrefix}/${route.entryName}.js';`
     );
   }
-  for (const { key } of Object.values(routes.special)) {
+  for (const { key, entryName } of Object.values(routes.special)) {
     imports.writeLines(
-      `import page${key} from '${virtualFilePrefix}/${markoRunFilePrefix}special__${key}.marko${serverEntryQuery}';`
+      `import page${key} from '${virtualFilePrefix}/${entryName}.marko${serverEntryQuery}';`
     );
   }
   writer.writeLines(
@@ -1264,13 +1271,10 @@ function logRoutesTable(routes, bundle) {
 }
 function computeRouteSize(route, bundle) {
   if (route.page) {
+    const entryName = `${route.entryName}.marko`;
     for (const chunk of Object.values(bundle)) {
-      if (chunk.type === "chunk") {
-        for (const key of Object.keys(chunk.modules)) {
-          if (key.startsWith(route.page.filePath)) {
-            return computeChunkSize(chunk, bundle);
-          }
-        }
+      if (chunk.type === "chunk" && chunk.isEntry && chunk.name === entryName) {
+        return computeChunkSize(chunk, bundle);
       }
     }
   }
@@ -1334,9 +1338,8 @@ var setExternalPluginOptions = (viteConfig, value) => setConfig(viteConfig, Plug
 var getExternalAdapterOptions = (viteConfig) => getConfig(viteConfig, AdapterConfigKey);
 
 // src/vite/plugin.ts
-var import_url = require("url");
-var import_meta = {};
-var __dirname = (0, import_url.fileURLToPath)(new URL(".", import_meta.url));
+var import_url2 = require("url");
+var __dirname = import_path2.default.dirname((0, import_url2.fileURLToPath)(__importMetaURL));
 var markoExt = ".marko";
 var POSIX_SEP = "/";
 var WINDOWS_SEP = "\\";
@@ -1345,7 +1348,7 @@ function isMarkoFile(id) {
   return id.endsWith(markoExt);
 }
 function markoRun(opts = {}) {
-  let { routesDir = "src/routes", adapter, ...markoOptions } = opts;
+  let { routesDir, adapter, ...markoVitePluginOptions } = opts;
   let compiler;
   let store;
   let root;
@@ -1379,7 +1382,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)) {
@@ -1452,7 +1455,7 @@ function markoRun(opts = {}) {
       name: "marko-run-vite:pre",
       enforce: "pre",
       async config(config2, env) {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e, _f, _g;
         const externalPluginOptions = getExternalPluginOptions(config2);
         if (externalPluginOptions) {
           opts = (0, import_vite.mergeConfig)(opts, externalPluginOptions);
@@ -1466,11 +1469,11 @@ function markoRun(opts = {}) {
           config2.logLevel !== "silent" && !isBuild || isSSRBuild
         );
         if (adapter) {
-          const externalAdapterConfig = getExternalAdapterOptions(config2);
-          if (externalAdapterConfig && adapter.configure) {
-            adapter.configure(externalAdapterConfig);
-          }
-          const adapterOptions = await ((_b = adapter.pluginOptions) == null ? void 0 : _b.call(adapter, opts));
+          (_b = adapter.configure) == null ? void 0 : _b.call(adapter, {
+            ...getExternalAdapterOptions(config2),
+            root
+          });
+          const adapterOptions = await ((_c = adapter.pluginOptions) == null ? void 0 : _c.call(adapter, opts));
           if (adapterOptions) {
             opts = (0, import_vite.mergeConfig)(opts, adapterOptions);
           }
@@ -1484,16 +1487,19 @@ function markoRun(opts = {}) {
             )
           }
         });
-        store = opts.store || new import_vite2.FileStore(
+        routesDir = opts.routesDir || "src/routes";
+        markoVitePluginOptions.store = store = opts.store || new import_vite2.FileStore(
           `marko-serve-vite-${import_crypto.default.createHash("SHA1").update(root).digest("hex")}`
         );
+        markoVitePluginOptions.runtimeId = opts.runtimeId;
+        markoVitePluginOptions.basePathVar = opts.basePathVar;
         resolvedRoutesDir = import_path2.default.resolve(root, routesDir);
         typesDir = import_path2.default.join(root, ".marko-run");
         devEntryFile = import_path2.default.join(root, "index.html");
         devEntryFilePosix = normalizePath(devEntryFile);
-        const assetsDir = ((_c = config2.build) == null ? void 0 : _c.assetsDir) || "assets";
-        let rollupOutputOptions = (_e = (_d = config2.build) == null ? void 0 : _d.rollupOptions) == null ? void 0 : _e.output;
-        if (isBuild && !isSSRBuild) {
+        const assetsDir = ((_d = config2.build) == null ? void 0 : _d.assetsDir) || "assets";
+        let rollupOutputOptions = (_f = (_e = config2.build) == null ? void 0 : _e.rollupOptions) == null ? void 0 : _f.output;
+        if (isBuild) {
           const defaultRollupOutputOptions = {
             assetFileNames({ name }) {
               if (name && name.indexOf("_marko-virtual_id_") < 0) {
@@ -1513,7 +1519,7 @@ function markoRun(opts = {}) {
               }
               return `${assetsDir}/${name || "[name]"}-[hash].js`;
             },
-            chunkFileNames: `${assetsDir}/_[hash].js`
+            chunkFileNames: isSSRBuild ? `_[hash].js` : `${assetsDir}/_[hash].js`
           };
           if (!rollupOutputOptions) {
             rollupOutputOptions = defaultRollupOutputOptions;
@@ -1544,7 +1550,7 @@ function markoRun(opts = {}) {
             }
           }
         };
-        const adapterConfig = await ((_f = adapter == null ? void 0 : adapter.viteConfig) == null ? void 0 : _f.call(adapter, config2));
+        const adapterConfig = await ((_g = adapter == null ? void 0 : adapter.viteConfig) == null ? void 0 : _g.call(adapter, config2));
         if (adapterConfig) {
           pluginConfig = (0, import_vite.mergeConfig)(pluginConfig, adapterConfig);
         }
@@ -1655,12 +1661,7 @@ function markoRun(opts = {}) {
         }
       }
     },
-    ...(0, import_vite2.default)({
-      ...markoOptions,
-      get store() {
-        return store;
-      }
-    }),
+    ...(0, import_vite2.default)(markoVitePluginOptions),
     {
       name: "marko-run-vite:post",
       enforce: "post",
@@ -1781,19 +1782,27 @@ async function ensureDir(dir) {
     await import_fs2.default.promises.mkdir(dir, { recursive: true });
   }
 }
+async function getPackageData(dir) {
+  do {
+    const pkgPath = import_path2.default.join(dir, "package.json");
+    if (import_fs2.default.existsSync(pkgPath)) {
+      return JSON.parse(await import_fs2.default.promises.readFile(pkgPath, "utf-8"));
+    }
+  } while (dir !== (dir = import_path2.default.dirname(dir)));
+  return null;
+}
 async function resolveAdapter(root, options, log) {
   const { adapter } = options;
   if (adapter !== void 0) {
     return adapter;
   }
-  const { resolvePackageData } = await import("vite");
-  const pkg = resolvePackageData(".", root);
+  const pkg = await getPackageData(root);
   if (pkg) {
-    const dependecies = {
-      ...pkg.data.dependecies,
-      ...pkg.data.devDependencies
-    };
-    for (const name of Object.keys(dependecies)) {
+    let dependecies = pkg.dependencies ? Object.keys(pkg.dependencies) : [];
+    if (pkg.devDependencies) {
+      dependecies = dependecies.concat(Object.keys(pkg.devDependencies));
+    }
+    for (const name of dependecies) {
       if (name.startsWith("@marko/run-adapter") || name.indexOf("marko-run-adapter") !== -1) {
         try {
           const module3 = await import(name);
@@ -1833,7 +1842,7 @@ async function parseEnv(envFile) {
 function loadEnv(envFile) {
   (0, import_dotenv.config)({ path: envFile });
 }
-async function spawnServer(cmd, args = [], port = 0, env, cwd = process.cwd(), wait = 3e4) {
+async function spawnServer(cmd, args = [], port = 0, env, cwd = process.cwd(), wait = 3e4, stdio = ["ignore", "inherit", "inherit"]) {
   if (port <= 0) {
     port = await getAvailablePort();
   }
@@ -1843,7 +1852,7 @@ async function spawnServer(cmd, args = [], port = 0, env, cwd = process.cwd(), w
   const proc = import_child_process.default.spawn(cmd, args, {
     cwd,
     shell: true,
-    stdio: "inherit",
+    stdio,
     windowsHide: true,
     env: { ...env, NODE_ENV: "development", ...process.env, PORT: `${port}` }
   });
@@ -1852,7 +1861,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 +1874,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 +1891,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}".`
       );
     }
   }
@@ -1904,6 +1924,7 @@ function sleep(ms) {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   getAvailablePort,
+  getPackageData,
   isPortInUse,
   loadEnv,
   parseEnv,

package/dist/vite/index.d.ts

@@ -1,4 +1,4 @@
-export { default } from "./plugin";
+export { default, getPackageData } from "./plugin";
 export { getAvailablePort, isPortInUse, loadEnv, parseEnv, spawnServer, } from "./utils/server";
 export type { SpawnedServer } from "./utils/server";
-export type { Adapter, AdapterConfig, Options, BuiltRoutes, HttpVerb, ParamInfo, Route, RoutableFile, RoutableFileType, } from "./types";
+export type { Adapter, AdapterConfig, Options, BuiltRoutes, HttpVerb, PackageData, ParamInfo, Route, RoutableFile, RoutableFileType, } from "./types";

package/dist/vite/index.js

@@ -143,6 +143,7 @@ async function buildRoutes(walk, basePath) {
             meta: (_e = files.get(RoutableFileTypes.Meta)) == null ? void 0 : _e[0],
             page,
             handler,
+            entryName: `${markoRunFilePrefix}route__${key}`,
             score: scorePath(path3, index)
           });
           for (const mw of middlewareStack) {
@@ -160,6 +161,7 @@ async function buildRoutes(walk, basePath) {
               middleware: [],
               layouts: [...layoutsStack],
               page: entries[0],
+              entryName: `${markoRunFilePrefix}special__${type}`,
               score: 0
             };
           }
@@ -455,7 +457,7 @@ function renderRouteTemplate(route) {
   }
   const writer = createStringWriter();
   writer.writeLines(
-    `// ${virtualFilePrefix}/${markoRunFilePrefix}route__${route.key}.marko`
+    `// ${virtualFilePrefix}/${route.entryName}.marko`
   );
   writer.branch("imports");
   writer.writeLines("");
@@ -478,7 +480,7 @@ function writeRouteTemplateTag(writer, [file, ...rest], index = 1) {
 }
 function renderRouteEntry(route) {
   var _a;
-  const { key, index, handler, page, middleware, meta } = route;
+  const { key, index, handler, page, middleware, meta, entryName } = route;
   const verbs = getVerbs(route);
   if (!verbs) {
     throw new Error(
@@ -487,7 +489,7 @@ function renderRouteEntry(route) {
   }
   const writer = createStringWriter();
   writer.writeLines(
-    `// ${virtualFilePrefix}/${markoRunFilePrefix}route__${key}.js`
+    `// ${virtualFilePrefix}/${entryName}.js`
   );
   const imports = writer.branch("imports");
   const runtimeImports = [];
@@ -530,7 +532,7 @@ function renderRouteEntry(route) {
   }
   if (page) {
     imports.writeLines(
-      `import page from '${virtualFilePrefix}/${markoRunFilePrefix}route__${key}.marko${serverEntryQuery}';`
+      `import page from '${virtualFilePrefix}/${entryName}.marko${serverEntryQuery}';`
     );
   }
   if (meta) {
@@ -635,12 +637,12 @@ function renderRouter(routes, options = {
     imports.writeLines(
       `import { ${names.join(
         ", "
-      )} } from '${virtualFilePrefix}/${markoRunFilePrefix}route__${route.key}.js';`
+      )} } from '${virtualFilePrefix}/${route.entryName}.js';`
     );
   }
-  for (const { key } of Object.values(routes.special)) {
+  for (const { key, entryName } of Object.values(routes.special)) {
     imports.writeLines(
-      `import page${key} from '${virtualFilePrefix}/${markoRunFilePrefix}special__${key}.marko${serverEntryQuery}';`
+      `import page${key} from '${virtualFilePrefix}/${entryName}.marko${serverEntryQuery}';`
     );
   }
   writer.writeLines(
@@ -1227,13 +1229,10 @@ function logRoutesTable(routes, bundle) {
 }
 function computeRouteSize(route, bundle) {
   if (route.page) {
+    const entryName = `${route.entryName}.marko`;
     for (const chunk of Object.values(bundle)) {
-      if (chunk.type === "chunk") {
-        for (const key of Object.keys(chunk.modules)) {
-          if (key.startsWith(route.page.filePath)) {
-            return computeChunkSize(chunk, bundle);
-          }
-        }
+      if (chunk.type === "chunk" && chunk.isEntry && chunk.name === entryName) {
+        return computeChunkSize(chunk, bundle);
       }
     }
   }
@@ -1298,7 +1297,7 @@ var getExternalAdapterOptions = (viteConfig) => getConfig(viteConfig, AdapterCon
 
 // src/vite/plugin.ts
 import { fileURLToPath } from "url";
-var __dirname = fileURLToPath(new URL(".", import.meta.url));
+var __dirname = path2.dirname(fileURLToPath(import.meta.url));
 var markoExt = ".marko";
 var POSIX_SEP = "/";
 var WINDOWS_SEP = "\\";
@@ -1307,7 +1306,7 @@ function isMarkoFile(id) {
   return id.endsWith(markoExt);
 }
 function markoRun(opts = {}) {
-  let { routesDir = "src/routes", adapter, ...markoOptions } = opts;
+  let { routesDir, adapter, ...markoVitePluginOptions } = opts;
   let compiler;
   let store;
   let root;
@@ -1341,7 +1340,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)) {
@@ -1414,7 +1413,7 @@ function markoRun(opts = {}) {
       name: "marko-run-vite:pre",
       enforce: "pre",
       async config(config2, env) {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e, _f, _g;
         const externalPluginOptions = getExternalPluginOptions(config2);
         if (externalPluginOptions) {
           opts = mergeConfig(opts, externalPluginOptions);
@@ -1428,11 +1427,11 @@ function markoRun(opts = {}) {
           config2.logLevel !== "silent" && !isBuild || isSSRBuild
         );
         if (adapter) {
-          const externalAdapterConfig = getExternalAdapterOptions(config2);
-          if (externalAdapterConfig && adapter.configure) {
-            adapter.configure(externalAdapterConfig);
-          }
-          const adapterOptions = await ((_b = adapter.pluginOptions) == null ? void 0 : _b.call(adapter, opts));
+          (_b = adapter.configure) == null ? void 0 : _b.call(adapter, {
+            ...getExternalAdapterOptions(config2),
+            root
+          });
+          const adapterOptions = await ((_c = adapter.pluginOptions) == null ? void 0 : _c.call(adapter, opts));
           if (adapterOptions) {
             opts = mergeConfig(opts, adapterOptions);
           }
@@ -1446,16 +1445,19 @@ function markoRun(opts = {}) {
             )
           }
         });
-        store = opts.store || new FileStore(
+        routesDir = opts.routesDir || "src/routes";
+        markoVitePluginOptions.store = store = opts.store || new FileStore(
           `marko-serve-vite-${crypto.createHash("SHA1").update(root).digest("hex")}`
         );
+        markoVitePluginOptions.runtimeId = opts.runtimeId;
+        markoVitePluginOptions.basePathVar = opts.basePathVar;
         resolvedRoutesDir = path2.resolve(root, routesDir);
         typesDir = path2.join(root, ".marko-run");
         devEntryFile = path2.join(root, "index.html");
         devEntryFilePosix = normalizePath(devEntryFile);
-        const assetsDir = ((_c = config2.build) == null ? void 0 : _c.assetsDir) || "assets";
-        let rollupOutputOptions = (_e = (_d = config2.build) == null ? void 0 : _d.rollupOptions) == null ? void 0 : _e.output;
-        if (isBuild && !isSSRBuild) {
+        const assetsDir = ((_d = config2.build) == null ? void 0 : _d.assetsDir) || "assets";
+        let rollupOutputOptions = (_f = (_e = config2.build) == null ? void 0 : _e.rollupOptions) == null ? void 0 : _f.output;
+        if (isBuild) {
           const defaultRollupOutputOptions = {
             assetFileNames({ name }) {
               if (name && name.indexOf("_marko-virtual_id_") < 0) {
@@ -1475,7 +1477,7 @@ function markoRun(opts = {}) {
               }
               return `${assetsDir}/${name || "[name]"}-[hash].js`;
             },
-            chunkFileNames: `${assetsDir}/_[hash].js`
+            chunkFileNames: isSSRBuild ? `_[hash].js` : `${assetsDir}/_[hash].js`
           };
           if (!rollupOutputOptions) {
             rollupOutputOptions = defaultRollupOutputOptions;
@@ -1506,7 +1508,7 @@ function markoRun(opts = {}) {
             }
           }
         };
-        const adapterConfig = await ((_f = adapter == null ? void 0 : adapter.viteConfig) == null ? void 0 : _f.call(adapter, config2));
+        const adapterConfig = await ((_g = adapter == null ? void 0 : adapter.viteConfig) == null ? void 0 : _g.call(adapter, config2));
         if (adapterConfig) {
           pluginConfig = mergeConfig(pluginConfig, adapterConfig);
         }
@@ -1617,12 +1619,7 @@ function markoRun(opts = {}) {
         }
       }
     },
-    ...markoVitePlugin({
-      ...markoOptions,
-      get store() {
-        return store;
-      }
-    }),
+    ...markoVitePlugin(markoVitePluginOptions),
     {
       name: "marko-run-vite:post",
       enforce: "post",
@@ -1743,19 +1740,27 @@ async function ensureDir(dir) {
     await fs2.promises.mkdir(dir, { recursive: true });
   }
 }
+async function getPackageData(dir) {
+  do {
+    const pkgPath = path2.join(dir, "package.json");
+    if (fs2.existsSync(pkgPath)) {
+      return JSON.parse(await fs2.promises.readFile(pkgPath, "utf-8"));
+    }
+  } while (dir !== (dir = path2.dirname(dir)));
+  return null;
+}
 async function resolveAdapter(root, options, log) {
   const { adapter } = options;
   if (adapter !== void 0) {
     return adapter;
   }
-  const { resolvePackageData } = await import("vite");
-  const pkg = resolvePackageData(".", root);
+  const pkg = await getPackageData(root);
   if (pkg) {
-    const dependecies = {
-      ...pkg.data.dependecies,
-      ...pkg.data.devDependencies
-    };
-    for (const name of Object.keys(dependecies)) {
+    let dependecies = pkg.dependencies ? Object.keys(pkg.dependencies) : [];
+    if (pkg.devDependencies) {
+      dependecies = dependecies.concat(Object.keys(pkg.devDependencies));
+    }
+    for (const name of dependecies) {
       if (name.startsWith("@marko/run-adapter") || name.indexOf("marko-run-adapter") !== -1) {
         try {
           const module2 = await import(name);
@@ -1795,7 +1800,7 @@ async function parseEnv(envFile) {
 function loadEnv(envFile) {
   config({ path: envFile });
 }
-async function spawnServer(cmd, args = [], port = 0, env, cwd = process.cwd(), wait = 3e4) {
+async function spawnServer(cmd, args = [], port = 0, env, cwd = process.cwd(), wait = 3e4, stdio = ["ignore", "inherit", "inherit"]) {
   if (port <= 0) {
     port = await getAvailablePort();
   }
@@ -1805,7 +1810,7 @@ async function spawnServer(cmd, args = [], port = 0, env, cwd = process.cwd(), w
   const proc = cp.spawn(cmd, args, {
     cwd,
     shell: true,
-    stdio: "inherit",
+    stdio,
     windowsHide: true,
     env: { ...env, NODE_ENV: "development", ...process.env, PORT: `${port}` }
   });
@@ -1814,7 +1819,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 +1832,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 +1849,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}".`
       );
     }
   }
@@ -1866,6 +1882,7 @@ function sleep(ms) {
 export {
   markoRun as default,
   getAvailablePort,
+  getPackageData,
   isPortInUse,
   loadEnv,
   parseEnv,

package/dist/vite/plugin.d.ts

@@ -1,4 +1,5 @@
 import type { Plugin } from "vite";
-import type { Options, Adapter } from "./types";
+import type { Options, Adapter, PackageData } from "./types";
 export default function markoRun(opts?: Options): Plugin[];
+export declare function getPackageData(dir: string): Promise<PackageData | null>;
 export declare function resolveAdapter(root: string, options: Options, log?: boolean): Promise<Adapter | null>;

package/dist/vite/types.d.ts

@@ -48,6 +48,7 @@ export interface Route {
     meta?: RoutableFile;
     handler?: RoutableFile;
     page?: RoutableFile;
+    entryName: string;
     score: number;
 }
 export interface ParamInfo {
@@ -79,3 +80,9 @@ export interface BuiltRoutes {
     special: SpecialRoutes;
     middleware: RoutableFile[];
 }
+export interface PackageData {
+    name?: string;
+    version?: string;
+    dependencies?: Record<string, string>;
+    devDependencies?: Record<string, string>;
+}

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

@@ -1,5 +1,7 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import { type Socket } from "net";
+import { type ChildProcess, type StdioOptions } from "child_process";
 import { type Worker } from "cluster";
 export interface SpawnedServer {
     port: number;
@@ -7,9 +9,11 @@ export interface SpawnedServer {
 }
 export declare function parseEnv(envFile: string): Promise<import("dotenv").DotenvParseOutput | undefined>;
 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 spawnServer(cmd: string, args?: string[], port?: number, env?: string | Record<string, string>, cwd?: string, wait?: number, stdio?: StdioOptions): 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.12",
   "description": "The Marko application framework.",
   "license": "MIT",
   "homepage": "https://github.com/marko-js/run/tree/main/packages/run",
@@ -112,7 +112,7 @@
     "typescript": "^4.7.4"
   },
   "dependencies": {
-    "@marko/vite": "^2.3.13",
+    "@marko/vite": "^2.4.4",
     "cli-table3": "^0.6.3",
     "compression": "^1.7.4",
     "dotenv": "^16.0.3",