Unfreeze the react-dom/server interface (facebook#11531)

* Unfreeze the react-dom/server interface this allows stubbing of the exposed named functions, as was possible before v16.1 fixes facebook#11526 * Fix missing version export * Fix missing version export * Whitespace
Ethan-Arrowood · Dec 8, 2017 · c02d0ad · c02d0ad
1 parent 173373e
commit c02d0ad
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 8 deletions.
diff --git a/packages/react-dom/server.browser.js b/packages/react-dom/server.browser.js
@@ -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;
diff --git a/packages/react-dom/server.node.js b/packages/react-dom/server.node.js
@@ -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;
diff --git a/packages/react-dom/src/server/ReactDOMServerBrowser.js b/packages/react-dom/src/server/ReactDOMServerBrowser.js
@@ -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;
diff --git a/packages/react-dom/src/server/ReactDOMServerNode.js b/packages/react-dom/src/server/ReactDOMServerNode.js
@@ -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;