do not transport SRI info in manifest, only in the importmap

jacob-ebey · jacob-ebey · commit 1f21bdfb5a3d · 2025-03-06T10:07:17.000-08:00
diff --git a/packages/react-router/lib/dom/ssr/components.tsx b/packages/react-router/lib/dom/ssr/components.tsx
@@ -776,21 +776,28 @@ import(${JSON.stringify(manifest.entry.module)});`;
 
   let preloads = isHydrated
     ? []
-    : manifest.entry.imports.concat(
-        getModuleLinkHrefs(matches, manifest, {
-          includeHydrateFallback: true,
-        })
+    : dedupe(
+        manifest.entry.imports.concat(
+          getModuleLinkHrefs(matches, manifest, {
+            includeHydrateFallback: true,
+          })
+        )
       );
 
+  let sri = typeof manifest.sri === "object" ? manifest.sri : {};
+
   return isHydrated ? null : (
     <>
       {manifest.sri ? (
         <script
           type="importmap"
+          suppressHydrationWarning
           dangerouslySetInnerHTML={{
-            __html: JSON.stringify({
-              integrity: manifest.sri,
-            }),
+            __html: sri
+              ? JSON.stringify({
+                  integrity: sri,
+                })
+              : "",
           }}
         />
       ) : null}
@@ -799,22 +806,22 @@ import(${JSON.stringify(manifest.entry.module)});`;
           rel="modulepreload"
           href={manifest.url}
           crossOrigin={props.crossOrigin}
-          integrity={manifest.sri?.[manifest.url]}
+          integrity={sri[manifest.url]}
         />
       ) : null}
       <link
         rel="modulepreload"
         href={manifest.entry.module}
         crossOrigin={props.crossOrigin}
-        integrity={manifest.sri?.[manifest.entry.module]}
+        integrity={sri[manifest.entry.module]}
       />
-      {dedupe(preloads).map((path) => (
+      {preloads.map((path) => (
         <link
           key={path}
           rel="modulepreload"
           href={path}
           crossOrigin={props.crossOrigin}
-          integrity={manifest.sri?.[path]}
+          integrity={sri[path]}
         />
       ))}
       {initialScripts}
diff --git a/packages/react-router/lib/dom/ssr/entry.ts b/packages/react-router/lib/dom/ssr/entry.ts
@@ -60,5 +60,5 @@ export interface AssetsManifest {
     timestamp?: number;
     runtime: string;
   };
-  sri?: Record<string, string>;
+  sri?: Record<string, string> | true;
 }
diff --git a/packages/react-router/lib/dom/ssr/fog-of-war.ts b/packages/react-router/lib/dom/ssr/fog-of-war.ts
@@ -31,7 +31,7 @@ export function isFogOfWarEnabled(ssr: boolean) {
 }
 
 export function getPartialManifest(
-  manifest: AssetsManifest,
+  { sri, ...manifest }: AssetsManifest,
   router: DataRouter
 ) {
   // Start with our matches for this pathname
@@ -64,6 +64,7 @@ export function getPartialManifest(
   return {
     ...manifest,
     routes: initialRoutes,
+    sri: true,
   };
 }
 
diff --git a/playground/framework/app/root.tsx b/playground/framework/app/root.tsx
@@ -1,16 +1,35 @@
-import { Links, Meta, Outlet, Scripts, ScrollRestoration } from "react-router";
+import {
+  Link,
+  Links,
+  Meta,
+  Outlet,
+  Scripts,
+  ScrollRestoration,
+} from "react-router";
 
 export function Layout({ children }: { children: React.ReactNode }) {
   return (
     <html lang="en">
       <head>
         <meta charSet="utf-8" />
         <meta name="viewport" content="width=device-width, initial-scale=1" />
-        
+
         <Meta />
         <Links />
       </head>
       <body>
+        <ul>
+          <li>
+            <Link prefetch="intent" to="/">
+              Home
+            </Link>
+          </li>
+          <li>
+            <Link prefetch="intent" to="/products/abc">
+              Product
+            </Link>
+          </li>
+        </ul>
         {children}
         <ScrollRestoration />
         <Scripts />

Original file line number	Diff line number	Diff line change
`@@ -60,5 +60,5 @@ export interface AssetsManifest {`
`60`	`60`	`timestamp?: number;`
`61`	`61`	`runtime: string;`
`62`	`62`	`};`
`63`		`- sri?: Record<string, string>;`
	`63`	`+ sri?: Record<string, string> \| true;`
`64`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ export function isFogOfWarEnabled(ssr: boolean) {`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`export function getPartialManifest(`
`34`		`- manifest: AssetsManifest,`
	`34`	`+ { sri, ...manifest }: AssetsManifest,`
`35`	`35`	`router: DataRouter`
`36`	`36`	`) {`
`37`	`37`	`// Start with our matches for this pathname`
`@@ -64,6 +64,7 @@ export function getPartialManifest(`
`64`	`64`	`return {`
`65`	`65`	`...manifest,`
`66`	`66`	`routes: initialRoutes,`
	`67`	`+ sri: true,`
`67`	`68`	`};`
`68`	`69`	`}`
`69`	`70`