Backport v13: Update React from d900fadbf to 1dba980e1f (#74202)

Update React from d900fadbf to 1dba980e1f. ### React upstream changes - facebook/react#31881 - facebook/react#31872 --------- Co-authored-by: JJ Kasper <jj@jjsweb.site>
vercel · Dec 21, 2024 · 82e0af7 · 82e0af7
1 parent e8f4e7a
commit 82e0af7
Show file tree

Hide file tree

Showing 88 changed files with 846 additions and 622 deletions.
diff --git a/.github/workflows/build_and_deploy.yml b/.github/workflows/build_and_deploy.yml
@@ -8,8 +8,8 @@ on:
 env:
   NAPI_CLI_VERSION: 2.16.2
   TURBO_VERSION: 1.10.9
-  NODE_MAINTENANCE_VERSION: 16
-  NODE_LTS_VERSION: 18
+  NODE_MAINTENANCE_VERSION: 18
+  NODE_LTS_VERSION: 20
   CARGO_PROFILE_RELEASE_LTO: 'true'
   TURBO_TEAM: 'vercel'
   TURBO_REMOTE_ONLY: 'true'

diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
@@ -9,8 +9,8 @@ on:
 env:
   NAPI_CLI_VERSION: 2.14.7
   TURBO_VERSION: 1.10.9
-  NODE_MAINTENANCE_VERSION: 16
-  NODE_LTS_VERSION: 18
+  NODE_MAINTENANCE_VERSION: 18
+  NODE_LTS_VERSION: 20
   TEST_CONCURRENCY: 8
   # disable backtrace for test snapshots
   RUST_BACKTRACE: 0
@@ -147,7 +147,7 @@ jobs:
         group: [1, 2, 3, 4, 5]
     uses: ./.github/workflows/build_reusable.yml
     with:
-      nodeVersion: 16
+      nodeVersion: 18
       skipForDocsOnly: 'yes'
       afterBuild: RUST_BACKTRACE=0 NEXT_EXTERNAL_TESTS_FILTERS="$(pwd)/test/turbopack-tests-manifest.json" TURBOPACK=1 node run-tests.js --timings -g ${{ matrix.group }}/5 -c ${TEST_CONCURRENCY} --type integration
     secrets: inherit
@@ -212,7 +212,7 @@ jobs:
 
     uses: ./.github/workflows/build_reusable.yml
     with:
-      nodeVersion: 16
+      nodeVersion: 18
       skipForDocsOnly: 'yes'
       afterBuild: node run-tests.js --timings -g ${{ matrix.group }}/12 -c ${TEST_CONCURRENCY} --type integration
     secrets: inherit

diff --git a/.github/workflows/build_reusable.yml b/.github/workflows/build_reusable.yml
@@ -57,8 +57,8 @@ on:
 env:
   NAPI_CLI_VERSION: 2.14.7
   TURBO_VERSION: 1.10.9
-  NODE_MAINTENANCE_VERSION: 16
-  NODE_LTS_VERSION: 18
+  NODE_MAINTENANCE_VERSION: 18
+  NODE_LTS_VERSION: 20
   TEST_CONCURRENCY: 8
   # disable backtrace for test snapshots
   RUST_BACKTRACE: 0

diff --git a/.github/workflows/code_freeze.yml b/.github/workflows/code_freeze.yml
@@ -18,8 +18,8 @@ name: Code Freeze
 env:
   NAPI_CLI_VERSION: 2.14.7
   TURBO_VERSION: 1.10.9
-  NODE_MAINTENANCE_VERSION: 16
-  NODE_LTS_VERSION: 18
+  NODE_MAINTENANCE_VERSION: 18
+  NODE_LTS_VERSION: 20
 
 jobs:
   start:

diff --git a/.github/workflows/pull_request_stats.yml b/.github/workflows/pull_request_stats.yml
@@ -7,8 +7,8 @@ name: Generate Pull Request Stats
 env:
   NAPI_CLI_VERSION: 2.14.7
   TURBO_VERSION: 1.10.9
-  NODE_MAINTENANCE_VERSION: 16
-  NODE_LTS_VERSION: 18
+  NODE_MAINTENANCE_VERSION: 18
+  NODE_LTS_VERSION: 20
   TEST_CONCURRENCY: 6
 
   TURBO_TEAM: 'vercel'

diff --git a/.github/workflows/test_e2e_deploy.yml b/.github/workflows/test_e2e_deploy.yml
@@ -16,8 +16,8 @@ jobs:
       DATADOG_API_KEY: ${{ secrets.DATA_DOG_API_KEY }}
       NAPI_CLI_VERSION: 2.16.2
       TURBO_VERSION: 1.10.9
-      NODE_MAINTENANCE_VERSION: 16
-      NODE_LTS_VERSION: 18
+      NODE_MAINTENANCE_VERSION: 18
+      NODE_LTS_VERSION: 20
       CARGO_PROFILE_RELEASE_LTO: 'true'
       TURBO_TEAM: 'vercel'
       TURBO_REMOTE_ONLY: 'true'

diff --git a/.github/workflows/trigger_release.yml b/.github/workflows/trigger_release.yml
@@ -30,8 +30,8 @@ name: Trigger Release
 env:
   NAPI_CLI_VERSION: 2.14.7
   TURBO_VERSION: 1.10.9
-  NODE_MAINTENANCE_VERSION: 16
-  NODE_LTS_VERSION: 18
+  NODE_MAINTENANCE_VERSION: 18
+  NODE_LTS_VERSION: 20
 
 jobs:
   start:

diff --git a/.github/workflows/update_fonts_data.yml b/.github/workflows/update_fonts_data.yml
@@ -8,7 +8,7 @@ on:
   workflow_dispatch:
 
 env:
-  NODE_LTS_VERSION: 18
+  NODE_LTS_VERSION: 20
 
 jobs:
   create-pull-request:

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-d900fadbf-20230929",
+    "react-builtin": "npm:react@18.3.0-canary-1dba980e1f-20241220",
     "react-dom": "18.2.0",
     "react-dom-17": "npm:react-dom@17.0.2",
-    "react-dom-builtin": "npm:react-dom@18.3.0-canary-d900fadbf-20230929",
-    "react-dom-experimental-builtin": "npm:react-dom@0.0.0-experimental-d900fadbf-20230929",
-    "react-experimental-builtin": "npm:react@0.0.0-experimental-d900fadbf-20230929",
-    "react-server-dom-turbopack": "18.3.0-canary-d900fadbf-20230929",
-    "react-server-dom-turbopack-experimental": "npm:react-server-dom-turbopack@0.0.0-experimental-d900fadbf-20230929",
-    "react-server-dom-webpack": "18.3.0-canary-d900fadbf-20230929",
-    "react-server-dom-webpack-experimental": "npm:react-server-dom-webpack@0.0.0-experimental-d900fadbf-20230929",
+    "react-dom-builtin": "npm:react-dom@18.3.0-canary-1dba980e1f-20241220",
+    "react-dom-experimental-builtin": "npm:react-dom@0.0.0-experimental-1dba980e1f-20241220",
+    "react-experimental-builtin": "npm:react@0.0.0-experimental-1dba980e1f-20241220",
+    "react-server-dom-turbopack": "18.3.0-canary-1dba980e1f-20241220",
+    "react-server-dom-turbopack-experimental": "npm:react-server-dom-turbopack@0.0.0-experimental-1dba980e1f-20241220",
+    "react-server-dom-webpack": "18.3.0-canary-1dba980e1f-20241220",
+    "react-server-dom-webpack-experimental": "npm:react-server-dom-webpack@0.0.0-experimental-1dba980e1f-20241220",
     "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-d900fadbf-20230929",
-    "scheduler-experimental-builtin": "npm:scheduler@0.0.0-experimental-d900fadbf-20230929",
+    "scheduler-builtin": "npm:scheduler@0.24.0-canary-1dba980e1f-20241220",
+    "scheduler-experimental-builtin": "npm:scheduler@0.0.0-experimental-1dba980e1f-20241220",
     "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-3cfcbc5bc-20231018';
+var ReactVersion = '18.3.0-experimental-1dba980e1f-20241220';
 
 var ReactSharedInternals = React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED;
 

diff --git a/...src/compiled/react-dom-experimental/cjs/react-dom-server-legacy.browser.production.min.js b/...src/compiled/react-dom-experimental/cjs/react-dom-server-legacy.browser.production.min.js
diff --git a/.../next/src/compiled/react-dom-experimental/cjs/react-dom-server-legacy.node.development.js b/.../next/src/compiled/react-dom-experimental/cjs/react-dom-server-legacy.node.development.js
@@ -18,7 +18,7 @@ var React = require("next/dist/compiled/react-experimental");
 var ReactDOM = require('react-dom');
 var stream = require('stream');
 
-var ReactVersion = '18.3.0-experimental-3cfcbc5bc-20231018';
+var ReactVersion = '18.3.0-experimental-1dba980e1f-20241220';
 
 var ReactSharedInternals = React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED;
 

diff --git a/...xt/src/compiled/react-dom-experimental/cjs/react-dom-server-legacy.node.production.min.js b/...xt/src/compiled/react-dom-experimental/cjs/react-dom-server-legacy.node.production.min.js
diff --git a/...xt/src/compiled/react-dom-experimental/cjs/react-dom-server-rendering-stub.development.js b/...xt/src/compiled/react-dom-experimental/cjs/react-dom-server-rendering-stub.development.js
@@ -16,7 +16,7 @@ if (process.env.NODE_ENV !== "production") {
 
 var React = require("next/dist/compiled/react-experimental");
 
-var ReactVersion = '18.3.0-experimental-3cfcbc5bc-20231018';
+var ReactVersion = '18.3.0-experimental-1dba980e1f-20241220';
 
 var Internals = {
   usingClientEntryPoint: false,

diff --git a/...src/compiled/react-dom-experimental/cjs/react-dom-server-rendering-stub.production.min.js b/...src/compiled/react-dom-experimental/cjs/react-dom-server-rendering-stub.production.min.js
diff --git a/...ages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.browser.development.js b/...ages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.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-3cfcbc5bc-20231018';
+var ReactVersion = '18.3.0-experimental-1dba980e1f-20241220';
 
 var ReactSharedInternals = React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED;
 

diff --git a/...s/next/src/compiled/react-dom-experimental/cjs/react-dom-server.browser.production.min.js b/...s/next/src/compiled/react-dom-experimental/cjs/react-dom-server.browser.production.min.js
diff --git a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.edge.development.js b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.edge.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-3cfcbc5bc-20231018';
+var ReactVersion = '18.3.0-experimental-1dba980e1f-20241220';
 
 var ReactSharedInternals = React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED;
 

diff --git a/...ages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.edge.production.min.js b/...ages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.edge.production.min.js
diff --git a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.node.development.js b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.node.development.js
@@ -21,7 +21,7 @@ var async_hooks = require('async_hooks');
 var ReactDOM = require('react-dom');
 var stream = require('stream');
 
-var ReactVersion = '18.3.0-experimental-3cfcbc5bc-20231018';
+var ReactVersion = '18.3.0-experimental-1dba980e1f-20241220';
 
 var ReactSharedInternals = React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED;
 

diff --git a/...ages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.node.production.min.js b/...ages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.node.production.min.js
diff --git a/...es/next/src/compiled/react-dom-experimental/cjs/react-dom-unstable_testing.development.js b/...es/next/src/compiled/react-dom-experimental/cjs/react-dom-unstable_testing.development.js
@@ -28672,7 +28672,7 @@ identifierPrefix, onRecoverableError, transitionCallbacks, formState) {
   return root;
 }
 
-var ReactVersion = '18.3.0-experimental-3cfcbc5bc-20231018';
+var ReactVersion = '18.3.0-experimental-1dba980e1f-20241220';
 
 function createPortal$1(children, containerInfo, // TODO: figure out the API for cross-renderer implementation.
 implementation) {