@qwik.dev/router 2.0.0-beta.34 → 2.0.0-beta.36

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

@@ -227,16 +227,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() {

package/lib/chunks/use-functions.qwik.mjs

@@ -16,9 +16,6 @@ const useDocumentHead = () => useContext(DocumentHeadContext);
 const useLocation = () => useContext(RouteLocationContext);
 const useNavigate = () => useContext(RouteNavigateContext);
 const usePreventNavigateQrl = (fn) => {
-  if (!__EXPERIMENTAL__.preventNavigate) {
-    throw new Error('usePreventNavigate$ is experimental and must be enabled with `experimental: ["preventNavigate"]` in the `qwikVite` plugin.');
-  }
   const registerPreventNav = useContext(RoutePreventNavigateContext);
   useVisibleTaskQrl(/* @__PURE__ */ inlinedQrl(() => {
     const fn2 = _captures[0], registerPreventNav2 = _captures[1];

package/lib/chunks/worker-thread.qwik.mjs

@@ -1,5 +1,5 @@
 import { parentPort } from 'node:worker_threads';
-import { isDev, _UNINITIALIZED, _deserialize, _verifySerializable, _serialize } from '@qwik.dev/core/internal';
+import { isDev, _UNINITIALIZED, _deserialize, _verifySerializable, _serialize, _getAsyncLocalStorage } from '@qwik.dev/core/internal';
 import { withLocale, inlinedQrl } from '@qwik.dev/core';
 import { A as AbortMessage$1 } from './redirect-handler.mjs';
 import { isServer } from '@qwik.dev/core/build';
@@ -1616,8 +1616,11 @@ The request origin "${inputOrigin}" does not match the server origin "${origin}"
         });
         pipeSource = readable.pipeThrough(capture);
       }
+      let pipeError;
       const pipe = pipeSource.pipeTo(writableStream, {
         preventClose: true
+      }).catch((error) => {
+        pipeError = error;
       });
       const stream = writable.getWriter();
       const status = requestEv.status();
@@ -1627,6 +1630,9 @@ The request origin "${inputOrigin}" does not match the server origin "${origin}"
         const result = await render({
           base: requestEv.basePathname + "build/",
           stream,
+          streaming: isStatic ? {
+            outOfOrder: false
+          } : void 0,
           serverData,
           containerAttributes: {
             ["q:render"]: isStatic ? "static" : "",
@@ -1648,6 +1654,9 @@ The request origin "${inputOrigin}" does not match the server origin "${origin}"
         await stream.close();
         await pipe;
       }
+      if (pipeError) {
+        throw pipeError;
+      }
       if (eTagCacheKey && cacheChunks && cacheChunks.length > 0) {
         const totalLength = cacheChunks.reduce((sum, chunk) => sum + chunk.length, 0);
         const combined = new Uint8Array(totalLength);
@@ -1803,6 +1812,7 @@ function getQwikRouterServerDataWithDeps(deps, requestEv) {
   return {
     url: reconstructedUrl.href,
     requestHeaders,
+    renderMode: deps.getRequestMode(requestEv),
     locale: locale(),
     nonce,
     containerAttributes: {
@@ -1836,6 +1846,7 @@ const responsePageDeps = {
   RequestRouteName,
   getRequestLoaders,
   getRequestLoaderSerializationStrategyMap,
+  getRequestMode,
   getRequestRoute
 };
 function getQwikRouterServerData(...args) {
@@ -2103,11 +2114,12 @@ function createRequestEvent(...args) {
 
 let _asyncRequestStore;
 if (isServer) {
-  import('node:async_hooks').then((module) => {
-    _asyncRequestStore = new module.AsyncLocalStorage();
-  }).catch((err) => {
-    console.warn("\n=====================\n  Qwik Router Warning:\n    AsyncLocalStorage is not available, continuing without it.\n    This impacts concurrent async server calls, where they lose access to the ServerRequestEv object.\n=====================\n\n", err);
-  });
+  const AsyncLocalStorage = _getAsyncLocalStorage();
+  if (AsyncLocalStorage) {
+    _asyncRequestStore = new AsyncLocalStorage();
+  } else {
+    console.warn("\n=====================\n  Qwik Router Warning:\n    AsyncLocalStorage is not available, continuing without it.\n    This impacts concurrent async server calls, where they lose access to the ServerRequestEv object.\n=====================\n\n");
+  }
 }
 
 const ESCAPE_HTML = /[&<>]/g;

package/lib/index.d.ts

@@ -13,7 +13,7 @@ import { QRLEventHandlerMulti } from '@qwik.dev/core';
 import { QwikIntrinsicElements } from '@qwik.dev/core';
 import { QwikJSX } from '@qwik.dev/core';
 import { Render } from '@qwik.dev/core/server';
-import { RenderOptions } from '@qwik.dev/core/server';
+import { RenderToStreamOptions } from '@qwik.dev/core/server';
 import { RequestEvent } from '@qwik.dev/router/middleware/request-handler';
 import { RequestEventAction } from '@qwik.dev/router/middleware/request-handler';
 import { RequestEventBase } from '@qwik.dev/router/middleware/request-handler';
@@ -754,12 +754,12 @@ export declare interface QwikRouterProps {
 export declare const QwikRouterProvider: Component<QwikRouterProps>;
 
 /** @public */
-export declare type RendererOptions = Omit<RenderOptions, 'serverData'> & {
+export declare type RendererOptions = Omit<RenderToStreamOptions, 'serverData'> & {
     serverData: ServerData;
 };
 
 /** @public */
-export declare type RendererOutputOptions = Omit<RenderOptions, 'serverData'> & {
+export declare type RendererOutputOptions = Omit<RenderToStreamOptions, 'serverData'> & {
     serverData: ServerData & {
         documentHead?: DocumentHeadValue;
     } & Record<string, unknown>;
@@ -911,6 +911,7 @@ declare interface ServerConfig {
 export declare type ServerData = {
     url: string;
     requestHeaders: Record<string, string>;
+    renderMode: 'static' | 'server';
     locale: string | undefined;
     nonce: string | undefined;
     containerAttributes: Record<string, string> & {

package/lib/index.qwik.mjs

@@ -26,6 +26,7 @@ const ErrorBoundary = /* @__PURE__ */ componentQrl(/* @__PURE__ */ inlinedQrl((p
   return /* @__PURE__ */ _jsxSorted(Slot, null, null, null, 3, "bA_1");
 }, "ErrorBoundary_component_pOa6vjtC7ik"));
 
+const __vite_import_meta_env__ = {};
 const Link = /* @__PURE__ */ componentQrl(/* @__PURE__ */ inlinedQrl((props) => {
   const nav = useNavigate();
   const loc = useLocation();
@@ -117,7 +118,7 @@ const Link = /* @__PURE__ */ componentQrl(/* @__PURE__ */ inlinedQrl((props) =>
         handler?.(event, anchorRef2.value);
       }
     }
-    const isProdOrTest = !isDev || undefined                    ;
+    const isProdOrTest = !isDev || __vite_import_meta_env__?.TEST;
     if (isProdOrTest && anchorRef2.value) {
       if (prefetchBundleProp2 === "visible" || // deprecated prop below, remove in favor of prefetchBundle
       prefetchProp2 === "js" || prefetchProp2 === true) {
@@ -413,9 +414,6 @@ const useQwikRouter = (props) => {
   }
   const serverHead = useServerData("documentHead");
   const manifestHash = useServerData("containerAttributes")?.["q:manifest-hash"];
-  if (env.ev.originalUrl.pathname !== env.ev.url.pathname && !__EXPERIMENTAL__.enableRequestRewrite) {
-    throw new Error(`enableRequestRewrite is an experimental feature and is not enabled. Please enable the feature flag by adding \`experimental: ["enableRequestRewrite"]\` to your qwikVite plugin options.`);
-  }
   const url = new URL(urlEnv);
   const routeLocationTarget = {
     url,
@@ -1655,7 +1653,15 @@ function omitProps(obj, keys) {
 const createRenderer = (getOptions) => {
   return (opts) => {
     const { jsx, options } = getOptions(opts);
-    return renderToStream(jsx, options);
+    const isStatic = opts.serverData.renderMode === "static";
+    const renderOptions = isStatic ? {
+      ...options,
+      streaming: {
+        ...options.streaming,
+        outOfOrder: false
+      }
+    } : options;
+    return renderToStream(jsx, renderOptions);
   };
 };
 

package/lib/middleware/node/index.mjs

@@ -18,12 +18,15 @@ function fallbackOrigin(req) {
 function computeOrigin(req, opts) {
   return opts?.getOrigin?.(req) ?? opts?.origin ?? process.env.ORIGIN ?? fallbackOrigin(req);
 }
-function isIgnoredError(message = "") {
-  const ignoredErrors = [
-    "The stream has been destroyed",
-    "write after end"
-  ];
-  return ignoredErrors.some((ignored) => message.includes(ignored));
+function isClientAbortWriteError(error) {
+  if (!(error instanceof Error)) {
+    return false;
+  }
+  const code = error.code;
+  if (code === "EPIPE" || code === "ECONNRESET" || code === "ERR_STREAM_DESTROYED" || code === "ERR_STREAM_WRITE_AFTER_END") {
+    return true;
+  }
+  return false;
 }
 const invalidHeadersPattern = /^:(method|scheme|authority|path)$/i;
 function normalizeUrl(url, base) {
@@ -34,38 +37,75 @@ function getUrl(req, origin) {
 }
 function createNodeResponseSink(res) {
   let closed = res.closed || res.destroyed;
+  let responseError;
+  let resolveClosed;
   const closedPromise = closed ? Promise.resolve() : new Promise((resolve) => {
+    resolveClosed = resolve;
     res.once("close", () => {
       closed = true;
       resolve();
     });
   });
+  res.on("error", (error) => {
+    if (responseError === void 0) {
+      responseError = error;
+    }
+    if (!closed) {
+      closed = true;
+      resolveClosed();
+    }
+  });
+  const shouldPropagateResponseError = () => responseError !== void 0 && !isClientAbortWriteError(responseError);
   const write = (chunk) => {
     if (closed || res.closed || res.destroyed) {
+      if (shouldPropagateResponseError()) {
+        return Promise.reject(responseError);
+      }
       return;
     }
     return new Promise((resolve, reject) => {
       let settled = false;
+      let onDrain;
+      const cleanupDrain = () => {
+        if (onDrain) {
+          res.off("drain", onDrain);
+          onDrain = void 0;
+        }
+      };
       const finish = () => {
         if (settled) {
           return;
         }
         settled = true;
+        cleanupDrain();
         setImmediate(resolve);
       };
+      const finishClosed = () => {
+        closed = true;
+        finish();
+      };
       const fail = (error) => {
         if (settled) {
           return;
         }
         settled = true;
+        closed = true;
+        cleanupDrain();
         reject(error);
       };
-      closedPromise.then(finish);
+      closedPromise.then(() => {
+        if (shouldPropagateResponseError()) {
+          fail(responseError);
+          return;
+        }
+        finish();
+      });
+      let ok;
       try {
-        res.write(chunk, (error) => {
+        ok = res.write(chunk, (error) => {
           if (error) {
-            if (isIgnoredError(error.message)) {
-              finish();
+            if (isClientAbortWriteError(error)) {
+              finishClosed();
               return;
             }
             fail(error);
@@ -74,22 +114,69 @@ function createNodeResponseSink(res) {
           finish();
         });
       } catch (error) {
-        if (error instanceof Error && isIgnoredError(error.message)) {
-          finish();
+        if (isClientAbortWriteError(error)) {
+          finishClosed();
           return;
         }
         fail(error);
+        return;
+      }
+      if (settled) {
+        return;
+      }
+      if (ok) {
+        finish();
+      } else {
+        onDrain = () => {
+          onDrain = void 0;
+          finish();
+        };
+        res.once("drain", onDrain);
       }
     });
   };
   const close = () => {
     if (closed || res.closed || res.destroyed) {
+      if (shouldPropagateResponseError()) {
+        return Promise.reject(responseError);
+      }
       return;
     }
-    return new Promise((resolve) => {
-      res.end(() => {
+    return new Promise((resolve, reject) => {
+      let settled = false;
+      const finish = () => {
+        if (settled) {
+          return;
+        }
+        settled = true;
+        closed = true;
         resolve();
+      };
+      const fail = (error) => {
+        if (settled) {
+          return;
+        }
+        settled = true;
+        closed = true;
+        reject(error);
+      };
+      closedPromise.then(() => {
+        if (shouldPropagateResponseError()) {
+          fail(responseError);
+          return;
+        }
+        finish();
       });
+      res.once("finish", finish);
+      try {
+        res.end();
+      } catch (error) {
+        if (isClientAbortWriteError(error)) {
+          finish();
+          return;
+        }
+        fail(error);
+      }
     });
   };
   return {
@@ -123,6 +210,9 @@ async function fromNodeHttp(url, req, res, mode, getClientConn) {
   };
   const body = req.method === "HEAD" || req.method === "GET" ? void 0 : getRequestBody();
   const controller = new AbortController();
+  const abort = () => {
+    controller.abort();
+  };
   const options = {
     method: req.method,
     headers: requestHeaders,
@@ -130,9 +220,10 @@ async function fromNodeHttp(url, req, res, mode, getClientConn) {
     signal: controller.signal,
     duplex: "half"
   };
-  res.on("close", () => {
-    controller.abort();
-  });
+  req.on("aborted", abort);
+  req.on("error", abort);
+  res.on("close", abort);
+  res.on("error", abort);
   const serverRequestEv = {
     mode,
     url,
@@ -142,7 +233,7 @@ async function fromNodeHttp(url, req, res, mode, getClientConn) {
         return process.env[key];
       }
     },
-    getWritableStream: (status, headers, cookies) => {
+    getWritableStream: (status, headers, cookies, resolve) => {
       res.statusCode = status;
       const sink = createNodeResponseSink(res);
       try {
@@ -159,6 +250,7 @@ async function fromNodeHttp(url, req, res, mode, getClientConn) {
       } catch (err) {
         console.error(err);
       }
+      resolve(true);
       return new WritableStream({
         write(chunk) {
           return sink.write(chunk);

package/lib/middleware/request-handler/index.mjs

@@ -1,5 +1,5 @@
 import { Q as Q_ROUTE, m as resolveRouteConfig, n as QLOADER_KEY, h as QFN_KEY, j as QACTION_KEY, o as isPromise, k as QDATA_KEY, b as loadRoute } from '../../chunks/routing.qwik.mjs';
-import { isDev, _UNINITIALIZED, _deserialize, _verifySerializable, _serialize } from '@qwik.dev/core/internal';
+import { isDev, _UNINITIALIZED, _deserialize, _verifySerializable, _serialize, _getAsyncLocalStorage } from '@qwik.dev/core/internal';
 import { inlinedQrl } from '@qwik.dev/core';
 import { R as RedirectMessage, A as AbortMessage } from '../../chunks/redirect-handler.mjs';
 import { isServer } from '@qwik.dev/core/build';
@@ -603,6 +603,7 @@ function getQwikRouterServerDataWithDeps(deps, requestEv) {
   return {
     url: reconstructedUrl.href,
     requestHeaders,
+    renderMode: deps.getRequestMode(requestEv),
     locale: locale(),
     nonce,
     containerAttributes: {
@@ -636,6 +637,7 @@ const responsePageDeps = {
   RequestRouteName,
   getRequestLoaders,
   getRequestLoaderSerializationStrategyMap,
+  getRequestMode,
   getRequestRoute
 };
 function getQwikRouterServerData(...args) {
@@ -1079,8 +1081,11 @@ The request origin "${inputOrigin}" does not match the server origin "${origin}"
         });
         pipeSource = readable.pipeThrough(capture);
       }
+      let pipeError;
       const pipe = pipeSource.pipeTo(writableStream, {
         preventClose: true
+      }).catch((error) => {
+        pipeError = error;
       });
       const stream = writable.getWriter();
       const status = requestEv.status();
@@ -1090,6 +1095,9 @@ The request origin "${inputOrigin}" does not match the server origin "${origin}"
         const result = await render({
           base: requestEv.basePathname + "build/",
           stream,
+          streaming: isStatic ? {
+            outOfOrder: false
+          } : void 0,
           serverData,
           containerAttributes: {
             ["q:render"]: isStatic ? "static" : "",
@@ -1111,6 +1119,9 @@ The request origin "${inputOrigin}" does not match the server origin "${origin}"
         await stream.close();
         await pipe;
       }
+      if (pipeError) {
+        throw pipeError;
+      }
       if (eTagCacheKey && cacheChunks && cacheChunks.length > 0) {
         const totalLength = cacheChunks.reduce((sum, chunk) => sum + chunk.length, 0);
         const combined = new Uint8Array(totalLength);
@@ -1291,11 +1302,12 @@ const { renderQwikMiddleware, resolveRequestHandlers} = requestHandlers;
 
 let _asyncRequestStore;
 if (isServer) {
-  import('node:async_hooks').then((module) => {
-    _asyncRequestStore = new module.AsyncLocalStorage();
-  }).catch((err) => {
-    console.warn("\n=====================\n  Qwik Router Warning:\n    AsyncLocalStorage is not available, continuing without it.\n    This impacts concurrent async server calls, where they lose access to the ServerRequestEv object.\n=====================\n\n", err);
-  });
+  const AsyncLocalStorage = _getAsyncLocalStorage();
+  if (AsyncLocalStorage) {
+    _asyncRequestStore = new AsyncLocalStorage();
+  } else {
+    console.warn("\n=====================\n  Qwik Router Warning:\n    AsyncLocalStorage is not available, continuing without it.\n    This impacts concurrent async server calls, where they lose access to the ServerRequestEv object.\n=====================\n\n");
+  }
 }
 
 function createCacheControl(cacheControl) {

package/lib/vite/index.mjs

@@ -2275,7 +2275,11 @@ class HtmlTransformPatcher {
     }
   }
   async handleEnd(chunk, encoding, callback) {
-    if (typeof encoding === "function") {
+    if (typeof chunk === "function") {
+      callback = chunk;
+      chunk = void 0;
+      encoding = void 0;
+    } else if (typeof encoding === "function") {
       callback = encoding;
       encoding = void 0;
     }
@@ -2293,7 +2297,15 @@ function wrapResponseForHtmlTransform(request, response, server) {
 }
 
 const makeRouterDevMiddleware = (server, ctx) => async (req, res, next) => {
-  const mod = await server.ssrLoadModule("src/entry.ssr");
+  let mod;
+  try {
+    mod = await server.ssrLoadModule("src/entry.ssr");
+  } catch (e) {
+    if (e instanceof Error) {
+      server.ssrFixStacktrace(e);
+    }
+    return next();
+  }
   if (!mod.default) {
     console.error("No default export found in src/entry.ssr");
     return next();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@qwik.dev/router",
   "description": "The router for Qwik.",
-  "version": "2.0.0-beta.34",
+  "version": "2.0.0-beta.36",
   "bugs": "https://github.com/QwikDev/qwik/issues",
   "dependencies": {
     "@azure/functions": "3.5.1",
@@ -40,7 +40,7 @@
     "tsm": "2.3.0",
     "typescript": "5.9.3",
     "uvu": "0.5.6",
-    "@qwik.dev/core": "2.0.0-beta.34"
+    "@qwik.dev/core": "2.0.0-beta.36"
   },
   "engines": {
     "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
@@ -169,7 +169,7 @@
   "main": "./lib/index.qwik.mjs",
   "peerDependencies": {
     "vite": ">=6 <9",
-    "@qwik.dev/core": "^2.0.0-beta.34"
+    "@qwik.dev/core": "^2.0.0-beta.36"
   },
   "publishConfig": {
     "access": "public"