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

package/lib/adapters/shared/vite/index.d.ts

@@ -75,7 +75,7 @@ export declare interface ServerAdapterOptions {
 }
 
 /** @public */
-export declare function viteAdapter(opts: ViteAdapterPluginOptions): Plugin_2<never>;
+export declare function viteAdapter(opts: ViteAdapterPluginOptions): Plugin_2<any>[];
 
 /** @public */
 declare interface ViteAdapterPluginOptions {

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

@@ -1,7 +1,29 @@
 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';
 
+const SSG_WORKER_IMPORT_PREFIX = "@qwik-router-ssg-worker/";
+function ssgWorkerImportPlugin() {
+  return {
+    name: "qwik-router-ssg-worker-imports",
+    enforce: "pre",
+    async resolveId(id, importer) {
+      if (!id.startsWith(SSG_WORKER_IMPORT_PREFIX)) {
+        return null;
+      }
+      const subpath = id.slice(SSG_WORKER_IMPORT_PREFIX.length);
+      const sourceId = fileURLToPath(new URL(`../../${subpath}`, import.meta.url));
+      const resolved = await this.resolve(sourceId, importer, {
+        skipSelf: true
+      });
+      return `${(resolved ?? {
+        id: sourceId
+      }).id}?ssg-worker`;
+    }
+  };
+}
+
 function normalizeTrailingSlash(pathname) {
   if (!pathname.endsWith("/")) {
     return pathname + "/";
@@ -196,11 +218,16 @@ function viteAdapter(opts) {
         `import { isMainThread } from 'node:worker_threads';`,
         `import render from '${srcDir}/entry.ssr';`,
         `import qwikRouterConfig from '@qwik-router-config';`,
+        `import { runSsg, startWorker } from '@qwik.dev/router/ssg';`,
         ``,
         `const ssgOpts = ${JSON.stringify(ssgOpts)};`,
         ``,
+        `// Parse --quiet / --debug CLI flags`,
+        `const args = isMainThread ? process.argv.slice(2) : [];`,
+        `if (args.includes('--quiet')) ssgOpts.log = 'quiet';`,
+        `if (args.includes('--debug')) ssgOpts.log = 'debug';`,
+        ``,
         `if (isMainThread) {`,
-        `  const { runSsg } = await import('@qwik.dev/router/ssg');`,
         `  await runSsg({`,
         `    render,`,
         `    qwikRouterConfig,`,
@@ -208,7 +235,6 @@ function viteAdapter(opts) {
         `    ...ssgOpts,`,
         `  });`,
         `} else {`,
-        `  const { startWorker } = await import('@qwik.dev/router/ssg');`,
         `  await startWorker({ render, qwikRouterConfig });`,
         `}`
       ].join("\n");
@@ -300,7 +326,10 @@ See https://qwik.dev/docs/deployments/#cache-headers for more information.
       }
     }
   };
-  return plugin;
+  return [
+    ssgWorkerImportPlugin(),
+    plugin
+  ];
 }
 function getParentDir(startDir, dirName) {
   const root = resolve("/");

package/lib/chunks/deepFreeze.qwik.mjs

@@ -0,0 +1,18 @@
+const deepFreeze = (obj) => {
+  if (obj == null) {
+    return obj;
+  }
+  Object.getOwnPropertyNames(obj).forEach((prop) => {
+    const value = obj[prop];
+    if (value && typeof value === "object" && !Object.isFrozen(value)) {
+      try {
+        deepFreeze(value);
+      } catch {
+        return obj;
+      }
+    }
+  });
+  return Object.freeze(obj);
+};
+
+export { deepFreeze as d };

package/lib/chunks/http-error.qwik.mjs

@@ -1,13 +1,17 @@
-import { componentQrl, inlinedQrl, _jsxSorted } from '@qwik.dev/core';
+import { componentQrl, inlinedQrl, _jsxSorted, _fnSignal } from '@qwik.dev/core';
 import { k as useHttpStatus } from './use-functions.qwik.mjs';
 
+const _hf0 = (p0) => p0.status || 500;
+const _hf0_str = "p0.status||500";
+const _hf1 = (p0) => p0.message || "";
+const _hf1_str = 'p0.message||""';
 const cacheKey = (status) => String(status);
 const COLOR_400 = "#006ce9";
 const COLOR_500 = "#713fc2";
 const DisplayHttpStatus = /* @__PURE__ */ componentQrl(/* @__PURE__ */ inlinedQrl(() => {
-  const { status, message } = useHttpStatus();
-  const width = message ? "600px" : "300px";
-  const color = status < 500 ? COLOR_400 : COLOR_500;
+  const httpstatus = useHttpStatus();
+  const width = httpstatus.message ? "600px" : "300px";
+  const color = httpstatus.status < 500 ? COLOR_400 : COLOR_500;
   const style = `
 			body { color: ${color}; background-color: #fafafa; padding: 30px; font-family: ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, Roboto, sans-serif; }
 			p { max-width: ${width}; margin: 60px auto 30px auto; background: white; border-radius: 4px; box-shadow: 0px 0px 50px -20px ${color}; overflow: hidden; }
@@ -18,9 +22,13 @@ const DisplayHttpStatus = /* @__PURE__ */ componentQrl(/* @__PURE__ */ inlinedQr
     /* @__PURE__ */ _jsxSorted("style", {
       dangerouslySetInnerHTML: style
     }, null, null, 3, null),
-    /* @__PURE__ */ _jsxSorted("strong", null, null, status || 500, 3, null),
+    /* @__PURE__ */ _jsxSorted("strong", null, null, _fnSignal(_hf0, [
+      httpstatus
+    ], _hf0_str), 3, null),
     " ",
-    /* @__PURE__ */ _jsxSorted("span", null, null, message || "", 3, null)
+    /* @__PURE__ */ _jsxSorted("span", null, null, _fnSignal(_hf1, [
+      httpstatus
+    ], _hf1_str), 3, null)
   ], 1, "vY_0");
 }, "DisplayHttpStatus_component_PJf4K4PL7Oc"));
 

package/lib/chunks/redirect-handler.mjs

@@ -0,0 +1,6 @@
+class AbortMessage {
+}
+class RedirectMessage extends AbortMessage {
+}
+
+export { AbortMessage as A, RedirectMessage as R };

package/lib/chunks/routing.qwik.mjs

@@ -1,8 +1,8 @@
 import { createAsyncQrl, inlinedQrl, _captures, isBrowser, withLocale } from '@qwik.dev/core';
 import { _deserialize, _UNINITIALIZED } from '@qwik.dev/core/internal';
 import { p } from '@qwik.dev/core/preloader';
+import { d as deepFreeze } from './deepFreeze.qwik.mjs';
 
-const MODULE_CACHE = /* @__PURE__ */ new WeakMap();
 const CLIENT_DATA_CACHE = /* @__PURE__ */ new Map();
 const QACTION_KEY = "qaction";
 const QLOADER_KEY = "qloaders";
@@ -376,23 +376,7 @@ const resolveHead = (endpoint, routeLocation, contentModules, locale, defaults)
   return resolveRouteConfig(getData, routeLocation, contentModules, locale, endpoint.status, defaults).head;
 };
 
-const deepFreeze = (obj) => {
-  if (obj == null) {
-    return obj;
-  }
-  Object.getOwnPropertyNames(obj).forEach((prop) => {
-    const value = obj[prop];
-    if (value && typeof value === "object" && !Object.isFrozen(value)) {
-      try {
-        deepFreeze(value);
-      } catch {
-        return obj;
-      }
-    }
-  });
-  return Object.freeze(obj);
-};
-
+const MODULE_CACHE = /* @__PURE__ */ new WeakMap();
 const httpErrorLoader = () => import('./http-error.qwik.mjs');
 function walkTrieKeys(root, keys) {
   let node = root;
@@ -401,7 +385,18 @@ function walkTrieKeys(root, keys) {
     layouts.push(node._L);
   }
   for (const key of keys) {
-    const next = node[key];
+    let next = node[key];
+    if (!next && node._M) {
+      for (const group of node._M) {
+        next = group[key];
+        if (next) {
+          if (group._L) {
+            layouts.push(group._L);
+          }
+          break;
+        }
+      }
+    }
     if (!next) {
       return void 0;
     }
@@ -415,27 +410,6 @@ function walkTrieKeys(root, keys) {
     layouts
   };
 }
-function resolveLoaders(root, node, gatheredLayouts) {
-  if (node._G) {
-    const keys = node._G.split("/").filter((p) => p.length > 0);
-    const target = walkTrieKeys(root, keys);
-    if (!target) {
-      return void 0;
-    }
-    return resolveLoaders(root, target.node, target.layouts);
-  }
-  const index = node._I;
-  if (!index) {
-    return void 0;
-  }
-  if (Array.isArray(index)) {
-    return index;
-  }
-  return [
-    ...gatheredLayouts,
-    index
-  ];
-}
 function collectNodeMeta(node, groups, layouts, errorLoaderRef, notFoundLoaderRef, menuLoaderRef) {
   for (const g of groups) {
     if (g._L) {
@@ -553,6 +527,43 @@ function findIndexNode(node) {
   }
   return void 0;
 }
+function resolveLoaders(root, node, gatheredLayouts) {
+  if (node._G) {
+    const keys = node._G.split("/").filter((p) => p.length > 0);
+    const target = walkTrieKeys(root, keys);
+    if (!target) {
+      return void 0;
+    }
+    let targetNode = target.node;
+    const targetLayouts = target.layouts;
+    if (!targetNode._I && !targetNode._G) {
+      const indexResult = findIndexNode(targetNode);
+      if (indexResult) {
+        for (const g of indexResult.groups) {
+          if (g._L) {
+            targetLayouts.push(g._L);
+          }
+        }
+        targetNode = indexResult.target;
+        if (targetNode._L) {
+          targetLayouts.push(targetNode._L);
+        }
+      }
+    }
+    return resolveLoaders(root, targetNode, targetLayouts);
+  }
+  const index = node._I;
+  if (!index) {
+    return void 0;
+  }
+  if (Array.isArray(index)) {
+    return index;
+  }
+  return [
+    ...gatheredLayouts,
+    index
+  ];
+}
 function findRestNode(node) {
   if (node._A) {
     return {
@@ -806,4 +817,4 @@ const loadRoute = async (routes, cacheModules, pathname, isInternal) => {
   };
 };
 
-export { CLIENT_DATA_CACHE as C, DEFAULT_LOADERS_SERIALIZATION_STRATEGY as D, Q_ROUTE as Q, createDocumentHead as a, isSameOrigin as b, createLoaderSignal as c, loadRoute as d, clientNavigate as e, QFN_KEY as f, getClientNavPath as g, QACTION_KEY as h, isSamePath as i, QDATA_KEY as j, isPromise as k, loadClientData as l, QLOADER_KEY as m, resolveRouteConfig as n, preloadRouteBundles as p, resolveHead as r, shouldPreload as s, toUrl as t };
+export { CLIENT_DATA_CACHE as C, DEFAULT_LOADERS_SERIALIZATION_STRATEGY as D, Q_ROUTE as Q, createDocumentHead as a, isSameOrigin as b, createLoaderSignal as c, clientNavigate as d, loadRoute as e, toPath as f, getClientNavPath as g, QFN_KEY as h, isSamePath as i, QACTION_KEY as j, QDATA_KEY as k, loadClientData as l, resolveRouteConfig as m, QLOADER_KEY as n, isPromise as o, preloadRouteBundles as p, resolveHead as r, shouldPreload as s, toUrl as t };

package/lib/chunks/system.mjs

@@ -14,6 +14,7 @@ function ssgWorkerCompare(a, b) {
   return a.totalTasks < b.totalTasks ? -1 : 1;
 }
 async function createWorkerPool(sys, opts) {
+  const log = await sys.createLogger();
   const ssgWorkers = [];
   const sitemapBuffer = [];
   let sitemapStream = null;
@@ -119,9 +120,10 @@ async function createWorkerPool(sys, opts) {
       }
     });
     nodeWorker.on("error", (e) => {
-      console.error(`worker error`, e);
+      log.error(`worker error`, e);
     });
     nodeWorker.on("exit", (code) => {
+      log.debug(`worker exit code=${code}`);
       if (terminateTimeout) {
         clearTimeout(terminateTimeout);
         terminateTimeout = null;
@@ -210,7 +212,7 @@ async function createWorkerPool(sys, opts) {
     }
   };
   if (sitemapOutFile) {
-    await ensureDir(sitemapOutFile);
+    await sys.ensureDir(sitemapOutFile);
     sitemapStream = fs.createWriteStream(sitemapOutFile, {
       flags: "w"
     });
@@ -218,6 +220,7 @@ async function createWorkerPool(sys, opts) {
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
 `);
   }
+  log.debug(`creating ${maxWorkers} workers, ${maxTasksPerWorker} tasks each`);
   for (let i = 0; i < maxWorkers; i++) {
     ssgWorkers.push(createWorker());
     if (process.platform === "win32" && i < maxWorkers - 1) {
@@ -260,20 +263,22 @@ async function createSystem(opts, threadId) {
       return (diff[0] * NS_PER_SEC + diff[1]) * MS_PER_NS;
     };
   };
+  const noop = () => {
+  };
   const createLogger = async () => {
+    const isQuiet = opts.log === "quiet";
+    const isDebug = opts.log === "debug";
     if (threadId !== void 0) {
       return {
-        debug: opts.log === "debug" ? console.debug.bind(console, `[${threadId}]`) : () => {
-        },
+        debug: isDebug ? console.debug.bind(console, `[${threadId}]`) : noop,
         error: console.error.bind(console, `[${threadId}]`),
-        info: console.info.bind(console, `[${threadId}]`)
+        info: isQuiet ? noop : console.info.bind(console, `[${threadId}]`)
       };
     }
     return {
-      debug: opts.log === "debug" ? console.debug.bind(console) : () => {
-      },
+      debug: isDebug ? console.debug.bind(console) : noop,
       error: console.error.bind(console),
-      info: console.info.bind(console)
+      info: isQuiet ? noop : console.info.bind(console)
     };
   };
   const outDir = normalizePath(opts.outDir);