Skip to content

Commit 00df11b

Browse files
acdlitehuozhi
andauthored
Update React from a9985529f to 8c8ee9ee6 (#57483)
React upstream changes: - facebook/react#27594 - facebook/react#27584 Co-authored-by: Jiachi Liu <4800338+huozhi@users.noreply.github.com>
1 parent 07483d4 commit 00df11b

File tree

48 files changed

+144
-144
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+144
-144
lines changed

package.json

+10-10
Original file line numberDiff line numberDiff line change
@@ -193,16 +193,16 @@
193193
"random-seed": "0.3.0",
194194
"react": "18.2.0",
195195
"react-17": "npm:react@17.0.2",
196-
"react-builtin": "npm:react@18.3.0-canary-a9985529f-20231025",
196+
"react-builtin": "npm:react@18.3.0-canary-8c8ee9ee6-20231026",
197197
"react-dom": "18.2.0",
198198
"react-dom-17": "npm:react-dom@17.0.2",
199-
"react-dom-builtin": "npm:react-dom@18.3.0-canary-a9985529f-20231025",
200-
"react-dom-experimental-builtin": "npm:react-dom@0.0.0-experimental-a9985529f-20231025",
201-
"react-experimental-builtin": "npm:react@0.0.0-experimental-a9985529f-20231025",
202-
"react-server-dom-turbopack": "18.3.0-canary-a9985529f-20231025",
203-
"react-server-dom-turbopack-experimental": "npm:react-server-dom-turbopack@0.0.0-experimental-a9985529f-20231025",
204-
"react-server-dom-webpack": "18.3.0-canary-a9985529f-20231025",
205-
"react-server-dom-webpack-experimental": "npm:react-server-dom-webpack@0.0.0-experimental-a9985529f-20231025",
199+
"react-dom-builtin": "npm:react-dom@18.3.0-canary-8c8ee9ee6-20231026",
200+
"react-dom-experimental-builtin": "npm:react-dom@0.0.0-experimental-8c8ee9ee6-20231026",
201+
"react-experimental-builtin": "npm:react@0.0.0-experimental-8c8ee9ee6-20231026",
202+
"react-server-dom-turbopack": "18.3.0-canary-8c8ee9ee6-20231026",
203+
"react-server-dom-turbopack-experimental": "npm:react-server-dom-turbopack@0.0.0-experimental-8c8ee9ee6-20231026",
204+
"react-server-dom-webpack": "18.3.0-canary-8c8ee9ee6-20231026",
205+
"react-server-dom-webpack-experimental": "npm:react-server-dom-webpack@0.0.0-experimental-8c8ee9ee6-20231026",
206206
"react-ssr-prepass": "1.0.8",
207207
"react-virtualized": "9.22.3",
208208
"relay-compiler": "13.0.2",
@@ -212,8 +212,8 @@
212212
"resolve-from": "5.0.0",
213213
"sass": "1.54.0",
214214
"satori": "0.10.6",
215-
"scheduler-builtin": "npm:scheduler@0.24.0-canary-a9985529f-20231025",
216-
"scheduler-experimental-builtin": "npm:scheduler@0.0.0-experimental-a9985529f-20231025",
215+
"scheduler-builtin": "npm:scheduler@0.24.0-canary-8c8ee9ee6-20231026",
216+
"scheduler-experimental-builtin": "npm:scheduler@0.0.0-experimental-8c8ee9ee6-20231026",
217217
"seedrandom": "3.0.5",
218218
"selenium-webdriver": "4.0.0-beta.4",
219219
"semver": "7.3.7",

packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server-legacy.browser.development.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ if (process.env.NODE_ENV !== "production") {
1717
var React = require("next/dist/compiled/react-experimental");
1818
var ReactDOM = require('react-dom');
1919

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

2222
var ReactSharedInternals = React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED;
2323

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

1080810808
if (task.replay.pendingTasks === 1 && task.replay.nodes.length > 0) {
1080910809
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.");

packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server-legacy.browser.production.min.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server-legacy.node.development.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ var React = require("next/dist/compiled/react-experimental");
1818
var ReactDOM = require('react-dom');
1919
var stream = require('stream');
2020

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

2323
var ReactSharedInternals = React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED;
2424

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

1080910809
if (task.replay.pendingTasks === 1 && task.replay.nodes.length > 0) {
1081010810
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.");

packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server-legacy.node.production.min.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server-rendering-stub.development.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ function printWarning(level, format, args) {
5555
}
5656
}
5757

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

6060
var Internals = {
6161
usingClientEntryPoint: false,

packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server-rendering-stub.production.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.browser.development.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ if (process.env.NODE_ENV !== "production") {
1717
var React = require("next/dist/compiled/react-experimental");
1818
var ReactDOM = require('react-dom');
1919

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

2222
var ReactSharedInternals = React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED;
2323

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

1089610896
if (task.replay.pendingTasks === 1 && task.replay.nodes.length > 0) {
1089710897
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.");

0 commit comments

Comments
 (0)