Normalize ReactFlightServerConfig and related files

packages/react-client/src/ReactFlightClient.js

@@ -16,14 +16,14 @@ import type {
   UninitializedModel,
   Response,
   SSRManifest,
-} from './ReactFlightClientHostConfig';
+} from './ReactFlightClientConfig';
 
 import {
   resolveClientReference,
   preloadModule,
   requireModule,
   parseModel,
-} from './ReactFlightClientHostConfig';
+} from './ReactFlightClientConfig';
 
 import {knownServerReferences} from './ReactFlightServerReferenceRegistry';
 

packages/react-client/src/ReactFlightClientHostConfigStream.js → packages/react-client/src/ReactFlightClientConfigStream.js

@@ -8,7 +8,7 @@
  */
 
 import type {ResponseBase} from './ReactFlightClient';
-import type {StringDecoder} from './ReactFlightClientHostConfig';
+import type {StringDecoder} from './ReactFlightClientConfig';
 
 export type Response = ResponseBase & {
   _partialRow: string,

packages/react-client/src/ReactFlightClientStream.js

@@ -8,8 +8,8 @@
  */
 
 import type {CallServerCallback} from './ReactFlightClient';
-import type {Response} from './ReactFlightClientHostConfigStream';
-import type {SSRManifest} from './ReactFlightClientHostConfig';
+import type {Response} from './ReactFlightClientConfigStream';
+import type {SSRManifest} from './ReactFlightClientConfig';
 
 import {
   resolveModule,
@@ -26,7 +26,7 @@ import {
   readFinalStringChunk,
   supportsBinaryStreams,
   createStringDecoder,
-} from './ReactFlightClientHostConfig';
+} from './ReactFlightClientConfig';
 
 export type {Response};
 

packages/react-client/src/forks/ReactFlightClientConfig.dom-browser.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/ReactFlightClientConfigBrowser';
+export * from 'react-client/src/ReactFlightClientConfigStream';
+export * from 'react-server-dom-webpack/src/ReactFlightClientConfigWebpackBundler';

packages/react-client/src/forks/ReactFlightClientHostConfig.dom-bun.js → packages/react-client/src/forks/ReactFlightClientConfig.dom-bun.js

@@ -7,8 +7,8 @@
  * @flow
  */
 
-export * from 'react-client/src/ReactFlightClientHostConfigBrowser';
-export * from 'react-client/src/ReactFlightClientHostConfigStream';
+export * from 'react-client/src/ReactFlightClientConfigBrowser';
+export * from 'react-client/src/ReactFlightClientConfigStream';
 
 export type Response = any;
 export opaque type SSRManifest = mixed;

packages/react-client/src/forks/ReactFlightClientConfig.dom-edge-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/ReactFlightClientConfigBrowser';
+export * from 'react-client/src/ReactFlightClientConfigStream';
+export * from 'react-server-dom-webpack/src/ReactFlightClientConfigWebpackBundler';

packages/react-client/src/forks/ReactFlightClientConfig.dom-legacy.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/ReactFlightClientConfigBrowser';
+export * from 'react-client/src/ReactFlightClientConfigStream';
+export * from 'react-server-dom-webpack/src/ReactFlightClientConfigWebpackBundler';

packages/react-client/src/forks/ReactFlightClientConfig.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/ReactFlightClientConfigNode';
+export * from 'react-client/src/ReactFlightClientConfigStream';
+export * from 'react-server-dom-webpack/src/ReactFlightClientConfigWebpackBundler';

packages/react-client/src/forks/ReactFlightClientConfig.dom-node.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/ReactFlightClientConfigNode';
+export * from 'react-client/src/ReactFlightClientConfigStream';
+export * from 'react-server-dom-webpack/src/ReactFlightClientConfigNodeBundler';

packages/react-client/src/forks/ReactFlightClientHostConfig.dom-relay.js → packages/react-client/src/forks/ReactFlightClientConfig.dom-relay.js

@@ -7,5 +7,5 @@
  * @flow
  */
 
-export * from 'react-server-dom-relay/src/ReactFlightDOMRelayClientHostConfig';
-export * from '../ReactFlightClientHostConfigNoStream';
+export * from 'react-server-dom-relay/src/ReactFlightClientConfigDOMRelay';
+export * from '../ReactFlightClientConfigNoStream';

packages/react-client/src/forks/ReactFlightClientHostConfig.native-relay.js → packages/react-client/src/forks/ReactFlightClientConfig.native-relay.js

@@ -7,5 +7,5 @@
  * @flow
  */
 
-export * from 'react-server-native-relay/src/ReactFlightNativeRelayClientHostConfig';
-export * from '../ReactFlightClientHostConfigNoStream';
+export * from 'react-server-native-relay/src/ReactFlightClientConfigNativeRelay';
+export * from '../ReactFlightClientConfigNoStream';

packages/react-native-renderer/src/server/ReactFlightServerConfigNative.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 const isPrimaryRenderer = true;

packages/react-server-dom-relay/src/ReactFlightDOMRelayServer.js

@@ -11,7 +11,7 @@ import type {ReactClientValue} from 'react-server/src/ReactFlightServer';
 import type {
   ClientManifest,
   Destination,
-} from './ReactFlightDOMRelayServerHostConfig';
+} from './ReactFlightServerConfigDOMRelay';
 
 import {
   createRequest,

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

@@ -11,7 +11,7 @@ import type {Thenable} from 'shared/ReactTypes.js';
 
 import type {Response as FlightResponse} from 'react-client/src/ReactFlightClientStream';
 
-import type {SSRManifest} from './ReactFlightClientWebpackBundlerConfig';
+import type {SSRManifest} from './ReactFlightClientConfigWebpackBundler';
 
 import {
   createResponse,

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

@@ -11,7 +11,7 @@ import type {Thenable} from 'shared/ReactTypes.js';
 
 import type {Response} from 'react-client/src/ReactFlightClientStream';
 
-import type {SSRManifest} from 'react-client/src/ReactFlightClientHostConfig';
+import type {SSRManifest} from 'react-client/src/ReactFlightClientConfig';
 
 import type {Readable} from 'stream';
 

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

@@ -9,8 +9,8 @@
 
 import type {ReactClientValue} from 'react-server/src/ReactFlightServer';
 import type {ServerContextJSONValue, Thenable} from 'shared/ReactTypes';
-import type {ClientManifest} from './ReactFlightServerWebpackBundlerConfig';
-import type {ServerManifest} from 'react-client/src/ReactFlightClientHostConfig';
+import type {ClientManifest} from './ReactFlightServerConfigWebpackBundler';
+import type {ServerManifest} from 'react-client/src/ReactFlightClientConfig';
 
 import {
   createRequest,

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

@@ -9,8 +9,8 @@
 
 import type {ReactClientValue} from 'react-server/src/ReactFlightServer';
 import type {ServerContextJSONValue, Thenable} from 'shared/ReactTypes';
-import type {ClientManifest} from './ReactFlightServerWebpackBundlerConfig';
-import type {ServerManifest} from 'react-client/src/ReactFlightClientHostConfig';
+import type {ClientManifest} from './ReactFlightServerConfigWebpackBundler';
+import type {ServerManifest} from 'react-client/src/ReactFlightClientConfig';
 
 import {
   createRequest,

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

@@ -12,8 +12,8 @@ import type {
   ReactClientValue,
 } from 'react-server/src/ReactFlightServer';
 import type {Destination} from 'react-server/src/ReactServerStreamConfigNode';
-import type {ClientManifest} from './ReactFlightServerWebpackBundlerConfig';
-import type {ServerManifest} from 'react-client/src/ReactFlightClientHostConfig';
+import type {ClientManifest} from './ReactFlightServerConfigWebpackBundler';
+import type {ServerManifest} from 'react-client/src/ReactFlightClientConfig';
 import type {Busboy} from 'busboy';
 import type {Writable} from 'stream';
 import type {ServerContextJSONValue, Thenable} from 'shared/ReactTypes';

packages/react-server-native-relay/src/ReactFlightNativeRelayServer.js

@@ -11,7 +11,7 @@ import type {ReactClientValue} from 'react-server/src/ReactFlightServer';
 import type {
   ClientManifest,
   Destination,
-} from './ReactFlightNativeRelayServerHostConfig';
+} from './ReactFlightServerConfigNativeRelay';
 
 import {
   createRequest,

packages/react-server/src/ReactFlightReplyServer.js

@@ -16,13 +16,13 @@ import type {
   ServerReferenceId,
   ServerManifest,
   ClientReference as ServerReference,
-} from 'react-client/src/ReactFlightClientHostConfig';
+} from 'react-client/src/ReactFlightClientConfig';
 
 import {
   resolveServerReference,
   preloadModule,
   requireModule,
-} from 'react-client/src/ReactFlightClientHostConfig';
+} from 'react-client/src/ReactFlightClientConfig';
 
 export type JSONValue =
   | number

packages/react-server/src/forks/ReactFlightServerConfig.custom.js

@@ -8,4 +8,6 @@
  */
 
 export * from '../ReactFlightServerConfigStream';
-export * from '../ReactFlightServerBundlerConfigCustom';
+export * from '../ReactFlightServerConfigBundlerCustom';
+
+export const isPrimaryRenderer = false;

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

@@ -8,4 +8,4 @@
  */
 
 export * from '../ReactFlightServerConfigStream';
-export * from 'react-server-dom-webpack/src/ReactFlightServerWebpackBundlerConfig';
+export * from 'react-server-dom-webpack/src/ReactFlightServerConfigWebpackBundler';

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

@@ -8,4 +8,4 @@
  */
 
 export * from '../ReactFlightServerConfigStream';
-export * from '../ReactFlightServerBundlerConfigCustom';
+export * from '../ReactFlightServerConfigBundlerCustom';

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

@@ -8,4 +8,4 @@
  */
 
 export * from '../ReactFlightServerConfigStream';
-export * from 'react-server-dom-webpack/src/ReactFlightServerWebpackBundlerConfig';
+export * from 'react-server-dom-webpack/src/ReactFlightServerConfigWebpackBundler';

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

@@ -8,4 +8,4 @@
  */
 
 export * from '../ReactFlightServerConfigStream';
-export * from 'react-server-dom-webpack/src/ReactFlightServerWebpackBundlerConfig';
+export * from 'react-server-dom-webpack/src/ReactFlightServerConfigWebpackBundler';

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

@@ -8,4 +8,4 @@
  */
 
 export * from '../ReactFlightServerConfigStream';
-export * from 'react-server-dom-webpack/src/ReactFlightServerWebpackBundlerConfig';
+export * from 'react-server-dom-webpack/src/ReactFlightServerConfigWebpackBundler';

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

@@ -8,4 +8,4 @@
  */
 
 export * from '../ReactFlightServerConfigStream';
-export * from 'react-server-dom-webpack/src/ReactFlightServerWebpackBundlerConfig';
+export * from 'react-server-dom-webpack/src/ReactFlightServerConfigWebpackBundler';

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

@@ -7,4 +7,4 @@
  * @flow
  */
 
-export * from 'react-server-dom-relay/src/ReactFlightDOMRelayServerHostConfig';
+export * from 'react-server-dom-relay/src/ReactFlightServerConfigDOMRelay';

packages/react-server/src/forks/ReactFlightServerConfig.native-relay.js

@@ -7,4 +7,5 @@
  * @flow
  */
 
-export * from 'react-server-native-relay/src/ReactFlightNativeRelayServerHostConfig';
+export * from 'react-server-native-relay/src/ReactFlightServerConfigNativeRelay';
+export * from 'react-native-renderer/src/server/ReactFlightServerConfigNative';

scripts/flow/createFlowConfigs.js

@@ -55,7 +55,7 @@ module.name_mapper='ReactFiberHostConfig$$' -> 'forks/ReactFiberHostConfig.${ren
 module.name_mapper='ReactServerStreamConfig$$' -> 'forks/ReactServerStreamConfig.${serverRenderer}'
 module.name_mapper='ReactServerFormatConfig$$' -> 'forks/ReactServerFormatConfig.${serverRenderer}'
 module.name_mapper='ReactFlightServerConfig$$' -> 'forks/ReactFlightServerConfig.${serverRenderer}'
-module.name_mapper='ReactFlightClientHostConfig$$' -> 'forks/ReactFlightClientHostConfig.${serverRenderer}'
+module.name_mapper='ReactFlightClientConfig$$' -> 'forks/ReactFlightClientConfig.${serverRenderer}'
 module.name_mapper='react-devtools-feature-flags' -> 'react-devtools-shared/src/config/DevToolsFeatureFlags.default'
     `.trim(),
     )

scripts/jest/setupHostConfigs.js

@@ -81,7 +81,7 @@ jest.mock('react-server/flight', () => {
   return config => {
     jest.mock(shimServerStreamConfigPath, () => config);
     jest.mock(shimServerFormatConfigPath, () => config);
-    jest.mock('react-server/src/ReactFlightServerBundlerConfigCustom', () => ({
+    jest.mock('react-server/src/ReactFlightServerConfigBundlerCustom', () => ({
       isClientReference: config.isClientReference,
       isServerReference: config.isServerReference,
       getClientReferenceKey: config.getClientReferenceKey,
@@ -95,18 +95,17 @@ jest.mock('react-server/flight', () => {
     return jest.requireActual('react-server/flight');
   };
 });
-const shimFlightClientHostConfigPath =
-  'react-client/src/ReactFlightClientHostConfig';
+const shimFlightClientConfigPath = 'react-client/src/ReactFlightClientConfig';
 jest.mock('react-client/flight', () => {
   return config => {
-    jest.mock(shimFlightClientHostConfigPath, () => config);
+    jest.mock(shimFlightClientConfigPath, () => config);
     return jest.requireActual('react-client/flight');
   };
 });
 
 const configPaths = [
   'react-reconciler/src/ReactFiberHostConfig',
-  'react-client/src/ReactFlightClientHostConfig',
+  'react-client/src/ReactFlightClientConfig',
   'react-server/src/ReactServerStreamConfig',
   'react-server/src/ReactServerFormatConfig',
   'react-server/src/ReactFlightServerConfig',