Skip to content

Commit

Permalink
Remove skipUnmountedBoundaries (#26489)
Browse files Browse the repository at this point in the history
# Overview

Landing this flag internally, will test this PR in React Native before
merging.

DiffTrain build for [ca01f35](ca01f35)
  • Loading branch information
rickhanlonii committed Mar 31, 2023
1 parent d9b663c commit 4b5a5b8
Show file tree
Hide file tree
Showing 19 changed files with 57 additions and 203 deletions.
2 changes: 1 addition & 1 deletion compiled/facebook-www/REVISION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
43a70a610dd2cc298ab5592deebfbf8f7bbac127
ca01f359b9236292c749075bb2fd41bb7b569308
2 changes: 1 addition & 1 deletion compiled/facebook-www/React-dev.modern.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ if (
}
"use strict";

var ReactVersion = "18.3.0-www-modern-b298fcd9";
var ReactVersion = "18.3.0-www-modern-ab4f3725";

// ATTENTION
// When adding new symbols to this file,
Expand Down
18 changes: 3 additions & 15 deletions compiled/facebook-www/ReactART-dev.classic.js
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ function _assertThisInitialized(self) {
return self;
}

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

var LegacyRoot = 0;
var ConcurrentRoot = 1;
Expand Down Expand Up @@ -170,7 +170,6 @@ var revertRemovalOfSiblingPrerendering =
replayFailedUnitOfWorkWithInvokeGuardedCallback =
dynamicFeatureFlags.replayFailedUnitOfWorkWithInvokeGuardedCallback,
enableDebugTracing = dynamicFeatureFlags.enableDebugTracing,
skipUnmountedBoundaries = dynamicFeatureFlags.skipUnmountedBoundaries,
enableUseRefAccessWarning = dynamicFeatureFlags.enableUseRefAccessWarning,
enableLazyContextPropagation =
dynamicFeatureFlags.enableLazyContextPropagation,
Expand Down Expand Up @@ -26151,13 +26150,7 @@ function captureCommitPhaseError(sourceFiber, nearestMountedAncestor, error$1) {
return;
}

var fiber = null;

if (skipUnmountedBoundaries) {
fiber = nearestMountedAncestor;
} else {
fiber = sourceFiber.return;
}
var fiber = nearestMountedAncestor;

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

{
// TODO: Until we re-land skipUnmountedBoundaries (see #20147), this warning
// will fire for errors that are thrown by destroy functions inside deleted
// trees. What it should instead do is propagate the error to the parent of
// the deleted tree. In the meantime, do not add this warning to the
// allowlist; this is only for our internal use.
error(
"Internal React error: Attempted to capture a commit phase error " +
"inside a detached tree. This indicates a bug in React. Likely " +
"inside a detached tree. This indicates a bug in React. Potential " +
"causes include deleting the same fiber more than once, committing an " +
"already-finished tree, or an inconsistent return pointer.\n\n" +
"Error message:\n\n%s",
Expand Down
18 changes: 3 additions & 15 deletions compiled/facebook-www/ReactART-dev.modern.js
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ function _assertThisInitialized(self) {
return self;
}

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

var LegacyRoot = 0;
var ConcurrentRoot = 1;
Expand Down Expand Up @@ -170,7 +170,6 @@ var revertRemovalOfSiblingPrerendering =
replayFailedUnitOfWorkWithInvokeGuardedCallback =
dynamicFeatureFlags.replayFailedUnitOfWorkWithInvokeGuardedCallback,
enableDebugTracing = dynamicFeatureFlags.enableDebugTracing,
skipUnmountedBoundaries = dynamicFeatureFlags.skipUnmountedBoundaries,
enableUseRefAccessWarning = dynamicFeatureFlags.enableUseRefAccessWarning,
enableLazyContextPropagation =
dynamicFeatureFlags.enableLazyContextPropagation,
Expand Down Expand Up @@ -25811,13 +25810,7 @@ function captureCommitPhaseError(sourceFiber, nearestMountedAncestor, error$1) {
return;
}

var fiber = null;

if (skipUnmountedBoundaries) {
fiber = nearestMountedAncestor;
} else {
fiber = sourceFiber.return;
}
var fiber = nearestMountedAncestor;

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

{
// TODO: Until we re-land skipUnmountedBoundaries (see #20147), this warning
// will fire for errors that are thrown by destroy functions inside deleted
// trees. What it should instead do is propagate the error to the parent of
// the deleted tree. In the meantime, do not add this warning to the
// allowlist; this is only for our internal use.
error(
"Internal React error: Attempted to capture a commit phase error " +
"inside a detached tree. This indicates a bug in React. Likely " +
"inside a detached tree. This indicates a bug in React. Potential " +
"causes include deleting the same fiber more than once, committing an " +
"already-finished tree, or an inconsistent return pointer.\n\n" +
"Error message:\n\n%s",
Expand Down
13 changes: 3 additions & 10 deletions compiled/facebook-www/ReactART-prod.classic.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ var ReactSharedInternals =
revertRemovalOfSiblingPrerendering =
dynamicFeatureFlags.revertRemovalOfSiblingPrerendering,
enableDebugTracing = dynamicFeatureFlags.enableDebugTracing,
skipUnmountedBoundaries = dynamicFeatureFlags.skipUnmountedBoundaries,
enableUseRefAccessWarning = dynamicFeatureFlags.enableUseRefAccessWarning,
enableLazyContextPropagation =
dynamicFeatureFlags.enableLazyContextPropagation,
Expand Down Expand Up @@ -8962,13 +8961,7 @@ function captureCommitPhaseError(sourceFiber, nearestMountedAncestor, error) {
if (3 === sourceFiber.tag)
captureCommitPhaseErrorOnRoot(sourceFiber, sourceFiber, error);
else
for (
nearestMountedAncestor = skipUnmountedBoundaries
? nearestMountedAncestor
: sourceFiber.return;
null !== nearestMountedAncestor;

) {
for (; null !== nearestMountedAncestor; ) {
if (3 === nearestMountedAncestor.tag) {
captureCommitPhaseErrorOnRoot(
nearestMountedAncestor,
Expand Down Expand Up @@ -10023,7 +10016,7 @@ var slice = Array.prototype.slice,
return null;
},
bundleType: 0,
version: "18.3.0-www-classic-942a9e22",
version: "18.3.0-www-classic-0c778728",
rendererPackageName: "react-art"
};
var internals$jscomp$inline_1324 = {
Expand Down Expand Up @@ -10054,7 +10047,7 @@ var internals$jscomp$inline_1324 = {
scheduleRoot: null,
setRefreshHandler: null,
getCurrentFiber: null,
reconcilerVersion: "18.3.0-www-classic-942a9e22"
reconcilerVersion: "18.3.0-www-classic-0c778728"
};
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
var hook$jscomp$inline_1325 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
Expand Down
13 changes: 3 additions & 10 deletions compiled/facebook-www/ReactART-prod.modern.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ var ReactSharedInternals =
revertRemovalOfSiblingPrerendering =
dynamicFeatureFlags.revertRemovalOfSiblingPrerendering,
enableDebugTracing = dynamicFeatureFlags.enableDebugTracing,
skipUnmountedBoundaries = dynamicFeatureFlags.skipUnmountedBoundaries,
enableUseRefAccessWarning = dynamicFeatureFlags.enableUseRefAccessWarning,
enableLazyContextPropagation =
dynamicFeatureFlags.enableLazyContextPropagation,
Expand Down Expand Up @@ -8694,13 +8693,7 @@ function captureCommitPhaseError(sourceFiber, nearestMountedAncestor, error) {
if (3 === sourceFiber.tag)
captureCommitPhaseErrorOnRoot(sourceFiber, sourceFiber, error);
else
for (
nearestMountedAncestor = skipUnmountedBoundaries
? nearestMountedAncestor
: sourceFiber.return;
null !== nearestMountedAncestor;

) {
for (; null !== nearestMountedAncestor; ) {
if (3 === nearestMountedAncestor.tag) {
captureCommitPhaseErrorOnRoot(
nearestMountedAncestor,
Expand Down Expand Up @@ -9688,7 +9681,7 @@ var slice = Array.prototype.slice,
return null;
},
bundleType: 0,
version: "18.3.0-www-modern-b8a2f36f",
version: "18.3.0-www-modern-5592667d",
rendererPackageName: "react-art"
};
var internals$jscomp$inline_1304 = {
Expand Down Expand Up @@ -9719,7 +9712,7 @@ var internals$jscomp$inline_1304 = {
scheduleRoot: null,
setRefreshHandler: null,
getCurrentFiber: null,
reconcilerVersion: "18.3.0-www-modern-b8a2f36f"
reconcilerVersion: "18.3.0-www-modern-5592667d"
};
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
var hook$jscomp$inline_1305 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
Expand Down
18 changes: 3 additions & 15 deletions compiled/facebook-www/ReactDOM-dev.classic.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ var disableInputAttributeSyncing =
dynamicFeatureFlags.replayFailedUnitOfWorkWithInvokeGuardedCallback,
enableLegacyFBSupport = dynamicFeatureFlags.enableLegacyFBSupport,
enableDebugTracing = dynamicFeatureFlags.enableDebugTracing,
skipUnmountedBoundaries = dynamicFeatureFlags.skipUnmountedBoundaries,
enableUseRefAccessWarning = dynamicFeatureFlags.enableUseRefAccessWarning,
enableLazyContextPropagation =
dynamicFeatureFlags.enableLazyContextPropagation,
Expand Down Expand Up @@ -37591,13 +37590,7 @@ function captureCommitPhaseError(sourceFiber, nearestMountedAncestor, error$1) {
return;
}

var fiber = null;

if (skipUnmountedBoundaries) {
fiber = nearestMountedAncestor;
} else {
fiber = sourceFiber.return;
}
var fiber = nearestMountedAncestor;

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

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

var ReactVersion = "18.3.0-www-classic-17634136";
var ReactVersion = "18.3.0-www-classic-1fca3cc2";

function createPortal$1(
children,
Expand Down
18 changes: 3 additions & 15 deletions compiled/facebook-www/ReactDOM-dev.modern.js
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,6 @@ var disableInputAttributeSyncing =
dynamicFeatureFlags.replayFailedUnitOfWorkWithInvokeGuardedCallback,
enableLegacyFBSupport = dynamicFeatureFlags.enableLegacyFBSupport,
enableDebugTracing = dynamicFeatureFlags.enableDebugTracing,
skipUnmountedBoundaries = dynamicFeatureFlags.skipUnmountedBoundaries,
enableUseRefAccessWarning = dynamicFeatureFlags.enableUseRefAccessWarning,
enableLazyContextPropagation =
dynamicFeatureFlags.enableLazyContextPropagation,
Expand Down Expand Up @@ -31627,13 +31626,7 @@ function captureCommitPhaseError(sourceFiber, nearestMountedAncestor, error$1) {
return;
}

var fiber = null;

if (skipUnmountedBoundaries) {
fiber = nearestMountedAncestor;
} else {
fiber = sourceFiber.return;
}
var fiber = nearestMountedAncestor;

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

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

var ReactVersion = "18.3.0-www-modern-b8a2f36f";
var ReactVersion = "18.3.0-www-modern-5592667d";

function createPortal$1(
children,
Expand Down
15 changes: 4 additions & 11 deletions compiled/facebook-www/ReactDOM-prod.classic.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ var Scheduler = require("scheduler"),
dynamicFeatureFlags.revertRemovalOfSiblingPrerendering,
enableLegacyFBSupport = dynamicFeatureFlags.enableLegacyFBSupport,
enableDebugTracing = dynamicFeatureFlags.enableDebugTracing,
skipUnmountedBoundaries = dynamicFeatureFlags.skipUnmountedBoundaries,
enableUseRefAccessWarning = dynamicFeatureFlags.enableUseRefAccessWarning,
enableLazyContextPropagation =
dynamicFeatureFlags.enableLazyContextPropagation,
Expand Down Expand Up @@ -12403,13 +12402,7 @@ function captureCommitPhaseError(sourceFiber, nearestMountedAncestor, error) {
if (3 === sourceFiber.tag)
captureCommitPhaseErrorOnRoot(sourceFiber, sourceFiber, error);
else
for (
nearestMountedAncestor = skipUnmountedBoundaries
? nearestMountedAncestor
: sourceFiber.return;
null !== nearestMountedAncestor;

) {
for (; null !== nearestMountedAncestor; ) {
if (3 === nearestMountedAncestor.tag) {
captureCommitPhaseErrorOnRoot(
nearestMountedAncestor,
Expand Down Expand Up @@ -16084,7 +16077,7 @@ Internals.Events = [
var devToolsConfig$jscomp$inline_1796 = {
findFiberByHostInstance: getClosestInstanceFromNode,
bundleType: 0,
version: "18.3.0-www-classic-4264d861",
version: "18.3.0-www-classic-e955483c",
rendererPackageName: "react-dom"
};
var internals$jscomp$inline_2173 = {
Expand Down Expand Up @@ -16114,7 +16107,7 @@ var internals$jscomp$inline_2173 = {
scheduleRoot: null,
setRefreshHandler: null,
getCurrentFiber: null,
reconcilerVersion: "18.3.0-www-classic-4264d861"
reconcilerVersion: "18.3.0-www-classic-e955483c"
};
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
var hook$jscomp$inline_2174 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
Expand Down Expand Up @@ -16354,4 +16347,4 @@ exports.unstable_renderSubtreeIntoContainer = function (
);
};
exports.unstable_runWithPriority = runWithPriority;
exports.version = "18.3.0-www-classic-4264d861";
exports.version = "18.3.0-www-classic-e955483c";
15 changes: 4 additions & 11 deletions compiled/facebook-www/ReactDOM-prod.modern.js
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,6 @@ var dynamicFeatureFlags = require("ReactFeatureFlags"),
dynamicFeatureFlags.revertRemovalOfSiblingPrerendering,
enableLegacyFBSupport = dynamicFeatureFlags.enableLegacyFBSupport,
enableDebugTracing = dynamicFeatureFlags.enableDebugTracing,
skipUnmountedBoundaries = dynamicFeatureFlags.skipUnmountedBoundaries,
enableUseRefAccessWarning = dynamicFeatureFlags.enableUseRefAccessWarning,
enableLazyContextPropagation =
dynamicFeatureFlags.enableLazyContextPropagation,
Expand Down Expand Up @@ -10510,13 +10509,7 @@ function captureCommitPhaseError(sourceFiber, nearestMountedAncestor, error) {
if (3 === sourceFiber.tag)
captureCommitPhaseErrorOnRoot(sourceFiber, sourceFiber, error);
else
for (
nearestMountedAncestor = skipUnmountedBoundaries
? nearestMountedAncestor
: sourceFiber.return;
null !== nearestMountedAncestor;

) {
for (; null !== nearestMountedAncestor; ) {
if (3 === nearestMountedAncestor.tag) {
captureCommitPhaseErrorOnRoot(
nearestMountedAncestor,
Expand Down Expand Up @@ -15607,7 +15600,7 @@ Internals.Events = [
var devToolsConfig$jscomp$inline_1765 = {
findFiberByHostInstance: getClosestInstanceFromNode,
bundleType: 0,
version: "18.3.0-www-modern-617a14f8",
version: "18.3.0-www-modern-fadda158",
rendererPackageName: "react-dom"
};
var internals$jscomp$inline_2160 = {
Expand Down Expand Up @@ -15638,7 +15631,7 @@ var internals$jscomp$inline_2160 = {
scheduleRoot: null,
setRefreshHandler: null,
getCurrentFiber: null,
reconcilerVersion: "18.3.0-www-modern-617a14f8"
reconcilerVersion: "18.3.0-www-modern-fadda158"
};
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
var hook$jscomp$inline_2161 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
Expand Down Expand Up @@ -15807,4 +15800,4 @@ exports.unstable_createEventHandle = function (type, options) {
return eventHandle;
};
exports.unstable_runWithPriority = runWithPriority;
exports.version = "18.3.0-www-modern-617a14f8";
exports.version = "18.3.0-www-modern-fadda158";
Loading

0 comments on commit 4b5a5b8

Please sign in to comment.