@marko/run 0.1.14 → 0.1.16

package/dist/adapter/middleware.cjs

@@ -1,7 +1,9 @@
 "use strict";
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -15,6 +17,10 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/adapter/middleware.ts
@@ -22,6 +28,7 @@ var middleware_exports = {};
 __export(middleware_exports, {
   createMiddleware: () => createMiddleware,
   getOrigin: () => getOrigin,
+  getSetCookie_fallback: () => getSetCookie_fallback,
   setResponseHeaders: () => setResponseHeaders
 });
 module.exports = __toCommonJS(middleware_exports);
@@ -31,62 +38,21 @@ var import_url = require("url");
 var __importMetaURL = (0, import_url.pathToFileURL)(__filename);
 
 // src/adapter/polyfill.ts
-var import_web = require("stream/web");
+var webStream = __toESM(require("stream/web"), 1);
 var import_crypto = require("crypto");
-var import_undici = require("undici");
-var import_http = require("http");
-var globals = {
-  crypto: import_crypto.webcrypto,
-  fetch: import_undici.fetch,
-  Response: import_undici.Response,
-  Request: import_undici.Request,
-  Headers: import_undici.Headers,
-  ReadableStream: import_web.ReadableStream,
-  TransformStream: import_web.TransformStream,
-  WritableStream: import_web.WritableStream,
-  FormData: import_undici.FormData,
-  File: import_undici.File
-};
-if (typeof import_http.OutgoingMessage.prototype.appendHeader !== "function") {
-  const messageHeaders = /* @__PURE__ */ new WeakMap();
-  import_http.OutgoingMessage.prototype.appendHeader = function(name, value) {
-    let headers = messageHeaders.get(this);
-    if (!headers) {
-      headers = /* @__PURE__ */ new Map();
-      messageHeaders.set(this, headers);
-    }
-    const key = name.toLowerCase();
-    let existing = headers.get(key);
-    if (existing) {
-      if (Array.isArray(existing)) {
-        existing.push(value);
-      } else {
-        existing = [existing, value];
-      }
-      this.setHeader(name, existing);
-      headers.set(key, existing);
-    } else {
-      this.setHeader(name, value);
-      headers.set(key, value);
-    }
-    return this;
-  };
-}
-function installPolyfills() {
-  for (const name in globals) {
-    if (!(name in globalThis)) {
-      Object.defineProperty(globalThis, name, {
-        enumerable: true,
-        configurable: true,
-        writable: true,
-        value: globals[name]
-      });
-    }
-  }
-}
+var undici = __toESM(require("undici"), 1);
+globalThis.crypto ?? (globalThis.crypto = import_crypto.webcrypto);
+globalThis.fetch ?? (globalThis.fetch = undici.fetch);
+globalThis.Response ?? (globalThis.Response = undici.Response);
+globalThis.Request ?? (globalThis.Request = undici.Request);
+globalThis.Headers ?? (globalThis.Headers = undici.Headers);
+globalThis.ReadableStream ?? (globalThis.ReadableStream = webStream.ReadableStream);
+globalThis.TransformStream ?? (globalThis.TransformStream = webStream.TransformStream);
+globalThis.WritableStream ?? (globalThis.WritableStream = webStream.WritableStream);
+globalThis.FormData ?? (globalThis.FormData = undici.FormData);
+globalThis.File ?? (globalThis.File = undici.File);
 
 // src/adapter/middleware.ts
-installPolyfills();
 function getForwardedHeader(req, name) {
   const value = req.headers["x-forwarded-" + name];
   if (value) {
@@ -97,10 +63,9 @@ function getForwardedHeader(req, name) {
     return value[0];
   }
 }
-function getOrigin(req, protocol, host, trustProxy) {
-  var _a;
-  protocol ?? (protocol = req.protocol || trustProxy && getForwardedHeader(req, "proto") || ((_a = req.socket) == null ? void 0 : _a.encrypted) && "https" || "http");
-  host ?? (host = trustProxy && getForwardedHeader(req, "host") || req.headers.host);
+function getOrigin(req, trustProxy) {
+  const protocol = req.protocol || trustProxy && getForwardedHeader(req, "proto") || (req.socket.encrypted ? "https" : "http");
+  let host = req.headers.host || trustProxy && getForwardedHeader(req, "host");
   if (!host) {
     if (process.env.NODE_ENV !== "production") {
       host = "localhost";
@@ -118,70 +83,116 @@ function getOrigin(req, protocol, host, trustProxy) {
 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);
+    if (key !== "set-cookie") {
+      res.setHeader(key, value);
+    }
+  }
+  const setCookies = getSetCookie(response.headers);
+  if (setCookies == null ? void 0 : setCookies.length) {
+    res.setHeader("set-cookie", setCookies);
+  }
+}
+var getSetCookie = Headers.prototype.getSetCookie ? getSetCookie_platform : getSetCookie_fallback;
+function getSetCookie_platform(headers) {
+  return headers.getSetCookie();
+}
+function getSetCookie_fallback(headers) {
+  const value = headers.get("set-cookie");
+  if (!value)
+    return void 0;
+  let sepIndex = value.indexOf(",") + 1;
+  if (!sepIndex)
+    return value;
+  let index = 0;
+  let setCookie = void 0;
+  let setCookies = void 0;
+  do {
+    const valuePart = value.slice(index, sepIndex - 1);
+    if (!inExpiresDateRgs.test(valuePart)) {
+      if (setCookies) {
+        setCookies.push(valuePart);
+      } else if (setCookie) {
+        setCookies = [setCookie, valuePart];
       } 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));
+        setCookie = valuePart;
       }
-    } else {
-      res.setHeader(key, value);
+      index = sepIndex;
+      while (value.charCodeAt(index) === 32)
+        index++;
     }
+    sepIndex = value.indexOf(",", sepIndex) + 1;
+  } while (sepIndex);
+  if (index) {
+    const valuePart = value.slice(index);
+    if (setCookies) {
+      setCookies.push(valuePart);
+      return setCookies;
+    }
+    return [setCookie, valuePart];
   }
+  return value;
 }
 function createMiddleware(fetch2, options = {}) {
-  const { trustProxy = process.env.TRUST_PROXY === "1", devServer } = options;
-  let { origin = process.env.ORIGIN } = options;
-  let protocol;
-  let host;
-  if (origin) {
-    ({ protocol, host } = new URL(origin));
-    protocol = protocol.slice(0, -1);
-  }
+  const {
+    origin = process.env.ORIGIN,
+    trustProxy = process.env.TRUST_PROXY === "1",
+    devServer
+  } = options;
   return async (req, res, next) => {
-    origin ?? (origin = getOrigin(req, protocol, host, trustProxy));
-    const url = new URL(req.url, origin);
+    const controller = new AbortController();
+    const { signal } = controller;
+    const url = new URL(req.url, origin || getOrigin(req, trustProxy));
     const ip = req.ip || trustProxy && getForwardedHeader(req, "for") || req.socket.remoteAddress || "";
     const headers = req.headers;
-    const body = req.method === "GET" || req.method === "HEAD" ? void 0 : req.socket ? req : new ReadableStream({
-      start(controller) {
-        req.on("data", (chunk) => controller.enqueue(chunk));
-        req.on("end", () => controller.close());
-        req.on("error", (err) => controller.error(err));
-      }
-    });
+    req.on("error", onError);
+    res.on("error", onError);
+    req.socket.on("error", onError);
+    function onError(err) {
+      req.off("error", onError);
+      res.off("error", onError);
+      req.socket.off("error", onError);
+      controller.abort(err);
+    }
+    if (process.env.NODE_ENV !== "production" && devServer) {
+      devServer.ws.on("connection", function onConnection(ws) {
+        devServer.ws.off("connection", onConnection);
+        if (signal.aborted) {
+          sendError();
+        } else {
+          signal.addEventListener("abort", sendError);
+        }
+        function sendError() {
+          const { message, stack = "" } = signal.reason;
+          ws.send(
+            JSON.stringify({
+              type: "error",
+              err: { message, stack }
+            })
+          );
+        }
+      });
+    } else {
+      signal.addEventListener("abort", () => {
+        if (!res.destroyed && res.socket) {
+          res.socket.destroySoon();
+        }
+      });
+    }
     const request = new Request(url, {
       method: req.method,
       headers,
-      body,
-      duplex: "half"
+      body: req.method === "GET" || req.method === "HEAD" ? void 0 : req,
+      duplex: "half",
+      signal
     });
     const response = await fetch2(request, {
       ip,
       request: req,
-      response: res,
-      setCookie(cookie) {
-        res.appendHeader("set-cookie", cookie);
-      }
+      response: res
     });
     if (!response) {
       if (next) {
         next();
-      } else {
-        res.statusCode = 404;
-        res.setHeader("content-length", "0");
-        res.end();
-        return;
       }
       return;
     }
@@ -193,58 +204,35 @@ function createMiddleware(fetch2, options = {}) {
       }
       res.end();
       return;
-    }
-    const reader = response.body.getReader();
-    if (res.destroyed) {
-      reader.cancel();
+    } else if (res.destroyed) {
+      controller.abort(new Error("Response stream destroyed"));
       return;
     }
-    res.on("close", cancel);
-    res.on("error", cancel);
-    write();
-    function cancel(error) {
-      res.off("close", cancel);
-      res.off("error", cancel);
-      reader.cancel(error).catch(() => {
-      });
-      if (error) {
-        if (process.env.NODE_ENV !== "production" && devServer) {
-          res.end();
-          devServer.ws.send({
-            type: "error",
-            err: { message: error.message, stack: error.stack || "" }
-          });
-        } else {
-          res.destroy(error);
-        }
-      }
-    }
-    async function write() {
-      try {
-        while (true) {
-          const { done, value } = await reader.read();
-          if (done) {
-            res.end();
-            return;
-          } else if (!res.write(value)) {
-            res.once("drain", write);
-            return;
-          } else if (res.flush) {
-            res.flush();
-          }
-        }
-      } catch (err) {
-        const error = err instanceof Error ? err : new Error("Error while writing to node response", {
-          cause: err
-        });
-        cancel(error);
+    writeResponse(response.body.getReader(), res, controller);
+  };
+}
+async function writeResponse(reader, res, controller) {
+  try {
+    while (!controller.signal.aborted) {
+      const { done, value } = await reader.read();
+      if (done) {
+        res.end();
+        return;
+      } else if (!res.write(value)) {
+        res.once("drain", () => writeResponse(reader, res, controller));
+        return;
+      } else if (res.flush) {
+        res.flush();
       }
     }
-  };
+  } catch (err) {
+    controller.abort(err);
+  }
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   createMiddleware,
   getOrigin,
+  getSetCookie_fallback,
   setResponseHeaders
 });

package/dist/adapter/middleware.d.ts

@@ -1,29 +1,15 @@
 /// <reference types="node" />
+import "./polyfill";
 import type { Fetch } from "../runtime";
-import type { IncomingMessage, ServerResponse } from "http";
+import type { IncomingMessage, ServerResponse, OutgoingMessage } from "http";
 import type { ViteDevServer } from "vite";
-import { OutgoingMessage } from "http";
-declare module "net" {
-    interface Socket {
-        encrypted?: boolean;
-    }
-}
-declare module "http" {
-    interface IncomingMessage {
-        ip?: string;
-        protocol?: string;
-    }
-}
 export interface NodePlatformInfo {
     ip: string;
     request: IncomingMessage;
     response: ServerResponse;
-    setCookie(cookie: string): void;
 }
 /** Connect/Express style request listener/middleware */
-export type NodeMiddleware = (req: IncomingMessage, res: ServerResponse & {
-    flush?: () => void;
-}, next?: () => void) => void;
+export type NodeMiddleware = (req: IncomingMessage, res: ServerResponse, next?: () => void) => void;
 /** Adapter options */
 export interface NodeAdapterOptions {
     /**
@@ -48,8 +34,9 @@ export interface NodeAdapterOptions {
     trustProxy?: boolean;
     devServer?: ViteDevServer;
 }
-export declare function getOrigin(req: IncomingMessage, protocol?: string, host?: string, trustProxy?: boolean): string;
+export declare function getOrigin(req: IncomingMessage, trustProxy?: boolean): string;
 export declare function setResponseHeaders(response: Response, res: OutgoingMessage): void;
+export declare function getSetCookie_fallback(headers: Headers): string | string[] | undefined;
 /**
  * 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

@@ -1,60 +1,19 @@
 // src/adapter/polyfill.ts
-import { ReadableStream as ReadableStream2, TransformStream, WritableStream } from "stream/web";
-import { webcrypto as crypto } from "crypto";
-import { fetch, Response, Request as Request2, Headers, FormData, File } from "undici";
-import { OutgoingMessage } from "http";
-var globals = {
-  crypto,
-  fetch,
-  Response,
-  Request: Request2,
-  Headers,
-  ReadableStream: ReadableStream2,
-  TransformStream,
-  WritableStream,
-  FormData,
-  File
-};
-if (typeof OutgoingMessage.prototype.appendHeader !== "function") {
-  const messageHeaders = /* @__PURE__ */ new WeakMap();
-  OutgoingMessage.prototype.appendHeader = function(name, value) {
-    let headers = messageHeaders.get(this);
-    if (!headers) {
-      headers = /* @__PURE__ */ new Map();
-      messageHeaders.set(this, headers);
-    }
-    const key = name.toLowerCase();
-    let existing = headers.get(key);
-    if (existing) {
-      if (Array.isArray(existing)) {
-        existing.push(value);
-      } else {
-        existing = [existing, value];
-      }
-      this.setHeader(name, existing);
-      headers.set(key, existing);
-    } else {
-      this.setHeader(name, value);
-      headers.set(key, value);
-    }
-    return this;
-  };
-}
-function installPolyfills() {
-  for (const name in globals) {
-    if (!(name in globalThis)) {
-      Object.defineProperty(globalThis, name, {
-        enumerable: true,
-        configurable: true,
-        writable: true,
-        value: globals[name]
-      });
-    }
-  }
-}
+import * as webStream from "stream/web";
+import { webcrypto } from "crypto";
+import * as undici from "undici";
+globalThis.crypto ?? (globalThis.crypto = webcrypto);
+globalThis.fetch ?? (globalThis.fetch = undici.fetch);
+globalThis.Response ?? (globalThis.Response = undici.Response);
+globalThis.Request ?? (globalThis.Request = undici.Request);
+globalThis.Headers ?? (globalThis.Headers = undici.Headers);
+globalThis.ReadableStream ?? (globalThis.ReadableStream = webStream.ReadableStream);
+globalThis.TransformStream ?? (globalThis.TransformStream = webStream.TransformStream);
+globalThis.WritableStream ?? (globalThis.WritableStream = webStream.WritableStream);
+globalThis.FormData ?? (globalThis.FormData = undici.FormData);
+globalThis.File ?? (globalThis.File = undici.File);
 
 // src/adapter/middleware.ts
-installPolyfills();
 function getForwardedHeader(req, name) {
   const value = req.headers["x-forwarded-" + name];
   if (value) {
@@ -65,10 +24,9 @@ function getForwardedHeader(req, name) {
     return value[0];
   }
 }
-function getOrigin(req, protocol, host, trustProxy) {
-  var _a;
-  protocol ?? (protocol = req.protocol || trustProxy && getForwardedHeader(req, "proto") || ((_a = req.socket) == null ? void 0 : _a.encrypted) && "https" || "http");
-  host ?? (host = trustProxy && getForwardedHeader(req, "host") || req.headers.host);
+function getOrigin(req, trustProxy) {
+  const protocol = req.protocol || trustProxy && getForwardedHeader(req, "proto") || (req.socket.encrypted ? "https" : "http");
+  let host = req.headers.host || trustProxy && getForwardedHeader(req, "host");
   if (!host) {
     if (process.env.NODE_ENV !== "production") {
       host = "localhost";
@@ -86,70 +44,116 @@ function getOrigin(req, protocol, host, trustProxy) {
 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);
+    if (key !== "set-cookie") {
+      res.setHeader(key, value);
+    }
+  }
+  const setCookies = getSetCookie(response.headers);
+  if (setCookies == null ? void 0 : setCookies.length) {
+    res.setHeader("set-cookie", setCookies);
+  }
+}
+var getSetCookie = Headers.prototype.getSetCookie ? getSetCookie_platform : getSetCookie_fallback;
+function getSetCookie_platform(headers) {
+  return headers.getSetCookie();
+}
+function getSetCookie_fallback(headers) {
+  const value = headers.get("set-cookie");
+  if (!value)
+    return void 0;
+  let sepIndex = value.indexOf(",") + 1;
+  if (!sepIndex)
+    return value;
+  let index = 0;
+  let setCookie = void 0;
+  let setCookies = void 0;
+  do {
+    const valuePart = value.slice(index, sepIndex - 1);
+    if (!inExpiresDateRgs.test(valuePart)) {
+      if (setCookies) {
+        setCookies.push(valuePart);
+      } else if (setCookie) {
+        setCookies = [setCookie, valuePart];
       } 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));
+        setCookie = valuePart;
       }
-    } else {
-      res.setHeader(key, value);
+      index = sepIndex;
+      while (value.charCodeAt(index) === 32)
+        index++;
     }
+    sepIndex = value.indexOf(",", sepIndex) + 1;
+  } while (sepIndex);
+  if (index) {
+    const valuePart = value.slice(index);
+    if (setCookies) {
+      setCookies.push(valuePart);
+      return setCookies;
+    }
+    return [setCookie, valuePart];
   }
+  return value;
 }
 function createMiddleware(fetch2, options = {}) {
-  const { trustProxy = process.env.TRUST_PROXY === "1", devServer } = options;
-  let { origin = process.env.ORIGIN } = options;
-  let protocol;
-  let host;
-  if (origin) {
-    ({ protocol, host } = new URL(origin));
-    protocol = protocol.slice(0, -1);
-  }
+  const {
+    origin = process.env.ORIGIN,
+    trustProxy = process.env.TRUST_PROXY === "1",
+    devServer
+  } = options;
   return async (req, res, next) => {
-    origin ?? (origin = getOrigin(req, protocol, host, trustProxy));
-    const url = new URL(req.url, origin);
+    const controller = new AbortController();
+    const { signal } = controller;
+    const url = new URL(req.url, origin || getOrigin(req, trustProxy));
     const ip = req.ip || trustProxy && getForwardedHeader(req, "for") || req.socket.remoteAddress || "";
     const headers = req.headers;
-    const body = req.method === "GET" || req.method === "HEAD" ? void 0 : req.socket ? req : new ReadableStream({
-      start(controller) {
-        req.on("data", (chunk) => controller.enqueue(chunk));
-        req.on("end", () => controller.close());
-        req.on("error", (err) => controller.error(err));
-      }
-    });
+    req.on("error", onError);
+    res.on("error", onError);
+    req.socket.on("error", onError);
+    function onError(err) {
+      req.off("error", onError);
+      res.off("error", onError);
+      req.socket.off("error", onError);
+      controller.abort(err);
+    }
+    if (process.env.NODE_ENV !== "production" && devServer) {
+      devServer.ws.on("connection", function onConnection(ws) {
+        devServer.ws.off("connection", onConnection);
+        if (signal.aborted) {
+          sendError();
+        } else {
+          signal.addEventListener("abort", sendError);
+        }
+        function sendError() {
+          const { message, stack = "" } = signal.reason;
+          ws.send(
+            JSON.stringify({
+              type: "error",
+              err: { message, stack }
+            })
+          );
+        }
+      });
+    } else {
+      signal.addEventListener("abort", () => {
+        if (!res.destroyed && res.socket) {
+          res.socket.destroySoon();
+        }
+      });
+    }
     const request = new Request(url, {
       method: req.method,
       headers,
-      body,
-      duplex: "half"
+      body: req.method === "GET" || req.method === "HEAD" ? void 0 : req,
+      duplex: "half",
+      signal
     });
     const response = await fetch2(request, {
       ip,
       request: req,
-      response: res,
-      setCookie(cookie) {
-        res.appendHeader("set-cookie", cookie);
-      }
+      response: res
     });
     if (!response) {
       if (next) {
         next();
-      } else {
-        res.statusCode = 404;
-        res.setHeader("content-length", "0");
-        res.end();
-        return;
       }
       return;
     }
@@ -161,57 +165,34 @@ function createMiddleware(fetch2, options = {}) {
       }
       res.end();
       return;
-    }
-    const reader = response.body.getReader();
-    if (res.destroyed) {
-      reader.cancel();
+    } else if (res.destroyed) {
+      controller.abort(new Error("Response stream destroyed"));
       return;
     }
-    res.on("close", cancel);
-    res.on("error", cancel);
-    write();
-    function cancel(error) {
-      res.off("close", cancel);
-      res.off("error", cancel);
-      reader.cancel(error).catch(() => {
-      });
-      if (error) {
-        if (process.env.NODE_ENV !== "production" && devServer) {
-          res.end();
-          devServer.ws.send({
-            type: "error",
-            err: { message: error.message, stack: error.stack || "" }
-          });
-        } else {
-          res.destroy(error);
-        }
-      }
-    }
-    async function write() {
-      try {
-        while (true) {
-          const { done, value } = await reader.read();
-          if (done) {
-            res.end();
-            return;
-          } else if (!res.write(value)) {
-            res.once("drain", write);
-            return;
-          } else if (res.flush) {
-            res.flush();
-          }
-        }
-      } catch (err) {
-        const error = err instanceof Error ? err : new Error("Error while writing to node response", {
-          cause: err
-        });
-        cancel(error);
+    writeResponse(response.body.getReader(), res, controller);
+  };
+}
+async function writeResponse(reader, res, controller) {
+  try {
+    while (!controller.signal.aborted) {
+      const { done, value } = await reader.read();
+      if (done) {
+        res.end();
+        return;
+      } else if (!res.write(value)) {
+        res.once("drain", () => writeResponse(reader, res, controller));
+        return;
+      } else if (res.flush) {
+        res.flush();
       }
     }
-  };
+  } catch (err) {
+    controller.abort(err);
+  }
 }
 export {
   createMiddleware,
   getOrigin,
+  getSetCookie_fallback,
   setResponseHeaders
 };

package/dist/adapter/polyfill.d.ts

@@ -1,6 +1,6 @@
-declare module 'http' {
-    interface OutgoingMessage {
-        appendHeader(this: OutgoingMessage, name: string, value: string): this;
+declare global {
+    interface Headers {
+        getSetCookie: () => string[];
     }
 }
-export declare function installPolyfills(): void;
+export {};

package/dist/vite/index.cjs

@@ -55,7 +55,6 @@ var virtualRoutesPrefix = `${virtualFilePrefix}/routes`;
 var virtualRuntimePrefix = `${virtualFilePrefix}/internal`;
 var httpVerbs = ["get", "post", "put", "delete"];
 var serverEntryQuery = "?marko-server-entry";
-var browserEntryQuery = "?marko-browser-entry";
 var RoutableFileTypes = {
   Page: "page",
   Layout: "layout",
@@ -73,9 +72,6 @@ var routeableFileRegex = new RegExp(
   `^[+](?:${markoFiles}|${nonMarkoFiles})$`,
   "i"
 );
-function isRoutableFile(filename) {
-  return routeableFileRegex.test(filename);
-}
 function matchRoutableFile(filename) {
   const match = filename.match(routeableFileRegex);
   return match && (match[1] || match[3]).toLowerCase();
@@ -750,7 +746,7 @@ const page404ResponseInit = {
   if (routes.special[RoutableFileTypes.Error]) {
     imports.writeLines(`
 const page500ResponseInit = {
-  status: 404,
+  status: 500,
   headers: { "content-type": "text/html;charset=UTF-8" },
 };`);
     writer.writeBlockStart(
@@ -1341,13 +1337,9 @@ var getExternalAdapterOptions = (viteConfig) => getConfig(viteConfig, AdapterCon
 // src/vite/plugin.ts
 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 = "\\";
 var normalizePath = import_path2.default.sep === WINDOWS_SEP ? (id) => id.replace(/\\/g, POSIX_SEP) : (id) => id;
-function isMarkoFile(id) {
-  return id.endsWith(markoExt);
-}
 function markoRun(opts = {}) {
   let { routesDir, adapter, ...markoVitePluginOptions } = opts;
   let compiler;
@@ -1578,15 +1570,14 @@ function markoRun(opts = {}) {
       configureServer(_server) {
         devServer = _server;
         devServer.watcher.on("all", async (type, filename) => {
-          const file = import_path2.default.parse(filename);
-          if (filename.startsWith(resolvedRoutesDir) && isRoutableFile(file.base)) {
+          const routableFileType = matchRoutableFile(import_path2.default.parse(filename).base);
+          if (filename.startsWith(resolvedRoutesDir) && routableFileType) {
             if (type === "add") {
               isStale = true;
             } else if (type === "unlink") {
               isStale = true;
             } else if (type === "change") {
-              const match = matchRoutableFile(file.base);
-              if (match === RoutableFileTypes.Handler) {
+              if (routableFileType === RoutableFileTypes.Handler) {
                 isStale = true;
               }
             }
@@ -1621,7 +1612,7 @@ function markoRun(opts = {}) {
           extractVerbs = isBuild ? getVerbsFromFileBuild.bind(null, this) : getVerbsFromFileDev.bind(null, devServer);
         }
       },
-      async resolveId(importee, importer, { ssr }) {
+      async resolveId(importee, importer) {
         let resolved;
         if (importee.startsWith(virtualRuntimePrefix)) {
           return this.resolve(
@@ -1643,16 +1634,13 @@ function markoRun(opts = {}) {
         }
         if (virtualFiles.has(importee)) {
           resolved = importee;
-          if (!ssr && isMarkoFile(resolved)) {
-            resolved += browserEntryQuery;
-          }
         }
         return resolved || null;
       },
       async load(id) {
         var _a;
-        if (id.endsWith(browserEntryQuery)) {
-          id = id.slice(0, -browserEntryQuery.length);
+        if (id.endsWith(serverEntryQuery)) {
+          id = id.slice(0, -serverEntryQuery.length);
         }
         if (virtualFiles.has(id)) {
           if (!isRendered) {

package/dist/vite/index.js

@@ -13,7 +13,6 @@ var virtualRoutesPrefix = `${virtualFilePrefix}/routes`;
 var virtualRuntimePrefix = `${virtualFilePrefix}/internal`;
 var httpVerbs = ["get", "post", "put", "delete"];
 var serverEntryQuery = "?marko-server-entry";
-var browserEntryQuery = "?marko-browser-entry";
 var RoutableFileTypes = {
   Page: "page",
   Layout: "layout",
@@ -31,9 +30,6 @@ var routeableFileRegex = new RegExp(
   `^[+](?:${markoFiles}|${nonMarkoFiles})$`,
   "i"
 );
-function isRoutableFile(filename) {
-  return routeableFileRegex.test(filename);
-}
 function matchRoutableFile(filename) {
   const match = filename.match(routeableFileRegex);
   return match && (match[1] || match[3]).toLowerCase();
@@ -708,7 +704,7 @@ const page404ResponseInit = {
   if (routes.special[RoutableFileTypes.Error]) {
     imports.writeLines(`
 const page500ResponseInit = {
-  status: 404,
+  status: 500,
   headers: { "content-type": "text/html;charset=UTF-8" },
 };`);
     writer.writeBlockStart(
@@ -1299,13 +1295,9 @@ var getExternalAdapterOptions = (viteConfig) => getConfig(viteConfig, AdapterCon
 // src/vite/plugin.ts
 import { fileURLToPath } from "url";
 var __dirname = path2.dirname(fileURLToPath(import.meta.url));
-var markoExt = ".marko";
 var POSIX_SEP = "/";
 var WINDOWS_SEP = "\\";
 var normalizePath = path2.sep === WINDOWS_SEP ? (id) => id.replace(/\\/g, POSIX_SEP) : (id) => id;
-function isMarkoFile(id) {
-  return id.endsWith(markoExt);
-}
 function markoRun(opts = {}) {
   let { routesDir, adapter, ...markoVitePluginOptions } = opts;
   let compiler;
@@ -1536,15 +1528,14 @@ function markoRun(opts = {}) {
       configureServer(_server) {
         devServer = _server;
         devServer.watcher.on("all", async (type, filename) => {
-          const file = path2.parse(filename);
-          if (filename.startsWith(resolvedRoutesDir) && isRoutableFile(file.base)) {
+          const routableFileType = matchRoutableFile(path2.parse(filename).base);
+          if (filename.startsWith(resolvedRoutesDir) && routableFileType) {
             if (type === "add") {
               isStale = true;
             } else if (type === "unlink") {
               isStale = true;
             } else if (type === "change") {
-              const match = matchRoutableFile(file.base);
-              if (match === RoutableFileTypes.Handler) {
+              if (routableFileType === RoutableFileTypes.Handler) {
                 isStale = true;
               }
             }
@@ -1579,7 +1570,7 @@ function markoRun(opts = {}) {
           extractVerbs = isBuild ? getVerbsFromFileBuild.bind(null, this) : getVerbsFromFileDev.bind(null, devServer);
         }
       },
-      async resolveId(importee, importer, { ssr }) {
+      async resolveId(importee, importer) {
         let resolved;
         if (importee.startsWith(virtualRuntimePrefix)) {
           return this.resolve(
@@ -1601,16 +1592,13 @@ function markoRun(opts = {}) {
         }
         if (virtualFiles.has(importee)) {
           resolved = importee;
-          if (!ssr && isMarkoFile(resolved)) {
-            resolved += browserEntryQuery;
-          }
         }
         return resolved || null;
       },
       async load(id) {
         var _a;
-        if (id.endsWith(browserEntryQuery)) {
-          id = id.slice(0, -browserEntryQuery.length);
+        if (id.endsWith(serverEntryQuery)) {
+          id = id.slice(0, -serverEntryQuery.length);
         }
         if (virtualFiles.has(id)) {
           if (!isRendered) {

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

@@ -1,5 +1,6 @@
 /// <reference types="node" />
 /// <reference types="node" />
+/// <reference types="node" />
 import { type Socket } from "net";
 import { type ChildProcess, type StdioOptions } from "child_process";
 import { type Worker } from "cluster";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marko/run",
-  "version": "0.1.14",
+  "version": "0.1.16",
   "description": "The Marko application framework.",
   "license": "MIT",
   "homepage": "https://github.com/marko-js/run/tree/main/packages/run",
@@ -94,7 +94,7 @@
     "@types/human-format": "^1.0.0",
     "@types/jsdom": "^21.1.0",
     "@types/mocha": "^9.1.1",
-    "@types/node": "^18.11.18",
+    "@types/node": "^20.3.1",
     "acorn": "^8.8.0",
     "cross-env": "^7.0.3",
     "esbuild": "^0.15.7",
@@ -112,7 +112,7 @@
     "typescript": "^4.7.4"
   },
   "dependencies": {
-    "@marko/vite": "^2.4.6",
+    "@marko/vite": "^2.4.8",
     "cli-table3": "^0.6.3",
     "compression": "^1.7.4",
     "dotenv": "^16.0.3",