Skip to content

Commit

Permalink
[Fizz] track postpones when aborting boundaries with a postpone (#30751)
Browse files Browse the repository at this point in the history
When aborting with a postpone value boundaries are put into client
rendered mode even during prerenders. This doesn't follow the postpoen
semantics of the rest of fizz where during a prerender a postpone is
tracked and it will leave holes in tracked postpone state that can be
resumed. This change updates this behavior to match the postpones
semantics between aborts and imperative postpones.

DiffTrain build for [2505bf9](2505bf9)
  • Loading branch information
gnoff committed Aug 20, 2024
1 parent 6f94ca8 commit 7420875
Show file tree
Hide file tree
Showing 36 changed files with 98 additions and 98 deletions.
2 changes: 1 addition & 1 deletion compiled/facebook-www/REVISION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7954db9398b9afa962167577a6c6940be3856c39
2505bf9b3400c6a00381e86d30b495935f5339df
2 changes: 1 addition & 1 deletion compiled/facebook-www/REVISION_TRANSFORMS
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7954db9398b9afa962167577a6c6940be3856c39
2505bf9b3400c6a00381e86d30b495935f5339df
2 changes: 1 addition & 1 deletion compiled/facebook-www/React-dev.classic.js
Original file line number Diff line number Diff line change
Expand Up @@ -2001,7 +2001,7 @@ __DEV__ &&
exports.useTransition = function () {
return resolveDispatcher().useTransition();
};
exports.version = "19.0.0-www-classic-7954db93-20240816";
exports.version = "19.0.0-www-classic-2505bf9b-20240820";
"undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
"function" ===
typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&
Expand Down
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 @@ -1981,7 +1981,7 @@ __DEV__ &&
exports.useTransition = function () {
return resolveDispatcher().useTransition();
};
exports.version = "19.0.0-www-modern-7954db93-20240816";
exports.version = "19.0.0-www-modern-2505bf9b-20240820";
"undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
"function" ===
typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&
Expand Down
2 changes: 1 addition & 1 deletion compiled/facebook-www/React-prod.classic.js
Original file line number Diff line number Diff line change
Expand Up @@ -665,4 +665,4 @@ exports.useSyncExternalStore = function (
exports.useTransition = function () {
return ReactSharedInternals.H.useTransition();
};
exports.version = "19.0.0-www-classic-7954db93-20240816";
exports.version = "19.0.0-www-classic-2505bf9b-20240820";
2 changes: 1 addition & 1 deletion compiled/facebook-www/React-prod.modern.js
Original file line number Diff line number Diff line change
Expand Up @@ -665,4 +665,4 @@ exports.useSyncExternalStore = function (
exports.useTransition = function () {
return ReactSharedInternals.H.useTransition();
};
exports.version = "19.0.0-www-modern-7954db93-20240816";
exports.version = "19.0.0-www-modern-2505bf9b-20240820";
2 changes: 1 addition & 1 deletion compiled/facebook-www/React-profiling.classic.js
Original file line number Diff line number Diff line change
Expand Up @@ -669,7 +669,7 @@ exports.useSyncExternalStore = function (
exports.useTransition = function () {
return ReactSharedInternals.H.useTransition();
};
exports.version = "19.0.0-www-classic-7954db93-20240816";
exports.version = "19.0.0-www-classic-2505bf9b-20240820";
"undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
"function" ===
typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&
Expand Down
2 changes: 1 addition & 1 deletion compiled/facebook-www/React-profiling.modern.js
Original file line number Diff line number Diff line change
Expand Up @@ -669,7 +669,7 @@ exports.useSyncExternalStore = function (
exports.useTransition = function () {
return ReactSharedInternals.H.useTransition();
};
exports.version = "19.0.0-www-modern-7954db93-20240816";
exports.version = "19.0.0-www-modern-2505bf9b-20240820";
"undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
"function" ===
typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&
Expand Down
6 changes: 3 additions & 3 deletions compiled/facebook-www/ReactART-dev.classic.js
Original file line number Diff line number Diff line change
Expand Up @@ -16776,11 +16776,11 @@ __DEV__ &&
(function () {
var internals = {
bundleType: 1,
version: "19.0.0-www-classic-7954db93-20240816",
version: "19.0.0-www-classic-2505bf9b-20240820",
rendererPackageName: "react-art",
currentDispatcherRef: ReactSharedInternals,
findFiberByHostInstance: getInstanceFromNode,
reconcilerVersion: "19.0.0-www-classic-7954db93-20240816"
reconcilerVersion: "19.0.0-www-classic-2505bf9b-20240820"
};
internals.overrideHookState = overrideHookState;
internals.overrideHookStateDeletePath = overrideHookStateDeletePath;
Expand Down Expand Up @@ -16814,7 +16814,7 @@ __DEV__ &&
exports.Shape = Shape;
exports.Surface = Surface;
exports.Text = Text;
exports.version = "19.0.0-www-classic-7954db93-20240816";
exports.version = "19.0.0-www-classic-2505bf9b-20240820";
"undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
"function" ===
typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&
Expand Down
6 changes: 3 additions & 3 deletions compiled/facebook-www/ReactART-dev.modern.js
Original file line number Diff line number Diff line change
Expand Up @@ -16189,11 +16189,11 @@ __DEV__ &&
(function () {
var internals = {
bundleType: 1,
version: "19.0.0-www-modern-7954db93-20240816",
version: "19.0.0-www-modern-2505bf9b-20240820",
rendererPackageName: "react-art",
currentDispatcherRef: ReactSharedInternals,
findFiberByHostInstance: getInstanceFromNode,
reconcilerVersion: "19.0.0-www-modern-7954db93-20240816"
reconcilerVersion: "19.0.0-www-modern-2505bf9b-20240820"
};
internals.overrideHookState = overrideHookState;
internals.overrideHookStateDeletePath = overrideHookStateDeletePath;
Expand Down Expand Up @@ -16227,7 +16227,7 @@ __DEV__ &&
exports.Shape = Shape;
exports.Surface = Surface;
exports.Text = Text;
exports.version = "19.0.0-www-modern-7954db93-20240816";
exports.version = "19.0.0-www-modern-2505bf9b-20240820";
"undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
"function" ===
typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&
Expand Down
6 changes: 3 additions & 3 deletions compiled/facebook-www/ReactART-prod.classic.js
Original file line number Diff line number Diff line change
Expand Up @@ -10618,13 +10618,13 @@ var slice = Array.prototype.slice,
})(React.Component);
var internals$jscomp$inline_1361 = {
bundleType: 0,
version: "19.0.0-www-classic-7954db93-20240816",
version: "19.0.0-www-classic-2505bf9b-20240820",
rendererPackageName: "react-art",
currentDispatcherRef: ReactSharedInternals,
findFiberByHostInstance: function () {
return null;
},
reconcilerVersion: "19.0.0-www-classic-7954db93-20240816"
reconcilerVersion: "19.0.0-www-classic-2505bf9b-20240820"
};
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
var hook$jscomp$inline_1362 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
Expand All @@ -10650,4 +10650,4 @@ exports.RadialGradient = RadialGradient;
exports.Shape = TYPES.SHAPE;
exports.Surface = Surface;
exports.Text = Text;
exports.version = "19.0.0-www-classic-7954db93-20240816";
exports.version = "19.0.0-www-classic-2505bf9b-20240820";
6 changes: 3 additions & 3 deletions compiled/facebook-www/ReactART-prod.modern.js
Original file line number Diff line number Diff line change
Expand Up @@ -10132,13 +10132,13 @@ var slice = Array.prototype.slice,
})(React.Component);
var internals$jscomp$inline_1353 = {
bundleType: 0,
version: "19.0.0-www-modern-7954db93-20240816",
version: "19.0.0-www-modern-2505bf9b-20240820",
rendererPackageName: "react-art",
currentDispatcherRef: ReactSharedInternals,
findFiberByHostInstance: function () {
return null;
},
reconcilerVersion: "19.0.0-www-modern-7954db93-20240816"
reconcilerVersion: "19.0.0-www-modern-2505bf9b-20240820"
};
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
var hook$jscomp$inline_1354 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
Expand All @@ -10164,4 +10164,4 @@ exports.RadialGradient = RadialGradient;
exports.Shape = TYPES.SHAPE;
exports.Surface = Surface;
exports.Text = Text;
exports.version = "19.0.0-www-modern-7954db93-20240816";
exports.version = "19.0.0-www-modern-2505bf9b-20240820";
10 changes: 5 additions & 5 deletions compiled/facebook-www/ReactDOM-dev.classic.js
Original file line number Diff line number Diff line change
Expand Up @@ -27528,11 +27528,11 @@ __DEV__ &&
: flushSyncErrorInBuildsThatSupportLegacyMode;
(function () {
var isomorphicReactPackageVersion = React.version;
if ("19.0.0-www-classic-7954db93-20240816" !== isomorphicReactPackageVersion)
if ("19.0.0-www-classic-2505bf9b-20240820" !== isomorphicReactPackageVersion)
throw Error(
'Incompatible React versions: The "react" and "react-dom" packages must have the exact same version. Instead got:\n - react: ' +
(isomorphicReactPackageVersion +
"\n - react-dom: 19.0.0-www-classic-7954db93-20240816\nLearn more: https://react.dev/warnings/version-mismatch")
"\n - react-dom: 19.0.0-www-classic-2505bf9b-20240820\nLearn more: https://react.dev/warnings/version-mismatch")
);
})();
("function" === typeof Map &&
Expand Down Expand Up @@ -27576,11 +27576,11 @@ __DEV__ &&
!(function () {
var internals = {
bundleType: 1,
version: "19.0.0-www-classic-7954db93-20240816",
version: "19.0.0-www-classic-2505bf9b-20240820",
rendererPackageName: "react-dom",
currentDispatcherRef: ReactSharedInternals,
findFiberByHostInstance: getClosestInstanceFromNode,
reconcilerVersion: "19.0.0-www-classic-7954db93-20240816"
reconcilerVersion: "19.0.0-www-classic-2505bf9b-20240820"
};
internals.overrideHookState = overrideHookState;
internals.overrideHookStateDeletePath = overrideHookStateDeletePath;
Expand Down Expand Up @@ -28233,7 +28233,7 @@ __DEV__ &&
exports.useFormStatus = function () {
return resolveDispatcher().useHostTransitionStatus();
};
exports.version = "19.0.0-www-classic-7954db93-20240816";
exports.version = "19.0.0-www-classic-2505bf9b-20240820";
"undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
"function" ===
typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&
Expand Down
10 changes: 5 additions & 5 deletions compiled/facebook-www/ReactDOM-dev.modern.js
Original file line number Diff line number Diff line change
Expand Up @@ -26613,11 +26613,11 @@ __DEV__ &&
return_targetInst = null;
(function () {
var isomorphicReactPackageVersion = React.version;
if ("19.0.0-www-modern-7954db93-20240816" !== isomorphicReactPackageVersion)
if ("19.0.0-www-modern-2505bf9b-20240820" !== isomorphicReactPackageVersion)
throw Error(
'Incompatible React versions: The "react" and "react-dom" packages must have the exact same version. Instead got:\n - react: ' +
(isomorphicReactPackageVersion +
"\n - react-dom: 19.0.0-www-modern-7954db93-20240816\nLearn more: https://react.dev/warnings/version-mismatch")
"\n - react-dom: 19.0.0-www-modern-2505bf9b-20240820\nLearn more: https://react.dev/warnings/version-mismatch")
);
})();
("function" === typeof Map &&
Expand Down Expand Up @@ -26660,11 +26660,11 @@ __DEV__ &&
!(function () {
var internals = {
bundleType: 1,
version: "19.0.0-www-modern-7954db93-20240816",
version: "19.0.0-www-modern-2505bf9b-20240820",
rendererPackageName: "react-dom",
currentDispatcherRef: ReactSharedInternals,
findFiberByHostInstance: getClosestInstanceFromNode,
reconcilerVersion: "19.0.0-www-modern-7954db93-20240816"
reconcilerVersion: "19.0.0-www-modern-2505bf9b-20240820"
};
internals.overrideHookState = overrideHookState;
internals.overrideHookStateDeletePath = overrideHookStateDeletePath;
Expand Down Expand Up @@ -27269,7 +27269,7 @@ __DEV__ &&
exports.useFormStatus = function () {
return resolveDispatcher().useHostTransitionStatus();
};
exports.version = "19.0.0-www-modern-7954db93-20240816";
exports.version = "19.0.0-www-modern-2505bf9b-20240820";
"undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
"function" ===
typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&
Expand Down
10 changes: 5 additions & 5 deletions compiled/facebook-www/ReactDOM-prod.classic.js
Original file line number Diff line number Diff line change
Expand Up @@ -17170,14 +17170,14 @@ function getCrossOriginStringAs(as, input) {
}
var isomorphicReactPackageVersion$jscomp$inline_1753 = React.version;
if (
"19.0.0-www-classic-7954db93-20240816" !==
"19.0.0-www-classic-2505bf9b-20240820" !==
isomorphicReactPackageVersion$jscomp$inline_1753
)
throw Error(
formatProdErrorMessage(
527,
isomorphicReactPackageVersion$jscomp$inline_1753,
"19.0.0-www-classic-7954db93-20240816"
"19.0.0-www-classic-2505bf9b-20240820"
)
);
function flushSyncFromReconciler(fn) {
Expand Down Expand Up @@ -17222,11 +17222,11 @@ Internals.Events = [
];
var internals$jscomp$inline_2208 = {
bundleType: 0,
version: "19.0.0-www-classic-7954db93-20240816",
version: "19.0.0-www-classic-2505bf9b-20240820",
rendererPackageName: "react-dom",
currentDispatcherRef: ReactSharedInternals,
findFiberByHostInstance: getClosestInstanceFromNode,
reconcilerVersion: "19.0.0-www-classic-7954db93-20240816"
reconcilerVersion: "19.0.0-www-classic-2505bf9b-20240820"
};
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
var hook$jscomp$inline_2209 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
Expand Down Expand Up @@ -17682,4 +17682,4 @@ exports.useFormState = function (action, initialState, permalink) {
exports.useFormStatus = function () {
return ReactSharedInternals.H.useHostTransitionStatus();
};
exports.version = "19.0.0-www-classic-7954db93-20240816";
exports.version = "19.0.0-www-classic-2505bf9b-20240820";
10 changes: 5 additions & 5 deletions compiled/facebook-www/ReactDOM-prod.modern.js
Original file line number Diff line number Diff line change
Expand Up @@ -16544,14 +16544,14 @@ function getCrossOriginStringAs(as, input) {
}
var isomorphicReactPackageVersion$jscomp$inline_1724 = React.version;
if (
"19.0.0-www-modern-7954db93-20240816" !==
"19.0.0-www-modern-2505bf9b-20240820" !==
isomorphicReactPackageVersion$jscomp$inline_1724
)
throw Error(
formatProdErrorMessage(
527,
isomorphicReactPackageVersion$jscomp$inline_1724,
"19.0.0-www-modern-7954db93-20240816"
"19.0.0-www-modern-2505bf9b-20240820"
)
);
Internals.findDOMNode = function (componentOrElement) {
Expand All @@ -16569,11 +16569,11 @@ Internals.Events = [
];
var internals$jscomp$inline_2199 = {
bundleType: 0,
version: "19.0.0-www-modern-7954db93-20240816",
version: "19.0.0-www-modern-2505bf9b-20240820",
rendererPackageName: "react-dom",
currentDispatcherRef: ReactSharedInternals,
findFiberByHostInstance: getClosestInstanceFromNode,
reconcilerVersion: "19.0.0-www-modern-7954db93-20240816"
reconcilerVersion: "19.0.0-www-modern-2505bf9b-20240820"
};
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
var hook$jscomp$inline_2200 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
Expand Down Expand Up @@ -16936,4 +16936,4 @@ exports.useFormState = function (action, initialState, permalink) {
exports.useFormStatus = function () {
return ReactSharedInternals.H.useHostTransitionStatus();
};
exports.version = "19.0.0-www-modern-7954db93-20240816";
exports.version = "19.0.0-www-modern-2505bf9b-20240820";
10 changes: 5 additions & 5 deletions compiled/facebook-www/ReactDOM-profiling.classic.js
Original file line number Diff line number Diff line change
Expand Up @@ -17949,14 +17949,14 @@ function getCrossOriginStringAs(as, input) {
}
var isomorphicReactPackageVersion$jscomp$inline_1841 = React.version;
if (
"19.0.0-www-classic-7954db93-20240816" !==
"19.0.0-www-classic-2505bf9b-20240820" !==
isomorphicReactPackageVersion$jscomp$inline_1841
)
throw Error(
formatProdErrorMessage(
527,
isomorphicReactPackageVersion$jscomp$inline_1841,
"19.0.0-www-classic-7954db93-20240816"
"19.0.0-www-classic-2505bf9b-20240820"
)
);
function flushSyncFromReconciler(fn) {
Expand Down Expand Up @@ -18001,11 +18001,11 @@ Internals.Events = [
];
var internals$jscomp$inline_1848 = {
bundleType: 0,
version: "19.0.0-www-classic-7954db93-20240816",
version: "19.0.0-www-classic-2505bf9b-20240820",
rendererPackageName: "react-dom",
currentDispatcherRef: ReactSharedInternals,
findFiberByHostInstance: getClosestInstanceFromNode,
reconcilerVersion: "19.0.0-www-classic-7954db93-20240816"
reconcilerVersion: "19.0.0-www-classic-2505bf9b-20240820"
};
enableSchedulingProfiler &&
((internals$jscomp$inline_1848.getLaneLabelMap = getLaneLabelMap),
Expand Down Expand Up @@ -18464,7 +18464,7 @@ exports.useFormState = function (action, initialState, permalink) {
exports.useFormStatus = function () {
return ReactSharedInternals.H.useHostTransitionStatus();
};
exports.version = "19.0.0-www-classic-7954db93-20240816";
exports.version = "19.0.0-www-classic-2505bf9b-20240820";
"undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
"function" ===
typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&
Expand Down
10 changes: 5 additions & 5 deletions compiled/facebook-www/ReactDOM-profiling.modern.js
Original file line number Diff line number Diff line change
Expand Up @@ -17306,14 +17306,14 @@ function getCrossOriginStringAs(as, input) {
}
var isomorphicReactPackageVersion$jscomp$inline_1812 = React.version;
if (
"19.0.0-www-modern-7954db93-20240816" !==
"19.0.0-www-modern-2505bf9b-20240820" !==
isomorphicReactPackageVersion$jscomp$inline_1812
)
throw Error(
formatProdErrorMessage(
527,
isomorphicReactPackageVersion$jscomp$inline_1812,
"19.0.0-www-modern-7954db93-20240816"
"19.0.0-www-modern-2505bf9b-20240820"
)
);
Internals.findDOMNode = function (componentOrElement) {
Expand All @@ -17331,11 +17331,11 @@ Internals.Events = [
];
var internals$jscomp$inline_1814 = {
bundleType: 0,
version: "19.0.0-www-modern-7954db93-20240816",
version: "19.0.0-www-modern-2505bf9b-20240820",
rendererPackageName: "react-dom",
currentDispatcherRef: ReactSharedInternals,
findFiberByHostInstance: getClosestInstanceFromNode,
reconcilerVersion: "19.0.0-www-modern-7954db93-20240816"
reconcilerVersion: "19.0.0-www-modern-2505bf9b-20240820"
};
enableSchedulingProfiler &&
((internals$jscomp$inline_1814.getLaneLabelMap = getLaneLabelMap),
Expand Down Expand Up @@ -17701,7 +17701,7 @@ exports.useFormState = function (action, initialState, permalink) {
exports.useFormStatus = function () {
return ReactSharedInternals.H.useHostTransitionStatus();
};
exports.version = "19.0.0-www-modern-7954db93-20240816";
exports.version = "19.0.0-www-modern-2505bf9b-20240820";
"undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
"function" ===
typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&
Expand Down
6 changes: 3 additions & 3 deletions compiled/facebook-www/ReactDOMServer-dev.classic.js
Original file line number Diff line number Diff line change
Expand Up @@ -6430,9 +6430,9 @@ __DEV__ &&
} else
boundary.pendingTasks--,
boundary.status !== CLIENT_RENDERED &&
((boundary.status = CLIENT_RENDERED),
(task = getThrownInfo(task.componentStack)),
((task = getThrownInfo(task.componentStack)),
(segment = logRecoverableError(request, error, task)),
(boundary.status = CLIENT_RENDERED),
encodeErrorForBoundary(boundary, segment, error, task, !0),
untrackBoundary(request, boundary),
boundary.parentFlushed &&
Expand Down Expand Up @@ -8945,5 +8945,5 @@ __DEV__ &&
'The server used "renderToString" which does not support Suspense. If you intended for this Suspense boundary to render the fallback content on the server consider throwing an Error somewhere within the Suspense boundary. If you intended to have the server wait for the suspended component please switch to "renderToReadableStream" which supports Suspense on the server'
);
};
exports.version = "19.0.0-www-classic-7954db93-20240816";
exports.version = "19.0.0-www-classic-2505bf9b-20240820";
})();
Loading

0 comments on commit 7420875

Please sign in to comment.