@qwik.dev/router 2.0.0-beta.11 → 2.0.0-beta.14

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

@@ -1,74 +1,97 @@
-import { setServerPlatform as C } from "@qwik.dev/core/server";
-import { isStaticPath as c, mergeHeadersCookies as _, requestHandler as w, getNotFound as g } from "@qwik.dev/router/middleware/request-handler";
-const v = "x-vercel-ip-country", y = "x-real-ip", L = "__vdpl", N = "VERCEL_SKEW_PROTECTION_ENABLED", S = "VERCEL_DEPLOYMENT_ID", T = "BASE_URL";
-function O(n) {
-  n.qwikCityPlan && !n.qwikRouterConfig && (console.warn("qwikCityPlan is deprecated. Simply remove it."), n.qwikRouterConfig = n.qwikCityPlan), n.manifest && C(n.manifest);
-  async function l(e) {
+import { setServerPlatform } from '@qwik.dev/core/server';
+import { isStaticPath, mergeHeadersCookies, requestHandler, getNotFound } from '@qwik.dev/router/middleware/request-handler';
+
+const COUNTRY_HEADER_NAME = "x-vercel-ip-country";
+const IP_HEADER_NAME = "x-real-ip";
+const VERCEL_COOKIE = "__vdpl";
+const VERCEL_SKEW_PROTECTION_ENABLED = "VERCEL_SKEW_PROTECTION_ENABLED";
+const VERCEL_DEPLOYMENT_ID = "VERCEL_DEPLOYMENT_ID";
+const BASE_URL = "BASE_URL";
+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 onVercelEdgeRequest(request) {
     try {
-      const t = new URL(e.url);
-      if (c(e.method, t))
+      const url = new URL(request.url);
+      if (isStaticPath(request.method, url)) {
         return new Response(null, {
           headers: {
             "x-middleware-next": "1"
           }
         });
-      const E = globalThis.process, o = {
+      }
+      const p = (() => globalThis.process)();
+      const serverRequestEv = {
         mode: "server",
         locale: void 0,
-        url: t,
-        request: e,
+        url,
+        request,
         env: {
-          get(r) {
-            return E.env[r];
+          get(key) {
+            return p.env[key];
           }
         },
-        getWritableStream: (r, s, i, u) => {
-          const { readable: m, writable: h } = new TransformStream();
-          if (o.env.get(N)) {
-            const R = o.env.get(S) || "", f = o.env.get(T) || "/";
-            e.headers.has("Sec-Fetch-Dest") && i.set(L, R, {
-              path: f,
-              secure: !0,
-              sameSite: !0,
-              httpOnly: !0
-            });
+        getWritableStream: (status, headers, cookies, resolve) => {
+          const { readable, writable } = new TransformStream();
+          if (serverRequestEv.env.get(VERCEL_SKEW_PROTECTION_ENABLED)) {
+            const deploymentId = serverRequestEv.env.get(VERCEL_DEPLOYMENT_ID) || "";
+            const baseUrl = serverRequestEv.env.get(BASE_URL) || "/";
+            if (request.headers.has("Sec-Fetch-Dest")) {
+              cookies.set(VERCEL_COOKIE, deploymentId, {
+                path: baseUrl,
+                secure: true,
+                sameSite: true,
+                httpOnly: true
+              });
+            }
           }
-          const p = new Response(m, {
-            status: r,
-            headers: _(s, i)
+          const response = new Response(readable, {
+            status,
+            headers: mergeHeadersCookies(headers, cookies)
           });
-          return u(p), h;
+          resolve(response);
+          return writable;
         },
         platform: {},
-        getClientConn: () => ({
-          ip: e.headers.get(y) ?? void 0,
-          country: e.headers.get(v) ?? void 0
-        })
-      }, a = await w(o, n);
-      if (a) {
-        a.completion.then((s) => {
-          s && console.error(s);
+        getClientConn: () => {
+          return {
+            ip: request.headers.get(IP_HEADER_NAME) ?? void 0,
+            country: request.headers.get(COUNTRY_HEADER_NAME) ?? void 0
+          };
+        }
+      };
+      const handledResponse = await requestHandler(serverRequestEv, opts);
+      if (handledResponse) {
+        handledResponse.completion.then((v) => {
+          if (v) {
+            console.error(v);
+          }
         });
-        const r = await a.response;
-        if (r)
-          return r;
+        const response = await handledResponse.response;
+        if (response) {
+          return response;
+        }
       }
-      const d = !e.headers.get("accept")?.includes("text/html") || c(e.method || "GET", t) ? "Not Found" : g(t.pathname);
-      return new Response(d, {
+      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": t.pathname }
+        headers: { "Content-Type": "text/html; charset=utf-8", "X-Not-Found": url.pathname }
       });
-    } catch (t) {
-      return console.error(t), new Response(String(t || "Error"), {
+    } catch (e) {
+      console.error(e);
+      return new Response(String(e || "Error"), {
         status: 500,
         headers: { "Content-Type": "text/plain; charset=utf-8", "X-Error": "vercel-edge" }
       });
     }
   }
-  return l;
+  return onVercelEdgeRequest;
 }
-const x = O;
-export {
-  x as createQwikCity,
-  O as createQwikRouter
-};
+const createQwikCity = createQwikRouter;
+
+export { createQwikCity, createQwikRouter };

package/lib/service-worker/index.mjs

@@ -0,0 +1,4 @@
+const setupServiceWorker = () => {
+};
+
+export { setupServiceWorker };

package/lib/ssg/index.mjs

@@ -1,22 +1,14 @@
-async function i(t) {
-  return await (await r()).generate(t);
-}
-function r() {
-  if (n())
-    return import("./index-ClHGw5z1.js");
-  if (e() || o())
-    return import("./index-CBIchDYq.js");
-  throw new Error("Unsupported platform");
-}
-function n() {
-  return typeof Deno < "u";
-}
-function e() {
-  return typeof Bun < "u";
-}
-function o() {
-  return !e() && !n() && typeof process < "u" && !!process.versions?.node;
-}
-export {
-  i as generate
-};
+async function generate(opts) {
+  const ssgPlatform = await getEntryModule();
+  const result = await ssgPlatform.generate(opts);
+  return result;
+}
+async function getEntryModule() {
+  try {
+    return await import('../chunks/index.mjs');
+  } catch (e) {
+    throw new Error(`Unsupported platform`, { cause: e });
+  }
+}
+
+export { generate };

package/lib/vite/index.d.ts

@@ -7,13 +7,13 @@ import type { PluginOption } from 'vite';
 import type { SerializationStrategy } from '@qwik.dev/core/internal';
 import { UserConfigExport } from 'vite';
 
-declare interface BuildEntry extends ParsedPathname {
+declare interface BuiltEntry extends ParsedPathname {
     id: string;
     chunkFileName: string;
     filePath: string;
 }
 
-declare interface BuildLayout {
+declare interface BuiltLayout {
     filePath: string;
     dirPath: string;
     id: string;
@@ -21,7 +21,7 @@ declare interface BuildLayout {
     layoutName: string;
 }
 
-declare interface BuildRoute extends ParsedPathname {
+declare interface BuiltRoute extends ParsedPathname {
     /** Unique id built from its relative file system path */
     id: string;
     /** Local file system path */
@@ -29,7 +29,7 @@ declare interface BuildRoute extends ParsedPathname {
     ext: string;
     /** URL Pathname */
     pathname: string;
-    layouts: BuildLayout[];
+    layouts: BuiltLayout[];
 }
 
 /** @public */
@@ -99,7 +99,13 @@ declare interface PluginOptions {
     mdxPlugins?: MdxPlugins;
     /** MDX Options https://mdxjs.com/ */
     mdx?: any;
-    /** The platform object which can be used to mock the Cloudflare bindings. */
+    /**
+     * Extend the `platform` object in RequestEvent, which can be used to e.g. mock Cloudflare
+     * bindings.
+     *
+     * This only works in **dev mode** and only when using the in-process Vite dev server middleware
+     * (the default).
+     */
     platform?: Record<string, unknown>;
     /** Configuration to rewrite url paths */
     rewriteRoutes?: RewriteRouteOption[];
@@ -136,8 +142,8 @@ export declare interface QwikRouterPlugin extends P<QwikRouterPluginApi> {
 /** @public */
 declare interface QwikRouterPluginApi {
     getBasePathname: () => string;
-    getRoutes: () => BuildRoute[];
-    getServiceWorkers: () => BuildEntry[];
+    getRoutes: () => BuiltRoute[];
+    getServiceWorkers: () => BuiltEntry[];
 }
 
 /** @public */