Skip to content

Commit 9dd5eea

Browse files
sebmarkbagesebmarkbage
committed
Finish cleaning up digest from onRecoverableError (#28686)
Don't need to track it separately on the captured value anymore. Shouldn't be in the types. I used a getter for the warning instead because Proxies are kind of heavy weight options for this kind of warning. We typically use getters. DiffTrain build for commit df95577.
1 parent acb6876 commit 9dd5eea

File tree

10 files changed

+270
-348
lines changed

10 files changed

+270
-348
lines changed

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

Lines changed: 24 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<4c8833d67d5c40def402e9b24fc93313>>
10+
* @generated SignedSource<<450ce571f0c96cb1643d074e993d3573>>
1111
*/
1212

1313
"use strict";
@@ -13195,20 +13195,18 @@ if (__DEV__) {
1319513195
return {
1319613196
value: value,
1319713197
source: source,
13198-
stack: stack,
13199-
digest: null
13198+
stack: stack
1320013199
};
1320113200
}
13202-
function createCapturedValueFromError(value, digest, stack) {
13201+
function createCapturedValueFromError(value, stack) {
1320313202
if (typeof stack === "string") {
1320413203
CapturedStacks.set(value, stack);
1320513204
}
1320613205

1320713206
return {
1320813207
value: value,
1320913208
source: null,
13210-
stack: stack != null ? stack : null,
13211-
digest: digest != null ? digest : null
13209+
stack: stack
1321213210
};
1321313211
}
1321413212

@@ -15825,7 +15823,9 @@ if (__DEV__) {
1582515823
// get an update and we'll never be able to hydrate the final content. Let's just try the
1582615824
// client side render instead.
1582715825
var digest;
15828-
var message, stack, componentStack;
15826+
var message;
15827+
var stack = null;
15828+
var componentStack = null;
1582915829

1583015830
{
1583115831
var _getSuspenseInstanceF =
@@ -15857,8 +15857,7 @@ if (__DEV__) {
1585715857
error.digest = digest;
1585815858
capturedValue = createCapturedValueFromError(
1585915859
error,
15860-
digest,
15861-
componentStack
15860+
componentStack === undefined ? null : componentStack
1586215861
);
1586315862
}
1586415863

@@ -15973,7 +15972,8 @@ if (__DEV__) {
1597315972
new Error(
1597415973
"There was an error while hydrating this Suspense boundary. " +
1597515974
"Switched to client rendering."
15976-
)
15975+
),
15976+
null
1597715977
);
1597815978

1597915979
return retrySuspenseComponentWithoutHydrating(
@@ -24886,35 +24886,23 @@ if (__DEV__) {
2488624886
}
2488724887

2488824888
function makeErrorInfo(componentStack) {
24889-
{
24890-
var errorInfo = {
24891-
componentStack: componentStack
24892-
};
24893-
return new Proxy(errorInfo, {
24894-
get: function (target, prop, receiver) {
24895-
if (prop === "digest") {
24896-
error(
24897-
'You are accessing "digest" from the errorInfo object passed to onRecoverableError.' +
24898-
" This property is no longer provided as part of errorInfo but can be accessed as a property" +
24899-
" of the Error instance itself."
24900-
);
24901-
}
24902-
24903-
return Reflect.get(target, prop, receiver);
24904-
},
24905-
has: function (target, prop) {
24906-
if (prop === "digest") {
24907-
error(
24908-
'You are accessing "digest" from the errorInfo object passed to onRecoverableError.' +
24909-
" This property is no longer provided as part of errorInfo but can be accessed as a property" +
24910-
" of the Error instance itself."
24911-
);
24912-
}
24889+
var errorInfo = {
24890+
componentStack: componentStack
24891+
};
2491324892

24914-
return Reflect.has(target, prop);
24893+
{
24894+
Object.defineProperty(errorInfo, "digest", {
24895+
get: function () {
24896+
error(
24897+
'You are accessing "digest" from the errorInfo object passed to onRecoverableError.' +
24898+
" This property is no longer provided as part of errorInfo but can be accessed as a property" +
24899+
" of the Error instance itself."
24900+
);
2491524901
}
2491624902
});
2491724903
}
24904+
24905+
return errorInfo;
2491824906
}
2491924907

2492024908
function releaseRootPooledCache(root, remainingLanes) {
@@ -26838,7 +26826,7 @@ if (__DEV__) {
2683826826
return root;
2683926827
}
2684026828

26841-
var ReactVersion = "19.0.0-canary-90c44db1";
26829+
var ReactVersion = "19.0.0-canary-a7826ac0";
2684226830

2684326831
// Might add PROFILE later.
2684426832

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

Lines changed: 25 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<7ea0ba771a3dafe13783264b14f1cffd>>
10+
* @generated SignedSource<<b862b395b4f51e602cf4cf820214c31d>>
1111
*/
1212

1313
"use strict";
@@ -3536,16 +3536,11 @@ function createCapturedValueAtFiber(value, source) {
35363536
((stack = getStackByFiberInDevAndProd(source)),
35373537
CapturedStacks.set(value, stack));
35383538
} else stack = getStackByFiberInDevAndProd(source);
3539-
return { value: value, source: source, stack: stack, digest: null };
3539+
return { value: value, source: source, stack: stack };
35403540
}
3541-
function createCapturedValueFromError(value, digest, stack) {
3541+
function createCapturedValueFromError(value, stack) {
35423542
"string" === typeof stack && CapturedStacks.set(value, stack);
3543-
return {
3544-
value: value,
3545-
source: null,
3546-
stack: null != stack ? stack : null,
3547-
digest: null != digest ? digest : null
3548-
};
3543+
return { value: value, source: null, stack: stack };
35493544
}
35503545
var reportGlobalError =
35513546
"function" === typeof reportError
@@ -4408,7 +4403,8 @@ function updateSuspenseComponent(current, workInProgress, renderLanes) {
44084403
(JSCompiler_temp = createCapturedValueFromError(
44094404
Error(
44104405
"There was an error while hydrating this Suspense boundary. Switched to client rendering."
4411-
)
4406+
),
4407+
null
44124408
)),
44134409
(workInProgress = retrySuspenseComponentWithoutHydrating(
44144410
current,
@@ -4464,11 +4460,7 @@ function updateSuspenseComponent(current, workInProgress, renderLanes) {
44644460
)),
44654461
(nextProps.stack = ""),
44664462
(nextProps.digest = JSCompiler_temp),
4467-
(JSCompiler_temp = createCapturedValueFromError(
4468-
nextProps,
4469-
JSCompiler_temp,
4470-
void 0
4471-
)),
4463+
(JSCompiler_temp = createCapturedValueFromError(nextProps, null)),
44724464
(workInProgress = retrySuspenseComponentWithoutHydrating(
44734465
current,
44744466
workInProgress,
@@ -8320,8 +8312,9 @@ function commitRootImpl(
83208312
finishedWork++
83218313
)
83228314
(remainingLanes = recoverableErrors[finishedWork]),
8323-
(transitions = { componentStack: remainingLanes.stack }),
8324-
renderPriorityLevel(remainingLanes.value, transitions);
8315+
renderPriorityLevel(remainingLanes.value, {
8316+
componentStack: remainingLanes.stack
8317+
});
83258318
0 !== (pendingPassiveEffectsLanes & 3) &&
83268319
0 !== root.tag &&
83278320
flushPassiveEffects();
@@ -9215,19 +9208,19 @@ function wrapFiber(fiber) {
92159208
fiberToWrapper.set(fiber, wrapper));
92169209
return wrapper;
92179210
}
9218-
var devToolsConfig$jscomp$inline_1002 = {
9211+
var devToolsConfig$jscomp$inline_999 = {
92199212
findFiberByHostInstance: function () {
92209213
throw Error("TestRenderer does not support findFiberByHostInstance()");
92219214
},
92229215
bundleType: 0,
9223-
version: "19.0.0-canary-0ee8586e",
9216+
version: "19.0.0-canary-120686d7",
92249217
rendererPackageName: "react-test-renderer"
92259218
};
9226-
var internals$jscomp$inline_1190 = {
9227-
bundleType: devToolsConfig$jscomp$inline_1002.bundleType,
9228-
version: devToolsConfig$jscomp$inline_1002.version,
9229-
rendererPackageName: devToolsConfig$jscomp$inline_1002.rendererPackageName,
9230-
rendererConfig: devToolsConfig$jscomp$inline_1002.rendererConfig,
9219+
var internals$jscomp$inline_1187 = {
9220+
bundleType: devToolsConfig$jscomp$inline_999.bundleType,
9221+
version: devToolsConfig$jscomp$inline_999.version,
9222+
rendererPackageName: devToolsConfig$jscomp$inline_999.rendererPackageName,
9223+
rendererConfig: devToolsConfig$jscomp$inline_999.rendererConfig,
92319224
overrideHookState: null,
92329225
overrideHookStateDeletePath: null,
92339226
overrideHookStateRenamePath: null,
@@ -9244,26 +9237,26 @@ var internals$jscomp$inline_1190 = {
92449237
return null === fiber ? null : fiber.stateNode;
92459238
},
92469239
findFiberByHostInstance:
9247-
devToolsConfig$jscomp$inline_1002.findFiberByHostInstance ||
9240+
devToolsConfig$jscomp$inline_999.findFiberByHostInstance ||
92489241
emptyFindFiberByHostInstance,
92499242
findHostInstancesForRefresh: null,
92509243
scheduleRefresh: null,
92519244
scheduleRoot: null,
92529245
setRefreshHandler: null,
92539246
getCurrentFiber: null,
9254-
reconcilerVersion: "19.0.0-canary-0ee8586e"
9247+
reconcilerVersion: "19.0.0-canary-120686d7"
92559248
};
92569249
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
9257-
var hook$jscomp$inline_1191 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
9250+
var hook$jscomp$inline_1188 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
92589251
if (
9259-
!hook$jscomp$inline_1191.isDisabled &&
9260-
hook$jscomp$inline_1191.supportsFiber
9252+
!hook$jscomp$inline_1188.isDisabled &&
9253+
hook$jscomp$inline_1188.supportsFiber
92619254
)
92629255
try {
9263-
(rendererID = hook$jscomp$inline_1191.inject(
9264-
internals$jscomp$inline_1190
9256+
(rendererID = hook$jscomp$inline_1188.inject(
9257+
internals$jscomp$inline_1187
92659258
)),
9266-
(injectedHook = hook$jscomp$inline_1191);
9259+
(injectedHook = hook$jscomp$inline_1188);
92679260
} catch (err) {}
92689261
}
92699262
exports._Scheduler = Scheduler;

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

Lines changed: 18 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<0102d8d01b7c7efdce15387c6fa804bc>>
10+
* @generated SignedSource<<1e162bfd81c2744b7c22ac7c96c87f91>>
1111
*/
1212

1313
"use strict";
@@ -3694,16 +3694,11 @@ function createCapturedValueAtFiber(value, source) {
36943694
((stack = getStackByFiberInDevAndProd(source)),
36953695
CapturedStacks.set(value, stack));
36963696
} else stack = getStackByFiberInDevAndProd(source);
3697-
return { value: value, source: source, stack: stack, digest: null };
3697+
return { value: value, source: source, stack: stack };
36983698
}
3699-
function createCapturedValueFromError(value, digest, stack) {
3699+
function createCapturedValueFromError(value, stack) {
37003700
"string" === typeof stack && CapturedStacks.set(value, stack);
3701-
return {
3702-
value: value,
3703-
source: null,
3704-
stack: null != stack ? stack : null,
3705-
digest: null != digest ? digest : null
3706-
};
3701+
return { value: value, source: null, stack: stack };
37073702
}
37083703
var reportGlobalError =
37093704
"function" === typeof reportError
@@ -4579,7 +4574,8 @@ function updateSuspenseComponent(current, workInProgress, renderLanes) {
45794574
(JSCompiler_temp = createCapturedValueFromError(
45804575
Error(
45814576
"There was an error while hydrating this Suspense boundary. Switched to client rendering."
4582-
)
4577+
),
4578+
null
45834579
)),
45844580
(workInProgress = retrySuspenseComponentWithoutHydrating(
45854581
current,
@@ -4635,11 +4631,7 @@ function updateSuspenseComponent(current, workInProgress, renderLanes) {
46354631
)),
46364632
(nextProps.stack = ""),
46374633
(nextProps.digest = JSCompiler_temp),
4638-
(JSCompiler_temp = createCapturedValueFromError(
4639-
nextProps,
4640-
JSCompiler_temp,
4641-
void 0
4642-
)),
4634+
(JSCompiler_temp = createCapturedValueFromError(nextProps, null)),
46434635
(workInProgress = retrySuspenseComponentWithoutHydrating(
46444636
current,
46454637
workInProgress,
@@ -8866,8 +8858,9 @@ function commitRootImpl(
88668858
finishedWork++
88678859
)
88688860
(remainingLanes = recoverableErrors[finishedWork]),
8869-
(transitions = { componentStack: remainingLanes.stack }),
8870-
renderPriorityLevel(remainingLanes.value, transitions);
8861+
renderPriorityLevel(remainingLanes.value, {
8862+
componentStack: remainingLanes.stack
8863+
});
88718864
0 !== (pendingPassiveEffectsLanes & 3) &&
88728865
0 !== root.tag &&
88738866
flushPassiveEffects();
@@ -9833,12 +9826,12 @@ function wrapFiber(fiber) {
98339826
fiberToWrapper.set(fiber, wrapper));
98349827
return wrapper;
98359828
}
9836-
var devToolsConfig$jscomp$inline_1086 = {
9829+
var devToolsConfig$jscomp$inline_1083 = {
98379830
findFiberByHostInstance: function () {
98389831
throw Error("TestRenderer does not support findFiberByHostInstance()");
98399832
},
98409833
bundleType: 0,
9841-
version: "19.0.0-canary-8b0c34a5",
9834+
version: "19.0.0-canary-841877f9",
98429835
rendererPackageName: "react-test-renderer"
98439836
};
98449837
(function (internals) {
@@ -9855,10 +9848,10 @@ var devToolsConfig$jscomp$inline_1086 = {
98559848
} catch (err) {}
98569849
return hook.checkDCE ? !0 : !1;
98579850
})({
9858-
bundleType: devToolsConfig$jscomp$inline_1086.bundleType,
9859-
version: devToolsConfig$jscomp$inline_1086.version,
9860-
rendererPackageName: devToolsConfig$jscomp$inline_1086.rendererPackageName,
9861-
rendererConfig: devToolsConfig$jscomp$inline_1086.rendererConfig,
9851+
bundleType: devToolsConfig$jscomp$inline_1083.bundleType,
9852+
version: devToolsConfig$jscomp$inline_1083.version,
9853+
rendererPackageName: devToolsConfig$jscomp$inline_1083.rendererPackageName,
9854+
rendererConfig: devToolsConfig$jscomp$inline_1083.rendererConfig,
98629855
overrideHookState: null,
98639856
overrideHookStateDeletePath: null,
98649857
overrideHookStateRenamePath: null,
@@ -9875,14 +9868,14 @@ var devToolsConfig$jscomp$inline_1086 = {
98759868
return null === fiber ? null : fiber.stateNode;
98769869
},
98779870
findFiberByHostInstance:
9878-
devToolsConfig$jscomp$inline_1086.findFiberByHostInstance ||
9871+
devToolsConfig$jscomp$inline_1083.findFiberByHostInstance ||
98799872
emptyFindFiberByHostInstance,
98809873
findHostInstancesForRefresh: null,
98819874
scheduleRefresh: null,
98829875
scheduleRoot: null,
98839876
setRefreshHandler: null,
98849877
getCurrentFiber: null,
9885-
reconcilerVersion: "19.0.0-canary-8b0c34a5"
9878+
reconcilerVersion: "19.0.0-canary-841877f9"
98869879
});
98879880
exports._Scheduler = Scheduler;
98889881
exports.act = act;

‎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-
b9149cc6e6442389accf1f7c34a77ba2e6e52b5e
1+
df95577db0d1d7ca383f281bc1d9e6ba5579bef2

0 commit comments

Comments
 (0)