Skip to content

Commit 84addaa

Browse files
sebmarkbagesebmarkbage
committed
Don't log onRecoverableError if the current commit fail (#28665)
We didn't recover after all. Currently we might log a recoverable error in the recovery pass. E.g. the SSR server had an error. Then the client component fails to render which errors again. This ends up double logging. So if we fail to actually complete a fully successful commit, we ignore any recoverable errors because we'll get real errors logged. It's possible that this might cover up some other error that happened at the same time. DiffTrain build for commit e10a7b5.
1 parent 853d994 commit 84addaa

File tree

10 files changed

+64
-28
lines changed

10 files changed

+64
-28
lines changed

‎compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react-test-renderer/cjs/ReactTestRenderer-dev.js‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<d0aa2e6a0e8da06520b3955d1e4ff347>>
10+
* @generated SignedSource<<398013076b718065eff718ae9cda9bc9>>
1111
*/
1212

1313
"use strict";
@@ -22614,7 +22614,15 @@ if (__DEV__) {
2261422614
break;
2261522615
}
2261622616

22617-
case RootErrored:
22617+
case RootErrored: {
22618+
// This render errored. Ignore any recoverable errors because we weren't actually
22619+
// able to recover. Instead, whatever the final errors were is the ones we log.
22620+
// This ensures that we only log the actual client side error if it's just a plain
22621+
// error thrown from a component on the server and the client.
22622+
workInProgressRootRecoverableErrors = null;
22623+
break;
22624+
}
22625+
2261822626
case RootSuspended:
2261922627
case RootCompleted: {
2262022628
break;
@@ -26232,7 +26240,7 @@ if (__DEV__) {
2623226240
return root;
2623326241
}
2623426242

26235-
var ReactVersion = "19.0.0-canary-7773ba64";
26243+
var ReactVersion = "19.0.0-canary-32f0e114";
2623626244

2623726245
// Might add PROFILE later.
2623826246

‎compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react-test-renderer/cjs/ReactTestRenderer-prod.js‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<fbc62bfe200b9d9ebe7f7d11c5ded593>>
10+
* @generated SignedSource<<0ee47dc3b016f4afd98141a3877b7155>>
1111
*/
1212

1313
"use strict";
@@ -7543,6 +7543,8 @@ function performConcurrentWorkOnRoot(root, didTimeout) {
75437543
}
75447544
break;
75457545
case 2:
7546+
workInProgressRootRecoverableErrors = null;
7547+
break;
75467548
case 3:
75477549
case 5:
75487550
break;
@@ -9183,7 +9185,7 @@ var devToolsConfig$jscomp$inline_1010 = {
91839185
throw Error("TestRenderer does not support findFiberByHostInstance()");
91849186
},
91859187
bundleType: 0,
9186-
version: "19.0.0-canary-91633fbe",
9188+
version: "19.0.0-canary-c99426f3",
91879189
rendererPackageName: "react-test-renderer"
91889190
};
91899191
var internals$jscomp$inline_1198 = {
@@ -9214,7 +9216,7 @@ var internals$jscomp$inline_1198 = {
92149216
scheduleRoot: null,
92159217
setRefreshHandler: null,
92169218
getCurrentFiber: null,
9217-
reconcilerVersion: "19.0.0-canary-91633fbe"
9219+
reconcilerVersion: "19.0.0-canary-c99426f3"
92189220
};
92199221
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
92209222
var hook$jscomp$inline_1199 = __REACT_DEVTOOLS_GLOBAL_HOOK__;

‎compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react-test-renderer/cjs/ReactTestRenderer-profiling.js‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<662d561a421c36554758f8e6e23d952c>>
10+
* @generated SignedSource<<41c82c8e66afe030207944ff087399ac>>
1111
*/
1212

1313
"use strict";
@@ -7885,6 +7885,8 @@ function performConcurrentWorkOnRoot(root, didTimeout) {
78857885
}
78867886
break;
78877887
case 2:
7888+
workInProgressRootRecoverableErrors = null;
7889+
break;
78887890
case 3:
78897891
case 5:
78907892
break;
@@ -9609,7 +9611,7 @@ var devToolsConfig$jscomp$inline_1053 = {
96099611
throw Error("TestRenderer does not support findFiberByHostInstance()");
96109612
},
96119613
bundleType: 0,
9612-
version: "19.0.0-canary-b7977e30",
9614+
version: "19.0.0-canary-58a5689a",
96139615
rendererPackageName: "react-test-renderer"
96149616
};
96159617
var internals$jscomp$inline_1239 = {
@@ -9640,7 +9642,7 @@ var internals$jscomp$inline_1239 = {
96409642
scheduleRoot: null,
96419643
setRefreshHandler: null,
96429644
getCurrentFiber: null,
9643-
reconcilerVersion: "19.0.0-canary-b7977e30"
9645+
reconcilerVersion: "19.0.0-canary-58a5689a"
96449646
};
96459647
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
96469648
var hook$jscomp$inline_1240 = __REACT_DEVTOOLS_GLOBAL_HOOK__;

‎compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/REVISION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
a0537160771bafae90c6fd3154eeead2f2c903e7
1+
e10a7b5cd541882a78ff659147c1a0294413ccb0

‎compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactFabric-dev.fb.js‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<aa8c8ecbed2d92e2e15f4de2c4919cff>>
10+
* @generated SignedSource<<9c81454fac04a284791d0ad56825d16e>>
1111
*/
1212

1313
"use strict";
@@ -26645,7 +26645,15 @@ to return true:wantsResponderID| |
2664526645
break;
2664626646
}
2664726647

26648-
case RootErrored:
26648+
case RootErrored: {
26649+
// This render errored. Ignore any recoverable errors because we weren't actually
26650+
// able to recover. Instead, whatever the final errors were is the ones we log.
26651+
// This ensures that we only log the actual client side error if it's just a plain
26652+
// error thrown from a component on the server and the client.
26653+
workInProgressRootRecoverableErrors = null;
26654+
break;
26655+
}
26656+
2664926657
case RootSuspended:
2665026658
case RootCompleted: {
2665126659
break;
@@ -30563,7 +30571,7 @@ to return true:wantsResponderID| |
3056330571
return root;
3056430572
}
3056530573

30566-
var ReactVersion = "19.0.0-canary-61da7430";
30574+
var ReactVersion = "19.0.0-canary-1f40d31c";
3056730575

3056830576
function createPortal$1(
3056930577
children,

‎compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactFabric-prod.fb.js‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<831b87dba7ff1bcc6c13121b5a09085a>>
10+
* @generated SignedSource<<d1e551744163659d35d40bd04a925d41>>
1111
*/
1212

1313
"use strict";
@@ -9137,6 +9137,8 @@ function performConcurrentWorkOnRoot(root, didTimeout) {
91379137
}
91389138
break;
91399139
case 2:
9140+
workInProgressRootRecoverableErrors = null;
9141+
break;
91409142
case 3:
91419143
case 5:
91429144
break;
@@ -10636,7 +10638,7 @@ var roots = new Map(),
1063610638
devToolsConfig$jscomp$inline_1105 = {
1063710639
findFiberByHostInstance: getInstanceFromNode,
1063810640
bundleType: 0,
10639-
version: "19.0.0-canary-9deee096",
10641+
version: "19.0.0-canary-369e456c",
1064010642
rendererPackageName: "react-native-renderer",
1064110643
rendererConfig: {
1064210644
getInspectorDataForInstance: getInspectorDataForInstance,
@@ -10679,7 +10681,7 @@ var internals$jscomp$inline_1342 = {
1067910681
scheduleRoot: null,
1068010682
setRefreshHandler: null,
1068110683
getCurrentFiber: null,
10682-
reconcilerVersion: "19.0.0-canary-9deee096"
10684+
reconcilerVersion: "19.0.0-canary-369e456c"
1068310685
};
1068410686
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
1068510687
var hook$jscomp$inline_1343 = __REACT_DEVTOOLS_GLOBAL_HOOK__;

‎compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactFabric-profiling.fb.js‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<244937dc229d1c275651498c5cc072e4>>
10+
* @generated SignedSource<<1559aa190bc5f176834018f226327de0>>
1111
*/
1212

1313
"use strict";
@@ -9669,6 +9669,8 @@ function performConcurrentWorkOnRoot(root, didTimeout) {
96699669
}
96709670
break;
96719671
case 2:
9672+
workInProgressRootRecoverableErrors = null;
9673+
break;
96729674
case 3:
96739675
case 5:
96749676
break;
@@ -11343,7 +11345,7 @@ var roots = new Map(),
1134311345
devToolsConfig$jscomp$inline_1187 = {
1134411346
findFiberByHostInstance: getInstanceFromNode,
1134511347
bundleType: 0,
11346-
version: "19.0.0-canary-02645df6",
11348+
version: "19.0.0-canary-042f4f16",
1134711349
rendererPackageName: "react-native-renderer",
1134811350
rendererConfig: {
1134911351
getInspectorDataForInstance: getInspectorDataForInstance,
@@ -11399,7 +11401,7 @@ var roots = new Map(),
1139911401
scheduleRoot: null,
1140011402
setRefreshHandler: null,
1140111403
getCurrentFiber: null,
11402-
reconcilerVersion: "19.0.0-canary-02645df6"
11404+
reconcilerVersion: "19.0.0-canary-042f4f16"
1140311405
});
1140411406
exports.createPortal = function (children, containerTag) {
1140511407
return createPortal$1(

‎compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactNativeRenderer-dev.fb.js‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<2404257a9486a252ec409c8c85f8f4d3>>
10+
* @generated SignedSource<<c68a27d19a317e5a7b99950cb7e7c671>>
1111
*/
1212

1313
"use strict";
@@ -27085,7 +27085,15 @@ to return true:wantsResponderID| |
2708527085
break;
2708627086
}
2708727087

27088-
case RootErrored:
27088+
case RootErrored: {
27089+
// This render errored. Ignore any recoverable errors because we weren't actually
27090+
// able to recover. Instead, whatever the final errors were is the ones we log.
27091+
// This ensures that we only log the actual client side error if it's just a plain
27092+
// error thrown from a component on the server and the client.
27093+
workInProgressRootRecoverableErrors = null;
27094+
break;
27095+
}
27096+
2708927097
case RootSuspended:
2709027098
case RootCompleted: {
2709127099
break;
@@ -31003,7 +31011,7 @@ to return true:wantsResponderID| |
3100331011
return root;
3100431012
}
3100531013

31006-
var ReactVersion = "19.0.0-canary-ddc2e0d8";
31014+
var ReactVersion = "19.0.0-canary-91643e90";
3100731015

3100831016
function createPortal$1(
3100931017
children,

‎compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactNativeRenderer-prod.fb.js‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<0c190283ee39757ac0fe599741488227>>
10+
* @generated SignedSource<<96c8efbd3025d48af64a0646f425c765>>
1111
*/
1212

1313
"use strict";
@@ -9346,6 +9346,8 @@ function performConcurrentWorkOnRoot(root, didTimeout) {
93469346
}
93479347
break;
93489348
case 2:
9349+
workInProgressRootRecoverableErrors = null;
9350+
break;
93499351
case 3:
93509352
case 5:
93519353
break;
@@ -10852,7 +10854,7 @@ var roots = new Map(),
1085210854
devToolsConfig$jscomp$inline_1172 = {
1085310855
findFiberByHostInstance: getInstanceFromTag,
1085410856
bundleType: 0,
10855-
version: "19.0.0-canary-48885add",
10857+
version: "19.0.0-canary-f4c7a68d",
1085610858
rendererPackageName: "react-native-renderer",
1085710859
rendererConfig: {
1085810860
getInspectorDataForInstance: getInspectorDataForInstance,
@@ -10895,7 +10897,7 @@ var internals$jscomp$inline_1423 = {
1089510897
scheduleRoot: null,
1089610898
setRefreshHandler: null,
1089710899
getCurrentFiber: null,
10898-
reconcilerVersion: "19.0.0-canary-48885add"
10900+
reconcilerVersion: "19.0.0-canary-f4c7a68d"
1089910901
};
1090010902
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
1090110903
var hook$jscomp$inline_1424 = __REACT_DEVTOOLS_GLOBAL_HOOK__;

‎compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactNativeRenderer-profiling.fb.js‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<3e69b54c3deb3830ded1e06cc2837e8d>>
10+
* @generated SignedSource<<747a3fcb345e723e898836c3648fe48a>>
1111
*/
1212

1313
"use strict";
@@ -9879,6 +9879,8 @@ function performConcurrentWorkOnRoot(root, didTimeout) {
98799879
}
98809880
break;
98819881
case 2:
9882+
workInProgressRootRecoverableErrors = null;
9883+
break;
98829884
case 3:
98839885
case 5:
98849886
break;
@@ -11560,7 +11562,7 @@ var roots = new Map(),
1156011562
devToolsConfig$jscomp$inline_1254 = {
1156111563
findFiberByHostInstance: getInstanceFromTag,
1156211564
bundleType: 0,
11563-
version: "19.0.0-canary-97d95438",
11565+
version: "19.0.0-canary-7a0cbc16",
1156411566
rendererPackageName: "react-native-renderer",
1156511567
rendererConfig: {
1156611568
getInspectorDataForInstance: getInspectorDataForInstance,
@@ -11616,7 +11618,7 @@ var roots = new Map(),
1161611618
scheduleRoot: null,
1161711619
setRefreshHandler: null,
1161811620
getCurrentFiber: null,
11619-
reconcilerVersion: "19.0.0-canary-97d95438"
11621+
reconcilerVersion: "19.0.0-canary-7a0cbc16"
1162011622
});
1162111623
exports.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED = {
1162211624
computeComponentStackForErrorReporting: function (reactTag) {

0 commit comments

Comments
 (0)