From 3849e6ab1afdcc1d5ed53a9e952a5f810b8129d8 Mon Sep 17 00:00:00 2001
From: Sebastian Markbage <sema@fb.com>
Date: Mon, 14 Jun 2021 18:56:37 -0400
Subject: [PATCH] Same thing but with the modern entry point

---
 fixtures/fizz-ssr-browser/index.html            |  4 ++--
 fixtures/ssr/src/index.js                       |  2 +-
 packages/react-dom/npm/unstable-fizz.browser.js |  4 ++--
 packages/react-dom/npm/unstable-fizz.node.js    |  4 ++--
 scripts/rollup/bundles.js                       | 10 ++++++----
 scripts/shared/inlinedHostConfigs.js            |  4 ++--
 6 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/fixtures/fizz-ssr-browser/index.html b/fixtures/fizz-ssr-browser/index.html
index 6320c4a56bbcb..82ed7bf6145da 100644
--- a/fixtures/fizz-ssr-browser/index.html
+++ b/fixtures/fizz-ssr-browser/index.html
@@ -17,11 +17,11 @@ <h1>Fizz Example</h1>
       </p>
     </div>
     <script src="../../build/node_modules/react/umd/react.development.js"></script>
-    <script src="../../build/node_modules/react-dom/umd/react-dom-unstable-fizz.browser.development.js"></script>
+    <script src="../../build/node_modules/react-dom/umd/react-dom-server.browser.development.js"></script>
     <script src="https://unpkg.com/babel-standalone@6/babel.js"></script>
     <script type="text/babel">
       let controller = new AbortController();
-      let stream = ReactDOMFizzServer.renderToReadableStream(
+      let stream = ReactDOMServer.renderToReadableStream(
         <html>
           <body>Success</body>
         </html>,
diff --git a/fixtures/ssr/src/index.js b/fixtures/ssr/src/index.js
index 88c736fab4289..0af0c3127aa1d 100644
--- a/fixtures/ssr/src/index.js
+++ b/fixtures/ssr/src/index.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import {unstable_createRoot as createRoot} from 'react-dom';
+import {createRoot} from 'react-dom';
 
 import App from './components/App';
 
diff --git a/packages/react-dom/npm/unstable-fizz.browser.js b/packages/react-dom/npm/unstable-fizz.browser.js
index 976fac7eca51c..32b4953bb3500 100644
--- a/packages/react-dom/npm/unstable-fizz.browser.js
+++ b/packages/react-dom/npm/unstable-fizz.browser.js
@@ -1,7 +1,7 @@
 'use strict';
 
 if (process.env.NODE_ENV === 'production') {
-  module.exports = require('./cjs/react-dom-unstable-fizz.browser.production.min.js');
+  module.exports = require('./cjs/react-dom-server.browser.production.min.js');
 } else {
-  module.exports = require('./cjs/react-dom-unstable-fizz.browser.development.js');
+  module.exports = require('./cjs/react-dom-server.browser.development.js');
 }
diff --git a/packages/react-dom/npm/unstable-fizz.node.js b/packages/react-dom/npm/unstable-fizz.node.js
index 038a3fd0fb495..c45c37af6f37c 100644
--- a/packages/react-dom/npm/unstable-fizz.node.js
+++ b/packages/react-dom/npm/unstable-fizz.node.js
@@ -1,7 +1,7 @@
 'use strict';
 
 if (process.env.NODE_ENV === 'production') {
-  module.exports = require('./cjs/react-dom-unstable-fizz.node.production.min.js');
+  module.exports = require('./cjs/react-dom-server.node.production.min.js');
 } else {
-  module.exports = require('./cjs/react-dom-unstable-fizz.node.development.js');
+  module.exports = require('./cjs/react-dom-server.node.development.js');
 }
diff --git a/scripts/rollup/bundles.js b/scripts/rollup/bundles.js
index 97b4269f70fa0..a19b6510c3ced 100644
--- a/scripts/rollup/bundles.js
+++ b/scripts/rollup/bundles.js
@@ -263,15 +263,17 @@ const bundles = [
   {
     bundleTypes: [NODE_DEV, NODE_PROD, UMD_DEV, UMD_PROD],
     moduleType: RENDERER,
-    entry: 'react-dom/unstable-fizz.browser',
-    global: 'ReactDOMFizzServer',
+    entry: 'react-dom/src/server/ReactDOMFizzServerBrowser',
+    name: 'react-dom-server.browser',
+    global: 'ReactDOMServer',
     externals: ['react'],
   },
   {
     bundleTypes: [NODE_DEV, NODE_PROD],
     moduleType: RENDERER,
-    entry: 'react-dom/unstable-fizz.node',
-    global: 'ReactDOMFizzServer',
+    entry: 'react-dom/src/server/ReactDOMFizzServerNode',
+    name: 'react-dom-server.node',
+    global: 'ReactDOMServer',
     externals: ['react'],
   },
   {
diff --git a/scripts/shared/inlinedHostConfigs.js b/scripts/shared/inlinedHostConfigs.js
index ca92e08a51d2d..dd16af3f62a20 100644
--- a/scripts/shared/inlinedHostConfigs.js
+++ b/scripts/shared/inlinedHostConfigs.js
@@ -12,7 +12,7 @@ module.exports = [
     entryPoints: [
       'react-dom',
       'react-dom/testing',
-      'react-dom/unstable-fizz.node',
+      'react-dom/src/server/ReactDOMFizzServerNode',
       'react-server-dom-webpack/writer.node.server',
       'react-server-dom-webpack',
     ],
@@ -36,7 +36,7 @@ module.exports = [
     entryPoints: [
       'react-dom',
       'react-dom/testing',
-      'react-dom/unstable-fizz.browser',
+      'react-dom/src/server/ReactDOMFizzServerBrowser',
       'react-server-dom-webpack/writer.browser.server',
       'react-server-dom-webpack',
     ],
