Skip to content

Commit 750a0e4

Browse files
sebmarkbagesebmarkbage
committed
Audit try/finally around console patching (#31286)
Otherwise if something errors they can be left patched. [Review without whitespace](https://github.com/facebook/react/pull/31286/files?w=1) DiffTrain build for [b8ae38f](b8ae38f)
1 parent d4ef1bc commit 750a0e4

25 files changed

+1673
-1398
lines changed

‎compiled-rn/VERSION_NATIVE_FB‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
19.0.0-native-fb-a3d9ea05-20241016
1+
19.0.0-native-fb-b8ae38f8-20241018

‎compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/react-dom/cjs/ReactDOM-dev.js‎

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

1313
"use strict";
@@ -420,5 +420,5 @@ __DEV__ &&
420420
exports.useFormStatus = function () {
421421
return resolveDispatcher().useHostTransitionStatus();
422422
};
423-
exports.version = "19.0.0-native-fb-a3d9ea05-20241016";
423+
exports.version = "19.0.0-native-fb-b8ae38f8-20241018";
424424
})();

‎compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/react-dom/cjs/ReactDOM-prod.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<d6b5734b9a70e827a70881f9e8349ed7>>
10+
* @generated SignedSource<<8bc05e324822aae609cf6f750242a2ec>>
1111
*/
1212

1313
"use strict";
@@ -203,4 +203,4 @@ exports.useFormState = function (action, initialState, permalink) {
203203
exports.useFormStatus = function () {
204204
return ReactSharedInternals.H.useHostTransitionStatus();
205205
};
206-
exports.version = "19.0.0-native-fb-a3d9ea05-20241016";
206+
exports.version = "19.0.0-native-fb-b8ae38f8-20241018";

‎compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/react-dom/cjs/ReactDOM-profiling.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<d6b5734b9a70e827a70881f9e8349ed7>>
10+
* @generated SignedSource<<8bc05e324822aae609cf6f750242a2ec>>
1111
*/
1212

1313
"use strict";
@@ -203,4 +203,4 @@ exports.useFormState = function (action, initialState, permalink) {
203203
exports.useFormStatus = function () {
204204
return ReactSharedInternals.H.useHostTransitionStatus();
205205
};
206-
exports.version = "19.0.0-native-fb-a3d9ea05-20241016";
206+
exports.version = "19.0.0-native-fb-b8ae38f8-20241018";

‎compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/react-dom/cjs/ReactDOMClient-dev.js‎

Lines changed: 125 additions & 102 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<263a03af1650431ef8a84e977c3decda>>
10+
* @generated SignedSource<<b1adf5fbcf2b6118e3619e7b2f03d287>>
1111
*/
1212

1313
/*
@@ -365,64 +365,64 @@ __DEV__ &&
365365
previousDispatcher = ReactSharedInternals.H;
366366
ReactSharedInternals.H = null;
367367
disableLogs();
368-
var RunInRootFrame = {
369-
DetermineComponentFrameRoot: function () {
370-
try {
371-
if (construct) {
372-
var Fake = function () {
373-
throw Error();
374-
};
375-
Object.defineProperty(Fake.prototype, "props", {
376-
set: function () {
368+
try {
369+
var RunInRootFrame = {
370+
DetermineComponentFrameRoot: function () {
371+
try {
372+
if (construct) {
373+
var Fake = function () {
377374
throw Error();
375+
};
376+
Object.defineProperty(Fake.prototype, "props", {
377+
set: function () {
378+
throw Error();
379+
}
380+
});
381+
if ("object" === typeof Reflect && Reflect.construct) {
382+
try {
383+
Reflect.construct(Fake, []);
384+
} catch (x) {
385+
var control = x;
386+
}
387+
Reflect.construct(fn, [], Fake);
388+
} else {
389+
try {
390+
Fake.call();
391+
} catch (x$0) {
392+
control = x$0;
393+
}
394+
fn.call(Fake.prototype);
378395
}
379-
});
380-
if ("object" === typeof Reflect && Reflect.construct) {
381-
try {
382-
Reflect.construct(Fake, []);
383-
} catch (x) {
384-
var control = x;
385-
}
386-
Reflect.construct(fn, [], Fake);
387396
} else {
388397
try {
389-
Fake.call();
390-
} catch (x$0) {
391-
control = x$0;
398+
throw Error();
399+
} catch (x$1) {
400+
control = x$1;
392401
}
393-
fn.call(Fake.prototype);
394-
}
395-
} else {
396-
try {
397-
throw Error();
398-
} catch (x$1) {
399-
control = x$1;
402+
(Fake = fn()) &&
403+
"function" === typeof Fake.catch &&
404+
Fake.catch(function () {});
400405
}
401-
(Fake = fn()) &&
402-
"function" === typeof Fake.catch &&
403-
Fake.catch(function () {});
406+
} catch (sample) {
407+
if (sample && control && "string" === typeof sample.stack)
408+
return [sample.stack, control.stack];
404409
}
405-
} catch (sample) {
406-
if (sample && control && "string" === typeof sample.stack)
407-
return [sample.stack, control.stack];
410+
return [null, null];
408411
}
409-
return [null, null];
410-
}
411-
};
412-
RunInRootFrame.DetermineComponentFrameRoot.displayName =
413-
"DetermineComponentFrameRoot";
414-
var namePropDescriptor = Object.getOwnPropertyDescriptor(
415-
RunInRootFrame.DetermineComponentFrameRoot,
416-
"name"
417-
);
418-
namePropDescriptor &&
419-
namePropDescriptor.configurable &&
420-
Object.defineProperty(
412+
};
413+
RunInRootFrame.DetermineComponentFrameRoot.displayName =
414+
"DetermineComponentFrameRoot";
415+
var namePropDescriptor = Object.getOwnPropertyDescriptor(
421416
RunInRootFrame.DetermineComponentFrameRoot,
422-
"name",
423-
{ value: "DetermineComponentFrameRoot" }
417+
"name"
424418
);
425-
try {
419+
namePropDescriptor &&
420+
namePropDescriptor.configurable &&
421+
Object.defineProperty(
422+
RunInRootFrame.DetermineComponentFrameRoot,
423+
"name",
424+
{ value: "DetermineComponentFrameRoot" }
425+
);
426426
var _RunInRootFrame$Deter =
427427
RunInRootFrame.DetermineComponentFrameRoot(),
428428
sampleStack = _RunInRootFrame$Deter[0],
@@ -431,54 +431,58 @@ __DEV__ &&
431431
var sampleLines = sampleStack.split("\n"),
432432
controlLines = controlStack.split("\n");
433433
for (
434-
sampleStack = _RunInRootFrame$Deter = 0;
435-
_RunInRootFrame$Deter < sampleLines.length &&
436-
!sampleLines[_RunInRootFrame$Deter].includes(
434+
_RunInRootFrame$Deter = namePropDescriptor = 0;
435+
namePropDescriptor < sampleLines.length &&
436+
!sampleLines[namePropDescriptor].includes(
437437
"DetermineComponentFrameRoot"
438438
);
439439

440440
)
441-
_RunInRootFrame$Deter++;
441+
namePropDescriptor++;
442442
for (
443443
;
444-
sampleStack < controlLines.length &&
445-
!controlLines[sampleStack].includes("DetermineComponentFrameRoot");
444+
_RunInRootFrame$Deter < controlLines.length &&
445+
!controlLines[_RunInRootFrame$Deter].includes(
446+
"DetermineComponentFrameRoot"
447+
);
446448

447449
)
448-
sampleStack++;
450+
_RunInRootFrame$Deter++;
449451
if (
450-
_RunInRootFrame$Deter === sampleLines.length ||
451-
sampleStack === controlLines.length
452+
namePropDescriptor === sampleLines.length ||
453+
_RunInRootFrame$Deter === controlLines.length
452454
)
453455
for (
454-
_RunInRootFrame$Deter = sampleLines.length - 1,
455-
sampleStack = controlLines.length - 1;
456-
1 <= _RunInRootFrame$Deter &&
457-
0 <= sampleStack &&
458-
sampleLines[_RunInRootFrame$Deter] !== controlLines[sampleStack];
456+
namePropDescriptor = sampleLines.length - 1,
457+
_RunInRootFrame$Deter = controlLines.length - 1;
458+
1 <= namePropDescriptor &&
459+
0 <= _RunInRootFrame$Deter &&
460+
sampleLines[namePropDescriptor] !==
461+
controlLines[_RunInRootFrame$Deter];
459462

460463
)
461-
sampleStack--;
464+
_RunInRootFrame$Deter--;
462465
for (
463466
;
464-
1 <= _RunInRootFrame$Deter && 0 <= sampleStack;
465-
_RunInRootFrame$Deter--, sampleStack--
467+
1 <= namePropDescriptor && 0 <= _RunInRootFrame$Deter;
468+
namePropDescriptor--, _RunInRootFrame$Deter--
466469
)
467470
if (
468-
sampleLines[_RunInRootFrame$Deter] !== controlLines[sampleStack]
471+
sampleLines[namePropDescriptor] !==
472+
controlLines[_RunInRootFrame$Deter]
469473
) {
470-
if (1 !== _RunInRootFrame$Deter || 1 !== sampleStack) {
474+
if (1 !== namePropDescriptor || 1 !== _RunInRootFrame$Deter) {
471475
do
472476
if (
473-
(_RunInRootFrame$Deter--,
474-
sampleStack--,
475-
0 > sampleStack ||
476-
sampleLines[_RunInRootFrame$Deter] !==
477-
controlLines[sampleStack])
477+
(namePropDescriptor--,
478+
_RunInRootFrame$Deter--,
479+
0 > _RunInRootFrame$Deter ||
480+
sampleLines[namePropDescriptor] !==
481+
controlLines[_RunInRootFrame$Deter])
478482
) {
479483
var _frame =
480484
"\n" +
481-
sampleLines[_RunInRootFrame$Deter].replace(
485+
sampleLines[namePropDescriptor].replace(
482486
" at new ",
483487
" at "
484488
);
@@ -489,7 +493,7 @@ __DEV__ &&
489493
componentFrameCache.set(fn, _frame);
490494
return _frame;
491495
}
492-
while (1 <= _RunInRootFrame$Deter && 0 <= sampleStack);
496+
while (1 <= namePropDescriptor && 0 <= _RunInRootFrame$Deter);
493497
}
494498
break;
495499
}
@@ -6178,10 +6182,14 @@ __DEV__ &&
61786182
var hook = mountWorkInProgressHook();
61796183
if (void 0 !== init) {
61806184
var initialState = init(initialArg);
6181-
shouldDoubleInvokeUserFnsInHooksDEV &&
6182-
(setIsStrictModeForDevtools(!0),
6183-
init(initialArg),
6184-
setIsStrictModeForDevtools(!1));
6185+
if (shouldDoubleInvokeUserFnsInHooksDEV) {
6186+
setIsStrictModeForDevtools(!0);
6187+
try {
6188+
init(initialArg);
6189+
} finally {
6190+
setIsStrictModeForDevtools(!1);
6191+
}
6192+
}
61856193
} else initialState = initialArg;
61866194
hook.memoizedState = hook.baseState = initialState;
61876195
reducer = {
@@ -6497,10 +6505,14 @@ __DEV__ &&
64976505
if ("function" === typeof initialState) {
64986506
var initialStateInitializer = initialState;
64996507
initialState = initialStateInitializer();
6500-
shouldDoubleInvokeUserFnsInHooksDEV &&
6501-
(setIsStrictModeForDevtools(!0),
6502-
initialStateInitializer(),
6503-
setIsStrictModeForDevtools(!1));
6508+
if (shouldDoubleInvokeUserFnsInHooksDEV) {
6509+
setIsStrictModeForDevtools(!0);
6510+
try {
6511+
initialStateInitializer();
6512+
} finally {
6513+
setIsStrictModeForDevtools(!1);
6514+
}
6515+
}
65046516
}
65056517
hook.memoizedState = hook.baseState = initialState;
65066518
hook.queue = {
@@ -6954,10 +6966,14 @@ __DEV__ &&
69546966
var hook = mountWorkInProgressHook();
69556967
deps = void 0 === deps ? null : deps;
69566968
var nextValue = nextCreate();
6957-
shouldDoubleInvokeUserFnsInHooksDEV &&
6958-
(setIsStrictModeForDevtools(!0),
6959-
nextCreate(),
6960-
setIsStrictModeForDevtools(!1));
6969+
if (shouldDoubleInvokeUserFnsInHooksDEV) {
6970+
setIsStrictModeForDevtools(!0);
6971+
try {
6972+
nextCreate();
6973+
} finally {
6974+
setIsStrictModeForDevtools(!1);
6975+
}
6976+
}
69616977
hook.memoizedState = [nextValue, deps];
69626978
return nextValue;
69636979
}
@@ -6968,10 +6984,14 @@ __DEV__ &&
69686984
if (null !== deps && areHookInputsEqual(deps, prevState[1]))
69696985
return prevState[0];
69706986
prevState = nextCreate();
6971-
shouldDoubleInvokeUserFnsInHooksDEV &&
6972-
(setIsStrictModeForDevtools(!0),
6973-
nextCreate(),
6974-
setIsStrictModeForDevtools(!1));
6987+
if (shouldDoubleInvokeUserFnsInHooksDEV) {
6988+
setIsStrictModeForDevtools(!0);
6989+
try {
6990+
nextCreate();
6991+
} finally {
6992+
setIsStrictModeForDevtools(!1);
6993+
}
6994+
}
69756995
hook.memoizedState = [prevState, deps];
69766996
return prevState;
69776997
}
@@ -16402,12 +16422,15 @@ __DEV__ &&
1640216422
var shouldDoubleInvokePassiveEffects =
1640316423
2 < arguments.length && void 0 !== arguments[2] ? arguments[2] : !0;
1640416424
setIsStrictModeForDevtools(!0);
16405-
disappearLayoutEffects(fiber);
16406-
shouldDoubleInvokePassiveEffects && disconnectPassiveEffect(fiber);
16407-
reappearLayoutEffects(root, fiber.alternate, fiber, !1);
16408-
shouldDoubleInvokePassiveEffects &&
16409-
reconnectPassiveEffects(root, fiber, 0, null, !1);
16410-
setIsStrictModeForDevtools(!1);
16425+
try {
16426+
disappearLayoutEffects(fiber),
16427+
shouldDoubleInvokePassiveEffects && disconnectPassiveEffect(fiber),
16428+
reappearLayoutEffects(root, fiber.alternate, fiber, !1),
16429+
shouldDoubleInvokePassiveEffects &&
16430+
reconnectPassiveEffects(root, fiber, 0, null, !1);
16431+
} finally {
16432+
setIsStrictModeForDevtools(!1);
16433+
}
1641116434
}
1641216435
function commitDoubleInvokeEffectsInDEV(root, hasPassiveEffects) {
1641316436
0 !== root.tag
@@ -25329,11 +25352,11 @@ __DEV__ &&
2532925352
};
2533025353
(function () {
2533125354
var isomorphicReactPackageVersion = React.version;
25332-
if ("19.0.0-native-fb-a3d9ea05-20241016" !== isomorphicReactPackageVersion)
25355+
if ("19.0.0-native-fb-b8ae38f8-20241018" !== isomorphicReactPackageVersion)
2533325356
throw Error(
2533425357
'Incompatible React versions: The "react" and "react-dom" packages must have the exact same version. Instead got:\n - react: ' +
2533525358
(isomorphicReactPackageVersion +
25336-
"\n - react-dom: 19.0.0-native-fb-a3d9ea05-20241016\nLearn more: https://react.dev/warnings/version-mismatch")
25359+
"\n - react-dom: 19.0.0-native-fb-b8ae38f8-20241018\nLearn more: https://react.dev/warnings/version-mismatch")
2533725360
);
2533825361
})();
2533925362
("function" === typeof Map &&
@@ -25370,11 +25393,11 @@ __DEV__ &&
2537025393
!(function () {
2537125394
var internals = {
2537225395
bundleType: 1,
25373-
version: "19.0.0-native-fb-a3d9ea05-20241016",
25396+
version: "19.0.0-native-fb-b8ae38f8-20241018",
2537425397
rendererPackageName: "react-dom",
2537525398
currentDispatcherRef: ReactSharedInternals,
2537625399
findFiberByHostInstance: getClosestInstanceFromNode,
25377-
reconcilerVersion: "19.0.0-native-fb-a3d9ea05-20241016"
25400+
reconcilerVersion: "19.0.0-native-fb-b8ae38f8-20241018"
2537825401
};
2537925402
internals.overrideHookState = overrideHookState;
2538025403
internals.overrideHookStateDeletePath = overrideHookStateDeletePath;
@@ -25518,5 +25541,5 @@ __DEV__ &&
2551825541
listenToAllSupportedEvents(container);
2551925542
return new ReactDOMHydrationRoot(initialChildren);
2552025543
};
25521-
exports.version = "19.0.0-native-fb-a3d9ea05-20241016";
25544+
exports.version = "19.0.0-native-fb-b8ae38f8-20241018";
2552225545
})();

0 commit comments

Comments
 (0)