@qwik.dev/router 2.0.0-alpha.8 → 2.0.0-beta.1

package/lib/vite/index.mjs

@@ -7,7 +7,7 @@ var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __esm = (fn, res) => function __init() {
   return fn && (res = (0, fn[__getOwnPropNames(fn)[0]])(fn = 0)), res;
 };
-var __commonJS = (cb, mod) => function __require2() {
+var __commonJS = (cb, mod) => function __require() {
   return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
 };
 var __export = (target, all3) => {
@@ -14285,7 +14285,7 @@ function extendConfig(baseConfigExport, serverConfigExport) {
 }
 
 // sw-reg:@qwik-router-sw-register-build
-var qwik_router_sw_register_build_default = '((i,r,a,o)=>{a=e=>{const t=document.querySelector("[q\\\\:base]");t&&r.active&&r.active.postMessage({type:"qprefetch",base:t.getAttribute("q:base"),...e})},document.addEventListener("qprefetch",e=>{const t=e.detail;r?a(t):i.push(t)}),"serviceWorker"in navigator?navigator.serviceWorker.register("__url").then(e=>{o=()=>{r=e,i.forEach(a),a({bundles:i})},e.installing?e.installing.addEventListener("statechange",t=>{t.target.state=="activated"&&o()}):e.active&&o()}).catch(e=>console.error(e)):console.log("Service worker not supported in this browser.")})([])';
+var qwik_router_sw_register_build_default = '"serviceWorker"in navigator?navigator.serviceWorker.register("__url").catch(r=>console.error(r)):console.log("Service worker not supported in this browser.")';
 
 // packages/qwik-router/src/buildtime/vite/plugin.ts
 import fs8 from "node:fs";
@@ -14295,17 +14295,11 @@ import { loadEnv } from "vite";
 // packages/qwik-router/src/middleware/request-handler/error-handler.ts
 var ServerError = class extends Error {
   constructor(status, data) {
-    super();
+    super(typeof data === "string" ? data : void 0);
     this.status = status;
     this.data = data;
   }
 };
-var ErrorResponse = class extends Error {
-  constructor(status, message) {
-    super(message);
-    this.status = status;
-  }
-};
 function getErrorHtml(status, e) {
   let message = "Server Error";
   if (e != null) {
@@ -14507,6 +14501,14 @@ var AbortMessage = class {
 var RedirectMessage = class extends AbortMessage {
 };
 
+// packages/qwik-router/src/middleware/request-handler/rewrite-handler.ts
+var RewriteMessage = class extends AbortMessage {
+  constructor(pathname) {
+    super();
+    this.pathname = pathname;
+  }
+};
+
 // packages/qwik-router/src/runtime/src/constants.ts
 var QACTION_KEY = "qaction";
 var QFN_KEY = "qfunc";
@@ -14670,8 +14672,7 @@ function createCacheControl(cacheControl) {
     cacheControl = {
       public: true,
       immutable: true,
-      maxAge: 60 * 60 * 24 * 365,
-      staleWhileRevalidate: 60 * 60 * 24 * 365
+      maxAge: 60 * 60 * 24 * 365
     };
   } else if (cacheControl === "no-cache") {
     cacheControl = {
@@ -14681,8 +14682,7 @@ function createCacheControl(cacheControl) {
   if (typeof cacheControl === "number") {
     cacheControl = {
       maxAge: cacheControl,
-      sMaxAge: cacheControl,
-      staleWhileRevalidate: cacheControl
+      sMaxAge: cacheControl
     };
   }
   if (cacheControl.immutable) {
@@ -14727,14 +14727,13 @@ import("node:async_hooks").then((module) => {
     err
   );
 });
-function runQwikRouter(serverRequestEv, loadedRoute, requestHandlers, manifest, trailingSlash = true, basePathname = "/", qwikSerializer) {
+function runQwikRouter(serverRequestEv, loadedRoute, requestHandlers, rebuildRouteInfo, trailingSlash = true, basePathname = "/", qwikSerializer) {
   let resolve4;
   const responsePromise = new Promise((r2) => resolve4 = r2);
   const requestEv = createRequestEvent(
     serverRequestEv,
     loadedRoute,
     requestHandlers,
-    manifest,
     trailingSlash,
     basePathname,
     qwikSerializer,
@@ -14743,49 +14742,71 @@ function runQwikRouter(serverRequestEv, loadedRoute, requestHandlers, manifest,
   return {
     response: responsePromise,
     requestEv,
-    completion: asyncStore ? asyncStore.run(requestEv, runNext, requestEv, resolve4) : runNext(requestEv, resolve4)
+    completion: asyncStore ? asyncStore.run(requestEv, runNext, requestEv, rebuildRouteInfo, resolve4) : runNext(requestEv, rebuildRouteInfo, resolve4)
   };
 }
-async function runNext(requestEv, resolve4) {
-  try {
-    await requestEv.next();
-  } catch (e) {
-    if (e instanceof RedirectMessage) {
-      const stream = requestEv.getWritableStream();
-      await stream.close();
-    } else if (e instanceof ErrorResponse) {
-      console.error(e);
-      if (!requestEv.headersSent) {
-        const html5 = getErrorHtml(e.status, e);
-        const status = e.status;
-        requestEv.html(status, html5);
-      }
-    } else if (!(e instanceof AbortMessage)) {
-      if (getRequestMode(requestEv) !== "dev") {
-        try {
-          if (!requestEv.headersSent) {
-            requestEv.headers.set("content-type", "text/html; charset=utf-8");
-            requestEv.cacheControl({ noCache: true });
-            requestEv.status(500);
+async function runNext(requestEv, rebuildRouteInfo, resolve4) {
+  let rewriteAttempt = 1;
+  async function _runNext() {
+    try {
+      await requestEv.next();
+    } catch (e) {
+      if (e instanceof RedirectMessage) {
+        const stream = requestEv.getWritableStream();
+        await stream.close();
+      } else if (e instanceof RewriteMessage) {
+        if (rewriteAttempt > 50) {
+          throw new Error(`Infinite rewrite loop`);
+        }
+        rewriteAttempt += 1;
+        const url = new URL(requestEv.url);
+        url.pathname = e.pathname;
+        const { loadedRoute, requestHandlers } = await rebuildRouteInfo(url);
+        requestEv.resetRoute(loadedRoute, requestHandlers, url);
+        return await _runNext();
+      } else if (e instanceof ServerError) {
+        if (!requestEv.headersSent) {
+          const status = e.status;
+          const accept = requestEv.request.headers.get("Accept");
+          if (accept && !accept.includes("text/html")) {
+            const qwikSerializer = requestEv[RequestEvQwikSerializer];
+            requestEv.headers.set("Content-Type", "application/qwik-json");
+            requestEv.send(status, await qwikSerializer._serialize([e.data]));
+          } else {
+            const html5 = getErrorHtml(e.status, e.data);
+            requestEv.html(status, html5);
           }
-          const stream = requestEv.getWritableStream();
-          if (!stream.locked) {
-            const writer = stream.getWriter();
-            await writer.write(encoder.encode(minimalHtmlResponse(500, "Internal Server Error")));
-            await writer.close();
+        }
+      } else if (!(e instanceof AbortMessage)) {
+        if (getRequestMode(requestEv) !== "dev") {
+          try {
+            if (!requestEv.headersSent) {
+              requestEv.headers.set("content-type", "text/html; charset=utf-8");
+              requestEv.cacheControl({ noCache: true });
+              requestEv.status(500);
+            }
+            const stream = requestEv.getWritableStream();
+            if (!stream.locked) {
+              const writer = stream.getWriter();
+              await writer.write(encoder.encode(minimalHtmlResponse(500, "Internal Server Error")));
+              await writer.close();
+            }
+          } catch {
+            console.error("Unable to render error page");
           }
-        } catch {
-          console.error("Unable to render error page");
         }
+        return e;
       }
-      return e;
     }
+    return void 0;
+  }
+  try {
+    return await _runNext();
   } finally {
     if (!requestEv.isDirty()) {
       resolve4(null);
     }
   }
-  return void 0;
 }
 function getRouteMatchPathname(pathname, trailingSlash) {
   if (pathname.endsWith(QDATA_JSON)) {
@@ -14811,7 +14832,8 @@ var RequestRouteName = "@routeName";
 var RequestEvSharedActionId = "@actionId";
 var RequestEvSharedActionFormData = "@actionFormData";
 var RequestEvSharedNonce = "@nonce";
-function createRequestEvent(serverRequestEv, loadedRoute, requestHandlers, manifest, trailingSlash, basePathname, qwikSerializer, resolved) {
+var RequestEvIsRewrite = "@rewrite";
+function createRequestEvent(serverRequestEv, loadedRoute, requestHandlers, trailingSlash, basePathname, qwikSerializer, resolved) {
   const { request, platform, env: env2 } = serverRequestEv;
   const sharedMap = /* @__PURE__ */ new Map();
   const cookie = new Cookie(request.headers.get("cookie"));
@@ -14824,7 +14846,6 @@ function createRequestEvent(serverRequestEv, loadedRoute, requestHandlers, manif
     }
     sharedMap.set(IsQData, true);
   }
-  sharedMap.set("@manifest", manifest);
   let routeModuleIndex = -1;
   let writableStream = null;
   let requestData = void 0;
@@ -14842,6 +14863,13 @@ function createRequestEvent(serverRequestEv, loadedRoute, requestHandlers, manif
       routeModuleIndex++;
     }
   };
+  const resetRoute = (_loadedRoute, _requestHandlers, _url = url) => {
+    loadedRoute = _loadedRoute;
+    requestHandlers = _requestHandlers;
+    url.pathname = _url.pathname;
+    url.search = _url.search;
+    routeModuleIndex = -1;
+  };
   const check = () => {
     if (writableStream !== null) {
       throw new Error("Response already sent");
@@ -14876,11 +14904,7 @@ function createRequestEvent(serverRequestEv, loadedRoute, requestHandlers, manif
         const writableStream2 = requestEv.getWritableStream();
         statusOrResponse.body.pipeTo(writableStream2);
       } else {
-        if (status >= 300 && status < 400) {
-          return new RedirectMessage();
-        } else {
-          requestEv.getWritableStream().getWriter().close();
-        }
+        requestEv.getWritableStream().getWriter().close();
       }
     }
     return exit2();
@@ -14894,17 +14918,26 @@ function createRequestEvent(serverRequestEv, loadedRoute, requestHandlers, manif
     [RequestEvLoaders]: loaders,
     [RequestEvMode]: serverRequestEv.mode,
     [RequestEvTrailingSlash]: trailingSlash,
-    [RequestEvRoute]: loadedRoute,
+    get [RequestEvRoute]() {
+      return loadedRoute;
+    },
     [RequestEvQwikSerializer]: qwikSerializer,
     cookie,
     headers,
     env: env2,
     method: request.method,
     signal: request.signal,
-    params: (loadedRoute == null ? void 0 : loadedRoute[1]) ?? {},
-    pathname: url.pathname,
+    originalUrl: new URL(url),
+    get params() {
+      return (loadedRoute == null ? void 0 : loadedRoute[1]) ?? {};
+    },
+    get pathname() {
+      return url.pathname;
+    },
     platform,
-    query: url.searchParams,
+    get query() {
+      return url.searchParams;
+    },
     request,
     url,
     basePathname,
@@ -14919,6 +14952,7 @@ function createRequestEvent(serverRequestEv, loadedRoute, requestHandlers, manif
       return serverRequestEv.getClientConn();
     },
     next,
+    resetRoute,
     exit: exit2,
     cacheControl: (cacheControl, target = "Cache-Control") => {
       check();
@@ -14951,7 +14985,7 @@ function createRequestEvent(serverRequestEv, loadedRoute, requestHandlers, manif
     },
     error: (statusCode, message) => {
       status = statusCode;
-      return new ErrorResponse(statusCode, message);
+      return new ServerError(statusCode, message);
     },
     redirect: (statusCode, url2) => {
       check();
@@ -14969,6 +15003,14 @@ function createRequestEvent(serverRequestEv, loadedRoute, requestHandlers, manif
       exit2();
       return new RedirectMessage();
     },
+    rewrite: (pathname) => {
+      check();
+      if (pathname.startsWith("http")) {
+        throw new Error("Rewrite does not support absolute urls");
+      }
+      sharedMap.set(RequestEvIsRewrite, true);
+      return new RewriteMessage(pathname.replace(/\/+/g, "/"));
+    },
     defer: (returnData) => {
       return typeof returnData === "function" ? returnData : () => returnData;
     },
@@ -15052,7 +15094,7 @@ var parseRequest = async ({ request, method, query }, sharedMap, qwikSerializer)
       if (data) {
         try {
           return qwikSerializer._deserialize(decodeURIComponent(data));
-        } catch (err) {
+        } catch {
         }
       }
     }
@@ -15080,7 +15122,7 @@ var formToObj = (formData) => {
 
 // packages/qwik-router/src/middleware/request-handler/response-page.ts
 function getQwikRouterServerData(requestEv) {
-  const { url, params, request, status, locale } = requestEv;
+  const { params, request, status, locale, originalUrl } = requestEv;
   const requestHeaders = {};
   request.headers.forEach((value2, key) => requestHeaders[key] = value2);
   const action = requestEv.sharedMap.get(RequestEvSharedActionId);
@@ -15088,7 +15130,7 @@ function getQwikRouterServerData(requestEv) {
   const routeName = requestEv.sharedMap.get(RequestRouteName);
   const nonce = requestEv.sharedMap.get(RequestEvSharedNonce);
   const headers = requestEv.request.headers;
-  const reconstructedUrl = new URL(url.pathname + url.search, url);
+  const reconstructedUrl = new URL(originalUrl.pathname + originalUrl.search, originalUrl);
   const host = headers.get("X-Forwarded-Host");
   const protocol = headers.get("X-Forwarded-Proto");
   if (host) {
@@ -15366,13 +15408,9 @@ async function pureServerFunction(ev) {
           }
         } catch (err) {
           if (err instanceof ServerError) {
-            ev.headers.set("Content-Type", "application/qwik-json");
-            ev.send(err.status, await qwikSerializer._serialize([err.data]));
-            return;
+            throw ev.error(err.status, err.data);
           }
-          ev.headers.set("Content-Type", "application/qwik-json");
-          ev.send(500, await qwikSerializer._serialize([err]));
-          return;
+          throw ev.error(500, "Invalid request");
         }
         if (isAsyncIterator(result)) {
           ev.headers.set("Content-Type", "text/qwik-json-stream");
@@ -15404,18 +15442,19 @@ async function pureServerFunction(ev) {
 }
 function fixTrailingSlash(ev) {
   const trailingSlash = getRequestTrailingSlash(ev);
-  const { basePathname, pathname, url, sharedMap } = ev;
+  const { basePathname, originalUrl, sharedMap } = ev;
+  const { pathname, search: search2 } = originalUrl;
   const isQData = sharedMap.has(IsQData);
   if (!isQData && pathname !== basePathname && !pathname.endsWith(".html")) {
     if (trailingSlash) {
       if (!pathname.endsWith("/")) {
-        throw ev.redirect(301 /* MovedPermanently */, pathname + "/" + url.search);
+        throw ev.redirect(301 /* MovedPermanently */, pathname + "/" + search2);
       }
     } else {
       if (pathname.endsWith("/")) {
         throw ev.redirect(
           301 /* MovedPermanently */,
-          pathname.slice(0, pathname.length - 1) + url.search
+          pathname.slice(0, pathname.length - 1) + search2
         );
       }
     }
@@ -15492,10 +15531,10 @@ async function handleRedirect(requestEv) {
     return;
   }
   const status = requestEv.status();
-  const location2 = requestEv.headers.get("Location");
-  const isRedirect = status >= 301 && status <= 308 && location2;
+  const location = requestEv.headers.get("Location");
+  const isRedirect = status >= 301 && status <= 308 && location;
   if (isRedirect) {
-    const adaptedLocation = makeQDataPath(location2);
+    const adaptedLocation = makeQDataPath(location);
     if (adaptedLocation) {
       requestEv.headers.set("Location", adaptedLocation);
       requestEv.getWritableStream().close();
@@ -15516,7 +15555,7 @@ async function renderQData(requestEv) {
     return;
   }
   const status = requestEv.status();
-  const location2 = requestEv.headers.get("Location");
+  const redirectLocation = requestEv.headers.get("Location");
   const trailingSlash = getRequestTrailingSlash(requestEv);
   const requestHeaders = {};
   requestEv.request.headers.forEach((value2, key) => requestHeaders[key] = value2);
@@ -15526,7 +15565,8 @@ async function renderQData(requestEv) {
     action: requestEv.sharedMap.get(RequestEvSharedActionId),
     status: status !== 200 ? status : 200,
     href: getPathname(requestEv.url, trailingSlash),
-    redirect: location2 ?? void 0
+    redirect: redirectLocation ?? void 0,
+    isRewrite: requestEv.sharedMap.get(RequestEvIsRewrite)
   };
   const writer = requestEv.getWritableStream().getWriter();
   const qwikSerializer = requestEv[RequestEvQwikSerializer];
@@ -25964,6 +26004,9 @@ async function createMdxTransformer(ctx) {
       const addImport = `import { jsx } from '@qwik.dev/core';
 `;
       const newDefault = `
+function _missingMdxReference(id, component, place) {
+  throw new Error("${id}: Expected " + (component ? "component" : "object") + " \`" + id + "\` to be defined: you likely forgot to import, pass, or provide it." + (place ? "\\nIt\u2019s referenced in your code at \`" + place + "\`" : ""));
+}
 const WrappedMdxContent = () => {
   const content = _createMdxContent({});
   return typeof MDXLayout === 'function' ? jsx(MDXLayout, {children: content}) : content;
@@ -26178,130 +26221,6 @@ function generateServiceWorkerRegister(ctx, swRegister) {
   }
   return `export default ${JSON.stringify(swReg)};`;
 }
-function prependManifestToServiceWorker(ctx, manifest, prefetch, swCode) {
-  const key = `/* Qwik Service Worker */`;
-  if (swCode.includes(key)) {
-    return null;
-  }
-  const appBundles = [];
-  const appBundlesCode = generateAppBundles(appBundles, manifest);
-  const libraryBundlesCode = generateLibraryBundles(appBundles, manifest);
-  const [linkBundlesCode] = generateLinkBundles(ctx, appBundles, manifest, prefetch);
-  return [key, appBundlesCode, libraryBundlesCode, linkBundlesCode, swCode].join("\n");
-}
-function generateAppBundles(appBundles, manifest) {
-  const sortedBundles = Object.keys(manifest.bundles).sort();
-  for (const appBundleName of sortedBundles) {
-    const appBundle = [appBundleName, []];
-    appBundles.push(appBundle);
-    const symbolHashesInBundle = [];
-    const manifestBundle = manifest.bundles[appBundleName];
-    const importedBundleNames = Array.isArray(manifestBundle.imports) ? manifestBundle.imports : [];
-    const depsSet = new Set(importedBundleNames);
-    for (const importedBundleName of importedBundleNames) {
-      clearTransitiveDeps(depsSet, /* @__PURE__ */ new Set(), importedBundleName);
-    }
-    appBundle[1] = Array.from(depsSet).map((dep) => sortedBundles.indexOf(dep));
-    if (manifestBundle.symbols) {
-      for (const manifestBundleSymbolName of manifestBundle.symbols) {
-        const symbol = manifest.symbols[manifestBundleSymbolName];
-        if ((symbol == null ? void 0 : symbol.hash) && !symbolHashesInBundle.includes(symbol.hash)) {
-          symbolHashesInBundle.push(symbol.hash);
-        }
-      }
-    }
-    if (symbolHashesInBundle.length > 0) {
-      appBundle[2] = symbolHashesInBundle;
-    }
-  }
-  function clearTransitiveDeps(deps, seen, depName) {
-    const childBundle = manifest.bundles[depName];
-    for (const childDepImport of childBundle.imports || []) {
-      if (deps.has(childDepImport)) {
-        deps.delete(childDepImport);
-      }
-      if (!seen.has(childDepImport)) {
-        seen.add(childDepImport);
-        clearTransitiveDeps(deps, seen, childDepImport);
-      }
-    }
-  }
-  return `const appBundles=${JSON.stringify(appBundles)};`;
-}
-function generateLibraryBundles(appBundles, manifest) {
-  const libraryBundleIds = [];
-  for (const [bundleName, bundle] of Object.entries(manifest.bundles)) {
-    if (bundle.origins && bundle.origins.includes("@qwik-router-config")) {
-      libraryBundleIds.push(getAppBundleIndex(appBundles, bundleName));
-      break;
-    }
-  }
-  return `const libraryBundleIds=${JSON.stringify(libraryBundleIds)};`;
-}
-function generateLinkBundles(ctx, appBundles, manifest, prefetch) {
-  var _a, _b;
-  const linkBundles = [];
-  const symbolToBundle = /* @__PURE__ */ new Map();
-  const routeToBundles = {};
-  for (const bundleName in manifest.bundles || []) {
-    (_a = manifest.bundles[bundleName].symbols) == null ? void 0 : _a.forEach((symbol) => {
-      const idx = symbol.lastIndexOf("_");
-      symbolToBundle.set(idx === -1 ? symbol : symbol.substring(idx + 1), bundleName);
-    });
-  }
-  for (const r2 of ctx.routes) {
-    const linkBundleNames = [];
-    const addFileBundles = (filePath) => {
-      for (const [bundleName, bundle] of Object.entries(manifest.bundles)) {
-        if (bundle.origins) {
-          for (const bundleOrigin of bundle.origins) {
-            const srcPath = removeExtension(filePath);
-            const bundleOriginPath = removeExtension(bundleOrigin);
-            if (srcPath.endsWith(bundleOriginPath)) {
-              if (!linkBundleNames.includes(bundleName)) {
-                linkBundleNames.push(bundleName);
-              }
-              if (bundle.dynamicImports) {
-                for (const dynamicImport of bundle.dynamicImports) {
-                  if (!linkBundleNames.includes(dynamicImport)) {
-                    linkBundleNames.push(dynamicImport);
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    };
-    for (const layout of r2.layouts) {
-      addFileBundles(layout.filePath);
-    }
-    addFileBundles(r2.filePath);
-    if (prefetch) {
-      const symbolsForRoute = prefetch.find((p) => p.route === r2.routeName);
-      (_b = symbolsForRoute == null ? void 0 : symbolsForRoute.symbols) == null ? void 0 : _b.reverse().forEach((symbol) => {
-        const bundle = symbolToBundle.get(symbol);
-        if (bundle) {
-          const idx = linkBundleNames.indexOf(bundle);
-          if (idx !== -1) {
-            linkBundleNames.splice(idx, 1);
-          }
-          linkBundleNames.unshift(bundle);
-        }
-      });
-    }
-    linkBundles.push(
-      `[${r2.pattern.toString()},${JSON.stringify(
-        linkBundleNames.map((bundleName) => getAppBundleIndex(appBundles, bundleName))
-      )}]`
-    );
-    routeToBundles[r2.routeName] = linkBundleNames;
-  }
-  return [`const linkBundles=[${linkBundles.join(",")}];`, routeToBundles];
-}
-function getAppBundleIndex(appBundles, bundleName) {
-  return appBundles.findIndex((b) => b[0] === bundleName);
-}
 var SW_UNREGISTER = `
 navigator.serviceWorker?.getRegistrations().then((regs) => {
   for (const reg of regs) {
@@ -26532,6 +26451,16 @@ function generateCodeFrame(source, start = 0, end) {
   }
   return res.join("\n");
 }
+function parseId(originalId) {
+  const [pathId, query] = originalId.split("?");
+  const queryStr = query || "";
+  return {
+    originalId,
+    pathId,
+    query: queryStr ? `?${query}` : "",
+    params: new URLSearchParams(queryStr)
+  };
+}
 
 // packages/qwik-router/src/buildtime/vite/format-error.ts
 import fs4 from "node:fs";
@@ -26714,21 +26643,27 @@ function ssrDevMiddleware(ctx, server) {
         if (requestHandlers.length > 0) {
           const serverRequestEv = await fromNodeHttp(url, req, res, "dev");
           Object.assign(serverRequestEv.platform, ctx.opts.platform);
-          const manifest = {
-            manifestHash: "",
-            symbols: {},
-            mapping: {},
-            bundles: {},
-            injections: [],
-            version: "1"
-          };
           const { _deserialize, _serialize, _verifySerializable } = await server.ssrLoadModule("@qwik-serializer");
           const qwikSerializer = { _deserialize, _serialize, _verifySerializable };
+          const rebuildRouteInfo = async (url2) => {
+            const { serverPlugins: serverPlugins2, loadedRoute: loadedRoute2 } = await resolveRoute2(routeModulePaths, url2);
+            const requestHandlers2 = resolveRequestHandlers(
+              serverPlugins2,
+              loadedRoute2,
+              req.method ?? "GET",
+              false,
+              renderFn
+            );
+            return {
+              loadedRoute: loadedRoute2,
+              requestHandlers: requestHandlers2
+            };
+          };
           const { completion, requestEv } = runQwikRouter(
             serverRequestEv,
             loadedRoute,
             requestHandlers,
-            manifest,
+            rebuildRouteInfo,
             ctx.opts.trailingSlash,
             ctx.opts.basePathname,
             qwikSerializer
@@ -26891,7 +26826,7 @@ function staticDistMiddleware({ config }) {
           fs5.createReadStream(filePath).pipe(res);
           return;
         }
-      } catch (e) {
+      } catch {
       }
     }
     next();
@@ -26923,7 +26858,7 @@ function formatDevSerializeError(err, routeModulePaths) {
         if (line > -1) {
           err.loc.line = line + 1;
         }
-      } catch (e) {
+      } catch {
       }
     }
   }
@@ -26987,29 +26922,55 @@ self.addEventListener('install', () => self.skipWaiting());
 self.addEventListener('activate', (ev) => ev.waitUntil(self.clients.claim()));
 `;
 
+// packages/qwik-router/src/buildtime/vite/get-route-imports.ts
+function getRouteImports(routes, manifest) {
+  var _a, _b;
+  const result = {};
+  routes.forEach((route) => {
+    const routePath = removeExtension(route.filePath);
+    const layoutPaths = route.layouts ? route.layouts.map((layout) => removeExtension(layout.filePath)) : [];
+    const routeAndLayoutPaths = [routePath, ...layoutPaths];
+    const bundles = [];
+    for (const [bundleName, bundle] of Object.entries(manifest.bundles)) {
+      if (isBundlePartOfRoute(bundle, routeAndLayoutPaths)) {
+        bundles.push(bundleName);
+      }
+    }
+    if (bundles.length > 0) {
+      result[route.routeName] = { dynamicImports: bundles };
+    }
+  });
+  for (const bundleName of Object.keys(manifest.bundles)) {
+    const bundle = manifest.bundles[bundleName];
+    if ((_a = bundle.origins) == null ? void 0 : _a.some((s2) => s2.endsWith(QWIK_ROUTER_CONFIG_ID))) {
+      result[bundleName] = {
+        ...bundle,
+        dynamicImports: (_b = bundle.dynamicImports) == null ? void 0 : _b.filter(
+          (d) => {
+            var _a2;
+            return (_a2 = manifest.bundles[d].origins) == null ? void 0 : _a2.some((s2) => s2.endsWith("menu.md"));
+          }
+        )
+      };
+      break;
+    }
+  }
+  return result;
+}
+function isBundlePartOfRoute(bundle, routeAndLayoutPaths) {
+  if (!bundle.origins) {
+    return false;
+  }
+  for (const bundleOrigin of bundle.origins) {
+    const originPath = removeExtension(bundleOrigin);
+    return routeAndLayoutPaths.some((path3) => path3.endsWith(originPath));
+  }
+}
+
 // packages/qwik-router/src/buildtime/vite/image-jsx.ts
 import fs6 from "node:fs";
 import path2 from "node:path";
 import { optimize } from "svgo";
-
-// packages/qwik/src/optimizer/src/versions.ts
-var versions = {
-  qwik: globalThis.QWIK_VERSION
-};
-
-// packages/qwik/src/optimizer/src/plugins/plugin.ts
-function parseId(originalId) {
-  const [pathId, query] = originalId.split("?");
-  const queryStr = query || "";
-  return {
-    originalId,
-    pathId,
-    query: queryStr ? `?${query}` : "",
-    params: new URLSearchParams(queryStr)
-  };
-}
-
-// packages/qwik-router/src/buildtime/vite/image-jsx.ts
 function imagePlugin(userOpts) {
   const supportedExtensions = [".jpg", ".jpeg", ".png", ".webp", ".gif", ".avif", ".tiff"];
   return [
@@ -27042,7 +27003,7 @@ function imagePlugin(userOpts) {
         defaultDirectives: (url) => {
           var _a;
           if (url.searchParams.has("jsx")) {
-            const { jsx: jsx2, ...params } = Object.fromEntries(url.searchParams.entries());
+            const { jsx: _2, ...params } = Object.fromEntries(url.searchParams.entries());
             return new URLSearchParams({
               format: "webp",
               quality: "75",
@@ -27266,7 +27227,7 @@ function qwikRouterPlugin(userOpts) {
       return updatedViteConfig;
     },
     async configResolved(config) {
-      var _a, _b, _c;
+      var _a, _b, _c, _d, _e;
       Object.assign(process.env, loadEnv(config.mode, process.cwd(), ""));
       rootDir = resolve3(config.root);
       const target = ((_a = config.build) == null ? void 0 : _a.ssr) || config.mode === "ssr" ? "ssr" : "client";
@@ -27279,10 +27240,13 @@ function qwikRouterPlugin(userOpts) {
       if (!qwikPlugin) {
         throw new Error("Missing vite-plugin-qwik");
       }
-      if (((_b = config.ssr) == null ? void 0 : _b.format) === "cjs") {
+      (_c = (_b = qwikPlugin.api).registerBundleGraphAdder) == null ? void 0 : _c.call(_b, (manifest) => {
+        return getRouteImports(ctx.routes, manifest);
+      });
+      if (((_d = config.ssr) == null ? void 0 : _d.format) === "cjs") {
         ssrFormat = "cjs";
       }
-      outDir = (_c = config.build) == null ? void 0 : _c.outDir;
+      outDir = (_e = config.build) == null ? void 0 : _e.outDir;
     },
     configureServer(server) {
       return () => {
@@ -27424,34 +27388,7 @@ function qwikRouterPlugin(userOpts) {
       sequential: true,
       async handler() {
         if ((ctx == null ? void 0 : ctx.target) === "ssr" && !(ctx == null ? void 0 : ctx.isDevServer)) {
-          const manifest = qwikPlugin.api.getManifest();
           const clientOutDir = qwikPlugin.api.getClientOutDir();
-          if (manifest && clientOutDir) {
-            const basePathRelDir = api.getBasePathname().replace(/^\/|\/$/, "");
-            const clientOutBaseDir = join6(clientOutDir, basePathRelDir);
-            const insightsManifest = await qwikPlugin.api.getInsightsManifest(clientOutDir);
-            for (const swEntry of ctx.serviceWorkers) {
-              try {
-                const swClientDistPath = join6(clientOutBaseDir, swEntry.chunkFileName);
-                const swCode = await fs8.promises.readFile(swClientDistPath, "utf-8");
-                try {
-                  const swCodeUpdate = prependManifestToServiceWorker(
-                    ctx,
-                    manifest,
-                    (insightsManifest == null ? void 0 : insightsManifest.prefetch) || null,
-                    swCode
-                  );
-                  if (swCodeUpdate) {
-                    await fs8.promises.mkdir(clientOutDir, { recursive: true });
-                    await fs8.promises.writeFile(swClientDistPath, swCodeUpdate);
-                  }
-                } catch (e2) {
-                  console.error(e2);
-                }
-              } catch (e) {
-              }
-            }
-          }
           if (outDir && clientOutDir) {
             const assetsDir = qwikPlugin.api.getAssetsDir();
             const { staticPathsCode, notFoundPathsCode } = await postBuild(