Skip to content

Commit 901a091

Browse files
travigaearon
authored andcommitted
Unfreeze the react-dom/server interface (#11531)
* Unfreeze the react-dom/server interface this allows stubbing of the exposed named functions, as was possible before v16.1 fixes #11526 * Fix missing version export * Fix missing version export * Whitespace
1 parent 2fe3494 commit 901a091

File tree

4 files changed

+20
-8
lines changed

4 files changed

+20
-8
lines changed

packages/react-dom/server.browser.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,10 @@
99

1010
'use strict';
1111

12-
module.exports = require('./src/server/ReactDOMServerBrowser');
12+
var ReactDOMServer = require('./src/server/ReactDOMServerBrowser');
13+
14+
// TODO: decide on the top-level export form.
15+
// This is hacky but makes it work with both Rollup and Jest
16+
module.exports = ReactDOMServer.default
17+
? ReactDOMServer.default
18+
: ReactDOMServer;

packages/react-dom/server.node.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,10 @@
99

1010
'use strict';
1111

12-
module.exports = require('./src/server/ReactDOMServerNode');
12+
var ReactDOMServer = require('./src/server/ReactDOMServerNode');
13+
14+
// TODO: decide on the top-level export form.
15+
// This is hacky but makes it work with both Rollup and Jest
16+
module.exports = ReactDOMServer.default
17+
? ReactDOMServer.default
18+
: ReactDOMServer;

packages/react-dom/src/server/ReactDOMServerBrowser.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ function renderToStaticNodeStream() {
2727
);
2828
}
2929

30-
export {
30+
// Note: when changing this, also consider https://github.com/facebook/react/issues/11526
31+
export default {
3132
renderToString,
3233
renderToStaticMarkup,
3334
renderToNodeStream,
3435
renderToStaticNodeStream,
36+
version: ReactVersion,
3537
};
36-
37-
export const version = ReactVersion;

packages/react-dom/src/server/ReactDOMServerNode.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ import {
1414
renderToStaticNodeStream,
1515
} from './ReactDOMNodeStreamRenderer';
1616

17-
export {
17+
// Note: when changing this, also consider https://github.com/facebook/react/issues/11526
18+
export default {
1819
renderToString,
1920
renderToStaticMarkup,
2021
renderToNodeStream,
2122
renderToStaticNodeStream,
23+
version: ReactVersion,
2224
};
23-
24-
export const version = ReactVersion;

0 commit comments

Comments
 (0)