@qwik.dev/router 2.0.0-beta.27 → 2.0.0-beta.29

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

@@ -2,51 +2,6 @@ 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 fsPath = join(fsDir, fsName);
-    if (fsName === "index.html" || fsName === "q-data.json") {
-      if (!staticPaths.has(pathname) && cleanStatic) {
-        await fs.promises.unlink(fsPath);
-      }
-      return;
-    }
-    if (fsName === "404.html") {
-      const notFoundHtml = await fs.promises.readFile(fsPath, "utf-8");
-      notFounds.push([pathname, notFoundHtml]);
-      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 = createNotFoundPathsCode(pathName, notFounds);
-  const staticPathsCode = createStaticPathsCode(staticPaths);
-  await injectStatics(staticPathsCode, notFoundPathsCode, serverOutDir);
-}
 function normalizeTrailingSlash(pathname) {
   if (!pathname.endsWith("/")) {
     return pathname + "/";
@@ -71,7 +26,10 @@ function createNotFoundPathsCode(basePathname, notFounds) {
   });
   if (!notFounds.some((r) => r[0] === basePathname)) {
     const html = getErrorHtml(404, "Resource Not Found");
-    notFounds.push([basePathname, html]);
+    notFounds.push([
+      basePathname,
+      html
+    ]);
   }
   return JSON.stringify(notFounds, null, 2).slice(1, -1);
 }
@@ -83,19 +41,18 @@ const injectStatics = async (staticPathsCode, notFoundPathsCode, outDir) => {
   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,
-      (_, _quote, type) => {
-        replaced = true;
-        return type === "STATIC_PATHS" ? staticPathsCode : notFoundPathsCode;
-      }
-    );
+    const newCode = code.replace(/(['"])__QWIK_ROUTER_(STATIC_PATHS|NOT_FOUND)_ARRAY__\1/g, (_, _quote, type) => {
+      replaced = true;
+      return type === "STATIC_PATHS" ? staticPathsCode : notFoundPathsCode;
+    });
     if (replaced) {
       await fs.promises.writeFile(path, newCode);
     }
   };
   const walk = async (dir) => {
-    const entries = await fs.promises.readdir(dir, { withFileTypes: true });
+    const entries = await fs.promises.readdir(dir, {
+      withFileTypes: true
+    });
     for (const entry of entries) {
       if (entry.isDirectory()) {
         await walk(join(dir, entry.name));
@@ -110,14 +67,61 @@ const injectStatics = async (staticPathsCode, notFoundPathsCode, outDir) => {
   await walk(outDir);
   await Promise.all(promises);
 };
+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 fsPath = join(fsDir, fsName);
+    if (fsName === "index.html" || fsName === "q-data.json") {
+      if (!staticPaths.has(pathname) && cleanStatic) {
+        await fs.promises.unlink(fsPath);
+      }
+      return;
+    }
+    if (fsName === "404.html") {
+      const notFoundHtml = await fs.promises.readFile(fsPath, "utf-8");
+      notFounds.push([
+        pathname,
+        notFoundHtml
+      ]);
+      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 = createNotFoundPathsCode(pathName, notFounds);
+  const staticPathsCode = createStaticPathsCode(staticPaths);
+  await injectStatics(staticPathsCode, notFoundPathsCode, serverOutDir);
+}
 
+const QWIK_SSG_ENTRY_ID = "@qwik-ssg-entry";
+const QWIK_SSG_ENTRY_RESOLVED = "\0@qwik-ssg-entry";
 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 = {
@@ -135,63 +139,96 @@ function viteAdapter(opts) {
       return config;
     },
     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");
-        }
-        qwikVitePlugin = config.plugins.find(
-          (p) => p.name === "vite-plugin-qwik"
-        );
-        if (!qwikVitePlugin) {
-          throw new Error("Missing vite-plugin-qwik");
-        }
-        serverOutDir = config.build.outDir;
-        if (config.build?.ssr !== true) {
-          throw new Error(
-            `"build.ssr" must be set to "true" in order to use the "${opts.name}" adapter.`
-          );
-        }
-        if (!config.build?.rollupOptions?.input) {
-          throw new Error(
-            `"build.rollupOptions.input" must be set in order to use the "${opts.name}" adapter.`
-          );
+      qwikRouterPlugin = config.plugins.find((p) => p.name === "vite-plugin-qwik-router");
+      if (!qwikRouterPlugin) {
+        throw new Error("Missing vite-plugin-qwik-router");
+      }
+      qwikVitePlugin = config.plugins.find((p) => p.name === "vite-plugin-qwik");
+      if (!qwikVitePlugin) {
+        throw new Error("Missing vite-plugin-qwik");
+      }
+      serverOutDir = config.build.outDir;
+    },
+    resolveId(id) {
+      if (id === QWIK_SSG_ENTRY_ID) {
+        return QWIK_SSG_ENTRY_RESOLVED;
+      }
+    },
+    load(id) {
+      if (id !== QWIK_SSG_ENTRY_RESOLVED) {
+        return;
+      }
+      const { srcDir } = qwikVitePlugin.api.getOptions();
+      const clientPublicOutDir = qwikVitePlugin.api.getClientPublicOutDir();
+      const basePathname = qwikRouterPlugin.api.getBasePathname();
+      const rootDir = qwikVitePlugin.api.getRootDir() ?? void 0;
+      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 {
+        ssgOrigin = new URL(ssgOrigin).origin;
+      } catch {
+        this.warn(`Invalid "origin" option: "${ssgOrigin}". Using default origin: "https://yoursite.qwik.dev"`);
+        ssgOrigin = `https://yoursite.qwik.dev`;
+      }
+      const ssgOpts = {
+        origin: ssgOrigin,
+        outDir: clientPublicOutDir,
+        basePathname,
+        rootDir,
+        ...opts.ssg,
+        maxWorkers: opts.maxWorkers
+      };
+      for (const key of Object.keys(ssgOpts)) {
+        if (ssgOpts[key] === void 0) {
+          delete ssgOpts[key];
         }
       }
+      return [
+        `import { isMainThread } from 'node:worker_threads';`,
+        `import render from '${srcDir}/entry.ssr';`,
+        `import qwikRouterConfig from '@qwik-router-config';`,
+        ``,
+        `const ssgOpts = ${JSON.stringify(ssgOpts)};`,
+        ``,
+        `if (isMainThread) {`,
+        `  const { runSsg } = await import('@qwik.dev/router/ssg');`,
+        `  await runSsg({`,
+        `    render,`,
+        `    qwikRouterConfig,`,
+        `    workerFilePath: new URL(import.meta.url).href,`,
+        `    ...ssgOpts,`,
+        `  });`,
+        `} else {`,
+        `  const { startWorker } = await import('@qwik.dev/router/ssg');`,
+        `  await startWorker({ render, qwikRouterConfig });`,
+        `}`
+      ].join("\n");
     },
     buildStart() {
-      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"
-          });
-        }
+      if (this.environment.config.consumer === "server" && opts.ssg !== null && viteCommand === "build" && serverOutDir) {
+        this.emitFile({
+          id: QWIK_SSG_ENTRY_ID,
+          type: "chunk",
+          fileName: "run-ssg.js"
+        });
       }
     },
     generateBundle(_, bundles) {
-      if (isSsrBuild) {
+      if (this.environment.config.consumer === "server") {
         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);
-            }
           }
         }
       }
@@ -199,61 +236,48 @@ function viteAdapter(opts) {
     closeBundle: {
       sequential: true,
       async handler() {
-        if (isSsrBuild && serverOutDir && qwikRouterPlugin?.api && qwikVitePlugin?.api) {
+        if (this.environment.config.consumer === "server" && 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}`;
+          if (opts.ssg !== null && clientOutDir && clientPublicOutDir) {
+            const runSsgPath = join(serverOutDir, "run-ssg.js");
+            const { spawn } = await import('node:child_process');
+            const ssgExitCode = await new Promise((resolve2, reject) => {
+              const child = spawn(process.execPath, [
+                runSsgPath
+              ], {
+                stdio: [
+                  "ignore",
+                  "inherit",
+                  "inherit"
+                ],
+                env: {
+                  ...process.env,
+                  NODE_ENV: process.env.NODE_ENV || "production"
+                }
+              });
+              child.on("close", resolve2);
+              child.on("error", reject);
+            });
+            if (ssgExitCode !== 0) {
+              const err = new Error(`Error while running SSG from "${opts.name}" adapter. At least one path failed to render.`);
+              err.stack = void 0;
+              this.error(err);
             }
+            const fs = await import('node:fs');
+            const staticPathsFile = join(clientPublicOutDir, "_static-paths.json");
             try {
-              ssgOrigin = new URL(ssgOrigin).origin;
+              const content = await fs.promises.readFile(staticPathsFile, "utf-8");
+              staticPaths.push(...JSON.parse(content));
+              await fs.promises.unlink(staticPathsFile);
             } catch {
-              this.warn(
-                `Invalid "origin" option: "${ssgOrigin}". Using default origin: "https://yoursite.qwik.dev"`
-              );
-              ssgOrigin = `https://yoursite.qwik.dev`;
             }
-            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.`
-              );
-              err.stack = void 0;
-              this.error(err);
-            }
-            staticPaths.push(...staticGenerateResult.staticPaths);
           }
-          await postBuild(
-            clientPublicOutDir,
-            serverOutDir,
-            assetsDir ? join(basePathname, assetsDir) : basePathname,
-            staticPaths,
-            !!opts.cleanStaticGenerated
-          );
+          await postBuild(clientPublicOutDir, serverOutDir, assetsDir ? join(basePathname, assetsDir) : basePathname, staticPaths, !!opts.cleanStaticGenerated);
           if (typeof opts.generate === "function") {
             await opts.generate({
               outputEntries,
@@ -267,21 +291,11 @@ function viteAdapter(opts) {
               error: (message) => this.error(message)
             });
           }
-          this.warn(
-            `
+          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.
-==============================================`
-          );
-          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();
-          }
+==============================================`);
         }
       }
     }

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

@@ -1,14 +1,13 @@
 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: opts.origin,
     ssg: {
-      include: ["/*"],
+      include: [
+        "/*"
+      ],
       ...opts
     }
   });

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

@@ -1,7 +1,6 @@
 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({
@@ -14,7 +13,20 @@ function vercelEdgeAdapter(opts = {}) {
       const outDir = config.build?.outDir || join(".vercel", "output", "functions", "_qwik-router.func");
       return {
         resolve: {
-          conditions: opts.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: opts.target === "node" ? "node" : "webworker",
@@ -38,7 +50,9 @@ function vercelEdgeAdapter(opts = {}) {
       if (opts.outputConfig !== false) {
         const vercelOutputConfig = {
           routes: [
-            { handle: "filesystem" },
+            {
+              handle: "filesystem"
+            },
             {
               src: basePathname + ".*",
               dest: "/_qwik-router"
@@ -46,10 +60,7 @@ function vercelEdgeAdapter(opts = {}) {
           ],
           version: 3
         };
-        await fs.promises.writeFile(
-          join(vercelOutputDir, "config.json"),
-          JSON.stringify(vercelOutputConfig, null, 2)
-        );
+        await fs.promises.writeFile(join(vercelOutputDir, "config.json"), JSON.stringify(vercelOutputConfig, null, 2));
       }
       let entrypoint = opts.vcConfigEntryPoint;
       if (!entrypoint) {
@@ -71,8 +82,13 @@ function vercelEdgeAdapter(opts = {}) {
       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.rm(vercelStaticDir, {
+        recursive: true,
+        force: true
+      });
+      await fs.promises.mkdir(dirname(vercelStaticDir), {
+        recursive: true
+      });
       await fs.promises.rename(clientPublicOutDir, vercelStaticDir);
     }
   });

package/lib/chunks/error-handler.mjs

@@ -1,14 +1,20 @@
-function getErrorHtml(status, e) {
-  let message = "Server Error";
-  if (e != null) {
-    if (typeof e.message === "string") {
-      message = e.message;
-    } else {
-      message = String(e);
+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 "";
     }
-  }
-  return `<html>` + minimalHtmlResponse(status, message) + `</html>`;
-}
+  });
+};
+const COLOR_400 = "#006ce9";
+const COLOR_500 = "#713fc2";
 function minimalHtmlResponse(status, message) {
   if (typeof status !== "number") {
     status = 500;
@@ -36,22 +42,16 @@ function minimalHtmlResponse(status, message) {
 <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 "";
+function getErrorHtml(status, e) {
+  let message = "Server Error";
+  if (e != null) {
+    if (typeof e.message === "string") {
+      message = e.message;
+    } else {
+      message = String(e);
     }
-  });
-};
-const COLOR_400 = "#006ce9";
-const COLOR_500 = "#713fc2";
+  }
+  return `<html>` + minimalHtmlResponse(status, message) + `</html>`;
+}
 
 export { getErrorHtml as g, minimalHtmlResponse as m };