@qwik.dev/router 2.0.0-beta.30 → 2.0.0-beta.32

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

@@ -1,20 +1,14 @@
-import { Http2ServerRequest } from 'http2';
-import { IncomingMessage } from 'http';
-import { NodeRequestNextFunction } from '@qwik.dev/router/middleware/node';
-import type { QwikCityPlan } from '@qwik.dev/router';
+import type { Http2ServerRequest } from 'node:http2';
+import type { IncomingMessage } from 'node:http';
+import type { NodeRequestNextFunction } from '@qwik.dev/router/middleware/node';
 import type { QwikManifest } from '@qwik.dev/core/optimizer';
-import type { QwikRouterConfig } from '@qwik.dev/router';
 import type { Render } from '@qwik.dev/core/server';
 import type { ServerRenderOptions } from '@qwik.dev/router/middleware/request-handler';
-import { ServerResponse } from 'http';
+import type { ServerResponse } from 'node:http';
 
 declare interface AwsOpt {
     render: Render;
     manifest?: QwikManifest;
-    /** @deprecated Not used */
-    qwikRouterConfig?: QwikRouterConfig;
-    /** @deprecated Not used */
-    qwikCityPlan?: QwikCityPlan;
 }
 
 /**
@@ -24,13 +18,7 @@ declare interface AwsOpt {
 export declare const createQwikCity: typeof createQwikRouter;
 
 /** @public */
-export declare function createQwikRouter(opts: AwsOpt): {
-    fixPath: (pathT: string) => string;
-    router: (req: IncomingMessage | Http2ServerRequest, res: ServerResponse, next: NodeRequestNextFunction) => Promise<void>;
-    staticFile: (req: IncomingMessage | Http2ServerRequest, res: ServerResponse, next: (e?: any) => void) => Promise<void>;
-    notFound: (req: IncomingMessage | Http2ServerRequest, res: ServerResponse, next: (e: any) => void) => Promise<void>;
-    handle: (req: any, res: any) => void;
-};
+export declare function createQwikRouter(opts: AwsOpt): QwikRouterAwsLambdaMiddleware;
 
 /** @public */
 export declare interface PlatformAwsLambda extends Object {
@@ -42,6 +30,16 @@ export declare interface PlatformAwsLambda extends Object {
  */
 export declare type QwikCityAwsLambdaOptions = QwikRouterAwsLambdaOptions;
 
+/** @public */
+export declare interface QwikRouterAwsLambdaMiddleware {
+    fixPath: (pathT: string) => string;
+    router: (req: IncomingMessage | Http2ServerRequest, res: ServerResponse, next: NodeRequestNextFunction) => Promise<void>;
+    staticFile: (req: IncomingMessage | Http2ServerRequest, res: ServerResponse, next: (e?: any) => void) => Promise<void>;
+    /** @deprecated `router` handles 404 responses. Will be removed in V3. */
+    notFound: (req: IncomingMessage | Http2ServerRequest, res: ServerResponse, next: (e?: any) => void) => Promise<void>;
+    handle: (req: any, res: any) => void;
+}
+
 /** @public */
 export declare interface QwikRouterAwsLambdaOptions extends ServerRenderOptions {
 }

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

@@ -1,14 +1,9 @@
 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;
-  }
   try {
-    const { router, staticFile, notFound } = createQwikRouter$1({
+    const { router, staticFile } = createQwikRouter$1({
       render: opts.render,
-      qwikRouterConfig: opts.qwikRouterConfig,
       manifest: opts.manifest,
       static: {
         cacheControl: "public, max-age=31557600"
@@ -36,11 +31,12 @@ function createQwikRouter(opts) {
       req.url = fixPath(req.url);
       staticFile(req, res, () => {
         router(req, res, () => {
-          notFound(req, res, () => {
-          });
         });
       });
     };
+    const notFound = async (_req, _res, next) => {
+      next();
+    };
     return {
       fixPath,
       router,

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

@@ -3,10 +3,6 @@ import { requestHandler, isStaticPath, getNotFound } from '@qwik.dev/router/midd
 import { parseString } from 'set-cookie-parser';
 
 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);
   }

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

@@ -8,11 +8,7 @@ import type { ServerRenderOptions } from '@qwik.dev/router/middleware/request-ha
 export declare const createQwikCity: typeof createQwikRouter;
 
 /** @public */
-export declare function createQwikRouter(opts: QwikRouterBunOptions): {
-    router: (request: Request) => Promise<Response | null>;
-    notFound: (request: Request) => Promise<Response>;
-    staticFile: (request: Request) => Promise<Response | null>;
-};
+export declare function createQwikRouter(opts: QwikRouterBunOptions): QwikRouterBunMiddleware;
 
 /**
  * @deprecated Use `QwikRouterBunOptions` instead. Will be removed in V3
@@ -20,6 +16,14 @@ export declare function createQwikRouter(opts: QwikRouterBunOptions): {
  */
 export declare type QwikCityBunOptions = QwikRouterBunOptions;
 
+/** @public */
+export declare interface QwikRouterBunMiddleware {
+    router: (request: Request) => Promise<Response | null>;
+    /** @deprecated `router` handles 404 responses. Will be removed in V3. */
+    notFound: (request: Request) => Promise<Response>;
+    staticFile: (request: Request) => Promise<Response | null>;
+}
+
 /** @public */
 export declare interface QwikRouterBunOptions extends ServerRenderOptions {
     /** Options for serving static files */

package/lib/middleware/bun/index.mjs

@@ -1,8 +1,8 @@
+import { isDev } from '@qwik.dev/core/build';
 import { setServerPlatform } from '@qwik.dev/core/server';
-import { _TextEncoderStream_polyfill, isStaticPath, getNotFound, mergeHeadersCookies, requestHandler } from '@qwik.dev/router/middleware/request-handler';
+import { _TextEncoderStream_polyfill, isStaticPath, 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';
-import { isDev } from '@qwik.dev/core/build';
+import { M as MIME_TYPES, n as normalizeRequestUrl } from '../../chunks/url.mjs';
 
 function getRequestUrl(request, opts) {
   const url = new URL(request.url);
@@ -10,13 +10,9 @@ function getRequestUrl(request, opts) {
   if (!origin) {
     return url;
   }
-  return new URL(`${url.pathname}${url.search}${url.hash}`, origin);
+  return normalizeRequestUrl(`${url.pathname}${url.search}${url.hash}`, origin);
 }
 function createQwikRouter(opts) {
-  if (opts.qwikCityPlan && !opts.qwikRouterConfig) {
-    console.warn("qwikCityPlan is deprecated. Simply remove it.");
-    opts.qwikRouterConfig = opts.qwikCityPlan;
-  }
   globalThis.TextEncoderStream ||= _TextEncoderStream_polyfill;
   if (opts.manifest) {
     setServerPlatform(opts.manifest);
@@ -81,27 +77,8 @@ function createQwikRouter(opts) {
       });
     }
   }
-  const notFound = async (request) => {
-    try {
-      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
-        }
-      });
-    } catch (e) {
-      console.error(e);
-      return new Response(isDev ? String(e || "Error") : "Internal Server Error", {
-        status: 500,
-        headers: {
-          "Content-Type": "text/plain; charset=utf-8",
-          "X-Error": "bun-server"
-        }
-      });
-    }
+  const notFound = async (_request) => {
+    return null;
   };
   const openStaticFile = async (url) => {
     const pathname = url.pathname;

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

@@ -3,10 +3,6 @@ import { _TextEncoderStream_polyfill, isStaticPath, mergeHeadersCookies, request
 import { isDev } from '@qwik.dev/core/build';
 
 function createQwikRouter(opts) {
-  if (opts.qwikCityPlan && !opts.qwikRouterConfig) {
-    console.warn("qwikCityPlan is deprecated. Simply remove it.");
-    opts.qwikRouterConfig = opts.qwikCityPlan;
-  }
   try {
     new globalThis.TextEncoderStream();
   } catch {

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

@@ -8,11 +8,7 @@ import type { ServerRenderOptions } from '@qwik.dev/router/middleware/request-ha
 export declare const createQwikCity: typeof createQwikRouter;
 
 /** @public */
-export declare function createQwikRouter(opts: QwikRouterDenoOptions): {
-    router: (request: Request, info: ServeHandlerInfo) => Promise<Response | null>;
-    notFound: (request: Request) => Promise<Response>;
-    staticFile: (request: Request) => Promise<Response | null>;
-};
+export declare function createQwikRouter(opts: QwikRouterDenoOptions): QwikRouterDenoMiddleware;
 
 /** @public */
 export declare interface NetAddr {
@@ -27,6 +23,14 @@ export declare interface NetAddr {
  */
 export declare type QwikCityDenoOptions = QwikRouterDenoOptions;
 
+/** @public */
+export declare interface QwikRouterDenoMiddleware {
+    router: (request: Request, info: ServeHandlerInfo) => Promise<Response | null>;
+    /** @deprecated `router` handles 404 responses. Will be removed in V3. */
+    notFound: (request: Request) => Promise<Response>;
+    staticFile: (request: Request) => Promise<Response | null>;
+}
+
 /** @public */
 export declare interface QwikRouterDenoOptions extends ServerRenderOptions {
     /** Options for serving static files */

package/lib/middleware/deno/index.mjs

@@ -1,6 +1,6 @@
 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 { isStaticPath, mergeHeadersCookies, requestHandler } from '@qwik.dev/router/middleware/request-handler';
+import { M as MIME_TYPES, n as normalizeRequestUrl } from '../../chunks/url.mjs';
 import { join, fromFileUrl, extname } from 'https://deno.land/std/path/mod.ts';
 import { isDev } from '@qwik.dev/core/build';
 
@@ -10,13 +10,9 @@ function getRequestUrl(request, opts, info) {
   if (!origin) {
     return url;
   }
-  return new URL(`${url.pathname}${url.search}${url.hash}`, origin);
+  return normalizeRequestUrl(`${url.pathname}${url.search}${url.hash}`, origin);
 }
 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);
   }
@@ -73,27 +69,8 @@ function createQwikRouter(opts) {
       });
     }
   }
-  const notFound = async (request) => {
-    try {
-      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
-        }
-      });
-    } catch (e) {
-      console.error(e);
-      return new Response(isDev ? String(e || "Error") : "Internal Server Error", {
-        status: 500,
-        headers: {
-          "Content-Type": "text/plain; charset=utf-8",
-          "X-Error": "deno-server"
-        }
-      });
-    }
+  const notFound = async (_request) => {
+    return null;
   };
   const openStaticFile = async (url) => {
     const pathname = url.pathname;

package/lib/middleware/firebase/index.mjs

@@ -1,14 +1,9 @@
 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({
+  const { staticFile, router } = createQwikRouter$1({
     render: opts.render,
     manifest: opts.manifest,
-    qwikRouterConfig: opts.qwikRouterConfig,
     static: {
       cacheControl: "public, max-age=31557600"
     },
@@ -21,8 +16,8 @@ function createQwikRouter(opts) {
   });
   const qwikApp = (req, res) => {
     return staticFile(req, res, () => {
-      router(req, res, () => notFound(req, res, () => {
-      }));
+      router(req, res, () => {
+      });
     });
   };
   return qwikApp;

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

@@ -3,10 +3,6 @@ import { isStaticPath, mergeHeadersCookies, requestHandler, getNotFound } from '
 import { isDev } from '@qwik.dev/core/build';
 
 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);
   }

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

@@ -11,11 +11,7 @@ import type { ServerResponse } from 'node:http';
 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>;
-};
+export declare function createQwikRouter(opts: QwikRouterNodeRequestOptions | QwikCityNodeRequestOptions): QwikRouterNodeMiddleware;
 
 /** @public */
 export declare interface NodeRequestNextFunction {
@@ -35,6 +31,14 @@ export declare interface PlatformNode {
  */
 export declare type QwikCityNodeRequestOptions = QwikRouterNodeRequestOptions;
 
+/** @public */
+export declare interface QwikRouterNodeMiddleware {
+    router: (req: IncomingMessage | Http2ServerRequest, res: ServerResponse, next: NodeRequestNextFunction) => Promise<void>;
+    /** @deprecated `router` handles 404 responses. Will be removed in V3. */
+    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 QwikRouterNodeRequestOptions extends ServerRenderOptions {
     /** Options for serving static files */

package/lib/middleware/node/index.mjs

@@ -1,10 +1,10 @@
 import { isDev } from '@qwik.dev/core';
 import { setServerPlatform } from '@qwik.dev/core/server';
-import { isStaticPath, getNotFound, requestHandler } from '@qwik.dev/router/middleware/request-handler';
+import { isStaticPath, requestHandler } from '@qwik.dev/router/middleware/request-handler';
 import { createReadStream } from 'node:fs';
 import { join, basename, extname } from 'node:path';
 import { fileURLToPath } from 'node:url';
-import { M as MIME_TYPES } from '../../chunks/mime-types.mjs';
+import { n as normalizeRequestUrl, M as MIME_TYPES } from '../../chunks/url.mjs';
 import { Http2ServerRequest } from 'node:http2';
 
 function fallbackOrigin(req) {
@@ -27,8 +27,7 @@ function isIgnoredError(message = "") {
 }
 const invalidHeadersPattern = /^:(method|scheme|authority|path)$/i;
 function normalizeUrl(url, base) {
-  const DOUBLE_SLASH_REG = /\/\/|\\\\/g;
-  return new URL(url.replace(DOUBLE_SLASH_REG, "/"), base);
+  return normalizeRequestUrl(url, base);
 }
 function getUrl(req, origin) {
   return normalizeUrl(req.originalUrl || req.url || "/", origin);
@@ -126,10 +125,6 @@ async function fromNodeHttp(url, req, res, mode, getClientConn) {
 }
 
 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);
   }
@@ -157,23 +152,7 @@ function createQwikRouter(opts) {
       next(e);
     }
   };
-  const notFound = async (req, res, next) => {
-    try {
-      if (!res.headersSent) {
-        const origin = computeOrigin(req, opts);
-        const url = getUrl(req, origin);
-        const notFoundHtml = !req.headers.accept?.includes("text/html") || isStaticPath(req.method || "GET", url) ? "Not Found" : getNotFound(url.pathname);
-        res.writeHead(404, {
-          "Content-Type": "text/html; charset=utf-8",
-          "X-Not-Found": url.pathname
-        });
-        res.end(notFoundHtml);
-      }
-    } catch (e) {
-      console.error(e);
-      next(e);
-    }
-  };
+  const notFound = async (_req, _res, next) => next();
   const staticFile = async (req, res, next) => {
     try {
       const origin = computeOrigin(req, opts);

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

@@ -4,9 +4,7 @@ import type { EnvGetter as EnvGetter_2 } from '@qwik.dev/router/middleware/reque
 import type { FailReturn } from '@qwik.dev/router';
 import type { JSXOutput } from '@qwik.dev/core';
 import type { Loader as Loader_2 } from '@qwik.dev/router';
-import type { QwikCityPlan } from '@qwik.dev/router';
 import type { QwikIntrinsicElements } from '@qwik.dev/core';
-import type { QwikRouterConfig } from '@qwik.dev/router';
 import type { Render } from '@qwik.dev/core/server';
 import type { RenderOptions } from '@qwik.dev/core/server';
 import { RequestEvent as RequestEvent_2 } from '@qwik.dev/router/middleware/request-handler';
@@ -632,7 +630,10 @@ export declare type RequestHandler<PLATFORM = QwikRouterPlatform> = (ev: Request
 export declare function requestHandler<T = unknown>(serverRequestEv: ServerRequestEvent<T>, opts: ServerRenderOptions): Promise<QwikRouterRun<T> | null>;
 
 /** @public */
-declare type ResolvedDocumentHead<FrontMatter extends Record<string, any> = Record<string, unknown>> = Required<DocumentHeadValue<FrontMatter>>;
+declare type ResolvedDocumentHead<FrontMatter extends Record<string, any> = Record<string, unknown>> = Required<DocumentHeadValue<FrontMatter>> & {
+    /** The build's manifest hash, used for per-loader data URLs. Always defined (`'dev'` in dev). */
+    readonly manifestHash: string;
+};
 
 /** @public */
 export declare interface ResolveSyncValue {
@@ -715,10 +716,6 @@ declare type ServerErrorCode = 500 | 501 | 502 | 503 | 504 | 505 | 506 | 507 | 5
 /** @public */
 export declare interface ServerRenderOptions extends RenderOptions {
     render: Render;
-    /** @deprecated Not used */
-    qwikCityPlan?: QwikCityPlan;
-    /** @deprecated Not used */
-    qwikRouterConfig?: QwikRouterConfig;
     /**
      * Protection against cross-site request forgery (CSRF) attacks.
      *

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

@@ -1,4 +1,4 @@
-import { Q as Q_ROUTE, m as resolveRouteConfig, n as QLOADER_KEY, h as QFN_KEY, j as QACTION_KEY, o as isPromise, k as QDATA_KEY, e as loadRoute } from '../../chunks/routing.qwik.mjs';
+import { Q as Q_ROUTE, m as resolveRouteConfig, n as QLOADER_KEY, h as QFN_KEY, j as QACTION_KEY, o as isPromise, k as QDATA_KEY, b as loadRoute } from '../../chunks/routing.qwik.mjs';
 import { isDev, _UNINITIALIZED, _deserialize, _verifySerializable, _serialize } from '@qwik.dev/core/internal';
 import { inlinedQrl } from '@qwik.dev/core';
 import { R as RedirectMessage, A as AbortMessage } from '../../chunks/redirect-handler.mjs';
@@ -647,7 +647,7 @@ function createResolveRequestHandlers(deps) {
     const routeLoaders = [];
     const routeActions = [];
     const requestHandlers = [];
-    const isPageRoute = !!(route && isLastModulePageRoute(route.$mods$));
+    const isPageRoute = !!isLastModulePageRoute(route.$mods$);
     if (isInternal) {
       requestHandlers.push(handleQDataRedirect);
     }
@@ -657,36 +657,36 @@ function createResolveRequestHandlers(deps) {
     if (serverPlugins) {
       _resolveRequestHandlers(routeLoaders, routeActions, requestHandlers, serverPlugins, isPageRoute, method);
     }
-    if (route) {
-      const routeModules = route.$mods$;
-      _resolveRequestHandlers(routeLoaders, routeActions, requestHandlers, routeModules, isPageRoute, method);
-      const routeName = route.$routeName$;
-      if (checkOrigin && (method === "POST" || method === "PUT" || method === "PATCH" || method === "DELETE")) {
-        if (checkOrigin === "lax-proto") {
-          requestHandlers.unshift(csrfLaxProtoCheckMiddleware);
-        } else {
-          requestHandlers.unshift(csrfCheckMiddleware);
-        }
+    const routeModules = route.$mods$;
+    _resolveRequestHandlers(routeLoaders, routeActions, requestHandlers, routeModules, isPageRoute, method);
+    const routeName = route.$routeName$;
+    if (checkOrigin && (method === "POST" || method === "PUT" || method === "PATCH" || method === "DELETE")) {
+      if (checkOrigin === "lax-proto") {
+        requestHandlers.unshift(csrfLaxProtoCheckMiddleware);
+      } else {
+        requestHandlers.unshift(csrfCheckMiddleware);
       }
-      if (isPageRoute) {
-        if (method === "POST" || method === "GET") {
-          requestHandlers.push(runServerFunction);
-        }
+    }
+    if (isPageRoute) {
+      if (method === "POST" || method === "GET") {
+        requestHandlers.push(runServerFunction);
+      }
+      if (!route.$notFound$) {
         requestHandlers.push(fixTrailingSlash);
-        if (isInternal) {
-          requestHandlers.push(renderQData);
-        }
       }
-      if (isPageRoute) {
-        requestHandlers.push((ev) => {
-          ev.sharedMap.set(deps.RequestRouteName, routeName);
-        });
-        requestHandlers.push(actionsMiddleware(routeActions));
-        requestHandlers.push(loadersMiddleware(routeLoaders));
-        requestHandlers.push(eTagMiddleware(route));
-        requestHandlers.push(renderHandler);
+      if (isInternal) {
+        requestHandlers.push(renderQData);
       }
     }
+    if (isPageRoute) {
+      requestHandlers.push((ev) => {
+        ev.sharedMap.set(deps.RequestRouteName, routeName);
+      });
+      requestHandlers.push(actionsMiddleware(routeActions));
+      requestHandlers.push(loadersMiddleware(routeLoaders));
+      requestHandlers.push(eTagMiddleware(route));
+      requestHandlers.push(renderHandler);
+    }
     return requestHandlers;
   };
   const _resolveRequestHandlers = (routeLoaders, routeActions, requestHandlers, routeModules, collectActions, method) => {
@@ -1632,9 +1632,15 @@ function runQwikRouter(serverRequestEv, loadedRoute, requestHandlers, rebuildRou
   });
 }
 
-let qwikRouterConfigActual;
-async function loadRequestHandlers(qwikRouterConfig, pathname, method, checkOrigin, renderFn, isInternal) {
-  const { routes, serverPlugins, cacheModules } = qwikRouterConfig;
+let qwikRouterConfig;
+async function getConfig() {
+  if (!qwikRouterConfig) {
+    qwikRouterConfig = await import('@qwik-router-config');
+  }
+  return qwikRouterConfig;
+}
+async function loadRequestHandlers(qwikRouterConfig2, pathname, method, checkOrigin, renderFn, isInternal) {
+  const { routes, serverPlugins, cacheModules } = qwikRouterConfig2;
   const loadedRoute = await loadRoute(routes, cacheModules, pathname, isInternal);
   const requestHandlers = resolveRequestHandlers(serverPlugins, loadedRoute, method, checkOrigin, renderQwikMiddleware(renderFn), isInternal);
   return {
@@ -1644,29 +1650,20 @@ async function loadRequestHandlers(qwikRouterConfig, pathname, method, checkOrig
 }
 async function requestHandler(serverRequestEv, opts) {
   const { render, checkOrigin } = opts;
-  let { qwikRouterConfig } = opts;
-  if (!qwikRouterConfig) {
-    if (!qwikRouterConfigActual) {
-      qwikRouterConfigActual = await import('@qwik-router-config');
-    }
-    qwikRouterConfig = qwikRouterConfigActual;
-  }
-  if (!qwikRouterConfig) {
-    throw new Error("qwikRouterConfig is required.");
-  }
+  const config = await getConfig();
   const { pathname, isInternal } = getRouteMatchPathname(serverRequestEv.url.pathname);
   if (pathname === "/.well-known" || pathname.startsWith("/.well-known/")) {
     return null;
   }
-  const { loadedRoute, requestHandlers } = await loadRequestHandlers(qwikRouterConfig, pathname, serverRequestEv.request.method, checkOrigin ?? true, render, isInternal);
-  if (qwikRouterConfig.fallthrough && loadedRoute.$notFound$) {
+  const { loadedRoute, requestHandlers } = await loadRequestHandlers(config, pathname, serverRequestEv.request.method, checkOrigin ?? true, render, isInternal);
+  if (config.fallthrough && loadedRoute.$notFound$) {
     return null;
   }
   const rebuildRouteInfo = async (url) => {
     const { pathname: pathname2 } = getRouteMatchPathname(url.pathname);
-    return loadRequestHandlers(qwikRouterConfig, pathname2, serverRequestEv.request.method, checkOrigin ?? true, render, isInternal);
+    return loadRequestHandlers(config, pathname2, serverRequestEv.request.method, checkOrigin ?? true, render, isInternal);
   };
-  return runQwikRouter(serverRequestEv, loadedRoute, requestHandlers, rebuildRouteInfo, qwikRouterConfig.basePathname);
+  return runQwikRouter(serverRequestEv, loadedRoute, requestHandlers, rebuildRouteInfo, config.basePathname);
 }
 
 const notFounds = [

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

@@ -9,10 +9,6 @@ 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);
   }