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

package/lib/index.d.ts

@@ -457,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;
@@ -562,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
@@ -841,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$);
@@ -903,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");
@@ -934,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;

package/lib/middleware/node/index.mjs

@@ -32,6 +32,71 @@ function normalizeUrl(url, base) {
 function getUrl(req, origin) {
   return normalizeUrl(req.originalUrl || req.url || "/", origin);
 }
+function createNodeResponseSink(res) {
+  let closed = res.closed || res.destroyed;
+  const closedPromise = closed ? Promise.resolve() : new Promise((resolve) => {
+    res.once("close", () => {
+      closed = true;
+      resolve();
+    });
+  });
+  const write = (chunk) => {
+    if (closed || res.closed || res.destroyed) {
+      return;
+    }
+    return new Promise((resolve, reject) => {
+      let settled = false;
+      const finish = () => {
+        if (settled) {
+          return;
+        }
+        settled = true;
+        setImmediate(resolve);
+      };
+      const fail = (error) => {
+        if (settled) {
+          return;
+        }
+        settled = true;
+        reject(error);
+      };
+      closedPromise.then(finish);
+      try {
+        res.write(chunk, (error) => {
+          if (error) {
+            if (isIgnoredError(error.message)) {
+              finish();
+              return;
+            }
+            fail(error);
+            return;
+          }
+          finish();
+        });
+      } catch (error) {
+        if (error instanceof Error && isIgnoredError(error.message)) {
+          finish();
+          return;
+        }
+        fail(error);
+      }
+    });
+  };
+  const close = () => {
+    if (closed || res.closed || res.destroyed) {
+      return;
+    }
+    return new Promise((resolve) => {
+      res.end(() => {
+        resolve();
+      });
+    });
+  };
+  return {
+    write,
+    close
+  };
+}
 async function fromNodeHttp(url, req, res, mode, getClientConn) {
   const requestHeaders = new Headers();
   const nodeRequestHeaders = req.headers;
@@ -79,6 +144,7 @@ async function fromNodeHttp(url, req, res, mode, getClientConn) {
     },
     getWritableStream: (status, headers, cookies) => {
       res.statusCode = status;
+      const sink = createNodeResponseSink(res);
       try {
         for (const [key, value] of headers) {
           if (invalidHeadersPattern.test(key)) {
@@ -95,17 +161,10 @@ async function fromNodeHttp(url, req, res, mode, getClientConn) {
       }
       return new WritableStream({
         write(chunk) {
-          if (res.closed || res.destroyed) {
-            return;
-          }
-          res.write(chunk, (error) => {
-            if (error && !isIgnoredError(error.message)) {
-              console.error(error);
-            }
-          });
+          return sink.write(chunk);
         },
         close() {
-          res.end();
+          return sink.close();
         }
       });
     },
@@ -139,12 +198,12 @@ function createQwikRouter(opts) {
       const handled = await requestHandler(serverRequestEv, opts);
       if (handled) {
         const err = await handled.completion;
-        if (err) {
-          throw err;
-        }
         if (handled.requestEv.headersSent) {
           return;
         }
+        if (err) {
+          throw err;
+        }
       }
       next();
     } catch (e) {

package/lib/vite/index.mjs

@@ -479,7 +479,7 @@ async function walkServerPlugins(opts) {
       });
     }
   }));
-  return sourceFiles;
+  return sourceFiles.sort((a, b) => a.filePath < b.filePath ? -1 : 1);
 }
 
 function resolveEntry(opts, sourceFile) {
@@ -2010,13 +2010,13 @@ function imagePlugin(userOpts) {
   ];
 }
 
-async function collectServerFnModuleIds(ctx, resolvedVirtualId, loadModule) {
+async function collectServerFnModuleIds(routingContext, resolvedVirtualId, pluginContext) {
   const serverFnModules = /* @__PURE__ */ new Set();
   const queuedModuleIds = /* @__PURE__ */ new Set();
   const seenModuleIds = /* @__PURE__ */ new Set();
-  const routes = ctx.routes;
-  const layouts = ctx.layouts;
-  const serverPlugins = ctx.serverPlugins;
+  const routes = routingContext.routes;
+  const layouts = routingContext.layouts;
+  const serverPlugins = routingContext.serverPlugins;
   for (let i = 0; i < routes.length; i++) {
     const route = routes[i];
     queuedModuleIds.add(route.filePath);
@@ -2038,15 +2038,26 @@ async function collectServerFnModuleIds(ctx, resolvedVirtualId, loadModule) {
       continue;
     }
     seenModuleIds.add(id);
-    const moduleInfo = await loadModule(id);
-    if (moduleInfo.code?.includes("serverQrl(")) {
+    const resolved = await pluginContext.resolve(id, void 0, {
+      skipSelf: true
+    });
+    if (!resolved || resolved.external) {
+      continue;
+    }
+    const moduleInfo = await pluginContext.load({
+      id: resolved.id
+    });
+    if (moduleInfo.code == null) {
+      continue;
+    }
+    if (moduleInfo.code.includes("serverQrl(")) {
       serverFnModules.add(moduleInfo.id);
     }
-    const resolvedImports = moduleInfo.importedIdResolutions.concat(moduleInfo.dynamicallyImportedIdResolutions);
+    const resolvedImports = moduleInfo.importedIds.concat(moduleInfo.dynamicallyImportedIds);
     for (let i = 0; i < resolvedImports.length; i++) {
       const resolvedImport = resolvedImports[i];
-      if (!resolvedImport.external && !seenModuleIds.has(resolvedImport.id)) {
-        queuedModuleIds.add(resolvedImport.id);
+      if (resolvedImport && !seenModuleIds.has(resolvedImport)) {
+        queuedModuleIds.add(resolvedImport);
       }
     }
   }
@@ -2723,9 +2734,7 @@ function serverFnsPlugin(buildContextRef) {
       if (!ctx) {
         return;
       }
-      const moduleIds = await collectServerFnModuleIds(ctx, RESOLVED_ID, (id) => this.load({
-        id
-      }));
+      const moduleIds = await collectServerFnModuleIds(ctx, RESOLVED_ID, this);
       for (let i = 0; i < moduleIds.length; i++) {
         serverFnModules.add(moduleIds[i]);
       }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@qwik.dev/router",
   "description": "The router for Qwik.",
-  "version": "2.0.0-beta.32",
+  "version": "2.0.0-beta.34",
   "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.32"
+    "@qwik.dev/core": "2.0.0-beta.34"
   },
   "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.32"
+    "@qwik.dev/core": "^2.0.0-beta.34"
   },
   "publishConfig": {
     "access": "public"