remove defer, render script directly, rm nonce

huozhi · huozhi · commit 27a535b5baea · 2025-03-11T20:55:51.000+01:00
diff --git a/packages/next/src/server/app-render/app-render.tsx b/packages/next/src/server/app-render/app-render.tsx
@@ -3089,7 +3089,6 @@ async function prerenderToStream(
             stream: await continueDynamicPrerender(prelude, {
               getServerInsertedHTML,
               getServerInsertedMetadata,
-              nonce: ctx.nonce,
             }),
             dynamicAccess: consumeDynamicAccess(
               serverDynamicTracking,
@@ -3152,7 +3151,6 @@ async function prerenderToStream(
               ),
               getServerInsertedHTML,
               getServerInsertedMetadata,
-              nonce: ctx.nonce,
             }),
             dynamicAccess: consumeDynamicAccess(
               serverDynamicTracking,
@@ -3726,7 +3724,6 @@ async function prerenderToStream(
           stream: await continueDynamicPrerender(prelude, {
             getServerInsertedHTML,
             getServerInsertedMetadata,
-            nonce: ctx.nonce,
           }),
           dynamicAccess: dynamicTracking.dynamicAccesses,
           // TODO: Should this include the SSR pass?
@@ -3747,7 +3744,6 @@ async function prerenderToStream(
           stream: await continueDynamicPrerender(prelude, {
             getServerInsertedHTML,
             getServerInsertedMetadata,
-            nonce: ctx.nonce,
           }),
           dynamicAccess: dynamicTracking.dynamicAccesses,
           // TODO: Should this include the SSR pass?
@@ -3808,7 +3804,6 @@ async function prerenderToStream(
             ),
             getServerInsertedHTML,
             getServerInsertedMetadata,
-            nonce: ctx.nonce,
           }),
           dynamicAccess: dynamicTracking.dynamicAccesses,
           // TODO: Should this include the SSR pass?
diff --git a/packages/next/src/server/app-render/metadata-insertion/create-server-inserted-metadata.tsx b/packages/next/src/server/app-render/metadata-insertion/create-server-inserted-metadata.tsx
@@ -45,13 +45,7 @@ export function createServerInsertedMetadata(nonce: string | undefined) {
         element: (
           <>
             {metadataToFlush}
-            <script
-              defer
-              nonce={nonce}
-              dangerouslySetInnerHTML={{
-                __html: REINSERT_ICON_SCRIPT,
-              }}
-            />
+            <script nonce={nonce}>{REINSERT_ICON_SCRIPT}</script>
           </>
         ),
       })
diff --git a/packages/next/src/server/stream-utils/node-web-streams-helper.ts b/packages/next/src/server/stream-utils/node-web-streams-helper.ts
@@ -582,7 +582,6 @@ export async function continueFizzStream(
 type ContinueDynamicPrerenderOptions = {
   getServerInsertedHTML: () => Promise<string>
   getServerInsertedMetadata: () => Promise<string>
-  nonce: string | undefined
 }
 
 export async function continueDynamicPrerender(
@@ -610,7 +609,6 @@ type ContinueStaticPrerenderOptions = {
   inlinedDataStream: ReadableStream<Uint8Array>
   getServerInsertedHTML: () => Promise<string>
   getServerInsertedMetadata: () => Promise<string>
-  nonce: string | undefined
 }
 
 export async function continueStaticPrerender(

Original file line number	Diff line number	Diff line change
`@@ -582,7 +582,6 @@ export async function continueFizzStream(`
`582`	`582`	`type ContinueDynamicPrerenderOptions = {`
`583`	`583`	`getServerInsertedHTML: () => Promise<string>`
`584`	`584`	`getServerInsertedMetadata: () => Promise<string>`
`585`		`- nonce: string \| undefined`
`586`	`585`	`}`
`587`	`586`
`588`	`587`	`export async function continueDynamicPrerender(`
`@@ -610,7 +609,6 @@ type ContinueStaticPrerenderOptions = {`
`610`	`609`	`inlinedDataStream: ReadableStream<Uint8Array>`
`611`	`610`	`getServerInsertedHTML: () => Promise<string>`
`612`	`611`	`getServerInsertedMetadata: () => Promise<string>`
`613`		`- nonce: string \| undefined`
`614`	`612`	`}`
`615`	`613`
`616`	`614`	`export async function continueStaticPrerender(`