@qwik.dev/router 2.0.0-beta.10 → 2.0.0-beta.13

package/lib/middleware/deno/index.mjs

@@ -1,148 +1,129 @@
-import { setServerPlatform as w } from "@qwik.dev/core/server";
-import { mergeHeadersCookies as C, requestHandler as y, isStaticPath as c, getNotFound as R } from "@qwik.dev/router/middleware/request-handler";
-import { join as m, fromFileUrl as b, extname as S } from "https://deno.land/std/path/mod.ts";
-const j = {
-  "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"
-};
-function E(n) {
-  n.qwikCityPlan && !n.qwikRouterConfig && (console.warn("qwikCityPlan is deprecated. Simply remove it."), n.qwikRouterConfig = n.qwikCityPlan), n.manifest && w(n.manifest);
-  const l = n.static?.root ?? m(b(import.meta.url), "..", "..", "dist");
-  async function p(t, e) {
+import { setServerPlatform } from "@qwik.dev/core/server";
+import { isStaticPath, getNotFound, mergeHeadersCookies, requestHandler } from "@qwik.dev/router/middleware/request-handler";
+import { M as MIME_TYPES } from "../../chunks/mime-types.mjs";
+import { join, fromFileUrl, extname } from "https://deno.land/std/path/mod.ts";
+function createQwikRouter(opts) {
+  if (opts.qwikCityPlan && !opts.qwikRouterConfig) {
+    console.warn("qwikCityPlan is deprecated. Simply remove it.");
+    opts.qwikRouterConfig = opts.qwikCityPlan;
+  }
+  if (opts.manifest) {
+    setServerPlatform(opts.manifest);
+  }
+  const staticFolder = opts.static?.root ?? join(fromFileUrl(import.meta.url), "..", "..", "dist");
+  async function router(request, info) {
     try {
-      const i = {
+      const url = new URL(request.url);
+      const serverRequestEv = {
         mode: "server",
         locale: void 0,
-        url: new URL(t.url),
+        url,
         // @ts-ignore
         env: Deno.env,
-        request: t,
-        getWritableStream: (a, s, g, u) => {
-          const { readable: v, writable: h } = new TransformStream(), x = new Response(v, {
-            status: a,
-            headers: C(s, g)
+        request,
+        getWritableStream: (status, headers, cookies, resolve) => {
+          const { readable, writable } = new TransformStream();
+          const response = new Response(readable, {
+            status,
+            headers: mergeHeadersCookies(headers, cookies)
           });
-          return u(x), h;
+          resolve(response);
+          return writable;
         },
         platform: {
-          ssr: !0
+          ssr: true
         },
-        getClientConn: () => n.getClientConn ? n.getClientConn(t, e) : {
-          ip: e.remoteAddr.hostname
+        getClientConn: () => {
+          return opts.getClientConn ? opts.getClientConn(request, info) : {
+            ip: info.remoteAddr.hostname
+          };
         }
-      }, r = await y(i, n);
-      if (r) {
-        r.completion.then((s) => {
-          s && console.error(s);
+      };
+      const handledResponse = await requestHandler(serverRequestEv, opts);
+      if (handledResponse) {
+        handledResponse.completion.then((v) => {
+          if (v) {
+            console.error(v);
+          }
         });
-        const a = await r.response;
-        if (a)
-          return a;
+        const response = await handledResponse.response;
+        if (response) {
+          return response;
+        }
       }
       return null;
-    } catch (o) {
-      return console.error(o), new Response(String(o || "Error"), {
+    } catch (e) {
+      console.error(e);
+      return new Response(String(e || "Error"), {
         status: 500,
         headers: { "Content-Type": "text/plain; charset=utf-8", "X-Error": "deno-server" }
       });
     }
   }
-  const d = async (t) => {
+  const notFound = async (request) => {
     try {
-      const e = new URL(t.url), o = !t.headers.get("accept")?.includes("text/html") || c(t.method || "GET", e) ? "Not Found" : R(e.pathname);
-      return new Response(o, {
+      const url = new URL(request.url);
+      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": e.pathname }
+        headers: { "Content-Type": "text/html; charset=utf-8", "X-Not-Found": url.pathname }
       });
     } catch (e) {
-      return console.error(e), new Response(String(e || "Error"), {
+      console.error(e);
+      return new Response(String(e || "Error"), {
         status: 500,
         headers: { "Content-Type": "text/plain; charset=utf-8", "X-Error": "deno-server" }
       });
     }
-  }, f = async (t) => {
-    const e = t.pathname, o = e.slice(t.pathname.lastIndexOf("/"));
-    let i;
-    return o.includes(".") ? i = m(l, e) : globalThis.__NO_TRAILING_SLASH__ ? i = m(l, e, "index.html") : i = m(l, e + "index.html"), {
-      filePath: i,
+  };
+  const openStaticFile = async (url) => {
+    const pathname = url.pathname;
+    const fileName = pathname.slice(url.pathname.lastIndexOf("/"));
+    let filePath;
+    if (fileName.includes(".")) {
+      filePath = join(staticFolder, pathname);
+    } else if (!globalThis.__NO_TRAILING_SLASH__) {
+      filePath = join(staticFolder, pathname + "index.html");
+    } else {
+      filePath = join(staticFolder, pathname, "index.html");
+    }
+    return {
+      filePath,
       // @ts-ignore
-      content: await Deno.open(i, { read: !0 })
+      content: await Deno.open(filePath, { read: true })
     };
   };
-  return {
-    router: p,
-    notFound: d,
-    staticFile: async (t) => {
-      try {
-        const e = new URL(t.url);
-        if (c(t.method || "GET", e)) {
-          const { filePath: o, content: i } = await f(e), r = S(o).replace(/^\./, "");
-          return new Response(i.readable, {
-            status: 200,
-            headers: {
-              "content-type": j[r] || "text/plain; charset=utf-8",
-              "Cache-Control": n.static?.cacheControl || "max-age=3600"
-            }
-          });
-        }
-        return null;
-      } catch (e) {
-        return console.error(e), new Response(String(e || "Error"), {
-          status: 500,
-          headers: { "Content-Type": "text/plain; charset=utf-8", "X-Error": "deno-server" }
+  const staticFile = async (request) => {
+    try {
+      const url = new URL(request.url);
+      if (isStaticPath(request.method || "GET", url)) {
+        const { filePath, content } = await openStaticFile(url);
+        const ext = extname(filePath).replace(/^\./, "");
+        return new Response(content.readable, {
+          status: 200,
+          headers: {
+            "content-type": MIME_TYPES[ext] || "text/plain; charset=utf-8",
+            "Cache-Control": opts.static?.cacheControl || "max-age=3600"
+          }
         });
       }
+      return null;
+    } catch (e) {
+      console.error(e);
+      return new Response(String(e || "Error"), {
+        status: 500,
+        headers: { "Content-Type": "text/plain; charset=utf-8", "X-Error": "deno-server" }
+      });
     }
   };
+  return {
+    router,
+    notFound,
+    staticFile
+  };
 }
-const _ = E;
+const createQwikCity = createQwikRouter;
 export {
-  _ as createQwikCity,
-  E as createQwikRouter
+  createQwikCity,
+  createQwikRouter
 };

package/lib/middleware/firebase/index.cjs

@@ -1 +1,33 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const c=require("@qwik.dev/router/middleware/node");function r(e){e.qwikCityPlan&&!e.qwikRouterConfig&&(console.warn("qwikCityPlan is deprecated. Simply remove it."),e.qwikRouterConfig=e.qwikCityPlan);const{staticFile:n,notFound:o,router:a}=c.createQwikRouter({render:e.render,manifest:e.manifest,qwikRouterConfig:e.qwikRouterConfig,static:{cacheControl:"public, max-age=31557600"},getOrigin(i){return process.env.IS_OFFLINE?`http://${i.headers.host}`:null}});return(i,t)=>n(i,t,()=>{a(i,t,()=>o(i,t,()=>{}))})}const u=r;exports.createQwikCity=u;exports.createQwikRouter=r;
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const node = require("@qwik.dev/router/middleware/node");
+function createQwikRouter(opts) {
+  if (opts.qwikCityPlan && !opts.qwikRouterConfig) {
+    console.warn("qwikCityPlan is deprecated. Simply remove it.");
+    opts.qwikRouterConfig = opts.qwikCityPlan;
+  }
+  const { staticFile, notFound, router } = node.createQwikRouter({
+    render: opts.render,
+    manifest: opts.manifest,
+    qwikRouterConfig: opts.qwikRouterConfig,
+    static: {
+      cacheControl: "public, max-age=31557600"
+    },
+    getOrigin(req) {
+      if (process.env.IS_OFFLINE) {
+        return `http://${req.headers.host}`;
+      }
+      return null;
+    }
+  });
+  const qwikApp = (req, res) => {
+    return staticFile(req, res, () => {
+      router(req, res, () => notFound(req, res, () => {
+      }));
+    });
+  };
+  return qwikApp;
+}
+const createQwikCity = createQwikRouter;
+exports.createQwikCity = createQwikCity;
+exports.createQwikRouter = createQwikRouter;

package/lib/middleware/firebase/index.mjs

@@ -1,24 +1,33 @@
-import { createQwikRouter as a } from "@qwik.dev/router/middleware/node";
-function c(e) {
-  e.qwikCityPlan && !e.qwikRouterConfig && (console.warn("qwikCityPlan is deprecated. Simply remove it."), e.qwikRouterConfig = e.qwikCityPlan);
-  const { staticFile: r, notFound: n, router: o } = a({
-    render: e.render,
-    manifest: e.manifest,
-    qwikRouterConfig: e.qwikRouterConfig,
+import { createQwikRouter as createQwikRouter$1 } from "@qwik.dev/router/middleware/node";
+function createQwikRouter(opts) {
+  if (opts.qwikCityPlan && !opts.qwikRouterConfig) {
+    console.warn("qwikCityPlan is deprecated. Simply remove it.");
+    opts.qwikRouterConfig = opts.qwikCityPlan;
+  }
+  const { staticFile, notFound, router } = createQwikRouter$1({
+    render: opts.render,
+    manifest: opts.manifest,
+    qwikRouterConfig: opts.qwikRouterConfig,
     static: {
       cacheControl: "public, max-age=31557600"
     },
-    getOrigin(i) {
-      return process.env.IS_OFFLINE ? `http://${i.headers.host}` : null;
+    getOrigin(req) {
+      if (process.env.IS_OFFLINE) {
+        return `http://${req.headers.host}`;
+      }
+      return null;
     }
   });
-  return (i, t) => r(i, t, () => {
-    o(i, t, () => n(i, t, () => {
-    }));
-  });
+  const qwikApp = (req, res) => {
+    return staticFile(req, res, () => {
+      router(req, res, () => notFound(req, res, () => {
+      }));
+    });
+  };
+  return qwikApp;
 }
-const k = c;
+const createQwikCity = createQwikRouter;
 export {
-  k as createQwikCity,
-  c as createQwikRouter
+  createQwikCity,
+  createQwikRouter
 };

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

@@ -1 +1,71 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const p=require("@qwik.dev/core/server"),n=require("@qwik.dev/router/middleware/request-handler");function c(t){t.qwikCityPlan&&!t.qwikRouterConfig&&(console.warn("qwikCityPlan is deprecated. Simply remove it."),t.qwikRouterConfig=t.qwikCityPlan),t.manifest&&p.setServerPlatform(t.manifest);async function l(r,o){try{const e=new URL(r.url);if(n.isStaticPath(r.method,e)||e.pathname.startsWith("/.netlify"))return o.next();const u={mode:"server",locale:void 0,url:e,env:Deno.env,request:r,getWritableStream:(i,a,f,m)=>{const{readable:h,writable:w}=new TransformStream,y=new Response(h,{status:i,headers:n.mergeHeadersCookies(a,f)});return m(y),w},getClientConn:()=>({ip:o.ip,country:o.geo.country?.code}),platform:o},s=await n.requestHandler(u,t);if(s){s.completion.then(a=>{a&&console.error(a)});const i=await s.response;if(i)return i}const d=!r.headers.get("accept")?.includes("text/html")||n.isStaticPath(r.method||"GET",e)?"Not Found":n.getNotFound(e.pathname);return new Response(d,{status:404,headers:{"Content-Type":"text/html; charset=utf-8","X-Not-Found":e.pathname}})}catch(e){return console.error(e),new Response(String(e||"Error"),{status:500,headers:{"Content-Type":"text/plain; charset=utf-8","X-Error":"netlify-edge"}})}}return l}const g=c;exports.createQwikCity=g;exports.createQwikRouter=c;
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const server = require("@qwik.dev/core/server");
+const requestHandler = require("@qwik.dev/router/middleware/request-handler");
+function createQwikRouter(opts) {
+  if (opts.qwikCityPlan && !opts.qwikRouterConfig) {
+    console.warn("qwikCityPlan is deprecated. Simply remove it.");
+    opts.qwikRouterConfig = opts.qwikCityPlan;
+  }
+  if (opts.manifest) {
+    server.setServerPlatform(opts.manifest);
+  }
+  async function onNetlifyEdgeRequest(request, context) {
+    try {
+      const url = new URL(request.url);
+      if (requestHandler.isStaticPath(request.method, url) || url.pathname.startsWith("/.netlify")) {
+        return context.next();
+      }
+      const serverRequestEv = {
+        mode: "server",
+        locale: void 0,
+        url,
+        env: Deno.env,
+        request,
+        getWritableStream: (status, headers, cookies, resolve) => {
+          const { readable, writable } = new TransformStream();
+          const response = new Response(readable, {
+            status,
+            headers: requestHandler.mergeHeadersCookies(headers, cookies)
+          });
+          resolve(response);
+          return writable;
+        },
+        getClientConn: () => {
+          return {
+            ip: context.ip,
+            country: context.geo.country?.code
+          };
+        },
+        platform: context
+      };
+      const handledResponse = await requestHandler.requestHandler(serverRequestEv, opts);
+      if (handledResponse) {
+        handledResponse.completion.then((v) => {
+          if (v) {
+            console.error(v);
+          }
+        });
+        const response = await handledResponse.response;
+        if (response) {
+          return response;
+        }
+      }
+      const notFoundHtml = !request.headers.get("accept")?.includes("text/html") || requestHandler.isStaticPath(request.method || "GET", url) ? "Not Found" : requestHandler.getNotFound(url.pathname);
+      return new Response(notFoundHtml, {
+        status: 404,
+        headers: { "Content-Type": "text/html; charset=utf-8", "X-Not-Found": url.pathname }
+      });
+    } catch (e) {
+      console.error(e);
+      return new Response(String(e || "Error"), {
+        status: 500,
+        headers: { "Content-Type": "text/plain; charset=utf-8", "X-Error": "netlify-edge" }
+      });
+    }
+  }
+  return onNetlifyEdgeRequest;
+}
+const createQwikCity = createQwikRouter;
+exports.createQwikCity = createQwikCity;
+exports.createQwikRouter = createQwikRouter;

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

@@ -1,55 +1,71 @@
-import { setServerPlatform as w } from "@qwik.dev/core/server";
-import { isStaticPath as s, mergeHeadersCookies as y, requestHandler as g, getNotFound as C } from "@qwik.dev/router/middleware/request-handler";
-function R(t) {
-  t.qwikCityPlan && !t.qwikRouterConfig && (console.warn("qwikCityPlan is deprecated. Simply remove it."), t.qwikRouterConfig = t.qwikCityPlan), t.manifest && w(t.manifest);
-  async function l(n, r) {
+import { setServerPlatform } from "@qwik.dev/core/server";
+import { isStaticPath, mergeHeadersCookies, requestHandler, getNotFound } from "@qwik.dev/router/middleware/request-handler";
+function createQwikRouter(opts) {
+  if (opts.qwikCityPlan && !opts.qwikRouterConfig) {
+    console.warn("qwikCityPlan is deprecated. Simply remove it.");
+    opts.qwikRouterConfig = opts.qwikCityPlan;
+  }
+  if (opts.manifest) {
+    setServerPlatform(opts.manifest);
+  }
+  async function onNetlifyEdgeRequest(request, context) {
     try {
-      const e = new URL(n.url);
-      if (s(n.method, e) || e.pathname.startsWith("/.netlify"))
-        return r.next();
-      const c = {
+      const url = new URL(request.url);
+      if (isStaticPath(request.method, url) || url.pathname.startsWith("/.netlify")) {
+        return context.next();
+      }
+      const serverRequestEv = {
         mode: "server",
         locale: void 0,
-        url: e,
+        url,
         env: Deno.env,
-        request: n,
-        getWritableStream: (o, a, u, d) => {
-          const { readable: f, writable: h } = new TransformStream(), p = new Response(f, {
-            status: o,
-            headers: y(a, u)
+        request,
+        getWritableStream: (status, headers, cookies, resolve) => {
+          const { readable, writable } = new TransformStream();
+          const response = new Response(readable, {
+            status,
+            headers: mergeHeadersCookies(headers, cookies)
           });
-          return d(p), h;
+          resolve(response);
+          return writable;
+        },
+        getClientConn: () => {
+          return {
+            ip: context.ip,
+            country: context.geo.country?.code
+          };
         },
-        getClientConn: () => ({
-          ip: r.ip,
-          country: r.geo.country?.code
-        }),
-        platform: r
-      }, i = await g(c, t);
-      if (i) {
-        i.completion.then((a) => {
-          a && console.error(a);
+        platform: context
+      };
+      const handledResponse = await requestHandler(serverRequestEv, opts);
+      if (handledResponse) {
+        handledResponse.completion.then((v) => {
+          if (v) {
+            console.error(v);
+          }
         });
-        const o = await i.response;
-        if (o)
-          return o;
+        const response = await handledResponse.response;
+        if (response) {
+          return response;
+        }
       }
-      const m = !n.headers.get("accept")?.includes("text/html") || s(n.method || "GET", e) ? "Not Found" : C(e.pathname);
-      return new Response(m, {
+      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": e.pathname }
+        headers: { "Content-Type": "text/html; charset=utf-8", "X-Not-Found": url.pathname }
       });
     } catch (e) {
-      return console.error(e), new Response(String(e || "Error"), {
+      console.error(e);
+      return new Response(String(e || "Error"), {
         status: 500,
         headers: { "Content-Type": "text/plain; charset=utf-8", "X-Error": "netlify-edge" }
       });
     }
   }
-  return l;
+  return onNetlifyEdgeRequest;
 }
-const S = R;
+const createQwikCity = createQwikRouter;
 export {
-  S as createQwikCity,
-  R as createQwikRouter
+  createQwikCity,
+  createQwikRouter
 };