@qwik.dev/router 2.0.0-beta.3 → 2.0.0-beta.31

package/lib/middleware/deno/index.d.ts

@@ -36,6 +36,17 @@ export declare interface QwikRouterDenoOptions extends ServerRenderOptions {
         /** Set the Cache-Control header for all static files */
         cacheControl?: string;
     };
+    /**
+     * Provide a function that computes the origin of the server, used to resolve relative URLs and
+     * validate the request origin against CSRF attacks.
+     *
+     * When not specified, it defaults to the `ORIGIN` environment variable (if set).
+     *
+     * If `ORIGIN` is not set, it's derived from the incoming request, which is not recommended for
+     * production use.
+     */
+    getOrigin?: (request: Request, info?: ServeHandlerInfo) => string | null;
+    /** Provide a function that returns a `ClientConn` for the given request. */
     getClientConn?: (request: Request, info: ServeHandlerInfo) => ClientConn;
 }
 

package/lib/middleware/deno/index.mjs

@@ -1,84 +1,25 @@
-// packages/qwik-router/src/middleware/deno/index.ts
-import { getNotFound } from "@qwik-router-not-found-paths";
-import { isStaticPath } from "@qwik-router-static-paths";
-import { _deserialize, _serialize, _verifySerializable } from "@qwik.dev/core/internal";
-import { setServerPlatform } from "@qwik.dev/core/server";
-import { mergeHeadersCookies, requestHandler } from "../request-handler/index.mjs";
+import { setServerPlatform } from '@qwik.dev/core/server';
+import { isStaticPath, getNotFound, mergeHeadersCookies, requestHandler } from '@qwik.dev/router/middleware/request-handler';
+import { M as MIME_TYPES, n as normalizeRequestUrl } from '../../chunks/url.mjs';
+import { join, fromFileUrl, extname } from 'https://deno.land/std/path/mod.ts';
+import { isDev } from '@qwik.dev/core/build';
 
-// packages/qwik-router/src/middleware/request-handler/mime-types.ts
-var MIME_TYPES = {
-  "3gp": "video/3gpp",
-  "3gpp": "video/3gpp",
-  asf: "video/x-ms-asf",
-  asx: "video/x-ms-asf",
-  avi: "video/x-msvideo",
-  avif: "image/avif",
-  bmp: "image/x-ms-bmp",
-  css: "text/css",
-  flv: "video/x-flv",
-  gif: "image/gif",
-  htm: "text/html",
-  html: "text/html",
-  ico: "image/x-icon",
-  jng: "image/x-jng",
-  jpeg: "image/jpeg",
-  jpg: "image/jpeg",
-  js: "application/javascript",
-  json: "application/json",
-  kar: "audio/midi",
-  m4a: "audio/x-m4a",
-  m4v: "video/x-m4v",
-  mid: "audio/midi",
-  midi: "audio/midi",
-  mng: "video/x-mng",
-  mov: "video/quicktime",
-  mp3: "audio/mpeg",
-  mp4: "video/mp4",
-  mpeg: "video/mpeg",
-  mpg: "video/mpeg",
-  ogg: "audio/ogg",
-  pdf: "application/pdf",
-  png: "image/png",
-  rar: "application/x-rar-compressed",
-  shtml: "text/html",
-  svg: "image/svg+xml",
-  svgz: "image/svg+xml",
-  tif: "image/tiff",
-  tiff: "image/tiff",
-  ts: "video/mp2t",
-  txt: "text/plain",
-  wbmp: "image/vnd.wap.wbmp",
-  webm: "video/webm",
-  webp: "image/webp",
-  wmv: "video/x-ms-wmv",
-  woff: "font/woff",
-  woff2: "font/woff2",
-  xml: "text/xml",
-  zip: "application/zip"
-};
-
-// packages/qwik-router/src/middleware/deno/index.ts
-import { extname, fromFileUrl, join } from "https://deno.land/std/path/mod.ts";
-function createQwikRouter(opts) {
-  var _a;
-  if (opts.qwikCityPlan && !opts.qwikRouterConfig) {
-    console.warn("qwikCityPlan is deprecated. Use qwikRouterConfig instead.");
-    opts.qwikRouterConfig = opts.qwikCityPlan;
-  } else if (!opts.qwikRouterConfig) {
-    throw new Error("qwikRouterConfig is required.");
+function getRequestUrl(request, opts, info) {
+  const url = new URL(request.url);
+  const origin = opts.getOrigin?.(request, info) ?? Deno.env?.get?.("ORIGIN");
+  if (!origin) {
+    return url;
   }
-  const qwikSerializer = {
-    _deserialize,
-    _serialize,
-    _verifySerializable
-  };
+  return normalizeRequestUrl(`${url.pathname}${url.search}${url.hash}`, origin);
+}
+function createQwikRouter(opts) {
   if (opts.manifest) {
     setServerPlatform(opts.manifest);
   }
-  const staticFolder = ((_a = opts.static) == null ? void 0 : _a.root) ?? join(fromFileUrl(import.meta.url), "..", "..", "dist");
+  const staticFolder = opts.static?.root ?? join(fromFileUrl(import.meta.url), "..", "..", "dist");
   async function router(request, info) {
     try {
-      const url = new URL(request.url);
+      const url = getRequestUrl(request, opts, info);
       const serverRequestEv = {
         mode: "server",
         locale: void 0,
@@ -104,11 +45,11 @@ function createQwikRouter(opts) {
           };
         }
       };
-      const handledResponse = await requestHandler(serverRequestEv, opts, qwikSerializer);
+      const handledResponse = await requestHandler(serverRequestEv, opts);
       if (handledResponse) {
-        handledResponse.completion.then((v) => {
-          if (v) {
-            console.error(v);
+        handledResponse.completion.then((completion) => {
+          if (completion) {
+            console.error(completion);
           }
         });
         const response = await handledResponse.response;
@@ -119,25 +60,34 @@ function createQwikRouter(opts) {
       return null;
     } catch (e) {
       console.error(e);
-      return new Response(String(e || "Error"), {
+      return new Response(isDev ? String(e || "Error") : "Internal Server Error", {
         status: 500,
-        headers: { "Content-Type": "text/plain; charset=utf-8", "X-Error": "deno-server" }
+        headers: {
+          "Content-Type": "text/plain; charset=utf-8",
+          "X-Error": "deno-server"
+        }
       });
     }
   }
   const notFound = async (request) => {
     try {
-      const url = new URL(request.url);
-      const notFoundHtml = isStaticPath(request.method || "GET", url) ? "Not Found" : getNotFound(url.pathname);
+      const url = getRequestUrl(request, opts);
+      const notFoundHtml = !request.headers.get("accept")?.includes("text/html") || isStaticPath(request.method || "GET", url) ? "Not Found" : getNotFound(url.pathname);
       return new Response(notFoundHtml, {
         status: 404,
-        headers: { "Content-Type": "text/html; charset=utf-8", "X-Not-Found": url.pathname }
+        headers: {
+          "Content-Type": "text/html; charset=utf-8",
+          "X-Not-Found": url.pathname
+        }
       });
     } catch (e) {
       console.error(e);
-      return new Response(String(e || "Error"), {
+      return new Response(isDev ? String(e || "Error") : "Internal Server Error", {
         status: 500,
-        headers: { "Content-Type": "text/plain; charset=utf-8", "X-Error": "deno-server" }
+        headers: {
+          "Content-Type": "text/plain; charset=utf-8",
+          "X-Error": "deno-server"
+        }
       });
     }
   };
@@ -147,7 +97,7 @@ function createQwikRouter(opts) {
     let filePath;
     if (fileName.includes(".")) {
       filePath = join(staticFolder, pathname);
-    } else if (opts.qwikRouterConfig.trailingSlash) {
+    } else if (!globalThis.__NO_TRAILING_SLASH__) {
       filePath = join(staticFolder, pathname + "index.html");
     } else {
       filePath = join(staticFolder, pathname, "index.html");
@@ -155,13 +105,14 @@ function createQwikRouter(opts) {
     return {
       filePath,
       // @ts-ignore
-      content: await Deno.open(filePath, { read: true })
+      content: await Deno.open(filePath, {
+        read: true
+      })
     };
   };
   const staticFile = async (request) => {
-    var _a2;
     try {
-      const url = new URL(request.url);
+      const url = getRequestUrl(request, opts);
       if (isStaticPath(request.method || "GET", url)) {
         const { filePath, content } = await openStaticFile(url);
         const ext = extname(filePath).replace(/^\./, "");
@@ -169,16 +120,19 @@ function createQwikRouter(opts) {
           status: 200,
           headers: {
             "content-type": MIME_TYPES[ext] || "text/plain; charset=utf-8",
-            "Cache-Control": ((_a2 = opts.static) == null ? void 0 : _a2.cacheControl) || "max-age=3600"
+            "Cache-Control": opts.static?.cacheControl || "max-age=3600"
           }
         });
       }
       return null;
     } catch (e) {
       console.error(e);
-      return new Response(String(e || "Error"), {
+      return new Response(isDev ? String(e || "Error") : "Internal Server Error", {
         status: 500,
-        headers: { "Content-Type": "text/plain; charset=utf-8", "X-Error": "deno-server" }
+        headers: {
+          "Content-Type": "text/plain; charset=utf-8",
+          "X-Error": "deno-server"
+        }
       });
     }
   };
@@ -188,8 +142,6 @@ function createQwikRouter(opts) {
     staticFile
   };
 }
-var createQwikCity = createQwikRouter;
-export {
-  createQwikCity,
-  createQwikRouter
-};
+const createQwikCity = createQwikRouter;
+
+export { createQwikCity, createQwikRouter };

package/lib/middleware/firebase/index.mjs

@@ -1,16 +1,9 @@
-// packages/qwik-router/src/middleware/firebase/index.ts
-import { createQwikRouter as createQwikRouterNode } from "@qwik.dev/router/middleware/node";
+import { createQwikRouter as createQwikRouter$1 } from '@qwik.dev/router/middleware/node';
+
 function createQwikRouter(opts) {
-  if (opts.qwikCityPlan && !opts.qwikRouterConfig) {
-    console.warn("qwikCityPlan is deprecated. Use qwikRouterConfig instead.");
-    opts.qwikRouterConfig = opts.qwikCityPlan;
-  } else if (!opts.qwikRouterConfig) {
-    throw new Error("qwikRouterConfig is required.");
-  }
-  const { staticFile, notFound, router } = createQwikRouterNode({
+  const { staticFile, notFound, router } = createQwikRouter$1({
     render: opts.render,
     manifest: opts.manifest,
-    qwikRouterConfig: opts.qwikRouterConfig,
     static: {
       cacheControl: "public, max-age=31557600"
     },
@@ -29,8 +22,6 @@ function createQwikRouter(opts) {
   };
   return qwikApp;
 }
-var createQwikCity = createQwikRouter;
-export {
-  createQwikCity,
-  createQwikRouter
-};
+const createQwikCity = createQwikRouter;
+
+export { createQwikCity, createQwikRouter };

package/lib/middleware/netlify-edge/index.mjs

@@ -1,21 +1,8 @@
-// packages/qwik-router/src/middleware/netlify-edge/index.ts
-import { getNotFound } from "@qwik-router-not-found-paths";
-import { isStaticPath } from "@qwik-router-static-paths";
-import { _deserialize, _serialize, _verifySerializable } from "@qwik.dev/core/internal";
-import { setServerPlatform } from "@qwik.dev/core/server";
-import { mergeHeadersCookies, requestHandler } from "../request-handler/index.mjs";
+import { setServerPlatform } from '@qwik.dev/core/server';
+import { isStaticPath, mergeHeadersCookies, requestHandler, getNotFound } from '@qwik.dev/router/middleware/request-handler';
+import { isDev } from '@qwik.dev/core/build';
+
 function createQwikRouter(opts) {
-  if (opts.qwikCityPlan && !opts.qwikRouterConfig) {
-    console.warn("qwikCityPlan is deprecated. Use qwikRouterConfig instead.");
-    opts.qwikRouterConfig = opts.qwikCityPlan;
-  } else if (!opts.qwikRouterConfig) {
-    throw new Error("qwikRouterConfig is required.");
-  }
-  const qwikSerializer = {
-    _deserialize,
-    _serialize,
-    _verifySerializable
-  };
   if (opts.manifest) {
     setServerPlatform(opts.manifest);
   }
@@ -41,19 +28,18 @@ function createQwikRouter(opts) {
           return writable;
         },
         getClientConn: () => {
-          var _a;
           return {
             ip: context.ip,
-            country: (_a = context.geo.country) == null ? void 0 : _a.code
+            country: context.geo.country?.code
           };
         },
         platform: context
       };
-      const handledResponse = await requestHandler(serverRequestEv, opts, qwikSerializer);
+      const handledResponse = await requestHandler(serverRequestEv, opts);
       if (handledResponse) {
-        handledResponse.completion.then((v) => {
-          if (v) {
-            console.error(v);
+        handledResponse.completion.then((completion) => {
+          if (completion) {
+            console.error(completion);
           }
         });
         const response = await handledResponse.response;
@@ -61,23 +47,27 @@ function createQwikRouter(opts) {
           return response;
         }
       }
-      const notFoundHtml = isStaticPath(request.method || "GET", url) ? "Not Found" : getNotFound(url.pathname);
+      const notFoundHtml = !request.headers.get("accept")?.includes("text/html") || isStaticPath(request.method || "GET", url) ? "Not Found" : getNotFound(url.pathname);
       return new Response(notFoundHtml, {
         status: 404,
-        headers: { "Content-Type": "text/html; charset=utf-8", "X-Not-Found": url.pathname }
+        headers: {
+          "Content-Type": "text/html; charset=utf-8",
+          "X-Not-Found": url.pathname
+        }
       });
     } catch (e) {
       console.error(e);
-      return new Response(String(e || "Error"), {
+      return new Response(isDev ? String(e || "Error") : "Internal Server Error", {
         status: 500,
-        headers: { "Content-Type": "text/plain; charset=utf-8", "X-Error": "netlify-edge" }
+        headers: {
+          "Content-Type": "text/plain; charset=utf-8",
+          "X-Error": "netlify-edge"
+        }
       });
     }
   }
   return onNetlifyEdgeRequest;
 }
-var createQwikCity = createQwikRouter;
-export {
-  createQwikCity,
-  createQwikRouter
-};
+const createQwikCity = createQwikRouter;
+
+export { createQwikCity, createQwikRouter };

package/lib/middleware/node/index.mjs

@@ -1,71 +1,12 @@
-// packages/qwik-router/src/middleware/node/index.ts
-import { getNotFound } from "@qwik-router-not-found-paths";
-import { isStaticPath } from "@qwik-router-static-paths";
-import { _deserialize, _serialize, _verifySerializable } from "@qwik.dev/core/internal";
-import { setServerPlatform } from "@qwik.dev/core/server";
-import { requestHandler } from "../request-handler/index.mjs";
-import { createReadStream } from "node:fs";
-import { basename, extname, join } from "node:path";
-import { fileURLToPath } from "node:url";
+import { isDev } from '@qwik.dev/core';
+import { setServerPlatform } from '@qwik.dev/core/server';
+import { isStaticPath, getNotFound, requestHandler } from '@qwik.dev/router/middleware/request-handler';
+import { createReadStream } from 'node:fs';
+import { join, basename, extname } from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { n as normalizeRequestUrl, M as MIME_TYPES } from '../../chunks/url.mjs';
+import { Http2ServerRequest } from 'node:http2';
 
-// packages/qwik-router/src/middleware/request-handler/mime-types.ts
-var MIME_TYPES = {
-  "3gp": "video/3gpp",
-  "3gpp": "video/3gpp",
-  asf: "video/x-ms-asf",
-  asx: "video/x-ms-asf",
-  avi: "video/x-msvideo",
-  avif: "image/avif",
-  bmp: "image/x-ms-bmp",
-  css: "text/css",
-  flv: "video/x-flv",
-  gif: "image/gif",
-  htm: "text/html",
-  html: "text/html",
-  ico: "image/x-icon",
-  jng: "image/x-jng",
-  jpeg: "image/jpeg",
-  jpg: "image/jpeg",
-  js: "application/javascript",
-  json: "application/json",
-  kar: "audio/midi",
-  m4a: "audio/x-m4a",
-  m4v: "video/x-m4v",
-  mid: "audio/midi",
-  midi: "audio/midi",
-  mng: "video/x-mng",
-  mov: "video/quicktime",
-  mp3: "audio/mpeg",
-  mp4: "video/mp4",
-  mpeg: "video/mpeg",
-  mpg: "video/mpeg",
-  ogg: "audio/ogg",
-  pdf: "application/pdf",
-  png: "image/png",
-  rar: "application/x-rar-compressed",
-  shtml: "text/html",
-  svg: "image/svg+xml",
-  svgz: "image/svg+xml",
-  tif: "image/tiff",
-  tiff: "image/tiff",
-  ts: "video/mp2t",
-  txt: "text/plain",
-  wbmp: "image/vnd.wap.wbmp",
-  webm: "video/webm",
-  webp: "image/webp",
-  wmv: "video/x-ms-wmv",
-  woff: "font/woff",
-  woff2: "font/woff2",
-  xml: "text/xml",
-  zip: "application/zip"
-};
-
-// packages/qwik-router/src/middleware/node/http.ts
-import { Http2ServerRequest } from "node:http2";
-function computeOrigin(req, opts) {
-  var _a;
-  return ((_a = opts == null ? void 0 : opts.getOrigin) == null ? void 0 : _a.call(opts, req)) ?? (opts == null ? void 0 : opts.origin) ?? process.env.ORIGIN ?? fallbackOrigin(req);
-}
 function fallbackOrigin(req) {
   const { PROTOCOL_HEADER, HOST_HEADER } = process.env;
   const headers = req.headers;
@@ -74,17 +15,22 @@ function fallbackOrigin(req) {
   const host = headers[hostHeader];
   return `${protocol}://${host}`;
 }
-function getUrl(req, origin) {
-  return normalizeUrl(req.originalUrl || req.url || "/", origin);
+function computeOrigin(req, opts) {
+  return opts?.getOrigin?.(req) ?? opts?.origin ?? process.env.ORIGIN ?? fallbackOrigin(req);
 }
 function isIgnoredError(message = "") {
-  const ignoredErrors = ["The stream has been destroyed", "write after end"];
+  const ignoredErrors = [
+    "The stream has been destroyed",
+    "write after end"
+  ];
   return ignoredErrors.some((ignored) => message.includes(ignored));
 }
-var invalidHeadersPattern = /^:(method|scheme|authority|path)$/i;
+const invalidHeadersPattern = /^:(method|scheme|authority|path)$/i;
 function normalizeUrl(url, base) {
-  const DOUBLE_SLASH_REG = /\/\/|\\\\/g;
-  return new URL(url.replace(DOUBLE_SLASH_REG, "/"), base);
+  return normalizeRequestUrl(url, base);
+}
+function getUrl(req, origin) {
+  return normalizeUrl(req.originalUrl || req.url || "/", origin);
 }
 async function fromNodeHttp(url, req, res, mode, getClientConn) {
   const requestHeaders = new Headers();
@@ -172,42 +118,25 @@ async function fromNodeHttp(url, req, res, mode, getClientConn) {
       ssr: true,
       incomingMessage: req,
       node: process.versions.node
-      // Weirdly needed to make typecheck of insights happy
     },
     locale: void 0
   };
   return serverRequestEv;
 }
 
-// packages/qwik-router/src/middleware/node/index.ts
 function createQwikRouter(opts) {
-  var _a;
-  if (opts.qwikCityPlan && !opts.qwikRouterConfig) {
-    console.warn("qwikCityPlan is deprecated. Use qwikRouterConfig instead.");
-    opts.qwikRouterConfig = opts.qwikCityPlan;
-  } else if (!opts.qwikRouterConfig) {
-    throw new Error("qwikRouterConfig is required.");
-  }
-  const qwikSerializer = {
-    _deserialize,
-    _serialize,
-    _verifySerializable
-  };
   if (opts.manifest) {
     setServerPlatform(opts.manifest);
   }
-  const staticFolder = ((_a = opts.static) == null ? void 0 : _a.root) ?? join(fileURLToPath(import.meta.url), "..", "..", "dist");
+  const staticFolder = opts.static?.root ?? join(fileURLToPath(import.meta.url), "..", "..", "dist");
   const router = async (req, res, next) => {
     try {
       const origin = computeOrigin(req, opts);
-      const serverRequestEv = await fromNodeHttp(
-        getUrl(req, origin),
-        req,
-        res,
-        "server",
-        opts.getClientConn
-      );
-      const handled = await requestHandler(serverRequestEv, opts, qwikSerializer);
+      const serverRequestEv = await fromNodeHttp(getUrl(req, origin), req, res, "server", opts.getClientConn);
+      if (isDev && opts.platform) {
+        Object.assign(serverRequestEv.platform, opts.platform);
+      }
+      const handled = await requestHandler(serverRequestEv, opts);
       if (handled) {
         const err = await handled.completion;
         if (err) {
@@ -228,7 +157,7 @@ function createQwikRouter(opts) {
       if (!res.headersSent) {
         const origin = computeOrigin(req, opts);
         const url = getUrl(req, origin);
-        const notFoundHtml = isStaticPath(req.method || "GET", url) ? "Not Found" : getNotFound(url.pathname);
+        const notFoundHtml = !req.headers.accept?.includes("text/html") || isStaticPath(req.method || "GET", url) ? "Not Found" : getNotFound(url.pathname);
         res.writeHead(404, {
           "Content-Type": "text/html; charset=utf-8",
           "X-Not-Found": url.pathname
@@ -241,7 +170,6 @@ function createQwikRouter(opts) {
     }
   };
   const staticFile = async (req, res, next) => {
-    var _a2;
     try {
       const origin = computeOrigin(req, opts);
       const url = getUrl(req, origin);
@@ -250,7 +178,7 @@ function createQwikRouter(opts) {
         let filePath;
         if (basename(pathname).includes(".")) {
           filePath = join(staticFolder, pathname);
-        } else if (opts.qwikRouterConfig.trailingSlash) {
+        } else if (!globalThis.__NO_TRAILING_SLASH__) {
           filePath = join(staticFolder, pathname + "index.html");
         } else {
           filePath = join(staticFolder, pathname, "index.html");
@@ -262,7 +190,7 @@ function createQwikRouter(opts) {
         if (contentType) {
           res.setHeader("Content-Type", contentType);
         }
-        if ((_a2 = opts.static) == null ? void 0 : _a2.cacheControl) {
+        if (opts.static?.cacheControl) {
           res.setHeader("Cache-Control", opts.static.cacheControl);
         }
         stream.pipe(res);
@@ -280,8 +208,6 @@ function createQwikRouter(opts) {
     staticFile
   };
 }
-var createQwikCity = createQwikRouter;
-export {
-  createQwikCity,
-  createQwikRouter
-};
+const createQwikCity = createQwikRouter;
+
+export { createQwikCity, createQwikRouter };