[Float][Fizz] add crossOrigin support for preloading bootstrap script…

…s and bootstrap modules (#26942) The recently merged support for crossorigin in bootstrap scripts did not implement the functionality for preloading. This adds it see #26844 DiffTrain build for [a7bf5ba](a7bf5ba)
facebook · Jun 13, 2023 · 1d94a43 · 1d94a43
1 parent 717bf32
commit 1d94a43
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 23 deletions.
diff --git a/compiled/facebook-www/REVISION b/compiled/facebook-www/REVISION
@@ -1 +1 @@
-90229eb925e2330667fb7c023a5c4317c7ae8363
+a7bf5ba614c6ddbd1eb3057c71f72efd1b6c21a9
diff --git a/compiled/facebook-www/ReactDOMServer-dev.classic.js b/compiled/facebook-www/ReactDOMServer-dev.classic.js
@@ -19,7 +19,7 @@ if (__DEV__) {
 var React = require("react");
 var ReactDOM = require("react-dom");
 
-var ReactVersion = "18.3.0-www-classic-81c3ac25";
+var ReactVersion = "18.3.0-www-classic-22ab72ab";
 
 // This refers to a WWW module.
 var warningWWW = require("warning");
@@ -2471,7 +2471,7 @@ function createResponseState$1(
           : scriptConfig.crossOrigin === "use-credentials"
           ? "use-credentials"
           : "";
-      preloadBootstrapScript(resources, src, nonce, integrity);
+      preloadBootstrapScript(resources, src, nonce, integrity, crossOrigin);
       bootstrapChunks.push(
         startScriptSrc,
         stringToChunk(escapeTextForBrowser(src))
@@ -2519,7 +2519,7 @@ function createResponseState$1(
           ? "use-credentials"
           : "";
 
-      preloadBootstrapModule(resources, _src, nonce, _integrity);
+      preloadBootstrapModule(resources, _src, nonce, _integrity, _crossOrigin);
       bootstrapChunks.push(
         startModuleSrc,
         stringToChunk(escapeTextForBrowser(_src))
@@ -7424,7 +7424,7 @@ function preinit(href, options) {
 // scripts at any other point in time we will need to check whether the preload
 // already exists and not assume it
 
-function preloadBootstrapScript(resources, src, nonce, integrity) {
+function preloadBootstrapScript(resources, src, nonce, integrity, crossOrigin) {
   var key = getResourceKey("script", src);
 
   {
@@ -7444,7 +7444,8 @@ function preloadBootstrapScript(resources, src, nonce, integrity) {
     href: src,
     as: "script",
     nonce: nonce,
-    integrity: integrity
+    integrity: integrity,
+    crossOrigin: crossOrigin
   };
   var resource = {
     type: "preload",
@@ -7460,7 +7461,7 @@ function preloadBootstrapScript(resources, src, nonce, integrity) {
 // scripts at any other point in time we will need to check whether the preload
 // already exists and not assume it
 
-function preloadBootstrapModule(resources, src, nonce, integrity) {
+function preloadBootstrapModule(resources, src, nonce, integrity, crossOrigin) {
   var key = getResourceKey("script", src);
 
   {
@@ -7479,7 +7480,8 @@ function preloadBootstrapModule(resources, src, nonce, integrity) {
     rel: "modulepreload",
     href: src,
     nonce: nonce,
-    integrity: integrity
+    integrity: integrity,
+    crossOrigin: crossOrigin
   };
   var resource = {
     type: "preload",

diff --git a/compiled/facebook-www/ReactDOMServer-dev.modern.js b/compiled/facebook-www/ReactDOMServer-dev.modern.js
@@ -19,7 +19,7 @@ if (__DEV__) {
 var React = require("react");
 var ReactDOM = require("react-dom");
 
-var ReactVersion = "18.3.0-www-modern-bff42cc0";
+var ReactVersion = "18.3.0-www-modern-27b3679a";
 
 // This refers to a WWW module.
 var warningWWW = require("warning");
@@ -2471,7 +2471,7 @@ function createResponseState$1(
           : scriptConfig.crossOrigin === "use-credentials"
           ? "use-credentials"
           : "";
-      preloadBootstrapScript(resources, src, nonce, integrity);
+      preloadBootstrapScript(resources, src, nonce, integrity, crossOrigin);
       bootstrapChunks.push(
         startScriptSrc,
         stringToChunk(escapeTextForBrowser(src))
@@ -2519,7 +2519,7 @@ function createResponseState$1(
           ? "use-credentials"
           : "";
 
-      preloadBootstrapModule(resources, _src, nonce, _integrity);
+      preloadBootstrapModule(resources, _src, nonce, _integrity, _crossOrigin);
       bootstrapChunks.push(
         startModuleSrc,
         stringToChunk(escapeTextForBrowser(_src))
@@ -7424,7 +7424,7 @@ function preinit(href, options) {
 // scripts at any other point in time we will need to check whether the preload
 // already exists and not assume it
 
-function preloadBootstrapScript(resources, src, nonce, integrity) {
+function preloadBootstrapScript(resources, src, nonce, integrity, crossOrigin) {
   var key = getResourceKey("script", src);
 
   {
@@ -7444,7 +7444,8 @@ function preloadBootstrapScript(resources, src, nonce, integrity) {
     href: src,
     as: "script",
     nonce: nonce,
-    integrity: integrity
+    integrity: integrity,
+    crossOrigin: crossOrigin
   };
   var resource = {
     type: "preload",
@@ -7460,7 +7461,7 @@ function preloadBootstrapScript(resources, src, nonce, integrity) {
 // scripts at any other point in time we will need to check whether the preload
 // already exists and not assume it
 
-function preloadBootstrapModule(resources, src, nonce, integrity) {
+function preloadBootstrapModule(resources, src, nonce, integrity, crossOrigin) {
   var key = getResourceKey("script", src);
 
   {
@@ -7479,7 +7480,8 @@ function preloadBootstrapModule(resources, src, nonce, integrity) {
     rel: "modulepreload",
     href: src,
     nonce: nonce,
-    integrity: integrity
+    integrity: integrity,
+    crossOrigin: crossOrigin
   };
   var resource = {
     type: "preload",

diff --git a/compiled/facebook-www/ReactDOMServerStreaming-dev.modern.js b/compiled/facebook-www/ReactDOMServerStreaming-dev.modern.js
@@ -2468,7 +2468,7 @@ function createResponseState(
           : scriptConfig.crossOrigin === "use-credentials"
           ? "use-credentials"
           : "";
-      preloadBootstrapScript(resources, src, nonce, integrity);
+      preloadBootstrapScript(resources, src, nonce, integrity, crossOrigin);
       bootstrapChunks.push(
         startScriptSrc,
         stringToChunk(escapeTextForBrowser(src))
@@ -2516,7 +2516,7 @@ function createResponseState(
           ? "use-credentials"
           : "";
 
-      preloadBootstrapModule(resources, _src, nonce, _integrity);
+      preloadBootstrapModule(resources, _src, nonce, _integrity, _crossOrigin);
       bootstrapChunks.push(
         startModuleSrc,
         stringToChunk(escapeTextForBrowser(_src))
@@ -7431,7 +7431,7 @@ function preinit(href, options) {
 // scripts at any other point in time we will need to check whether the preload
 // already exists and not assume it
 
-function preloadBootstrapScript(resources, src, nonce, integrity) {
+function preloadBootstrapScript(resources, src, nonce, integrity, crossOrigin) {
   var key = getResourceKey("script", src);
 
   {
@@ -7451,7 +7451,8 @@ function preloadBootstrapScript(resources, src, nonce, integrity) {
     href: src,
     as: "script",
     nonce: nonce,
-    integrity: integrity
+    integrity: integrity,
+    crossOrigin: crossOrigin
   };
   var resource = {
     type: "preload",
@@ -7467,7 +7468,7 @@ function preloadBootstrapScript(resources, src, nonce, integrity) {
 // scripts at any other point in time we will need to check whether the preload
 // already exists and not assume it
 
-function preloadBootstrapModule(resources, src, nonce, integrity) {
+function preloadBootstrapModule(resources, src, nonce, integrity, crossOrigin) {
   var key = getResourceKey("script", src);
 
   {
@@ -7486,7 +7487,8 @@ function preloadBootstrapModule(resources, src, nonce, integrity) {
     rel: "modulepreload",
     href: src,
     nonce: nonce,
-    integrity: integrity
+    integrity: integrity,
+    crossOrigin: crossOrigin
   };
   var resource = {
     type: "preload",

diff --git a/compiled/facebook-www/ReactDOMServerStreaming-prod.modern.js b/compiled/facebook-www/ReactDOMServerStreaming-prod.modern.js
@@ -3871,7 +3871,8 @@ exports.renderToStream = function (children, options) {
           href: externalRuntimeConfig,
           as: "script",
           nonce: void 0,
-          integrity: integrity
+          integrity: integrity,
+          crossOrigin: scriptConfig
         },
         resource = { type: "preload", chunks: [], state: 0, props: props };
       resources.preloadsMap.set("[script]" + externalRuntimeConfig, resource);
@@ -3914,7 +3915,8 @@ exports.renderToStream = function (children, options) {
           rel: "modulepreload",
           href: bootstrapScriptContent,
           nonce: void 0,
-          integrity: externalRuntimeConfig
+          integrity: externalRuntimeConfig,
+          crossOrigin: integrity
         }),
         (props = {
           type: "preload",
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		90229eb925e2330667fb7c023a5c4317c7ae8363
		a7bf5ba614c6ddbd1eb3057c71f72efd1b6c21a9