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

package/lib/middleware/request-handler/index.d.ts

@@ -599,14 +599,14 @@ declare type ResolvedDocumentHead<FrontMatter extends Record<string, any> = Reco
 
 /** @public */
 export declare interface ResolveSyncValue {
+    <T, INPUT, OPTIONAL extends boolean>(action: Action<T, INPUT, OPTIONAL>): Awaited<T> | undefined;
     <T>(loader: Loader_2<T>): Awaited<T> extends () => any ? never : Awaited<T>;
-    <T>(action: Action<T>): Awaited<T> | undefined;
 }
 
 /** @public */
 export declare interface ResolveValue {
+    <T, INPUT, OPTIONAL extends boolean>(action: Action<T, INPUT, OPTIONAL>): Promise<T | undefined>;
     <T>(loader: Loader_2<T>): Awaited<T> extends () => any ? never : Promise<T>;
-    <T>(action: Action<T>): Promise<T | undefined>;
 }
 
 /** @public */

package/lib/middleware/request-handler/index.mjs

@@ -1,22 +1,12 @@
-var __defProp = Object.defineProperty;
-var __typeError = (msg) => {
-  throw TypeError(msg);
-};
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-var __accessCheck = (obj, member, msg) => member.has(obj) || __typeError("Cannot " + msg);
-var __privateGet = (obj, member, getter) => (__accessCheck(obj, member, "read from private field"), getter ? getter.call(obj) : member.get(obj));
-var __privateAdd = (obj, member, value) => member.has(obj) ? __typeError("Cannot add the same private member more than once") : member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
-var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "write to private field"), setter ? setter.call(obj, value) : member.set(obj, value), value);
-var _a, _b, _c, _pendingHighSurrogate, _handle, _transform;
-import { isServer } from "@qwik.dev/core/build";
-import { i as isPromise, k as QDATA_KEY, Q as Q_ROUTE, h as QFN_KEY, m as QLOADER_KEY, j as QACTION_KEY, d as loadRoute } from "../../chunks/routing.qwik.mjs";
-import { inlinedQrl } from "@qwik.dev/core";
-import { _serialize, _UNINITIALIZED, _deserialize, _verifySerializable } from "@qwik.dev/core/internal";
-import { L as LoadedRouteProp } from "../../chunks/types.qwik.mjs";
-import { _asyncRequestStore as _asyncRequestStore$1, ServerError as ServerError$1, RedirectMessage as RedirectMessage$1, RewriteMessage as RewriteMessage$1, AbortMessage as AbortMessage$1 } from "@qwik.dev/router/middleware/request-handler";
-import { g as getErrorHtml, m as minimalHtmlResponse } from "../../chunks/error-handler.mjs";
-import "@qwik.dev/core/preloader";
+import { isServer } from '@qwik.dev/core/build';
+import { i as isPromise, k as QDATA_KEY, Q as Q_ROUTE, h as QFN_KEY, m as QLOADER_KEY, j as QACTION_KEY, d as loadRoute } from '../../chunks/routing.qwik.mjs';
+import { inlinedQrl } from '@qwik.dev/core';
+import { _serialize, _UNINITIALIZED, _deserialize, _verifySerializable } from '@qwik.dev/core/internal';
+import { L as LoadedRouteProp } from '../../chunks/types.qwik.mjs';
+import { _asyncRequestStore as _asyncRequestStore$1, ServerError as ServerError$1, RedirectMessage as RedirectMessage$1, RewriteMessage as RewriteMessage$1, AbortMessage as AbortMessage$1 } from '@qwik.dev/router/middleware/request-handler';
+import { g as getErrorHtml, m as minimalHtmlResponse } from '../../chunks/error-handler.mjs';
+import '@qwik.dev/core/preloader';
+
 var HttpStatus = /* @__PURE__ */ ((HttpStatus2) => {
   HttpStatus2[HttpStatus2["Continue"] = 100] = "Continue";
   HttpStatus2[HttpStatus2["SwitchingProtocols"] = 101] = "SwitchingProtocols";
@@ -81,6 +71,7 @@ var HttpStatus = /* @__PURE__ */ ((HttpStatus2) => {
   HttpStatus2[HttpStatus2["NetworkAuthenticationRequired"] = 511] = "NetworkAuthenticationRequired";
   return HttpStatus2;
 })(HttpStatus || {});
+
 function createCacheControl(cacheControl) {
   const controls = [];
   if (cacheControl === "day") {
@@ -142,6 +133,7 @@ function createCacheControl(cacheControl) {
   }
   return controls.join(", ");
 }
+
 const SAMESITE = {
   lax: "Lax",
   Lax: "Lax",
@@ -221,13 +213,12 @@ function resolveSameSite(sameSite) {
 const REQ_COOKIE = Symbol("request-cookies");
 const RES_COOKIE = Symbol("response-cookies");
 const LIVE_COOKIE = Symbol("live-cookies");
-_c = REQ_COOKIE, _b = RES_COOKIE, _a = LIVE_COOKIE;
 class Cookie {
+  [REQ_COOKIE];
+  [RES_COOKIE] = {};
+  [LIVE_COOKIE] = {};
+  appendCounter = 0;
   constructor(cookieString) {
-    __publicField(this, _c);
-    __publicField(this, _b, {});
-    __publicField(this, _a, {});
-    __publicField(this, "appendCounter", 0);
     this[REQ_COOKIE] = parseCookieString(cookieString);
     this[LIVE_COOKIE] = { ...this[REQ_COOKIE] };
   }
@@ -291,6 +282,7 @@ const mergeHeadersCookies = (headers, cookies) => {
   }
   return headers;
 };
+
 function runQwikRouter(serverRequestEv, loadedRoute, requestHandlers, rebuildRouteInfo, basePathname = "/") {
   let resolve;
   const responsePromise = new Promise((r) => resolve = r);
@@ -392,6 +384,7 @@ function getRouteMatchPathname(pathname) {
 }
 const IsQData = "@isQData";
 const QDATA_JSON = "/q-data.json";
+
 const RequestEvLoaders = Symbol("RequestEvLoaders");
 const RequestEvMode = Symbol("RequestEvMode");
 const RequestEvRoute = Symbol("RequestEvRoute");
@@ -696,6 +689,7 @@ const formToObj = (formData) => {
   }, {});
   return values;
 };
+
 function getQwikRouterServerData(requestEv) {
   const { params, request, status, locale, originalUrl } = requestEv;
   const requestHeaders = {};
@@ -740,6 +734,7 @@ function getQwikRouterServerData(requestEv) {
     }
   };
 }
+
 const resolveRequestHandlers = (serverPlugins, route, method, checkOrigin, renderHandler, isInternal) => {
   const routeLoaders = [];
   const routeActions = [];
@@ -1262,9 +1257,10 @@ function isContentType(headers, ...types) {
   const type = headers.get("content-type")?.split(/;/, 1)[0].trim() ?? "";
   return types.includes(type);
 }
+
 let _asyncRequestStore;
 if (isServer) {
-  import("node:async_hooks").then((module) => {
+  import('node:async_hooks').then((module) => {
     _asyncRequestStore = new module.AsyncLocalStorage();
   }).catch((err) => {
     console.warn(
@@ -1279,7 +1275,7 @@ async function requestHandler(serverRequestEv, opts) {
   let { qwikRouterConfig } = opts;
   if (!qwikRouterConfig) {
     if (!qwikRouterConfigActual) {
-      qwikRouterConfigActual = await import("@qwik-router-config");
+      qwikRouterConfigActual = await import('@qwik-router-config');
     }
     qwikRouterConfig = qwikRouterConfigActual;
   }
@@ -1340,6 +1336,7 @@ async function loadRequestHandlers(qwikRouterConfig, pathname, method, checkOrig
   }
   return null;
 }
+
 const notFounds = [
   // Will be replaced in post-build with the 404s generated by SSG
   "__QWIK_ROUTER_NOT_FOUND_ARRAY__"
@@ -1352,6 +1349,7 @@ function getNotFound(prefix) {
   }
   return minimalHtmlResponse(404, "Resource Not Found");
 }
+
 const staticPaths = /* @__PURE__ */ new Set(["__QWIK_ROUTER_STATIC_PATHS_ARRAY__"]);
 function isStaticPath(method, url) {
   if (method.toUpperCase() !== "GET") {
@@ -1378,6 +1376,7 @@ function isStaticPath(method, url) {
   }
   return false;
 }
+
 class ServerError extends Error {
   constructor(status, data) {
     super(typeof data === "string" ? data : void 0);
@@ -1385,84 +1384,70 @@ class ServerError extends Error {
     this.data = data;
   }
 }
+
 class AbortMessage {
 }
 class RedirectMessage extends AbortMessage {
 }
+
 class RewriteMessage extends AbortMessage {
   constructor(pathname) {
     super();
     this.pathname = pathname;
   }
 }
+
 class _TextEncoderStream_polyfill {
-  constructor() {
-    __privateAdd(this, _pendingHighSurrogate, null);
-    __privateAdd(this, _handle, new TextEncoder());
-    __privateAdd(this, _transform, new TransformStream({
-      transform: (chunk, controller) => {
-        chunk = String(chunk);
-        let finalChunk = "";
-        for (let i = 0; i < chunk.length; i++) {
-          const item = chunk[i];
-          const codeUnit = item.charCodeAt(0);
-          if (__privateGet(this, _pendingHighSurrogate) !== null) {
-            const highSurrogate = __privateGet(this, _pendingHighSurrogate);
-            __privateSet(this, _pendingHighSurrogate, null);
-            if (56320 <= codeUnit && codeUnit <= 57343) {
-              finalChunk += highSurrogate + item;
-              continue;
-            }
-            finalChunk += "�";
-          }
-          if (55296 <= codeUnit && codeUnit <= 56319) {
-            __privateSet(this, _pendingHighSurrogate, item);
-            continue;
-          }
+  #pendingHighSurrogate = null;
+  #handle = new TextEncoder();
+  #transform = new TransformStream({
+    transform: (chunk, controller) => {
+      chunk = String(chunk);
+      let finalChunk = "";
+      for (let i = 0; i < chunk.length; i++) {
+        const item = chunk[i];
+        const codeUnit = item.charCodeAt(0);
+        if (this.#pendingHighSurrogate !== null) {
+          const highSurrogate = this.#pendingHighSurrogate;
+          this.#pendingHighSurrogate = null;
           if (56320 <= codeUnit && codeUnit <= 57343) {
-            finalChunk += "�";
+            finalChunk += highSurrogate + item;
             continue;
           }
-          finalChunk += item;
+          finalChunk += "�";
         }
-        if (finalChunk) {
-          controller.enqueue(__privateGet(this, _handle).encode(finalChunk));
+        if (55296 <= codeUnit && codeUnit <= 56319) {
+          this.#pendingHighSurrogate = item;
+          continue;
         }
-      },
-      flush: (controller) => {
-        if (__privateGet(this, _pendingHighSurrogate) !== null) {
-          controller.enqueue(new Uint8Array([239, 191, 189]));
+        if (56320 <= codeUnit && codeUnit <= 57343) {
+          finalChunk += "�";
+          continue;
         }
+        finalChunk += item;
       }
-    }));
-  }
+      if (finalChunk) {
+        controller.enqueue(this.#handle.encode(finalChunk));
+      }
+    },
+    flush: (controller) => {
+      if (this.#pendingHighSurrogate !== null) {
+        controller.enqueue(new Uint8Array([239, 191, 189]));
+      }
+    }
+  });
   get encoding() {
-    return __privateGet(this, _handle).encoding;
+    return this.#handle.encoding;
   }
   get readable() {
-    return __privateGet(this, _transform).readable;
+    return this.#transform.readable;
   }
   get writable() {
-    return __privateGet(this, _transform).writable;
+    return this.#transform.writable;
   }
   get [Symbol.toStringTag]() {
     return "TextEncoderStream";
   }
 }
-_pendingHighSurrogate = new WeakMap();
-_handle = new WeakMap();
-_transform = new WeakMap();
-export {
-  AbortMessage,
-  RedirectMessage,
-  RequestEvShareQData,
-  RewriteMessage,
-  ServerError,
-  _TextEncoderStream_polyfill,
-  _asyncRequestStore,
-  getErrorHtml,
-  getNotFound,
-  isStaticPath,
-  mergeHeadersCookies,
-  requestHandler
-};
+
+export { AbortMessage, RedirectMessage, RequestEvShareQData, RewriteMessage, ServerError, _TextEncoderStream_polyfill, _asyncRequestStore, getErrorHtml, getNotFound, isStaticPath, mergeHeadersCookies, requestHandler };

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

@@ -1,5 +1,6 @@
-import { setServerPlatform } from "@qwik.dev/core/server";
-import { isStaticPath, mergeHeadersCookies, requestHandler, getNotFound } from "@qwik.dev/router/middleware/request-handler";
+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";
@@ -92,7 +93,5 @@ function createQwikRouter(opts) {
   return onVercelEdgeRequest;
 }
 const createQwikCity = createQwikRouter;
-export {
-  createQwikCity,
-  createQwikRouter
-};
+
+export { createQwikCity, createQwikRouter };

package/lib/service-worker/index.mjs

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

package/lib/ssg/index.mjs

@@ -5,11 +5,10 @@ async function generate(opts) {
 }
 async function getEntryModule() {
   try {
-    return await import("../chunks/index.mjs");
+    return await import('../chunks/index.mjs');
   } catch (e) {
     throw new Error(`Unsupported platform`, { cause: e });
   }
 }
-export {
-  generate
-};
+
+export { generate };

package/lib/vite/index.d.ts

@@ -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[];