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

package/lib/index.qwik.mjs

@@ -1,13 +1,11 @@
-import { $ as basePathname, B as DocumentHeadContext, C as getRequestEvent, F as routeLoaderQrl, G as RouteNavigateContext, H as RouteActionContext, I as setLoaderSignalValue, J as QACTION_KEY, K as RoutePreventNavigateContext, N as restoreRouteLoaders, O as isImmutableLoader, P as routeLoader$, R as ContentContext, S as getModuleRouteLoaders, U as RouteLoaderCtxContext, V as HttpStatusContext, W as RouteLocationContext, X as QFN_KEY, Y as QDATA_KEY, Z as Q_ROUTE, _ as commitRouteLoaders, a as isPromise, b as getClientRouteLoaders, c as shouldPreload, d as loadRoute, h as clearNavFetchCache, i as getClientNavPath, j as prepareRouteLoaders, l as toPath, m as abortRouteLoaderNavigation, n as resolveHead, o as isSameOrigin, q as RouteStateContext, s as isSamePath, t as createDocumentHead, u as toUrl, v as ensureRouteLoaderSignals, y as fetchRouteLoaderData, z as ContentInternalContext } from "./chunks/head.qwik.mjs";
 import { t as ensureSlash } from "./chunks/pathname.mjs";
-import { SkipRender, Slot, _captures, _fnSignal, _getConstProps, _getVarProps, _jsxSorted, _jsxSplit, _qrlSync, _restProps, _wrapProp, componentQrl, createComputedQrl, createElement, eventQrl, getLocale, implicit$FirstArg, inlinedQrl, isBrowser, isDev, isServer, noSerialize, untrack, useContext, useContextProvider, useServerData, useSignal, useStore, useTaskQrl, useVisibleTaskQrl, withLocale } from "@qwik.dev/core";
-import { p } from "@qwik.dev/core/preloader";
-import { _deserialize, _getContextContainer, _getContextHostElement, _hasStoreEffects, _serialize, _waitUntilRendered, forceStoreEffects } from "@qwik.dev/core/internal";
+import { $ as RoutePreventNavigateContext, B as _setRouterConfig, C as getRequestEvent, F as routeLoader$, G as ContentContext, H as getRouterConfig, I as routeLoaderQrl, J as HttpStatusContext, K as ContentInternalContext, L as setLoaderSignalValue, M as prepareRouteLoaders, P as restoreRouteLoaders, Q as RouteNavigateContext, S as getModuleRouteLoaders, U as getRoutes, V as getBasePathname, W as getTrailingSlash, X as RouteLoaderCtxContext, Y as RouteActionContext, Z as RouteLocationContext, _ as commitRouteLoaders, a as isPromise, b as getClientRouteLoaders, c as shouldPreload, d as loadRoute, et as RouteStateContext, h as clearNavFetchCache, i as getClientNavPath, it as Q_ROUTE, k as isImmutableLoader, l as toPath, m as abortRouteLoaderNavigation, n as resolveHead, nt as QDATA_KEY, o as isSameOrigin, q as DocumentHeadContext, rt as QFN_KEY, s as isSamePath, t as createDocumentHead, tt as QACTION_KEY, u as toUrl, v as ensureRouteLoaderSignals, y as fetchRouteLoaderData, z as _getServiceWorkerUrl } from "./chunks/head.qwik.mjs";
+import { SkipRender, Slot, _capturesObj, _fnSignal, _getConstProps, _getVarProps, _jsxSorted, _jsxSplit, _qrlSync, _restProps, _wrapProp, componentQrl, createComputedQrl, createElement, eventQrl, getLocale, implicit$FirstArg, inlinedQrl, isBrowser, isDev, isServer, noSerialize, untrack, useContext, useContextProvider, useServerData, useSignal, useStore, useTaskQrl, useVisibleTaskQrl, withLocale } from "@qwik.dev/core";
+import { _deserialize, _getContextContainer, _getContextHostElement, _hasStoreEffects, _regInlinedQrl, _requestPreload, _serialize, _waitUntilRendered, forceStoreEffects } from "@qwik.dev/core/internal";
 import { Fragment } from "@qwik.dev/core/jsx-runtime";
 import * as v from "valibot";
 import * as z$1 from "zod";
 import { z } from "zod";
-import swRegister from "@qwik-router-sw-register";
 import { renderToStream } from "@qwik.dev/core/server";
 /**
 * Prefetch a route's JS bundles and optionally its loader data.
@@ -25,14 +23,14 @@ import { renderToStream } from "@qwik.dev/core/server";
 async function prefetchRoute(url, prefetchData, probability = .8, manifestHash, prefetchBundle = true) {
 	if (!isBrowser || isDev) return;
 	try {
-		const qwikRouterConfig = await import("@qwik-router-config");
-		const loadedRoute = await loadRoute(qwikRouterConfig.routes, qwikRouterConfig.cacheModules, url.pathname);
+		const { routes, cacheModules } = await getRouterConfig();
+		const loadedRoute = await loadRoute(routes, cacheModules, url.pathname);
 		if (!loadedRoute) return;
 		if (prefetchBundle) {
 			let routeName = loadedRoute.$routeName$;
 			routeName = ensureSlash(routeName);
 			if (routeName.length > 1 && routeName.startsWith("/")) routeName = routeName.slice(1);
-			p(routeName, probability);
+			_requestPreload(routeName, probability);
 		}
 		if (!prefetchData || !manifestHash) return;
 		prefetchLoaderData(loadedRoute, url, manifestHash);
@@ -47,7 +45,7 @@ async function prefetchRoute(url, prefetchData, probability = .8, manifestHash,
 var prefetchLoaderData = (loadedRoute, url, manifestHash) => {
 	if (!loadedRoute.$loaders$?.length || !loadedRoute.$loaderPaths$) return;
 	const immutableIds = new Set(getModuleRouteLoaders(loadedRoute.$mods$).filter((loader) => loader.__cacheControl === "immutable").map((loader) => loader.__id));
-	const basePath = basePathname;
+	const basePath = getBasePathname();
 	for (const hash of loadedRoute.$loaders$) {
 		if (immutableIds.has(hash)) continue;
 		let loaderPath = loadedRoute.$loaderPaths$[hash];
@@ -77,7 +75,7 @@ var useNavigate = () => useContext(RouteNavigateContext);
 var usePreventNavigateQrl = (fn) => {
 	const registerPreventNav = useContext(RoutePreventNavigateContext);
 	useVisibleTaskQrl(/*#__PURE__*/ inlinedQrl(() => {
-		const fn = _captures[0], registerPreventNav = _captures[1];
+		let fn = _capturesObj._[0], registerPreventNav = _capturesObj._[1];
 		return registerPreventNav(fn);
 	}, "usePreventNavigateQrl_useVisibleTask_BsYUaz9XhUs", [fn, registerPreventNav]));
 };
@@ -133,8 +131,14 @@ var Link = /*#__PURE__*/ componentQrl(/*#__PURE__*/ inlinedQrl((props) => {
 	const shouldPrefetch = untrack(shouldPreload, clientNavPath, loc);
 	const shouldVisiblePrefetchBundles = !!clientNavPath && shouldPrefetch && !isDepratedPrefetchDisabled && (prefetchBundlesProp === "visible" || prefetchProp === "js" || prefetchProp === true);
 	const shouldVisiblePrefetchData = !!clientNavPath && shouldPrefetch && !isDepratedPrefetchDisabled && (prefetchDataProp === "visible" || prefetchProp === true);
-	const handleDataPrefetch = !!clientNavPath && prefetchDataProp !== "off" && shouldPrefetch && !isDepratedPrefetchDisabled ? /*#__PURE__*/ inlinedQrl((_, elm) => {
-		const head = _captures[0];
+	const shouldPrefetchBundles = !!clientNavPath && prefetchBundlesProp !== "off" && shouldPrefetch && !isDepratedPrefetchDisabled;
+	const shouldPrefetchData = !!clientNavPath && prefetchDataProp !== "off" && shouldPrefetch && !isDepratedPrefetchDisabled;
+	const handleBundlePrefetch = shouldPrefetchBundles ? /*#__PURE__*/ inlinedQrl((_, elm) => {
+		if (navigator.connection?.saveData) return;
+		if (elm && elm.href) prefetchRoute(new URL(elm.href), false, .8);
+	}, "Link_component_handleBundlePrefetch_ZttUP0kLKj0") : null;
+	const handleDataPrefetch = shouldPrefetchData ? /*#__PURE__*/ inlinedQrl((_, elm) => {
+		let head = _capturesObj._[0];
 		if (navigator.connection?.saveData) return;
 		if (elm && elm.href) prefetchRoute(new URL(elm.href), true, .8, head.manifestHash, false);
 	}, "Link_component_handleDataPrefetch_lcd4O9LHbbA", [head]) : null;
@@ -142,15 +146,22 @@ var Link = /*#__PURE__*/ componentQrl(/*#__PURE__*/ inlinedQrl((props) => {
 		if (!(event.metaKey || event.ctrlKey || event.shiftKey || event.altKey)) event.preventDefault();
 	}, "event=>{if(!(event.metaKey||event.ctrlKey||event.shiftKey||event.altKey)){event.preventDefault();}}") : null;
 	const prefetchData = /*#__PURE__*/ inlinedQrl(async (_, elm) => {
-		const handleDataPrefetch = _captures[0];
+		let handleDataPrefetch = _capturesObj._[0];
 		handleDataPrefetch?.(null, elm);
 	}, "Link_component_prefetchData_UwVx4NhHkSo", [handleDataPrefetch]);
 	const onEnterKeyDown = /*#__PURE__*/ inlinedQrl((event, element) => {
-		const prefetchData = _captures[0];
-		if (event.key === "Enter") prefetchData(null, element);
-	}, "Link_component_onEnterKeyDown_z274ws00irY", [prefetchData]);
+		let handleBundlePrefetch = _capturesObj._[0], prefetchBundlesProp = _capturesObj._[1], prefetchData = _capturesObj._[2], prefetchDataProp = _capturesObj._[3];
+		if (event.key !== "Enter") return;
+		if (prefetchDataProp === "commit") prefetchData(null, element);
+		if (prefetchBundlesProp === "commit") handleBundlePrefetch?.(null, element);
+	}, "Link_component_onEnterKeyDown_z274ws00irY", [
+		handleBundlePrefetch,
+		prefetchBundlesProp,
+		prefetchData,
+		prefetchDataProp
+	]);
 	const handleClientSideNavigation = clientNavPath ? /*#__PURE__*/ inlinedQrl((event, elm) => {
-		const nav = _captures[0], reload = _captures[1], replaceState = _captures[2], scroll = _captures[3];
+		let nav = _capturesObj._[0], reload = _capturesObj._[1], replaceState = _capturesObj._[2], scroll = _capturesObj._[3];
 		if (event.defaultPrevented) {
 			if (elm.href) {
 				elm.setAttribute("aria-pressed", "true");
@@ -182,10 +193,22 @@ var Link = /*#__PURE__*/ componentQrl(/*#__PURE__*/ inlinedQrl((props) => {
 			onClick$,
 			handleClientSideNavigation
 		],
-		"q-e:pointerenter": [linkProps.onMouseOver$, prefetchDataProp === "intent" ? prefetchData : null],
-		"q-e:focus": [linkProps.onFocus$, prefetchDataProp === "intent" ? prefetchData : null],
-		"q-e:pointerdown": [linkProps.onPointerDown$, prefetchDataProp === "commit" ? prefetchData : null],
-		"q-e:keydown": [linkProps.onKeyDown$, prefetchDataProp === "commit" ? onEnterKeyDown : null]
+		"q-e:pointerenter": [
+			linkProps.onPointerEnter$,
+			prefetchDataProp === "intent" ? prefetchData : null,
+			prefetchBundlesProp === "intent" ? handleBundlePrefetch : null
+		],
+		"q-e:focus": [
+			linkProps.onFocus$,
+			prefetchDataProp === "intent" ? prefetchData : null,
+			prefetchBundlesProp === "intent" ? handleBundlePrefetch : null
+		],
+		"q-e:pointerdown": [
+			linkProps.onPointerDown$,
+			prefetchDataProp === "commit" ? prefetchData : null,
+			prefetchBundlesProp === "commit" ? handleBundlePrefetch : null
+		],
+		"q-e:keydown": [linkProps.onKeyDown$, prefetchDataProp === "commit" || prefetchBundlesProp === "commit" ? onEnterKeyDown : null]
 	}, null, /*#__PURE__*/ _jsxSorted(Slot, null, null, null, 3, "xa_0"), 0, "xa_1");
 }, "Link_component_VPmar9tb3t4"));
 var clientNavigate = (win, navType, fromURL, toURL, replaceState = false) => {
@@ -211,7 +234,7 @@ var preloadRouteBundles = (path, probability = .8) => {
 	if (isBrowser) {
 		path = ensureSlash(path);
 		path = path.length > 1 && path.startsWith("/") ? path.slice(1) : path;
-		p(path, probability);
+		_requestPreload(path, probability);
 	}
 };
 var prefetchedLinks = /* @__PURE__ */ new WeakSet();
@@ -550,7 +573,7 @@ var useQwikRouter = (props) => {
 	});
 	const contentInternal = useSignal();
 	/**
-	* Non-serializable navigation context passed from the nav task to the head+commit task. Only the
+	* Non-serializable navigation context passed from the nav task to the navigation task. Only the
 	* data that can't be derived from existing stores/signals.
 	*/
 	const navContext = useSignal();
@@ -605,7 +628,7 @@ var useQwikRouter = (props) => {
 	* make sure to change the address bar before awaiting anything.
 	*/
 	const goto = /*#__PURE__*/ inlinedQrl(async (path, opt) => {
-		const actionState = _captures[0], manifestHash = _captures[1], navResolver = _captures[2], routeInternal = _captures[3], routeLoaderCtx = _captures[4], routeLocation = _captures[5];
+		let actionState = _capturesObj._[0], manifestHash = _capturesObj._[1], navResolver = _capturesObj._[2], routeInternal = _capturesObj._[3], routeLoaderCtx = _capturesObj._[4], routeLocation = _capturesObj._[5];
 		const { type = "link", forceReload = path === void 0, replaceState = false, scroll = true } = typeof opt === "object" ? opt : { forceReload: opt };
 		if (isBrowser && type === "link" && routeInternal.value.type === "initial") {
 			const url = new URL(window.location.href);
@@ -709,9 +732,11 @@ var useQwikRouter = (props) => {
 	* before we trigger the render, and we need to subscribe only head to loader signal updates
 	*/
 	useTaskQrl(/*#__PURE__*/ inlinedQrl(async ({ track }) => {
-		const actionDataSignal = _captures[0], actionState = _captures[1], content = _captures[2], contentInternal = _captures[3], env = _captures[4], goto = _captures[5], httpStatus = _captures[6], loaderState = _captures[7], navContext = _captures[8], navResolver = _captures[9], routeInternal = _captures[10], routeLoaderCtx = _captures[11], routeLocation = _captures[12], routeLocationTarget = _captures[13];
+		let actionDataSignal = _capturesObj._[0], actionState = _capturesObj._[1], content = _capturesObj._[2], contentInternal = _capturesObj._[3], env = _capturesObj._[4], goto = _capturesObj._[5], httpStatus = _capturesObj._[6], loaderState = _capturesObj._[7], navContext = _capturesObj._[8], navResolver = _capturesObj._[9], routeInternal = _capturesObj._[10], routeLoaderCtx = _capturesObj._[11], routeLocation = _capturesObj._[12], routeLocationTarget = _capturesObj._[13];
 		const navigation = track(routeInternal);
 		const action = track(actionState);
+		action?.resolveDispatch?.();
+		if (action) action.resolveDispatch = void 0;
 		const prevUrl = routeLocation.url;
 		const navType = action ? "form" : navigation.type;
 		const replaceState = navigation.replaceState;
@@ -734,7 +759,7 @@ var useQwikRouter = (props) => {
 			if (trackUrl.pathname.endsWith("/")) {
 				if (globalThis.__NO_TRAILING_SLASH__) trackUrl.pathname = trackUrl.pathname.slice(0, -1);
 			} else if (!globalThis.__NO_TRAILING_SLASH__) trackUrl.pathname = ensureSlash(trackUrl.pathname);
-			const loadRoutePromise = import("@qwik-router-config").then((config) => {
+			const loadRoutePromise = getRouterConfig().then((config) => {
 				if (internalState.navCount !== navCountBefore) return;
 				return loadRoute(config.routes, config.cacheModules, trackUrl.pathname);
 			});
@@ -879,7 +904,7 @@ var useQwikRouter = (props) => {
 	* Note that on the server these tasks run sequentially.
 	*/
 	useTaskQrl(/*#__PURE__*/ inlinedQrl(({ track }) => {
-		const actionDataSignal = _captures[0], contentInternal = _captures[1], documentHead = _captures[2], loaderState = _captures[3], navContext = _captures[4], routeLocation = _captures[5], serverHead = _captures[6];
+		let actionDataSignal = _capturesObj._[0], contentInternal = _capturesObj._[1], documentHead = _capturesObj._[2], loaderState = _capturesObj._[3], navContext = _capturesObj._[4], routeLocation = _capturesObj._[5], serverHead = _capturesObj._[6];
 		const contentModules = track(contentInternal);
 		const nav = navContext.untrackedValue;
 		if (!isServer && routeLocation.isNavigating && nav && nav.navCount !== internalState.navCount) return;
@@ -910,7 +935,7 @@ var useQwikRouter = (props) => {
 	]), { deferUpdates: isServer });
 	/** Actual navigation */
 	useTaskQrl(/*#__PURE__*/ inlinedQrl(({ track }) => {
-		const contentInternal = _captures[0], goto = _captures[1], loaderState = _captures[2], manifestHash = _captures[3], navContext = _captures[4], navResolver = _captures[5], props = _captures[6], routeInternal = _captures[7], routeLoaderCtx = _captures[8], routeLocation = _captures[9];
+		let contentInternal = _capturesObj._[0], goto = _capturesObj._[1], loaderState = _capturesObj._[2], manifestHash = _capturesObj._[3], navContext = _capturesObj._[4], navResolver = _capturesObj._[5], props = _capturesObj._[6], routeInternal = _capturesObj._[7], routeLoaderCtx = _capturesObj._[8], routeLocation = _capturesObj._[9];
 		const nav = track(navContext);
 		if (isServer || !nav) return;
 		if (nav.navCount !== internalState.navCount) return;
@@ -1089,7 +1114,7 @@ var useQwikMockRouter = (props) => {
 	}, {});
 	const loadersState = useStore({}, { deep: false });
 	for (const [loaderId, data] of Object.entries(loadersData ?? {})) loadersState[loaderId] ||= createComputedQrl(/*#__PURE__*/ inlinedQrl(() => {
-		return _captures[0];
+		return _capturesObj._[0];
 	}, "useQwikMockRouter_createComputed_JL6bChMwwyc", [data]));
 	const goto = props.goto ?? /*#__PURE__*/ inlinedQrl(async () => {
 		console.warn("QwikRouterMockProvider: goto not provided");
@@ -1118,8 +1143,10 @@ var useQwikMockRouter = (props) => {
 		return acc;
 	}, {});
 	useTaskQrl(/*#__PURE__*/ inlinedQrl(async ({ track }) => {
-		const actionState = _captures[0], actionsMocks = _captures[1];
+		let actionState = _capturesObj._[0], actionsMocks = _capturesObj._[1];
 		const action = track(actionState);
+		action?.resolveDispatch?.();
+		if (action) action.resolveDispatch = void 0;
 		if (!action?.resolve) return;
 		const mock = actionsMocks?.[action.id];
 		if (mock) {
@@ -1178,9 +1205,9 @@ var RouterOutlet = /*#__PURE__*/ componentQrl(/*#__PURE__*/ inlinedQrl(() => {
 	return SkipRender;
 }, "RouterOutlet_component_QwONcWD5gIg"));
 /**
-* Hoisted function declarations (not consts) on purpose, like `routeLoaderQrl`: generated route
-* modules call these factories back during their own evaluation via the `@qwik-router-config`
-* cycle, where a `const` binding would throw a TDZ ReferenceError.
+* Hoisted function declarations (not consts) on purpose, like `routeLoaderQrl`: the app's route
+* modules call these factories during their own evaluation, which a bundle may run before this
+* module, where a `const` binding would throw a TDZ ReferenceError.
 *
 * @public
 */
@@ -1211,7 +1238,7 @@ function routeActionQrl(actionQrl, ...rest) {
 			return initialState;
 		});
 		initialState.submit = /* @__PURE__ */ inlinedQrl((input = {}) => {
-			const currentAction = _captures[0], id = _captures[1], latestSubmission = _captures[2], loc = _captures[3], state = _captures[4];
+			let currentAction = _capturesObj._[0], id = _capturesObj._[1], latestSubmission = _capturesObj._[2], loc = _capturesObj._[3], state = _capturesObj._[4];
 			if (isServer) throw new Error(`Actions can not be invoked within the server during SSR.
 Action.run() can only be called on the browser, for example when a user clicks a button, or submits a form.`);
 			let data;
@@ -1225,7 +1252,12 @@ Action.run() can only be called on the browser, for example when a user clicks a
 			} else data = input;
 			const submission = {};
 			latestSubmission.current = submission;
-			return new Promise((resolve) => {
+			const previousDispatch = currentAction.pendingDispatch ?? Promise.resolve();
+			let resolveDispatch;
+			currentAction.pendingDispatch = noSerialize(new Promise((resolve) => {
+				resolveDispatch = resolve;
+			}));
+			return previousDispatch.then(() => new Promise((resolve) => {
 				if (data instanceof FormData) state.formData = data;
 				state.submitted = true;
 				state.isRunning = true;
@@ -1233,9 +1265,10 @@ Action.run() can only be called on the browser, for example when a user clicks a
 				currentAction.value = {
 					data,
 					id,
-					resolve: noSerialize(resolve)
+					resolve: noSerialize(resolve),
+					resolveDispatch: noSerialize(resolveDispatch)
 				};
-			}).then(({ result, status }) => {
+			})).then(({ result, status }) => {
 				const isLatestSubmission = latestSubmission.current === submission;
 				if (isLatestSubmission) {
 					state.isRunning = false;
@@ -1404,6 +1437,7 @@ var zod$ = /*#__PURE__*/ implicit$FirstArg(zodQrl);
 /** @internal */
 function serverQrl(qrl, options) {
 	if (isServer) {
+		_regInlinedQrl(qrl);
 		const captured = qrl.getCaptured();
 		if (captured && captured.length > 0 && !_getContextHostElement()) throw new Error("For security reasons, we cannot serialize QRLs that capture lexical scope.");
 	}
@@ -1412,7 +1446,7 @@ function serverQrl(qrl, options) {
 	const origin = options?.origin || "";
 	const fetchOptions = options?.fetchOptions || {};
 	return /*#__PURE__*/ inlinedQrl(async function(...args) {
-		const fetchOptions = _captures[0], headers = _captures[1], method = _captures[2], origin = _captures[3], qrl = _captures[4];
+		let fetchOptions = _capturesObj._[0], headers = _capturesObj._[1], method = _capturesObj._[2], origin = _capturesObj._[3], qrl = _capturesObj._[4];
 		const abortSignal = args.length > 0 && args[0] instanceof AbortSignal ? args.shift() : void 0;
 		if (isServer) return qrl.apply(getRequestEvent(this), args);
 		else {
@@ -1521,6 +1555,10 @@ var deserializeStream = async function* (stream, abortSignal) {
 		reader.releaseLock();
 	}
 };
+var SW_REGISTER = `(()=>{if("serviceWorker"in navigator){navigator.serviceWorker.register("__url").catch(e=>console.error(e));"caches"in window&&caches.keys().then(r=>{const e=r.find(c=>c.startsWith("QwikBuild"));e&&caches.delete(e).catch(console.error)}).catch(console.error)}else console.log("Service worker not supported in this browser.")})()`;
+var SW_UNREGISTER = `"serviceWorker"in navigator&&navigator.serviceWorker.getRegistrations().then(r=>{for(const e of r){const c="__url".split("/").pop();e.active?.scriptURL.endsWith(c||"service-worker.js")&&e.unregister().catch(console.error)}}),"caches"in window&&caches.keys().then(r=>{const e=r.find(c=>c.startsWith("QwikBuild"));e&&caches.delete(e).catch(console.error)}).catch(console.error)`;
+/** @internal */
+var _getServiceWorkerScript = (serviceWorkerUrl) => (serviceWorkerUrl ? SW_REGISTER : SW_UNREGISTER).replace("__url", serviceWorkerUrl ?? "/service-worker.js");
 /**
 * Loads the service workers that are defined in the routes. Any file named `service-worker.*` (all
 * JS extensions are allowed) will be picked up, bundled into a separate file, and registered as a
@@ -1534,10 +1572,10 @@ var deserializeStream = async function* (stream, abortSignal) {
 *
 * @public
 */
-var ServiceWorkerRegister = (props) => /*#__PURE__*/ _jsxSorted("script", { nonce: _wrapProp(props, "nonce") }, {
-	type: "module",
-	dangerouslySetInnerHTML: swRegister
-}, null, 3, "UM_0");
+var ServiceWorkerRegister = (props) => /*#__PURE__*/ _jsxSorted("script", {
+	dangerouslySetInnerHTML: _getServiceWorkerScript(_getServiceWorkerUrl()),
+	nonce: _wrapProp(props, "nonce")
+}, { type: "module" }, null, 3, "UM_0");
 var _hf0 = (p0) => p0.spaReset ? "true" : void 0;
 var _hf0_str = "p0.spaReset?\"true\":undefined";
 /** @public */
@@ -1549,7 +1587,7 @@ var Form = ({ action, spaReset, reloadDocument, onSubmit$, ...rest }, key) => {
 			action: _wrapProp(action, "actionPath"),
 			"preventdefault:submit": !reloadDocument,
 			"q-e:submit": [...onSubmit$, !reloadDocument ? /*#__PURE__*/ inlinedQrl((evt) => {
-				const action = _captures[0];
+				let action = _capturesObj._[0];
 				if (!action.submitted) return action.submit(evt);
 			}, "Form_form_q_e_submit_6i0Jq5q8JFg", [action]) : void 0],
 			["data-spa-reset"]: spaReset ? "true" : void 0
@@ -1585,7 +1623,7 @@ var GetForm = /*#__PURE__*/ componentQrl(/*#__PURE__*/ inlinedQrl((_rawProps) =>
 		"q-e:submit": [
 			...Array.isArray(_rawProps.onSubmit$) ? _rawProps.onSubmit$ : [_rawProps.onSubmit$],
 			/*#__PURE__*/ inlinedQrl(async (_evt, form) => {
-				const nav = _captures[0];
+				let nav = _capturesObj._[0];
 				const formData = new FormData(form);
 				const params = new URLSearchParams();
 				formData.forEach((value, key) => {
@@ -1737,4 +1775,4 @@ var DocumentHeadTags = /*#__PURE__*/ componentQrl(/*#__PURE__*/ inlinedQrl((prop
 		})
 	], 1, "eL_3");
 }, "DocumentHeadTags_component_9CrWYOoCpgY"));
-export { DocumentHeadTags, Form, Link, QWIK_CITY_SCROLLER, QWIK_ROUTER_SCROLLER, QwikCityMockProvider, QwikCityProvider, QwikRouterMockProvider, QwikRouterProvider, RouterOutlet, ServiceWorkerRegister, createRenderer, getRequestEvent, globalAction$, globalActionQrl, omitProps, routeAction$, routeActionQrl, routeLoader$, routeLoaderQrl, server$, serverQrl, untypedAppUrl, useContent, useDocumentHead, useHttpStatus, useLocation, useNavigate, usePreventNavigate$, usePreventNavigateQrl, useQwikRouter, valibot$, valibotQrl, validator$, validatorQrl, z, zod$, zodQrl };
+export { DocumentHeadTags, Form, Link, QWIK_CITY_SCROLLER, QWIK_ROUTER_SCROLLER, QwikCityMockProvider, QwikCityProvider, QwikRouterMockProvider, QwikRouterProvider, RouterOutlet, ServiceWorkerRegister, _getServiceWorkerScript, _setRouterConfig, createRenderer, getBasePathname, getRequestEvent, getRouterConfig, getRoutes, getTrailingSlash, globalAction$, globalActionQrl, omitProps, routeAction$, routeActionQrl, routeLoader$, routeLoaderQrl, server$, serverQrl, untypedAppUrl, useContent, useDocumentHead, useHttpStatus, useLocation, useNavigate, usePreventNavigate$, usePreventNavigateQrl, useQwikRouter, valibot$, valibotQrl, validator$, validatorQrl, z, zod$, zodQrl };

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,37 +1,22 @@
-import { Q 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) {
-		const config = await import("@qwik-router-config");
-		await config.importEagerModules?.();
-		return config;
-	}
-	if (!qwikRouterConfig) {
-		const config = await import("@qwik-router-config");
-		await config.importEagerModules?.();
-		qwikRouterConfig = config;
-	}
-	return qwikRouterConfig;
-}
 /**
 * The request handler for QwikRouter. Called by every adapter.
 *
 * @public
 */
 async function requestHandler(serverRequestEv, opts) {
-	const { render, checkOrigin } = opts;
-	const config = await getConfig();
+	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,
@@ -39,10 +24,10 @@ async function requestHandler(serverRequestEv, opts) {
 		$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);
@@ -52,7 +37,7 @@ function getRequestHandlerPathname(serverRequestEv, isDevRequest = isDev) {
 	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) {
+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;
@@ -60,7 +45,7 @@ async function loadRequestHandlers(qwikRouterConfig, pathname, method, checkOrig
 	if (loader && lastModule) loadedRoute.$mods$[loadedRoute.$mods$.length - 1] = Object.assign({}, lastModule, { __preloadedRouteLoader: loader });
 	return {
 		loadedRoute,
-		requestHandlers: resolveRequestHandlers(serverPlugins, loadedRoute, method, checkOrigin, renderQwikMiddleware(renderFn))
+		requestHandlers: resolveRequestHandlers(serverPlugins, loadedRoute, method, opts.checkOrigin ?? true, renderQwikMiddleware(opts.render, opts.trustForwardedHeaders))
 	};
 }
 /**

package/lib/ssg/index.mjs

@@ -1,4 +1,5 @@
 import { n as getPathnameForDynamicRoute, t as ensureSlash } from "../chunks/pathname.mjs";
+import { n as isStaticTrieKey, r as unescapeStaticTrieKey } from "../chunks/route-trie-key.mjs";
 import { r as msToString } from "../chunks/format.mjs";
 import { t as createRouteTester } from "../chunks/routes.mjs";
 import { relative } from "node:path";
@@ -171,8 +172,8 @@ async function mainThread(sys) {
 					await traverseRouteTree(childNode, [...pathParts, pathPart], basePathname, currentLoaders);
 				}
 				for (const [key, child] of Object.entries(node)) {
-					if (key.charCodeAt(0) === 95) continue;
-					await traverseRouteTree(child, [...pathParts, key], basePathname, currentLoaders);
+					if (!isStaticTrieKey(key)) continue;
+					await traverseRouteTree(child, [...pathParts, unescapeStaticTrieKey(key)], basePathname, currentLoaders);
 				}
 			};
 			const loadStaticRoutes = async () => {