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

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

@@ -1,205 +1,306 @@
-import { join as y, resolve as D, dirname as b, basename as O } from "node:path";
-import { getErrorHtml as E } from "@qwik.dev/router/middleware/request-handler";
-import m from "node:fs";
-async function R(e, s, t, i, d) {
-  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(P)), w = [], c = async (a, l, u) => {
-    if (u = P(u), h.has(u))
+import { join, resolve, dirname, basename } from 'node:path';
+import fs from 'node:fs';
+import { g as getErrorHtml } from '../../../chunks/error-handler.mjs';
+
+async function postBuild(clientOutDir, serverOutDir, pathName, userStaticPaths, cleanStatic) {
+  if (pathName && !pathName.endsWith("/")) {
+    pathName += "/";
+  }
+  const ignorePathnames = /* @__PURE__ */ new Set([
+    pathName + "/" + (globalThis.__QWIK_BUILD_DIR__ || "build") + "/",
+    pathName + "/" + (globalThis.__QWIK_ASSETS_DIR__ || "assets") + "/"
+  ]);
+  const staticPaths = new Set(userStaticPaths.map(normalizeTrailingSlash));
+  const notFounds = [];
+  const loadItem = async (fsDir, fsName, pathname) => {
+    pathname = normalizeTrailingSlash(pathname);
+    if (ignorePathnames.has(pathname)) {
       return;
-    const g = y(a, l);
-    if (l === "index.html" || l === "q-data.json") {
-      !o.has(u) && d && await m.promises.unlink(g);
+    }
+    const fsPath = join(fsDir, fsName);
+    if (fsName === "index.html" || fsName === "q-data.json") {
+      if (!staticPaths.has(pathname) && cleanStatic) {
+        await fs.promises.unlink(fsPath);
+      }
       return;
     }
-    if (l === "404.html") {
-      const n = await m.promises.readFile(g, "utf-8");
-      w.push([u, n]);
+    if (fsName === "404.html") {
+      const notFoundHtml = await fs.promises.readFile(fsPath, "utf-8");
+      notFounds.push([pathname, notFoundHtml]);
       return;
     }
-    const k = await m.promises.stat(g);
-    k.isDirectory() ? await p(g, u + l + "/") : k.isFile() && o.add(u + l);
-  }, p = async (a, l) => {
-    const u = await m.promises.readdir(a);
-    await Promise.all(u.map((g) => c(a, g, l)));
+    const stat = await fs.promises.stat(fsPath);
+    if (stat.isDirectory()) {
+      await loadDir(fsPath, pathname + fsName + "/");
+    } else if (stat.isFile()) {
+      staticPaths.add(pathname + fsName);
+    }
+  };
+  const loadDir = async (fsDir, pathname) => {
+    const itemNames = await fs.promises.readdir(fsDir);
+    await Promise.all(itemNames.map((i) => loadItem(fsDir, i, pathname)));
   };
-  m.existsSync(e) && await p(e, t);
-  const r = T(t, w), f = A(o);
-  await C(f, r, s);
+  if (fs.existsSync(clientOutDir)) {
+    await loadDir(clientOutDir, pathName);
+  }
+  const notFoundPathsCode = createNotFoundPathsCode(pathName, notFounds);
+  const staticPathsCode = createStaticPathsCode(staticPaths);
+  await injectStatics(staticPathsCode, notFoundPathsCode, serverOutDir);
 }
-function P(e) {
-  return e.endsWith("/") ? e : e + "/";
+function normalizeTrailingSlash(pathname) {
+  if (!pathname.endsWith("/")) {
+    return pathname + "/";
+  }
+  return pathname;
 }
-function T(e, s) {
-  if (s.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), !s.some((t) => t[0] === e)) {
-    const t = E(404, "Resource Not Found");
-    s.push([e, t]);
+function createNotFoundPathsCode(basePathname, notFounds) {
+  notFounds.sort((a, b) => {
+    if (a[0].length > b[0].length) {
+      return -1;
+    }
+    if (a[0].length < b[0].length) {
+      return 1;
+    }
+    if (a[0] < b[0]) {
+      return -1;
+    }
+    if (a[0] > b[0]) {
+      return 1;
+    }
+    return 0;
+  });
+  if (!notFounds.some((r) => r[0] === basePathname)) {
+    const html = getErrorHtml(404, "Resource Not Found");
+    notFounds.push([basePathname, html]);
   }
-  return JSON.stringify(s, null, 2).slice(1, -1);
+  return JSON.stringify(notFounds, null, 2).slice(1, -1);
 }
-function A(e) {
-  return JSON.stringify(Array.from(new Set(e)).sort()).slice(1, -1);
+function createStaticPathsCode(staticPaths) {
+  return JSON.stringify(Array.from(new Set(staticPaths)).sort()).slice(1, -1);
 }
-const C = async (e, s, t) => {
-  const i = /* @__PURE__ */ new Set(), d = async (o) => {
-    const w = await m.promises.readFile(o, "utf-8");
-    let c = !1;
-    const p = w.replace(
+const injectStatics = async (staticPathsCode, notFoundPathsCode, outDir) => {
+  const promises = /* @__PURE__ */ new Set();
+  const doReplace = async (path) => {
+    const code = await fs.promises.readFile(path, "utf-8");
+    let replaced = false;
+    const newCode = code.replace(
       /(['"])__QWIK_ROUTER_(STATIC_PATHS|NOT_FOUND)_ARRAY__\1/g,
-      (r, f, a) => (c = !0, a === "STATIC_PATHS" ? e : s)
+      (_, _quote, type) => {
+        replaced = true;
+        return type === "STATIC_PATHS" ? staticPathsCode : notFoundPathsCode;
+      }
     );
-    c && await m.promises.writeFile(o, p);
-  }, h = async (o) => {
-    const w = await m.promises.readdir(o, { withFileTypes: !0 });
-    for (const c of w)
-      if (c.isDirectory())
-        await h(y(o, c.name));
-      else if (c.name.endsWith("js")) {
-        const p = d(y(o, c.name)).finally(() => {
-          i.delete(p);
+    if (replaced) {
+      await fs.promises.writeFile(path, newCode);
+    }
+  };
+  const walk = async (dir) => {
+    const entries = await fs.promises.readdir(dir, { withFileTypes: true });
+    for (const entry of entries) {
+      if (entry.isDirectory()) {
+        await walk(join(dir, entry.name));
+      } else if (entry.name.endsWith("js")) {
+        const p = doReplace(join(dir, entry.name)).finally(() => {
+          promises.delete(p);
         });
-        i.add(p);
+        promises.add(p);
       }
+    }
   };
-  await h(t), await Promise.all(i);
+  await walk(outDir);
+  await Promise.all(promises);
 };
-function W(e) {
-  let s = null, t = null, i = null, d = null, h = null, o = !1, w;
-  const c = [];
-  return {
-    name: `vite-plugin-qwik-router-ssg-${e.name}`,
+
+function viteAdapter(opts) {
+  let qwikRouterPlugin = null;
+  let qwikVitePlugin = null;
+  let serverOutDir = null;
+  let renderModulePath = null;
+  let qwikRouterConfigModulePath = null;
+  let isSsrBuild = false;
+  let viteCommand;
+  const outputEntries = [];
+  const plugin = {
+    name: `vite-plugin-qwik-router-ssg-${opts.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;
+    config(config) {
+      if (typeof opts.config === "function") {
+        config = opts.config(config);
+      }
+      config.define = {
+        "process.env.NODE_ENV": JSON.stringify(process.env.NODE_ENV || "production"),
+        ...config.define
+      };
+      return config;
     },
-    configResolved(r) {
-      if (o = !!r.build.ssr, w = r.command, o) {
-        if (s = r.plugins.find(
-          (f) => f.name === "vite-plugin-qwik-router"
-        ), !s)
+    configResolved(config) {
+      isSsrBuild = !!config.build.ssr;
+      viteCommand = config.command;
+      if (isSsrBuild) {
+        qwikRouterPlugin = config.plugins.find(
+          (p) => p.name === "vite-plugin-qwik-router"
+        );
+        if (!qwikRouterPlugin) {
           throw new Error("Missing vite-plugin-qwik-router");
-        if (t = r.plugins.find(
-          (f) => f.name === "vite-plugin-qwik"
-        ), !t)
+        }
+        qwikVitePlugin = config.plugins.find(
+          (p) => p.name === "vite-plugin-qwik"
+        );
+        if (!qwikVitePlugin) {
           throw new Error("Missing vite-plugin-qwik");
-        if (i = r.build.outDir, r.build?.ssr !== !0)
+        }
+        serverOutDir = config.build.outDir;
+        if (config.build?.ssr !== true) {
           throw new Error(
-            `"build.ssr" must be set to "true" in order to use the "${e.name}" adapter.`
+            `"build.ssr" must be set to "true" in order to use the "${opts.name}" adapter.`
           );
-        if (!r.build?.rollupOptions?.input)
+        }
+        if (!config.build?.rollupOptions?.input) {
           throw new Error(
-            `"build.rollupOptions.input" must be set in order to use the "${e.name}" adapter.`
+            `"build.rollupOptions.input" must be set in order to use the "${opts.name}" adapter.`
           );
+        }
       }
     },
     buildStart() {
-      if (o && e.ssg !== null) {
-        const { srcDir: r } = t.api.getOptions();
-        w === "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"
-        }));
+      if (isSsrBuild && opts.ssg !== null) {
+        const { srcDir } = qwikVitePlugin.api.getOptions();
+        if (viteCommand === "build" && serverOutDir && srcDir) {
+          this.emitFile({
+            id: "@qwik-router-config",
+            type: "chunk",
+            fileName: "@qwik-router-config.js"
+          });
+          this.emitFile({
+            id: `${srcDir}/entry.ssr`,
+            type: "chunk",
+            fileName: "entry.ssr.js"
+          });
+        }
       }
     },
-    generateBundle(r, f) {
-      if (o) {
-        c.length = 0;
-        for (const a in f) {
-          const l = f[a];
-          l.type === "chunk" && l.isEntry && (c.push(a), l.name === "entry.ssr" ? d = y(i, a) : l.name === "@qwik-router-config" && (h = y(i, a)));
+    generateBundle(_, bundles) {
+      if (isSsrBuild) {
+        outputEntries.length = 0;
+        for (const fileName in bundles) {
+          const chunk = bundles[fileName];
+          if (chunk.type === "chunk" && chunk.isEntry) {
+            outputEntries.push(fileName);
+            if (chunk.name === "entry.ssr") {
+              renderModulePath = join(serverOutDir, fileName);
+            } else if (chunk.name === "@qwik-router-config") {
+              qwikRouterConfigModulePath = join(serverOutDir, fileName);
+            }
+          }
         }
       }
     },
     closeBundle: {
-      sequential: !0,
+      sequential: true,
       async handler() {
-        if (o && i && s?.api && t?.api) {
-          const r = e.staticPaths || [], f = s.api.getRoutes(), a = s.api.getBasePathname(), l = t.api.getClientOutDir(), u = t.api.getClientPublicOutDir(), g = t.api.getAssetsDir(), k = t.api.getRootDir() ?? void 0;
-          if (e.ssg !== null && d && h && l && u) {
-            let n = e.ssg?.origin ?? e.origin;
-            n || (n = "https://yoursite.qwik.dev"), n.length > 0 && !/:\/\//.test(n) && (n = `https://${n}`), n.startsWith("//") && (n = `https:${n}`);
+        if (isSsrBuild && serverOutDir && qwikRouterPlugin?.api && qwikVitePlugin?.api) {
+          const staticPaths = opts.staticPaths || [];
+          const routes = qwikRouterPlugin.api.getRoutes();
+          const basePathname = qwikRouterPlugin.api.getBasePathname();
+          const clientOutDir = qwikVitePlugin.api.getClientOutDir();
+          const clientPublicOutDir = qwikVitePlugin.api.getClientPublicOutDir();
+          const assetsDir = qwikVitePlugin.api.getAssetsDir();
+          const rootDir = qwikVitePlugin.api.getRootDir() ?? void 0;
+          if (opts.ssg !== null && renderModulePath && qwikRouterConfigModulePath && clientOutDir && clientPublicOutDir) {
+            let ssgOrigin = opts.ssg?.origin ?? opts.origin;
+            if (!ssgOrigin) {
+              ssgOrigin = `https://yoursite.qwik.dev`;
+            }
+            if (ssgOrigin.length > 0 && !/:\/\//.test(ssgOrigin)) {
+              ssgOrigin = `https://${ssgOrigin}`;
+            }
+            if (ssgOrigin.startsWith("//")) {
+              ssgOrigin = `https:${ssgOrigin}`;
+            }
             try {
-              n = new URL(n).origin;
+              ssgOrigin = new URL(ssgOrigin).origin;
             } catch {
               this.warn(
-                `Invalid "origin" option: "${n}". Using default origin: "https://yoursite.qwik.dev"`
-              ), n = "https://yoursite.qwik.dev";
+                `Invalid "origin" option: "${ssgOrigin}". Using default origin: "https://yoursite.qwik.dev"`
+              );
+              ssgOrigin = `https://yoursite.qwik.dev`;
             }
-            const v = await import("./index-CrwlB95_.js"), q = {
-              maxWorkers: e.maxWorkers,
-              basePathname: a,
-              outDir: u,
-              rootDir: k,
-              ...e.ssg,
-              origin: n,
-              renderModulePath: d,
-              qwikRouterConfigModulePath: h
-            }, 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.`
+            const staticGenerate = await import('../../../ssg/index.mjs');
+            const generateOpts = {
+              maxWorkers: opts.maxWorkers,
+              basePathname,
+              outDir: clientPublicOutDir,
+              rootDir,
+              ...opts.ssg,
+              origin: ssgOrigin,
+              renderModulePath,
+              qwikRouterConfigModulePath
+            };
+            const staticGenerateResult = await staticGenerate.generate(generateOpts);
+            if (staticGenerateResult.errors > 0) {
+              const err = new Error(
+                `Error while running SSG from "${opts.name}" adapter. At least one path failed to render.`
               );
-              _.stack = void 0, this.error(_);
+              err.stack = void 0;
+              this.error(err);
             }
-            r.push(...S.staticPaths);
+            staticPaths.push(...staticGenerateResult.staticPaths);
           }
-          await R(
-            u,
-            i,
-            g ? y(a, g) : a,
-            r,
-            !!e.cleanStaticGenerated
-          ), typeof e.generate == "function" && await e.generate({
-            outputEntries: c,
-            serverOutDir: i,
-            clientOutDir: l,
-            clientPublicOutDir: u,
-            basePathname: a,
-            routes: f,
-            assetsDir: g,
-            warn: (n) => this.warn(n),
-            error: (n) => this.error(n)
-          }), this.warn(
+          await postBuild(
+            clientPublicOutDir,
+            serverOutDir,
+            assetsDir ? join(basePathname, assetsDir) : basePathname,
+            staticPaths,
+            !!opts.cleanStaticGenerated
+          );
+          if (typeof opts.generate === "function") {
+            await opts.generate({
+              outputEntries,
+              serverOutDir,
+              clientOutDir,
+              clientPublicOutDir,
+              basePathname,
+              routes,
+              assetsDir,
+              warn: (message) => this.warn(message),
+              error: (message) => this.error(message)
+            });
+          }
+          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();
+          );
+          if (opts.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();
+          }
         }
       }
     }
   };
+  return plugin;
 }
-function x(e, s) {
-  const t = D("/");
-  let i = e;
-  for (let d = 0; d < 20; d++) {
-    if (i = b(i), O(i) === s)
-      return i;
-    if (i === t)
+function getParentDir(startDir, dirName) {
+  const root = resolve("/");
+  let dir = startDir;
+  for (let i = 0; i < 20; i++) {
+    dir = dirname(dir);
+    if (basename(dir) === dirName) {
+      return dir;
+    }
+    if (dir === root) {
       break;
+    }
   }
-  throw new Error(`Unable to find "${s}" directory from "${e}"`);
+  throw new Error(`Unable to find "${dirName}" directory from "${startDir}"`);
 }
-export {
-  x as getParentDir,
-  W as viteAdapter
-};
+
+export { getParentDir, viteAdapter };