@qwik.dev/router 2.0.0-beta.2 → 2.0.0-beta.21

package/lib/middleware/aws-lambda/index.d.ts

@@ -11,8 +11,9 @@ import { ServerResponse } from 'http';
 declare interface AwsOpt {
     render: Render;
     manifest?: QwikManifest;
-    qwikRouterConfig: QwikRouterConfig;
-    /** @deprecated Use `QwikRouterConfig` instead. Will be removed in V3 */
+    /** @deprecated Not used */
+    qwikRouterConfig?: QwikRouterConfig;
+    /** @deprecated Not used */
     qwikCityPlan?: QwikCityPlan;
 }
 

package/lib/middleware/aws-lambda/index.mjs

@@ -1,14 +1,12 @@
-// packages/qwik-router/src/middleware/aws-lambda/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.");
+    console.warn("qwikCityPlan is deprecated. Simply remove it.");
     opts.qwikRouterConfig = opts.qwikCityPlan;
-  } else if (!opts.qwikRouterConfig) {
-    throw new Error("qwikRouterConfig is required.");
   }
   try {
-    const { router, staticFile, notFound } = createQwikRouterNode({
+    const { router, staticFile, notFound } = createQwikRouter$1({
       render: opts.render,
       qwikRouterConfig: opts.qwikRouterConfig,
       manifest: opts.manifest,
@@ -23,7 +21,7 @@ function createQwikRouter(opts) {
       }
     });
     const fixPath = (pathT) => {
-      if (opts.qwikRouterConfig.trailingSlash) {
+      if (!globalThis.__NO_TRAILING_SLASH__) {
         const url = new URL(pathT, "http://aws-qwik.local");
         if (url.pathname.includes(".", url.pathname.lastIndexOf("/"))) {
           return pathT;
@@ -48,8 +46,6 @@ function createQwikRouter(opts) {
     throw new Error(err.message);
   }
 }
-var createQwikCity = createQwikRouter;
-export {
-  createQwikCity,
-  createQwikRouter
-};
+const createQwikCity = createQwikRouter;
+
+export { createQwikCity, createQwikRouter };

package/lib/middleware/azure-swa/index.mjs

@@ -1,216 +1,12 @@
-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 __commonJS = (cb, mod) => function __require() {
-  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-
-// node_modules/.pnpm/set-cookie-parser@2.6.0/node_modules/set-cookie-parser/lib/set-cookie.js
-var require_set_cookie = __commonJS({
-  "node_modules/.pnpm/set-cookie-parser@2.6.0/node_modules/set-cookie-parser/lib/set-cookie.js"(exports, module) {
-    "use strict";
-    var defaultParseOptions = {
-      decodeValues: true,
-      map: false,
-      silent: false
-    };
-    function isNonEmptyString(str) {
-      return typeof str === "string" && !!str.trim();
-    }
-    function parseString2(setCookieValue, options) {
-      var parts = setCookieValue.split(";").filter(isNonEmptyString);
-      var nameValuePairStr = parts.shift();
-      var parsed = parseNameValuePair(nameValuePairStr);
-      var name = parsed.name;
-      var value = parsed.value;
-      options = options ? Object.assign({}, defaultParseOptions, options) : defaultParseOptions;
-      try {
-        value = options.decodeValues ? decodeURIComponent(value) : value;
-      } catch (e) {
-        console.error(
-          "set-cookie-parser encountered an error while decoding a cookie with value '" + value + "'. Set options.decodeValues to false to disable this feature.",
-          e
-        );
-      }
-      var cookie = {
-        name,
-        value
-      };
-      parts.forEach(function(part) {
-        var sides = part.split("=");
-        var key = sides.shift().trimLeft().toLowerCase();
-        var value2 = sides.join("=");
-        if (key === "expires") {
-          cookie.expires = new Date(value2);
-        } else if (key === "max-age") {
-          cookie.maxAge = parseInt(value2, 10);
-        } else if (key === "secure") {
-          cookie.secure = true;
-        } else if (key === "httponly") {
-          cookie.httpOnly = true;
-        } else if (key === "samesite") {
-          cookie.sameSite = value2;
-        } else {
-          cookie[key] = value2;
-        }
-      });
-      return cookie;
-    }
-    function parseNameValuePair(nameValuePairStr) {
-      var name = "";
-      var value = "";
-      var nameValueArr = nameValuePairStr.split("=");
-      if (nameValueArr.length > 1) {
-        name = nameValueArr.shift();
-        value = nameValueArr.join("=");
-      } else {
-        value = nameValuePairStr;
-      }
-      return { name, value };
-    }
-    function parse(input, options) {
-      options = options ? Object.assign({}, defaultParseOptions, options) : defaultParseOptions;
-      if (!input) {
-        if (!options.map) {
-          return [];
-        } else {
-          return {};
-        }
-      }
-      if (input.headers) {
-        if (typeof input.headers.getSetCookie === "function") {
-          input = input.headers.getSetCookie();
-        } else if (input.headers["set-cookie"]) {
-          input = input.headers["set-cookie"];
-        } else {
-          var sch = input.headers[Object.keys(input.headers).find(function(key) {
-            return key.toLowerCase() === "set-cookie";
-          })];
-          if (!sch && input.headers.cookie && !options.silent) {
-            console.warn(
-              "Warning: set-cookie-parser appears to have been called on a request object. It is designed to parse Set-Cookie headers from responses, not Cookie headers from requests. Set the option {silent: true} to suppress this warning."
-            );
-          }
-          input = sch;
-        }
-      }
-      if (!Array.isArray(input)) {
-        input = [input];
-      }
-      options = options ? Object.assign({}, defaultParseOptions, options) : defaultParseOptions;
-      if (!options.map) {
-        return input.filter(isNonEmptyString).map(function(str) {
-          return parseString2(str, options);
-        });
-      } else {
-        var cookies = {};
-        return input.filter(isNonEmptyString).reduce(function(cookies2, str) {
-          var cookie = parseString2(str, options);
-          cookies2[cookie.name] = cookie;
-          return cookies2;
-        }, cookies);
-      }
-    }
-    function splitCookiesString(cookiesString) {
-      if (Array.isArray(cookiesString)) {
-        return cookiesString;
-      }
-      if (typeof cookiesString !== "string") {
-        return [];
-      }
-      var cookiesStrings = [];
-      var pos = 0;
-      var start;
-      var ch;
-      var lastComma;
-      var nextStart;
-      var cookiesSeparatorFound;
-      function skipWhitespace() {
-        while (pos < cookiesString.length && /\s/.test(cookiesString.charAt(pos))) {
-          pos += 1;
-        }
-        return pos < cookiesString.length;
-      }
-      function notSpecialChar() {
-        ch = cookiesString.charAt(pos);
-        return ch !== "=" && ch !== ";" && ch !== ",";
-      }
-      while (pos < cookiesString.length) {
-        start = pos;
-        cookiesSeparatorFound = false;
-        while (skipWhitespace()) {
-          ch = cookiesString.charAt(pos);
-          if (ch === ",") {
-            lastComma = pos;
-            pos += 1;
-            skipWhitespace();
-            nextStart = pos;
-            while (pos < cookiesString.length && notSpecialChar()) {
-              pos += 1;
-            }
-            if (pos < cookiesString.length && cookiesString.charAt(pos) === "=") {
-              cookiesSeparatorFound = true;
-              pos = nextStart;
-              cookiesStrings.push(cookiesString.substring(start, lastComma));
-              start = pos;
-            } else {
-              pos = lastComma + 1;
-            }
-          } else {
-            pos += 1;
-          }
-        }
-        if (!cookiesSeparatorFound || pos >= cookiesString.length) {
-          cookiesStrings.push(cookiesString.substring(start, cookiesString.length));
-        }
-      }
-      return cookiesStrings;
-    }
-    module.exports = parse;
-    module.exports.parse = parse;
-    module.exports.parseString = parseString2;
-    module.exports.splitCookiesString = splitCookiesString;
-  }
-});
+import { setServerPlatform } from '@qwik.dev/core/server';
+import { requestHandler, isStaticPath, getNotFound } from '@qwik.dev/router/middleware/request-handler';
+import { parseString } from 'set-cookie-parser';
 
-// packages/qwik-router/src/middleware/azure-swa/index.ts
-var import_set_cookie_parser = __toESM(require_set_cookie(), 1);
-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";
 function createQwikRouter(opts) {
   if (opts.qwikCityPlan && !opts.qwikRouterConfig) {
-    console.warn("qwikCityPlan is deprecated. Use qwikRouterConfig instead.");
+    console.warn("qwikCityPlan is deprecated. Simply remove it.");
     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);
   }
@@ -238,7 +34,7 @@ function createQwikRouter(opts) {
             status,
             body: new Uint8Array(),
             headers: {},
-            cookies: cookies.headers().map((header) => (0, import_set_cookie_parser.parseString)(header))
+            cookies: cookies.headers().map((header) => parseString(header))
           };
           headers.forEach((value, key) => response.headers[key] = value);
           return new WritableStream({
@@ -262,7 +58,7 @@ function createQwikRouter(opts) {
           };
         }
       };
-      const handledResponse = await requestHandler(serverRequestEv, opts, qwikSerializer);
+      const handledResponse = await requestHandler(serverRequestEv, opts);
       if (handledResponse) {
         handledResponse.completion.then((err) => {
           if (err) {
@@ -274,7 +70,7 @@ function createQwikRouter(opts) {
           return response;
         }
       }
-      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);
       return {
         status: 404,
         headers: { "Content-Type": "text/html; charset=utf-8", "X-Not-Found": url.pathname },
@@ -290,8 +86,6 @@ function createQwikRouter(opts) {
   }
   return onAzureSwaRequest;
 }
-var createQwikCity = createQwikRouter;
-export {
-  createQwikCity,
-  createQwikRouter
-};
+const createQwikCity = createQwikRouter;
+
+export { createQwikCity, createQwikRouter };

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

@@ -29,6 +29,17 @@ export declare interface QwikRouterBunOptions 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) => string | null;
+    /** Provide a function that returns a `ClientConn` for the given request. */
     getClientConn?: (request: Request) => ClientConn;
 }
 

package/lib/middleware/bun/index.mjs

@@ -1,85 +1,29 @@
-// packages/qwik-router/src/middleware/bun/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 {
-  _TextEncoderStream_polyfill,
-  mergeHeadersCookies,
-  requestHandler
-} from "../request-handler/index.mjs";
-import { extname, join } from "node:path";
+import { setServerPlatform } from '@qwik.dev/core/server';
+import { _TextEncoderStream_polyfill, isStaticPath, getNotFound, mergeHeadersCookies, requestHandler } from '@qwik.dev/router/middleware/request-handler';
+import { join, extname } from 'node:path';
+import { M as MIME_TYPES } from '../../chunks/mime-types.mjs';
 
-// 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/bun/index.ts
+function getRequestUrl(request, opts) {
+  const url = new URL(request.url);
+  const origin = opts.getOrigin?.(request) ?? Bun.env.ORIGIN;
+  if (!origin) {
+    return url;
+  }
+  return new URL(`${url.pathname}${url.search}${url.hash}`, origin);
+}
 function createQwikRouter(opts) {
-  var _a;
   if (opts.qwikCityPlan && !opts.qwikRouterConfig) {
-    console.warn("qwikCityPlan is deprecated. Use qwikRouterConfig instead.");
+    console.warn("qwikCityPlan is deprecated. Simply remove it.");
     opts.qwikRouterConfig = opts.qwikCityPlan;
-  } else if (!opts.qwikRouterConfig) {
-    throw new Error("qwikRouterConfig is required.");
   }
   globalThis.TextEncoderStream ||= _TextEncoderStream_polyfill;
-  const qwikSerializer = { _deserialize, _serialize, _verifySerializable };
   if (opts.manifest) {
     setServerPlatform(opts.manifest);
   }
-  const staticFolder = ((_a = opts.static) == null ? void 0 : _a.root) ?? join(Bun.fileURLToPath(import.meta.url), "..", "..", "dist");
+  const staticFolder = opts.static?.root ?? join(Bun.fileURLToPath(import.meta.url), "..", "..", "dist");
   async function router(request) {
     try {
-      const url = new URL(request.url);
+      const url = getRequestUrl(request, opts);
       const serverRequestEv = {
         mode: "server",
         locale: void 0,
@@ -106,7 +50,7 @@ function createQwikRouter(opts) {
           return opts.getClientConn ? opts.getClientConn(request) : {};
         }
       };
-      const handledResponse = await requestHandler(serverRequestEv, opts, qwikSerializer);
+      const handledResponse = await requestHandler(serverRequestEv, opts);
       if (handledResponse) {
         handledResponse.completion.then((v) => {
           if (v) {
@@ -135,8 +79,8 @@ function createQwikRouter(opts) {
   }
   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 }
@@ -155,7 +99,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");
@@ -166,9 +110,8 @@ function createQwikRouter(opts) {
     };
   };
   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);
         if (!await content.exists()) {
@@ -182,7 +125,7 @@ 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"
           }
         });
       }
@@ -201,8 +144,6 @@ function createQwikRouter(opts) {
     staticFile
   };
 }
-var createQwikCity = createQwikRouter;
-export {
-  createQwikCity,
-  createQwikRouter
-};
+const createQwikCity = createQwikRouter;
+
+export { createQwikCity, createQwikRouter };

package/lib/middleware/cloudflare-pages/index.mjs

@@ -1,26 +1,16 @@
-// packages/qwik-router/src/middleware/cloudflare-pages/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 {
-  _TextEncoderStream_polyfill,
-  mergeHeadersCookies,
-  requestHandler
-} from "../request-handler/index.mjs";
+import { setServerPlatform } from '@qwik.dev/core/server';
+import { _TextEncoderStream_polyfill, isStaticPath, mergeHeadersCookies, requestHandler, getNotFound } from '@qwik.dev/router/middleware/request-handler';
+
 function createQwikRouter(opts) {
   if (opts.qwikCityPlan && !opts.qwikRouterConfig) {
-    console.warn("qwikCityPlan is deprecated. Use qwikRouterConfig instead.");
+    console.warn("qwikCityPlan is deprecated. Simply remove it.");
     opts.qwikRouterConfig = opts.qwikCityPlan;
-  } else if (!opts.qwikRouterConfig) {
-    throw new Error("qwikRouterConfig is required.");
   }
   try {
     new globalThis.TextEncoderStream();
-  } catch (e) {
+  } catch {
     globalThis.TextEncoderStream = _TextEncoderStream_polyfill;
   }
-  const qwikSerializer = { _deserialize, _serialize, _verifySerializable };
   if (opts.manifest) {
     setServerPlatform(opts.manifest);
   }
@@ -70,7 +60,7 @@ function createQwikRouter(opts) {
           ctx
         }
       };
-      const handledResponse = await requestHandler(serverRequestEv, opts, qwikSerializer);
+      const handledResponse = await requestHandler(serverRequestEv, opts);
       if (handledResponse) {
         handledResponse.completion.then((v) => {
           if (v) {
@@ -85,7 +75,7 @@ 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 }
@@ -100,8 +90,6 @@ function createQwikRouter(opts) {
   }
   return onCloudflarePagesFetch;
 }
-var createQwikCity = createQwikRouter;
-export {
-  createQwikCity,
-  createQwikRouter
-};
+const createQwikCity = createQwikRouter;
+
+export { createQwikCity, createQwikRouter };

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;
 }