@samitouri / QOS-React-2 / commits / 44db16afc6

Normalize ReactFlightServerConfig and related files (#26589)

First part of https://github.com/facebook/react/pull/26571 merging separately to help with git history with a lot of file renames

Josh Story committed Apr 10, 2023 at 14:47 UTC 44db16afc61c34e6d46b55e985211df7ccc78fa5
50 files changed +114 -102
packages/react-client/src/ReactFlightClient.js
+2 -2
@@ -16,14 +16,14 @@ import type {
16 UninitializedModel,
17 Response,
18 SSRManifest,
19 -} from './ReactFlightClientHostConfig';
19 +} from './ReactFlightClientConfig';
20
21 import {
22 resolveClientReference,
23 preloadModule,
24 requireModule,
25 parseModel,
26 -} from './ReactFlightClientHostConfig';
26 +} from './ReactFlightClientConfig';
27
28 import {knownServerReferences} from './ReactFlightServerReferenceRegistry';
29
packages/react-client/src/ReactFlightClientConfig.js renamed
packages/react-client/src/ReactFlightClientConfigBrowser.js renamed
packages/react-client/src/ReactFlightClientConfigNoStream.js renamed
packages/react-client/src/ReactFlightClientConfigNode.js renamed
packages/react-client/src/ReactFlightClientConfigStream.js renamed
+1 -1
@@ -8,7 +8,7 @@
8 */
9
10 import type {ResponseBase} from './ReactFlightClient';
11 -import type {StringDecoder} from './ReactFlightClientHostConfig';
11 +import type {StringDecoder} from './ReactFlightClientConfig';
12
13 export type Response = ResponseBase & {
14 _partialRow: string,
packages/react-client/src/ReactFlightClientStream.js
+3 -3
@@ -8,8 +8,8 @@
8 */
9
10 import type {CallServerCallback} from './ReactFlightClient';
11 -import type {Response} from './ReactFlightClientHostConfigStream';
12 -import type {SSRManifest} from './ReactFlightClientHostConfig';
11 +import type {Response} from './ReactFlightClientConfigStream';
12 +import type {SSRManifest} from './ReactFlightClientConfig';
13
14 import {
15 resolveModule,
@@ -26,7 +26,7 @@ import {
26 readFinalStringChunk,
27 supportsBinaryStreams,
28 createStringDecoder,
29 -} from './ReactFlightClientHostConfig';
29 +} from './ReactFlightClientConfig';
30
31 export type {Response};
32
packages/react-client/src/forks/ReactFlightClientConfig.custom.js renamed
packages/react-client/src/forks/ReactFlightClientConfig.dom-browser.js new
+12
@@ -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 +export * from 'react-client/src/ReactFlightClientConfigBrowser';
11 +export * from 'react-client/src/ReactFlightClientConfigStream';
12 +export * from 'react-server-dom-webpack/src/ReactFlightClientConfigWebpackBundler';
packages/react-client/src/forks/ReactFlightClientConfig.dom-bun.js renamed
+2 -2
@@ -7,8 +7,8 @@
7 * @flow
8 */
9
10 -export * from 'react-client/src/ReactFlightClientHostConfigBrowser';
11 -export * from 'react-client/src/ReactFlightClientHostConfigStream';
10 +export * from 'react-client/src/ReactFlightClientConfigBrowser';
11 +export * from 'react-client/src/ReactFlightClientConfigStream';
12
13 export type Response = any;
14 export opaque type SSRManifest = mixed;
packages/react-client/src/forks/ReactFlightClientConfig.dom-edge-webpack.js new
+12
@@ -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 +export * from 'react-client/src/ReactFlightClientConfigBrowser';
11 +export * from 'react-client/src/ReactFlightClientConfigStream';
12 +export * from 'react-server-dom-webpack/src/ReactFlightClientConfigWebpackBundler';
packages/react-client/src/forks/ReactFlightClientConfig.dom-legacy.js new
+12
@@ -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 +export * from 'react-client/src/ReactFlightClientConfigBrowser';
11 +export * from 'react-client/src/ReactFlightClientConfigStream';
12 +export * from 'react-server-dom-webpack/src/ReactFlightClientConfigWebpackBundler';
packages/react-client/src/forks/ReactFlightClientConfig.dom-node-webpack.js new
+12
@@ -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 +export * from 'react-client/src/ReactFlightClientConfigNode';
11 +export * from 'react-client/src/ReactFlightClientConfigStream';
12 +export * from 'react-server-dom-webpack/src/ReactFlightClientConfigWebpackBundler';
packages/react-client/src/forks/ReactFlightClientConfig.dom-node.js new
+12
@@ -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 +export * from 'react-client/src/ReactFlightClientConfigNode';
11 +export * from 'react-client/src/ReactFlightClientConfigStream';
12 +export * from 'react-server-dom-webpack/src/ReactFlightClientConfigNodeBundler';
packages/react-client/src/forks/ReactFlightClientConfig.dom-relay.js renamed
+2 -2
@@ -7,5 +7,5 @@
7 * @flow
8 */
9
10 -export * from 'react-server-dom-relay/src/ReactFlightDOMRelayClientHostConfig';
11 -export * from '../ReactFlightClientHostConfigNoStream';
10 +export * from 'react-server-dom-relay/src/ReactFlightClientConfigDOMRelay';
11 +export * from '../ReactFlightClientConfigNoStream';
packages/react-client/src/forks/ReactFlightClientConfig.native-relay.js renamed
+2 -2
@@ -7,5 +7,5 @@
7 * @flow
8 */
9
10 -export * from 'react-server-native-relay/src/ReactFlightNativeRelayClientHostConfig';
11 -export * from '../ReactFlightClientHostConfigNoStream';
10 +export * from 'react-server-native-relay/src/ReactFlightClientConfigNativeRelay';
11 +export * from '../ReactFlightClientConfigNoStream';
packages/react-client/src/forks/ReactFlightClientHostConfig.dom-browser.js deleted
-12
@@ -1,12 +0,0 @@
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 -export * from 'react-client/src/ReactFlightClientHostConfigBrowser';
11 -export * from 'react-client/src/ReactFlightClientHostConfigStream';
12 -export * from 'react-server-dom-webpack/src/ReactFlightClientWebpackBundlerConfig';
packages/react-client/src/forks/ReactFlightClientHostConfig.dom-edge-webpack.js deleted
-12
@@ -1,12 +0,0 @@
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 -export * from 'react-client/src/ReactFlightClientHostConfigBrowser';
11 -export * from 'react-client/src/ReactFlightClientHostConfigStream';
12 -export * from 'react-server-dom-webpack/src/ReactFlightClientWebpackBundlerConfig';
packages/react-client/src/forks/ReactFlightClientHostConfig.dom-legacy.js deleted
-12
@@ -1,12 +0,0 @@
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 -export * from 'react-client/src/ReactFlightClientHostConfigBrowser';
11 -export * from 'react-client/src/ReactFlightClientHostConfigStream';
12 -export * from 'react-server-dom-webpack/src/ReactFlightClientWebpackBundlerConfig';
packages/react-client/src/forks/ReactFlightClientHostConfig.dom-node-webpack.js deleted
-12
@@ -1,12 +0,0 @@
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 -export * from 'react-client/src/ReactFlightClientHostConfigNode';
11 -export * from 'react-client/src/ReactFlightClientHostConfigStream';
12 -export * from 'react-server-dom-webpack/src/ReactFlightClientWebpackBundlerConfig';
packages/react-client/src/forks/ReactFlightClientHostConfig.dom-node.js deleted
-12
@@ -1,12 +0,0 @@
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 -export * from 'react-client/src/ReactFlightClientHostConfigNode';
11 -export * from 'react-client/src/ReactFlightClientHostConfigStream';
12 -export * from 'react-server-dom-webpack/src/ReactFlightClientNodeBundlerConfig';
packages/react-native-renderer/src/server/ReactFlightServerConfigNative.js new
+10
@@ -0,0 +1,10 @@
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 +export const isPrimaryRenderer = true;
packages/react-server-dom-relay/src/ReactFlightClientConfigDOMRelay.js renamed
packages/react-server-dom-relay/src/ReactFlightDOMRelayServer.js
+1 -1
@@ -11,7 +11,7 @@ import type {ReactClientValue} from 'react-server/src/ReactFlightServer';
11 import type {
12 ClientManifest,
13 Destination,
14 -} from './ReactFlightDOMRelayServerHostConfig';
14 +} from './ReactFlightServerConfigDOMRelay';
15
16 import {
17 createRequest,
packages/react-server-dom-relay/src/ReactFlightServerConfigDOMRelay.js renamed
packages/react-server-dom-webpack/src/ReactFlightClientConfigNodeBundler.js renamed
packages/react-server-dom-webpack/src/ReactFlightClientConfigWebpackBundler.js renamed
packages/react-server-dom-webpack/src/ReactFlightDOMClientEdge.js
+1 -1
@@ -11,7 +11,7 @@ import type {Thenable} from 'shared/ReactTypes.js';
11
12 import type {Response as FlightResponse} from 'react-client/src/ReactFlightClientStream';
13
14 -import type {SSRManifest} from './ReactFlightClientWebpackBundlerConfig';
14 +import type {SSRManifest} from './ReactFlightClientConfigWebpackBundler';
15
16 import {
17 createResponse,
packages/react-server-dom-webpack/src/ReactFlightDOMClientNode.js
+1 -1
@@ -11,7 +11,7 @@ import type {Thenable} from 'shared/ReactTypes.js';
11
12 import type {Response} from 'react-client/src/ReactFlightClientStream';
13
14 -import type {SSRManifest} from 'react-client/src/ReactFlightClientHostConfig';
14 +import type {SSRManifest} from 'react-client/src/ReactFlightClientConfig';
15
16 import type {Readable} from 'stream';
17
packages/react-server-dom-webpack/src/ReactFlightDOMServerBrowser.js
+2 -2
@@ -9,8 +9,8 @@
9
10 import type {ReactClientValue} from 'react-server/src/ReactFlightServer';
11 import type {ServerContextJSONValue, Thenable} from 'shared/ReactTypes';
12 -import type {ClientManifest} from './ReactFlightServerWebpackBundlerConfig';
13 -import type {ServerManifest} from 'react-client/src/ReactFlightClientHostConfig';
12 +import type {ClientManifest} from './ReactFlightServerConfigWebpackBundler';
13 +import type {ServerManifest} from 'react-client/src/ReactFlightClientConfig';
14
15 import {
16 createRequest,
packages/react-server-dom-webpack/src/ReactFlightDOMServerEdge.js
+2 -2
@@ -9,8 +9,8 @@
9
10 import type {ReactClientValue} from 'react-server/src/ReactFlightServer';
11 import type {ServerContextJSONValue, Thenable} from 'shared/ReactTypes';
12 -import type {ClientManifest} from './ReactFlightServerWebpackBundlerConfig';
13 -import type {ServerManifest} from 'react-client/src/ReactFlightClientHostConfig';
12 +import type {ClientManifest} from './ReactFlightServerConfigWebpackBundler';
13 +import type {ServerManifest} from 'react-client/src/ReactFlightClientConfig';
14
15 import {
16 createRequest,
packages/react-server-dom-webpack/src/ReactFlightDOMServerNode.js
+2 -2
@@ -12,8 +12,8 @@ import type {
12 ReactClientValue,
13 } from 'react-server/src/ReactFlightServer';
14 import type {Destination} from 'react-server/src/ReactServerStreamConfigNode';
15 -import type {ClientManifest} from './ReactFlightServerWebpackBundlerConfig';
16 -import type {ServerManifest} from 'react-client/src/ReactFlightClientHostConfig';
15 +import type {ClientManifest} from './ReactFlightServerConfigWebpackBundler';
16 +import type {ServerManifest} from 'react-client/src/ReactFlightClientConfig';
17 import type {Busboy} from 'busboy';
18 import type {Writable} from 'stream';
19 import type {ServerContextJSONValue, Thenable} from 'shared/ReactTypes';
packages/react-server-dom-webpack/src/ReactFlightServerConfigWebpackBundler.js renamed
packages/react-server-native-relay/src/ReactFlightClientConfigNativeRelay.js renamed
packages/react-server-native-relay/src/ReactFlightNativeRelayServer.js
+1 -1
@@ -11,7 +11,7 @@ import type {ReactClientValue} from 'react-server/src/ReactFlightServer';
11 import type {
12 ClientManifest,
13 Destination,
14 -} from './ReactFlightNativeRelayServerHostConfig';
14 +} from './ReactFlightServerConfigNativeRelay';
15
16 import {
17 createRequest,
packages/react-server-native-relay/src/ReactFlightServerConfigNativeRelay.js renamed
packages/react-server/src/ReactFlightReplyServer.js
+2 -2
@@ -16,13 +16,13 @@ import type {
16 ServerReferenceId,
17 ServerManifest,
18 ClientReference as ServerReference,
19 -} from 'react-client/src/ReactFlightClientHostConfig';
19 +} from 'react-client/src/ReactFlightClientConfig';
20
21 import {
22 resolveServerReference,
23 preloadModule,
24 requireModule,
25 -} from 'react-client/src/ReactFlightClientHostConfig';
25 +} from 'react-client/src/ReactFlightClientConfig';
26
27 export type JSONValue =
28 | number
packages/react-server/src/ReactFlightServerConfigBundlerCustom.js renamed
packages/react-server/src/forks/ReactFlightServerConfig.custom.js
+3 -1
@@ -8,4 +8,6 @@
8 */
9
10 export * from '../ReactFlightServerConfigStream';
11 -export * from '../ReactFlightServerBundlerConfigCustom';
11 +export * from '../ReactFlightServerConfigBundlerCustom';
12 +
13 +export const isPrimaryRenderer = false;
packages/react-server/src/forks/ReactFlightServerConfig.dom-browser.js
+1 -1
@@ -8,4 +8,4 @@
8 */
9
10 export * from '../ReactFlightServerConfigStream';
11 -export * from 'react-server-dom-webpack/src/ReactFlightServerWebpackBundlerConfig';
11 +export * from 'react-server-dom-webpack/src/ReactFlightServerConfigWebpackBundler';
packages/react-server/src/forks/ReactFlightServerConfig.dom-bun.js
+1 -1
@@ -8,4 +8,4 @@
8 */
9
10 export * from '../ReactFlightServerConfigStream';
11 -export * from '../ReactFlightServerBundlerConfigCustom';
11 +export * from '../ReactFlightServerConfigBundlerCustom';
packages/react-server/src/forks/ReactFlightServerConfig.dom-edge-webpack.js
+1 -1
@@ -8,4 +8,4 @@
8 */
9
10 export * from '../ReactFlightServerConfigStream';
11 -export * from 'react-server-dom-webpack/src/ReactFlightServerWebpackBundlerConfig';
11 +export * from 'react-server-dom-webpack/src/ReactFlightServerConfigWebpackBundler';
packages/react-server/src/forks/ReactFlightServerConfig.dom-legacy.js
+1 -1
@@ -8,4 +8,4 @@
8 */
9
10 export * from '../ReactFlightServerConfigStream';
11 -export * from 'react-server-dom-webpack/src/ReactFlightServerWebpackBundlerConfig';
11 +export * from 'react-server-dom-webpack/src/ReactFlightServerConfigWebpackBundler';
packages/react-server/src/forks/ReactFlightServerConfig.dom-node-webpack.js
+1 -1
@@ -8,4 +8,4 @@
8 */
9
10 export * from '../ReactFlightServerConfigStream';
11 -export * from 'react-server-dom-webpack/src/ReactFlightServerWebpackBundlerConfig';
11 +export * from 'react-server-dom-webpack/src/ReactFlightServerConfigWebpackBundler';
packages/react-server/src/forks/ReactFlightServerConfig.dom-node.js
+1 -1
@@ -8,4 +8,4 @@
8 */
9
10 export * from '../ReactFlightServerConfigStream';
11 -export * from 'react-server-dom-webpack/src/ReactFlightServerWebpackBundlerConfig';
11 +export * from 'react-server-dom-webpack/src/ReactFlightServerConfigWebpackBundler';
packages/react-server/src/forks/ReactFlightServerConfig.dom-relay.js
+1 -1
@@ -7,4 +7,4 @@
7 * @flow
8 */
9
10 -export * from 'react-server-dom-relay/src/ReactFlightDOMRelayServerHostConfig';
10 +export * from 'react-server-dom-relay/src/ReactFlightServerConfigDOMRelay';
packages/react-server/src/forks/ReactFlightServerConfig.native-relay.js
+2 -1
@@ -7,4 +7,5 @@
7 * @flow
8 */
9
10 -export * from 'react-server-native-relay/src/ReactFlightNativeRelayServerHostConfig';
10 +export * from 'react-server-native-relay/src/ReactFlightServerConfigNativeRelay';
11 +export * from 'react-native-renderer/src/server/ReactFlightServerConfigNative';
scripts/flow/createFlowConfigs.js
+1 -1
@@ -55,7 +55,7 @@ module.name_mapper='ReactFiberHostConfig$$' -> 'forks/ReactFiberHostConfig.${ren
55 module.name_mapper='ReactServerStreamConfig$$' -> 'forks/ReactServerStreamConfig.${serverRenderer}'
56 module.name_mapper='ReactServerFormatConfig$$' -> 'forks/ReactServerFormatConfig.${serverRenderer}'
57 module.name_mapper='ReactFlightServerConfig$$' -> 'forks/ReactFlightServerConfig.${serverRenderer}'
58 -module.name_mapper='ReactFlightClientHostConfig$$' -> 'forks/ReactFlightClientHostConfig.${serverRenderer}'
58 +module.name_mapper='ReactFlightClientConfig$$' -> 'forks/ReactFlightClientConfig.${serverRenderer}'
59 module.name_mapper='react-devtools-feature-flags' -> 'react-devtools-shared/src/config/DevToolsFeatureFlags.default'
60 `.trim(),
61 )
scripts/jest/setupHostConfigs.js
+4 -5
@@ -81,7 +81,7 @@ jest.mock('react-server/flight', () => {
81 return config => {
82 jest.mock(shimServerStreamConfigPath, () => config);
83 jest.mock(shimServerFormatConfigPath, () => config);
84 - jest.mock('react-server/src/ReactFlightServerBundlerConfigCustom', () => ({
84 + jest.mock('react-server/src/ReactFlightServerConfigBundlerCustom', () => ({
85 isClientReference: config.isClientReference,
86 isServerReference: config.isServerReference,
87 getClientReferenceKey: config.getClientReferenceKey,
@@ -95,18 +95,17 @@ jest.mock('react-server/flight', () => {
95 return jest.requireActual('react-server/flight');
96 };
97 });
98 -const shimFlightClientHostConfigPath =
99 - 'react-client/src/ReactFlightClientHostConfig';
98 +const shimFlightClientConfigPath = 'react-client/src/ReactFlightClientConfig';
99 jest.mock('react-client/flight', () => {
100 return config => {
102 - jest.mock(shimFlightClientHostConfigPath, () => config);
101 + jest.mock(shimFlightClientConfigPath, () => config);
102 return jest.requireActual('react-client/flight');
103 };
104 });
105
106 const configPaths = [
107 'react-reconciler/src/ReactFiberHostConfig',
109 - 'react-client/src/ReactFlightClientHostConfig',
108 + 'react-client/src/ReactFlightClientConfig',
109 'react-server/src/ReactServerStreamConfig',
110 'react-server/src/ReactServerFormatConfig',
111 'react-server/src/ReactFlightServerConfig',
scripts/rollup/forks.js
+3 -3
@@ -355,7 +355,7 @@ const forks = Object.freeze({
355 );
356 },
357
358 - './packages/react-client/src/ReactFlightClientHostConfig.js': (
358 + './packages/react-client/src/ReactFlightClientConfig.js': (
359 bundleType,
360 entry,
361 dependencies,
@@ -373,11 +373,11 @@ const forks = Object.freeze({
373 if (!rendererInfo.isServerSupported) {
374 return null;
375 }
376 - return `./packages/react-client/src/forks/ReactFlightClientHostConfig.${rendererInfo.shortName}.js`;
376 + return `./packages/react-client/src/forks/ReactFlightClientConfig.${rendererInfo.shortName}.js`;
377 }
378 }
379 throw new Error(
380 - 'Expected ReactFlightClientHostConfig to always be replaced with a shim, but ' +
380 + 'Expected ReactFlightClientConfig to always be replaced with a shim, but ' +
381 `found no mention of "${entry}" entry point in ./scripts/shared/inlinedHostConfigs.js. ` +
382 'Did you mean to add it there to associate it with a specific renderer?'
383 );