@qwik.dev/router 2.0.0-beta.35 → 2.0.0-beta.37

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

@@ -1,6 +1,7 @@
 import fs from 'node:fs';
 import { join, relative } from 'node:path';
 import { n as normalizePathSlash } from '../../../chunks/fs.mjs';
+import { e as ensureSlash } from '../../../chunks/pathname.mjs';
 import { viteAdapter } from '../../shared/vite/index.mjs';
 
 function cloudflarePagesAdapter(opts = {}) {
@@ -42,10 +43,7 @@ function cloudflarePagesAdapter(opts = {}) {
       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 pathName = ensureSlash(assetsDir ? join(basePathname, assetsDir) : basePathname);
         const routesJson = {
           version: 1,
           include: [

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

@@ -2,6 +2,8 @@ import { join, resolve, dirname, basename } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import fs from 'node:fs';
 import { g as getErrorHtml } from '../../../chunks/error-handler.mjs';
+import { L as LOADER_REGEX } from '../../../chunks/request-path.mjs';
+import { e as ensureSlash } from '../../../chunks/pathname.mjs';
 
 const SSG_WORKER_IMPORT_PREFIX = "@qwik-router-ssg-worker/";
 function ssgWorkerImportPlugin() {
@@ -24,12 +26,6 @@ function ssgWorkerImportPlugin() {
   };
 }
 
-function normalizeTrailingSlash(pathname) {
-  if (!pathname.endsWith("/")) {
-    return pathname + "/";
-  }
-  return pathname;
-}
 function createNotFoundPathsCode(basePathname, notFounds) {
   notFounds.sort((a, b) => {
     if (a[0].length > b[0].length) {
@@ -91,21 +87,22 @@ const injectStatics = async (staticPathsCode, notFoundPathsCode, outDir) => {
 };
 async function postBuild(clientOutDir, serverOutDir, pathName, userStaticPaths, cleanStatic) {
   if (pathName && !pathName.endsWith("/")) {
-    pathName += "/";
+    pathName = ensureSlash(pathName);
   }
+  const pathNameBase = pathName || "/";
   const ignorePathnames = /* @__PURE__ */ new Set([
-    pathName + "/" + (globalThis.__QWIK_BUILD_DIR__ || "build") + "/",
-    pathName + "/" + (globalThis.__QWIK_ASSETS_DIR__ || "assets") + "/"
+    pathNameBase + (globalThis.__QWIK_BUILD_DIR__ || "build") + "/",
+    pathNameBase + (globalThis.__QWIK_ASSETS_DIR__ || "assets") + "/"
   ]);
-  const staticPaths = new Set(userStaticPaths.map(normalizeTrailingSlash));
+  const staticPaths = new Set(userStaticPaths.map(ensureSlash));
   const notFounds = [];
   const loadItem = async (fsDir, fsName, pathname) => {
-    pathname = normalizeTrailingSlash(pathname);
+    pathname = ensureSlash(pathname);
     if (ignorePathnames.has(pathname)) {
       return;
     }
     const fsPath = join(fsDir, fsName);
-    if (fsName === "index.html" || fsName === "q-data.json") {
+    if (fsName === "index.html" || LOADER_REGEX.test("/" + fsName)) {
       if (!staticPaths.has(pathname) && cleanStatic) {
         await fs.promises.unlink(fsPath);
       }
@@ -121,7 +118,7 @@ async function postBuild(clientOutDir, serverOutDir, pathName, userStaticPaths,
     }
     const stat = await fs.promises.stat(fsPath);
     if (stat.isDirectory()) {
-      await loadDir(fsPath, pathname + fsName + "/");
+      await loadDir(fsPath, ensureSlash(pathname + fsName));
     } else if (stat.isFile()) {
       staticPaths.add(pathname + fsName);
     }
@@ -227,16 +224,22 @@ function viteAdapter(opts) {
         `if (args.includes('--quiet')) ssgOpts.log = 'quiet';`,
         `if (args.includes('--debug')) ssgOpts.log = 'debug';`,
         ``,
-        `if (isMainThread) {`,
-        `  await runSsg({`,
-        `    render,`,
-        `    qwikRouterConfig,`,
-        `    workerFilePath: new URL(import.meta.url).href,`,
-        `    ...ssgOpts,`,
-        `  });`,
-        `} else {`,
-        `  await startWorker({ render, qwikRouterConfig });`,
-        `}`
+        // Fire-and-forget instead of top-level await. On the worker/edge SSR target Vite
+        // inlines dynamic imports, and Rollup then reads the inlined `./system` namespace
+        // before it is initialized across a top-level await. See rollup/rollup#4166.
+        // runSsg/startWorker keep the process alive (worker handles) and call process.exit.
+        `const ssgRun = isMainThread`,
+        `  ? runSsg({`,
+        `      render,`,
+        `      qwikRouterConfig,`,
+        `      workerFilePath: new URL(import.meta.url).href,`,
+        `      ...ssgOpts,`,
+        `    })`,
+        `  : startWorker({ render, qwikRouterConfig });`,
+        `ssgRun.catch((err) => {`,
+        `  console.error(err);`,
+        `  process.exit(1);`,
+        `});`
       ].join("\n");
     },
     buildStart() {