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

package/lib/chunks/fs.mjs

@@ -99,7 +99,7 @@ function isIndexModule(extlessName) {
   return /^index(|!|@.+)$/.test(extlessName);
 }
 function isPluginModule(extlessName) {
-  return /^plugin(|@.+)$/.test(extlessName);
+  return /^plugin(|@.+)$/.test(extlessName) && !/\.(test|unit|spec)(\.[jt]s)?$/.test(extlessName);
 }
 function isLayoutModule(extlessName) {
   return /^layout(|!|-.+)$/.test(extlessName);

package/lib/chunks/routing.qwik.mjs

@@ -248,7 +248,7 @@ const resolveDocumentHead = (resolvedHead, updatedHead) => {
   mergeArray(resolvedHead.scripts, updatedHead.scripts);
   Object.assign(resolvedHead.frontmatter, updatedHead.frontmatter);
 };
-const createDocumentHead = (defaults) => ({
+const createDocumentHead = (defaults, manifestHash) => ({
   title: defaults?.title || "",
   meta: [
     ...defaults?.meta || []
@@ -264,7 +264,8 @@ const createDocumentHead = (defaults) => ({
   ],
   frontmatter: {
     ...defaults?.frontmatter
-  }
+  },
+  manifestHash: manifestHash || "dev"
 });
 const resolveRouteConfig = (resolveValue, routeLocation, contentModules, locale, status, defaults) => withLocale(locale, () => {
   const head = createDocumentHead(defaults);
@@ -817,4 +818,4 @@ const loadRoute = async (routes, cacheModules, pathname, isInternal) => {
   };
 };
 
-export { CLIENT_DATA_CACHE as C, DEFAULT_LOADERS_SERIALIZATION_STRATEGY as D, Q_ROUTE as Q, createDocumentHead as a, isSameOrigin as b, createLoaderSignal as c, clientNavigate as d, loadRoute as e, toPath as f, getClientNavPath as g, QFN_KEY as h, isSamePath as i, QACTION_KEY as j, QDATA_KEY as k, loadClientData as l, resolveRouteConfig as m, QLOADER_KEY as n, isPromise as o, preloadRouteBundles as p, resolveHead as r, shouldPreload as s, toUrl as t };
+export { CLIENT_DATA_CACHE as C, DEFAULT_LOADERS_SERIALIZATION_STRATEGY as D, Q_ROUTE as Q, createDocumentHead as a, loadRoute as b, createLoaderSignal as c, isSameOrigin as d, clientNavigate as e, toPath as f, getClientNavPath as g, QFN_KEY as h, isSamePath as i, QACTION_KEY as j, QDATA_KEY as k, loadClientData as l, resolveRouteConfig as m, QLOADER_KEY as n, isPromise as o, preloadRouteBundles as p, resolveHead as r, shouldPreload as s, toUrl as t };

package/lib/chunks/{mime-types.mjs → url.mjs}

@@ -49,4 +49,13 @@ const MIME_TYPES = {
   zip: "application/zip"
 };
 
-export { MIME_TYPES as M };
+const LEADING_DOUBLE_SLASH_REG = /^[\\/]{2,}/;
+function normalizeRequestUrl(url, base) {
+  const DOUBLE_SLASH_REG = /\/\/|\\\\/g;
+  const queryOrHashIndex = url.search(/[?#]/);
+  const path = queryOrHashIndex === -1 ? url : url.slice(0, queryOrHashIndex);
+  const suffix = queryOrHashIndex === -1 ? "" : url.slice(queryOrHashIndex);
+  return new URL(`${path.replace(LEADING_DOUBLE_SLASH_REG, "/").replace(DOUBLE_SLASH_REG, "/")}${suffix}`, base);
+}
+
+export { MIME_TYPES as M, normalizeRequestUrl as n };

package/lib/chunks/worker-thread.qwik.mjs

@@ -35,7 +35,7 @@ const resolveDocumentHead = (resolvedHead, updatedHead) => {
   mergeArray(resolvedHead.scripts, updatedHead.scripts);
   Object.assign(resolvedHead.frontmatter, updatedHead.frontmatter);
 };
-const createDocumentHead = (defaults) => ({
+const createDocumentHead = (defaults, manifestHash) => ({
   title: defaults?.title || "",
   meta: [
     ...defaults?.meta || []
@@ -51,7 +51,8 @@ const createDocumentHead = (defaults) => ({
   ],
   frontmatter: {
     ...defaults?.frontmatter
-  }
+  },
+  manifestHash: manifestHash || "dev"
 });
 const resolveRouteConfig = (resolveValue, routeLocation, contentModules, locale, status, defaults) => withLocale(locale, () => {
   const head = createDocumentHead(defaults);
@@ -1183,7 +1184,7 @@ function createResolveRequestHandlers(deps) {
     const routeLoaders = [];
     const routeActions = [];
     const requestHandlers = [];
-    const isPageRoute = !!(route && isLastModulePageRoute(route.$mods$));
+    const isPageRoute = !!isLastModulePageRoute(route.$mods$);
     if (isInternal) {
       requestHandlers.push(handleQDataRedirect);
     }
@@ -1193,36 +1194,36 @@ function createResolveRequestHandlers(deps) {
     if (serverPlugins) {
       _resolveRequestHandlers(routeLoaders, routeActions, requestHandlers, serverPlugins, isPageRoute, method);
     }
-    if (route) {
-      const routeModules = route.$mods$;
-      _resolveRequestHandlers(routeLoaders, routeActions, requestHandlers, routeModules, isPageRoute, method);
-      const routeName = route.$routeName$;
-      if (checkOrigin && (method === "POST" || method === "PUT" || method === "PATCH" || method === "DELETE")) {
-        if (checkOrigin === "lax-proto") {
-          requestHandlers.unshift(csrfLaxProtoCheckMiddleware);
-        } else {
-          requestHandlers.unshift(csrfCheckMiddleware);
-        }
+    const routeModules = route.$mods$;
+    _resolveRequestHandlers(routeLoaders, routeActions, requestHandlers, routeModules, isPageRoute, method);
+    const routeName = route.$routeName$;
+    if (checkOrigin && (method === "POST" || method === "PUT" || method === "PATCH" || method === "DELETE")) {
+      if (checkOrigin === "lax-proto") {
+        requestHandlers.unshift(csrfLaxProtoCheckMiddleware);
+      } else {
+        requestHandlers.unshift(csrfCheckMiddleware);
       }
-      if (isPageRoute) {
-        if (method === "POST" || method === "GET") {
-          requestHandlers.push(runServerFunction);
-        }
+    }
+    if (isPageRoute) {
+      if (method === "POST" || method === "GET") {
+        requestHandlers.push(runServerFunction);
+      }
+      if (!route.$notFound$) {
         requestHandlers.push(fixTrailingSlash);
-        if (isInternal) {
-          requestHandlers.push(renderQData);
-        }
       }
-      if (isPageRoute) {
-        requestHandlers.push((ev) => {
-          ev.sharedMap.set(deps.RequestRouteName, routeName);
-        });
-        requestHandlers.push(actionsMiddleware(routeActions));
-        requestHandlers.push(loadersMiddleware(routeLoaders));
-        requestHandlers.push(eTagMiddleware(route));
-        requestHandlers.push(renderHandler);
+      if (isInternal) {
+        requestHandlers.push(renderQData);
       }
     }
+    if (isPageRoute) {
+      requestHandlers.push((ev) => {
+        ev.sharedMap.set(deps.RequestRouteName, routeName);
+      });
+      requestHandlers.push(actionsMiddleware(routeActions));
+      requestHandlers.push(loadersMiddleware(routeLoaders));
+      requestHandlers.push(eTagMiddleware(route));
+      requestHandlers.push(renderHandler);
+    }
     return requestHandlers;
   };
   const _resolveRequestHandlers = (routeLoaders, routeActions, requestHandlers, routeModules, collectActions, method) => {

package/lib/index.d.ts

@@ -740,7 +740,10 @@ export { RequestEventLoader }
 export { RequestHandler }
 
 /** @public */
-export declare type ResolvedDocumentHead<FrontMatter extends Record<string, any> = Record<string, unknown>> = Required<DocumentHeadValue<FrontMatter>>;
+export declare type ResolvedDocumentHead<FrontMatter extends Record<string, any> = Record<string, unknown>> = Required<DocumentHeadValue<FrontMatter>> & {
+    /** The build's manifest hash, used for per-loader data URLs. Always defined (`'dev'` in dev). */
+    readonly manifestHash: string;
+};
 
 /** @public */
 export declare const routeAction$: ActionConstructor;

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';
@@ -366,6 +366,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 +403,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 +561,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 +573,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 +588,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 +620,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);

package/lib/middleware/aws-lambda/index.d.ts

@@ -1,9 +1,7 @@
 import { Http2ServerRequest } from 'http2';
 import { IncomingMessage } from 'http';
 import { NodeRequestNextFunction } from '@qwik.dev/router/middleware/node';
-import type { QwikCityPlan } from '@qwik.dev/router';
 import type { QwikManifest } from '@qwik.dev/core/optimizer';
-import type { QwikRouterConfig } from '@qwik.dev/router';
 import type { Render } from '@qwik.dev/core/server';
 import type { ServerRenderOptions } from '@qwik.dev/router/middleware/request-handler';
 import { ServerResponse } from 'http';
@@ -11,10 +9,6 @@ import { ServerResponse } from 'http';
 declare interface AwsOpt {
     render: Render;
     manifest?: QwikManifest;
-    /** @deprecated Not used */
-    qwikRouterConfig?: QwikRouterConfig;
-    /** @deprecated Not used */
-    qwikCityPlan?: QwikCityPlan;
 }
 
 /**

package/lib/middleware/aws-lambda/index.mjs

@@ -1,14 +1,9 @@
 import { createQwikRouter as createQwikRouter$1 } from '@qwik.dev/router/middleware/node';
 
 function createQwikRouter(opts) {
-  if (opts.qwikCityPlan && !opts.qwikRouterConfig) {
-    console.warn("qwikCityPlan is deprecated. Simply remove it.");
-    opts.qwikRouterConfig = opts.qwikCityPlan;
-  }
   try {
     const { router, staticFile, notFound } = createQwikRouter$1({
       render: opts.render,
-      qwikRouterConfig: opts.qwikRouterConfig,
       manifest: opts.manifest,
       static: {
         cacheControl: "public, max-age=31557600"

package/lib/middleware/azure-swa/index.mjs

@@ -3,10 +3,6 @@ import { requestHandler, isStaticPath, getNotFound } from '@qwik.dev/router/midd
 import { parseString } from 'set-cookie-parser';
 
 function createQwikRouter(opts) {
-  if (opts.qwikCityPlan && !opts.qwikRouterConfig) {
-    console.warn("qwikCityPlan is deprecated. Simply remove it.");
-    opts.qwikRouterConfig = opts.qwikCityPlan;
-  }
   if (opts.manifest) {
     setServerPlatform(opts.manifest);
   }

package/lib/middleware/bun/index.mjs

@@ -1,8 +1,8 @@
+import { isDev } from '@qwik.dev/core/build';
 import { setServerPlatform } from '@qwik.dev/core/server';
 import { _TextEncoderStream_polyfill, isStaticPath, getNotFound, mergeHeadersCookies, requestHandler } from '@qwik.dev/router/middleware/request-handler';
 import { join, extname } from 'node:path';
-import { M as MIME_TYPES } from '../../chunks/mime-types.mjs';
-import { isDev } from '@qwik.dev/core/build';
+import { M as MIME_TYPES, n as normalizeRequestUrl } from '../../chunks/url.mjs';
 
 function getRequestUrl(request, opts) {
   const url = new URL(request.url);
@@ -10,13 +10,9 @@ function getRequestUrl(request, opts) {
   if (!origin) {
     return url;
   }
-  return new URL(`${url.pathname}${url.search}${url.hash}`, origin);
+  return normalizeRequestUrl(`${url.pathname}${url.search}${url.hash}`, origin);
 }
 function createQwikRouter(opts) {
-  if (opts.qwikCityPlan && !opts.qwikRouterConfig) {
-    console.warn("qwikCityPlan is deprecated. Simply remove it.");
-    opts.qwikRouterConfig = opts.qwikCityPlan;
-  }
   globalThis.TextEncoderStream ||= _TextEncoderStream_polyfill;
   if (opts.manifest) {
     setServerPlatform(opts.manifest);

package/lib/middleware/cloudflare-pages/index.mjs

@@ -3,10 +3,6 @@ import { _TextEncoderStream_polyfill, isStaticPath, mergeHeadersCookies, request
 import { isDev } from '@qwik.dev/core/build';
 
 function createQwikRouter(opts) {
-  if (opts.qwikCityPlan && !opts.qwikRouterConfig) {
-    console.warn("qwikCityPlan is deprecated. Simply remove it.");
-    opts.qwikRouterConfig = opts.qwikCityPlan;
-  }
   try {
     new globalThis.TextEncoderStream();
   } catch {

package/lib/middleware/deno/index.mjs

@@ -1,6 +1,6 @@
 import { setServerPlatform } from '@qwik.dev/core/server';
 import { isStaticPath, getNotFound, mergeHeadersCookies, requestHandler } from '@qwik.dev/router/middleware/request-handler';
-import { M as MIME_TYPES } from '../../chunks/mime-types.mjs';
+import { M as MIME_TYPES, n as normalizeRequestUrl } from '../../chunks/url.mjs';
 import { join, fromFileUrl, extname } from 'https://deno.land/std/path/mod.ts';
 import { isDev } from '@qwik.dev/core/build';
 
@@ -10,13 +10,9 @@ function getRequestUrl(request, opts, info) {
   if (!origin) {
     return url;
   }
-  return new URL(`${url.pathname}${url.search}${url.hash}`, origin);
+  return normalizeRequestUrl(`${url.pathname}${url.search}${url.hash}`, origin);
 }
 function createQwikRouter(opts) {
-  if (opts.qwikCityPlan && !opts.qwikRouterConfig) {
-    console.warn("qwikCityPlan is deprecated. Simply remove it.");
-    opts.qwikRouterConfig = opts.qwikCityPlan;
-  }
   if (opts.manifest) {
     setServerPlatform(opts.manifest);
   }

package/lib/middleware/firebase/index.mjs

@@ -1,14 +1,9 @@
 import { createQwikRouter as createQwikRouter$1 } from '@qwik.dev/router/middleware/node';
 
 function createQwikRouter(opts) {
-  if (opts.qwikCityPlan && !opts.qwikRouterConfig) {
-    console.warn("qwikCityPlan is deprecated. Simply remove it.");
-    opts.qwikRouterConfig = opts.qwikCityPlan;
-  }
   const { staticFile, notFound, router } = createQwikRouter$1({
     render: opts.render,
     manifest: opts.manifest,
-    qwikRouterConfig: opts.qwikRouterConfig,
     static: {
       cacheControl: "public, max-age=31557600"
     },

package/lib/middleware/netlify-edge/index.mjs

@@ -3,10 +3,6 @@ import { isStaticPath, mergeHeadersCookies, requestHandler, getNotFound } from '
 import { isDev } from '@qwik.dev/core/build';
 
 function createQwikRouter(opts) {
-  if (opts.qwikCityPlan && !opts.qwikRouterConfig) {
-    console.warn("qwikCityPlan is deprecated. Simply remove it.");
-    opts.qwikRouterConfig = opts.qwikCityPlan;
-  }
   if (opts.manifest) {
     setServerPlatform(opts.manifest);
   }

package/lib/middleware/node/index.mjs

@@ -4,7 +4,7 @@ import { isStaticPath, getNotFound, requestHandler } from '@qwik.dev/router/midd
 import { createReadStream } from 'node:fs';
 import { join, basename, extname } from 'node:path';
 import { fileURLToPath } from 'node:url';
-import { M as MIME_TYPES } from '../../chunks/mime-types.mjs';
+import { n as normalizeRequestUrl, M as MIME_TYPES } from '../../chunks/url.mjs';
 import { Http2ServerRequest } from 'node:http2';
 
 function fallbackOrigin(req) {
@@ -27,8 +27,7 @@ function isIgnoredError(message = "") {
 }
 const invalidHeadersPattern = /^:(method|scheme|authority|path)$/i;
 function normalizeUrl(url, base) {
-  const DOUBLE_SLASH_REG = /\/\/|\\\\/g;
-  return new URL(url.replace(DOUBLE_SLASH_REG, "/"), base);
+  return normalizeRequestUrl(url, base);
 }
 function getUrl(req, origin) {
   return normalizeUrl(req.originalUrl || req.url || "/", origin);
@@ -126,10 +125,6 @@ async function fromNodeHttp(url, req, res, mode, getClientConn) {
 }
 
 function createQwikRouter(opts) {
-  if (opts.qwikCityPlan && !opts.qwikRouterConfig) {
-    console.warn("qwikCityPlan is deprecated. Simply remove it.");
-    opts.qwikRouterConfig = opts.qwikCityPlan;
-  }
   if (opts.manifest) {
     setServerPlatform(opts.manifest);
   }

package/lib/middleware/request-handler/index.d.ts

@@ -4,9 +4,7 @@ import type { EnvGetter as EnvGetter_2 } from '@qwik.dev/router/middleware/reque
 import type { FailReturn } from '@qwik.dev/router';
 import type { JSXOutput } from '@qwik.dev/core';
 import type { Loader as Loader_2 } from '@qwik.dev/router';
-import type { QwikCityPlan } from '@qwik.dev/router';
 import type { QwikIntrinsicElements } from '@qwik.dev/core';
-import type { QwikRouterConfig } from '@qwik.dev/router';
 import type { Render } from '@qwik.dev/core/server';
 import type { RenderOptions } from '@qwik.dev/core/server';
 import { RequestEvent as RequestEvent_2 } from '@qwik.dev/router/middleware/request-handler';
@@ -632,7 +630,10 @@ export declare type RequestHandler<PLATFORM = QwikRouterPlatform> = (ev: Request
 export declare function requestHandler<T = unknown>(serverRequestEv: ServerRequestEvent<T>, opts: ServerRenderOptions): Promise<QwikRouterRun<T> | null>;
 
 /** @public */
-declare type ResolvedDocumentHead<FrontMatter extends Record<string, any> = Record<string, unknown>> = Required<DocumentHeadValue<FrontMatter>>;
+declare type ResolvedDocumentHead<FrontMatter extends Record<string, any> = Record<string, unknown>> = Required<DocumentHeadValue<FrontMatter>> & {
+    /** The build's manifest hash, used for per-loader data URLs. Always defined (`'dev'` in dev). */
+    readonly manifestHash: string;
+};
 
 /** @public */
 export declare interface ResolveSyncValue {
@@ -715,10 +716,6 @@ declare type ServerErrorCode = 500 | 501 | 502 | 503 | 504 | 505 | 506 | 507 | 5
 /** @public */
 export declare interface ServerRenderOptions extends RenderOptions {
     render: Render;
-    /** @deprecated Not used */
-    qwikCityPlan?: QwikCityPlan;
-    /** @deprecated Not used */
-    qwikRouterConfig?: QwikRouterConfig;
     /**
      * Protection against cross-site request forgery (CSRF) attacks.
      *

package/lib/middleware/request-handler/index.mjs

@@ -1,4 +1,4 @@
-import { Q as Q_ROUTE, m as resolveRouteConfig, n as QLOADER_KEY, h as QFN_KEY, j as QACTION_KEY, o as isPromise, k as QDATA_KEY, e as loadRoute } from '../../chunks/routing.qwik.mjs';
+import { Q as Q_ROUTE, m as resolveRouteConfig, n as QLOADER_KEY, h as QFN_KEY, j as QACTION_KEY, o as isPromise, k as QDATA_KEY, b as loadRoute } from '../../chunks/routing.qwik.mjs';
 import { isDev, _UNINITIALIZED, _deserialize, _verifySerializable, _serialize } from '@qwik.dev/core/internal';
 import { inlinedQrl } from '@qwik.dev/core';
 import { R as RedirectMessage, A as AbortMessage } from '../../chunks/redirect-handler.mjs';
@@ -647,7 +647,7 @@ function createResolveRequestHandlers(deps) {
     const routeLoaders = [];
     const routeActions = [];
     const requestHandlers = [];
-    const isPageRoute = !!(route && isLastModulePageRoute(route.$mods$));
+    const isPageRoute = !!isLastModulePageRoute(route.$mods$);
     if (isInternal) {
       requestHandlers.push(handleQDataRedirect);
     }
@@ -657,36 +657,36 @@ function createResolveRequestHandlers(deps) {
     if (serverPlugins) {
       _resolveRequestHandlers(routeLoaders, routeActions, requestHandlers, serverPlugins, isPageRoute, method);
     }
-    if (route) {
-      const routeModules = route.$mods$;
-      _resolveRequestHandlers(routeLoaders, routeActions, requestHandlers, routeModules, isPageRoute, method);
-      const routeName = route.$routeName$;
-      if (checkOrigin && (method === "POST" || method === "PUT" || method === "PATCH" || method === "DELETE")) {
-        if (checkOrigin === "lax-proto") {
-          requestHandlers.unshift(csrfLaxProtoCheckMiddleware);
-        } else {
-          requestHandlers.unshift(csrfCheckMiddleware);
-        }
+    const routeModules = route.$mods$;
+    _resolveRequestHandlers(routeLoaders, routeActions, requestHandlers, routeModules, isPageRoute, method);
+    const routeName = route.$routeName$;
+    if (checkOrigin && (method === "POST" || method === "PUT" || method === "PATCH" || method === "DELETE")) {
+      if (checkOrigin === "lax-proto") {
+        requestHandlers.unshift(csrfLaxProtoCheckMiddleware);
+      } else {
+        requestHandlers.unshift(csrfCheckMiddleware);
       }
-      if (isPageRoute) {
-        if (method === "POST" || method === "GET") {
-          requestHandlers.push(runServerFunction);
-        }
+    }
+    if (isPageRoute) {
+      if (method === "POST" || method === "GET") {
+        requestHandlers.push(runServerFunction);
+      }
+      if (!route.$notFound$) {
         requestHandlers.push(fixTrailingSlash);
-        if (isInternal) {
-          requestHandlers.push(renderQData);
-        }
       }
-      if (isPageRoute) {
-        requestHandlers.push((ev) => {
-          ev.sharedMap.set(deps.RequestRouteName, routeName);
-        });
-        requestHandlers.push(actionsMiddleware(routeActions));
-        requestHandlers.push(loadersMiddleware(routeLoaders));
-        requestHandlers.push(eTagMiddleware(route));
-        requestHandlers.push(renderHandler);
+      if (isInternal) {
+        requestHandlers.push(renderQData);
       }
     }
+    if (isPageRoute) {
+      requestHandlers.push((ev) => {
+        ev.sharedMap.set(deps.RequestRouteName, routeName);
+      });
+      requestHandlers.push(actionsMiddleware(routeActions));
+      requestHandlers.push(loadersMiddleware(routeLoaders));
+      requestHandlers.push(eTagMiddleware(route));
+      requestHandlers.push(renderHandler);
+    }
     return requestHandlers;
   };
   const _resolveRequestHandlers = (routeLoaders, routeActions, requestHandlers, routeModules, collectActions, method) => {
@@ -1632,9 +1632,15 @@ function runQwikRouter(serverRequestEv, loadedRoute, requestHandlers, rebuildRou
   });
 }
 
-let qwikRouterConfigActual;
-async function loadRequestHandlers(qwikRouterConfig, pathname, method, checkOrigin, renderFn, isInternal) {
-  const { routes, serverPlugins, cacheModules } = qwikRouterConfig;
+let qwikRouterConfig;
+async function getConfig() {
+  if (!qwikRouterConfig) {
+    qwikRouterConfig = await import('@qwik-router-config');
+  }
+  return qwikRouterConfig;
+}
+async function loadRequestHandlers(qwikRouterConfig2, pathname, method, checkOrigin, renderFn, isInternal) {
+  const { routes, serverPlugins, cacheModules } = qwikRouterConfig2;
   const loadedRoute = await loadRoute(routes, cacheModules, pathname, isInternal);
   const requestHandlers = resolveRequestHandlers(serverPlugins, loadedRoute, method, checkOrigin, renderQwikMiddleware(renderFn), isInternal);
   return {
@@ -1644,29 +1650,20 @@ async function loadRequestHandlers(qwikRouterConfig, pathname, method, checkOrig
 }
 async function requestHandler(serverRequestEv, opts) {
   const { render, checkOrigin } = opts;
-  let { qwikRouterConfig } = opts;
-  if (!qwikRouterConfig) {
-    if (!qwikRouterConfigActual) {
-      qwikRouterConfigActual = await import('@qwik-router-config');
-    }
-    qwikRouterConfig = qwikRouterConfigActual;
-  }
-  if (!qwikRouterConfig) {
-    throw new Error("qwikRouterConfig is required.");
-  }
+  const config = await getConfig();
   const { pathname, isInternal } = getRouteMatchPathname(serverRequestEv.url.pathname);
   if (pathname === "/.well-known" || pathname.startsWith("/.well-known/")) {
     return null;
   }
-  const { loadedRoute, requestHandlers } = await loadRequestHandlers(qwikRouterConfig, pathname, serverRequestEv.request.method, checkOrigin ?? true, render, isInternal);
-  if (qwikRouterConfig.fallthrough && loadedRoute.$notFound$) {
+  const { loadedRoute, requestHandlers } = await loadRequestHandlers(config, pathname, serverRequestEv.request.method, checkOrigin ?? true, render, isInternal);
+  if (config.fallthrough && loadedRoute.$notFound$) {
     return null;
   }
   const rebuildRouteInfo = async (url) => {
     const { pathname: pathname2 } = getRouteMatchPathname(url.pathname);
-    return loadRequestHandlers(qwikRouterConfig, pathname2, serverRequestEv.request.method, checkOrigin ?? true, render, isInternal);
+    return loadRequestHandlers(config, pathname2, serverRequestEv.request.method, checkOrigin ?? true, render, isInternal);
   };
-  return runQwikRouter(serverRequestEv, loadedRoute, requestHandlers, rebuildRouteInfo, qwikRouterConfig.basePathname);
+  return runQwikRouter(serverRequestEv, loadedRoute, requestHandlers, rebuildRouteInfo, config.basePathname);
 }
 
 const notFounds = [

package/lib/middleware/vercel-edge/index.mjs

@@ -9,10 +9,6 @@ const VERCEL_SKEW_PROTECTION_ENABLED = "VERCEL_SKEW_PROTECTION_ENABLED";
 const VERCEL_DEPLOYMENT_ID = "VERCEL_DEPLOYMENT_ID";
 const BASE_URL = "BASE_URL";
 function createQwikRouter(opts) {
-  if (opts.qwikCityPlan && !opts.qwikRouterConfig) {
-    console.warn("qwikCityPlan is deprecated. Simply remove it.");
-    opts.qwikRouterConfig = opts.qwikCityPlan;
-  }
   if (opts.manifest) {
     setServerPlatform(opts.manifest);
   }

package/lib/vite/index.mjs

@@ -1608,10 +1608,10 @@ function isBundlePartOfRoute(bundle, routeAndLayoutPaths) {
   if (!bundle.origins) {
     return false;
   }
-  for (const bundleOrigin of bundle.origins) {
+  return bundle.origins.some((bundleOrigin) => {
     const originPath = removeExtension(bundleOrigin);
     return routeAndLayoutPaths.some((path) => path.endsWith(originPath));
-  }
+  });
 }
 function getRouteImports(routes, manifest) {
   const result = {};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@qwik.dev/router",
   "description": "The router for Qwik.",
-  "version": "2.0.0-beta.30",
+  "version": "2.0.0-beta.31",
   "bugs": "https://github.com/QwikDev/qwik/issues",
   "dependencies": {
     "@azure/functions": "3.5.1",
@@ -40,7 +40,7 @@
     "tsm": "2.3.0",
     "typescript": "5.9.3",
     "uvu": "0.5.6",
-    "@qwik.dev/core": "2.0.0-beta.30"
+    "@qwik.dev/core": "2.0.0-beta.31"
   },
   "engines": {
     "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
@@ -169,7 +169,7 @@
   "main": "./lib/index.qwik.mjs",
   "peerDependencies": {
     "vite": ">=6 <9",
-    "@qwik.dev/core": "^2.0.0-beta.30"
+    "@qwik.dev/core": "^2.0.0-beta.31"
   },
   "publishConfig": {
     "access": "public"