From 3bb71dfd4bfc68920e758cd5fcf9fbfa44b99a21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Markb=C3=A5ge?= <sebastian@calyptus.eu>
Date: Tue, 18 Oct 2022 10:15:52 -0400
Subject: [PATCH] Rename react-server-dom-webpack entry points to /client and
 /server (#25504)

---
 fixtures/flight-browser/index.html            |  2 +-
 fixtures/flight/server/handler.server.js      |  2 +-
 fixtures/flight/src/index.js                  |  2 +-
 packages/react-server-dom-webpack/client.js   | 10 ++++++++++
 packages/react-server-dom-webpack/index.js    |  2 +-
 .../react-server-dom-webpack/npm/client.js    |  7 +++++++
 .../react-server-dom-webpack/npm/index.js     | 15 +++++++++-----
 .../npm/server.browser.js                     |  7 +++++++
 .../npm/{writer.js => server.js}              |  0
 .../npm/server.node.js                        |  7 +++++++
 .../npm/writer.browser.server.js              |  7 -------
 .../npm/writer.node.server.js                 |  7 -------
 .../react-server-dom-webpack/package.json     | 20 ++++++++++---------
 ...er.browser.server.js => server.browser.js} |  0
 .../{writer.js => server.js}                  |  2 +-
 .../{writer.node.server.js => server.node.js} |  0
 .../src/ReactFlightWebpackPlugin.js           |  2 +-
 .../src/__tests__/ReactFlightDOM-test.js      |  4 ++--
 .../__tests__/ReactFlightDOMBrowser-test.js   |  4 ++--
 scripts/rollup/bundles.js                     | 16 +++++++--------
 scripts/shared/inlinedHostConfigs.js          | 20 ++++++++++---------
 21 files changed, 81 insertions(+), 55 deletions(-)
 create mode 100644 packages/react-server-dom-webpack/client.js
 create mode 100644 packages/react-server-dom-webpack/npm/client.js
 create mode 100644 packages/react-server-dom-webpack/npm/server.browser.js
 rename packages/react-server-dom-webpack/npm/{writer.js => server.js} (100%)
 create mode 100644 packages/react-server-dom-webpack/npm/server.node.js
 delete mode 100644 packages/react-server-dom-webpack/npm/writer.browser.server.js
 delete mode 100644 packages/react-server-dom-webpack/npm/writer.node.server.js
 rename packages/react-server-dom-webpack/{writer.browser.server.js => server.browser.js} (100%)
 rename packages/react-server-dom-webpack/{writer.js => server.js} (78%)
 rename packages/react-server-dom-webpack/{writer.node.server.js => server.node.js} (100%)

diff --git a/fixtures/flight-browser/index.html b/fixtures/flight-browser/index.html
index 75654b943eb53..190bd782cf87e 100644
--- a/fixtures/flight-browser/index.html
+++ b/fixtures/flight-browser/index.html
@@ -19,7 +19,7 @@ <h1>Flight Example</h1>
     <script src="../../build/node_modules/react/umd/react.development.js"></script>
     <script src="../../build/node_modules/react-dom/umd/react-dom.development.js"></script>
     <script src="../../build/node_modules/react-dom/umd/react-dom-server.browser.development.js"></script>
-    <script src="../../build/node_modules/react-server-dom-webpack/umd/react-server-dom-webpack-writer.browser.development.server.js"></script>
+    <script src="../../build/node_modules/react-server-dom-webpack/umd/react-server-dom-webpack-server.browser.development.js"></script>
     <script src="../../build/node_modules/react-server-dom-webpack/umd/react-server-dom-webpack.development.js"></script>
     <script src="https://unpkg.com/babel-standalone@6/babel.js"></script>
     <script type="text/babel">
diff --git a/fixtures/flight/server/handler.server.js b/fixtures/flight/server/handler.server.js
index b6745c0332791..fbba850b31bcc 100644
--- a/fixtures/flight/server/handler.server.js
+++ b/fixtures/flight/server/handler.server.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const {renderToPipeableStream} = require('react-server-dom-webpack/writer');
+const {renderToPipeableStream} = require('react-server-dom-webpack/server');
 const {readFile} = require('fs');
 const {resolve} = require('path');
 const React = require('react');
diff --git a/fixtures/flight/src/index.js b/fixtures/flight/src/index.js
index 0c35d289c2be2..8a63b80b57f23 100644
--- a/fixtures/flight/src/index.js
+++ b/fixtures/flight/src/index.js
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import {Suspense} from 'react';
 import ReactDOM from 'react-dom/client';
-import ReactServerDOMReader from 'react-server-dom-webpack';
+import ReactServerDOMReader from 'react-server-dom-webpack/client';
 
 let data = ReactServerDOMReader.createFromFetch(fetch('http://localhost:3001'));
 
diff --git a/packages/react-server-dom-webpack/client.js b/packages/react-server-dom-webpack/client.js
new file mode 100644
index 0000000000000..67e9a28e029db
--- /dev/null
+++ b/packages/react-server-dom-webpack/client.js
@@ -0,0 +1,10 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow
+ */
+
+export * from './src/ReactFlightDOMClient';
diff --git a/packages/react-server-dom-webpack/index.js b/packages/react-server-dom-webpack/index.js
index 67e9a28e029db..544a5613d045f 100644
--- a/packages/react-server-dom-webpack/index.js
+++ b/packages/react-server-dom-webpack/index.js
@@ -7,4 +7,4 @@
  * @flow
  */
 
-export * from './src/ReactFlightDOMClient';
+throw new Error('Use react-server-dom-webpack/client instead.');
diff --git a/packages/react-server-dom-webpack/npm/client.js b/packages/react-server-dom-webpack/npm/client.js
new file mode 100644
index 0000000000000..b8e9a99ec5e80
--- /dev/null
+++ b/packages/react-server-dom-webpack/npm/client.js
@@ -0,0 +1,7 @@
+'use strict';
+
+if (process.env.NODE_ENV === 'production') {
+  module.exports = require('./cjs/react-server-dom-webpack-client.production.min.js');
+} else {
+  module.exports = require('./cjs/react-server-dom-webpack-client.development.js');
+}
diff --git a/packages/react-server-dom-webpack/npm/index.js b/packages/react-server-dom-webpack/npm/index.js
index 76932ab8e3c6b..7b24fbe523864 100644
--- a/packages/react-server-dom-webpack/npm/index.js
+++ b/packages/react-server-dom-webpack/npm/index.js
@@ -1,7 +1,12 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow
+ */
+
 'use strict';
 
-if (process.env.NODE_ENV === 'production') {
-  module.exports = require('./cjs/react-server-dom-webpack.production.min.js');
-} else {
-  module.exports = require('./cjs/react-server-dom-webpack.development.js');
-}
+throw new Error('Use react-server-dom-webpack/client instead.');
diff --git a/packages/react-server-dom-webpack/npm/server.browser.js b/packages/react-server-dom-webpack/npm/server.browser.js
new file mode 100644
index 0000000000000..ef53389abbc30
--- /dev/null
+++ b/packages/react-server-dom-webpack/npm/server.browser.js
@@ -0,0 +1,7 @@
+'use strict';
+
+if (process.env.NODE_ENV === 'production') {
+  module.exports = require('./cjs/react-server-dom-webpack-server.browser.production.min.js');
+} else {
+  module.exports = require('./cjs/react-server-dom-webpack-server.browser.development.js');
+}
diff --git a/packages/react-server-dom-webpack/npm/writer.js b/packages/react-server-dom-webpack/npm/server.js
similarity index 100%
rename from packages/react-server-dom-webpack/npm/writer.js
rename to packages/react-server-dom-webpack/npm/server.js
diff --git a/packages/react-server-dom-webpack/npm/server.node.js b/packages/react-server-dom-webpack/npm/server.node.js
new file mode 100644
index 0000000000000..7ac5a189e2a2d
--- /dev/null
+++ b/packages/react-server-dom-webpack/npm/server.node.js
@@ -0,0 +1,7 @@
+'use strict';
+
+if (process.env.NODE_ENV === 'production') {
+  module.exports = require('./cjs/react-server-dom-webpack-server.node.production.min.js');
+} else {
+  module.exports = require('./cjs/react-server-dom-webpack-server.node.development.js');
+}
diff --git a/packages/react-server-dom-webpack/npm/writer.browser.server.js b/packages/react-server-dom-webpack/npm/writer.browser.server.js
deleted file mode 100644
index 3f6729883fda2..0000000000000
--- a/packages/react-server-dom-webpack/npm/writer.browser.server.js
+++ /dev/null
@@ -1,7 +0,0 @@
-'use strict';
-
-if (process.env.NODE_ENV === 'production') {
-  module.exports = require('./cjs/react-server-dom-webpack-writer.browser.production.min.server.js');
-} else {
-  module.exports = require('./cjs/react-server-dom-webpack-writer.browser.development.server.js');
-}
diff --git a/packages/react-server-dom-webpack/npm/writer.node.server.js b/packages/react-server-dom-webpack/npm/writer.node.server.js
deleted file mode 100644
index 0254033b0b9c1..0000000000000
--- a/packages/react-server-dom-webpack/npm/writer.node.server.js
+++ /dev/null
@@ -1,7 +0,0 @@
-'use strict';
-
-if (process.env.NODE_ENV === 'production') {
-  module.exports = require('./cjs/react-server-dom-webpack-writer.node.production.min.server.js');
-} else {
-  module.exports = require('./cjs/react-server-dom-webpack-writer.node.development.server.js');
-}
diff --git a/packages/react-server-dom-webpack/package.json b/packages/react-server-dom-webpack/package.json
index a9948e4ccc14a..92c6c8d73213d 100644
--- a/packages/react-server-dom-webpack/package.json
+++ b/packages/react-server-dom-webpack/package.json
@@ -13,9 +13,10 @@
     "README.md",
     "index.js",
     "plugin.js",
-    "writer.js",
-    "writer.browser.server.js",
-    "writer.node.server.js",
+    "client.js",
+    "server.js",
+    "server.browser.js",
+    "server.node.js",
     "node-register.js",
     "cjs/",
     "umd/",
@@ -24,15 +25,16 @@
   "exports": {
     ".": "./index.js",
     "./plugin": "./plugin.js",
-    "./writer": {
+    "./client": "./client.js",
+    "./server": {
       "react-server": {
-        "node": "./writer.node.server.js",
-        "browser": "./writer.browser.server.js"
+        "node": "./server.node.js",
+        "browser": "./server.browser.js"
       },
-      "default": "./writer.js"
+      "default": "./server.js"
     },
-    "./writer.node.server": "./writer.node.server.js",
-    "./writer.browser.server": "./writer.browser.server.js",
+    "./server.node": "./server.node.js",
+    "./server.browser": "./server.browser.js",
     "./node-loader": "./esm/react-server-dom-webpack-node-loader.js",
     "./node-register": "./node-register.js",
     "./src/*": "./src/*",
diff --git a/packages/react-server-dom-webpack/writer.browser.server.js b/packages/react-server-dom-webpack/server.browser.js
similarity index 100%
rename from packages/react-server-dom-webpack/writer.browser.server.js
rename to packages/react-server-dom-webpack/server.browser.js
diff --git a/packages/react-server-dom-webpack/writer.js b/packages/react-server-dom-webpack/server.js
similarity index 78%
rename from packages/react-server-dom-webpack/writer.js
rename to packages/react-server-dom-webpack/server.js
index 00db7f503faf7..c90c6261bb672 100644
--- a/packages/react-server-dom-webpack/writer.js
+++ b/packages/react-server-dom-webpack/server.js
@@ -8,6 +8,6 @@
  */
 
 throw new Error(
-  'The React Server Writer cannot be used outside a react-server environment. ' +
+  'The React Server cannot be used outside a react-server environment. ' +
     'You must configure Node.js using the `--conditions react-server` flag.',
 );
diff --git a/packages/react-server-dom-webpack/writer.node.server.js b/packages/react-server-dom-webpack/server.node.js
similarity index 100%
rename from packages/react-server-dom-webpack/writer.node.server.js
rename to packages/react-server-dom-webpack/server.node.js
diff --git a/packages/react-server-dom-webpack/src/ReactFlightWebpackPlugin.js b/packages/react-server-dom-webpack/src/ReactFlightWebpackPlugin.js
index 1a64b305ff443..050aa5d486dac 100644
--- a/packages/react-server-dom-webpack/src/ReactFlightWebpackPlugin.js
+++ b/packages/react-server-dom-webpack/src/ReactFlightWebpackPlugin.js
@@ -39,7 +39,7 @@ class ClientReferenceDependency extends ModuleDependency {
 // We use the Flight client implementation because you can't get to these
 // without the client runtime so it's the first time in the loading sequence
 // you might want them.
-const clientImportName = 'react-server-dom-webpack';
+const clientImportName = 'react-server-dom-webpack/client';
 const clientFileName = require.resolve('../');
 
 type ClientReferenceSearchPath = {
diff --git a/packages/react-server-dom-webpack/src/__tests__/ReactFlightDOM-test.js b/packages/react-server-dom-webpack/src/__tests__/ReactFlightDOM-test.js
index 1d1835ee31db8..35d21ede6ac8f 100644
--- a/packages/react-server-dom-webpack/src/__tests__/ReactFlightDOM-test.js
+++ b/packages/react-server-dom-webpack/src/__tests__/ReactFlightDOM-test.js
@@ -44,8 +44,8 @@ describe('ReactFlightDOM', () => {
     use = React.experimental_use;
     Suspense = React.Suspense;
     ReactDOMClient = require('react-dom/client');
-    ReactServerDOMWriter = require('react-server-dom-webpack/writer.node.server');
-    ReactServerDOMReader = require('react-server-dom-webpack');
+    ReactServerDOMWriter = require('react-server-dom-webpack/server.node');
+    ReactServerDOMReader = require('react-server-dom-webpack/client');
 
     ErrorBoundary = class extends React.Component {
       state = {hasError: false, error: null};
diff --git a/packages/react-server-dom-webpack/src/__tests__/ReactFlightDOMBrowser-test.js b/packages/react-server-dom-webpack/src/__tests__/ReactFlightDOMBrowser-test.js
index 2ff81ce2e843d..25f4c0cb4452e 100644
--- a/packages/react-server-dom-webpack/src/__tests__/ReactFlightDOMBrowser-test.js
+++ b/packages/react-server-dom-webpack/src/__tests__/ReactFlightDOMBrowser-test.js
@@ -37,8 +37,8 @@ describe('ReactFlightDOMBrowser', () => {
     React = require('react');
     ReactDOMClient = require('react-dom/client');
     ReactDOMServer = require('react-dom/server.browser');
-    ReactServerDOMWriter = require('react-server-dom-webpack/writer.browser.server');
-    ReactServerDOMReader = require('react-server-dom-webpack');
+    ReactServerDOMWriter = require('react-server-dom-webpack/server.browser');
+    ReactServerDOMReader = require('react-server-dom-webpack/client');
     Suspense = React.Suspense;
     use = React.experimental_use;
   });
diff --git a/scripts/rollup/bundles.js b/scripts/rollup/bundles.js
index 81072166a0269..36a9627799fc5 100644
--- a/scripts/rollup/bundles.js
+++ b/scripts/rollup/bundles.js
@@ -377,12 +377,12 @@ const bundles = [
     externals: ['react'],
   },
 
-  /******* React Server DOM Webpack Writer *******/
+  /******* React Server DOM Webpack Server *******/
   {
     bundleTypes: [NODE_DEV, NODE_PROD, UMD_DEV, UMD_PROD],
     moduleType: RENDERER,
-    entry: 'react-server-dom-webpack/writer.browser.server',
-    global: 'ReactServerDOMWriter',
+    entry: 'react-server-dom-webpack/server.browser',
+    global: 'ReactServerDOMServer',
     minifyWithProdErrorCodes: false,
     wrapWithModuleBoundaries: false,
     externals: ['react', 'react-dom'],
@@ -390,19 +390,19 @@ const bundles = [
   {
     bundleTypes: [NODE_DEV, NODE_PROD],
     moduleType: RENDERER,
-    entry: 'react-server-dom-webpack/writer.node.server',
-    global: 'ReactServerDOMWriter',
+    entry: 'react-server-dom-webpack/server.node',
+    global: 'ReactServerDOMServer',
     minifyWithProdErrorCodes: false,
     wrapWithModuleBoundaries: false,
     externals: ['react', 'util', 'react-dom'],
   },
 
-  /******* React Server DOM Webpack Reader *******/
+  /******* React Server DOM Webpack Client *******/
   {
     bundleTypes: [NODE_DEV, NODE_PROD, UMD_DEV, UMD_PROD],
     moduleType: RENDERER,
-    entry: 'react-server-dom-webpack',
-    global: 'ReactServerDOMReader',
+    entry: 'react-server-dom-webpack/client',
+    global: 'ReactServerDOMClient',
     minifyWithProdErrorCodes: false,
     wrapWithModuleBoundaries: false,
     externals: ['react'],
diff --git a/scripts/shared/inlinedHostConfigs.js b/scripts/shared/inlinedHostConfigs.js
index 027c71aa173b3..21c804cec0354 100644
--- a/scripts/shared/inlinedHostConfigs.js
+++ b/scripts/shared/inlinedHostConfigs.js
@@ -16,8 +16,8 @@ module.exports = [
       'react-dom/static.node',
       'react-dom/server-rendering-stub',
       'react-dom/src/server/ReactDOMServerExternalRuntime.js',
-      'react-server-dom-webpack/writer.node.server',
-      'react-server-dom-webpack',
+      'react-server-dom-webpack/server.node',
+      'react-server-dom-webpack/client',
     ],
     paths: [
       'react-dom',
@@ -30,9 +30,10 @@ module.exports = [
       'react-dom/src/server/ReactDOMFizzServerNode.js', // react-dom/server.node
       'react-dom/src/server/ReactDOMFizzStaticNode.js',
       'react-server-dom-webpack',
-      'react-server-dom-webpack/writer',
-      'react-server-dom-webpack/writer.node.server',
-      'react-server-dom-webpack/src/ReactFlightDOMServerNode.js', // react-server-dom-webpack/writer.node.server
+      'react-server-dom-webpack/client',
+      'react-server-dom-webpack/server',
+      'react-server-dom-webpack/server.node',
+      'react-server-dom-webpack/src/ReactFlightDOMServerNode.js', // react-server-dom-webpack/server.node
       'react-client/src/ReactFlightClientStream.js', // We can only type check this in streaming configurations.
       'react-devtools',
       'react-devtools-core',
@@ -53,8 +54,8 @@ module.exports = [
       'react-dom/static.browser',
       'react-dom/server-rendering-stub',
       'react-dom/src/server/ReactDOMServerExternalRuntime.js',
-      'react-server-dom-webpack/writer.browser.server',
-      'react-server-dom-webpack',
+      'react-server-dom-webpack/server.browser',
+      'react-server-dom-webpack/client',
     ],
     paths: [
       'react-dom',
@@ -66,8 +67,9 @@ module.exports = [
       'react-dom/src/server/ReactDOMFizzServerBrowser.js', // react-dom/server.browser
       'react-dom/src/server/ReactDOMFizzStaticBrowser.js',
       'react-server-dom-webpack',
-      'react-server-dom-webpack/writer.browser.server',
-      'react-server-dom-webpack/src/ReactFlightDOMServerBrowser.js', // react-server-dom-webpack/writer.browser.server
+      'react-server-dom-webpack/client',
+      'react-server-dom-webpack/server.browser',
+      'react-server-dom-webpack/src/ReactFlightDOMServerBrowser.js', // react-server-dom-webpack/server.browser
       'react-client/src/ReactFlightClientStream.js', // We can only type check this in streaming configurations.
       'react-devtools',
       'react-devtools-core',