Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 21, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1948be5
Update React from d900fadbf to 1dba980e1f
ztanner Dec 21, 2024
4057890
update node version
ijjk Dec 21, 2024
6a2561e
update another
ijjk Dec 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build_and_deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build_and_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build_reusable.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/code_freeze.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pull_request_stats.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test_e2e_deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/trigger_release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update_fonts_data.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
workflow_dispatch:

env:
NODE_LTS_VERSION: 18
NODE_LTS_VERSION: 20

jobs:
create-pull-request:
Expand Down
20 changes: 10 additions & 10 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,16 +193,16 @@
"random-seed": "0.3.0",
"react": "18.2.0",
"react-17": "npm:[email protected]",
"react-builtin": "npm:[email protected]d900fadbf-20230929",
"react-builtin": "npm:[email protected]1dba980e1f-20241220",
"react-dom": "18.2.0",
"react-dom-17": "npm:[email protected]",
"react-dom-builtin": "npm:[email protected]d900fadbf-20230929",
"react-dom-experimental-builtin": "npm:[email protected]d900fadbf-20230929",
"react-experimental-builtin": "npm:[email protected]d900fadbf-20230929",
"react-server-dom-turbopack": "18.3.0-canary-d900fadbf-20230929",
"react-server-dom-turbopack-experimental": "npm:[email protected]d900fadbf-20230929",
"react-server-dom-webpack": "18.3.0-canary-d900fadbf-20230929",
"react-server-dom-webpack-experimental": "npm:[email protected]d900fadbf-20230929",
"react-dom-builtin": "npm:[email protected]1dba980e1f-20241220",
"react-dom-experimental-builtin": "npm:[email protected]1dba980e1f-20241220",
"react-experimental-builtin": "npm:[email protected]1dba980e1f-20241220",
"react-server-dom-turbopack": "18.3.0-canary-1dba980e1f-20241220",
"react-server-dom-turbopack-experimental": "npm:[email protected]1dba980e1f-20241220",
"react-server-dom-webpack": "18.3.0-canary-1dba980e1f-20241220",
"react-server-dom-webpack-experimental": "npm:[email protected]1dba980e1f-20241220",
"react-ssr-prepass": "1.0.8",
"react-virtualized": "9.22.3",
"relay-compiler": "13.0.2",
Expand All @@ -212,8 +212,8 @@
"resolve-from": "5.0.0",
"sass": "1.54.0",
"satori": "0.10.6",
"scheduler-builtin": "npm:[email protected]d900fadbf-20230929",
"scheduler-experimental-builtin": "npm:[email protected]d900fadbf-20230929",
"scheduler-builtin": "npm:[email protected]1dba980e1f-20241220",
"scheduler-experimental-builtin": "npm:[email protected]1dba980e1f-20241220",
"seedrandom": "3.0.5",
"selenium-webdriver": "4.0.0-beta.4",
"semver": "7.3.7",
Expand Down
2 changes: 1 addition & 1 deletion ...xt/src/compiled/react-dom-experimental/cjs/react-dom-server-legacy.browser.development.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion ...src/compiled/react-dom-experimental/cjs/react-dom-server-legacy.browser.production.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .../next/src/compiled/react-dom-experimental/cjs/react-dom-server-legacy.node.development.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion ...xt/src/compiled/react-dom-experimental/cjs/react-dom-server-legacy.node.production.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ...xt/src/compiled/react-dom-experimental/cjs/react-dom-server-rendering-stub.development.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion ...src/compiled/react-dom-experimental/cjs/react-dom-server-rendering-stub.production.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ...ages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.browser.development.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion ...s/next/src/compiled/react-dom-experimental/cjs/react-dom-server.browser.production.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.edge.development.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion ...ages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.edge.production.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.node.development.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion ...ages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.node.production.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ...es/next/src/compiled/react-dom-experimental/cjs/react-dom-unstable_testing.development.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Loading
Loading