Skip to content

Commit

Permalink
Unfreeze the react-dom/server interface (#11531)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
travi authored and gaearon committed Nov 13, 2017
1 parent 2fe3494 commit 901a091
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 8 deletions.
8 changes: 7 additions & 1 deletion packages/react-dom/server.browser.js
Expand Up @@ -9,4 +9,10 @@

'use strict';

module.exports = require('./src/server/ReactDOMServerBrowser');
var ReactDOMServer = require('./src/server/ReactDOMServerBrowser');

// TODO: decide on the top-level export form.
// This is hacky but makes it work with both Rollup and Jest
module.exports = ReactDOMServer.default
? ReactDOMServer.default
: ReactDOMServer;
8 changes: 7 additions & 1 deletion packages/react-dom/server.node.js
Expand Up @@ -9,4 +9,10 @@

'use strict';

module.exports = require('./src/server/ReactDOMServerNode');
var ReactDOMServer = require('./src/server/ReactDOMServerNode');

// TODO: decide on the top-level export form.
// This is hacky but makes it work with both Rollup and Jest
module.exports = ReactDOMServer.default
? ReactDOMServer.default
: ReactDOMServer;
6 changes: 3 additions & 3 deletions packages/react-dom/src/server/ReactDOMServerBrowser.js
Expand Up @@ -27,11 +27,11 @@ function renderToStaticNodeStream() {
);
}

export {
// Note: when changing this, also consider https://github.com/facebook/react/issues/11526
export default {
renderToString,
renderToStaticMarkup,
renderToNodeStream,
renderToStaticNodeStream,
version: ReactVersion,
};

export const version = ReactVersion;
6 changes: 3 additions & 3 deletions packages/react-dom/src/server/ReactDOMServerNode.js
Expand Up @@ -14,11 +14,11 @@ import {
renderToStaticNodeStream,
} from './ReactDOMNodeStreamRenderer';

export {
// Note: when changing this, also consider https://github.com/facebook/react/issues/11526
export default {
renderToString,
renderToStaticMarkup,
renderToNodeStream,
renderToStaticNodeStream,
version: ReactVersion,
};

export const version = ReactVersion;

0 comments on commit 901a091

Please sign in to comment.