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

package/lib/adapters/ssg/vite/index.mjs

@@ -1,205 +1,18 @@
-import { join as y } from "node:path";
-import { getErrorHtml as D } from "@qwik.dev/router/middleware/request-handler";
-import p from "node:fs";
-async function O(e, l, t, n, m) {
-  t && !t.endsWith("/") && (t += "/");
-  const w = /* @__PURE__ */ new Set([
-    t + "/" + (globalThis.__QWIK_BUILD_DIR__ || "build") + "/",
-    t + "/" + (globalThis.__QWIK_ASSETS_DIR__ || "assets") + "/"
-  ]), s = new Set(n.map(P)), g = [], c = async (o, a, u) => {
-    if (u = P(u), w.has(u))
-      return;
-    const f = y(o, a);
-    if (a === "index.html" || a === "q-data.json") {
-      !s.has(u) && m && await p.promises.unlink(f);
-      return;
-    }
-    if (a === "404.html") {
-      const r = await p.promises.readFile(f, "utf-8");
-      g.push([u, r]);
-      return;
-    }
-    const k = await p.promises.stat(f);
-    k.isDirectory() ? await h(f, u + a + "/") : k.isFile() && s.add(u + a);
-  }, h = async (o, a) => {
-    const u = await p.promises.readdir(o);
-    await Promise.all(u.map((f) => c(o, f, a)));
-  };
-  p.existsSync(e) && await h(e, t);
-  const i = R(t, g), d = T(s);
-  await b(d, i, l);
-}
-function P(e) {
-  return e.endsWith("/") ? e : e + "/";
-}
-function R(e, l) {
-  if (l.sort((t, n) => t[0].length > n[0].length ? -1 : t[0].length < n[0].length ? 1 : t[0] < n[0] ? -1 : t[0] > n[0] ? 1 : 0), !l.some((t) => t[0] === e)) {
-    const t = D(404, "Resource Not Found");
-    l.push([e, t]);
-  }
-  return JSON.stringify(l, null, 2).slice(1, -1);
-}
-function T(e) {
-  return JSON.stringify(Array.from(new Set(e)).sort()).slice(1, -1);
-}
-const b = async (e, l, t) => {
-  const n = /* @__PURE__ */ new Set(), m = async (s) => {
-    const g = await p.promises.readFile(s, "utf-8");
-    let c = !1;
-    const h = g.replace(
-      /(['"])__QWIK_ROUTER_(STATIC_PATHS|NOT_FOUND)_ARRAY__\1/g,
-      (i, d, o) => (c = !0, o === "STATIC_PATHS" ? e : l)
-    );
-    c && await p.promises.writeFile(s, h);
-  }, w = async (s) => {
-    const g = await p.promises.readdir(s, { withFileTypes: !0 });
-    for (const c of g)
-      if (c.isDirectory())
-        await w(y(s, c.name));
-      else if (c.name.endsWith("js")) {
-        const h = m(y(s, c.name)).finally(() => {
-          n.delete(h);
-        });
-        n.add(h);
-      }
-  };
-  await w(t), await Promise.all(n);
-};
-function E(e) {
-  let l = null, t = null, n = null, m = null, w = null, s = !1, g;
-  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 = {
-        "process.env.NODE_ENV": JSON.stringify("production"),
-        ...i.define
-      }, i;
-    },
-    configResolved(i) {
-      if (s = !!i.build.ssr, g = i.command, s) {
-        if (l = i.plugins.find(
-          (d) => d.name === "vite-plugin-qwik-router"
-        ), !l)
-          throw new Error("Missing vite-plugin-qwik-router");
-        if (t = i.plugins.find(
-          (d) => d.name === "vite-plugin-qwik"
-        ), !t)
-          throw new Error("Missing vite-plugin-qwik");
-        if (n = i.build.outDir, i.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)
-          throw new Error(
-            `"build.rollupOptions.input" must be set in order to use the "${e.name}" adapter.`
-          );
-      }
-    },
-    buildStart() {
-      if (s && e.ssg !== null) {
-        const { srcDir: i } = t.api.getOptions();
-        g === "build" && n && i && (this.emitFile({
-          id: "@qwik-router-config",
-          type: "chunk",
-          fileName: "@qwik-router-config.js"
-        }), this.emitFile({
-          id: `${i}/entry.ssr`,
-          type: "chunk",
-          fileName: "entry.ssr.js"
-        }));
-      }
-    },
-    generateBundle(i, d) {
-      if (s) {
-        c.length = 0;
-        for (const o in d) {
-          const a = d[o];
-          a.type === "chunk" && a.isEntry && (c.push(o), a.name === "entry.ssr" ? m = y(n, o) : a.name === "@qwik-router-config" && (w = y(n, o)));
-        }
-      }
-    },
-    closeBundle: {
-      sequential: !0,
-      async handler() {
-        if (s && n && l?.api && t?.api) {
-          const i = e.staticPaths || [], d = l.api.getRoutes(), o = l.api.getBasePathname(), a = t.api.getClientOutDir(), u = t.api.getClientPublicOutDir(), f = t.api.getAssetsDir(), k = t.api.getRootDir() ?? void 0;
-          if (e.ssg !== null && m && w && a && u) {
-            let r = e.ssg?.origin ?? e.origin;
-            r || (r = "https://yoursite.qwik.dev"), r.length > 0 && !/:\/\//.test(r) && (r = `https://${r}`), r.startsWith("//") && (r = `https:${r}`);
-            try {
-              r = new URL(r).origin;
-            } catch {
-              this.warn(
-                `Invalid "origin" option: "${r}". Using default origin: "https://yoursite.qwik.dev"`
-              ), r = "https://yoursite.qwik.dev";
-            }
-            const v = await import("./index-CrwlB95_.js"), q = {
-              maxWorkers: e.maxWorkers,
-              basePathname: o,
-              outDir: u,
-              rootDir: k,
-              ...e.ssg,
-              origin: r,
-              renderModulePath: m,
-              qwikRouterConfigModulePath: w
-            }, S = await v.generate(q);
-            if (S.errors > 0) {
-              const _ = new Error(
-                `Error while running SSG from "${e.name}" adapter. At least one path failed to render.`
-              );
-              _.stack = void 0, this.error(_);
-            }
-            i.push(...S.staticPaths);
-          }
-          await O(
-            u,
-            n,
-            f ? y(o, f) : o,
-            i,
-            !!e.cleanStaticGenerated
-          ), typeof e.generate == "function" && await e.generate({
-            outputEntries: c,
-            serverOutDir: n,
-            clientOutDir: a,
-            clientPublicOutDir: u,
-            basePathname: o,
-            routes: d,
-            assetsDir: f,
-            warn: (r) => this.warn(r),
-            error: (r) => this.error(r)
-          }), this.warn(
-            `
-==============================================
-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();
-        }
-      }
-    }
-  };
-}
-function A(e) {
-  return E({
+import { viteAdapter } from '../../shared/vite/index.mjs';
+import 'node:path';
+import 'node:fs';
+import '../../../chunks/error-handler.mjs';
+
+function ssgAdapter(opts) {
+  return viteAdapter({
     name: "static-site-generation",
-    origin: e.origin,
+    origin: opts.origin,
     ssg: {
       include: ["/*"],
-      ...e
+      ...opts
     }
   });
 }
-const W = A;
-export {
-  A as ssgAdapter,
-  W as staticAdapter
-};
+const staticAdapter = ssgAdapter;
+
+export { ssgAdapter, staticAdapter };

package/lib/adapters/vercel-edge/vite/index.d.ts

@@ -35,7 +35,7 @@ export declare interface VercelEdgeAdapterOptions extends ServerAdapterOptions {
      */
     staticPaths?: string[];
     /**
-     * Define the `target` property in the `ssr` object in the `vite.config.mts` file.
+     * Define the `target` property in the `ssr` object in the `vite.config.ts` file.
      *
      * Defaults to `webworker`.
      */

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

@@ -1,266 +1,81 @@
-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 m = /* @__PURE__ */ new Set([
-    t + "/" + (globalThis.__QWIK_BUILD_DIR__ || "build") + "/",
-    t + "/" + (globalThis.__QWIK_ASSETS_DIR__ || "assets") + "/"
-  ]), s = new Set(i.map(_)), h = [], c = async (l, u, d) => {
-    if (d = _(d), m.has(d))
-      return;
-    const y = p(l, u);
-    if (u === "index.html" || u === "q-data.json") {
-      !s.has(d) && w && await g.promises.unlink(y);
-      return;
-    }
-    if (u === "404.html") {
-      const o = await g.promises.readFile(y, "utf-8");
-      h.push([d, o]);
-      return;
-    }
-    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)));
-  };
-  g.existsSync(e) && await f(e, t);
-  const r = R(t, h), a = T(s);
-  await I(a, r, n);
-}
-function _(e) {
-  return e.endsWith("/") ? e : e + "/";
-}
-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 T(e) {
-  return JSON.stringify(Array.from(new Set(e)).sort()).slice(1, -1);
-}
-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,
-      (r, a, l) => (c = !0, l === "STATIC_PATHS" ? e : n)
-    );
-    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);
-        });
-        i.add(f);
-      }
-  };
-  await m(t), await Promise.all(i);
-};
-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(r) {
-      return typeof e.config == "function" && (r = e.config(r)), r.define = {
-        "process.env.NODE_ENV": JSON.stringify("production"),
-        ...r.define
-      }, r;
-    },
-    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 = r.plugins.find(
-          (a) => a.name === "vite-plugin-qwik"
-        ), !t)
-          throw new Error("Missing vite-plugin-qwik");
-        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 (!r.build?.rollupOptions?.input)
-          throw new Error(
-            `"build.rollupOptions.input" must be set in order to use the "${e.name}" adapter.`
-          );
-      }
-    },
-    buildStart() {
-      if (s && e.ssg !== null) {
-        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: `${r}/entry.ssr`,
-          type: "chunk",
-          fileName: "entry.ssr.js"
-        }));
-      }
-    },
-    generateBundle(r, a) {
-      if (s) {
-        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 && 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 {
-              o = new URL(o).origin;
-            } catch {
-              this.warn(
-                `Invalid "origin" option: "${o}". Using default origin: "https://yoursite.qwik.dev"`
-              ), o = "https://yoursite.qwik.dev";
-            }
-            const b = await import("./index-CrwlB95_.js"), D = {
-              maxWorkers: e.maxWorkers,
-              basePathname: l,
-              outDir: d,
-              rootDir: v,
-              ...e.ssg,
-              origin: o,
-              renderModulePath: w,
-              qwikRouterConfigModulePath: m
-            }, k = await b.generate(D);
-            if (k.errors > 0) {
-              const S = new Error(
-                `Error while running SSG from "${e.name}" adapter. At least one path failed to render.`
-              );
-              S.stack = void 0, this.error(S);
-            }
-            r.push(...k.staticPaths);
-          }
-          await C(
-            d,
-            i,
-            y ? p(l, y) : l,
-            r,
-            !!e.cleanStaticGenerated
-          ), typeof e.generate == "function" && await e.generate({
-            outputEntries: c,
-            serverOutDir: i,
-            clientOutDir: u,
-            clientPublicOutDir: d,
-            basePathname: l,
-            routes: a,
-            assetsDir: y,
-            warn: (o) => this.warn(o),
-            error: (o) => this.error(o)
-          }), this.warn(
-            `
-==============================================
-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();
-        }
-      }
-    }
-  };
-}
-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 A({
+import fs from 'node:fs';
+import { join, dirname } from 'node:path';
+import { viteAdapter, getParentDir } from '../../shared/vite/index.mjs';
+import '../../../chunks/error-handler.mjs';
+
+function vercelEdgeAdapter(opts = {}) {
+  return viteAdapter({
     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 || p(".vercel", "output", "functions", "_qwik-router.func");
+    ssg: opts.ssg,
+    staticPaths: opts.staticPaths,
+    cleanStaticGenerated: true,
+    config(config) {
+      const outDir = config.build?.outDir || join(".vercel", "output", "functions", "_qwik-router.func");
       return {
         resolve: {
-          conditions: e.target === "node" ? ["node", "import", "module", "browser", "default"] : ["edge-light", "webworker", "worker", "browser", "module", "main"]
+          conditions: opts.target === "node" ? ["node", "import", "module", "browser", "default"] : ["edge-light", "webworker", "worker", "browser", "module", "main"]
         },
         ssr: {
-          target: e.target === "node" ? "node" : "webworker",
-          noExternal: !0
+          target: opts.target === "node" ? "node" : "webworker",
+          noExternal: true
         },
         build: {
-          ssr: !0,
-          outDir: t,
+          ssr: true,
+          outDir,
           rollupOptions: {
             output: {
               format: "es",
-              hoistTransitiveImports: !1
+              hoistTransitiveImports: false
             }
           }
         },
-        publicDir: !1
+        publicDir: false
       };
     },
-    async generate({ clientPublicOutDir: n, serverOutDir: t, basePathname: i, outputEntries: w }) {
-      const m = F(t, "output");
-      if (e.outputConfig !== !1) {
-        const a = {
+    async generate({ clientPublicOutDir, serverOutDir, basePathname, outputEntries }) {
+      const vercelOutputDir = getParentDir(serverOutDir, "output");
+      if (opts.outputConfig !== false) {
+        const vercelOutputConfig = {
           routes: [
             { handle: "filesystem" },
             {
-              src: i + ".*",
+              src: basePathname + ".*",
               dest: "/_qwik-router"
             }
           ],
           version: 3
         };
-        await g.promises.writeFile(
-          p(m, "config.json"),
-          JSON.stringify(a, null, 2)
+        await fs.promises.writeFile(
+          join(vercelOutputDir, "config.json"),
+          JSON.stringify(vercelOutputConfig, null, 2)
         );
       }
-      let s = e.vcConfigEntryPoint;
-      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 = {
+      let entrypoint = opts.vcConfigEntryPoint;
+      if (!entrypoint) {
+        if (outputEntries.some((n) => n === "entry.vercel-edge.mjs")) {
+          entrypoint = "entry.vercel-edge.mjs";
+        } else {
+          entrypoint = "entry.vercel-edge.js";
+        }
+      }
+      const vcConfigPath = join(serverOutDir, ".vc-config.json");
+      const vcConfig = {
         runtime: "edge",
-        entrypoint: s,
-        envVarsInUse: e.vcConfigEnvVarsInUse
+        entrypoint,
+        envVarsInUse: opts.vcConfigEnvVarsInUse
       };
-      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);
+      await fs.promises.writeFile(vcConfigPath, JSON.stringify(vcConfig, null, 2));
+      let vercelStaticDir = join(vercelOutputDir, "static");
+      const basePathnameParts = basePathname.split("/").filter((p) => p.length > 0);
+      if (basePathnameParts.length > 0) {
+        vercelStaticDir = join(vercelStaticDir, ...basePathnameParts);
+      }
+      await fs.promises.rm(vercelStaticDir, { recursive: true, force: true });
+      await fs.promises.mkdir(dirname(vercelStaticDir), { recursive: true });
+      await fs.promises.rename(clientPublicOutDir, vercelStaticDir);
     }
   });
 }
-export {
-  U as vercelEdgeAdapter
-};
+
+export { vercelEdgeAdapter };

package/lib/chunks/error-handler.mjs

@@ -0,0 +1,57 @@
+function getErrorHtml(status, e) {
+  let message = "Server Error";
+  if (e != null) {
+    if (typeof e.message === "string") {
+      message = e.message;
+    } else {
+      message = String(e);
+    }
+  }
+  return `<html>` + minimalHtmlResponse(status, message) + `</html>`;
+}
+function minimalHtmlResponse(status, message) {
+  if (typeof status !== "number") {
+    status = 500;
+  }
+  if (typeof message === "string") {
+    message = escapeHtml(message);
+  } else {
+    message = "";
+  }
+  const width = typeof message === "string" ? "600px" : "300px";
+  const color = status >= 500 ? COLOR_500 : COLOR_400;
+  return `
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="Status" content="${status}">
+  <title>${status} ${message}</title>
+  <meta name="viewport" content="width=device-width,initial-scale=1">
+  <style>
+    body { color: ${color}; background-color: #fafafa; padding: 30px; font-family: ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, Roboto, sans-serif; }
+    p { max-width: ${width}; margin: 60px auto 30px auto; background: white; border-radius: 4px; box-shadow: 0px 0px 50px -20px ${color}; overflow: hidden; }
+    strong { display: inline-block; padding: 15px; background: ${color}; color: white; }
+    span { display: inline-block; padding: 15px; }
+  </style>
+</head>
+<body><p><strong>${status}</strong> <span>${message}</span></p></body>
+`;
+}
+const ESCAPE_HTML = /[&<>]/g;
+const escapeHtml = (s) => {
+  return s.replace(ESCAPE_HTML, (c) => {
+    switch (c) {
+      case "&":
+        return "&amp;";
+      case "<":
+        return "&lt;";
+      case ">":
+        return "&gt;";
+      default:
+        return "";
+    }
+  });
+};
+const COLOR_400 = "#006ce9";
+const COLOR_500 = "#713fc2";
+
+export { getErrorHtml as g, minimalHtmlResponse as m };