@qwik.dev/router 2.0.0-beta.27 → 2.0.0-beta.29

package/lib/vite/index.mjs

@@ -1,8 +1,10 @@
 import { mergeConfig, loadEnv } from 'vite';
 import fs, { existsSync } from 'node:fs';
 import path, { join, dirname, basename, resolve, isAbsolute, extname } from 'node:path';
-import { g as getExtension, r as removeExtension, i as isIndexModule, a as isErrorName, b as isLayoutModule, c as isEntryName, d as isMenuFileName, e as isServiceWorkerName, f as isPageModuleExt, h as isModuleExt, j as isMarkdownExt, k as isSameOriginUrl, l as normalizePath, m as getPathnameFromDirPath, o as getMenuPathname, p as createFileId, q as parseRouteIndexName, s as isPluginModule, t as addError, u as addWarning, v as isPageExt } from '../chunks/fs.mjs';
+import { g as getExtension, r as removeExtension, i as isIndexModule, a as isErrorName, b as isLayoutModule, c as isEntryName, d as isMenuFileName, e as isServiceWorkerName, f as isPageModuleExt, h as isModuleExt, j as isMarkdownExt, k as normalizePath, l as getPathnameFromDirPath, m as getMenuPathname, o as createFileId, p as parseRouteIndexName, q as isPluginModule, s as isPageExt } from '../chunks/fs.mjs';
+import { i as isSameOriginUrl, a as addError, b as addWarning } from '../chunks/pathname.mjs';
 import { marked } from 'marked';
+import { createHash } from 'node:crypto';
 import { SourceMapGenerator } from 'source-map';
 import { visit } from 'unist-util-visit';
 import { parse } from 'yaml';
@@ -13,7 +15,6 @@ import { toString } from 'hast-util-to-string';
 import { refractor } from 'refractor';
 import tsxLang from 'refractor/lang/tsx.js';
 import { optimize } from 'svgo';
-import { p as parseId, f as formatError } from '../chunks/format-error.mjs';
 
 function extendConfig(baseConfigExport, serverConfigExport) {
   return async (env) => {
@@ -73,11 +74,9 @@ function getMarkdownRelativeUrl(opts, containingFilePath, url, checkFileExists)
     const parts = normalizePath(strippedUrl).split("/").filter((p) => p.length > 0);
     const filePath = isAbsolute ? join(opts.routesDir, ...parts) : join(dirname(containingFilePath), ...parts);
     if (checkFileExists && !existsSync(filePath)) {
-      console.warn(
-        `
+      console.warn(`
 The link "${url}", found within "${containingFilePath}" does not have a matching source file.
-`
-      );
+`);
     }
     const fileName = basename(filePath);
     const sourceFileName = getSourceFile(fileName);
@@ -113,12 +112,6 @@ function createMenu(opts, filePath) {
 function resolveMenu(opts, menuSourceFile) {
   return createMenu(opts, menuSourceFile.filePath);
 }
-async function transformMenu(opts, filePath, content) {
-  const parsedMenu = parseMenu(opts, filePath, content);
-  const id = createFileId(opts.routesDir, filePath);
-  const code = `const ${id} = ${JSON.stringify(parsedMenu, null, 2)};`;
-  return `${code} export default ${id}`;
-}
 function parseMenu(opts, filePath, content, checkFileExists = true) {
   const tokens = marked.lexer(content, {});
   let currentDepth = 0;
@@ -130,11 +123,7 @@ function parseMenu(opts, filePath, content, checkFileExists = true) {
         stack.length -= diff + 1;
       }
       if (diff < -1) {
-        throw new Error(
-          `Menu hierarchy skipped a level, went from <h${"#".repeat(
-            currentDepth
-          )}> to <h${"#".repeat(t.depth)}>, in menu: ${filePath}`
-        );
+        throw new Error(`Menu hierarchy skipped a level, went from <h${"#".repeat(currentDepth)}> to <h${"#".repeat(t.depth)}>, in menu: ${filePath}`);
       }
       currentDepth = t.depth;
       const parentNode = stack[stack.length - 1];
@@ -148,9 +137,7 @@ function parseMenu(opts, filePath, content, checkFileExists = true) {
           lastNode.text = h2Token.text;
           lastNode.href = getMarkdownRelativeUrl(opts, filePath, h2Token.href, checkFileExists);
         } else {
-          throw new Error(
-            `Headings can only be a text or link. Received "${h2Token.type}", value "${h2Token.raw}", in menu: ${filePath}`
-          );
+          throw new Error(`Headings can only be a text or link. Received "${h2Token.type}", value "${h2Token.raw}", in menu: ${filePath}`);
         }
         if (parentNode) {
           parentNode.items = parentNode.items || [];
@@ -167,16 +154,16 @@ function parseMenu(opts, filePath, content, checkFileExists = true) {
             if (liToken.type === "text") {
               for (const liItem of liToken.tokens) {
                 if (liItem.type === "text") {
-                  parentNode.items.push({ text: liItem.text });
+                  parentNode.items.push({
+                    text: liItem.text
+                  });
                 } else if (liItem.type === "link") {
                   parentNode.items.push({
                     text: liItem.text,
                     href: getMarkdownRelativeUrl(opts, filePath, liItem.href, checkFileExists)
                   });
                 } else {
-                  throw new Error(
-                    `List items can only be a text or link. Received "${liItem.type}", value "${liItem.raw}", in menu: ${filePath}`
-                  );
+                  throw new Error(`List items can only be a text or link. Received "${liItem.type}", value "${liItem.raw}", in menu: ${filePath}`);
                 }
               }
             } else if (liToken.type === "link") {
@@ -185,23 +172,17 @@ function parseMenu(opts, filePath, content, checkFileExists = true) {
                 href: getMarkdownRelativeUrl(opts, filePath, liToken.href, checkFileExists)
               });
             } else {
-              throw new Error(
-                `List items can only be a text or link. Received "${liToken.type}", value "${liToken.raw}", in menu: ${filePath}`
-              );
+              throw new Error(`List items can only be a text or link. Received "${liToken.type}", value "${liToken.raw}", in menu: ${filePath}`);
             }
           }
         } else {
-          throw new Error(
-            `Only list items can be used in lists. Received "${li.type}", value "${li.raw}", in menu: ${filePath}`
-          );
+          throw new Error(`Only list items can be used in lists. Received "${li.type}", value "${li.raw}", in menu: ${filePath}`);
         }
       }
     } else if (t.type === "space") {
       continue;
     } else {
-      throw new Error(
-        `Menu has a "${t.type}" with the value "${t.raw}". However, only headings and lists can be used in the menu: ${filePath}`
-      );
+      throw new Error(`Menu has a "${t.type}" with the value "${t.raw}". However, only headings and lists can be used in the menu: ${filePath}`);
     }
   }
   if (stack.length === 0) {
@@ -209,14 +190,30 @@ function parseMenu(opts, filePath, content, checkFileExists = true) {
   }
   return stack[0];
 }
+async function transformMenu(opts, filePath, content) {
+  const parsedMenu = parseMenu(opts, filePath, content);
+  const id = createFileId(opts.routesDir, filePath);
+  const code = `const ${id} = ${JSON.stringify(parsedMenu, null, 2)};`;
+  return `${code} export default ${id}`;
+}
 
+const PARAM_PATTERN = /^(\.\.\.)?(\w+)?$/;
+const DYNAMIC_SEGMENT = /\[(.+?)\]/;
 function parseRoutePathname(basePathname, pathname) {
   if (pathname === basePathname) {
     return {
       pattern: new RegExp("^" + pathname.replace(/[.*+?^${}()|[\]\\]/g, "\\$&") + "$"),
       routeName: pathname,
       paramNames: [],
-      segments: [[{ content: "", dynamic: false, rest: false }]]
+      segments: [
+        [
+          {
+            content: "",
+            dynamic: false,
+            rest: false
+          }
+        ]
+      ]
     };
   }
   pathname = pathname.slice(1);
@@ -264,8 +261,6 @@ function parseRoutePathname(basePathname, pathname) {
     })
   };
 }
-const PARAM_PATTERN = /^(\.\.\.)?(\w+)?$/;
-const DYNAMIC_SEGMENT = /\[(.+?)\]/;
 
 function routeSortCompare(a, b) {
   const maxSegments = Math.max(a.segments.length, b.segments.length);
@@ -304,38 +299,9 @@ function routeSortCompare(a, b) {
   return a.pathname < b.pathname ? -1 : 1;
 }
 
-function resolveSourceFiles(opts, sourceFiles) {
-  const layouts = sourceFiles.filter((s) => s.type === "layout").map((s) => resolveLayout(opts, s)).sort((a, b) => {
-    return a.id < b.id ? -1 : 1;
-  });
-  const routes = sourceFiles.filter((s) => s.type === "route").map((s) => resolveRoute(opts, layouts, s)).sort(routeSortCompare);
-  const entries = sourceFiles.filter((s) => s.type === "entry").map((s) => resolveEntry(opts, s)).sort((a, b) => {
-    return a.chunkFileName < b.chunkFileName ? -1 : 1;
-  });
-  const serviceWorkers = sourceFiles.filter((s) => s.type === "service-worker").map((p) => resolveServiceWorkerEntry(opts, p)).sort((a, b) => {
-    return a.chunkFileName < b.chunkFileName ? -1 : 1;
-  });
-  const menus = sourceFiles.filter((s) => s.type === "menu").map((p) => resolveMenu(opts, p)).sort((a, b) => {
-    return a.pathname < b.pathname ? -1 : 1;
-  });
-  let inc = 0;
-  const ids = /* @__PURE__ */ new Set();
-  const uniqueIds = (b) => {
-    for (const r of b) {
-      let id = r.id;
-      while (ids.has(id)) {
-        id = `${r.id}_${inc++}`;
-      }
-      r.id = id;
-      ids.add(id);
-    }
-  };
-  uniqueIds(layouts);
-  uniqueIds(routes);
-  uniqueIds(entries);
-  uniqueIds(serviceWorkers);
-  return { layouts, routes, entries, menus, serviceWorkers };
-}
+const LAYOUT_ID = "layout";
+const LAYOUT_NAMED_PREFIX = LAYOUT_ID + "-";
+const LAYOUT_TOP_SUFFIX = "!";
 function resolveLayout(opts, layoutSourceFile) {
   let extlessName = layoutSourceFile.extlessName;
   const filePath = layoutSourceFile.filePath;
@@ -362,16 +328,13 @@ function resolveLayout(opts, layoutSourceFile) {
   };
   return layout;
 }
-const LAYOUT_ID = "layout";
-const LAYOUT_NAMED_PREFIX = LAYOUT_ID + "-";
-const LAYOUT_TOP_SUFFIX = "!";
 function resolveRoute(opts, appLayouts, sourceFile) {
   const filePath = sourceFile.filePath;
   const layouts = [];
   const routesDir = opts.routesDir;
   const { layoutName, layoutStop } = parseRouteIndexName(sourceFile.extlessName);
   let pathname = getPathnameFromDirPath(opts, sourceFile.dirPath);
-  if (sourceFile.extlessName === "404") {
+  if (sourceFile.extlessName === "404" || sourceFile.extlessName === "error") {
     pathname += sourceFile.extlessName + ".html";
   }
   if (!layoutStop) {
@@ -400,7 +363,7 @@ function resolveRoute(opts, appLayouts, sourceFile) {
       currentDir = normalizePath(dirname(currentDir));
     }
   }
-  const buildRoute = {
+  return {
     id: createFileId(opts.routesDir, filePath, "Route"),
     filePath,
     pathname,
@@ -408,152 +371,209 @@ function resolveRoute(opts, appLayouts, sourceFile) {
     ext: sourceFile.ext,
     ...parseRoutePathname(opts.basePathname, pathname)
   };
-  return buildRoute;
 }
+
+function parseDirName(name) {
+  if (name.startsWith("(") && name.endsWith(")")) {
+    return {
+      key: null
+    };
+  }
+  const restMatch = /^\[\.\.\.(\w+)\]$/.exec(name);
+  if (restMatch) {
+    return {
+      key: "_A",
+      paramName: restMatch[1]
+    };
+  }
+  const paramMatch = /^(.*?)\[(\w+)\](.*?)$/.exec(name);
+  if (paramMatch) {
+    return {
+      key: "_W",
+      paramName: paramMatch[2],
+      prefix: paramMatch[1] || void 0,
+      suffix: paramMatch[3] || void 0
+    };
+  }
+  return {
+    key: name.toLowerCase()
+  };
+}
+async function walkRouteDir(node, dirPath) {
+  const dirItemNames = await fs.promises.readdir(dirPath);
+  await Promise.all(dirItemNames.map(async (itemName) => {
+    const itemPath = normalizePath(join(dirPath, itemName));
+    const stat = await fs.promises.stat(itemPath);
+    if (stat.isDirectory()) {
+      const parsed = parseDirName(itemName);
+      if (parsed.key === null) {
+        let child = node.children.get(itemName);
+        if (!child) {
+          child = {
+            _files: [],
+            _dirPath: itemPath,
+            children: /* @__PURE__ */ new Map()
+          };
+          node.children.set(itemName, child);
+        }
+        await walkRouteDir(child, itemPath);
+      } else {
+        let child = node.children.get(parsed.key);
+        if (!child) {
+          child = {
+            _files: [],
+            _dirPath: itemPath,
+            children: /* @__PURE__ */ new Map()
+          };
+          if (parsed.paramName) {
+            child._P = parsed.paramName;
+          }
+          if (parsed.prefix) {
+            child._0 = parsed.prefix;
+          }
+          if (parsed.suffix) {
+            child._9 = parsed.suffix;
+          }
+          node.children.set(parsed.key, child);
+        }
+        await walkRouteDir(child, itemPath);
+      }
+    } else {
+      const sourceFileName = getSourceFile(itemName);
+      if (sourceFileName !== null) {
+        node._files.push({
+          ...sourceFileName,
+          fileName: itemName,
+          filePath: itemPath,
+          dirName: basename(dirPath),
+          dirPath: normalizePath(dirPath)
+        });
+      }
+    }
+  }));
+}
+async function walkRoutes(routesDir) {
+  const dirPath = normalizePath(routesDir);
+  const root = {
+    _files: [],
+    _dirPath: dirPath,
+    children: /* @__PURE__ */ new Map()
+  };
+  await walkRouteDir(root, dirPath);
+  return root;
+}
+
+async function walkServerPlugins(opts) {
+  const dirPath = opts.serverPluginsDir;
+  const dirItemNames = await fs.promises.readdir(dirPath);
+  const sourceFiles = [];
+  await Promise.all(dirItemNames.map(async (itemName) => {
+    const itemPath = normalizePath(join(dirPath, itemName));
+    const ext = getExtension(itemName);
+    const extlessName = removeExtension(itemName);
+    if ((isModuleExt(ext) || isPageModuleExt(ext)) && isPluginModule(extlessName)) {
+      sourceFiles.push({
+        id: createFileId(opts.serverPluginsDir, itemPath, "Plugin"),
+        filePath: itemPath,
+        ext
+      });
+    }
+  }));
+  return sourceFiles;
+}
+
 function resolveEntry(opts, sourceFile) {
   const pathname = getPathnameFromDirPath(opts, sourceFile.dirPath);
   const chunkFileName = pathname.slice(opts.basePathname.length);
-  const buildEntry = {
+  return {
     id: createFileId(opts.routesDir, sourceFile.filePath, "Route"),
     filePath: sourceFile.filePath,
     chunkFileName,
     ...parseRoutePathname(opts.basePathname, pathname)
   };
-  return buildEntry;
 }
 function resolveServiceWorkerEntry(opts, sourceFile) {
   const dirPathname = getPathnameFromDirPath(opts, sourceFile.dirPath);
   const pathname = dirPathname + sourceFile.extlessName + ".js";
   const chunkFileName = pathname.slice(opts.basePathname.length);
-  const buildEntry = {
+  return {
     id: createFileId(opts.routesDir, sourceFile.filePath, "ServiceWorker"),
     filePath: sourceFile.filePath,
     chunkFileName,
     ...parseRoutePathname(opts.basePathname, pathname)
   };
-  return buildEntry;
-}
-
-async function walkRoutes(routesDir) {
-  const sourceFiles = [];
-  await walkRouteDir(sourceFiles, normalizePath(routesDir), basename(routesDir));
-  return sourceFiles;
 }
-async function walkRouteDir(sourceFiles, dirPath, dirName) {
-  const dirItemNames = await fs.promises.readdir(dirPath);
-  await Promise.all(
-    dirItemNames.map(async (itemName) => {
-      const itemPath = normalizePath(join(dirPath, itemName));
-      const stat = await fs.promises.stat(itemPath);
-      if (stat.isDirectory()) {
-        await walkRouteDir(sourceFiles, itemPath, itemName);
-      } else {
-        const sourceFileName = getSourceFile(itemName);
-        if (sourceFileName !== null) {
-          sourceFiles.push({
-            ...sourceFileName,
-            fileName: itemName,
-            filePath: itemPath,
-            dirName,
-            dirPath
-          });
-        }
-      }
-    })
-  );
-}
-
-async function walkServerPlugins(opts) {
-  const dirPath = opts.serverPluginsDir;
-  const dirItemNames = await fs.promises.readdir(dirPath);
-  const sourceFiles = [];
-  await Promise.all(
-    dirItemNames.map(async (itemName) => {
-      const itemPath = normalizePath(join(dirPath, itemName));
-      const ext = getExtension(itemName);
-      const extlessName = removeExtension(itemName);
-      if ((isModuleExt(ext) || isPageModuleExt(ext)) && isPluginModule(extlessName)) {
-        sourceFiles.push({
-          id: createFileId(opts.serverPluginsDir, itemPath, "Plugin"),
-          filePath: itemPath,
-          ext
-        });
-      }
-    })
-  );
-  return sourceFiles;
-}
-
-async function parseRoutesDir(ctx) {
-  try {
-    await updateRoutingContext(ctx);
-    validateBuild(ctx);
-  } catch (e) {
-    addError(ctx, e);
+function deriveFromTrie(opts, root) {
+  const layouts = [];
+  const routes = [];
+  const entries = [];
+  const serviceWorkers = [];
+  const menus = [];
+  const allFiles = [];
+  function collectAllFiles(node) {
+    allFiles.push(...node._files);
+    for (const child of node.children.values()) {
+      collectAllFiles(child);
+    }
   }
-  for (const d of ctx.diagnostics) {
-    if (d.type === "error") {
-      throw new Error(d.message);
-    } else {
-      console.warn(d.message);
+  collectAllFiles(root);
+  for (const file of allFiles) {
+    if (file.type === "layout") {
+      layouts.push(resolveLayout(opts, file));
     }
   }
-}
-function updateRoutingContext(ctx) {
-  ctx.activeBuild ||= _updateRoutingContext(ctx).finally(() => {
-    ctx.activeBuild = null;
-  });
-  return ctx.activeBuild;
-}
-async function _updateRoutingContext(ctx) {
-  const serverPlugins = await walkServerPlugins(ctx.opts);
-  const sourceFiles = await walkRoutes(ctx.opts.routesDir);
-  const resolved = resolveSourceFiles(ctx.opts, sourceFiles);
-  resolved.routes = rewriteRoutes(ctx, resolved.routes);
-  ctx.serverPlugins = serverPlugins;
-  ctx.layouts = resolved.layouts;
-  ctx.routes = resolved.routes;
-  ctx.entries = resolved.entries;
-  ctx.serviceWorkers = resolved.serviceWorkers;
-  ctx.menus = resolved.menus;
-}
-function rewriteRoutes(ctx, routes) {
-  if (!ctx.opts.rewriteRoutes) {
-    return routes;
+  for (const file of allFiles) {
+    switch (file.type) {
+      case "route":
+        routes.push(resolveRoute(opts, layouts, file));
+        break;
+      case "entry":
+        entries.push(resolveEntry(opts, file));
+        break;
+      case "service-worker":
+        serviceWorkers.push(resolveServiceWorkerEntry(opts, file));
+        break;
+      case "menu":
+        menus.push(resolveMenu(opts, file));
+        break;
+    }
   }
-  const translatedRoutes = [];
-  let segmentsToTranslate = ctx.opts.rewriteRoutes.flatMap((rewriteConfig) => {
-    return Object.keys(rewriteConfig.paths || {});
-  });
-  segmentsToTranslate = Array.from(new Set(segmentsToTranslate));
-  routes.forEach((route) => {
-    translatedRoutes.push(route);
-    const currentRouteSegments = route.pathname.split("/");
-    const foundSegmentToTranslate = currentRouteSegments.some(
-      (segment) => segmentsToTranslate.includes(segment)
-    );
-    if (foundSegmentToTranslate || route.pathname === "/") {
-      ctx.opts.rewriteRoutes.forEach((config, configIndex) => {
-        if (route.pathname === "/" && !config.prefix) {
-          return;
-        }
-        const routeToPush = translateRoute(route, config, configIndex);
-        if (!translatedRoutes.some(
-          (item) => item.pathname === routeToPush.pathname && item.routeName === routeToPush.routeName
-        )) {
-          translatedRoutes.push(routeToPush);
-        }
-      });
+  let inc = 0;
+  const ids = /* @__PURE__ */ new Set();
+  const uniqueIds = (items) => {
+    for (const item of items) {
+      let id = item.id;
+      while (ids.has(id)) {
+        id = `${item.id}_${inc++}`;
+      }
+      item.id = id;
+      ids.add(id);
     }
-  });
-  return translatedRoutes.sort(routeSortCompare);
+  };
+  uniqueIds(layouts);
+  uniqueIds(routes);
+  uniqueIds(entries);
+  uniqueIds(serviceWorkers);
+  layouts.sort((a, b) => a.id < b.id ? -1 : 1);
+  entries.sort((a, b) => a.chunkFileName < b.chunkFileName ? -1 : 1);
+  serviceWorkers.sort((a, b) => a.chunkFileName < b.chunkFileName ? -1 : 1);
+  menus.sort((a, b) => a.pathname < b.pathname ? -1 : 1);
+  return {
+    layouts,
+    routes,
+    entries,
+    serviceWorkers,
+    menus
+  };
 }
 function translateRoute(route, config, configIndex) {
   const replacePath = (part) => (config.paths || {})[part] ?? part;
   const pathnamePrefix = config.prefix ? "/" + config.prefix : "";
   const routeNamePrefix = config.prefix ? config.prefix + "/" : "";
   const idSuffix = config.prefix?.toUpperCase().replace(/-/g, "");
-  const patternInfix = config.prefix ? [config.prefix] : [];
+  const patternInfix = config.prefix ? [
+    config.prefix
+  ] : [];
   const splittedPathName = route.pathname.split("/");
   const translatedPathParts = splittedPathName.map(replacePath);
   const splittedRouteName = route.routeName.split("/");
@@ -566,13 +586,11 @@ function translateRoute(route, config, configIndex) {
     ...translatedPatternOthers
   ];
   const translatedPatternString = translatedPatternParts.join("\\/");
-  const translatedRegExp = translatedPatternString.substring(
-    1,
-    route.pathname === "/" ? translatedPatternString.length - 1 : translatedPatternString.length - 2
-  );
-  const translatedSegments = route.segments.map(
-    (segment) => segment.map((item) => ({ ...item, content: replacePath(item.content) }))
-  );
+  const translatedRegExp = translatedPatternString.substring(1, route.pathname === "/" ? translatedPatternString.length - 1 : translatedPatternString.length - 2);
+  const translatedSegments = route.segments.map((segment) => segment.map((item) => ({
+    ...item,
+    content: replacePath(item.content)
+  })));
   if (config.prefix) {
     translatedSegments.splice(0, 0, [
       {
@@ -584,7 +602,7 @@ function translateRoute(route, config, configIndex) {
   }
   const translatedPath = translatedPathParts.join("/");
   const translatedRoute = translatedRouteParts.join("/");
-  const routeToPush = {
+  return {
     ...route,
     id: route.id + (idSuffix || configIndex),
     pathname: pathnamePrefix + translatedPath,
@@ -592,47 +610,81 @@ function translateRoute(route, config, configIndex) {
     pattern: new RegExp(translatedRegExp),
     segments: translatedSegments
   };
-  return routeToPush;
+}
+function rewriteRoutes(ctx, routes) {
+  if (!ctx.opts.rewriteRoutes) {
+    return routes;
+  }
+  const translatedRoutes = [];
+  let segmentsToTranslate = ctx.opts.rewriteRoutes.flatMap((rewriteConfig) => {
+    return Object.keys(rewriteConfig.paths || {});
+  });
+  segmentsToTranslate = Array.from(new Set(segmentsToTranslate));
+  routes.forEach((route) => {
+    translatedRoutes.push(route);
+    const currentRouteSegments = route.pathname.split("/");
+    const foundSegmentToTranslate = currentRouteSegments.some((segment) => segmentsToTranslate.includes(segment));
+    if (foundSegmentToTranslate || route.pathname === "/") {
+      ctx.opts.rewriteRoutes.forEach((config, configIndex) => {
+        if (route.pathname === "/" && !config.prefix) {
+          return;
+        }
+        const routeToPush = translateRoute(route, config, configIndex);
+        if (!translatedRoutes.some((item) => item.pathname === routeToPush.pathname && item.routeName === routeToPush.routeName)) {
+          translatedRoutes.push(routeToPush);
+        }
+      });
+    }
+  });
+  return translatedRoutes.sort(routeSortCompare);
+}
+async function _updateRoutingContext(ctx) {
+  const serverPlugins = await walkServerPlugins(ctx.opts);
+  const routeTrie = await walkRoutes(ctx.opts.routesDir);
+  ctx.routeTrie = routeTrie;
+  ctx.serverPlugins = serverPlugins;
+  const derived = deriveFromTrie(ctx.opts, routeTrie);
+  ctx.layouts = derived.layouts;
+  ctx.routes = rewriteRoutes(ctx, derived.routes);
+  ctx.entries = derived.entries;
+  ctx.serviceWorkers = derived.serviceWorkers;
+  ctx.menus = derived.menus;
+}
+function updateRoutingContext(ctx) {
+  ctx.activeBuild ||= _updateRoutingContext(ctx).finally(() => {
+    ctx.activeBuild = null;
+  });
+  return ctx.activeBuild;
 }
 function validateBuild(ctx) {
   const pathnames = Array.from(new Set(ctx.routes.map((r) => r.pathname))).sort();
   for (const pathname of pathnames) {
     const foundRoutes = ctx.routes.filter((r) => r.pathname === pathname);
     if (foundRoutes.length > 1) {
-      addError(
-        ctx,
-        `More than one route has been found for pathname "${pathname}". Please narrow it down to only one of these:
-${foundRoutes.map((r) => `  - ${r.filePath}`).join("\n")}`
-      );
+      addError(ctx, `More than one route has been found for pathname "${pathname}". Please narrow it down to only one of these:
+${foundRoutes.map((r) => `  - ${r.filePath}`).join("\n")}`);
     }
   }
   ctx.layouts.filter((l) => l.layoutType === "top").forEach((l) => {
-    addWarning(
-      ctx,
-      `The "top" layout feature, which is used by "${l.filePath}" has been deprecated and will be removed from future versions. In most cases the "group" layout feature can be used in its place: https://qwik.dev/docs/advanced/routing/`
-    );
+    addWarning(ctx, `The "top" layout feature, which is used by "${l.filePath}" has been deprecated and will be removed from future versions. In most cases the "group" layout feature can be used in its place: https://qwik.dev/docs/advanced/routing/`);
   });
 }
-
-function createBuildContext(rootDir, viteBasePath, userOpts, target, dynamicImports) {
-  const ctx = {
-    rootDir: normalizePath(rootDir),
-    opts: normalizeOptions(rootDir, viteBasePath, userOpts),
-    routes: [],
-    serverPlugins: [],
-    layouts: [],
-    entries: [],
-    serviceWorkers: [],
-    menus: [],
-    diagnostics: [],
-    frontmatter: /* @__PURE__ */ new Map(),
-    target: target || "ssr",
-    dynamicImports: target === "client" || !!dynamicImports,
-    isDirty: true,
-    activeBuild: null
-  };
-  return ctx;
+async function parseRoutesDir(ctx) {
+  try {
+    await updateRoutingContext(ctx);
+    validateBuild(ctx);
+  } catch (e) {
+    addError(ctx, e);
+  }
+  for (const d of ctx.diagnostics) {
+    if (d.type === "error") {
+      throw new Error(d.message);
+    } else {
+      console.warn(d.message);
+    }
+  }
 }
+
 function resetBuildContext(ctx) {
   if (ctx) {
     ctx.routes.length = 0;
@@ -646,14 +698,14 @@ function resetBuildContext(ctx) {
 }
 function normalizeOptions(rootDir, viteBasePath, userOpts) {
   if (!(viteBasePath.startsWith("/") && viteBasePath.endsWith("/"))) {
-    console.error(
-      `warning: vite's config.base must begin and end with /. This will be an error in v2. If you have a valid use case, please open an issue.`
-    );
+    console.error(`warning: vite's config.base must begin and end with /. This will be an error in v2. If you have a valid use case, please open an issue.`);
     if (!viteBasePath.endsWith("/")) {
       viteBasePath += "/";
     }
   }
-  const opts = { ...userOpts };
+  const opts = {
+    ...userOpts
+  };
   if (typeof opts.routesDir !== "string") {
     opts.routesDir = resolve(rootDir, "src", "routes");
   } else if (!isAbsolute(opts.routesDir)) {
@@ -673,9 +725,7 @@ function normalizeOptions(rootDir, viteBasePath, userOpts) {
     opts.basePathname = viteBasePath;
   }
   if (!opts.basePathname.endsWith("/")) {
-    console.error(
-      `Warning: qwik-router plugin basePathname must end with /. This will be an error in v2`
-    );
+    console.error(`Warning: qwik-router plugin basePathname must end with /. This will be an error in v2`);
     opts.basePathname += "/";
   }
   const url = new URL(opts.basePathname, "https://qwik.dev/");
@@ -684,9 +734,42 @@ function normalizeOptions(rootDir, viteBasePath, userOpts) {
   opts.platform = opts.platform || {};
   return opts;
 }
-
-function parseFrontmatter(ctx) {
-  return (mdast, vfile) => {
+function createBuildContext(rootDir, viteBasePath, userOpts, target, dynamicImports) {
+  const ctx = {
+    rootDir: normalizePath(rootDir),
+    opts: normalizeOptions(rootDir, viteBasePath, userOpts),
+    routeTrie: {
+      _files: [],
+      _dirPath: "",
+      children: /* @__PURE__ */ new Map()
+    },
+    routes: [],
+    serverPlugins: [],
+    layouts: [],
+    entries: [],
+    serviceWorkers: [],
+    menus: [],
+    diagnostics: [],
+    frontmatter: /* @__PURE__ */ new Map(),
+    target: target || "ssr",
+    dynamicImports: target === "client" || !!dynamicImports,
+    isDirty: true,
+    activeBuild: null
+  };
+  return ctx;
+}
+
+function parseFrontmatterAttrs(yaml) {
+  if (typeof yaml === "string") {
+    yaml = yaml.trim();
+    if (yaml !== "") {
+      return parse(yaml);
+    }
+  }
+  return null;
+}
+function parseFrontmatter(ctx) {
+  return (mdast, vfile) => {
     const attrs = {};
     visit(mdast, "yaml", (node) => {
       const parsedAttrs = parseFrontmatterAttrs(node.value);
@@ -699,15 +782,6 @@ function parseFrontmatter(ctx) {
     }
   };
 }
-function parseFrontmatterAttrs(yaml) {
-  if (typeof yaml === "string") {
-    yaml = yaml.trim();
-    if (yaml !== "") {
-      return parse(yaml);
-    }
-  }
-  return null;
-}
 const metaNames = {
   author: true,
   creator: true,
@@ -741,7 +815,9 @@ function frontmatterAttrsToDocumentHead(attrs) {
             head.title = head.title.replace(/\\@/g, "@");
           } else if (attrName === "og" || attrName === "opengraph") {
             if (typeof attrValue === "object") {
-              for (const opengraph of Array.isArray(attrValue) ? attrValue : [attrValue]) {
+              for (const opengraph of Array.isArray(attrValue) ? attrValue : [
+                attrValue
+              ]) {
                 if (opengraph != null && typeof opengraph === "object" && !Array.isArray(opengraph)) {
                   for (const [property, content] of Object.entries(opengraph)) {
                     if ((property === "title" || property === "description") && content === true) {
@@ -777,31 +853,6 @@ function frontmatterAttrsToDocumentHead(attrs) {
   return null;
 }
 
-function rehypeSlug() {
-  return (ast) => {
-    const mdast = ast;
-    const slugs = new Slugger();
-    visit(mdast, "element", (node) => {
-      const level = headingRank(node);
-      if (level && node.properties) {
-        const text = toString(node);
-        if (!hasProperty(node, "id")) {
-          node.properties.id = slugs.slug(text);
-        }
-      }
-    });
-  };
-}
-function rehypePage(ctx) {
-  return (ast, vfile) => {
-    const mdast = ast;
-    const sourcePath = normalizePath(vfile.path);
-    updateContentLinks(mdast, ctx.opts, sourcePath);
-    exportFrontmatter(ctx, mdast, sourcePath);
-    exportContentHead(ctx, mdast, sourcePath);
-    exportContentHeadings(mdast);
-  };
-}
 function renameClassname() {
   return (ast) => {
     const mdast = ast;
@@ -820,11 +871,17 @@ function wrapTableWithDiv() {
     const mdast = ast;
     visit(mdast, "element", (node) => {
       if (node.tagName === "table" && !node.done) {
-        const table = { ...node };
+        const table = {
+          ...node
+        };
         table.done = true;
         node.tagName = "div";
-        node.properties = { className: "table-wrapper" };
-        node.children = [table];
+        node.properties = {
+          className: "table-wrapper"
+        };
+        node.children = [
+          table
+        ];
       }
     });
   };
@@ -837,47 +894,12 @@ function updateContentLinks(mdast, opts, sourcePath) {
       if (isSameOriginUrl(href)) {
         const ext = getExtension(href);
         if (isMarkdownExt(ext)) {
-          node.properties.href = getMarkdownRelativeUrl(
-            opts,
-            sourcePath,
-            node.properties.href,
-            true
-          );
+          node.properties.href = getMarkdownRelativeUrl(opts, sourcePath, node.properties.href, true);
         }
       }
     }
   });
 }
-function exportFrontmatter(ctx, mdast, sourcePath) {
-  const attrs = ctx.frontmatter.get(sourcePath);
-  createExport(mdast, "frontmatter", attrs);
-}
-function exportContentHead(ctx, mdast, sourcePath) {
-  const attrs = ctx.frontmatter.get(sourcePath);
-  const head = frontmatterAttrsToDocumentHead(attrs);
-  if (head) {
-    createExport(mdast, "head", head);
-  }
-}
-function exportContentHeadings(mdast) {
-  const headings = [];
-  visit(mdast, "element", (node) => {
-    const level = headingRank(node);
-    if (level && node.properties) {
-      if (hasProperty(node, "id")) {
-        const text = toString(node);
-        headings.push({
-          text,
-          id: node.properties.id,
-          level
-        });
-      }
-    }
-  });
-  if (headings.length > 0) {
-    createExport(mdast, "headings", headings);
-  }
-}
 function createExport(mdast, identifierName, val) {
   const mdxjsEsm = {
     type: "mdxjsEsm",
@@ -898,7 +920,10 @@ function createExport(mdast, identifierName, val) {
               declarations: [
                 {
                   type: "VariableDeclarator",
-                  id: { type: "Identifier", name: identifierName },
+                  id: {
+                    type: "Identifier",
+                    name: identifierName
+                  },
                   init: valueToEstree(val)
                 }
               ]
@@ -910,31 +935,67 @@ function createExport(mdast, identifierName, val) {
   };
   mdast.children.unshift(mdxjsEsm);
 }
+function exportFrontmatter(ctx, mdast, sourcePath) {
+  const attrs = ctx.frontmatter.get(sourcePath);
+  createExport(mdast, "frontmatter", attrs);
+}
+function exportContentHead(ctx, mdast, sourcePath) {
+  const attrs = ctx.frontmatter.get(sourcePath);
+  const head = frontmatterAttrsToDocumentHead(attrs);
+  if (head) {
+    createExport(mdast, "head", head);
+  }
+}
 const own = {}.hasOwnProperty;
 function hasProperty(node, propName) {
   const value = node && typeof node === "object" && node.type === "element" && node.properties && own.call(node.properties, propName) && node.properties[propName];
   return value != null && value !== false;
 }
-
-function rehypeSyntaxHighlight() {
-  refractor.register(tsxLang);
-  return async (ast) => {
-    visit(ast, "element", (node, _index, parent) => {
-      if (!parent || parent.tagName !== "pre" || node.tagName !== "code" || !Array.isArray(node.properties.className)) {
-        return;
-      }
-      for (let i = 0; i < node.properties.className.length; i++) {
-        const className = node.properties.className[i];
-        const lang = getLanguage(className);
-        if (lang && refractor.registered(lang)) {
-          node.properties.className[i] = "language-" + lang;
-          syntaxHighlight(node, lang);
-          return;
+function rehypeSlug() {
+  return (ast) => {
+    const mdast = ast;
+    const slugs = new Slugger();
+    visit(mdast, "element", (node) => {
+      const level = headingRank(node);
+      if (level && node.properties) {
+        const text = toString(node);
+        if (!hasProperty(node, "id")) {
+          node.properties.id = slugs.slug(text);
         }
       }
     });
   };
 }
+function exportContentHeadings(mdast) {
+  const headings = [];
+  visit(mdast, "element", (node) => {
+    const level = headingRank(node);
+    if (level && node.properties) {
+      if (hasProperty(node, "id")) {
+        const text = toString(node);
+        headings.push({
+          text,
+          id: node.properties.id,
+          level
+        });
+      }
+    }
+  });
+  if (headings.length > 0) {
+    createExport(mdast, "headings", headings);
+  }
+}
+function rehypePage(ctx) {
+  return (ast, vfile) => {
+    const mdast = ast;
+    const sourcePath = normalizePath(vfile.path);
+    updateContentLinks(mdast, ctx.opts, sourcePath);
+    exportFrontmatter(ctx, mdast, sourcePath);
+    exportContentHead(ctx, mdast, sourcePath);
+    exportContentHeadings(mdast);
+  };
+}
+
 function syntaxHighlight(node, lang) {
   const code = toString(node);
   const result = refractor.highlight(code, lang);
@@ -951,6 +1012,25 @@ function getLanguage(className) {
   }
   return null;
 }
+function rehypeSyntaxHighlight() {
+  refractor.register(tsxLang);
+  return async (ast) => {
+    visit(ast, "element", (node, _index, parent) => {
+      if (!parent || parent.tagName !== "pre" || node.tagName !== "code" || !Array.isArray(node.properties.className)) {
+        return;
+      }
+      for (let i = 0; i < node.properties.className.length; i++) {
+        const className = node.properties.className[i];
+        const lang = getLanguage(className);
+        if (lang && refractor.registered(lang)) {
+          node.properties.className[i] = "language-" + lang;
+          syntaxHighlight(node, lang);
+          return;
+        }
+      }
+    });
+  };
+}
 
 async function createMdxTransformer(ctx) {
   const { compile } = await import('@mdx-js/mdx');
@@ -982,21 +1062,34 @@ async function createMdxTransformer(ctx) {
       ...userRemarkPlugins,
       ...coreRemarkPlugins,
       remarkFrontmatter,
-      [parseFrontmatter, ctx]
+      [
+        parseFrontmatter,
+        ctx
+      ]
     ],
     rehypePlugins: [
       rehypeSlug,
       ...userRehypePlugins,
       ...coreRehypePlugins,
-      [rehypePage, ctx],
+      [
+        rehypePage,
+        ctx
+      ],
       renameClassname,
       wrapTableWithDiv
     ]
   };
   return async function(code, id) {
     const ext = getExtension(id);
-    if ([".mdx", ".md", ".markdown"].includes(ext)) {
-      const file = new VFile({ value: code, path: id });
+    if ([
+      ".mdx",
+      ".md",
+      ".markdown"
+    ].includes(ext)) {
+      const file = new VFile({
+        value: code,
+        path: id
+      });
       const compiled = await compile(file, options);
       const output = String(compiled.value);
       const addImport = `import { jsx } from '@qwik.dev/core';
@@ -1015,7 +1108,13 @@ export default WrappedMdxContent;
       if (exportIndex === -1) {
         throw new Error("Could not find default export in mdx output");
       }
-      const wrappedOutput = addImport + output.slice(0, exportIndex) + newDefault;
+      let eTagExport = "";
+      if (ext === ".md" || ext === ".markdown") {
+        const hash = createHash("sha256").update(code).digest("hex").slice(0, 16);
+        eTagExport = `export const eTag = ${JSON.stringify(hash)};
+`;
+      }
+      const wrappedOutput = addImport + output.slice(0, exportIndex) + eTagExport + newDefault;
       return {
         code: wrappedOutput,
         map: compiled.map
@@ -1026,7 +1125,10 @@ export default WrappedMdxContent;
 
 function createEntries(ctx, c) {
   const isClient = ctx.target === "client";
-  const entries = [...ctx.entries, ...ctx.serviceWorkers];
+  const entries = [
+    ...ctx.entries,
+    ...ctx.serviceWorkers
+  ];
   if (isClient && entries.length > 0) {
     c.push(`
 /** Qwik Router Entries Entry */`);
@@ -1036,7 +1138,10 @@ function createEntries(ctx, c) {
 }
 function generateQwikRouterEntries(ctx) {
   const c = [];
-  const entries = [...ctx.entries, ...ctx.serviceWorkers];
+  const entries = [
+    ...ctx.entries,
+    ...ctx.serviceWorkers
+  ];
   c.push(`
 /** Qwik Router Entries (${entries.length}) */`);
   for (let i = 0; i < entries.length; i++) {
@@ -1057,80 +1162,41 @@ function getImportPath(importPath) {
   return importPath;
 }
 
-function createMenus(ctx, c, esmImports, isSSR) {
-  c.push(`
-/** Qwik Router Menus (${ctx.menus.length}) */`);
-  c.push(`export const menus = [`);
-  const dynamicImports = !isSSR;
-  const routesDir = ctx.opts.routesDir;
-  for (const m of ctx.menus) {
-    const importPath = JSON.stringify(getImportPath(m.filePath));
-    if (dynamicImports) {
-      c.push(`  [${JSON.stringify(m.pathname)}, ()=>import(${importPath})],`);
-    } else {
-      const id = createFileId(routesDir, m.filePath);
-      esmImports.push(`import * as ${id} from ${importPath};`);
-      c.push(`  [${JSON.stringify(m.pathname)}, ()=>${id}],`);
-    }
-  }
-  c.push(`];`);
+function isGroupKey(key) {
+  return key.charCodeAt(0) === 40;
 }
-
-function createRoutes(ctx, qwikPlugin, c, esmImports, isSSR) {
-  const includeEndpoints = isSSR;
-  const dynamicImports = ctx.dynamicImports;
-  if (ctx.layouts.length > 0) {
-    c.push(`
-/** Qwik Router Layouts (${ctx.layouts.length}) */`);
-    for (const layout of ctx.layouts) {
-      const importPath = JSON.stringify(getImportPath(layout.filePath));
-      if (dynamicImports) {
-        c.push(`const ${layout.id} = ()=>import(${importPath});`);
-      } else {
-        esmImports.push(`import * as ${layout.id}_ from ${importPath};`);
-        c.push(`const ${layout.id} = ()=>${layout.id}_;`);
-      }
-    }
+function collectFiles(node, cb) {
+  for (const file of node._files) {
+    cb(file, node);
   }
-  c.push(`
-/** Qwik Router Routes (${ctx.routes.length}) */`);
-  c.push(`export const routes = [`);
-  for (const route of ctx.routes) {
-    const layouts = [];
-    if (isPageExt(route.ext)) {
-      for (const layout of route.layouts) {
-        layouts.push(layout.id);
-      }
-      const importPath = getImportPath(route.filePath);
-      if (dynamicImports) {
-        layouts.push(`()=>import(${JSON.stringify(importPath)})`);
-      } else {
-        esmImports.push(`import * as ${route.id} from ${JSON.stringify(importPath)};`);
-        layouts.push(`()=>${route.id}`);
+  for (const child of node.children.values()) {
+    collectFiles(child, cb);
+  }
+}
+function resolveNamedLayoutChain(ancestorLayouts, nodeLayouts, targetName) {
+  const allLayouts = [
+    ...ancestorLayouts,
+    ...nodeLayouts
+  ];
+  const result = [];
+  let foundNamed = false;
+  for (let i = allLayouts.length - 1; i >= 0; i--) {
+    const layout = allLayouts[i];
+    if (!foundNamed) {
+      if (layout.layoutName === targetName) {
+        result.unshift(layout);
+        foundNamed = true;
       }
-    } else if (includeEndpoints && isModuleExt(route.ext)) {
-      const importPath = getImportPath(route.filePath);
-      esmImports.push(`import * as ${route.id} from ${JSON.stringify(importPath)};`);
-      for (const layout of route.layouts) {
-        layouts.push(layout.id);
+    } else {
+      if (layout.layoutName === "") {
+        result.unshift(layout);
+        if (layout.layoutType === "top") {
+          break;
+        }
       }
-      layouts.push(`()=>${route.id}`);
-    }
-    if (layouts.length > 0) {
-      c.push(`  ${createRouteData(qwikPlugin, route, layouts, isSSR)},`);
     }
   }
-  c.push(`];`);
-}
-function createRouteData(qwikPlugin, r, layouts, isSsr) {
-  const routeName = JSON.stringify(r.routeName);
-  const moduleLayouts = `[ ${layouts.join(", ")} ]`;
-  if (isSsr) {
-    const originalPathname = JSON.stringify(r.pathname);
-    const clientBundleNames = JSON.stringify(getClientRouteBundleNames(qwikPlugin, r));
-    return `[ ${routeName}, ${moduleLayouts}, ${originalPathname}, ${clientBundleNames} ]`;
-  }
-  return `[ ${routeName}, ${moduleLayouts} ]`;
+  return result;
 }
 function getClientRouteBundleNames(qwikPlugin, r) {
   const bundlesNames = [];
@@ -1152,13 +1218,249 @@ function getClientRouteBundleNames(qwikPlugin, r) {
           }
         }
       }
-    };
-    for (const layout of r.layouts) {
-      addRouteFile(layout.filePath);
+    };
+    for (const layout of r.layouts) {
+      addRouteFile(layout.filePath);
+    }
+    addRouteFile(r.filePath);
+  }
+  return bundlesNames;
+}
+function serializeBuildTrie(ctx, qwikPlugin, node, layoutIdMap, routeIdMap, menuIdMap, errorFiles, notFoundFiles, ancestorLayouts, isSSR, indent) {
+  const lines = [];
+  const nextIndent = indent + "  ";
+  if (node._P) {
+    lines.push(`${nextIndent}_P: ${JSON.stringify(node._P)},`);
+  }
+  if (node._0) {
+    lines.push(`${nextIndent}_0: ${JSON.stringify(node._0)},`);
+  }
+  if (node._9) {
+    lines.push(`${nextIndent}_9: ${JSON.stringify(node._9)},`);
+  }
+  if (node._G) {
+    lines.push(`${nextIndent}_G: ${JSON.stringify(node._G)},`);
+  }
+  let layoutExpr;
+  let indexExpr;
+  let indexIsOverride = false;
+  let errorExpr;
+  let notFoundExpr;
+  let menuExpr;
+  let bundleRoute;
+  const nodeLayouts = [];
+  for (const file of node._files) {
+    if (file.type === "menu") {
+      const menuId = menuIdMap.get(file.filePath);
+      if (menuId) {
+        menuExpr = menuId;
+      }
+    } else if (file.type === "layout") {
+      const layoutId = layoutIdMap.get(file.filePath);
+      if (layoutId) {
+        let extlessName = file.extlessName;
+        let layoutType = "nested";
+        if (extlessName.endsWith("!")) {
+          layoutType = "top";
+          extlessName = extlessName.slice(0, -1);
+        }
+        const layoutName = extlessName.startsWith("layout-") ? extlessName.slice("layout-".length) : "";
+        nodeLayouts.push({
+          id: layoutId,
+          layoutName,
+          layoutType
+        });
+        if (layoutName === "") {
+          layoutExpr = layoutId;
+        }
+      }
+    }
+  }
+  for (const file of node._files) {
+    if (file.type !== "route") {
+      continue;
+    }
+    const loaderExpr = routeIdMap.get(file.filePath);
+    if (!loaderExpr) {
+      continue;
+    }
+    const isError = file.extlessName === "error";
+    const is404 = file.extlessName === "404";
+    if (isError) {
+      errorExpr = loaderExpr;
+      errorFiles.set(node._dirPath, file.filePath);
+    } else if (is404) {
+      notFoundExpr = loaderExpr;
+      notFoundFiles.set(node._dirPath, file.filePath);
+    } else {
+      const { layoutName, layoutStop } = parseRouteIndexName(file.extlessName);
+      if (layoutStop) {
+        indexExpr = `[ ${loaderExpr} ]`;
+        indexIsOverride = true;
+      } else if (layoutName) {
+        const chain = resolveNamedLayoutChain(ancestorLayouts, nodeLayouts, layoutName);
+        const chainExprs = chain.map((l) => l.id);
+        chainExprs.push(loaderExpr);
+        indexExpr = `[ ${chainExprs.join(", ")} ]`;
+        indexIsOverride = true;
+      } else {
+        indexExpr = loaderExpr;
+      }
+      bundleRoute = ctx.routes.find((r) => r.filePath === file.filePath);
+    }
+  }
+  if (layoutExpr) {
+    lines.push(`${nextIndent}_L: ${layoutExpr},`);
+  }
+  if (indexExpr) {
+    if (indexIsOverride) {
+      lines.push(`${nextIndent}_I: ${indexExpr},`);
+    } else {
+      lines.push(`${nextIndent}_I: ${indexExpr},`);
+    }
+    if (isSSR && bundleRoute) {
+      const bundleNames = getClientRouteBundleNames(qwikPlugin, bundleRoute);
+      if (bundleNames.length > 0) {
+        lines.push(`${nextIndent}_B: ${JSON.stringify(bundleNames)},`);
+      }
+    }
+  }
+  if (errorExpr) {
+    lines.push(`${nextIndent}_E: ${errorExpr},`);
+  }
+  if (notFoundExpr) {
+    lines.push(`${nextIndent}_4: ${notFoundExpr},`);
+  }
+  if (menuExpr) {
+    lines.push(`${nextIndent}_N: ${menuExpr},`);
+  }
+  const childAncestors = [
+    ...ancestorLayouts,
+    ...nodeLayouts
+  ];
+  const groupChildren = [];
+  const regularChildren = [];
+  for (const [key, child] of node.children) {
+    if (isGroupKey(key)) {
+      groupChildren.push([
+        key,
+        child
+      ]);
+    } else {
+      regularChildren.push([
+        key,
+        child
+      ]);
+    }
+  }
+  if (groupChildren.length > 0) {
+    groupChildren.sort((a, b) => a[0].localeCompare(b[0]));
+    const groupStrs = [];
+    for (const [_key, child] of groupChildren) {
+      const childStr = serializeBuildTrie(ctx, qwikPlugin, child, layoutIdMap, routeIdMap, menuIdMap, errorFiles, notFoundFiles, childAncestors, isSSR, nextIndent);
+      if (childStr !== "{}") {
+        groupStrs.push(childStr);
+      }
+    }
+    if (groupStrs.length > 0) {
+      lines.push(`${nextIndent}_M: [${groupStrs.join(", ")}],`);
+    }
+  }
+  for (const [key, child] of regularChildren) {
+    const childStr = serializeBuildTrie(ctx, qwikPlugin, child, layoutIdMap, routeIdMap, menuIdMap, errorFiles, notFoundFiles, childAncestors, isSSR, nextIndent);
+    if (childStr !== "{}") {
+      const keyStr = JSON.stringify(key);
+      lines.push(`${nextIndent}${keyStr}: ${childStr},`);
+    }
+  }
+  if (lines.length === 0) {
+    return "{}";
+  }
+  return `{
+${lines.join("\n")}
+${indent}}`;
+}
+function createRoutes(ctx, qwikPlugin, c, esmImports, isSSR) {
+  const includeEndpoints = isSSR;
+  const dynamicImports = ctx.dynamicImports;
+  const layoutIdMap = /* @__PURE__ */ new Map();
+  const routeIdMap = /* @__PURE__ */ new Map();
+  const menuIdMap = /* @__PURE__ */ new Map();
+  const errorFiles = /* @__PURE__ */ new Map();
+  const notFoundFiles = /* @__PURE__ */ new Map();
+  let layoutCount = 0;
+  let routeCount = 0;
+  let menuCount = 0;
+  collectFiles(ctx.routeTrie, (file, _node) => {
+    if (file.type === "layout") {
+      const id = ctx.layouts.find((l) => l.filePath === file.filePath)?.id;
+      if (id) {
+        layoutIdMap.set(file.filePath, id);
+        layoutCount++;
+      }
+    } else if (file.type === "route") {
+      const route = ctx.routes.find((r) => r.filePath === file.filePath);
+      if (route) {
+        routeCount++;
+      }
+    } else if (file.type === "menu") {
+      const id = createFileId(ctx.opts.routesDir, file.filePath);
+      menuIdMap.set(file.filePath, id);
+      menuCount++;
+    }
+  });
+  if (layoutCount > 0) {
+    c.push(`
+/** Qwik Router Layouts (${layoutCount}) */`);
+    for (const [filePath, id] of layoutIdMap) {
+      const importPath = JSON.stringify(getImportPath(filePath));
+      if (dynamicImports) {
+        c.push(`const ${id} = ()=>import(${importPath});`);
+      } else {
+        esmImports.push(`import * as ${id}_ from ${importPath};`);
+        c.push(`const ${id} = ()=>${id}_;`);
+      }
+    }
+  }
+  if (menuCount > 0) {
+    c.push(`
+/** Qwik Router Menus (${menuCount}) */`);
+    for (const [filePath, id] of menuIdMap) {
+      const importPath = JSON.stringify(getImportPath(filePath));
+      if (dynamicImports) {
+        c.push(`const ${id} = ()=>import(${importPath});`);
+      } else {
+        esmImports.push(`import * as ${id}_ from ${importPath};`);
+        c.push(`const ${id} = ()=>${id}_;`);
+      }
+    }
+  }
+  c.push(`
+/** Qwik Router Routes (${routeCount}) */`);
+  for (const route of ctx.routes) {
+    if (isPageExt(route.ext)) {
+      const importPath = getImportPath(route.filePath);
+      let loaderExpr;
+      if (dynamicImports) {
+        loaderExpr = `()=>import(${JSON.stringify(importPath)})`;
+      } else {
+        esmImports.push(`import * as ${route.id} from ${JSON.stringify(importPath)};`);
+        loaderExpr = `()=>${route.id}`;
+      }
+      routeIdMap.set(route.filePath, loaderExpr);
+    } else if (includeEndpoints && isModuleExt(route.ext)) {
+      const importPath = getImportPath(route.filePath);
+      esmImports.push(`import * as ${route.id} from ${JSON.stringify(importPath)};`);
+      routeIdMap.set(route.filePath, `()=>${route.id}`);
     }
-    addRouteFile(r.filePath);
   }
-  return bundlesNames;
+  const trieStr = serializeBuildTrie(ctx, qwikPlugin, ctx.routeTrie, layoutIdMap, routeIdMap, menuIdMap, errorFiles, notFoundFiles, [], isSSR, "");
+  const baseSegments = ctx.opts.basePathname.split("/").filter((s) => s.length > 0);
+  let routesExpr = trieStr;
+  for (let j = baseSegments.length - 1; j >= 0; j--) {
+    routesExpr = `{ ${JSON.stringify(baseSegments[j])}: ${routesExpr} }`;
+  }
+  c.push(`export const routes = ${routesExpr};`);
 }
 
 function createServerPlugins(ctx, _qwikPlugin, c, esmImports, isSSR) {
@@ -1186,17 +1488,17 @@ function generateQwikRouterConfig(ctx, qwikPlugin, isSSR) {
 import { isDev } from '@qwik.dev/core/build';`);
   createServerPlugins(ctx, qwikPlugin, c, esmImports, isSSR);
   createRoutes(ctx, qwikPlugin, c, esmImports, isSSR);
-  createMenus(ctx, c, esmImports, isSSR);
   createEntries(ctx, c);
   c.push(`export const trailingSlash = ${JSON.stringify(!globalThis.__NO_TRAILING_SLASH__)};`);
   c.push(`export const basePathname = ${JSON.stringify(ctx.opts.basePathname)};`);
   c.push(`export const cacheModules = !isDev;`);
-  c.push(
-    `export default { routes, serverPlugins, menus, trailingSlash, basePathname, cacheModules };`
-  );
+  c.push(`export default { routes, serverPlugins, trailingSlash, basePathname, cacheModules };`);
   return esmImports.join("\n") + c.join("\n");
 }
 
+const SW_UNREGISTER = `
+"serviceWorker"in navigator&&navigator.serviceWorker.getRegistrations().then(r=>{for(const e of r){const c='__url'.split("/").pop();e.active?.scriptURL.endsWith(c||"service-worker.js")&&e.unregister().catch(console.error)}}),"caches"in window&&caches.keys().then(r=>{const e=r.find(c=>c.startsWith("QwikBuild"));e&&caches.delete(e).catch(console.error)}).catch(console.error)
+`;
 function generateServiceWorkerRegister(ctx, swRegister) {
   let swReg;
   let swUrl = "/service-worker.js";
@@ -1204,24 +1506,31 @@ function generateServiceWorkerRegister(ctx, swRegister) {
     swReg = SW_UNREGISTER;
   } else {
     swReg = swRegister;
-    const sw = ctx.serviceWorkers.sort(
-      (a, b) => a.chunkFileName.length < b.chunkFileName.length ? -1 : 1
-    )[0];
+    const sw = ctx.serviceWorkers.sort((a, b) => a.chunkFileName.length < b.chunkFileName.length ? -1 : 1)[0];
     swUrl = ctx.opts.basePathname + sw.chunkFileName;
   }
   swReg = swReg.replace("__url", swUrl);
   return `export default ${JSON.stringify(swReg)};`;
 }
-const SW_UNREGISTER = `
-"serviceWorker"in navigator&&navigator.serviceWorker.getRegistrations().then(r=>{for(const e of r){const c='__url'.split("/").pop();e.active?.scriptURL.endsWith(c||"service-worker.js")&&e.unregister().catch(console.error)}}),"caches"in window&&caches.keys().then(r=>{const e=r.find(c=>c.startsWith("QwikBuild"));e&&caches.delete(e).catch(console.error)}).catch(console.error)
-`;
 
+function isBundlePartOfRoute(bundle, routeAndLayoutPaths) {
+  if (!bundle.origins) {
+    return false;
+  }
+  for (const bundleOrigin of bundle.origins) {
+    const originPath = removeExtension(bundleOrigin);
+    return routeAndLayoutPaths.some((path) => path.endsWith(originPath));
+  }
+}
 function getRouteImports(routes, manifest) {
   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 routeAndLayoutPaths = [
+      routePath,
+      ...layoutPaths
+    ];
     const bundles = [];
     for (const [bundleName, bundle] of Object.entries(manifest.bundles)) {
       if (isBundlePartOfRoute(bundle, routeAndLayoutPaths)) {
@@ -1229,7 +1538,9 @@ function getRouteImports(routes, manifest) {
       }
     }
     if (bundles.length > 0) {
-      result[route.routeName] = { dynamicImports: bundles };
+      result[route.routeName] = {
+        dynamicImports: bundles
+      };
     }
   });
   for (const bundleName of Object.keys(manifest.bundles)) {
@@ -1237,71 +1548,235 @@ function getRouteImports(routes, manifest) {
     if (bundle.origins?.some((s) => s.endsWith(QWIK_ROUTER_CONFIG_ID))) {
       result[bundleName] = {
         ...bundle,
-        dynamicImports: bundle.dynamicImports?.filter(
-          (d) => manifest.bundles[d].origins?.some((s) => s.endsWith("menu.md"))
-        )
+        dynamicImports: bundle.dynamicImports?.filter((d) => manifest.bundles[d].origins?.some((s) => s.endsWith("menu.md")))
       };
       break;
     }
   }
   return result;
 }
-function isBundlePartOfRoute(bundle, routeAndLayoutPaths) {
-  if (!bundle.origins) {
-    return false;
+
+const safeParseInt = (nu) => {
+  try {
+    return parseInt(nu, 10);
+  } catch {
+    return void 0;
   }
-  for (const bundleOrigin of bundle.origins) {
-    const originPath = removeExtension(bundleOrigin);
-    return routeAndLayoutPaths.some((path) => path.endsWith(originPath));
+};
+const findLocation = (e) => {
+  const stack = e.stack;
+  if (typeof stack === "string") {
+    const lines = stack.split("\n").filter((l) => !l.includes("/node_modules/") && !l.includes("(node:"));
+    for (let i = 1; i < lines.length; i++) {
+      const line = lines[i].replace("file:///", "/");
+      if (/^\s+at/.test(line)) {
+        const start = line.indexOf("/");
+        const end = line.lastIndexOf(")", start);
+        if (start > 0) {
+          const path = line.slice(start, end);
+          const parts = path.split(":");
+          const nu0 = safeParseInt(parts[parts.length - 1]);
+          const nu1 = safeParseInt(parts[parts.length - 2]);
+          if (typeof nu0 === "number" && typeof nu1 === "number") {
+            parts.length -= 2;
+            return {
+              file: parts.join(":"),
+              line: nu1,
+              column: nu0
+            };
+          } else if (typeof nu0 === "number") {
+            parts.length -= 1;
+            return {
+              file: parts.join(":"),
+              line: nu0,
+              column: void 0
+            };
+          } else {
+            return {
+              file: parts.join(":"),
+              line: void 0,
+              column: void 0
+            };
+          }
+        }
+      }
+    }
+  }
+  return void 0;
+};
+const splitRE = /\r?\n/;
+const range = 2;
+function posToNumber(source, pos) {
+  if (typeof pos === "number") {
+    return pos;
+  }
+  if (pos.lo != null) {
+    return pos.lo;
+  }
+  const lines = source.split(splitRE);
+  const { line, column } = pos;
+  let start = 0;
+  for (let i = 0; i < line - 1 && i < lines.length; i++) {
+    start += lines[i].length + 1;
+  }
+  return start + column;
+}
+function generateCodeFrame(source, start = 0, end) {
+  start = posToNumber(source, start);
+  end = end || start;
+  const lines = source.split(splitRE);
+  let count = 0;
+  const res = [];
+  for (let i = 0; i < lines.length; i++) {
+    count += lines[i].length + 1;
+    if (count >= start) {
+      for (let j = i - range; j <= i + range || end > count; j++) {
+        if (j < 0 || j >= lines.length) {
+          continue;
+        }
+        const line = j + 1;
+        res.push(`${line}${" ".repeat(Math.max(3 - String(line).length, 0))}|  ${lines[j]}`);
+        const lineLength = lines[j].length;
+        if (j === i) {
+          const pad = Math.max(start - (count - lineLength) + 1, 0);
+          const length = Math.max(1, end > count ? lineLength - pad : end - start);
+          res.push(`   |  ` + " ".repeat(pad) + "^".repeat(length));
+        } else if (j > i) {
+          if (end > count) {
+            const length = Math.max(Math.min(end - count, lineLength), 1);
+            res.push(`   |  ` + "^".repeat(length));
+          }
+          count += lineLength + 1;
+        }
+      }
+      break;
+    }
   }
+  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)
+  };
 }
 
-function imagePlugin(userOpts) {
-  const supportedExtensions = [".jpg", ".jpeg", ".png", ".webp", ".gif", ".avif", ".tiff"];
-  return [
-    import('vite-imagetools').then(
-      ({ imagetools }) => imagetools({
-        exclude: [],
-        extendOutputFormats(builtins) {
-          const jsx = () => (metadatas) => {
-            const srcSet = metadatas.map((meta) => `${meta.src} ${meta.width}w`).join(", ");
-            let largestImage;
-            let largestImageSize = 0;
-            for (let i = 0; i < metadatas.length; i++) {
-              const m = metadatas[i];
-              if (m.width > largestImageSize) {
-                largestImage = m;
-                largestImageSize = m.width;
+function optimizeSvg({ code, path: path2 }, userOpts) {
+  const svgAttributes = {};
+  const prefixIdsConfiguration = userOpts?.imageOptimization?.svgo?.prefixIds;
+  const maybePrefixIdsPlugin = prefixIdsConfiguration !== false ? [
+    {
+      name: "prefixIds",
+      params: prefixIdsConfiguration
+    }
+  ] : [];
+  const userPlugins = userOpts?.imageOptimization?.svgo?.plugins?.filter((plugin) => {
+    if (plugin === "preset-default" || typeof plugin === "object" && plugin.name === "preset-default") {
+      console.warn(`You are trying to use the preset-default SVGO plugin. This plugin is already included by default, you can customize it through the defaultPresetOverrides option.`);
+      return false;
+    }
+    if (plugin === "prefixIds" || typeof plugin === "object" && plugin.name === "prefixIds") {
+      console.warn(`You are trying to use the preset-default SVGO plugin. This plugin is already included by default, you can customize it through the prefixIds option.`);
+      return false;
+    }
+    return true;
+  }) || [];
+  const data = optimize(code, {
+    floatPrecision: userOpts?.imageOptimization?.svgo?.floatPrecision,
+    multipass: userOpts?.imageOptimization?.svgo?.multipass,
+    path: path2,
+    plugins: [
+      {
+        name: "preset-default",
+        params: {
+          overrides: {
+            removeViewBox: false,
+            ...userOpts?.imageOptimization?.svgo?.defaultPresetOverrides
+          }
+        }
+      },
+      {
+        name: "customPluginName",
+        fn: () => {
+          return {
+            element: {
+              exit: (node) => {
+                if (node.name === "svg") {
+                  node.name = "g";
+                  Object.assign(svgAttributes, node.attributes);
+                  node.attributes = {};
+                }
               }
             }
-            return {
-              srcSet,
-              width: largestImage === null || largestImage === void 0 ? void 0 : largestImage.width,
-              height: largestImage === null || largestImage === void 0 ? void 0 : largestImage.height
-            };
           };
+        }
+      },
+      ...maybePrefixIdsPlugin,
+      ...userPlugins
+    ]
+  }).data;
+  svgAttributes.dangerouslySetInnerHTML = data.slice(3, -4);
+  return {
+    data,
+    svgAttributes
+  };
+}
+function imagePlugin(userOpts) {
+  const supportedExtensions = [
+    ".jpg",
+    ".jpeg",
+    ".png",
+    ".webp",
+    ".gif",
+    ".avif",
+    ".tiff"
+  ];
+  return [
+    import('vite-imagetools').then(({ imagetools }) => imagetools({
+      exclude: [],
+      extendOutputFormats(builtins) {
+        const jsx = () => (metadatas) => {
+          const srcSet = metadatas.map((meta) => `${meta.src} ${meta.width}w`).join(", ");
+          let largestImage;
+          let largestImageSize = 0;
+          for (let i = 0; i < metadatas.length; i++) {
+            const m = metadatas[i];
+            if (m.width > largestImageSize) {
+              largestImage = m;
+              largestImageSize = m.width;
+            }
+          }
           return {
-            ...builtins,
-            jsx
+            srcSet,
+            width: largestImage === null || largestImage === void 0 ? void 0 : largestImage.width,
+            height: largestImage === null || largestImage === void 0 ? void 0 : largestImage.height
           };
-        },
-        defaultDirectives: (url) => {
-          if (url.searchParams.has("jsx")) {
-            const { jsx: _, ...params } = Object.fromEntries(url.searchParams.entries());
-            return new URLSearchParams({
-              format: "webp",
-              quality: "75",
-              w: "200;400;600;800;1200",
-              withoutEnlargement: "",
-              ...userOpts?.imageOptimization?.jsxDirectives,
-              ...params,
-              as: "jsx"
-            });
-          }
-          return new URLSearchParams();
+        };
+        return {
+          ...builtins,
+          jsx
+        };
+      },
+      defaultDirectives: (url) => {
+        if (url.searchParams.has("jsx")) {
+          const { jsx: _, ...params } = Object.fromEntries(url.searchParams.entries());
+          return new URLSearchParams({
+            format: "webp",
+            quality: "75",
+            w: "200;400;600;800;1200",
+            withoutEnlargement: "",
+            ...userOpts?.imageOptimization?.jsxDirectives,
+            ...params,
+            as: "jsx"
+          });
         }
-      })
-    ).catch((err) => {
+        return new URLSearchParams();
+      }
+    })).catch((err) => {
       console.error("Error loading vite-imagetools, image imports are not available", err);
       return null;
     }),
@@ -1341,7 +1816,10 @@ function imagePlugin(userOpts) {
               map: null
             };
           } else if (extension === ".svg") {
-            const { svgAttributes } = optimizeSvg({ code, path: pathId }, userOpts);
+            const { svgAttributes } = optimizeSvg({
+              code,
+              path: pathId
+            }, userOpts);
             return {
               code: `
   import { _jsxSorted } from '@qwik.dev/core';
@@ -1358,89 +1836,50 @@ function imagePlugin(userOpts) {
     }
   ];
 }
-function optimizeSvg({ code, path: path2 }, userOpts) {
-  const svgAttributes = {};
-  const prefixIdsConfiguration = userOpts?.imageOptimization?.svgo?.prefixIds;
-  const maybePrefixIdsPlugin = prefixIdsConfiguration !== false ? [{ name: "prefixIds", params: prefixIdsConfiguration }] : [];
-  const userPlugins = userOpts?.imageOptimization?.svgo?.plugins?.filter((plugin) => {
-    if (plugin === "preset-default" || typeof plugin === "object" && plugin.name === "preset-default") {
-      console.warn(
-        `You are trying to use the preset-default SVGO plugin. This plugin is already included by default, you can customize it through the defaultPresetOverrides option.`
-      );
-      return false;
-    }
-    if (plugin === "prefixIds" || typeof plugin === "object" && plugin.name === "prefixIds") {
-      console.warn(
-        `You are trying to use the preset-default SVGO plugin. This plugin is already included by default, you can customize it through the prefixIds option.`
-      );
-      return false;
-    }
-    return true;
-  }) || [];
-  const data = optimize(code, {
-    floatPrecision: userOpts?.imageOptimization?.svgo?.floatPrecision,
-    multipass: userOpts?.imageOptimization?.svgo?.multipass,
-    path: path2,
-    plugins: [
-      {
-        name: "preset-default",
-        params: {
-          overrides: {
-            removeViewBox: false,
-            ...userOpts?.imageOptimization?.svgo?.defaultPresetOverrides
-          }
-        }
-      },
-      {
-        name: "customPluginName",
-        fn: () => {
-          return {
-            element: {
-              exit: (node) => {
-                if (node.name === "svg") {
-                  node.name = "g";
-                  Object.assign(svgAttributes, node.attributes);
-                  node.attributes = {};
-                }
-              }
-            }
-          };
-        }
-      },
-      ...maybePrefixIdsPlugin,
-      ...userPlugins
-    ]
-  }).data;
-  svgAttributes.dangerouslySetInnerHTML = data.slice(3, -4);
-  return {
-    data,
-    svgAttributes
-  };
-}
 
 async function validatePlugin(opts) {
   if (typeof opts.routesDir !== "string") {
     throw new Error(`qwikRouter plugin "routesDir" option missing`);
   }
   if (!isAbsolute(opts.routesDir)) {
-    throw new Error(
-      `qwikRouter plugin "routesDir" option must be an absolute path: ${opts.routesDir}`
-    );
+    throw new Error(`qwikRouter plugin "routesDir" option must be an absolute path: ${opts.routesDir}`);
   }
   try {
     const s = await fs.promises.stat(opts.routesDir);
     if (!s.isDirectory()) {
-      throw new Error(
-        `qwikRouter plugin "routesDir" option must be a directory: ${opts.routesDir}`
-      );
+      throw new Error(`qwikRouter plugin "routesDir" option must be a directory: ${opts.routesDir}`);
     }
   } catch (e) {
     throw new Error(`qwikRouter plugin "routesDir" not found: ${e}`);
   }
 }
 
+function formatError(e) {
+  if (e instanceof Error) {
+    const err = e;
+    let loc = err.loc;
+    if (!err.frame && !err.plugin) {
+      if (!loc) {
+        loc = findLocation(err);
+      }
+      if (loc) {
+        err.loc = loc;
+        if (loc.file) {
+          err.id = normalizePath(err.loc.file);
+          try {
+            const code = fs.readFileSync(err.loc.file, "utf-8");
+            err.frame = generateCodeFrame(code, err.loc);
+          } catch {
+          }
+        }
+      }
+    }
+  }
+  return e;
+}
+
 class HtmlTransformPatcher {
-  state = 0 /* BUFFERING */;
+  state = 0;
   buffer = "";
   headInnerIndex = -1;
   bodyInnerIndex = -1;
@@ -1495,7 +1934,7 @@ class HtmlTransformPatcher {
     };
   }
   handleWrite(chunk, encoding, callback) {
-    if (!this.isHtmlResponse || this.state === 3 /* PASSTHROUGH */) {
+    if (!this.isHtmlResponse || this.state === 3) {
       return this.origWrite(chunk, encoding, callback);
     }
     if (typeof encoding === "function") {
@@ -1514,7 +1953,7 @@ class HtmlTransformPatcher {
     }
     this.buffer += data;
     switch (this.state) {
-      case 0 /* BUFFERING */:
+      case 0:
         if (this.headInnerIndex === -1) {
           const headMatch = this.buffer.match(/<head[^>]*>/i);
           if (headMatch) {
@@ -1525,16 +1964,16 @@ class HtmlTransformPatcher {
         if (this.headInnerIndex !== -1) {
           const bodyMatch = this.buffer.slice(this.headInnerIndex).match(/<body[^>]*>/i);
           if (bodyMatch) {
-            this.state = 1 /* PROCESSING_HEAD */;
+            this.state = 1;
             const bodyOuterIndex = this.buffer.indexOf(bodyMatch[0]);
             this.bodyInnerIndex = bodyOuterIndex + bodyMatch[0].length;
             this.processingPromise = this.processHead();
           }
         }
         break;
-      case 1 /* PROCESSING_HEAD */:
+      case 1:
         break;
-      case 2 /* STREAMING_BODY */:
+      case 2:
         this.handleStreamingBodyState();
         break;
       default:
@@ -1545,42 +1984,31 @@ class HtmlTransformPatcher {
   }
   async processHead() {
     try {
-      const fakeHtml = "<html><head>[FAKE_HEAD]</head><body>[FAKE_BODY]</body></html>";
-      const transformedHtml = await this.server.transformIndexHtml(
-        this.request.url || "/",
-        fakeHtml
-      );
+      const fakeHtml = `<html><head>[FAKE_HEAD]</head><body>[FAKE_BODY]</body></html>`;
+      const transformedHtml = await this.server.transformIndexHtml(this.request.url || "/", fakeHtml);
+      const hmrBridge = this.server.hot ? `<script type="module" src="/@id/@qwik-hmr-bridge"><\/script>` : "";
       const fakeHeadIndex = transformedHtml.indexOf("[FAKE_HEAD]");
       const fakeHeadCloseIndex = transformedHtml.indexOf("</head>", fakeHeadIndex);
       if (fakeHeadIndex === -1 || fakeHeadCloseIndex === -1) {
         throw new Error("Transformed HTML does not contain [FAKE_HEAD]...</head>");
       }
       const headPreContent = transformedHtml.slice("<html><head>".length, fakeHeadIndex).trim();
-      const headPostContent = transformedHtml.slice(
-        fakeHeadIndex + "[FAKE_HEAD]".length,
-        fakeHeadCloseIndex
-      );
+      const headPostContent = transformedHtml.slice(fakeHeadIndex + "[FAKE_HEAD]".length, fakeHeadCloseIndex) + hmrBridge;
       const fakeBodyStartIndex = transformedHtml.indexOf("<body>", fakeHeadCloseIndex);
       const fakeBodyIndex = transformedHtml.indexOf("[FAKE_BODY]", fakeBodyStartIndex);
       const fakeBodyEndIndex = transformedHtml.indexOf("</body>", fakeBodyIndex);
       if (fakeBodyIndex === -1 || fakeBodyEndIndex === -1) {
         throw new Error("Transformed HTML does not contain [FAKE_BODY]...</body>");
       }
-      const bodyPreContent = transformedHtml.slice(
-        fakeBodyStartIndex + "<body>".length,
-        fakeBodyIndex
-      );
-      this.bodyPostContent = transformedHtml.slice(
-        fakeBodyIndex + "[FAKE_BODY]".length,
-        fakeBodyEndIndex
-      );
+      const bodyPreContent = transformedHtml.slice(fakeBodyStartIndex + "<body>".length, fakeBodyIndex);
+      this.bodyPostContent = transformedHtml.slice(fakeBodyIndex + "[FAKE_BODY]".length, fakeBodyEndIndex);
       const headCloseIndex = this.buffer.indexOf("</head>", this.headInnerIndex);
       if (headCloseIndex === -1) {
         throw new Error("Buffered HTML does not contain </head>");
       }
       this.buffer = this.buffer.slice(0, this.headInnerIndex) + headPreContent + this.buffer.slice(this.headInnerIndex, headCloseIndex) + headPostContent + this.buffer.slice(headCloseIndex, this.bodyInnerIndex) + bodyPreContent + this.buffer.slice(this.bodyInnerIndex);
       if (this.bodyPostContent.length > 0) {
-        this.state = 2 /* STREAMING_BODY */;
+        this.state = 2;
         this.handleStreamingBodyState();
         return;
       }
@@ -1603,7 +2031,7 @@ class HtmlTransformPatcher {
     this.flushBuffer(6);
   }
   transitionToPassthrough() {
-    this.state = 3 /* PASSTHROUGH */;
+    this.state = 3;
     this.flushBuffer();
   }
   flushBuffer(keep = 0) {
@@ -1648,9 +2076,7 @@ const makeRouterDevMiddleware = (server, ctx) => async (req, res, next) => {
   }
   const entry = ctx.entries.find((e) => req.url === `${server.config.base}${e.chunkFileName}`);
   if (entry) {
-    const entryContents = await server.transformRequest(
-      `/@fs${entry.filePath.startsWith("/") ? "" : "/"}${entry.filePath}`
-    );
+    const entryContents = await server.transformRequest(`/@fs${entry.filePath.startsWith("/") ? "" : "/"}${entry.filePath}`);
     if (entryContents) {
       res.setHeader("Content-Type", "text/javascript");
       res.end(entryContents.code);
@@ -1661,19 +2087,15 @@ const makeRouterDevMiddleware = (server, ctx) => async (req, res, next) => {
   }
   if (req.url === `${server.config.base}service-worker.js`) {
     res.setHeader("Content-Type", "text/javascript");
-    res.end(
-      `/* Qwik Router Dev Service Worker */self.addEventListener('install', () => self.skipWaiting());self.addEventListener('activate', (ev) => ev.waitUntil(self.clients.claim()));`
-    );
+    res.end(`/* Qwik Router Dev Service Worker */self.addEventListener('install', () => self.skipWaiting());self.addEventListener('activate', (ev) => ev.waitUntil(self.clients.claim()));`);
     return;
   }
   globalThis.__qwik = void 0;
-  const { createQwikRouter } = await server.ssrLoadModule(
-    "@qwik.dev/router/middleware/node"
-  );
+  const { createQwikRouter } = await server.ssrLoadModule("@qwik.dev/router/middleware/node");
   try {
-    const render = (async (opts) => {
+    const render = async (opts) => {
       return await renderer(opts);
-    });
+    };
     const { router, staticFile, notFound } = createQwikRouter({
       render,
       // inject the platform from dev middleware options
@@ -1694,14 +2116,26 @@ const makeRouterDevMiddleware = (server, ctx) => async (req, res, next) => {
     return;
   }
 };
-const CSS_EXTENSIONS = [".css", ".scss", ".sass", ".less", ".styl", ".stylus"];
+const CSS_EXTENSIONS = [
+  ".css",
+  ".scss",
+  ".sass",
+  ".less",
+  ".styl",
+  ".stylus"
+];
 const JS_EXTENSIONS = /\.[mc]?[tj]sx?$/;
 const isCssPath = (url) => CSS_EXTENSIONS.some((ext) => url.endsWith(ext));
 const getCssUrls = (server) => {
+  const clientGraph = server.environments.client.moduleGraph;
+  const ssrGraph = server.environments.ssr.moduleGraph;
   const cssModules = /* @__PURE__ */ new Set();
   const cssImportedByCSS = /* @__PURE__ */ new Set();
-  Array.from(server.moduleGraph.fileToModulesMap.entries()).forEach(([_name, modules]) => {
-    modules.forEach((mod) => {
+  for (const graph of [
+    clientGraph,
+    ssrGraph
+  ]) {
+    for (const mod of graph.idToModuleMap.values()) {
       const [pathId, query] = mod.url.split("?");
       if (!query && isCssPath(pathId)) {
         const isEntryCSS = mod.importers.size === 0;
@@ -1718,20 +2152,23 @@ const getCssUrls = (server) => {
           return importerPath && JS_EXTENSIONS.test(importerPath);
         });
         if ((isEntryCSS || hasJSImporter) && !hasCSSImporter && !cssImportedByCSS.has(mod.url)) {
-          cssModules.add(mod);
+          cssModules.add(`${mod.url}${mod.lastHMRTimestamp ? `?t=${mod.lastHMRTimestamp}` : ""}`);
         }
       }
-    });
-  });
-  return [...cssModules].map(
-    ({ url, lastHMRTimestamp }) => `${url}${lastHMRTimestamp ? `?t=${lastHMRTimestamp}` : ""}`
-  );
+    }
+  }
+  return [
+    ...cssModules
+  ];
 };
 const getRouterIndexTags = (server) => {
   const cssUrls = getCssUrls(server);
   return cssUrls.map((url) => ({
     tag: "link",
-    attrs: { rel: "stylesheet", href: url }
+    attrs: {
+      rel: "stylesheet",
+      href: url
+    }
   }));
 };
 
@@ -1739,11 +2176,25 @@ const QWIK_ROUTER_CONFIG_ID = "@qwik-router-config";
 const QWIK_ROUTER_ENTRIES_ID = "@qwik-router-entries";
 const QWIK_ROUTER = "@qwik.dev/router";
 const QWIK_ROUTER_SW_REGISTER = "@qwik-router-sw-register";
-function qwikCity(userOpts) {
-  return qwikRouter(userOpts);
-}
-function qwikRouter(userOpts) {
-  return [qwikRouterPlugin(userOpts), ...imagePlugin(userOpts)];
+async function generateServerPackageJson(outDir) {
+  await fs.promises.mkdir(outDir, {
+    recursive: true
+  });
+  const serverPackageJsonPath = join(outDir, "package.json");
+  let packageJson = {};
+  if (fs.existsSync(serverPackageJsonPath)) {
+    const content = await fs.promises.readFile(serverPackageJsonPath, "utf-8");
+    const contentAsJson = JSON.parse(content);
+    packageJson = {
+      ...contentAsJson
+    };
+  }
+  packageJson = {
+    ...packageJson,
+    type: "module"
+  };
+  const serverPackageJsonCode = JSON.stringify(packageJson, null, 2);
+  await fs.promises.writeFile(serverPackageJsonPath, serverPackageJsonCode);
 }
 function qwikRouterPlugin(userOpts) {
   let ctx = null;
@@ -1773,20 +2224,37 @@ function qwikRouterPlugin(userOpts) {
       viteCommand = viteEnv.command;
       const updatedViteConfig = {
         define: {
-          "globalThis.__DEFAULT_LOADERS_SERIALIZATION_STRATEGY__": JSON.stringify(
-            userOpts?.defaultLoadersSerializationStrategy || "never"
-          ),
-          "globalThis.__NO_TRAILING_SLASH__": JSON.stringify(userOpts?.trailingSlash === false)
+          "globalThis.__DEFAULT_LOADERS_SERIALIZATION_STRATEGY__": JSON.stringify(userOpts?.defaultLoadersSerializationStrategy || "never"),
+          "globalThis.__NO_TRAILING_SLASH__": JSON.stringify(userOpts?.trailingSlash === false),
+          "globalThis.__SSR_CACHE_SIZE__": JSON.stringify(viteEnv.command === "serve" ? 0 : userOpts?.ssrCacheSize ?? 50)
         },
         appType: "custom",
         resolve: {
-          dedupe: [QWIK_ROUTER, "@builder.io/qwik-city"],
+          dedupe: [
+            QWIK_ROUTER,
+            "@builder.io/qwik-city"
+          ],
           alias: [
-            { find: "@builder.io/qwik-city", replacement: "@qwik.dev/router" },
-            { find: /^@builder\.io\/qwik-city\/(.*)/, replacement: "@qwik.dev/router/$1" },
-            { find: "@qwik-city-plan", replacement: QWIK_ROUTER_CONFIG_ID },
-            { find: "@qwik-city-entries", replacement: QWIK_ROUTER_ENTRIES_ID },
-            { find: "@qwik-city-sw-register", replacement: QWIK_ROUTER_SW_REGISTER }
+            {
+              find: "@builder.io/qwik-city",
+              replacement: "@qwik.dev/router"
+            },
+            {
+              find: /^@builder\.io\/qwik-city\/(.*)/,
+              replacement: "@qwik.dev/router/$1"
+            },
+            {
+              find: "@qwik-city-plan",
+              replacement: QWIK_ROUTER_CONFIG_ID
+            },
+            {
+              find: "@qwik-city-entries",
+              replacement: QWIK_ROUTER_ENTRIES_ID
+            },
+            {
+              find: "@qwik-city-sw-register",
+              replacement: QWIK_ROUTER_SW_REGISTER
+            }
           ]
         },
         optimizeDeps: {
@@ -1804,8 +2272,11 @@ function qwikRouterPlugin(userOpts) {
             QWIK_ROUTER_SW_REGISTER
           ]
         },
+        // Duplicated from configEnvironment to support legacy vite build --ssr compatibility
         ssr: {
-          external: ["node:async_hooks"],
+          external: [
+            "node:async_hooks"
+          ],
           noExternal: [
             QWIK_ROUTER,
             QWIK_ROUTER_CONFIG_ID,
@@ -1824,22 +2295,33 @@ function qwikRouterPlugin(userOpts) {
       };
       return updatedViteConfig;
     },
+    configEnvironment(name, _config, _env) {
+      if (name === "ssr") {
+        return {
+          resolve: {
+            external: [
+              "node:async_hooks"
+            ],
+            noExternal: [
+              QWIK_ROUTER,
+              QWIK_ROUTER_CONFIG_ID,
+              QWIK_ROUTER_ENTRIES_ID,
+              QWIK_ROUTER_SW_REGISTER,
+              "zod"
+            ]
+          }
+        };
+      }
+      return {};
+    },
     async configResolved(config) {
       Object.assign(process.env, loadEnv(config.mode, process.cwd(), ""));
       rootDir = resolve(config.root);
       const target = config.build?.ssr || config.mode === "ssr" ? "ssr" : "client";
-      ctx = createBuildContext(
-        rootDir,
-        config.base,
-        userOpts,
-        target,
-        !userOpts?.staticImportRoutes
-      );
+      ctx = createBuildContext(rootDir, config.base, userOpts, target, !userOpts?.staticImportRoutes);
       await validatePlugin(ctx.opts);
       mdxTransform = await createMdxTransformer(ctx);
-      qwikPlugin = config.plugins.find(
-        (p) => p.name === "vite-plugin-qwik"
-      );
+      qwikPlugin = config.plugins.find((p) => p.name === "vite-plugin-qwik");
       if (!qwikPlugin) {
         throw new Error("Missing vite-plugin-qwik");
       }
@@ -1853,10 +2335,7 @@ function qwikRouterPlugin(userOpts) {
     },
     async configureServer(server) {
       devServer = server;
-      const toWatch = resolve(
-        rootDir,
-        "src/routes/**/{index,layout,entry,service-worker}{.,@,-}*"
-      );
+      const toWatch = resolve(rootDir, "src/routes/**/{index,layout,entry,service-worker}{.,@,-}*");
       server.watcher.add(toWatch);
       await new Promise((resolve2) => setTimeout(resolve2, 1e3));
       server.watcher.on("change", (path) => {
@@ -1918,7 +2397,7 @@ function qwikRouterPlugin(userOpts) {
             });
           }
           if (isRouterConfig) {
-            return generateQwikRouterConfig(ctx, qwikPlugin, opts?.ssr ?? false);
+            return generateQwikRouterConfig(ctx, qwikPlugin, this.environment.config.consumer === "server");
           }
           if (isSwRegister) {
             return generateServiceWorkerRegister(ctx, swRegister);
@@ -1938,7 +2417,10 @@ function qwikRouterPlugin(userOpts) {
         const fileName = basename(id);
         if (isMenuFileName(fileName)) {
           const menuCode = await transformMenu(ctx.opts, id, code);
-          return { code: menuCode, map: null };
+          return {
+            code: menuCode,
+            map: null
+          };
         }
         if (mdxTransform) {
           try {
@@ -1969,8 +2451,11 @@ function qwikRouterPlugin(userOpts) {
       return null;
     },
     generateBundle(_, bundles) {
-      if (ctx?.target === "client") {
-        const entries = [...ctx.entries, ...ctx.serviceWorkers].map((entry) => {
+      if (this.environment.config.consumer === "client") {
+        const entries = [
+          ...ctx.entries,
+          ...ctx.serviceWorkers
+        ].map((entry) => {
           return {
             chunkFileName: entry.chunkFileName,
             extensionlessFilePath: removeExtension(entry.filePath)
@@ -1993,7 +2478,7 @@ function qwikRouterPlugin(userOpts) {
     closeBundle: {
       sequential: true,
       async handler() {
-        if (ctx?.target === "ssr" && outDir) {
+        if (this.environment.config.consumer === "server" && outDir) {
           await generateServerPackageJson(outDir);
         }
       }
@@ -2001,23 +2486,14 @@ function qwikRouterPlugin(userOpts) {
   };
   return plugin;
 }
-async function generateServerPackageJson(outDir) {
-  await fs.promises.mkdir(outDir, { recursive: true });
-  const serverPackageJsonPath = join(outDir, "package.json");
-  let packageJson = {};
-  if (fs.existsSync(serverPackageJsonPath)) {
-    const content = await fs.promises.readFile(serverPackageJsonPath, "utf-8");
-    const contentAsJson = JSON.parse(content);
-    packageJson = {
-      ...contentAsJson
-    };
-  }
-  packageJson = {
-    ...packageJson,
-    type: "module"
-  };
-  const serverPackageJsonCode = JSON.stringify(packageJson, null, 2);
-  await fs.promises.writeFile(serverPackageJsonPath, serverPackageJsonCode);
+function qwikRouter(userOpts) {
+  return [
+    qwikRouterPlugin(userOpts),
+    ...imagePlugin(userOpts)
+  ];
+}
+function qwikCity(userOpts) {
+  return qwikRouter(userOpts);
 }
 
 export { extendConfig, qwikCity, qwikRouter };