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

package/lib/adapters/vercel-edge/vite/index.mjs

@@ -1,98 +1,98 @@
-import d from "node:fs";
-import { join as m, resolve as D, dirname as P, basename as q } from "node:path";
-import { getErrorHtml as E } from "@qwik.dev/router/middleware/request-handler";
-async function O(e, n, t, r, g) {
+import g from "node:fs";
+import { join as p, resolve as E, dirname as P, basename as q } from "node:path";
+import { getErrorHtml as O } from "@qwik.dev/router/middleware/request-handler";
+async function C(e, n, t, i, w) {
   t && !t.endsWith("/") && (t += "/");
-  const p = /* @__PURE__ */ new Set([
+  const m = /* @__PURE__ */ new Set([
     t + "/" + (globalThis.__QWIK_BUILD_DIR__ || "build") + "/",
     t + "/" + (globalThis.__QWIK_ASSETS_DIR__ || "assets") + "/"
-  ]), s = new Set(r.map(S)), w = [], h = async (u, c, f) => {
-    if (f = S(f), p.has(f))
+  ]), s = new Set(i.map(_)), h = [], c = async (l, u, d) => {
+    if (d = _(d), m.has(d))
       return;
-    const y = m(u, c);
-    if (c === "index.html" || c === "q-data.json") {
-      !s.has(f) && g && await d.promises.unlink(y);
+    const y = p(l, u);
+    if (u === "index.html" || u === "q-data.json") {
+      !s.has(d) && w && await g.promises.unlink(y);
       return;
     }
-    if (c === "404.html") {
-      const v = await d.promises.readFile(y, "utf-8");
-      w.push([f, v]);
+    if (u === "404.html") {
+      const o = await g.promises.readFile(y, "utf-8");
+      h.push([d, o]);
       return;
     }
-    const o = await d.promises.stat(y);
-    o.isDirectory() ? await i(y, f + c + "/") : o.isFile() && s.add(f + c);
-  }, i = async (u, c) => {
-    const f = await d.promises.readdir(u);
-    await Promise.all(f.map((y) => h(u, y, c)));
+    const v = await g.promises.stat(y);
+    v.isDirectory() ? await f(y, d + u + "/") : v.isFile() && s.add(d + u);
+  }, f = async (l, u) => {
+    const d = await g.promises.readdir(l);
+    await Promise.all(d.map((y) => c(l, y, u)));
   };
-  d.existsSync(e) && await i(e, t);
-  const l = C(t, w), a = R(s);
-  await T(a, l, n);
+  g.existsSync(e) && await f(e, t);
+  const r = R(t, h), a = T(s);
+  await I(a, r, n);
 }
-function S(e) {
+function _(e) {
   return e.endsWith("/") ? e : e + "/";
 }
-function C(e, n) {
-  if (n.sort((t, r) => t[0].length > r[0].length ? -1 : t[0].length < r[0].length ? 1 : t[0] < r[0] ? -1 : t[0] > r[0] ? 1 : 0), !n.some((t) => t[0] === e)) {
-    const t = E(404, "Resource Not Found");
+function R(e, n) {
+  if (n.sort((t, i) => t[0].length > i[0].length ? -1 : t[0].length < i[0].length ? 1 : t[0] < i[0] ? -1 : t[0] > i[0] ? 1 : 0), !n.some((t) => t[0] === e)) {
+    const t = O(404, "Resource Not Found");
     n.push([e, t]);
   }
   return JSON.stringify(n, null, 2).slice(1, -1);
 }
-function R(e) {
+function T(e) {
   return JSON.stringify(Array.from(new Set(e)).sort()).slice(1, -1);
 }
-const T = async (e, n, t) => {
-  const r = /* @__PURE__ */ new Set(), g = async (s) => {
-    const w = await d.promises.readFile(s, "utf-8");
-    let h = !1;
-    const i = w.replace(
+const I = async (e, n, t) => {
+  const i = /* @__PURE__ */ new Set(), w = async (s) => {
+    const h = await g.promises.readFile(s, "utf-8");
+    let c = !1;
+    const f = h.replace(
       /(['"])__QWIK_ROUTER_(STATIC_PATHS|NOT_FOUND)_ARRAY__\1/g,
-      (l, a, u) => (h = !0, u === "STATIC_PATHS" ? e : n)
+      (r, a, l) => (c = !0, l === "STATIC_PATHS" ? e : n)
     );
-    h && await d.promises.writeFile(s, i);
-  }, p = async (s) => {
-    const w = await d.promises.readdir(s, { withFileTypes: !0 });
-    for (const h of w)
-      if (h.isDirectory())
-        await p(m(s, h.name));
-      else if (h.name.endsWith("js")) {
-        const i = g(m(s, h.name)).finally(() => {
-          r.delete(i);
+    c && await g.promises.writeFile(s, f);
+  }, m = async (s) => {
+    const h = await g.promises.readdir(s, { withFileTypes: !0 });
+    for (const c of h)
+      if (c.isDirectory())
+        await m(p(s, c.name));
+      else if (c.name.endsWith("js")) {
+        const f = w(p(s, c.name)).finally(() => {
+          i.delete(f);
         });
-        r.add(i);
+        i.add(f);
       }
   };
-  await p(t), await Promise.all(r);
+  await m(t), await Promise.all(i);
 };
-function I(e) {
-  let n = null, t = null, r = null, g = null, p = null, s = !1;
-  const w = [];
+function A(e) {
+  let n = null, t = null, i = null, w = null, m = null, s = !1, h;
+  const c = [];
   return {
     name: `vite-plugin-qwik-router-ssg-${e.name}`,
     enforce: "post",
     apply: "build",
-    config(i) {
-      return typeof e.config == "function" && (i = e.config(i)), i.define = {
+    config(r) {
+      return typeof e.config == "function" && (r = e.config(r)), r.define = {
         "process.env.NODE_ENV": JSON.stringify("production"),
-        ...i.define
-      }, i;
+        ...r.define
+      }, r;
     },
-    configResolved(i) {
-      if (s = !!i.build.ssr, s) {
-        if (n = i.plugins.find(
-          (l) => l.name === "vite-plugin-qwik-router"
+    configResolved(r) {
+      if (s = !!r.build.ssr, h = r.command, s) {
+        if (n = r.plugins.find(
+          (a) => a.name === "vite-plugin-qwik-router"
         ), !n)
           throw new Error("Missing vite-plugin-qwik-router");
-        if (t = i.plugins.find(
-          (l) => l.name === "vite-plugin-qwik"
+        if (t = r.plugins.find(
+          (a) => a.name === "vite-plugin-qwik"
         ), !t)
           throw new Error("Missing vite-plugin-qwik");
-        if (r = i.build.outDir, i.build?.ssr !== !0)
+        if (i = r.build.outDir, r.build?.ssr !== !0)
           throw new Error(
             `"build.ssr" must be set to "true" in order to use the "${e.name}" adapter.`
           );
-        if (!i.build?.rollupOptions?.input)
+        if (!r.build?.rollupOptions?.input)
           throw new Error(
             `"build.rollupOptions.input" must be set in order to use the "${e.name}" adapter.`
           );
@@ -100,33 +100,33 @@ function I(e) {
     },
     buildStart() {
       if (s && e.ssg !== null) {
-        const { srcDir: i } = t.api.getOptions();
-        this.emitFile({
+        const { srcDir: r } = t.api.getOptions();
+        h === "build" && i && r && (this.emitFile({
           id: "@qwik-router-config",
           type: "chunk",
           fileName: "@qwik-router-config.js"
         }), this.emitFile({
-          id: `${i}/entry.ssr`,
+          id: `${r}/entry.ssr`,
           type: "chunk",
           fileName: "entry.ssr.js"
-        });
+        }));
       }
     },
-    generateBundle(i, l) {
+    generateBundle(r, a) {
       if (s) {
-        w.length = 0;
-        for (const a in l) {
-          const u = l[a];
-          u.type === "chunk" && u.isEntry && (w.push(a), u.name === "entry.ssr" ? g = m(r, a) : u.name === "@qwik-router-config" && (p = m(r, a)));
+        c.length = 0;
+        for (const l in a) {
+          const u = a[l];
+          u.type === "chunk" && u.isEntry && (c.push(l), u.name === "entry.ssr" ? w = p(i, l) : u.name === "@qwik-router-config" && (m = p(i, l)));
         }
       }
     },
     closeBundle: {
       sequential: !0,
       async handler() {
-        if (s && r && n?.api && t?.api) {
-          const i = e.staticPaths || [], l = n.api.getRoutes(), a = n.api.getBasePathname(), u = t.api.getClientOutDir(), c = t.api.getClientPublicOutDir(), f = t.api.getAssetsDir(), y = t.api.getRootDir() ?? void 0;
-          if (e.ssg !== null && g && p && u && c) {
+        if (s && i && n?.api && t?.api) {
+          const r = e.staticPaths || [], a = n.api.getRoutes(), l = n.api.getBasePathname(), u = t.api.getClientOutDir(), d = t.api.getClientPublicOutDir(), y = t.api.getAssetsDir(), v = t.api.getRootDir() ?? void 0;
+          if (e.ssg !== null && w && m && u && d) {
             let o = e.ssg?.origin ?? e.origin;
             o || (o = "https://yoursite.qwik.dev"), o.length > 0 && !/:\/\//.test(o) && (o = `https://${o}`), o.startsWith("//") && (o = `https:${o}`);
             try {
@@ -136,38 +136,38 @@ function I(e) {
                 `Invalid "origin" option: "${o}". Using default origin: "https://yoursite.qwik.dev"`
               ), o = "https://yoursite.qwik.dev";
             }
-            const v = await import("./index-CrwlB95_.js"), b = {
+            const b = await import("./index-CrwlB95_.js"), D = {
               maxWorkers: e.maxWorkers,
-              basePathname: a,
-              outDir: c,
-              rootDir: y,
+              basePathname: l,
+              outDir: d,
+              rootDir: v,
               ...e.ssg,
               origin: o,
-              renderModulePath: g,
-              qwikRouterConfigModulePath: p
-            }, k = await v.generate(b);
+              renderModulePath: w,
+              qwikRouterConfigModulePath: m
+            }, k = await b.generate(D);
             if (k.errors > 0) {
-              const _ = new Error(
+              const S = new Error(
                 `Error while running SSG from "${e.name}" adapter. At least one path failed to render.`
               );
-              _.stack = void 0, this.error(_);
+              S.stack = void 0, this.error(S);
             }
-            i.push(...k.staticPaths);
+            r.push(...k.staticPaths);
           }
-          await O(
-            c,
-            r,
-            f ? m(a, f) : a,
+          await C(
+            d,
             i,
+            y ? p(l, y) : l,
+            r,
             !!e.cleanStaticGenerated
           ), typeof e.generate == "function" && await e.generate({
-            outputEntries: w,
-            serverOutDir: r,
+            outputEntries: c,
+            serverOutDir: i,
             clientOutDir: u,
-            clientPublicOutDir: c,
-            basePathname: a,
-            routes: l,
-            assetsDir: f,
+            clientPublicOutDir: d,
+            basePathname: l,
+            routes: a,
+            assetsDir: y,
             warn: (o) => this.warn(o),
             error: (o) => this.error(o)
           }), this.warn(
@@ -177,6 +177,10 @@ Note: Make sure that you are serving the built files with proper cache headers.
 See https://qwik.dev/docs/deployments/#cache-headers for more information.
 ==============================================`
           ), e.ssg !== null && setTimeout(() => {
+            console.warn(
+              "SSG seems to be hanging after completion, forcing process to exit. Everything is likely fine."
+            ), process.exit(0);
+          }, 5e3).unref(), e.ssg !== null && setTimeout(() => {
             process.exit(0);
           }, 5e3).unref();
         }
@@ -184,26 +188,26 @@ See https://qwik.dev/docs/deployments/#cache-headers for more information.
     }
   };
 }
-function A(e, n) {
-  const t = D("/");
-  let r = e;
-  for (let g = 0; g < 20; g++) {
-    if (r = P(r), q(r) === n)
-      return r;
-    if (r === t)
+function F(e, n) {
+  const t = E("/");
+  let i = e;
+  for (let w = 0; w < 20; w++) {
+    if (i = P(i), q(i) === n)
+      return i;
+    if (i === t)
       break;
   }
   throw new Error(`Unable to find "${n}" directory from "${e}"`);
 }
 function U(e = {}) {
-  return I({
+  return A({
     name: "vercel-edge",
     origin: process?.env?.VERCEL_URL || "https://yoursitename.vercel.app",
     ssg: e.ssg,
     staticPaths: e.staticPaths,
     cleanStaticGenerated: !0,
     config(n) {
-      const t = n.build?.outDir || m(".vercel", "output", "functions", "_qwik-router.func");
+      const t = n.build?.outDir || p(".vercel", "output", "functions", "_qwik-router.func");
       return {
         resolve: {
           conditions: e.target === "node" ? ["node", "import", "module", "browser", "default"] : ["edge-light", "webworker", "worker", "browser", "module", "main"]
@@ -225,35 +229,35 @@ function U(e = {}) {
         publicDir: !1
       };
     },
-    async generate({ clientPublicOutDir: n, serverOutDir: t, basePathname: r, outputEntries: g }) {
-      const p = A(t, "output");
+    async generate({ clientPublicOutDir: n, serverOutDir: t, basePathname: i, outputEntries: w }) {
+      const m = F(t, "output");
       if (e.outputConfig !== !1) {
         const a = {
           routes: [
             { handle: "filesystem" },
             {
-              src: r + ".*",
+              src: i + ".*",
               dest: "/_qwik-router"
             }
           ],
           version: 3
         };
-        await d.promises.writeFile(
-          m(p, "config.json"),
+        await g.promises.writeFile(
+          p(m, "config.json"),
           JSON.stringify(a, null, 2)
         );
       }
       let s = e.vcConfigEntryPoint;
-      s || (g.some((a) => a === "entry.vercel-edge.mjs") ? s = "entry.vercel-edge.mjs" : s = "entry.vercel-edge.js");
-      const w = m(t, ".vc-config.json"), h = {
+      s || (w.some((a) => a === "entry.vercel-edge.mjs") ? s = "entry.vercel-edge.mjs" : s = "entry.vercel-edge.js");
+      const h = p(t, ".vc-config.json"), c = {
         runtime: "edge",
         entrypoint: s,
         envVarsInUse: e.vcConfigEnvVarsInUse
       };
-      await d.promises.writeFile(w, JSON.stringify(h, null, 2));
-      let i = m(p, "static");
-      const l = r.split("/").filter((a) => a.length > 0);
-      l.length > 0 && (i = m(i, ...l)), await d.promises.rm(i, { recursive: !0, force: !0 }), await d.promises.mkdir(P(i), { recursive: !0 }), await d.promises.rename(n, i);
+      await g.promises.writeFile(h, JSON.stringify(c, null, 2));
+      let f = p(m, "static");
+      const r = i.split("/").filter((a) => a.length > 0);
+      r.length > 0 && (f = p(f, ...r)), await g.promises.rm(f, { recursive: !0, force: !0 }), await g.promises.mkdir(P(f), { recursive: !0 }), await g.promises.rename(n, f);
     }
   });
 }

package/lib/index.qwik.cjs

@@ -75,7 +75,9 @@ const loadClientData = async (url, element, opts, retryCount = 0) => {
         const redirectedURL = new URL(rsp.url);
         const isQData = redirectedURL.pathname.endsWith("/q-data.json");
         if (!isQData || redirectedURL.origin !== location.origin) {
-          location.href = redirectedURL.href;
+          if (!opts?.isPrefetch) {
+            location.href = redirectedURL.href;
+          }
           return;
         }
       }
@@ -376,23 +378,31 @@ const resolveHead = (endpoint, routeLocation, contentModules, locale, defaults)
     }
     return data;
   };
-  const headProps = {
-    head,
-    withLocale: (fn) => core.withLocale(locale, fn),
-    resolveValue: getData,
-    ...routeLocation
-  };
-  for (let i = contentModules.length - 1; i >= 0; i--) {
-    const contentModuleHead = contentModules[i] && contentModules[i].head;
+  const fns = [];
+  for (const contentModule of contentModules) {
+    const contentModuleHead = contentModule?.head;
     if (contentModuleHead) {
       if (typeof contentModuleHead === "function") {
-        resolveDocumentHead(head, core.withLocale(locale, () => contentModuleHead(headProps)));
+        fns.unshift(contentModuleHead);
       } else if (typeof contentModuleHead === "object") {
         resolveDocumentHead(head, contentModuleHead);
       }
     }
   }
-  return headProps.head;
+  if (fns.length) {
+    const headProps = {
+      head,
+      withLocale: (fn) => core.withLocale(locale, fn),
+      resolveValue: getData,
+      ...routeLocation
+    };
+    core.withLocale(locale, () => {
+      for (const fn of fns) {
+        resolveDocumentHead(head, fn(headProps));
+      }
+    });
+  }
+  return head;
 };
 const resolveDocumentHead = (resolvedHead, updatedHead) => {
   if (typeof updatedHead.title === "string") {
@@ -572,7 +582,7 @@ const deepFreeze = (obj) => {
   });
   return Object.freeze(obj);
 };
-const loadRoute = async (routes, menus, cacheModules, pathname) => {
+const loadRoute = async (routes, menus, cacheModules, pathname, isInternal) => {
   if (!Array.isArray(routes)) {
     return null;
   }
@@ -589,9 +599,11 @@ const loadRoute = async (routes, menus, cacheModules, pathname) => {
     loaders.forEach((moduleLoader, i) => {
       loadModule(moduleLoader, pendingLoads, (routeModule) => modules[i] = routeModule, cacheModules);
     });
-    const menuLoader = getMenuLoader(menus, pathname);
     let menu = void 0;
-    loadModule(menuLoader, pendingLoads, (menuModule) => menu = menuModule?.default, cacheModules);
+    {
+      const menuLoader = getMenuLoader(menus, pathname);
+      loadModule(menuLoader, pendingLoads, (menuModule) => menu = menuModule?.default, cacheModules);
+    }
     if (pendingLoads.length > 0) {
       await Promise.all(pendingLoads);
     }
@@ -628,7 +640,7 @@ const loadModule = (moduleLoader, pendingLoads, moduleSetter, cacheModules) => {
 const getMenuLoader = (menus, pathname) => {
   if (menus) {
     pathname = pathname.endsWith("/") ? pathname : pathname + "/";
-    const menu = menus.find((m) => m[MenuDataProp.Pathname] === pathname || pathname.startsWith(m[MenuDataProp.Pathname] + (pathname.endsWith("/") ? "" : "/")));
+    const menu = menus.find((m) => m[MenuDataProp.Pathname] === pathname || pathname.startsWith(m[MenuDataProp.Pathname]));
     if (menu) {
       return menu[MenuDataProp.MenuLoader];
     }
@@ -855,6 +867,7 @@ const startViewTransition = (params) => {
     params.update?.();
   }
 };
+const transitionCss = "@layer qwik {\n  @supports selector(html:active-view-transition-type(type)) {\n    html:active-view-transition-type(qwik-navigation) {\n      :root {\n        view-transition-name: none;\n      }\n    }\n  }\n  @supports not selector(html:active-view-transition-type(type)) {\n    :root {\n      view-transition-name: none;\n    }\n  }\n}\n";
 const QWIK_CITY_SCROLLER = "_qCityScroller";
 const QWIK_ROUTER_SCROLLER = "_qRouterScroller";
 const preventNav = {};
@@ -862,18 +875,7 @@ const internalState = {
   navCount: 0
 };
 const useQwikRouter = (props) => {
-  core.useStyles$(`
-    @layer qwik {
-      @supports selector(html:active-view-transition-type(type)) {
-        html:active-view-transition-type(qwik-navigation) {
-          :root{view-transition-name:none}
-        }
-      }
-      @supports not selector(html:active-view-transition-type(type)) {
-        :root{view-transition-name:none}
-      }
-    }
-  `);
+  core.useStyles$(transitionCss);
   const env = useQwikRouterEnv();
   if (!env?.params) {
     throw new Error(`Missing Qwik Router Env Data for help visit https://github.com/QwikDev/qwik/issues/6237`);
@@ -1427,6 +1429,7 @@ const RouterOutlet = core.component$(() => {
   return core.SkipRender;
 });
 var store;
+// @__NO_SIDE_EFFECTS__
 function getGlobalConfig(config2) {
   return {
     lang: config2?.lang ?? store?.lang,
@@ -1435,6 +1438,7 @@ function getGlobalConfig(config2) {
     abortPipeEarly: config2?.abortPipeEarly ?? store?.abortPipeEarly
   };
 }
+// @__NO_SIDE_EFFECTS__
 function getDotPath(issue) {
   if (issue.path) {
     let key = "";
@@ -1453,11 +1457,12 @@ function getDotPath(issue) {
   }
   return null;
 }
+// @__NO_SIDE_EFFECTS__
 function flatten(issues) {
   const flatErrors = {};
   for (const issue of issues) {
     if (issue.path) {
-      const dotPath = getDotPath(issue);
+      const dotPath = /* @__PURE__ */ getDotPath(issue);
       if (dotPath) {
         if (!flatErrors.nested) {
           flatErrors.nested = {};
@@ -1484,10 +1489,11 @@ function flatten(issues) {
   }
   return flatErrors;
 }
+// @__NO_SIDE_EFFECTS__
 async function safeParseAsync(schema, input, config2) {
-  const dataset = await schema._run(
-    { typed: false, value: input },
-    getGlobalConfig(config2)
+  const dataset = await schema["~run"](
+    { value: input },
+    /* @__PURE__ */ getGlobalConfig(config2)
   );
   return {
     typed: dataset.typed,
@@ -1663,7 +1669,7 @@ const valibotQrl = (qrl) => {
       async validate(ev, inputData) {
         const schema = await qrl.resolve().then((obj) => typeof obj === "function" ? obj(ev) : obj);
         const data = inputData ?? await ev.parseBody();
-        const result = await safeParseAsync(schema, data);
+        const result = await /* @__PURE__ */ safeParseAsync(schema, data);
         if (result.success) {
           return {
             success: true,
@@ -1677,7 +1683,7 @@ const valibotQrl = (qrl) => {
             success: false,
             status: 400,
             error: {
-              formErrors: flatten(result.issues).root ?? [],
+              formErrors: (/* @__PURE__ */ flatten(result.issues)).root ?? [],
               fieldErrors: flattenValibotIssues(result.issues)
             }
           };