Skip to content

Commit 4b5a5b8

Browse files
committed
Remove skipUnmountedBoundaries (#26489)
# Overview Landing this flag internally, will test this PR in React Native before merging. DiffTrain build for [ca01f35](ca01f35)
1 parent d9b663c commit 4b5a5b8

19 files changed

Lines changed: 57 additions & 203 deletions

compiled/facebook-www/REVISION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
43a70a610dd2cc298ab5592deebfbf8f7bbac127
1+
ca01f359b9236292c749075bb2fd41bb7b569308

compiled/facebook-www/React-dev.modern.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ if (
2727
}
2828
"use strict";
2929

30-
var ReactVersion = "18.3.0-www-modern-b298fcd9";
30+
var ReactVersion = "18.3.0-www-modern-ab4f3725";
3131

3232
// ATTENTION
3333
// When adding new symbols to this file,

compiled/facebook-www/ReactART-dev.classic.js

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ function _assertThisInitialized(self) {
6969
return self;
7070
}
7171

72-
var ReactVersion = "18.3.0-www-classic-8643ce3a";
72+
var ReactVersion = "18.3.0-www-classic-3566099f";
7373

7474
var LegacyRoot = 0;
7575
var ConcurrentRoot = 1;
@@ -170,7 +170,6 @@ var revertRemovalOfSiblingPrerendering =
170170
replayFailedUnitOfWorkWithInvokeGuardedCallback =
171171
dynamicFeatureFlags.replayFailedUnitOfWorkWithInvokeGuardedCallback,
172172
enableDebugTracing = dynamicFeatureFlags.enableDebugTracing,
173-
skipUnmountedBoundaries = dynamicFeatureFlags.skipUnmountedBoundaries,
174173
enableUseRefAccessWarning = dynamicFeatureFlags.enableUseRefAccessWarning,
175174
enableLazyContextPropagation =
176175
dynamicFeatureFlags.enableLazyContextPropagation,
@@ -26151,13 +26150,7 @@ function captureCommitPhaseError(sourceFiber, nearestMountedAncestor, error$1) {
2615126150
return;
2615226151
}
2615326152

26154-
var fiber = null;
26155-
26156-
if (skipUnmountedBoundaries) {
26157-
fiber = nearestMountedAncestor;
26158-
} else {
26159-
fiber = sourceFiber.return;
26160-
}
26153+
var fiber = nearestMountedAncestor;
2616126154

2616226155
while (fiber !== null) {
2616326156
if (fiber.tag === HostRoot) {
@@ -26190,14 +26183,9 @@ function captureCommitPhaseError(sourceFiber, nearestMountedAncestor, error$1) {
2619026183
}
2619126184

2619226185
{
26193-
// TODO: Until we re-land skipUnmountedBoundaries (see #20147), this warning
26194-
// will fire for errors that are thrown by destroy functions inside deleted
26195-
// trees. What it should instead do is propagate the error to the parent of
26196-
// the deleted tree. In the meantime, do not add this warning to the
26197-
// allowlist; this is only for our internal use.
2619826186
error(
2619926187
"Internal React error: Attempted to capture a commit phase error " +
26200-
"inside a detached tree. This indicates a bug in React. Likely " +
26188+
"inside a detached tree. This indicates a bug in React. Potential " +
2620126189
"causes include deleting the same fiber more than once, committing an " +
2620226190
"already-finished tree, or an inconsistent return pointer.\n\n" +
2620326191
"Error message:\n\n%s",

compiled/facebook-www/ReactART-dev.modern.js

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ function _assertThisInitialized(self) {
6969
return self;
7070
}
7171

72-
var ReactVersion = "18.3.0-www-modern-58325a38";
72+
var ReactVersion = "18.3.0-www-modern-0c2f7392";
7373

7474
var LegacyRoot = 0;
7575
var ConcurrentRoot = 1;
@@ -170,7 +170,6 @@ var revertRemovalOfSiblingPrerendering =
170170
replayFailedUnitOfWorkWithInvokeGuardedCallback =
171171
dynamicFeatureFlags.replayFailedUnitOfWorkWithInvokeGuardedCallback,
172172
enableDebugTracing = dynamicFeatureFlags.enableDebugTracing,
173-
skipUnmountedBoundaries = dynamicFeatureFlags.skipUnmountedBoundaries,
174173
enableUseRefAccessWarning = dynamicFeatureFlags.enableUseRefAccessWarning,
175174
enableLazyContextPropagation =
176175
dynamicFeatureFlags.enableLazyContextPropagation,
@@ -25811,13 +25810,7 @@ function captureCommitPhaseError(sourceFiber, nearestMountedAncestor, error$1) {
2581125810
return;
2581225811
}
2581325812

25814-
var fiber = null;
25815-
25816-
if (skipUnmountedBoundaries) {
25817-
fiber = nearestMountedAncestor;
25818-
} else {
25819-
fiber = sourceFiber.return;
25820-
}
25813+
var fiber = nearestMountedAncestor;
2582125814

2582225815
while (fiber !== null) {
2582325816
if (fiber.tag === HostRoot) {
@@ -25850,14 +25843,9 @@ function captureCommitPhaseError(sourceFiber, nearestMountedAncestor, error$1) {
2585025843
}
2585125844

2585225845
{
25853-
// TODO: Until we re-land skipUnmountedBoundaries (see #20147), this warning
25854-
// will fire for errors that are thrown by destroy functions inside deleted
25855-
// trees. What it should instead do is propagate the error to the parent of
25856-
// the deleted tree. In the meantime, do not add this warning to the
25857-
// allowlist; this is only for our internal use.
2585825846
error(
2585925847
"Internal React error: Attempted to capture a commit phase error " +
25860-
"inside a detached tree. This indicates a bug in React. Likely " +
25848+
"inside a detached tree. This indicates a bug in React. Potential " +
2586125849
"causes include deleting the same fiber more than once, committing an " +
2586225850
"already-finished tree, or an inconsistent return pointer.\n\n" +
2586325851
"Error message:\n\n%s",

compiled/facebook-www/ReactART-prod.classic.js

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ var ReactSharedInternals =
6666
revertRemovalOfSiblingPrerendering =
6767
dynamicFeatureFlags.revertRemovalOfSiblingPrerendering,
6868
enableDebugTracing = dynamicFeatureFlags.enableDebugTracing,
69-
skipUnmountedBoundaries = dynamicFeatureFlags.skipUnmountedBoundaries,
7069
enableUseRefAccessWarning = dynamicFeatureFlags.enableUseRefAccessWarning,
7170
enableLazyContextPropagation =
7271
dynamicFeatureFlags.enableLazyContextPropagation,
@@ -8962,13 +8961,7 @@ function captureCommitPhaseError(sourceFiber, nearestMountedAncestor, error) {
89628961
if (3 === sourceFiber.tag)
89638962
captureCommitPhaseErrorOnRoot(sourceFiber, sourceFiber, error);
89648963
else
8965-
for (
8966-
nearestMountedAncestor = skipUnmountedBoundaries
8967-
? nearestMountedAncestor
8968-
: sourceFiber.return;
8969-
null !== nearestMountedAncestor;
8970-
8971-
) {
8964+
for (; null !== nearestMountedAncestor; ) {
89728965
if (3 === nearestMountedAncestor.tag) {
89738966
captureCommitPhaseErrorOnRoot(
89748967
nearestMountedAncestor,
@@ -10023,7 +10016,7 @@ var slice = Array.prototype.slice,
1002310016
return null;
1002410017
},
1002510018
bundleType: 0,
10026-
version: "18.3.0-www-classic-942a9e22",
10019+
version: "18.3.0-www-classic-0c778728",
1002710020
rendererPackageName: "react-art"
1002810021
};
1002910022
var internals$jscomp$inline_1324 = {
@@ -10054,7 +10047,7 @@ var internals$jscomp$inline_1324 = {
1005410047
scheduleRoot: null,
1005510048
setRefreshHandler: null,
1005610049
getCurrentFiber: null,
10057-
reconcilerVersion: "18.3.0-www-classic-942a9e22"
10050+
reconcilerVersion: "18.3.0-www-classic-0c778728"
1005810051
};
1005910052
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
1006010053
var hook$jscomp$inline_1325 = __REACT_DEVTOOLS_GLOBAL_HOOK__;

compiled/facebook-www/ReactART-prod.modern.js

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ var ReactSharedInternals =
6666
revertRemovalOfSiblingPrerendering =
6767
dynamicFeatureFlags.revertRemovalOfSiblingPrerendering,
6868
enableDebugTracing = dynamicFeatureFlags.enableDebugTracing,
69-
skipUnmountedBoundaries = dynamicFeatureFlags.skipUnmountedBoundaries,
7069
enableUseRefAccessWarning = dynamicFeatureFlags.enableUseRefAccessWarning,
7170
enableLazyContextPropagation =
7271
dynamicFeatureFlags.enableLazyContextPropagation,
@@ -8694,13 +8693,7 @@ function captureCommitPhaseError(sourceFiber, nearestMountedAncestor, error) {
86948693
if (3 === sourceFiber.tag)
86958694
captureCommitPhaseErrorOnRoot(sourceFiber, sourceFiber, error);
86968695
else
8697-
for (
8698-
nearestMountedAncestor = skipUnmountedBoundaries
8699-
? nearestMountedAncestor
8700-
: sourceFiber.return;
8701-
null !== nearestMountedAncestor;
8702-
8703-
) {
8696+
for (; null !== nearestMountedAncestor; ) {
87048697
if (3 === nearestMountedAncestor.tag) {
87058698
captureCommitPhaseErrorOnRoot(
87068699
nearestMountedAncestor,
@@ -9688,7 +9681,7 @@ var slice = Array.prototype.slice,
96889681
return null;
96899682
},
96909683
bundleType: 0,
9691-
version: "18.3.0-www-modern-b8a2f36f",
9684+
version: "18.3.0-www-modern-5592667d",
96929685
rendererPackageName: "react-art"
96939686
};
96949687
var internals$jscomp$inline_1304 = {
@@ -9719,7 +9712,7 @@ var internals$jscomp$inline_1304 = {
97199712
scheduleRoot: null,
97209713
setRefreshHandler: null,
97219714
getCurrentFiber: null,
9722-
reconcilerVersion: "18.3.0-www-modern-b8a2f36f"
9715+
reconcilerVersion: "18.3.0-www-modern-5592667d"
97239716
};
97249717
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
97259718
var hook$jscomp$inline_1305 = __REACT_DEVTOOLS_GLOBAL_HOOK__;

compiled/facebook-www/ReactDOM-dev.classic.js

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ var disableInputAttributeSyncing =
4646
dynamicFeatureFlags.replayFailedUnitOfWorkWithInvokeGuardedCallback,
4747
enableLegacyFBSupport = dynamicFeatureFlags.enableLegacyFBSupport,
4848
enableDebugTracing = dynamicFeatureFlags.enableDebugTracing,
49-
skipUnmountedBoundaries = dynamicFeatureFlags.skipUnmountedBoundaries,
5049
enableUseRefAccessWarning = dynamicFeatureFlags.enableUseRefAccessWarning,
5150
enableLazyContextPropagation =
5251
dynamicFeatureFlags.enableLazyContextPropagation,
@@ -37591,13 +37590,7 @@ function captureCommitPhaseError(sourceFiber, nearestMountedAncestor, error$1) {
3759137590
return;
3759237591
}
3759337592

37594-
var fiber = null;
37595-
37596-
if (skipUnmountedBoundaries) {
37597-
fiber = nearestMountedAncestor;
37598-
} else {
37599-
fiber = sourceFiber.return;
37600-
}
37593+
var fiber = nearestMountedAncestor;
3760137594

3760237595
while (fiber !== null) {
3760337596
if (fiber.tag === HostRoot) {
@@ -37630,14 +37623,9 @@ function captureCommitPhaseError(sourceFiber, nearestMountedAncestor, error$1) {
3763037623
}
3763137624

3763237625
{
37633-
// TODO: Until we re-land skipUnmountedBoundaries (see #20147), this warning
37634-
// will fire for errors that are thrown by destroy functions inside deleted
37635-
// trees. What it should instead do is propagate the error to the parent of
37636-
// the deleted tree. In the meantime, do not add this warning to the
37637-
// allowlist; this is only for our internal use.
3763837626
error(
3763937627
"Internal React error: Attempted to capture a commit phase error " +
37640-
"inside a detached tree. This indicates a bug in React. Likely " +
37628+
"inside a detached tree. This indicates a bug in React. Potential " +
3764137629
"causes include deleting the same fiber more than once, committing an " +
3764237630
"already-finished tree, or an inconsistent return pointer.\n\n" +
3764337631
"Error message:\n\n%s",
@@ -39564,7 +39552,7 @@ function createFiberRoot(
3956439552
return root;
3956539553
}
3956639554

39567-
var ReactVersion = "18.3.0-www-classic-17634136";
39555+
var ReactVersion = "18.3.0-www-classic-1fca3cc2";
3956839556

3956939557
function createPortal$1(
3957039558
children,

compiled/facebook-www/ReactDOM-dev.modern.js

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,6 @@ var disableInputAttributeSyncing =
252252
dynamicFeatureFlags.replayFailedUnitOfWorkWithInvokeGuardedCallback,
253253
enableLegacyFBSupport = dynamicFeatureFlags.enableLegacyFBSupport,
254254
enableDebugTracing = dynamicFeatureFlags.enableDebugTracing,
255-
skipUnmountedBoundaries = dynamicFeatureFlags.skipUnmountedBoundaries,
256255
enableUseRefAccessWarning = dynamicFeatureFlags.enableUseRefAccessWarning,
257256
enableLazyContextPropagation =
258257
dynamicFeatureFlags.enableLazyContextPropagation,
@@ -31627,13 +31626,7 @@ function captureCommitPhaseError(sourceFiber, nearestMountedAncestor, error$1) {
3162731626
return;
3162831627
}
3162931628

31630-
var fiber = null;
31631-
31632-
if (skipUnmountedBoundaries) {
31633-
fiber = nearestMountedAncestor;
31634-
} else {
31635-
fiber = sourceFiber.return;
31636-
}
31629+
var fiber = nearestMountedAncestor;
3163731630

3163831631
while (fiber !== null) {
3163931632
if (fiber.tag === HostRoot) {
@@ -31666,14 +31659,9 @@ function captureCommitPhaseError(sourceFiber, nearestMountedAncestor, error$1) {
3166631659
}
3166731660

3166831661
{
31669-
// TODO: Until we re-land skipUnmountedBoundaries (see #20147), this warning
31670-
// will fire for errors that are thrown by destroy functions inside deleted
31671-
// trees. What it should instead do is propagate the error to the parent of
31672-
// the deleted tree. In the meantime, do not add this warning to the
31673-
// allowlist; this is only for our internal use.
3167431662
error(
3167531663
"Internal React error: Attempted to capture a commit phase error " +
31676-
"inside a detached tree. This indicates a bug in React. Likely " +
31664+
"inside a detached tree. This indicates a bug in React. Potential " +
3167731665
"causes include deleting the same fiber more than once, committing an " +
3167831666
"already-finished tree, or an inconsistent return pointer.\n\n" +
3167931667
"Error message:\n\n%s",
@@ -33600,7 +33588,7 @@ function createFiberRoot(
3360033588
return root;
3360133589
}
3360233590

33603-
var ReactVersion = "18.3.0-www-modern-b8a2f36f";
33591+
var ReactVersion = "18.3.0-www-modern-5592667d";
3360433592

3360533593
function createPortal$1(
3360633594
children,

compiled/facebook-www/ReactDOM-prod.classic.js

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ var Scheduler = require("scheduler"),
2727
dynamicFeatureFlags.revertRemovalOfSiblingPrerendering,
2828
enableLegacyFBSupport = dynamicFeatureFlags.enableLegacyFBSupport,
2929
enableDebugTracing = dynamicFeatureFlags.enableDebugTracing,
30-
skipUnmountedBoundaries = dynamicFeatureFlags.skipUnmountedBoundaries,
3130
enableUseRefAccessWarning = dynamicFeatureFlags.enableUseRefAccessWarning,
3231
enableLazyContextPropagation =
3332
dynamicFeatureFlags.enableLazyContextPropagation,
@@ -12403,13 +12402,7 @@ function captureCommitPhaseError(sourceFiber, nearestMountedAncestor, error) {
1240312402
if (3 === sourceFiber.tag)
1240412403
captureCommitPhaseErrorOnRoot(sourceFiber, sourceFiber, error);
1240512404
else
12406-
for (
12407-
nearestMountedAncestor = skipUnmountedBoundaries
12408-
? nearestMountedAncestor
12409-
: sourceFiber.return;
12410-
null !== nearestMountedAncestor;
12411-
12412-
) {
12405+
for (; null !== nearestMountedAncestor; ) {
1241312406
if (3 === nearestMountedAncestor.tag) {
1241412407
captureCommitPhaseErrorOnRoot(
1241512408
nearestMountedAncestor,
@@ -16084,7 +16077,7 @@ Internals.Events = [
1608416077
var devToolsConfig$jscomp$inline_1796 = {
1608516078
findFiberByHostInstance: getClosestInstanceFromNode,
1608616079
bundleType: 0,
16087-
version: "18.3.0-www-classic-4264d861",
16080+
version: "18.3.0-www-classic-e955483c",
1608816081
rendererPackageName: "react-dom"
1608916082
};
1609016083
var internals$jscomp$inline_2173 = {
@@ -16114,7 +16107,7 @@ var internals$jscomp$inline_2173 = {
1611416107
scheduleRoot: null,
1611516108
setRefreshHandler: null,
1611616109
getCurrentFiber: null,
16117-
reconcilerVersion: "18.3.0-www-classic-4264d861"
16110+
reconcilerVersion: "18.3.0-www-classic-e955483c"
1611816111
};
1611916112
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
1612016113
var hook$jscomp$inline_2174 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
@@ -16354,4 +16347,4 @@ exports.unstable_renderSubtreeIntoContainer = function (
1635416347
);
1635516348
};
1635616349
exports.unstable_runWithPriority = runWithPriority;
16357-
exports.version = "18.3.0-www-classic-4264d861";
16350+
exports.version = "18.3.0-www-classic-e955483c";

compiled/facebook-www/ReactDOM-prod.modern.js

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@ var dynamicFeatureFlags = require("ReactFeatureFlags"),
102102
dynamicFeatureFlags.revertRemovalOfSiblingPrerendering,
103103
enableLegacyFBSupport = dynamicFeatureFlags.enableLegacyFBSupport,
104104
enableDebugTracing = dynamicFeatureFlags.enableDebugTracing,
105-
skipUnmountedBoundaries = dynamicFeatureFlags.skipUnmountedBoundaries,
106105
enableUseRefAccessWarning = dynamicFeatureFlags.enableUseRefAccessWarning,
107106
enableLazyContextPropagation =
108107
dynamicFeatureFlags.enableLazyContextPropagation,
@@ -10510,13 +10509,7 @@ function captureCommitPhaseError(sourceFiber, nearestMountedAncestor, error) {
1051010509
if (3 === sourceFiber.tag)
1051110510
captureCommitPhaseErrorOnRoot(sourceFiber, sourceFiber, error);
1051210511
else
10513-
for (
10514-
nearestMountedAncestor = skipUnmountedBoundaries
10515-
? nearestMountedAncestor
10516-
: sourceFiber.return;
10517-
null !== nearestMountedAncestor;
10518-
10519-
) {
10512+
for (; null !== nearestMountedAncestor; ) {
1052010513
if (3 === nearestMountedAncestor.tag) {
1052110514
captureCommitPhaseErrorOnRoot(
1052210515
nearestMountedAncestor,
@@ -15607,7 +15600,7 @@ Internals.Events = [
1560715600
var devToolsConfig$jscomp$inline_1765 = {
1560815601
findFiberByHostInstance: getClosestInstanceFromNode,
1560915602
bundleType: 0,
15610-
version: "18.3.0-www-modern-617a14f8",
15603+
version: "18.3.0-www-modern-fadda158",
1561115604
rendererPackageName: "react-dom"
1561215605
};
1561315606
var internals$jscomp$inline_2160 = {
@@ -15638,7 +15631,7 @@ var internals$jscomp$inline_2160 = {
1563815631
scheduleRoot: null,
1563915632
setRefreshHandler: null,
1564015633
getCurrentFiber: null,
15641-
reconcilerVersion: "18.3.0-www-modern-617a14f8"
15634+
reconcilerVersion: "18.3.0-www-modern-fadda158"
1564215635
};
1564315636
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
1564415637
var hook$jscomp$inline_2161 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
@@ -15807,4 +15800,4 @@ exports.unstable_createEventHandle = function (type, options) {
1580715800
return eventHandle;
1580815801
};
1580915802
exports.unstable_runWithPriority = runWithPriority;
15810-
exports.version = "18.3.0-www-modern-617a14f8";
15803+
exports.version = "18.3.0-www-modern-fadda158";

0 commit comments

Comments
 (0)