From 265bc28d74d94100a98d386c02491dcb5f433ef7 Mon Sep 17 00:00:00 2001
From: Sebastian Markbage <sema@fb.com>
Date: Mon, 7 Dec 2020 22:07:18 -0500
Subject: [PATCH] Rename /server to /writer

This is mainly because "React Server Server" is weird so we need another
dimension.
---
 fixtures/flight-browser/index.html            |  2 +-
 .../npm/server.browser.js                     |  7 -------
 .../react-server-dom-webpack/npm/server.js    |  3 ---
 .../npm/server.node.js                        |  7 -------
 .../npm/writer.browser.server.js              |  7 +++++++
 .../react-server-dom-webpack/npm/writer.js    |  3 +++
 .../npm/writer.node.server.js                 |  7 +++++++
 .../react-server-dom-webpack/package.json     | 14 +++++++-------
 .../src/__tests__/ReactFlightDOM-test.js      |  2 +-
 .../__tests__/ReactFlightDOMBrowser-test.js   |  2 +-
 ...er.browser.js => writer.browser.server.js} |  0
 .../{server.js => writer.js}                  |  2 +-
 .../{server.node.js => writer.node.server.js} |  0
 scripts/rollup/bundles.js                     |  4 ++--
 scripts/shared/inlinedHostConfigs.js          | 19 ++++++++-----------
 15 files changed, 38 insertions(+), 41 deletions(-)
 delete mode 100644 packages/react-server-dom-webpack/npm/server.browser.js
 delete mode 100644 packages/react-server-dom-webpack/npm/server.js
 delete mode 100644 packages/react-server-dom-webpack/npm/server.node.js
 create mode 100644 packages/react-server-dom-webpack/npm/writer.browser.server.js
 create mode 100644 packages/react-server-dom-webpack/npm/writer.js
 create mode 100644 packages/react-server-dom-webpack/npm/writer.node.server.js
 rename packages/react-server-dom-webpack/{server.browser.js => writer.browser.server.js} (100%)
 rename packages/react-server-dom-webpack/{server.js => writer.js} (84%)
 rename packages/react-server-dom-webpack/{server.node.js => writer.node.server.js} (100%)

diff --git a/fixtures/flight-browser/index.html b/fixtures/flight-browser/index.html
index 123eb80070782..c48e3e4c9e63f 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-server.browser.development.js"></script>
+    <script src="../../build/node_modules/react-server-dom-webpack/umd/react-server-dom-webpack-writer.browser.server.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/packages/react-server-dom-webpack/npm/server.browser.js b/packages/react-server-dom-webpack/npm/server.browser.js
deleted file mode 100644
index ef53389abbc30..0000000000000
--- a/packages/react-server-dom-webpack/npm/server.browser.js
+++ /dev/null
@@ -1,7 +0,0 @@
-'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/server.js b/packages/react-server-dom-webpack/npm/server.js
deleted file mode 100644
index 02f1553990a22..0000000000000
--- a/packages/react-server-dom-webpack/npm/server.js
+++ /dev/null
@@ -1,3 +0,0 @@
-'use strict';
-
-module.exports = require('./server.node');
diff --git a/packages/react-server-dom-webpack/npm/server.node.js b/packages/react-server-dom-webpack/npm/server.node.js
deleted file mode 100644
index 7ac5a189e2a2d..0000000000000
--- a/packages/react-server-dom-webpack/npm/server.node.js
+++ /dev/null
@@ -1,7 +0,0 @@
-'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
new file mode 100644
index 0000000000000..e15f6bdec7f8a
--- /dev/null
+++ b/packages/react-server-dom-webpack/npm/writer.browser.server.js
@@ -0,0 +1,7 @@
+'use strict';
+
+if (process.env.NODE_ENV === 'production') {
+  module.exports = require('./cjs/react-server-dom-webpack-writer.browser.server.production.min.js');
+} else {
+  module.exports = require('./cjs/react-server-dom-webpack-writer.browser.server.development.js');
+}
diff --git a/packages/react-server-dom-webpack/npm/writer.js b/packages/react-server-dom-webpack/npm/writer.js
new file mode 100644
index 0000000000000..f6c173050e057
--- /dev/null
+++ b/packages/react-server-dom-webpack/npm/writer.js
@@ -0,0 +1,3 @@
+'use strict';
+
+module.exports = require('./writer.node.server');
diff --git a/packages/react-server-dom-webpack/npm/writer.node.server.js b/packages/react-server-dom-webpack/npm/writer.node.server.js
new file mode 100644
index 0000000000000..b40cc946ea2fd
--- /dev/null
+++ b/packages/react-server-dom-webpack/npm/writer.node.server.js
@@ -0,0 +1,7 @@
+'use strict';
+
+if (process.env.NODE_ENV === 'production') {
+  module.exports = require('./cjs/react-server-dom-webpack-writer.node.server.production.min.js');
+} else {
+  module.exports = require('./cjs/react-server-dom-webpack-writer.node.server.development.js');
+}
diff --git a/packages/react-server-dom-webpack/package.json b/packages/react-server-dom-webpack/package.json
index 46d7d62a2496e..478218e978403 100644
--- a/packages/react-server-dom-webpack/package.json
+++ b/packages/react-server-dom-webpack/package.json
@@ -14,9 +14,9 @@
     "README.md",
     "index.js",
     "plugin.js",
-    "server.js",
-    "server.browser.js",
-    "server.node.js",
+    "writer.js",
+    "writer.browser.server.js",
+    "writer.node.server.js",
     "node-register.js",
     "cjs/",
     "umd/",
@@ -25,15 +25,15 @@
   "exports": {
     ".": "./index.js",
     "./plugin": "./plugin.js",
-    "./server": "./server.js",
-    "./server.browser": "./server.browser.js",
-    "./server.node": "./server.node.js",
+    "./writer": "./writer.js",
+    "./writer.browser.server": "./writer.browser.server.js",
+    "./writer.node.server": "./writer.node.server.js",
     "./node-loader": "./esm/react-server-dom-webpack-node-loader.js",
     "./node-register": "./node-register.js",
     "./package.json": "./package.json"
   },
   "browser": {
-    "./server.js": "./server.browser.js"
+    "./writer.js": "./writer.browser.server.js"
   },
   "main": "index.js",
   "repository": {
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 9779278e56b53..0eda8b6bd740f 100644
--- a/packages/react-server-dom-webpack/src/__tests__/ReactFlightDOM-test.js
+++ b/packages/react-server-dom-webpack/src/__tests__/ReactFlightDOM-test.js
@@ -40,7 +40,7 @@ describe('ReactFlightDOM', () => {
     Stream = require('stream');
     React = require('react');
     ReactDOM = require('react-dom');
-    ReactServerDOMWriter = require('react-server-dom-webpack/server');
+    ReactServerDOMWriter = require('react-server-dom-webpack/writer');
     ReactServerDOMReader = require('react-server-dom-webpack');
   });
 
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 039e241438737..04710cbdc5cf9 100644
--- a/packages/react-server-dom-webpack/src/__tests__/ReactFlightDOMBrowser-test.js
+++ b/packages/react-server-dom-webpack/src/__tests__/ReactFlightDOMBrowser-test.js
@@ -23,7 +23,7 @@ describe('ReactFlightDOMBrowser', () => {
   beforeEach(() => {
     jest.resetModules();
     React = require('react');
-    ReactServerDOMWriter = require('react-server-dom-webpack/server.browser');
+    ReactServerDOMWriter = require('react-server-dom-webpack/writer.browser.server');
     ReactServerDOMReader = require('react-server-dom-webpack');
   });
 
diff --git a/packages/react-server-dom-webpack/server.browser.js b/packages/react-server-dom-webpack/writer.browser.server.js
similarity index 100%
rename from packages/react-server-dom-webpack/server.browser.js
rename to packages/react-server-dom-webpack/writer.browser.server.js
diff --git a/packages/react-server-dom-webpack/server.js b/packages/react-server-dom-webpack/writer.js
similarity index 84%
rename from packages/react-server-dom-webpack/server.js
rename to packages/react-server-dom-webpack/writer.js
index 6010f4e3d5b22..d541dad86c3c5 100644
--- a/packages/react-server-dom-webpack/server.js
+++ b/packages/react-server-dom-webpack/writer.js
@@ -7,4 +7,4 @@
  * @flow
  */
 
-export * from './server.node';
+export * from './writer.node.server';
diff --git a/packages/react-server-dom-webpack/server.node.js b/packages/react-server-dom-webpack/writer.node.server.js
similarity index 100%
rename from packages/react-server-dom-webpack/server.node.js
rename to packages/react-server-dom-webpack/writer.node.server.js
diff --git a/scripts/rollup/bundles.js b/scripts/rollup/bundles.js
index bce6c34d0e01f..e6ef2e59bec9f 100644
--- a/scripts/rollup/bundles.js
+++ b/scripts/rollup/bundles.js
@@ -274,14 +274,14 @@ const bundles = [
   {
     bundleTypes: [NODE_DEV, NODE_PROD, UMD_DEV, UMD_PROD],
     moduleType: RENDERER,
-    entry: 'react-server-dom-webpack/server.browser',
+    entry: 'react-server-dom-webpack/writer.browser.server',
     global: 'ReactServerDOMWriter',
     externals: ['react', 'react-dom/server'],
   },
   {
     bundleTypes: [NODE_DEV, NODE_PROD],
     moduleType: RENDERER,
-    entry: 'react-server-dom-webpack/server.node',
+    entry: 'react-server-dom-webpack/writer.node.server',
     global: 'ReactServerDOMWriter',
     externals: ['react', 'react-dom/server'],
   },
diff --git a/scripts/shared/inlinedHostConfigs.js b/scripts/shared/inlinedHostConfigs.js
index 9142aaccfd79f..98fc13e4f1204 100644
--- a/scripts/shared/inlinedHostConfigs.js
+++ b/scripts/shared/inlinedHostConfigs.js
@@ -13,7 +13,7 @@ module.exports = [
       'react-dom',
       'react-dom/testing',
       'react-dom/unstable-fizz.node',
-      'react-server-dom-webpack/server.node',
+      'react-server-dom-webpack/writer.node.server',
       'react-server-dom-webpack',
     ],
     paths: [
@@ -22,9 +22,9 @@ module.exports = [
       'react-dom/unstable-fizz.node',
       'react-dom/src/server/ReactDOMFizzServerNode.js', // react-dom/unstable-fizz.node
       'react-server-dom-webpack',
-      'react-server-dom-webpack/server',
-      'react-server-dom-webpack/server.node',
-      'react-server-dom-webpack/src/ReactFlightDOMServerNode.js', // react-server-dom-webpack/server.browser
+      '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-client/src/ReactFlightClientStream.js', // We can only type check this in streaming configurations.
       'react-interactions',
     ],
@@ -37,7 +37,7 @@ module.exports = [
       'react-dom',
       'react-dom/testing',
       'react-dom/unstable-fizz.browser',
-      'react-server-dom-webpack/server.browser',
+      'react-server-dom-webpack/writer.browser.server',
       'react-server-dom-webpack',
     ],
     paths: [
@@ -46,8 +46,8 @@ module.exports = [
       'react-dom/unstable-fizz.browser',
       'react-dom/src/server/ReactDOMFizzServerBrowser.js', // react-dom/unstable-fizz.browser
       'react-server-dom-webpack',
-      'react-server-dom-webpack/server.browser',
-      'react-server-dom-webpack/src/ReactFlightDOMServerBrowser.js', // react-server-dom-webpack/server.browser
+      'react-server-dom-webpack/writer.browser.server',
+      'react-server-dom-webpack/src/ReactFlightDOMServerBrowser.js', // react-server-dom-webpack/writer.browser.server
       'react-client/src/ReactFlightClientStream.js', // We can only type check this in streaming configurations.
     ],
     isFlowTyped: true,
@@ -83,10 +83,7 @@ module.exports = [
   },
   {
     shortName: 'dom-relay',
-    entryPoints: [
-      'react-server-dom-relay',
-      'react-server-dom-relay/server',
-    ],
+    entryPoints: ['react-server-dom-relay', 'react-server-dom-relay/server'],
     paths: ['react-dom', 'react-server-dom-relay'],
     isFlowTyped: true,
     isServerSupported: true,