Skip to content

Commit 428831b

Browse files
gnoffgnoff
committed
[Flight Reply] Reject any new Chunks not yet discovered at the time of reportGlobalError (#31840)
We might have already resolved models that are not pending and so are not rejected by aborting the stream. When those later get parsed they might discover new chunks which end up as pending. These should be errored since they will never be able to resolve later. This avoids infinitely hanging the stream. This same fix needs to be ported to ReactFlightClient that has the same issue. DiffTrain build for [ef979d4](ef979d4)
1 parent f2bb2d4 commit 428831b

24 files changed

+97
-108
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.1.0-native-fb-95465dc4-20241218
1+
19.1.0-native-fb-ef979d47-20241218

‎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<<4309e198b8c1d38899787d07722ff98e>>
10+
* @generated SignedSource<<3dde4659ba6314ab5bb76e44c38111f2>>
1111
*/
1212

1313
"use strict";
@@ -420,5 +420,5 @@ __DEV__ &&
420420
exports.useFormStatus = function () {
421421
return resolveDispatcher().useHostTransitionStatus();
422422
};
423-
exports.version = "19.1.0-native-fb-95465dc4-20241218";
423+
exports.version = "19.1.0-native-fb-ef979d47-20241218";
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<<20d9f95468914c57d38cd6f9b609bbfb>>
10+
* @generated SignedSource<<a3dd833c55d72c75ede167f0ed408958>>
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.1.0-native-fb-95465dc4-20241218";
206+
exports.version = "19.1.0-native-fb-ef979d47-20241218";

‎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<<20d9f95468914c57d38cd6f9b609bbfb>>
10+
* @generated SignedSource<<a3dd833c55d72c75ede167f0ed408958>>
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.1.0-native-fb-95465dc4-20241218";
206+
exports.version = "19.1.0-native-fb-ef979d47-20241218";

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

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

1313
/*
@@ -25852,11 +25852,11 @@ __DEV__ &&
2585225852
};
2585325853
(function () {
2585425854
var isomorphicReactPackageVersion = React.version;
25855-
if ("19.1.0-native-fb-95465dc4-20241218" !== isomorphicReactPackageVersion)
25855+
if ("19.1.0-native-fb-ef979d47-20241218" !== isomorphicReactPackageVersion)
2585625856
throw Error(
2585725857
'Incompatible React versions: The "react" and "react-dom" packages must have the exact same version. Instead got:\n - react: ' +
2585825858
(isomorphicReactPackageVersion +
25859-
"\n - react-dom: 19.1.0-native-fb-95465dc4-20241218\nLearn more: https://react.dev/warnings/version-mismatch")
25859+
"\n - react-dom: 19.1.0-native-fb-ef979d47-20241218\nLearn more: https://react.dev/warnings/version-mismatch")
2586025860
);
2586125861
})();
2586225862
("function" === typeof Map &&
@@ -25893,10 +25893,10 @@ __DEV__ &&
2589325893
!(function () {
2589425894
var internals = {
2589525895
bundleType: 1,
25896-
version: "19.1.0-native-fb-95465dc4-20241218",
25896+
version: "19.1.0-native-fb-ef979d47-20241218",
2589725897
rendererPackageName: "react-dom",
2589825898
currentDispatcherRef: ReactSharedInternals,
25899-
reconcilerVersion: "19.1.0-native-fb-95465dc4-20241218"
25899+
reconcilerVersion: "19.1.0-native-fb-ef979d47-20241218"
2590025900
};
2590125901
internals.overrideHookState = overrideHookState;
2590225902
internals.overrideHookStateDeletePath = overrideHookStateDeletePath;
@@ -26042,5 +26042,5 @@ __DEV__ &&
2604226042
listenToAllSupportedEvents(container);
2604326043
return new ReactDOMHydrationRoot(initialChildren);
2604426044
};
26045-
exports.version = "19.1.0-native-fb-95465dc4-20241218";
26045+
exports.version = "19.1.0-native-fb-ef979d47-20241218";
2604626046
})();

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

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

1313
/*
@@ -15869,14 +15869,14 @@ ReactDOMHydrationRoot.prototype.unstable_scheduleHydration = function (target) {
1586915869
};
1587015870
var isomorphicReactPackageVersion$jscomp$inline_1724 = React.version;
1587115871
if (
15872-
"19.1.0-native-fb-95465dc4-20241218" !==
15872+
"19.1.0-native-fb-ef979d47-20241218" !==
1587315873
isomorphicReactPackageVersion$jscomp$inline_1724
1587415874
)
1587515875
throw Error(
1587615876
formatProdErrorMessage(
1587715877
527,
1587815878
isomorphicReactPackageVersion$jscomp$inline_1724,
15879-
"19.1.0-native-fb-95465dc4-20241218"
15879+
"19.1.0-native-fb-ef979d47-20241218"
1588015880
)
1588115881
);
1588215882
ReactDOMSharedInternals.findDOMNode = function (componentOrElement) {
@@ -15898,10 +15898,10 @@ ReactDOMSharedInternals.findDOMNode = function (componentOrElement) {
1589815898
};
1589915899
var internals$jscomp$inline_2179 = {
1590015900
bundleType: 0,
15901-
version: "19.1.0-native-fb-95465dc4-20241218",
15901+
version: "19.1.0-native-fb-ef979d47-20241218",
1590215902
rendererPackageName: "react-dom",
1590315903
currentDispatcherRef: ReactSharedInternals,
15904-
reconcilerVersion: "19.1.0-native-fb-95465dc4-20241218"
15904+
reconcilerVersion: "19.1.0-native-fb-ef979d47-20241218"
1590515905
};
1590615906
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
1590715907
var hook$jscomp$inline_2180 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
@@ -16007,4 +16007,4 @@ exports.hydrateRoot = function (container, initialChildren, options) {
1600716007
listenToAllSupportedEvents(container);
1600816008
return new ReactDOMHydrationRoot(initialChildren);
1600916009
};
16010-
exports.version = "19.1.0-native-fb-95465dc4-20241218";
16010+
exports.version = "19.1.0-native-fb-ef979d47-20241218";

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

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

1313
/*
@@ -16522,14 +16522,14 @@ ReactDOMHydrationRoot.prototype.unstable_scheduleHydration = function (target) {
1652216522
};
1652316523
var isomorphicReactPackageVersion$jscomp$inline_1814 = React.version;
1652416524
if (
16525-
"19.1.0-native-fb-95465dc4-20241218" !==
16525+
"19.1.0-native-fb-ef979d47-20241218" !==
1652616526
isomorphicReactPackageVersion$jscomp$inline_1814
1652716527
)
1652816528
throw Error(
1652916529
formatProdErrorMessage(
1653016530
527,
1653116531
isomorphicReactPackageVersion$jscomp$inline_1814,
16532-
"19.1.0-native-fb-95465dc4-20241218"
16532+
"19.1.0-native-fb-ef979d47-20241218"
1653316533
)
1653416534
);
1653516535
ReactDOMSharedInternals.findDOMNode = function (componentOrElement) {
@@ -16551,10 +16551,10 @@ ReactDOMSharedInternals.findDOMNode = function (componentOrElement) {
1655116551
};
1655216552
var internals$jscomp$inline_1821 = {
1655316553
bundleType: 0,
16554-
version: "19.1.0-native-fb-95465dc4-20241218",
16554+
version: "19.1.0-native-fb-ef979d47-20241218",
1655516555
rendererPackageName: "react-dom",
1655616556
currentDispatcherRef: ReactSharedInternals,
16557-
reconcilerVersion: "19.1.0-native-fb-95465dc4-20241218",
16557+
reconcilerVersion: "19.1.0-native-fb-ef979d47-20241218",
1655816558
getLaneLabelMap: function () {
1655916559
for (
1656016560
var map = new Map(), lane = 1, index$292 = 0;
@@ -16675,4 +16675,4 @@ exports.hydrateRoot = function (container, initialChildren, options) {
1667516675
listenToAllSupportedEvents(container);
1667616676
return new ReactDOMHydrationRoot(initialChildren);
1667716677
};
16678-
exports.version = "19.1.0-native-fb-95465dc4-20241218";
16678+
exports.version = "19.1.0-native-fb-ef979d47-20241218";

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

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

1313
/*
@@ -25913,11 +25913,11 @@ __DEV__ &&
2591325913
};
2591425914
(function () {
2591525915
var isomorphicReactPackageVersion = React.version;
25916-
if ("19.1.0-native-fb-95465dc4-20241218" !== isomorphicReactPackageVersion)
25916+
if ("19.1.0-native-fb-ef979d47-20241218" !== isomorphicReactPackageVersion)
2591725917
throw Error(
2591825918
'Incompatible React versions: The "react" and "react-dom" packages must have the exact same version. Instead got:\n - react: ' +
2591925919
(isomorphicReactPackageVersion +
25920-
"\n - react-dom: 19.1.0-native-fb-95465dc4-20241218\nLearn more: https://react.dev/warnings/version-mismatch")
25920+
"\n - react-dom: 19.1.0-native-fb-ef979d47-20241218\nLearn more: https://react.dev/warnings/version-mismatch")
2592125921
);
2592225922
})();
2592325923
("function" === typeof Map &&
@@ -25954,10 +25954,10 @@ __DEV__ &&
2595425954
!(function () {
2595525955
var internals = {
2595625956
bundleType: 1,
25957-
version: "19.1.0-native-fb-95465dc4-20241218",
25957+
version: "19.1.0-native-fb-ef979d47-20241218",
2595825958
rendererPackageName: "react-dom",
2595925959
currentDispatcherRef: ReactSharedInternals,
25960-
reconcilerVersion: "19.1.0-native-fb-95465dc4-20241218"
25960+
reconcilerVersion: "19.1.0-native-fb-ef979d47-20241218"
2596125961
};
2596225962
internals.overrideHookState = overrideHookState;
2596325963
internals.overrideHookStateDeletePath = overrideHookStateDeletePath;
@@ -26419,7 +26419,7 @@ __DEV__ &&
2641926419
exports.useFormStatus = function () {
2642026420
return resolveDispatcher().useHostTransitionStatus();
2642126421
};
26422-
exports.version = "19.1.0-native-fb-95465dc4-20241218";
26422+
exports.version = "19.1.0-native-fb-ef979d47-20241218";
2642326423
"undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
2642426424
"function" ===
2642526425
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 & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<405b68007cfbe76cc8a2773a612e284d>>
10+
* @generated SignedSource<<16d3216e1479de204a632072458b4991>>
1111
*/
1212

1313
/*
@@ -15880,14 +15880,14 @@ ReactDOMHydrationRoot.prototype.unstable_scheduleHydration = function (target) {
1588015880
};
1588115881
var isomorphicReactPackageVersion$jscomp$inline_1725 = React.version;
1588215882
if (
15883-
"19.1.0-native-fb-95465dc4-20241218" !==
15883+
"19.1.0-native-fb-ef979d47-20241218" !==
1588415884
isomorphicReactPackageVersion$jscomp$inline_1725
1588515885
)
1588615886
throw Error(
1588715887
formatProdErrorMessage(
1588815888
527,
1588915889
isomorphicReactPackageVersion$jscomp$inline_1725,
15890-
"19.1.0-native-fb-95465dc4-20241218"
15890+
"19.1.0-native-fb-ef979d47-20241218"
1589115891
)
1589215892
);
1589315893
ReactDOMSharedInternals.findDOMNode = function (componentOrElement) {
@@ -15909,10 +15909,10 @@ ReactDOMSharedInternals.findDOMNode = function (componentOrElement) {
1590915909
};
1591015910
var internals$jscomp$inline_2182 = {
1591115911
bundleType: 0,
15912-
version: "19.1.0-native-fb-95465dc4-20241218",
15912+
version: "19.1.0-native-fb-ef979d47-20241218",
1591315913
rendererPackageName: "react-dom",
1591415914
currentDispatcherRef: ReactSharedInternals,
15915-
reconcilerVersion: "19.1.0-native-fb-95465dc4-20241218"
15915+
reconcilerVersion: "19.1.0-native-fb-ef979d47-20241218"
1591615916
};
1591715917
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
1591815918
var hook$jscomp$inline_2183 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
@@ -16172,4 +16172,4 @@ exports.useFormState = function (action, initialState, permalink) {
1617216172
exports.useFormStatus = function () {
1617316173
return ReactSharedInternals.H.useHostTransitionStatus();
1617416174
};
16175-
exports.version = "19.1.0-native-fb-95465dc4-20241218";
16175+
exports.version = "19.1.0-native-fb-ef979d47-20241218";

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

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

1313
/*
@@ -16537,14 +16537,14 @@ ReactDOMHydrationRoot.prototype.unstable_scheduleHydration = function (target) {
1653716537
};
1653816538
var isomorphicReactPackageVersion$jscomp$inline_1815 = React.version;
1653916539
if (
16540-
"19.1.0-native-fb-95465dc4-20241218" !==
16540+
"19.1.0-native-fb-ef979d47-20241218" !==
1654116541
isomorphicReactPackageVersion$jscomp$inline_1815
1654216542
)
1654316543
throw Error(
1654416544
formatProdErrorMessage(
1654516545
527,
1654616546
isomorphicReactPackageVersion$jscomp$inline_1815,
16547-
"19.1.0-native-fb-95465dc4-20241218"
16547+
"19.1.0-native-fb-ef979d47-20241218"
1654816548
)
1654916549
);
1655016550
ReactDOMSharedInternals.findDOMNode = function (componentOrElement) {
@@ -16566,10 +16566,10 @@ ReactDOMSharedInternals.findDOMNode = function (componentOrElement) {
1656616566
};
1656716567
var internals$jscomp$inline_1822 = {
1656816568
bundleType: 0,
16569-
version: "19.1.0-native-fb-95465dc4-20241218",
16569+
version: "19.1.0-native-fb-ef979d47-20241218",
1657016570
rendererPackageName: "react-dom",
1657116571
currentDispatcherRef: ReactSharedInternals,
16572-
reconcilerVersion: "19.1.0-native-fb-95465dc4-20241218",
16572+
reconcilerVersion: "19.1.0-native-fb-ef979d47-20241218",
1657316573
getLaneLabelMap: function () {
1657416574
for (
1657516575
var map = new Map(), lane = 1, index$292 = 0;
@@ -16844,7 +16844,7 @@ exports.useFormState = function (action, initialState, permalink) {
1684416844
exports.useFormStatus = function () {
1684516845
return ReactSharedInternals.H.useHostTransitionStatus();
1684616846
};
16847-
exports.version = "19.1.0-native-fb-95465dc4-20241218";
16847+
exports.version = "19.1.0-native-fb-ef979d47-20241218";
1684816848
"undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
1684916849
"function" ===
1685016850
typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&

0 commit comments

Comments
 (0)