@qwik.dev/router 2.0.0-beta.1 → 2.0.0-beta.10

package/lib/index.qwik.cjs

@@ -7,6 +7,7 @@ const internal = require("@qwik.dev/core/internal");
 const qwikRouterConfig = require("@qwik-router-config");
 const zod = require("zod");
 const swRegister = require("@qwik-router-sw-register");
+const server = require("@qwik.dev/core/server");
 function _interopNamespaceDefault(e) {
   const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });
   if (e) {
@@ -39,106 +40,25 @@ const ErrorBoundary = core.component$((props) => {
 const MODULE_CACHE = /* @__PURE__ */ new WeakMap();
 const CLIENT_DATA_CACHE = /* @__PURE__ */ new Map();
 const QACTION_KEY = "qaction";
+const QLOADER_KEY = "qloaders";
 const QFN_KEY = "qfunc";
 const QDATA_KEY = "qdata";
-const toPath = (url) => url.pathname + url.search + url.hash;
-const toUrl = (url, baseUrl) => new URL(url, baseUrl.href);
-const isSameOrigin = (a, b) => a.origin === b.origin;
-const withSlash = (path) => path.endsWith("/") ? path : path + "/";
-const isSamePathname = ({ pathname: a }, { pathname: b }) => {
-  const lDiff = Math.abs(a.length - b.length);
-  return lDiff === 0 ? a === b : lDiff === 1 && withSlash(a) === withSlash(b);
-};
-const isSameSearchQuery = (a, b) => a.search === b.search;
-const isSamePath = (a, b) => isSameSearchQuery(a, b) && isSamePathname(a, b);
-const getClientDataPath = (pathname, pageSearch, action) => {
-  let search = pageSearch ?? "";
-  if (action) {
-    search += (search ? "&" : "?") + QACTION_KEY + "=" + encodeURIComponent(action.id);
-  }
-  return pathname + (pathname.endsWith("/") ? "" : "/") + "q-data.json" + search;
-};
-const getClientNavPath = (props, baseUrl) => {
-  const href = props.href;
-  if (typeof href === "string" && typeof props.target !== "string" && !props.reload) {
-    try {
-      const linkUrl = toUrl(href.trim(), baseUrl.url);
-      const currentUrl = toUrl("", baseUrl.url);
-      if (isSameOrigin(linkUrl, currentUrl)) {
-        return toPath(linkUrl);
-      }
-    } catch (e) {
-      console.error(e);
-    }
-  } else if (props.reload) {
-    return toPath(toUrl("", baseUrl.url));
-  }
-  return null;
-};
-const shouldPreload = (clientNavPath, currentLoc) => {
-  if (clientNavPath) {
-    const prefetchUrl = toUrl(clientNavPath, currentLoc.url);
-    const currentUrl = toUrl("", currentLoc.url);
-    return !isSamePathname(prefetchUrl, currentUrl);
-  }
-  return false;
-};
-const isPromise = (value) => {
-  return value && typeof value.then === "function";
-};
-const deepFreeze = (obj) => {
-  if (obj == null) {
-    return obj;
-  }
-  Object.getOwnPropertyNames(obj).forEach((prop) => {
-    const value = obj[prop];
-    if (value && typeof value === "object" && !Object.isFrozen(value)) {
-      deepFreeze(value);
-    }
-  });
-  return Object.freeze(obj);
-};
-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 newScrollState = () => {
-  return {
-    x: 0,
-    y: 0,
-    w: 0,
-    h: 0
-  };
-};
-const prefetchSymbols = (path) => {
-  if (core.isBrowser) {
-    path = path.endsWith("/") ? path : path + "/";
-    path = path.length > 1 && path.startsWith("/") ? path.slice(1) : path;
-    preloader.p(path, 0.8);
-  }
-};
-const loadClientData = async (url, element, opts) => {
+const Q_ROUTE = "q:route";
+const DEFAULT_LOADERS_SERIALIZATION_STRATEGY = globalThis.__DEFAULT_LOADERS_SERIALIZATION_STRATEGY__ || "never";
+const MAX_Q_DATA_RETRY_COUNT = 3;
+const loadClientData = async (url, element, opts, retryCount = 0) => {
   const pagePathname = url.pathname;
   const pageSearch = url.search;
-  const clientDataPath = getClientDataPath(pagePathname, pageSearch, opts?.action);
+  const clientDataPath = getClientDataPath(pagePathname, pageSearch, {
+    actionId: opts?.action?.id,
+    loaderIds: opts?.loaderIds
+  });
   let qData;
   if (!opts?.action) {
     qData = CLIENT_DATA_CACHE.get(clientDataPath);
   }
-  if (opts?.prefetchSymbols !== false) {
-    prefetchSymbols(pagePathname);
+  if (opts?.preloadRouteBundles !== false) {
+    preloadRouteBundles(pagePathname, 0.8);
   }
   let resolveFn;
   if (!qData) {
@@ -147,6 +67,10 @@ const loadClientData = async (url, element, opts) => {
       opts.action.data = void 0;
     }
     qData = fetch(clientDataPath, fetchOptions).then((rsp) => {
+      if (rsp.status === 404 && opts?.loaderIds && retryCount < MAX_Q_DATA_RETRY_COUNT) {
+        opts.loaderIds = void 0;
+        return loadClientData(url, element, opts, retryCount + 1);
+      }
       if (rsp.redirected) {
         const redirectedURL = new URL(rsp.url);
         const isQData = redirectedURL.pathname.endsWith("/q-data.json");
@@ -222,11 +146,108 @@ const getFetchOptions = (action, noCache) => {
       method: "POST",
       body: JSON.stringify(actionData),
       headers: {
-        "Content-Type": "application/json, charset=UTF-8"
+        "Content-Type": "application/json; charset=UTF-8"
       }
     };
   }
 };
+const toPath = (url) => url.pathname + url.search + url.hash;
+const toUrl = (url, baseUrl) => new URL(url, baseUrl.href);
+const isSameOrigin = (a, b) => a.origin === b.origin;
+const withSlash = (path) => path.endsWith("/") ? path : path + "/";
+const isSamePathname = ({ pathname: a }, { pathname: b }) => {
+  const lDiff = Math.abs(a.length - b.length);
+  return lDiff === 0 ? a === b : lDiff === 1 && withSlash(a) === withSlash(b);
+};
+const isSameSearchQuery = (a, b) => a.search === b.search;
+const isSamePath = (a, b) => isSameSearchQuery(a, b) && isSamePathname(a, b);
+const getClientDataPath = (pathname, pageSearch, options) => {
+  let search = pageSearch ?? "";
+  if (options?.actionId) {
+    search += (search ? "&" : "?") + QACTION_KEY + "=" + encodeURIComponent(options.actionId);
+  }
+  if (options?.loaderIds) {
+    for (const loaderId of options.loaderIds) {
+      search += (search ? "&" : "?") + QLOADER_KEY + "=" + encodeURIComponent(loaderId);
+    }
+  }
+  return pathname + (pathname.endsWith("/") ? "" : "/") + "q-data.json" + search;
+};
+const getClientNavPath = (props, baseUrl) => {
+  const href = props.href;
+  if (typeof href === "string" && typeof props.target !== "string" && !props.reload) {
+    try {
+      const linkUrl = toUrl(href.trim(), baseUrl.url);
+      const currentUrl = toUrl("", baseUrl.url);
+      if (isSameOrigin(linkUrl, currentUrl)) {
+        return toPath(linkUrl);
+      }
+    } catch (e) {
+      console.error(e);
+    }
+  } else if (props.reload) {
+    return toPath(toUrl("", baseUrl.url));
+  }
+  return null;
+};
+const shouldPreload = (clientNavPath, currentLoc) => {
+  if (clientNavPath) {
+    const prefetchUrl = toUrl(clientNavPath, currentLoc.url);
+    const currentUrl = toUrl("", currentLoc.url);
+    return !isSamePathname(prefetchUrl, currentUrl);
+  }
+  return false;
+};
+const isPromise = (value) => {
+  return value && typeof value.then === "function";
+};
+const createLoaderSignal = (loadersObject, loaderId, url, serializationStrategy, container) => {
+  return core.createAsyncComputed$(async () => {
+    if (core.isBrowser && loadersObject[loaderId] === internal._UNINITIALIZED) {
+      const data = await loadClientData(url, void 0, {
+        loaderIds: [
+          loaderId
+        ]
+      });
+      loadersObject[loaderId] = data?.loaders[loaderId] ?? internal._UNINITIALIZED;
+    }
+    return loadersObject[loaderId];
+  }, {
+    container,
+    serializationStrategy
+  });
+};
+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 newScrollState = () => {
+  return {
+    x: 0,
+    y: 0,
+    w: 0,
+    h: 0
+  };
+};
+const preloadRouteBundles = (path, probability = 0.8) => {
+  if (core.isBrowser) {
+    path = path.endsWith("/") ? path : path + "/";
+    path = path.length > 1 && path.startsWith("/") ? path.slice(1) : path;
+    preloader.p(path, probability);
+  }
+};
 const RouteStateContext = /* @__PURE__ */ core.createContextId("qc-s");
 const ContentContext = /* @__PURE__ */ core.createContextId("qc-c");
 const ContentInternalContext = /* @__PURE__ */ core.createContextId("qc-ic");
@@ -269,33 +290,38 @@ const Link = core.component$((props) => {
     }
     if (elm && elm.href) {
       const url = new URL(elm.href);
-      prefetchSymbols(url.pathname);
+      preloadRouteBundles(url.pathname);
       if (elm.hasAttribute("data-prefetch")) {
         loadClientData(url, elm, {
-          prefetchSymbols: false,
+          preloadRouteBundles: false,
           isPrefetch: true
         });
       }
     }
   }) : void 0;
-  const preventDefault = clientNavPath ? core.sync$((event, target) => {
+  const preventDefault = clientNavPath ? core.sync$((event) => {
     if (!(event.metaKey || event.ctrlKey || event.shiftKey || event.altKey)) {
       event.preventDefault();
     }
   }) : void 0;
-  const handleClick = clientNavPath ? core.$(async (event, elm) => {
+  const handleClientSideNavigation = clientNavPath ? core.$((event, elm) => {
     if (event.defaultPrevented) {
       if (elm.href) {
         elm.setAttribute("aria-pressed", "true");
-        await nav(elm.href, {
+        nav(elm.href, {
           forceReload: reload,
           replaceState,
           scroll
+        }).then(() => {
+          elm.removeAttribute("aria-pressed");
         });
-        elm.removeAttribute("aria-pressed");
       }
     }
   }) : void 0;
+  const handlePreload = core.$((_, elm) => {
+    const url = new URL(elm.href);
+    preloadRouteBundles(url.pathname, 1);
+  });
   core.useVisibleTask$(({ track }) => {
     track(() => loc.url.pathname);
     const handler = linkProps.onQVisible$;
@@ -317,8 +343,9 @@ const Link = core.component$((props) => {
     ...linkProps,
     onClick$: [
       preventDefault,
+      handlePreload,
       onClick$,
-      handleClick
+      handleClientSideNavigation
     ],
     "data-prefetch": prefetchData,
     onMouseOver$: [
@@ -334,8 +361,8 @@ const Link = core.component$((props) => {
     children: /* @__PURE__ */ jsxRuntime.jsx(core.Slot, {})
   });
 });
-const resolveHead = (endpoint, routeLocation, contentModules, locale) => {
-  const head = createDocumentHead();
+const resolveHead = (endpoint, routeLocation, contentModules, locale, defaults) => {
+  const head = createDocumentHead(defaults);
   const getData = (loaderOrAction) => {
     const id = loaderOrAction.__id;
     if (loaderOrAction.__brand === "server_loader") {
@@ -391,13 +418,23 @@ const mergeArray = (existingArr, newArr) => {
     }
   }
 };
-const createDocumentHead = () => ({
-  title: "",
-  meta: [],
-  links: [],
-  styles: [],
-  scripts: [],
-  frontmatter: {}
+const createDocumentHead = (defaults) => ({
+  title: defaults?.title || "",
+  meta: [
+    ...defaults?.meta || []
+  ],
+  links: [
+    ...defaults?.links || []
+  ],
+  styles: [
+    ...defaults?.styles || []
+  ],
+  scripts: [
+    ...defaults?.scripts || []
+  ],
+  frontmatter: {
+    ...defaults?.frontmatter
+  }
 });
 function matchRoute(route, path) {
   const routeIdx = startIdxSkipSlash(route);
@@ -407,6 +444,9 @@ function matchRoute(route, path) {
   return matchRoutePart(route, routeIdx, routeLength, path, pathIdx, pathLength);
 }
 function matchRoutePart(route, routeIdx, routeLength, path, pathIdx, pathLength) {
+  if (path.startsWith("/build/")) {
+    return null;
+  }
   let params = null;
   while (routeIdx < routeLength) {
     const routeCh = route.charCodeAt(routeIdx++);
@@ -508,18 +548,42 @@ function lastIndexOf(text, start, match, searchIdx, notFoundIdx) {
   }
   return idx > start ? idx : notFoundIdx;
 }
+var RouteDataProp = /* @__PURE__ */ (function(RouteDataProp2) {
+  RouteDataProp2[RouteDataProp2["RouteName"] = 0] = "RouteName";
+  RouteDataProp2[RouteDataProp2["Loaders"] = 1] = "Loaders";
+  RouteDataProp2[RouteDataProp2["OriginalPathname"] = 2] = "OriginalPathname";
+  RouteDataProp2[RouteDataProp2["RouteBundleNames"] = 3] = "RouteBundleNames";
+  return RouteDataProp2;
+})({});
+var MenuDataProp = /* @__PURE__ */ (function(MenuDataProp2) {
+  MenuDataProp2[MenuDataProp2["Pathname"] = 0] = "Pathname";
+  MenuDataProp2[MenuDataProp2["MenuLoader"] = 1] = "MenuLoader";
+  return MenuDataProp2;
+})({});
+const deepFreeze = (obj) => {
+  if (obj == null) {
+    return obj;
+  }
+  Object.getOwnPropertyNames(obj).forEach((prop) => {
+    const value = obj[prop];
+    if (value && typeof value === "object" && !Object.isFrozen(value)) {
+      deepFreeze(value);
+    }
+  });
+  return Object.freeze(obj);
+};
 const loadRoute = async (routes, menus, cacheModules, pathname) => {
   if (!Array.isArray(routes)) {
     return null;
   }
   for (const routeData of routes) {
-    const routeName = routeData[0];
+    const routeName = routeData[RouteDataProp.RouteName];
     const params = matchRoute(routeName, pathname);
     if (!params) {
       continue;
     }
-    const loaders = routeData[1];
-    const routeBundleNames = routeData[3];
+    const loaders = routeData[RouteDataProp.Loaders];
+    const routeBundleNames = routeData[RouteDataProp.RouteBundleNames];
     const modules = new Array(loaders.length);
     const pendingLoads = [];
     loaders.forEach((moduleLoader, i) => {
@@ -564,9 +628,9 @@ const loadModule = (moduleLoader, pendingLoads, moduleSetter, cacheModules) => {
 const getMenuLoader = (menus, pathname) => {
   if (menus) {
     pathname = pathname.endsWith("/") ? pathname : pathname + "/";
-    const menu = menus.find((m) => m[0] === pathname || pathname.startsWith(m[0] + (pathname.endsWith("/") ? "" : "/")));
+    const menu = menus.find((m) => m[MenuDataProp.Pathname] === pathname || pathname.startsWith(m[MenuDataProp.Pathname] + (pathname.endsWith("/") ? "" : "/")));
     if (menu) {
-      return menu[1];
+      return menu[MenuDataProp.MenuLoader];
     }
   }
 };
@@ -758,8 +822,8 @@ const spaInit = core.event$((_, el) => {
     };
     win[scrollEnabled] = true;
     setTimeout(() => {
-      addEventListener("popstate", win[initPopstate]);
-      addEventListener("scroll", win[initScroll], {
+      win.addEventListener("popstate", win[initPopstate]);
+      win.addEventListener("scroll", win[initScroll], {
         passive: true
       });
       document.body.addEventListener("click", win[initAnchors]);
@@ -797,11 +861,11 @@ const preventNav = {};
 const internalState = {
   navCount: 0
 };
-const QwikRouterProvider = core.component$((props) => {
+const useQwikRouter = (props) => {
   core.useStyles$(`
     @layer qwik {
       @supports selector(html:active-view-transition-type(type)) {
-        html:active-view-transition-type(qwik-router-spa) {
+        html:active-view-transition-type(qwik-navigation) {
           :root{view-transition-name:none}
         }
       }
@@ -818,24 +882,40 @@ const QwikRouterProvider = core.component$((props) => {
   if (!urlEnv) {
     throw new Error(`Missing Qwik URL Env Data`);
   }
+  const serverHead = core.useServerData("documentHead");
   if (core.isServer) {
     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.`);
     }
   }
   const url = new URL(urlEnv);
-  const routeLocation = core.useStore({
+  const routeLocationTarget = {
     url,
     params: env.params,
     isNavigating: false,
     prevUrl: void 0
-  }, {
+  };
+  const routeLocation = core.useStore(routeLocationTarget, {
     deep: false
   });
   const navResolver = {};
-  const loaderState = internal._weakSerialize(core.useStore(env.response.loaders, {
-    deep: false
-  }));
+  const container = internal._getContextContainer();
+  const getSerializationStrategy = (loaderId) => {
+    return env.response.loadersSerializationStrategy.get(loaderId) || DEFAULT_LOADERS_SERIALIZATION_STRATEGY;
+  };
+  const loadersObject = {};
+  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[internal.SerializerSymbol] = (obj) => {
+    const loadersSerializationObject = {};
+    for (const [k, v] of Object.entries(obj)) {
+      loadersSerializationObject[k] = getSerializationStrategy(k) === "always" ? v : internal._UNINITIALIZED;
+    }
+    return loadersSerializationObject;
+  };
   const routeInternal = core.useSignal({
     type: "initial",
     dest: url,
@@ -843,7 +923,7 @@ const QwikRouterProvider = core.component$((props) => {
     replaceState: false,
     scroll: true
   });
-  const documentHead = core.useStore(createDocumentHead);
+  const documentHead = core.useStore(() => createDocumentHead(serverHead));
   const content = core.useStore({
     headings: void 0,
     menu: void 0
@@ -928,7 +1008,7 @@ const QwikRouterProvider = core.component$((props) => {
         let scroller = document.getElementById(QWIK_ROUTER_SCROLLER);
         if (!scroller) {
           scroller = document.getElementById(QWIK_CITY_SCROLLER);
-          if (scroller) {
+          if (scroller && core.isDev) {
             console.warn(`Please update your scroller ID to "${QWIK_ROUTER_SCROLLER}" as "${QWIK_CITY_SCROLLER}" is deprecated and will be removed in V3`);
           }
         }
@@ -989,10 +1069,10 @@ const QwikRouterProvider = core.component$((props) => {
       } else {
         trackUrl = new URL(navigation.dest, location);
         if (trackUrl.pathname.endsWith("/")) {
-          if (!qwikRouterConfig__namespace.trailingSlash) {
+          if (globalThis.__NO_TRAILING_SLASH__) {
             trackUrl.pathname = trackUrl.pathname.slice(0, -1);
           }
-        } else if (qwikRouterConfig__namespace.trailingSlash) {
+        } else if (!globalThis.__NO_TRAILING_SLASH__) {
           trackUrl.pathname += "/";
         }
         let loadRoutePromise = loadRoute(qwikRouterConfig__namespace.routes, qwikRouterConfig__namespace.menus, qwikRouterConfig__namespace.cacheModules, trackUrl.pathname);
@@ -1034,25 +1114,38 @@ const QwikRouterProvider = core.component$((props) => {
         const [routeName, params, mods, menu] = loadedRoute;
         const contentModules = mods;
         const pageModule = contentModules[contentModules.length - 1];
-        const isRedirect = navType === "form" && !isSamePath(trackUrl, prevUrl);
-        if (navigation.dest.search && !isRedirect) {
+        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)) {
-          routeLocation.prevUrl = prevUrl;
+          if (internal._hasStoreEffects(routeLocation, "prevUrl")) {
+            shouldForcePrevUrl = true;
+          }
+          routeLocationTarget.prevUrl = prevUrl;
+        }
+        if (routeLocationTarget.url !== trackUrl) {
+          if (internal._hasStoreEffects(routeLocation, "url")) {
+            shouldForceUrl = true;
+          }
+          routeLocationTarget.url = trackUrl;
+        }
+        if (routeLocationTarget.params !== params) {
+          if (internal._hasStoreEffects(routeLocation, "params")) {
+            shouldForceParams = true;
+          }
+          routeLocationTarget.params = params;
         }
-        routeLocation.url = trackUrl;
-        routeLocation.params = {
-          ...params
-        };
         routeInternal.untrackedValue = {
           type: navType,
           dest: trackUrl
         };
-        const resolvedHead = resolveHead(clientPageData, routeLocation, contentModules, locale);
+        const resolvedHead = resolveHead(clientPageData, routeLocation, contentModules, locale, serverHead);
         content.headings = pageModule.headings;
         content.menu = menu;
-        contentInternal.value = core.noSerialize(contentModules);
+        contentInternal.untrackedValue = core.noSerialize(contentModules);
         documentHead.links = resolvedHead.links;
         documentHead.meta = resolvedHead.meta;
         documentHead.styles = resolvedHead.styles;
@@ -1065,15 +1158,25 @@ const QwikRouterProvider = core.component$((props) => {
             scrollState = getScrollHistory();
           }
           const scroller = document.getElementById(QWIK_ROUTER_SCROLLER) ?? document.documentElement;
-          if (navigation.scroll && (!navigation.forceReload || !isSamePath(trackUrl, prevUrl)) && (navType === "link" || navType === "popstate") || isRedirect) {
+          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;
-          const win = window;
           if (loaders) {
-            Object.assign(loaderState, loaders);
+            const container2 = internal._getContextContainer();
+            for (const [key, value] of Object.entries(loaders)) {
+              const signal = loaderState[key];
+              const awaitedValue = await value;
+              loadersObject[key] = awaitedValue;
+              if (!signal) {
+                loaderState[key] = createLoaderSignal(loadersObject, key, trackUrl, DEFAULT_LOADERS_SERIALIZATION_STRATEGY, container2);
+              } else {
+                signal.invalidate();
+              }
+            }
           }
           CLIENT_DATA_CACHE.clear();
+          const win = window;
           if (!win._qRouterSPA) {
             win._qRouterSPA = true;
             history.scrollRestoration = "manual";
@@ -1184,10 +1287,11 @@ const QwikRouterProvider = core.component$((props) => {
           }
           const navigate = () => {
             clientNavigate(window, navType, prevUrl, trackUrl, replaceState);
+            contentInternal.force();
             return internal._waitUntilRendered(elm);
           };
           const _waitNextPage = () => {
-            if (core.isServer || props.viewTransition === false) {
+            if (core.isServer || props?.viewTransition === false) {
               return navigate();
             } else {
               const viewTransition = startViewTransition({
@@ -1203,14 +1307,23 @@ const QwikRouterProvider = core.component$((props) => {
             }
           };
           _waitNextPage().then(() => {
-            const container = internal._getQContainerElement(elm);
-            container.setAttribute("q:route", routeName);
+            const container2 = internal._getQContainerElement(elm);
+            container2.setAttribute(Q_ROUTE, routeName);
             const scrollState2 = currentScrollState(scroller);
             saveScrollHistory(scrollState2);
             win._qRouterScrollEnabled = true;
             if (core.isBrowser) {
               callRestoreScrollOnDocument();
             }
+            if (shouldForcePrevUrl) {
+              internal.forceStoreEffects(routeLocation, "prevUrl");
+            }
+            if (shouldForceUrl) {
+              internal.forceStoreEffects(routeLocation, "url");
+            }
+            if (shouldForceParams) {
+              internal.forceStoreEffects(routeLocation, "params");
+            }
             routeLocation.isNavigating = false;
             navResolver.r?.();
           });
@@ -1223,10 +1336,13 @@ const QwikRouterProvider = core.component$((props) => {
       run();
     }
   });
+};
+const QwikRouterProvider = core.component$((props) => {
+  useQwikRouter(props);
   return /* @__PURE__ */ jsxRuntime.jsx(core.Slot, {});
 });
 const QwikCityProvider = QwikRouterProvider;
-const QwikRouterMockProvider = core.component$((props) => {
+const useQwikMockRouter = (props) => {
   const urlEnv = props.url ?? "http://localhost/";
   const url = new URL(urlEnv);
   const routeLocation = core.useStore({
@@ -1237,7 +1353,7 @@ const QwikRouterMockProvider = core.component$((props) => {
   }, {
     deep: false
   });
-  const loaderState = core.useSignal({});
+  const loaderState = {};
   const routeInternal = core.useSignal({
     type: "initial",
     dest: url
@@ -1264,6 +1380,9 @@ const QwikRouterMockProvider = core.component$((props) => {
   core.useContextProvider(RouteStateContext, loaderState);
   core.useContextProvider(RouteActionContext, actionState);
   core.useContextProvider(RouteInternalContext, routeInternal);
+};
+const QwikRouterMockProvider = core.component$((props) => {
+  useQwikMockRouter(props);
   return /* @__PURE__ */ jsxRuntime.jsx(core.Slot, {});
 });
 const QwikCityMockProvider = QwikRouterMockProvider;
@@ -1272,13 +1391,14 @@ const RouterOutlet = core.component$(() => {
   if (!serverData) {
     throw new Error("PrefetchServiceWorker component must be rendered on the server.");
   }
-  const { value } = core.useContext(ContentInternalContext);
-  if (value && value.length > 0) {
-    const contentsLen = value.length;
+  const internalContext = core.useContext(ContentInternalContext);
+  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 (value[i].default) {
-        cmp = core.jsx(value[i].default, {
+      if (contents[i].default) {
+        cmp = core.jsx(contents[i].default, {
           children: cmp
         });
       }
@@ -1482,24 +1602,25 @@ const globalActionQrl = (actionQrl, ...rest) => {
 const routeAction$ = /* @__PURE__ */ core.implicit$FirstArg(routeActionQrl);
 const globalAction$ = /* @__PURE__ */ core.implicit$FirstArg(globalActionQrl);
 const routeLoaderQrl = (loaderQrl, ...rest) => {
-  const { id, validators } = getValidators(rest, loaderQrl);
+  const { id, validators, serializationStrategy } = getValidators(rest, loaderQrl);
   function loader() {
-    return core.useContext(RouteStateContext, (state) => {
-      if (!(id in state)) {
-        throw new Error(`routeLoader$ "${loaderQrl.getSymbol()}" was invoked in a route where it was not declared.
+    const state = internal._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/`);
-      }
-      return internal._wrapStore(state, id);
-    });
+    }
+    core.untrack(() => state[id].value);
+    return state[id];
   }
   loader.__brand = "server_loader";
   loader.__qrl = loaderQrl;
   loader.__validators = validators;
   loader.__id = id;
+  loader.__serializationStrategy = serializationStrategy;
   Object.freeze(loader);
   return loader;
 };
@@ -1604,7 +1725,7 @@ const zodQrl = (qrl) => {
           }
         });
         const data = inputData ?? await ev.parseBody();
-        const result = await schema.safeParseAsync(data);
+        const result = await core.withLocale(ev.locale(), () => schema.safeParseAsync(data));
         if (result.success) {
           return result;
         } else {
@@ -1689,7 +1810,7 @@ const serverQrl = (qrl, options) => {
         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* () {
+          return (async function* () {
             try {
               for await (const result of deserializeStream(res.body, ctxElm ?? document.documentElement, abortSignal)) {
                 yield result;
@@ -1699,7 +1820,7 @@ const serverQrl = (qrl, options) => {
                 await res.body.cancel();
               }
             }
-          }();
+          })();
         } else if (contentType === "application/qwik-json") {
           const str = await res.text();
           const [obj] = internal._deserialize(str, ctxElm ?? document.documentElement);
@@ -1728,6 +1849,7 @@ const serverQrl = (qrl, options) => {
 const server$ = /* @__PURE__ */ core.implicit$FirstArg(serverQrl);
 const getValidators = (rest, qrl) => {
   let id;
+  let serializationStrategy = DEFAULT_LOADERS_SERIALIZATION_STRATEGY;
   const validators = [];
   if (rest.length === 1) {
     const options = rest[0];
@@ -1736,6 +1858,9 @@ const getValidators = (rest, qrl) => {
         validators.push(options);
       } else {
         id = options.id;
+        if (options.serializationStrategy) {
+          serializationStrategy = options.serializationStrategy;
+        }
         if (options.validation) {
           validators.push(...options.validation);
         }
@@ -1756,7 +1881,8 @@ const getValidators = (rest, qrl) => {
   }
   return {
     validators: validators.reverse(),
-    id
+    id,
+    serializationStrategy
   };
 };
 const deserializeStream = async function* (stream, ctxElm, abortSignal) {
@@ -1908,10 +2034,55 @@ function omitProps(obj, keys) {
   }
   return omittedObj;
 }
+const createRenderer = (getOptions) => {
+  return (opts) => {
+    const { jsx, options } = getOptions(opts);
+    return server.renderToStream(jsx, options);
+  };
+};
+const DocumentHeadTags = core.component$((props) => {
+  let head = useDocumentHead();
+  if (props) {
+    head = {
+      ...head,
+      ...props
+    };
+  }
+  return /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, {
+    children: [
+      head.title && /* @__PURE__ */ jsxRuntime.jsx("title", {
+        children: head.title
+      }),
+      head.meta.map((m) => /* @__PURE__ */ jsxRuntime.jsx("meta", {
+        ...m
+      })),
+      head.links.map((l) => /* @__PURE__ */ jsxRuntime.jsx("link", {
+        ...l
+      })),
+      head.styles.map((s) => {
+        const props2 = s.props || s;
+        return /* @__PURE__ */ core.createElement("style", {
+          ...props2,
+          dangerouslySetInnerHTML: s.style || props2.dangerouslySetInnerHTML,
+          key: s.key
+        });
+      }),
+      head.scripts.map((s) => {
+        const props2 = s.props || s;
+        return /* @__PURE__ */ core.createElement("script", {
+          ...props2,
+          dangerouslySetInnerHTML: s.script || props2.dangerouslySetInnerHTML,
+          key: s.key
+        });
+      })
+    ]
+  });
+});
 Object.defineProperty(exports, "z", {
   enumerable: true,
   get: () => zod.z
 });
+exports.DocumentHeadTags = DocumentHeadTags;
 exports.ErrorBoundary = ErrorBoundary;
 exports.Form = Form;
 exports.Link = Link;
@@ -1923,6 +2094,7 @@ exports.QwikRouterMockProvider = QwikRouterMockProvider;
 exports.QwikRouterProvider = QwikRouterProvider;
 exports.RouterOutlet = RouterOutlet;
 exports.ServiceWorkerRegister = ServiceWorkerRegister;
+exports.createRenderer = createRenderer;
 exports.globalAction$ = globalAction$;
 exports.globalActionQrl = globalActionQrl;
 exports.omitProps = omitProps;
@@ -1939,6 +2111,7 @@ exports.useLocation = useLocation;
 exports.useNavigate = useNavigate;
 exports.usePreventNavigate$ = usePreventNavigate$;
 exports.usePreventNavigateQrl = usePreventNavigateQrl;
+exports.useQwikRouter = useQwikRouter;
 exports.valibot$ = valibot$;
 exports.valibotQrl = valibotQrl;
 exports.validator$ = validator$;