Merge branch 'main' of https://github.com/Shane-Donlon/qwik into docs-e2e-page-loads

Author: Shane-Donlon

.changeset/sixty-rockets-clean.md

@@ -0,0 +1,5 @@
+---
+'@builder.io/qwik-city': patch
+---
+
+FEAT: SPA Link navigation now preloads the next route bundles on click with maximum probability, speeding up SPA navigation.

.changeset/wise-worlds-hang.md

@@ -0,0 +1,5 @@
+---
+'@builder.io/qwik': patch
+---
+
+CHORE: use patched domino instead of qwik-dom

packages/qwik-city/src/runtime/src/client-navigate.ts

@@ -41,10 +41,10 @@ export const newScrollState = (): ScrollState => {
   };
 };
 
-export const prefetchSymbols = (path: string) => {
+export const preloadRouteBundles = (path: string, probability: number = 0.8) => {
   if (isBrowser) {
     path = path.endsWith('/') ? path : path + '/';
     path = path.length > 1 && path.startsWith('/') ? path.slice(1) : path;
-    preload(path, 0.8);
+    preload(path, probability);
   }
 };

packages/qwik-city/src/runtime/src/link-component.tsx

@@ -13,8 +13,10 @@ import {
 import { getClientNavPath, shouldPreload } from './utils';
 import { loadClientData } from './use-endpoint';
 import { useLocation, useNavigate } from './use-functions';
-import { prefetchSymbols } from './client-navigate';
+import { preloadRouteBundles } from './client-navigate';
 import { isDev } from '@builder.io/qwik';
+// @ts-expect-error we don't have types for the preloader yet
+import { p as preload } from '@builder.io/qwik/preloader';
 
 /** @public */
 export const Link = component$<LinkProps>((props) => {
@@ -51,28 +53,30 @@ export const Link = component$<LinkProps>((props) => {
 
         if (elm && elm.href) {
           const url = new URL(elm.href);
-          prefetchSymbols(url.pathname);
+          preloadRouteBundles(url.pathname);
 
           if (elm.hasAttribute('data-prefetch')) {
             loadClientData(url, elm, {
-              prefetchSymbols: false,
+              preloadRouteBundles: false,
               isPrefetch: true,
             });
           }
         }
       })
     : undefined;
+
   const preventDefault = clientNavPath
     ? sync$((event: MouseEvent, target: HTMLAnchorElement) => {
         if (!(event.metaKey || event.ctrlKey || event.shiftKey || event.altKey)) {
           event.preventDefault();
         }
       })
     : undefined;
-  const handleClick = clientNavPath
+
+  const handleClientSideNavigation = clientNavPath
     ? $(async (event: Event, elm: HTMLAnchorElement) => {
         if (event.defaultPrevented) {
-          // If default was prevented, than it is up to us to make client side navigation.
+          // If default was prevented, then it is up to us to make client side navigation.
           if (elm.hasAttribute('q:nbs')) {
             // Allow bootstrapping into useNavigate.
             await nav(location.href, { type: 'popstate' });
@@ -85,6 +89,11 @@ export const Link = component$<LinkProps>((props) => {
       })
     : undefined;
 
+  const handlePreload = $((_: any, elm: HTMLAnchorElement) => {
+    const url = new URL(elm.href);
+    preloadRouteBundles(url.pathname, 1);
+  });
+
   useVisibleTask$(({ track }) => {
     track(() => loc.url.pathname);
     // We need to trigger the onQVisible$ in the visible task for it to fire on subsequent route navigations
@@ -115,7 +124,12 @@ export const Link = component$<LinkProps>((props) => {
       // Attr 'q:link' is used as a selector for bootstrapping into spa after context loss
       {...{ 'q:link': !!clientNavPath }}
       {...linkProps}
-      onClick$={[preventDefault, onClick$, handleClick]}
+      onClick$={[
+        preventDefault,
+        handlePreload, // needs to be in between preventDefault and onClick$ to ensure it starts asap.
+        onClick$,
+        handleClientSideNavigation,
+      ]}
       data-prefetch={prefetchData}
       onMouseOver$={[linkProps.onMouseOver$, handlePrefetch]}
       onFocus$={[linkProps.onFocus$, handlePrefetch]}

packages/qwik-city/src/runtime/src/use-endpoint.ts

@@ -2,15 +2,15 @@ import { getClientDataPath } from './utils';
 import { CLIENT_DATA_CACHE } from './constants';
 import type { ClientPageData, RouteActionValue } from './types';
 import { _deserializeData } from '@builder.io/qwik';
-import { prefetchSymbols } from './client-navigate';
+import { preloadRouteBundles } from './client-navigate';
 
 export const loadClientData = async (
   url: URL,
   element: unknown,
   opts?: {
     action?: RouteActionValue;
     clearCache?: boolean;
-    prefetchSymbols?: boolean;
+    preloadRouteBundles?: boolean;
     isPrefetch?: boolean;
   }
 ) => {
@@ -22,8 +22,8 @@ export const loadClientData = async (
     qData = CLIENT_DATA_CACHE.get(clientDataPath);
   }
 
-  if (opts?.prefetchSymbols !== false) {
-    prefetchSymbols(pagePathname);
+  if (opts?.preloadRouteBundles !== false) {
+    preloadRouteBundles(pagePathname, 0.8);
   }
   let resolveFn: () => void | undefined;
 

packages/qwik/package.json

@@ -30,7 +30,7 @@
   },
   "devDependencies": {
     "@builder.io/qwik": "workspace:^",
-    "@builder.io/qwik-dom": "workspace:^",
+    "domino": "2.1.6",
     "ignore": "5.3.1",
     "image-size": "1.1.1",
     "kleur": "4.1.5",

packages/qwik/src/testing/document.ts

@@ -1,5 +1,5 @@
 import type { MockDocumentOptions, MockWindow } from './types';
-import qwikDom from '@builder.io/qwik-dom';
+import domino from 'domino';
 import { normalizeUrl } from './util';
 
 /**
@@ -9,7 +9,7 @@ import { normalizeUrl } from './util';
  * @public
  */
 export function createDocument(opts?: MockDocumentOptions) {
-  const doc = qwikDom.createDocument(opts?.html);
+  const doc = domino.createDocument(opts?.html);
   ensureGlobals(doc, opts);
   return doc;
 }