@qwik.dev/router 2.0.0-beta.43 → 2.0.0-beta.47

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

@@ -1,6 +1,7 @@
 import { t as ensureSlash } from "../../chunks/pathname.mjs";
 import { createQwikRouter as createQwikRouter$1 } from "@qwik.dev/router/middleware/node";
-/** @public */ function createQwikRouter(opts) {
+/** @public */
+function createQwikRouter(opts) {
 	try {
 		const { router, staticFile } = createQwikRouter$1({
 			render: opts.render,
@@ -25,7 +26,8 @@ import { createQwikRouter as createQwikRouter$1 } from "@qwik.dev/router/middlew
 				router(req, res, () => {});
 			});
 		};
-		/** @deprecated `router` handles 404 responses. Will be removed in V3. */ const notFound = async (_req, _res, next) => {
+		/** @deprecated `router` handles 404 responses. Will be removed in V3. */
+		const notFound = async (_req, _res, next) => {
 			next();
 		};
 		return {
@@ -42,5 +44,6 @@ import { createQwikRouter as createQwikRouter$1 } from "@qwik.dev/router/middlew
 /**
 * @deprecated Use `createQwikRouter` instead. Will be removed in V3
 * @public
-*/ var createQwikCity = createQwikRouter;
+*/
+var createQwikCity = createQwikRouter;
 export { createQwikCity, createQwikRouter };

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

@@ -1,7 +1,8 @@
 import { setServerPlatform } from "@qwik.dev/core/server";
 import { getErrorHtml, isStaticPath, requestHandler } from "@qwik.dev/router/middleware/request-handler";
 import { parseString } from "set-cookie-parser";
-/** @public */ function createQwikRouter(opts) {
+/** @public */
+function createQwikRouter(opts) {
 	if (opts.manifest) setServerPlatform(opts.manifest);
 	async function onAzureSwaRequest(context, req) {
 		try {
@@ -83,5 +84,6 @@ import { parseString } from "set-cookie-parser";
 /**
 * @deprecated Use `createQwikRouter` instead. Will be removed in V3
 * @public
-*/ var createQwikCity = createQwikRouter;
+*/
+var createQwikCity = createQwikRouter;
 export { createQwikCity, createQwikRouter };

package/lib/middleware/bun/index.mjs

@@ -1,4 +1,4 @@
-import { n as MIME_TYPES, t as normalizeRequestUrl } from "../../chunks/url.mjs";
+import { n as normalizeRequestUrl, r as MIME_TYPES, t as getStaticFilePath } from "../../chunks/static-file.mjs";
 import { isDev } from "@qwik.dev/core/build";
 import { setServerPlatform } from "@qwik.dev/core/server";
 import { extname, join } from "node:path";
@@ -9,7 +9,8 @@ function getRequestUrl(request, opts) {
 	if (!origin) return url;
 	return normalizeRequestUrl(`${url.pathname}${url.search}${url.hash}`, origin);
 }
-/** @public */ function createQwikRouter(opts) {
+/** @public */
+function createQwikRouter(opts) {
 	globalThis.TextEncoderStream ||= _TextEncoderStream_polyfill;
 	if (opts.manifest) setServerPlatform(opts.manifest);
 	const staticFolder = opts.static?.root ?? join(Bun.fileURLToPath(import.meta.url), "..", "..", "dist");
@@ -61,16 +62,12 @@ function getRequestUrl(request, opts) {
 			});
 		}
 	}
-	/** @deprecated `router` handles 404 responses. Will be removed in V3. */ const notFound = async (_request) => {
+	/** @deprecated `router` handles 404 responses. Will be removed in V3. */
+	const notFound = async (_request) => {
 		return null;
 	};
-	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");
+	const openStaticFile = async (staticFilePath) => {
+		const filePath = join(staticFolder, staticFilePath);
 		return {
 			filePath,
 			content: Bun.file(filePath)
@@ -80,7 +77,9 @@ function getRequestUrl(request, opts) {
 		try {
 			const url = getRequestUrl(request, opts);
 			if (isStaticPath(request.method || "GET", url)) {
-				const { filePath, content } = await openStaticFile(url);
+				const staticFilePath = getStaticFilePath(url.pathname);
+				if (staticFilePath === void 0) return null;
+				const { filePath, content } = await openStaticFile(staticFilePath);
 				if (!await content.exists()) return new Response("Not Found", {
 					status: 404,
 					headers: {
@@ -118,5 +117,6 @@ function getRequestUrl(request, opts) {
 /**
 * @deprecated Use `createQwikRouter` instead. Will be removed in V3
 * @public
-*/ var createQwikCity = createQwikRouter;
+*/
+var createQwikCity = createQwikRouter;
 export { createQwikCity, createQwikRouter };

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

@@ -1,7 +1,8 @@
 import { isDev } from "@qwik.dev/core/build";
 import { setServerPlatform } from "@qwik.dev/core/server";
 import { _TextEncoderStream_polyfill, getErrorHtml, isStaticPath, mergeHeadersCookies, requestHandler } from "@qwik.dev/router/middleware/request-handler";
-/** @public */ function createQwikRouter(opts) {
+/** @public */
+function createQwikRouter(opts) {
 	try {
 		new globalThis.TextEncoderStream();
 	} catch {
@@ -12,7 +13,7 @@ import { _TextEncoderStream_polyfill, getErrorHtml, isStaticPath, mergeHeadersCo
 		try {
 			const url = new URL(request.url);
 			if (isStaticPath(request.method, url)) return env.ASSETS.fetch(request);
-			const useCache = url.hostname !== "127.0.0.1" && url.hostname !== "localhost" && url.port === "" && request.method === "GET";
+			const useCache = url.hostname !== "127.0.0.1" && url.hostname !== "localhost" && url.port === "" && request.method === "GET" && !request.headers.has("Cookie") && !request.headers.has("Authorization");
 			const cacheKey = new Request(url.href, request);
 			const cache = useCache ? await caches.open("custom:qwikrouter") : null;
 			if (cache) {
@@ -58,7 +59,7 @@ import { _TextEncoderStream_polyfill, getErrorHtml, isStaticPath, mergeHeadersCo
 				});
 				const response = await handledResponse.response;
 				if (response) {
-					if (response.ok && cache && response.headers.has("Cache-Control")) ctx.waitUntil(cache.put(cacheKey, response.clone()));
+					if (response.ok && cache && isSharedCacheable(response)) ctx.waitUntil(cache.put(cacheKey, response.clone()));
 					return response;
 				}
 			}
@@ -83,8 +84,22 @@ import { _TextEncoderStream_polyfill, getErrorHtml, isStaticPath, mergeHeadersCo
 	}
 	return onCloudflarePagesFetch;
 }
+var uncacheableDirectives = /* @__PURE__ */ new Set([
+	"private",
+	"no-store",
+	"no-cache"
+]);
+var isSharedCacheable = (response) => {
+	const cacheControl = response.headers.get("Cache-Control");
+	if (!cacheControl || response.headers.has("Set-Cookie")) return false;
+	return !cacheControl.split(",").some((value) => {
+		const directive = value.trim().split("=", 1)[0].toLowerCase();
+		return uncacheableDirectives.has(directive);
+	});
+};
 /**
 * @deprecated Use `createQwikRouter` instead. Will be removed in V3
 * @public
-*/ var createQwikCity = createQwikRouter;
+*/
+var createQwikCity = createQwikRouter;
 export { createQwikCity, createQwikRouter };

package/lib/middleware/deno/index.mjs

@@ -1,4 +1,4 @@
-import { n as MIME_TYPES, t as normalizeRequestUrl } from "../../chunks/url.mjs";
+import { n as normalizeRequestUrl, r as MIME_TYPES, t as getStaticFilePath } from "../../chunks/static-file.mjs";
 import { r as limitRequestBody } from "../../chunks/request-body-limit.mjs";
 import { isDev } from "@qwik.dev/core/build";
 import { setServerPlatform } from "@qwik.dev/core/server";
@@ -10,7 +10,8 @@ function getRequestUrl(request, opts, info) {
 	if (!origin) return url;
 	return normalizeRequestUrl(`${url.pathname}${url.search}${url.hash}`, origin);
 }
-/** @public */ function createQwikRouter(opts) {
+/** @public */
+function createQwikRouter(opts) {
 	if (opts.manifest) setServerPlatform(opts.manifest);
 	const staticFolder = opts.static?.root ?? join(fromFileUrl(import.meta.url), "..", "..", "dist");
 	async function router(request, info) {
@@ -54,16 +55,12 @@ function getRequestUrl(request, opts, info) {
 			});
 		}
 	}
-	/** @deprecated `router` handles 404 responses. Will be removed in V3. */ const notFound = async (_request) => {
+	/** @deprecated `router` handles 404 responses. Will be removed in V3. */
+	const notFound = async (_request) => {
 		return null;
 	};
-	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");
+	const openStaticFile = async (staticFilePath) => {
+		const filePath = join(staticFolder, staticFilePath);
 		return {
 			filePath,
 			content: await Deno.open(filePath, { read: true })
@@ -73,7 +70,9 @@ function getRequestUrl(request, opts, info) {
 		try {
 			const url = getRequestUrl(request, opts);
 			if (isStaticPath(request.method || "GET", url)) {
-				const { filePath, content } = await openStaticFile(url);
+				const staticFilePath = getStaticFilePath(url.pathname);
+				if (staticFilePath === void 0) return null;
+				const { filePath, content } = await openStaticFile(staticFilePath);
 				const ext = extname(filePath).replace(/^\./, "");
 				return new Response(content.readable, {
 					status: 200,
@@ -104,5 +103,6 @@ function getRequestUrl(request, opts, info) {
 /**
 * @deprecated Use `createQwikRouter` instead. Will be removed in V3
 * @public
-*/ var createQwikCity = createQwikRouter;
+*/
+var createQwikCity = createQwikRouter;
 export { createQwikCity, createQwikRouter };

package/lib/middleware/firebase/index.mjs

@@ -1,5 +1,6 @@
 import { createQwikRouter as createQwikRouter$1 } from "@qwik.dev/router/middleware/node";
-/** @public */ function createQwikRouter(opts) {
+/** @public */
+function createQwikRouter(opts) {
 	const { staticFile, router } = createQwikRouter$1({
 		render: opts.render,
 		manifest: opts.manifest,
@@ -19,5 +20,6 @@ import { createQwikRouter as createQwikRouter$1 } from "@qwik.dev/router/middlew
 /**
 * @deprecated Use `createQwikRouter` instead. Will be removed in V3
 * @public
-*/ var createQwikCity = createQwikRouter;
+*/
+var createQwikCity = createQwikRouter;
 export { createQwikCity, createQwikRouter };

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

@@ -1,7 +1,8 @@
 import { isDev } from "@qwik.dev/core/build";
 import { setServerPlatform } from "@qwik.dev/core/server";
 import { getErrorHtml, isStaticPath, mergeHeadersCookies, requestHandler } from "@qwik.dev/router/middleware/request-handler";
-/** @public */ function createQwikRouter(opts) {
+/** @public */
+function createQwikRouter(opts) {
 	if (opts.manifest) setServerPlatform(opts.manifest);
 	async function onNetlifyEdgeRequest(request, context) {
 		try {
@@ -61,5 +62,6 @@ import { getErrorHtml, isStaticPath, mergeHeadersCookies, requestHandler } from
 /**
 * @deprecated Use `createQwikRouter` instead. Will be removed in V3
 * @public
-*/ var createQwikCity = createQwikRouter;
+*/
+var createQwikCity = createQwikRouter;
 export { createQwikCity, createQwikRouter };

package/lib/middleware/node/index.mjs

@@ -1,20 +1,23 @@
-import { n as MIME_TYPES, t as normalizeRequestUrl } from "../../chunks/url.mjs";
+import { n as normalizeRequestUrl, r as MIME_TYPES, t as getStaticFilePath } from "../../chunks/static-file.mjs";
 import { i as validateRequestBodyLimit, n as RequestBodyLimitError, t as DEFAULT_REQUEST_BODY_LIMIT } from "../../chunks/request-body-limit.mjs";
 import { t as devPreloadedRouteLoaders } from "../../chunks/dev-preloaded-route-loader.mjs";
 import { isDev } from "@qwik.dev/core";
 import { setServerPlatform } from "@qwik.dev/core/server";
 import { createReadStream } from "node:fs";
-import { basename, extname, join } from "node:path";
+import { extname, join } from "node:path";
 import { isStaticPath, requestHandler } from "@qwik.dev/router/middleware/request-handler";
 import { fileURLToPath } from "node:url";
 import { Http2ServerRequest } from "node:http2";
+function computeOrigin(req, opts) {
+	return opts?.getOrigin?.(req) ?? opts?.origin ?? process.env.ORIGIN ?? fallbackOrigin(req);
+}
 function fallbackOrigin(req) {
 	const { PROTOCOL_HEADER, HOST_HEADER } = process.env;
 	const headers = req.headers;
 	return `${PROTOCOL_HEADER && headers[PROTOCOL_HEADER] || (req.socket.encrypted || req.connection.encrypted ? "https" : "http")}://${headers[HOST_HEADER ?? (req instanceof Http2ServerRequest ? ":authority" : "host")]}`;
 }
-function computeOrigin(req, opts) {
-	return opts?.getOrigin?.(req) ?? opts?.origin ?? process.env.ORIGIN ?? fallbackOrigin(req);
+function getUrl(req, origin) {
+	return normalizeUrl(req.originalUrl || req.url || "/", origin);
 }
 function isClientAbortWriteError(error) {
 	if (!(error instanceof Error)) return false;
@@ -26,9 +29,6 @@ var invalidHeadersPattern = /^:(method|scheme|authority|path)$/i;
 function normalizeUrl(url, base) {
 	return normalizeRequestUrl(url, base);
 }
-function getUrl(req, origin) {
-	return normalizeUrl(req.originalUrl || req.url || "/", origin);
-}
 function createNodeResponseSink(res) {
 	let closed = res.closed || res.destroyed;
 	let responseError;
@@ -243,7 +243,8 @@ async function fromNodeHttp(url, req, res, mode, getClientConn, requestBodyLimit
 		locale: void 0
 	};
 }
-/** @public */ function createQwikRouter(opts) {
+/** @public */
+function createQwikRouter(opts) {
 	if (opts.manifest) setServerPlatform(opts.manifest);
 	const staticFolder = opts.static?.root ?? join(fileURLToPath(import.meta.url), "..", "..", "dist");
 	const router = async (req, res, next, limits = {}) => {
@@ -275,16 +276,15 @@ async function fromNodeHttp(url, req, res, mode, getClientConn, requestBodyLimit
 			next(e);
 		}
 	};
-	/** @deprecated `router` handles 404 responses. Will be removed in V3. */ const notFound = async (_req, _res, next) => next();
+	/** @deprecated `router` handles 404 responses. Will be removed in V3. */
+	const notFound = async (_req, _res, next) => next();
 	const staticFile = async (req, res, next) => {
 		try {
 			const url = getUrl(req, computeOrigin(req, opts));
 			if (isStaticPath(req.method || "GET", url)) {
-				const pathname = url.pathname;
-				let filePath;
-				if (basename(pathname).includes(".")) filePath = join(staticFolder, pathname);
-				else if (!globalThis.__NO_TRAILING_SLASH__) filePath = join(staticFolder, pathname + "index.html");
-				else filePath = join(staticFolder, pathname, "index.html");
+				const staticFilePath = getStaticFilePath(url.pathname);
+				if (staticFilePath === void 0) return next();
+				const filePath = join(staticFolder, staticFilePath);
 				const ext = extname(filePath).replace(/^\./, "");
 				const stream = createReadStream(filePath);
 				stream.on("error", next);
@@ -309,5 +309,6 @@ async function fromNodeHttp(url, req, res, mode, getClientConn, requestBodyLimit
 /**
 * @deprecated Use `createQwikRouter` instead. Will be removed in V3
 * @public
-*/ var createQwikCity = createQwikRouter;
+*/
+var createQwikCity = createQwikRouter;
 export { createQwikCity, createQwikRouter };

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

@@ -18,8 +18,13 @@ export declare class AbortMessage {
     readonly __controlFlow: true;
 }
 
-/** @internal */
-export declare let _asyncRequestStore: AsyncLocalStorage<RequestEventInternal> | undefined;
+/**
+ * Shared with the router copy of a Qwik library kept external on the server, so its
+ * `getRequestEvent()` and `server$` see the request the app is serving.
+ *
+ * @internal
+ */
+export declare const _asyncRequestStore: AsyncLocalStorage<RequestEventInternal> | undefined;
 
 /** @public */
 export declare type CacheControl = CacheControlOptions | number | 'day' | 'week' | 'month' | 'year' | 'no-cache' | 'immutable' | 'private';
@@ -399,8 +404,16 @@ declare interface LoadedRoute {
     $loaders$?: string[];
     /** Runtime-only mapping of routeLoader$ hashes to the matched pathname used for q-loader fetches */
     $loaderPaths$?: Record<string, string>;
+    /** Runtime-only mapping of routeLoader$ hashes to params matched at their loader path */
+    $loaderParams$?: Record<string, PathParams>;
+}
+
+declare interface MenuModule {
+    readonly default: ContentMenu;
 }
 
+declare type MenuModuleLoader = () => Promise<MenuModule>;
+
 /** @public */
 export declare const mergeHeadersCookies: (headers: Headers, cookies: Cookie) => Headers;
 
@@ -422,6 +435,25 @@ declare type PathParams = Record<string, string>;
 
 declare type QwikRouterCompletion = Error | undefined | object;
 
+/** @public */
+declare interface QwikRouterConfig {
+    readonly routes: RouteData;
+    readonly serverPlugins?: RouteModule[];
+    readonly basePathname?: string;
+    readonly trailingSlash?: boolean;
+    readonly cacheModules?: boolean;
+    /** When true, return null instead of rendering the 404 page, letting the adapter handle it */
+    readonly fallthrough?: boolean;
+    /**
+     * Imports the modules containing `server$` functions so their registration side effects run.
+     * Called by the request handler before serving; deliberately async so the config module itself
+     * evaluates without touching the runtime (see the import-cycle notes in `route-loaders.ts`).
+     */
+    readonly importEagerModules?: () => Promise<unknown>;
+    /** URL of the app's service worker, when the routes define one. */
+    readonly serviceWorkerUrl?: string;
+}
+
 declare interface QwikRouterRun<T> {
     response: Promise<T | null>;
     requestEv: RequestEvent_2;
@@ -632,6 +664,7 @@ export declare interface RequestEventCommon<PLATFORM = QwikRouterPlatform> exten
 declare interface RequestEventInternal extends Readonly<RequestEvent>, Readonly<RequestEventLoader> {
     readonly [RequestEvMode]: ServerRequestMode;
     readonly [RequestEvRoute]: LoadedRoute;
+    readonly [RequestEvRouterConfig]: QwikRouterConfig | undefined;
     /**
      * Check if this request is already written to.
      *
@@ -658,6 +691,9 @@ declare const RequestEvMode: unique symbol;
 
 declare const RequestEvRoute: unique symbol;
 
+/** The request event's key for the config of the app serving it. */
+declare const RequestEvRouterConfig: unique symbol;
+
 /** @public */
 export declare type RequestHandler<PLATFORM = QwikRouterPlatform> = (ev: RequestEvent<PLATFORM>) => Promise<void | AbortMessage | ServerError> | void | AbortMessage | ServerError;
 
@@ -714,6 +750,60 @@ declare interface RouteConfigValue {
     readonly cacheKey?: CacheKeyFn;
 }
 
+/**
+ * A nested route trie structure. The root represents `/` and each level represents a URL segment.
+ *
+ * Keys starting with a single `_` are metadata; all other keys are child route segments. A static
+ * segment that starts with `_` is stored with an extra `_` (`_drafts` → `__drafts`).
+ *
+ * - Use `_W` as the key for a single dynamic segment (param); `_P` on that node names the param.
+ * - Use `_A` as the key for a rest/catch-all segment; `_P` on that node names the param.
+ * - For infix params like `pre[slug]post`, use `_W` with `_0` (prefix) and `_9` (suffix).
+ * - Use `_M` for an array of group (pathless layout) nodes, sorted by group name.
+ *
+ * When matching, exact segments are tried first (case-insensitive), then `_W` (with optional
+ * prefix/suffix), then `_A`. When no route matches, the closest `_E` (error.tsx) or `_4` (404.tsx)
+ * loader in the ancestor chain is used to render the error page.
+ *
+ * @public
+ */
+declare interface RouteData {
+    /** This node's layout loader (single). Runtime accumulates these during trie traversal. */
+    _L?: ContentModuleLoader;
+    /**
+     * This node's index/page loader. Single = normal (runtime prepends gathered _L). Array = override
+     * (layout stop / named layout — IS the complete chain).
+     */
+    _I?: ContentModuleLoader | ModuleLoader[];
+    /** Rewrite/goto target path. Matcher re-walks trie from root using this path's keys. */
+    _G?: string;
+    /** The JS bundle names for this route (SSR only) */
+    _B?: string[];
+    /**
+     * Not-found (404) boundary: single loader (runtime prepends layouts) or override chain
+     * (`404@layout`/`!`).
+     */
+    _4?: ContentModuleLoader | ModuleLoader[];
+    /** Error (error.tsx) boundary, same single-or-override-chain shape as `_4`. */
+    _E?: ContentModuleLoader | ModuleLoader[];
+    /** The parameter name when this node is reached via `_W` or `_A` from the parent */
+    _P?: string;
+    /** Prefix for infix params (e.g. "pre" for `pre[slug]post`) — only on `_W` nodes */
+    _0?: string;
+    /** Suffix for infix params (e.g. "post" for `pre[slug]post`) — only on `_W` nodes */
+    _9?: string;
+    /** Group (pathless layout) nodes merged into this level, sorted by group name */
+    _M?: RouteData[];
+    /** Menu loader for this subtree (from menu.md). Runtime uses nearest ancestor during traversal. */
+    _N?: MenuModuleLoader;
+    /** Inherited layout and server plugin routeLoader$ hashes. */
+    _R?: string[];
+    /** Page loader hashes; override pages include their selected layouts and plugins. */
+    _D?: string[];
+    /** Child route segments (any key not starting with a single `_`) */
+    [part: string]: RouteData | RouteData[] | ModuleLoader[] | ContentModuleLoader | MenuModuleLoader | string[] | string | undefined;
+}
+
 /** @public */
 declare interface RouteLocation {
     readonly params: Readonly<Record<string, string>>;
@@ -766,6 +856,16 @@ export declare interface ServerRenderOptions extends RenderOptions {
      * Defaults to `true`.
      */
     checkOrigin?: boolean | 'lax-proto';
+    /**
+     * Use the `X-Forwarded-Host` and `X-Forwarded-Proto` request headers to compute the URL exposed
+     * by `useLocation()` during SSR.
+     *
+     * Only enable this when the server is behind a proxy that overwrites these headers, otherwise
+     * clients can spoof the URL.
+     *
+     * Defaults to `false`.
+     */
+    trustForwardedHeaders?: boolean;
 }
 
 /**

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

@@ -1,47 +1,22 @@
-import { Y as _asyncRequestStore, d as loadRoute } from "../../chunks/head.qwik.mjs";
+import { H as getRouterConfig, d as loadRoute, ot as _asyncRequestStore } from "../../chunks/head.qwik.mjs";
 import { c as resolveValidInternalFullPathname, l as trimInternalPathname, s as recognizeRequest, u as trimRecognizedInternalPathname } from "../../chunks/request-path.mjs";
 import { i as RedirectMessage, r as AbortMessage, t as ServerError } from "../../chunks/server-error.mjs";
 import { t as devPreloadedRouteLoaders } from "../../chunks/dev-preloaded-route-loader.mjs";
 import { a as getStaticPathRedirect, c as clearSsrCache, d as mergeHeadersCookies, i as resolveRequestHandlers, n as getErrorHtml, o as isStaticPath, r as renderQwikMiddleware, s as clearLoaderCache, t as runQwikRouter, u as RewriteMessage } from "../../chunks/user-response.mjs";
 import { isDev } from "@qwik.dev/core";
-var qwikRouterConfig;
-async function getConfig() {
-	if (isDev) return await import("@qwik-router-config");
-	if (!qwikRouterConfig) qwikRouterConfig = await import("@qwik-router-config");
-	return qwikRouterConfig;
-}
-function getRequestHandlerPathname(serverRequestEv, isDevRequest = isDev) {
-	const recognized = recognizeRequest(serverRequestEv.url.pathname);
-	if (!recognized) return serverRequestEv.url.pathname;
-	const loaderPathname = trimRecognizedInternalPathname(serverRequestEv.url.pathname, recognized);
-	if (recognized.type !== "@isQLoader") return loaderPathname;
-	const routePath = serverRequestEv.request.headers.get("X-Qwik-fullpath") ?? (isDevRequest ? serverRequestEv.request.headers.get("X-Qwik-route-path") : null);
-	return resolveValidInternalFullPathname(loaderPathname, routePath) ?? loaderPathname;
-}
-async function loadRequestHandlers(qwikRouterConfig, pathname, method, checkOrigin, renderFn, serverRequestEv) {
-	const { routes, serverPlugins, cacheModules } = qwikRouterConfig;
-	const loadedRoute = await loadRoute(routes, cacheModules, pathname);
-	const loader = isDev ? devPreloadedRouteLoaders.get(serverRequestEv.request) : void 0;
-	const lastModule = loadedRoute.$mods$[loadedRoute.$mods$.length - 1];
-	if (loader && lastModule) loadedRoute.$mods$[loadedRoute.$mods$.length - 1] = Object.assign({}, lastModule, { __preloadedRouteLoader: loader });
-	return {
-		loadedRoute,
-		requestHandlers: resolveRequestHandlers(serverPlugins, loadedRoute, method, checkOrigin, renderQwikMiddleware(renderFn))
-	};
-}
 /**
 * The request handler for QwikRouter. Called by every adapter.
 *
 * @public
-*/ async function requestHandler(serverRequestEv, opts) {
-	const { render, checkOrigin } = opts;
-	const config = await getConfig();
+*/
+async function requestHandler(serverRequestEv, opts) {
+	const config = await getRouterConfig();
 	const pathname = getRequestHandlerPathname(serverRequestEv);
 	if (pathname === "/.well-known" || pathname.startsWith("/.well-known/")) return null;
 	const staticPathRedirect = getStaticPathRedirect(serverRequestEv.request.method, serverRequestEv.url);
 	const rebuildRouteInfo = async (url) => {
 		const cleanPathname = trimInternalPathname(url.pathname);
-		return loadRequestHandlers(config, cleanPathname, serverRequestEv.request.method, checkOrigin ?? true, render, serverRequestEv);
+		return loadRequestHandlers(config, cleanPathname, serverRequestEv.request.method, opts, serverRequestEv);
 	};
 	if (staticPathRedirect) return runQwikRouter(serverRequestEv, {
 		$routeName$: pathname,
@@ -49,16 +24,37 @@ async function loadRequestHandlers(qwikRouterConfig, pathname, method, checkOrig
 		$mods$: []
 	}, [(event) => {
 		throw event.redirect(301, staticPathRedirect);
-	}], rebuildRouteInfo, config.basePathname);
-	const { loadedRoute, requestHandlers } = await loadRequestHandlers(config, pathname, serverRequestEv.request.method, checkOrigin ?? true, render, serverRequestEv);
+	}], rebuildRouteInfo, config.basePathname, config);
+	const { loadedRoute, requestHandlers } = await loadRequestHandlers(config, pathname, serverRequestEv.request.method, opts, serverRequestEv);
 	if (config.fallthrough && loadedRoute.$notFound$) return null;
-	return runQwikRouter(serverRequestEv, loadedRoute, requestHandlers, rebuildRouteInfo, config.basePathname);
+	return runQwikRouter(serverRequestEv, loadedRoute, requestHandlers, rebuildRouteInfo, config.basePathname, config);
+}
+function getRequestHandlerPathname(serverRequestEv, isDevRequest = isDev) {
+	const recognized = recognizeRequest(serverRequestEv.url.pathname);
+	if (!recognized) return serverRequestEv.url.pathname;
+	const loaderPathname = trimRecognizedInternalPathname(serverRequestEv.url.pathname, recognized);
+	if (recognized.type !== "@isQLoader") return loaderPathname;
+	const routePath = serverRequestEv.request.headers.get("X-Qwik-fullpath") ?? (isDevRequest ? serverRequestEv.request.headers.get("X-Qwik-route-path") : null);
+	return resolveValidInternalFullPathname(loaderPathname, routePath) ?? loaderPathname;
+}
+async function loadRequestHandlers(qwikRouterConfig, pathname, method, opts, serverRequestEv) {
+	const { routes, serverPlugins, cacheModules } = qwikRouterConfig;
+	const loadedRoute = await loadRoute(routes, cacheModules, pathname);
+	const loader = isDev ? devPreloadedRouteLoaders.get(serverRequestEv.request) : void 0;
+	const lastModule = loadedRoute.$mods$[loadedRoute.$mods$.length - 1];
+	if (loader && lastModule) loadedRoute.$mods$[loadedRoute.$mods$.length - 1] = Object.assign({}, lastModule, { __preloadedRouteLoader: loader });
+	return {
+		loadedRoute,
+		requestHandlers: resolveRequestHandlers(serverPlugins, loadedRoute, method, opts.checkOrigin ?? true, renderQwikMiddleware(opts.render, opts.trustForwardedHeaders))
+	};
 }
 /**
 * TextEncoderStream polyfill based on Node.js' implementation
 * https://github.com/nodejs/node/blob/3f3226c8e363a5f06c1e6a37abd59b6b8c1923f1/lib/internal/webstreams/encoding.js#L38-L119
 * (MIT License)
-*/ /** @internal */ var _TextEncoderStream_polyfill = class {
+*/
+/** @internal */
+var _TextEncoderStream_polyfill = class {
 	#pendingHighSurrogate = null;
 	#handle = new TextEncoder();
 	#transform = new TransformStream({

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

@@ -7,7 +7,8 @@ var VERCEL_COOKIE = "__vdpl";
 var VERCEL_SKEW_PROTECTION_ENABLED = "VERCEL_SKEW_PROTECTION_ENABLED";
 var VERCEL_DEPLOYMENT_ID = "VERCEL_DEPLOYMENT_ID";
 var BASE_URL = "BASE_URL";
-/** @public */ function createQwikRouter(opts) {
+/** @public */
+function createQwikRouter(opts) {
 	if (opts.manifest) setServerPlatform(opts.manifest);
 	async function onVercelEdgeRequest(request) {
 		try {
@@ -80,5 +81,6 @@ var BASE_URL = "BASE_URL";
 /**
 * @deprecated Use `createQwikRouter` instead. Will be removed in V3
 * @public
-*/ var createQwikCity = createQwikRouter;
+*/
+var createQwikCity = createQwikRouter;
 export { createQwikCity, createQwikRouter };

package/lib/service-worker/index.mjs

@@ -9,5 +9,6 @@
 *   If you do have custom service worker logic, you should keep the `service-worker.ts` file and
 *   `<ServiceWorkerRegister />` component, but remove the `setupServiceWorker()` call.
 * @public
-*/ var setupServiceWorker = () => {};
+*/
+var setupServiceWorker = () => {};
 export { setupServiceWorker };