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

package/lib/adapters/cloud-run/vite/index.mjs

@@ -1,210 +1,24 @@
-import { join as y } from "node:path";
-import { getErrorHtml as q } from "@qwik.dev/router/middleware/request-handler";
-import p from "node:fs";
-async function R(e, s, t, n, m) {
-  t && !t.endsWith("/") && (t += "/");
-  const h = /* @__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), h.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 w(f, u + l + "/") : S.isFile() && o.add(u + l);
-  }, w = async (a, l) => {
-    const u = await p.promises.readdir(a);
-    await Promise.all(u.map((f) => c(a, f, l)));
-  };
-  p.existsSync(e) && await w(e, t);
-  const i = O(t, g), d = b(o);
-  await T(d, i, s);
-}
-function v(e) {
-  return e.endsWith("/") ? e : e + "/";
-}
-function O(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 = q(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 w = 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, w);
-  }, h = async (o) => {
-    const g = await p.promises.readdir(o, { withFileTypes: !0 });
-    for (const c of g)
-      if (c.isDirectory())
-        await h(y(o, c.name));
-      else if (c.name.endsWith("js")) {
-        const w = m(y(o, c.name)).finally(() => {
-          n.delete(w);
-        });
-        n.add(w);
-      }
-  };
-  await h(t), await Promise.all(n);
-};
-function E(e) {
-  let s = null, t = null, n = null, m = null, h = 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" && (h = 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 && h && 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"), D = {
-              maxWorkers: e.maxWorkers,
-              basePathname: a,
-              outDir: u,
-              rootDir: S,
-              ...e.ssg,
-              origin: r,
-              renderModulePath: m,
-              qwikRouterConfigModulePath: h
-            }, k = await P.generate(D);
-            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 R(
-            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({
+import { viteAdapter } from '../../shared/vite/index.mjs';
+import 'node:path';
+import 'node:fs';
+import '../../../chunks/error-handler.mjs';
+
+function cloudRunAdapter(opts = {}) {
+  const env = process?.env;
+  return viteAdapter({
     name: "cloud-run",
-    origin: s?.ORIGIN ?? s?.URL ?? "https://your-app-name.run.app",
-    ssg: e.ssg,
-    cleanStaticGenerated: !0,
+    origin: env?.ORIGIN ?? env?.URL ?? "https://your-app-name.run.app",
+    ssg: opts.ssg,
+    cleanStaticGenerated: true,
     config() {
       return {
         build: {
-          ssr: !0
+          ssr: true
         },
-        publicDir: !1
+        publicDir: false
       };
     }
   });
 }
-export {
-  F as cloudRunAdapter
-};
+
+export { cloudRunAdapter };

package/lib/adapters/cloudflare-pages/vite/index.mjs

@@ -1,6 +1,65 @@
-import "node:fs";
-import "node:path";
-import { c as p } from "./index-CHT9Y93A.js";
-export {
-  p as cloudflarePagesAdapter
-};
+import fs from 'node:fs';
+import { join, relative } from 'node:path';
+import { n as normalizePathSlash } from '../../../chunks/fs.mjs';
+import { viteAdapter } from '../../shared/vite/index.mjs';
+import '../../../chunks/error-handler.mjs';
+
+function cloudflarePagesAdapter(opts = {}) {
+  const env = process?.env;
+  return viteAdapter({
+    name: "cloudflare-pages",
+    origin: env?.CF_PAGES_URL ?? env?.ORIGIN ?? "https://your.cloudflare.pages.dev",
+    ssg: opts.ssg,
+    staticPaths: opts.staticPaths,
+    cleanStaticGenerated: true,
+    config() {
+      return {
+        resolve: {
+          conditions: ["webworker", "worker"]
+        },
+        ssr: {
+          target: "webworker",
+          noExternal: true,
+          external: ["node:async_hooks"]
+        },
+        build: {
+          ssr: true,
+          rollupOptions: {
+            output: {
+              format: "es",
+              hoistTransitiveImports: false
+            }
+          }
+        },
+        publicDir: false
+      };
+    },
+    async generate({ clientOutDir, serverOutDir, basePathname, assetsDir }) {
+      const routesJsonPath = join(clientOutDir, "_routes.json");
+      const hasRoutesJson = fs.existsSync(routesJsonPath);
+      if (!hasRoutesJson && opts.functionRoutes !== false) {
+        let pathName = assetsDir ? join(basePathname, assetsDir) : basePathname;
+        if (!pathName.endsWith("/")) {
+          pathName += "/";
+        }
+        const routesJson = {
+          version: 1,
+          include: [basePathname + "*"],
+          exclude: [pathName + "build/*", pathName + "assets/*"]
+        };
+        await fs.promises.writeFile(routesJsonPath, JSON.stringify(routesJson, void 0, 2));
+      }
+      const workerJsPath = join(clientOutDir, "_worker.js");
+      const hasWorkerJs = fs.existsSync(workerJsPath);
+      if (!hasWorkerJs) {
+        const importPath = relative(clientOutDir, join(serverOutDir, "entry.cloudflare-pages"));
+        await fs.promises.writeFile(
+          workerJsPath,
+          `import { fetch } from "${normalizePathSlash(importPath)}"; export default { fetch };`
+        );
+      }
+    }
+  });
+}
+
+export { cloudflarePagesAdapter };

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

@@ -1,200 +1,15 @@
-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 b(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 k = await p.promises.stat(f);
-    k.isDirectory() ? await h(f, u + l + "/") : k.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 = O(t, g), d = R(o);
-  await T(d, i, s);
-}
-function v(e) {
-  return e.endsWith("/") ? e : e + "/";
-}
-function O(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 R(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(), k = 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: k,
-              ...e.ssg,
-              origin: r,
-              renderModulePath: m,
-              qwikRouterConfigModulePath: w
-            }, S = await P.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 b(
-            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 C(e = {}) {
-  const s = process?.env;
-  return E({
-    name: e.name || "deno-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 denoServerAdapter(opts = {}) {
+  const env = process?.env;
+  return viteAdapter({
+    name: opts.name || "deno-server",
+    origin: env?.ORIGIN ?? env?.URL ?? "https://yoursitename.qwik.dev",
+    ssg: opts.ssg,
+    cleanStaticGenerated: true,
     config() {
       return {
         resolve: {
@@ -202,24 +17,23 @@ function C(e = {}) {
         },
         ssr: {
           target: "webworker",
-          noExternal: !0,
+          noExternal: true,
           external: ["node:async_hooks"]
         },
         build: {
-          ssr: !0,
+          ssr: true,
           target: "esnext",
           rollupOptions: {
             output: {
               format: "es",
-              hoistTransitiveImports: !1
+              hoistTransitiveImports: false
             }
           }
         },
-        publicDir: !1
+        publicDir: false
       };
     }
   });
 }
-export {
-  C as denoServerAdapter
-};
+
+export { denoServerAdapter };