From 5fd9db732dff1b99c096bffef9a565b594c788de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Markb=C3=A5ge?= <sema@fb.com>
Date: Tue, 8 Dec 2020 08:08:57 -0500
Subject: [PATCH] [Flight] Rename react-transport-... packages to
 react-server-... (#20403)

* Move files

* Update paths

* Rename import variables

* Rename /server to /writer

This is mainly because "React Server Server" is weird so we need another
dimension.

* Use "react-server" convention to enforce that writer is only loaded in a server
---
 .eslintrc.js                                  |  4 +-
 fixtures/flight-browser/index.html            | 10 ++--
 fixtures/flight/config/webpack.config.js      |  2 +-
 fixtures/flight/loader/index.js               |  2 +-
 fixtures/flight/server/cli.server.js          |  2 +-
 fixtures/flight/server/handler.server.js      |  2 +-
 fixtures/flight/src/index.js                  |  6 +-
 ...ReactFlightClientHostConfig.dom-browser.js |  2 +-
 .../ReactFlightClientHostConfig.dom-relay.js  |  2 +-
 .../forks/ReactFlightClientHostConfig.dom.js  |  2 +-
 ...eactFlightClientHostConfig.native-relay.js |  2 +-
 .../index.js                                  |  0
 .../package.json                              |  4 +-
 .../server.js                                 |  0
 .../src/ReactFlightDOMRelayClient.js          |  0
 .../ReactFlightDOMRelayClientHostConfig.js    |  0
 .../src/ReactFlightDOMRelayProtocol.js        |  0
 .../src/ReactFlightDOMRelayServer.js          |  0
 .../ReactFlightDOMRelayServerHostConfig.js    |  0
 .../src/__mocks__/JSResourceReference.js      |  0
 .../ReactFlightDOMRelayClientIntegration.js   |  0
 .../ReactFlightDOMRelayServerIntegration.js   |  0
 .../ReactFlightDOMRelay-test.internal.js      |  4 +-
 .../README.md                                 |  2 +-
 .../esm/package.json                          |  0
 .../react-server-dom-webpack-node-loader.js}  |  0
 .../index.js                                  |  0
 .../node-register.js                          |  0
 .../npm/esm/package.json                      |  0
 .../react-server-dom-webpack/npm/index.js     |  7 +++
 .../npm/node-register.js                      |  3 +
 .../react-server-dom-webpack/npm/plugin.js    |  3 +
 .../npm/writer.browser.server.js              |  7 +++
 .../react-server-dom-webpack/npm/writer.js    |  6 ++
 .../npm/writer.node.server.js                 |  7 +++
 .../package.json                              | 28 ++++++----
 .../plugin.js                                 |  0
 .../ReactFlightClientWebpackBundlerConfig.js  |  0
 .../src/ReactFlightDOMClient.js               |  0
 .../src/ReactFlightDOMServerBrowser.js        |  0
 .../src/ReactFlightDOMServerNode.js           |  0
 .../ReactFlightServerWebpackBundlerConfig.js  |  0
 .../src/ReactFlightWebpackNodeLoader.js       |  0
 .../src/ReactFlightWebpackNodeRegister.js     |  0
 .../src/ReactFlightWebpackPlugin.js           |  2 +-
 .../src/__tests__/ReactFlightDOM-test.js      | 36 ++++++------
 .../__tests__/ReactFlightDOMBrowser-test.js   | 12 ++--
 .../writer.browser.server.js}                 |  0
 .../writer.js}                                |  5 +-
 .../writer.node.server.js}                    |  0
 .../index.js                                  |  0
 .../package.json                              |  4 +-
 .../server.js                                 |  0
 .../src/ReactFlightNativeRelayClient.js       |  0
 .../ReactFlightNativeRelayClientHostConfig.js |  0
 .../src/ReactFlightNativeRelayProtocol.js     |  0
 .../src/ReactFlightNativeRelayServer.js       |  0
 .../ReactFlightNativeRelayServerHostConfig.js |  0
 .../src/__mocks__/JSResourceReferenceImpl.js  |  0
 ...ReactFlightNativeRelayClientIntegration.js |  0
 ...ReactFlightNativeRelayServerIntegration.js |  0
 .../ReactFlightNativeRelay-test.internal.js   |  4 +-
 ...actFlightNativeRelay-test.internal.js.snap |  0
 .../ReactFlightServerConfig.dom-browser.js    |  2 +-
 .../ReactFlightServerConfig.dom-relay.js      |  2 +-
 .../src/forks/ReactFlightServerConfig.dom.js  |  2 +-
 .../ReactFlightServerConfig.native-relay.js   |  2 +-
 .../react-transport-dom-webpack/npm/index.js  |  7 ---
 .../npm/node-register.js                      |  3 -
 .../react-transport-dom-webpack/npm/plugin.js |  3 -
 .../npm/server.browser.js                     |  7 ---
 .../react-transport-dom-webpack/npm/server.js |  3 -
 .../npm/server.node.js                        |  7 ---
 scripts/rollup/bundles.js                     | 56 +++++++++----------
 scripts/rollup/packaging.js                   |  2 +-
 scripts/shared/inlinedHostConfigs.js          | 35 ++++++------
 76 files changed, 154 insertions(+), 147 deletions(-)
 rename packages/{react-transport-dom-relay => react-server-dom-relay}/index.js (100%)
 rename packages/{react-transport-dom-relay => react-server-dom-relay}/package.json (76%)
 rename packages/{react-transport-dom-relay => react-server-dom-relay}/server.js (100%)
 rename packages/{react-transport-dom-relay => react-server-dom-relay}/src/ReactFlightDOMRelayClient.js (100%)
 rename packages/{react-transport-dom-relay => react-server-dom-relay}/src/ReactFlightDOMRelayClientHostConfig.js (100%)
 rename packages/{react-transport-dom-relay => react-server-dom-relay}/src/ReactFlightDOMRelayProtocol.js (100%)
 rename packages/{react-transport-dom-relay => react-server-dom-relay}/src/ReactFlightDOMRelayServer.js (100%)
 rename packages/{react-transport-dom-relay => react-server-dom-relay}/src/ReactFlightDOMRelayServerHostConfig.js (100%)
 rename packages/{react-transport-dom-relay => react-server-dom-relay}/src/__mocks__/JSResourceReference.js (100%)
 rename packages/{react-transport-dom-relay => react-server-dom-relay}/src/__mocks__/ReactFlightDOMRelayClientIntegration.js (100%)
 rename packages/{react-transport-dom-relay => react-server-dom-relay}/src/__mocks__/ReactFlightDOMRelayServerIntegration.js (100%)
 rename packages/{react-transport-dom-relay => react-server-dom-relay}/src/__tests__/ReactFlightDOMRelay-test.internal.js (97%)
 rename packages/{react-transport-dom-webpack => react-server-dom-webpack}/README.md (74%)
 rename packages/{react-transport-dom-webpack => react-server-dom-webpack}/esm/package.json (100%)
 rename packages/{react-transport-dom-webpack/esm/react-transport-dom-webpack-node-loader.js => react-server-dom-webpack/esm/react-server-dom-webpack-node-loader.js} (100%)
 rename packages/{react-transport-dom-webpack => react-server-dom-webpack}/index.js (100%)
 rename packages/{react-transport-dom-webpack => react-server-dom-webpack}/node-register.js (100%)
 rename packages/{react-transport-dom-webpack => react-server-dom-webpack}/npm/esm/package.json (100%)
 create mode 100644 packages/react-server-dom-webpack/npm/index.js
 create mode 100644 packages/react-server-dom-webpack/npm/node-register.js
 create mode 100644 packages/react-server-dom-webpack/npm/plugin.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-transport-dom-webpack => react-server-dom-webpack}/package.json (56%)
 rename packages/{react-transport-dom-webpack => react-server-dom-webpack}/plugin.js (100%)
 rename packages/{react-transport-dom-webpack => react-server-dom-webpack}/src/ReactFlightClientWebpackBundlerConfig.js (100%)
 rename packages/{react-transport-dom-webpack => react-server-dom-webpack}/src/ReactFlightDOMClient.js (100%)
 rename packages/{react-transport-dom-webpack => react-server-dom-webpack}/src/ReactFlightDOMServerBrowser.js (100%)
 rename packages/{react-transport-dom-webpack => react-server-dom-webpack}/src/ReactFlightDOMServerNode.js (100%)
 rename packages/{react-transport-dom-webpack => react-server-dom-webpack}/src/ReactFlightServerWebpackBundlerConfig.js (100%)
 rename packages/{react-transport-dom-webpack => react-server-dom-webpack}/src/ReactFlightWebpackNodeLoader.js (100%)
 rename packages/{react-transport-dom-webpack => react-server-dom-webpack}/src/ReactFlightWebpackNodeRegister.js (100%)
 rename packages/{react-transport-dom-webpack => react-server-dom-webpack}/src/ReactFlightWebpackPlugin.js (99%)
 rename packages/{react-transport-dom-webpack => react-server-dom-webpack}/src/__tests__/ReactFlightDOM-test.js (91%)
 rename packages/{react-transport-dom-webpack => react-server-dom-webpack}/src/__tests__/ReactFlightDOMBrowser-test.js (80%)
 rename packages/{react-transport-dom-webpack/server.browser.js => react-server-dom-webpack/writer.browser.server.js} (100%)
 rename packages/{react-transport-dom-webpack/server.js => react-server-dom-webpack/writer.js} (52%)
 rename packages/{react-transport-dom-webpack/server.node.js => react-server-dom-webpack/writer.node.server.js} (100%)
 rename packages/{react-transport-native-relay => react-server-native-relay}/index.js (100%)
 rename packages/{react-transport-native-relay => react-server-native-relay}/package.json (76%)
 rename packages/{react-transport-native-relay => react-server-native-relay}/server.js (100%)
 rename packages/{react-transport-native-relay => react-server-native-relay}/src/ReactFlightNativeRelayClient.js (100%)
 rename packages/{react-transport-native-relay => react-server-native-relay}/src/ReactFlightNativeRelayClientHostConfig.js (100%)
 rename packages/{react-transport-native-relay => react-server-native-relay}/src/ReactFlightNativeRelayProtocol.js (100%)
 rename packages/{react-transport-native-relay => react-server-native-relay}/src/ReactFlightNativeRelayServer.js (100%)
 rename packages/{react-transport-native-relay => react-server-native-relay}/src/ReactFlightNativeRelayServerHostConfig.js (100%)
 rename packages/{react-transport-native-relay => react-server-native-relay}/src/__mocks__/JSResourceReferenceImpl.js (100%)
 rename packages/{react-transport-native-relay => react-server-native-relay}/src/__mocks__/ReactFlightNativeRelayClientIntegration.js (100%)
 rename packages/{react-transport-native-relay => react-server-native-relay}/src/__mocks__/ReactFlightNativeRelayServerIntegration.js (100%)
 rename packages/{react-transport-native-relay => react-server-native-relay}/src/__tests__/ReactFlightNativeRelay-test.internal.js (95%)
 rename packages/{react-transport-native-relay => react-server-native-relay}/src/__tests__/__snapshots__/ReactFlightNativeRelay-test.internal.js.snap (100%)
 delete mode 100644 packages/react-transport-dom-webpack/npm/index.js
 delete mode 100644 packages/react-transport-dom-webpack/npm/node-register.js
 delete mode 100644 packages/react-transport-dom-webpack/npm/plugin.js
 delete mode 100644 packages/react-transport-dom-webpack/npm/server.browser.js
 delete mode 100644 packages/react-transport-dom-webpack/npm/server.js
 delete mode 100644 packages/react-transport-dom-webpack/npm/server.node.js

diff --git a/.eslintrc.js b/.eslintrc.js
index 715c6eb96074a..a456964bdbdb0 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -185,14 +185,14 @@ module.exports = {
     {
       files: [
         'packages/react-native-renderer/**/*.js',
-        'packages/react-transport-native-relay/**/*.js',
+        'packages/react-server-native-relay/**/*.js',
       ],
       globals: {
         nativeFabricUIManager: true,
       },
     },
     {
-      files: ['packages/react-transport-dom-webpack/**/*.js'],
+      files: ['packages/react-server-dom-webpack/**/*.js'],
       globals: {
         __webpack_chunk_load__: true,
         __webpack_require__: true,
diff --git a/fixtures/flight-browser/index.html b/fixtures/flight-browser/index.html
index 1fc2a4e195284..c48e3e4c9e63f 100644
--- a/fixtures/flight-browser/index.html
+++ b/fixtures/flight-browser/index.html
@@ -19,8 +19,8 @@ <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-transport-dom-webpack/umd/react-transport-dom-webpack-server.browser.development.js"></script>
-    <script src="../../build/node_modules/react-transport-dom-webpack/umd/react-transport-dom-webpack.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">
       let Suspense = React.Suspense;
@@ -60,7 +60,7 @@ <h1>Flight Example</h1>
         content: <HTML />,
       };
 
-      let stream = ReactTransportDOMServer.renderToReadableStream(model);
+      let stream = ReactServerDOMWriter.renderToReadableStream(model);
       let response = new Response(stream, {
         headers: {'Content-Type': 'text/html'},
       });
@@ -70,13 +70,13 @@ <h1>Flight Example</h1>
         let blob = await responseToDisplay.blob();
         let url = URL.createObjectURL(blob);
 
-        let data = ReactTransportDOMClient.createFromFetch(
+        let data = ReactServerDOMReader.createFromFetch(
           fetch(url)
         );
         // The client also supports XHR streaming.
         // var xhr = new XMLHttpRequest();
         // xhr.open('GET', url);
-        // let data = ReactTransportDOMClient.createFromXHR(xhr);
+        // let data = ReactServerDOMReader.createFromXHR(xhr);
         // xhr.send();
 
         renderResult(data);
diff --git a/fixtures/flight/config/webpack.config.js b/fixtures/flight/config/webpack.config.js
index 37037c207b4c0..2d4bbe74f6141 100644
--- a/fixtures/flight/config/webpack.config.js
+++ b/fixtures/flight/config/webpack.config.js
@@ -1,7 +1,7 @@
 'use strict';
 
 // Fork Start
-const ReactFlightWebpackPlugin = require('react-transport-dom-webpack/plugin');
+const ReactFlightWebpackPlugin = require('react-server-dom-webpack/plugin');
 // Fork End
 
 const fs = require('fs');
diff --git a/fixtures/flight/loader/index.js b/fixtures/flight/loader/index.js
index 04960e6dcc9e1..07e7eacd0104e 100644
--- a/fixtures/flight/loader/index.js
+++ b/fixtures/flight/loader/index.js
@@ -2,7 +2,7 @@ import {
   resolve,
   getSource,
   transformSource as reactTransformSource,
-} from 'react-transport-dom-webpack/node-loader';
+} from 'react-server-dom-webpack/node-loader';
 
 export {resolve, getSource};
 
diff --git a/fixtures/flight/server/cli.server.js b/fixtures/flight/server/cli.server.js
index fefef07e9bd0e..3b60f05796148 100644
--- a/fixtures/flight/server/cli.server.js
+++ b/fixtures/flight/server/cli.server.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const register = require('react-transport-dom-webpack/node-register');
+const register = require('react-server-dom-webpack/node-register');
 register();
 
 const babelRegister = require('@babel/register');
diff --git a/fixtures/flight/server/handler.server.js b/fixtures/flight/server/handler.server.js
index 3a7b138ae4adf..cd4af7319f01f 100644
--- a/fixtures/flight/server/handler.server.js
+++ b/fixtures/flight/server/handler.server.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const {pipeToNodeWritable} = require('react-transport-dom-webpack/server');
+const {pipeToNodeWritable} = require('react-server-dom-webpack/writer');
 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 4069f2fe88eba..a096ff25e897b 100644
--- a/fixtures/flight/src/index.js
+++ b/fixtures/flight/src/index.js
@@ -1,11 +1,9 @@
 import * as React from 'react';
 import {Suspense} from 'react';
 import ReactDOM from 'react-dom';
-import ReactTransportDOMClient from 'react-transport-dom-webpack';
+import ReactServerDOMReader from 'react-server-dom-webpack';
 
-let data = ReactTransportDOMClient.createFromFetch(
-  fetch('http://localhost:3001')
-);
+let data = ReactServerDOMReader.createFromFetch(fetch('http://localhost:3001'));
 
 function Content() {
   return data.readRoot();
diff --git a/packages/react-client/src/forks/ReactFlightClientHostConfig.dom-browser.js b/packages/react-client/src/forks/ReactFlightClientHostConfig.dom-browser.js
index 96c6d5c723ab5..59e1171c144ea 100644
--- a/packages/react-client/src/forks/ReactFlightClientHostConfig.dom-browser.js
+++ b/packages/react-client/src/forks/ReactFlightClientHostConfig.dom-browser.js
@@ -9,4 +9,4 @@
 
 export * from 'react-client/src/ReactFlightClientHostConfigBrowser';
 export * from 'react-client/src/ReactFlightClientHostConfigStream';
-export * from 'react-transport-dom-webpack/src/ReactFlightClientWebpackBundlerConfig';
+export * from 'react-server-dom-webpack/src/ReactFlightClientWebpackBundlerConfig';
diff --git a/packages/react-client/src/forks/ReactFlightClientHostConfig.dom-relay.js b/packages/react-client/src/forks/ReactFlightClientHostConfig.dom-relay.js
index bafd639ab2d1c..cfa4c770aafeb 100644
--- a/packages/react-client/src/forks/ReactFlightClientHostConfig.dom-relay.js
+++ b/packages/react-client/src/forks/ReactFlightClientHostConfig.dom-relay.js
@@ -7,5 +7,5 @@
  * @flow
  */
 
-export * from 'react-transport-dom-relay/src/ReactFlightDOMRelayClientHostConfig';
+export * from 'react-server-dom-relay/src/ReactFlightDOMRelayClientHostConfig';
 export * from '../ReactFlightClientHostConfigNoStream';
diff --git a/packages/react-client/src/forks/ReactFlightClientHostConfig.dom.js b/packages/react-client/src/forks/ReactFlightClientHostConfig.dom.js
index 96c6d5c723ab5..59e1171c144ea 100644
--- a/packages/react-client/src/forks/ReactFlightClientHostConfig.dom.js
+++ b/packages/react-client/src/forks/ReactFlightClientHostConfig.dom.js
@@ -9,4 +9,4 @@
 
 export * from 'react-client/src/ReactFlightClientHostConfigBrowser';
 export * from 'react-client/src/ReactFlightClientHostConfigStream';
-export * from 'react-transport-dom-webpack/src/ReactFlightClientWebpackBundlerConfig';
+export * from 'react-server-dom-webpack/src/ReactFlightClientWebpackBundlerConfig';
diff --git a/packages/react-client/src/forks/ReactFlightClientHostConfig.native-relay.js b/packages/react-client/src/forks/ReactFlightClientHostConfig.native-relay.js
index ca1d639fe948c..594b723a3d970 100644
--- a/packages/react-client/src/forks/ReactFlightClientHostConfig.native-relay.js
+++ b/packages/react-client/src/forks/ReactFlightClientHostConfig.native-relay.js
@@ -7,5 +7,5 @@
  * @flow
  */
 
-export * from 'react-transport-native-relay/src/ReactFlightNativeRelayClientHostConfig';
+export * from 'react-server-native-relay/src/ReactFlightNativeRelayClientHostConfig';
 export * from '../ReactFlightClientHostConfigNoStream';
diff --git a/packages/react-transport-dom-relay/index.js b/packages/react-server-dom-relay/index.js
similarity index 100%
rename from packages/react-transport-dom-relay/index.js
rename to packages/react-server-dom-relay/index.js
diff --git a/packages/react-transport-dom-relay/package.json b/packages/react-server-dom-relay/package.json
similarity index 76%
rename from packages/react-transport-dom-relay/package.json
rename to packages/react-server-dom-relay/package.json
index d89d183929989..5353bf9a1e5ef 100644
--- a/packages/react-transport-dom-relay/package.json
+++ b/packages/react-server-dom-relay/package.json
@@ -1,11 +1,11 @@
 {
-  "name": "react-transport-dom-relay",
+  "name": "react-server-dom-relay",
   "version": "0.1.0",
   "private": true,
   "repository": {
     "type" : "git",
     "url" : "https://github.com/facebook/react.git",
-    "directory": "packages/react-transport-dom-relay"
+    "directory": "packages/react-server-dom-relay"
   },
   "dependencies": {
     "object-assign": "^4.1.1",
diff --git a/packages/react-transport-dom-relay/server.js b/packages/react-server-dom-relay/server.js
similarity index 100%
rename from packages/react-transport-dom-relay/server.js
rename to packages/react-server-dom-relay/server.js
diff --git a/packages/react-transport-dom-relay/src/ReactFlightDOMRelayClient.js b/packages/react-server-dom-relay/src/ReactFlightDOMRelayClient.js
similarity index 100%
rename from packages/react-transport-dom-relay/src/ReactFlightDOMRelayClient.js
rename to packages/react-server-dom-relay/src/ReactFlightDOMRelayClient.js
diff --git a/packages/react-transport-dom-relay/src/ReactFlightDOMRelayClientHostConfig.js b/packages/react-server-dom-relay/src/ReactFlightDOMRelayClientHostConfig.js
similarity index 100%
rename from packages/react-transport-dom-relay/src/ReactFlightDOMRelayClientHostConfig.js
rename to packages/react-server-dom-relay/src/ReactFlightDOMRelayClientHostConfig.js
diff --git a/packages/react-transport-dom-relay/src/ReactFlightDOMRelayProtocol.js b/packages/react-server-dom-relay/src/ReactFlightDOMRelayProtocol.js
similarity index 100%
rename from packages/react-transport-dom-relay/src/ReactFlightDOMRelayProtocol.js
rename to packages/react-server-dom-relay/src/ReactFlightDOMRelayProtocol.js
diff --git a/packages/react-transport-dom-relay/src/ReactFlightDOMRelayServer.js b/packages/react-server-dom-relay/src/ReactFlightDOMRelayServer.js
similarity index 100%
rename from packages/react-transport-dom-relay/src/ReactFlightDOMRelayServer.js
rename to packages/react-server-dom-relay/src/ReactFlightDOMRelayServer.js
diff --git a/packages/react-transport-dom-relay/src/ReactFlightDOMRelayServerHostConfig.js b/packages/react-server-dom-relay/src/ReactFlightDOMRelayServerHostConfig.js
similarity index 100%
rename from packages/react-transport-dom-relay/src/ReactFlightDOMRelayServerHostConfig.js
rename to packages/react-server-dom-relay/src/ReactFlightDOMRelayServerHostConfig.js
diff --git a/packages/react-transport-dom-relay/src/__mocks__/JSResourceReference.js b/packages/react-server-dom-relay/src/__mocks__/JSResourceReference.js
similarity index 100%
rename from packages/react-transport-dom-relay/src/__mocks__/JSResourceReference.js
rename to packages/react-server-dom-relay/src/__mocks__/JSResourceReference.js
diff --git a/packages/react-transport-dom-relay/src/__mocks__/ReactFlightDOMRelayClientIntegration.js b/packages/react-server-dom-relay/src/__mocks__/ReactFlightDOMRelayClientIntegration.js
similarity index 100%
rename from packages/react-transport-dom-relay/src/__mocks__/ReactFlightDOMRelayClientIntegration.js
rename to packages/react-server-dom-relay/src/__mocks__/ReactFlightDOMRelayClientIntegration.js
diff --git a/packages/react-transport-dom-relay/src/__mocks__/ReactFlightDOMRelayServerIntegration.js b/packages/react-server-dom-relay/src/__mocks__/ReactFlightDOMRelayServerIntegration.js
similarity index 100%
rename from packages/react-transport-dom-relay/src/__mocks__/ReactFlightDOMRelayServerIntegration.js
rename to packages/react-server-dom-relay/src/__mocks__/ReactFlightDOMRelayServerIntegration.js
diff --git a/packages/react-transport-dom-relay/src/__tests__/ReactFlightDOMRelay-test.internal.js b/packages/react-server-dom-relay/src/__tests__/ReactFlightDOMRelay-test.internal.js
similarity index 97%
rename from packages/react-transport-dom-relay/src/__tests__/ReactFlightDOMRelay-test.internal.js
rename to packages/react-server-dom-relay/src/__tests__/ReactFlightDOMRelay-test.internal.js
index 1bdb8b7684b83..e63a357b31da8 100644
--- a/packages/react-transport-dom-relay/src/__tests__/ReactFlightDOMRelay-test.internal.js
+++ b/packages/react-server-dom-relay/src/__tests__/ReactFlightDOMRelay-test.internal.js
@@ -21,8 +21,8 @@ describe('ReactFlightDOMRelay', () => {
     act = require('react-dom/test-utils').unstable_concurrentAct;
     React = require('react');
     ReactDOM = require('react-dom');
-    ReactDOMFlightRelayServer = require('react-transport-dom-relay/server');
-    ReactDOMFlightRelayClient = require('react-transport-dom-relay');
+    ReactDOMFlightRelayServer = require('react-server-dom-relay/server');
+    ReactDOMFlightRelayClient = require('react-server-dom-relay');
     JSResourceReference = require('JSResourceReference');
   });
 
diff --git a/packages/react-transport-dom-webpack/README.md b/packages/react-server-dom-webpack/README.md
similarity index 74%
rename from packages/react-transport-dom-webpack/README.md
rename to packages/react-server-dom-webpack/README.md
index 1897fa8502d75..f3568e050b161 100644
--- a/packages/react-transport-dom-webpack/README.md
+++ b/packages/react-server-dom-webpack/README.md
@@ -1,4 +1,4 @@
-# react-transport-dom-webpack
+# react-server-dom-webpack
 
 Experimental React Flight bindings for DOM using Webpack.
 
diff --git a/packages/react-transport-dom-webpack/esm/package.json b/packages/react-server-dom-webpack/esm/package.json
similarity index 100%
rename from packages/react-transport-dom-webpack/esm/package.json
rename to packages/react-server-dom-webpack/esm/package.json
diff --git a/packages/react-transport-dom-webpack/esm/react-transport-dom-webpack-node-loader.js b/packages/react-server-dom-webpack/esm/react-server-dom-webpack-node-loader.js
similarity index 100%
rename from packages/react-transport-dom-webpack/esm/react-transport-dom-webpack-node-loader.js
rename to packages/react-server-dom-webpack/esm/react-server-dom-webpack-node-loader.js
diff --git a/packages/react-transport-dom-webpack/index.js b/packages/react-server-dom-webpack/index.js
similarity index 100%
rename from packages/react-transport-dom-webpack/index.js
rename to packages/react-server-dom-webpack/index.js
diff --git a/packages/react-transport-dom-webpack/node-register.js b/packages/react-server-dom-webpack/node-register.js
similarity index 100%
rename from packages/react-transport-dom-webpack/node-register.js
rename to packages/react-server-dom-webpack/node-register.js
diff --git a/packages/react-transport-dom-webpack/npm/esm/package.json b/packages/react-server-dom-webpack/npm/esm/package.json
similarity index 100%
rename from packages/react-transport-dom-webpack/npm/esm/package.json
rename to packages/react-server-dom-webpack/npm/esm/package.json
diff --git a/packages/react-server-dom-webpack/npm/index.js b/packages/react-server-dom-webpack/npm/index.js
new file mode 100644
index 0000000000000..76932ab8e3c6b
--- /dev/null
+++ b/packages/react-server-dom-webpack/npm/index.js
@@ -0,0 +1,7 @@
+'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');
+}
diff --git a/packages/react-server-dom-webpack/npm/node-register.js b/packages/react-server-dom-webpack/npm/node-register.js
new file mode 100644
index 0000000000000..9c7c6a9fcfdf1
--- /dev/null
+++ b/packages/react-server-dom-webpack/npm/node-register.js
@@ -0,0 +1,3 @@
+'use strict';
+
+module.exports = require('./cjs/react-server-dom-webpack-node-register.js');
diff --git a/packages/react-server-dom-webpack/npm/plugin.js b/packages/react-server-dom-webpack/npm/plugin.js
new file mode 100644
index 0000000000000..64e01aad024c1
--- /dev/null
+++ b/packages/react-server-dom-webpack/npm/plugin.js
@@ -0,0 +1,3 @@
+'use strict';
+
+module.exports = require('./cjs/react-server-dom-webpack-plugin.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..13a632e641179
--- /dev/null
+++ b/packages/react-server-dom-webpack/npm/writer.js
@@ -0,0 +1,6 @@
+'use strict';
+
+throw new Error(
+  'The React Server Writer 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/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-transport-dom-webpack/package.json b/packages/react-server-dom-webpack/package.json
similarity index 56%
rename from packages/react-transport-dom-webpack/package.json
rename to packages/react-server-dom-webpack/package.json
index e2666f94809fc..711ffb37d68e8 100644
--- a/packages/react-transport-dom-webpack/package.json
+++ b/packages/react-server-dom-webpack/package.json
@@ -1,6 +1,6 @@
 {
-  "name": "react-transport-dom-webpack",
-  "description": "React Transport bindings for DOM using Webpack. This is intended to be integrated into meta-frameworks. It is not intended to be imported directly.",
+  "name": "react-server-dom-webpack",
+  "description": "React Server Components bindings for DOM using Webpack. This is intended to be integrated into meta-frameworks. It is not intended to be imported directly.",
   "version": "0.1.0",
   "private": true,
   "keywords": [
@@ -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,21 +25,27 @@
   "exports": {
     ".": "./index.js",
     "./plugin": "./plugin.js",
-    "./server": "./server.js",
-    "./server.browser": "./server.browser.js",
-    "./server.node": "./server.node.js",
-    "./node-loader": "./esm/react-transport-dom-webpack-node-loader.js",
+    "./writer": {
+      "react-server": {
+        "node": "./writer.node.server.js",
+        "browser": "./writer.browser.server.js"
+      },
+      "default": "./writer.js"
+    },
+    "./writer.node.server": "./writer.node.server.js",
+    "./writer.browser.server": "./writer.browser.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": {
     "type" : "git",
     "url" : "https://github.com/facebook/react.git",
-    "directory": "packages/react-transport-dom-webpack"
+    "directory": "packages/react-server-dom-webpack"
   },
   "engines": {
     "node": ">=0.10.0"
diff --git a/packages/react-transport-dom-webpack/plugin.js b/packages/react-server-dom-webpack/plugin.js
similarity index 100%
rename from packages/react-transport-dom-webpack/plugin.js
rename to packages/react-server-dom-webpack/plugin.js
diff --git a/packages/react-transport-dom-webpack/src/ReactFlightClientWebpackBundlerConfig.js b/packages/react-server-dom-webpack/src/ReactFlightClientWebpackBundlerConfig.js
similarity index 100%
rename from packages/react-transport-dom-webpack/src/ReactFlightClientWebpackBundlerConfig.js
rename to packages/react-server-dom-webpack/src/ReactFlightClientWebpackBundlerConfig.js
diff --git a/packages/react-transport-dom-webpack/src/ReactFlightDOMClient.js b/packages/react-server-dom-webpack/src/ReactFlightDOMClient.js
similarity index 100%
rename from packages/react-transport-dom-webpack/src/ReactFlightDOMClient.js
rename to packages/react-server-dom-webpack/src/ReactFlightDOMClient.js
diff --git a/packages/react-transport-dom-webpack/src/ReactFlightDOMServerBrowser.js b/packages/react-server-dom-webpack/src/ReactFlightDOMServerBrowser.js
similarity index 100%
rename from packages/react-transport-dom-webpack/src/ReactFlightDOMServerBrowser.js
rename to packages/react-server-dom-webpack/src/ReactFlightDOMServerBrowser.js
diff --git a/packages/react-transport-dom-webpack/src/ReactFlightDOMServerNode.js b/packages/react-server-dom-webpack/src/ReactFlightDOMServerNode.js
similarity index 100%
rename from packages/react-transport-dom-webpack/src/ReactFlightDOMServerNode.js
rename to packages/react-server-dom-webpack/src/ReactFlightDOMServerNode.js
diff --git a/packages/react-transport-dom-webpack/src/ReactFlightServerWebpackBundlerConfig.js b/packages/react-server-dom-webpack/src/ReactFlightServerWebpackBundlerConfig.js
similarity index 100%
rename from packages/react-transport-dom-webpack/src/ReactFlightServerWebpackBundlerConfig.js
rename to packages/react-server-dom-webpack/src/ReactFlightServerWebpackBundlerConfig.js
diff --git a/packages/react-transport-dom-webpack/src/ReactFlightWebpackNodeLoader.js b/packages/react-server-dom-webpack/src/ReactFlightWebpackNodeLoader.js
similarity index 100%
rename from packages/react-transport-dom-webpack/src/ReactFlightWebpackNodeLoader.js
rename to packages/react-server-dom-webpack/src/ReactFlightWebpackNodeLoader.js
diff --git a/packages/react-transport-dom-webpack/src/ReactFlightWebpackNodeRegister.js b/packages/react-server-dom-webpack/src/ReactFlightWebpackNodeRegister.js
similarity index 100%
rename from packages/react-transport-dom-webpack/src/ReactFlightWebpackNodeRegister.js
rename to packages/react-server-dom-webpack/src/ReactFlightWebpackNodeRegister.js
diff --git a/packages/react-transport-dom-webpack/src/ReactFlightWebpackPlugin.js b/packages/react-server-dom-webpack/src/ReactFlightWebpackPlugin.js
similarity index 99%
rename from packages/react-transport-dom-webpack/src/ReactFlightWebpackPlugin.js
rename to packages/react-server-dom-webpack/src/ReactFlightWebpackPlugin.js
index 3ae5acbe460ad..4b273acdfef61 100644
--- a/packages/react-transport-dom-webpack/src/ReactFlightWebpackPlugin.js
+++ b/packages/react-server-dom-webpack/src/ReactFlightWebpackPlugin.js
@@ -50,7 +50,7 @@ type Options = {
   manifestFilename?: string,
 };
 
-const PLUGIN_NAME = 'React Transport Plugin';
+const PLUGIN_NAME = 'React Server Plugin';
 
 export default class ReactFlightWebpackPlugin {
   clientReferences: $ReadOnlyArray<ClientReferencePath>;
diff --git a/packages/react-transport-dom-webpack/src/__tests__/ReactFlightDOM-test.js b/packages/react-server-dom-webpack/src/__tests__/ReactFlightDOM-test.js
similarity index 91%
rename from packages/react-transport-dom-webpack/src/__tests__/ReactFlightDOM-test.js
rename to packages/react-server-dom-webpack/src/__tests__/ReactFlightDOM-test.js
index 4ff3ff20341c7..a481d6ebbcd62 100644
--- a/packages/react-transport-dom-webpack/src/__tests__/ReactFlightDOM-test.js
+++ b/packages/react-server-dom-webpack/src/__tests__/ReactFlightDOM-test.js
@@ -28,8 +28,8 @@ let act;
 let Stream;
 let React;
 let ReactDOM;
-let ReactTransportDOMServer;
-let ReactTransportDOMClient;
+let ReactServerDOMWriter;
+let ReactServerDOMReader;
 
 describe('ReactFlightDOM', () => {
   beforeEach(() => {
@@ -40,8 +40,8 @@ describe('ReactFlightDOM', () => {
     Stream = require('stream');
     React = require('react');
     ReactDOM = require('react-dom');
-    ReactTransportDOMServer = require('react-transport-dom-webpack/server');
-    ReactTransportDOMClient = require('react-transport-dom-webpack');
+    ReactServerDOMWriter = require('react-server-dom-webpack/writer.node.server');
+    ReactServerDOMReader = require('react-server-dom-webpack');
   });
 
   function getTestStream() {
@@ -113,8 +113,8 @@ describe('ReactFlightDOM', () => {
     }
 
     const {writable, readable} = getTestStream();
-    ReactTransportDOMServer.pipeToNodeWritable(<App />, writable, webpackMap);
-    const response = ReactTransportDOMClient.createFromReadableStream(readable);
+    ReactServerDOMWriter.pipeToNodeWritable(<App />, writable, webpackMap);
+    const response = ReactServerDOMReader.createFromReadableStream(readable);
     await waitForSuspense(() => {
       const model = response.readRoot();
       expect(model).toEqual({
@@ -163,12 +163,12 @@ describe('ReactFlightDOM', () => {
     }
 
     const {writable, readable} = getTestStream();
-    ReactTransportDOMServer.pipeToNodeWritable(
+    ReactServerDOMWriter.pipeToNodeWritable(
       <RootModel />,
       writable,
       webpackMap,
     );
-    const response = ReactTransportDOMClient.createFromReadableStream(readable);
+    const response = ReactServerDOMReader.createFromReadableStream(readable);
 
     const container = document.createElement('div');
     const root = ReactDOM.unstable_createRoot(container);
@@ -202,12 +202,12 @@ describe('ReactFlightDOM', () => {
     }
 
     const {writable, readable} = getTestStream();
-    ReactTransportDOMServer.pipeToNodeWritable(
+    ReactServerDOMWriter.pipeToNodeWritable(
       <RootModel />,
       writable,
       webpackMap,
     );
-    const response = ReactTransportDOMClient.createFromReadableStream(readable);
+    const response = ReactServerDOMReader.createFromReadableStream(readable);
 
     const container = document.createElement('div');
     const root = ReactDOM.unstable_createRoot(container);
@@ -239,12 +239,12 @@ describe('ReactFlightDOM', () => {
     }
 
     const {writable, readable} = getTestStream();
-    ReactTransportDOMServer.pipeToNodeWritable(
+    ReactServerDOMWriter.pipeToNodeWritable(
       <RootModel />,
       writable,
       webpackMap,
     );
-    const response = ReactTransportDOMClient.createFromReadableStream(readable);
+    const response = ReactServerDOMReader.createFromReadableStream(readable);
 
     const container = document.createElement('div');
     const root = ReactDOM.unstable_createRoot(container);
@@ -374,8 +374,8 @@ describe('ReactFlightDOM', () => {
     }
 
     const {writable, readable} = getTestStream();
-    ReactTransportDOMServer.pipeToNodeWritable(model, writable, webpackMap);
-    const response = ReactTransportDOMClient.createFromReadableStream(readable);
+    ReactServerDOMWriter.pipeToNodeWritable(model, writable, webpackMap);
+    const response = ReactServerDOMReader.createFromReadableStream(readable);
 
     const container = document.createElement('div');
     const root = ReactDOM.unstable_createRoot(container);
@@ -473,12 +473,12 @@ describe('ReactFlightDOM', () => {
     const root = ReactDOM.unstable_createRoot(container);
 
     const stream1 = getTestStream();
-    ReactTransportDOMServer.pipeToNodeWritable(
+    ReactServerDOMWriter.pipeToNodeWritable(
       <App color="red" />,
       stream1.writable,
       webpackMap,
     );
-    const response1 = ReactTransportDOMClient.createFromReadableStream(
+    const response1 = ReactServerDOMReader.createFromReadableStream(
       stream1.readable,
     );
     await act(async () => {
@@ -501,12 +501,12 @@ describe('ReactFlightDOM', () => {
     inputB.value = 'goodbye';
 
     const stream2 = getTestStream();
-    ReactTransportDOMServer.pipeToNodeWritable(
+    ReactServerDOMWriter.pipeToNodeWritable(
       <App color="blue" />,
       stream2.writable,
       webpackMap,
     );
-    const response2 = ReactTransportDOMClient.createFromReadableStream(
+    const response2 = ReactServerDOMReader.createFromReadableStream(
       stream2.readable,
     );
     await act(async () => {
diff --git a/packages/react-transport-dom-webpack/src/__tests__/ReactFlightDOMBrowser-test.js b/packages/react-server-dom-webpack/src/__tests__/ReactFlightDOMBrowser-test.js
similarity index 80%
rename from packages/react-transport-dom-webpack/src/__tests__/ReactFlightDOMBrowser-test.js
rename to packages/react-server-dom-webpack/src/__tests__/ReactFlightDOMBrowser-test.js
index 182e9ed2bf3c9..04710cbdc5cf9 100644
--- a/packages/react-transport-dom-webpack/src/__tests__/ReactFlightDOMBrowser-test.js
+++ b/packages/react-server-dom-webpack/src/__tests__/ReactFlightDOMBrowser-test.js
@@ -16,15 +16,15 @@ global.TextEncoder = require('util').TextEncoder;
 global.TextDecoder = require('util').TextDecoder;
 
 let React;
-let ReactTransportDOMServer;
-let ReactTransportDOMClient;
+let ReactServerDOMWriter;
+let ReactServerDOMReader;
 
 describe('ReactFlightDOMBrowser', () => {
   beforeEach(() => {
     jest.resetModules();
     React = require('react');
-    ReactTransportDOMServer = require('react-transport-dom-webpack/server.browser');
-    ReactTransportDOMClient = require('react-transport-dom-webpack');
+    ReactServerDOMWriter = require('react-server-dom-webpack/writer.browser.server');
+    ReactServerDOMReader = require('react-server-dom-webpack');
   });
 
   async function waitForSuspense(fn) {
@@ -61,8 +61,8 @@ describe('ReactFlightDOMBrowser', () => {
       return model;
     }
 
-    const stream = ReactTransportDOMServer.renderToReadableStream(<App />);
-    const response = ReactTransportDOMClient.createFromReadableStream(stream);
+    const stream = ReactServerDOMWriter.renderToReadableStream(<App />);
+    const response = ReactServerDOMReader.createFromReadableStream(stream);
     await waitForSuspense(() => {
       const model = response.readRoot();
       expect(model).toEqual({
diff --git a/packages/react-transport-dom-webpack/server.browser.js b/packages/react-server-dom-webpack/writer.browser.server.js
similarity index 100%
rename from packages/react-transport-dom-webpack/server.browser.js
rename to packages/react-server-dom-webpack/writer.browser.server.js
diff --git a/packages/react-transport-dom-webpack/server.js b/packages/react-server-dom-webpack/writer.js
similarity index 52%
rename from packages/react-transport-dom-webpack/server.js
rename to packages/react-server-dom-webpack/writer.js
index 6010f4e3d5b22..00db7f503faf7 100644
--- a/packages/react-transport-dom-webpack/server.js
+++ b/packages/react-server-dom-webpack/writer.js
@@ -7,4 +7,7 @@
  * @flow
  */
 
-export * from './server.node';
+throw new Error(
+  'The React Server Writer cannot be used outside a react-server environment. ' +
+    'You must configure Node.js using the `--conditions react-server` flag.',
+);
diff --git a/packages/react-transport-dom-webpack/server.node.js b/packages/react-server-dom-webpack/writer.node.server.js
similarity index 100%
rename from packages/react-transport-dom-webpack/server.node.js
rename to packages/react-server-dom-webpack/writer.node.server.js
diff --git a/packages/react-transport-native-relay/index.js b/packages/react-server-native-relay/index.js
similarity index 100%
rename from packages/react-transport-native-relay/index.js
rename to packages/react-server-native-relay/index.js
diff --git a/packages/react-transport-native-relay/package.json b/packages/react-server-native-relay/package.json
similarity index 76%
rename from packages/react-transport-native-relay/package.json
rename to packages/react-server-native-relay/package.json
index 3c9bb80dbb4c1..1c328bd2ba32f 100644
--- a/packages/react-transport-native-relay/package.json
+++ b/packages/react-server-native-relay/package.json
@@ -1,11 +1,11 @@
 {
-  "name": "react-transport-native-relay",
+  "name": "react-server-native-relay",
   "version": "0.1.0",
   "private": true,
   "repository": {
     "type" : "git",
     "url" : "https://github.com/facebook/react.git",
-    "directory": "packages/react-transport-native-relay"
+    "directory": "packages/react-server-native-relay"
   },
   "dependencies": {
     "object-assign": "^4.1.1",
diff --git a/packages/react-transport-native-relay/server.js b/packages/react-server-native-relay/server.js
similarity index 100%
rename from packages/react-transport-native-relay/server.js
rename to packages/react-server-native-relay/server.js
diff --git a/packages/react-transport-native-relay/src/ReactFlightNativeRelayClient.js b/packages/react-server-native-relay/src/ReactFlightNativeRelayClient.js
similarity index 100%
rename from packages/react-transport-native-relay/src/ReactFlightNativeRelayClient.js
rename to packages/react-server-native-relay/src/ReactFlightNativeRelayClient.js
diff --git a/packages/react-transport-native-relay/src/ReactFlightNativeRelayClientHostConfig.js b/packages/react-server-native-relay/src/ReactFlightNativeRelayClientHostConfig.js
similarity index 100%
rename from packages/react-transport-native-relay/src/ReactFlightNativeRelayClientHostConfig.js
rename to packages/react-server-native-relay/src/ReactFlightNativeRelayClientHostConfig.js
diff --git a/packages/react-transport-native-relay/src/ReactFlightNativeRelayProtocol.js b/packages/react-server-native-relay/src/ReactFlightNativeRelayProtocol.js
similarity index 100%
rename from packages/react-transport-native-relay/src/ReactFlightNativeRelayProtocol.js
rename to packages/react-server-native-relay/src/ReactFlightNativeRelayProtocol.js
diff --git a/packages/react-transport-native-relay/src/ReactFlightNativeRelayServer.js b/packages/react-server-native-relay/src/ReactFlightNativeRelayServer.js
similarity index 100%
rename from packages/react-transport-native-relay/src/ReactFlightNativeRelayServer.js
rename to packages/react-server-native-relay/src/ReactFlightNativeRelayServer.js
diff --git a/packages/react-transport-native-relay/src/ReactFlightNativeRelayServerHostConfig.js b/packages/react-server-native-relay/src/ReactFlightNativeRelayServerHostConfig.js
similarity index 100%
rename from packages/react-transport-native-relay/src/ReactFlightNativeRelayServerHostConfig.js
rename to packages/react-server-native-relay/src/ReactFlightNativeRelayServerHostConfig.js
diff --git a/packages/react-transport-native-relay/src/__mocks__/JSResourceReferenceImpl.js b/packages/react-server-native-relay/src/__mocks__/JSResourceReferenceImpl.js
similarity index 100%
rename from packages/react-transport-native-relay/src/__mocks__/JSResourceReferenceImpl.js
rename to packages/react-server-native-relay/src/__mocks__/JSResourceReferenceImpl.js
diff --git a/packages/react-transport-native-relay/src/__mocks__/ReactFlightNativeRelayClientIntegration.js b/packages/react-server-native-relay/src/__mocks__/ReactFlightNativeRelayClientIntegration.js
similarity index 100%
rename from packages/react-transport-native-relay/src/__mocks__/ReactFlightNativeRelayClientIntegration.js
rename to packages/react-server-native-relay/src/__mocks__/ReactFlightNativeRelayClientIntegration.js
diff --git a/packages/react-transport-native-relay/src/__mocks__/ReactFlightNativeRelayServerIntegration.js b/packages/react-server-native-relay/src/__mocks__/ReactFlightNativeRelayServerIntegration.js
similarity index 100%
rename from packages/react-transport-native-relay/src/__mocks__/ReactFlightNativeRelayServerIntegration.js
rename to packages/react-server-native-relay/src/__mocks__/ReactFlightNativeRelayServerIntegration.js
diff --git a/packages/react-transport-native-relay/src/__tests__/ReactFlightNativeRelay-test.internal.js b/packages/react-server-native-relay/src/__tests__/ReactFlightNativeRelay-test.internal.js
similarity index 95%
rename from packages/react-transport-native-relay/src/__tests__/ReactFlightNativeRelay-test.internal.js
rename to packages/react-server-native-relay/src/__tests__/ReactFlightNativeRelay-test.internal.js
index a28a6fa35e078..0d439154b537f 100644
--- a/packages/react-transport-native-relay/src/__tests__/ReactFlightNativeRelay-test.internal.js
+++ b/packages/react-server-native-relay/src/__tests__/ReactFlightNativeRelay-test.internal.js
@@ -36,8 +36,8 @@ describe('ReactFlightNativeRelay', () => {
       uiViewClassName: 'RCTText',
     }));
 
-    ReactNativeFlightRelayServer = require('react-transport-native-relay/server');
-    ReactNativeFlightRelayClient = require('react-transport-native-relay');
+    ReactNativeFlightRelayServer = require('react-server-native-relay/server');
+    ReactNativeFlightRelayClient = require('react-server-native-relay');
     JSResourceReferenceImpl = require('JSResourceReferenceImpl');
   });
 
diff --git a/packages/react-transport-native-relay/src/__tests__/__snapshots__/ReactFlightNativeRelay-test.internal.js.snap b/packages/react-server-native-relay/src/__tests__/__snapshots__/ReactFlightNativeRelay-test.internal.js.snap
similarity index 100%
rename from packages/react-transport-native-relay/src/__tests__/__snapshots__/ReactFlightNativeRelay-test.internal.js.snap
rename to packages/react-server-native-relay/src/__tests__/__snapshots__/ReactFlightNativeRelay-test.internal.js.snap
diff --git a/packages/react-server/src/forks/ReactFlightServerConfig.dom-browser.js b/packages/react-server/src/forks/ReactFlightServerConfig.dom-browser.js
index c5768555f71fe..07b5f345f1936 100644
--- a/packages/react-server/src/forks/ReactFlightServerConfig.dom-browser.js
+++ b/packages/react-server/src/forks/ReactFlightServerConfig.dom-browser.js
@@ -8,4 +8,4 @@
  */
 
 export * from '../ReactFlightServerConfigStream';
-export * from 'react-transport-dom-webpack/src/ReactFlightServerWebpackBundlerConfig';
+export * from 'react-server-dom-webpack/src/ReactFlightServerWebpackBundlerConfig';
diff --git a/packages/react-server/src/forks/ReactFlightServerConfig.dom-relay.js b/packages/react-server/src/forks/ReactFlightServerConfig.dom-relay.js
index ba3627cb23704..3fe901f5742ff 100644
--- a/packages/react-server/src/forks/ReactFlightServerConfig.dom-relay.js
+++ b/packages/react-server/src/forks/ReactFlightServerConfig.dom-relay.js
@@ -7,4 +7,4 @@
  * @flow
  */
 
-export * from 'react-transport-dom-relay/src/ReactFlightDOMRelayServerHostConfig';
+export * from 'react-server-dom-relay/src/ReactFlightDOMRelayServerHostConfig';
diff --git a/packages/react-server/src/forks/ReactFlightServerConfig.dom.js b/packages/react-server/src/forks/ReactFlightServerConfig.dom.js
index c5768555f71fe..07b5f345f1936 100644
--- a/packages/react-server/src/forks/ReactFlightServerConfig.dom.js
+++ b/packages/react-server/src/forks/ReactFlightServerConfig.dom.js
@@ -8,4 +8,4 @@
  */
 
 export * from '../ReactFlightServerConfigStream';
-export * from 'react-transport-dom-webpack/src/ReactFlightServerWebpackBundlerConfig';
+export * from 'react-server-dom-webpack/src/ReactFlightServerWebpackBundlerConfig';
diff --git a/packages/react-server/src/forks/ReactFlightServerConfig.native-relay.js b/packages/react-server/src/forks/ReactFlightServerConfig.native-relay.js
index 35e6334ab331a..ba0f441a4dfd3 100644
--- a/packages/react-server/src/forks/ReactFlightServerConfig.native-relay.js
+++ b/packages/react-server/src/forks/ReactFlightServerConfig.native-relay.js
@@ -7,4 +7,4 @@
  * @flow
  */
 
-export * from 'react-transport-native-relay/src/ReactFlightNativeRelayServerHostConfig';
+export * from 'react-server-native-relay/src/ReactFlightNativeRelayServerHostConfig';
diff --git a/packages/react-transport-dom-webpack/npm/index.js b/packages/react-transport-dom-webpack/npm/index.js
deleted file mode 100644
index 479f8a52f74c6..0000000000000
--- a/packages/react-transport-dom-webpack/npm/index.js
+++ /dev/null
@@ -1,7 +0,0 @@
-'use strict';
-
-if (process.env.NODE_ENV === 'production') {
-  module.exports = require('./cjs/react-transport-dom-webpack.production.min.js');
-} else {
-  module.exports = require('./cjs/react-transport-dom-webpack.development.js');
-}
diff --git a/packages/react-transport-dom-webpack/npm/node-register.js b/packages/react-transport-dom-webpack/npm/node-register.js
deleted file mode 100644
index 87a431afe1989..0000000000000
--- a/packages/react-transport-dom-webpack/npm/node-register.js
+++ /dev/null
@@ -1,3 +0,0 @@
-'use strict';
-
-module.exports = require('./cjs/react-transport-dom-webpack-node-register.js');
diff --git a/packages/react-transport-dom-webpack/npm/plugin.js b/packages/react-transport-dom-webpack/npm/plugin.js
deleted file mode 100644
index a6c80480c1f10..0000000000000
--- a/packages/react-transport-dom-webpack/npm/plugin.js
+++ /dev/null
@@ -1,3 +0,0 @@
-'use strict';
-
-module.exports = require('./cjs/react-transport-dom-webpack-plugin.js');
diff --git a/packages/react-transport-dom-webpack/npm/server.browser.js b/packages/react-transport-dom-webpack/npm/server.browser.js
deleted file mode 100644
index af28f2e4695fe..0000000000000
--- a/packages/react-transport-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-transport-dom-webpack-server.browser.production.min.js');
-} else {
-  module.exports = require('./cjs/react-transport-dom-webpack-server.browser.development.js');
-}
diff --git a/packages/react-transport-dom-webpack/npm/server.js b/packages/react-transport-dom-webpack/npm/server.js
deleted file mode 100644
index 02f1553990a22..0000000000000
--- a/packages/react-transport-dom-webpack/npm/server.js
+++ /dev/null
@@ -1,3 +0,0 @@
-'use strict';
-
-module.exports = require('./server.node');
diff --git a/packages/react-transport-dom-webpack/npm/server.node.js b/packages/react-transport-dom-webpack/npm/server.node.js
deleted file mode 100644
index 2461e39a9561a..0000000000000
--- a/packages/react-transport-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-transport-dom-webpack-server.node.production.min.js');
-} else {
-  module.exports = require('./cjs/react-transport-dom-webpack-server.node.development.js');
-}
diff --git a/scripts/rollup/bundles.js b/scripts/rollup/bundles.js
index 47a004ed4e120..e6ef2e59bec9f 100644
--- a/scripts/rollup/bundles.js
+++ b/scripts/rollup/bundles.js
@@ -270,64 +270,64 @@ const bundles = [
     externals: ['react', 'react-dom/server'],
   },
 
-  /******* React Transport DOM Server Webpack *******/
+  /******* React Server DOM Webpack Writer *******/
   {
     bundleTypes: [NODE_DEV, NODE_PROD, UMD_DEV, UMD_PROD],
     moduleType: RENDERER,
-    entry: 'react-transport-dom-webpack/server.browser',
-    global: 'ReactTransportDOMServer',
+    entry: 'react-server-dom-webpack/writer.browser.server',
+    global: 'ReactServerDOMWriter',
     externals: ['react', 'react-dom/server'],
   },
   {
     bundleTypes: [NODE_DEV, NODE_PROD],
     moduleType: RENDERER,
-    entry: 'react-transport-dom-webpack/server.node',
-    global: 'ReactTransportDOMServer',
+    entry: 'react-server-dom-webpack/writer.node.server',
+    global: 'ReactServerDOMWriter',
     externals: ['react', 'react-dom/server'],
   },
 
-  /******* React Transport DOM Client Webpack *******/
+  /******* React Server DOM Webpack Reader *******/
   {
     bundleTypes: [NODE_DEV, NODE_PROD, UMD_DEV, UMD_PROD],
     moduleType: RENDERER,
-    entry: 'react-transport-dom-webpack',
-    global: 'ReactTransportDOMClient',
+    entry: 'react-server-dom-webpack',
+    global: 'ReactServerDOMReader',
     externals: ['react'],
   },
 
-  /******* React Transport DOM Webpack Plugin *******/
+  /******* React Server DOM Webpack Plugin *******/
   {
     bundleTypes: [NODE_ES2015],
     moduleType: RENDERER_UTILS,
-    entry: 'react-transport-dom-webpack/plugin',
-    global: 'ReactFlightWebpackPlugin',
+    entry: 'react-server-dom-webpack/plugin',
+    global: 'ReactServerWebpackPlugin',
     externals: ['fs', 'path', 'url', 'neo-async'],
   },
 
-  /******* React Transport DOM Webpack Node.js Loader *******/
+  /******* React Server DOM Webpack Node.js Loader *******/
   {
     bundleTypes: [NODE_ESM],
     moduleType: RENDERER_UTILS,
-    entry: 'react-transport-dom-webpack/node-loader',
-    global: 'ReactFlightWebpackNodeLoader',
+    entry: 'react-server-dom-webpack/node-loader',
+    global: 'ReactServerWebpackNodeLoader',
     externals: ['acorn'],
   },
 
-  /******* React Transport DOM Webpack Node.js CommonJS Loader *******/
+  /******* React Server DOM Webpack Node.js CommonJS Loader *******/
   {
     bundleTypes: [NODE_ES2015],
     moduleType: RENDERER_UTILS,
-    entry: 'react-transport-dom-webpack/node-register',
+    entry: 'react-server-dom-webpack/node-register',
     global: 'ReactFlightWebpackNodeRegister',
     externals: ['url', 'module'],
   },
 
-  /******* React Transport DOM Server Relay *******/
+  /******* React Server DOM Relay Writer *******/
   {
     bundleTypes: [FB_WWW_DEV, FB_WWW_PROD],
     moduleType: RENDERER,
-    entry: 'react-transport-dom-relay/server',
-    global: 'ReactFlightDOMRelayServer',
+    entry: 'react-server-dom-relay/server',
+    global: 'ReactFlightDOMRelayServer', // TODO: Rename to Writer
     externals: [
       'react',
       'react-dom/server',
@@ -336,12 +336,12 @@ const bundles = [
     ],
   },
 
-  /******* React Transport DOM Client Relay *******/
+  /******* React Server DOM Relay Reader *******/
   {
     bundleTypes: [FB_WWW_DEV, FB_WWW_PROD],
     moduleType: RENDERER,
-    entry: 'react-transport-dom-relay',
-    global: 'ReactFlightDOMRelayClient',
+    entry: 'react-server-dom-relay',
+    global: 'ReactFlightDOMRelayClient', // TODO: Rename to Reader
     externals: [
       'react',
       'ReactFlightDOMRelayClientIntegration',
@@ -349,12 +349,12 @@ const bundles = [
     ],
   },
 
-  /******* React Transport Native Server Relay *******/
+  /******* React Server Native Relay Writer *******/
   {
     bundleTypes: [RN_FB_DEV, RN_FB_PROD],
     moduleType: RENDERER,
-    entry: 'react-transport-native-relay/server',
-    global: 'ReactFlightNativeRelayServer',
+    entry: 'react-server-native-relay/server',
+    global: 'ReactFlightNativeRelayServer', // TODO: Rename to Writer
     externals: [
       'react',
       'ReactFlightNativeRelayServerIntegration',
@@ -362,12 +362,12 @@ const bundles = [
     ],
   },
 
-  /******* React Transport Native Client Relay *******/
+  /******* React Server Native Relay Reader *******/
   {
     bundleTypes: [RN_FB_DEV, RN_FB_PROD],
     moduleType: RENDERER,
-    entry: 'react-transport-native-relay',
-    global: 'ReactFlightNativeRelayClient',
+    entry: 'react-server-native-relay',
+    global: 'ReactFlightNativeRelayClient', // TODO: Rename to Reader
     externals: [
       'react',
       'ReactFlightNativeRelayClientIntegration',
diff --git a/scripts/rollup/packaging.js b/scripts/rollup/packaging.js
index 1e7ae2b018dbe..eaf78959a6786 100644
--- a/scripts/rollup/packaging.js
+++ b/scripts/rollup/packaging.js
@@ -82,7 +82,7 @@ function getBundleOutputPath(bundleType, filename, packageName) {
             /\.js$/,
             '.fb.js'
           )}`;
-        case 'react-transport-native-relay':
+        case 'react-server-native-relay':
           return `build/facebook-relay/flight/${filename}`;
         default:
           throw new Error('Unknown RN package.');
diff --git a/scripts/shared/inlinedHostConfigs.js b/scripts/shared/inlinedHostConfigs.js
index 175ce42f07483..98fc13e4f1204 100644
--- a/scripts/shared/inlinedHostConfigs.js
+++ b/scripts/shared/inlinedHostConfigs.js
@@ -13,18 +13,18 @@ module.exports = [
       'react-dom',
       'react-dom/testing',
       'react-dom/unstable-fizz.node',
-      'react-transport-dom-webpack/server.node',
-      'react-transport-dom-webpack',
+      'react-server-dom-webpack/writer.node.server',
+      'react-server-dom-webpack',
     ],
     paths: [
       'react-dom',
       'react-dom/unstable-fizz',
       'react-dom/unstable-fizz.node',
       'react-dom/src/server/ReactDOMFizzServerNode.js', // react-dom/unstable-fizz.node
-      'react-transport-dom-webpack',
-      'react-transport-dom-webpack/server',
-      'react-transport-dom-webpack/server.node',
-      'react-transport-dom-webpack/src/ReactFlightDOMServerNode.js', // react-transport-dom-webpack/server.browser
+      '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-client/src/ReactFlightClientStream.js', // We can only type check this in streaming configurations.
       'react-interactions',
     ],
@@ -37,17 +37,17 @@ module.exports = [
       'react-dom',
       'react-dom/testing',
       'react-dom/unstable-fizz.browser',
-      'react-transport-dom-webpack/server.browser',
-      'react-transport-dom-webpack',
+      'react-server-dom-webpack/writer.browser.server',
+      'react-server-dom-webpack',
     ],
     paths: [
       'react-dom',
       'react-dom/testing',
       'react-dom/unstable-fizz.browser',
       'react-dom/src/server/ReactDOMFizzServerBrowser.js', // react-dom/unstable-fizz.browser
-      'react-transport-dom-webpack',
-      'react-transport-dom-webpack/server.browser',
-      'react-transport-dom-webpack/src/ReactFlightDOMServerBrowser.js', // react-transport-dom-webpack/server.browser
+      '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-client/src/ReactFlightClientStream.js', // We can only type check this in streaming configurations.
     ],
     isFlowTyped: true,
@@ -83,21 +83,18 @@ module.exports = [
   },
   {
     shortName: 'dom-relay',
-    entryPoints: [
-      'react-transport-dom-relay',
-      'react-transport-dom-relay/server',
-    ],
-    paths: ['react-dom', 'react-transport-dom-relay'],
+    entryPoints: ['react-server-dom-relay', 'react-server-dom-relay/server'],
+    paths: ['react-dom', 'react-server-dom-relay'],
     isFlowTyped: true,
     isServerSupported: true,
   },
   {
     shortName: 'native-relay',
     entryPoints: [
-      'react-transport-native-relay',
-      'react-transport-native-relay/server',
+      'react-server-native-relay',
+      'react-server-native-relay/server',
     ],
-    paths: ['react-native-renderer', 'react-transport-native-relay'],
+    paths: ['react-native-renderer', 'react-server-native-relay'],
     isFlowTyped: true,
     isServerSupported: true,
   },