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

package/lib/index.qwik.mjs

@@ -1,36 +1,13 @@
 import { t as ensureSlash } from "./chunks/pathname.mjs";
-import { A as routeLoader$, B as RouteLoaderCtxContext, E as isImmutableLoader, F as ContentContext, G as QACTION_KEY, H as RouteNavigateContext, I as ContentInternalContext, J as Q_ROUTE, K as QDATA_KEY, L as DocumentHeadContext, M as setLoaderSignalValue, P as updateRouteLoaderPaths, R as HttpStatusContext, T as invalidateNavRouteLoaders, U as RoutePreventNavigateContext, V as RouteLocationContext, W as RouteStateContext, _ as fetchRouteLoaderData, a as isPromise, b as getRequestEvent, c as shouldPreload, d as loadRoute, g as ensureRouteLoaderSignals, i as getClientNavPath, j as routeLoaderQrl, l as toPath, m as clearNavFetchCache, n as resolveHead, o as isSameOrigin, q as QFN_KEY, s as isSamePath, t as createDocumentHead, u as toUrl, y as getModuleRouteLoaders, z as RouteActionContext } from "./chunks/head.qwik.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 * as qwikRouterConfig from "@qwik-router-config";
-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 loader data in parallel (fire-and-forget). The per-nav fetch map dedupes
-* repeat hovers and shares the promise with the navigation's own fetch; the browser HTTP cache
-* handles freshness. Immutable loaders are skipped: they download lazily on first actual read and
-* are then browser-cached for the life of the deploy.
-*/ 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 = qwikRouterConfig.basePathname ?? "/";
-	for (const hash of loadedRoute.$loaders$) {
-		if (immutableIds.has(hash)) continue;
-		let loaderPath = loadedRoute.$loaderPaths$[hash];
-		if (!loaderPath) continue;
-		if (basePath !== "/" && !loaderPath.startsWith(basePath)) loaderPath = basePath + loaderPath.slice(1);
-		fetchRouteLoaderData(hash, loaderPath, manifestHash, {
-			pageUrl: url,
-			basePath
-		}).catch(() => {});
-	}
-};
-/**
 * Prefetch a route's JS bundles and optionally its loader data.
 *
 * Resolves the route from the trie to get the routeName (for the bundle graph preloader) and
@@ -42,34 +19,63 @@ import { renderToStream } from "@qwik.dev/core/server";
 * @param probability - Bundle preload probability (0-1, default 0.8)
 * @param manifestHash - Build manifest hash for loader URLs (from `useDocumentHead().manifestHash`)
 * @param prefetchBundle - Whether to prefetch route JS bundles
-*/ async function prefetchRoute(url, prefetchData, probability = .8, manifestHash, prefetchBundle = true) {
+*/
+async function prefetchRoute(url, prefetchData, probability = .8, manifestHash, prefetchBundle = true) {
 	if (!isBrowser || isDev) return;
 	try {
-		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);
 	} catch {}
 }
-/** @public */ var useHttpStatus = () => useContext(HttpStatusContext).value;
-/** @public */ var useContent = () => useContext(ContentContext);
+/**
+* Prefetch a route's loader data in parallel (fire-and-forget). The per-nav fetch map dedupes
+* repeat hovers and shares the promise with the navigation's own fetch; the browser HTTP cache
+* handles freshness. Immutable loaders are skipped: they download lazily on first actual read and
+* are then browser-cached for the life of the deploy.
+*/
+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 = getBasePathname();
+	for (const hash of loadedRoute.$loaders$) {
+		if (immutableIds.has(hash)) continue;
+		let loaderPath = loadedRoute.$loaderPaths$[hash];
+		if (!loaderPath) continue;
+		if (basePath !== "/" && !loaderPath.startsWith(basePath)) loaderPath = basePath + loaderPath.slice(1);
+		fetchRouteLoaderData(hash, loaderPath, manifestHash, {
+			pageUrl: url,
+			basePath
+		}).catch(() => {});
+	}
+};
+/** @public */
+var useHttpStatus = () => useContext(HttpStatusContext).value;
+/** @public */
+var useContent = () => useContext(ContentContext);
 /**
 * Returns the document head for the current page. The generic type describes the front matter.
 *
 * @public
-*/ var useDocumentHead = () => useContext(DocumentHeadContext);
-/** @public */ var useLocation = () => useContext(RouteLocationContext);
-/** @public */ var useNavigate = () => useContext(RouteNavigateContext);
-/** @internal Implementation of usePreventNavigate$ */ var usePreventNavigateQrl = (fn) => {
+*/
+var useDocumentHead = () => useContext(DocumentHeadContext);
+/** @public */
+var useLocation = () => useContext(RouteLocationContext);
+/** @public */
+var useNavigate = () => useContext(RouteNavigateContext);
+/** @internal Implementation of usePreventNavigate$ */
+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]));
 };
@@ -106,26 +112,33 @@ import { renderToStream } from "@qwik.dev/core/server";
 * you can show a dialog or just return `true` to prevent the navigation.
 *
 * @public
-*/ var usePreventNavigate$ = implicit$FirstArg(usePreventNavigateQrl);
+*/
+var usePreventNavigate$ = implicit$FirstArg(usePreventNavigateQrl);
 var useAction = () => useContext(RouteActionContext);
 var useQwikRouterEnv = () => noSerialize(useServerData("qwikrouter"));
-/** @public */ var Link = /*#__PURE__*/ componentQrl(/*#__PURE__*/ inlinedQrl((props) => {
+/** @public */
+var Link = /*#__PURE__*/ componentQrl(/*#__PURE__*/ inlinedQrl((props) => {
 	const nav = useNavigate();
 	const loc = useLocation();
 	const head = useDocumentHead();
-	const originalHref = props.href;
 	const { onClick$, prefetch: prefetchProp, reload, replaceState, scroll, prefetchBundles: prefetchBundlesProp = "visible", prefetchData: prefetchDataProp = prefetchProp === "js" ? "off" : "intent", ...linkProps } = props;
 	const clientNavPath = untrack(getClientNavPath, {
 		...linkProps,
 		reload
 	}, loc);
-	linkProps.href = clientNavPath || originalHref;
+	linkProps.href = clientNavPath || props.href;
 	const isDepratedPrefetchDisabled = prefetchProp === false;
 	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;
@@ -133,15 +146,22 @@ var useQwikRouterEnv = () => noSerialize(useServerData("qwikrouter"));
 		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");
@@ -160,34 +180,37 @@ var useQwikRouterEnv = () => noSerialize(useServerData("qwikrouter"));
 		replaceState,
 		scroll
 	]) : null;
-	const handlePreload = /*#__PURE__*/ inlinedQrl((_, elm) => {
-		prefetchRoute(new URL(elm.href), false, 1);
-	}, "Link_component_handlePreload_AAemwtuBjsE");
 	return /*#__PURE__*/ _jsxSplit("a", {
-		"q:link": !!clientNavPath,
-		..._getVarProps(linkProps),
-		..._getConstProps(linkProps),
+		..._getVarProps({ "q:link": !!clientNavPath }),
+		..._getConstProps({ "q:link": !!clientNavPath }),
+		...linkProps,
 		"data-q-prefetch": shouldVisiblePrefetchBundles && shouldVisiblePrefetchData ? "bd" : shouldVisiblePrefetchBundles ? "b" : shouldVisiblePrefetchData ? "d" : null,
 		"q-e:click": [
 			preventDefault,
-			handlePreload,
+			/*#__PURE__*/ inlinedQrl((_, elm) => {
+				prefetchRoute(new URL(elm.href), false, 1);
+			}, "Link_component_handlePreload_AAemwtuBjsE"),
 			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]
-	}, null, /*#__PURE__*/ _jsxSorted(Slot, null, null, null, 3, "jO_0"), 0, "jO_1");
+		"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 newScrollState = () => {
-	return {
-		x: 0,
-		y: 0,
-		w: 0,
-		h: 0
-	};
-};
 var clientNavigate = (win, navType, fromURL, toURL, replaceState = false) => {
 	if (navType !== "popstate") {
 		const samePath = isSamePath(fromURL, toURL);
@@ -199,11 +222,19 @@ var clientNavigate = (win, navType, fromURL, toURL, replaceState = false) => {
 		}
 	}
 };
+var newScrollState = () => {
+	return {
+		x: 0,
+		y: 0,
+		w: 0,
+		h: 0
+	};
+};
 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();
@@ -211,6 +242,14 @@ var cleanupPrefetchObserver;
 var resetLinkPrefetchState = () => {
 	prefetchedLinks = /* @__PURE__ */ new WeakSet();
 };
+var refreshLinkPrefetchObserver = (manifestHash) => {
+	resetLinkPrefetchState();
+	cleanupPrefetchObserver?.();
+	cleanupPrefetchObserver = createLinkPrefetchObserver(manifestHash);
+};
+var linkPrefetchInit = eventQrl(/*#__PURE__*/ inlinedQrl((_, element) => {
+	refreshLinkPrefetchObserver(element.closest("[q\\:manifest-hash]")?.getAttribute("q:manifest-hash") || void 0);
+}, "linkPrefetchInit_event_hoZr9O26Irg"));
 var createLinkPrefetchObserver = (manifestHash) => {
 	const anchors = document.querySelectorAll("a[q\\:link][data-q-prefetch]");
 	const prefetchAnchor = (anchor, observer) => {
@@ -242,20 +281,18 @@ var createLinkPrefetchObserver = (manifestHash) => {
 		observer.disconnect();
 	};
 };
-var refreshLinkPrefetchObserver = (manifestHash) => {
-	resetLinkPrefetchState();
-	cleanupPrefetchObserver?.();
-	cleanupPrefetchObserver = createLinkPrefetchObserver(manifestHash);
-};
-var linkPrefetchInit = eventQrl(/*#__PURE__*/ inlinedQrl((_, element) => {
-	refreshLinkPrefetchObserver(element.closest("[q\\:manifest-hash]")?.getAttribute("q:manifest-hash") || void 0);
-}, "linkPrefetchInit_event_hoZr9O26Irg"));
 function callRestoreScrollOnDocument() {
 	if (document.__q_scroll_restore__) {
 		document.__q_scroll_restore__();
 		document.__q_scroll_restore__ = void 0;
 	}
 }
+var restoreScroll = (type, toUrl, fromUrl, scroller, scrollState) => {
+	if (type === "popstate" && scrollState) scroller.scrollTo(scrollState.x, scrollState.y);
+	else if (type === "link" || type === "form") {
+		if (!hashScroll(toUrl, fromUrl)) scroller.scrollTo(0, 0);
+	}
+};
 var hashScroll = (toUrl, fromUrl) => {
 	const elmId = toUrl.hash.slice(1);
 	const elm = elmId && document.getElementById(elmId);
@@ -265,12 +302,6 @@ var hashScroll = (toUrl, fromUrl) => {
 	} else if (!elm && toUrl.hash && isSamePath(toUrl, fromUrl)) return true;
 	return false;
 };
-var restoreScroll = (type, toUrl, fromUrl, scroller, scrollState) => {
-	if (type === "popstate" && scrollState) scroller.scrollTo(scrollState.x, scrollState.y);
-	else if (type === "link" || type === "form") {
-		if (!hashScroll(toUrl, fromUrl)) scroller.scrollTo(0, 0);
-	}
-};
 var currentScrollState = (elm) => {
 	return {
 		x: elm.scrollLeft,
@@ -411,7 +442,8 @@ var spa_init_default = eventQrl(/*#__PURE__*/ inlinedQrl((_, el) => {
 * POSTs to the route URL with `qaction={actionId}` appended and `Accept: application/json`. The
 * server runs the action and returns the action result, optionally with the loader hashes that
 * should be invalidated.
-*/ async function submitAction(action, routeUrl) {
+*/
+async function submitAction(action, routeUrl) {
 	const pathBase = ensureSlash(routeUrl.pathname);
 	const searchParams = new URLSearchParams(routeUrl.search);
 	searchParams.set(QACTION_KEY, action.id);
@@ -433,15 +465,11 @@ var spa_init_default = eventQrl(/*#__PURE__*/ inlinedQrl((_, el) => {
 		}
 	};
 	const response = await fetch(url, fetchOptions);
-	if (response.redirected) {
-		const redirectedURL = new URL(response.url);
-		if (redirectedURL.origin !== location.origin) {
-			location.href = redirectedURL.href;
-			return;
-		}
-		location.href = redirectedURL.href;
-		return;
-	}
+	if (response.redirected) return {
+		status: response.status,
+		result: void 0,
+		redirect: new URL(response.url)
+	};
 	if ((response.headers.get("content-type") || "").includes("json")) {
 		const text = await response.text();
 		const data = await _deserialize(text);
@@ -454,9 +482,11 @@ var spa_init_default = eventQrl(/*#__PURE__*/ inlinedQrl((_, el) => {
 	}
 }
 var qwik_view_transition_default = "@layer qwik{@supports selector(html:active-view-transition-type(type)){html:active-view-transition-type(qwik-navigation){& :root{view-transition-name:none}}}@supports not selector(html:active-view-transition-type(type)){:root{view-transition-name:none}}}";
-/** View transitions are opt-in and require browser support. */ var shouldStartViewTransition = (viewTransition) => viewTransition === true && "startViewTransition" in document;
+/** View transitions are opt-in and require browser support. */
+var shouldStartViewTransition = (viewTransition) => viewTransition === true && "startViewTransition" in document;
 var VIEW_TRANSITION_STYLE_ID = "qwik-view-transition";
-/** Inject the view-transition stylesheet once, only when a transition actually runs. */ var ensureViewTransitionStyles = () => {
+/** Inject the view-transition stylesheet once, only when a transition actually runs. */
+var ensureViewTransitionStyles = () => {
 	if (document.getElementById(VIEW_TRANSITION_STYLE_ID)) return;
 	const style = document.createElement("style");
 	style.id = VIEW_TRANSITION_STYLE_ID;
@@ -481,44 +511,17 @@ var startViewTransition = (params) => {
 	} else return { ready: params.update() };
 };
 /**
-* Qwik Router Component
-*
-* This file contains the main Qwik Router component, which initializes the router and provides the
-* necessary context for it to work. It also contains the logic for handling navigation, including
-* updating the URL, managing scroll restoration, and resolving document head changes.
-*
-* Note: This component is designed to work both on the server and the client. During server-side
-* rendering (SSR), it initializes the router state based on the URL and route data provided by the
-* server environment. On the client, it handles navigation events and updates the router state
-* accordingly.
-*
-* SSR is _required_ for the initial load.
-*
-* The flow of navigation is as follows:
-*
-* 1. During SSR, the server environment parses the initial URL and collects the route data.
-* 2. It runs the middleware hooks (`onRequest`, `onGet`, `onPost`, etc.), and responds to q-loader,
-*    action$ and server$ requests.
-* 3. If SSR is deemed appropriate, the route data is provided via `useServerData` and this component
-*    uses it to initialize the router contexts, register Tasks, and render the Slot. This component
-*    will never render again.
-* 4. Then, slotted components like `<DocumentHeadTags />` and `<RouterOutlet />` can consume the route
-*    data to render the page.
-* 5. On the client, when a navigation event occurs, this calls `goto()`, which updates the URL in the
-*    same tick, loads the route data and adjusts the router context.
-* 6. The changed contexts trigger the slotted components to re-render with the new route data.
-*
-* Since the head data can depend on route loaders and they get their data asynchronously and can
-* update without navigation, the head is resolved in a separate Task that tracks the relevant
-* signals.
-*/
-/**
 * @deprecated Use `QWIK_ROUTER_SCROLLER` instead (will be removed in V3)
 * @public
-*/ var QWIK_CITY_SCROLLER = "_qCityScroller";
-/** @public */ var QWIK_ROUTER_SCROLLER = "_qRouterScroller";
+*/
+var QWIK_CITY_SCROLLER = "_qCityScroller";
+/** @public */
+var QWIK_ROUTER_SCROLLER = "_qRouterScroller";
 var preventNav = {};
-var internalState = { navCount: 0 };
+var internalState = {
+	navCount: 0,
+	attemptCount: 0
+};
 var getScroller = () => {
 	let scroller = document.getElementById(QWIK_ROUTER_SCROLLER);
 	if (!scroller) {
@@ -527,154 +530,13 @@ var getScroller = () => {
 	}
 	return scroller ?? document.documentElement;
 };
-/** @public */ var useQwikMockRouter = (props) => {
-	const urlEnv = props.url ?? "http://localhost/";
-	const url = new URL(urlEnv);
-	const routeLocation = useStore({
-		url,
-		params: props.params ?? {},
-		isNavigating: false,
-		prevUrl: void 0
-	}, { deep: false });
-	const loadersData = props.loaders?.reduce((acc, { loader, data }) => {
-		acc[loader.__id] = data;
-		return acc;
-	}, {});
-	const loadersState = useStore({}, { deep: false });
-	for (const [loaderId, data] of Object.entries(loadersData ?? {})) loadersState[loaderId] ||= createComputedQrl(/*#__PURE__*/ inlinedQrl(() => {
-		return _captures[0];
-	}, "useQwikMockRouter_createComputed_JL6bChMwwyc", [data]));
-	const goto = props.goto ?? /*#__PURE__*/ inlinedQrl(async () => {
-		console.warn("QwikRouterMockProvider: goto not provided");
-	}, "useQwikMockRouter_goto_aViHFxQ1a3s");
-	const documentHead = useStore(createDocumentHead, { deep: false });
-	const content = useStore({
-		headings: void 0,
-		menu: void 0
-	}, { deep: false });
-	const contentInternal = useSignal();
-	const actionState = useSignal();
-	const httpStatus = useSignal({
-		status: 200,
-		message: ""
-	});
-	useContextProvider(ContentContext, content);
-	useContextProvider(ContentInternalContext, contentInternal);
-	useContextProvider(DocumentHeadContext, documentHead);
-	useContextProvider(HttpStatusContext, httpStatus);
-	useContextProvider(RouteLocationContext, routeLocation);
-	useContextProvider(RouteNavigateContext, goto);
-	useContextProvider(RouteStateContext, loadersState);
-	useContextProvider(RouteActionContext, actionState);
-	const actionsMocks = props.actions?.reduce((acc, { action, handler }) => {
-		acc[action.__id] = handler;
-		return acc;
-	}, {});
-	useTaskQrl(/*#__PURE__*/ inlinedQrl(async ({ track }) => {
-		const actionState = _captures[0], actionsMocks = _captures[1];
-		const action = track(actionState);
-		if (!action?.resolve) return;
-		const mock = actionsMocks?.[action.id];
-		if (mock) {
-			const actionResult = await mock(action.data);
-			action.resolve(actionResult);
-		}
-	}, "useQwikMockRouter_useTask_tXTLR4tzCy0", [actionState, actionsMocks]));
-};
-/** @public */ var QwikRouterMockProvider = /*#__PURE__*/ componentQrl(/*#__PURE__*/ inlinedQrl((props) => {
-	useQwikMockRouter(props);
-	return /*#__PURE__*/ _jsxSorted(Slot, null, null, null, 3, "5y_1");
-}, "QwikRouterMockProvider_component_IN4dVpT0x74"));
-/**
-* @deprecated Use `useQwikMockRouter()` instead. Will be removed in V3
-* @public
-*/ var QwikCityMockProvider = QwikRouterMockProvider;
-function initializeSPA(goto, scroller) {
-	if (!window._qRouterSPA) {
-		window._qRouterSPA = true;
-		history.scrollRestoration = "manual";
-		window.addEventListener("popstate", () => {
-			window._qRouterScrollEnabled = false;
-			clearTimeout(window._qRouterScrollDebounce);
-			goto(location.href, { type: "popstate" });
-		});
-		window.removeEventListener("popstate", window._qRouterInitPopstate);
-		window._qRouterInitPopstate = void 0;
-		if (!window._qRouterHistoryPatch) {
-			window._qRouterHistoryPatch = true;
-			const pushState = history.pushState;
-			const replaceState = history.replaceState;
-			const prepareState = (state) => {
-				if (state === null || typeof state === "undefined") state = {};
-				else if (state?.constructor !== Object) {
-					state = { _data: state };
-					if (isDev) console.warn("In a Qwik SPA context, `history.state` is used to store scroll state. Direct calls to `pushState()` and `replaceState()` must supply an actual Object type. We need to be able to automatically attach the scroll state to your state object. A new state object has been created, your data has been moved to: `history.state._data`");
-				}
-				state._qRouterScroll = state._qRouterScroll || currentScrollState(scroller);
-				return state;
-			};
-			history.pushState = (state, title, url) => {
-				state = prepareState(state);
-				return pushState.call(history, state, title, url);
-			};
-			history.replaceState = (state, title, url) => {
-				state = prepareState(state);
-				return replaceState.call(history, state, title, url);
-			};
-		}
-		document.addEventListener("click", (event) => {
-			if (event.defaultPrevented) return;
-			const target = event.target.closest("a[href]");
-			if (target && !target.hasAttribute("preventdefault:click")) {
-				const href = target.getAttribute("href");
-				const prev = new URL(location.href);
-				const dest = new URL(href, prev);
-				if (isSameOrigin(dest, prev) && isSamePath(dest, prev)) {
-					event.preventDefault();
-					if (!dest.hash && !dest.href.endsWith("#")) {
-						if (dest.href !== prev.href) history.pushState(null, "", dest);
-						window._qRouterScrollEnabled = false;
-						clearTimeout(window._qRouterScrollDebounce);
-						saveScrollHistory({
-							...currentScrollState(scroller),
-							x: 0,
-							y: 0
-						});
-						location.reload();
-						return;
-					}
-					goto(target.getAttribute("href"));
-				}
-			}
-		});
-		document.removeEventListener("click", window._qRouterInitAnchors);
-		window._qRouterInitAnchors = void 0;
-		if (!window.navigation) {
-			document.addEventListener("visibilitychange", () => {
-				if (window._qRouterScrollEnabled && document.visibilityState === "hidden") saveScrollHistory(currentScrollState(scroller));
-			}, { passive: true });
-			document.removeEventListener("visibilitychange", window._qRouterInitVisibility);
-			window._qRouterInitVisibility = void 0;
-		}
-		window.addEventListener("scroll", () => {
-			if (!window._qRouterScrollEnabled) return;
-			clearTimeout(window._qRouterScrollDebounce);
-			window._qRouterScrollDebounce = setTimeout(() => {
-				saveScrollHistory(currentScrollState(scroller));
-				window._qRouterScrollDebounce = void 0;
-			}, 200);
-		}, { passive: true });
-		removeEventListener("scroll", window._qRouterInitScroll);
-		window._qRouterInitScroll = void 0;
-		spa_init_default.resolve();
-	}
-}
 /**
 * @public
 * This hook initializes Qwik Router, providing the necessary context for it to work.
 *
 * This hook should be used once, at the root of your application.
-*/ var useQwikRouter = (props) => {
+*/
+var useQwikRouter = (props) => {
 	if (!isServer) throw new Error("useQwikRouter can only run during SSR on the server. If you are seeing this, it means you are re-rendering the root of your application. Fix that or use the <QwikRouterProvider> component around the root of your application.");
 	const env = useQwikRouterEnv();
 	if (!env?.params) throw new Error(`Missing Qwik Router Env Data for help visit https://github.com/QwikDev/qwik/issues/6237`);
@@ -695,7 +557,7 @@ function initializeSPA(goto, scroller) {
 	routeLoaderCtx.manifestHash = manifestHash;
 	const loaderState = {};
 	const contentModulesForInit = env.loadedRoute.$mods$;
-	const loaders = ensureRouteLoaderSignals(contentModulesForInit, loaderState, routeLoaderCtx);
+	const loaders = ensureRouteLoaderSignals(contentModulesForInit, loaderState, routeLoaderCtx, env.ev);
 	for (const loader of loaders) if (loader.__id in env.loaderValues) {
 		const value = env.loaderValues[loader.__id];
 		setLoaderSignalValue(loaderState[loader.__id], value);
@@ -711,9 +573,10 @@ function initializeSPA(goto, scroller) {
 	});
 	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();
+	*/
+	const navContext = useSignal();
 	const httpStatus = useSignal({
 		status: env.response.status,
 		message: env.loadedRoute.$notFound$ ? "Not Found" : env.response.statusMessage ?? ""
@@ -736,7 +599,7 @@ function initializeSPA(goto, scroller) {
 	const registerPreventNav = /*#__PURE__*/ inlinedQrl((fn$) => {
 		if (!isBrowser) return;
 		preventNav.$handler$ ||= (event) => {
-			internalState.navCount++;
+			internalState.attemptCount++;
 			if (!preventNav.$cbs$) return;
 			if ([...preventNav.$cbs$.values()].map((cb) => cb.resolved ? cb.resolved() : cb()).some(Boolean)) {
 				event.preventDefault();
@@ -763,8 +626,9 @@ function initializeSPA(goto, scroller) {
 	* Note: when goto is called, the address bar change must happen in the same tick for Safari to
 	* treat it as a user-initiated navigation and allow scroll restoration to work. For this reason,
 	* 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], routeLocation = _captures[4];
+	*/
+	const goto = /*#__PURE__*/ inlinedQrl(async (path, opt) => {
+		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);
@@ -774,12 +638,11 @@ function initializeSPA(goto, scroller) {
 		const lastDest = routeInternal.value.dest;
 		const dest = path === void 0 ? lastDest : typeof path === "number" ? path : toUrl(path, routeLocation.url);
 		if (navResolver.p && !forceReload && typeof dest !== "number" && isSamePath(dest, lastDest) && dest.href === lastDest.href) return navResolver.p;
-		const navCount = ++internalState.navCount;
-		internalState.currentTransition?.skipTransition();
+		const attemptCount = ++internalState.attemptCount;
 		if (preventNav.$cbs$ && (forceReload || typeof dest === "number" || !isSamePath(dest, lastDest) || !isSameOrigin(dest, lastDest))) {
 			const prevents = await Promise.all([...preventNav.$cbs$.values()].map((cb) => cb(dest)));
-			if (navCount !== internalState.navCount || prevents.some(Boolean)) {
-				if (navCount === internalState.navCount && type === "popstate") history.pushState(null, "", lastDest);
+			if (attemptCount !== internalState.attemptCount || prevents.some(Boolean)) {
+				if (attemptCount === internalState.attemptCount && type === "popstate") history.pushState(null, "", lastDest);
 				return;
 			}
 		}
@@ -803,9 +666,15 @@ function initializeSPA(goto, scroller) {
 				routeInternal.value.dest = newUrl;
 				routeLocation.url = newUrl;
 			}
-			return;
+			return navResolver.p;
 		}
+		const navCount = ++internalState.navCount;
+		internalState.currentTransition?.skipTransition();
+		navResolver.cancel?.();
+		navResolver.cancel = void 0;
+		navResolver.r?.();
 		let historyUpdated = false;
+		if (isBrowser) getClientRouteLoaders(routeLoaderCtx, routeLocation.url.href);
 		if (isBrowser && type === "link" && !forceReload) {
 			const scroller = getScroller();
 			window._qRouterScrollEnabled = false;
@@ -814,9 +683,10 @@ function initializeSPA(goto, scroller) {
 			clientNavigate(window, type, new URL(location.href), dest, replaceState);
 			historyUpdated = true;
 		}
+		const wasNavigating = routeLocation.isNavigating;
 		routeLocation.isNavigating = true;
 		const container = isBrowser ? _getContextContainer() : void 0;
-		if (container) {
+		if (container && !wasNavigating) {
 			await _waitUntilRendered(container);
 			if (navCount !== internalState.navCount) return;
 		}
@@ -829,6 +699,7 @@ function initializeSPA(goto, scroller) {
 			scroll,
 			historyUpdated
 		};
+		if (wasNavigating) abortRouteLoaderNavigation(routeLoaderCtx);
 		if (isBrowser) prefetchRoute(dest, false, .8, manifestHash, true);
 		navResolver.p = new Promise((resolve) => {
 			navResolver.r = () => {
@@ -843,6 +714,7 @@ function initializeSPA(goto, scroller) {
 		manifestHash,
 		navResolver,
 		routeInternal,
+		routeLoaderCtx,
 		routeLocation
 	]);
 	useContextProvider(ContentContext, content);
@@ -858,10 +730,13 @@ function initializeSPA(goto, scroller) {
 	/**
 	* This is split in 3 tasks because we need to update the head once we figured out the route, and
 	* 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], routeInternal = _captures[9], routeLoaderCtx = _captures[10], routeLocation = _captures[11], routeLocationTarget = _captures[12];
+	*/
+	useTaskQrl(/*#__PURE__*/ inlinedQrl(async ({ track }) => {
+		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;
@@ -870,7 +745,6 @@ function initializeSPA(goto, scroller) {
 		let endpointResponse;
 		let actionData;
 		let actionLoaderHashes;
-		let shouldInvalidateActionLoaders = false;
 		let loadedRoute;
 		if (isServer) {
 			trackUrl = new URL(navigation.dest, routeLocation.url);
@@ -879,20 +753,42 @@ function initializeSPA(goto, scroller) {
 			actionData = endpointResponse;
 		} else {
 			trackUrl = new URL(navigation.dest, location);
+			const canceled = new Promise((resolve) => {
+				navResolver.cancel = () => resolve(void 0);
+			});
 			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 = loadRoute(qwikRouterConfig.routes, qwikRouterConfig.cacheModules, trackUrl.pathname);
+			const loadRoutePromise = getRouterConfig().then((config) => {
+				if (internalState.navCount !== navCountBefore) return;
+				return loadRoute(config.routes, config.cacheModules, trackUrl.pathname);
+			});
 			try {
-				loadedRoute = await loadRoutePromise;
+				const route = await Promise.race([loadRoutePromise, canceled]);
+				if (!route) return;
+				loadedRoute = route;
 			} catch (e) {
+				if (internalState.navCount !== navCountBefore) return;
+				const preparedNavCount = getClientRouteLoaders(routeLoaderCtx).navCount;
+				if (preparedNavCount !== void 0) restoreRouteLoaders(loaderState, routeLoaderCtx, preparedNavCount);
 				console.error(`Could not load route ${trackUrl.pathname}, reloading:`, e);
 				window.location.href = trackUrl.href;
 				return;
 			}
 			if (internalState.navCount !== navCountBefore) return;
 			if (action) {
-				const result = await submitAction(action, trackUrl);
+				const result = await Promise.race([submitAction(action, trackUrl).then((result) => {
+					if (result && action.resolve) {
+						action.resolve({
+							status: result.status,
+							result: result.result
+						});
+						action.resolve = void 0;
+					}
+					return result;
+				}), canceled]);
+				if (internalState.navCount !== navCountBefore || action !== actionState.untrackedValue) return;
+				navResolver.cancel = void 0;
 				if (!result) {
 					routeInternal.untrackedValue = {
 						type: navType,
@@ -900,15 +796,9 @@ function initializeSPA(goto, scroller) {
 					};
 					return;
 				}
-				if (action.resolve) {
-					action.resolve({
-						status: result.status,
-						result: result.result
-					});
-					action.resolve = void 0;
-				}
 				if (result.redirect) {
-					goto(result.redirect, { replaceState: true });
+					if (result.redirect instanceof URL) location.href = result.redirect.href;
+					else goto(result.redirect, { replaceState: true });
 					return;
 				}
 				actionData = {
@@ -917,19 +807,17 @@ function initializeSPA(goto, scroller) {
 					actionResult: result.result
 				};
 				actionLoaderHashes = result.loaderHashes;
-				shouldInvalidateActionLoaders = true;
 			}
+			navResolver.cancel = void 0;
 		}
 		const { $routeName$, $params$, $mods$, $menu$, $notFound$ } = loadedRoute;
 		const contentModules = $mods$;
 		if (!isServer) routeLoaderCtx.goto = noSerialize(goto);
-		updateRouteLoaderPaths(routeLoaderCtx, loadedRoute.$loaderPaths$, trackUrl);
-		if (!isServer) invalidateNavRouteLoaders(loaderState);
-		const routeLoaders = ensureRouteLoaderSignals(contentModules, loaderState, routeLoaderCtx);
-		if (shouldInvalidateActionLoaders) {
-			if (actionLoaderHashes !== void 0) for (const hash of actionLoaderHashes) loaderState[hash]?.invalidate(true);
-			else for (const loader of routeLoaders) loaderState[loader.__id].invalidate(true);
-		}
+		let routeLoaders;
+		if (isServer) {
+			Object.assign(routeLoaderCtx.loaderPaths, loadedRoute.$loaderPaths$);
+			routeLoaders = ensureRouteLoaderSignals(contentModules, loaderState, routeLoaderCtx, env.ev);
+		} else routeLoaders = prepareRouteLoaders(contentModules, loaderState, routeLoaderCtx, loadedRoute.$loaderPaths$, trackUrl, prevUrl, navCountBefore, action ? actionLoaderHashes ?? null : void 0, action ?? navigation);
 		if (routeLoaders.length > 0) for (let i = 0; i < routeLoaders.length; i++) {
 			const loader = routeLoaders[i];
 			if (!isImmutableLoader(loader.__id)) loaderState[loader.__id].untrackedPending;
@@ -953,6 +841,7 @@ function initializeSPA(goto, scroller) {
 			message: "OK"
 		};
 		const pageModule = contentModules[contentModules.length - 1];
+		if (isSamePath(trackUrl, navigation.dest)) trackUrl.hash = navigation.dest.hash;
 		if (navigation.dest.search && !!isSamePath(trackUrl, prevUrl)) trackUrl.search = navigation.dest.search;
 		let shouldForcePrevUrl = false;
 		let shouldForceUrl = false;
@@ -1002,6 +891,7 @@ function initializeSPA(goto, scroller) {
 		httpStatus,
 		loaderState,
 		navContext,
+		navResolver,
 		routeInternal,
 		routeLoaderCtx,
 		routeLocation,
@@ -1012,9 +902,12 @@ function initializeSPA(goto, scroller) {
 	* without re-running the navigation logic.
 	*
 	* 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], routeLocation = _captures[4], serverHead = _captures[5];
+	*/
+	useTaskQrl(/*#__PURE__*/ inlinedQrl(({ track }) => {
+		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;
 		if (!contentModules) return;
 		const actionData = track(actionDataSignal);
 		let head;
@@ -1036,11 +929,13 @@ function initializeSPA(goto, scroller) {
 		contentInternal,
 		documentHead,
 		loaderState,
+		navContext,
 		routeLocation,
 		serverHead
 	]), { deferUpdates: isServer });
-	/** Actual navigation */ useTaskQrl(/*#__PURE__*/ inlinedQrl(({ track }) => {
-		const contentInternal = _captures[0], goto = _captures[1], manifestHash = _captures[2], navContext = _captures[3], navResolver = _captures[4], props = _captures[5], routeInternal = _captures[6], routeLocation = _captures[7];
+	/** Actual navigation */
+	useTaskQrl(/*#__PURE__*/ inlinedQrl(({ track }) => {
+		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;
@@ -1071,7 +966,12 @@ function initializeSPA(goto, scroller) {
 				if (currentPath !== nextPath) history.replaceState(history.state, "", nextPath);
 			} else clientNavigate(window, navType, prevUrl, trackUrl, replaceState);
 			contentInternal.trigger();
-			return navigatePromise = _waitUntilRendered(container);
+			return navigatePromise = _waitUntilRendered(container).then(() => {
+				if (nav.navCount === internalState.navCount) commitRouteLoaders(loaderState, routeLoaderCtx, nav.navCount);
+			}, (error) => {
+				if (nav.navCount === internalState.navCount) restoreRouteLoaders(loaderState, routeLoaderCtx, nav.navCount);
+				throw error;
+			});
 		};
 		const _waitNextPage = () => {
 			if (!shouldStartViewTransition(props?.viewTransition)) return navigate().then(() => void 0);
@@ -1104,40 +1004,192 @@ function initializeSPA(goto, scroller) {
 	}, "useQwikRouter_useTask_2_yw17chooOac", [
 		contentInternal,
 		goto,
+		loaderState,
 		manifestHash,
 		navContext,
 		navResolver,
 		props,
 		routeInternal,
+		routeLoaderCtx,
 		routeLocation
 	]), { deferUpdates: false });
 };
-/** @public This is a wrapper around the `useQwikRouter()` hook. We recommend using the hook instead of this component, unless you have a good reason to make your root component reactive. */ var QwikRouterProvider = /*#__PURE__*/ componentQrl(/*#__PURE__*/ inlinedQrl((props) => {
+/** @public This is a wrapper around the `useQwikRouter()` hook. We recommend using the hook instead of this component, unless you have a good reason to make your root component reactive. */
+function initializeSPA(goto, scroller) {
+	if (!window._qRouterSPA) {
+		window._qRouterSPA = true;
+		history.scrollRestoration = "manual";
+		window.addEventListener("popstate", () => {
+			window._qRouterScrollEnabled = false;
+			clearTimeout(window._qRouterScrollDebounce);
+			goto(location.href, { type: "popstate" });
+		});
+		window.removeEventListener("popstate", window._qRouterInitPopstate);
+		window._qRouterInitPopstate = void 0;
+		if (!window._qRouterHistoryPatch) {
+			window._qRouterHistoryPatch = true;
+			const pushState = history.pushState;
+			const replaceState = history.replaceState;
+			const prepareState = (state) => {
+				if (state === null || typeof state === "undefined") state = {};
+				else if (state?.constructor !== Object) {
+					state = { _data: state };
+					if (isDev) console.warn("In a Qwik SPA context, `history.state` is used to store scroll state. Direct calls to `pushState()` and `replaceState()` must supply an actual Object type. We need to be able to automatically attach the scroll state to your state object. A new state object has been created, your data has been moved to: `history.state._data`");
+				}
+				state._qRouterScroll = state._qRouterScroll || currentScrollState(scroller);
+				return state;
+			};
+			history.pushState = (state, title, url) => {
+				state = prepareState(state);
+				return pushState.call(history, state, title, url);
+			};
+			history.replaceState = (state, title, url) => {
+				state = prepareState(state);
+				return replaceState.call(history, state, title, url);
+			};
+		}
+		document.addEventListener("click", (event) => {
+			if (event.defaultPrevented) return;
+			const target = event.target.closest("a[href]");
+			if (target && !target.hasAttribute("preventdefault:click")) {
+				const href = target.getAttribute("href");
+				const prev = new URL(location.href);
+				const dest = new URL(href, prev);
+				if (isSameOrigin(dest, prev) && isSamePath(dest, prev)) {
+					event.preventDefault();
+					if (!dest.hash && !dest.href.endsWith("#")) {
+						if (dest.href !== prev.href) history.pushState(null, "", dest);
+						window._qRouterScrollEnabled = false;
+						clearTimeout(window._qRouterScrollDebounce);
+						saveScrollHistory({
+							...currentScrollState(scroller),
+							x: 0,
+							y: 0
+						});
+						location.reload();
+						return;
+					}
+					goto(target.getAttribute("href"));
+				}
+			}
+		});
+		document.removeEventListener("click", window._qRouterInitAnchors);
+		window._qRouterInitAnchors = void 0;
+		if (!window.navigation) {
+			document.addEventListener("visibilitychange", () => {
+				if (window._qRouterScrollEnabled && document.visibilityState === "hidden") saveScrollHistory(currentScrollState(scroller));
+			}, { passive: true });
+			document.removeEventListener("visibilitychange", window._qRouterInitVisibility);
+			window._qRouterInitVisibility = void 0;
+		}
+		window.addEventListener("scroll", () => {
+			if (!window._qRouterScrollEnabled) return;
+			clearTimeout(window._qRouterScrollDebounce);
+			window._qRouterScrollDebounce = setTimeout(() => {
+				saveScrollHistory(currentScrollState(scroller));
+				window._qRouterScrollDebounce = void 0;
+			}, 200);
+		}, { passive: true });
+		removeEventListener("scroll", window._qRouterInitScroll);
+		window._qRouterInitScroll = void 0;
+		spa_init_default.resolve();
+	}
+}
+var QwikRouterMockProvider = /*#__PURE__*/ componentQrl(/*#__PURE__*/ inlinedQrl((props) => {
+	useQwikMockRouter(props);
+	return /*#__PURE__*/ _jsxSorted(Slot, null, null, null, 3, "dU_1");
+}, "QwikRouterMockProvider_component_IN4dVpT0x74"));
+var useQwikMockRouter = (props) => {
+	const urlEnv = props.url ?? "http://localhost/";
+	const url = new URL(urlEnv);
+	const routeLocation = useStore({
+		url,
+		params: props.params ?? {},
+		isNavigating: false,
+		prevUrl: void 0
+	}, { deep: false });
+	const loadersData = props.loaders?.reduce((acc, { loader, data }) => {
+		acc[loader.__id] = data;
+		return acc;
+	}, {});
+	const loadersState = useStore({}, { deep: false });
+	for (const [loaderId, data] of Object.entries(loadersData ?? {})) loadersState[loaderId] ||= createComputedQrl(/*#__PURE__*/ inlinedQrl(() => {
+		return _capturesObj._[0];
+	}, "useQwikMockRouter_createComputed_JL6bChMwwyc", [data]));
+	const goto = props.goto ?? /*#__PURE__*/ inlinedQrl(async () => {
+		console.warn("QwikRouterMockProvider: goto not provided");
+	}, "useQwikMockRouter_goto_aViHFxQ1a3s");
+	const documentHead = useStore(createDocumentHead, { deep: false });
+	const content = useStore({
+		headings: void 0,
+		menu: void 0
+	}, { deep: false });
+	const contentInternal = useSignal();
+	const actionState = useSignal();
+	const httpStatus = useSignal({
+		status: 200,
+		message: ""
+	});
+	useContextProvider(ContentContext, content);
+	useContextProvider(ContentInternalContext, contentInternal);
+	useContextProvider(DocumentHeadContext, documentHead);
+	useContextProvider(HttpStatusContext, httpStatus);
+	useContextProvider(RouteLocationContext, routeLocation);
+	useContextProvider(RouteNavigateContext, goto);
+	useContextProvider(RouteStateContext, loadersState);
+	useContextProvider(RouteActionContext, actionState);
+	const actionsMocks = props.actions?.reduce((acc, { action, handler }) => {
+		acc[action.__id] = handler;
+		return acc;
+	}, {});
+	useTaskQrl(/*#__PURE__*/ inlinedQrl(async ({ track }) => {
+		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) {
+			const actionResult = await mock(action.data);
+			action.resolve(actionResult);
+		}
+	}, "useQwikMockRouter_useTask_tXTLR4tzCy0", [actionState, actionsMocks]));
+};
+var QwikRouterProvider = /*#__PURE__*/ componentQrl(/*#__PURE__*/ inlinedQrl((props) => {
 	useQwikRouter(props);
-	return /*#__PURE__*/ _jsxSorted(Slot, null, null, null, 3, "5y_0");
+	return /*#__PURE__*/ _jsxSorted(Slot, null, null, null, 3, "dU_0");
 }, "QwikRouterProvider_component_6Kjfa79mqlY"));
 /**
 * @deprecated Use `useQwikRouter()` instead. Will be removed in v3.
 * @public
-*/ var QwikCityProvider = QwikRouterProvider;
+*/
+var QwikCityProvider = QwikRouterProvider;
+/** @public */
+/** @public */
+/**
+* @deprecated Use `useQwikMockRouter()` instead. Will be removed in V3
+* @public
+*/
+var QwikCityMockProvider = QwikRouterMockProvider;
 var handleRouterPopstate = (nav, event) => {
 	const href = event.detail?.href;
 	if (href) return nav(href, { type: "popstate" });
 };
-/** @public */ var RouterOutlet = /*#__PURE__*/ componentQrl(/*#__PURE__*/ inlinedQrl(() => {
+/** @public */
+var RouterOutlet = /*#__PURE__*/ componentQrl(/*#__PURE__*/ inlinedQrl(() => {
 	if (!useServerData("containerAttributes")) throw new Error("PrefetchServiceWorker component must be rendered on the server.");
 	const internalContext = useContext(ContentInternalContext);
 	const nav = useNavigate();
 	const contents = internalContext.value;
 	if (contents && contents.length > 0) {
-		const contentsLen = contents.length;
 		let cmp = null;
-		for (let i = contentsLen - 1; i >= 0; i--) if (contents[i].default) cmp = _jsxSorted(contents[i].default, null, null, cmp, 1, "Fn_0");
+		for (let i = contents.length - 1; i >= 0; i--) if (contents[i].default) cmp = /*#__PURE__*/ _jsxSorted(contents[i].default, null, null, cmp, 1, "yd_0");
 		return /*#__PURE__*/ _jsxSorted(Fragment, null, null, [cmp, !__EXPERIMENTAL__.noSPA && /*#__PURE__*/ _jsxSorted("script", {
+			"q-d:qcinit": [spa_init_default, linkPrefetchInit],
 			"q-d:qinit": _qrlSync(() => {
 				((w, h) => {
 					if (!w._qcs) {
-						w._qcs = !0;
+						w._qcs = true;
 						const s = h.state?._qRouterScroll;
 						if (s) {
 							h.scrollRestoration = "manual";
@@ -1147,126 +1199,19 @@ var handleRouterPopstate = (nav, event) => {
 					}
 				})(window, history);
 			}, "()=>{((w,h)=>{if(!w._qcs){w._qcs=!0;const s=h.state?._qRouterScroll;if(s){h.scrollRestoration=\"manual\";w.scrollTo(s.x,s.y);}document.dispatchEvent(new Event(\"qcinit\"));}})(window,history);}"),
-			"q-d:qrouterpopstate": /*#__PURE__*/ inlinedQrl((event, _1, nav) => handleRouterPopstate(nav, event), "RouterOutlet_component_Fragment_script_q_d_qrouterpopstate_aRL6GvFyews").m(),
 			"q:p": nav
-		}, { "q-d:qcinit": [spa_init_default, linkPrefetchInit] }, null, 6, "Fn_1")], 1, "Fn_2");
+		}, { "q-d:qrouterpopstate": /*#__PURE__*/ inlinedQrl((event, _1, nav) => handleRouterPopstate(nav, event), "RouterOutlet_component_Fragment_script_q_d_qrouterpopstate_aRL6GvFyews").m() }, null, 6, "yd_0")], 1, "yd_1");
 	}
 	return SkipRender;
 }, "RouterOutlet_component_QwONcWD5gIg"));
-/** @internal */ var validatorQrl = (validator) => {
-	if (isServer) return { validate: validator };
-};
-/** @public */ var validator$ = /*#__PURE__*/ implicit$FirstArg(validatorQrl);
-var flattenValibotIssues = (issues) => {
-	return issues.reduce((acc, issue) => {
-		if (issue.path) {
-			if (issue.path.some((path) => path.type === "array")) {
-				const keySuffix = issue.expected === "Array" ? "[]" : "";
-				const key = issue.path.map((item) => item.type === "array" ? "*" : item.key).join(".").replace(/\.\*/g, "[]") + keySuffix;
-				acc[key] = acc[key] || [];
-				if (Array.isArray(acc[key])) acc[key].push(issue.message);
-				return acc;
-			} else acc[issue.path.map((item) => item.key).join(".")] = issue.message;
-		}
-		return acc;
-	}, {});
-};
-/** @internal */ var valibotQrl = (qrl) => {
-	if (!__EXPERIMENTAL__.valibot) throw new Error("Valibot is an experimental feature and is not enabled. Please enable the feature flag by adding `experimental: [\"valibot\"]` to your qwikVite plugin options.");
-	if (isServer) return {
-		__brand: "valibot",
-		async validate(ev, inputData) {
-			const schema = await qrl.resolve().then((obj) => typeof obj === "function" ? obj(ev) : obj);
-			const data = inputData ?? await ev.parseBody();
-			const result = await v.safeParseAsync(schema, data);
-			if (result.success) return {
-				success: true,
-				data: result.output
-			};
-			else {
-				if (isDev) console.error("ERROR: Valibot validation failed", result.issues);
-				return {
-					success: false,
-					status: 400,
-					error: {
-						formErrors: v.flatten(result.issues).root ?? [],
-						fieldErrors: flattenValibotIssues(result.issues)
-					}
-				};
-			}
-		}
-	};
-};
-/** @beta */ var valibot$ = /*#__PURE__*/ implicit$FirstArg(valibotQrl);
-var flattenZodIssues = (issues) => {
-	issues = Array.isArray(issues) ? issues : [issues];
-	return issues.reduce((acc, issue) => {
-		const isExpectingArray = "expected" in issue && issue.expected === "array";
-		if (issue.path.some((path) => typeof path === "number") || isExpectingArray) {
-			const keySuffix = "expected" in issue && issue.expected === "array" ? "[]" : "";
-			const key = issue.path.map((path) => typeof path === "number" ? "*" : path).join(".").replace(/\.\*/g, "[]") + keySuffix;
-			acc[key] = acc[key] || [];
-			if (Array.isArray(acc[key])) acc[key].push(issue.message);
-			return acc;
-		} else acc[issue.path.join(".")] = issue.message;
-		return acc;
-	}, {});
-};
-/** @internal */ var zodQrl = (qrl) => {
-	if (isServer) return {
-		__brand: "zod",
-		async validate(ev, inputData) {
-			const schema = await qrl.resolve().then((obj) => {
-				if (typeof obj === "function") obj = obj(z$1, ev);
-				if (obj instanceof z$1.ZodType) return obj;
-				else return z$1.object(obj);
-			});
-			const data = inputData ?? await ev.parseBody();
-			const result = await withLocale(ev.locale(), () => schema.safeParseAsync(data));
-			if (result.success) return result;
-			else {
-				if (isDev) console.error("ERROR: Zod validation failed", result.error.issues);
-				return {
-					success: false,
-					status: 400,
-					error: {
-						formErrors: result.error.flatten().formErrors,
-						fieldErrors: flattenZodIssues(result.error.issues)
-					}
-				};
-			}
-		}
-	};
-};
-/** @public */ var zod$ = /*#__PURE__*/ implicit$FirstArg(zodQrl);
-var getValidators = (rest, qrl) => {
-	let id;
-	let invalidate;
-	const validators = [];
-	if (rest.length === 1) {
-		const options = rest[0];
-		if (options && typeof options === "object") {
-			if ("validate" in options) validators.push(options);
-			else {
-				id = options.id;
-				if (options.validation) validators.push(...options.validation);
-				if (options.invalidate) invalidate = options.invalidate.map((loader) => loader.__id);
-			}
-		}
-	} else if (rest.length > 1) validators.push(...rest.filter((v) => !!v));
-	if (typeof id === "string") {
-		if (isDev) {
-			if (!/^[\w/.-]+$/.test(id)) throw new Error(`Invalid id: ${id}, id can only contain [a-zA-Z0-9_.-]`);
-		}
-		id = `id_${id}`;
-	} else id = qrl.getHash();
-	return {
-		validators: validators.reverse(),
-		id,
-		invalidate
-	};
-};
-/** @public */ var routeActionQrl = (actionQrl, ...rest) => {
+/**
+* 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
+*/
+function routeActionQrl(actionQrl, ...rest) {
 	const { id, validators, invalidate } = getValidators(rest, actionQrl);
 	function action() {
 		const loc = useLocation();
@@ -1293,7 +1238,7 @@ var getValidators = (rest, qrl) => {
 			return initialState;
 		});
 		initialState.submit = /* @__PURE__ */ inlinedQrl((input = {}) => {
-			const currentAction = _captures[0], id = _captures[1], loc = _captures[2], state = _captures[3];
+			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;
@@ -1305,7 +1250,14 @@ Action.run() can only be called on the browser, for example when a user clicks a
 					if (input.submitter.name) data.append(input.submitter.name, input.submitter.value);
 				}
 			} else data = input;
-			return new Promise((resolve) => {
+			const submission = {};
+			latestSubmission.current = submission;
+			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;
@@ -1313,17 +1265,21 @@ 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((_rawProps) => {
-				state.isRunning = false;
-				state.status = _rawProps.status;
-				state.value = _rawProps.result;
+			})).then(({ result, status }) => {
+				const isLatestSubmission = latestSubmission.current === submission;
+				if (isLatestSubmission) {
+					state.isRunning = false;
+					state.status = status;
+					state.value = result;
+				}
 				if (form) {
-					if (form.getAttribute("data-spa-reset") === "true") form.reset();
+					if (isLatestSubmission && form.getAttribute("data-spa-reset") === "true") form.reset();
 					const detail = {
-						status: _rawProps.status,
-						value: _rawProps.result
+						status,
+						value: result
 					};
 					form.dispatchEvent(new CustomEvent("submitcompleted", {
 						bubbles: false,
@@ -1333,13 +1289,14 @@ Action.run() can only be called on the browser, for example when a user clicks a
 					}));
 				}
 				return {
-					status: _rawProps.status,
-					value: _rawProps.result
+					status,
+					value: result
 				};
 			});
 		}, "routeActionQrl_action_submit_YuS5bpdQ360", [
 			currentAction,
 			id,
+			{ current: void 0 },
 			loc,
 			state
 		]);
@@ -1352,15 +1309,16 @@ Action.run() can only be called on the browser, for example when a user clicks a
 	action.__invalidate = invalidate;
 	Object.freeze(action);
 	return action;
-};
-/** @internal */ var globalActionQrl = (actionQrl, ...rest) => {
+}
+/** @internal */
+function globalActionQrl(actionQrl, ...rest) {
 	const action = routeActionQrl(actionQrl, ...rest);
 	if (isServer) {
 		if (typeof globalThis._qwikActionsMap === "undefined") globalThis._qwikActionsMap = /* @__PURE__ */ new Map();
 		globalThis._qwikActionsMap.set(action.__id, action);
 	}
 	return action;
-};
+}
 /**
 * Define a route action that handles form submissions or programmatic invocations.
 *
@@ -1380,27 +1338,106 @@ Action.run() can only be called on the browser, for example when a user clicks a
 * don't specify an explicit `invalidate` option.
 *
 * @public
-*/ var routeAction$ = /*#__PURE__*/ implicit$FirstArg(routeActionQrl);
-/** @public */ var globalAction$ = /*#__PURE__*/ implicit$FirstArg(globalActionQrl);
-var deserializeStream = async function* (stream, abortSignal) {
-	const reader = stream.getReader();
-	try {
-		let buffer = "";
-		const decoder = new TextDecoder();
-		while (!abortSignal?.aborted) {
-			const result = await reader.read();
-			if (result.done) break;
-			buffer += decoder.decode(result.value, { stream: true });
-			const lines = buffer.split(/\n/);
-			buffer = lines.pop();
-			for (const line of lines) yield await _deserialize(line);
+*/
+var routeAction$ = /*#__PURE__*/ implicit$FirstArg(routeActionQrl);
+/** @public */
+var globalAction$ = /*#__PURE__*/ implicit$FirstArg(globalActionQrl);
+/** @internal */
+function validatorQrl(validator) {
+	if (isServer) return { validate: validator };
+}
+/** @public */
+var validator$ = /*#__PURE__*/ implicit$FirstArg(validatorQrl);
+var flattenValibotIssues = (issues) => {
+	return issues.reduce((acc, issue) => {
+		if (issue.path) {
+			if (issue.path.some((path) => path.type === "array")) {
+				const keySuffix = issue.expected === "Array" ? "[]" : "";
+				const key = issue.path.map((item) => item.type === "array" ? "*" : item.key).join(".").replace(/\.\*/g, "[]") + keySuffix;
+				acc[key] = acc[key] || [];
+				if (Array.isArray(acc[key])) acc[key].push(issue.message);
+				return acc;
+			} else acc[issue.path.map((item) => item.key).join(".")] = issue.message;
 		}
-	} finally {
-		reader.releaseLock();
-	}
+		return acc;
+	}, {});
+};
+/** @internal */
+function valibotQrl(qrl) {
+	if (!__EXPERIMENTAL__.valibot) throw new Error("Valibot is an experimental feature and is not enabled. Please enable the feature flag by adding `experimental: [\"valibot\"]` to your qwikVite plugin options.");
+	if (isServer) return {
+		__brand: "valibot",
+		async validate(ev, inputData) {
+			const schema = await qrl.resolve().then((obj) => typeof obj === "function" ? obj(ev) : obj);
+			const data = inputData ?? await ev.parseBody();
+			const result = await v.safeParseAsync(schema, data);
+			if (result.success) return {
+				success: true,
+				data: result.output
+			};
+			else {
+				if (isDev) console.error("ERROR: Valibot validation failed", result.issues);
+				return {
+					success: false,
+					status: 400,
+					error: {
+						formErrors: v.flatten(result.issues).root ?? [],
+						fieldErrors: flattenValibotIssues(result.issues)
+					}
+				};
+			}
+		}
+	};
+}
+/** @beta */
+var valibot$ = /*#__PURE__*/ implicit$FirstArg(valibotQrl);
+var flattenZodIssues = (issues) => {
+	issues = Array.isArray(issues) ? issues : [issues];
+	return issues.reduce((acc, issue) => {
+		const isExpectingArray = "expected" in issue && issue.expected === "array";
+		if (issue.path.some((path) => typeof path === "number") || isExpectingArray) {
+			const keySuffix = "expected" in issue && issue.expected === "array" ? "[]" : "";
+			const key = issue.path.map((path) => typeof path === "number" ? "*" : path).join(".").replace(/\.\*/g, "[]") + keySuffix;
+			acc[key] = acc[key] || [];
+			if (Array.isArray(acc[key])) acc[key].push(issue.message);
+			return acc;
+		} else acc[issue.path.join(".")] = issue.message;
+		return acc;
+	}, {});
 };
-/** @internal */ var serverQrl = (qrl, options) => {
+/** @internal */
+function zodQrl(qrl) {
+	if (isServer) return {
+		__brand: "zod",
+		async validate(ev, inputData) {
+			const schema = await qrl.resolve().then((obj) => {
+				if (typeof obj === "function") obj = obj(z$1, ev);
+				if (obj instanceof z$1.ZodType) return obj;
+				else return z$1.object(obj);
+			});
+			const data = inputData ?? await ev.parseBody();
+			const result = await withLocale(ev.locale(), () => schema.safeParseAsync(data));
+			if (result.success) return result;
+			else {
+				if (isDev) console.error("ERROR: Zod validation failed", result.error.issues);
+				return {
+					success: false,
+					status: 400,
+					error: {
+						formErrors: result.error.flatten().formErrors,
+						fieldErrors: flattenZodIssues(result.error.issues)
+					}
+				};
+			}
+		}
+	};
+}
+/** @public */
+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.");
 	}
@@ -1409,7 +1446,7 @@ var deserializeStream = async function* (stream, abortSignal) {
 	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 {
@@ -1442,13 +1479,13 @@ var deserializeStream = async function* (stream, abortSignal) {
 			else config.body = body;
 			const res = await fetch(`${origin}?${QFN_KEY}=${qrlHash}${query}`, config);
 			const contentType = res.headers.get("Content-Type");
-			if (res.ok && contentType === "text/qwik-json-stream" && res.body) return async function* () {
+			if (res.ok && contentType === "text/qwik-json-stream" && res.body) return (async function* () {
 				try {
 					for await (const result of deserializeStream(res.body, abortSignal)) yield result;
 				} finally {
 					if (!abortSignal?.aborted) await res.body.cancel();
 				}
-			}();
+			})();
 			else if (contentType === "application/qwik-json") {
 				const str = await res.text();
 				const obj = await _deserialize(str);
@@ -1471,8 +1508,57 @@ var deserializeStream = async function* (stream, abortSignal) {
 		origin,
 		qrl
 	]);
+}
+/** @public */
+var server$ = /*#__PURE__*/ implicit$FirstArg(serverQrl);
+function getValidators(rest, qrl) {
+	let id;
+	let invalidate;
+	const validators = [];
+	if (rest.length === 1) {
+		const options = rest[0];
+		if (options && typeof options === "object") {
+			if ("validate" in options) validators.push(options);
+			else {
+				id = options.id;
+				if (options.validation) validators.push(...options.validation);
+				if (options.invalidate) invalidate = options.invalidate.map((loader) => loader.__id);
+			}
+		}
+	} else if (rest.length > 1) validators.push(...rest.filter((v) => !!v));
+	if (typeof id === "string") {
+		if (isDev) {
+			if (!/^[\w/.-]+$/.test(id)) throw new Error(`Invalid id: ${id}, id can only contain [a-zA-Z0-9_.-]`);
+		}
+		id = `id_${id}`;
+	} else id = qrl.getHash();
+	return {
+		validators: validators.reverse(),
+		id,
+		invalidate
+	};
+}
+var deserializeStream = async function* (stream, abortSignal) {
+	const reader = stream.getReader();
+	try {
+		let buffer = "";
+		const decoder = new TextDecoder();
+		while (!abortSignal?.aborted) {
+			const result = await reader.read();
+			if (result.done) break;
+			buffer += decoder.decode(result.value, { stream: true });
+			const lines = buffer.split(/\n/);
+			buffer = lines.pop();
+			for (const line of lines) yield await _deserialize(line);
+		}
+	} finally {
+		reader.releaseLock();
+	}
 };
-/** @public */ var server$ = /*#__PURE__*/ implicit$FirstArg(serverQrl);
+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
@@ -1485,14 +1571,43 @@ var deserializeStream = async function* (stream, abortSignal) {
 * service-worker.ts file) as long as you want to unregister the service-worker.js for your users.
 *
 * @public
-*/ var ServiceWorkerRegister = (props) => /*#__PURE__*/ _jsxSorted("script", { nonce: _wrapProp(props, "nonce") }, {
-	type: "module",
-	dangerouslySetInnerHTML: swRegister
-}, null, 3, "1x_0");
-var _hf0 = (p0) => !p0.reloadDocument;
-var _hf0_str = "!p0.reloadDocument";
-var _hf1 = (p0) => p0.spaReset ? "true" : void 0;
-var _hf1_str = "p0.spaReset?\"true\":undefined";
+*/
+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 */
+var Form = ({ action, spaReset, reloadDocument, onSubmit$, ...rest }, key) => {
+	if (action) {
+		if (Array.isArray(onSubmit$)) return /*#__PURE__*/ _jsxSplit("form", {
+			..._getVarProps(rest),
+			..._getConstProps(rest),
+			action: _wrapProp(action, "actionPath"),
+			"preventdefault:submit": !reloadDocument,
+			"q-e:submit": [...onSubmit$, !reloadDocument ? /*#__PURE__*/ inlinedQrl((evt) => {
+				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
+		}, { method: "post" }, null, 0, key);
+		return /*#__PURE__*/ _jsxSplit("form", {
+			..._getVarProps(rest),
+			..._getConstProps(rest),
+			action: _wrapProp(action, "actionPath"),
+			"preventdefault:submit": !reloadDocument,
+			"q-e:submit": [onSubmit$, !reloadDocument ? action.submit : void 0],
+			["data-spa-reset"]: spaReset ? "true" : void 0
+		}, { method: "post" }, null, 0, key);
+	} else return /*#__PURE__*/ createElement(GetForm, {
+		...rest,
+		spaReset,
+		reloadDocument,
+		onSubmit$,
+		key
+	});
+};
 var GetForm = /*#__PURE__*/ componentQrl(/*#__PURE__*/ inlinedQrl((_rawProps) => {
 	const rest = _restProps(_rawProps, [
 		"action",
@@ -1503,14 +1618,12 @@ var GetForm = /*#__PURE__*/ componentQrl(/*#__PURE__*/ inlinedQrl((_rawProps) =>
 	const nav = useNavigate();
 	return /*#__PURE__*/ _jsxSplit("form", {
 		action: "get",
-		"preventdefault:submit": _fnSignal(_hf0, [_rawProps], _hf0_str),
-		"data-spa-reset": _fnSignal(_hf1, [_rawProps], _hf1_str),
+		"data-spa-reset": _fnSignal(_hf0, [_rawProps], _hf0_str),
 		..._getVarProps(rest),
-		..._getConstProps(rest),
 		"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) => {
@@ -1531,40 +1644,16 @@ var GetForm = /*#__PURE__*/ componentQrl(/*#__PURE__*/ inlinedQrl((_rawProps) =>
 				}));
 			}, "GetForm_component_form_q_e_submit_1_cuYklZAOHrA")
 		]
-	}, null, /*#__PURE__*/ _jsxSorted(Slot, null, null, null, 3, "Q4_0"), 0, "Q4_1");
+	}, {
+		..._getConstProps(rest),
+		"preventdefault:submit": true
+	}, /*#__PURE__*/ _jsxSorted(Slot, null, null, null, 3, "TF_0"), 0, "TF_1");
 }, "GetForm_component_2U5Z2Z8ryc0"));
-/** @public */ var Form = ({ action, spaReset, reloadDocument, onSubmit$, ...rest }, key) => {
-	if (action) {
-		if (Array.isArray(onSubmit$)) return _jsxSplit("form", {
-			..._getVarProps(rest),
-			..._getConstProps(rest),
-			action: _wrapProp(action, "actionPath"),
-			"preventdefault:submit": !reloadDocument,
-			"q-e:submit": [...onSubmit$, !reloadDocument ? /*#__PURE__*/ inlinedQrl((evt) => {
-				const action = _captures[0];
-				if (!action.submitted) return action.submit(evt);
-			}, "Form_form_q_e_submit_6i0Jq5q8JFg", [action]) : void 0],
-			["data-spa-reset"]: spaReset ? "true" : void 0
-		}, { method: "post" }, null, 0, key);
-		return _jsxSplit("form", {
-			..._getVarProps(rest),
-			..._getConstProps(rest),
-			action: _wrapProp(action, "actionPath"),
-			"preventdefault:submit": !reloadDocument,
-			"q-e:submit": [onSubmit$, !reloadDocument ? action.submit : void 0],
-			["data-spa-reset"]: spaReset ? "true" : void 0
-		}, { method: "post" }, null, 0, key);
-	} else return /*#__PURE__*/ _jsxSplit(GetForm, {
-		spaReset,
-		reloadDocument,
-		onSubmit$,
-		...rest
-	}, null, null, 0, key);
-};
 /**
 * @beta
 * @experimental
-*/ var untypedAppUrl = function appUrl(route, params, paramsPrefix = "") {
+*/
+var untypedAppUrl = function appUrl(route, params, paramsPrefix = "") {
 	const path = route.split("/");
 	for (let i = 0; i < path.length; i++) {
 		const segment = path[i];
@@ -1590,7 +1679,8 @@ var GetForm = /*#__PURE__*/ componentQrl(/*#__PURE__*/ inlinedQrl((_rawProps) =>
 *
 * @beta
 * @experimental
-*/ function omitProps(obj, keys) {
+*/
+function omitProps(obj, keys) {
 	const omittedObj = {};
 	for (const key in obj) if (!key.startsWith("param:") && !keys.includes(key)) omittedObj[key] = obj[key];
 	return omittedObj;
@@ -1621,8 +1711,9 @@ var GetForm = /*#__PURE__*/ componentQrl(/*#__PURE__*/ inlinedQrl((_rawProps) =>
 * ```
 *
 * @public
-*/ var createRenderer = (getOptions) => {
-	return (opts) => {
+*/
+var createRenderer = (getOptions) => {
+	return ((opts) => {
 		const { jsx, options } = getOptions(opts);
 		const renderOptions = opts.serverData.renderMode === "static" ? {
 			...options,
@@ -1632,7 +1723,7 @@ var GetForm = /*#__PURE__*/ componentQrl(/*#__PURE__*/ inlinedQrl((_rawProps) =>
 			}
 		} : options;
 		return renderToStream(jsx, renderOptions);
-	};
+	});
 };
 /**
 * This renders all the tags collected from `head`.
@@ -1655,16 +1746,17 @@ var GetForm = /*#__PURE__*/ componentQrl(/*#__PURE__*/ inlinedQrl((_rawProps) =>
 * `src/root.tsx` to make runtime changes to `<head>` if needed.
 *
 * @public
-*/ var DocumentHeadTags = /*#__PURE__*/ componentQrl(/*#__PURE__*/ inlinedQrl((props) => {
+*/
+var DocumentHeadTags = /*#__PURE__*/ componentQrl(/*#__PURE__*/ inlinedQrl((props) => {
 	let head = useDocumentHead();
 	if (props) head = {
 		...head,
 		...props
 	};
 	return /*#__PURE__*/ _jsxSorted(Fragment, null, null, [
-		head.title && /*#__PURE__*/ _jsxSorted("title", null, null, head.title, 1, "r5_0"),
-		head.meta.map((m) => /*#__PURE__*/ _jsxSplit("meta", { ..._getVarProps(m) }, _getConstProps(m), null, 0, "r5_1")),
-		head.links.map((l) => /*#__PURE__*/ _jsxSplit("link", { ..._getVarProps(l) }, _getConstProps(l), null, 0, "r5_2")),
+		head.title && /*#__PURE__*/ _jsxSorted("title", null, null, head.title, 1, "eL_0"),
+		head.meta.map((m) => /*#__PURE__*/ _jsxSplit("meta", { ..._getVarProps(m) }, _getConstProps(m), null, 0, "eL_1")),
+		head.links.map((l) => /*#__PURE__*/ _jsxSplit("link", { ..._getVarProps(l) }, _getConstProps(l), null, 0, "eL_2")),
 		head.styles.map((s) => {
 			const props = s.props || s;
 			return /*#__PURE__*/ createElement("style", {
@@ -1681,6 +1773,6 @@ var GetForm = /*#__PURE__*/ componentQrl(/*#__PURE__*/ inlinedQrl((_rawProps) =>
 				key: s.key
 			});
 		})
-	], 1, "r5_3");
+	], 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 };