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

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

@@ -1,276 +1,88 @@
-import y, { existsSync as E } from "node:fs";
-import { join as m, resolve as D, dirname as x, basename as q } from "node:path";
-import { getErrorHtml as R } from "@qwik.dev/router/middleware/request-handler";
-async function O(e, r, t, i, u) {
-  t && !t.endsWith("/") && (t += "/");
-  const h = /* @__PURE__ */ new Set([
-    t + "/" + (globalThis.__QWIK_BUILD_DIR__ || "build") + "/",
-    t + "/" + (globalThis.__QWIK_ASSETS_DIR__ || "assets") + "/"
-  ]), o = new Set(i.map(_)), d = [], c = async (a, l, f) => {
-    if (f = _(f), h.has(f))
-      return;
-    const w = m(a, l);
-    if (l === "index.html" || l === "q-data.json") {
-      !o.has(f) && u && await y.promises.unlink(w);
-      return;
-    }
-    if (l === "404.html") {
-      const s = await y.promises.readFile(w, "utf-8");
-      d.push([f, s]);
-      return;
-    }
-    const k = await y.promises.stat(w);
-    k.isDirectory() ? await p(w, f + l + "/") : k.isFile() && o.add(f + l);
-  }, p = async (a, l) => {
-    const f = await y.promises.readdir(a);
-    await Promise.all(f.map((w) => c(a, w, l)));
-  };
-  y.existsSync(e) && await p(e, t);
-  const n = T(t, d), g = j(o);
-  await A(g, n, r);
-}
-function _(e) {
-  return e.endsWith("/") ? e : e + "/";
-}
-function T(e, r) {
-  if (r.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), !r.some((t) => t[0] === e)) {
-    const t = R(404, "Resource Not Found");
-    r.push([e, t]);
-  }
-  return JSON.stringify(r, null, 2).slice(1, -1);
-}
-function j(e) {
-  return JSON.stringify(Array.from(new Set(e)).sort()).slice(1, -1);
-}
-const A = async (e, r, t) => {
-  const i = /* @__PURE__ */ new Set(), u = async (o) => {
-    const d = await y.promises.readFile(o, "utf-8");
-    let c = !1;
-    const p = d.replace(
-      /(['"])__QWIK_ROUTER_(STATIC_PATHS|NOT_FOUND)_ARRAY__\1/g,
-      (n, g, a) => (c = !0, a === "STATIC_PATHS" ? e : r)
-    );
-    c && await y.promises.writeFile(o, p);
-  }, h = async (o) => {
-    const d = await y.promises.readdir(o, { withFileTypes: !0 });
-    for (const c of d)
-      if (c.isDirectory())
-        await h(m(o, c.name));
-      else if (c.name.endsWith("js")) {
-        const p = u(m(o, c.name)).finally(() => {
-          i.delete(p);
-        });
-        i.add(p);
-      }
-  };
-  await h(t), await Promise.all(i);
-};
-function F(e) {
-  let r = null, t = null, i = null, u = null, h = null, o = !1, d;
-  const c = [];
-  return {
-    name: `vite-plugin-qwik-router-ssg-${e.name}`,
-    enforce: "post",
-    apply: "build",
-    config(n) {
-      return typeof e.config == "function" && (n = e.config(n)), n.define = {
-        "process.env.NODE_ENV": JSON.stringify("production"),
-        ...n.define
-      }, n;
-    },
-    configResolved(n) {
-      if (o = !!n.build.ssr, d = n.command, o) {
-        if (r = n.plugins.find(
-          (g) => g.name === "vite-plugin-qwik-router"
-        ), !r)
-          throw new Error("Missing vite-plugin-qwik-router");
-        if (t = n.plugins.find(
-          (g) => g.name === "vite-plugin-qwik"
-        ), !t)
-          throw new Error("Missing vite-plugin-qwik");
-        if (i = n.build.outDir, n.build?.ssr !== !0)
-          throw new Error(
-            `"build.ssr" must be set to "true" in order to use the "${e.name}" adapter.`
-          );
-        if (!n.build?.rollupOptions?.input)
-          throw new Error(
-            `"build.rollupOptions.input" must be set in order to use the "${e.name}" adapter.`
-          );
-      }
-    },
-    buildStart() {
-      if (o && e.ssg !== null) {
-        const { srcDir: n } = t.api.getOptions();
-        d === "build" && i && n && (this.emitFile({
-          id: "@qwik-router-config",
-          type: "chunk",
-          fileName: "@qwik-router-config.js"
-        }), this.emitFile({
-          id: `${n}/entry.ssr`,
-          type: "chunk",
-          fileName: "entry.ssr.js"
-        }));
-      }
-    },
-    generateBundle(n, g) {
-      if (o) {
-        c.length = 0;
-        for (const a in g) {
-          const l = g[a];
-          l.type === "chunk" && l.isEntry && (c.push(a), l.name === "entry.ssr" ? u = m(i, a) : l.name === "@qwik-router-config" && (h = m(i, a)));
-        }
-      }
-    },
-    closeBundle: {
-      sequential: !0,
-      async handler() {
-        if (o && i && r?.api && t?.api) {
-          const n = e.staticPaths || [], g = r.api.getRoutes(), a = r.api.getBasePathname(), l = t.api.getClientOutDir(), f = t.api.getClientPublicOutDir(), w = t.api.getAssetsDir(), k = t.api.getRootDir() ?? void 0;
-          if (e.ssg !== null && u && h && l && f) {
-            let s = e.ssg?.origin ?? e.origin;
-            s || (s = "https://yoursite.qwik.dev"), s.length > 0 && !/:\/\//.test(s) && (s = `https://${s}`), s.startsWith("//") && (s = `https:${s}`);
-            try {
-              s = new URL(s).origin;
-            } catch {
-              this.warn(
-                `Invalid "origin" option: "${s}". Using default origin: "https://yoursite.qwik.dev"`
-              ), s = "https://yoursite.qwik.dev";
-            }
-            const v = await import("./index-CrwlB95_.js"), b = {
-              maxWorkers: e.maxWorkers,
-              basePathname: a,
-              outDir: f,
-              rootDir: k,
-              ...e.ssg,
-              origin: s,
-              renderModulePath: u,
-              qwikRouterConfigModulePath: h
-            }, P = await v.generate(b);
-            if (P.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);
-            }
-            n.push(...P.staticPaths);
-          }
-          await O(
-            f,
-            i,
-            w ? m(a, w) : a,
-            n,
-            !!e.cleanStaticGenerated
-          ), typeof e.generate == "function" && await e.generate({
-            outputEntries: c,
-            serverOutDir: i,
-            clientOutDir: l,
-            clientPublicOutDir: f,
-            basePathname: a,
-            routes: g,
-            assetsDir: w,
-            warn: (s) => this.warn(s),
-            error: (s) => this.error(s)
-          }), 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 I(e, r) {
-  const t = D("/");
-  let i = e;
-  for (let u = 0; u < 20; u++) {
-    if (i = x(i), q(i) === r)
-      return i;
-    if (i === t)
-      break;
-  }
-  throw new Error(`Unable to find "${r}" directory from "${e}"`);
-}
-function G(e = {}) {
-  const r = process?.env;
-  return F({
+import fs, { existsSync } from 'node:fs';
+import { join } from 'node:path';
+import { viteAdapter, getParentDir } from '../../shared/vite/index.mjs';
+import '../../../chunks/error-handler.mjs';
+
+function netlifyEdgeAdapter(opts = {}) {
+  const env = process?.env;
+  return viteAdapter({
     name: "netlify-edge",
-    origin: r?.ORIGIN ?? r?.URL ?? "https://yoursitename.netlify.app",
-    ssg: e.ssg,
-    staticPaths: e.staticPaths,
-    cleanStaticGenerated: !0,
-    config(t) {
-      const i = t.build?.outDir || ".netlify/edge-functions/entry.netlify-edge";
+    origin: env?.ORIGIN ?? env?.URL ?? "https://yoursitename.netlify.app",
+    ssg: opts.ssg,
+    staticPaths: opts.staticPaths,
+    cleanStaticGenerated: true,
+    config(config) {
+      const outDir = config.build?.outDir || ".netlify/edge-functions/entry.netlify-edge";
       return {
         resolve: {
           conditions: ["webworker", "worker"]
         },
         ssr: {
           target: "webworker",
-          noExternal: !0,
+          noExternal: true,
           external: ["node:async_hooks"]
         },
         build: {
-          ssr: !0,
-          outDir: i,
+          ssr: true,
+          outDir,
           rollupOptions: {
             output: {
               format: "es",
-              hoistTransitiveImports: !1
+              hoistTransitiveImports: false
             }
           }
         },
-        publicDir: !1
+        publicDir: false
       };
     },
-    async generate({ serverOutDir: t, basePathname: i }) {
-      if (e.functionRoutes !== !1) {
-        const u = [];
-        typeof e.excludedPath == "string" ? u.push(e.excludedPath) : Array.isArray(e.excludedPath) ? u.push(...e.excludedPath) : u.push(
-          "/build/*",
-          "/favicon.ico",
-          "/robots.txt",
-          "/mainifest.json",
-          "/~partytown/*",
-          "/service-worker.js",
-          "/sitemap.xml"
-        );
-        const h = {
+    async generate({ serverOutDir, basePathname }) {
+      if (opts.functionRoutes !== false) {
+        const excludedPath = [];
+        if (typeof opts.excludedPath === "string") {
+          excludedPath.push(opts.excludedPath);
+        } else if (Array.isArray(opts.excludedPath)) {
+          excludedPath.push(...opts.excludedPath);
+        } else {
+          excludedPath.push(
+            "/build/*",
+            "/favicon.ico",
+            "/robots.txt",
+            "/mainifest.json",
+            "/~partytown/*",
+            "/service-worker.js",
+            "/sitemap.xml"
+          );
+        }
+        const netlifyEdgeManifest = {
           functions: [
             {
-              path: i + "*",
+              path: basePathname + "*",
               function: "entry.netlify-edge",
               cache: "manual",
-              excludedPath: u
+              excludedPath
             }
           ],
           version: 1
-        }, o = m(t, "entry.netlify-edge.js"), d = m(t, "entry.netlify-edge.mjs");
-        E(d) && await y.promises.writeFile(
-          o,
-          [
-            "import entry_netlifyEdge from './entry.netlify-edge.mjs';",
-            "export default entry_netlifyEdge;"
-          ].join(`
-`)
-        );
-        const c = I(t, "edge-functions");
-        await y.promises.writeFile(
-          m(c, "manifest.json"),
-          JSON.stringify(h, null, 2)
+        };
+        const jsPath = join(serverOutDir, "entry.netlify-edge.js");
+        const mjsPath = join(serverOutDir, "entry.netlify-edge.mjs");
+        if (existsSync(mjsPath)) {
+          await fs.promises.writeFile(
+            jsPath,
+            [
+              `import entry_netlifyEdge from './entry.netlify-edge.mjs';`,
+              `export default entry_netlifyEdge;`
+            ].join("\n")
+          );
+        }
+        const netlifyEdgeFnsDir = getParentDir(serverOutDir, "edge-functions");
+        await fs.promises.writeFile(
+          join(netlifyEdgeFnsDir, "manifest.json"),
+          JSON.stringify(netlifyEdgeManifest, null, 2)
         );
       }
     }
   });
 }
-export {
-  G as netlifyEdgeAdapter
-};
+
+export { netlifyEdgeAdapter };

package/lib/adapters/node-server/vite/index.mjs

@@ -1,213 +1,27 @@
-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, s, t, n, m) {
-  t && !t.endsWith("/") && (t += "/");
-  const w = /* @__PURE__ */ new Set([
-    t + "/" + (globalThis.__QWIK_BUILD_DIR__ || "build") + "/",
-    t + "/" + (globalThis.__QWIK_ASSETS_DIR__ || "assets") + "/"
-  ]), o = new Set(n.map(v)), g = [], c = async (a, l, u) => {
-    if (u = v(u), w.has(u))
-      return;
-    const f = y(a, l);
-    if (l === "index.html" || l === "q-data.json") {
-      !o.has(u) && m && await p.promises.unlink(f);
-      return;
-    }
-    if (l === "404.html") {
-      const r = await p.promises.readFile(f, "utf-8");
-      g.push([u, r]);
-      return;
-    }
-    const S = await p.promises.stat(f);
-    S.isDirectory() ? await h(f, u + l + "/") : S.isFile() && o.add(u + l);
-  }, h = async (a, l) => {
-    const u = await p.promises.readdir(a);
-    await Promise.all(u.map((f) => c(a, f, l)));
-  };
-  p.existsSync(e) && await h(e, t);
-  const i = R(t, g), d = b(o);
-  await T(d, i, s);
-}
-function v(e) {
-  return e.endsWith("/") ? e : e + "/";
-}
-function R(e, s) {
-  if (s.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), !s.some((t) => t[0] === e)) {
-    const t = D(404, "Resource Not Found");
-    s.push([e, t]);
-  }
-  return JSON.stringify(s, null, 2).slice(1, -1);
-}
-function b(e) {
-  return JSON.stringify(Array.from(new Set(e)).sort()).slice(1, -1);
-}
-const T = async (e, s, t) => {
-  const n = /* @__PURE__ */ new Set(), m = async (o) => {
-    const g = await p.promises.readFile(o, "utf-8");
-    let c = !1;
-    const h = g.replace(
-      /(['"])__QWIK_ROUTER_(STATIC_PATHS|NOT_FOUND)_ARRAY__\1/g,
-      (i, d, a) => (c = !0, a === "STATIC_PATHS" ? e : s)
-    );
-    c && await p.promises.writeFile(o, h);
-  }, w = async (o) => {
-    const g = await p.promises.readdir(o, { withFileTypes: !0 });
-    for (const c of g)
-      if (c.isDirectory())
-        await w(y(o, c.name));
-      else if (c.name.endsWith("js")) {
-        const h = m(y(o, c.name)).finally(() => {
-          n.delete(h);
-        });
-        n.add(h);
-      }
-  };
-  await w(t), await Promise.all(n);
-};
-function E(e) {
-  let s = null, t = null, n = null, m = null, w = null, o = !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 (o = !!i.build.ssr, g = i.command, o) {
-        if (s = i.plugins.find(
-          (d) => d.name === "vite-plugin-qwik-router"
-        ), !s)
-          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 (o && 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 (o) {
-        c.length = 0;
-        for (const a in d) {
-          const l = d[a];
-          l.type === "chunk" && l.isEntry && (c.push(a), l.name === "entry.ssr" ? m = y(n, a) : l.name === "@qwik-router-config" && (w = y(n, a)));
-        }
-      }
-    },
-    closeBundle: {
-      sequential: !0,
-      async handler() {
-        if (o && n && s?.api && t?.api) {
-          const i = e.staticPaths || [], d = s.api.getRoutes(), a = s.api.getBasePathname(), l = t.api.getClientOutDir(), u = t.api.getClientPublicOutDir(), f = t.api.getAssetsDir(), S = t.api.getRootDir() ?? void 0;
-          if (e.ssg !== null && m && w && l && 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 P = await import("./index-CrwlB95_.js"), q = {
-              maxWorkers: e.maxWorkers,
-              basePathname: a,
-              outDir: u,
-              rootDir: S,
-              ...e.ssg,
-              origin: r,
-              renderModulePath: m,
-              qwikRouterConfigModulePath: w
-            }, k = await P.generate(q);
-            if (k.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(...k.staticPaths);
-          }
-          await O(
-            u,
-            n,
-            f ? y(a, f) : a,
-            i,
-            !!e.cleanStaticGenerated
-          ), typeof e.generate == "function" && await e.generate({
-            outputEntries: c,
-            serverOutDir: n,
-            clientOutDir: l,
-            clientPublicOutDir: u,
-            basePathname: a,
-            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 F(e = {}) {
-  const s = process?.env;
-  return E({
-    name: e.name || "node-server",
-    origin: s?.ORIGIN ?? s?.URL ?? "https://yoursitename.qwik.dev",
-    ssg: e.ssg,
-    cleanStaticGenerated: !0,
+import { viteAdapter } from '../../shared/vite/index.mjs';
+import 'node:path';
+import 'node:fs';
+import '../../../chunks/error-handler.mjs';
+
+function nodeServerAdapter(opts = {}) {
+  const env = process?.env;
+  return viteAdapter({
+    name: opts.name || "node-server",
+    origin: env?.ORIGIN ?? env?.URL ?? "https://yoursitename.qwik.dev",
+    ssg: opts.ssg,
+    cleanStaticGenerated: true,
     config() {
       return {
         ssr: {
           target: "node"
         },
         build: {
-          ssr: !0
+          ssr: true
         },
-        publicDir: !1
+        publicDir: false
       };
     }
   });
 }
-export {
-  F as nodeServerAdapter
-};
+
+export { nodeServerAdapter };

package/lib/adapters/shared/vite/index.d.ts

@@ -26,7 +26,7 @@ export declare interface AdapterSSGOptions extends Omit<SsgRenderOptions, 'outDi
     origin?: string;
 }
 
-declare interface BuildLayout {
+declare interface BuiltLayout {
     filePath: string;
     dirPath: string;
     id: string;
@@ -34,7 +34,7 @@ declare interface BuildLayout {
     layoutName: string;
 }
 
-declare interface BuildRoute extends ParsedPathname {
+declare interface BuiltRoute extends ParsedPathname {
     /** Unique id built from its relative file system path */
     id: string;
     /** Local file system path */
@@ -42,7 +42,7 @@ declare interface BuildRoute extends ParsedPathname {
     ext: string;
     /** URL Pathname */
     pathname: string;
-    layouts: BuildLayout[];
+    layouts: BuiltLayout[];
 }
 
 /** @public */
@@ -98,7 +98,7 @@ declare interface ViteAdapterPluginOptions {
         clientPublicOutDir: string;
         serverOutDir: string;
         basePathname: string;
-        routes: BuildRoute[];
+        routes: BuiltRoute[];
         assetsDir?: string;
         warn: (message: string) => void;
         error: (message: string) => void;