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

package/lib/chunks/routing.qwik.mjs

@@ -509,7 +509,7 @@ function findChild(node, part, partLower, parts, partIndex, params) {
   return void 0;
 }
 function findIndexNode(node) {
-  if (node._I || node._G) {
+  if (node._I || node._G != null) {
     return {
       target: node,
       groups: []
@@ -529,7 +529,7 @@ function findIndexNode(node) {
   return void 0;
 }
 function resolveLoaders(root, node, gatheredLayouts) {
-  if (node._G) {
+  if (node._G != null) {
     const keys = node._G.split("/").filter((p) => p.length > 0);
     const target = walkTrieKeys(root, keys);
     if (!target) {
@@ -537,7 +537,7 @@ function resolveLoaders(root, node, gatheredLayouts) {
     }
     let targetNode = target.node;
     const targetLayouts = target.layouts;
-    if (!targetNode._I && !targetNode._G) {
+    if (!targetNode._I && targetNode._G == null) {
       const indexResult = findIndexNode(targetNode);
       if (indexResult) {
         for (const g of indexResult.groups) {
@@ -650,14 +650,14 @@ function matchRouteTree(root = {}, pathname) {
     collectNodeMeta(node, found.groups, layouts, errorLoaderRef, notFoundLoaderRef, menuLoaderRef);
   }
   if (matched && !done && i === len) {
-    if (!node._I && !node._G) {
+    if (!node._I && node._G == null) {
       const indexResult = findIndexNode(node);
       if (indexResult) {
         collectNodeMeta(indexResult.target, indexResult.groups, layouts, errorLoaderRef, notFoundLoaderRef, menuLoaderRef);
         node = indexResult.target;
       }
     }
-    if (!node._I && !node._G && node._A) {
+    if (!node._I && node._G == null && node._A) {
       const next = node._A;
       const paramName = next._P;
       params[paramName] = "";
@@ -670,7 +670,7 @@ function matchRouteTree(root = {}, pathname) {
         menuLoaderRef.v = node._N;
       }
     }
-    if (!node._I && !node._G) {
+    if (!node._I && node._G == null) {
       const restInfo = findRestNode(node);
       if (restInfo) {
         const next = restInfo.next;

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

@@ -280,7 +280,7 @@ function findChild(node, part, partLower, parts, partIndex, params) {
   return void 0;
 }
 function findIndexNode(node) {
-  if (node._I || node._G) {
+  if (node._I || node._G != null) {
     return {
       target: node,
       groups: []
@@ -300,7 +300,7 @@ function findIndexNode(node) {
   return void 0;
 }
 function resolveLoaders(root, node, gatheredLayouts) {
-  if (node._G) {
+  if (node._G != null) {
     const keys = node._G.split("/").filter((p) => p.length > 0);
     const target = walkTrieKeys(root, keys);
     if (!target) {
@@ -308,7 +308,7 @@ function resolveLoaders(root, node, gatheredLayouts) {
     }
     let targetNode = target.node;
     const targetLayouts = target.layouts;
-    if (!targetNode._I && !targetNode._G) {
+    if (!targetNode._I && targetNode._G == null) {
       const indexResult = findIndexNode(targetNode);
       if (indexResult) {
         for (const g of indexResult.groups) {
@@ -421,14 +421,14 @@ function matchRouteTree(root = {}, pathname) {
     collectNodeMeta(node, found.groups, layouts, errorLoaderRef, notFoundLoaderRef, menuLoaderRef);
   }
   if (matched && !done && i === len) {
-    if (!node._I && !node._G) {
+    if (!node._I && node._G == null) {
       const indexResult = findIndexNode(node);
       if (indexResult) {
         collectNodeMeta(indexResult.target, indexResult.groups, layouts, errorLoaderRef, notFoundLoaderRef, menuLoaderRef);
         node = indexResult.target;
       }
     }
-    if (!node._I && !node._G && node._A) {
+    if (!node._I && node._G == null && node._A) {
       const next = node._A;
       const paramName = next._P;
       params[paramName] = "";
@@ -441,7 +441,7 @@ function matchRouteTree(root = {}, pathname) {
         menuLoaderRef.v = node._N;
       }
     }
-    if (!node._I && !node._G) {
+    if (!node._I && node._G == null) {
       const restInfo = findRestNode(node);
       if (restInfo) {
         const next = restInfo.next;

package/lib/index.d.ts

@@ -400,8 +400,6 @@ export declare interface FormProps<O, I> extends Omit<QwikJSX.IntrinsicElements[
      * Defaults to `false`
      */
     spaReset?: boolean;
-    /** Event handler executed right when the form is submitted. */
-    onSubmit$?: QRLEventHandlerMulti<SubmitEvent, HTMLFormElement> | undefined;
     /** Event handler executed right after the action is executed successfully and returns some data. */
     onSubmitCompleted$?: QRLEventHandlerMulti<CustomEvent<FormSubmitSuccessDetail<O>>, HTMLFormElement> | undefined;
     key?: string | number | null;
@@ -459,22 +457,39 @@ export declare const Link: Component<LinkProps>;
 /** @public */
 export declare interface LinkProps extends AnchorAttributes {
     /**
-     * **Defaults to _true_.**
+     * @deprecated Use `prefetchBundle` and `prefetchData` instead for more granular control over what
+     *   is prefetched and when. This prop will be removed in a future major version.
      *
-     * Whether Qwik should prefetch and cache the target page of this **`Link`**, this includes
-     * invoking any **`routeLoader$`**, **`onGet`**, etc.
+     *   Legacy prefetch control for this **`Link`**.
      *
-     * This **improves UX performance** for client-side (**SPA**) navigations.
+     *   Setting this value to **`"js"`** will prefetch only javascript bundles required to render this
+     *   page on the client when the link becomes visible. Setting this value to **`true`** will
+     *   prefetch both javascript bundles and route data when the link becomes visible. Setting this
+     *   value to **`false`** will disable prefetching altogether.
+     */
+    prefetch?: boolean | 'js';
+    /**
+     * Controls when Qwik should prefetch the javascript bundles required to render this **`Link`**
+     * target during client-side navigation.
      *
-     * Prefetching occurs when a the Link enters the viewport in production (**`q-e:qvisible`**), or
-     * with **`mouseover`/`focus`** during dev.
+     * Defaults to **`"visible"`**.
      *
      * Prefetching will not occur if the user has the **data saver** setting enabled.
+     */
+    prefetchBundle?: PrefetchStrategy;
+    /**
+     * Controls when Qwik should prefetch and cache route data for this **`Link`** target, including
+     * invoking any **`routeLoader$`**, **`onGet`**, etc.
+     *
+     * Defaults to **`"intent"`**. When using the deprecated **`prefetch="js"`** prop, route data
+     * prefetching defaults to **`"off"`**.
+     *
+     * Prefetching route data can improve client-side navigation performance for pages that wait on
+     * loaders, server handlers, databases, or API calls.
      *
-     * Setting this value to **`"js"`** will prefetch only javascript bundles required to render this
-     * page on the client, **`false`** will disable prefetching altogether.
+     * Prefetching will not occur if the user has the **data saver** setting enabled.
      */
-    prefetch?: boolean | 'js';
+    prefetchData?: PrefetchStrategy;
     reload?: boolean;
     replaceState?: boolean;
     scroll?: boolean;
@@ -564,6 +579,29 @@ export declare type PageModule = RouteModule & {
 /** @public */
 export declare type PathParams = Record<string, string>;
 
+/**
+ * Defines when link prefetching should be triggered.
+ *
+ * @public
+ */
+export declare type PrefetchStrategy = 
+/**
+* Prefetch when the user commits to navigating.
+*
+* Triggered by `pointerdown` or the `Enter` key.
+*/
+'commit'
+/**
+* Prefetch when the user shows navigation intent.
+*
+* Triggered by `pointerenter`, hover, or focus.
+*/
+| 'intent'
+/** Prefetch when the link becomes visible in the viewport. */
+| 'visible'
+/** Disable link prefetching. */
+| 'off';
+
 declare type Prettify<T> = {} & {
     [K in keyof T]: T[K];
 };

package/lib/index.qwik.mjs

@@ -1,4 +1,4 @@
-import { componentQrl, inlinedQrl, useErrorBoundary, useOnWindow, _captures, _jsxSorted, Slot, useSignal, untrack, _qrlSync, useVisibleTaskQrl, isDev, _jsxSplit, _getConstProps, _getVarProps, eventQrl, isServer, useStylesQrl, useServerData, useStore, useContextProvider, useTaskQrl, getLocale, noSerialize, isBrowser, useContext, SkipRender, implicit$FirstArg, withLocale, _wrapProp, _restProps, _fnSignal, createElement } from '@qwik.dev/core';
+import { componentQrl, inlinedQrl, useErrorBoundary, useOnWindow, _captures, _jsxSorted, Slot, useSignal, untrack, _qrlSync, useVisibleTaskQrl, _jsxSplit, _getConstProps, _getVarProps, isDev, eventQrl, isServer, useStylesQrl, useServerData, useStore, useContextProvider, useTaskQrl, getLocale, noSerialize, isBrowser, useContext, SkipRender, implicit$FirstArg, withLocale, _wrapProp, _restProps, _fnSignal, createElement } from '@qwik.dev/core';
 import { Fragment } from '@qwik.dev/core/jsx-runtime';
 import { g as getClientNavPath, s as shouldPreload, p as preloadRouteBundles, l as loadClientData, i as isSamePath, c as createLoaderSignal, a as createDocumentHead, b as loadRoute, r as resolveHead, C as CLIENT_DATA_CACHE, d as isSameOrigin, Q as Q_ROUTE, D as DEFAULT_LOADERS_SERIALIZATION_STRATEGY, t as toUrl, e as clientNavigate, f as toPath, h as QFN_KEY, j as QACTION_KEY, k as QDATA_KEY } from './chunks/routing.qwik.mjs';
 import { u as useNavigate, a as useLocation, b as useQwikRouterEnv, C as ContentContext, c as ContentInternalContext, D as DocumentHeadContext, H as HttpStatusContext, R as RouteLocationContext, d as RouteNavigateContext, e as RouteStateContext, f as RouteActionContext, g as RoutePreventNavigateContext, h as useAction, i as useDocumentHead } from './chunks/use-functions.qwik.mjs';
@@ -31,34 +31,56 @@ const Link = /* @__PURE__ */ componentQrl(/* @__PURE__ */ inlinedQrl((props) =>
   const loc = useLocation();
   const originalHref = props.href;
   const anchorRef = useSignal();
-  const { onClick$, prefetch: prefetchProp, reload, replaceState, scroll, ...linkProps } = /* @__PURE__ */ (() => props)();
+  const { onClick$, prefetch: prefetchProp, reload, replaceState, scroll, prefetchBundle: prefetchBundleProp = "visible", prefetchData: prefetchDataProp = prefetchProp === "js" ? "off" : "intent", ...linkProps } = props;
   const clientNavPath = untrack(getClientNavPath, {
     ...linkProps,
     reload
   }, loc);
   linkProps.href = clientNavPath || originalHref;
-  const prefetchData = !!clientNavPath && prefetchProp !== false && prefetchProp !== "js" || void 0;
-  const prefetch = prefetchData || !!clientNavPath && prefetchProp !== false && untrack(shouldPreload, clientNavPath, loc);
-  const handlePrefetch = prefetch ? /* @__PURE__ */ inlinedQrl((_, elm) => {
+  const isDepratedPrefetchDisabled = prefetchProp === false;
+  const shouldPrefetch = untrack(shouldPreload, clientNavPath, loc);
+  const shouldPrefetchBundle = !!clientNavPath && prefetchBundleProp !== "off" && shouldPrefetch && !isDepratedPrefetchDisabled;
+  const shouldPrefetchData = !!clientNavPath && prefetchDataProp !== "off" && shouldPrefetch && !isDepratedPrefetchDisabled;
+  const handleBundlePrefetch = shouldPrefetchBundle ? /* @__PURE__ */ inlinedQrl((_, elm) => {
     if (navigator.connection?.saveData) {
       return;
     }
     if (elm && elm.href) {
       const url = new URL(elm.href);
       preloadRouteBundles(url.pathname);
-      if (elm.hasAttribute("data-prefetch")) {
-        loadClientData(url, {
-          preloadRouteBundles: false,
-          isPrefetch: true
-        });
-      }
     }
-  }, "Link_component_handlePrefetch_AGvVXzXKbms") : void 0;
+  }, "Link_component_handleBundlePrefetch_ZttUP0kLKj0") : null;
+  const handleDataPrefetch = shouldPrefetchData ? /* @__PURE__ */ inlinedQrl((_, elm) => {
+    if (navigator.connection?.saveData) {
+      return;
+    }
+    if (elm && elm.href) {
+      const url = new URL(elm.href);
+      loadClientData(url, {
+        preloadRouteBundles: false,
+        isPrefetch: true
+      });
+    }
+  }, "Link_component_handleDataPrefetch_lcd4O9LHbbA") : null;
   const preventDefault = clientNavPath ? _qrlSync((event) => {
     if (!(event.metaKey || event.ctrlKey || event.shiftKey || event.altKey)) {
       event.preventDefault();
     }
-  }, "event=>{if(!(event.metaKey||event.ctrlKey||event.shiftKey||event.altKey)){event.preventDefault();}}") : void 0;
+  }, "event=>{if(!(event.metaKey||event.ctrlKey||event.shiftKey||event.altKey)){event.preventDefault();}}") : null;
+  const prefetchData = /* @__PURE__ */ inlinedQrl(async (_, elm) => {
+    const handleDataPrefetch2 = _captures[0];
+    handleDataPrefetch2?.(null, elm);
+  }, "Link_component_prefetchData_UwVx4NhHkSo", [
+    handleDataPrefetch
+  ]);
+  const onEnterKeyDown = /* @__PURE__ */ inlinedQrl((event, element) => {
+    const prefetchData2 = _captures[0];
+    if (event.key === "Enter") {
+      prefetchData2(null, element);
+    }
+  }, "Link_component_onEnterKeyDown_z274ws00irY", [
+    prefetchData
+  ]);
   const handleClientSideNavigation = clientNavPath ? /* @__PURE__ */ inlinedQrl((event, elm) => {
     const nav2 = _captures[0], reload2 = _captures[1], replaceState2 = _captures[2], scroll2 = _captures[3];
     if (event.defaultPrevented) {
@@ -78,13 +100,13 @@ const Link = /* @__PURE__ */ componentQrl(/* @__PURE__ */ inlinedQrl((props) =>
     reload,
     replaceState,
     scroll
-  ]) : void 0;
+  ]) : null;
   const handlePreload = /* @__PURE__ */ inlinedQrl((_, elm) => {
     const url = new URL(elm.href);
     preloadRouteBundles(url.pathname, 1);
   }, "Link_component_handlePreload_AAemwtuBjsE");
   useVisibleTaskQrl(/* @__PURE__ */ inlinedQrl(({ track }) => {
-    const anchorRef2 = _captures[0], handlePrefetch2 = _captures[1], linkProps2 = _captures[2], loc2 = _captures[3];
+    const anchorRef2 = _captures[0], handleBundlePrefetch2 = _captures[1], handleDataPrefetch2 = _captures[2], linkProps2 = _captures[3], loc2 = _captures[4], prefetchBundleProp2 = _captures[5], prefetchDataProp2 = _captures[6], prefetchProp2 = _captures[7];
     track(() => loc2.url.pathname);
     const handler = linkProps2.onQVisible$;
     if (handler) {
@@ -95,14 +117,26 @@ const Link = /* @__PURE__ */ componentQrl(/* @__PURE__ */ inlinedQrl((props) =>
         handler?.(event, anchorRef2.value);
       }
     }
-    if (!isDev && anchorRef2.value) {
-      handlePrefetch2?.(void 0, anchorRef2.value);
+    const isProdOrTest = !isDev || undefined                    ;
+    if (isProdOrTest && anchorRef2.value) {
+      if (prefetchBundleProp2 === "visible" || // deprecated prop below, remove in favor of prefetchBundle
+      prefetchProp2 === "js" || prefetchProp2 === true) {
+        handleBundlePrefetch2?.(null, anchorRef2.value);
+      }
+      if (prefetchDataProp2 === "visible" || // deprecated prop below, remove in favor of prefetchData
+      prefetchProp2 === true) {
+        handleDataPrefetch2?.(null, anchorRef2.value);
+      }
     }
   }, "Link_component_useVisibleTask_xKeuRmnoNSA", [
     anchorRef,
-    handlePrefetch,
+    handleBundlePrefetch,
+    handleDataPrefetch,
     linkProps,
-    loc
+    loc,
+    prefetchBundleProp,
+    prefetchDataProp,
+    prefetchProp
   ]));
   return /* @__PURE__ */ _jsxSplit("a", {
     ref: anchorRef,
@@ -115,14 +149,21 @@ const Link = /* @__PURE__ */ componentQrl(/* @__PURE__ */ inlinedQrl((props) =>
       onClick$,
       handleClientSideNavigation
     ],
-    "data-prefetch": prefetchData,
-    "q-e:mouseover": [
+    "q-e:pointerenter": [
       linkProps.onMouseOver$,
-      handlePrefetch
+      prefetchDataProp === "intent" ? prefetchData : null
     ],
     "q-e:focus": [
       linkProps.onFocus$,
-      handlePrefetch
+      prefetchDataProp === "intent" ? prefetchData : null
+    ],
+    "q-e:pointerdown": [
+      linkProps.onPointerDown$,
+      prefetchDataProp === "commit" ? prefetchData : null
+    ],
+    "q-e:keydown": [
+      linkProps.onKeyDown$,
+      prefetchDataProp === "commit" ? onEnterKeyDown : null
     ]
   }, {
     // We need to prevent the onQVisible$ from being called twice since it is handled in the visible task
@@ -176,9 +217,27 @@ const saveScrollHistory = (scrollState) => {
   history.replaceState(state, "");
 };
 
+const Q_ROUTER_POPSTATE_EVENT = "qrouterpopstate";
+const createCurrentPathTracker = (initialPath) => {
+  let currentPath = initialPath;
+  return (nextPath) => {
+    if (currentPath !== nextPath) {
+      currentPath = nextPath;
+      return true;
+    }
+    return false;
+  };
+};
+const dispatchRouterPopstate = (document1, href) => {
+  document1.dispatchEvent(new CustomEvent(Q_ROUTER_POPSTATE_EVENT, {
+    detail: {
+      href
+    }
+  }));
+};
 const spaInit = eventQrl(/* @__PURE__ */ inlinedQrl((_, el) => {
   if (!window._qRouterSPA && !window._qRouterInitPopstate) {
-    const currentPath = location.pathname + location.search;
+    const hasPathChanged = createCurrentPathTracker(location.pathname + location.search);
     const checkAndScroll = (scrollState) => {
       if (scrollState) {
         window.scrollTo(scrollState.x, scrollState.y);
@@ -205,21 +264,8 @@ const spaInit = eventQrl(/* @__PURE__ */ inlinedQrl((_, el) => {
       }
       window._qRouterScrollEnabled = false;
       clearTimeout(window._qRouterScrollDebounce);
-      if (currentPath !== location.pathname + location.search) {
-        const getContainer = (el2) => el2.closest("[q\\:container]:not([q\\:container=html]):not([q\\:container=text])");
-        const container = getContainer(el);
-        const domContainer = container.qContainer;
-        const hostElement = domContainer.vNodeLocate(el);
-        const nav = domContainer?.resolveContext(hostElement, {
-          id: "qr-n"
-        });
-        if (nav) {
-          nav(location.href, {
-            type: "popstate"
-          });
-        } else {
-          location.reload();
-        }
+      if (hasPathChanged(location.pathname + location.search)) {
+        dispatchRouterPopstate(document, location.href);
       } else {
         if (history.scrollRestoration === "manual") {
           const scrollState = history.state?._qRouterScroll;
@@ -836,6 +882,9 @@ const useQwikRouter = (props) => {
         };
         _waitNextPage().catch((err) => {
           navigate();
+          if (err instanceof DOMException && err.name === "TimeoutError") {
+            throw new Error('View transition timed out. This can happen if you have "disableCache" in your browser devtools enabled.');
+          }
           throw err;
         }).finally(() => {
           container2.element.setAttribute?.(Q_ROUTE, $routeName$);
@@ -898,13 +947,16 @@ const useQwikMockRouter = (props) => {
   }, {
     deep: false
   });
-  const loadersData = props.loaders?.reduce((acc, { loader, data }) => {
-    acc[loader.__id] = data;
-    return acc;
-  }, {});
-  const loaderState = useStore(loadersData ?? {}, {
-    deep: false
-  });
+  const container = _getContextContainer();
+  const loadersObject = {};
+  const loadersState = {};
+  if (props.loaders) {
+    for (const { loader, data } of props.loaders) {
+      const id = loader.__id;
+      loadersObject[id] = data;
+      loadersState[id] = createLoaderSignal(loadersObject, id, url, DEFAULT_LOADERS_SERIALIZATION_STRATEGY, container);
+    }
+  }
   const goto = props.goto ?? /* @__PURE__ */ inlinedQrl(async () => {
     console.warn("QwikRouterMockProvider: goto not provided");
   }, "useQwikMockRouter_goto_aViHFxQ1a3s");
@@ -929,7 +981,7 @@ const useQwikMockRouter = (props) => {
   useContextProvider(HttpStatusContext, httpStatus);
   useContextProvider(RouteLocationContext, routeLocation);
   useContextProvider(RouteNavigateContext, goto);
-  useContextProvider(RouteStateContext, loaderState);
+  useContextProvider(RouteStateContext, loadersState);
   useContextProvider(RouteActionContext, actionState);
   const actionsMocks = props.actions?.reduce((acc, { action, handler }) => {
     acc[action.__id] = handler;
@@ -957,12 +1009,21 @@ const QwikRouterMockProvider = /* @__PURE__ */ componentQrl(/* @__PURE__ */ inli
 }, "QwikRouterMockProvider_component_IN4dVpT0x74"));
 const QwikCityMockProvider = QwikRouterMockProvider;
 
+const handleRouterPopstate = (nav, event) => {
+  const href = event.detail?.href;
+  if (href) {
+    return nav(href, {
+      type: "popstate"
+    });
+  }
+};
 const RouterOutlet = /* @__PURE__ */ componentQrl(/* @__PURE__ */ inlinedQrl(() => {
   const serverData = useServerData("containerAttributes");
   if (!serverData) {
     throw new Error("PrefetchServiceWorker component must be rendered on the server.");
   }
   const internalContext = useContext(ContentInternalContext);
+  const nav = useNavigate();
   const contents = internalContext.value;
   if (contents && contents.length > 0) {
     const contentsLen = contents.length;
@@ -977,19 +1038,22 @@ const RouterOutlet = /* @__PURE__ */ componentQrl(/* @__PURE__ */ inlinedQrl(()
       !__EXPERIMENTAL__.noSPA && /* @__PURE__ */ _jsxSorted("script", {
         "q-d:qinit": _qrlSync(() => {
           ((w, h) => {
-            if (!w._qcs && h.scrollRestoration === "manual") {
+            if (!w._qcs) {
               w._qcs = true;
               const s = h.state?._qRouterScroll;
               if (s) {
+                h.scrollRestoration = "manual";
                 w.scrollTo(s.x, s.y);
               }
               document.dispatchEvent(new Event("qcinit"));
             }
           })(window, history);
-        }, '()=>{((w,h)=>{if(!w._qcs&&h.scrollRestoration==="manual"){w._qcs=!0;const s=h.state?._qRouterScroll;if(s){w.scrollTo(s.x,s.y);}document.dispatchEvent(new Event("qcinit"));}})(window,history);}')
+        }, '()=>{((w,h)=>{if(!w._qcs){w._qcs=!0;const s=h.state?._qRouterScroll;if(s){h.scrollRestoration="manual";w.scrollTo(s.x,s.y);}document.dispatchEvent(new Event("qcinit"));}})(window,history);}'),
+        "q-d:qrouterpopstate": /* @__PURE__ */ inlinedQrl((event, _1, nav2) => handleRouterPopstate(nav2, event), "RouterOutlet_component_Fragment_script_q_d_qrouterpopstate_aRL6GvFyews"),
+        "q:p": nav
       }, {
         "q-d:qcinit": spaInit
-      }, null, 2, "Fn_1")
+      }, null, 6, "Fn_1")
     ], 1, "Fn_2");
   }
   return SkipRender;

package/lib/middleware/aws-lambda/index.d.ts

@@ -1,10 +1,10 @@
-import { Http2ServerRequest } from 'http2';
-import { IncomingMessage } from 'http';
-import { NodeRequestNextFunction } from '@qwik.dev/router/middleware/node';
+import type { Http2ServerRequest } from 'node:http2';
+import type { IncomingMessage } from 'node:http';
+import type { NodeRequestNextFunction } from '@qwik.dev/router/middleware/node';
 import type { QwikManifest } from '@qwik.dev/core/optimizer';
 import type { Render } from '@qwik.dev/core/server';
 import type { ServerRenderOptions } from '@qwik.dev/router/middleware/request-handler';
-import { ServerResponse } from 'http';
+import type { ServerResponse } from 'node:http';
 
 declare interface AwsOpt {
     render: Render;
@@ -18,13 +18,7 @@ declare interface AwsOpt {
 export declare const createQwikCity: typeof createQwikRouter;
 
 /** @public */
-export declare function createQwikRouter(opts: AwsOpt): {
-    fixPath: (pathT: string) => string;
-    router: (req: IncomingMessage | Http2ServerRequest, res: ServerResponse, next: NodeRequestNextFunction) => Promise<void>;
-    staticFile: (req: IncomingMessage | Http2ServerRequest, res: ServerResponse, next: (e?: any) => void) => Promise<void>;
-    notFound: (req: IncomingMessage | Http2ServerRequest, res: ServerResponse, next: (e: any) => void) => Promise<void>;
-    handle: (req: any, res: any) => void;
-};
+export declare function createQwikRouter(opts: AwsOpt): QwikRouterAwsLambdaMiddleware;
 
 /** @public */
 export declare interface PlatformAwsLambda extends Object {
@@ -36,6 +30,16 @@ export declare interface PlatformAwsLambda extends Object {
  */
 export declare type QwikCityAwsLambdaOptions = QwikRouterAwsLambdaOptions;
 
+/** @public */
+export declare interface QwikRouterAwsLambdaMiddleware {
+    fixPath: (pathT: string) => string;
+    router: (req: IncomingMessage | Http2ServerRequest, res: ServerResponse, next: NodeRequestNextFunction) => Promise<void>;
+    staticFile: (req: IncomingMessage | Http2ServerRequest, res: ServerResponse, next: (e?: any) => void) => Promise<void>;
+    /** @deprecated `router` handles 404 responses. Will be removed in V3. */
+    notFound: (req: IncomingMessage | Http2ServerRequest, res: ServerResponse, next: (e?: any) => void) => Promise<void>;
+    handle: (req: any, res: any) => void;
+}
+
 /** @public */
 export declare interface QwikRouterAwsLambdaOptions extends ServerRenderOptions {
 }

package/lib/middleware/aws-lambda/index.mjs

@@ -2,7 +2,7 @@ import { createQwikRouter as createQwikRouter$1 } from '@qwik.dev/router/middlew
 
 function createQwikRouter(opts) {
   try {
-    const { router, staticFile, notFound } = createQwikRouter$1({
+    const { router, staticFile } = createQwikRouter$1({
       render: opts.render,
       manifest: opts.manifest,
       static: {
@@ -31,11 +31,12 @@ function createQwikRouter(opts) {
       req.url = fixPath(req.url);
       staticFile(req, res, () => {
         router(req, res, () => {
-          notFound(req, res, () => {
-          });
         });
       });
     };
+    const notFound = async (_req, _res, next) => {
+      next();
+    };
     return {
       fixPath,
       router,

package/lib/middleware/bun/index.d.ts

@@ -8,11 +8,7 @@ import type { ServerRenderOptions } from '@qwik.dev/router/middleware/request-ha
 export declare const createQwikCity: typeof createQwikRouter;
 
 /** @public */
-export declare function createQwikRouter(opts: QwikRouterBunOptions): {
-    router: (request: Request) => Promise<Response | null>;
-    notFound: (request: Request) => Promise<Response>;
-    staticFile: (request: Request) => Promise<Response | null>;
-};
+export declare function createQwikRouter(opts: QwikRouterBunOptions): QwikRouterBunMiddleware;
 
 /**
  * @deprecated Use `QwikRouterBunOptions` instead. Will be removed in V3
@@ -20,6 +16,14 @@ export declare function createQwikRouter(opts: QwikRouterBunOptions): {
  */
 export declare type QwikCityBunOptions = QwikRouterBunOptions;
 
+/** @public */
+export declare interface QwikRouterBunMiddleware {
+    router: (request: Request) => Promise<Response | null>;
+    /** @deprecated `router` handles 404 responses. Will be removed in V3. */
+    notFound: (request: Request) => Promise<Response>;
+    staticFile: (request: Request) => Promise<Response | null>;
+}
+
 /** @public */
 export declare interface QwikRouterBunOptions extends ServerRenderOptions {
     /** Options for serving static files */

package/lib/middleware/bun/index.mjs

@@ -1,6 +1,6 @@
 import { isDev } from '@qwik.dev/core/build';
 import { setServerPlatform } from '@qwik.dev/core/server';
-import { _TextEncoderStream_polyfill, isStaticPath, getNotFound, mergeHeadersCookies, requestHandler } from '@qwik.dev/router/middleware/request-handler';
+import { _TextEncoderStream_polyfill, isStaticPath, mergeHeadersCookies, requestHandler } from '@qwik.dev/router/middleware/request-handler';
 import { join, extname } from 'node:path';
 import { M as MIME_TYPES, n as normalizeRequestUrl } from '../../chunks/url.mjs';
 
@@ -77,27 +77,8 @@ function createQwikRouter(opts) {
       });
     }
   }
-  const notFound = async (request) => {
-    try {
-      const url = getRequestUrl(request, opts);
-      const notFoundHtml = !request.headers.get("accept")?.includes("text/html") || isStaticPath(request.method || "GET", url) ? "Not Found" : getNotFound(url.pathname);
-      return new Response(notFoundHtml, {
-        status: 404,
-        headers: {
-          "Content-Type": "text/html; charset=utf-8",
-          "X-Not-Found": url.pathname
-        }
-      });
-    } catch (e) {
-      console.error(e);
-      return new Response(isDev ? String(e || "Error") : "Internal Server Error", {
-        status: 500,
-        headers: {
-          "Content-Type": "text/plain; charset=utf-8",
-          "X-Error": "bun-server"
-        }
-      });
-    }
+  const notFound = async (_request) => {
+    return null;
   };
   const openStaticFile = async (url) => {
     const pathname = url.pathname;

package/lib/middleware/deno/index.d.ts

@@ -8,11 +8,7 @@ import type { ServerRenderOptions } from '@qwik.dev/router/middleware/request-ha
 export declare const createQwikCity: typeof createQwikRouter;
 
 /** @public */
-export declare function createQwikRouter(opts: QwikRouterDenoOptions): {
-    router: (request: Request, info: ServeHandlerInfo) => Promise<Response | null>;
-    notFound: (request: Request) => Promise<Response>;
-    staticFile: (request: Request) => Promise<Response | null>;
-};
+export declare function createQwikRouter(opts: QwikRouterDenoOptions): QwikRouterDenoMiddleware;
 
 /** @public */
 export declare interface NetAddr {
@@ -27,6 +23,14 @@ export declare interface NetAddr {
  */
 export declare type QwikCityDenoOptions = QwikRouterDenoOptions;
 
+/** @public */
+export declare interface QwikRouterDenoMiddleware {
+    router: (request: Request, info: ServeHandlerInfo) => Promise<Response | null>;
+    /** @deprecated `router` handles 404 responses. Will be removed in V3. */
+    notFound: (request: Request) => Promise<Response>;
+    staticFile: (request: Request) => Promise<Response | null>;
+}
+
 /** @public */
 export declare interface QwikRouterDenoOptions extends ServerRenderOptions {
     /** Options for serving static files */