@qwik.dev/router 2.0.0-alpha.1 → 2.0.0-alpha.10

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

@@ -1,26 +1,26 @@
-import type { ServerRenderOptions } from '@qwik.dev/router/middleware/request-handler';
-
-/**
- * @deprecated Use `createQwikRouter` instead. Will be removed in V3
- * @public
- */
-export declare const createQwikCity: typeof createQwikRouter;
-
-/** @public */
-export declare function createQwikRouter(opts: QwikRouterFirebaseOptions): (req: any, res: any) => Promise<void>;
-
-/** @public */
-export declare interface PlatformFirebase extends Object {
-}
-
-/**
- * @deprecated Use `QwikRouterFirebaseOptions` instead. Will be removed in V3
- * @public
- */
-export declare type QwikCityFirebaseOptions = QwikRouterFirebaseOptions;
-
-/** @public */
-export declare interface QwikRouterFirebaseOptions extends ServerRenderOptions {
-}
-
-export { }
+import type { ServerRenderOptions } from '@qwik.dev/router/middleware/request-handler';
+
+/**
+ * @deprecated Use `createQwikRouter` instead. Will be removed in V3
+ * @public
+ */
+export declare const createQwikCity: typeof createQwikRouter;
+
+/** @public */
+export declare function createQwikRouter(opts: QwikRouterFirebaseOptions): (req: any, res: any) => Promise<void>;
+
+/** @public */
+export declare interface PlatformFirebase extends Object {
+}
+
+/**
+ * @deprecated Use `QwikRouterFirebaseOptions` instead. Will be removed in V3
+ * @public
+ */
+export declare type QwikCityFirebaseOptions = QwikRouterFirebaseOptions;
+
+/** @public */
+export declare interface QwikRouterFirebaseOptions extends ServerRenderOptions {
+}
+
+export { }

package/lib/middleware/netlify-edge/index.d.ts

@@ -1,27 +1,27 @@
-import type { Context } from '@netlify/edge-functions';
-import type { ServerRenderOptions } from '@qwik.dev/router/middleware/request-handler';
-
-/**
- * @deprecated Use `createQwikRouter` instead. Will be removed in V3
- * @public
- */
-export declare const createQwikCity: typeof createQwikRouter;
-
-/** @public */
-export declare function createQwikRouter(opts: QwikRouterNetlifyOptions): (request: Request, context: Context) => Promise<Response>;
-
-/** @public */
-export declare interface PlatformNetlify extends Partial<Omit<Context, 'next' | 'cookies'>> {
-}
-
-/**
- * @deprecated Use `QwikRouterNetlifyOptions` instead. Will be removed in V3
- * @public
- */
-export declare type QwikCityNetlifyOptions = QwikRouterNetlifyOptions;
-
-/** @public */
-export declare interface QwikRouterNetlifyOptions extends ServerRenderOptions {
-}
-
-export { }
+import type { Context } from '@netlify/edge-functions';
+import type { ServerRenderOptions } from '@qwik.dev/router/middleware/request-handler';
+
+/**
+ * @deprecated Use `createQwikRouter` instead. Will be removed in V3
+ * @public
+ */
+export declare const createQwikCity: typeof createQwikRouter;
+
+/** @public */
+export declare function createQwikRouter(opts: QwikRouterNetlifyOptions): (request: Request, context: Context) => Promise<Response>;
+
+/** @public */
+export declare interface PlatformNetlify extends Partial<Omit<Context, 'next' | 'cookies'>> {
+}
+
+/**
+ * @deprecated Use `QwikRouterNetlifyOptions` instead. Will be removed in V3
+ * @public
+ */
+export declare type QwikCityNetlifyOptions = QwikRouterNetlifyOptions;
+
+/** @public */
+export declare interface QwikRouterNetlifyOptions extends ServerRenderOptions {
+}
+
+export { }

package/lib/middleware/node/index.cjs

@@ -18,12 +18,12 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // packages/qwik-router/src/middleware/node/index.ts
-var node_exports = {};
-__export(node_exports, {
+var index_exports = {};
+__export(index_exports, {
   createQwikCity: () => createQwikCity,
   createQwikRouter: () => createQwikRouter
 });
-module.exports = __toCommonJS(node_exports);
+module.exports = __toCommonJS(index_exports);
 var import_qwik_router_not_found_paths = require("@qwik-router-not-found-paths");
 var import_qwik_router_static_paths = require("@qwik-router-static-paths");
 var import_internal = require("@qwik.dev/core/internal");

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

@@ -1,66 +1,64 @@
-/// <reference types="node" />
-
-import type { ClientConn } from '@qwik.dev/router/middleware/request-handler';
-import type { Http2ServerRequest } from 'node:http2';
-import type { IncomingMessage } from 'node:http';
-import type { ServerRenderOptions } from '@qwik.dev/router/middleware/request-handler';
-import type { ServerResponse } from 'node:http';
-
-/**
- * @deprecated Use `createQwikRouter` instead. Will be removed in V3
- * @public
- */
-export declare const createQwikCity: typeof createQwikRouter;
-
-/** @public */
-export declare function createQwikRouter(opts: QwikRouterNodeRequestOptions | QwikCityNodeRequestOptions): {
-    router: (req: IncomingMessage | Http2ServerRequest, res: ServerResponse, next: NodeRequestNextFunction) => Promise<void>;
-    notFound: (req: IncomingMessage | Http2ServerRequest, res: ServerResponse, next: (e: any) => void) => Promise<void>;
-    staticFile: (req: IncomingMessage | Http2ServerRequest, res: ServerResponse, next: (e?: any) => void) => Promise<void>;
-};
-
-/** @public */
-export declare interface NodeRequestNextFunction {
-    (err?: any): void;
-}
-
-/** @public */
-export declare interface PlatformNode {
-    ssr?: true;
-    incomingMessage?: IncomingMessage | Http2ServerRequest;
-    node?: string;
-}
-
-/**
- * @deprecated Use `QwikRouterNodeRequestOptions` instead. Will be removed in V3
- * @public
- */
-export declare type QwikCityNodeRequestOptions = QwikRouterNodeRequestOptions;
-
-/** @public */
-export declare interface QwikRouterNodeRequestOptions extends ServerRenderOptions {
-    /** Options for serving static files */
-    static?: {
-        /** The root folder for statics files. Defaults to /dist */
-        root?: string;
-        /** 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. You can specify the `PROTOCOL_HEADER`, `HOST_HEADER` to `X-Forwarded-Proto` and
-     * `X-Forwarded-Host` respectively to override the default behavior.
-     */
-    getOrigin?: (req: IncomingMessage | Http2ServerRequest) => string | null;
-    /** Provide a function that returns a `ClientConn` for the given request. */
-    getClientConn?: (req: IncomingMessage | Http2ServerRequest) => ClientConn;
-    /** @deprecated Use `getOrigin` instead. Will be removed in V3 */
-    origin?: string;
-}
-
-export { }
+import type { ClientConn } from '@qwik.dev/router/middleware/request-handler';
+import type { Http2ServerRequest } from 'node:http2';
+import type { IncomingMessage } from 'node:http';
+import type { ServerRenderOptions } from '@qwik.dev/router/middleware/request-handler';
+import type { ServerResponse } from 'node:http';
+
+/**
+ * @deprecated Use `createQwikRouter` instead. Will be removed in V3
+ * @public
+ */
+export declare const createQwikCity: typeof createQwikRouter;
+
+/** @public */
+export declare function createQwikRouter(opts: QwikRouterNodeRequestOptions | QwikCityNodeRequestOptions): {
+    router: (req: IncomingMessage | Http2ServerRequest, res: ServerResponse, next: NodeRequestNextFunction) => Promise<void>;
+    notFound: (req: IncomingMessage | Http2ServerRequest, res: ServerResponse, next: (e: any) => void) => Promise<void>;
+    staticFile: (req: IncomingMessage | Http2ServerRequest, res: ServerResponse, next: (e?: any) => void) => Promise<void>;
+};
+
+/** @public */
+export declare interface NodeRequestNextFunction {
+    (err?: any): void;
+}
+
+/** @public */
+export declare interface PlatformNode {
+    ssr?: true;
+    incomingMessage?: IncomingMessage | Http2ServerRequest;
+    node?: string;
+}
+
+/**
+ * @deprecated Use `QwikRouterNodeRequestOptions` instead. Will be removed in V3
+ * @public
+ */
+export declare type QwikCityNodeRequestOptions = QwikRouterNodeRequestOptions;
+
+/** @public */
+export declare interface QwikRouterNodeRequestOptions extends ServerRenderOptions {
+    /** Options for serving static files */
+    static?: {
+        /** The root folder for statics files. Defaults to /dist */
+        root?: string;
+        /** 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. You can specify the `PROTOCOL_HEADER`, `HOST_HEADER` to `X-Forwarded-Proto` and
+     * `X-Forwarded-Host` respectively to override the default behavior.
+     */
+    getOrigin?: (req: IncomingMessage | Http2ServerRequest) => string | null;
+    /** Provide a function that returns a `ClientConn` for the given request. */
+    getClientConn?: (req: IncomingMessage | Http2ServerRequest) => ClientConn;
+    /** @deprecated Use `getOrigin` instead. Will be removed in V3 */
+    origin?: string;
+}
+
+export { }

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

@@ -28,8 +28,8 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // packages/qwik-router/src/middleware/request-handler/index.ts
-var request_handler_exports = {};
-__export(request_handler_exports, {
+var index_exports = {};
+__export(index_exports, {
   AbortMessage: () => AbortMessage,
   RedirectMessage: () => RedirectMessage,
   ServerError: () => ServerError,
@@ -38,22 +38,16 @@ __export(request_handler_exports, {
   mergeHeadersCookies: () => mergeHeadersCookies,
   requestHandler: () => requestHandler
 });
-module.exports = __toCommonJS(request_handler_exports);
+module.exports = __toCommonJS(index_exports);
 
 // packages/qwik-router/src/middleware/request-handler/error-handler.ts
 var ServerError = class extends Error {
   constructor(status, data) {
-    super();
+    super(typeof data === "string" ? data : void 0);
     this.status = status;
     this.data = data;
   }
 };
-var ErrorResponse = class extends Error {
-  constructor(status, message) {
-    super(message);
-    this.status = status;
-  }
-};
 function getErrorHtml(status, e) {
   let message = "Server Error";
   if (e != null) {
@@ -501,8 +495,7 @@ function createCacheControl(cacheControl) {
     cacheControl = {
       public: true,
       immutable: true,
-      maxAge: 60 * 60 * 24 * 365,
-      staleWhileRevalidate: 60 * 60 * 24 * 365
+      maxAge: 60 * 60 * 24 * 365
     };
   } else if (cacheControl === "no-cache") {
     cacheControl = {
@@ -512,8 +505,7 @@ function createCacheControl(cacheControl) {
   if (typeof cacheControl === "number") {
     cacheControl = {
       maxAge: cacheControl,
-      sMaxAge: cacheControl,
-      staleWhileRevalidate: cacheControl
+      sMaxAge: cacheControl
     };
   }
   if (cacheControl.immutable) {
@@ -558,14 +550,13 @@ import("node:async_hooks").then((module2) => {
     err
   );
 });
-function runQwikRouter(serverRequestEv, loadedRoute, requestHandlers, manifest, trailingSlash = true, basePathname = "/", qwikSerializer) {
+function runQwikRouter(serverRequestEv, loadedRoute, requestHandlers, trailingSlash = true, basePathname = "/", qwikSerializer) {
   let resolve;
   const responsePromise = new Promise((r) => resolve = r);
   const requestEv = createRequestEvent(
     serverRequestEv,
     loadedRoute,
     requestHandlers,
-    manifest,
     trailingSlash,
     basePathname,
     qwikSerializer,
@@ -584,12 +575,18 @@ async function runNext(requestEv, resolve) {
     if (e instanceof RedirectMessage) {
       const stream = requestEv.getWritableStream();
       await stream.close();
-    } else if (e instanceof ErrorResponse) {
-      console.error(e);
+    } else if (e instanceof ServerError) {
       if (!requestEv.headersSent) {
-        const html = getErrorHtml(e.status, e);
         const status = e.status;
-        requestEv.html(status, html);
+        const accept = requestEv.request.headers.get("Accept");
+        if (accept && !accept.includes("text/html")) {
+          const qwikSerializer = requestEv[RequestEvQwikSerializer];
+          requestEv.headers.set("Content-Type", "application/qwik-json");
+          requestEv.send(status, await qwikSerializer._serialize([e.data]));
+        } else {
+          const html = getErrorHtml(e.status, e.data);
+          requestEv.html(status, html);
+        }
       }
     } else if (!(e instanceof AbortMessage)) {
       if (getRequestMode(requestEv) !== "dev") {
@@ -642,7 +639,7 @@ var RequestRouteName = "@routeName";
 var RequestEvSharedActionId = "@actionId";
 var RequestEvSharedActionFormData = "@actionFormData";
 var RequestEvSharedNonce = "@nonce";
-function createRequestEvent(serverRequestEv, loadedRoute, requestHandlers, manifest, trailingSlash, basePathname, qwikSerializer, resolved) {
+function createRequestEvent(serverRequestEv, loadedRoute, requestHandlers, trailingSlash, basePathname, qwikSerializer, resolved) {
   const { request, platform, env } = serverRequestEv;
   const sharedMap = /* @__PURE__ */ new Map();
   const cookie = new Cookie(request.headers.get("cookie"));
@@ -655,7 +652,6 @@ function createRequestEvent(serverRequestEv, loadedRoute, requestHandlers, manif
     }
     sharedMap.set(IsQData, true);
   }
-  sharedMap.set("@manifest", manifest);
   let routeModuleIndex = -1;
   let writableStream = null;
   let requestData = void 0;
@@ -689,17 +685,25 @@ function createRequestEvent(serverRequestEv, loadedRoute, requestHandlers, manif
     } else {
       status = statusOrResponse.status;
       statusOrResponse.headers.forEach((value, key) => {
+        if (key.toLowerCase() === "set-cookie") {
+          return;
+        }
         headers.append(key, value);
       });
+      statusOrResponse.headers.getSetCookie().forEach((ck) => {
+        const index = ck.indexOf("=");
+        if (index === -1) {
+          return;
+        }
+        const key = ck.slice(0, index).trim();
+        const value = ck.slice(index + 1).trim();
+        cookie.set(key, value);
+      });
       if (statusOrResponse.body) {
         const writableStream2 = requestEv.getWritableStream();
         statusOrResponse.body.pipeTo(writableStream2);
       } else {
-        if (status >= 300 && status < 400) {
-          return new RedirectMessage();
-        } else {
-          requestEv.getWritableStream().getWriter().close();
-        }
+        requestEv.getWritableStream().getWriter().close();
       }
     }
     return exit();
@@ -770,7 +774,7 @@ function createRequestEvent(serverRequestEv, loadedRoute, requestHandlers, manif
     },
     error: (statusCode, message) => {
       status = statusCode;
-      return new ErrorResponse(statusCode, message);
+      return new ServerError(statusCode, message);
     },
     redirect: (statusCode, url2) => {
       check();
@@ -871,7 +875,7 @@ var parseRequest = async ({ request, method, query }, sharedMap, qwikSerializer)
       if (data) {
         try {
           return qwikSerializer._deserialize(decodeURIComponent(data));
-        } catch (err) {
+        } catch {
         }
       }
     }
@@ -1182,13 +1186,9 @@ async function pureServerFunction(ev) {
           }
         } catch (err) {
           if (err instanceof ServerError) {
-            ev.headers.set("Content-Type", "application/qwik-json");
-            ev.send(err.status, await qwikSerializer._serialize([err.data]));
-            return;
+            throw ev.error(err.status, err.data);
           }
-          ev.headers.set("Content-Type", "application/qwik-json");
-          ev.send(500, await qwikSerializer._serialize([err]));
-          return;
+          throw ev.error(500, "Invalid request");
         }
         if (isAsyncIterator(result)) {
           ev.headers.set("Content-Type", "text/qwik-json-stream");
@@ -1430,13 +1430,13 @@ async function measure(requestEv, name, fn) {
 }
 function isContentType(headers, ...types) {
   var _a;
-  const type = ((_a = headers.get("content-type")) == null ? void 0 : _a.split(/;,/, 1)[0].trim()) ?? "";
+  const type = ((_a = headers.get("content-type")) == null ? void 0 : _a.split(/;/, 1)[0].trim()) ?? "";
   return types.includes(type);
 }
 
 // packages/qwik-router/src/middleware/request-handler/request-handler.ts
 async function requestHandler(serverRequestEv, opts, qwikSerializer) {
-  const { render, qwikRouterConfig, manifest, checkOrigin } = opts;
+  const { render, qwikRouterConfig, checkOrigin } = opts;
   if (!qwikRouterConfig) {
     throw new Error("qwikRouterConfig is required.");
   }
@@ -1455,7 +1455,6 @@ async function requestHandler(serverRequestEv, opts, qwikSerializer) {
       serverRequestEv,
       route,
       requestHandlers,
-      manifest,
       qwikRouterConfig.trailingSlash,
       qwikRouterConfig.basePathname,
       qwikSerializer