fix polyfill script integrity

vercel · Sep 29, 2022 · fe2c494 · fe2c494
1 parent e43ae22
commit fe2c494
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 13 deletions.
diff --git a/packages/next/build/webpack/plugins/subresource-integrity-plugin.ts b/packages/next/build/webpack/plugins/subresource-integrity-plugin.ts
@@ -17,17 +17,10 @@ export class SubresourceIntegrityPlugin {
           stage: webpack.Compilation.PROCESS_ASSETS_STAGE_ADDITIONS,
         },
         (assets) => {
-          // Collect all the entrypoint files.
+          // Collect all the assets.
           let files = new Set<string>()
-          for (const entrypoint of compilation.entrypoints.values()) {
-            const iterator = entrypoint?.getFiles()
-            if (!iterator) {
-              continue
-            }
-
-            for (const file of iterator) {
-              files.add(file)
-            }
+          for (const asset of compilation.getAssets()) {
+            files.add(asset.name)
           }
 
           // For each file, deduped, calculate the file hash.

diff --git a/packages/next/server/app-render.tsx b/packages/next/server/app-render.tsx
@@ -1292,7 +1292,10 @@ export async function renderToHTMLOrFlight(
           (polyfill) =>
             polyfill.endsWith('.js') && !polyfill.endsWith('.module.js')
         )
-        .map((polyfill) => `${renderOpts.assetPrefix || ''}/_next/${polyfill}`)
+        .map((polyfill) => ({
+          src: `${renderOpts.assetPrefix || ''}/_next/${polyfill}`,
+          integrity: subresourceIntegrityManifest?.[polyfill],
+        }))
 
       try {
         const renderStream = await renderToInitialStream({

diff --git a/packages/next/server/node-web-streams-helper.ts b/packages/next/server/node-web-streams-helper.ts
@@ -272,7 +272,7 @@ export async function continueFromInitialStream(
     generateStaticHTML: boolean
     flushEffectHandler?: () => Promise<string>
     flushEffectsToHead: boolean
-    polyfills?: string[]
+    polyfills?: { src: string; integrity: string | undefined }[]
   }
 ): Promise<ReadableStream<Uint8Array>> {
   const closeTag = '</body></html>'
@@ -295,7 +295,12 @@ export async function continueFromInitialStream(
       // blocking here and can't be `defer` because other scripts have `async`.
       const polyfillScripts = polyfills
         ? polyfills
-            .map((src) => `<script src="${src}" nomodule=""></script>`)
+            .map(
+              ({ src, integrity }) =>
+                `<script src="${src}" nomodule=""${
+                  integrity ? ` integrity="${integrity}"` : ''
+                }></script>`
+            )
             .join('')
         : ''