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

package/lib/index.qwik.mjs

@@ -1,6 +1,6 @@
-import { componentQrl, inlinedQrl, useErrorBoundary, useOnWindow, _captures, _jsxSorted, Slot, useSignal, untrack, _qrlSync, useVisibleTaskQrl, isDev, _jsxSplit, _getConstProps, _getVarProps, eventQrl, isServer, useStylesQrl, useServerData, useStore, useContextProvider, useTaskQrl, isBrowser, getLocale, noSerialize, useContext, SkipRender, implicit$FirstArg, withLocale, _wrapProp, _restProps, _fnSignal, createElement } from '@qwik.dev/core';
+import { componentQrl, inlinedQrl, useErrorBoundary, useOnWindow, _captures, _jsxSorted, Slot, useSignal, untrack, _qrlSync, useVisibleTaskQrl, isDev, _jsxSplit, _getConstProps, _getVarProps, eventQrl, isServer, useStylesQrl, useServerData, useStore, useContextProvider, useTaskQrl, getLocale, noSerialize, isBrowser, 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, D as DEFAULT_LOADERS_SERIALIZATION_STRATEGY, t as toUrl, b as isSameOrigin, d as clientNavigate, e as loadRoute, r as resolveHead, C as CLIENT_DATA_CACHE, Q as Q_ROUTE, f as toPath, h as QFN_KEY, j as QACTION_KEY, k as QDATA_KEY } from './chunks/routing.qwik.mjs';
+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';
@@ -176,9 +176,27 @@ const saveScrollHistory = (scrollState) => {
   history.replaceState(state, "");
 };
 
+const Q_ROUTER_POPSTATE_EVENT = "qrouterpopstate";
+const createCurrentPathTracker = (initialPath) => {
+  let currentPath = initialPath;
+  return (nextPath) => {
+    if (currentPath !== nextPath) {
+      currentPath = nextPath;
+      return true;
+    }
+    return false;
+  };
+};
+const dispatchRouterPopstate = (document1, href) => {
+  document1.dispatchEvent(new CustomEvent(Q_ROUTER_POPSTATE_EVENT, {
+    detail: {
+      href
+    }
+  }));
+};
 const spaInit = eventQrl(/* @__PURE__ */ inlinedQrl((_, el) => {
   if (!window._qRouterSPA && !window._qRouterInitPopstate) {
-    const currentPath = location.pathname + location.search;
+    const hasPathChanged = createCurrentPathTracker(location.pathname + location.search);
     const checkAndScroll = (scrollState) => {
       if (scrollState) {
         window.scrollTo(scrollState.x, scrollState.y);
@@ -205,21 +223,8 @@ const spaInit = eventQrl(/* @__PURE__ */ inlinedQrl((_, el) => {
       }
       window._qRouterScrollEnabled = false;
       clearTimeout(window._qRouterScrollDebounce);
-      if (currentPath !== location.pathname + location.search) {
-        const getContainer = (el2) => el2.closest("[q\\:container]:not([q\\:container=html]):not([q\\:container=text])");
-        const container = getContainer(el);
-        const domContainer = container.qContainer;
-        const hostElement = domContainer.vNodeLocate(el);
-        const nav = domContainer?.resolveContext(hostElement, {
-          id: "qr-n"
-        });
-        if (nav) {
-          nav(location.href, {
-            type: "popstate"
-          });
-        } else {
-          location.reload();
-        }
+      if (hasPathChanged(location.pathname + location.search)) {
+        dispatchRouterPopstate(document, location.href);
       } else {
         if (history.scrollRestoration === "manual") {
           const scrollState = history.state?._qRouterScroll;
@@ -366,6 +371,7 @@ const useQwikRouter = (props) => {
     throw new Error(`Missing Qwik URL Env Data`);
   }
   const serverHead = useServerData("documentHead");
+  const manifestHash = useServerData("containerAttributes")?.["q:manifest-hash"];
   if (env.ev.originalUrl.pathname !== env.ev.url.pathname && !__EXPERIMENTAL__.enableRequestRewrite) {
     throw new Error(`enableRequestRewrite is an experimental feature and is not enabled. Please enable the feature flag by adding \`experimental: ["enableRequestRewrite"]\` to your qwikVite plugin options.`);
   }
@@ -402,7 +408,7 @@ const useQwikRouter = (props) => {
     dest: url,
     scroll: true
   });
-  const documentHead = useStore(() => createDocumentHead(serverHead));
+  const documentHead = useStore(() => createDocumentHead(serverHead, manifestHash));
   const content = useStore({
     headings: void 0,
     menu: void 0
@@ -560,9 +566,10 @@ const useQwikRouter = (props) => {
   useContextProvider(RouteStateContext, loaderState);
   useContextProvider(RouteActionContext, actionState);
   useContextProvider(RoutePreventNavigateContext, registerPreventNav);
-  useTaskQrl(/* @__PURE__ */ inlinedQrl(({ 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];
-    async function run() {
+  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 navigation = track(routeInternal2);
       const action = track(actionState2);
       const locale = getLocale("");
@@ -571,8 +578,7 @@ const useQwikRouter = (props) => {
       const replaceState = navigation.replaceState;
       let trackUrl;
       let clientPageData;
-      let loadedRoute = null;
-      let container2;
+      let loadedRoute;
       if (isServer) {
         trackUrl = new URL(navigation.dest, routeLocation2.url);
         loadedRoute = env2.loadedRoute;
@@ -587,7 +593,6 @@ const useQwikRouter = (props) => {
           trackUrl.pathname += "/";
         }
         let loadRoutePromise = loadRoute(qwikRouterConfig.routes, qwikRouterConfig.cacheModules, trackUrl.pathname);
-        container2 = _getContextContainer();
         const pageData = clientPageData = await loadClientData(trackUrl, {
           action,
           clearCache: true
@@ -620,271 +625,267 @@ const useQwikRouter = (props) => {
           return;
         }
       }
-      if (loadedRoute) {
-        const { $routeName$, $params$, $mods$, $menu$, $notFound$ } = loadedRoute;
-        const contentModules = $mods$;
-        if ($notFound$) {
-          httpStatus2.value = {
-            status: 404,
-            message: "Not Found"
-          };
-        } else {
-          httpStatus2.value = {
-            status: clientPageData?.status ?? 200,
-            message: clientPageData?.statusMessage ?? ""
-          };
+      const { $routeName$, $params$, $mods$, $menu$, $notFound$ } = loadedRoute;
+      const contentModules = $mods$;
+      if ($notFound$) {
+        httpStatus2.value = {
+          status: 404,
+          message: "Not Found"
+        };
+      } else {
+        httpStatus2.value = {
+          status: clientPageData?.status ?? 200,
+          message: clientPageData?.statusMessage ?? ""
+        };
+      }
+      const pageModule = contentModules[contentModules.length - 1];
+      if (navigation.dest.search && !!isSamePath(trackUrl, prevUrl)) {
+        trackUrl.search = navigation.dest.search;
+      }
+      let shouldForcePrevUrl = false;
+      let shouldForceUrl = false;
+      let shouldForceParams = false;
+      if (!isSamePath(trackUrl, prevUrl)) {
+        if (_hasStoreEffects(routeLocation2, "prevUrl")) {
+          shouldForcePrevUrl = true;
         }
-        const pageModule = contentModules[contentModules.length - 1];
-        if (navigation.dest.search && !!isSamePath(trackUrl, prevUrl)) {
-          trackUrl.search = navigation.dest.search;
+        routeLocationTarget2.prevUrl = prevUrl;
+      }
+      if (routeLocationTarget2.url !== trackUrl) {
+        if (_hasStoreEffects(routeLocation2, "url")) {
+          shouldForceUrl = true;
         }
-        let shouldForcePrevUrl = false;
-        let shouldForceUrl = false;
-        let shouldForceParams = false;
-        if (!isSamePath(trackUrl, prevUrl)) {
-          if (_hasStoreEffects(routeLocation2, "prevUrl")) {
-            shouldForcePrevUrl = true;
-          }
-          routeLocationTarget2.prevUrl = prevUrl;
+        routeLocationTarget2.url = trackUrl;
+      }
+      if (routeLocationTarget2.params !== $params$) {
+        if (_hasStoreEffects(routeLocation2, "params")) {
+          shouldForceParams = true;
         }
-        if (routeLocationTarget2.url !== trackUrl) {
-          if (_hasStoreEffects(routeLocation2, "url")) {
-            shouldForceUrl = true;
-          }
-          routeLocationTarget2.url = trackUrl;
+        routeLocationTarget2.params = $params$;
+      }
+      routeInternal2.untrackedValue = {
+        type: navType,
+        dest: trackUrl
+      };
+      const resolvedHead = resolveHead(clientPageData, routeLocation2, contentModules, locale, serverHead2);
+      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();
         }
-        if (routeLocationTarget2.params !== $params$) {
-          if (_hasStoreEffects(routeLocation2, "params")) {
-            shouldForceParams = true;
-          }
-          routeLocationTarget2.params = $params$;
+        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);
         }
-        routeInternal2.untrackedValue = {
-          type: navType,
-          dest: trackUrl
-        };
-        const resolvedHead = resolveHead(clientPageData, routeLocation2, contentModules, locale, serverHead2);
-        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) {
-            const container3 = _getContextContainer();
-            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, container3);
-              } else {
-                signal.invalidate();
-              }
+        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"
-              });
+        }
+        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`");
-                  }
+          });
+          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;
+              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);
                   }
-                  goto2(target.getAttribute("href"));
+                  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(() => {
+          });
+          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);
-                window._qRouterScrollDebounce = void 0;
-              }, 200);
+              }
             }, {
               passive: true
             });
-            removeEventListener("scroll", window._qRouterInitScroll);
-            window._qRouterInitScroll = void 0;
-            spaInit.resolve();
+            document.removeEventListener("visibilitychange", window._qRouterInitVisibility);
+            window._qRouterInitVisibility = void 0;
           }
-          if (navType !== "popstate") {
-            window._qRouterScrollEnabled = false;
+          window.addEventListener("scroll", () => {
+            if (!window._qRouterScrollEnabled && !window._qCityScrollEnabled) {
+              return;
+            }
             clearTimeout(window._qRouterScrollDebounce);
-            if (!navigation.historyUpdated) {
+            window._qRouterScrollDebounce = setTimeout(() => {
               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();
-            throw err;
-          }).finally(() => {
-            container2.element.setAttribute?.(Q_ROUTE, $routeName$);
+              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);
-            window._qRouterScrollEnabled = true;
-            if (isBrowser) {
-              callRestoreScrollOnDocument();
-            }
-            if (shouldForcePrevUrl) {
-              forceStoreEffects(routeLocation2, "prevUrl");
-            }
-            if (shouldForceUrl) {
-              forceStoreEffects(routeLocation2, "url");
+          }
+        }
+        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);
             }
-            if (shouldForceParams) {
-              forceStoreEffects(routeLocation2, "params");
+          } 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();
             }
-            routeLocation2.isNavigating = false;
-            navResolver2.r?.();
-          });
-        }
+            return viewTransition.ready;
+          }
+        };
+        _waitNextPage().catch((err) => {
+          navigate();
+          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?.();
+        });
       }
+    }, "useQwikRouter_useTask_XpalYii770E", [
+      actionState,
+      content,
+      contentInternal,
+      documentHead,
+      env,
+      getScroller,
+      goto,
+      httpStatus,
+      loaderState,
+      loadersObject,
+      navResolver,
+      props,
+      routeInternal,
+      routeLocation,
+      routeLocationTarget,
+      serverHead
+    ]),
+    // We should only wait for navigation to complete on the server
+    {
+      deferUpdates: isServer
     }
-    if (isServer) {
-      return run();
-    } else {
-      run();
-    }
-  }, "useQwikRouter_useTask_XpalYii770E", [
-    actionState,
-    content,
-    contentInternal,
-    documentHead,
-    env,
-    getScroller,
-    goto,
-    httpStatus,
-    loaderState,
-    loadersObject,
-    navResolver,
-    props,
-    routeInternal,
-    routeLocation,
-    routeLocationTarget,
-    serverHead
-  ]));
+  );
 };
 const QwikRouterProvider = /* @__PURE__ */ componentQrl(/* @__PURE__ */ inlinedQrl((props) => {
   useQwikRouter(props);
@@ -961,12 +962,21 @@ const QwikRouterMockProvider = /* @__PURE__ */ componentQrl(/* @__PURE__ */ inli
 }, "QwikRouterMockProvider_component_IN4dVpT0x74"));
 const QwikCityMockProvider = QwikRouterMockProvider;
 
+const handleRouterPopstate = (nav, event) => {
+  const href = event.detail?.href;
+  if (href) {
+    return nav(href, {
+      type: "popstate"
+    });
+  }
+};
 const RouterOutlet = /* @__PURE__ */ componentQrl(/* @__PURE__ */ inlinedQrl(() => {
   const serverData = useServerData("containerAttributes");
   if (!serverData) {
     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;
@@ -981,19 +991,22 @@ const RouterOutlet = /* @__PURE__ */ componentQrl(/* @__PURE__ */ inlinedQrl(()
       !__EXPERIMENTAL__.noSPA && /* @__PURE__ */ _jsxSorted("script", {
         "q-d:qinit": _qrlSync(() => {
           ((w, h) => {
-            if (!w._qcs && h.scrollRestoration === "manual") {
+            if (!w._qcs) {
               w._qcs = true;
               const s = h.state?._qRouterScroll;
               if (s) {
+                h.scrollRestoration = "manual";
                 w.scrollTo(s.x, s.y);
               }
               document.dispatchEvent(new Event("qcinit"));
             }
           })(window, history);
-        }, '()=>{((w,h)=>{if(!w._qcs&&h.scrollRestoration==="manual"){w._qcs=!0;const s=h.state?._qRouterScroll;if(s){w.scrollTo(s.x,s.y);}document.dispatchEvent(new Event("qcinit"));}})(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, nav2) => handleRouterPopstate(nav2, event), "RouterOutlet_component_Fragment_script_q_d_qrouterpopstate_aRL6GvFyews"),
+        "q:p": nav
       }, {
         "q-d:qcinit": spaInit
-      }, null, 2, "Fn_1")
+      }, null, 6, "Fn_1")
     ], 1, "Fn_2");
   }
   return SkipRender;