Skip to content

Commit f4f873f

Browse files
authored
Implements wiring for Flight to have it's own "HostConfig" (#26590)
Part of #26571 Implements wiring for Flight to have it's own "HostConfig" from Fizz. Historically the ServerFormatConfigs were supposed to be generic enough to be used by Fizz and Flight. However with the addition of features like Float the configs have evolved to be more specific to the renderer. We may want to get back to a place where there is a pure FormatConfig which can be shared but for now we are embracing the fact that these runtimes need very different things and DCE cannot adequately remove the unused stuff for Fizz when pulling this dep into Flight so we are going to fork the configs and just maintain separate ones. At first the Flight config will be almost empty but once Float support in Flight lands it will have a more complex implementation Additionally this commit normalizes the component files which make up FlightServerConfig and FlightClientConfig. Now each file that participates starts with ReactFlightServerConfig... and ReactFlightClientConfig...
1 parent 44db16a commit f4f873f

17 files changed

+40
-1
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@
1010
export * from 'react-client/src/ReactFlightClientConfigBrowser';
1111
export * from 'react-client/src/ReactFlightClientConfigStream';
1212
export * from 'react-server-dom-webpack/src/ReactFlightClientConfigWebpackBundler';
13+
export * from 'react-dom-bindings/src/shared/ReactFlightClientConfigDOM';

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
export * from 'react-client/src/ReactFlightClientConfigBrowser';
1111
export * from 'react-client/src/ReactFlightClientConfigStream';
12+
export * from 'react-dom-bindings/src/shared/ReactFlightClientConfigDOM';
1213

1314
export type Response = any;
1415
export opaque type SSRManifest = mixed;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@
1010
export * from 'react-client/src/ReactFlightClientConfigBrowser';
1111
export * from 'react-client/src/ReactFlightClientConfigStream';
1212
export * from 'react-server-dom-webpack/src/ReactFlightClientConfigWebpackBundler';
13+
export * from 'react-dom-bindings/src/shared/ReactFlightClientConfigDOM';

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@
1010
export * from 'react-client/src/ReactFlightClientConfigBrowser';
1111
export * from 'react-client/src/ReactFlightClientConfigStream';
1212
export * from 'react-server-dom-webpack/src/ReactFlightClientConfigWebpackBundler';
13+
export * from 'react-dom-bindings/src/shared/ReactFlightClientConfigDOM';

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@
1010
export * from 'react-client/src/ReactFlightClientConfigNode';
1111
export * from 'react-client/src/ReactFlightClientConfigStream';
1212
export * from 'react-server-dom-webpack/src/ReactFlightClientConfigWebpackBundler';
13+
export * from 'react-dom-bindings/src/shared/ReactFlightClientConfigDOM';

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@
1010
export * from 'react-client/src/ReactFlightClientConfigNode';
1111
export * from 'react-client/src/ReactFlightClientConfigStream';
1212
export * from 'react-server-dom-webpack/src/ReactFlightClientConfigNodeBundler';
13+
export * from 'react-dom-bindings/src/shared/ReactFlightClientConfigDOM';

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@
99

1010
export * from 'react-server-dom-relay/src/ReactFlightClientConfigDOMRelay';
1111
export * from '../ReactFlightClientConfigNoStream';
12+
export * from 'react-dom-bindings/src/shared/ReactFlightClientConfigDOM';
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
/**
2+
* Copyright (c) Meta Platforms, Inc. and affiliates.
3+
*
4+
* This source code is licensed under the MIT license found in the
5+
* LICENSE file in the root directory of this source tree.
6+
*
7+
* @flow
8+
*/
9+
10+
// Used to distinguish these contexts from ones used in other renderers.
11+
// E.g. this can be used to distinguish legacy renderers from this modern one.
12+
export const isPrimaryRenderer = true;
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
/**
2+
* Copyright (c) Meta Platforms, Inc. and affiliates.
3+
*
4+
* This source code is licensed under the MIT license found in the
5+
* LICENSE file in the root directory of this source tree.
6+
*
7+
* @flow
8+
*/
9+
10+
// This client file is in the shared folder because it applies to both SSR and browser contexts.
11+
// It is the configuraiton of the FlightClient behavior which can run in either environment.
12+
13+
// In a future update this is where we will implement `dispatchDirective` such as for Float methods

packages/react-server/src/ReactFlightNewContext.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import type {
1313
} from 'shared/ReactTypes';
1414

1515
import {REACT_SERVER_CONTEXT_DEFAULT_VALUE_NOT_LOADED} from 'shared/ReactSymbols';
16-
import {isPrimaryRenderer} from './ReactServerFormatConfig';
16+
import {isPrimaryRenderer} from './ReactFlightServerConfig';
1717

1818
let rendererSigil;
1919
if (__DEV__) {

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@
99

1010
export * from '../ReactFlightServerConfigStream';
1111
export * from 'react-server-dom-webpack/src/ReactFlightServerConfigWebpackBundler';
12+
export * from 'react-dom-bindings/src/server/ReactFlightServerConfigDOM';

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@
99

1010
export * from '../ReactFlightServerConfigStream';
1111
export * from '../ReactFlightServerConfigBundlerCustom';
12+
export * from 'react-dom-bindings/src/server/ReactFlightServerConfigDOM';

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@
99

1010
export * from '../ReactFlightServerConfigStream';
1111
export * from 'react-server-dom-webpack/src/ReactFlightServerConfigWebpackBundler';
12+
export * from 'react-dom-bindings/src/server/ReactFlightServerConfigDOM';

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@
99

1010
export * from '../ReactFlightServerConfigStream';
1111
export * from 'react-server-dom-webpack/src/ReactFlightServerConfigWebpackBundler';
12+
export * from 'react-dom-bindings/src/server/ReactFlightServerConfigDOM';

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@
99

1010
export * from '../ReactFlightServerConfigStream';
1111
export * from 'react-server-dom-webpack/src/ReactFlightServerConfigWebpackBundler';
12+
export * from 'react-dom-bindings/src/server/ReactFlightServerConfigDOM';

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@
99

1010
export * from '../ReactFlightServerConfigStream';
1111
export * from 'react-server-dom-webpack/src/ReactFlightServerConfigWebpackBundler';
12+
export * from 'react-dom-bindings/src/server/ReactFlightServerConfigDOM';

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@
88
*/
99

1010
export * from 'react-server-dom-relay/src/ReactFlightServerConfigDOMRelay';
11+
export * from 'react-dom-bindings/src/server/ReactFlightServerConfigDOM';

0 commit comments

Comments
 (0)