{"patch":"diff --git a\/packages\/react-dom-bindings\/src\/server\/ReactFizzConfigDOM.js b\/packages\/react-dom-bindings\/src\/server\/ReactFizzConfigDOM.js\nindex 5314564242..089e9964ce 100644\n--- a\/packages\/react-dom-bindings\/src\/server\/ReactFizzConfigDOM.js\n+++ b\/packages\/react-dom-bindings\/src\/server\/ReactFizzConfigDOM.js\n@@ -201,6 +201,7 @@ export type ExternalRuntimeScript = {\n \/\/ if passed externalRuntimeConfig and the enableFizzExternalRuntime feature flag\n \/\/ is set, the server will send instructions via data attributes (instead of inline scripts)\n export function createResponseState(\n+ resources: Resources,\n identifierPrefix: string | void,\n nonce: string | void,\n bootstrapScriptContent: string | void,\n@@ -266,6 +267,8 @@ export function createResponseState(\n const integrity =\n typeof scriptConfig === 'string' ? undefined : scriptConfig.integrity;\n \n+ preloadBootstrapScript(resources, src, nonce, integrity);\n+\n bootstrapChunks.push(\n startScriptSrc,\n stringToChunk(escapeTextForBrowser(src)),\n@@ -5469,6 +5472,46 @@ function preinit(href: string, options: PreinitOptions): void {\n }\n }\n \n+\/\/ This function is only safe to call at Request start time since it assumes\n+\/\/ that each script has not already been preloaded. If we find a need to preload\n+\/\/ scripts at any other point in time we will need to check whether the preload\n+\/\/ already exists and not assume it\n+function preloadBootstrapScript(\n+ resources: Resources,\n+ src: string,\n+ nonce: ?string,\n+ integrity: ?string,\n+): void {\n+ const key = getResourceKey('script', src);\n+ if (__DEV__) {\n+ if (resources.preloadsMap.has(key)) {\n+ \/\/ This is coded as a React error because it should be impossible for a userspace preload to preempt this call\n+ \/\/ If a userspace preload can preempt it then this assumption is broken and we need to reconsider this strategy\n+ \/\/ rather than instruct the user to not preload their bootstrap scripts themselves\n+ console.error(\n+ 'Internal React Error: React expected bootstrap script with src \"%s\" to not have been preloaded already. please file an issue',\n+ src,\n+ );\n+ }\n+ }\n+ const props: PreloadProps = {\n+ rel: 'preload',\n+ href: src,\n+ as: 'script',\n+ nonce,\n+ integrity,\n+ };\n+ const resource: PreloadResource = {\n+ type: 'preload',\n+ chunks: [],\n+ state: NoState,\n+ props,\n+ };\n+ resources.preloadsMap.set(key, resource);\n+ resources.explicitScriptPreloads.add(resource);\n+ pushLinkImpl(resource.chunks, props);\n+}\n+\n function internalPreinitScript(\n resources: Resources,\n src: string,\ndiff --git a\/packages\/react-dom-bindings\/src\/server\/ReactFizzConfigDOMLegacy.js b\/packages\/react-dom-bindings\/src\/server\/ReactFizzConfigDOMLegacy.js\nindex 5e1be3c91b..d8f7094b50 100644\n--- a\/packages\/react-dom-bindings\/src\/server\/ReactFizzConfigDOMLegacy.js\n+++ b\/packages\/react-dom-bindings\/src\/server\/ReactFizzConfigDOMLegacy.js\n@@ -8,6 +8,7 @@\n *\/\n \n import type {\n+ Resources,\n BootstrapScriptDescriptor,\n ExternalRuntimeScript,\n FormatContext,\n@@ -63,11 +64,13 @@ export type ResponseState = {\n };\n \n export function createResponseState(\n+ resources: Resources,\n generateStaticMarkup: boolean,\n identifierPrefix: string | void,\n externalRuntimeConfig: string | BootstrapScriptDescriptor | void,\n ): ResponseState {\n const responseState = createResponseStateImpl(\n+ resources,\n identifierPrefix,\n undefined,\n undefined,\ndiff --git a\/packages\/react-dom\/src\/__tests__\/ReactDOMFizzServer-test.js b\/packages\/react-dom\/src\/__tests__\/ReactDOMFizzServer-test.js\nindex 2bf48eae39..e16beba051 100644\n--- a\/packages\/react-dom\/src\/__tests__\/ReactDOMFizzServer-test.js\n+++ b\/packages\/react-dom\/src\/__tests__\/ReactDOMFizzServer-test.js\n@@ -596,14 +596,27 @@ describe('ReactDOMFizzServer', () => {\n {\n nonce: 'R4nd0m',\n bootstrapScriptContent: 'function noop(){}',\n- bootstrapScripts: ['init.js'],\n+ bootstrapScripts: [\n+ 'init.js',\n+ {src: 'init2.js', integrity: 'init2hash'},\n+ ],\n bootstrapModules: ['init.mjs'],\n },\n );\n pipe(writable);\n });\n \n- expect(getVisibleChildren(container)).toEqual(

Loading...<\/div>);\n+ expect(getVisibleChildren(container)).toEqual([\n+ ,\n+ ,\n+

Loading...<\/div>,\n+ ]);\n \n \/\/ check that there are 4 scripts with a matching nonce:\n \/\/ The runtime script, an inline bootstrap script, and two src scripts\n@@ -611,12 +624,22 @@ describe('ReactDOMFizzServer', () => {\n Array.from(container.getElementsByTagName('script')).filter(\n node => node.getAttribute('nonce') === CSPnonce,\n ).length,\n- ).toEqual(4);\n+ ).toEqual(5);\n \n await act(() => {\n resolve({default: Text});\n });\n- expect(getVisibleChildren(container)).toEqual(

Hello<\/div>);\n+ expect(getVisibleChildren(container)).toEqual([\n+ ,\n+ ,\n+

Hello<\/div>,\n+ ]);\n } finally {\n CSPnonce = null;\n }\n@@ -3756,7 +3779,11 @@ describe('ReactDOMFizzServer', () => {\n \n expect(getVisibleChildren(document)).toEqual(\n \n- \n+ \n+ \n+ \n+ \n+ <\/head>\n \n

hello world<\/div>\n <\/body>\ndiff --git a\/packages\/react-dom\/src\/__tests__\/ReactDOMFizzServerBrowser-test.js b\/packages\/react-dom\/src\/__tests__\/ReactDOMFizzServerBrowser-test.js\nindex c6dbae0d0c..6571cddcc6 100644\n--- a\/packages\/react-dom\/src\/__tests__\/ReactDOMFizzServerBrowser-test.js\n+++ b\/packages\/react-dom\/src\/__tests__\/ReactDOMFizzServerBrowser-test.js\n@@ -84,7 +84,7 @@ describe('ReactDOMFizzServerBrowser', () => {\n );\n const result = await readResult(stream);\n expect(result).toMatchInlineSnapshot(\n- `\"

hello world<\/div>

dillon1000/react

Files changed