@qwik.dev/router 2.0.0-beta.36 → 2.0.0-beta.37

package/lib/index.qwik.mjs

@@ -1,11 +1,14 @@
-import { componentQrl, inlinedQrl, useErrorBoundary, useOnWindow, _captures, _jsxSorted, Slot, useSignal, untrack, _qrlSync, useVisibleTaskQrl, _jsxSplit, _getConstProps, _getVarProps, isDev, eventQrl, isServer, useStylesQrl, useServerData, useStore, useContextProvider, useTaskQrl, getLocale, noSerialize, isBrowser, useContext, SkipRender, implicit$FirstArg, withLocale, _wrapProp, _restProps, _fnSignal, createElement } from '@qwik.dev/core';
+import { componentQrl, inlinedQrl, useErrorBoundary, useOnWindow, _captures, _jsxSorted, Slot, isBrowser, useSignal, untrack, _qrlSync, useVisibleTaskQrl, _jsxSplit, _getConstProps, _getVarProps, isDev, eventQrl, isServer, useStylesQrl, useServerData, useStore, useContextProvider, useTaskQrl, noSerialize, getLocale, useContext, SkipRender, implicit$FirstArg, withLocale, _wrapProp, _restProps, _fnSignal, createElement } from '@qwik.dev/core';
 import { Fragment } from '@qwik.dev/core/jsx-runtime';
-import { g as getClientNavPath, s as shouldPreload, p as preloadRouteBundles, l as loadClientData, i as isSamePath, c as createLoaderSignal, a as createDocumentHead, b as loadRoute, r as resolveHead, C as CLIENT_DATA_CACHE, d as isSameOrigin, Q as Q_ROUTE, D as DEFAULT_LOADERS_SERIALIZATION_STRATEGY, t as toUrl, e as clientNavigate, f as toPath, h as QFN_KEY, j as QACTION_KEY, k as QDATA_KEY } from './chunks/routing.qwik.mjs';
-import { u as useNavigate, a as useLocation, b as useQwikRouterEnv, C as ContentContext, c as ContentInternalContext, D as DocumentHeadContext, H as HttpStatusContext, R as RouteLocationContext, d as RouteNavigateContext, e as RouteStateContext, f as RouteActionContext, g as RoutePreventNavigateContext, h as useAction, i as useDocumentHead } from './chunks/use-functions.qwik.mjs';
-export { j as useContent, k as useHttpStatus, l as usePreventNavigate$, m as usePreventNavigateQrl } from './chunks/use-functions.qwik.mjs';
 import * as qwikRouterConfig from '@qwik-router-config';
-import { _getContextContainer, SerializerSymbol, _UNINITIALIZED, _hasStoreEffects, forceStoreEffects, _waitUntilRendered, _getContextHostElement, _getContextEvent, _serialize, _deserialize, _resolveContextWithoutSequentialScope } from '@qwik.dev/core/internal';
-import { _asyncRequestStore } from '@qwik.dev/router/middleware/request-handler';
+import { p } from '@qwik.dev/core/preloader';
+import { e as ensureSlash } from './chunks/pathname.mjs';
+import { f as fetchRouteLoaderData, Q as QACTION_KEY, e as ensureRouteLoaderSignals, s as setLoaderSignalValue, C as ContentContext, a as ContentInternalContext, D as DocumentHeadContext, H as HttpStatusContext, R as RouteLocationContext, b as RouteNavigateContext, c as RouteStateContext, d as RouteLoaderCtxContext, g as RouteActionContext, h as RoutePreventNavigateContext, u as updateRouteLoaderPaths, i as Q_ROUTE, j as getRequestEvent, k as QFN_KEY, l as QDATA_KEY } from './chunks/deepFreeze.qwik.mjs';
+export { r as routeLoader$, m as routeLoaderQrl } from './chunks/deepFreeze.qwik.mjs';
+import { l as loadRoute, g as getClientNavPath, s as shouldPreload, i as isSamePath, t as toPath, c as createDocumentHead, r as resolveHead, a as toUrl, b as isSameOrigin } from './chunks/head.qwik.mjs';
+import { u as useNavigate, a as useLocation, b as useDocumentHead, c as useQwikRouterEnv, d as useAction } from './chunks/use-functions.qwik.mjs';
+export { e as useContent, f as useHttpStatus, g as usePreventNavigate$, h as usePreventNavigateQrl } from './chunks/use-functions.qwik.mjs';
+import { _deserialize, _hasStoreEffects, _getContextContainer, forceStoreEffects, createAsyncQrl, _waitUntilRendered, _getContextHostElement, _serialize } from '@qwik.dev/core/internal';
 import * as v from 'valibot';
 import * as z from 'zod';
 export { z } from 'zod';
@@ -26,10 +29,52 @@ const ErrorBoundary = /* @__PURE__ */ componentQrl(/* @__PURE__ */ inlinedQrl((p
   return /* @__PURE__ */ _jsxSorted(Slot, null, null, null, 3, "bA_1");
 }, "ErrorBoundary_component_pOa6vjtC7ik"));
 
+async function prefetchRoute(url, prefetchData, probability = 0.8, manifestHash, prefetchBundle = true) {
+  if (!isBrowser) {
+    return;
+  }
+  try {
+    const loadedRoute = await loadRoute(qwikRouterConfig.routes, qwikRouterConfig.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);
+    }
+    if (!prefetchData || !manifestHash) {
+      return;
+    }
+    if (loadedRoute.$loaders$?.length && loadedRoute.$loaderPaths$) {
+      const basePath = qwikRouterConfig.basePathname ?? "/";
+      for (const hash of loadedRoute.$loaders$) {
+        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(() => {
+        });
+      }
+    }
+  } catch {
+  }
+}
+
 const __vite_import_meta_env__ = {};
 const Link = /* @__PURE__ */ componentQrl(/* @__PURE__ */ inlinedQrl((props) => {
   const nav = useNavigate();
   const loc = useLocation();
+  const head = useDocumentHead();
   const originalHref = props.href;
   const anchorRef = useSignal();
   const { onClick$, prefetch: prefetchProp, reload, replaceState, scroll, prefetchBundle: prefetchBundleProp = "visible", prefetchData: prefetchDataProp = prefetchProp === "js" ? "off" : "intent", ...linkProps } = props;
@@ -42,27 +87,18 @@ const Link = /* @__PURE__ */ componentQrl(/* @__PURE__ */ inlinedQrl((props) =>
   const shouldPrefetch = untrack(shouldPreload, clientNavPath, loc);
   const shouldPrefetchBundle = !!clientNavPath && prefetchBundleProp !== "off" && shouldPrefetch && !isDepratedPrefetchDisabled;
   const shouldPrefetchData = !!clientNavPath && prefetchDataProp !== "off" && shouldPrefetch && !isDepratedPrefetchDisabled;
-  const handleBundlePrefetch = shouldPrefetchBundle ? /* @__PURE__ */ inlinedQrl((_, elm) => {
-    if (navigator.connection?.saveData) {
-      return;
-    }
-    if (elm && elm.href) {
-      const url = new URL(elm.href);
-      preloadRouteBundles(url.pathname);
-    }
-  }, "Link_component_handleBundlePrefetch_ZttUP0kLKj0") : null;
   const handleDataPrefetch = shouldPrefetchData ? /* @__PURE__ */ inlinedQrl((_, elm) => {
+    const head2 = _captures[0];
     if (navigator.connection?.saveData) {
       return;
     }
     if (elm && elm.href) {
       const url = new URL(elm.href);
-      loadClientData(url, {
-        preloadRouteBundles: false,
-        isPrefetch: true
-      });
+      prefetchRoute(url, true, 0.8, head2.manifestHash, false);
     }
-  }, "Link_component_handleDataPrefetch_lcd4O9LHbbA") : null;
+  }, "Link_component_handleDataPrefetch_lcd4O9LHbbA", [
+    head
+  ]) : null;
   const preventDefault = clientNavPath ? _qrlSync((event) => {
     if (!(event.metaKey || event.ctrlKey || event.shiftKey || event.altKey)) {
       event.preventDefault();
@@ -104,10 +140,10 @@ const Link = /* @__PURE__ */ componentQrl(/* @__PURE__ */ inlinedQrl((props) =>
   ]) : null;
   const handlePreload = /* @__PURE__ */ inlinedQrl((_, elm) => {
     const url = new URL(elm.href);
-    preloadRouteBundles(url.pathname, 1);
+    prefetchRoute(url, false, 1);
   }, "Link_component_handlePreload_AAemwtuBjsE");
   useVisibleTaskQrl(/* @__PURE__ */ inlinedQrl(({ track }) => {
-    const anchorRef2 = _captures[0], handleBundlePrefetch2 = _captures[1], handleDataPrefetch2 = _captures[2], linkProps2 = _captures[3], loc2 = _captures[4], prefetchBundleProp2 = _captures[5], prefetchDataProp2 = _captures[6], prefetchProp2 = _captures[7];
+    const anchorRef2 = _captures[0], handleDataPrefetch2 = _captures[1], head2 = _captures[2], linkProps2 = _captures[3], loc2 = _captures[4], prefetchBundleProp2 = _captures[5], prefetchDataProp2 = _captures[6], prefetchProp2 = _captures[7], shouldPrefetchBundle2 = _captures[8];
     track(() => loc2.url.pathname);
     const handler = linkProps2.onQVisible$;
     if (handler) {
@@ -119,25 +155,27 @@ const Link = /* @__PURE__ */ componentQrl(/* @__PURE__ */ inlinedQrl((props) =>
       }
     }
     const isProdOrTest = !isDev || __vite_import_meta_env__?.TEST;
-    if (isProdOrTest && anchorRef2.value) {
-      if (prefetchBundleProp2 === "visible" || // deprecated prop below, remove in favor of prefetchBundle
-      prefetchProp2 === "js" || prefetchProp2 === true) {
-        handleBundlePrefetch2?.(null, anchorRef2.value);
-      }
-      if (prefetchDataProp2 === "visible" || // deprecated prop below, remove in favor of prefetchData
-      prefetchProp2 === true) {
-        handleDataPrefetch2?.(null, anchorRef2.value);
+    if (isProdOrTest && anchorRef2.value?.href && !navigator.connection?.saveData) {
+      if (handleDataPrefetch2 && (prefetchDataProp2 === "visible" || // deprecated prop below, remove in favor of prefetchData
+      prefetchProp2 === true)) {
+        const url = new URL(anchorRef2.value.href);
+        prefetchRoute(url, true, 0.8, head2.manifestHash, shouldPrefetchBundle2);
+      } else if (shouldPrefetchBundle2 && (prefetchBundleProp2 === "visible" || // deprecated prop below, remove in favor of prefetchBundle
+      prefetchProp2 === "js" || prefetchProp2 === true)) {
+        const url = new URL(anchorRef2.value.href);
+        prefetchRoute(url, false, 0.8);
       }
     }
   }, "Link_component_useVisibleTask_xKeuRmnoNSA", [
     anchorRef,
-    handleBundlePrefetch,
     handleDataPrefetch,
+    head,
     linkProps,
     loc,
     prefetchBundleProp,
     prefetchDataProp,
-    prefetchProp
+    prefetchProp,
+    shouldPrefetchBundle
   ]));
   return /* @__PURE__ */ _jsxSplit("a", {
     ref: anchorRef,
@@ -172,6 +210,31 @@ const Link = /* @__PURE__ */ componentQrl(/* @__PURE__ */ inlinedQrl((props) =>
   }, /* @__PURE__ */ _jsxSorted(Slot, null, null, null, 3, "jO_0"), 0, "jO_1");
 }, "Link_component_VPmar9tb3t4"));
 
+const newScrollState = () => {
+  return {
+    x: 0,
+    y: 0,
+    w: 0,
+    h: 0
+  };
+};
+const clientNavigate = (win, navType, fromURL, toURL, replaceState = false) => {
+  if (navType !== "popstate") {
+    const samePath = isSamePath(fromURL, toURL);
+    const sameHash = fromURL.hash === toURL.hash;
+    if (!samePath || !sameHash) {
+      const newState = {
+        _qRouterScroll: newScrollState()
+      };
+      if (replaceState) {
+        win.history.replaceState(newState, "", toPath(toURL));
+      } else {
+        win.history.pushState(newState, "", toPath(toURL));
+      }
+    }
+  }
+};
+
 const transitionCss = "@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}}}";
 
 function callRestoreScrollOnDocument() {
@@ -357,25 +420,67 @@ const spaInit = eventQrl(/* @__PURE__ */ inlinedQrl((_, el) => {
       }, 200);
     };
     window._qRouterScrollEnabled = true;
-    setTimeout(() => {
-      window.addEventListener("popstate", window._qRouterInitPopstate);
-      window.addEventListener("scroll", window._qRouterInitScroll, {
+    window.addEventListener("popstate", window._qRouterInitPopstate);
+    window.addEventListener("scroll", window._qRouterInitScroll, {
+      passive: true
+    });
+    document.addEventListener("click", window._qRouterInitAnchors);
+    if (!window.navigation) {
+      document.addEventListener("visibilitychange", window._qRouterInitVisibility, {
         passive: true
       });
-      document.addEventListener("click", window._qRouterInitAnchors);
-      if (!window.navigation) {
-        document.addEventListener("visibilitychange", window._qRouterInitVisibility, {
-          passive: true
-        });
-      }
-    }, 0);
+    }
   }
 }, "spa_init_event_igI1pUsax0E"));
 
-const startViewTransition = (params) => {
-  if (!params.update) {
-    return;
+async function submitAction(action, routePath) {
+  const pathBase = ensureSlash(routePath);
+  const url = `${pathBase}?${QACTION_KEY}=${encodeURIComponent(action.id)}`;
+  const actionData = action.data;
+  action.data = void 0;
+  let fetchOptions;
+  if (actionData instanceof FormData) {
+    fetchOptions = {
+      method: "POST",
+      body: actionData,
+      headers: {
+        Accept: "application/json"
+      }
+    };
+  } else {
+    fetchOptions = {
+      method: "POST",
+      body: JSON.stringify(actionData),
+      headers: {
+        "Content-Type": "application/json; charset=UTF-8",
+        Accept: "application/json"
+      }
+    };
+  }
+  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 void 0;
+    }
+    location.href = redirectedURL.href;
+    return void 0;
   }
+  if ((response.headers.get("content-type") || "").includes("json")) {
+    const text = await response.text();
+    const data = _deserialize(text);
+    return {
+      status: response.status,
+      result: data?.result,
+      redirect: data?.redirect,
+      loaderHashes: data?.loaderHashes
+    };
+  }
+  return void 0;
+}
+
+const startViewTransition = (params) => {
   if ("startViewTransition" in document) {
     let transition;
     try {
@@ -387,9 +492,14 @@ const startViewTransition = (params) => {
       detail: transition
     });
     document.dispatchEvent(event);
-    return transition;
+    return {
+      ready: transition.ready,
+      transition
+    };
   } else {
-    params.update?.();
+    return {
+      ready: params.update()
+    };
   }
 };
 
@@ -399,6 +509,196 @@ const preventNav = {};
 const internalState = {
   navCount: 0
 };
+const getScroller = () => {
+  let scroller = document.getElementById(QWIK_ROUTER_SCROLLER);
+  if (!scroller) {
+    scroller = document.getElementById(QWIK_CITY_SCROLLER);
+    if (scroller && isDev) {
+      console.warn(`Please update your scroller ID to "${QWIK_ROUTER_SCROLLER}" as "${QWIK_CITY_SCROLLER}" is deprecated and will be removed in V3`);
+    }
+  }
+  return scroller ?? document.documentElement;
+};
+const 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] ||= createAsyncQrl(/* @__PURE__ */ inlinedQrl(async () => {
+      const data2 = _captures[0];
+      return data2;
+    }, "useQwikMockRouter_createAsync_clbxpuXqpEU", [
+      data
+    ]), {
+      initial: 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 actionState2 = _captures[0], actionsMocks2 = _captures[1];
+    const action = track(actionState2);
+    if (!action?.resolve) {
+      return;
+    }
+    const mock = actionsMocks2?.[action.id];
+    if (mock) {
+      const actionResult = await mock(action.data);
+      action.resolve(actionResult);
+    }
+  }, "useQwikMockRouter_useTask_tXTLR4tzCy0", [
+    actionState,
+    actionsMocks
+  ]));
+};
+const QwikRouterMockProvider = /* @__PURE__ */ componentQrl(/* @__PURE__ */ inlinedQrl((props) => {
+  useQwikMockRouter(props);
+  return /* @__PURE__ */ _jsxSorted(Slot, null, null, null, 3, "5y_1");
+}, "QwikRouterMockProvider_component_IN4dVpT0x74"));
+const 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") {
+          const scrollState = currentScrollState(scroller);
+          saveScrollHistory(scrollState);
+        }
+      }, {
+        passive: true
+      });
+      document.removeEventListener("visibilitychange", window._qRouterInitVisibility);
+      window._qRouterInitVisibility = void 0;
+    }
+    window.addEventListener("scroll", () => {
+      if (!window._qRouterScrollEnabled) {
+        return;
+      }
+      clearTimeout(window._qRouterScrollDebounce);
+      window._qRouterScrollDebounce = setTimeout(() => {
+        const scrollState = currentScrollState(scroller);
+        saveScrollHistory(scrollState);
+        window._qRouterScrollDebounce = void 0;
+      }, 200);
+    }, {
+      passive: true
+    });
+    removeEventListener("scroll", window._qRouterInitScroll);
+    window._qRouterInitScroll = void 0;
+    spaInit.resolve();
+  }
+}
 const 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.");
@@ -425,27 +725,19 @@ const useQwikRouter = (props) => {
     deep: false
   });
   const navResolver = {};
-  const container = _getContextContainer();
-  const getSerializationStrategy = (loaderId) => {
-    return env.response.loadersSerializationStrategy.get(loaderId) || DEFAULT_LOADERS_SERIALIZATION_STRATEGY;
-  };
-  const loadersObject = {};
+  const routeLoaderCtx = useStore(env.routeLoaderCtx);
   const loaderState = {};
-  for (const [key, value] of Object.entries(env.response.loaders)) {
-    loadersObject[key] = value;
-    loaderState[key] = createLoaderSignal(loadersObject, key, url, getSerializationStrategy(key), container);
-  }
-  loadersObject[SerializerSymbol] = (obj) => {
-    const loadersSerializationObject = {};
-    for (const [k, v] of Object.entries(obj)) {
-      loadersSerializationObject[k] = getSerializationStrategy(k) === "always" ? v : _UNINITIALIZED;
+  const contentModulesForInit = env.loadedRoute.$mods$;
+  const loaders = ensureRouteLoaderSignals(contentModulesForInit, loaderState, routeLoaderCtx);
+  for (const loader of loaders) {
+    if (loader.__id in env.loaderValues) {
+      const value = env.loaderValues[loader.__id];
+      setLoaderSignalValue(loaderState[loader.__id], value);
     }
-    return loadersSerializationObject;
-  };
+  }
   const routeInternal = useSignal({
     type: "initial",
-    dest: url,
-    scroll: true
+    dest: url
   });
   const documentHead = useStore(() => createDocumentHead(serverHead, manifestHash));
   const content = useStore({
@@ -453,12 +745,13 @@ const useQwikRouter = (props) => {
     menu: void 0
   });
   const contentInternal = useSignal();
+  const navContext = useSignal();
   const httpStatus = useSignal({
     status: env.response.status,
     message: env.loadedRoute.$notFound$ ? "Not Found" : env.response.statusMessage ?? ""
   });
   const currentActionId = env.response.action;
-  const currentAction = currentActionId ? env.response.loaders[currentActionId] : void 0;
+  const currentAction = currentActionId ? env.response.actionResult : void 0;
   const actionState = useSignal(currentAction ? {
     id: currentActionId,
     data: env.response.formData,
@@ -467,6 +760,11 @@ const useQwikRouter = (props) => {
       status: env.response.status
     }
   } : void 0);
+  const actionDataSignal = useSignal(currentActionId ? {
+    action: currentActionId,
+    actionResult: currentAction,
+    status: env.response.status
+  } : void 0);
   const registerPreventNav = /* @__PURE__ */ inlinedQrl((fn$) => {
     if (!isBrowser) {
       return;
@@ -497,22 +795,11 @@ const useQwikRouter = (props) => {
       }
     };
   }, "useQwikRouter_registerPreventNav_69B0DK0eZJc");
-  const getScroller = /* @__PURE__ */ inlinedQrl(() => {
-    let scroller = document.getElementById(QWIK_ROUTER_SCROLLER);
-    if (!scroller) {
-      scroller = document.getElementById(QWIK_CITY_SCROLLER);
-      if (scroller && isDev) {
-        console.warn(`Please update your scroller ID to "${QWIK_ROUTER_SCROLLER}" as "${QWIK_CITY_SCROLLER}" is deprecated and will be removed in V3`);
-      }
-    }
-    return scroller ?? document.documentElement;
-  }, "useQwikRouter_getScroller_0UhDFwlxeFQ");
   const goto = /* @__PURE__ */ inlinedQrl(async (path, opt) => {
-    const actionState2 = _captures[0], getScroller2 = _captures[1], navResolver2 = _captures[2], routeInternal2 = _captures[3], routeLocation2 = _captures[4];
+    const actionState2 = _captures[0], manifestHash2 = _captures[1], navResolver2 = _captures[2], routeInternal2 = _captures[3], routeLocation2 = _captures[4];
     const { type = "link", forceReload = path === void 0, replaceState = false, scroll = true } = typeof opt === "object" ? opt : {
       forceReload: opt
     };
-    internalState.navCount++;
     if (isBrowser && type === "link" && routeInternal2.value.type === "initial") {
       const url2 = new URL(window.location.href);
       routeInternal2.value.dest = url2;
@@ -520,6 +807,11 @@ const useQwikRouter = (props) => {
     }
     const lastDest = routeInternal2.value.dest;
     const dest = path === void 0 ? lastDest : typeof path === "number" ? path : toUrl(path, routeLocation2.url);
+    if (navResolver2.p && !forceReload && typeof dest !== "number" && isSamePath(dest, lastDest) && dest.href === lastDest.href) {
+      return navResolver2.p;
+    }
+    internalState.navCount++;
+    internalState.currentTransition?.skipTransition();
     if (preventNav.$cbs$ && (forceReload || typeof dest === "number" || !isSamePath(dest, lastDest) || !isSameOrigin(dest, lastDest))) {
       const ourNavId = internalState.navCount;
       const prevents = await Promise.all([
@@ -549,7 +841,7 @@ const useQwikRouter = (props) => {
         if (type === "link" && dest.href !== location.href) {
           history.pushState(null, "", dest);
         }
-        const scroller = await getScroller2();
+        const scroller = getScroller();
         restoreScroll(type, dest, new URL(location.href), scroller, getScrollHistory());
         if (type === "popstate") {
           window._qRouterScrollEnabled = true;
@@ -564,7 +856,7 @@ const useQwikRouter = (props) => {
     }
     let historyUpdated = false;
     if (isBrowser && type === "link" && !forceReload) {
-      const scroller = await getScroller2();
+      const scroller = getScroller();
       window._qRouterScrollEnabled = false;
       clearTimeout(window._qRouterScrollDebounce);
       const scrollState = currentScrollState(scroller);
@@ -581,17 +873,21 @@ const useQwikRouter = (props) => {
       historyUpdated
     };
     if (isBrowser) {
-      loadClientData(dest);
-      loadRoute(qwikRouterConfig.routes, qwikRouterConfig.cacheModules, dest.pathname);
+      prefetchRoute(dest, true, 0.8, manifestHash2);
     }
     actionState2.value = void 0;
     routeLocation2.isNavigating = true;
-    return new Promise((resolve) => {
-      navResolver2.r = resolve;
+    navResolver2.p = new Promise((resolve) => {
+      navResolver2.r = () => {
+        navResolver2.r = void 0;
+        navResolver2.p = void 0;
+        resolve();
+      };
     });
+    return navResolver2.p;
   }, "useQwikRouter_goto_8j8Vrz2yUIM", [
     actionState,
-    getScroller,
+    manifestHash,
     navResolver,
     routeInternal,
     routeLocation
@@ -603,25 +899,29 @@ const useQwikRouter = (props) => {
   useContextProvider(RouteLocationContext, routeLocation);
   useContextProvider(RouteNavigateContext, goto);
   useContextProvider(RouteStateContext, loaderState);
+  useContextProvider(RouteLoaderCtxContext, routeLoaderCtx);
   useContextProvider(RouteActionContext, actionState);
   useContextProvider(RoutePreventNavigateContext, registerPreventNav);
   useTaskQrl(
     /* @__PURE__ */ inlinedQrl(async ({ track }) => {
-      const actionState2 = _captures[0], content2 = _captures[1], contentInternal2 = _captures[2], documentHead2 = _captures[3], env2 = _captures[4], getScroller2 = _captures[5], goto2 = _captures[6], httpStatus2 = _captures[7], loaderState2 = _captures[8], loadersObject2 = _captures[9], navResolver2 = _captures[10], props2 = _captures[11], routeInternal2 = _captures[12], routeLocation2 = _captures[13], routeLocationTarget2 = _captures[14], serverHead2 = _captures[15];
-      const container2 = _getContextContainer();
+      const actionDataSignal2 = _captures[0], actionState2 = _captures[1], content2 = _captures[2], contentInternal2 = _captures[3], env2 = _captures[4], goto2 = _captures[5], httpStatus2 = _captures[6], loaderState2 = _captures[7], navContext2 = _captures[8], routeInternal2 = _captures[9], routeLoaderCtx2 = _captures[10], routeLocation2 = _captures[11], routeLocationTarget2 = _captures[12];
       const navigation = track(routeInternal2);
       const action = track(actionState2);
-      const locale = getLocale("");
       const prevUrl = routeLocation2.url;
       const navType = action ? "form" : navigation.type;
       const replaceState = navigation.replaceState;
+      const navCountBefore = internalState.navCount;
       let trackUrl;
-      let clientPageData;
+      let endpointResponse;
+      let actionData;
+      let actionLoaderHashes;
+      let shouldInvalidateActionLoaders = false;
       let loadedRoute;
       if (isServer) {
         trackUrl = new URL(navigation.dest, routeLocation2.url);
         loadedRoute = env2.loadedRoute;
-        clientPageData = env2.response;
+        endpointResponse = env2.response;
+        actionData = endpointResponse;
       } else {
         trackUrl = new URL(navigation.dest, location);
         if (trackUrl.pathname.endsWith("/")) {
@@ -629,52 +929,90 @@ const useQwikRouter = (props) => {
             trackUrl.pathname = trackUrl.pathname.slice(0, -1);
           }
         } else if (!globalThis.__NO_TRAILING_SLASH__) {
-          trackUrl.pathname += "/";
-        }
-        let loadRoutePromise = loadRoute(qwikRouterConfig.routes, qwikRouterConfig.cacheModules, trackUrl.pathname);
-        const pageData = clientPageData = await loadClientData(trackUrl, {
-          action,
-          clearCache: true
-        });
-        if (!pageData) {
-          routeInternal2.untrackedValue = {
-            type: navType,
-            dest: trackUrl
-          };
-          return;
-        }
-        const newHref = pageData.href;
-        const newURL = new URL(newHref, trackUrl);
-        if (!isSamePath(newURL, trackUrl)) {
-          if (!pageData.isRewrite) {
-            trackUrl = newURL;
-          }
-          loadRoutePromise = loadRoute(
-            qwikRouterConfig.routes,
-            qwikRouterConfig.cacheModules,
-            newURL.pathname
-            // Load the actual required path.
-          );
+          trackUrl.pathname = ensureSlash(trackUrl.pathname);
         }
+        const loadRoutePromise = loadRoute(qwikRouterConfig.routes, qwikRouterConfig.cacheModules, trackUrl.pathname);
         try {
           loadedRoute = await loadRoutePromise;
         } catch (e) {
-          console.error(e);
-          window.location.href = newHref;
+          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.pathname);
+          if (!result) {
+            routeInternal2.untrackedValue = {
+              type: navType,
+              dest: trackUrl
+            };
+            return;
+          }
+          actionData = {
+            status: result.status,
+            action: action.id,
+            actionResult: result.result
+          };
+          if (action.resolve) {
+            action.resolve({
+              status: result.status,
+              result: result.result
+            });
+            action.resolve = void 0;
+          }
+          actionLoaderHashes = result.loaderHashes;
+          shouldInvalidateActionLoaders = true;
+        }
       }
       const { $routeName$, $params$, $mods$, $menu$, $notFound$ } = loadedRoute;
       const contentModules = $mods$;
+      if (!isServer) {
+        routeLoaderCtx2.goto = noSerialize(goto2);
+      }
+      updateRouteLoaderPaths(routeLoaderCtx2, loadedRoute.$loaderPaths$, trackUrl);
+      const routeLoaders = ensureRouteLoaderSignals(contentModules, loaderState2, routeLoaderCtx2);
+      if (shouldInvalidateActionLoaders) {
+        if (actionLoaderHashes !== void 0) {
+          for (const hash of actionLoaderHashes) {
+            loaderState2[hash]?.invalidate(true);
+          }
+        } else {
+          for (const loader of routeLoaders) {
+            loaderState2[loader.__id].invalidate(true);
+          }
+        }
+      }
+      if (routeLoaders.length > 0) {
+        for (let i = 0; i < routeLoaders.length; i++) {
+          const loader = routeLoaders[i];
+          loaderState2[loader.__id].untrackedLoading;
+        }
+      }
+      if (internalState.navCount !== navCountBefore) {
+        return;
+      }
       if ($notFound$) {
         httpStatus2.value = {
           status: 404,
           message: "Not Found"
         };
+      } else if (endpointResponse) {
+        httpStatus2.value = {
+          status: endpointResponse.status,
+          message: endpointResponse.statusMessage ?? "OK"
+        };
+      } else if (actionData) {
+        httpStatus2.value = {
+          status: actionData.status,
+          message: "OK"
+        };
       } else {
         httpStatus2.value = {
-          status: clientPageData?.status ?? 200,
-          message: clientPageData?.statusMessage ?? ""
+          status: 200,
+          message: "OK"
         };
       }
       const pageModule = contentModules[contentModules.length - 1];
@@ -702,310 +1040,197 @@ const useQwikRouter = (props) => {
         }
         routeLocationTarget2.params = $params$;
       }
-      routeInternal2.untrackedValue = {
+      const nextRouteInternal = {
         type: navType,
         dest: trackUrl
       };
-      const resolvedHead = resolveHead(clientPageData, routeLocation2, contentModules, locale, serverHead2);
+      if (navigation.forceReload !== void 0) {
+        nextRouteInternal.forceReload = navigation.forceReload;
+      }
+      if (navigation.replaceState !== void 0) {
+        nextRouteInternal.replaceState = navigation.replaceState;
+      }
+      if (navigation.scroll !== void 0) {
+        nextRouteInternal.scroll = navigation.scroll;
+      }
+      if (navigation.historyUpdated !== void 0) {
+        nextRouteInternal.historyUpdated = navigation.historyUpdated;
+      }
+      routeInternal2.untrackedValue = nextRouteInternal;
       content2.headings = pageModule.headings;
       content2.menu = $menu$;
       contentInternal2.untrackedValue = noSerialize(contentModules);
-      documentHead2.links = resolvedHead.links;
-      documentHead2.meta = resolvedHead.meta;
-      documentHead2.styles = resolvedHead.styles;
-      documentHead2.scripts = resolvedHead.scripts;
-      documentHead2.title = resolvedHead.title;
-      documentHead2.frontmatter = resolvedHead.frontmatter;
-      if (isBrowser) {
-        let scrollState;
-        if (navType === "popstate") {
-          scrollState = getScrollHistory();
-        }
-        const scroller = await getScroller2();
-        if (navigation.scroll && (!navigation.forceReload || !isSamePath(trackUrl, prevUrl)) && (navType === "link" || navType === "popstate") || navType === "form" && !isSamePath(trackUrl, prevUrl)) {
-          document.__q_scroll_restore__ = () => restoreScroll(navType, trackUrl, prevUrl, scroller, scrollState);
-        }
-        const loaders = clientPageData?.loaders;
-        if (loaders) {
-          for (const [key, value] of Object.entries(loaders)) {
-            const signal = loaderState2[key];
-            const awaitedValue = await value;
-            loadersObject2[key] = awaitedValue;
-            if (!signal) {
-              loaderState2[key] = createLoaderSignal(loadersObject2, key, trackUrl, DEFAULT_LOADERS_SERIALIZATION_STRATEGY, container2);
-            } else {
-              signal.invalidate();
-            }
-          }
-        }
-        CLIENT_DATA_CACHE.clear();
-        if (!window._qRouterSPA) {
-          window._qRouterSPA = true;
-          history.scrollRestoration = "manual";
-          window.addEventListener("popstate", () => {
-            window._qRouterScrollEnabled = false;
-            clearTimeout(window._qRouterScrollDebounce);
-            goto2(location.href, {
-              type: "popstate"
-            });
-          });
-          window.removeEventListener("popstate", window._qRouterInitPopstate);
-          window._qRouterInitPopstate = void 0;
-          if (!window._qRouterHistoryPatch) {
-            window._qRouterHistoryPatch = true;
-            const pushState = history.pushState;
-            const replaceState2 = 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, url2) => {
-              state = prepareState(state);
-              return pushState.call(history, state, title, url2);
-            };
-            history.replaceState = (state, title, url2) => {
-              state = prepareState(state);
-              return replaceState2.call(history, state, title, url2);
-            };
-          }
-          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;
-                }
-                goto2(target.getAttribute("href"));
-              }
-            }
-          });
-          document.removeEventListener("click", window._qRouterInitAnchors);
-          window._qRouterInitAnchors = void 0;
-          if (!window.navigation) {
-            document.addEventListener("visibilitychange", () => {
-              if ((window._qRouterScrollEnabled || window._qCityScrollEnabled) && document.visibilityState === "hidden") {
-                if (window._qCityScrollEnabled) {
-                  console.warn('"_qCityScrollEnabled" is deprecated. Use "_qRouterScrollEnabled" instead.');
-                }
-                const scrollState2 = currentScrollState(scroller);
-                saveScrollHistory(scrollState2);
-              }
-            }, {
-              passive: true
-            });
-            document.removeEventListener("visibilitychange", window._qRouterInitVisibility);
-            window._qRouterInitVisibility = void 0;
-          }
-          window.addEventListener("scroll", () => {
-            if (!window._qRouterScrollEnabled && !window._qCityScrollEnabled) {
-              return;
-            }
-            clearTimeout(window._qRouterScrollDebounce);
-            window._qRouterScrollDebounce = setTimeout(() => {
-              const scrollState2 = currentScrollState(scroller);
-              saveScrollHistory(scrollState2);
-              window._qRouterScrollDebounce = void 0;
-            }, 200);
-          }, {
-            passive: true
-          });
-          removeEventListener("scroll", window._qRouterInitScroll);
-          window._qRouterInitScroll = void 0;
-          spaInit.resolve();
-        }
-        if (navType !== "popstate") {
-          window._qRouterScrollEnabled = false;
-          clearTimeout(window._qRouterScrollDebounce);
-          if (!navigation.historyUpdated) {
-            const scrollState2 = currentScrollState(scroller);
-            saveScrollHistory(scrollState2);
-          }
-        }
-        const navigate = () => {
-          if (navigation.historyUpdated) {
-            const currentPath = location.pathname + location.search + location.hash;
-            const nextPath = toPath(trackUrl);
-            if (currentPath !== nextPath) {
-              history.replaceState(history.state, "", nextPath);
-            }
-          } else {
-            clientNavigate(window, navType, prevUrl, trackUrl, replaceState);
-          }
-          contentInternal2.trigger();
-          return _waitUntilRendered(container2);
-        };
-        const _waitNextPage = () => {
-          if (isServer || props2?.viewTransition === false) {
-            return navigate();
-          } else {
-            const viewTransition = startViewTransition({
-              update: navigate,
-              types: [
-                "qwik-navigation"
-              ]
-            });
-            if (!viewTransition) {
-              return Promise.resolve();
-            }
-            return viewTransition.ready;
-          }
-        };
-        _waitNextPage().catch((err) => {
-          navigate();
-          if (err instanceof DOMException && err.name === "TimeoutError") {
-            throw new Error('View transition timed out. This can happen if you have "disableCache" in your browser devtools enabled.');
-          }
-          throw err;
-        }).finally(() => {
-          container2.element.setAttribute?.(Q_ROUTE, $routeName$);
-          const scrollState2 = currentScrollState(scroller);
-          saveScrollHistory(scrollState2);
-          window._qRouterScrollEnabled = true;
-          if (isBrowser) {
-            callRestoreScrollOnDocument();
-          }
-          if (shouldForcePrevUrl) {
-            forceStoreEffects(routeLocation2, "prevUrl");
-          }
-          if (shouldForceUrl) {
-            forceStoreEffects(routeLocation2, "url");
-          }
-          if (shouldForceParams) {
-            forceStoreEffects(routeLocation2, "params");
-          }
-          routeLocation2.isNavigating = false;
-          navResolver2.r?.();
-        });
-      }
+      actionDataSignal2.value = actionData;
+      navContext2.value = noSerialize({
+        routeName: $routeName$,
+        navType,
+        replaceState,
+        shouldForcePrevUrl,
+        shouldForceUrl,
+        shouldForceParams,
+        navCount: navCountBefore
+      });
     }, "useQwikRouter_useTask_XpalYii770E", [
+      actionDataSignal,
       actionState,
       content,
       contentInternal,
-      documentHead,
       env,
-      getScroller,
       goto,
       httpStatus,
       loaderState,
-      loadersObject,
-      navResolver,
-      props,
+      navContext,
       routeInternal,
+      routeLoaderCtx,
       routeLocation,
-      routeLocationTarget,
-      serverHead
+      routeLocationTarget
     ]),
-    // We should only wait for navigation to complete on the server
+    // We should only wait for head calculation to complete on the server
     {
       deferUpdates: isServer
     }
   );
-};
-const QwikRouterProvider = /* @__PURE__ */ componentQrl(/* @__PURE__ */ inlinedQrl((props) => {
-  useQwikRouter(props);
-  return /* @__PURE__ */ _jsxSorted(Slot, null, null, null, 3, "5y_0");
-}, "QwikRouterProvider_component_6Kjfa79mqlY"));
-const QwikCityProvider = QwikRouterProvider;
-const 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 container = _getContextContainer();
-  const loadersObject = {};
-  const loadersState = {};
-  if (props.loaders) {
-    for (const { loader, data } of props.loaders) {
-      const id = loader.__id;
-      loadersObject[id] = data;
-      loadersState[id] = createLoaderSignal(loadersObject, id, url, DEFAULT_LOADERS_SERIALIZATION_STRATEGY, container);
+  useTaskQrl(/* @__PURE__ */ inlinedQrl(({ track }) => {
+    const actionDataSignal2 = _captures[0], contentInternal2 = _captures[1], documentHead2 = _captures[2], loaderState2 = _captures[3], routeLocation2 = _captures[4], serverHead2 = _captures[5];
+    const contentModules = track(contentInternal2);
+    if (!contentModules) {
+      return;
     }
-  }
-  const goto = props.goto ?? /* @__PURE__ */ inlinedQrl(async () => {
-    console.warn("QwikRouterMockProvider: goto not provided");
-  }, "useQwikMockRouter_goto_aViHFxQ1a3s");
-  const documentHead = useStore(createDocumentHead, {
-    deep: false
+    const actionData = track(actionDataSignal2);
+    const head = track(() => resolveHead(actionData, loaderState2, routeLocation2, contentModules, getLocale(""), serverHead2));
+    documentHead2.links = head.links;
+    documentHead2.meta = head.meta;
+    documentHead2.styles = head.styles;
+    documentHead2.scripts = head.scripts;
+    documentHead2.title = head.title;
+    documentHead2.frontmatter = head.frontmatter;
+  }, "useQwikRouter_useTask_1_1sKEZ9Pg1ow", [
+    actionDataSignal,
+    contentInternal,
+    documentHead,
+    loaderState,
+    routeLocation,
+    serverHead
+  ]), {
+    deferUpdates: isServer
   });
-  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 actionState2 = _captures[0], actionsMocks2 = _captures[1];
-    const action = track(actionState2);
-    if (!action?.resolve) {
+  useTaskQrl(/* @__PURE__ */ inlinedQrl(({ track }) => {
+    const contentInternal2 = _captures[0], goto2 = _captures[1], navContext2 = _captures[2], navResolver2 = _captures[3], props2 = _captures[4], routeInternal2 = _captures[5], routeLocation2 = _captures[6];
+    const nav = track(navContext2);
+    if (isServer || !nav) {
       return;
     }
-    const mock = actionsMocks2?.[action.id];
-    if (mock) {
-      const actionResult = await mock(action.data);
-      action.resolve(actionResult);
+    if (nav.navCount !== internalState.navCount) {
+      return;
     }
-  }, "useQwikMockRouter_useTask_tXTLR4tzCy0", [
-    actionState,
-    actionsMocks
-  ]));
+    const container = _getContextContainer();
+    const navigation = routeInternal2.untrackedValue;
+    const { navType, replaceState, routeName } = nav;
+    const trackUrl = routeLocation2.url;
+    const prevUrl = routeLocation2.prevUrl ?? trackUrl;
+    const scroller = getScroller();
+    let scrollState;
+    if (navType === "popstate") {
+      scrollState = getScrollHistory();
+    }
+    if (navigation.scroll && (!navigation.forceReload || !isSamePath(trackUrl, prevUrl)) && (navType === "link" || navType === "popstate") || navType === "form" && !isSamePath(trackUrl, prevUrl)) {
+      document.__q_scroll_restore__ = () => restoreScroll(navType, trackUrl, prevUrl, scroller, scrollState);
+    }
+    initializeSPA(goto2, scroller);
+    if (navType !== "popstate") {
+      window._qRouterScrollEnabled = false;
+      clearTimeout(window._qRouterScrollDebounce);
+      if (!navigation.historyUpdated) {
+        const scrollState2 = currentScrollState(scroller);
+        saveScrollHistory(scrollState2);
+      }
+    }
+    let didNavigate = false;
+    let navigatePromise;
+    let currentTransition;
+    const navigate = () => {
+      if (navigatePromise) {
+        return navigatePromise;
+      }
+      if (nav.navCount !== internalState.navCount) {
+        return Promise.resolve();
+      }
+      didNavigate = true;
+      if (navigation.historyUpdated) {
+        const currentPath = location.pathname + location.search + location.hash;
+        const nextPath = toPath(trackUrl);
+        if (currentPath !== nextPath) {
+          history.replaceState(history.state, "", nextPath);
+        }
+      } else {
+        clientNavigate(window, navType, prevUrl, trackUrl, replaceState);
+      }
+      contentInternal2.trigger();
+      return navigatePromise = _waitUntilRendered(container);
+    };
+    const _waitNextPage = () => {
+      if (props2?.viewTransition === false || !("startViewTransition" in document)) {
+        return navigate().then(() => void 0);
+      }
+      const { ready, transition } = startViewTransition({
+        update: navigate,
+        types: [
+          "qwik-navigation"
+        ]
+      });
+      currentTransition = transition;
+      internalState.currentTransition = transition;
+      return ready.then(() => transition, (reason) => {
+        if (!didNavigate && nav.navCount === internalState.navCount) {
+          return navigate().then(() => transition);
+        }
+        if (reason?.name === "AbortError") {
+          return transition;
+        }
+        throw reason;
+      });
+    };
+    _waitNextPage().finally(() => {
+      if (currentTransition && internalState.currentTransition === currentTransition) {
+        internalState.currentTransition = void 0;
+      }
+      if (nav.navCount !== internalState.navCount) {
+        return;
+      }
+      container.element.setAttribute?.(Q_ROUTE, routeName);
+      const scrollState2 = currentScrollState(scroller);
+      saveScrollHistory(scrollState2);
+      window._qRouterScrollEnabled = true;
+      callRestoreScrollOnDocument();
+      if (nav.shouldForcePrevUrl) {
+        forceStoreEffects(routeLocation2, "prevUrl");
+      }
+      if (nav.shouldForceUrl) {
+        forceStoreEffects(routeLocation2, "url");
+      }
+      if (nav.shouldForceParams) {
+        forceStoreEffects(routeLocation2, "params");
+      }
+      routeLocation2.isNavigating = false;
+      navResolver2.r?.();
+    });
+  }, "useQwikRouter_useTask_2_yw17chooOac", [
+    contentInternal,
+    goto,
+    navContext,
+    navResolver,
+    props,
+    routeInternal,
+    routeLocation
+  ]), {
+    deferUpdates: false
+  });
 };
-const QwikRouterMockProvider = /* @__PURE__ */ componentQrl(/* @__PURE__ */ inlinedQrl((props) => {
-  useQwikMockRouter(props);
-  return /* @__PURE__ */ _jsxSorted(Slot, null, null, null, 3, "5y_1");
-}, "QwikRouterMockProvider_component_IN4dVpT0x74"));
-const QwikCityMockProvider = QwikRouterMockProvider;
+const QwikRouterProvider = /* @__PURE__ */ componentQrl(/* @__PURE__ */ inlinedQrl((props) => {
+  useQwikRouter(props);
+  return /* @__PURE__ */ _jsxSorted(Slot, null, null, null, 3, "5y_0");
+}, "QwikRouterProvider_component_6Kjfa79mqlY"));
+const QwikCityProvider = QwikRouterProvider;
 
 const handleRouterPopstate = (nav, event) => {
   const href = event.detail?.href;
@@ -1057,7 +1282,6 @@ const RouterOutlet = /* @__PURE__ */ componentQrl(/* @__PURE__ */ inlinedQrl(()
   return SkipRender;
 }, "RouterOutlet_component_QwONcWD5gIg"));
 
-const getValue = (obj) => obj.value;
 const validatorQrl = (validator) => {
   if (isServer) {
     return {
@@ -1182,7 +1406,7 @@ const zodQrl = (qrl) => {
 const zod$ = /* @__PURE__ */ implicit$FirstArg(zodQrl);
 const getValidators = (rest, qrl) => {
   let id;
-  let serializationStrategy = DEFAULT_LOADERS_SERIALIZATION_STRATEGY;
+  let invalidate;
   const validators = [];
   if (rest.length === 1) {
     const options = rest[0];
@@ -1191,12 +1415,12 @@ const getValidators = (rest, qrl) => {
         validators.push(options);
       } else {
         id = options.id;
-        if (options.serializationStrategy) {
-          serializationStrategy = options.serializationStrategy;
-        }
         if (options.validation) {
           validators.push(...options.validation);
         }
+        if (options.invalidate) {
+          invalidate = options.invalidate.map((loader) => loader.__id);
+        }
       }
     }
   } else if (rest.length > 1) {
@@ -1215,11 +1439,11 @@ const getValidators = (rest, qrl) => {
   return {
     validators: validators.reverse(),
     id,
-    serializationStrategy
+    invalidate
   };
 };
 const routeActionQrl = (actionQrl, ...rest) => {
-  const { id, validators } = getValidators(rest, actionQrl);
+  const { id, validators, invalidate } = getValidators(rest, actionQrl);
   function action() {
     const loc = useLocation();
     const currentAction = useAction();
@@ -1314,6 +1538,7 @@ Action.run() can only be called on the browser, for example when a user clicks a
   action.__validators = validators;
   action.__qrl = actionQrl;
   action.__id = id;
+  action.__invalidate = invalidate;
   Object.freeze(action);
   return action;
 };
@@ -1329,32 +1554,6 @@ const globalActionQrl = (actionQrl, ...rest) => {
 };
 const routeAction$ = /* @__PURE__ */ implicit$FirstArg(routeActionQrl);
 const globalAction$ = /* @__PURE__ */ implicit$FirstArg(globalActionQrl);
-const routeLoaderQrl = (loaderQrl, ...rest) => {
-  const { id, validators, serializationStrategy } = getValidators(rest, loaderQrl);
-  function loader() {
-    const state = _resolveContextWithoutSequentialScope(RouteStateContext);
-    if (!(id in state)) {
-      throw new Error(`routeLoader$ "${loaderQrl.getSymbol()}" was invoked in a route where it was not declared.
-    This is because the routeLoader$ was not exported in a 'layout.tsx' or 'index.tsx' file of the existing route.
-    For more information check: https://qwik.dev/docs/route-loader/
-
-    If your are managing reusable logic or a library it is essential that this function is re-exported from within 'layout.tsx' or 'index.tsx file of the existing route otherwise it will not run or throw exception.
-    For more information check: https://qwik.dev/docs/re-exporting-loaders/`);
-    }
-    const loaderData = state[id];
-    untrack(getValue, loaderData);
-    return loaderData;
-  }
-  loader.__brand = "server_loader";
-  loader.__qrl = loaderQrl;
-  loader.__validators = validators;
-  loader.__id = id;
-  loader.__serializationStrategy = serializationStrategy;
-  loader.__expires = -1;
-  Object.freeze(loader);
-  return loader;
-};
-const routeLoader$ = /* @__PURE__ */ implicit$FirstArg(routeLoaderQrl);
 const deserializeStream = async function* (stream, abortSignal) {
   const reader = stream.getReader();
   try {
@@ -1394,16 +1593,7 @@ const serverQrl = (qrl, options) => {
     const fetchOptions2 = _captures[0], headers2 = _captures[1], method2 = _captures[2], origin2 = _captures[3], qrl2 = _captures[4];
     const abortSignal = args.length > 0 && args[0] instanceof AbortSignal ? args.shift() : void 0;
     if (isServer) {
-      let requestEvent = _asyncRequestStore?.getStore();
-      if (!requestEvent) {
-        const contexts = [
-          useQwikRouterEnv()?.ev,
-          this,
-          _getContextEvent()
-        ];
-        requestEvent = contexts.find((v2) => v2 && Object.prototype.hasOwnProperty.call(v2, "sharedMap") && Object.prototype.hasOwnProperty.call(v2, "cookie"));
-      }
-      return qrl2.apply(requestEvent, args);
+      return qrl2.apply(getRequestEvent(this), args);
     } else {
       let filteredArgs = args.map((arg) => {
         if (arg instanceof SubmitEvent && arg.target instanceof HTMLFormElement) {
@@ -1630,9 +1820,7 @@ const untypedAppUrl = function appUrl(route, params, paramsPrefix = "") {
   let url = path.join("/");
   let baseURL = "/";
   if (baseURL) {
-    if (!baseURL.endsWith("/")) {
-      baseURL += "/";
-    }
+    baseURL = ensureSlash(baseURL);
     while (url.startsWith("/")) {
       url = url.substring(1);
     }
@@ -1700,4 +1888,4 @@ const DocumentHeadTags = /* @__PURE__ */ componentQrl(/* @__PURE__ */ inlinedQrl
   ], 1, "r5_3");
 }, "DocumentHeadTags_component_9CrWYOoCpgY"));
 
-export { DocumentHeadTags, ErrorBoundary, Form, Link, QWIK_CITY_SCROLLER, QWIK_ROUTER_SCROLLER, QwikCityMockProvider, QwikCityProvider, QwikRouterMockProvider, QwikRouterProvider, RouterOutlet, ServiceWorkerRegister, createRenderer, globalAction$, globalActionQrl, omitProps, routeAction$, routeActionQrl, routeLoader$, routeLoaderQrl, server$, serverQrl, untypedAppUrl, useDocumentHead, useLocation, useNavigate, useQwikRouter, valibot$, valibotQrl, validator$, validatorQrl, zod$, zodQrl };
+export { DocumentHeadTags, ErrorBoundary, Form, Link, QWIK_CITY_SCROLLER, QWIK_ROUTER_SCROLLER, QwikCityMockProvider, QwikCityProvider, QwikRouterMockProvider, QwikRouterProvider, RouterOutlet, ServiceWorkerRegister, createRenderer, globalAction$, globalActionQrl, omitProps, routeAction$, routeActionQrl, server$, serverQrl, untypedAppUrl, useDocumentHead, useLocation, useNavigate, useQwikRouter, valibot$, valibotQrl, validator$, validatorQrl, zod$, zodQrl };