Skip to content

Commit fed9476

Browse files
pull[bot]pull[bot]
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 a084c8a commit fed9476

23 files changed

+100
-128
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-de68d2f4-20241204
1+
19.0.0-native-fb-4a8fc0f9-20241210

‎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<<160a11128267704309b6ab8a4178e177>>
10+
* @generated SignedSource<<eba012b47ddd3253a2dd5cdddb1f26e2>>
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-de68d2f4-20241204";
423+
exports.version = "19.0.0-native-fb-4a8fc0f9-20241210";
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<<4ab67f1597a97138a25ba4aa51a83988>>
10+
* @generated SignedSource<<84f92a68501c80e402eaeb6c42e04120>>
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-de68d2f4-20241204";
206+
exports.version = "19.0.0-native-fb-4a8fc0f9-20241210";

‎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<<4ab67f1597a97138a25ba4aa51a83988>>
10+
* @generated SignedSource<<84f92a68501c80e402eaeb6c42e04120>>
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-de68d2f4-20241204";
206+
exports.version = "19.0.0-native-fb-4a8fc0f9-20241210";

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

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<cd64d01e66b344949b063ad934308ad1>>
10+
* @generated SignedSource<<9d91ebef4e187c24916a13538ba8743f>>
1111
*/
1212

1313
/*
@@ -25794,11 +25794,11 @@ __DEV__ &&
2579425794
};
2579525795
(function () {
2579625796
var isomorphicReactPackageVersion = React.version;
25797-
if ("19.0.0-native-fb-de68d2f4-20241204" !== isomorphicReactPackageVersion)
25797+
if ("19.0.0-native-fb-4a8fc0f9-20241210" !== isomorphicReactPackageVersion)
2579825798
throw Error(
2579925799
'Incompatible React versions: The "react" and "react-dom" packages must have the exact same version. Instead got:\n - react: ' +
2580025800
(isomorphicReactPackageVersion +
25801-
"\n - react-dom: 19.0.0-native-fb-de68d2f4-20241204\nLearn more: https://react.dev/warnings/version-mismatch")
25801+
"\n - react-dom: 19.0.0-native-fb-4a8fc0f9-20241210\nLearn more: https://react.dev/warnings/version-mismatch")
2580225802
);
2580325803
})();
2580425804
("function" === typeof Map &&
@@ -25835,11 +25835,10 @@ __DEV__ &&
2583525835
!(function () {
2583625836
var internals = {
2583725837
bundleType: 1,
25838-
version: "19.0.0-native-fb-de68d2f4-20241204",
25838+
version: "19.0.0-native-fb-4a8fc0f9-20241210",
2583925839
rendererPackageName: "react-dom",
2584025840
currentDispatcherRef: ReactSharedInternals,
25841-
findFiberByHostInstance: getClosestInstanceFromNode,
25842-
reconcilerVersion: "19.0.0-native-fb-de68d2f4-20241204"
25841+
reconcilerVersion: "19.0.0-native-fb-4a8fc0f9-20241210"
2584325842
};
2584425843
internals.overrideHookState = overrideHookState;
2584525844
internals.overrideHookStateDeletePath = overrideHookStateDeletePath;
@@ -25983,5 +25982,5 @@ __DEV__ &&
2598325982
listenToAllSupportedEvents(container);
2598425983
return new ReactDOMHydrationRoot(initialChildren);
2598525984
};
25986-
exports.version = "19.0.0-native-fb-de68d2f4-20241204";
25985+
exports.version = "19.0.0-native-fb-4a8fc0f9-20241210";
2598725986
})();

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

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<e6dc49083d7f6b1d3dcd756ba7a07031>>
10+
* @generated SignedSource<<8226504c8b39ce2c6645a71e7e4df1ca>>
1111
*/
1212

1313
/*
@@ -15864,14 +15864,14 @@ ReactDOMHydrationRoot.prototype.unstable_scheduleHydration = function (target) {
1586415864
};
1586515865
var isomorphicReactPackageVersion$jscomp$inline_1731 = React.version;
1586615866
if (
15867-
"19.0.0-native-fb-de68d2f4-20241204" !==
15867+
"19.0.0-native-fb-4a8fc0f9-20241210" !==
1586815868
isomorphicReactPackageVersion$jscomp$inline_1731
1586915869
)
1587015870
throw Error(
1587115871
formatProdErrorMessage(
1587215872
527,
1587315873
isomorphicReactPackageVersion$jscomp$inline_1731,
15874-
"19.0.0-native-fb-de68d2f4-20241204"
15874+
"19.0.0-native-fb-4a8fc0f9-20241210"
1587515875
)
1587615876
);
1587715877
ReactDOMSharedInternals.findDOMNode = function (componentOrElement) {
@@ -15893,11 +15893,10 @@ ReactDOMSharedInternals.findDOMNode = function (componentOrElement) {
1589315893
};
1589415894
var internals$jscomp$inline_2186 = {
1589515895
bundleType: 0,
15896-
version: "19.0.0-native-fb-de68d2f4-20241204",
15896+
version: "19.0.0-native-fb-4a8fc0f9-20241210",
1589715897
rendererPackageName: "react-dom",
1589815898
currentDispatcherRef: ReactSharedInternals,
15899-
findFiberByHostInstance: getClosestInstanceFromNode,
15900-
reconcilerVersion: "19.0.0-native-fb-de68d2f4-20241204"
15899+
reconcilerVersion: "19.0.0-native-fb-4a8fc0f9-20241210"
1590115900
};
1590215901
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
1590315902
var hook$jscomp$inline_2187 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
@@ -16001,4 +16000,4 @@ exports.hydrateRoot = function (container, initialChildren, options) {
1600116000
listenToAllSupportedEvents(container);
1600216001
return new ReactDOMHydrationRoot(initialChildren);
1600316002
};
16004-
exports.version = "19.0.0-native-fb-de68d2f4-20241204";
16003+
exports.version = "19.0.0-native-fb-4a8fc0f9-20241210";

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

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

1313
/*
@@ -16517,14 +16517,14 @@ ReactDOMHydrationRoot.prototype.unstable_scheduleHydration = function (target) {
1651716517
};
1651816518
var isomorphicReactPackageVersion$jscomp$inline_1821 = React.version;
1651916519
if (
16520-
"19.0.0-native-fb-de68d2f4-20241204" !==
16520+
"19.0.0-native-fb-4a8fc0f9-20241210" !==
1652116521
isomorphicReactPackageVersion$jscomp$inline_1821
1652216522
)
1652316523
throw Error(
1652416524
formatProdErrorMessage(
1652516525
527,
1652616526
isomorphicReactPackageVersion$jscomp$inline_1821,
16527-
"19.0.0-native-fb-de68d2f4-20241204"
16527+
"19.0.0-native-fb-4a8fc0f9-20241210"
1652816528
)
1652916529
);
1653016530
ReactDOMSharedInternals.findDOMNode = function (componentOrElement) {
@@ -16546,11 +16546,10 @@ ReactDOMSharedInternals.findDOMNode = function (componentOrElement) {
1654616546
};
1654716547
var internals$jscomp$inline_1828 = {
1654816548
bundleType: 0,
16549-
version: "19.0.0-native-fb-de68d2f4-20241204",
16549+
version: "19.0.0-native-fb-4a8fc0f9-20241210",
1655016550
rendererPackageName: "react-dom",
1655116551
currentDispatcherRef: ReactSharedInternals,
16552-
findFiberByHostInstance: getClosestInstanceFromNode,
16553-
reconcilerVersion: "19.0.0-native-fb-de68d2f4-20241204",
16552+
reconcilerVersion: "19.0.0-native-fb-4a8fc0f9-20241210",
1655416553
getLaneLabelMap: function () {
1655516554
for (
1655616555
var map = new Map(), lane = 1, index$292 = 0;
@@ -16669,4 +16668,4 @@ exports.hydrateRoot = function (container, initialChildren, options) {
1666916668
listenToAllSupportedEvents(container);
1667016669
return new ReactDOMHydrationRoot(initialChildren);
1667116670
};
16672-
exports.version = "19.0.0-native-fb-de68d2f4-20241204";
16671+
exports.version = "19.0.0-native-fb-4a8fc0f9-20241210";

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

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<8090e4e1a96875999b0b1e929689f54a>>
10+
* @generated SignedSource<<e93dd6e3a8be643d8843d7f48e9c77ad>>
1111
*/
1212

1313
/*
@@ -25855,11 +25855,11 @@ __DEV__ &&
2585525855
};
2585625856
(function () {
2585725857
var isomorphicReactPackageVersion = React.version;
25858-
if ("19.0.0-native-fb-de68d2f4-20241204" !== isomorphicReactPackageVersion)
25858+
if ("19.0.0-native-fb-4a8fc0f9-20241210" !== isomorphicReactPackageVersion)
2585925859
throw Error(
2586025860
'Incompatible React versions: The "react" and "react-dom" packages must have the exact same version. Instead got:\n - react: ' +
2586125861
(isomorphicReactPackageVersion +
25862-
"\n - react-dom: 19.0.0-native-fb-de68d2f4-20241204\nLearn more: https://react.dev/warnings/version-mismatch")
25862+
"\n - react-dom: 19.0.0-native-fb-4a8fc0f9-20241210\nLearn more: https://react.dev/warnings/version-mismatch")
2586325863
);
2586425864
})();
2586525865
("function" === typeof Map &&
@@ -25896,11 +25896,10 @@ __DEV__ &&
2589625896
!(function () {
2589725897
var internals = {
2589825898
bundleType: 1,
25899-
version: "19.0.0-native-fb-de68d2f4-20241204",
25899+
version: "19.0.0-native-fb-4a8fc0f9-20241210",
2590025900
rendererPackageName: "react-dom",
2590125901
currentDispatcherRef: ReactSharedInternals,
25902-
findFiberByHostInstance: getClosestInstanceFromNode,
25903-
reconcilerVersion: "19.0.0-native-fb-de68d2f4-20241204"
25902+
reconcilerVersion: "19.0.0-native-fb-4a8fc0f9-20241210"
2590425903
};
2590525904
internals.overrideHookState = overrideHookState;
2590625905
internals.overrideHookStateDeletePath = overrideHookStateDeletePath;
@@ -26360,7 +26359,7 @@ __DEV__ &&
2636026359
exports.useFormStatus = function () {
2636126360
return resolveDispatcher().useHostTransitionStatus();
2636226361
};
26363-
exports.version = "19.0.0-native-fb-de68d2f4-20241204";
26362+
exports.version = "19.0.0-native-fb-4a8fc0f9-20241210";
2636426363
"undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
2636526364
"function" ===
2636626365
typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&

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

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<046ea9b9730f6e8d6a381272708c7682>>
10+
* @generated SignedSource<<50843be80492526f107d37d07948cc75>>
1111
*/
1212

1313
/*
@@ -15875,14 +15875,14 @@ ReactDOMHydrationRoot.prototype.unstable_scheduleHydration = function (target) {
1587515875
};
1587615876
var isomorphicReactPackageVersion$jscomp$inline_1732 = React.version;
1587715877
if (
15878-
"19.0.0-native-fb-de68d2f4-20241204" !==
15878+
"19.0.0-native-fb-4a8fc0f9-20241210" !==
1587915879
isomorphicReactPackageVersion$jscomp$inline_1732
1588015880
)
1588115881
throw Error(
1588215882
formatProdErrorMessage(
1588315883
527,
1588415884
isomorphicReactPackageVersion$jscomp$inline_1732,
15885-
"19.0.0-native-fb-de68d2f4-20241204"
15885+
"19.0.0-native-fb-4a8fc0f9-20241210"
1588615886
)
1588715887
);
1588815888
ReactDOMSharedInternals.findDOMNode = function (componentOrElement) {
@@ -15904,11 +15904,10 @@ ReactDOMSharedInternals.findDOMNode = function (componentOrElement) {
1590415904
};
1590515905
var internals$jscomp$inline_2189 = {
1590615906
bundleType: 0,
15907-
version: "19.0.0-native-fb-de68d2f4-20241204",
15907+
version: "19.0.0-native-fb-4a8fc0f9-20241210",
1590815908
rendererPackageName: "react-dom",
1590915909
currentDispatcherRef: ReactSharedInternals,
15910-
findFiberByHostInstance: getClosestInstanceFromNode,
15911-
reconcilerVersion: "19.0.0-native-fb-de68d2f4-20241204"
15910+
reconcilerVersion: "19.0.0-native-fb-4a8fc0f9-20241210"
1591215911
};
1591315912
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
1591415913
var hook$jscomp$inline_2190 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
@@ -16166,4 +16165,4 @@ exports.useFormState = function (action, initialState, permalink) {
1616616165
exports.useFormStatus = function () {
1616716166
return ReactSharedInternals.H.useHostTransitionStatus();
1616816167
};
16169-
exports.version = "19.0.0-native-fb-de68d2f4-20241204";
16168+
exports.version = "19.0.0-native-fb-4a8fc0f9-20241210";

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

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<20d4f0ac43edf7059230122ab79fd535>>
10+
* @generated SignedSource<<58ef98c12ee11305732c4d771d986c86>>
1111
*/
1212

1313
/*
@@ -16532,14 +16532,14 @@ ReactDOMHydrationRoot.prototype.unstable_scheduleHydration = function (target) {
1653216532
};
1653316533
var isomorphicReactPackageVersion$jscomp$inline_1822 = React.version;
1653416534
if (
16535-
"19.0.0-native-fb-de68d2f4-20241204" !==
16535+
"19.0.0-native-fb-4a8fc0f9-20241210" !==
1653616536
isomorphicReactPackageVersion$jscomp$inline_1822
1653716537
)
1653816538
throw Error(
1653916539
formatProdErrorMessage(
1654016540
527,
1654116541
isomorphicReactPackageVersion$jscomp$inline_1822,
16542-
"19.0.0-native-fb-de68d2f4-20241204"
16542+
"19.0.0-native-fb-4a8fc0f9-20241210"
1654316543
)
1654416544
);
1654516545
ReactDOMSharedInternals.findDOMNode = function (componentOrElement) {
@@ -16561,11 +16561,10 @@ ReactDOMSharedInternals.findDOMNode = function (componentOrElement) {
1656116561
};
1656216562
var internals$jscomp$inline_1829 = {
1656316563
bundleType: 0,
16564-
version: "19.0.0-native-fb-de68d2f4-20241204",
16564+
version: "19.0.0-native-fb-4a8fc0f9-20241210",
1656516565
rendererPackageName: "react-dom",
1656616566
currentDispatcherRef: ReactSharedInternals,
16567-
findFiberByHostInstance: getClosestInstanceFromNode,
16568-
reconcilerVersion: "19.0.0-native-fb-de68d2f4-20241204",
16567+
reconcilerVersion: "19.0.0-native-fb-4a8fc0f9-20241210",
1656916568
getLaneLabelMap: function () {
1657016569
for (
1657116570
var map = new Map(), lane = 1, index$292 = 0;
@@ -16838,7 +16837,7 @@ exports.useFormState = function (action, initialState, permalink) {
1683816837
exports.useFormStatus = function () {
1683916838
return ReactSharedInternals.H.useHostTransitionStatus();
1684016839
};
16841-
exports.version = "19.0.0-native-fb-de68d2f4-20241204";
16840+
exports.version = "19.0.0-native-fb-4a8fc0f9-20241210";
1684216841
"undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
1684316842
"function" ===
1684416843
typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&

0 commit comments

Comments
 (0)