Skip to content

Commit 5c7c15d

Browse files
committed
[Flight] Don't call onError/onPostpone when halting and unify error branches (facebook#31715)
We shouldn't call onError/onPostpone when we halt a stream because that node didn't error yet. Its digest would also get lost. We also have a lot of error branches now for thenables and streams. This unifies them under erroredTask. I'm not yet unifying the cases that don't allocate a task for the error when those are outlined. DiffTrain build for [4a8fc0f](facebook@4a8fc0f)
1 parent 5b994a7 commit 5c7c15d

34 files changed

+96
-130
lines changed

compiled/facebook-www/REVISION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
de68d2f4a2403ad1ef46a3036ddc1f9080640588
1+
4a8fc0f92e0f75257962522b51a938bf4dfda77a
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
de68d2f4a2403ad1ef46a3036ddc1f9080640588
1+
4a8fc0f92e0f75257962522b51a938bf4dfda77a

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1841,7 +1841,7 @@ __DEV__ &&
18411841
exports.useTransition = function () {
18421842
return resolveDispatcher().useTransition();
18431843
};
1844-
exports.version = "19.0.0-www-classic-de68d2f4-20241204";
1844+
exports.version = "19.0.0-www-classic-4a8fc0f9-20241210";
18451845
"undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
18461846
"function" ===
18471847
typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1841,7 +1841,7 @@ __DEV__ &&
18411841
exports.useTransition = function () {
18421842
return resolveDispatcher().useTransition();
18431843
};
1844-
exports.version = "19.0.0-www-modern-de68d2f4-20241204";
1844+
exports.version = "19.0.0-www-modern-4a8fc0f9-20241210";
18451845
"undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
18461846
"function" ===
18471847
typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -634,4 +634,4 @@ exports.useSyncExternalStore = function (
634634
exports.useTransition = function () {
635635
return ReactSharedInternals.H.useTransition();
636636
};
637-
exports.version = "19.0.0-www-classic-de68d2f4-20241204";
637+
exports.version = "19.0.0-www-classic-4a8fc0f9-20241210";

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -634,4 +634,4 @@ exports.useSyncExternalStore = function (
634634
exports.useTransition = function () {
635635
return ReactSharedInternals.H.useTransition();
636636
};
637-
exports.version = "19.0.0-www-modern-de68d2f4-20241204";
637+
exports.version = "19.0.0-www-modern-4a8fc0f9-20241210";

compiled/facebook-www/React-profiling.classic.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -638,7 +638,7 @@ exports.useSyncExternalStore = function (
638638
exports.useTransition = function () {
639639
return ReactSharedInternals.H.useTransition();
640640
};
641-
exports.version = "19.0.0-www-classic-de68d2f4-20241204";
641+
exports.version = "19.0.0-www-classic-4a8fc0f9-20241210";
642642
"undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
643643
"function" ===
644644
typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -638,7 +638,7 @@ exports.useSyncExternalStore = function (
638638
exports.useTransition = function () {
639639
return ReactSharedInternals.H.useTransition();
640640
};
641-
exports.version = "19.0.0-www-modern-de68d2f4-20241204";
641+
exports.version = "19.0.0-www-modern-4a8fc0f9-20241210";
642642
"undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
643643
"function" ===
644644
typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&

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

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1281,9 +1281,6 @@ __DEV__ &&
12811281
(null == props.visible || props.visible) && instance.show();
12821282
}
12831283
function unhideTextInstance() {}
1284-
function getInstanceFromNode() {
1285-
return null;
1286-
}
12871284
function createCursor(defaultValue) {
12881285
return { current: defaultValue };
12891286
}
@@ -17129,11 +17126,10 @@ __DEV__ &&
1712917126
(function () {
1713017127
var internals = {
1713117128
bundleType: 1,
17132-
version: "19.0.0-www-classic-de68d2f4-20241204",
17129+
version: "19.0.0-www-classic-4a8fc0f9-20241210",
1713317130
rendererPackageName: "react-art",
1713417131
currentDispatcherRef: ReactSharedInternals,
17135-
findFiberByHostInstance: getInstanceFromNode,
17136-
reconcilerVersion: "19.0.0-www-classic-de68d2f4-20241204"
17132+
reconcilerVersion: "19.0.0-www-classic-4a8fc0f9-20241210"
1713717133
};
1713817134
internals.overrideHookState = overrideHookState;
1713917135
internals.overrideHookStateDeletePath = overrideHookStateDeletePath;
@@ -17167,7 +17163,7 @@ __DEV__ &&
1716717163
exports.Shape = Shape;
1716817164
exports.Surface = Surface;
1716917165
exports.Text = Text;
17170-
exports.version = "19.0.0-www-classic-de68d2f4-20241204";
17166+
exports.version = "19.0.0-www-classic-4a8fc0f9-20241210";
1717117167
"undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
1717217168
"function" ===
1717317169
typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&

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

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1267,9 +1267,6 @@ __DEV__ &&
12671267
(null == props.visible || props.visible) && instance.show();
12681268
}
12691269
function unhideTextInstance() {}
1270-
function getInstanceFromNode() {
1271-
return null;
1272-
}
12731270
function createCursor(defaultValue) {
12741271
return { current: defaultValue };
12751272
}
@@ -16892,11 +16889,10 @@ __DEV__ &&
1689216889
(function () {
1689316890
var internals = {
1689416891
bundleType: 1,
16895-
version: "19.0.0-www-modern-de68d2f4-20241204",
16892+
version: "19.0.0-www-modern-4a8fc0f9-20241210",
1689616893
rendererPackageName: "react-art",
1689716894
currentDispatcherRef: ReactSharedInternals,
16898-
findFiberByHostInstance: getInstanceFromNode,
16899-
reconcilerVersion: "19.0.0-www-modern-de68d2f4-20241204"
16895+
reconcilerVersion: "19.0.0-www-modern-4a8fc0f9-20241210"
1690016896
};
1690116897
internals.overrideHookState = overrideHookState;
1690216898
internals.overrideHookStateDeletePath = overrideHookStateDeletePath;
@@ -16930,7 +16926,7 @@ __DEV__ &&
1693016926
exports.Shape = Shape;
1693116927
exports.Surface = Surface;
1693216928
exports.Text = Text;
16933-
exports.version = "19.0.0-www-modern-de68d2f4-20241204";
16929+
exports.version = "19.0.0-www-modern-4a8fc0f9-20241210";
1693416930
"undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
1693516931
"function" ===
1693616932
typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&

0 commit comments

Comments
 (0)