Update React from 593ecee66 to 2c338b16f. (#58553)

#### Upstream Changes - facebook/react#27692 - facebook/react#27712 - facebook/react#27659
vercel · Nov 16, 2023 · 4deb697 · 4deb697
1 parent 1ae13b5
commit 4deb697
Show file tree

Hide file tree

Showing 71 changed files with 1,888 additions and 1,647 deletions.
diff --git a/package.json b/package.json
@@ -193,16 +193,16 @@
     "random-seed": "0.3.0",
     "react": "18.2.0",
     "react-17": "npm:react@17.0.2",
-    "react-builtin": "npm:react@18.3.0-canary-593ecee66-20231114",
+    "react-builtin": "npm:react@18.3.0-canary-2c338b16f-20231116",
     "react-dom": "18.2.0",
     "react-dom-17": "npm:react-dom@17.0.2",
-    "react-dom-builtin": "npm:react-dom@18.3.0-canary-593ecee66-20231114",
-    "react-dom-experimental-builtin": "npm:react-dom@0.0.0-experimental-593ecee66-20231114",
-    "react-experimental-builtin": "npm:react@0.0.0-experimental-593ecee66-20231114",
-    "react-server-dom-turbopack": "18.3.0-canary-593ecee66-20231114",
-    "react-server-dom-turbopack-experimental": "npm:react-server-dom-turbopack@0.0.0-experimental-593ecee66-20231114",
-    "react-server-dom-webpack": "18.3.0-canary-593ecee66-20231114",
-    "react-server-dom-webpack-experimental": "npm:react-server-dom-webpack@0.0.0-experimental-593ecee66-20231114",
+    "react-dom-builtin": "npm:react-dom@18.3.0-canary-2c338b16f-20231116",
+    "react-dom-experimental-builtin": "npm:react-dom@0.0.0-experimental-2c338b16f-20231116",
+    "react-experimental-builtin": "npm:react@0.0.0-experimental-2c338b16f-20231116",
+    "react-server-dom-turbopack": "18.3.0-canary-2c338b16f-20231116",
+    "react-server-dom-turbopack-experimental": "npm:react-server-dom-turbopack@0.0.0-experimental-2c338b16f-20231116",
+    "react-server-dom-webpack": "18.3.0-canary-2c338b16f-20231116",
+    "react-server-dom-webpack-experimental": "npm:react-server-dom-webpack@0.0.0-experimental-2c338b16f-20231116",
     "react-ssr-prepass": "1.0.8",
     "react-virtualized": "9.22.3",
     "relay-compiler": "13.0.2",
@@ -212,8 +212,8 @@
     "resolve-from": "5.0.0",
     "sass": "1.54.0",
     "satori": "0.10.6",
-    "scheduler-builtin": "npm:scheduler@0.24.0-canary-593ecee66-20231114",
-    "scheduler-experimental-builtin": "npm:scheduler@0.0.0-experimental-593ecee66-20231114",
+    "scheduler-builtin": "npm:scheduler@0.24.0-canary-2c338b16f-20231116",
+    "scheduler-experimental-builtin": "npm:scheduler@0.0.0-experimental-2c338b16f-20231116",
     "seedrandom": "3.0.5",
     "selenium-webdriver": "4.0.0-beta.4",
     "semver": "7.3.7",

diff --git a/...xt/src/compiled/react-dom-experimental/cjs/react-dom-server-legacy.browser.development.js b/...xt/src/compiled/react-dom-experimental/cjs/react-dom-server-legacy.browser.development.js
@@ -17,7 +17,7 @@ if (process.env.NODE_ENV !== "production") {
 var React = require("next/dist/compiled/react-experimental");
 var ReactDOM = require('react-dom');
 
-var ReactVersion = '18.3.0-experimental-593ecee66-20231114';
+var ReactVersion = '18.3.0-experimental-2c338b16f-20231116';
 
 var ReactSharedInternals = React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED;
 
@@ -6449,6 +6449,9 @@ function emitEarlyPreloads(renderState, resumableState, shellComplete) {
     var headers = renderState.headers;
 
     if (headers) {
+      // Even if onHeaders throws we don't want to call this again so
+      // we drop the headers state from this point onwards.
+      renderState.headers = null;
       var linkHeader = headers.preconnects;
 
       if (headers.fontPreloads) {
@@ -6519,7 +6522,6 @@ function emitEarlyPreloads(renderState, resumableState, shellComplete) {
         onHeaders({});
       }
 
-      renderState.headers = null;
       return;
     }
   }
@@ -11075,6 +11077,15 @@ function abortTask(task, request, error) {
   if (request.allPendingTasks === 0) {
     completeAll(request);
   }
+}
+
+function safelyEmitEarlyPreloads(request, shellComplete) {
+  try {
+    emitEarlyPreloads(request.renderState, request.resumableState, shellComplete);
+  } catch (error) {
+    // We assume preloads are optimistic and thus non-fatal if errored.
+    logRecoverableError(request, error);
+  }
 } // I extracted this function out because we want to ensure we consistently emit preloads before
 // transitioning to the next request stage and this transition can happen in multiple places in this
 // implementation.
@@ -11088,7 +11099,7 @@ function completeShell(request) {
     // we should only be calling completeShell when the shell is complete so we
     // just use a literal here
     var shellComplete = true;
-    emitEarlyPreloads(request.renderState, request.resumableState, shellComplete);
+    safelyEmitEarlyPreloads(request, shellComplete);
   } // We have completed the shell so the shell can't error anymore.
 
 
@@ -11108,7 +11119,7 @@ function completeAll(request) {
   var shellComplete = request.trackedPostpones === null ? // Render, we assume it is completed
   true : // Prerender Request, we use the state of the root segment
   request.completedRootSegment === null || request.completedRootSegment.status !== POSTPONED;
-  emitEarlyPreloads(request.renderState, request.resumableState, shellComplete);
+  safelyEmitEarlyPreloads(request, shellComplete);
   var onAllReady = request.onAllReady;
   onAllReady();
 }
@@ -11837,7 +11848,7 @@ function startWork(request) {
 
 function enqueueEarlyPreloadsAfterInitialWork(request) {
   var shellComplete = request.pendingRootTasks === 0;
-  emitEarlyPreloads(request.renderState, request.resumableState, shellComplete);
+  safelyEmitEarlyPreloads(request, shellComplete);
 }
 
 function enqueueFlush(request) {

diff --git a/...ext/src/compiled/react-dom-experimental/cjs/react-dom-server-legacy.browser.production.js b/...ext/src/compiled/react-dom-experimental/cjs/react-dom-server-legacy.browser.production.js
@@ -26,7 +26,7 @@ function formatProdErrorMessage(code) {
   return "Minified React error #" + code + "; visit " + url + " for the full message or " + 'use the non-minified dev environment for full errors and additional ' + 'helpful warnings.';
 }
 
-var ReactVersion = '18.3.0-experimental-593ecee66-20231114';
+var ReactVersion = '18.3.0-experimental-2c338b16f-20231116';
 
 // A pure JS implementation of a string hashing function. We do not use it for
 // security or obfuscation purposes, only to create compact hashes. So we
@@ -4774,6 +4774,9 @@ function emitEarlyPreloads(renderState, resumableState, shellComplete) {
     const headers = renderState.headers;
 
     if (headers) {
+      // Even if onHeaders throws we don't want to call this again so
+      // we drop the headers state from this point onwards.
+      renderState.headers = null;
       let linkHeader = headers.preconnects;
 
       if (headers.fontPreloads) {
@@ -4844,7 +4847,6 @@ function emitEarlyPreloads(renderState, resumableState, shellComplete) {
         onHeaders({});
       }
 
-      renderState.headers = null;
       return;
     }
   }
@@ -8004,6 +8006,15 @@ function abortTask(task, request, error) {
   if (request.allPendingTasks === 0) {
     completeAll(request);
   }
+}
+
+function safelyEmitEarlyPreloads(request, shellComplete) {
+  try {
+    emitEarlyPreloads(request.renderState, request.resumableState, shellComplete);
+  } catch (error) {
+    // We assume preloads are optimistic and thus non-fatal if errored.
+    logRecoverableError(request, error);
+  }
 } // I extracted this function out because we want to ensure we consistently emit preloads before
 // transitioning to the next request stage and this transition can happen in multiple places in this
 // implementation.
@@ -8017,7 +8028,7 @@ function completeShell(request) {
     // we should only be calling completeShell when the shell is complete so we
     // just use a literal here
     const shellComplete = true;
-    emitEarlyPreloads(request.renderState, request.resumableState, shellComplete);
+    safelyEmitEarlyPreloads(request, shellComplete);
   } // We have completed the shell so the shell can't error anymore.
 
 
@@ -8037,7 +8048,7 @@ function completeAll(request) {
   const shellComplete = request.trackedPostpones === null ? // Render, we assume it is completed
   true : // Prerender Request, we use the state of the root segment
   request.completedRootSegment === null || request.completedRootSegment.status !== POSTPONED;
-  emitEarlyPreloads(request.renderState, request.resumableState, shellComplete);
+  safelyEmitEarlyPreloads(request, shellComplete);
   const onAllReady = request.onAllReady;
   onAllReady();
 }
@@ -8725,7 +8736,7 @@ function startWork(request) {
 
 function enqueueEarlyPreloadsAfterInitialWork(request) {
   const shellComplete = request.pendingRootTasks === 0;
-  emitEarlyPreloads(request.renderState, request.resumableState, shellComplete);
+  safelyEmitEarlyPreloads(request, shellComplete);
 }
 
 function enqueueFlush(request) {