Preload route chunks

remix-run · Sep 4, 2024 · ac71173 · ac71173
1 parent 359318e
commit ac71173
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 32 deletions.
diff --git a/packages/react-router/lib/dom/ssr/components.tsx b/packages/react-router/lib/dom/ssr/components.tsx
@@ -715,14 +715,9 @@ import(${JSON.stringify(manifest.entry.module)});`;
     // eslint-disable-next-line
   }, []);
 
-  let routePreloads = matches
-    .map((match) => {
-      let route = manifest.routes[match.route.id];
-      return (route.imports || []).concat([route.module]);
-    })
-    .flat(1);
-
-  let preloads = isHydrated ? [] : manifest.entry.imports.concat(routePreloads);
+  let preloads = isHydrated
+    ? []
+    : manifest.entry.imports.concat(getModuleLinkHrefs(matches, manifest));
 
   return isHydrated ? null : (
     <>

diff --git a/packages/react-router/lib/dom/ssr/links.ts b/packages/react-router/lib/dom/ssr/links.ts
@@ -222,7 +222,7 @@ export function getKeyedLinksForMatches(
     })
     .flat(2);
 
-  let preloads = getCurrentPageModulePreloadHrefs(matches, manifest);
+  let preloads = getModuleLinkHrefs(matches, manifest);
   return dedupeLinkDescriptors(descriptors, preloads);
 }
 
@@ -421,27 +421,6 @@ export function getNewMatchesForLinks(
 }
 
 export function getModuleLinkHrefs(
-  matches: AgnosticDataRouteMatch[],
-  manifestPatch: AssetsManifest
-): string[] {
-  return dedupeHrefs(
-    matches
-      .map((match) => {
-        let route = manifestPatch.routes[match.route.id];
-        let hrefs = [route.module];
-        if (route.imports) {
-          hrefs = hrefs.concat(route.imports);
-        }
-        return hrefs;
-      })
-      .flat(1)
-  );
-}
-
-// The `<Script>` will render rel=modulepreload for the current page, we don't
-// need to include them in a page prefetch, this gives us the list to remove
-// while deduping.
-function getCurrentPageModulePreloadHrefs(
   matches: AgnosticDataRouteMatch[],
   manifest: AssetsManifest
 ): string[] {
@@ -450,11 +429,15 @@ function getCurrentPageModulePreloadHrefs(
       .map((match) => {
         let route = manifest.routes[match.route.id];
         let hrefs = [route.module];
-
+        if (route.clientActionModule) {
+          hrefs = hrefs.concat(route.clientActionModule);
+        }
+        if (route.clientLoaderModule) {
+          hrefs = hrefs.concat(route.clientLoaderModule);
+        }
         if (route.imports) {
           hrefs = hrefs.concat(route.imports);
         }
-
         return hrefs;
       })
       .flat(1)