[Flight][Fizz][Fiber] Refactor configs

packages/react-art/src/ReactARTHostConfig.js → packages/react-art/src/ReactFiberConfigART.js

@@ -238,13 +238,13 @@ function applyTextProps(instance, props, prevProps = {}) {
   }
 }
 
-export * from 'react-reconciler/src/ReactFiberHostConfigWithNoPersistence';
-export * from 'react-reconciler/src/ReactFiberHostConfigWithNoHydration';
-export * from 'react-reconciler/src/ReactFiberHostConfigWithNoScopes';
-export * from 'react-reconciler/src/ReactFiberHostConfigWithNoTestSelectors';
-export * from 'react-reconciler/src/ReactFiberHostConfigWithNoMicrotasks';
-export * from 'react-reconciler/src/ReactFiberHostConfigWithNoResources';
-export * from 'react-reconciler/src/ReactFiberHostConfigWithNoSingletons';
+export * from 'react-reconciler/src/ReactFiberConfigWithNoPersistence';
+export * from 'react-reconciler/src/ReactFiberConfigWithNoHydration';
+export * from 'react-reconciler/src/ReactFiberConfigWithNoScopes';
+export * from 'react-reconciler/src/ReactFiberConfigWithNoTestSelectors';
+export * from 'react-reconciler/src/ReactFiberConfigWithNoMicrotasks';
+export * from 'react-reconciler/src/ReactFiberConfigWithNoResources';
+export * from 'react-reconciler/src/ReactFiberConfigWithNoSingletons';
 
 export function appendInitialChild(parentInstance, child) {
   if (typeof child === 'string') {

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/ReactFlightClientHostConfig.custom.js → packages/react-client/src/forks/ReactFlightClientConfig.custom.js

@@ -23,27 +23,27 @@
 // So `$$$config` looks like a global variable, but it's
 // really an argument to a top-level wrapping function.
 
-declare var $$$hostConfig: any;
+declare var $$$config: any;
 
 export type Response = any;
 export opaque type SSRManifest = mixed;
 export opaque type ServerManifest = mixed;
 export opaque type ServerReferenceId = string;
 export opaque type ClientReferenceMetadata = mixed;
 export opaque type ClientReference<T> = mixed; // eslint-disable-line no-unused-vars
-export const resolveClientReference = $$$hostConfig.resolveClientReference;
-export const resolveServerReference = $$$hostConfig.resolveServerReference;
-export const preloadModule = $$$hostConfig.preloadModule;
-export const requireModule = $$$hostConfig.requireModule;
+export const resolveClientReference = $$$config.resolveClientReference;
+export const resolveServerReference = $$$config.resolveServerReference;
+export const preloadModule = $$$config.preloadModule;
+export const requireModule = $$$config.requireModule;
 
 export opaque type Source = mixed;
 
 export type UninitializedModel = string;
-export const parseModel = $$$hostConfig.parseModel;
+export const parseModel = $$$config.parseModel;
 
 export opaque type StringDecoder = mixed; // eslint-disable-line no-undef
 
-export const supportsBinaryStreams = $$$hostConfig.supportsBinaryStreams;
-export const createStringDecoder = $$$hostConfig.createStringDecoder;
-export const readPartialStringChunk = $$$hostConfig.readPartialStringChunk;
-export const readFinalStringChunk = $$$hostConfig.readFinalStringChunk;
+export const supportsBinaryStreams = $$$config.supportsBinaryStreams;
+export const createStringDecoder = $$$config.createStringDecoder;
+export const readPartialStringChunk = $$$config.readPartialStringChunk;
+export const readFinalStringChunk = $$$config.readFinalStringChunk;

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

@@ -0,0 +1,13 @@
+/**
+ * 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';
+export * from 'react-dom-bindings/src/shared/ReactFlightClientConfigDOM';

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

@@ -7,8 +7,9 @@
  * @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 * from 'react-dom-bindings/src/shared/ReactFlightClientConfigDOM';
 
 export type Response = any;
 export opaque type SSRManifest = mixed;

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

@@ -0,0 +1,13 @@
+/**
+ * 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';
+export * from 'react-dom-bindings/src/shared/ReactFlightClientConfigDOM';

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

@@ -0,0 +1,13 @@
+/**
+ * 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';
+export * from 'react-dom-bindings/src/shared/ReactFlightClientConfigDOM';

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

@@ -0,0 +1,13 @@
+/**
+ * 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';
+export * from 'react-dom-bindings/src/shared/ReactFlightClientConfigDOM';

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

@@ -0,0 +1,13 @@
+/**
+ * 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';
+export * from 'react-dom-bindings/src/shared/ReactFlightClientConfigDOM';

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

@@ -7,5 +7,6 @@
  * @flow
  */
 
-export * from 'react-server-native-relay/src/ReactFlightNativeRelayClientHostConfig';
-export * from '../ReactFlightClientHostConfigNoStream';
+export * from 'react-server-dom-relay/src/ReactFlightClientConfigDOMRelay';
+export * from '../ReactFlightClientConfigNoStream';
+export * from 'react-dom-bindings/src/shared/ReactFlightClientConfigDOM';

packages/react-client/src/forks/ReactFlightClientConfig.native-relay.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 'react-server-native-relay/src/ReactFlightClientConfigNativeRelay';
+export * from '../ReactFlightClientConfigNoStream';

packages/react-dom-bindings/src/client/ReactDOMComponentTree.js

@@ -21,7 +21,7 @@ import type {
   Props,
   HoistableRoot,
   RootResources,
-} from './ReactDOMHostConfig';
+} from './ReactFiberConfigDOM';
 
 import {
   HostComponent,
@@ -32,7 +32,7 @@ import {
   SuspenseComponent,
 } from 'react-reconciler/src/ReactWorkTags';
 
-import {getParentSuspenseInstance} from './ReactDOMHostConfig';
+import {getParentSuspenseInstance} from './ReactFiberConfigDOM';
 
 import {
   enableScopeAPI,

packages/react-dom-bindings/src/client/ReactDOMHostConfig.js → packages/react-dom-bindings/src/client/ReactFiberConfigDOM.js

@@ -179,7 +179,7 @@ const STYLE = 'style';
 let eventsEnabled: ?boolean = null;
 let selectionInformation: null | SelectionInformation = null;
 
-export * from 'react-reconciler/src/ReactFiberHostConfigWithNoPersistence';
+export * from 'react-reconciler/src/ReactFiberConfigWithNoPersistence';
 
 function getOwnerDocumentFromRootContainer(
   rootContainerElement: Element | Document | DocumentFragment,

packages/react-dom-bindings/src/events/ReactDOMEventListener.js

@@ -10,7 +10,7 @@
 import type {EventPriority} from 'react-reconciler/src/ReactEventPriorities';
 import type {AnyNativeEvent} from '../events/PluginModuleType';
 import type {Fiber, FiberRoot} from 'react-reconciler/src/ReactInternalTypes';
-import type {Container, SuspenseInstance} from '../client/ReactDOMHostConfig';
+import type {Container, SuspenseInstance} from '../client/ReactFiberConfigDOM';
 import type {DOMEventName} from '../events/DOMEventNames';
 
 import {

packages/react-dom-bindings/src/events/ReactDOMEventReplaying.js

@@ -8,7 +8,7 @@
  */
 
 import type {AnyNativeEvent} from '../events/PluginModuleType';
-import type {Container, SuspenseInstance} from '../client/ReactDOMHostConfig';
+import type {Container, SuspenseInstance} from '../client/ReactFiberConfigDOM';
 import type {DOMEventName} from '../events/DOMEventNames';
 import type {EventSystemFlags} from './EventSystemFlags';
 import type {FiberRoot} from 'react-reconciler/src/ReactInternalTypes';

packages/react-dom-bindings/src/events/getListener.js

@@ -7,7 +7,7 @@
  */
 
 import type {Fiber} from 'react-reconciler/src/ReactInternalTypes';
-import type {Props} from '../client/ReactDOMHostConfig';
+import type {Props} from '../client/ReactFiberConfigDOM';
 
 import {getFiberCurrentPropsFromNode} from '../client/ReactDOMComponentTree';
 

packages/react-dom-bindings/src/events/plugins/ChangeEventPlugin.js

@@ -6,7 +6,7 @@
  *
  * @flow
  */
-import type {TextInstance, Instance} from '../../client/ReactDOMHostConfig';
+import type {TextInstance, Instance} from '../../client/ReactFiberConfigDOM';
 import type {AnyNativeEvent} from '../PluginModuleType';
 import type {DOMEventName} from '../DOMEventNames';
 import type {DispatchQueue} from '../DOMPluginEventSystem';

packages/react-dom-bindings/src/server/ReactDOMServerLegacyFormatConfig.js → packages/react-dom-bindings/src/server/ReactFizzConfigDOMLegacy.js

@@ -12,7 +12,7 @@ import type {
   FormatContext,
   StreamingFormat,
   InstructionState,
-} from './ReactDOMServerFormatConfig';
+} from './ReactFizzConfigDOM';
 
 import {
   createResponseState as createResponseStateImpl,
@@ -23,7 +23,7 @@ import {
   writeEndCompletedSuspenseBoundary as writeEndCompletedSuspenseBoundaryImpl,
   writeEndClientRenderedSuspenseBoundary as writeEndClientRenderedSuspenseBoundaryImpl,
   HTML_MODE,
-} from './ReactDOMServerFormatConfig';
+} from './ReactFizzConfigDOM';
 
 import type {
   Destination,
@@ -34,7 +34,7 @@ import type {
 export const isPrimaryRenderer = false;
 
 export type ResponseState = {
-  // Keep this in sync with ReactDOMServerFormatConfig
+  // Keep this in sync with ReactFizzConfigDOM
   bootstrapChunks: Array<Chunk | PrecomputedChunk>,
   placeholderPrefix: PrecomputedChunk,
   segmentPrefix: PrecomputedChunk,
@@ -71,7 +71,7 @@ export function createResponseState(
     externalRuntimeConfig,
   );
   return {
-    // Keep this in sync with ReactDOMServerFormatConfig
+    // Keep this in sync with ReactFizzConfigDOM
     bootstrapChunks: responseState.bootstrapChunks,
     placeholderPrefix: responseState.placeholderPrefix,
     segmentPrefix: responseState.segmentPrefix,
@@ -109,7 +109,7 @@ export type {
   BoundaryResources,
   FormatContext,
   SuspenseBoundaryID,
-} from './ReactDOMServerFormatConfig';
+} from './ReactFizzConfigDOM';
 
 export {
   getChildFormatContext,
@@ -139,7 +139,7 @@ export {
   setCurrentlyRenderingBoundaryResourcesTarget,
   prepareToRender,
   cleanupAfterRender,
-} from './ReactDOMServerFormatConfig';
+} from './ReactFizzConfigDOM';
 
 import {stringToChunk} from 'react-server/src/ReactServerStreamConfig';
 

packages/react-client/src/forks/ReactFlightClientHostConfig.dom-relay.js → packages/react-dom-bindings/src/server/ReactFlightServerConfigDOM.js

@@ -7,5 +7,6 @@
  * @flow
  */
 
-export * from 'react-server-dom-relay/src/ReactFlightDOMRelayClientHostConfig';
-export * from '../ReactFlightClientHostConfigNoStream';
+// Used to distinguish these contexts from ones used in other renderers.
+// E.g. this can be used to distinguish legacy renderers from this modern one.
+export const isPrimaryRenderer = true;