Merge branch 'main' of https://github.com/ethanniser/mcmaster-next

src/components/ui/link.tsx

@@ -17,11 +17,9 @@ function sleep(ms: number) {
 }
 
 async function prefetchImages(href: string) {
-  if (!href.startsWith("/products")) {
+  if (!href.startsWith("/") || href.startsWith("/order")) {
     return [];
   }
-  // Delay the prefetch until after Next.js has time to prefetch the page itself.
-  await sleep(1000);
   const url = new URL(href, window.location.href);
   const imageResponse = await fetch(`/api/prefetch-images${url.pathname}`, {
     priority: "low",
@@ -55,7 +53,9 @@ export const Link: typeof NextLink = (({ children, ...props }) => {
         const entry = entries[0];
         if (entry.isIntersecting) {
           // Set a timeout to trigger prefetch after 1 second
-          prefetchTimeout = setTimeout(() => {
+          prefetchTimeout = setTimeout(async () => {
+            router.prefetch(String(props.href));
+            await sleep(0); // We want the doc prefetches to happen first.
             void prefetchImages(String(props.href)).then((images) => {
               setImages(images);
             }, console.error);
@@ -84,7 +84,9 @@ export const Link: typeof NextLink = (({ children, ...props }) => {
   return (
     <NextLink
       ref={linkRef}
+      prefetch={false}
       onMouseOver={() => {
+        router.prefetch(String(props.href));
         for (const image of images) {
           if (image.loading === "lazy" || seen.has(image.srcset)) {
             continue;