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

package/lib/vite/index.mjs

@@ -1,15 +1,15 @@
 import { mergeConfig as pe, loadEnv as me } from "vite";
-import v, { existsSync as ge } from "node:fs";
-import z, { normalize as ye, basename as A, dirname as I, relative as ee, join as W, resolve as O, isAbsolute as L, extname as we } from "node:path";
+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 x } from "unist-util-visit";
+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 q } from "hast-util-to-string";
-import { refractor as H } from "refractor";
+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) {
@@ -83,18 +83,18 @@ function _e(e) {
   const n = e.split("@");
   return n.length > 1 && (n.shift(), t = n.join("@")), { layoutName: t, layoutStop: r };
 }
-function C(e, t) {
+function L(e, t) {
   const r = ee(e.routesDir, t);
-  let n = y(r);
+  let n = v(r);
   return n = ne(n, e.basePathname).split("/").filter((s) => !qe(s)).join("/"), n === "" ? "/" : n;
 }
 function De(e, t) {
-  let r = y(ee(e.routesDir, t));
-  r = "/" + y(I(r));
+  let r = v(ee(e.routesDir, t));
+  r = "/" + v(R(r));
   let n = ne(r, e.basePathname);
   return n.endsWith("/") || (n += "/"), n;
 }
-function N(e) {
+function $(e) {
   if (typeof e == "string") {
     const t = e.trim().toLowerCase().split(".");
     if (t.length > 1) {
@@ -104,26 +104,26 @@ function N(e) {
   }
   return "";
 }
-function b(e) {
+function S(e) {
   if (typeof e == "string") {
     e = e.trim();
-    const t = N(e);
+    const t = $(e);
     return e.slice(0, e.length - t.length);
   }
   return "";
 }
-function y(e) {
+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;
 }
-function S(e, t, r) {
+function I(e, t, r) {
   const n = [];
   for (let s = 0; s < 25; s++) {
-    let i = b(A(t));
-    if (i = i.replace(/[\W_]+/g, ""), i === "" ? i = "Q" + s : isNaN(i.charAt(0)) || (i = "Q" + i), n.push(Ne(i)), t = y(I(t)), t === e)
+    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;
   }
   return n.length > 1 && n[0] === "Index" && n.shift(), n.reverse().join("").concat(r || "");
@@ -150,10 +150,10 @@ function Ae(e) {
 function ae(e) {
   return e in ie;
 }
-function F(e) {
+function U(e) {
   return e in Te;
 }
-function B(e) {
+function J(e) {
   return e in oe;
 }
 function Ce(e) {
@@ -184,7 +184,7 @@ function qe(e, t = !0) {
   ), !0) : e.startsWith("(") && e.endsWith(")");
 }
 function le(e) {
-  const t = N(e), r = b(e), n = ae(t), s = F(t), i = B(t);
+  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,
@@ -192,22 +192,22 @@ function le(e) {
     ext: t
   } : null;
 }
-function j(e, t, r, n) {
+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 = N(o);
-  if (B(a)) {
-    const u = o.startsWith("/"), c = y(o).split("/").filter((d) => d.length > 0), l = u ? W(e.routesDir, ...c) : W(I(t), ...c);
+  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 f = A(l);
+    const f = M(l);
     if (le(f)) {
-      const d = I(l);
-      let p = C(e, d);
-      return s.length > 1 ? p += "?" + s[1] : i.length > 1 && (p += "#" + i[1]), p;
+      const w = R(l);
+      let d = L(e, w);
+      return s.length > 1 ? d += "?" + s[1] : i.length > 1 && (d += "#" + i[1]), d;
     }
   } else a === "" && (r.endsWith("/") ? globalThis.__NO_TRAILING_SLASH__ && (r = r.slice(0, -1)) : globalThis.__NO_TRAILING_SLASH__ || (r += "/"));
   return r;
@@ -222,7 +222,7 @@ function Be(e, t) {
   return Fe(e, t.filePath);
 }
 async function Ue(e, t, r) {
-  const n = Je(e, t, r), s = S(e.routesDir, t);
+  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) {
@@ -247,7 +247,7 @@ function Je(e, t, r, n = !0) {
         if (l.type === "text")
           f.text = l.text;
         else if (l.type === "link")
-          f.text = l.text, f.href = j(e, t, l.href, n);
+          f.text = l.text, f.href = C(e, t, l.href, n);
         else
           throw new Error(
             `Headings can only be a text or link. Received "${l.type}", value "${l.raw}", in menu: ${t}`
@@ -267,7 +267,7 @@ function Je(e, t, r, n = !0) {
                 else if (f.type === "link")
                   u.items.push({
                     text: f.text,
-                    href: j(e, t, f.href, n)
+                    href: C(e, t, f.href, n)
                   });
                 else
                   throw new Error(
@@ -276,7 +276,7 @@ function Je(e, t, r, n = !0) {
             else if (l.type === "link")
               u.items.push({
                 text: l.text,
-                href: j(e, t, l.href, n)
+                href: C(e, t, l.href, n)
               });
             else
               throw new Error(
@@ -297,7 +297,7 @@ function Je(e, t, r, n = !0) {
     throw new Error(`Menu must start with an h1 in the index: ${t}`);
   return o[0];
 }
-function U(e, t) {
+function G(e, t) {
   if (t === e)
     return {
       pattern: new RegExp("^" + t.replace(/[.*+?^${}()|[\]\\]/g, "\\$&") + "$"),
@@ -315,8 +315,8 @@ function U(e, t) {
           if (c % 2) {
             const l = Ge.exec(u);
             if (l) {
-              const [, f, h] = l;
-              return n.push(h), f ? "(.*?)" : "([^/]+?)";
+              const [, f, p] = l;
+              return n.push(p), f ? "(.*?)" : "([^/]+?)";
             }
           }
           return encodeURI(u).normalize().replace(/%5[Bb]/g, "[").replace(/%5[Dd]/g, "]").replace(/#/g, "%23").replace(/\?/g, "%3F").replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
@@ -364,81 +364,81 @@ function Qe(e, t) {
   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) => Ye(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);
+  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 h = f.id;
-      for (; u.has(h); )
-        h = `${f.id}_${a++}`;
-      f.id = h, u.add(h);
+      let p = f.id;
+      for (; u.has(p); )
+        p = `${f.id}_${a++}`;
+      f.id = p, u.add(p);
     }
   };
   return c(r), c(n), c(s), c(i), { layouts: r, routes: n, entries: s, menus: o, serviceWorkers: i };
 }
-function Ye(e, t) {
+function Ve(e, t) {
   let r = t.extlessName;
   const n = t.filePath, s = t.dirPath;
   let i, o;
-  return r.endsWith(Ve) ? (o = "top", r = r.slice(0, r.length - 1)) : o = "nested", r.startsWith(Q) ? i = r.slice(Q.length) : i = "", {
-    id: S(e.routesDir, n),
+  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
   };
 }
-const Xe = "layout", Q = Xe + "-", Ve = "!";
+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 = C(e, r.dirPath);
+  let u = L(e, r.dirPath);
   if (r.extlessName === "404" && (u += r.extlessName + ".html"), !a) {
-    let l = y(I(n)), f = !1;
-    const h = o !== "";
-    for (let d = 0; d < 20; d++) {
-      let p;
-      if (h && !f ? (p = t.find((g) => g.dirPath === l && g.layoutName === o), p && (f = !0)) : p = t.find((g) => g.dirPath === l && g.layoutName === ""), p && (s.push(p), p.layoutType === "top") || l === i)
+    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)
         break;
-      l = y(I(l));
+      l = v(R(l));
     }
   }
   return {
-    id: S(e.routesDir, n, "Route"),
+    id: I(e.routesDir, n, "Route"),
     filePath: n,
     pathname: u,
     layouts: s.reverse(),
     ext: r.ext,
-    ...U(e.basePathname, u)
+    ...G(e.basePathname, u)
   };
 }
 function et(e, t) {
-  const r = C(e, t.dirPath), n = r.slice(e.basePathname.length);
+  const r = L(e, t.dirPath), n = r.slice(e.basePathname.length);
   return {
-    id: S(e.routesDir, t.filePath, "Route"),
+    id: I(e.routesDir, t.filePath, "Route"),
     filePath: t.filePath,
     chunkFileName: n,
-    ...U(e.basePathname, r)
+    ...G(e.basePathname, r)
   };
 }
 function tt(e, t) {
-  const n = C(e, t.dirPath) + t.extlessName + ".js", s = n.slice(e.basePathname.length);
+  const n = L(e, t.dirPath) + t.extlessName + ".js", s = n.slice(e.basePathname.length);
   return {
-    id: S(e.routesDir, t.filePath, "ServiceWorker"),
+    id: I(e.routesDir, t.filePath, "ServiceWorker"),
     filePath: t.filePath,
     chunkFileName: s,
-    ...U(e.basePathname, n)
+    ...G(e.basePathname, n)
   };
 }
 async function rt(e) {
   const t = [];
-  return await ce(t, y(e), A(e)), t;
+  return await ce(t, v(e), M(e)), t;
 }
 async function ce(e, t, r) {
-  const n = await v.promises.readdir(t);
+  const n = await x.promises.readdir(t);
   await Promise.all(
     n.map(async (s) => {
-      const i = y(W(t, s));
-      if ((await v.promises.stat(i)).isDirectory())
+      const i = v(j(t, s));
+      if ((await x.promises.stat(i)).isDirectory())
         await ce(e, i, s);
       else {
         const a = le(s);
@@ -454,12 +454,12 @@ async function ce(e, t, r) {
   );
 }
 async function nt(e) {
-  const t = e.serverPluginsDir, r = await v.promises.readdir(t), n = [];
+  const t = e.serverPluginsDir, r = await x.promises.readdir(t), n = [];
   return await Promise.all(
     r.map(async (s) => {
-      const i = y(W(t, s)), o = N(s), a = b(s);
-      (F(o) || ae(o)) && je(a) && n.push({
-        id: S(e.serverPluginsDir, i, "Plugin"),
+      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
       });
@@ -507,31 +507,31 @@ function it(e, t) {
   }), t.routes = r;
 }
 function ot(e, t, r) {
-  const n = ($) => (t.paths || {})[$] ?? $, 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), h = e.pattern.toString().split("\\/"), [d, ...p] = h.map(n), w = [
-    d,
+  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,
-    ...p
-  ].join("\\/"), m = w.substring(
+    ...d
+  ].join("\\/"), g = m.substring(
     1,
-    e.pathname === "/" ? w.length - 1 : w.length - 2
-  ), P = e.segments.map(
-    ($) => $.map((G) => ({ ...G, content: n(G.content) }))
+    e.pathname === "/" ? m.length - 1 : m.length - 2
+  ), b = e.segments.map(
+    (k) => k.map((A) => ({ ...A, content: n(A.content) }))
   );
-  t.prefix && P.splice(0, 0, [
+  t.prefix && b.splice(0, 0, [
     {
       content: t.prefix,
       dynamic: !1,
       rest: !1
     }
   ]);
-  const R = c.join("/"), k = f.join("/");
+  const P = c.join("/"), y = f.join("/");
   return {
     ...e,
     id: e.id + (o || r),
-    pathname: s + R,
-    routeName: i + (k !== "/" ? k : ""),
-    pattern: new RegExp(m),
-    segments: P
+    pathname: s + P,
+    routeName: i + (y !== "/" ? y : ""),
+    pattern: new RegExp(g),
+    segments: b
   };
 }
 function at(e) {
@@ -554,7 +554,7 @@ ${n.map((s) => `  - ${s.filePath}`).join(`
 }
 function ut(e, t, r, n, s) {
   return {
-    rootDir: y(e),
+    rootDir: v(e),
     opts: ct(e, t, r),
     routes: [],
     serverPlugins: [],
@@ -578,7 +578,7 @@ function ct(e, t, r) {
     "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 = O(e, "src", "routes") : L(n.routesDir) || (n.routesDir = O(e, n.routesDir)), n.routesDir = y(n.routesDir), typeof n.serverPluginsDir != "string" ? n.serverPluginsDir = n.routesDir : L(n.serverPluginsDir) || (n.serverPluginsDir = O(e, n.serverPluginsDir)), n.serverPluginsDir = y(n.serverPluginsDir), typeof n.baseUrl == "string" && (n.basePathname = n.baseUrl), typeof n.basePathname != "string" && (n.basePathname = t), n.basePathname.endsWith("/") || (console.error(
+  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/");
@@ -587,17 +587,17 @@ function ct(e, t, r) {
 function ft(e) {
   return (t, r) => {
     const n = {};
-    x(t, "yaml", (s) => {
-      const i = ht(s.value);
+    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(y(r.path), n);
+    }), Object.keys(n).length > 0 && e.frontmatter.set(v(r.path), n);
   };
 }
-function ht(e) {
+function dt(e) {
   return typeof e == "string" && (e = e.trim(), e !== "") ? Pe(e) : null;
 }
-const dt = {
+const ht = {
   author: !0,
   creator: !0,
   "color-scheme": !0,
@@ -640,7 +640,7 @@ function pt(e) {
                       content: a?.toString()
                     });
             }
-          } else dt[n] ? r.meta.push({
+          } else ht[n] ? r.meta.push({
             name: n,
             content: s.toString()
           }) : r.frontmatter[n] = s;
@@ -653,30 +653,30 @@ function pt(e) {
 function mt() {
   return (e) => {
     const t = e, r = new xe();
-    x(t, "element", (n) => {
+    E(t, "element", (n) => {
       if (te(n) && n.properties) {
-        const i = q(n);
-        he(n, "id") || (n.properties.id = r.slug(i));
+        const i = B(n);
+        de(n, "id") || (n.properties.id = r.slug(i));
       }
     });
   };
 }
 function gt(e) {
   return (t, r) => {
-    const n = t, s = y(r.path);
+    const n = t, s = v(r.path);
     vt(n, e.opts, s), bt(e, n, s), Pt(e, n, s), xt(n);
   };
 }
 function yt() {
   return (e) => {
-    x(e, "element", (r) => {
+    E(e, "element", (r) => {
       r.properties && r.properties.className && (r.properties.class = r.properties.className, r.properties.className = void 0);
     });
   };
 }
 function wt() {
   return (e) => {
-    x(e, "element", (r) => {
+    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];
@@ -685,12 +685,12 @@ function wt() {
   };
 }
 function vt(e, t, r) {
-  x(e, "element", (n) => {
+  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 = N(i);
-        B(o) && (n.properties.href = j(
+        const o = $(i);
+        J(o) && (n.properties.href = C(
           t,
           r,
           n.properties.href,
@@ -702,27 +702,27 @@ function vt(e, t, r) {
 }
 function bt(e, t, r) {
   const n = e.frontmatter.get(r);
-  J(t, "frontmatter", n);
+  z(t, "frontmatter", n);
 }
 function Pt(e, t, r) {
   const n = e.frontmatter.get(r), s = pt(n);
-  s && J(t, "head", s);
+  s && z(t, "head", s);
 }
 function xt(e) {
   const t = [];
-  x(e, "element", (r) => {
+  E(e, "element", (r) => {
     const n = te(r);
-    if (n && r.properties && he(r, "id")) {
-      const s = q(r);
+    if (n && r.properties && de(r, "id")) {
+      const s = B(r);
       t.push({
         text: s,
         id: r.properties.id,
         level: n
       });
     }
-  }), t.length > 0 && J(e, "headings", t);
+  }), t.length > 0 && z(e, "headings", t);
 }
-function J(e, t, r) {
+function z(e, t, r) {
   const n = {
     type: "mdxjsEsm",
     value: "",
@@ -755,17 +755,17 @@ function J(e, t, r) {
   e.children.unshift(n);
 }
 const St = {}.hasOwnProperty;
-function he(e, t) {
+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 H.register(ke), async (e) => {
-    x(e, "element", (t, r, n) => {
+  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 && H.registered(o)) {
+          if (o && F.registered(o)) {
             t.properties.className[s] = "language-" + o, Et(t, o);
             return;
           }
@@ -774,7 +774,7 @@ function kt() {
   };
 }
 function Et(e, t) {
-  const r = q(e), n = H.highlight(r, t);
+  const r = B(e), n = F.highlight(r, t);
   n && Array.isArray(e.children) && (e.children = n.children);
 }
 function It(e) {
@@ -785,7 +785,7 @@ async function Nt(e) {
   (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 h = {
+  const p = {
     SourceMapGenerator: be,
     jsxImportSource: "@qwik.dev/core",
     ...o,
@@ -805,25 +805,25 @@ async function Nt(e) {
       wt
     ]
   };
-  return async function(d, p) {
-    const g = N(p);
-    if ([".mdx", ".md", ".markdown"].includes(g)) {
-      const w = new i({ value: d, path: p }), m = await t(w, h), P = String(m.value), R = `import { jsx } from '@qwik.dev/core';
-`, k = `
+  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 = `
 function _missingMdxReference(id, component, place) {
-  throw new Error("${p}: 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("${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 + "\`" : ""));
 }
 const WrappedMdxContent = () => {
   const content = _createMdxContent({});
   return typeof MDXLayout === 'function' ? jsx(MDXLayout, {children: content}) : content;
 };
 export default WrappedMdxContent;
-`, M = P.lastIndexOf("export default ");
-      if (M === -1)
+`, _ = b.lastIndexOf("export default ");
+      if (_ === -1)
         throw new Error("Could not find default export in mdx output");
       return {
-        code: R + P.slice(0, M) + k,
-        map: m.map
+        code: P + b.slice(0, _) + y,
+        map: g.map
       };
     }
   };
@@ -846,7 +846,7 @@ function $t(e) {
 `) + `
 `;
 }
-function T(e) {
+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;
 }
@@ -855,11 +855,11 @@ function _t(e, t, r, n) {
 /** 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(T(o.filePath));
+    const a = JSON.stringify(W(o.filePath));
     if (s)
       t.push(`  [${JSON.stringify(o.pathname)}, ()=>import(${a})],`);
     else {
-      const u = S(i, o.filePath);
+      const u = I(i, o.filePath);
       r.push(`import * as ${u} from ${a};`), t.push(`  [${JSON.stringify(o.pathname)}, ()=>${u}],`);
     }
   }
@@ -871,7 +871,7 @@ function Dt(e, t, r, n, s) {
     r.push(`
 /** Qwik Router Layouts (${e.layouts.length}) */`);
     for (const a of e.layouts) {
-      const u = JSON.stringify(T(a.filePath));
+      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}_;`));
     }
   }
@@ -882,10 +882,10 @@ function Dt(e, t, r, n, s) {
     if (Ce(a.ext)) {
       for (const l of a.layouts)
         u.push(l.id);
-      const c = T(a.filePath);
+      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 && F(a.ext)) {
-      const c = T(a.filePath);
+    } 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);
@@ -907,12 +907,12 @@ function Tt(e, t) {
   const r = [], n = e.api.getManifest();
   if (n) {
     const s = Object.keys(n.bundles), i = (o) => {
-      o = b(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 = b(c);
+            const l = S(c);
             o.endsWith(l) && (r.includes(a) || r.push(a));
           }
       }
@@ -927,7 +927,7 @@ 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(T(i.filePath));
+      const o = JSON.stringify(W(i.filePath));
       n.push(`import * as ${i.id} from ${o};`);
     }
     for (const i of e.serverPlugins)
@@ -964,14 +964,14 @@ const Ct = `
 function Mt(e, t) {
   const r = {};
   e.forEach((n) => {
-    const s = b(n.filePath), i = n.layouts ? n.layouts.map((u) => b(u.filePath)) : [], o = [s, ...i], a = [];
+    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 });
   });
   for (const n of Object.keys(t.bundles)) {
     const s = t.bundles[n];
-    if (s.origins?.some((i) => i.endsWith(E))) {
+    if (s.origins?.some((i) => i.endsWith(N))) {
       r[n] = {
         ...s,
         dynamicImports: s.dynamicImports?.filter(
@@ -987,7 +987,7 @@ function Lt(e, t) {
   if (!e.origins)
     return !1;
   for (const r of e.origins) {
-    const n = b(r);
+    const n = S(r);
     return t.some((s) => s.endsWith(n));
   }
 }
@@ -1001,7 +1001,7 @@ const Ht = (e) => {
       if (/^\s+at/.test(s)) {
         const i = s.indexOf("/"), o = s.lastIndexOf(")", i);
         if (i > 0) {
-          const u = s.slice(i, o).split(":"), c = K(u[u.length - 1]), l = K(u[u.length - 2]);
+          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,
@@ -1019,19 +1019,19 @@ const Ht = (e) => {
       }
     }
   }
-}, K = (e) => {
+}, V = (e) => {
   try {
     return parseInt(e, 10);
   } catch {
     return;
   }
-}, de = /\r?\n/, Y = 2;
+}, 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(de), { line: n, column: s } = t;
+  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;
@@ -1039,7 +1039,7 @@ function qt(e, t) {
 }
 function Ft(e, t = 0, r) {
   t = qt(e, t), r = r || t;
-  const n = e.split(de);
+  const n = e.split(he);
   let s = 0;
   const i = [];
   for (let o = 0; o < n.length; o++)
@@ -1122,9 +1122,9 @@ function Bt(e) {
         order: "pre",
         handler: async (r) => {
           const { params: n, pathId: s } = X(r);
-          if (z.extname(s).toLowerCase() === ".svg" && n.has("jsx"))
+          if (Q.extname(s).toLowerCase() === ".svg" && n.has("jsx"))
             return {
-              code: await v.promises.readFile(s, "utf-8"),
+              code: await x.promises.readFile(s, "utf-8"),
               moduleSideEffects: !1
             };
         }
@@ -1133,7 +1133,7 @@ function Bt(e) {
         n = n.toLowerCase();
         const { params: s, pathId: i } = X(n);
         if (s.has("jsx")) {
-          const o = z.extname(i).toLowerCase();
+          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");
@@ -1205,12 +1205,12 @@ function Ut({ code: e, path: t }, r) {
 async function Jt(e) {
   if (typeof e.routesDir != "string")
     throw new Error('qwikRouter plugin "routesDir" option missing');
-  if (!L(e.routesDir))
+  if (!q(e.routesDir))
     throw new Error(
       `qwikRouter plugin "routesDir" option must be an absolute path: ${e.routesDir}`
     );
   try {
-    if (!(await v.promises.stat(e.routesDir)).isDirectory())
+    if (!(await x.promises.stat(e.routesDir)).isDirectory())
       throw new Error(
         `qwikRouter plugin "routesDir" option must be a directory: ${e.routesDir}`
       );
@@ -1223,9 +1223,9 @@ function Gt(e) {
     const t = e;
     let r = t.loc;
     if (!t.frame && !t.plugin && (r || (r = Ht(t)), r && (t.loc = r, r.file))) {
-      t.id = y(t.loc.file);
+      t.id = v(t.loc.file);
       try {
-        const n = v.readFileSync(t.loc.file, "utf-8");
+        const n = x.readFileSync(t.loc.file, "utf-8");
         t.frame = Ft(n, t.loc);
       } catch {
       }
@@ -1256,7 +1256,7 @@ class zt {
       }
       return this.origSetHeader(s, i);
     }, this.response.writeHead = (s, i, o) => {
-      if (o && typeof o == "object") {
+      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();
@@ -1309,7 +1309,7 @@ class zt {
       ), n = r.indexOf("[FAKE_HEAD]"), s = r.indexOf("</head>", n);
       if (n === -1 || s === -1)
         throw new Error("Transformed HTML does not contain [FAKE_HEAD]...</head>");
-      const i = r.slice(12, n), o = r.slice(
+      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);
@@ -1379,32 +1379,33 @@ const Kt = (e, t) => async (r, n, s) => {
     );
     return;
   }
+  globalThis.__qwik = void 0;
   const { createQwikRouter: u } = await e.ssrLoadModule(
     "@qwik.dev/router/middleware/node"
   );
   try {
-    const c = (async (p) => await o(p)), { router: l, staticFile: f, notFound: h } = u({ render: c }), d = Qt(r, n, e);
-    f(r, d, () => {
-      l(r, d, () => {
-        h(r, d, s);
+    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);
       });
     });
   } catch (c) {
     c instanceof Error && (e.ssrFixStacktrace(c), Gt(c)), s(c);
     return;
   }
-}, Yt = [".css", ".scss", ".sass", ".less", ".styl", ".stylus"], Xt = /\.[mc]?[tj]sx?$/, V = (e) => Yt.some((t) => e.endsWith(t)), Vt = (e) => {
+}, 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 && V(o)) {
+      if (!a && Z(o)) {
         const u = i.importers.size === 0, c = Array.from(i.importers).some((f) => {
-          const h = f.url || f.file, d = h && V(h);
-          return d && i.url && r.add(i.url), d;
+          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 h = f.url || f.file;
-          return h && Xt.test(h);
+          const p = f.url || f.file;
+          return p && Yt.test(p);
         });
         (u || l) && !c && !r.has(i.url) && t.add(i);
       }
@@ -1412,10 +1413,10 @@ const Kt = (e, t) => async (r, n, s) => {
   }), [...t].map(
     ({ url: n, lastHMRTimestamp: s }) => `${n}${s ? `?t=${s}` : ""}`
   );
-}, Zt = (e) => Vt(e).map((r) => ({
+}, Zt = (e) => Xt(e).map((r) => ({
   tag: "link",
   attrs: { rel: "stylesheet", href: r }
-})), E = "@qwik-router-config", _ = "@qwik-router-entries", Z = "@qwik.dev/router", D = "@qwik-router-sw-register";
+})), N = "@qwik-router-config", D = "@qwik-router-entries", H = "@qwik.dev/router", O = "@qwik-router-sw-register";
 function wr(e) {
   return er(e);
 }
@@ -1424,6 +1425,7 @@ function er(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 {
     name: "vite-plugin-qwik-router",
     enforce: "pre",
@@ -1432,8 +1434,8 @@ function tr(e) {
       getRoutes: () => t?.routes.slice() ?? [],
       getServiceWorkers: () => t?.serviceWorkers.slice() ?? []
     },
-    async config(h, d) {
-      return a = d.command, {
+    async config(d, h) {
+      return a = h.command, {
         define: {
           "globalThis.__DEFAULT_LOADERS_SERIALIZATION_STRATEGY__": JSON.stringify(
             e?.defaultLoadersSerializationStrategy || "never"
@@ -1442,29 +1444,37 @@ function tr(e) {
         },
         appType: "custom",
         resolve: {
+          dedupe: [H, "@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: E },
-            { find: "@qwik-city-entries", replacement: _ },
-            { find: "@qwik-city-sw-register", replacement: D }
+            { find: "@qwik-city-plan", replacement: N },
+            { find: "@qwik-city-entries", replacement: D },
+            { find: "@qwik-city-sw-register", replacement: O }
           ]
         },
         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@*`
+          ],
+          // These need processing by the optimizer during dev
           exclude: [
-            Z,
-            E,
-            _,
-            D
+            H,
+            N,
+            D,
+            O
           ]
         },
         ssr: {
           external: ["node:async_hooks"],
           noExternal: [
-            Z,
-            E,
-            _,
-            D
+            H,
+            N,
+            D,
+            O
           ]
         },
         server: {
@@ -1475,37 +1485,39 @@ function tr(e) {
         }
       };
     },
-    async configResolved(h) {
-      Object.assign(process.env, me(h.mode, process.cwd(), "")), n = O(h.root);
-      const d = h.build?.ssr || h.mode === "ssr" ? "ssr" : "client";
+    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,
-        h.base,
+        d.base,
         e,
-        d,
+        h,
         !e?.staticImportRoutes
-      ), await Jt(t.opts), r = await Nt(t), s = h.plugins.find((p) => p.name === "vite-plugin-qwik"), !s)
+      ), await Jt(t.opts), r = await Nt(t), s = d.plugins.find(
+        (m) => m.name === "vite-plugin-qwik"
+      ), !s)
         throw new Error("Missing vite-plugin-qwik");
-      typeof c != "boolean" && (c = s.api._oldDevSsrServer()), s.api.registerBundleGraphAdder?.((p) => Mt(t.routes, p)), h.ssr?.format === "cjs" && (i = "cjs"), o = h.build?.outDir;
+      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;
     },
-    async configureServer(h) {
-      u = h;
-      const d = O(
+    async configureServer(d) {
+      u = d;
+      const h = T(
         n,
         "src/routes/**/{index,layout,entry,service-worker}{.,@,-}*"
       );
-      if (h.watcher.add(d), await new Promise((p) => setTimeout(p, 1e3)), h.watcher.on("change", (p) => {
-        if (!/\/(index[.@]|layout[.-]|entry\.|service-worker\.)[^/]*$/.test(p))
+      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))
           return;
         t.isDirty = !0;
-        const g = h.environments?.ssr?.moduleGraph;
+        const g = d.environments?.ssr?.moduleGraph;
         if (g) {
-          const w = g.getModuleById("@qwik-router-config");
-          w && g.invalidateModule(w);
+          const b = g.getModuleById("@qwik-router-config");
+          b && g.invalidateModule(b);
         }
       }), e?.devSsrServer !== !1)
         return () => {
-          h.middlewares.use(Kt(h, t));
+          d.middlewares.use(Kt(d, t));
         };
     },
     transformIndexHtml() {
@@ -1515,72 +1527,72 @@ function tr(e) {
     buildStart() {
       lt(t);
     },
-    resolveId(h) {
-      return h === E || h === _ ? {
-        id: h,
+    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"
-      } : h === D ? h : null;
+      } : d === O ? d : null;
     },
-    async load(h, d) {
+    async load(d, h) {
       if (t) {
-        if (h.endsWith(_))
+        if (d.endsWith(D))
           return $t(t);
-        const p = h.endsWith(E), g = h.endsWith(D);
-        if (p || g) {
-          if (t.isDirty && (await fe(t), t.isDirty = !1, t.diagnostics.forEach((w) => {
-            this.warn(w.message);
-          })), p)
-            return jt(t, s, d?.ssr ?? !1);
+        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);
         }
       }
       return null;
     },
-    async transform(h, d) {
-      if (d.startsWith("\0"))
+    async transform(d, h) {
+      if (h.startsWith("\0"))
         return;
-      const p = we(d).toLowerCase();
-      if (t && (p === ".md" || p === ".mdx")) {
-        const w = A(d);
-        if (ue(w))
-          return { code: await Ue(t.opts, d, h), map: null };
+      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)
           try {
-            return await r(h, d);
-          } catch (m) {
-            if (m && typeof m == "object" && "position" in m && "reason" in m) {
-              const P = m.position?.start.column, R = m.position?.start.line, k = Object.assign(new Error(m.reason), {
-                id: d,
+            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,
                 plugin: "qwik-router-mdx",
                 loc: {
-                  column: P,
-                  line: R
+                  column: _,
+                  line: k
                 },
                 stack: ""
               });
-              this.error(k);
-            } else m instanceof Error ? this.error(m) : this.error(String(m));
+              this.error(A);
+            } else y instanceof Error ? this.error(y) : this.error(String(y));
           }
       }
       return null;
     },
-    generateBundle(h, d) {
+    generateBundle(d, h) {
       if (t?.target === "client") {
-        const p = [...t.entries, ...t.serviceWorkers].map((g) => ({
+        const m = [...t.entries, ...t.serviceWorkers].map((g) => ({
           chunkFileName: g.chunkFileName,
-          extensionlessFilePath: b(g.filePath)
+          extensionlessFilePath: S(g.filePath)
         }));
-        for (const g of p)
-          for (const w in d) {
-            const m = d[w];
-            if (m.type === "chunk" && m.isDynamicEntry && m.facadeModuleId) {
-              const P = b(y(m.facadeModuleId));
-              if (g.extensionlessFilePath === P) {
-                m.fileName = g.chunkFileName;
+        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;
                 continue;
               }
             }
@@ -1596,11 +1608,11 @@ function tr(e) {
   };
 }
 async function rr(e, t) {
-  await v.promises.mkdir(e, { recursive: !0 });
-  const r = W(e, "package.json");
+  await x.promises.mkdir(e, { recursive: !0 });
+  const r = j(e, "package.json");
   let n = {};
-  if (v.existsSync(r)) {
-    const i = await v.promises.readFile(r, "utf-8");
+  if (x.existsSync(r)) {
+    const i = await x.promises.readFile(r, "utf-8");
     n = {
       ...JSON.parse(i)
     };
@@ -1610,7 +1622,7 @@ async function rr(e, t) {
     type: t == "cjs" ? "commonjs" : "module"
   };
   const s = JSON.stringify(n, null, 2);
-  await v.promises.writeFile(r, s);
+  await x.promises.writeFile(r, s);
 }
 export {
   yr as extendConfig,