From fb8192f16821f9aefab4991a1eb62ad78600d654 Mon Sep 17 00:00:00 2001
From: Sebastian Markbage <sebastian@calyptus.eu>
Date: Wed, 15 Feb 2023 23:50:41 -0500
Subject: [PATCH 1/4] Split client into separate builds per environment
 including unbundled node

---
 fixtures/flight-browser/index.html            |  2 +-
 .../client.browser.js                         | 10 +++++
 .../react-server-dom-webpack/client.edge.js   | 10 +++++
 packages/react-server-dom-webpack/client.js   |  2 +-
 .../react-server-dom-webpack/client.node.js   | 10 +++++
 .../client.node.unbundled.js                  | 10 +++++
 .../npm/client.browser.js                     |  7 ++++
 .../npm/client.edge.js                        |  7 ++++
 .../react-server-dom-webpack/npm/client.js    |  6 +--
 .../npm/client.node.js                        |  7 ++++
 .../npm/client.node.unbundled.js              |  7 ++++
 .../npm/server.node.unbundled.js              |  7 ++++
 .../react-server-dom-webpack/package.json     | 30 +++++++++++++--
 .../server.node.unbundled.js                  | 10 +++++
 .../src/__tests__/ReactFlightDOM-test.js      |  2 +-
 scripts/rollup/bundles.js                     | 38 ++++++++++++++++++-
 scripts/shared/inlinedHostConfigs.js          | 20 ++++------
 17 files changed, 161 insertions(+), 24 deletions(-)
 create mode 100644 packages/react-server-dom-webpack/client.browser.js
 create mode 100644 packages/react-server-dom-webpack/client.edge.js
 create mode 100644 packages/react-server-dom-webpack/client.node.js
 create mode 100644 packages/react-server-dom-webpack/client.node.unbundled.js
 create mode 100644 packages/react-server-dom-webpack/npm/client.browser.js
 create mode 100644 packages/react-server-dom-webpack/npm/client.edge.js
 create mode 100644 packages/react-server-dom-webpack/npm/client.node.js
 create mode 100644 packages/react-server-dom-webpack/npm/client.node.unbundled.js
 create mode 100644 packages/react-server-dom-webpack/npm/server.node.unbundled.js
 create mode 100644 packages/react-server-dom-webpack/server.node.unbundled.js

diff --git a/fixtures/flight-browser/index.html b/fixtures/flight-browser/index.html
index 5b16a2809c7a1..76035601d315a 100644
--- a/fixtures/flight-browser/index.html
+++ b/fixtures/flight-browser/index.html
@@ -20,7 +20,7 @@ <h1>Flight Example</h1>
     <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-client.development.js"></script>
+    <script src="../../build/node_modules/react-server-dom-webpack/umd/react-server-dom-webpack-client.browser.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/packages/react-server-dom-webpack/client.browser.js b/packages/react-server-dom-webpack/client.browser.js
new file mode 100644
index 0000000000000..9b9c654fb5804
--- /dev/null
+++ b/packages/react-server-dom-webpack/client.browser.js
@@ -0,0 +1,10 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow
+ */
+
+export * from './src/ReactFlightDOMClient';
diff --git a/packages/react-server-dom-webpack/client.edge.js b/packages/react-server-dom-webpack/client.edge.js
new file mode 100644
index 0000000000000..9b9c654fb5804
--- /dev/null
+++ b/packages/react-server-dom-webpack/client.edge.js
@@ -0,0 +1,10 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow
+ */
+
+export * from './src/ReactFlightDOMClient';
diff --git a/packages/react-server-dom-webpack/client.js b/packages/react-server-dom-webpack/client.js
index 9b9c654fb5804..2dad5bb513872 100644
--- a/packages/react-server-dom-webpack/client.js
+++ b/packages/react-server-dom-webpack/client.js
@@ -7,4 +7,4 @@
  * @flow
  */
 
-export * from './src/ReactFlightDOMClient';
+export * from './client.browser';
diff --git a/packages/react-server-dom-webpack/client.node.js b/packages/react-server-dom-webpack/client.node.js
new file mode 100644
index 0000000000000..9b9c654fb5804
--- /dev/null
+++ b/packages/react-server-dom-webpack/client.node.js
@@ -0,0 +1,10 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow
+ */
+
+export * from './src/ReactFlightDOMClient';
diff --git a/packages/react-server-dom-webpack/client.node.unbundled.js b/packages/react-server-dom-webpack/client.node.unbundled.js
new file mode 100644
index 0000000000000..9b9c654fb5804
--- /dev/null
+++ b/packages/react-server-dom-webpack/client.node.unbundled.js
@@ -0,0 +1,10 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow
+ */
+
+export * from './src/ReactFlightDOMClient';
diff --git a/packages/react-server-dom-webpack/npm/client.browser.js b/packages/react-server-dom-webpack/npm/client.browser.js
new file mode 100644
index 0000000000000..9a80cea84cbb8
--- /dev/null
+++ b/packages/react-server-dom-webpack/npm/client.browser.js
@@ -0,0 +1,7 @@
+'use strict';
+
+if (process.env.NODE_ENV === 'production') {
+  module.exports = require('./cjs/react-server-dom-webpack-client.browser.production.min.js');
+} else {
+  module.exports = require('./cjs/react-server-dom-webpack-client.browser.development.js');
+}
diff --git a/packages/react-server-dom-webpack/npm/client.edge.js b/packages/react-server-dom-webpack/npm/client.edge.js
new file mode 100644
index 0000000000000..661caffa755ba
--- /dev/null
+++ b/packages/react-server-dom-webpack/npm/client.edge.js
@@ -0,0 +1,7 @@
+'use strict';
+
+if (process.env.NODE_ENV === 'production') {
+  module.exports = require('./cjs/react-server-dom-webpack-client.edge.production.min.js');
+} else {
+  module.exports = require('./cjs/react-server-dom-webpack-client.edge.development.js');
+}
diff --git a/packages/react-server-dom-webpack/npm/client.js b/packages/react-server-dom-webpack/npm/client.js
index b8e9a99ec5e80..89d93a7a7920f 100644
--- a/packages/react-server-dom-webpack/npm/client.js
+++ b/packages/react-server-dom-webpack/npm/client.js
@@ -1,7 +1,3 @@
 'use strict';
 
-if (process.env.NODE_ENV === 'production') {
-  module.exports = require('./cjs/react-server-dom-webpack-client.production.min.js');
-} else {
-  module.exports = require('./cjs/react-server-dom-webpack-client.development.js');
-}
+module.exports = require('./client.browser');
diff --git a/packages/react-server-dom-webpack/npm/client.node.js b/packages/react-server-dom-webpack/npm/client.node.js
new file mode 100644
index 0000000000000..cb7dbcf4c34f7
--- /dev/null
+++ b/packages/react-server-dom-webpack/npm/client.node.js
@@ -0,0 +1,7 @@
+'use strict';
+
+if (process.env.NODE_ENV === 'production') {
+  module.exports = require('./cjs/react-server-dom-webpack-client.node.production.min.js');
+} else {
+  module.exports = require('./cjs/react-server-dom-webpack-client.node.development.js');
+}
diff --git a/packages/react-server-dom-webpack/npm/client.node.unbundled.js b/packages/react-server-dom-webpack/npm/client.node.unbundled.js
new file mode 100644
index 0000000000000..17fe876fd388a
--- /dev/null
+++ b/packages/react-server-dom-webpack/npm/client.node.unbundled.js
@@ -0,0 +1,7 @@
+'use strict';
+
+if (process.env.NODE_ENV === 'production') {
+  module.exports = require('./cjs/react-server-dom-webpack-client.node.unbundled.production.min.js');
+} else {
+  module.exports = require('./cjs/react-server-dom-webpack-client.node.unbundled.development.js');
+}
diff --git a/packages/react-server-dom-webpack/npm/server.node.unbundled.js b/packages/react-server-dom-webpack/npm/server.node.unbundled.js
new file mode 100644
index 0000000000000..5f75de80942a2
--- /dev/null
+++ b/packages/react-server-dom-webpack/npm/server.node.unbundled.js
@@ -0,0 +1,7 @@
+'use strict';
+
+if (process.env.NODE_ENV === 'production') {
+  module.exports = require('./cjs/react-server-dom-webpack-server.node.unbundled.production.min.js');
+} else {
+  module.exports = require('./cjs/react-server-dom-webpack-server.node.unbundled.development.js');
+}
diff --git a/packages/react-server-dom-webpack/package.json b/packages/react-server-dom-webpack/package.json
index 8bf5e8c18e19e..e1a0945b1d089 100644
--- a/packages/react-server-dom-webpack/package.json
+++ b/packages/react-server-dom-webpack/package.json
@@ -14,10 +14,15 @@
     "index.js",
     "plugin.js",
     "client.js",
+    "client.browser.js",
+    "client.edge.js",
+    "client.node.js",
+    "client.node.unbundled.js",
     "server.js",
     "server.browser.js",
     "server.edge.js",
     "server.node.js",
+    "server.node.unbundled.js",
     "node-register.js",
     "cjs/",
     "umd/",
@@ -26,13 +31,31 @@
   "exports": {
     ".": "./index.js",
     "./plugin": "./plugin.js",
-    "./client": "./client.js",
+    "./client": {
+      "workerd": "./client.edge.js",
+      "edge-light": "./client.edge.js",
+      "deno": "./client.edge.js",
+      "worker": "./client.edge.js",
+      "node": {
+        "webpack": "./client.node.js",
+        "default": "./client.node.unbundled.js"
+      },
+      "browser": "./client.browser.js",
+      "default": "./client.browser.js"
+    },
+    "./client.browser": "./client.browser.js",
+    "./client.edge": "./client.edge.js",
+    "./client.node": "./client.node.js",
+    "./client.node.unbundled": "./client.node.unbundled.js",
     "./server": {
       "react-server": {
-        "edge-light": "./server.edge.js",
         "workerd": "./server.edge.js",
+        "edge-light": "./server.edge.js",
         "deno": "./server.browser.js",
-        "node": "./server.node.js",
+        "node": {
+          "webpack": "./server.node.js",
+          "default": "./server.node.unbundled.js"
+        },
         "browser": "./server.browser.js"
       },
       "default": "./server.js"
@@ -40,6 +63,7 @@
     "./server.browser": "./server.browser.js",
     "./server.edge": "./server.edge.js",
     "./server.node": "./server.node.js",
+    "./server.node.unbundled": "./server.node.unbundled.js",
     "./node-loader": "./esm/react-server-dom-webpack-node-loader.js",
     "./node-register": "./node-register.js",
     "./src/*": "./src/*",
diff --git a/packages/react-server-dom-webpack/server.node.unbundled.js b/packages/react-server-dom-webpack/server.node.unbundled.js
new file mode 100644
index 0000000000000..7726b9bb929d4
--- /dev/null
+++ b/packages/react-server-dom-webpack/server.node.unbundled.js
@@ -0,0 +1,10 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow
+ */
+
+export * from './src/ReactFlightDOMServerNode';
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 54ae52f90554a..4c1b0f7585000 100644
--- a/packages/react-server-dom-webpack/src/__tests__/ReactFlightDOM-test.js
+++ b/packages/react-server-dom-webpack/src/__tests__/ReactFlightDOM-test.js
@@ -45,7 +45,7 @@ describe('ReactFlightDOM', () => {
     use = React.use;
     Suspense = React.Suspense;
     ReactDOMClient = require('react-dom/client');
-    ReactServerDOMWriter = require('react-server-dom-webpack/server.node');
+    ReactServerDOMWriter = require('react-server-dom-webpack/server.node.unbundled');
     ReactServerDOMReader = require('react-server-dom-webpack/client');
 
     ErrorBoundary = class extends React.Component {
diff --git a/scripts/rollup/bundles.js b/scripts/rollup/bundles.js
index e048f6818349e..5a0f140a84a00 100644
--- a/scripts/rollup/bundles.js
+++ b/scripts/rollup/bundles.js
@@ -357,6 +357,15 @@ const bundles = [
     wrapWithModuleBoundaries: false,
     externals: ['react', 'util', 'async_hooks', 'react-dom'],
   },
+  {
+    bundleTypes: [NODE_DEV, NODE_PROD],
+    moduleType: RENDERER,
+    entry: 'react-server-dom-webpack/server.node.unbundled',
+    global: 'ReactServerDOMServer',
+    minifyWithProdErrorCodes: false,
+    wrapWithModuleBoundaries: false,
+    externals: ['react', 'util', 'async_hooks', 'react-dom'],
+  },
   {
     bundleTypes: [NODE_DEV, NODE_PROD],
     moduleType: RENDERER,
@@ -371,7 +380,34 @@ const bundles = [
   {
     bundleTypes: [NODE_DEV, NODE_PROD, UMD_DEV, UMD_PROD],
     moduleType: RENDERER,
-    entry: 'react-server-dom-webpack/client',
+    entry: 'react-server-dom-webpack/client.browser',
+    global: 'ReactServerDOMClient',
+    minifyWithProdErrorCodes: false,
+    wrapWithModuleBoundaries: false,
+    externals: ['react'],
+  },
+  {
+    bundleTypes: [NODE_DEV, NODE_PROD],
+    moduleType: RENDERER,
+    entry: 'react-server-dom-webpack/client.node',
+    global: 'ReactServerDOMClient',
+    minifyWithProdErrorCodes: false,
+    wrapWithModuleBoundaries: false,
+    externals: ['react'],
+  },
+  {
+    bundleTypes: [NODE_DEV, NODE_PROD],
+    moduleType: RENDERER,
+    entry: 'react-server-dom-webpack/client.node.unbundled',
+    global: 'ReactServerDOMClient',
+    minifyWithProdErrorCodes: false,
+    wrapWithModuleBoundaries: false,
+    externals: ['react'],
+  },
+  {
+    bundleTypes: [NODE_DEV, NODE_PROD],
+    moduleType: RENDERER,
+    entry: 'react-server-dom-webpack/client.edge',
     global: 'ReactServerDOMClient',
     minifyWithProdErrorCodes: false,
     wrapWithModuleBoundaries: false,
diff --git a/scripts/shared/inlinedHostConfigs.js b/scripts/shared/inlinedHostConfigs.js
index 9a4a37539ab9b..1a4661f6aa4d2 100644
--- a/scripts/shared/inlinedHostConfigs.js
+++ b/scripts/shared/inlinedHostConfigs.js
@@ -16,8 +16,8 @@ module.exports = [
       'react-dom/static.node',
       'react-dom/server-rendering-stub',
       'react-dom/unstable_server-external-runtime',
-      'react-server-dom-webpack/server.node',
-      'react-server-dom-webpack/client',
+      'react-server-dom-webpack/server.node.unbundled',
+      'react-server-dom-webpack/client.node.unbundled',
     ],
     paths: [
       'react-dom',
@@ -30,9 +30,9 @@ module.exports = [
       'react-dom/src/server/ReactDOMFizzServerNode.js', // react-dom/server.node
       'react-dom/src/server/ReactDOMFizzStaticNode.js',
       'react-server-dom-webpack',
-      'react-server-dom-webpack/client',
+      'react-server-dom-webpack/client.node.unbundled',
       'react-server-dom-webpack/server',
-      'react-server-dom-webpack/server.node',
+      'react-server-dom-webpack/server.node.unbundled',
       'react-server-dom-webpack/src/ReactFlightDOMServerNode.js', // react-server-dom-webpack/server.node
       'react-client/src/ReactFlightClientStream.js', // We can only type check this in streaming configurations.
       'react-devtools',
@@ -54,11 +54,6 @@ module.exports = [
       'react-dom/server.bun',
       'react-dom/src/server/ReactDOMFizzServerBun.js',
       'react-dom-bindings',
-      'react-dom/server.node',
-      'react-server-dom-webpack',
-      'react-server-dom-webpack/client',
-      'react-server-dom-webpack/server',
-      'react-client/src/ReactFlightClientStream.js', // We can only type check this in streaming configurations.
       'shared/ReactDOMSharedInternals',
     ],
     isFlowTyped: true,
@@ -74,7 +69,7 @@ module.exports = [
       'react-dom/server-rendering-stub',
       'react-dom/unstable_server-external-runtime',
       'react-server-dom-webpack/server.browser',
-      'react-server-dom-webpack/client',
+      'react-server-dom-webpack/client.browser',
     ],
     paths: [
       'react-dom',
@@ -87,6 +82,7 @@ module.exports = [
       'react-dom/src/server/ReactDOMFizzStaticBrowser.js',
       'react-server-dom-webpack',
       'react-server-dom-webpack/client',
+      'react-server-dom-webpack/client.browser',
       'react-server-dom-webpack/server.browser',
       'react-server-dom-webpack/src/ReactFlightDOMServerBrowser.js', // react-server-dom-webpack/server.browser
       'react-client/src/ReactFlightClientStream.js', // We can only type check this in streaming configurations.
@@ -109,7 +105,7 @@ module.exports = [
       'react-dom/server-rendering-stub',
       'react-dom/unstable_server-external-runtime',
       'react-server-dom-webpack/server.edge',
-      'react-server-dom-webpack/client',
+      'react-server-dom-webpack/client.edge',
     ],
     paths: [
       'react-dom',
@@ -121,7 +117,7 @@ module.exports = [
       'react-dom/src/server/ReactDOMFizzServerEdge.js', // react-dom/server.edge
       'react-dom/src/server/ReactDOMFizzStaticEdge.js',
       'react-server-dom-webpack',
-      'react-server-dom-webpack/client',
+      'react-server-dom-webpack/client.edge',
       'react-server-dom-webpack/server.edge',
       'react-server-dom-webpack/src/ReactFlightDOMServerEdge.js', // react-server-dom-webpack/server.edge
       'react-client/src/ReactFlightClientStream.js', // We can only type check this in streaming configurations.

From 7c1658f085a9869a30b4fc85395a9cd689a77a68 Mon Sep 17 00:00:00 2001
From: Sebastian Markbage <sebastian@calyptus.eu>
Date: Thu, 16 Feb 2023 00:27:29 -0500
Subject: [PATCH 2/4] Split out into separate webpack environment builds

The supported edge builds are expected to always be bundled with webpack.
---
 ...lightClientHostConfig.dom-edge-webpack.js} |  0
 ...FlightClientHostConfig.dom-node-webpack.js | 12 ++++++
 ... ReactFiberHostConfig.dom-edge-webpack.js} |  0
 .../ReactFiberHostConfig.dom-node-webpack.js  | 10 +++++
 ...actFlightServerConfig.dom-edge-webpack.js} |  0
 ...eactFlightServerConfig.dom-node-webpack.js | 11 ++++++
 ...actServerFormatConfig.dom-edge-webpack.js} |  0
 ...eactServerFormatConfig.dom-node-webpack.js | 10 +++++
 ...actServerStreamConfig.dom-edge-webpack.js} |  0
 ...eactServerStreamConfig.dom-node-webpack.js | 10 +++++
 scripts/shared/inlinedHostConfigs.js          | 38 ++++++++++++++++---
 11 files changed, 86 insertions(+), 5 deletions(-)
 rename packages/react-client/src/forks/{ReactFlightClientHostConfig.dom-edge.js => ReactFlightClientHostConfig.dom-edge-webpack.js} (100%)
 create mode 100644 packages/react-client/src/forks/ReactFlightClientHostConfig.dom-node-webpack.js
 rename packages/react-reconciler/src/forks/{ReactFiberHostConfig.dom-edge.js => ReactFiberHostConfig.dom-edge-webpack.js} (100%)
 create mode 100644 packages/react-reconciler/src/forks/ReactFiberHostConfig.dom-node-webpack.js
 rename packages/react-server/src/forks/{ReactFlightServerConfig.dom-edge.js => ReactFlightServerConfig.dom-edge-webpack.js} (100%)
 create mode 100644 packages/react-server/src/forks/ReactFlightServerConfig.dom-node-webpack.js
 rename packages/react-server/src/forks/{ReactServerFormatConfig.dom-edge.js => ReactServerFormatConfig.dom-edge-webpack.js} (100%)
 create mode 100644 packages/react-server/src/forks/ReactServerFormatConfig.dom-node-webpack.js
 rename packages/react-server/src/forks/{ReactServerStreamConfig.dom-edge.js => ReactServerStreamConfig.dom-edge-webpack.js} (100%)
 create mode 100644 packages/react-server/src/forks/ReactServerStreamConfig.dom-node-webpack.js

diff --git a/packages/react-client/src/forks/ReactFlightClientHostConfig.dom-edge.js b/packages/react-client/src/forks/ReactFlightClientHostConfig.dom-edge-webpack.js
similarity index 100%
rename from packages/react-client/src/forks/ReactFlightClientHostConfig.dom-edge.js
rename to packages/react-client/src/forks/ReactFlightClientHostConfig.dom-edge-webpack.js
diff --git a/packages/react-client/src/forks/ReactFlightClientHostConfig.dom-node-webpack.js b/packages/react-client/src/forks/ReactFlightClientHostConfig.dom-node-webpack.js
new file mode 100644
index 0000000000000..4aae8141fd56e
--- /dev/null
+++ b/packages/react-client/src/forks/ReactFlightClientHostConfig.dom-node-webpack.js
@@ -0,0 +1,12 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow
+ */
+
+export * from 'react-client/src/ReactFlightClientHostConfigBrowser';
+export * from 'react-client/src/ReactFlightClientHostConfigStream';
+export * from 'react-server-dom-webpack/src/ReactFlightClientWebpackBundlerConfig';
diff --git a/packages/react-reconciler/src/forks/ReactFiberHostConfig.dom-edge.js b/packages/react-reconciler/src/forks/ReactFiberHostConfig.dom-edge-webpack.js
similarity index 100%
rename from packages/react-reconciler/src/forks/ReactFiberHostConfig.dom-edge.js
rename to packages/react-reconciler/src/forks/ReactFiberHostConfig.dom-edge-webpack.js
diff --git a/packages/react-reconciler/src/forks/ReactFiberHostConfig.dom-node-webpack.js b/packages/react-reconciler/src/forks/ReactFiberHostConfig.dom-node-webpack.js
new file mode 100644
index 0000000000000..aae45be9aae50
--- /dev/null
+++ b/packages/react-reconciler/src/forks/ReactFiberHostConfig.dom-node-webpack.js
@@ -0,0 +1,10 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow
+ */
+
+export * from 'react-dom-bindings/src/client/ReactDOMHostConfig';
diff --git a/packages/react-server/src/forks/ReactFlightServerConfig.dom-edge.js b/packages/react-server/src/forks/ReactFlightServerConfig.dom-edge-webpack.js
similarity index 100%
rename from packages/react-server/src/forks/ReactFlightServerConfig.dom-edge.js
rename to packages/react-server/src/forks/ReactFlightServerConfig.dom-edge-webpack.js
diff --git a/packages/react-server/src/forks/ReactFlightServerConfig.dom-node-webpack.js b/packages/react-server/src/forks/ReactFlightServerConfig.dom-node-webpack.js
new file mode 100644
index 0000000000000..99c541a937d63
--- /dev/null
+++ b/packages/react-server/src/forks/ReactFlightServerConfig.dom-node-webpack.js
@@ -0,0 +1,11 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow
+ */
+
+export * from '../ReactFlightServerConfigStream';
+export * from 'react-server-dom-webpack/src/ReactFlightServerWebpackBundlerConfig';
diff --git a/packages/react-server/src/forks/ReactServerFormatConfig.dom-edge.js b/packages/react-server/src/forks/ReactServerFormatConfig.dom-edge-webpack.js
similarity index 100%
rename from packages/react-server/src/forks/ReactServerFormatConfig.dom-edge.js
rename to packages/react-server/src/forks/ReactServerFormatConfig.dom-edge-webpack.js
diff --git a/packages/react-server/src/forks/ReactServerFormatConfig.dom-node-webpack.js b/packages/react-server/src/forks/ReactServerFormatConfig.dom-node-webpack.js
new file mode 100644
index 0000000000000..485793a6893ee
--- /dev/null
+++ b/packages/react-server/src/forks/ReactServerFormatConfig.dom-node-webpack.js
@@ -0,0 +1,10 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow
+ */
+
+export * from 'react-dom-bindings/src/server/ReactDOMServerFormatConfig';
diff --git a/packages/react-server/src/forks/ReactServerStreamConfig.dom-edge.js b/packages/react-server/src/forks/ReactServerStreamConfig.dom-edge-webpack.js
similarity index 100%
rename from packages/react-server/src/forks/ReactServerStreamConfig.dom-edge.js
rename to packages/react-server/src/forks/ReactServerStreamConfig.dom-edge-webpack.js
diff --git a/packages/react-server/src/forks/ReactServerStreamConfig.dom-node-webpack.js b/packages/react-server/src/forks/ReactServerStreamConfig.dom-node-webpack.js
new file mode 100644
index 0000000000000..1a3871aef2e8b
--- /dev/null
+++ b/packages/react-server/src/forks/ReactServerStreamConfig.dom-node-webpack.js
@@ -0,0 +1,10 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow
+ */
+
+export * from '../ReactServerStreamConfigNode';
diff --git a/scripts/shared/inlinedHostConfigs.js b/scripts/shared/inlinedHostConfigs.js
index 1a4661f6aa4d2..74165e4cee060 100644
--- a/scripts/shared/inlinedHostConfigs.js
+++ b/scripts/shared/inlinedHostConfigs.js
@@ -96,14 +96,10 @@ module.exports = [
     isServerSupported: true,
   },
   {
-    shortName: 'dom-edge',
+    shortName: 'dom-edge-webpack',
     entryPoints: [
-      'react-dom',
-      'react-dom/unstable_testing',
       'react-dom/src/server/ReactDOMFizzServerEdge.js',
       'react-dom/static.edge',
-      'react-dom/server-rendering-stub',
-      'react-dom/unstable_server-external-runtime',
       'react-server-dom-webpack/server.edge',
       'react-server-dom-webpack/client.edge',
     ],
@@ -130,6 +126,38 @@ module.exports = [
     isFlowTyped: true,
     isServerSupported: true,
   },
+  {
+    shortName: 'dom-node-webpack',
+    entryPoints: [
+      'react-server-dom-webpack/server.node',
+      'react-server-dom-webpack/client.node',
+    ],
+    paths: [
+      'react-dom',
+      'react-dom-bindings',
+      'react-dom/client',
+      'react-dom/server',
+      'react-dom/server.node',
+      'react-dom/static',
+      'react-dom/static.node',
+      'react-dom/src/server/ReactDOMFizzServerNode.js', // react-dom/server.node
+      'react-dom/src/server/ReactDOMFizzStaticNode.js',
+      'react-server-dom-webpack',
+      'react-server-dom-webpack/client.node',
+      'react-server-dom-webpack/server',
+      'react-server-dom-webpack/server.node',
+      'react-server-dom-webpack/src/ReactFlightDOMServerNode.js', // react-server-dom-webpack/server.node
+      'react-client/src/ReactFlightClientStream.js', // We can only type check this in streaming configurations.
+      'react-devtools',
+      'react-devtools-core',
+      'react-devtools-shell',
+      'react-devtools-shared',
+      'react-interactions',
+      'shared/ReactDOMSharedInternals',
+    ],
+    isFlowTyped: true,
+    isServerSupported: true,
+  },
   {
     shortName: 'dom-legacy',
     entryPoints: [

From d308d580fe7b5dded3648940725e5f69f02cc9ce Mon Sep 17 00:00:00 2001
From: Sebastian Markbage <sebastian@calyptus.eu>
Date: Thu, 16 Feb 2023 02:03:11 -0500
Subject: [PATCH 3/4] Detect the browser entry in the plugin

---
 .../react-server-dom-webpack/src/ReactFlightWebpackPlugin.js    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/react-server-dom-webpack/src/ReactFlightWebpackPlugin.js b/packages/react-server-dom-webpack/src/ReactFlightWebpackPlugin.js
index c40d6b1f56057..987a803f64431 100644
--- a/packages/react-server-dom-webpack/src/ReactFlightWebpackPlugin.js
+++ b/packages/react-server-dom-webpack/src/ReactFlightWebpackPlugin.js
@@ -40,7 +40,7 @@ class ClientReferenceDependency extends ModuleDependency {
 // without the client runtime so it's the first time in the loading sequence
 // you might want them.
 const clientImportName = 'react-server-dom-webpack/client';
-const clientFileName = require.resolve('../client');
+const clientFileName = require.resolve('../client.browser.js');
 
 type ClientReferenceSearchPath = {
   directory: string,

From 1d6fc5215dc0503cefc89138a2ce48130cb27aab Mon Sep 17 00:00:00 2001
From: Sebastian Markbage <sebastian@calyptus.eu>
Date: Thu, 16 Feb 2023 02:14:20 -0500
Subject: [PATCH 4/4] Fix Bun types. Bun doesn't have a Flight build yet.

---
 .../src/forks/ReactFlightClientHostConfig.dom-bun.js     | 9 ++++++++-
 .../src/forks/ReactFlightServerConfig.dom-bun.js         | 2 +-
 scripts/shared/inlinedHostConfigs.js                     | 1 -
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/packages/react-client/src/forks/ReactFlightClientHostConfig.dom-bun.js b/packages/react-client/src/forks/ReactFlightClientHostConfig.dom-bun.js
index 4aae8141fd56e..4bcb94fc76962 100644
--- a/packages/react-client/src/forks/ReactFlightClientHostConfig.dom-bun.js
+++ b/packages/react-client/src/forks/ReactFlightClientHostConfig.dom-bun.js
@@ -9,4 +9,11 @@
 
 export * from 'react-client/src/ReactFlightClientHostConfigBrowser';
 export * from 'react-client/src/ReactFlightClientHostConfigStream';
-export * from 'react-server-dom-webpack/src/ReactFlightClientWebpackBundlerConfig';
+
+export type Response = any;
+export opaque type BundlerConfig = mixed;
+export opaque type ClientReferenceMetadata = mixed;
+export opaque type ClientReference<T> = mixed; // eslint-disable-line no-unused-vars
+export const resolveClientReference: any = null;
+export const preloadModule: any = null;
+export const requireModule: any = null;
diff --git a/packages/react-server/src/forks/ReactFlightServerConfig.dom-bun.js b/packages/react-server/src/forks/ReactFlightServerConfig.dom-bun.js
index 99c541a937d63..f85cfb5f78b25 100644
--- a/packages/react-server/src/forks/ReactFlightServerConfig.dom-bun.js
+++ b/packages/react-server/src/forks/ReactFlightServerConfig.dom-bun.js
@@ -8,4 +8,4 @@
  */
 
 export * from '../ReactFlightServerConfigStream';
-export * from 'react-server-dom-webpack/src/ReactFlightServerWebpackBundlerConfig';
+export * from '../ReactFlightServerBundlerConfigCustom';
diff --git a/scripts/shared/inlinedHostConfigs.js b/scripts/shared/inlinedHostConfigs.js
index 74165e4cee060..4f79d5e6f8f9c 100644
--- a/scripts/shared/inlinedHostConfigs.js
+++ b/scripts/shared/inlinedHostConfigs.js
@@ -50,7 +50,6 @@ module.exports = [
     entryPoints: ['react-dom', 'react-dom/src/server/ReactDOMFizzServerBun.js'],
     paths: [
       'react-dom',
-      'react-dom/server',
       'react-dom/server.bun',
       'react-dom/src/server/ReactDOMFizzServerBun.js',
       'react-dom-bindings',