Pass BundlerConfig through to Relay Integration (#18393)
I wasn't sure we needed this but looks like it'll come in handy.
Sebastian Markbåge committed
Mar 25, 2020 at 20:25 UTC
dbb060d561b83ad901af3e1f60541e6c313cca4f
4 files changed
+16
-7
packages/react-flight-dom-relay/src/ReactFlightDOMRelayServer.js
+10
-3
@@ -8,12 +8,19 @@
8
*/
9
10
import type {ReactModel} from 'react-server/src/ReactFlightServer';
11
-import type {Destination} from './ReactFlightDOMRelayServerHostConfig';
11
+import type {
12
+ BundlerConfig,
13
+ Destination,
14
+} from './ReactFlightDOMRelayServerHostConfig';
15
16
import {createRequest, startWork} from 'react-server/src/ReactFlightServer';
17
15
-function render(model: ReactModel, destination: Destination): void {
16
- let request = createRequest(model, destination, undefined);
18
+function render(
19
+ model: ReactModel,
20
+ destination: Destination,
21
+ config: BundlerConfig,
22
+): void {
23
+ let request = createRequest(model, destination, config);
24
startWork(request);
25
}
26
packages/react-flight-dom-relay/src/ReactFlightDOMRelayServerHostConfig.js
+3
-3
@@ -11,6 +11,7 @@ import type {Request, ReactModel} from 'react-server/src/ReactFlightServer';
11
12
import type {
13
Destination,
14
+ BundlerConfig,
15
ModuleReference,
16
ModuleMetaData,
17
} from 'ReactFlightDOMRelayServerIntegration';
@@ -25,17 +26,16 @@ import {
26
27
export type {
28
Destination,
29
+ BundlerConfig,
30
ModuleReference,
31
ModuleMetaData,
32
} from 'ReactFlightDOMRelayServerIntegration';
33
32
-export type BundlerConfig = void;
33
-
34
export function resolveModuleMetaData<T>(
35
config: BundlerConfig,
36
resource: ModuleReference<T>,
37
): ModuleMetaData {
38
- return resolveModuleMetaDataImpl(resource);
38
+ return resolveModuleMetaDataImpl(config, resource);
39
}
40
41
type JSONValue =
packages/react-flight-dom-relay/src/__mocks__/ReactFlightDOMRelayServerIntegration.js
+1
-1
@@ -23,7 +23,7 @@ const ReactFlightDOMRelayServerIntegration = {
23
});
24
},
25
close(destination) {},
26
- resolveModuleMetaData(resource) {
26
+ resolveModuleMetaData(config, resource) {
27
return resource;
28
},
29
};
scripts/flow/react-relay-hooks.js
+2
@@ -17,6 +17,7 @@ type JSONValue =
17
18
declare module 'ReactFlightDOMRelayServerIntegration' {
19
declare export opaque type Destination;
20
+ declare export opaque type BundlerConfig;
21
declare export function emitModel(
22
destination: Destination,
23
id: number,
@@ -33,6 +34,7 @@ declare module 'ReactFlightDOMRelayServerIntegration' {
34
declare export opaque type ModuleReference<T>;
35
declare export type ModuleMetaData = JSONValue;
36
declare export function resolveModuleMetaData<T>(
37
+ config: BundlerConfig,
38
resourceReference: ModuleReference<T>,
39
): ModuleMetaData;
40
}