Skip to content

Commit 9ac4542

Browse files
committed
Rename BundlerConfig -> SSRManifest/ClientManifest
These could be more generic but for now that's what they mean.
1 parent 40b171b commit 9ac4542

21 files changed

+51
-57
lines changed

packages/react-client/src/ReactFlightClient.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import type {
1515
ClientReferenceMetadata,
1616
UninitializedModel,
1717
Response,
18-
BundlerConfig,
18+
SSRManifest,
1919
} from './ReactFlightClientHostConfig';
2020

2121
import {
@@ -149,7 +149,7 @@ Chunk.prototype.then = function <T>(
149149
};
150150

151151
export type ResponseBase = {
152-
_bundlerConfig: BundlerConfig,
152+
_bundlerConfig: SSRManifest,
153153
_callServer: CallServerCallback,
154154
_chunks: Map<number, SomeChunk<any>>,
155155
...
@@ -611,7 +611,7 @@ function missingCall() {
611611
}
612612

613613
export function createResponse(
614-
bundlerConfig: BundlerConfig,
614+
bundlerConfig: SSRManifest,
615615
callServer: void | CallServerCallback,
616616
): ResponseBase {
617617
const chunks: Map<number, SomeChunk<any>> = new Map();

packages/react-client/src/ReactFlightClientStream.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
import type {CallServerCallback} from './ReactFlightClient';
1111
import type {Response} from './ReactFlightClientHostConfigStream';
12-
import type {BundlerConfig} from './ReactFlightClientHostConfig';
12+
import type {SSRManifest} from './ReactFlightClientHostConfig';
1313

1414
import {
1515
resolveModule,
@@ -121,7 +121,7 @@ function createFromJSONCallback(response: Response) {
121121
}
122122

123123
export function createResponse(
124-
bundlerConfig: BundlerConfig,
124+
bundlerConfig: SSRManifest,
125125
callServer: void | CallServerCallback,
126126
): Response {
127127
// NOTE: CHECK THE COMPILER OUTPUT EACH TIME YOU CHANGE THIS.

packages/react-client/src/forks/ReactFlightClientHostConfig.custom.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
declare var $$$hostConfig: any;
2727

2828
export type Response = any;
29-
export opaque type BundlerConfig = mixed;
29+
export opaque type SSRManifest = mixed;
3030
export opaque type ClientReferenceMetadata = mixed;
3131
export opaque type ClientReference<T> = mixed; // eslint-disable-line no-unused-vars
3232
export const resolveClientReference = $$$hostConfig.resolveClientReference;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export * from 'react-client/src/ReactFlightClientHostConfigBrowser';
1111
export * from 'react-client/src/ReactFlightClientHostConfigStream';
1212

1313
export type Response = any;
14-
export opaque type BundlerConfig = mixed;
14+
export opaque type ClientManifest = mixed;
1515
export opaque type ClientReferenceMetadata = mixed;
1616
export opaque type ClientReference<T> = mixed; // eslint-disable-line no-unused-vars
1717
export const resolveClientReference: any = null;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@ import isArray from 'shared/isArray';
3131

3232
export type {ClientReferenceMetadata} from 'ReactFlightDOMRelayClientIntegration';
3333

34-
export type BundlerConfig = null;
34+
export type SSRManifest = null;
3535

3636
export type UninitializedModel = JSONValue;
3737

3838
export type Response = ResponseBase;
3939

4040
export function resolveClientReference<T>(
41-
bundlerConfig: BundlerConfig,
41+
bundlerConfig: SSRManifest,
4242
metadata: ClientReferenceMetadata,
4343
): ClientReference<T> {
4444
return resolveClientReferenceImpl(metadata);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
import type {ReactClientValue} from 'react-server/src/ReactFlightServer';
1111
import type {
12-
BundlerConfig,
12+
ClientManifest,
1313
Destination,
1414
} from './ReactFlightDOMRelayServerHostConfig';
1515

@@ -27,7 +27,7 @@ type Options = {
2727
function render(
2828
model: ReactClientValue,
2929
destination: Destination,
30-
config: BundlerConfig,
30+
config: ClientManifest,
3131
options?: Options,
3232
): void {
3333
const request = createRequest(

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ export type ServerReferenceId = {};
2626

2727
import type {
2828
Destination,
29-
BundlerConfig,
29+
ClientManifest,
3030
ClientReferenceMetadata,
3131
} from 'ReactFlightDOMRelayServerIntegration';
3232

@@ -40,7 +40,7 @@ import {
4040

4141
export type {
4242
Destination,
43-
BundlerConfig,
43+
ClientManifest,
4444
ClientReferenceMetadata,
4545
} from 'ReactFlightDOMRelayServerIntegration';
4646

@@ -63,21 +63,21 @@ export function getClientReferenceKey(
6363
}
6464

6565
export function resolveClientReferenceMetadata<T>(
66-
config: BundlerConfig,
66+
config: ClientManifest,
6767
resource: ClientReference<T>,
6868
): ClientReferenceMetadata {
6969
return resolveClientReferenceMetadataImpl(config, resource);
7070
}
7171

7272
export function getServerReferenceId<T>(
73-
config: BundlerConfig,
73+
config: ClientManifest,
7474
resource: ServerReference<T>,
7575
): ServerReferenceId {
7676
throw new Error('Not implemented.');
7777
}
7878

7979
export function getServerReferenceBoundArguments<T>(
80-
config: BundlerConfig,
80+
config: ClientManifest,
8181
resource: ServerReference<T>,
8282
): Array<ReactClientValue> {
8383
throw new Error('Not implemented.');

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,12 @@ import type {
1313
RejectedThenable,
1414
} from 'shared/ReactTypes';
1515

16-
export type WebpackSSRMap = {
16+
export type SSRManifest = {
1717
[clientId: string]: {
1818
[clientExportName: string]: ClientReference<any>,
1919
},
2020
};
2121

22-
export type BundlerConfig = WebpackSSRMap;
23-
2422
export opaque type ClientReferenceMetadata = {
2523
id: string,
2624
chunks: Array<string>,
@@ -34,7 +32,7 @@ export opaque type ClientReference<T> = {
3432
};
3533

3634
export function resolveClientReference<T>(
37-
bundlerConfig: BundlerConfig,
35+
bundlerConfig: SSRManifest,
3836
metadata: ClientReferenceMetadata,
3937
): ClientReference<T> {
4038
const resolvedModuleData = bundlerConfig[metadata.id][metadata.name];

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,12 @@ import type {
1313
RejectedThenable,
1414
} from 'shared/ReactTypes';
1515

16-
export type WebpackSSRMap = {
16+
export type SSRManifest = null | {
1717
[clientId: string]: {
1818
[clientExportName: string]: ClientReferenceMetadata,
1919
},
2020
};
2121

22-
export type BundlerConfig = null | WebpackSSRMap;
23-
2422
export opaque type ClientReferenceMetadata = {
2523
id: string,
2624
chunks: Array<string>,
@@ -32,7 +30,7 @@ export opaque type ClientReferenceMetadata = {
3230
export opaque type ClientReference<T> = ClientReferenceMetadata;
3331

3432
export function resolveClientReference<T>(
35-
bundlerConfig: BundlerConfig,
33+
bundlerConfig: SSRManifest,
3634
metadata: ClientReferenceMetadata,
3735
): ClientReference<T> {
3836
if (bundlerConfig) {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import type {Thenable} from 'shared/ReactTypes.js';
1111

1212
import type {Response as FlightResponse} from 'react-client/src/ReactFlightClientStream';
1313

14-
import type {BundlerConfig} from './ReactFlightClientWebpackBundlerConfig';
14+
import type {SSRManifest} from './ReactFlightClientWebpackBundlerConfig';
1515

1616
import {
1717
createResponse,
@@ -30,7 +30,7 @@ function noServerCall() {
3030
}
3131

3232
export type Options = {
33-
moduleMap?: BundlerConfig,
33+
moduleMap?: SSRManifest,
3434
};
3535

3636
function createResponseFromOptions(options: void | Options) {

0 commit comments

Comments
 (0)