Skip to content

Commit

Permalink
Rejct toWarnDev if given callback throws (#26003)
Browse files Browse the repository at this point in the history
## Summary

Should unblock facebook/react#25970
If the callback for `toWarnDev` was `async` and threw, we didn't
ultimately reject the await Promise from the matcher. This resulted in
tests failing even though the failure was expected due to a test gate.

## How did you test this change?

- [x] tested in facebook/react#25970 with `yarn
test --r=stable --env=development
packages/react-dom/src/__tests__/ReactDOMFizzServer-test.js --watch`
- [x] `yarn test`
- [x] CI

DiffTrain build for [4f8ffec453c41fcb6e98cb4e003f7319bb1c81b9](facebook/react@4f8ffec)
[View git log for this commit](https://github.com/facebook/react/commits/4f8ffec453c41fcb6e98cb4e003f7319bb1c81b9)
  • Loading branch information
jerrydev0927 committed Jan 15, 2023
1 parent 9a2fa9b commit 97c780c
Show file tree
Hide file tree
Showing 28 changed files with 42 additions and 42 deletions.
2 changes: 1 addition & 1 deletion compiled/facebook-www/REVISION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0e31dd028e8032ef433aea87268a5fd41cfb66a4
4f8ffec453c41fcb6e98cb4e003f7319bb1c81b9
2 changes: 1 addition & 1 deletion compiled/facebook-www/REVISION_TRANSFORMS
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0e31dd028e8032ef433aea87268a5fd41cfb66a4
4f8ffec453c41fcb6e98cb4e003f7319bb1c81b9
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 @@ -27,7 +27,7 @@ if (
}
"use strict";

var ReactVersion = "18.3.0-www-classic-0e31dd028-20230113";
var ReactVersion = "18.3.0-www-classic-4f8ffec45-20230115";

// ATTENTION
// When adding new symbols to this file,
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 @@ -27,7 +27,7 @@ if (
}
"use strict";

var ReactVersion = "18.3.0-www-modern-0e31dd028-20230113";
var ReactVersion = "18.3.0-www-modern-4f8ffec45-20230115";

// ATTENTION
// When adding new symbols to this file,
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 @@ -643,4 +643,4 @@ exports.useSyncExternalStore = function(
);
};
exports.useTransition = useTransition;
exports.version = "18.3.0-www-classic-0e31dd028-20230113";
exports.version = "18.3.0-www-classic-4f8ffec45-20230115";
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 @@ -635,4 +635,4 @@ exports.useSyncExternalStore = function(
);
};
exports.useTransition = useTransition;
exports.version = "18.3.0-www-modern-0e31dd028-20230113";
exports.version = "18.3.0-www-modern-4f8ffec45-20230115";
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 @@ -654,7 +654,7 @@ exports.useSyncExternalStore = function(
);
};
exports.useTransition = useTransition;
exports.version = "18.3.0-www-classic-0e31dd028-20230113";
exports.version = "18.3.0-www-classic-4f8ffec45-20230115";

/* global __REACT_DEVTOOLS_GLOBAL_HOOK__ */
if (
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 @@ -646,7 +646,7 @@ exports.useSyncExternalStore = function(
);
};
exports.useTransition = useTransition;
exports.version = "18.3.0-www-modern-0e31dd028-20230113";
exports.version = "18.3.0-www-modern-4f8ffec45-20230115";

/* global __REACT_DEVTOOLS_GLOBAL_HOOK__ */
if (
Expand Down
2 changes: 1 addition & 1 deletion 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-0e31dd028-20230113";
var ReactVersion = "18.3.0-www-classic-4f8ffec45-20230115";

var LegacyRoot = 0;
var ConcurrentRoot = 1;
Expand Down
2 changes: 1 addition & 1 deletion 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-0e31dd028-20230113";
var ReactVersion = "18.3.0-www-modern-4f8ffec45-20230115";

var LegacyRoot = 0;
var ConcurrentRoot = 1;
Expand Down
4 changes: 2 additions & 2 deletions compiled/facebook-www/ReactART-prod.classic.js
Original file line number Diff line number Diff line change
Expand Up @@ -9804,7 +9804,7 @@ var slice = Array.prototype.slice,
return null;
},
bundleType: 0,
version: "18.3.0-www-classic-0e31dd028-20230113",
version: "18.3.0-www-classic-4f8ffec45-20230115",
rendererPackageName: "react-art"
};
var internals$jscomp$inline_1318 = {
Expand Down Expand Up @@ -9835,7 +9835,7 @@ var internals$jscomp$inline_1318 = {
scheduleRoot: null,
setRefreshHandler: null,
getCurrentFiber: null,
reconcilerVersion: "18.3.0-next-0e31dd028-20230113"
reconcilerVersion: "18.3.0-next-4f8ffec45-20230115"
};
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
var hook$jscomp$inline_1319 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
Expand Down
4 changes: 2 additions & 2 deletions compiled/facebook-www/ReactART-prod.modern.js
Original file line number Diff line number Diff line change
Expand Up @@ -9471,7 +9471,7 @@ var slice = Array.prototype.slice,
return null;
},
bundleType: 0,
version: "18.3.0-www-modern-0e31dd028-20230113",
version: "18.3.0-www-modern-4f8ffec45-20230115",
rendererPackageName: "react-art"
};
var internals$jscomp$inline_1309 = {
Expand Down Expand Up @@ -9502,7 +9502,7 @@ var internals$jscomp$inline_1309 = {
scheduleRoot: null,
setRefreshHandler: null,
getCurrentFiber: null,
reconcilerVersion: "18.3.0-next-0e31dd028-20230113"
reconcilerVersion: "18.3.0-next-4f8ffec45-20230115"
};
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
var hook$jscomp$inline_1310 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
Expand Down
2 changes: 1 addition & 1 deletion compiled/facebook-www/ReactDOM-dev.classic.js
Original file line number Diff line number Diff line change
Expand Up @@ -42667,7 +42667,7 @@ function createFiberRoot(
return root;
}

var ReactVersion = "18.3.0-www-classic-0e31dd028-20230113";
var ReactVersion = "18.3.0-www-classic-4f8ffec45-20230115";

function createPortal(
children,
Expand Down
2 changes: 1 addition & 1 deletion compiled/facebook-www/ReactDOM-dev.modern.js
Original file line number Diff line number Diff line change
Expand Up @@ -42391,7 +42391,7 @@ function createFiberRoot(
return root;
}

var ReactVersion = "18.3.0-www-modern-0e31dd028-20230113";
var ReactVersion = "18.3.0-www-modern-4f8ffec45-20230115";

function createPortal(
children,
Expand Down
6 changes: 3 additions & 3 deletions compiled/facebook-www/ReactDOM-prod.classic.js
Original file line number Diff line number Diff line change
Expand Up @@ -15529,7 +15529,7 @@ Internals.Events = [
var devToolsConfig$jscomp$inline_1750 = {
findFiberByHostInstance: getClosestInstanceFromNode,
bundleType: 0,
version: "18.3.0-www-classic-0e31dd028-20230113",
version: "18.3.0-www-classic-4f8ffec45-20230115",
rendererPackageName: "react-dom"
};
var internals$jscomp$inline_2134 = {
Expand Down Expand Up @@ -15559,7 +15559,7 @@ var internals$jscomp$inline_2134 = {
scheduleRoot: null,
setRefreshHandler: null,
getCurrentFiber: null,
reconcilerVersion: "18.3.0-next-0e31dd028-20230113"
reconcilerVersion: "18.3.0-next-4f8ffec45-20230115"
};
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
var hook$jscomp$inline_2135 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
Expand Down Expand Up @@ -15801,4 +15801,4 @@ exports.unstable_renderSubtreeIntoContainer = function(
);
};
exports.unstable_runWithPriority = runWithPriority;
exports.version = "18.3.0-next-0e31dd028-20230113";
exports.version = "18.3.0-next-4f8ffec45-20230115";
6 changes: 3 additions & 3 deletions compiled/facebook-www/ReactDOM-prod.modern.js
Original file line number Diff line number Diff line change
Expand Up @@ -15090,7 +15090,7 @@ Internals.Events = [
var devToolsConfig$jscomp$inline_1718 = {
findFiberByHostInstance: getClosestInstanceFromNode,
bundleType: 0,
version: "18.3.0-www-modern-0e31dd028-20230113",
version: "18.3.0-www-modern-4f8ffec45-20230115",
rendererPackageName: "react-dom"
};
var internals$jscomp$inline_2109 = {
Expand Down Expand Up @@ -15121,7 +15121,7 @@ var internals$jscomp$inline_2109 = {
scheduleRoot: null,
setRefreshHandler: null,
getCurrentFiber: null,
reconcilerVersion: "18.3.0-next-0e31dd028-20230113"
reconcilerVersion: "18.3.0-next-4f8ffec45-20230115"
};
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
var hook$jscomp$inline_2110 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
Expand Down Expand Up @@ -15309,4 +15309,4 @@ exports.unstable_flushControlled = function(fn) {
}
};
exports.unstable_runWithPriority = runWithPriority;
exports.version = "18.3.0-next-0e31dd028-20230113";
exports.version = "18.3.0-next-4f8ffec45-20230115";
6 changes: 3 additions & 3 deletions compiled/facebook-www/ReactDOM-profiling.classic.js
Original file line number Diff line number Diff line change
Expand Up @@ -16299,7 +16299,7 @@ Internals.Events = [
var devToolsConfig$jscomp$inline_1824 = {
findFiberByHostInstance: getClosestInstanceFromNode,
bundleType: 0,
version: "18.3.0-www-classic-0e31dd028-20230113",
version: "18.3.0-www-classic-4f8ffec45-20230115",
rendererPackageName: "react-dom"
};
(function(internals) {
Expand Down Expand Up @@ -16343,7 +16343,7 @@ var devToolsConfig$jscomp$inline_1824 = {
scheduleRoot: null,
setRefreshHandler: null,
getCurrentFiber: null,
reconcilerVersion: "18.3.0-next-0e31dd028-20230113"
reconcilerVersion: "18.3.0-next-4f8ffec45-20230115"
});
assign(Internals, {
ReactBrowserEventEmitter: {
Expand Down Expand Up @@ -16572,7 +16572,7 @@ exports.unstable_renderSubtreeIntoContainer = function(
);
};
exports.unstable_runWithPriority = runWithPriority;
exports.version = "18.3.0-next-0e31dd028-20230113";
exports.version = "18.3.0-next-4f8ffec45-20230115";

/* global __REACT_DEVTOOLS_GLOBAL_HOOK__ */
if (
Expand Down
6 changes: 3 additions & 3 deletions compiled/facebook-www/ReactDOM-profiling.modern.js
Original file line number Diff line number Diff line change
Expand Up @@ -15850,7 +15850,7 @@ Internals.Events = [
var devToolsConfig$jscomp$inline_1792 = {
findFiberByHostInstance: getClosestInstanceFromNode,
bundleType: 0,
version: "18.3.0-www-modern-0e31dd028-20230113",
version: "18.3.0-www-modern-4f8ffec45-20230115",
rendererPackageName: "react-dom"
};
(function(internals) {
Expand Down Expand Up @@ -15895,7 +15895,7 @@ var devToolsConfig$jscomp$inline_1792 = {
scheduleRoot: null,
setRefreshHandler: null,
getCurrentFiber: null,
reconcilerVersion: "18.3.0-next-0e31dd028-20230113"
reconcilerVersion: "18.3.0-next-4f8ffec45-20230115"
});
exports.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED = Internals;
exports.createPortal = function(children, container) {
Expand Down Expand Up @@ -16070,7 +16070,7 @@ exports.unstable_flushControlled = function(fn) {
}
};
exports.unstable_runWithPriority = runWithPriority;
exports.version = "18.3.0-next-0e31dd028-20230113";
exports.version = "18.3.0-next-4f8ffec45-20230115";

/* global __REACT_DEVTOOLS_GLOBAL_HOOK__ */
if (
Expand Down
2 changes: 1 addition & 1 deletion compiled/facebook-www/ReactDOMServer-dev.classic.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ if (__DEV__) {
var React = require("react");
var ReactDOM = require("react-dom");

var ReactVersion = "18.3.0-www-classic-0e31dd028-20230113";
var ReactVersion = "18.3.0-www-classic-4f8ffec45-20230115";

// This refers to a WWW module.
var warningWWW = require("warning");
Expand Down
2 changes: 1 addition & 1 deletion compiled/facebook-www/ReactDOMServer-dev.modern.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ if (__DEV__) {
var React = require("react");
var ReactDOM = require("react-dom");

var ReactVersion = "18.3.0-www-modern-0e31dd028-20230113";
var ReactVersion = "18.3.0-www-modern-4f8ffec45-20230115";

// This refers to a WWW module.
var warningWWW = require("warning");
Expand Down
2 changes: 1 addition & 1 deletion compiled/facebook-www/ReactDOMServer-prod.classic.js
Original file line number Diff line number Diff line change
Expand Up @@ -3633,4 +3633,4 @@ exports.renderToString = function(children, options) {
'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 = "18.3.0-www-classic-0e31dd028-20230113";
exports.version = "18.3.0-www-classic-4f8ffec45-20230115";
2 changes: 1 addition & 1 deletion compiled/facebook-www/ReactDOMServer-prod.modern.js
Original file line number Diff line number Diff line change
Expand Up @@ -3546,4 +3546,4 @@ exports.renderToString = function(children, options) {
'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 = "18.3.0-www-modern-0e31dd028-20230113";
exports.version = "18.3.0-www-modern-4f8ffec45-20230115";
2 changes: 1 addition & 1 deletion compiled/facebook-www/ReactDOMTesting-dev.classic.js
Original file line number Diff line number Diff line change
Expand Up @@ -31206,7 +31206,7 @@ function createFiberRoot(
return root;
}

var ReactVersion = "18.3.0-www-classic-0e31dd028-20230113";
var ReactVersion = "18.3.0-www-classic-4f8ffec45-20230115";

function createPortal(
children,
Expand Down
2 changes: 1 addition & 1 deletion compiled/facebook-www/ReactDOMTesting-dev.modern.js
Original file line number Diff line number Diff line change
Expand Up @@ -38519,7 +38519,7 @@ function createFiberRoot(
return root;
}

var ReactVersion = "18.3.0-www-modern-0e31dd028-20230113";
var ReactVersion = "18.3.0-www-modern-4f8ffec45-20230115";

function createPortal(
children,
Expand Down
6 changes: 3 additions & 3 deletions compiled/facebook-www/ReactDOMTesting-prod.classic.js
Original file line number Diff line number Diff line change
Expand Up @@ -11328,7 +11328,7 @@ Internals.Events = [
var devToolsConfig$jscomp$inline_1518 = {
findFiberByHostInstance: getClosestInstanceFromNode,
bundleType: 0,
version: "18.3.0-www-classic-0e31dd028-20230113",
version: "18.3.0-www-classic-4f8ffec45-20230115",
rendererPackageName: "react-dom"
};
var internals$jscomp$inline_2047 = {
Expand Down Expand Up @@ -11358,7 +11358,7 @@ var internals$jscomp$inline_2047 = {
scheduleRoot: null,
setRefreshHandler: null,
getCurrentFiber: null,
reconcilerVersion: "18.3.0-next-0e31dd028-20230113"
reconcilerVersion: "18.3.0-next-4f8ffec45-20230115"
};
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
var hook$jscomp$inline_2048 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
Expand Down Expand Up @@ -14847,4 +14847,4 @@ exports.unstable_renderSubtreeIntoContainer = function(
);
};
exports.unstable_runWithPriority = runWithPriority;
exports.version = "18.3.0-next-0e31dd028-20230113";
exports.version = "18.3.0-next-4f8ffec45-20230115";
6 changes: 3 additions & 3 deletions compiled/facebook-www/ReactDOMTesting-prod.modern.js
Original file line number Diff line number Diff line change
Expand Up @@ -13967,7 +13967,7 @@ Internals.Events = [
var devToolsConfig$jscomp$inline_1673 = {
findFiberByHostInstance: getClosestInstanceFromNode,
bundleType: 0,
version: "18.3.0-www-modern-0e31dd028-20230113",
version: "18.3.0-www-modern-4f8ffec45-20230115",
rendererPackageName: "react-dom"
};
var internals$jscomp$inline_2072 = {
Expand Down Expand Up @@ -13998,7 +13998,7 @@ var internals$jscomp$inline_2072 = {
scheduleRoot: null,
setRefreshHandler: null,
getCurrentFiber: null,
reconcilerVersion: "18.3.0-next-0e31dd028-20230113"
reconcilerVersion: "18.3.0-next-4f8ffec45-20230115"
};
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
var hook$jscomp$inline_2073 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
Expand Down Expand Up @@ -14321,4 +14321,4 @@ exports.unstable_flushControlled = function(fn) {
}
};
exports.unstable_runWithPriority = runWithPriority;
exports.version = "18.3.0-next-0e31dd028-20230113";
exports.version = "18.3.0-next-4f8ffec45-20230115";
2 changes: 1 addition & 1 deletion compiled/facebook-www/ReactTestRenderer-dev.classic.js
Original file line number Diff line number Diff line change
Expand Up @@ -23903,7 +23903,7 @@ function createFiberRoot(
return root;
}

var ReactVersion = "18.3.0-www-classic-0e31dd028-20230113";
var ReactVersion = "18.3.0-www-classic-4f8ffec45-20230115";

// Might add PROFILE later.

Expand Down
2 changes: 1 addition & 1 deletion compiled/facebook-www/ReactTestRenderer-dev.modern.js
Original file line number Diff line number Diff line change
Expand Up @@ -23903,7 +23903,7 @@ function createFiberRoot(
return root;
}

var ReactVersion = "18.3.0-www-modern-0e31dd028-20230113";
var ReactVersion = "18.3.0-www-modern-4f8ffec45-20230115";

// Might add PROFILE later.

Expand Down

0 comments on commit 97c780c

Please sign in to comment.