From 91e7e166844ed213bf9086ca419a706892b23a53 Mon Sep 17 00:00:00 2001
From: SukkaW <isukkaw@gmail.com>
Date: Wed, 12 Oct 2022 17:40:51 +0800
Subject: [PATCH] refactor: polyfill-module should block hydration

---
 packages/next/server/app-render.tsx | 11 ++---------
 test/e2e/app-dir/index.test.ts      |  4 +++-
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/packages/next/server/app-render.tsx b/packages/next/server/app-render.tsx
index 45fbb227e6d4d..0fa2e535b573a 100644
--- a/packages/next/server/app-render.tsx
+++ b/packages/next/server/app-render.tsx
@@ -1440,17 +1440,10 @@ export async function renderToHTMLOrFlight(
                   return (
                     <script
                       key={polyfill.src}
+                      src={polyfill.src}
+                      integrity={polyfill.integrity}
                       noModule={true}
                       nonce={nonce}
-                      dangerouslySetInnerHTML={{
-                        __html: `(self.__next_s=self.__next_s||[]).push([${JSON.stringify(
-                          polyfill.src
-                        )},${
-                          polyfill.integrity
-                            ? JSON.stringify({ integrity: polyfill.integrity })
-                            : '{}'
-                        }])`,
-                      }}
                     />
                   )
                 })}
diff --git a/test/e2e/app-dir/index.test.ts b/test/e2e/app-dir/index.test.ts
index 18c1c6b8282fe..1b52ac3b027f3 100644
--- a/test/e2e/app-dir/index.test.ts
+++ b/test/e2e/app-dir/index.test.ts
@@ -121,7 +121,9 @@ describe('app dir', () => {
 
     it('should serve polyfills for browsers that do not support modules', async () => {
       const html = await renderViaHTTP(next.url, '/dashboard/index')
-      expect(html).toMatch(/\/_next\/static\/chunks\/polyfills(-.+)?\.js/)
+      expect(html).toMatch(
+        /<script src="\/_next\/static\/chunks\/polyfills(-\w+)?\.js" nomodule="">/
+      )
     })
 
     // TODO-APP: handle css modules fouc in dev