Convert the rest of react-dom and react-test-renderer to Named Exports

packages/react-dom/server.browser.js

@@ -7,10 +7,10 @@
  * @flow
  */
 
-'use strict';
-
-const 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;
+export {
+  renderToString,
+  renderToStaticMarkup,
+  renderToNodeStream,
+  renderToStaticNodeStream,
+  version,
+} from './src/server/ReactDOMServerBrowser';

packages/react-dom/server.js

@@ -7,6 +7,4 @@
  * @flow
  */
 
-'use strict';
-
-module.exports = require('./server.node');
+export * from './server.node';

packages/react-dom/server.node.js

@@ -7,10 +7,11 @@
  * @flow
  */
 
-'use strict';
-
-const 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;
+// For some reason Flow doesn't like export * in this file. I don't know why.
+export {
+  renderToString,
+  renderToStaticMarkup,
+  renderToNodeStream,
+  renderToStaticNodeStream,
+  version,
+} from './src/server/ReactDOMServerNode';

packages/react-dom/src/__tests__/ReactTestUtils-test.js

@@ -9,11 +9,11 @@
 
 'use strict';
 
-let createRenderer;
-let React;
-let ReactDOM;
-let ReactDOMServer;
-let ReactTestUtils;
+import ReactShallowRenderer from 'react-test-renderer/shallow';
+import * as React from 'react';
+import * as ReactDOM from 'react-dom';
+import * as ReactDOMServer from 'react-dom/server';
+import * as ReactTestUtils from 'react-dom/test-utils';
 
 function getTestDocument(markup) {
   const doc = document.implementation.createHTMLDocument('');
@@ -27,14 +27,6 @@ function getTestDocument(markup) {
 }
 
 describe('ReactTestUtils', () => {
-  beforeEach(() => {
-    createRenderer = require('react-test-renderer/shallow').createRenderer;
-    React = require('react');
-    ReactDOM = require('react-dom');
-    ReactDOMServer = require('react-dom/server');
-    ReactTestUtils = require('react-dom/test-utils');
-  });
-
   it('Simulate should have locally attached media events', () => {
     expect(Object.keys(ReactTestUtils.Simulate).sort()).toMatchSnapshot();
   });
@@ -403,7 +395,7 @@ describe('ReactTestUtils', () => {
       }
 
       const handler = jest.fn().mockName('spy');
-      const shallowRenderer = createRenderer();
+      const shallowRenderer = ReactShallowRenderer.createRenderer();
       const result = shallowRenderer.render(
         <SomeComponent handleClick={handler} />,
       );

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

@@ -29,6 +29,4 @@ function renderToReadableStream(children: ReactNodeList): ReadableStream {
   });
 }
 
-export default {
-  renderToReadableStream,
-};
+export {renderToReadableStream};

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

@@ -25,6 +25,4 @@ function pipeToNodeWritable(
   startWork(request);
 }
 
-export default {
-  pipeToNodeWritable,
-};
+export {pipeToNodeWritable};

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

@@ -26,11 +26,10 @@ function renderToStaticNodeStream() {
   );
 }
 
-// Note: when changing this, also consider https://github.com/facebook/react/issues/11526
-export default {
+export {
   renderToString,
   renderToStaticMarkup,
   renderToNodeStream,
   renderToStaticNodeStream,
-  version: ReactVersion,
+  ReactVersion as version,
 };

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

@@ -13,11 +13,10 @@ import {
   renderToStaticNodeStream,
 } from './ReactDOMNodeStreamRenderer';
 
-// Note: when changing this, also consider https://github.com/facebook/react/issues/11526
-export default {
+export {
   renderToString,
   renderToStaticMarkup,
   renderToNodeStream,
   renderToStaticNodeStream,
-  version: ReactVersion,
+  ReactVersion as version,
 };