[Flight] reorganize code for forked entrypoints (#30702)

This commit updates the file locations and bulid configurations for
flight in preparation for new static entrypoints. This follows a
structure similar to Fizz which has a unified build but exports methods
from different top level entrypoints. This PR doesn't actually add the
new top level entrypoints however, that will arrive in a later update.

packages/react-client/src/forks/ReactFlightClientConfig.dom-browser-esm.js

@@ -9,7 +9,7 @@
 
 export * from 'react-client/src/ReactFlightClientStreamConfigWeb';
 export * from 'react-client/src/ReactClientConsoleConfigBrowser';
-export * from 'react-server-dom-esm/src/ReactFlightClientConfigBundlerESM';
-export * from 'react-server-dom-esm/src/ReactFlightClientConfigTargetESMBrowser';
+export * from 'react-server-dom-esm/src/client/ReactFlightClientConfigBundlerESM';
+export * from 'react-server-dom-esm/src/client/ReactFlightClientConfigTargetESMBrowser';
 export * from 'react-dom-bindings/src/shared/ReactFlightClientConfigDOM';
 export const usedWithSSR = false;

packages/react-client/src/forks/ReactFlightClientConfig.dom-browser-turbopack.js

@@ -9,8 +9,8 @@
 
 export * from 'react-client/src/ReactFlightClientStreamConfigWeb';
 export * from 'react-client/src/ReactClientConsoleConfigBrowser';
-export * from 'react-server-dom-turbopack/src/ReactFlightClientConfigBundlerTurbopack';
-export * from 'react-server-dom-turbopack/src/ReactFlightClientConfigBundlerTurbopackBrowser';
-export * from 'react-server-dom-turbopack/src/ReactFlightClientConfigTargetTurbopackBrowser';
+export * from 'react-server-dom-turbopack/src/client/ReactFlightClientConfigBundlerTurbopack';
+export * from 'react-server-dom-turbopack/src/client/ReactFlightClientConfigBundlerTurbopackBrowser';
+export * from 'react-server-dom-turbopack/src/client/ReactFlightClientConfigTargetTurbopackBrowser';
 export * from 'react-dom-bindings/src/shared/ReactFlightClientConfigDOM';
 export const usedWithSSR = false;

packages/react-client/src/forks/ReactFlightClientConfig.dom-browser.js

@@ -9,8 +9,8 @@
 
 export * from 'react-client/src/ReactFlightClientStreamConfigWeb';
 export * from 'react-client/src/ReactClientConsoleConfigBrowser';
-export * from 'react-server-dom-webpack/src/ReactFlightClientConfigBundlerWebpack';
-export * from 'react-server-dom-webpack/src/ReactFlightClientConfigBundlerWebpackBrowser';
-export * from 'react-server-dom-webpack/src/ReactFlightClientConfigTargetWebpackBrowser';
+export * from 'react-server-dom-webpack/src/client/ReactFlightClientConfigBundlerWebpack';
+export * from 'react-server-dom-webpack/src/client/ReactFlightClientConfigBundlerWebpackBrowser';
+export * from 'react-server-dom-webpack/src/client/ReactFlightClientConfigTargetWebpackBrowser';
 export * from 'react-dom-bindings/src/shared/ReactFlightClientConfigDOM';
 export const usedWithSSR = false;

packages/react-client/src/forks/ReactFlightClientConfig.dom-edge-turbopack.js

@@ -9,8 +9,8 @@
 
 export * from 'react-client/src/ReactFlightClientStreamConfigWeb';
 export * from 'react-client/src/ReactClientConsoleConfigServer';
-export * from 'react-server-dom-turbopack/src/ReactFlightClientConfigBundlerTurbopack';
-export * from 'react-server-dom-turbopack/src/ReactFlightClientConfigBundlerTurbopackServer';
-export * from 'react-server-dom-turbopack/src/ReactFlightClientConfigTargetTurbopackServer';
+export * from 'react-server-dom-turbopack/src/client/ReactFlightClientConfigBundlerTurbopack';
+export * from 'react-server-dom-turbopack/src/client/ReactFlightClientConfigBundlerTurbopackServer';
+export * from 'react-server-dom-turbopack/src/client/ReactFlightClientConfigTargetTurbopackServer';
 export * from 'react-dom-bindings/src/shared/ReactFlightClientConfigDOM';
 export const usedWithSSR = true;

packages/react-client/src/forks/ReactFlightClientConfig.dom-edge-webpack.js

@@ -9,8 +9,8 @@
 
 export * from 'react-client/src/ReactFlightClientStreamConfigWeb';
 export * from 'react-client/src/ReactClientConsoleConfigServer';
-export * from 'react-server-dom-webpack/src/ReactFlightClientConfigBundlerWebpack';
-export * from 'react-server-dom-webpack/src/ReactFlightClientConfigBundlerWebpackServer';
-export * from 'react-server-dom-webpack/src/ReactFlightClientConfigTargetWebpackServer';
+export * from 'react-server-dom-webpack/src/client/ReactFlightClientConfigBundlerWebpack';
+export * from 'react-server-dom-webpack/src/client/ReactFlightClientConfigBundlerWebpackServer';
+export * from 'react-server-dom-webpack/src/client/ReactFlightClientConfigTargetWebpackServer';
 export * from 'react-dom-bindings/src/shared/ReactFlightClientConfigDOM';
 export const usedWithSSR = true;

packages/react-client/src/forks/ReactFlightClientConfig.dom-node-esm.js

@@ -9,7 +9,7 @@
 
 export * from 'react-client/src/ReactFlightClientStreamConfigNode';
 export * from 'react-client/src/ReactClientConsoleConfigServer';
-export * from 'react-server-dom-esm/src/ReactFlightClientConfigBundlerESM';
-export * from 'react-server-dom-esm/src/ReactFlightClientConfigTargetESMServer';
+export * from 'react-server-dom-esm/src/client/ReactFlightClientConfigBundlerESM';
+export * from 'react-server-dom-esm/src/client/ReactFlightClientConfigTargetESMServer';
 export * from 'react-dom-bindings/src/shared/ReactFlightClientConfigDOM';
 export const usedWithSSR = true;

packages/react-client/src/forks/ReactFlightClientConfig.dom-node-turbopack-bundled.js

@@ -9,8 +9,8 @@
 
 export * from 'react-client/src/ReactFlightClientStreamConfigNode';
 export * from 'react-client/src/ReactClientConsoleConfigServer';
-export * from 'react-server-dom-turbopack/src/ReactFlightClientConfigBundlerTurbopack';
-export * from 'react-server-dom-turbopack/src/ReactFlightClientConfigBundlerTurbopackServer';
-export * from 'react-server-dom-turbopack/src/ReactFlightClientConfigTargetTurbopackServer';
+export * from 'react-server-dom-turbopack/src/client/ReactFlightClientConfigBundlerTurbopack';
+export * from 'react-server-dom-turbopack/src/client/ReactFlightClientConfigBundlerTurbopackServer';
+export * from 'react-server-dom-turbopack/src/client/ReactFlightClientConfigTargetTurbopackServer';
 export * from 'react-dom-bindings/src/shared/ReactFlightClientConfigDOM';
 export const usedWithSSR = true;

packages/react-client/src/forks/ReactFlightClientConfig.dom-node-turbopack.js

@@ -9,7 +9,7 @@
 
 export * from 'react-client/src/ReactFlightClientStreamConfigNode';
 export * from 'react-client/src/ReactClientConsoleConfigServer';
-export * from 'react-server-dom-turbopack/src/ReactFlightClientConfigBundlerNode';
-export * from 'react-server-dom-turbopack/src/ReactFlightClientConfigTargetTurbopackServer';
+export * from 'react-server-dom-turbopack/src/client/ReactFlightClientConfigBundlerNode';
+export * from 'react-server-dom-turbopack/src/client/ReactFlightClientConfigTargetTurbopackServer';
 export * from 'react-dom-bindings/src/shared/ReactFlightClientConfigDOM';
 export const usedWithSSR = true;

packages/react-client/src/forks/ReactFlightClientConfig.dom-node-webpack.js

@@ -9,8 +9,8 @@
 
 export * from 'react-client/src/ReactFlightClientStreamConfigNode';
 export * from 'react-client/src/ReactClientConsoleConfigServer';
-export * from 'react-server-dom-webpack/src/ReactFlightClientConfigBundlerWebpack';
-export * from 'react-server-dom-webpack/src/ReactFlightClientConfigBundlerWebpackServer';
-export * from 'react-server-dom-webpack/src/ReactFlightClientConfigTargetWebpackServer';
+export * from 'react-server-dom-webpack/src/client/ReactFlightClientConfigBundlerWebpack';
+export * from 'react-server-dom-webpack/src/client/ReactFlightClientConfigBundlerWebpackServer';
+export * from 'react-server-dom-webpack/src/client/ReactFlightClientConfigTargetWebpackServer';
 export * from 'react-dom-bindings/src/shared/ReactFlightClientConfigDOM';
 export const usedWithSSR = true;

packages/react-client/src/forks/ReactFlightClientConfig.dom-node.js

@@ -9,7 +9,7 @@
 
 export * from 'react-client/src/ReactFlightClientStreamConfigNode';
 export * from 'react-client/src/ReactClientConsoleConfigServer';
-export * from 'react-server-dom-webpack/src/ReactFlightClientConfigBundlerNode';
-export * from 'react-server-dom-webpack/src/ReactFlightClientConfigTargetWebpackServer';
+export * from 'react-server-dom-webpack/src/client/ReactFlightClientConfigBundlerNode';
+export * from 'react-server-dom-webpack/src/client/ReactFlightClientConfigTargetWebpackServer';
 export * from 'react-dom-bindings/src/shared/ReactFlightClientConfigDOM';
 export const usedWithSSR = true;

packages/react-server-dom-esm/client.browser.js

@@ -7,4 +7,4 @@
  * @flow
  */
 
-export * from './src/ReactFlightDOMClientBrowser';
+export * from './src/client/ReactFlightDOMClientBrowser';

packages/react-server-dom-esm/client.node.js

@@ -7,4 +7,4 @@
  * @flow
  */
 
-export * from './src/ReactFlightDOMClientNode';
+export * from './src/client/ReactFlightDOMClientNode';

packages/react-server-dom-esm/npm/server.node.js

@@ -1,7 +1,17 @@
 'use strict';
 
+var s;
 if (process.env.NODE_ENV === 'production') {
-  module.exports = require('./cjs/react-server-dom-esm-server.node.production.js');
+  s = require('./cjs/react-server-dom-esm-server.node.production.js');
 } else {
-  module.exports = require('./cjs/react-server-dom-esm-server.node.development.js');
+  s = require('./cjs/react-server-dom-esm-server.node.development.js');
 }
+
+exports.renderToPipeableStream = s.renderToPipeableStream;
+exports.decodeReplyFromBusboy = s.decodeReplyFromBusboy;
+exports.decodeReply = s.decodeReply;
+exports.decodeAction = s.decodeAction;
+exports.decodeFormState = s.decodeFormState;
+exports.registerServerReference = s.registerServerReference;
+exports.registerClientReference = s.registerClientReference;
+exports.createTemporaryReferenceSet = s.createTemporaryReferenceSet;

packages/react-server-dom-esm/server.node.js

@@ -7,4 +7,13 @@
  * @flow
  */
 
-export * from './src/ReactFlightDOMServerNode';
+export {
+  renderToPipeableStream,
+  decodeReplyFromBusboy,
+  decodeReply,
+  decodeAction,
+  decodeFormState,
+  registerServerReference,
+  registerClientReference,
+  createTemporaryReferenceSet,
+} from './src/server/react-flight-dom-server.node';

packages/react-server-dom-esm/src/server/ReactFlightDOMServerNode.js

@@ -45,7 +45,7 @@ import {
 export {
   registerServerReference,
   registerClientReference,
-} from './ReactFlightESMReferences';
+} from '../ReactFlightESMReferences';
 
 import type {TemporaryReferenceSet} from 'react-server/src/ReactFlightServerTemporaryReferences';
 

packages/react-server-dom-esm/src/server/ReactFlightServerConfigESMBundler.js

@@ -12,7 +12,7 @@ import type {ReactClientValue} from 'react-server/src/ReactFlightServer';
 import type {
   ClientReference,
   ServerReference,
-} from './ReactFlightESMReferences';
+} from '../ReactFlightESMReferences';
 
 export type {ClientReference, ServerReference};
 
@@ -27,7 +27,10 @@ export type ClientReferenceMetadata = [
 
 export type ClientReferenceKey = string;
 
-export {isClientReference, isServerReference} from './ReactFlightESMReferences';
+export {
+  isClientReference,
+  isServerReference,
+} from '../ReactFlightESMReferences';
 
 export function getClientReferenceKey(
   reference: ClientReference<any>,

packages/react-server-dom-esm/src/server/react-flight-dom-server.node.js

@@ -0,0 +1,19 @@
+/**
+ * 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 {
+  renderToPipeableStream,
+  decodeReplyFromBusboy,
+  decodeReply,
+  decodeAction,
+  decodeFormState,
+  registerServerReference,
+  registerClientReference,
+  createTemporaryReferenceSet,
+} from './ReactFlightDOMServerNode';

packages/react-server-dom-turbopack/client.browser.js

@@ -7,4 +7,4 @@
  * @flow
  */
 
-export * from './src/ReactFlightDOMClientBrowser';
+export * from './src/client/ReactFlightDOMClientBrowser';

packages/react-server-dom-turbopack/client.edge.js

@@ -7,4 +7,4 @@
  * @flow
  */
 
-export * from './src/ReactFlightDOMClientEdge';
+export * from './src/client/ReactFlightDOMClientEdge';

packages/react-server-dom-turbopack/client.node.js

@@ -7,4 +7,4 @@
  * @flow
  */
 
-export * from './src/ReactFlightDOMClientNode';
+export * from './src/client/ReactFlightDOMClientNode';

packages/react-server-dom-turbopack/client.node.unbundled.js

@@ -7,4 +7,4 @@
  * @flow
  */
 
-export * from './src/ReactFlightDOMClientNode';
+export * from './src/client/ReactFlightDOMClientNode';

packages/react-server-dom-turbopack/npm/server.browser.js

@@ -1,7 +1,17 @@
 'use strict';
 
+var s;
 if (process.env.NODE_ENV === 'production') {
-  module.exports = require('./cjs/react-server-dom-turbopack-server.browser.production.js');
+  s = require('./cjs/react-server-dom-turbopack-server.browser.production.js');
 } else {
-  module.exports = require('./cjs/react-server-dom-turbopack-server.browser.development.js');
+  s = require('./cjs/react-server-dom-turbopack-server.browser.development.js');
 }
+
+exports.renderToReadableStream = s.renderToReadableStream;
+exports.decodeReply = s.decodeReply;
+exports.decodeAction = s.decodeAction;
+exports.decodeFormState = s.decodeFormState;
+exports.registerServerReference = s.registerServerReference;
+exports.registerClientReference = s.registerClientReference;
+exports.createClientModuleProxy = s.createClientModuleProxy;
+exports.createTemporaryReferenceSet = s.createTemporaryReferenceSet;

packages/react-server-dom-turbopack/npm/server.edge.js

@@ -1,7 +1,17 @@
 'use strict';
 
+var s;
 if (process.env.NODE_ENV === 'production') {
-  module.exports = require('./cjs/react-server-dom-turbopack-server.edge.production.js');
+  s = require('./cjs/react-server-dom-turbopack-server.edge.production.js');
 } else {
-  module.exports = require('./cjs/react-server-dom-turbopack-server.edge.development.js');
+  s = require('./cjs/react-server-dom-turbopack-server.edge.development.js');
 }
+
+exports.renderToReadableStream = s.renderToReadableStream;
+exports.decodeReply = s.decodeReply;
+exports.decodeAction = s.decodeAction;
+exports.decodeFormState = s.decodeFormState;
+exports.registerServerReference = s.registerServerReference;
+exports.registerClientReference = s.registerClientReference;
+exports.createClientModuleProxy = s.createClientModuleProxy;
+exports.createTemporaryReferenceSet = s.createTemporaryReferenceSet;

packages/react-server-dom-turbopack/npm/server.node.js

@@ -1,7 +1,18 @@
 'use strict';
 
+var s;
 if (process.env.NODE_ENV === 'production') {
-  module.exports = require('./cjs/react-server-dom-turbopack-server.node.production.js');
+  s = require('./cjs/react-server-dom-turbopack-server.node.production.js');
 } else {
-  module.exports = require('./cjs/react-server-dom-turbopack-server.node.development.js');
+  s = require('./cjs/react-server-dom-turbopack-server.node.development.js');
 }
+
+exports.renderToPipeableStream = s.renderToPipeableStream;
+exports.decodeReplyFromBusboy = s.decodeReplyFromBusboy;
+exports.decodeReply = s.decodeReply;
+exports.decodeAction = s.decodeAction;
+exports.decodeFormState = s.decodeFormState;
+exports.registerServerReference = s.registerServerReference;
+exports.registerClientReference = s.registerClientReference;
+exports.createClientModuleProxy = s.createClientModuleProxy;
+exports.createTemporaryReferenceSet = s.createTemporaryReferenceSet;

packages/react-server-dom-turbopack/npm/server.node.unbundled.js

@@ -1,7 +1,18 @@
 'use strict';
 
+var s;
 if (process.env.NODE_ENV === 'production') {
-  module.exports = require('./cjs/react-server-dom-turbopack-server.node.unbundled.production.js');
+  s = require('./cjs/react-server-dom-turbopack-server.node.unbundled.production.js');
 } else {
-  module.exports = require('./cjs/react-server-dom-turbopack-server.node.unbundled.development.js');
+  s = require('./cjs/react-server-dom-turbopack-server.node.unbundled.development.js');
 }
+
+exports.renderToPipeableStream = s.renderToPipeableStream;
+exports.decodeReplyFromBusboy = s.decodeReplyFromBusboy;
+exports.decodeReply = s.decodeReply;
+exports.decodeAction = s.decodeAction;
+exports.decodeFormState = s.decodeFormState;
+exports.registerServerReference = s.registerServerReference;
+exports.registerClientReference = s.registerClientReference;
+exports.createClientModuleProxy = s.createClientModuleProxy;
+exports.createTemporaryReferenceSet = s.createTemporaryReferenceSet;

packages/react-server-dom-turbopack/server.browser.js

@@ -7,4 +7,13 @@
  * @flow
  */
 
-export * from './src/ReactFlightDOMServerBrowser';
+export {
+  renderToReadableStream,
+  decodeReply,
+  decodeAction,
+  decodeFormState,
+  registerServerReference,
+  registerClientReference,
+  createClientModuleProxy,
+  createTemporaryReferenceSet,
+} from './src/server/react-flight-dom-server.browser';

packages/react-server-dom-turbopack/server.edge.js

@@ -7,4 +7,13 @@
  * @flow
  */
 
-export * from './src/ReactFlightDOMServerEdge';
+export {
+  renderToReadableStream,
+  decodeReply,
+  decodeAction,
+  decodeFormState,
+  registerServerReference,
+  registerClientReference,
+  createClientModuleProxy,
+  createTemporaryReferenceSet,
+} from './src/server/react-flight-dom-server.edge';

packages/react-server-dom-turbopack/server.node.js

@@ -7,4 +7,14 @@
  * @flow
  */
 
-export * from './src/ReactFlightDOMServerNode';
+export {
+  renderToPipeableStream,
+  decodeReplyFromBusboy,
+  decodeReply,
+  decodeAction,
+  decodeFormState,
+  registerServerReference,
+  registerClientReference,
+  createClientModuleProxy,
+  createTemporaryReferenceSet,
+} from './src/server/react-flight-dom-server.node';

packages/react-server-dom-turbopack/server.node.unbundled.js

@@ -7,4 +7,14 @@
  * @flow
  */
 
-export * from './src/ReactFlightDOMServerNode';
+export {
+  renderToPipeableStream,
+  decodeReplyFromBusboy,
+  decodeReply,
+  decodeAction,
+  decodeFormState,
+  registerServerReference,
+  registerClientReference,
+  createClientModuleProxy,
+  createTemporaryReferenceSet,
+} from './src/server/react-flight-dom-server.node.unbundled';

packages/react-server-dom-turbopack/src/client/ReactFlightClientConfigBundlerNode.js

@@ -13,7 +13,7 @@ import type {
   RejectedThenable,
 } from 'shared/ReactTypes';
 
-import type {ImportMetadata} from './shared/ReactFlightImportMetadata';
+import type {ImportMetadata} from '../shared/ReactFlightImportMetadata';
 import type {ModuleLoading} from 'react-client/src/ReactFlightClientConfig';
 
 import {
@@ -21,7 +21,7 @@ import {
   CHUNKS,
   NAME,
   isAsyncImport,
-} from './shared/ReactFlightImportMetadata';
+} from '../shared/ReactFlightImportMetadata';
 import {prepareDestinationWithChunks} from 'react-client/src/ReactFlightClientConfig';
 
 export type SSRModuleMap = {

packages/react-server-dom-turbopack/src/client/ReactFlightClientConfigBundlerTurbopack.js

@@ -16,7 +16,7 @@ import type {
 import type {
   ImportMetadata,
   ImportManifestEntry,
-} from './shared/ReactFlightImportMetadata';
+} from '../shared/ReactFlightImportMetadata';
 import type {ModuleLoading} from 'react-client/src/ReactFlightClientConfig';
 
 import {
@@ -24,7 +24,7 @@ import {
   CHUNKS,
   NAME,
   isAsyncImport,
-} from './shared/ReactFlightImportMetadata';
+} from '../shared/ReactFlightImportMetadata';
 
 import {prepareDestinationWithChunks} from 'react-client/src/ReactFlightClientConfig';
 

packages/react-server-dom-turbopack/src/server/ReactFlightDOMServerBrowser.js

@@ -35,7 +35,7 @@ export {
   registerServerReference,
   registerClientReference,
   createClientModuleProxy,
-} from './ReactFlightTurbopackReferences';
+} from '../ReactFlightTurbopackReferences';
 
 import type {TemporaryReferenceSet} from 'react-server/src/ReactFlightServerTemporaryReferences';
 

packages/react-server-dom-turbopack/src/server/ReactFlightDOMServerEdge.js

@@ -35,7 +35,7 @@ export {
   registerServerReference,
   registerClientReference,
   createClientModuleProxy,
-} from './ReactFlightTurbopackReferences';
+} from '../ReactFlightTurbopackReferences';
 
 import type {TemporaryReferenceSet} from 'react-server/src/ReactFlightServerTemporaryReferences';
 

packages/react-server-dom-turbopack/src/server/ReactFlightDOMServerNode.js

@@ -46,7 +46,7 @@ export {
   registerServerReference,
   registerClientReference,
   createClientModuleProxy,
-} from './ReactFlightTurbopackReferences';
+} from '../ReactFlightTurbopackReferences';
 
 import type {TemporaryReferenceSet} from 'react-server/src/ReactFlightServerTemporaryReferences';
 

packages/react-server-dom-turbopack/src/server/ReactFlightServerConfigTurbopackBundler.js

@@ -11,12 +11,12 @@ import type {ReactClientValue} from 'react-server/src/ReactFlightServer';
 import type {
   ImportMetadata,
   ImportManifestEntry,
-} from './shared/ReactFlightImportMetadata';
+} from '../shared/ReactFlightImportMetadata';
 
 import type {
   ClientReference,
   ServerReference,
-} from './ReactFlightTurbopackReferences';
+} from '../ReactFlightTurbopackReferences';
 
 export type {ClientReference, ServerReference};
 
@@ -34,7 +34,7 @@ export type ClientReferenceKey = string;
 export {
   isClientReference,
   isServerReference,
-} from './ReactFlightTurbopackReferences';
+} from '../ReactFlightTurbopackReferences';
 
 export function getClientReferenceKey(
   reference: ClientReference<any>,

packages/react-server-dom-turbopack/src/server/react-flight-dom-server.browser.js

@@ -0,0 +1,19 @@
+/**
+ * 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 {
+  renderToReadableStream,
+  decodeReply,
+  decodeAction,
+  decodeFormState,
+  registerServerReference,
+  registerClientReference,
+  createClientModuleProxy,
+  createTemporaryReferenceSet,
+} from './ReactFlightDOMServerBrowser';

packages/react-server-dom-turbopack/src/server/react-flight-dom-server.edge.js

@@ -0,0 +1,19 @@
+/**
+ * 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 {
+  renderToReadableStream,
+  decodeReply,
+  decodeAction,
+  decodeFormState,
+  registerServerReference,
+  registerClientReference,
+  createClientModuleProxy,
+  createTemporaryReferenceSet,
+} from './ReactFlightDOMServerEdge';

packages/react-server-dom-turbopack/src/server/react-flight-dom-server.node.js

@@ -0,0 +1,20 @@
+/**
+ * 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 {
+  renderToPipeableStream,
+  decodeReplyFromBusboy,
+  decodeReply,
+  decodeAction,
+  decodeFormState,
+  registerServerReference,
+  registerClientReference,
+  createClientModuleProxy,
+  createTemporaryReferenceSet,
+} from './ReactFlightDOMServerNode';

packages/react-server-dom-turbopack/src/server/react-flight-dom-server.node.unbundled.js

@@ -0,0 +1,20 @@
+/**
+ * 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 {
+  renderToPipeableStream,
+  decodeReplyFromBusboy,
+  decodeReply,
+  decodeAction,
+  decodeFormState,
+  registerServerReference,
+  registerClientReference,
+  createClientModuleProxy,
+  createTemporaryReferenceSet,
+} from './ReactFlightDOMServerNode';

packages/react-server-dom-webpack/client.browser.js

@@ -7,4 +7,4 @@
  * @flow
  */
 
-export * from './src/ReactFlightDOMClientBrowser';
+export * from './src/client/ReactFlightDOMClientBrowser';

packages/react-server-dom-webpack/client.edge.js

@@ -7,4 +7,4 @@
  * @flow
  */
 
-export * from './src/ReactFlightDOMClientEdge';
+export * from './src/client/ReactFlightDOMClientEdge';

packages/react-server-dom-webpack/client.node.js

@@ -7,4 +7,4 @@
  * @flow
  */
 
-export * from './src/ReactFlightDOMClientNode';
+export * from './src/client/ReactFlightDOMClientNode';

packages/react-server-dom-webpack/client.node.unbundled.js

@@ -7,4 +7,4 @@
  * @flow
  */
 
-export * from './src/ReactFlightDOMClientNode';
+export * from './src/client/ReactFlightDOMClientNode';

packages/react-server-dom-webpack/npm/server.browser.js

@@ -1,7 +1,17 @@
 'use strict';
 
+var s;
 if (process.env.NODE_ENV === 'production') {
-  module.exports = require('./cjs/react-server-dom-webpack-server.browser.production.js');
+  s = require('./cjs/react-server-dom-webpack-server.browser.production.js');
 } else {
-  module.exports = require('./cjs/react-server-dom-webpack-server.browser.development.js');
+  s = require('./cjs/react-server-dom-webpack-server.browser.development.js');
 }
+
+exports.renderToReadableStream = s.renderToReadableStream;
+exports.decodeReply = s.decodeReply;
+exports.decodeAction = s.decodeAction;
+exports.decodeFormState = s.decodeFormState;
+exports.registerServerReference = s.registerServerReference;
+exports.registerClientReference = s.registerClientReference;
+exports.createClientModuleProxy = s.createClientModuleProxy;
+exports.createTemporaryReferenceSet = s.createTemporaryReferenceSet;

packages/react-server-dom-webpack/npm/server.edge.js

@@ -1,7 +1,17 @@
 'use strict';
 
+var s;
 if (process.env.NODE_ENV === 'production') {
-  module.exports = require('./cjs/react-server-dom-webpack-server.edge.production.js');
+  s = require('./cjs/react-server-dom-webpack-server.edge.production.js');
 } else {
-  module.exports = require('./cjs/react-server-dom-webpack-server.edge.development.js');
+  s = require('./cjs/react-server-dom-webpack-server.edge.development.js');
 }
+
+exports.renderToReadableStream = s.renderToReadableStream;
+exports.decodeReply = s.decodeReply;
+exports.decodeAction = s.decodeAction;
+exports.decodeFormState = s.decodeFormState;
+exports.registerServerReference = s.registerServerReference;
+exports.registerClientReference = s.registerClientReference;
+exports.createClientModuleProxy = s.createClientModuleProxy;
+exports.createTemporaryReferenceSet = s.createTemporaryReferenceSet;

packages/react-server-dom-webpack/npm/server.node.js

@@ -1,7 +1,18 @@
 'use strict';
 
+var s;
 if (process.env.NODE_ENV === 'production') {
-  module.exports = require('./cjs/react-server-dom-webpack-server.node.production.js');
+  s = require('./cjs/react-server-dom-webpack-server.node.production.js');
 } else {
-  module.exports = require('./cjs/react-server-dom-webpack-server.node.development.js');
+  s = require('./cjs/react-server-dom-webpack-server.node.development.js');
 }
+
+exports.renderToPipeableStream = s.renderToPipeableStream;
+exports.decodeReplyFromBusboy = s.decodeReplyFromBusboy;
+exports.decodeReply = s.decodeReply;
+exports.decodeAction = s.decodeAction;
+exports.decodeFormState = s.decodeFormState;
+exports.registerServerReference = s.registerServerReference;
+exports.registerClientReference = s.registerClientReference;
+exports.createClientModuleProxy = s.createClientModuleProxy;
+exports.createTemporaryReferenceSet = s.createTemporaryReferenceSet;

packages/react-server-dom-webpack/npm/server.node.unbundled.js

@@ -1,7 +1,18 @@
 'use strict';
 
+var s;
 if (process.env.NODE_ENV === 'production') {
-  module.exports = require('./cjs/react-server-dom-webpack-server.node.unbundled.production.js');
+  s = require('./cjs/react-server-dom-webpack-server.node.unbundled.production.js');
 } else {
-  module.exports = require('./cjs/react-server-dom-webpack-server.node.unbundled.development.js');
+  s = require('./cjs/react-server-dom-webpack-server.node.unbundled.development.js');
 }
+
+exports.renderToPipeableStream = s.renderToPipeableStream;
+exports.decodeReplyFromBusboy = s.decodeReplyFromBusboy;
+exports.decodeReply = s.decodeReply;
+exports.decodeAction = s.decodeAction;
+exports.decodeFormState = s.decodeFormState;
+exports.registerServerReference = s.registerServerReference;
+exports.registerClientReference = s.registerClientReference;
+exports.createClientModuleProxy = s.createClientModuleProxy;
+exports.createTemporaryReferenceSet = s.createTemporaryReferenceSet;

packages/react-server-dom-webpack/server.browser.js

@@ -7,4 +7,13 @@
  * @flow
  */
 
-export * from './src/ReactFlightDOMServerBrowser';
+export {
+  renderToReadableStream,
+  decodeReply,
+  decodeAction,
+  decodeFormState,
+  registerServerReference,
+  registerClientReference,
+  createClientModuleProxy,
+  createTemporaryReferenceSet,
+} from './src/server/react-flight-dom-server.browser';

packages/react-server-dom-webpack/server.edge.js

@@ -7,4 +7,13 @@
  * @flow
  */
 
-export * from './src/ReactFlightDOMServerEdge';
+export {
+  renderToReadableStream,
+  decodeReply,
+  decodeAction,
+  decodeFormState,
+  registerServerReference,
+  registerClientReference,
+  createClientModuleProxy,
+  createTemporaryReferenceSet,
+} from './src/server/react-flight-dom-server.edge';

packages/react-server-dom-webpack/server.node.js

@@ -7,4 +7,14 @@
  * @flow
  */
 
-export * from './src/ReactFlightDOMServerNode';
+export {
+  renderToPipeableStream,
+  decodeReplyFromBusboy,
+  decodeReply,
+  decodeAction,
+  decodeFormState,
+  registerServerReference,
+  registerClientReference,
+  createClientModuleProxy,
+  createTemporaryReferenceSet,
+} from './src/server/react-flight-dom-server.node';

packages/react-server-dom-webpack/server.node.unbundled.js

@@ -7,4 +7,14 @@
  * @flow
  */
 
-export * from './src/ReactFlightDOMServerNode';
+export {
+  renderToPipeableStream,
+  decodeReplyFromBusboy,
+  decodeReply,
+  decodeAction,
+  decodeFormState,
+  registerServerReference,
+  registerClientReference,
+  createClientModuleProxy,
+  createTemporaryReferenceSet,
+} from './src/server/react-flight-dom-server.node.unbundled';

packages/react-server-dom-webpack/src/client/ReactFlightClientConfigBundlerNode.js

@@ -13,7 +13,7 @@ import type {
   RejectedThenable,
 } from 'shared/ReactTypes';
 
-import type {ImportMetadata} from './shared/ReactFlightImportMetadata';
+import type {ImportMetadata} from '../shared/ReactFlightImportMetadata';
 import type {ModuleLoading} from 'react-client/src/ReactFlightClientConfig';
 
 import {
@@ -21,7 +21,7 @@ import {
   CHUNKS,
   NAME,
   isAsyncImport,
-} from './shared/ReactFlightImportMetadata';
+} from '../shared/ReactFlightImportMetadata';
 import {prepareDestinationWithChunks} from 'react-client/src/ReactFlightClientConfig';
 
 export type SSRModuleMap = {

packages/react-server-dom-webpack/src/client/ReactFlightClientConfigBundlerWebpack.js

@@ -16,7 +16,7 @@ import type {
 import type {
   ImportMetadata,
   ImportManifestEntry,
-} from './shared/ReactFlightImportMetadata';
+} from '../shared/ReactFlightImportMetadata';
 import type {ModuleLoading} from 'react-client/src/ReactFlightClientConfig';
 
 import {
@@ -24,7 +24,7 @@ import {
   CHUNKS,
   NAME,
   isAsyncImport,
-} from './shared/ReactFlightImportMetadata';
+} from '../shared/ReactFlightImportMetadata';
 
 import {prepareDestinationWithChunks} from 'react-client/src/ReactFlightClientConfig';
 

packages/react-server-dom-webpack/src/server/ReactFlightDOMServerBrowser.js

@@ -35,7 +35,7 @@ export {
   registerServerReference,
   registerClientReference,
   createClientModuleProxy,
-} from './ReactFlightWebpackReferences';
+} from '../ReactFlightWebpackReferences';
 
 import type {TemporaryReferenceSet} from 'react-server/src/ReactFlightServerTemporaryReferences';
 

packages/react-server-dom-webpack/src/server/ReactFlightDOMServerEdge.js

@@ -35,7 +35,7 @@ export {
   registerServerReference,
   registerClientReference,
   createClientModuleProxy,
-} from './ReactFlightWebpackReferences';
+} from '../ReactFlightWebpackReferences';
 
 import type {TemporaryReferenceSet} from 'react-server/src/ReactFlightServerTemporaryReferences';
 

packages/react-server-dom-webpack/src/server/ReactFlightDOMServerNode.js

@@ -46,7 +46,7 @@ export {
   registerServerReference,
   registerClientReference,
   createClientModuleProxy,
-} from './ReactFlightWebpackReferences';
+} from '../ReactFlightWebpackReferences';
 
 import type {TemporaryReferenceSet} from 'react-server/src/ReactFlightServerTemporaryReferences';
 

packages/react-server-dom-webpack/src/server/ReactFlightServerConfigWebpackBundler.js

@@ -11,12 +11,12 @@ import type {ReactClientValue} from 'react-server/src/ReactFlightServer';
 import type {
   ImportMetadata,
   ImportManifestEntry,
-} from './shared/ReactFlightImportMetadata';
+} from '../shared/ReactFlightImportMetadata';
 
 import type {
   ClientReference,
   ServerReference,
-} from './ReactFlightWebpackReferences';
+} from '../ReactFlightWebpackReferences';
 
 export type {ClientReference, ServerReference};
 
@@ -34,7 +34,7 @@ export type ClientReferenceKey = string;
 export {
   isClientReference,
   isServerReference,
-} from './ReactFlightWebpackReferences';
+} from '../ReactFlightWebpackReferences';
 
 export function getClientReferenceKey(
   reference: ClientReference<any>,

packages/react-server-dom-webpack/src/server/react-flight-dom-server.browser.js

@@ -0,0 +1,19 @@
+/**
+ * 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 {
+  renderToReadableStream,
+  decodeReply,
+  decodeAction,
+  decodeFormState,
+  registerServerReference,
+  registerClientReference,
+  createClientModuleProxy,
+  createTemporaryReferenceSet,
+} from './ReactFlightDOMServerBrowser';

packages/react-server-dom-webpack/src/server/react-flight-dom-server.edge.js

@@ -0,0 +1,19 @@
+/**
+ * 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 {
+  renderToReadableStream,
+  decodeReply,
+  decodeAction,
+  decodeFormState,
+  registerServerReference,
+  registerClientReference,
+  createClientModuleProxy,
+  createTemporaryReferenceSet,
+} from './ReactFlightDOMServerEdge';

packages/react-server-dom-webpack/src/server/react-flight-dom-server.node.js

@@ -0,0 +1,20 @@
+/**
+ * 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 {
+  renderToPipeableStream,
+  decodeReplyFromBusboy,
+  decodeReply,
+  decodeAction,
+  decodeFormState,
+  registerServerReference,
+  registerClientReference,
+  createClientModuleProxy,
+  createTemporaryReferenceSet,
+} from './ReactFlightDOMServerNode';

packages/react-server-dom-webpack/src/server/react-flight-dom-server.node.unbundled.js

@@ -0,0 +1,20 @@
+/**
+ * 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 {
+  renderToPipeableStream,
+  decodeReplyFromBusboy,
+  decodeReply,
+  decodeAction,
+  decodeFormState,
+  registerServerReference,
+  registerClientReference,
+  createClientModuleProxy,
+  createTemporaryReferenceSet,
+} from './ReactFlightDOMServerNode';

packages/react-server/src/forks/ReactFlightServerConfig.dom-browser-esm.js

@@ -10,7 +10,7 @@
 import type {Request} from 'react-server/src/ReactFlightServer';
 import type {ReactComponentInfo} from 'shared/ReactTypes';
 
-export * from 'react-server-dom-esm/src/ReactFlightServerConfigESMBundler';
+export * from 'react-server-dom-esm/src/server/ReactFlightServerConfigESMBundler';
 export * from 'react-dom-bindings/src/server/ReactFlightServerConfigDOM';
 
 export const supportsRequestStorage = false;

packages/react-server/src/forks/ReactFlightServerConfig.dom-browser-turbopack.js

@@ -10,7 +10,7 @@
 import type {Request} from 'react-server/src/ReactFlightServer';
 import type {ReactComponentInfo} from 'shared/ReactTypes';
 
-export * from 'react-server-dom-turbopack/src/ReactFlightServerConfigTurbopackBundler';
+export * from 'react-server-dom-turbopack/src/server/ReactFlightServerConfigTurbopackBundler';
 export * from 'react-dom-bindings/src/server/ReactFlightServerConfigDOM';
 
 export const supportsRequestStorage = false;

packages/react-server/src/forks/ReactFlightServerConfig.dom-browser.js

@@ -10,7 +10,7 @@
 import type {Request} from 'react-server/src/ReactFlightServer';
 import type {ReactComponentInfo} from 'shared/ReactTypes';
 
-export * from 'react-server-dom-webpack/src/ReactFlightServerConfigWebpackBundler';
+export * from 'react-server-dom-webpack/src/server/ReactFlightServerConfigWebpackBundler';
 export * from 'react-dom-bindings/src/server/ReactFlightServerConfigDOM';
 
 export const supportsRequestStorage = false;

packages/react-server/src/forks/ReactFlightServerConfig.dom-edge-turbopack.js

@@ -9,7 +9,7 @@
 import type {Request} from 'react-server/src/ReactFlightServer';
 import type {ReactComponentInfo} from 'shared/ReactTypes';
 
-export * from 'react-server-dom-turbopack/src/ReactFlightServerConfigTurbopackBundler';
+export * from 'react-server-dom-turbopack/src/server/ReactFlightServerConfigTurbopackBundler';
 export * from 'react-dom-bindings/src/server/ReactFlightServerConfigDOM';
 
 // For now, we get this from the global scope, but this will likely move to a module.

packages/react-server/src/forks/ReactFlightServerConfig.dom-edge.js

@@ -10,7 +10,7 @@
 import type {Request} from 'react-server/src/ReactFlightServer';
 import type {ReactComponentInfo} from 'shared/ReactTypes';
 
-export * from 'react-server-dom-webpack/src/ReactFlightServerConfigWebpackBundler';
+export * from 'react-server-dom-webpack/src/server/ReactFlightServerConfigWebpackBundler';
 export * from 'react-dom-bindings/src/server/ReactFlightServerConfigDOM';
 
 // For now, we get this from the global scope, but this will likely move to a module.

packages/react-server/src/forks/ReactFlightServerConfig.dom-node-esm.js

@@ -12,7 +12,7 @@ import {AsyncLocalStorage} from 'async_hooks';
 import type {Request} from 'react-server/src/ReactFlightServer';
 import type {ReactComponentInfo} from 'shared/ReactTypes';
 
-export * from 'react-server-dom-esm/src/ReactFlightServerConfigESMBundler';
+export * from 'react-server-dom-esm/src/server/ReactFlightServerConfigESMBundler';
 export * from 'react-dom-bindings/src/server/ReactFlightServerConfigDOM';
 
 export const supportsRequestStorage = true;

packages/react-server/src/forks/ReactFlightServerConfig.dom-node-turbopack.js

@@ -12,7 +12,7 @@ import {AsyncLocalStorage} from 'async_hooks';
 import type {Request} from 'react-server/src/ReactFlightServer';
 import type {ReactComponentInfo} from 'shared/ReactTypes';
 
-export * from 'react-server-dom-turbopack/src/ReactFlightServerConfigTurbopackBundler';
+export * from 'react-server-dom-turbopack/src/server/ReactFlightServerConfigTurbopackBundler';
 export * from 'react-dom-bindings/src/server/ReactFlightServerConfigDOM';
 
 export const supportsRequestStorage = true;

packages/react-server/src/forks/ReactFlightServerConfig.dom-node.js

@@ -12,7 +12,7 @@ import {AsyncLocalStorage} from 'async_hooks';
 import type {Request} from 'react-server/src/ReactFlightServer';
 import type {ReactComponentInfo} from 'shared/ReactTypes';
 
-export * from 'react-server-dom-webpack/src/ReactFlightServerConfigWebpackBundler';
+export * from 'react-server-dom-webpack/src/server/ReactFlightServerConfigWebpackBundler';
 export * from 'react-dom-bindings/src/server/ReactFlightServerConfigDOM';
 
 export const supportsRequestStorage = true;

scripts/rollup/bundles.js

@@ -392,7 +392,9 @@ const bundles = [
   {
     bundleTypes: [NODE_DEV, NODE_PROD],
     moduleType: RENDERER,
-    entry: 'react-server-dom-webpack/server.browser',
+    entry:
+      'react-server-dom-webpack/src/server/react-flight-dom-server.browser',
+    name: 'react-server-dom-webpack-server.browser',
     condition: 'react-server',
     global: 'ReactServerDOMServer',
     minifyWithProdErrorCodes: false,
@@ -402,7 +404,8 @@ const bundles = [
   {
     bundleTypes: [NODE_DEV, NODE_PROD],
     moduleType: RENDERER,
-    entry: 'react-server-dom-webpack/server.node',
+    entry: 'react-server-dom-webpack/src/server/react-flight-dom-server.node',
+    name: 'react-server-dom-webpack-server.node',
     condition: 'react-server',
     global: 'ReactServerDOMServer',
     minifyWithProdErrorCodes: false,
@@ -412,7 +415,9 @@ const bundles = [
   {
     bundleTypes: [NODE_DEV, NODE_PROD],
     moduleType: RENDERER,
-    entry: 'react-server-dom-webpack/server.node.unbundled',
+    entry:
+      'react-server-dom-webpack/src/server/react-flight-dom-server.node.unbundled',
+    name: 'react-server-dom-webpack-server.node.unbundled',
     condition: 'react-server',
     global: 'ReactServerDOMServer',
     minifyWithProdErrorCodes: false,
@@ -422,7 +427,8 @@ const bundles = [
   {
     bundleTypes: [NODE_DEV, NODE_PROD],
     moduleType: RENDERER,
-    entry: 'react-server-dom-webpack/server.edge',
+    entry: 'react-server-dom-webpack/src/server/react-flight-dom-server.edge',
+    name: 'react-server-dom-webpack-server.edge',
     condition: 'react-server',
     global: 'ReactServerDOMServer',
     minifyWithProdErrorCodes: false,
@@ -508,7 +514,9 @@ const bundles = [
   {
     bundleTypes: [NODE_DEV, NODE_PROD],
     moduleType: RENDERER,
-    entry: 'react-server-dom-turbopack/server.browser',
+    entry:
+      'react-server-dom-turbopack/src/server/react-flight-dom-server.browser',
+    name: 'react-server-dom-turbopack-server.browser',
     condition: 'react-server',
     global: 'ReactServerDOMServer',
     minifyWithProdErrorCodes: false,
@@ -518,7 +526,8 @@ const bundles = [
   {
     bundleTypes: [NODE_DEV, NODE_PROD],
     moduleType: RENDERER,
-    entry: 'react-server-dom-turbopack/server.node',
+    entry: 'react-server-dom-turbopack/src/server/react-flight-dom-server.node',
+    name: 'react-server-dom-turbopack-server.node',
     condition: 'react-server',
     global: 'ReactServerDOMServer',
     minifyWithProdErrorCodes: false,
@@ -528,7 +537,9 @@ const bundles = [
   {
     bundleTypes: [NODE_DEV, NODE_PROD],
     moduleType: RENDERER,
-    entry: 'react-server-dom-turbopack/server.node.unbundled',
+    entry:
+      'react-server-dom-turbopack/src/server/react-flight-dom-server.node.unbundled',
+    name: 'react-server-dom-turbopack-server.node.unbundled',
     condition: 'react-server',
     global: 'ReactServerDOMServer',
     minifyWithProdErrorCodes: false,
@@ -538,7 +549,8 @@ const bundles = [
   {
     bundleTypes: [NODE_DEV, NODE_PROD],
     moduleType: RENDERER,
-    entry: 'react-server-dom-turbopack/server.edge',
+    entry: 'react-server-dom-turbopack/src/server/react-flight-dom-server.edge',
+    name: 'react-server-dom-turbopack-server.edge',
     condition: 'react-server',
     global: 'ReactServerDOMServer',
     minifyWithProdErrorCodes: false,
@@ -617,7 +629,8 @@ const bundles = [
   {
     bundleTypes: [NODE_DEV, NODE_PROD],
     moduleType: RENDERER,
-    entry: 'react-server-dom-esm/server.node',
+    entry: 'react-server-dom-esm/src/server/react-flight-dom-server.node',
+    name: 'react-server-dom-esm-server.node',
     condition: 'react-server',
     minifyWithProdErrorCodes: false,
     wrapWithModuleBoundaries: false,

scripts/shared/inlinedHostConfigs.js

@@ -19,8 +19,8 @@ module.exports = [
       'react-dom/static.node',
       'react-dom/test-utils',
       'react-dom/unstable_server-external-runtime',
-      'react-server-dom-webpack/server.node.unbundled',
       'react-server-dom-webpack/client.node.unbundled',
+      'react-server-dom-webpack/src/server/react-flight-dom-server.node.unbundled',
     ],
     paths: [
       'react-dom',
@@ -43,9 +43,10 @@ module.exports = [
       'react-server-dom-webpack/client.node.unbundled',
       'react-server-dom-webpack/server',
       'react-server-dom-webpack/server.node.unbundled',
-      'react-server-dom-webpack/src/ReactFlightDOMServerNode.js', // react-server-dom-webpack/server.node
-      'react-server-dom-webpack/src/ReactFlightDOMClientNode.js', // react-server-dom-webpack/client.node
-      'react-server-dom-webpack/src/ReactFlightClientConfigBundlerNode.js',
+      'react-server-dom-webpack/src/client/ReactFlightDOMClientNode.js', // react-server-dom-webpack/client.node
+      'react-server-dom-webpack/src/client/ReactFlightClientConfigBundlerNode.js',
+      'react-server-dom-webpack/src/server/react-flight-dom-server.node.unbundled',
+      'react-server-dom-webpack/src/server/ReactFlightDOMServerNode.js', // react-server-dom-webpack/src/server/react-flight-dom-server.node
       'react-devtools',
       'react-devtools-core',
       'react-devtools-shell',
@@ -59,8 +60,8 @@ module.exports = [
   {
     shortName: 'dom-node-webpack',
     entryPoints: [
-      'react-server-dom-webpack/server.node',
       'react-server-dom-webpack/client.node',
+      'react-server-dom-webpack/src/server/react-flight-dom-server.node',
     ],
     paths: [
       'react-dom',
@@ -81,9 +82,10 @@ module.exports = [
       '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-server-dom-webpack/src/ReactFlightClientConfigBundlerWebpack.js',
-      'react-server-dom-webpack/src/ReactFlightClientConfigBundlerWebpackServer.js',
+      'react-server-dom-webpack/src/client/ReactFlightClientConfigBundlerWebpack.js',
+      'react-server-dom-webpack/src/client/ReactFlightClientConfigBundlerWebpackServer.js',
+      'react-server-dom-webpack/src/server/react-flight-dom-server.node',
+      'react-server-dom-webpack/src/server/ReactFlightDOMServerNode.js', // react-server-dom-webpack/src/server/react-flight-dom-server.node
       'react-server-dom-webpack/node-register',
       'react-server-dom-webpack/src/ReactFlightWebpackNodeRegister.js',
       'react-devtools',
@@ -99,8 +101,8 @@ module.exports = [
   {
     shortName: 'dom-node-turbopack',
     entryPoints: [
-      'react-server-dom-turbopack/server.node.unbundled',
       'react-server-dom-turbopack/client.node.unbundled',
+      'react-server-dom-turbopack/src/server/react-flight-dom-server.node.unbundled',
     ],
     paths: [
       'react-dom',
@@ -121,9 +123,10 @@ module.exports = [
       'react-server-dom-turbopack/client.node.unbundled',
       'react-server-dom-turbopack/server',
       'react-server-dom-turbopack/server.node.unbundled',
-      'react-server-dom-turbopack/src/ReactFlightDOMServerNode.js', // react-server-dom-turbopack/server.node.unbundled
-      'react-server-dom-turbopack/src/ReactFlightDOMClientNode.js', // react-server-dom-turbopack/client.node.unbundled
-      'react-server-dom-turbopack/src/ReactFlightClientConfigBundlerNode.js',
+      'react-server-dom-turbopack/src/client/ReactFlightDOMClientNode.js', // react-server-dom-turbopack/client.node.unbundled
+      'react-server-dom-turbopack/src/client/ReactFlightClientConfigBundlerNode.js',
+      'react-server-dom-turbopack/src/server/react-flight-dom-server.node.unbundled',
+      'react-server-dom-turbopack/src/server/ReactFlightDOMServerNode.js', // react-server-dom-turbopack/src/server/react-flight-dom-server.node.unbundled
       'react-server-dom-turbopack/node-register',
       'react-server-dom-turbopack/src/ReactFlightTurbopackNodeRegister.js',
       'react-devtools',
@@ -139,8 +142,8 @@ module.exports = [
   {
     shortName: 'dom-node-turbopack-bundled',
     entryPoints: [
-      'react-server-dom-turbopack/server.node',
       'react-server-dom-turbopack/client.node',
+      'react-server-dom-turbopack/src/server/react-flight-dom-server.node',
     ],
     paths: [
       'react-dom',
@@ -161,10 +164,11 @@ module.exports = [
       'react-server-dom-turbopack/client.node',
       'react-server-dom-turbopack/server',
       'react-server-dom-turbopack/server.node',
-      'react-server-dom-turbopack/src/ReactFlightDOMServerNode.js', // react-server-dom-turbopack/server.node
-      'react-server-dom-turbopack/src/ReactFlightDOMClientNode.js', // react-server-dom-turbopack/client.node
-      'react-server-dom-turbopack/src/ReactFlightClientConfigBundlerTurbopack.js',
-      'react-server-dom-turbopack/src/ReactFlightClientConfigBundlerTurbopackServer.js',
+      'react-server-dom-turbopack/src/client/ReactFlightDOMClientNode.js', // react-server-dom-turbopack/client.node
+      'react-server-dom-turbopack/src/client/ReactFlightClientConfigBundlerTurbopack.js',
+      'react-server-dom-turbopack/src/client/ReactFlightClientConfigBundlerTurbopackServer.js',
+      'react-server-dom-turbopack/src/server/react-flight-dom-server.node',
+      'react-server-dom-turbopack/src/server/ReactFlightDOMServerNode.js', // react-server-dom-turbopack/src/server/react-flight-dom-server.node
       'react-server-dom-turbopack/node-register',
       'react-server-dom-turbopack/src/ReactFlightTurbopackNodeRegister.js',
       'react-devtools',
@@ -212,8 +216,8 @@ module.exports = [
       'react-dom/src/server/react-dom-server.browser.js',
       'react-dom/static.browser',
       'react-dom/unstable_server-external-runtime',
-      'react-server-dom-webpack/server.browser',
       'react-server-dom-webpack/client.browser',
+      'react-server-dom-webpack/src/server/react-flight-dom-server.browser',
     ],
     paths: [
       'react-dom',
@@ -234,10 +238,11 @@ module.exports = [
       'react-server-dom-webpack/client',
       'react-server-dom-webpack/client.browser',
       'react-server-dom-webpack/server.browser',
-      'react-server-dom-webpack/src/ReactFlightDOMClientBrowser.js', // react-server-dom-webpack/client.browser
-      'react-server-dom-webpack/src/ReactFlightDOMServerBrowser.js', // react-server-dom-webpack/server.browser
-      'react-server-dom-webpack/src/ReactFlightClientConfigBundlerWebpack.js',
-      'react-server-dom-webpack/src/ReactFlightClientConfigBundlerWebpackBrowser.js',
+      'react-server-dom-webpack/src/client/ReactFlightDOMClientBrowser.js', // react-server-dom-webpack/client.browser
+      'react-server-dom-webpack/src/client/ReactFlightClientConfigBundlerWebpack.js',
+      'react-server-dom-webpack/src/client/ReactFlightClientConfigBundlerWebpackBrowser.js',
+      'react-server-dom-webpack/src/server/react-flight-dom-server.browser',
+      'react-server-dom-webpack/src/server/ReactFlightDOMServerBrowser.js', // react-server-dom-webpack/src/server/react-flight-dom-server.browser
       'react-devtools',
       'react-devtools-core',
       'react-devtools-shell',
@@ -264,7 +269,7 @@ module.exports = [
       'react-server-dom-esm',
       'react-server-dom-esm/client',
       'react-server-dom-esm/client.browser',
-      'react-server-dom-esm/src/ReactFlightDOMClientBrowser.js', // react-server-dom-esm/client.browser
+      'react-server-dom-esm/src/client/ReactFlightDOMClientBrowser.js', // react-server-dom-esm/client.browser
       'react-devtools',
       'react-devtools-core',
       'react-devtools-shell',
@@ -278,7 +283,7 @@ module.exports = [
     shortName: 'dom-browser-turbopack',
     entryPoints: [
       'react-server-dom-turbopack/client.browser',
-      'react-server-dom-turbopack/server.browser',
+      'react-server-dom-turbopack/src/server/react-flight-dom-server.browser',
     ],
     paths: [
       'react-dom',
@@ -287,17 +292,18 @@ module.exports = [
       'react-dom/server',
       'react-dom/server.node',
       'react-dom-bindings',
+      'react-dom-bindings/src/server/ReactDOMFlightServerHostDispatcher.js',
+      'react-dom-bindings/src/server/ReactFlightServerConfigDOM.js',
+      'react-dom-bindings/src/shared/ReactFlightClientConfigDOM.js',
       'react-server-dom-turbopack',
       'react-server-dom-turbopack/client',
       'react-server-dom-turbopack/client.browser',
       'react-server-dom-turbopack/server.browser',
-      'react-server-dom-turbopack/src/ReactFlightDOMClientBrowser.js', // react-server-dom-turbopack/client.browser
-      'react-server-dom-turbopack/src/ReactFlightDOMServerBrowser.js', // react-server-dom-turbopack/server.browser
-      'react-server-dom-turbopack/src/ReactFlightClientConfigBundlerTurbopack.js',
-      'react-server-dom-turbopack/src/ReactFlightClientConfigBundlerTurbopackBrowser.js',
-      'react-dom-bindings/src/server/ReactDOMFlightServerHostDispatcher.js',
-      'react-dom-bindings/src/server/ReactFlightServerConfigDOM.js',
-      'react-dom-bindings/src/shared/ReactFlightClientConfigDOM.js',
+      'react-server-dom-turbopack/src/client/ReactFlightDOMClientBrowser.js', // react-server-dom-turbopack/client.browser
+      'react-server-dom-turbopack/src/client/ReactFlightClientConfigBundlerTurbopack.js',
+      'react-server-dom-turbopack/src/client/ReactFlightClientConfigBundlerTurbopackBrowser.js',
+      'react-server-dom-turbopack/src/server/react-flight-dom-server.browser',
+      'react-server-dom-turbopack/src/server/ReactFlightDOMServerBrowser.js', // react-server-dom-turbopack/src/server/react-flight-dom-server.browser
       'react-devtools',
       'react-devtools-core',
       'react-devtools-shell',
@@ -312,8 +318,8 @@ module.exports = [
     entryPoints: [
       'react-dom/src/server/react-dom-server.edge.js',
       'react-dom/static.edge',
-      'react-server-dom-webpack/server.edge',
       'react-server-dom-webpack/client.edge',
+      'react-server-dom-webpack/src/server/react-flight-dom-server.edge',
     ],
     paths: [
       'react-dom',
@@ -333,10 +339,11 @@ module.exports = [
       'react-server-dom-webpack',
       'react-server-dom-webpack/client.edge',
       'react-server-dom-webpack/server.edge',
-      'react-server-dom-webpack/src/ReactFlightDOMClientEdge.js', // react-server-dom-webpack/client.edge
-      'react-server-dom-webpack/src/ReactFlightDOMServerEdge.js', // react-server-dom-webpack/server.edge
-      'react-server-dom-webpack/src/ReactFlightClientConfigBundlerWebpack.js',
-      'react-server-dom-webpack/src/ReactFlightClientConfigBundlerWebpackServer.js',
+      'react-server-dom-webpack/src/client/ReactFlightDOMClientEdge.js', // react-server-dom-webpack/client.edge
+      'react-server-dom-webpack/src/client/ReactFlightClientConfigBundlerWebpack.js',
+      'react-server-dom-webpack/src/client/ReactFlightClientConfigBundlerWebpackServer.js',
+      'react-server-dom-webpack/src/server/react-flight-dom-server.edge',
+      'react-server-dom-webpack/src/server/ReactFlightDOMServerEdge.js', // react-server-dom-webpack/src/server/react-flight-dom-server.edge
       'react-devtools',
       'react-devtools-core',
       'react-devtools-shell',
@@ -350,8 +357,8 @@ module.exports = [
   {
     shortName: 'dom-edge-turbopack',
     entryPoints: [
-      'react-server-dom-turbopack/server.edge',
       'react-server-dom-turbopack/client.edge',
+      'react-server-dom-turbopack/src/server/react-flight-dom-server.edge',
     ],
     paths: [
       'react-dom',
@@ -371,10 +378,11 @@ module.exports = [
       'react-server-dom-turbopack',
       'react-server-dom-turbopack/client.edge',
       'react-server-dom-turbopack/server.edge',
-      'react-server-dom-turbopack/src/ReactFlightDOMClientEdge.js', // react-server-dom-turbopack/client.edge
-      'react-server-dom-turbopack/src/ReactFlightDOMServerEdge.js', // react-server-dom-turbopack/server.edge
-      'react-server-dom-turbopack/src/ReactFlightClientConfigBundlerTurbopack.js',
-      'react-server-dom-turbopack/src/ReactFlightClientConfigBundlerTurbopackServer.js',
+      'react-server-dom-turbopack/src/client/ReactFlightDOMClientEdge.js', // react-server-dom-turbopack/client.edge
+      'react-server-dom-turbopack/src/client/ReactFlightClientConfigBundlerTurbopack.js',
+      'react-server-dom-turbopack/src/client/ReactFlightClientConfigBundlerTurbopackServer.js',
+      'react-server-dom-turbopack/src/server/react-flight-dom-server.edge',
+      'react-server-dom-turbopack/src/server/ReactFlightDOMServerEdge.js', // react-server-dom-turbopack/src/server/react-flight-dom-server.edge
       'react-devtools',
       'react-devtools-core',
       'react-devtools-shell',
@@ -388,8 +396,8 @@ module.exports = [
   {
     shortName: 'dom-node-esm',
     entryPoints: [
-      'react-server-dom-esm/server.node',
       'react-server-dom-esm/client.node',
+      'react-server-dom-esm/src/server/react-flight-dom-server.node',
     ],
     paths: [
       'react-dom',
@@ -411,8 +419,9 @@ module.exports = [
       'react-server-dom-esm/client.node',
       'react-server-dom-esm/server',
       'react-server-dom-esm/server.node',
-      'react-server-dom-esm/src/ReactFlightDOMServerNode.js', // react-server-dom-esm/server.node
-      'react-server-dom-esm/src/ReactFlightDOMClientNode.js', // react-server-dom-esm/client.node
+      'react-server-dom-esm/src/client/ReactFlightDOMClientNode.js', // react-server-dom-esm/client.node
+      'react-server-dom-esm/src/server/react-flight-dom-server.node',
+      'react-server-dom-esm/src/server/ReactFlightDOMServerNode.js', // react-server-dom-esm/src/server/react-flight-dom-server.node
       'react-devtools',
       'react-devtools-core',
       'react-devtools-shell',