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

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

@@ -1,338 +1,205 @@
-// packages/qwik-router/src/adapters/shared/vite/index.ts
-import fs2 from "node:fs";
-import { basename, dirname, join as join2, resolve } from "node:path";
-
-// packages/qwik-router/src/adapters/shared/vite/post-build.ts
-import { getErrorHtml } from "../../../middleware/request-handler/index.mjs";
-import fs from "node:fs";
-import { join } from "node:path";
-async function postBuild(clientOutDir, pathName, userStaticPaths, format, cleanStatic) {
-  if (pathName && !pathName.endsWith("/")) {
-    pathName += "/";
-  }
-  const ignorePathnames = /* @__PURE__ */ new Set([pathName + "build/", pathName + "assets/"]);
-  const staticPaths = new Set(userStaticPaths.map(normalizeTrailingSlash));
-  const notFounds = [];
-  const loadItem = async (fsDir, fsName, pathname) => {
-    pathname = normalizeTrailingSlash(pathname);
-    if (ignorePathnames.has(pathname)) {
+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))
       return;
-    }
-    const fsPath = join(fsDir, fsName);
-    if (fsName === "index.html" || fsName === "q-data.json") {
-      if (!staticPaths.has(pathname) && cleanStatic) {
-        await fs.promises.unlink(fsPath);
-      }
+    const g = y(a, l);
+    if (l === "index.html" || l === "q-data.json") {
+      !o.has(u) && d && await m.promises.unlink(g);
       return;
     }
-    if (fsName === "404.html") {
-      const notFoundHtml = await fs.promises.readFile(fsPath, "utf-8");
-      notFounds.push([pathname, notFoundHtml]);
+    if (l === "404.html") {
+      const n = await m.promises.readFile(g, "utf-8");
+      w.push([u, n]);
       return;
     }
-    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)));
-  };
-  if (fs.existsSync(clientOutDir)) {
-    await loadDir(clientOutDir, pathName);
-  }
-  const notFoundPathsCode = createNotFoundPathsModule(pathName, notFounds, format);
-  const staticPathsCode = createStaticPathsModule(pathName, staticPaths, format);
-  return {
-    notFoundPathsCode,
-    staticPathsCode
+    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)));
   };
+  m.existsSync(e) && await p(e, t);
+  const r = T(t, w), f = A(o);
+  await C(f, r, s);
 }
-function normalizeTrailingSlash(pathname) {
-  if (!pathname.endsWith("/")) {
-    return pathname + "/";
-  }
-  return pathname;
+function P(e) {
+  return e.endsWith("/") ? e : e + "/";
 }
-function createNotFoundPathsModule(basePathname, notFounds, format) {
-  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]);
-  }
-  const c = [];
-  c.push(`const notFounds = ${JSON.stringify(notFounds, null, 2)};`);
-  c.push(`function getNotFound(p) {`);
-  c.push(`  for (const r of notFounds) {`);
-  c.push(`    if (p.startsWith(r[0])) {`);
-  c.push(`      return r[1];`);
-  c.push(`    }`);
-  c.push(`  }`);
-  c.push(`  return "Resource Not Found";`);
-  c.push(`}`);
-  if (format === "cjs") {
-    c.push("exports.getNotFound = getNotFound;");
-  } else {
-    c.push("export { getNotFound };");
+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]);
   }
-  return c.join("\n");
+  return JSON.stringify(s, null, 2).slice(1, -1);
 }
-function createStaticPathsModule(basePathname, staticPaths, format) {
-  const assetsPath = basePathname + "assets/";
-  const baseBuildPath = basePathname + "build/";
-  const c = [];
-  c.push(
-    `const staticPaths = new Set(${JSON.stringify(
-      Array.from(new Set(staticPaths)).sort()
-    )});`
-  );
-  c.push(`function isStaticPath(method, url) {`);
-  c.push(`  if (method.toUpperCase() !== 'GET') {`);
-  c.push(`    return false;`);
-  c.push(`  }`);
-  c.push(`  const p = url.pathname;`);
-  c.push(`  if (p.startsWith(${JSON.stringify(baseBuildPath)})) {`);
-  c.push(`    return true;`);
-  c.push(`  }`);
-  c.push(`  if (p.startsWith(${JSON.stringify(assetsPath)})) {`);
-  c.push(`    return true;`);
-  c.push(`  }`);
-  c.push(`  if (staticPaths.has(p)) {`);
-  c.push(`    return true;`);
-  c.push(`  }`);
-  c.push(`  if (p.endsWith('/q-data.json')) {`);
-  c.push(`    const pWithoutQdata = p.replace(/\\/q-data.json$/, '');`);
-  c.push(`    if (staticPaths.has(pWithoutQdata + '/')) {`);
-  c.push(`      return true;`);
-  c.push(`    }`);
-  c.push(`    if (staticPaths.has(pWithoutQdata)) {`);
-  c.push(`      return true;`);
-  c.push(`    }`);
-  c.push(`  }`);
-  c.push(`  return false;`);
-  c.push(`}`);
-  if (format === "cjs") {
-    c.push("exports.isStaticPath = isStaticPath;");
-  } else {
-    c.push("export { isStaticPath };");
-  }
-  return c.join("\n");
+function A(e) {
+  return JSON.stringify(Array.from(new Set(e)).sort()).slice(1, -1);
 }
-
-// packages/qwik-router/src/adapters/shared/vite/index.ts
-function viteAdapter(opts) {
-  let qwikRouterPlugin = null;
-  let qwikVitePlugin = null;
-  let serverOutDir = null;
-  let renderModulePath = null;
-  let qwikRouterConfigModulePath = null;
-  let isSsrBuild = false;
-  let format = "esm";
-  const outputEntries = [];
-  const plugin = {
-    name: `vite-plugin-qwik-router-${opts.name}`,
+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(
+      /(['"])__QWIK_ROUTER_(STATIC_PATHS|NOT_FOUND)_ARRAY__\1/g,
+      (r, f, a) => (c = !0, a === "STATIC_PATHS" ? e : s)
+    );
+    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);
+        });
+        i.add(p);
+      }
+  };
+  await h(t), await Promise.all(i);
+};
+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}`,
     enforce: "post",
     apply: "build",
-    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;
+    config(r) {
+      return typeof e.config == "function" && (r = e.config(r)), r.define = {
+        "process.env.NODE_ENV": JSON.stringify("production"),
+        ...r.define
+      }, r;
     },
-    configResolved(config) {
-      var _a, _b, _c, _d;
-      isSsrBuild = !!config.build.ssr;
-      if (isSsrBuild) {
-        qwikRouterPlugin = config.plugins.find(
-          (p) => p.name === "vite-plugin-qwik-router"
-        );
-        if (!qwikRouterPlugin) {
+    configResolved(r) {
+      if (o = !!r.build.ssr, w = r.command, o) {
+        if (s = r.plugins.find(
+          (f) => f.name === "vite-plugin-qwik-router"
+        ), !s)
           throw new Error("Missing vite-plugin-qwik-router");
-        }
-        qwikVitePlugin = config.plugins.find(
-          (p) => p.name === "vite-plugin-qwik"
-        );
-        if (!qwikVitePlugin) {
+        if (t = r.plugins.find(
+          (f) => f.name === "vite-plugin-qwik"
+        ), !t)
           throw new Error("Missing vite-plugin-qwik");
-        }
-        serverOutDir = config.build.outDir;
-        if (((_a = config.build) == null ? void 0 : _a.ssr) !== true) {
+        if (i = r.build.outDir, r.build?.ssr !== !0)
           throw new Error(
-            `"build.ssr" must be set to "true" in order to use the "${opts.name}" adapter.`
+            `"build.ssr" must be set to "true" in order to use the "${e.name}" adapter.`
           );
-        }
-        if (!((_c = (_b = config.build) == null ? void 0 : _b.rollupOptions) == null ? void 0 : _c.input)) {
+        if (!r.build?.rollupOptions?.input)
           throw new Error(
-            `"build.rollupOptions.input" must be set in order to use the "${opts.name}" adapter.`
+            `"build.rollupOptions.input" must be set in order to use the "${e.name}" adapter.`
           );
-        }
-        if (((_d = config.ssr) == null ? void 0 : _d.format) === "cjs") {
-          format = "cjs";
-        }
       }
     },
-    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 = join2(serverOutDir, fileName);
-            } else if (chunk.name === "@qwik-router-config") {
-              qwikRouterConfigModulePath = join2(serverOutDir, fileName);
-            }
-          }
-        }
-        if (!renderModulePath) {
-          throw new Error(
-            'Unable to find "entry.ssr" entry point. Did you forget to add it to "build.rollupOptions.input"?'
-          );
-        }
-        if (!qwikRouterConfigModulePath) {
-          throw new Error(
-            'Unable to find "@qwik-router-config" entry point. Did you forget to add it to "build.rollupOptions.input"?'
-          );
+    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"
+        }));
+      }
+    },
+    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)));
         }
       }
     },
     closeBundle: {
-      sequential: true,
+      sequential: !0,
       async handler() {
-        var _a;
-        if (isSsrBuild && opts.ssg !== null && serverOutDir && (qwikRouterPlugin == null ? void 0 : qwikRouterPlugin.api) && (qwikVitePlugin == null ? void 0 : 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 (renderModulePath && qwikRouterConfigModulePath && clientOutDir && clientPublicOutDir) {
-            let ssgOrigin = ((_a = opts.ssg) == null ? void 0 : _a.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}`;
-            }
+        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}`);
             try {
-              ssgOrigin = new URL(ssgOrigin).origin;
-            } catch (e) {
+              n = new URL(n).origin;
+            } catch {
               this.warn(
-                `Invalid "origin" option: "${ssgOrigin}". Using default origin: "https://yoursite.qwik.dev"`
-              );
-              ssgOrigin = `https://yoursite.qwik.dev`;
+                `Invalid "origin" option: "${n}". Using default origin: "https://yoursite.qwik.dev"`
+              ), n = "https://yoursite.qwik.dev";
             }
-            const staticGenerate = await import("../../../static/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.`
+            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.`
               );
-              err.stack = void 0;
-              this.error(err);
+              _.stack = void 0, this.error(_);
             }
-            staticPaths.push(...staticGenerateResult.staticPaths);
-            const { staticPathsCode, notFoundPathsCode } = await postBuild(
-              clientPublicOutDir,
-              assetsDir ? join2(basePathname, assetsDir) : basePathname,
-              staticPaths,
-              format,
-              !!opts.cleanStaticGenerated
-            );
-            await Promise.all([
-              fs2.promises.writeFile(join2(serverOutDir, RESOLVED_STATIC_PATHS_ID), staticPathsCode),
-              fs2.promises.writeFile(
-                join2(serverOutDir, RESOLVED_NOT_FOUND_PATHS_ID),
-                notFoundPathsCode
-              )
-            ]);
-            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(
-              `
+            r.push(...S.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(
+            `
 ==============================================
 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();
         }
       }
     }
   };
-  return plugin;
 }
-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) {
+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)
       break;
-    }
   }
-  throw new Error(`Unable to find "${dirName}" directory from "${startDir}"`);
+  throw new Error(`Unable to find "${s}" directory from "${e}"`);
 }
-var STATIC_PATHS_ID = "@qwik-router-static-paths";
-var RESOLVED_STATIC_PATHS_ID = `${STATIC_PATHS_ID}.js`;
-var NOT_FOUND_PATHS_ID = "@qwik-router-not-found-paths";
-var RESOLVED_NOT_FOUND_PATHS_ID = `${NOT_FOUND_PATHS_ID}.js`;
 export {
-  NOT_FOUND_PATHS_ID,
-  RESOLVED_NOT_FOUND_PATHS_ID,
-  RESOLVED_STATIC_PATHS_ID,
-  STATIC_PATHS_ID,
-  getParentDir,
-  viteAdapter
+  x as getParentDir,
+  W as viteAdapter
 };

package/lib/adapters/ssg/vite/index-BqUeglYs.cjs

@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});async function t(r){return await(await o()).generate(r)}function o(){if(e())return Promise.resolve().then(()=>require("./index-vQuPcef3.cjs"));if(n()||s())return Promise.resolve().then(()=>require("./index-DTIOTwZo.cjs"));throw new Error("Unsupported platform")}function e(){return typeof Deno<"u"}function n(){return typeof Bun<"u"}function s(){return!n()&&!e()&&typeof process<"u"&&!!process.versions?.node}exports.generate=t;