Skip to content

Commit 6f7d04e

Browse files
committed
Update React from bf3a29d097 to 1df34bdf62
1 parent ad396b0 commit 6f7d04e

File tree

101 files changed

+1267
-834
lines changed

Some content is hidden

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

101 files changed

+1267
-834
lines changed

package.json

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -197,18 +197,18 @@
197197
"pretty-bytes": "5.3.0",
198198
"pretty-ms": "7.0.0",
199199
"random-seed": "0.3.0",
200-
"react": "19.0.0-rc-bf3a29d097-20240603",
200+
"react": "19.0.0-rc-1df34bdf62-20240605",
201201
"react-17": "npm:react@17.0.2",
202-
"react-builtin": "npm:react@19.0.0-rc-bf3a29d097-20240603",
203-
"react-dom": "19.0.0-rc-bf3a29d097-20240603",
202+
"react-builtin": "npm:react@19.0.0-rc-1df34bdf62-20240605",
203+
"react-dom": "19.0.0-rc-1df34bdf62-20240605",
204204
"react-dom-17": "npm:react-dom@17.0.2",
205-
"react-dom-builtin": "npm:react-dom@19.0.0-rc-bf3a29d097-20240603",
206-
"react-dom-experimental-builtin": "npm:react-dom@0.0.0-experimental-bf3a29d097-20240603",
207-
"react-experimental-builtin": "npm:react@0.0.0-experimental-bf3a29d097-20240603",
208-
"react-server-dom-turbopack": "19.0.0-rc-bf3a29d097-20240603",
209-
"react-server-dom-turbopack-experimental": "npm:react-server-dom-turbopack@0.0.0-experimental-bf3a29d097-20240603",
210-
"react-server-dom-webpack": "19.0.0-rc-bf3a29d097-20240603",
211-
"react-server-dom-webpack-experimental": "npm:react-server-dom-webpack@0.0.0-experimental-bf3a29d097-20240603",
205+
"react-dom-builtin": "npm:react-dom@19.0.0-rc-1df34bdf62-20240605",
206+
"react-dom-experimental-builtin": "npm:react-dom@0.0.0-experimental-1df34bdf62-20240605",
207+
"react-experimental-builtin": "npm:react@0.0.0-experimental-1df34bdf62-20240605",
208+
"react-server-dom-turbopack": "19.0.0-rc-1df34bdf62-20240605",
209+
"react-server-dom-turbopack-experimental": "npm:react-server-dom-turbopack@0.0.0-experimental-1df34bdf62-20240605",
210+
"react-server-dom-webpack": "19.0.0-rc-1df34bdf62-20240605",
211+
"react-server-dom-webpack-experimental": "npm:react-server-dom-webpack@0.0.0-experimental-1df34bdf62-20240605",
212212
"react-ssr-prepass": "1.0.8",
213213
"react-virtualized": "9.22.3",
214214
"relay-compiler": "13.0.2",
@@ -218,8 +218,8 @@
218218
"resolve-from": "5.0.0",
219219
"sass": "1.54.0",
220220
"satori": "0.10.9",
221-
"scheduler-builtin": "npm:scheduler@0.25.0-rc-bf3a29d097-20240603",
222-
"scheduler-experimental-builtin": "npm:scheduler@0.0.0-experimental-bf3a29d097-20240603",
221+
"scheduler-builtin": "npm:scheduler@0.25.0-rc-1df34bdf62-20240605",
222+
"scheduler-experimental-builtin": "npm:scheduler@0.0.0-experimental-1df34bdf62-20240605",
223223
"seedrandom": "3.0.5",
224224
"semver": "7.3.7",
225225
"shell-quote": "1.7.3",
@@ -253,10 +253,10 @@
253253
"@babel/traverse": "7.22.5",
254254
"@types/react": "npm:types-react@19.0.0-rc.0",
255255
"@types/react-dom": "npm:types-react-dom@19.0.0-rc.0",
256-
"react": "19.0.0-rc-bf3a29d097-20240603",
257-
"react-dom": "19.0.0-rc-bf3a29d097-20240603",
258-
"react-is": "19.0.0-rc-bf3a29d097-20240603",
259-
"scheduler": "0.25.0-rc-bf3a29d097-20240603"
256+
"react": "19.0.0-rc-1df34bdf62-20240605",
257+
"react-dom": "19.0.0-rc-1df34bdf62-20240605",
258+
"react-is": "19.0.0-rc-1df34bdf62-20240605",
259+
"scheduler": "0.25.0-rc-1df34bdf62-20240605"
260260
},
261261
"engines": {
262262
"node": ">=18.17.0",

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

Lines changed: 45 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ function warn(format) {
114114
args[_key - 1] = arguments[_key];
115115
}
116116

117-
printWarning('warn', format, args);
117+
printWarning('warn', format, args, new Error('react-stack-top-frame'));
118118
}
119119
}
120120
}
@@ -125,14 +125,14 @@ function error(format) {
125125
args[_key2 - 1] = arguments[_key2];
126126
}
127127

128-
printWarning('error', format, args);
128+
printWarning('error', format, args, new Error('react-stack-top-frame'));
129129
}
130130
}
131131
} // eslint-disable-next-line react-internal/no-production-logging
132132

133133
var supportsCreateTask = !!console.createTask;
134134

135-
function printWarning(level, format, args) {
135+
function printWarning(level, format, args, currentStack) {
136136
// When changing this logic, you might want to also
137137
// update consoleWithStackDev.www.js as well.
138138
{
@@ -142,7 +142,7 @@ function printWarning(level, format, args) {
142142
// We only add the current stack to the console when createTask is not supported.
143143
// Since createTask requires DevTools to be open to work, this means that stacks
144144
// can be lost while DevTools isn't open but we can't detect this.
145-
var stack = ReactSharedInternals.getCurrentStack();
145+
var stack = ReactSharedInternals.getCurrentStack(currentStack);
146146

147147
if (stack !== '') {
148148
format += '%s';
@@ -1010,18 +1010,28 @@ function describeFunctionComponentFrame(fn) {
10101010
/** @noinline */
10111011

10121012
function callComponentInDEV(Component, props, secondArg) {
1013+
var wasRendering = isRendering;
10131014
setIsRendering(true);
1014-
var result = Component(props, secondArg);
1015-
setIsRendering(false);
1016-
return result;
1015+
1016+
try {
1017+
var result = Component(props, secondArg);
1018+
return result;
1019+
} finally {
1020+
setIsRendering(wasRendering);
1021+
}
10171022
}
10181023
/** @noinline */
10191024

10201025
function callRenderInDEV(instance) {
1026+
var wasRendering = isRendering;
10211027
setIsRendering(true);
1022-
var result = instance.render();
1023-
setIsRendering(false);
1024-
return result;
1028+
1029+
try {
1030+
var result = instance.render();
1031+
return result;
1032+
} finally {
1033+
setIsRendering(wasRendering);
1034+
}
10251035
}
10261036
/** @noinline */
10271037

@@ -1132,6 +1142,11 @@ function filterDebugStack(error) {
11321142
if (lastFrameIdx !== -1) {
11331143
// Cut off everything after our "callComponent" slot since it'll be Fiber internals.
11341144
frames.length = lastFrameIdx;
1145+
} else {
1146+
// We didn't find any internal callsite out to user space.
1147+
// This means that this was called outside an owner or the owner is fully internal.
1148+
// To keep things light we exclude the entire trace in this case.
1149+
return '';
11351150
}
11361151

11371152
return frames.filter(isNotExternal).join('\n');
@@ -1212,11 +1227,23 @@ function describeFunctionComponentFrameWithoutLineNumber(fn) {
12121227
return name ? describeBuiltInComponentFrame(name) : '';
12131228
}
12141229

1215-
function getOwnerStackByFiberInDev(workInProgress) {
1230+
function getOwnerStackByFiberInDev(workInProgress, topStack) {
12161231

12171232
try {
12181233
var info = '';
12191234

1235+
if (topStack) {
1236+
// Prefix with a filtered version of the currently executing
1237+
// stack. This information will be available in the native
1238+
// stack regardless but it's hidden since we're reprinting
1239+
// the stack on top of it.
1240+
var formattedTopStack = formatOwnerStack(topStack);
1241+
1242+
if (formattedTopStack !== '') {
1243+
info += '\n' + formattedTopStack;
1244+
}
1245+
}
1246+
12201247
if (workInProgress.tag === HostText) {
12211248
// Text nodes never have an owner/stack because they're not created through JSX.
12221249
// We use the parent since text nodes are always created through a host parent.
@@ -1248,14 +1275,16 @@ function getOwnerStackByFiberInDev(workInProgress) {
12481275
case FunctionComponent:
12491276
case SimpleMemoComponent:
12501277
case ClassComponent:
1251-
if (!workInProgress._debugOwner) {
1278+
if (!workInProgress._debugOwner && info === '') {
1279+
// Only if we have no other data about the callsite do we add
1280+
// the component name as the single stack frame.
12521281
info += describeFunctionComponentFrameWithoutLineNumber(workInProgress.type);
12531282
}
12541283

12551284
break;
12561285

12571286
case ForwardRef:
1258-
if (!workInProgress._debugOwner) {
1287+
if (!workInProgress._debugOwner && info === '') {
12591288
info += describeFunctionComponentFrameWithoutLineNumber(workInProgress.type.render);
12601289
}
12611290

@@ -1337,7 +1366,7 @@ function getCurrentParentStackInDev() {
13371366
}
13381367
}
13391368

1340-
function getCurrentFiberStackInDev() {
1369+
function getCurrentFiberStackInDev(stack) {
13411370
{
13421371
if (current === null) {
13431372
return '';
@@ -1348,7 +1377,7 @@ function getCurrentFiberStackInDev() {
13481377

13491378

13501379
{
1351-
return getOwnerStackByFiberInDev(current);
1380+
return getOwnerStackByFiberInDev(current, stack);
13521381
}
13531382
}
13541383
}
@@ -36859,7 +36888,7 @@ identifierPrefix, onUncaughtError, onCaughtError, onRecoverableError, transition
3685936888
return root;
3686036889
}
3686136890

36862-
var ReactVersion = '19.0.0-experimental-bf3a29d097-20240603';
36891+
var ReactVersion = '19.0.0-experimental-1df34bdf62-20240605';
3686336892

3686436893
// Might add PROFILE later.
3686536894

packages/next/src/compiled/react-dom-experimental/cjs/react-dom-client.production.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14782,14 +14782,14 @@ ReactDOMHydrationRoot.prototype.unstable_scheduleHydration = function (target) {
1478214782
};
1478314783
var isomorphicReactPackageVersion$jscomp$inline_1631 = React.version;
1478414784
if (
14785-
"19.0.0-experimental-bf3a29d097-20240603" !==
14785+
"19.0.0-experimental-1df34bdf62-20240605" !==
1478614786
isomorphicReactPackageVersion$jscomp$inline_1631
1478714787
)
1478814788
throw Error(
1478914789
formatProdErrorMessage(
1479014790
527,
1479114791
isomorphicReactPackageVersion$jscomp$inline_1631,
14792-
"19.0.0-experimental-bf3a29d097-20240603"
14792+
"19.0.0-experimental-1df34bdf62-20240605"
1479314793
)
1479414794
);
1479514795
ReactDOMSharedInternals.findDOMNode = function (componentOrElement) {
@@ -14808,7 +14808,7 @@ ReactDOMSharedInternals.findDOMNode = function (componentOrElement) {
1480814808
var devToolsConfig$jscomp$inline_1638 = {
1480914809
findFiberByHostInstance: getClosestInstanceFromNode,
1481014810
bundleType: 0,
14811-
version: "19.0.0-experimental-bf3a29d097-20240603",
14811+
version: "19.0.0-experimental-1df34bdf62-20240605",
1481214812
rendererPackageName: "react-dom"
1481314813
};
1481414814
var internals$jscomp$inline_2016 = {
@@ -14838,7 +14838,7 @@ var internals$jscomp$inline_2016 = {
1483814838
scheduleRoot: null,
1483914839
setRefreshHandler: null,
1484014840
getCurrentFiber: null,
14841-
reconcilerVersion: "19.0.0-experimental-bf3a29d097-20240603"
14841+
reconcilerVersion: "19.0.0-experimental-1df34bdf62-20240605"
1484214842
};
1484314843
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
1484414844
var hook$jscomp$inline_2017 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
@@ -14944,4 +14944,4 @@ exports.hydrateRoot = function (container, initialChildren, options) {
1494414944
listenToAllSupportedEvents(container);
1494514945
return new ReactDOMHydrationRoot(initialChildren);
1494614946
};
14947-
exports.version = "19.0.0-experimental-bf3a29d097-20240603";
14947+
exports.version = "19.0.0-experimental-1df34bdf62-20240605";

0 commit comments

Comments
 (0)