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

package/lib/vite/index.cjs

@@ -9631,7 +9631,7 @@ var init_default = __esm({
   }
 });
 
-// node_modules/.pnpm/micromark-util-character@2.1.0/node_modules/micromark-util-character/index.js
+// node_modules/.pnpm/micromark-util-character@2.1.1/node_modules/micromark-util-character/index.js
 function asciiControl(code3) {
   return (
     // Special whitespace codes (which have negative values), C0 and Control
@@ -9656,7 +9656,7 @@ function regexCheck(regex3) {
 }
 var asciiAlpha, asciiAlphanumeric, asciiAtext, asciiDigit, asciiHexDigit, asciiPunctuation, unicodePunctuation, unicodeWhitespace;
 var init_micromark_util_character = __esm({
-  "node_modules/.pnpm/micromark-util-character@2.1.0/node_modules/micromark-util-character/index.js"() {
+  "node_modules/.pnpm/micromark-util-character@2.1.1/node_modules/micromark-util-character/index.js"() {
     asciiAlpha = regexCheck(/[A-Za-z]/);
     asciiAlphanumeric = regexCheck(/[\dA-Za-z]/);
     asciiAtext = regexCheck(/[#-'*+\--9=?A-Z^-~]/);
@@ -10464,12 +10464,12 @@ var init_mdast_util_gfm_autolink_literal = __esm({
   }
 });
 
-// node_modules/.pnpm/micromark-util-normalize-identifier@2.0.0/node_modules/micromark-util-normalize-identifier/index.js
+// node_modules/.pnpm/micromark-util-normalize-identifier@2.0.1/node_modules/micromark-util-normalize-identifier/index.js
 function normalizeIdentifier(value2) {
   return value2.replace(/[\t\n\r ]+/g, " ").replace(/^ | $/g, "").toLowerCase().toUpperCase();
 }
 var init_micromark_util_normalize_identifier = __esm({
-  "node_modules/.pnpm/micromark-util-normalize-identifier@2.0.0/node_modules/micromark-util-normalize-identifier/index.js"() {
+  "node_modules/.pnpm/micromark-util-normalize-identifier@2.0.1/node_modules/micromark-util-normalize-identifier/index.js"() {
   }
 });
 
@@ -12180,7 +12180,7 @@ var init_mdast_util_gfm = __esm({
   }
 });
 
-// node_modules/.pnpm/micromark-util-chunked@2.0.0/node_modules/micromark-util-chunked/index.js
+// node_modules/.pnpm/micromark-util-chunked@2.0.1/node_modules/micromark-util-chunked/index.js
 function splice(list3, start, remove, items) {
   const end = list3.length;
   let chunkStart = 0;
@@ -12207,11 +12207,11 @@ function splice(list3, start, remove, items) {
   }
 }
 var init_micromark_util_chunked = __esm({
-  "node_modules/.pnpm/micromark-util-chunked@2.0.0/node_modules/micromark-util-chunked/index.js"() {
+  "node_modules/.pnpm/micromark-util-chunked@2.0.1/node_modules/micromark-util-chunked/index.js"() {
   }
 });
 
-// node_modules/.pnpm/micromark-util-combine-extensions@2.0.0/node_modules/micromark-util-combine-extensions/index.js
+// node_modules/.pnpm/micromark-util-combine-extensions@2.0.1/node_modules/micromark-util-combine-extensions/index.js
 function combineExtensions(extensions) {
   const all3 = {};
   let index = -1;
@@ -12251,7 +12251,7 @@ function constructs(existing, list3) {
 }
 var hasOwnProperty;
 var init_micromark_util_combine_extensions = __esm({
-  "node_modules/.pnpm/micromark-util-combine-extensions@2.0.0/node_modules/micromark-util-combine-extensions/index.js"() {
+  "node_modules/.pnpm/micromark-util-combine-extensions@2.0.1/node_modules/micromark-util-combine-extensions/index.js"() {
     init_micromark_util_chunked();
     hasOwnProperty = {}.hasOwnProperty;
   }
@@ -12617,7 +12617,7 @@ var init_micromark_extension_gfm_autolink_literal = __esm({
   }
 });
 
-// node_modules/.pnpm/micromark-util-classify-character@2.0.0/node_modules/micromark-util-classify-character/index.js
+// node_modules/.pnpm/micromark-util-classify-character@2.0.1/node_modules/micromark-util-classify-character/index.js
 function classifyCharacter(code3) {
   if (code3 === null || markdownLineEndingOrSpace(code3) || unicodeWhitespace(code3)) {
     return 1;
@@ -12627,12 +12627,12 @@ function classifyCharacter(code3) {
   }
 }
 var init_micromark_util_classify_character = __esm({
-  "node_modules/.pnpm/micromark-util-classify-character@2.0.0/node_modules/micromark-util-classify-character/index.js"() {
+  "node_modules/.pnpm/micromark-util-classify-character@2.0.1/node_modules/micromark-util-classify-character/index.js"() {
     init_micromark_util_character();
   }
 });
 
-// node_modules/.pnpm/micromark-util-resolve-all@2.0.0/node_modules/micromark-util-resolve-all/index.js
+// node_modules/.pnpm/micromark-util-resolve-all@2.0.1/node_modules/micromark-util-resolve-all/index.js
 function resolveAll(constructs2, events, context) {
   const called = [];
   let index = -1;
@@ -12646,11 +12646,11 @@ function resolveAll(constructs2, events, context) {
   return events;
 }
 var init_micromark_util_resolve_all = __esm({
-  "node_modules/.pnpm/micromark-util-resolve-all@2.0.0/node_modules/micromark-util-resolve-all/index.js"() {
+  "node_modules/.pnpm/micromark-util-resolve-all@2.0.1/node_modules/micromark-util-resolve-all/index.js"() {
   }
 });
 
-// node_modules/.pnpm/micromark-factory-space@2.0.0/node_modules/micromark-factory-space/index.js
+// node_modules/.pnpm/micromark-factory-space@2.0.1/node_modules/micromark-factory-space/index.js
 function factorySpace(effects, ok3, type, max) {
   const limit = max ? max - 1 : Number.POSITIVE_INFINITY;
   let size = 0;
@@ -12672,12 +12672,12 @@ function factorySpace(effects, ok3, type, max) {
   }
 }
 var init_micromark_factory_space = __esm({
-  "node_modules/.pnpm/micromark-factory-space@2.0.0/node_modules/micromark-factory-space/index.js"() {
+  "node_modules/.pnpm/micromark-factory-space@2.0.1/node_modules/micromark-factory-space/index.js"() {
     init_micromark_util_character();
   }
 });
 
-// node_modules/.pnpm/micromark-core-commonmark@2.0.1/node_modules/micromark-core-commonmark/lib/blank-line.js
+// node_modules/.pnpm/micromark-core-commonmark@2.0.2/node_modules/micromark-core-commonmark/lib/blank-line.js
 function tokenizeBlankLine(effects, ok3, nok) {
   return start;
   function start(code3) {
@@ -12689,19 +12689,19 @@ function tokenizeBlankLine(effects, ok3, nok) {
 }
 var blankLine;
 var init_blank_line = __esm({
-  "node_modules/.pnpm/micromark-core-commonmark@2.0.1/node_modules/micromark-core-commonmark/lib/blank-line.js"() {
+  "node_modules/.pnpm/micromark-core-commonmark@2.0.2/node_modules/micromark-core-commonmark/lib/blank-line.js"() {
     init_micromark_factory_space();
     init_micromark_util_character();
     blankLine = {
-      tokenize: tokenizeBlankLine,
-      partial: true
+      partial: true,
+      tokenize: tokenizeBlankLine
     };
   }
 });
 
-// node_modules/.pnpm/micromark-core-commonmark@2.0.1/node_modules/micromark-core-commonmark/index.js
+// node_modules/.pnpm/micromark-core-commonmark@2.0.2/node_modules/micromark-core-commonmark/index.js
 var init_micromark_core_commonmark = __esm({
-  "node_modules/.pnpm/micromark-core-commonmark@2.0.1/node_modules/micromark-core-commonmark/index.js"() {
+  "node_modules/.pnpm/micromark-core-commonmark@2.0.2/node_modules/micromark-core-commonmark/index.js"() {
     init_blank_line();
   }
 });
@@ -14271,13 +14271,13 @@ var init_rehype_autolink_headings = __esm({
 });
 
 // packages/qwik-router/src/buildtime/vite/index.ts
-var vite_exports = {};
-__export(vite_exports, {
+var index_exports = {};
+__export(index_exports, {
   extendConfig: () => extendConfig,
   qwikCity: () => qwikCity,
   qwikRouter: () => qwikRouter
 });
-module.exports = __toCommonJS(vite_exports);
+module.exports = __toCommonJS(index_exports);
 
 // packages/qwik-router/src/buildtime/vite/config.ts
 var import_vite = require("vite");
@@ -14296,7 +14296,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
 var import_node_fs9 = __toESM(require("node:fs"), 1);
@@ -14306,17 +14306,11 @@ var import_vite2 = require("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) {
@@ -14681,8 +14675,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 = {
@@ -14692,8 +14685,7 @@ function createCacheControl(cacheControl) {
   if (typeof cacheControl === "number") {
     cacheControl = {
       maxAge: cacheControl,
-      sMaxAge: cacheControl,
-      staleWhileRevalidate: cacheControl
+      sMaxAge: cacheControl
     };
   }
   if (cacheControl.immutable) {
@@ -14738,14 +14730,13 @@ import("node:async_hooks").then((module2) => {
     err
   );
 });
-function runQwikRouter(serverRequestEv, loadedRoute, requestHandlers, manifest, trailingSlash = true, basePathname = "/", qwikSerializer) {
+function runQwikRouter(serverRequestEv, loadedRoute, requestHandlers, trailingSlash = true, basePathname = "/", qwikSerializer) {
   let resolve4;
   const responsePromise = new Promise((r2) => resolve4 = r2);
   const requestEv = createRequestEvent(
     serverRequestEv,
     loadedRoute,
     requestHandlers,
-    manifest,
     trailingSlash,
     basePathname,
     qwikSerializer,
@@ -14764,12 +14755,18 @@ async function runNext(requestEv, resolve4) {
     if (e instanceof RedirectMessage) {
       const stream = requestEv.getWritableStream();
       await stream.close();
-    } else if (e instanceof ErrorResponse) {
-      console.error(e);
+    } else if (e instanceof ServerError) {
       if (!requestEv.headersSent) {
-        const html5 = getErrorHtml(e.status, e);
         const status = e.status;
-        requestEv.html(status, html5);
+        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);
+        }
       }
     } else if (!(e instanceof AbortMessage)) {
       if (getRequestMode(requestEv) !== "dev") {
@@ -14822,7 +14819,7 @@ var RequestRouteName = "@routeName";
 var RequestEvSharedActionId = "@actionId";
 var RequestEvSharedActionFormData = "@actionFormData";
 var RequestEvSharedNonce = "@nonce";
-function createRequestEvent(serverRequestEv, loadedRoute, requestHandlers, manifest, trailingSlash, basePathname, qwikSerializer, resolved) {
+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"));
@@ -14835,7 +14832,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;
@@ -14869,17 +14865,25 @@ function createRequestEvent(serverRequestEv, loadedRoute, requestHandlers, manif
     } else {
       status = statusOrResponse.status;
       statusOrResponse.headers.forEach((value2, key) => {
+        if (key.toLowerCase() === "set-cookie") {
+          return;
+        }
         headers.append(key, value2);
       });
+      statusOrResponse.headers.getSetCookie().forEach((ck) => {
+        const index = ck.indexOf("=");
+        if (index === -1) {
+          return;
+        }
+        const key = ck.slice(0, index).trim();
+        const value2 = ck.slice(index + 1).trim();
+        cookie.set(key, value2);
+      });
       if (statusOrResponse.body) {
         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();
@@ -14950,7 +14954,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();
@@ -15051,7 +15055,7 @@ var parseRequest = async ({ request, method, query }, sharedMap, qwikSerializer)
       if (data) {
         try {
           return qwikSerializer._deserialize(decodeURIComponent(data));
-        } catch (err) {
+        } catch {
         }
       }
     }
@@ -15365,13 +15369,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");
@@ -15491,10 +15491,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();
@@ -15515,7 +15515,7 @@ async function renderQData(requestEv) {
     return;
   }
   const status = requestEv.status();
-  const location2 = requestEv.headers.get("Location");
+  const location = requestEv.headers.get("Location");
   const trailingSlash = getRequestTrailingSlash(requestEv);
   const requestHeaders = {};
   requestEv.request.headers.forEach((value2, key) => requestHeaders[key] = value2);
@@ -15525,7 +15525,7 @@ async function renderQData(requestEv) {
     action: requestEv.sharedMap.get(RequestEvSharedActionId),
     status: status !== 200 ? status : 200,
     href: getPathname(requestEv.url, trailingSlash),
-    redirect: location2 ?? void 0
+    redirect: location ?? void 0
   };
   const writer = requestEv.getWritableStream().getWriter();
   const qwikSerializer = requestEv[RequestEvQwikSerializer];
@@ -15562,7 +15562,7 @@ async function measure(requestEv, name, fn) {
 }
 function isContentType(headers, ...types) {
   var _a;
-  const type = ((_a = headers.get("content-type")) == null ? void 0 : _a.split(/;,/, 1)[0].trim()) ?? "";
+  const type = ((_a = headers.get("content-type")) == null ? void 0 : _a.split(/;/, 1)[0].trim()) ?? "";
   return types.includes(type);
 }
 
@@ -25963,6 +25963,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;
@@ -26177,130 +26180,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) {
@@ -26531,6 +26410,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
 var import_node_fs5 = __toESM(require("node:fs"), 1);
@@ -26713,21 +26602,12 @@ 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 { completion, requestEv } = runQwikRouter(
             serverRequestEv,
             loadedRoute,
             requestHandlers,
-            manifest,
             ctx.opts.trailingSlash,
             ctx.opts.basePathname,
             qwikSerializer
@@ -26890,7 +26770,7 @@ function staticDistMiddleware({ config }) {
           import_node_fs6.default.createReadStream(filePath).pipe(res);
           return;
         }
-      } catch (e) {
+      } catch {
       }
     }
     next();
@@ -26922,7 +26802,7 @@ function formatDevSerializeError(err, routeModulePaths) {
         if (line > -1) {
           err.loc.line = line + 1;
         }
-      } catch (e) {
+      } catch {
       }
     }
   }
@@ -26986,29 +26866,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
 var import_node_fs7 = __toESM(require("node:fs"), 1);
 var import_node_path9 = __toESM(require("node:path"), 1);
 var import_svgo = require("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 [
@@ -27041,7 +26947,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",
@@ -27265,7 +27171,7 @@ function qwikRouterPlugin(userOpts) {
       return updatedViteConfig;
     },
     async configResolved(config) {
-      var _a, _b, _c;
+      var _a, _b, _c, _d, _e;
       Object.assign(process.env, (0, import_vite2.loadEnv)(config.mode, process.cwd(), ""));
       rootDir = (0, import_node_path11.resolve)(config.root);
       const target = ((_a = config.build) == null ? void 0 : _a.ssr) || config.mode === "ssr" ? "ssr" : "client";
@@ -27278,10 +27184,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 () => {
@@ -27423,34 +27332,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 = (0, import_node_path11.join)(clientOutDir, basePathRelDir);
-            const insightsManifest = await qwikPlugin.api.getInsightsManifest(clientOutDir);
-            for (const swEntry of ctx.serviceWorkers) {
-              try {
-                const swClientDistPath = (0, import_node_path11.join)(clientOutBaseDir, swEntry.chunkFileName);
-                const swCode = await import_node_fs9.default.promises.readFile(swClientDistPath, "utf-8");
-                try {
-                  const swCodeUpdate = prependManifestToServiceWorker(
-                    ctx,
-                    manifest,
-                    (insightsManifest == null ? void 0 : insightsManifest.prefetch) || null,
-                    swCode
-                  );
-                  if (swCodeUpdate) {
-                    await import_node_fs9.default.promises.mkdir(clientOutDir, { recursive: true });
-                    await import_node_fs9.default.promises.writeFile(swClientDistPath, swCodeUpdate);
-                  }
-                } catch (e2) {
-                  console.error(e2);
-                }
-              } catch (e) {
-              }
-            }
-          }
           if (outDir && clientOutDir) {
             const assetsDir = qwikPlugin.api.getAssetsDir();
             const { staticPathsCode, notFoundPathsCode } = await postBuild(