Update computation of script chunks

facebook · Apr 28, 2023 · d2d41c4 · d2d41c4
1 parent ceb387b
commit d2d41c4
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 26 deletions.
diff --git a/packages/react-dom-bindings/src/server/ReactFizzConfigDOM.js b/packages/react-dom-bindings/src/server/ReactFizzConfigDOM.js
@@ -163,14 +163,8 @@ const startInlineScript = stringToPrecomputedChunk('<script>');
 const endInlineScript = stringToPrecomputedChunk('</script>');
 
 const startScriptSrc = stringToPrecomputedChunk('<script src="');
-const startScriptSrcWithNonce = stringToPrecomputedChunk('<script nonce="');
-const middleScriptSrcWithNonce = stringToPrecomputedChunk('" src="');
-
 const startModuleSrc = stringToPrecomputedChunk('<script type="module" src="');
-const startModuleSrcWithNonce = stringToPrecomputedChunk('<script nonce="');
-const middleModuleSrcWithNonce = stringToPrecomputedChunk(
-  '" type="module" src="',
-);
+const scriptNonce = stringToPrecomputedChunk('" nonce="');
 const scriptIntegirty = stringToPrecomputedChunk('" integrity="');
 const endAsyncScript = stringToPrecomputedChunk('" async=""></script>');
 
@@ -255,17 +249,15 @@ export function createResponseState(
         typeof scriptConfig === 'string' ? scriptConfig : scriptConfig.src;
       const integrity =
         typeof scriptConfig === 'string' ? undefined : scriptConfig.integrity;
-      if (nonce === undefined) {
-        bootstrapChunks.push(
-          startScriptSrc,
-          stringToChunk(escapeTextForBrowser(src)),
-        );
-      } else {
+
+      bootstrapChunks.push(
+        startScriptSrc,
+        stringToChunk(escapeTextForBrowser(src)),
+      );
+      if (nonce) {
         bootstrapChunks.push(
-          startScriptSrcWithNonce,
+          scriptNonce,
           stringToChunk(escapeTextForBrowser(nonce)),
-          middleScriptSrcWithNonce,
-          stringToChunk(escapeTextForBrowser(src)),
         );
       }
       if (integrity) {
@@ -284,17 +276,16 @@ export function createResponseState(
         typeof scriptConfig === 'string' ? scriptConfig : scriptConfig.src;
       const integrity =
         typeof scriptConfig === 'string' ? undefined : scriptConfig.integrity;
-      if (nonce === undefined) {
-        bootstrapChunks.push(
-          startModuleSrc,
-          stringToChunk(escapeTextForBrowser(src)),
-        );
-      } else {
+
+      bootstrapChunks.push(
+        startModuleSrc,
+        stringToChunk(escapeTextForBrowser(src)),
+      );
+
+      if (nonce) {
         bootstrapChunks.push(
-          startModuleSrcWithNonce,
+          scriptNonce,
           stringToChunk(escapeTextForBrowser(nonce)),
-          middleModuleSrcWithNonce,
-          stringToChunk(escapeTextForBrowser(src)),
         );
       }
       if (integrity) {

diff --git a/packages/react-dom/src/__tests__/ReactDOMFizzServerBrowser-test.js b/packages/react-dom/src/__tests__/ReactDOMFizzServerBrowser-test.js
@@ -500,7 +500,7 @@ describe('ReactDOMFizzServerBrowser', () => {
     );
     const result = await readResult(stream);
     expect(result).toMatchInlineSnapshot(
-      `"<div>hello world</div><script nonce="${nonce}">INIT();</script><script nonce="${nonce}" src="init.js" async=""></script><script nonce="${nonce}" type="module" src="init.mjs" async=""></script>"`,
+      `"<div>hello world</div><script nonce="${nonce}">INIT();</script><script src="init.js" nonce="${nonce}" async=""></script><script type="module" src="init.mjs" nonce="${nonce}" async=""></script>"`,
     );
   });
 });