Skip to content

Commit

Permalink
Update React from a9985529f to 8c8ee9ee6 (#57483)
Browse files Browse the repository at this point in the history
React upstream changes:

- facebook/react#27594
- facebook/react#27584

Co-authored-by: Jiachi Liu <[email protected]>
  • Loading branch information
acdlite and huozhi authored Oct 26, 2023
1 parent 07483d4 commit 00df11b
Show file tree
Hide file tree
Showing 48 changed files with 144 additions and 144 deletions.
20 changes: 10 additions & 10 deletions package.json
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]a9985529f-20231025",
"react-builtin": "npm:[email protected]8c8ee9ee6-20231026",
"react-dom": "18.2.0",
"react-dom-17": "npm:[email protected]",
"react-dom-builtin": "npm:[email protected]a9985529f-20231025",
"react-dom-experimental-builtin": "npm:[email protected]a9985529f-20231025",
"react-experimental-builtin": "npm:[email protected]a9985529f-20231025",
"react-server-dom-turbopack": "18.3.0-canary-a9985529f-20231025",
"react-server-dom-turbopack-experimental": "npm:[email protected]a9985529f-20231025",
"react-server-dom-webpack": "18.3.0-canary-a9985529f-20231025",
"react-server-dom-webpack-experimental": "npm:[email protected]a9985529f-20231025",
"react-dom-builtin": "npm:[email protected]8c8ee9ee6-20231026",
"react-dom-experimental-builtin": "npm:[email protected]8c8ee9ee6-20231026",
"react-experimental-builtin": "npm:[email protected]8c8ee9ee6-20231026",
"react-server-dom-turbopack": "18.3.0-canary-8c8ee9ee6-20231026",
"react-server-dom-turbopack-experimental": "npm:[email protected]8c8ee9ee6-20231026",
"react-server-dom-webpack": "18.3.0-canary-8c8ee9ee6-20231026",
"react-server-dom-webpack-experimental": "npm:[email protected]8c8ee9ee6-20231026",
"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]a9985529f-20231025",
"scheduler-experimental-builtin": "npm:[email protected]a9985529f-20231025",
"scheduler-builtin": "npm:[email protected]8c8ee9ee6-20231026",
"scheduler-experimental-builtin": "npm:[email protected]8c8ee9ee6-20231026",
"seedrandom": "3.0.5",
"selenium-webdriver": "4.0.0-beta.4",
"semver": "7.3.7",
Expand Down
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-a9985529f-20231025';
var ReactVersion = '18.3.0-experimental-8c8ee9ee6-20231026';

var ReactSharedInternals = React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED;

Expand Down Expand Up @@ -10803,7 +10803,7 @@ function retryReplayTask(request, task) {
// component suspends again, the thenable state will be restored.
var prevThenableState = task.thenableState;
task.thenableState = null;
renderNodeDestructive(request, task, prevThenableState, task.node, -1);
renderNodeDestructive(request, task, prevThenableState, task.node, task.childIndex);

if (task.replay.pendingTasks === 1 && task.replay.nodes.length > 0) {
throw new Error("Couldn't find all resumable slots by key/index during replaying. " + "The tree doesn't match so React will fallback to client rendering.");
Expand Down

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

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-a9985529f-20231025';
var ReactVersion = '18.3.0-experimental-8c8ee9ee6-20231026';

var ReactSharedInternals = React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED;

Expand Down Expand Up @@ -10804,7 +10804,7 @@ function retryReplayTask(request, task) {
// component suspends again, the thenable state will be restored.
var prevThenableState = task.thenableState;
task.thenableState = null;
renderNodeDestructive(request, task, prevThenableState, task.node, -1);
renderNodeDestructive(request, task, prevThenableState, task.node, task.childIndex);

if (task.replay.pendingTasks === 1 && task.replay.nodes.length > 0) {
throw new Error("Couldn't find all resumable slots by key/index during replaying. " + "The tree doesn't match so React will fallback to client rendering.");
Expand Down

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

Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ function printWarning(level, format, args) {
}
}

var ReactVersion = '18.3.0-experimental-a9985529f-20231025';
var ReactVersion = '18.3.0-experimental-8c8ee9ee6-20231026';

var Internals = {
usingClientEntryPoint: false,
Expand Down

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

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-a9985529f-20231025';
var ReactVersion = '18.3.0-experimental-8c8ee9ee6-20231026';

var ReactSharedInternals = React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED;

Expand Down Expand Up @@ -10891,7 +10891,7 @@ function retryReplayTask(request, task) {
// component suspends again, the thenable state will be restored.
var prevThenableState = task.thenableState;
task.thenableState = null;
renderNodeDestructive(request, task, prevThenableState, task.node, -1);
renderNodeDestructive(request, task, prevThenableState, task.node, task.childIndex);

if (task.replay.pendingTasks === 1 && task.replay.nodes.length > 0) {
throw new Error("Couldn't find all resumable slots by key/index during replaying. " + "The tree doesn't match so React will fallback to client rendering.");
Expand Down
Loading

0 comments on commit 00df11b

Please sign in to comment.