From 39dbb14da321cabafe3ab67de41150672aa301fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Markb=C3=A5ge?= <sema@fb.com>
Date: Fri, 15 Nov 2019 11:46:07 -0800
Subject: [PATCH] [Flight] Move Flight DOM to a Webpack Specific Package
 (#17372)

* Move Flight DOM to Webpack Specific Packagee

We'll have Webpack specific coupling so we need to ensure that it can be
versioned separately from various Webpack versions. We'll also have builds
for other bundlers in the future.

* Move to peerDep

* Move DOM Flight Tests

* Merge ReactFlightIntegration into ReactFlightDOM

This was an integration test. We can add to it.

* Fix fixture paths
---
 fixtures/flight-browser/index.html            |  4 +-
 fixtures/flight/server/handler.js             |  2 +-
 fixtures/flight/src/index.js                  |  2 +-
 .../react-dom/npm/unstable-flight-client.js   |  7 --
 .../npm/unstable-flight-server.browser.js     |  7 --
 .../react-dom/npm/unstable-flight-server.js   |  3 -
 .../npm/unstable-flight-server.node.js        |  7 --
 packages/react-dom/package.json               |  7 +-
 .../src/__tests__/ReactFlightDOM-test.js      | 92 -------------------
 packages/react-flight-dom-webpack/README.md   |  5 +
 .../index.js}                                 |  2 +-
 .../react-flight-dom-webpack/npm/index.js     |  7 ++
 .../npm/server.browser.js                     |  7 ++
 .../react-flight-dom-webpack/npm/server.js    |  3 +
 .../npm/server.node.js                        |  7 ++
 .../react-flight-dom-webpack/package.json     | 48 ++++++++++
 .../server.browser.js}                        |  2 +-
 .../server.js}                                |  2 +-
 .../server.node.js}                           |  2 +-
 .../src}/ReactFlightDOMClient.js              |  0
 .../src}/ReactFlightDOMServerBrowser.js       |  0
 .../src}/ReactFlightDOMServerNode.js          |  0
 .../src/__tests__/ReactFlightDOM-test.js}     | 50 +++++++++-
 .../__tests__/ReactFlightDOMBrowser-test.js   |  4 +-
 .../src/ReactFlightHostConfigBrowser.js}      |  0
 ...ReactFlightClientHostConfig.dom-browser.js |  2 +-
 .../forks/ReactFlightClientHostConfig.dom.js  |  2 +-
 .../src}/ReactDOMServerFormatConfig.js        |  0
 .../ReactServerFormatConfig.dom-browser.js    |  2 +-
 .../src/forks/ReactServerFormatConfig.dom.js  |  2 +-
 scripts/rollup/bundles.js                     | 10 +-
 scripts/shared/inlinedHostConfigs.js          |  8 +-
 yarn.lock                                     | 29 ++++++
 33 files changed, 177 insertions(+), 148 deletions(-)
 delete mode 100644 packages/react-dom/npm/unstable-flight-client.js
 delete mode 100644 packages/react-dom/npm/unstable-flight-server.browser.js
 delete mode 100644 packages/react-dom/npm/unstable-flight-server.js
 delete mode 100644 packages/react-dom/npm/unstable-flight-server.node.js
 delete mode 100644 packages/react-dom/src/__tests__/ReactFlightDOM-test.js
 create mode 100644 packages/react-flight-dom-webpack/README.md
 rename packages/{react-dom/unstable-flight-client.js => react-flight-dom-webpack/index.js} (82%)
 create mode 100644 packages/react-flight-dom-webpack/npm/index.js
 create mode 100644 packages/react-flight-dom-webpack/npm/server.browser.js
 create mode 100644 packages/react-flight-dom-webpack/npm/server.js
 create mode 100644 packages/react-flight-dom-webpack/npm/server.node.js
 create mode 100644 packages/react-flight-dom-webpack/package.json
 rename packages/{react-dom/unstable-flight-server.browser.js => react-flight-dom-webpack/server.browser.js} (81%)
 rename packages/{react-dom/unstable-flight-server.js => react-flight-dom-webpack/server.js} (78%)
 rename packages/{react-dom/unstable-flight-server.node.js => react-flight-dom-webpack/server.node.js} (81%)
 rename packages/{react-dom/src/client/flight => react-flight-dom-webpack/src}/ReactFlightDOMClient.js (100%)
 rename packages/{react-dom/src/server/flight => react-flight-dom-webpack/src}/ReactFlightDOMServerBrowser.js (100%)
 rename packages/{react-dom/src/server/flight => react-flight-dom-webpack/src}/ReactFlightDOMServerNode.js (100%)
 rename packages/{react-dom/src/__tests__/ReactFlightIntegration-test.js => react-flight-dom-webpack/src/__tests__/ReactFlightDOM-test.js} (87%)
 rename packages/{react-dom => react-flight-dom-webpack}/src/__tests__/ReactFlightDOMBrowser-test.js (91%)
 rename packages/{react-dom/src/client/flight/ReactFlightDOMHostConfig.js => react-flight/src/ReactFlightHostConfigBrowser.js} (100%)
 rename packages/{react-dom/src/server => react-server/src}/ReactDOMServerFormatConfig.js (100%)

diff --git a/fixtures/flight-browser/index.html b/fixtures/flight-browser/index.html
index b7e145732c..1fef79b182 100644
--- a/fixtures/flight-browser/index.html
+++ b/fixtures/flight-browser/index.html
@@ -19,8 +19,8 @@
     <script src="../../build/dist/react.development.js"></script>
     <script src="../../build/dist/react-dom.development.js"></script>
     <script src="../../build/dist/react-dom-server.browser.development.js"></script>
-    <script src="../../build/dist/react-dom-unstable-flight-server.browser.development.js"></script>
-    <script src="../../build/dist/react-dom-unstable-flight-client.development.js"></script>
+    <script src="../../build/dist/react-flight-dom-webpack-server.browser.development.js"></script>
+    <script src="../../build/dist/react-flight-dom-webpack.development.js"></script>
     <script src="https://unpkg.com/babel-standalone@6/babel.js"></script>
     <script type="text/babel">
       let Suspense = React.Suspense;
diff --git a/fixtures/flight/server/handler.js b/fixtures/flight/server/handler.js
index 86efd6194b..bb82a5e9a4 100644
--- a/fixtures/flight/server/handler.js
+++ b/fixtures/flight/server/handler.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const ReactFlightDOMServer = require('react-dom/unstable-flight-server');
+const ReactFlightDOMServer = require('react-flight-dom-webpack/server');
 const React = require('react');
 const Stream = require('stream');
 
diff --git a/fixtures/flight/src/index.js b/fixtures/flight/src/index.js
index 75dd7a556a..b46341250c 100644
--- a/fixtures/flight/src/index.js
+++ b/fixtures/flight/src/index.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
-import ReactFlightDOMClient from 'react-dom/unstable-flight-client';
+import ReactFlightDOMClient from 'react-flight-dom-webpack';
 import App from './App';
 
 let data = ReactFlightDOMClient.readFromFetch(fetch('http://localhost:3001'));
diff --git a/packages/react-dom/npm/unstable-flight-client.js b/packages/react-dom/npm/unstable-flight-client.js
deleted file mode 100644
index 9116c361eb..0000000000
--- a/packages/react-dom/npm/unstable-flight-client.js
+++ /dev/null
@@ -1,7 +0,0 @@
-'use strict';
-
-if (process.env.NODE_ENV === 'production') {
-  module.exports = require('./cjs/react-dom-unstable-flight-client.production.min.js');
-} else {
-  module.exports = require('./cjs/react-dom-unstable-flight-client.development.js');
-}
diff --git a/packages/react-dom/npm/unstable-flight-server.browser.js b/packages/react-dom/npm/unstable-flight-server.browser.js
deleted file mode 100644
index 8a6b19b7ab..0000000000
--- a/packages/react-dom/npm/unstable-flight-server.browser.js
+++ /dev/null
@@ -1,7 +0,0 @@
-'use strict';
-
-if (process.env.NODE_ENV === 'production') {
-  module.exports = require('./cjs/react-dom-unstable-flight-server.browser.production.min.js');
-} else {
-  module.exports = require('./cjs/react-dom-unstable-flight-server.browser.development.js');
-}
diff --git a/packages/react-dom/npm/unstable-flight-server.js b/packages/react-dom/npm/unstable-flight-server.js
deleted file mode 100644
index 4b75a8eef3..0000000000
--- a/packages/react-dom/npm/unstable-flight-server.js
+++ /dev/null
@@ -1,3 +0,0 @@
-'use strict';
-
-module.exports = require('./unstable-flight-server.node');
diff --git a/packages/react-dom/npm/unstable-flight-server.node.js b/packages/react-dom/npm/unstable-flight-server.node.js
deleted file mode 100644
index 30b967fd42..0000000000
--- a/packages/react-dom/npm/unstable-flight-server.node.js
+++ /dev/null
@@ -1,7 +0,0 @@
-'use strict';
-
-if (process.env.NODE_ENV === 'production') {
-  module.exports = require('./cjs/react-dom-unstable-flight-server.node.production.min.js');
-} else {
-  module.exports = require('./cjs/react-dom-unstable-flight-server.node.development.js');
-}
diff --git a/packages/react-dom/package.json b/packages/react-dom/package.json
index 9146d3f4bf..7e6cf5e5c0 100644
--- a/packages/react-dom/package.json
+++ b/packages/react-dom/package.json
@@ -39,18 +39,13 @@
     "unstable-fizz.js",
     "unstable-fizz.browser.js",
     "unstable-fizz.node.js",
-    "unstable-flight-client.js",
-    "unstable-flight-server.js",
-    "unstable-flight-server.browser.js",
-    "unstable-flight-server.node.js",
     "unstable-native-dependencies.js",
     "cjs/",
     "umd/"
   ],
   "browser": {
     "./server.js": "./server.browser.js",
-    "./unstable-fizz.js": "./unstable-fizz.browser.js",
-    "./unstable-flight-server.js": "./unstable-flight-server.browser.js"
+    "./unstable-fizz.js": "./unstable-fizz.browser.js"
   },
   "browserify": {
     "transform": [
diff --git a/packages/react-dom/src/__tests__/ReactFlightDOM-test.js b/packages/react-dom/src/__tests__/ReactFlightDOM-test.js
deleted file mode 100644
index 5fb8440cf8..0000000000
--- a/packages/react-dom/src/__tests__/ReactFlightDOM-test.js
+++ /dev/null
@@ -1,92 +0,0 @@
-/**
- * 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.
- *
- * @emails react-core
- * @jest-environment node
- */
-
-'use strict';
-
-// Polyfills for test environment
-global.ReadableStream = require('@mattiasbuelens/web-streams-polyfill/ponyfill/es6').ReadableStream;
-global.TextDecoder = require('util').TextDecoder;
-
-let Stream;
-let React;
-let ReactFlightDOMServer;
-let ReactFlightDOMClient;
-
-describe('ReactFlightDOM', () => {
-  beforeEach(() => {
-    jest.resetModules();
-    Stream = require('stream');
-    React = require('react');
-    ReactFlightDOMServer = require('react-dom/unstable-flight-server');
-    ReactFlightDOMClient = require('react-dom/unstable-flight-client');
-  });
-
-  function getTestStream() {
-    let writable = new Stream.PassThrough();
-    let readable = new ReadableStream({
-      start(controller) {
-        writable.on('data', chunk => {
-          controller.enqueue(chunk);
-        });
-        writable.on('end', () => {
-          controller.close();
-        });
-      },
-    });
-    return {
-      writable,
-      readable,
-    };
-  }
-
-  async function waitForSuspense(fn) {
-    while (true) {
-      try {
-        return fn();
-      } catch (promise) {
-        if (typeof promise.then === 'function') {
-          await promise;
-        } else {
-          throw promise;
-        }
-      }
-    }
-  }
-
-  it('should resolve HTML using Node streams', async () => {
-    function Text({children}) {
-      return <span>{children}</span>;
-    }
-    function HTML() {
-      return (
-        <div>
-          <Text>hello</Text>
-          <Text>world</Text>
-        </div>
-      );
-    }
-
-    function App() {
-      let model = {
-        html: <HTML />,
-      };
-      return model;
-    }
-
-    let {writable, readable} = getTestStream();
-    ReactFlightDOMServer.pipeToNodeWritable(<App />, writable);
-    let result = ReactFlightDOMClient.readFromReadableStream(readable);
-    await waitForSuspense(() => {
-      expect(result.model).toEqual({
-        html: '<div><span>hello</span><span>world</span></div>',
-      });
-    });
-  });
-});
diff --git a/packages/react-flight-dom-webpack/README.md b/packages/react-flight-dom-webpack/README.md
new file mode 100644
index 0000000000..9f69d87392
--- /dev/null
+++ b/packages/react-flight-dom-webpack/README.md
@@ -0,0 +1,5 @@
+# react-flight-dom-webpack
+
+Experimental React Flight bindings for DOM using Webpack.
+
+**Use it at your own risk.**
diff --git a/packages/react-dom/unstable-flight-client.js b/packages/react-flight-dom-webpack/index.js
similarity index 82%
rename from packages/react-dom/unstable-flight-client.js
rename to packages/react-flight-dom-webpack/index.js
index 7aeff31bb7..5b82a9d829 100644
--- a/packages/react-dom/unstable-flight-client.js
+++ b/packages/react-flight-dom-webpack/index.js
@@ -9,7 +9,7 @@
 
 'use strict';
 
-const ReactFlightDOMClient = require('./src/client/flight/ReactFlightDOMClient');
+const ReactFlightDOMClient = require('./src/ReactFlightDOMClient');
 
 // TODO: decide on the top-level export form.
 // This is hacky but makes it work with both Rollup and Jest
diff --git a/packages/react-flight-dom-webpack/npm/index.js b/packages/react-flight-dom-webpack/npm/index.js
new file mode 100644
index 0000000000..98d1e3a5dd
--- /dev/null
+++ b/packages/react-flight-dom-webpack/npm/index.js
@@ -0,0 +1,7 @@
+'use strict';
+
+if (process.env.NODE_ENV === 'production') {
+  module.exports = require('./cjs/react-flight-dom-webpack.production.min.js');
+} else {
+  module.exports = require('./cjs/react-flight-dom-webpack.development.js');
+}
diff --git a/packages/react-flight-dom-webpack/npm/server.browser.js b/packages/react-flight-dom-webpack/npm/server.browser.js
new file mode 100644
index 0000000000..2498fb4b51
--- /dev/null
+++ b/packages/react-flight-dom-webpack/npm/server.browser.js
@@ -0,0 +1,7 @@
+'use strict';
+
+if (process.env.NODE_ENV === 'production') {
+  module.exports = require('./cjs/react-flight-dom-webpack-server.browser.production.min.js');
+} else {
+  module.exports = require('./cjs/react-flight-dom-webpack-server.browser.development.js');
+}
diff --git a/packages/react-flight-dom-webpack/npm/server.js b/packages/react-flight-dom-webpack/npm/server.js
new file mode 100644
index 0000000000..02f1553990
--- /dev/null
+++ b/packages/react-flight-dom-webpack/npm/server.js
@@ -0,0 +1,3 @@
+'use strict';
+
+module.exports = require('./server.node');
diff --git a/packages/react-flight-dom-webpack/npm/server.node.js b/packages/react-flight-dom-webpack/npm/server.node.js
new file mode 100644
index 0000000000..1ec3340524
--- /dev/null
+++ b/packages/react-flight-dom-webpack/npm/server.node.js
@@ -0,0 +1,7 @@
+'use strict';
+
+if (process.env.NODE_ENV === 'production') {
+  module.exports = require('./cjs/react-flight-dom-webpack-server.node.production.min.js');
+} else {
+  module.exports = require('./cjs/react-flight-dom-webpack-server.node.development.js');
+}
diff --git a/packages/react-flight-dom-webpack/package.json b/packages/react-flight-dom-webpack/package.json
new file mode 100644
index 0000000000..8f48fae57f
--- /dev/null
+++ b/packages/react-flight-dom-webpack/package.json
@@ -0,0 +1,48 @@
+{
+  "name": "react-flight-dom-webpack",
+  "description": "React Flight bindings for DOM using Webpack.",
+  "version": "0.1.0",
+  "private": true,
+  "keywords": [
+    "react"
+  ],
+  "homepage": "https://reactjs.org/",
+  "bugs": "https://github.com/facebook/react/issues",
+  "license": "MIT",
+  "files": [
+    "LICENSE",
+    "README.md",
+    "index.js",
+    "server.js",
+    "server.browser.js",
+    "server.node.js",
+    "cjs/",
+    "umd/"
+  ],
+  "browser": {
+    "./server.js": "./server.browser.js"
+  },
+  "main": "index.js",
+  "repository": {
+    "type" : "git",
+    "url" : "https://github.com/facebook/react.git",
+    "directory": "packages/react-flight-dom-webpack"
+  },
+  "engines": {
+    "node": ">=0.10.0"
+  },
+  "peerDependencies": {
+    "react": "^16.0.0",
+    "react-dom": "^16.0.0",
+    "webpack": "^4.41.2"
+  },
+  "dependencies": {
+    "loose-envify": "^1.1.0",
+    "object-assign": "^4.1.1"
+  },
+  "browserify": {
+    "transform": [
+      "loose-envify"
+    ]
+  }
+}
diff --git a/packages/react-dom/unstable-flight-server.browser.js b/packages/react-flight-dom-webpack/server.browser.js
similarity index 81%
rename from packages/react-dom/unstable-flight-server.browser.js
rename to packages/react-flight-dom-webpack/server.browser.js
index 794459f5dc..b6d542749d 100644
--- a/packages/react-dom/unstable-flight-server.browser.js
+++ b/packages/react-flight-dom-webpack/server.browser.js
@@ -9,7 +9,7 @@
 
 'use strict';
 
-const ReactFlightDOMServerBrowser = require('./src/server/flight/ReactFlightDOMServerBrowser');
+const ReactFlightDOMServerBrowser = require('./src/ReactFlightDOMServerBrowser');
 
 // TODO: decide on the top-level export form.
 // This is hacky but makes it work with both Rollup and Jest
diff --git a/packages/react-dom/unstable-flight-server.js b/packages/react-flight-dom-webpack/server.js
similarity index 78%
rename from packages/react-dom/unstable-flight-server.js
rename to packages/react-flight-dom-webpack/server.js
index e4f1a3606c..03006336ba 100644
--- a/packages/react-dom/unstable-flight-server.js
+++ b/packages/react-flight-dom-webpack/server.js
@@ -9,4 +9,4 @@
 
 'use strict';
 
-module.exports = require('./unstable-flight-server.node');
+module.exports = require('./server.node');
diff --git a/packages/react-dom/unstable-flight-server.node.js b/packages/react-flight-dom-webpack/server.node.js
similarity index 81%
rename from packages/react-dom/unstable-flight-server.node.js
rename to packages/react-flight-dom-webpack/server.node.js
index 9466778779..1cbf1781b0 100644
--- a/packages/react-dom/unstable-flight-server.node.js
+++ b/packages/react-flight-dom-webpack/server.node.js
@@ -9,7 +9,7 @@
 
 'use strict';
 
-const ReactFlightDOMServerNode = require('./src/server/flight/ReactFlightDOMServerNode');
+const ReactFlightDOMServerNode = require('./src/ReactFlightDOMServerNode');
 
 // TODO: decide on the top-level export form.
 // This is hacky but makes it work with both Rollup and Jest
diff --git a/packages/react-dom/src/client/flight/ReactFlightDOMClient.js b/packages/react-flight-dom-webpack/src/ReactFlightDOMClient.js
similarity index 100%
rename from packages/react-dom/src/client/flight/ReactFlightDOMClient.js
rename to packages/react-flight-dom-webpack/src/ReactFlightDOMClient.js
diff --git a/packages/react-dom/src/server/flight/ReactFlightDOMServerBrowser.js b/packages/react-flight-dom-webpack/src/ReactFlightDOMServerBrowser.js
similarity index 100%
rename from packages/react-dom/src/server/flight/ReactFlightDOMServerBrowser.js
rename to packages/react-flight-dom-webpack/src/ReactFlightDOMServerBrowser.js
diff --git a/packages/react-dom/src/server/flight/ReactFlightDOMServerNode.js b/packages/react-flight-dom-webpack/src/ReactFlightDOMServerNode.js
similarity index 100%
rename from packages/react-dom/src/server/flight/ReactFlightDOMServerNode.js
rename to packages/react-flight-dom-webpack/src/ReactFlightDOMServerNode.js
diff --git a/packages/react-dom/src/__tests__/ReactFlightIntegration-test.js b/packages/react-flight-dom-webpack/src/__tests__/ReactFlightDOM-test.js
similarity index 87%
rename from packages/react-dom/src/__tests__/ReactFlightIntegration-test.js
rename to packages/react-flight-dom-webpack/src/__tests__/ReactFlightDOM-test.js
index 7621513830..c34e20ec83 100644
--- a/packages/react-dom/src/__tests__/ReactFlightIntegration-test.js
+++ b/packages/react-flight-dom-webpack/src/__tests__/ReactFlightDOM-test.js
@@ -24,15 +24,15 @@ let ReactDOM;
 let ReactFlightDOMServer;
 let ReactFlightDOMClient;
 
-describe('ReactFlightIntegration', () => {
+describe('ReactFlightDOM', () => {
   beforeEach(() => {
     jest.resetModules();
     act = require('react-dom/test-utils').act;
     Stream = require('stream');
     React = require('react');
     ReactDOM = require('react-dom');
-    ReactFlightDOMServer = require('react-dom/unstable-flight-server');
-    ReactFlightDOMClient = require('react-dom/unstable-flight-client');
+    ReactFlightDOMServer = require('react-flight-dom-webpack/server');
+    ReactFlightDOMClient = require('react-flight-dom-webpack');
   });
 
   function getTestStream() {
@@ -53,6 +53,50 @@ describe('ReactFlightIntegration', () => {
     };
   }
 
+  async function waitForSuspense(fn) {
+    while (true) {
+      try {
+        return fn();
+      } catch (promise) {
+        if (typeof promise.then === 'function') {
+          await promise;
+        } else {
+          throw promise;
+        }
+      }
+    }
+  }
+
+  it('should resolve HTML using Node streams', async () => {
+    function Text({children}) {
+      return <span>{children}</span>;
+    }
+    function HTML() {
+      return (
+        <div>
+          <Text>hello</Text>
+          <Text>world</Text>
+        </div>
+      );
+    }
+
+    function App() {
+      let model = {
+        html: <HTML />,
+      };
+      return model;
+    }
+
+    let {writable, readable} = getTestStream();
+    ReactFlightDOMServer.pipeToNodeWritable(<App />, writable);
+    let result = ReactFlightDOMClient.readFromReadableStream(readable);
+    await waitForSuspense(() => {
+      expect(result.model).toEqual({
+        html: '<div><span>hello</span><span>world</span></div>',
+      });
+    });
+  });
+
   it.experimental('should resolve the root', async () => {
     let {Suspense} = React;
 
diff --git a/packages/react-dom/src/__tests__/ReactFlightDOMBrowser-test.js b/packages/react-flight-dom-webpack/src/__tests__/ReactFlightDOMBrowser-test.js
similarity index 91%
rename from packages/react-dom/src/__tests__/ReactFlightDOMBrowser-test.js
rename to packages/react-flight-dom-webpack/src/__tests__/ReactFlightDOMBrowser-test.js
index 70387e585f..98a0f7f1da 100644
--- a/packages/react-dom/src/__tests__/ReactFlightDOMBrowser-test.js
+++ b/packages/react-flight-dom-webpack/src/__tests__/ReactFlightDOMBrowser-test.js
@@ -23,8 +23,8 @@ describe('ReactFlightDOMBrowser', () => {
   beforeEach(() => {
     jest.resetModules();
     React = require('react');
-    ReactFlightDOMServer = require('react-dom/unstable-flight-server.browser');
-    ReactFlightDOMClient = require('react-dom/unstable-flight-client');
+    ReactFlightDOMServer = require('react-flight-dom-webpack/server.browser');
+    ReactFlightDOMClient = require('react-flight-dom-webpack');
   });
 
   async function waitForSuspense(fn) {
diff --git a/packages/react-dom/src/client/flight/ReactFlightDOMHostConfig.js b/packages/react-flight/src/ReactFlightHostConfigBrowser.js
similarity index 100%
rename from packages/react-dom/src/client/flight/ReactFlightDOMHostConfig.js
rename to packages/react-flight/src/ReactFlightHostConfigBrowser.js
diff --git a/packages/react-flight/src/forks/ReactFlightClientHostConfig.dom-browser.js b/packages/react-flight/src/forks/ReactFlightClientHostConfig.dom-browser.js
index e768f225d6..aeb1f1f690 100644
--- a/packages/react-flight/src/forks/ReactFlightClientHostConfig.dom-browser.js
+++ b/packages/react-flight/src/forks/ReactFlightClientHostConfig.dom-browser.js
@@ -7,4 +7,4 @@
  * @flow
  */
 
-export * from 'react-dom/src/client/flight/ReactFlightDOMHostConfig';
+export * from 'react-flight/src/ReactFlightHostConfigBrowser';
diff --git a/packages/react-flight/src/forks/ReactFlightClientHostConfig.dom.js b/packages/react-flight/src/forks/ReactFlightClientHostConfig.dom.js
index e768f225d6..aeb1f1f690 100644
--- a/packages/react-flight/src/forks/ReactFlightClientHostConfig.dom.js
+++ b/packages/react-flight/src/forks/ReactFlightClientHostConfig.dom.js
@@ -7,4 +7,4 @@
  * @flow
  */
 
-export * from 'react-dom/src/client/flight/ReactFlightDOMHostConfig';
+export * from 'react-flight/src/ReactFlightHostConfigBrowser';
diff --git a/packages/react-dom/src/server/ReactDOMServerFormatConfig.js b/packages/react-server/src/ReactDOMServerFormatConfig.js
similarity index 100%
rename from packages/react-dom/src/server/ReactDOMServerFormatConfig.js
rename to packages/react-server/src/ReactDOMServerFormatConfig.js
diff --git a/packages/react-server/src/forks/ReactServerFormatConfig.dom-browser.js b/packages/react-server/src/forks/ReactServerFormatConfig.dom-browser.js
index c6e482efeb..e06662579e 100644
--- a/packages/react-server/src/forks/ReactServerFormatConfig.dom-browser.js
+++ b/packages/react-server/src/forks/ReactServerFormatConfig.dom-browser.js
@@ -7,4 +7,4 @@
  * @flow
  */
 
-export * from 'react-dom/src/server/ReactDOMServerFormatConfig';
+export * from '../ReactDOMServerFormatConfig';
diff --git a/packages/react-server/src/forks/ReactServerFormatConfig.dom.js b/packages/react-server/src/forks/ReactServerFormatConfig.dom.js
index c6e482efeb..e06662579e 100644
--- a/packages/react-server/src/forks/ReactServerFormatConfig.dom.js
+++ b/packages/react-server/src/forks/ReactServerFormatConfig.dom.js
@@ -7,4 +7,4 @@
  * @flow
  */
 
-export * from 'react-dom/src/server/ReactDOMServerFormatConfig';
+export * from '../ReactDOMServerFormatConfig';
diff --git a/scripts/rollup/bundles.js b/scripts/rollup/bundles.js
index ee0cdd2cf2..956e670653 100644
--- a/scripts/rollup/bundles.js
+++ b/scripts/rollup/bundles.js
@@ -170,23 +170,23 @@ const bundles = [
     externals: ['react', 'react-dom/server'],
   },
 
-  /******* React DOM Flight Server *******/
+  /******* React DOM Flight Server Webpack *******/
   {
     bundleTypes: [NODE_DEV, NODE_PROD, UMD_DEV, UMD_PROD],
     moduleType: RENDERER,
-    entry: 'react-dom/unstable-flight-server.browser',
+    entry: 'react-flight-dom-webpack/server.browser',
     global: 'ReactFlightDOMServer',
     externals: ['react', 'react-dom/server'],
   },
   {
     bundleTypes: [NODE_DEV, NODE_PROD, FB_WWW_DEV, FB_WWW_PROD],
     moduleType: RENDERER,
-    entry: 'react-dom/unstable-flight-server.node',
+    entry: 'react-flight-dom-webpack/server.node',
     global: 'ReactFlightDOMServer',
     externals: ['react', 'react-dom/server'],
   },
 
-  /******* React DOM Flight Client *******/
+  /******* React DOM Flight Client Webpack *******/
   {
     bundleTypes: [
       NODE_DEV,
@@ -197,7 +197,7 @@ const bundles = [
       FB_WWW_PROD,
     ],
     moduleType: RENDERER,
-    entry: 'react-dom/unstable-flight-client',
+    entry: 'react-flight-dom-webpack',
     global: 'ReactFlightDOMClient',
     externals: ['react'],
   },
diff --git a/scripts/shared/inlinedHostConfigs.js b/scripts/shared/inlinedHostConfigs.js
index 1832b732ee..81814324e6 100644
--- a/scripts/shared/inlinedHostConfigs.js
+++ b/scripts/shared/inlinedHostConfigs.js
@@ -12,8 +12,8 @@ module.exports = [
     entryPoints: [
       'react-dom',
       'react-dom/unstable-fizz.node',
-      'react-dom/unstable-flight-server.node',
-      'react-dom/unstable-flight-client',
+      'react-flight-dom-webpack/server.node',
+      'react-flight-dom-webpack',
     ],
     isFlowTyped: true,
     isServerSupported: true,
@@ -22,8 +22,8 @@ module.exports = [
     shortName: 'dom-browser',
     entryPoints: [
       'react-dom/unstable-fizz.browser',
-      'react-dom/unstable-flight-server.browser',
-      'react-dom/unstable-flight-client',
+      'react-flight-dom-webpack/server.browser',
+      'react-flight-dom-webpack',
     ],
     isFlowTyped: true,
     isServerSupported: true,
diff --git a/yarn.lock b/yarn.lock
index df34738bd8..e235f84857 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -13268,6 +13268,35 @@ webpack@^4.26.0:
     watchpack "^1.6.0"
     webpack-sources "^1.4.1"
 
+webpack@^4.41.2:
+  version "4.41.2"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.41.2.tgz#c34ec76daa3a8468c9b61a50336d8e3303dce74e"
+  integrity sha512-Zhw69edTGfbz9/8JJoyRQ/pq8FYUoY0diOXqW0T6yhgdhCv6wr0hra5DwwWexNRns2Z2+gsnrNcbe9hbGBgk/A==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/helper-module-context" "1.8.5"
+    "@webassemblyjs/wasm-edit" "1.8.5"
+    "@webassemblyjs/wasm-parser" "1.8.5"
+    acorn "^6.2.1"
+    ajv "^6.10.2"
+    ajv-keywords "^3.4.1"
+    chrome-trace-event "^1.0.2"
+    enhanced-resolve "^4.1.0"
+    eslint-scope "^4.0.3"
+    json-parse-better-errors "^1.0.2"
+    loader-runner "^2.4.0"
+    loader-utils "^1.2.3"
+    memory-fs "^0.4.1"
+    micromatch "^3.1.10"
+    mkdirp "^0.5.1"
+    neo-async "^2.6.1"
+    node-libs-browser "^2.2.1"
+    schema-utils "^1.0.0"
+    tapable "^1.1.3"
+    terser-webpack-plugin "^1.4.1"
+    watchpack "^1.6.0"
+    webpack-sources "^1.4.1"
+
 websocket-driver@>=0.5.1:
   version "0.7.3"
   resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.3.tgz#a2d4e0d4f4f116f1e6297eba58b05d430100e9f9"