@qwik.dev/router 2.0.0-beta.11 → 2.0.0-beta.14

package/lib/vite/index.mjs

@@ -1,561 +1,623 @@
-import { mergeConfig as pe, loadEnv as me } from "vite";
-import x, { existsSync as ge } from "node:fs";
-import Q, { normalize as ye, basename as M, dirname as R, relative as ee, join as j, resolve as T, isAbsolute as q, extname as we } from "node:path";
-import { marked as ve } from "marked";
-import { SourceMapGenerator as be } from "source-map";
-import { visit as E } from "unist-util-visit";
-import { parse as Pe } from "yaml";
-import xe from "github-slugger";
-import { valueToEstree as Se } from "estree-util-value-to-estree";
-import { headingRank as te } from "hast-util-heading-rank";
-import { toString as B } from "hast-util-to-string";
-import { refractor as F } from "refractor";
-import ke from "refractor/lang/tsx.js";
-import { optimize as Ee } from "svgo";
-function yr(e, t) {
-  return async (r) => {
-    let n = await e;
-    typeof n == "function" && (n = await n(r));
-    let s = await t;
-    return typeof s == "function" && (s = await s(r)), pe(n, s);
-  };
-}
-const Ie = '"serviceWorker"in navigator?(navigator.serviceWorker.register("__url").catch(e=>console.error(e)),"caches"in window&&caches.keys().then(e=>{const r=e.find(e=>e.startsWith("QwikBuild"));r&&caches.delete(r).catch(console.error)}).catch(console.error)):console.log("Service worker not supported in this browser.")';
-function Ne(e) {
-  return e.replace(/\w\S*/g, (t) => t.charAt(0).toUpperCase() + t.slice(1).toLowerCase());
-}
-function re(e, t) {
-  e.diagnostics.push({
-    type: "error",
-    message: t ? String(t.stack || t) : "Error"
-  });
-}
-function Re(e, t) {
-  e.diagnostics.push({
-    type: "warn",
-    message: String(t)
-  });
-}
-function ne(e, t) {
-  if (typeof e == "string" && (e = e.trim(), e !== ""))
-    try {
-      if (e = e.replace(/\/+/g, "/"), e.startsWith("/") && (e = e.slice(1)), e = new URL(t + e, "https://qwik.dev").pathname, e !== t) {
-        if (globalThis.__NO_TRAILING_SLASH__)
-          e.endsWith("/") && (e = e.slice(0, e.length - 1));
-        else if (!e.endsWith("/")) {
-          const r = e.split("/");
-          r[r.length - 1].includes(".") || (e += "/");
-        }
-      }
-      return e;
-    } catch (r) {
-      console.error(r);
+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 { marked } from 'marked';
+import { SourceMapGenerator } from 'source-map';
+import { visit } from 'unist-util-visit';
+import { parse } from 'yaml';
+import Slugger from 'github-slugger';
+import { valueToEstree } from 'estree-util-value-to-estree';
+import { headingRank } from 'hast-util-heading-rank';
+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) => {
+    let resolvedBase = await baseConfigExport;
+    if (typeof resolvedBase === "function") {
+      resolvedBase = await resolvedBase(env);
     }
-  return null;
-}
-function se(e) {
-  if (typeof e == "string" && (e = e.trim(), e !== "")) {
-    const t = e.charAt(0);
-    if (t !== "/" && t !== ".") {
-      if (t === "#")
-        return !1;
-      const r = e.indexOf(":");
-      if (r > -1) {
-        const n = e.slice(0, r).toLowerCase();
-        return !$e[n];
-      }
+    let resolvedServer = await serverConfigExport;
+    if (typeof resolvedServer === "function") {
+      resolvedServer = await resolvedServer(env);
     }
-    return !0;
-  }
-  return !1;
+    return mergeConfig(resolvedBase, resolvedServer);
+  };
 }
-const $e = {
-  https: !0,
-  http: !0,
-  about: !0,
-  javascript: !0,
-  file: !0
-};
-function _e(e) {
-  let t = "";
-  const r = e.endsWith("!");
-  r && (e = e.slice(0, e.length - 1));
-  const n = e.split("@");
-  return n.length > 1 && (n.shift(), t = n.join("@")), { layoutName: t, layoutStop: r };
-}
-function L(e, t) {
-  const r = ee(e.routesDir, t);
-  let n = v(r);
-  return n = ne(n, e.basePathname).split("/").filter((s) => !qe(s)).join("/"), n === "" ? "/" : n;
-}
-function De(e, t) {
-  let r = v(ee(e.routesDir, t));
-  r = "/" + v(R(r));
-  let n = ne(r, e.basePathname);
-  return n.endsWith("/") || (n += "/"), n;
-}
-function $(e) {
-  if (typeof e == "string") {
-    const t = e.trim().toLowerCase().split(".");
-    if (t.length > 1) {
-      const r = t.pop().split("?")[0].split("#")[0];
-      return r === "ts" && t.pop() === "d" ? ".d.ts" : "." + r;
-    }
+
+const swRegister = 'export default""';
+
+function getSourceFile(fileName) {
+  const ext = getExtension(fileName);
+  const extlessName = removeExtension(fileName);
+  const isPageModule = isPageModuleExt(ext);
+  const isModule = isModuleExt(ext);
+  const isMarkdown = isMarkdownExt(ext);
+  let type = null;
+  if ((isIndexModule(extlessName) || isErrorName(extlessName)) && (isPageModule || isModule || isMarkdown)) {
+    type = "route";
+  } else if (isLayoutModule(extlessName) && (isPageModule || isModule)) {
+    type = "layout";
+  } else if (isEntryName(extlessName) && isModule) {
+    type = "entry";
+  } else if (isMenuFileName(fileName)) {
+    type = "menu";
+  } else if (isModule && isServiceWorkerName(extlessName)) {
+    type = "service-worker";
   }
-  return "";
-}
-function S(e) {
-  if (typeof e == "string") {
-    e = e.trim();
-    const t = $(e);
-    return e.slice(0, e.length - t.length);
+  if (type !== null) {
+    const sourceFileName = {
+      type,
+      extlessName,
+      ext
+    };
+    return sourceFileName;
   }
-  return "";
-}
-function v(e) {
-  return Oe(ye(e));
-}
-function Oe(e) {
-  const t = /^\\\\\?\\/.test(e), r = /[^\u0000-\u0080]+/.test(e);
-  return t || r || (e = e.replace(/\\/g, "/"), e.endsWith("/") && (e = e.slice(0, e.length - 1))), e;
+  return null;
 }
-function I(e, t, r) {
-  const n = [];
-  for (let s = 0; s < 25; s++) {
-    let i = S(M(t));
-    if (i = i.replace(/[\W_]+/g, ""), i === "" ? i = "Q" + s : isNaN(i.charAt(0)) || (i = "Q" + i), n.push(Ne(i)), t = v(R(t)), t === e)
-      break;
+
+function getMarkdownRelativeUrl(opts, containingFilePath, url, checkFileExists) {
+  if (typeof url !== "string" || !isSameOriginUrl(url)) {
+    return url;
   }
-  return n.length > 1 && n[0] === "Index" && n.shift(), n.reverse().join("").concat(r || "");
-}
-const ie = {
-  ".tsx": !0,
-  ".jsx": !0
-}, Te = {
-  ".ts": !0,
-  ".js": !0
-}, oe = {
-  ".md": !0,
-  ".mdx": !0
-};
-function We(e) {
-  return /^index(|!|@.+)$/.test(e);
-}
-function je(e) {
-  return /^plugin(|@.+)$/.test(e);
-}
-function Ae(e) {
-  return /^layout(|!|-.+)$/.test(e);
-}
-function ae(e) {
-  return e in ie;
-}
-function U(e) {
-  return e in Te;
-}
-function J(e) {
-  return e in oe;
-}
-function Ce(e) {
-  return e in ie || e in oe;
-}
-function ue(e) {
-  return e === "menu.md";
-}
-function Me(e) {
-  return e === "service-worker";
-}
-function Le(e) {
-  return e === "entry";
-}
-function He(e) {
-  try {
-    const t = parseInt(e, 10);
-    return t >= 400 && t <= 599;
-  } catch {
-  }
-  return !1;
-}
-function qe(e, t = !0) {
-  return e.startsWith("__") ? (t && console.warn(
-    `Grouped (pathless) layout "${e}" should use the "(${e.slice(
-      2
-    )})" directory name instead. Prefixing a directory with "__" has been deprecated and will be removed in future versions.`
-  ), !0) : e.startsWith("(") && e.endsWith(")");
-}
-function le(e) {
-  const t = $(e), r = S(e), n = ae(t), s = U(t), i = J(t);
-  let o = null;
-  return (We(r) || He(r)) && (n || s || i) ? o = "route" : Ae(r) && (n || s) ? o = "layout" : Le(r) && s ? o = "entry" : ue(e) ? o = "menu" : s && Me(r) && (o = "service-worker"), o !== null ? {
-    type: o,
-    extlessName: r,
-    ext: t
-  } : null;
-}
-function C(e, t, r, n) {
-  if (typeof r != "string" || !se(r))
-    return r;
-  const s = r.split("?"), i = r.split("#"), o = r.split("?")[0].split("#")[0], a = $(o);
-  if (J(a)) {
-    const u = o.startsWith("/"), c = v(o).split("/").filter((w) => w.length > 0), l = u ? j(e.routesDir, ...c) : j(R(t), ...c);
-    n && !ge(l) && console.warn(
-      `
-The link "${r}", found within "${t}" does not have a matching source file.
+  const querySplit = url.split("?");
+  const hashSplit = url.split("#");
+  const strippedUrl = url.split("?")[0].split("#")[0];
+  const extension = getExtension(strippedUrl);
+  if (isMarkdownExt(extension)) {
+    const isAbsolute = strippedUrl.startsWith("/");
+    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(
+        `
+The link "${url}", found within "${containingFilePath}" does not have a matching source file.
 `
-    );
-    const f = M(l);
-    if (le(f)) {
-      const w = R(l);
-      let d = L(e, w);
-      return s.length > 1 ? d += "?" + s[1] : i.length > 1 && (d += "#" + i[1]), d;
+      );
+    }
+    const fileName = basename(filePath);
+    const sourceFileName = getSourceFile(fileName);
+    if (sourceFileName) {
+      const mdDirPath = dirname(filePath);
+      let pathname = getPathnameFromDirPath(opts, mdDirPath);
+      if (querySplit.length > 1) {
+        pathname += "?" + querySplit[1];
+      } else if (hashSplit.length > 1) {
+        pathname += "#" + hashSplit[1];
+      }
+      return pathname;
+    }
+  } else if (extension === "") {
+    if (url.endsWith("/")) {
+      if (globalThis.__NO_TRAILING_SLASH__) {
+        url = url.slice(0, -1);
+      }
+    } else if (!globalThis.__NO_TRAILING_SLASH__) {
+      url += "/";
     }
-  } else a === "" && (r.endsWith("/") ? globalThis.__NO_TRAILING_SLASH__ && (r = r.slice(0, -1)) : globalThis.__NO_TRAILING_SLASH__ || (r += "/"));
-  return r;
+  }
+  return url;
 }
-function Fe(e, t) {
-  return {
-    pathname: De(e, t),
-    filePath: t
+
+function createMenu(opts, filePath) {
+  const menu = {
+    pathname: getMenuPathname(opts, filePath),
+    filePath
   };
-}
-function Be(e, t) {
-  return Fe(e, t.filePath);
-}
-async function Ue(e, t, r) {
-  const n = Je(e, t, r), s = I(e.routesDir, t);
-  return `${`const ${s} = ${JSON.stringify(n, null, 2)};`} export default ${s}`;
-}
-function Je(e, t, r, n = !0) {
-  const s = ve.lexer(r, {});
-  let i = 0;
-  const o = [];
-  for (const a of s)
-    if (a.type === "heading") {
-      const u = i - a.depth;
-      if (u >= 0 && (o.length -= u + 1), u < -1)
+  return menu;
+}
+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;
+  const stack = [];
+  for (const t of tokens) {
+    if (t.type === "heading") {
+      const diff = currentDepth - t.depth;
+      if (diff >= 0) {
+        stack.length -= diff + 1;
+      }
+      if (diff < -1) {
         throw new Error(
           `Menu hierarchy skipped a level, went from <h${"#".repeat(
-            i
-          )}> to <h${"#".repeat(a.depth)}>, in menu: ${t}`
+            currentDepth
+          )}> to <h${"#".repeat(t.depth)}>, in menu: ${filePath}`
         );
-      i = a.depth;
-      const c = o[o.length - 1];
-      for (const l of a.tokens || []) {
-        const f = {
+      }
+      currentDepth = t.depth;
+      const parentNode = stack[stack.length - 1];
+      for (const h2Token of t.tokens || []) {
+        const lastNode = {
           text: ""
         };
-        if (l.type === "text")
-          f.text = l.text;
-        else if (l.type === "link")
-          f.text = l.text, f.href = C(e, t, l.href, n);
-        else
+        if (h2Token.type === "text") {
+          lastNode.text = h2Token.text;
+        } else if (h2Token.type === "link") {
+          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 "${l.type}", value "${l.raw}", in menu: ${t}`
+            `Headings can only be a text or link. Received "${h2Token.type}", value "${h2Token.raw}", in menu: ${filePath}`
           );
-        c && (c.items = c.items || [], c.items.push(f)), o.push(f);
+        }
+        if (parentNode) {
+          parentNode.items = parentNode.items || [];
+          parentNode.items.push(lastNode);
+        }
+        stack.push(lastNode);
       }
-    } else if (a.type === "list") {
-      const u = o[o.length - 1];
-      u.items = u.items || [];
-      for (const c of a.items)
-        if (c.type === "list_item")
-          for (const l of c.tokens)
-            if (l.type === "text")
-              for (const f of l.tokens)
-                if (f.type === "text")
-                  u.items.push({ text: f.text });
-                else if (f.type === "link")
-                  u.items.push({
-                    text: f.text,
-                    href: C(e, t, f.href, n)
+    } else if (t.type === "list") {
+      const parentNode = stack[stack.length - 1];
+      parentNode.items = parentNode.items || [];
+      for (const li of t.items) {
+        if (li.type === "list_item") {
+          for (const liToken of li.tokens) {
+            if (liToken.type === "text") {
+              for (const liItem of liToken.tokens) {
+                if (liItem.type === "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
+                } else {
                   throw new Error(
-                    `List items can only be a text or link. Received "${f.type}", value "${f.raw}", in menu: ${t}`
+                    `List items can only be a text or link. Received "${liItem.type}", value "${liItem.raw}", in menu: ${filePath}`
                   );
-            else if (l.type === "link")
-              u.items.push({
-                text: l.text,
-                href: C(e, t, l.href, n)
+                }
+              }
+            } else if (liToken.type === "link") {
+              parentNode.items.push({
+                text: liToken.text,
+                href: getMarkdownRelativeUrl(opts, filePath, liToken.href, checkFileExists)
               });
-            else
+            } else {
               throw new Error(
-                `List items can only be a text or link. Received "${l.type}", value "${l.raw}", in menu: ${t}`
+                `List items can only be a text or link. Received "${liToken.type}", value "${liToken.raw}", in menu: ${filePath}`
               );
-        else
+            }
+          }
+        } else {
           throw new Error(
-            `Only list items can be used in lists. Received "${c.type}", value "${c.raw}", in menu: ${t}`
+            `Only list items can be used in lists. Received "${li.type}", value "${li.raw}", in menu: ${filePath}`
           );
+        }
+      }
+    } else if (t.type === "space") {
+      continue;
     } else {
-      if (a.type === "space")
-        continue;
       throw new Error(
-        `Menu has a "${a.type}" with the value "${a.raw}". However, only headings and lists can be used in the menu: ${t}`
+        `Menu has a "${t.type}" with the value "${t.raw}". However, only headings and lists can be used in the menu: ${filePath}`
       );
     }
-  if (o.length === 0)
-    throw new Error(`Menu must start with an h1 in the index: ${t}`);
-  return o[0];
+  }
+  if (stack.length === 0) {
+    throw new Error(`Menu must start with an h1 in the index: ${filePath}`);
+  }
+  return stack[0];
 }
-function G(e, t) {
-  if (t === e)
+
+function parseRoutePathname(basePathname, pathname) {
+  if (pathname === basePathname) {
     return {
-      pattern: new RegExp("^" + t.replace(/[.*+?^${}()|[\]\\]/g, "\\$&") + "$"),
-      routeName: t,
+      pattern: new RegExp("^" + pathname.replace(/[.*+?^${}()|[\]\\]/g, "\\$&") + "$"),
+      routeName: pathname,
       paramNames: [],
-      segments: [[{ content: "", dynamic: !1, rest: !1 }]]
+      segments: [[{ content: "", dynamic: false, rest: false }]]
     };
-  t = t.slice(1);
-  const r = t.split("/"), n = [];
-  return {
-    pattern: new RegExp(
-      `^${r.filter((i) => i.length > 0).map((i) => {
-        const o = decodeURI(i), a = /^\[\.\.\.(\w+)?\]$/.exec(o);
-        return a ? (n.push(a[1]), "(?:/(.*))?") : "/" + o.split(ze).map((u, c) => {
-          if (c % 2) {
-            const l = Ge.exec(u);
-            if (l) {
-              const [, f, p] = l;
-              return n.push(p), f ? "(.*?)" : "([^/]+?)";
-            }
+  }
+  pathname = pathname.slice(1);
+  const segments = pathname.split("/");
+  const paramNames = [];
+  const pattern = new RegExp(
+    `^${segments.filter((segment) => segment.length > 0).map((s) => {
+      const segment = decodeURI(s);
+      const catchAll = /^\[\.\.\.(\w+)?\]$/.exec(segment);
+      if (catchAll) {
+        paramNames.push(catchAll[1]);
+        return "(?:/(.*))?";
+      }
+      return "/" + segment.split(DYNAMIC_SEGMENT).map((content, i) => {
+        if (i % 2) {
+          const rg = PARAM_PATTERN.exec(content);
+          if (rg) {
+            const [, rest, name] = rg;
+            paramNames.push(name);
+            return rest ? "(.*?)" : "([^/]+?)";
           }
-          return encodeURI(u).normalize().replace(/%5[Bb]/g, "[").replace(/%5[Dd]/g, "]").replace(/#/g, "%23").replace(/\?/g, "%3F").replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-        }).join("");
-      }).join("")}/?$`
-      // always match with and without a trailing slash
-    ),
-    routeName: t,
-    paramNames: n,
-    segments: r.map((i) => {
-      const o = [];
-      return i.split(/\[(.+?)\]/).map((a, u) => {
-        if (a) {
-          const c = !!(u % 2);
-          o.push({
-            content: a,
-            dynamic: c,
-            rest: c && a.startsWith("...")
+        }
+        return encodeURI(content).normalize().replace(/%5[Bb]/g, "[").replace(/%5[Dd]/g, "]").replace(/#/g, "%23").replace(/\?/g, "%3F").replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+      }).join("");
+    }).join("")}/?$`
+    // always match with and without a trailing slash
+  );
+  return {
+    pattern,
+    routeName: pathname,
+    paramNames,
+    segments: segments.map((segment) => {
+      const parts = [];
+      segment.split(/\[(.+?)\]/).map((content, i) => {
+        if (content) {
+          const dynamic = !!(i % 2);
+          parts.push({
+            content,
+            dynamic,
+            rest: dynamic && content.startsWith("...")
           });
         }
-      }), o;
+      });
+      return parts;
     })
   };
 }
-const Ge = /^(\.\.\.)?(\w+)?$/, ze = /\[(.+?)\]/;
-function Qe(e, t) {
-  const r = Math.max(e.segments.length, t.segments.length);
-  for (let n = 0; n < r; n += 1) {
-    const s = e.segments[n], i = t.segments[n];
-    if (!s)
-      return e.pathname.includes("[...") ? 1 : -1;
-    if (!i)
-      return t.pathname.includes("[...") ? -1 : 1;
-    const o = Math.max(s.length, i.length);
-    for (let a = 0; a < o; a += 1) {
-      const u = s[a], c = i[a];
-      if (u === void 0)
-        return c.dynamic ? -1 : 1;
-      if (c === void 0 || u.dynamic !== c.dynamic)
-        return u.dynamic ? 1 : -1;
-      if (u.dynamic && u.rest !== c.rest)
-        return u.rest ? 1 : -1;
+const PARAM_PATTERN = /^(\.\.\.)?(\w+)?$/;
+const DYNAMIC_SEGMENT = /\[(.+?)\]/;
+
+function routeSortCompare(a, b) {
+  const maxSegments = Math.max(a.segments.length, b.segments.length);
+  for (let i = 0; i < maxSegments; i += 1) {
+    const sa = a.segments[i];
+    const sb = b.segments[i];
+    if (!sa) {
+      return a.pathname.includes("[...") ? 1 : -1;
+    }
+    if (!sb) {
+      return b.pathname.includes("[...") ? -1 : 1;
+    }
+    const maxParts = Math.max(sa.length, sb.length);
+    for (let i2 = 0; i2 < maxParts; i2 += 1) {
+      const pa = sa[i2];
+      const pb = sb[i2];
+      if (pa === void 0) {
+        return pb.dynamic ? -1 : 1;
+      }
+      if (pb === void 0) {
+        return pa.dynamic ? 1 : -1;
+      }
+      if (pa.dynamic !== pb.dynamic) {
+        return pa.dynamic ? 1 : -1;
+      }
+      if (pa.dynamic) {
+        if (pa.rest !== pb.rest) {
+          return pa.rest ? 1 : -1;
+        }
+      }
     }
   }
-  return e.pathname === t.pathname ? e.ext > t.ext ? -1 : 1 : e.pathname < t.pathname ? -1 : 1;
-}
-function Ke(e, t) {
-  const r = t.filter((l) => l.type === "layout").map((l) => Ve(e, l)).sort((l, f) => l.id < f.id ? -1 : 1), n = t.filter((l) => l.type === "route").map((l) => Ze(e, r, l)).sort(Qe), s = t.filter((l) => l.type === "entry").map((l) => et(e, l)).sort((l, f) => l.chunkFileName < f.chunkFileName ? -1 : 1), i = t.filter((l) => l.type === "service-worker").map((l) => tt(e, l)).sort((l, f) => l.chunkFileName < f.chunkFileName ? -1 : 1), o = t.filter((l) => l.type === "menu").map((l) => Be(e, l)).sort((l, f) => l.pathname < f.pathname ? -1 : 1);
-  let a = 0;
-  const u = /* @__PURE__ */ new Set(), c = (l) => {
-    for (const f of l) {
-      let p = f.id;
-      for (; u.has(p); )
-        p = `${f.id}_${a++}`;
-      f.id = p, u.add(p);
+  if (a.pathname === b.pathname) {
+    return a.ext > b.ext ? -1 : 1;
+  }
+  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);
     }
   };
-  return c(r), c(n), c(s), c(i), { layouts: r, routes: n, entries: s, menus: o, serviceWorkers: i };
-}
-function Ve(e, t) {
-  let r = t.extlessName;
-  const n = t.filePath, s = t.dirPath;
-  let i, o;
-  return r.endsWith(Xe) ? (o = "top", r = r.slice(0, r.length - 1)) : o = "nested", r.startsWith(K) ? i = r.slice(K.length) : i = "", {
-    id: I(e.routesDir, n),
-    filePath: n,
-    dirPath: s,
-    layoutType: o,
-    layoutName: i
+  uniqueIds(layouts);
+  uniqueIds(routes);
+  uniqueIds(entries);
+  uniqueIds(serviceWorkers);
+  return { layouts, routes, entries, menus, serviceWorkers };
+}
+function resolveLayout(opts, layoutSourceFile) {
+  let extlessName = layoutSourceFile.extlessName;
+  const filePath = layoutSourceFile.filePath;
+  const dirPath = layoutSourceFile.dirPath;
+  let layoutName;
+  let layoutType;
+  if (extlessName.endsWith(LAYOUT_TOP_SUFFIX)) {
+    layoutType = "top";
+    extlessName = extlessName.slice(0, extlessName.length - 1);
+  } else {
+    layoutType = "nested";
+  }
+  if (extlessName.startsWith(LAYOUT_NAMED_PREFIX)) {
+    layoutName = extlessName.slice(LAYOUT_NAMED_PREFIX.length);
+  } else {
+    layoutName = "";
+  }
+  const layout = {
+    id: createFileId(opts.routesDir, filePath),
+    filePath,
+    dirPath,
+    layoutType,
+    layoutName
   };
-}
-const Ye = "layout", K = Ye + "-", Xe = "!";
-function Ze(e, t, r) {
-  const n = r.filePath, s = [], i = e.routesDir, { layoutName: o, layoutStop: a } = _e(r.extlessName);
-  let u = L(e, r.dirPath);
-  if (r.extlessName === "404" && (u += r.extlessName + ".html"), !a) {
-    let l = v(R(n)), f = !1;
-    const p = o !== "";
-    for (let w = 0; w < 20; w++) {
-      let d;
-      if (p && !f ? (d = t.find((h) => h.dirPath === l && h.layoutName === o), d && (f = !0)) : d = t.find((h) => h.dirPath === l && h.layoutName === ""), d && (s.push(d), d.layoutType === "top") || l === i)
+  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") {
+    pathname += sourceFile.extlessName + ".html";
+  }
+  if (!layoutStop) {
+    let currentDir = normalizePath(dirname(filePath));
+    let hasFoundNamedLayout = false;
+    const hasNamedLayout = layoutName !== "";
+    for (let i = 0; i < 20; i++) {
+      let layout = void 0;
+      if (hasNamedLayout && !hasFoundNamedLayout) {
+        layout = appLayouts.find((l) => l.dirPath === currentDir && l.layoutName === layoutName);
+        if (layout) {
+          hasFoundNamedLayout = true;
+        }
+      } else {
+        layout = appLayouts.find((l) => l.dirPath === currentDir && l.layoutName === "");
+      }
+      if (layout) {
+        layouts.push(layout);
+        if (layout.layoutType === "top") {
+          break;
+        }
+      }
+      if (currentDir === routesDir) {
         break;
-      l = v(R(l));
+      }
+      currentDir = normalizePath(dirname(currentDir));
     }
   }
-  return {
-    id: I(e.routesDir, n, "Route"),
-    filePath: n,
-    pathname: u,
-    layouts: s.reverse(),
-    ext: r.ext,
-    ...G(e.basePathname, u)
+  const buildRoute = {
+    id: createFileId(opts.routesDir, filePath, "Route"),
+    filePath,
+    pathname,
+    layouts: layouts.reverse(),
+    ext: sourceFile.ext,
+    ...parseRoutePathname(opts.basePathname, pathname)
   };
-}
-function et(e, t) {
-  const r = L(e, t.dirPath), n = r.slice(e.basePathname.length);
-  return {
-    id: I(e.routesDir, t.filePath, "Route"),
-    filePath: t.filePath,
-    chunkFileName: n,
-    ...G(e.basePathname, r)
+  return buildRoute;
+}
+function resolveEntry(opts, sourceFile) {
+  const pathname = getPathnameFromDirPath(opts, sourceFile.dirPath);
+  const chunkFileName = pathname.slice(opts.basePathname.length);
+  const buildEntry = {
+    id: createFileId(opts.routesDir, sourceFile.filePath, "Route"),
+    filePath: sourceFile.filePath,
+    chunkFileName,
+    ...parseRoutePathname(opts.basePathname, pathname)
   };
-}
-function tt(e, t) {
-  const n = L(e, t.dirPath) + t.extlessName + ".js", s = n.slice(e.basePathname.length);
-  return {
-    id: I(e.routesDir, t.filePath, "ServiceWorker"),
-    filePath: t.filePath,
-    chunkFileName: s,
-    ...G(e.basePathname, n)
+  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 = {
+    id: createFileId(opts.routesDir, sourceFile.filePath, "ServiceWorker"),
+    filePath: sourceFile.filePath,
+    chunkFileName,
+    ...parseRoutePathname(opts.basePathname, pathname)
   };
+  return buildEntry;
 }
-async function rt(e) {
-  const t = [];
-  return await ce(t, v(e), M(e)), t;
+
+async function walkRoutes(routesDir) {
+  const sourceFiles = [];
+  await walkRouteDir(sourceFiles, normalizePath(routesDir), basename(routesDir));
+  return sourceFiles;
 }
-async function ce(e, t, r) {
-  const n = await x.promises.readdir(t);
+async function walkRouteDir(sourceFiles, dirPath, dirName) {
+  const dirItemNames = await fs.promises.readdir(dirPath);
   await Promise.all(
-    n.map(async (s) => {
-      const i = v(j(t, s));
-      if ((await x.promises.stat(i)).isDirectory())
-        await ce(e, i, s);
-      else {
-        const a = le(s);
-        a !== null && e.push({
-          ...a,
-          fileName: s,
-          filePath: i,
-          dirName: r,
-          dirPath: t
-        });
+    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 nt(e) {
-  const t = e.serverPluginsDir, r = await x.promises.readdir(t), n = [];
-  return await Promise.all(
-    r.map(async (s) => {
-      const i = v(j(t, s)), o = $(s), a = S(s);
-      (U(o) || ae(o)) && je(a) && n.push({
-        id: I(e.serverPluginsDir, i, "Plugin"),
-        filePath: i,
-        ext: o
-      });
+
+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
+        });
+      }
     })
-  ), n;
+  );
+  return sourceFiles;
 }
-async function fe(e) {
+
+async function parseRoutesDir(ctx) {
   try {
-    await st(e), at(e);
-  } catch (t) {
-    re(e, t);
-  }
-  for (const t of e.diagnostics) {
-    if (t.type === "error")
-      throw new Error(t.message);
-    console.warn(t.message);
-  }
-}
-async function st(e) {
-  return e.activeBuild || (e.activeBuild = new Promise((t, r) => {
-    nt(e.opts).then((n) => (e.serverPlugins = n, rt(e.opts.routesDir))).then((n) => {
-      const s = Ke(e.opts, n);
-      it(e, s), e.layouts = s.layouts, e.routes = s.routes, e.entries = s.entries, e.serviceWorkers = s.serviceWorkers, e.menus = s.menus, t();
-    }, r).finally(() => {
-      e.activeBuild = null;
-    });
-  })), e.activeBuild;
+    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 it(e, t) {
-  if (!e.opts.rewriteRoutes || !t.routes)
-    return;
-  const r = [];
-  let n = e.opts.rewriteRoutes.flatMap((s) => Object.keys(s.paths || {}));
-  n = Array.from(new Set(n)), t.routes.forEach((s) => {
-    r.push(s), (s.pathname.split("/").some(
-      (a) => n.includes(a)
-    ) || s.pathname === "/") && e.opts.rewriteRoutes.forEach((a, u) => {
-      if (s.pathname === "/" && !a.prefix)
-        return;
-      const c = ot(s, a, u);
-      r.some(
-        (l) => l.pathname === c.pathname && l.routeName === c.routeName
-      ) || r.push(c);
-    });
-  }), t.routes = r;
-}
-function ot(e, t, r) {
-  const n = (k) => (t.paths || {})[k] ?? k, s = t.prefix ? "/" + t.prefix : "", i = t.prefix ? t.prefix + "/" : "", o = t.prefix?.toUpperCase().replace(/-/g, ""), a = t.prefix ? [t.prefix] : [], c = e.pathname.split("/").map(n), f = e.routeName.split("/").map(n), p = e.pattern.toString().split("\\/"), [w, ...d] = p.map(n), m = [
-    w,
-    ...a,
-    ...d
-  ].join("\\/"), g = m.substring(
+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;
+  }
+  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);
+}
+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 splittedPathName = route.pathname.split("/");
+  const translatedPathParts = splittedPathName.map(replacePath);
+  const splittedRouteName = route.routeName.split("/");
+  const translatedRouteParts = splittedRouteName.map(replacePath);
+  const splittedPattern = route.pattern.toString().split("\\/");
+  const [translatedPatternFirst, ...translatedPatternOthers] = splittedPattern.map(replacePath);
+  const translatedPatternParts = [
+    translatedPatternFirst,
+    ...patternInfix,
+    ...translatedPatternOthers
+  ];
+  const translatedPatternString = translatedPatternParts.join("\\/");
+  const translatedRegExp = translatedPatternString.substring(
     1,
-    e.pathname === "/" ? m.length - 1 : m.length - 2
-  ), b = e.segments.map(
-    (k) => k.map((A) => ({ ...A, content: n(A.content) }))
+    route.pathname === "/" ? translatedPatternString.length - 1 : translatedPatternString.length - 2
   );
-  t.prefix && b.splice(0, 0, [
-    {
-      content: t.prefix,
-      dynamic: !1,
-      rest: !1
-    }
-  ]);
-  const P = c.join("/"), y = f.join("/");
-  return {
-    ...e,
-    id: e.id + (o || r),
-    pathname: s + P,
-    routeName: i + (y !== "/" ? y : ""),
-    pattern: new RegExp(g),
-    segments: b
+  const translatedSegments = route.segments.map(
+    (segment) => segment.map((item) => ({ ...item, content: replacePath(item.content) }))
+  );
+  if (config.prefix) {
+    translatedSegments.splice(0, 0, [
+      {
+        content: config.prefix,
+        dynamic: false,
+        rest: false
+      }
+    ]);
+  }
+  const translatedPath = translatedPathParts.join("/");
+  const translatedRoute = translatedRouteParts.join("/");
+  const routeToPush = {
+    ...route,
+    id: route.id + (idSuffix || configIndex),
+    pathname: pathnamePrefix + translatedPath,
+    routeName: routeNamePrefix + (translatedRoute !== "/" ? translatedRoute : ""),
+    pattern: new RegExp(translatedRegExp),
+    segments: translatedSegments
   };
-}
-function at(e) {
-  const t = Array.from(new Set(e.routes.map((r) => r.pathname))).sort();
-  for (const r of t) {
-    const n = e.routes.filter((s) => s.pathname === r);
-    n.length > 1 && re(
-      e,
-      `More than one route has been found for pathname "${r}". Please narrow it down to only one of these:
-${n.map((s) => `  - ${s.filePath}`).join(`
-`)}`
-    );
+  return routeToPush;
+}
+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")}`
+      );
+    }
   }
-  e.layouts.filter((r) => r.layoutType === "top").forEach((r) => {
-    Re(
-      e,
-      `The "top" layout feature, which is used by "${r.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/`
+  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/`
     );
   });
 }
-function ut(e, t, r, n, s) {
-  return {
-    rootDir: v(e),
-    opts: ct(e, t, r),
+
+function createBuildContext(rootDir, viteBasePath, userOpts, target, dynamicImports) {
+  const ctx = {
+    rootDir: normalizePath(rootDir),
+    opts: normalizeOptions(rootDir, viteBasePath, userOpts),
     routes: [],
     serverPlugins: [],
     layouts: [],
@@ -564,57 +626,106 @@ function ut(e, t, r, n, s) {
     menus: [],
     diagnostics: [],
     frontmatter: /* @__PURE__ */ new Map(),
-    target: n || "ssr",
-    dynamicImports: n === "client" || !!s,
-    isDirty: !0,
+    target: target || "ssr",
+    dynamicImports: target === "client" || !!dynamicImports,
+    isDirty: true,
     activeBuild: null
   };
+  return ctx;
+}
+function resetBuildContext(ctx) {
+  if (ctx) {
+    ctx.routes.length = 0;
+    ctx.layouts.length = 0;
+    ctx.entries.length = 0;
+    ctx.menus.length = 0;
+    ctx.diagnostics.length = 0;
+    ctx.frontmatter.clear();
+    ctx.isDirty = true;
+  }
 }
-function lt(e) {
-  e && (e.routes.length = 0, e.layouts.length = 0, e.entries.length = 0, e.menus.length = 0, e.diagnostics.length = 0, e.frontmatter.clear(), e.isDirty = !0);
-}
-function ct(e, t, r) {
-  t.startsWith("/") && t.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."
-  ), t.endsWith("/") || (t += "/"));
-  const n = { ...r };
-  typeof n.routesDir != "string" ? n.routesDir = T(e, "src", "routes") : q(n.routesDir) || (n.routesDir = T(e, n.routesDir)), n.routesDir = v(n.routesDir), typeof n.serverPluginsDir != "string" ? n.serverPluginsDir = n.routesDir : q(n.serverPluginsDir) || (n.serverPluginsDir = T(e, n.serverPluginsDir)), n.serverPluginsDir = v(n.serverPluginsDir), typeof n.baseUrl == "string" && (n.basePathname = n.baseUrl), typeof n.basePathname != "string" && (n.basePathname = t), n.basePathname.endsWith("/") || (console.error(
-    "Warning: qwik-router plugin basePathname must end with /. This will be an error in v2"
-  ), n.basePathname += "/");
-  const s = new URL(n.basePathname, "https://qwik.dev/");
-  return n.basePathname = s.pathname, n.mdx = n.mdx || {}, n.platform = n.platform || {}, n;
-}
-function ft(e) {
-  return (t, r) => {
-    const n = {};
-    E(t, "yaml", (s) => {
-      const i = dt(s.value);
-      for (const o in i)
-        n[o] = i[o];
-    }), Object.keys(n).length > 0 && e.frontmatter.set(v(r.path), n);
+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.`
+    );
+    if (!viteBasePath.endsWith("/")) {
+      viteBasePath += "/";
+    }
+  }
+  const opts = { ...userOpts };
+  if (typeof opts.routesDir !== "string") {
+    opts.routesDir = resolve(rootDir, "src", "routes");
+  } else if (!isAbsolute(opts.routesDir)) {
+    opts.routesDir = resolve(rootDir, opts.routesDir);
+  }
+  opts.routesDir = normalizePath(opts.routesDir);
+  if (typeof opts.serverPluginsDir !== "string") {
+    opts.serverPluginsDir = opts.routesDir;
+  } else if (!isAbsolute(opts.serverPluginsDir)) {
+    opts.serverPluginsDir = resolve(rootDir, opts.serverPluginsDir);
+  }
+  opts.serverPluginsDir = normalizePath(opts.serverPluginsDir);
+  if (typeof opts.baseUrl === "string") {
+    opts.basePathname = opts.baseUrl;
+  }
+  if (typeof opts.basePathname !== "string") {
+    opts.basePathname = viteBasePath;
+  }
+  if (!opts.basePathname.endsWith("/")) {
+    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/");
+  opts.basePathname = url.pathname;
+  opts.mdx = opts.mdx || {};
+  opts.platform = opts.platform || {};
+  return opts;
+}
+
+function parseFrontmatter(ctx) {
+  return (mdast, vfile) => {
+    const attrs = {};
+    visit(mdast, "yaml", (node) => {
+      const parsedAttrs = parseFrontmatterAttrs(node.value);
+      for (const k in parsedAttrs) {
+        attrs[k] = parsedAttrs[k];
+      }
+    });
+    if (Object.keys(attrs).length > 0) {
+      ctx.frontmatter.set(normalizePath(vfile.path), attrs);
+    }
   };
 }
-function dt(e) {
-  return typeof e == "string" && (e = e.trim(), e !== "") ? Pe(e) : null;
-}
-const ht = {
-  author: !0,
-  creator: !0,
-  "color-scheme": !0,
-  description: !0,
-  generator: !0,
-  keywords: !0,
-  publisher: !0,
-  referrer: !0,
-  robots: !0,
-  "theme-color": !0,
-  viewport: !0
+function parseFrontmatterAttrs(yaml) {
+  if (typeof yaml === "string") {
+    yaml = yaml.trim();
+    if (yaml !== "") {
+      return parse(yaml);
+    }
+  }
+  return null;
+}
+const metaNames = {
+  author: true,
+  creator: true,
+  "color-scheme": true,
+  description: true,
+  generator: true,
+  keywords: true,
+  publisher: true,
+  referrer: true,
+  robots: true,
+  "theme-color": true,
+  viewport: true
 };
-function pt(e) {
-  if (e != null && typeof e == "object") {
-    const t = Object.keys(e);
-    if (t.length > 0) {
-      const r = {
+function frontmatterAttrsToDocumentHead(attrs) {
+  if (attrs != null && typeof attrs === "object") {
+    const attrNames = Object.keys(attrs);
+    if (attrNames.length > 0) {
+      const head = {
         title: "",
         meta: [],
         styles: [],
@@ -622,108 +733,153 @@ function pt(e) {
         scripts: [],
         frontmatter: {}
       };
-      for (const n of t) {
-        const s = e[n];
-        if (s != null)
-          if (n === "title")
-            r.title = s.toString(), r.title = r.title.replace(/\\@/g, "@");
-          else if (n === "og" || n === "opengraph") {
-            if (typeof s == "object") {
-              for (const i of Array.isArray(s) ? s : [s])
-                if (i != null && typeof i == "object" && !Array.isArray(i))
-                  for (const [o, a] of Object.entries(i))
-                    (o === "title" || o === "description") && a === !0 ? t.includes(o) && r.meta.push({
-                      property: `og:${o}`,
-                      content: e[o]?.toString()
-                    }) : r.meta.push({
-                      property: `og:${o}`,
-                      content: a?.toString()
-                    });
+      for (const attrName of attrNames) {
+        const attrValue = attrs[attrName];
+        if (attrValue != null) {
+          if (attrName === "title") {
+            head.title = attrValue.toString();
+            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]) {
+                if (opengraph != null && typeof opengraph === "object" && !Array.isArray(opengraph)) {
+                  for (const [property, content] of Object.entries(opengraph)) {
+                    if ((property === "title" || property === "description") && content === true) {
+                      if (attrNames.includes(property)) {
+                        head.meta.push({
+                          property: `og:${property}`,
+                          content: attrs[property]?.toString()
+                        });
+                      }
+                    } else {
+                      head.meta.push({
+                        property: `og:${property}`,
+                        content: content?.toString()
+                      });
+                    }
+                  }
+                }
+              }
             }
-          } else ht[n] ? r.meta.push({
-            name: n,
-            content: s.toString()
-          }) : r.frontmatter[n] = s;
+          } else if (metaNames[attrName]) {
+            head.meta.push({
+              name: attrName,
+              content: attrValue.toString()
+            });
+          } else {
+            head.frontmatter[attrName] = attrValue;
+          }
+        }
       }
-      return r;
+      return head;
     }
   }
   return null;
 }
-function mt() {
-  return (e) => {
-    const t = e, r = new xe();
-    E(t, "element", (n) => {
-      if (te(n) && n.properties) {
-        const i = B(n);
-        de(n, "id") || (n.properties.id = r.slug(i));
+
+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 gt(e) {
-  return (t, r) => {
-    const n = t, s = v(r.path);
-    vt(n, e.opts, s), bt(e, n, s), Pt(e, n, s), xt(n);
+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 yt() {
-  return (e) => {
-    E(e, "element", (r) => {
-      r.properties && r.properties.className && (r.properties.class = r.properties.className, r.properties.className = void 0);
+function renameClassname() {
+  return (ast) => {
+    const mdast = ast;
+    visit(mdast, "element", (node) => {
+      if (node.properties) {
+        if (node.properties.className) {
+          node.properties.class = node.properties.className;
+          node.properties.className = void 0;
+        }
+      }
     });
   };
 }
-function wt() {
-  return (e) => {
-    E(e, "element", (r) => {
-      if (r.tagName === "table" && !r.done) {
-        const n = { ...r };
-        n.done = !0, r.tagName = "div", r.properties = { className: "table-wrapper" }, r.children = [n];
+function wrapTableWithDiv() {
+  return (ast) => {
+    const mdast = ast;
+    visit(mdast, "element", (node) => {
+      if (node.tagName === "table" && !node.done) {
+        const table = { ...node };
+        table.done = true;
+        node.tagName = "div";
+        node.properties = { className: "table-wrapper" };
+        node.children = [table];
       }
     });
   };
 }
-function vt(e, t, r) {
-  E(e, "element", (n) => {
-    if ((n && n.type === "element" && n.tagName.toLowerCase()) === "a") {
-      const i = (n.properties && n.properties.href || "").trim();
-      if (se(i)) {
-        const o = $(i);
-        J(o) && (n.properties.href = C(
-          t,
-          r,
-          n.properties.href,
-          !0
-        ));
+function updateContentLinks(mdast, opts, sourcePath) {
+  visit(mdast, "element", (node) => {
+    const tagName = node && node.type === "element" && node.tagName.toLowerCase();
+    if (tagName === "a") {
+      const href = (node.properties && node.properties.href || "").trim();
+      if (isSameOriginUrl(href)) {
+        const ext = getExtension(href);
+        if (isMarkdownExt(ext)) {
+          node.properties.href = getMarkdownRelativeUrl(
+            opts,
+            sourcePath,
+            node.properties.href,
+            true
+          );
+        }
       }
     }
   });
 }
-function bt(e, t, r) {
-  const n = e.frontmatter.get(r);
-  z(t, "frontmatter", n);
-}
-function Pt(e, t, r) {
-  const n = e.frontmatter.get(r), s = pt(n);
-  s && z(t, "head", s);
-}
-function xt(e) {
-  const t = [];
-  E(e, "element", (r) => {
-    const n = te(r);
-    if (n && r.properties && de(r, "id")) {
-      const s = B(r);
-      t.push({
-        text: s,
-        id: r.properties.id,
-        level: n
-      });
+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
+        });
+      }
     }
-  }), t.length > 0 && z(e, "headings", t);
+  });
+  if (headings.length > 0) {
+    createExport(mdast, "headings", headings);
+  }
 }
-function z(e, t, r) {
-  const n = {
+function createExport(mdast, identifierName, val) {
+  const mdxjsEsm = {
     type: "mdxjsEsm",
     value: "",
     data: {
@@ -742,8 +898,8 @@ function z(e, t, r) {
               declarations: [
                 {
                   type: "VariableDeclarator",
-                  id: { type: "Identifier", name: t },
-                  init: Se(r)
+                  id: { type: "Identifier", name: identifierName },
+                  init: valueToEstree(val)
                 }
               ]
             }
@@ -752,393 +908,431 @@ function z(e, t, r) {
       }
     }
   };
-  e.children.unshift(n);
-}
-const St = {}.hasOwnProperty;
-function de(e, t) {
-  const r = e && typeof e == "object" && e.type === "element" && e.properties && St.call(e.properties, t) && e.properties[t];
-  return r != null && r !== !1;
-}
-function kt() {
-  return F.register(ke), async (e) => {
-    E(e, "element", (t, r, n) => {
-      if (!(!n || n.tagName !== "pre" || t.tagName !== "code" || !Array.isArray(t.properties.className)))
-        for (let s = 0; s < t.properties.className.length; s++) {
-          const i = t.properties.className[s], o = It(i);
-          if (o && F.registered(o)) {
-            t.properties.className[s] = "language-" + o, Et(t, o);
-            return;
-          }
+  mdast.children.unshift(mdxjsEsm);
+}
+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 Et(e, t) {
-  const r = B(e), n = F.highlight(r, t);
-  n && Array.isArray(e.children) && (e.children = n.children);
+function syntaxHighlight(node, lang) {
+  const code = toString(node);
+  const result = refractor.highlight(code, lang);
+  if (result && Array.isArray(node.children)) {
+    node.children = result.children;
+  }
 }
-function It(e) {
-  return typeof e == "string" && (e = e.toLowerCase(), e.startsWith("language-")) ? e.slice(9) : null;
+function getLanguage(className) {
+  if (typeof className === "string") {
+    className = className.toLowerCase();
+    if (className.startsWith("language-")) {
+      return className.slice(9);
+    }
+  }
+  return null;
 }
-async function Nt(e) {
-  const { compile: t } = await import("@mdx-js/mdx"), { default: r } = await import("remark-frontmatter"), { default: n } = await import("remark-gfm"), { default: s } = await import("rehype-autolink-headings"), { VFile: i } = await import("vfile"), o = e.opts.mdx, a = o.remarkPlugins || [], u = o.rehypePlugins || [], c = e.opts.mdxPlugins, l = [];
-  (typeof c?.remarkGfm > "u" || c.remarkGfm) && l.push(n);
-  const f = [];
-  (typeof c?.rehypeSyntaxHighlight > "u" || c.rehypeSyntaxHighlight) && f.push(kt), (typeof c?.rehypeAutolinkHeadings > "u" || c.rehypeAutolinkHeadings) && f.push(s);
-  const p = {
-    SourceMapGenerator: be,
+
+async function createMdxTransformer(ctx) {
+  const { compile } = await import('@mdx-js/mdx');
+  const { default: remarkFrontmatter } = await import('remark-frontmatter');
+  const { default: remarkGfm } = await import('remark-gfm');
+  const { default: rehypeAutolinkHeadings } = await import('rehype-autolink-headings');
+  const { VFile } = await import('vfile');
+  const userMdxOpts = ctx.opts.mdx;
+  const userRemarkPlugins = userMdxOpts.remarkPlugins || [];
+  const userRehypePlugins = userMdxOpts.rehypePlugins || [];
+  const coreMdxPlugins = ctx.opts.mdxPlugins;
+  const coreRemarkPlugins = [];
+  if (typeof coreMdxPlugins?.remarkGfm === "undefined" || coreMdxPlugins.remarkGfm) {
+    coreRemarkPlugins.push(remarkGfm);
+  }
+  const coreRehypePlugins = [];
+  if (typeof coreMdxPlugins?.rehypeSyntaxHighlight === "undefined" || coreMdxPlugins.rehypeSyntaxHighlight) {
+    coreRehypePlugins.push(rehypeSyntaxHighlight);
+  }
+  if (typeof coreMdxPlugins?.rehypeAutolinkHeadings === "undefined" || coreMdxPlugins.rehypeAutolinkHeadings) {
+    coreRehypePlugins.push(rehypeAutolinkHeadings);
+  }
+  const options = {
+    SourceMapGenerator,
     jsxImportSource: "@qwik.dev/core",
-    ...o,
+    ...userMdxOpts,
     elementAttributeNameCase: "html",
     remarkPlugins: [
-      ...a,
-      ...l,
-      r,
-      [ft, e]
+      ...userRemarkPlugins,
+      ...coreRemarkPlugins,
+      remarkFrontmatter,
+      [parseFrontmatter, ctx]
     ],
     rehypePlugins: [
-      mt,
-      ...u,
-      ...f,
-      [gt, e],
-      yt,
-      wt
+      rehypeSlug,
+      ...userRehypePlugins,
+      ...coreRehypePlugins,
+      [rehypePage, ctx],
+      renameClassname,
+      wrapTableWithDiv
     ]
   };
-  return async function(w, d) {
-    const h = $(d);
-    if ([".mdx", ".md", ".markdown"].includes(h)) {
-      const m = new i({ value: w, path: d }), g = await t(m, p), b = String(g.value), P = `import { jsx } from '@qwik.dev/core';
-`, y = `
+  return async function(code, id) {
+    const ext = getExtension(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';
+`;
+      const newDefault = `
 function _missingMdxReference(id, component, place) {
-  throw new Error("${d}: Expected " + (component ? "component" : "object") + " \`" + id + "\` to be defined: you likely forgot to import, pass, or provide it." + (place ? "\\nIt’s referenced in your code at \`" + place + "\`" : ""));
+  throw new Error("${id}: Expected " + (component ? "component" : "object") + " \`" + id + "\` to be defined: you likely forgot to import, pass, or provide it." + (place ? "\\nIt’s referenced in your code at \`" + place + "\`" : ""));
 }
 const WrappedMdxContent = () => {
   const content = _createMdxContent({});
   return typeof MDXLayout === 'function' ? jsx(MDXLayout, {children: content}) : content;
 };
 export default WrappedMdxContent;
-`, _ = b.lastIndexOf("export default ");
-      if (_ === -1)
+`;
+      const exportIndex = output.lastIndexOf("export default ");
+      if (exportIndex === -1) {
         throw new Error("Could not find default export in mdx output");
+      }
+      const wrappedOutput = addImport + output.slice(0, exportIndex) + newDefault;
       return {
-        code: P + b.slice(0, _) + y,
-        map: g.map
+        code: wrappedOutput,
+        map: compiled.map
       };
     }
   };
 }
-function Rt(e, t) {
-  const r = e.target === "client", n = [...e.entries, ...e.serviceWorkers];
-  r && n.length > 0 && (t.push(`
-/** Qwik Router Entries Entry */`), t.push(`export const e = () => import("@qwik-router-entries");
-`));
-}
-function $t(e) {
-  const t = [], r = [...e.entries, ...e.serviceWorkers];
-  t.push(`
-/** Qwik Router Entries (${r.length}) */`);
-  for (let n = 0; n < r.length; n++) {
-    const s = r[n];
-    t.push(`export const ${s.id} = () => import(${JSON.stringify(s.filePath)});`);
-  }
-  return t.join(`
-`) + `
-`;
+
+function createEntries(ctx, c) {
+  const isClient = ctx.target === "client";
+  const entries = [...ctx.entries, ...ctx.serviceWorkers];
+  if (isClient && entries.length > 0) {
+    c.push(`
+/** Qwik Router Entries Entry */`);
+    c.push(`export const e = () => import("@qwik-router-entries");
+`);
+  }
 }
-function W(e) {
-  const t = e.toLowerCase();
-  return t.endsWith(".tsx") || t.endsWith(".jsx") ? e.slice(0, e.length - 4) : t.endsWith(".ts") ? e.slice(0, e.length - 3) : e;
-}
-function _t(e, t, r, n) {
-  t.push(`
-/** Qwik Router Menus (${e.menus.length}) */`), t.push("export const menus = [");
-  const s = !n, i = e.opts.routesDir;
-  for (const o of e.menus) {
-    const a = JSON.stringify(W(o.filePath));
-    if (s)
-      t.push(`  [${JSON.stringify(o.pathname)}, ()=>import(${a})],`);
-    else {
-      const u = I(i, o.filePath);
-      r.push(`import * as ${u} from ${a};`), t.push(`  [${JSON.stringify(o.pathname)}, ()=>${u}],`);
-    }
+function generateQwikRouterEntries(ctx) {
+  const c = [];
+  const entries = [...ctx.entries, ...ctx.serviceWorkers];
+  c.push(`
+/** Qwik Router Entries (${entries.length}) */`);
+  for (let i = 0; i < entries.length; i++) {
+    const entry = entries[i];
+    c.push(`export const ${entry.id} = () => import(${JSON.stringify(entry.filePath)});`);
   }
-  t.push("];");
+  return c.join("\n") + "\n";
 }
-function Dt(e, t, r, n, s) {
-  const i = s, o = e.dynamicImports;
-  if (e.layouts.length > 0) {
-    r.push(`
-/** Qwik Router Layouts (${e.layouts.length}) */`);
-    for (const a of e.layouts) {
-      const u = JSON.stringify(W(a.filePath));
-      o ? r.push(`const ${a.id} = ()=>import(${u});`) : (n.push(`import * as ${a.id}_ from ${u};`), r.push(`const ${a.id} = ()=>${a.id}_;`));
+
+function getImportPath(importPath) {
+  const lowerCasePath = importPath.toLowerCase();
+  if (lowerCasePath.endsWith(".tsx") || lowerCasePath.endsWith(".jsx")) {
+    return importPath.slice(0, importPath.length - 4);
+  }
+  if (lowerCasePath.endsWith(".ts")) {
+    return importPath.slice(0, importPath.length - 3);
+  }
+  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 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}_;`);
+      }
     }
   }
-  r.push(`
-/** Qwik Router Routes (${e.routes.length}) */`), r.push("export const routes = [");
-  for (const a of e.routes) {
-    const u = [];
-    if (Ce(a.ext)) {
-      for (const l of a.layouts)
-        u.push(l.id);
-      const c = W(a.filePath);
-      o ? u.push(`()=>import(${JSON.stringify(c)})`) : (n.push(`import * as ${a.id} from ${JSON.stringify(c)};`), u.push(`()=>${a.id}`));
-    } else if (i && U(a.ext)) {
-      const c = W(a.filePath);
-      n.push(`import * as ${a.id} from ${JSON.stringify(c)};`);
-      for (const l of a.layouts)
-        u.push(l.id);
-      u.push(`()=>${a.id}`);
+  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}`);
+      }
+    } 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);
+      }
+      layouts.push(`()=>${route.id}`);
     }
-    u.length > 0 && r.push(`  ${Ot(t, a, u, s)},`);
-  }
-  r.push("];");
-}
-function Ot(e, t, r, n) {
-  const s = JSON.stringify(t.routeName), i = `[ ${r.join(", ")} ]`;
-  if (n) {
-    const o = JSON.stringify(t.pathname), a = JSON.stringify(Tt(e, t));
-    return `[ ${s}, ${i}, ${o}, ${a} ]`;
-  }
-  return `[ ${s}, ${i} ]`;
-}
-function Tt(e, t) {
-  const r = [], n = e.api.getManifest();
-  if (n) {
-    const s = Object.keys(n.bundles), i = (o) => {
-      o = S(o);
-      for (const a of s) {
-        const u = n.bundles[a];
-        if (u.origins)
-          for (const c of u.origins) {
-            const l = S(c);
-            o.endsWith(l) && (r.includes(a) || r.push(a));
+    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} ]`;
+}
+function getClientRouteBundleNames(qwikPlugin, r) {
+  const bundlesNames = [];
+  const manifest = qwikPlugin.api.getManifest();
+  if (manifest) {
+    const manifestBundleNames = Object.keys(manifest.bundles);
+    const addRouteFile = (filePath) => {
+      filePath = removeExtension(filePath);
+      for (const bundleName of manifestBundleNames) {
+        const bundle = manifest.bundles[bundleName];
+        if (bundle.origins) {
+          for (const bundleOrigin of bundle.origins) {
+            const originPath = removeExtension(bundleOrigin);
+            if (filePath.endsWith(originPath)) {
+              if (!bundlesNames.includes(bundleName)) {
+                bundlesNames.push(bundleName);
+              }
+            }
           }
+        }
       }
     };
-    for (const o of t.layouts)
-      i(o.filePath);
-    i(t.filePath);
-  }
-  return r;
-}
-function Wt(e, t, r, n, s) {
-  if (r.push(`
-/** Qwik Router ServerPlugins (${e.serverPlugins.length}) */`), r.push("export const serverPlugins = ["), s) {
-    for (const i of e.serverPlugins) {
-      const o = JSON.stringify(W(i.filePath));
-      n.push(`import * as ${i.id} from ${o};`);
+    for (const layout of r.layouts) {
+      addRouteFile(layout.filePath);
     }
-    for (const i of e.serverPlugins)
-      r.push(`  ${i.id},`);
-  }
-  r.push("];");
-}
-function jt(e, t, r) {
-  const n = [], s = [];
-  return s.push(`
-/** Qwik Router Config */`), s.push(`
-import { isDev } from '@qwik.dev/core/build';`), Wt(e, t, s, n, r), Dt(e, t, s, n, r), _t(e, s, n, r), Rt(e, s), s.push(`export const trailingSlash = ${JSON.stringify(!globalThis.__NO_TRAILING_SLASH__)};`), s.push(`export const basePathname = ${JSON.stringify(e.opts.basePathname)};`), s.push("export const cacheModules = !isDev;"), s.push(
-    "export default { routes, serverPlugins, menus, trailingSlash, basePathname, cacheModules };"
-  ), n.join(`
-`) + s.join(`
-`);
-}
-function At(e, t) {
-  let r, n = "/service-worker.js";
-  if (e.serviceWorkers.length === 0)
-    r = Ct;
-  else {
-    r = t;
-    const s = e.serviceWorkers.sort(
-      (i, o) => i.chunkFileName.length < o.chunkFileName.length ? -1 : 1
+    addRouteFile(r.filePath);
+  }
+  return bundlesNames;
+}
+
+function createServerPlugins(ctx, _qwikPlugin, c, esmImports, isSSR) {
+  c.push(`
+/** Qwik Router ServerPlugins (${ctx.serverPlugins.length}) */`);
+  c.push(`export const serverPlugins = [`);
+  if (isSSR) {
+    for (const file of ctx.serverPlugins) {
+      const importPath = JSON.stringify(getImportPath(file.filePath));
+      esmImports.push(`import * as ${file.id} from ${importPath};`);
+    }
+    for (const file of ctx.serverPlugins) {
+      c.push(`  ${file.id},`);
+    }
+  }
+  c.push(`];`);
+}
+
+function generateQwikRouterConfig(ctx, qwikPlugin, isSSR) {
+  const esmImports = [];
+  const c = [];
+  c.push(`
+/** Qwik Router Config */`);
+  c.push(`
+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 };`
+  );
+  return esmImports.join("\n") + c.join("\n");
+}
+
+function generateServiceWorkerRegister(ctx, swRegister) {
+  let swReg;
+  let swUrl = "/service-worker.js";
+  if (ctx.serviceWorkers.length === 0) {
+    swReg = SW_UNREGISTER;
+  } else {
+    swReg = swRegister;
+    const sw = ctx.serviceWorkers.sort(
+      (a, b) => a.chunkFileName.length < b.chunkFileName.length ? -1 : 1
     )[0];
-    n = e.opts.basePathname + s.chunkFileName;
+    swUrl = ctx.opts.basePathname + sw.chunkFileName;
   }
-  return r = r.replace("__url", n), `export default ${JSON.stringify(r)};`;
+  swReg = swReg.replace("__url", swUrl);
+  return `export default ${JSON.stringify(swReg)};`;
 }
-const Ct = `
+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 Mt(e, t) {
-  const r = {};
-  e.forEach((n) => {
-    const s = S(n.filePath), i = n.layouts ? n.layouts.map((u) => S(u.filePath)) : [], o = [s, ...i], a = [];
-    for (const [u, c] of Object.entries(t.bundles))
-      Lt(c, o) && a.push(u);
-    a.length > 0 && (r[n.routeName] = { dynamicImports: a });
+
+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 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 n of Object.keys(t.bundles)) {
-    const s = t.bundles[n];
-    if (s.origins?.some((i) => i.endsWith(N))) {
-      r[n] = {
-        ...s,
-        dynamicImports: s.dynamicImports?.filter(
-          (i) => t.bundles[i].origins?.some((o) => o.endsWith("menu.md"))
+  for (const bundleName of Object.keys(manifest.bundles)) {
+    const bundle = manifest.bundles[bundleName];
+    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"))
         )
       };
       break;
     }
   }
-  return r;
-}
-function Lt(e, t) {
-  if (!e.origins)
-    return !1;
-  for (const r of e.origins) {
-    const n = S(r);
-    return t.some((s) => s.endsWith(n));
-  }
-}
-const Ht = (e) => {
-  const t = e.stack;
-  if (typeof t == "string") {
-    const r = t.split(`
-`).filter((n) => !n.includes("/node_modules/") && !n.includes("(node:"));
-    for (let n = 1; n < r.length; n++) {
-      const s = r[n].replace("file:///", "/");
-      if (/^\s+at/.test(s)) {
-        const i = s.indexOf("/"), o = s.lastIndexOf(")", i);
-        if (i > 0) {
-          const u = s.slice(i, o).split(":"), c = V(u[u.length - 1]), l = V(u[u.length - 2]);
-          return typeof c == "number" && typeof l == "number" ? (u.length -= 2, {
-            file: u.join(":"),
-            line: l,
-            column: c
-          }) : typeof c == "number" ? (u.length -= 1, {
-            file: u.join(":"),
-            line: c,
-            column: void 0
-          }) : {
-            file: u.join(":"),
-            line: void 0,
-            column: void 0
-          };
-        }
-      }
-    }
+  return result;
+}
+function isBundlePartOfRoute(bundle, routeAndLayoutPaths) {
+  if (!bundle.origins) {
+    return false;
   }
-}, V = (e) => {
-  try {
-    return parseInt(e, 10);
-  } catch {
-    return;
+  for (const bundleOrigin of bundle.origins) {
+    const originPath = removeExtension(bundleOrigin);
+    return routeAndLayoutPaths.some((path) => path.endsWith(originPath));
   }
-}, he = /\r?\n/, Y = 2;
-function qt(e, t) {
-  if (typeof t == "number")
-    return t;
-  if (t.lo != null)
-    return t.lo;
-  const r = e.split(he), { line: n, column: s } = t;
-  let i = 0;
-  for (let o = 0; o < n - 1 && o < r.length; o++)
-    i += r[o].length + 1;
-  return i + s;
-}
-function Ft(e, t = 0, r) {
-  t = qt(e, t), r = r || t;
-  const n = e.split(he);
-  let s = 0;
-  const i = [];
-  for (let o = 0; o < n.length; o++)
-    if (s += n[o].length + 1, s >= t) {
-      for (let a = o - Y; a <= o + Y || r > s; a++) {
-        if (a < 0 || a >= n.length)
-          continue;
-        const u = a + 1;
-        i.push(`${u}${" ".repeat(Math.max(3 - String(u).length, 0))}|  ${n[a]}`);
-        const c = n[a].length;
-        if (a === o) {
-          const l = Math.max(t - (s - c) + 1, 0), f = Math.max(1, r > s ? c - l : r - t);
-          i.push("   |  " + " ".repeat(l) + "^".repeat(f));
-        } else if (a > o) {
-          if (r > s) {
-            const l = Math.max(Math.min(r - s, c), 1);
-            i.push("   |  " + "^".repeat(l));
-          }
-          s += c + 1;
-        }
-      }
-      break;
-    }
-  return i.join(`
-`);
-}
-function X(e) {
-  const [t, r] = e.split("?"), n = r || "";
-  return {
-    originalId: e,
-    pathId: t,
-    query: n ? `?${r}` : "",
-    params: new URLSearchParams(n)
-  };
 }
-function Bt(e) {
-  const t = [".jpg", ".jpeg", ".png", ".webp", ".gif", ".avif", ".tiff"];
+
+function imagePlugin(userOpts) {
+  const supportedExtensions = [".jpg", ".jpeg", ".png", ".webp", ".gif", ".avif", ".tiff"];
   return [
-    import("vite-imagetools").then(
-      ({ imagetools: r }) => r({
+    import('vite-imagetools').then(
+      ({ imagetools }) => imagetools({
         exclude: [],
-        extendOutputFormats(n) {
-          return {
-            ...n,
-            jsx: () => (i) => {
-              const o = i.map((c) => `${c.src} ${c.width}w`).join(", ");
-              let a, u = 0;
-              for (let c = 0; c < i.length; c++) {
-                const l = i[c];
-                l.width > u && (a = l, u = l.width);
+        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 {
-                srcSet: o,
-                width: a?.width,
-                height: a?.height
-              };
             }
+            return {
+              srcSet,
+              width: largestImage === null || largestImage === void 0 ? void 0 : largestImage.width,
+              height: largestImage === null || largestImage === void 0 ? void 0 : largestImage.height
+            };
+          };
+          return {
+            ...builtins,
+            jsx
           };
         },
-        defaultDirectives: (n) => {
-          if (n.searchParams.has("jsx")) {
-            const { jsx: s, ...i } = Object.fromEntries(n.searchParams.entries());
+        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: "",
-              ...e?.imageOptimization?.jsxDirectives,
-              ...i,
+              ...userOpts?.imageOptimization?.jsxDirectives,
+              ...params,
               as: "jsx"
             });
           }
           return new URLSearchParams();
         }
       })
-    ).catch((r) => (console.error("Error loading vite-imagetools, image imports are not available", r), null)),
+    ).catch((err) => {
+      console.error("Error loading vite-imagetools, image imports are not available", err);
+      return null;
+    }),
     {
       name: "qwik-router-image-jsx",
       load: {
         order: "pre",
-        handler: async (r) => {
-          const { params: n, pathId: s } = X(r);
-          if (Q.extname(s).toLowerCase() === ".svg" && n.has("jsx"))
+        handler: async (id) => {
+          const { params, pathId } = parseId(id);
+          const extension = path.extname(pathId).toLowerCase();
+          if (extension === ".svg" && params.has("jsx")) {
+            const code = await fs.promises.readFile(pathId, "utf-8");
             return {
-              code: await x.promises.readFile(s, "utf-8"),
-              moduleSideEffects: !1
+              code,
+              moduleSideEffects: false
             };
+          }
         }
       },
-      transform(r, n) {
-        n = n.toLowerCase();
-        const { params: s, pathId: i } = X(n);
-        if (s.has("jsx")) {
-          const o = Q.extname(i).toLowerCase();
-          if (t.includes(o)) {
-            r.includes("srcSet") || this.error(`Image '${n}' could not be optimized to JSX`);
-            const a = r.indexOf("export default");
+      transform(code, id) {
+        id = id.toLowerCase();
+        const { params, pathId } = parseId(id);
+        if (params.has("jsx")) {
+          const extension = path.extname(pathId).toLowerCase();
+          if (supportedExtensions.includes(extension)) {
+            if (!code.includes("srcSet")) {
+              this.error(`Image '${id}' could not be optimized to JSX`);
+            }
+            const index = code.indexOf("export default");
             return {
-              code: r.slice(0, a) + `
+              code: code.slice(0, index) + `
   import { _jsxSorted } from '@qwik.dev/core';
   const PROPS = {srcSet, width, height};
   export default function (props, key, _, dev) {
@@ -1146,12 +1340,12 @@ function Bt(e) {
   }`,
               map: null
             };
-          } else if (o === ".svg") {
-            const { svgAttributes: a } = Ut({ code: r, path: i }, e);
+          } else if (extension === ".svg") {
+            const { svgAttributes } = optimizeSvg({ code, path: pathId }, userOpts);
             return {
               code: `
   import { _jsxSorted } from '@qwik.dev/core';
-  const PROPS = ${JSON.stringify(a)};
+  const PROPS = ${JSON.stringify(svgAttributes)};
   export default function (props, key, _, dev) {
     return _jsxSorted('svg', props, PROPS, undefined, 3, key, dev);
   }`,
@@ -1164,81 +1358,93 @@ function Bt(e) {
     }
   ];
 }
-function Ut({ code: e, path: t }, r) {
-  const n = {}, s = r?.imageOptimization?.svgo?.prefixIds, i = s !== !1 ? [{ name: "prefixIds", params: s }] : [], o = r?.imageOptimization?.svgo?.plugins?.filter((u) => u === "preset-default" || typeof u == "object" && u.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."
-  ), !1) : u === "prefixIds" || typeof u == "object" && u.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."
-  ), !1) : !0) || [], a = Ee(e, {
-    floatPrecision: r?.imageOptimization?.svgo?.floatPrecision,
-    multipass: r?.imageOptimization?.svgo?.multipass,
-    path: t,
+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: !1,
-            ...r?.imageOptimization?.svgo?.defaultPresetOverrides
+            removeViewBox: false,
+            ...userOpts?.imageOptimization?.svgo?.defaultPresetOverrides
           }
         }
       },
       {
         name: "customPluginName",
-        fn: () => ({
-          element: {
-            exit: (u) => {
-              u.name === "svg" && (u.name = "g", Object.assign(n, u.attributes), u.attributes = {});
+        fn: () => {
+          return {
+            element: {
+              exit: (node) => {
+                if (node.name === "svg") {
+                  node.name = "g";
+                  Object.assign(svgAttributes, node.attributes);
+                  node.attributes = {};
+                }
+              }
             }
-          }
-        })
+          };
+        }
       },
-      ...i,
-      ...o
+      ...maybePrefixIdsPlugin,
+      ...userPlugins
     ]
   }).data;
-  return n.dangerouslySetInnerHTML = a.slice(3, -4), {
-    data: a,
-    svgAttributes: n
+  svgAttributes.dangerouslySetInnerHTML = data.slice(3, -4);
+  return {
+    data,
+    svgAttributes
   };
 }
-async function Jt(e) {
-  if (typeof e.routesDir != "string")
-    throw new Error('qwikRouter plugin "routesDir" option missing');
-  if (!q(e.routesDir))
+
+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: ${e.routesDir}`
+      `qwikRouter plugin "routesDir" option must be an absolute path: ${opts.routesDir}`
     );
+  }
   try {
-    if (!(await x.promises.stat(e.routesDir)).isDirectory())
+    const s = await fs.promises.stat(opts.routesDir);
+    if (!s.isDirectory()) {
       throw new Error(
-        `qwikRouter plugin "routesDir" option must be a directory: ${e.routesDir}`
+        `qwikRouter plugin "routesDir" option must be a directory: ${opts.routesDir}`
       );
-  } catch (t) {
-    throw new Error(`qwikRouter plugin "routesDir" not found: ${t}`);
-  }
-}
-function Gt(e) {
-  if (e instanceof Error) {
-    const t = e;
-    let r = t.loc;
-    if (!t.frame && !t.plugin && (r || (r = Ht(t)), r && (t.loc = r, r.file))) {
-      t.id = v(t.loc.file);
-      try {
-        const n = x.readFileSync(t.loc.file, "utf-8");
-        t.frame = Ft(n, t.loc);
-      } catch {
-      }
     }
+  } catch (e) {
+    throw new Error(`qwikRouter plugin "routesDir" not found: ${e}`);
   }
-  return e;
 }
-class zt {
-  state = 0;
+
+class HtmlTransformPatcher {
+  state = 0 /* BUFFERING */;
   buffer = "";
   headInnerIndex = -1;
   bodyInnerIndex = -1;
-  isHtmlResponse = !1;
+  isHtmlResponse = false;
   bodyPostContent = "";
   response;
   server;
@@ -1248,384 +1454,570 @@ class zt {
   origSetHeader;
   origWriteHead;
   processingPromise = null;
-  constructor(t, r, n) {
-    this.request = t, this.response = r, this.server = n, this.origWrite = this.response.write.bind(this.response), this.origEnd = this.response.end.bind(this.response), this.origSetHeader = this.response.setHeader.bind(this.response), this.origWriteHead = this.response.writeHead.bind(this.response), this.response.setHeader = (s, i) => {
-      if (s.toLowerCase() === "content-type") {
-        const o = String(i).toLowerCase();
-        this.isHtmlResponse = o.includes("text/html");
+  constructor(req, res, server) {
+    this.request = req;
+    this.response = res;
+    this.server = server;
+    this.origWrite = this.response.write.bind(this.response);
+    this.origEnd = this.response.end.bind(this.response);
+    this.origSetHeader = this.response.setHeader.bind(this.response);
+    this.origWriteHead = this.response.writeHead.bind(this.response);
+    this.response.setHeader = (name, value) => {
+      if (name.toLowerCase() === "content-type") {
+        const contentType = String(value).toLowerCase();
+        this.isHtmlResponse = contentType.includes("text/html");
       }
-      return this.origSetHeader(s, i);
-    }, this.response.writeHead = (s, i, o) => {
-      if (typeof i == "object" && i !== null && (o = i, i = void 0), o && typeof o == "object") {
-        for (const [a, u] of Object.entries(o))
-          if (a.toLowerCase() === "content-type") {
-            const c = String(u).toLowerCase();
-            this.isHtmlResponse = c.includes("text/html");
+      return this.origSetHeader(name, value);
+    };
+    this.response.writeHead = (statusCode, statusMessage, headers) => {
+      if (typeof statusMessage === "object" && statusMessage !== null) {
+        headers = statusMessage;
+        statusMessage = void 0;
+      }
+      if (headers && typeof headers === "object") {
+        for (const [key, value] of Object.entries(headers)) {
+          if (key.toLowerCase() === "content-type") {
+            const contentType = String(value).toLowerCase();
+            this.isHtmlResponse = contentType.includes("text/html");
           }
+        }
       }
-      return this.origWriteHead(s, i, o);
-    }, this.response.write = this.handleWrite.bind(this), this.response.end = (s, i, o) => (this.handleEnd(s, i, o).catch((a) => {
-      console.error("Error in handleEnd:", a), this.transitionToPassthrough(), this.origEnd(s, i, o);
-    }), this.response);
-  }
-  handleWrite(t, r, n) {
-    if (!this.isHtmlResponse || this.state === 3)
-      return this.origWrite(t, r, n);
-    typeof r == "function" && (n = r, r = void 0);
-    let s;
-    switch (t instanceof ArrayBuffer || t instanceof Uint8Array || t instanceof Uint16Array || t instanceof Uint32Array ? s = new TextDecoder().decode(t) : Buffer.isBuffer(t) ? s = t.toString(r || "utf8") : typeof t == "string" ? s = t : s = t?.toString() || "", this.buffer += s, this.state) {
-      case 0:
+      return this.origWriteHead(statusCode, statusMessage, headers);
+    };
+    this.response.write = this.handleWrite.bind(this);
+    this.response.end = (chunk, encoding, callback) => {
+      this.handleEnd(chunk, encoding, callback).catch((error) => {
+        console.error("Error in handleEnd:", error);
+        this.transitionToPassthrough();
+        this.origEnd(chunk, encoding, callback);
+      });
+      return this.response;
+    };
+  }
+  handleWrite(chunk, encoding, callback) {
+    if (!this.isHtmlResponse || this.state === 3 /* PASSTHROUGH */) {
+      return this.origWrite(chunk, encoding, callback);
+    }
+    if (typeof encoding === "function") {
+      callback = encoding;
+      encoding = void 0;
+    }
+    let data;
+    if (chunk instanceof ArrayBuffer || chunk instanceof Uint8Array || chunk instanceof Uint16Array || chunk instanceof Uint32Array) {
+      data = new TextDecoder().decode(chunk);
+    } else if (Buffer.isBuffer(chunk)) {
+      data = chunk.toString(encoding || "utf8");
+    } else if (typeof chunk === "string") {
+      data = chunk;
+    } else {
+      data = chunk?.toString() || "";
+    }
+    this.buffer += data;
+    switch (this.state) {
+      case 0 /* BUFFERING */:
         if (this.headInnerIndex === -1) {
-          const i = this.buffer.match(/<head[^>]*>/i);
-          if (i) {
-            const o = this.buffer.indexOf(i[0]);
-            this.headInnerIndex = o + i[0].length;
+          const headMatch = this.buffer.match(/<head[^>]*>/i);
+          if (headMatch) {
+            const headOuterIndex = this.buffer.indexOf(headMatch[0]);
+            this.headInnerIndex = headOuterIndex + headMatch[0].length;
           }
         }
         if (this.headInnerIndex !== -1) {
-          const i = this.buffer.slice(this.headInnerIndex).match(/<body[^>]*>/i);
-          if (i) {
-            this.state = 1;
-            const o = this.buffer.indexOf(i[0]);
-            this.bodyInnerIndex = o + i[0].length, this.processingPromise = this.processHead();
+          const bodyMatch = this.buffer.slice(this.headInnerIndex).match(/<body[^>]*>/i);
+          if (bodyMatch) {
+            this.state = 1 /* PROCESSING_HEAD */;
+            const bodyOuterIndex = this.buffer.indexOf(bodyMatch[0]);
+            this.bodyInnerIndex = bodyOuterIndex + bodyMatch[0].length;
+            this.processingPromise = this.processHead();
           }
         }
         break;
-      case 1:
+      case 1 /* PROCESSING_HEAD */:
         break;
-      case 2:
+      case 2 /* STREAMING_BODY */:
         this.handleStreamingBodyState();
         break;
       default:
         throw new Error(`Invalid state: ${this.state}`);
     }
-    return n?.(), !0;
+    callback?.();
+    return true;
   }
   async processHead() {
     try {
-      const r = await this.server.transformIndexHtml(
+      const fakeHtml = "<html><head>[FAKE_HEAD]</head><body>[FAKE_BODY]</body></html>";
+      const transformedHtml = await this.server.transformIndexHtml(
         this.request.url || "/",
-        "<html><head>[FAKE_HEAD]</head><body>[FAKE_BODY]</body></html>"
-      ), n = r.indexOf("[FAKE_HEAD]"), s = r.indexOf("</head>", n);
-      if (n === -1 || s === -1)
+        fakeHtml
+      );
+      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 i = r.slice(12, n).trim(), o = r.slice(
-        n + 11,
-        s
-      ), a = r.indexOf("<body>", s), u = r.indexOf("[FAKE_BODY]", a), c = r.indexOf("</body>", u);
-      if (u === -1 || c === -1)
+      }
+      const headPreContent = transformedHtml.slice("<html><head>".length, fakeHeadIndex).trim();
+      const headPostContent = transformedHtml.slice(
+        fakeHeadIndex + "[FAKE_HEAD]".length,
+        fakeHeadCloseIndex
+      );
+      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 l = r.slice(
-        a + 6,
-        u
+      }
+      const bodyPreContent = transformedHtml.slice(
+        fakeBodyStartIndex + "<body>".length,
+        fakeBodyIndex
       );
-      this.bodyPostContent = r.slice(
-        u + 11,
-        c
+      this.bodyPostContent = transformedHtml.slice(
+        fakeBodyIndex + "[FAKE_BODY]".length,
+        fakeBodyEndIndex
       );
-      const f = this.buffer.indexOf("</head>", this.headInnerIndex);
-      if (f === -1)
+      const headCloseIndex = this.buffer.indexOf("</head>", this.headInnerIndex);
+      if (headCloseIndex === -1) {
         throw new Error("Buffered HTML does not contain </head>");
-      if (this.buffer = this.buffer.slice(0, this.headInnerIndex) + i + this.buffer.slice(this.headInnerIndex, f) + o + this.buffer.slice(f, this.bodyInnerIndex) + l + this.buffer.slice(this.bodyInnerIndex), this.bodyPostContent.length > 0) {
-        this.state = 2, this.handleStreamingBodyState();
+      }
+      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.handleStreamingBodyState();
         return;
       }
       this.transitionToPassthrough();
       return;
-    } catch (t) {
-      console.error("Error transforming HTML:", t), this.transitionToPassthrough();
+    } catch (error) {
+      console.error("Error transforming HTML:", error);
+      this.transitionToPassthrough();
       return;
     }
   }
   handleStreamingBodyState() {
-    const t = this.buffer.match(/<\/body>/i);
-    if (t) {
-      const r = this.buffer.indexOf(t[0]);
-      this.buffer = this.buffer.slice(0, r) + this.bodyPostContent + this.buffer.slice(r), this.transitionToPassthrough();
+    const bodyEndMatch = this.buffer.match(/<\/body>/i);
+    if (bodyEndMatch) {
+      const bodyEndPos = this.buffer.indexOf(bodyEndMatch[0]);
+      this.buffer = this.buffer.slice(0, bodyEndPos) + this.bodyPostContent + this.buffer.slice(bodyEndPos);
+      this.transitionToPassthrough();
       return;
     }
     this.flushBuffer(6);
   }
   transitionToPassthrough() {
-    this.state = 3, this.flushBuffer();
+    this.state = 3 /* PASSTHROUGH */;
+    this.flushBuffer();
   }
-  flushBuffer(t = 0) {
-    this.buffer.length > t && (t > 0 ? (this.origWrite(this.buffer.slice(0, -t)), this.buffer = this.buffer.slice(-t)) : (this.origWrite(this.buffer), this.buffer = ""));
+  flushBuffer(keep = 0) {
+    if (this.buffer.length > keep) {
+      if (keep > 0) {
+        this.origWrite(this.buffer.slice(0, -keep));
+        this.buffer = this.buffer.slice(-keep);
+      } else {
+        this.origWrite(this.buffer);
+        this.buffer = "";
+      }
+    }
   }
-  async handleEnd(t, r, n) {
-    typeof r == "function" && (n = r, r = void 0), t && this.handleWrite(t, r), await this.processingPromise, this.flushBuffer(), this.origEnd(n);
+  async handleEnd(chunk, encoding, callback) {
+    if (typeof encoding === "function") {
+      callback = encoding;
+      encoding = void 0;
+    }
+    if (chunk) {
+      this.handleWrite(chunk, encoding);
+    }
+    await this.processingPromise;
+    this.flushBuffer();
+    this.origEnd(callback);
   }
 }
-function Qt(e, t, r) {
-  return new zt(e, t, r), t;
+function wrapResponseForHtmlTransform(request, response, server) {
+  new HtmlTransformPatcher(request, response, server);
+  return response;
 }
-const Kt = (e, t) => async (r, n, s) => {
-  const i = await e.ssrLoadModule("src/entry.ssr");
-  if (!i.default)
-    return console.error("No default export found in src/entry.ssr"), s();
-  const o = i.default;
-  t.isDirty && (await fe(t), t.isDirty = !1);
-  const a = t.entries.find((c) => r.url === `${e.config.base}${c.chunkFileName}`);
-  if (a) {
-    const c = await e.transformRequest(
-      `/@fs${a.filePath.startsWith("/") ? "" : "/"}${a.filePath}`
+
+const makeRouterDevMiddleware = (server, ctx) => async (req, res, next) => {
+  const mod = await server.ssrLoadModule("src/entry.ssr");
+  if (!mod.default) {
+    console.error("No default export found in src/entry.ssr");
+    return next();
+  }
+  const renderer = mod.default;
+  if (ctx.isDirty) {
+    await updateRoutingContext(ctx);
+    ctx.isDirty = false;
+  }
+  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}`
     );
-    c ? (n.setHeader("Content-Type", "text/javascript"), n.end(c.code)) : s();
+    if (entryContents) {
+      res.setHeader("Content-Type", "text/javascript");
+      res.end(entryContents.code);
+    } else {
+      next();
+    }
     return;
   }
-  if (r.url === `${e.config.base}service-worker.js`) {
-    n.setHeader("Content-Type", "text/javascript"), n.end(
-      "/* Qwik Router Dev Service Worker */self.addEventListener('install', () => self.skipWaiting());self.addEventListener('activate', (ev) => ev.waitUntil(self.clients.claim()));"
+  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()));`
     );
     return;
   }
   globalThis.__qwik = void 0;
-  const { createQwikRouter: u } = await e.ssrLoadModule(
+  const { createQwikRouter } = await server.ssrLoadModule(
     "@qwik.dev/router/middleware/node"
   );
   try {
-    const c = (async (d) => await o(d)), { router: l, staticFile: f, notFound: p } = u({ render: c }), w = Qt(r, n, e);
-    f(r, w, () => {
-      l(r, w, () => {
-        p(r, w, s);
+    const render = (async (opts) => {
+      return await renderer(opts);
+    });
+    const { router, staticFile, notFound } = createQwikRouter({
+      render,
+      // inject the platform from dev middleware options
+      platform: ctx.opts.platform
+    });
+    const wrappedRes = wrapResponseForHtmlTransform(req, res, server);
+    staticFile(req, wrappedRes, () => {
+      router(req, wrappedRes, () => {
+        notFound(req, wrappedRes, next);
       });
     });
-  } catch (c) {
-    c instanceof Error && (e.ssrFixStacktrace(c), Gt(c)), s(c);
+  } catch (e) {
+    if (e instanceof Error) {
+      server.ssrFixStacktrace(e);
+      formatError(e);
+    }
+    next(e);
     return;
   }
-}, Vt = [".css", ".scss", ".sass", ".less", ".styl", ".stylus"], Yt = /\.[mc]?[tj]sx?$/, Z = (e) => Vt.some((t) => e.endsWith(t)), Xt = (e) => {
-  const t = /* @__PURE__ */ new Set(), r = /* @__PURE__ */ new Set();
-  return Array.from(e.moduleGraph.fileToModulesMap.entries()).forEach(([n, s]) => {
-    s.forEach((i) => {
-      const [o, a] = i.url.split("?");
-      if (!a && Z(o)) {
-        const u = i.importers.size === 0, c = Array.from(i.importers).some((f) => {
-          const p = f.url || f.file, w = p && Z(p);
-          return w && i.url && r.add(i.url), w;
-        }), l = Array.from(i.importers).some((f) => {
-          const p = f.url || f.file;
-          return p && Yt.test(p);
+};
+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 cssModules = /* @__PURE__ */ new Set();
+  const cssImportedByCSS = /* @__PURE__ */ new Set();
+  Array.from(server.moduleGraph.fileToModulesMap.entries()).forEach(([_name, modules]) => {
+    modules.forEach((mod) => {
+      const [pathId, query] = mod.url.split("?");
+      if (!query && isCssPath(pathId)) {
+        const isEntryCSS = mod.importers.size === 0;
+        const hasCSSImporter = Array.from(mod.importers).some((importer) => {
+          const importerPath = importer.url || importer.file;
+          const isCSS = importerPath && isCssPath(importerPath);
+          if (isCSS && mod.url) {
+            cssImportedByCSS.add(mod.url);
+          }
+          return isCSS;
+        });
+        const hasJSImporter = Array.from(mod.importers).some((importer) => {
+          const importerPath = importer.url || importer.file;
+          return importerPath && JS_EXTENSIONS.test(importerPath);
         });
-        (u || l) && !c && !r.has(i.url) && t.add(i);
+        if ((isEntryCSS || hasJSImporter) && !hasCSSImporter && !cssImportedByCSS.has(mod.url)) {
+          cssModules.add(mod);
+        }
       }
     });
-  }), [...t].map(
-    ({ url: n, lastHMRTimestamp: s }) => `${n}${s ? `?t=${s}` : ""}`
+  });
+  return [...cssModules].map(
+    ({ url, lastHMRTimestamp }) => `${url}${lastHMRTimestamp ? `?t=${lastHMRTimestamp}` : ""}`
   );
-}, Zt = (e) => Xt(e).map((r) => ({
-  tag: "link",
-  attrs: { rel: "stylesheet", href: r }
-})), N = "@qwik-router-config", D = "@qwik-router-entries", H = "@qwik.dev/router", O = "@qwik-router-sw-register";
-function wr(e) {
-  return er(e);
-}
-function er(e) {
-  return [tr(e), ...Bt(e)];
-}
-function tr(e) {
-  let t = null, r = null, n = null, s, i = "esm", o = null, a, u = null, c = e?.devSsrServer;
-  const l = e?.routesDir ?? "src/routes", f = e?.serverPluginsDir ?? l;
-  return {
+};
+const getRouterIndexTags = (server) => {
+  const cssUrls = getCssUrls(server);
+  return cssUrls.map((url) => ({
+    tag: "link",
+    attrs: { rel: "stylesheet", href: url }
+  }));
+};
+
+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)];
+}
+function qwikRouterPlugin(userOpts) {
+  let ctx = null;
+  let mdxTransform = null;
+  let rootDir = null;
+  let qwikPlugin;
+  let outDir = null;
+  let viteCommand;
+  let devServer = null;
+  let devSsrServer = userOpts?.devSsrServer;
+  const routesDir = userOpts?.routesDir ?? "src/routes";
+  const serverPluginsDir = userOpts?.serverPluginsDir ?? routesDir;
+  const api = {
+    getBasePathname: () => ctx?.opts.basePathname ?? "/",
+    getRoutes: () => {
+      return ctx?.routes.slice() ?? [];
+    },
+    getServiceWorkers: () => {
+      return ctx?.serviceWorkers.slice() ?? [];
+    }
+  };
+  const plugin = {
     name: "vite-plugin-qwik-router",
     enforce: "pre",
-    api: {
-      getBasePathname: () => t?.opts.basePathname ?? "/",
-      getRoutes: () => t?.routes.slice() ?? [],
-      getServiceWorkers: () => t?.serviceWorkers.slice() ?? []
-    },
-    async config(d, h) {
-      return a = h.command, {
+    api,
+    async config(_viteConfig, viteEnv) {
+      viteCommand = viteEnv.command;
+      const updatedViteConfig = {
         define: {
           "globalThis.__DEFAULT_LOADERS_SERIALIZATION_STRATEGY__": JSON.stringify(
-            e?.defaultLoadersSerializationStrategy || "never"
+            userOpts?.defaultLoadersSerializationStrategy || "never"
           ),
-          "globalThis.__NO_TRAILING_SLASH__": JSON.stringify(e?.trailingSlash === !1)
+          "globalThis.__NO_TRAILING_SLASH__": JSON.stringify(userOpts?.trailingSlash === false)
         },
         appType: "custom",
         resolve: {
-          dedupe: [H, "@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: N },
-            { find: "@qwik-city-entries", replacement: D },
-            { find: "@qwik-city-sw-register", replacement: O }
+            { 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: {
           // Let Vite find all app deps, these are not part of the static imports from `src/root`
           entries: [
-            `${l}/**/index*`,
-            `${l}/**/layout*`,
-            `${f}/plugin@*`
+            `${routesDir}/**/index*`,
+            `${routesDir}/**/layout*`,
+            `${serverPluginsDir}/plugin@*`
           ],
           // These need processing by the optimizer during dev
           exclude: [
-            H,
-            N,
-            D,
-            O
+            QWIK_ROUTER,
+            QWIK_ROUTER_CONFIG_ID,
+            QWIK_ROUTER_ENTRIES_ID,
+            QWIK_ROUTER_SW_REGISTER
           ]
         },
         ssr: {
           external: ["node:async_hooks"],
           noExternal: [
-            H,
-            N,
-            D,
-            O
+            QWIK_ROUTER,
+            QWIK_ROUTER_CONFIG_ID,
+            QWIK_ROUTER_ENTRIES_ID,
+            QWIK_ROUTER_SW_REGISTER,
+            // We've had reports of bundling issues with zod
+            "zod"
           ]
         },
         server: {
           watch: {
             // needed for recursive watching of index and layout files in the src/routes directory
-            disableGlobbing: !1
+            disableGlobbing: false
           }
         }
       };
+      return updatedViteConfig;
     },
-    async configResolved(d) {
-      Object.assign(process.env, me(d.mode, process.cwd(), "")), n = T(d.root);
-      const h = d.build?.ssr || d.mode === "ssr" ? "ssr" : "client";
-      if (t = ut(
-        n,
-        d.base,
-        e,
-        h,
-        !e?.staticImportRoutes
-      ), await Jt(t.opts), r = await Nt(t), s = d.plugins.find(
-        (m) => m.name === "vite-plugin-qwik"
-      ), !s)
+    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
+      );
+      await validatePlugin(ctx.opts);
+      mdxTransform = await createMdxTransformer(ctx);
+      qwikPlugin = config.plugins.find(
+        (p) => p.name === "vite-plugin-qwik"
+      );
+      if (!qwikPlugin) {
         throw new Error("Missing vite-plugin-qwik");
-      typeof c != "boolean" && (c = s.api._oldDevSsrServer()), s.api.registerBundleGraphAdder?.((m) => Mt(t.routes, m)), d.ssr?.format === "cjs" && (i = "cjs"), o = d.build?.outDir;
+      }
+      if (typeof devSsrServer !== "boolean") {
+        devSsrServer = qwikPlugin.api._oldDevSsrServer();
+      }
+      qwikPlugin.api.registerBundleGraphAdder?.((manifest) => {
+        return getRouteImports(ctx.routes, manifest);
+      });
+      outDir = config.build?.outDir;
     },
-    async configureServer(d) {
-      u = d;
-      const h = T(
-        n,
+    async configureServer(server) {
+      devServer = server;
+      const toWatch = resolve(
+        rootDir,
         "src/routes/**/{index,layout,entry,service-worker}{.,@,-}*"
       );
-      if (d.watcher.add(h), await new Promise((m) => setTimeout(m, 1e3)), d.watcher.on("change", (m) => {
-        if (!/\/(index[.@]|layout[.-]|entry\.|service-worker\.)[^/]*$/.test(m))
+      server.watcher.add(toWatch);
+      await new Promise((resolve2) => setTimeout(resolve2, 1e3));
+      server.watcher.on("change", (path) => {
+        if (!/\/(index[.@]|layout[.-]|entry\.|service-worker\.)[^/]*$/.test(path)) {
           return;
-        t.isDirty = !0;
-        const g = d.environments?.ssr?.moduleGraph;
-        if (g) {
-          const b = g.getModuleById("@qwik-router-config");
-          b && g.invalidateModule(b);
         }
-      }), e?.devSsrServer !== !1)
+        ctx.isDirty = true;
+        const graph = server.environments?.ssr?.moduleGraph;
+        if (graph) {
+          const mod = graph.getModuleById("@qwik-router-config");
+          if (mod) {
+            graph.invalidateModule(mod);
+          }
+        }
+      });
+      if (userOpts?.devSsrServer !== false) {
         return () => {
-          d.middlewares.use(Kt(d, t));
+          server.middlewares.use(makeRouterDevMiddleware(server, ctx));
         };
+      }
     },
     transformIndexHtml() {
-      if (a === "serve")
-        return Zt(u);
+      if (viteCommand !== "serve") {
+        return;
+      }
+      return getRouterIndexTags(devServer);
     },
     buildStart() {
-      lt(t);
+      resetBuildContext(ctx);
     },
-    resolveId(d) {
-      return d === N || d === D ? {
-        id: d,
-        // user entries added in the routes, like src/routes/service-worker.ts
-        // are added as dynamic imports to the qwik-router-config as a way to create
-        // a new entry point for the build. Ensure these are not treeshaken.
-        moduleSideEffects: "no-treeshake"
-      } : d === O ? d : null;
+    resolveId(id) {
+      if (id === QWIK_ROUTER_CONFIG_ID || id === QWIK_ROUTER_ENTRIES_ID) {
+        return {
+          id,
+          // user entries added in the routes, like src/routes/service-worker.ts
+          // are added as dynamic imports to the qwik-router-config as a way to create
+          // a new entry point for the build. Ensure these are not treeshaken.
+          moduleSideEffects: "no-treeshake"
+        };
+      }
+      if (id === QWIK_ROUTER_SW_REGISTER) {
+        return id;
+      }
+      return null;
     },
-    async load(d, h) {
-      if (t) {
-        if (d.endsWith(D))
-          return $t(t);
-        const m = d.endsWith(N), g = d.endsWith(O);
-        if (m || g) {
-          if (t.isDirty && (await fe(t), t.isDirty = !1, t.diagnostics.forEach((b) => {
-            this.warn(b.message);
-          })), m)
-            return jt(t, s, h?.ssr ?? !1);
-          if (g)
-            return At(t, Ie);
+    async load(id, opts) {
+      if (ctx) {
+        if (id.endsWith(QWIK_ROUTER_ENTRIES_ID)) {
+          return generateQwikRouterEntries(ctx);
+        }
+        const isRouterConfig = id.endsWith(QWIK_ROUTER_CONFIG_ID);
+        const isSwRegister = id.endsWith(QWIK_ROUTER_SW_REGISTER);
+        if (isRouterConfig || isSwRegister) {
+          if (ctx.isDirty) {
+            await parseRoutesDir(ctx);
+            ctx.isDirty = false;
+            ctx.diagnostics.forEach((d) => {
+              this.warn(d.message);
+            });
+          }
+          if (isRouterConfig) {
+            return generateQwikRouterConfig(ctx, qwikPlugin, opts?.ssr ?? false);
+          }
+          if (isSwRegister) {
+            return generateServiceWorkerRegister(ctx, swRegister);
+          }
         }
       }
       return null;
     },
-    async transform(d, h) {
-      if (h.startsWith("\0"))
+    async transform(code, id) {
+      const isVirtualId = id.startsWith("\0");
+      if (isVirtualId) {
         return;
-      const g = we(h).toLowerCase();
-      if (t && (g === ".md" || g === ".mdx")) {
-        const P = M(h);
-        if (ue(P))
-          return { code: await Ue(t.opts, h, d), map: null };
-        if (r)
+      }
+      const ext = extname(id).toLowerCase();
+      const isMD = ext === ".md" || ext === ".mdx";
+      if (ctx && isMD) {
+        const fileName = basename(id);
+        if (isMenuFileName(fileName)) {
+          const menuCode = await transformMenu(ctx.opts, id, code);
+          return { code: menuCode, map: null };
+        }
+        if (mdxTransform) {
           try {
-            return await r(d, h);
-          } catch (y) {
-            if (y && typeof y == "object" && "position" in y && "reason" in y) {
-              const _ = y.position?.start.column, k = y.position?.start.line, A = Object.assign(new Error(y.reason), {
-                id: h,
+            const mdxResult = await mdxTransform(code, id);
+            return mdxResult;
+          } catch (e) {
+            if (e && typeof e == "object" && "position" in e && "reason" in e) {
+              const column = e.position?.start.column;
+              const line = e.position?.start.line;
+              const err = Object.assign(new Error(e.reason), {
+                id,
                 plugin: "qwik-router-mdx",
                 loc: {
-                  column: _,
-                  line: k
+                  column,
+                  line
                 },
                 stack: ""
               });
-              this.error(A);
-            } else y instanceof Error ? this.error(y) : this.error(String(y));
+              this.error(err);
+            } else if (e instanceof Error) {
+              this.error(e);
+            } else {
+              this.error(String(e));
+            }
           }
+        }
       }
       return null;
     },
-    generateBundle(d, h) {
-      if (t?.target === "client") {
-        const m = [...t.entries, ...t.serviceWorkers].map((g) => ({
-          chunkFileName: g.chunkFileName,
-          extensionlessFilePath: S(g.filePath)
-        }));
-        for (const g of m)
-          for (const b in h) {
-            const P = h[b];
-            if (P.type === "chunk" && P.isDynamicEntry && P.facadeModuleId) {
-              const y = S(v(P.facadeModuleId));
-              if (g.extensionlessFilePath === y) {
-                P.fileName = g.chunkFileName;
+    generateBundle(_, bundles) {
+      if (ctx?.target === "client") {
+        const entries = [...ctx.entries, ...ctx.serviceWorkers].map((entry) => {
+          return {
+            chunkFileName: entry.chunkFileName,
+            extensionlessFilePath: removeExtension(entry.filePath)
+          };
+        });
+        for (const entry of entries) {
+          for (const fileName in bundles) {
+            const c = bundles[fileName];
+            if (c.type === "chunk" && c.isDynamicEntry && c.facadeModuleId) {
+              const extensionlessFilePath = removeExtension(normalizePath(c.facadeModuleId));
+              if (entry.extensionlessFilePath === extensionlessFilePath) {
+                c.fileName = entry.chunkFileName;
                 continue;
               }
             }
           }
+        }
       }
     },
     closeBundle: {
-      sequential: !0,
+      sequential: true,
       async handler() {
-        t?.target === "ssr" && o && await rr(o, i);
+        if (ctx?.target === "ssr" && outDir) {
+          await generateServerPackageJson(outDir);
+        }
       }
     }
   };
-}
-async function rr(e, t) {
-  await x.promises.mkdir(e, { recursive: !0 });
-  const r = j(e, "package.json");
-  let n = {};
-  if (x.existsSync(r)) {
-    const i = await x.promises.readFile(r, "utf-8");
-    n = {
-      ...JSON.parse(i)
+  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
     };
   }
-  n = {
-    ...n,
-    type: t == "cjs" ? "commonjs" : "module"
+  packageJson = {
+    ...packageJson,
+    type: "module"
   };
-  const s = JSON.stringify(n, null, 2);
-  await x.promises.writeFile(r, s);
+  const serverPackageJsonCode = JSON.stringify(packageJson, null, 2);
+  await fs.promises.writeFile(serverPackageJsonPath, serverPackageJsonCode);
 }
-export {
-  yr as extendConfig,
-  wr as qwikCity,
-  er as qwikRouter
-};
+
+export { extendConfig, qwikCity, qwikRouter };