@samitouri / QOS-React-2 / commits / 39a7730b13

Rename SSRManifest to ServerConsumerManifest (#31299)

This config is more generally applicable to all server-side Flight Clients and not just SSR.

Sebastian Markbåge committed Oct 19, 2024 at 20:45 UTC 39a7730b1311fb78642c36686820d8d1c79e58e4
20 files changed +106 -100
fixtures/flight/server/global.js
+9 -3
@@ -130,7 +130,7 @@ async function renderApp(req, res, next) {
130 buildPath = path.join(__dirname, '../build/');
131 }
132 // Read the module map from the virtual file system.
133 - const ssrManifest = JSON.parse(
133 + const serverConsumerManifest = JSON.parse(
134 await virtualFs.readFile(
135 path.join(buildPath, 'react-ssr-manifest.json'),
136 'utf8'
@@ -160,14 +160,20 @@ async function renderApp(req, res, next) {
160 rscResponse.pipe(rscResponse1);
161 rscResponse.pipe(rscResponse2);
162
163 - const {formState} = await createFromNodeStream(rscResponse1, ssrManifest);
163 + const {formState} = await createFromNodeStream(
164 + rscResponse1,
165 + serverConsumerManifest
166 + );
167 rscResponse1.end();
168
169 let cachedResult;
170 let Root = () => {
171 if (!cachedResult) {
172 // Read this stream inside the render.
170 - cachedResult = createFromNodeStream(rscResponse2, ssrManifest);
173 + cachedResult = createFromNodeStream(
174 + rscResponse2,
175 + serverConsumerManifest
176 + );
177 }
178 return React.use(cachedResult).root;
179 };
packages/react-client/src/ReactFlightClient.js
+4 -4
@@ -20,7 +20,7 @@ import type {LazyComponent} from 'react/src/ReactLazy';
20 import type {
21 ClientReference,
22 ClientReferenceMetadata,
23 - SSRModuleMap,
23 + ServerConsumerModuleMap,
24 StringDecoder,
25 ModuleLoading,
26 } from './ReactFlightClientConfig';
@@ -269,7 +269,7 @@ export type FindSourceMapURLCallback = (
269 ) => null | string;
270
271 export type Response = {
272 - _bundlerConfig: SSRModuleMap,
272 + _bundlerConfig: ServerConsumerModuleMap,
273 _moduleLoading: ModuleLoading,
274 _callServer: CallServerCallback,
275 _encodeFormAction: void | EncodeFormActionCallback,
@@ -1420,7 +1420,7 @@ function missingCall() {
1420
1421 function ResponseInstance(
1422 this: $FlowFixMe,
1423 - bundlerConfig: SSRModuleMap,
1423 + bundlerConfig: ServerConsumerModuleMap,
1424 moduleLoading: ModuleLoading,
1425 callServer: void | CallServerCallback,
1426 encodeFormAction: void | EncodeFormActionCallback,
@@ -1485,7 +1485,7 @@ function ResponseInstance(
1485 }
1486
1487 export function createResponse(
1488 - bundlerConfig: SSRModuleMap,
1488 + bundlerConfig: ServerConsumerModuleMap,
1489 moduleLoading: ModuleLoading,
1490 callServer: void | CallServerCallback,
1491 encodeFormAction: void | EncodeFormActionCallback,
packages/react-client/src/forks/ReactFlightClientConfig.custom.js
+1 -1
@@ -26,7 +26,7 @@
26 declare const $$$config: any;
27
28 export opaque type ModuleLoading = mixed;
29 -export opaque type SSRModuleMap = mixed;
29 +export opaque type ServerConsumerModuleMap = mixed;
30 export opaque type ServerManifest = mixed;
31 export opaque type ServerReferenceId = string;
32 export opaque type ClientReferenceMetadata = mixed;
packages/react-client/src/forks/ReactFlightClientConfig.dom-bun.js
+1 -1
@@ -15,7 +15,7 @@ export * from 'react-client/src/ReactClientConsoleConfigPlain';
15 export * from 'react-dom-bindings/src/shared/ReactFlightClientConfigDOM';
16
17 export opaque type ModuleLoading = mixed;
18 -export opaque type SSRModuleMap = mixed;
18 +export opaque type ServerConsumerModuleMap = mixed;
19 export opaque type ServerManifest = mixed;
20 export opaque type ServerReferenceId = string;
21 export opaque type ClientReferenceMetadata = mixed;
packages/react-client/src/forks/ReactFlightClientConfig.dom-legacy.js
+1 -1
@@ -15,7 +15,7 @@ export * from 'react-client/src/ReactClientConsoleConfigBrowser';
15
16 export type Response = any;
17 export opaque type ModuleLoading = mixed;
18 -export opaque type SSRModuleMap = mixed;
18 +export opaque type ServerConsumerModuleMap = mixed;
19 export opaque type ServerManifest = mixed;
20 export opaque type ServerReferenceId = string;
21 export opaque type ClientReferenceMetadata = mixed;
packages/react-client/src/forks/ReactFlightClientConfig.markup.js
+2 -2
@@ -16,7 +16,7 @@ export * from 'react-markup/src/ReactMarkupLegacyClientStreamConfig.js';
16 export * from 'react-client/src/ReactClientConsoleConfigPlain';
17
18 export type ModuleLoading = null;
19 -export type SSRModuleMap = null;
19 +export type ServerConsumerModuleMap = null;
20 export opaque type ServerManifest = null;
21 export opaque type ServerReferenceId = string;
22 export opaque type ClientReferenceMetadata = null;
@@ -33,7 +33,7 @@ export function prepareDestinationForModule(
33 }
34
35 export function resolveClientReference<T>(
36 - bundlerConfig: SSRModuleMap,
36 + bundlerConfig: ServerConsumerModuleMap,
37 metadata: ClientReferenceMetadata,
38 ): ClientReference<T> {
39 throw new Error(
packages/react-server-dom-esm/src/client/ReactFlightClientConfigBundlerESM.js
+2 -2
@@ -14,7 +14,7 @@ import type {
14 } from 'shared/ReactTypes';
15 import type {ModuleLoading} from 'react-client/src/ReactFlightClientConfig';
16
17 -export type SSRModuleMap = string; // Module root path
17 +export type ServerConsumerModuleMap = string; // Module root path
18
19 export type ServerManifest = string; // Module root path
20
@@ -48,7 +48,7 @@ export function prepareDestinationForModule(
48 }
49
50 export function resolveClientReference<T>(
51 - bundlerConfig: SSRModuleMap,
51 + bundlerConfig: ServerConsumerModuleMap,
52 metadata: ClientReferenceMetadata,
53 ): ClientReference<T> {
54 const baseURL = bundlerConfig;
packages/react-server-dom-turbopack/src/__tests__/ReactFlightTurbopackDOMEdge-test.js
+1 -1
@@ -97,7 +97,7 @@ describe('ReactFlightTurbopackDOMEdge', () => {
97 turbopackMap,
98 );
99 const response = ReactServerDOMClient.createFromReadableStream(stream, {
100 - ssrManifest: {
100 + serverManifest: {
101 moduleMap: translationMap,
102 moduleLoading: null,
103 },
packages/react-server-dom-turbopack/src/client/ReactFlightClientConfigBundlerNode.js
+2 -2
@@ -24,7 +24,7 @@ import {
24 } from '../shared/ReactFlightImportMetadata';
25 import {prepareDestinationWithChunks} from 'react-client/src/ReactFlightClientConfig';
26
27 -export type SSRModuleMap = {
27 +export type ServerConsumerModuleMap = {
28 [clientId: string]: {
29 [clientExportName: string]: ClientReference<any>,
30 },
@@ -58,7 +58,7 @@ export function prepareDestinationForModule(
58 }
59
60 export function resolveClientReference<T>(
61 - bundlerConfig: SSRModuleMap,
61 + bundlerConfig: ServerConsumerModuleMap,
62 metadata: ClientReferenceMetadata,
63 ): ClientReference<T> {
64 const moduleExports = bundlerConfig[metadata[ID]];
packages/react-server-dom-turbopack/src/client/ReactFlightClientConfigBundlerTurbopack.js
+2 -2
@@ -30,7 +30,7 @@ import {prepareDestinationWithChunks} from 'react-client/src/ReactFlightClientCo
30
31 import {loadChunk} from 'react-client/src/ReactFlightClientConfig';
32
33 -export type SSRModuleMap = null | {
33 +export type ServerConsumerModuleMap = null | {
34 [clientId: string]: {
35 [clientExportName: string]: ClientReferenceManifestEntry,
36 },
@@ -63,7 +63,7 @@ export function prepareDestinationForModule(
63 }
64
65 export function resolveClientReference<T>(
66 - bundlerConfig: SSRModuleMap,
66 + bundlerConfig: ServerConsumerModuleMap,
67 metadata: ClientReferenceMetadata,
68 ): ClientReference<T> {
69 if (bundlerConfig) {
packages/react-server-dom-turbopack/src/client/ReactFlightDOMClientEdge.js
+6 -6
@@ -17,12 +17,12 @@ import type {
17 import type {ReactServerValue} from 'react-client/src/ReactFlightReplyClient';
18
19 import type {
20 - SSRModuleMap,
20 + ServerConsumerModuleMap,
21 ModuleLoading,
22 } from 'react-client/src/ReactFlightClientConfig';
23
24 -type SSRManifest = {
25 - moduleMap: SSRModuleMap,
24 +type ServerConsumerManifest = {
25 + moduleMap: ServerConsumerModuleMap,
26 moduleLoading: ModuleLoading,
27 };
28
@@ -66,7 +66,7 @@ type EncodeFormActionCallback = <A>(
66 ) => ReactCustomFormAction;
67
68 export type Options = {
69 - ssrManifest: SSRManifest,
69 + serverManifest: ServerConsumerManifest,
70 nonce?: string,
71 encodeFormAction?: EncodeFormActionCallback,
72 temporaryReferences?: TemporaryReferenceSet,
@@ -77,8 +77,8 @@ export type Options = {
77
78 function createResponseFromOptions(options: Options) {
79 return createResponse(
80 - options.ssrManifest.moduleMap,
81 - options.ssrManifest.moduleLoading,
80 + options.serverManifest.moduleMap,
81 + options.serverManifest.moduleLoading,
82 noServerCall,
83 options.encodeFormAction,
84 typeof options.nonce === 'string' ? options.nonce : undefined,
packages/react-server-dom-turbopack/src/client/ReactFlightDOMClientNode.js
+6 -6
@@ -15,12 +15,12 @@ import type {
15 } from 'react-client/src/ReactFlightClient';
16
17 import type {
18 - SSRModuleMap,
18 + ServerConsumerModuleMap,
19 ModuleLoading,
20 } from 'react-client/src/ReactFlightClientConfig';
21
22 -type SSRManifest = {
23 - moduleMap: SSRModuleMap,
22 +type ServerConsumerManifest = {
23 + moduleMap: ServerConsumerModuleMap,
24 moduleLoading: ModuleLoading,
25 };
26
@@ -66,12 +66,12 @@ export type Options = {
66
67 function createFromNodeStream<T>(
68 stream: Readable,
69 - ssrManifest: SSRManifest,
69 + serverConsumerManifest: ServerConsumerManifest,
70 options?: Options,
71 ): Thenable<T> {
72 const response: Response = createResponse(
73 - ssrManifest.moduleMap,
74 - ssrManifest.moduleLoading,
73 + serverConsumerManifest.moduleMap,
74 + serverConsumerManifest.moduleLoading,
75 noServerCall,
76 options ? options.encodeFormAction : undefined,
77 options && typeof options.nonce === 'string' ? options.nonce : undefined,
packages/react-server-dom-webpack/src/ReactFlightWebpackPlugin.js
+8 -8
@@ -58,7 +58,7 @@ type Options = {
58 clientReferences?: ClientReferencePath | $ReadOnlyArray<ClientReferencePath>,
59 chunkName?: string,
60 clientManifestFilename?: string,
61 - ssrManifestFilename?: string,
61 + serverConsumerManifestFilename?: string,
62 };
63
64 const PLUGIN_NAME = 'React Server Plugin';
@@ -67,7 +67,7 @@ export default class ReactFlightWebpackPlugin {
67 clientReferences: $ReadOnlyArray<ClientReferencePath>;
68 chunkName: string;
69 clientManifestFilename: string;
70 - ssrManifestFilename: string;
70 + serverConsumerManifestFilename: string;
71
72 constructor(options: Options) {
73 if (!options || typeof options.isServer !== 'boolean') {
@@ -105,8 +105,8 @@ export default class ReactFlightWebpackPlugin {
105 }
106 this.clientManifestFilename =
107 options.clientManifestFilename || 'react-client-manifest.json';
108 - this.ssrManifestFilename =
109 - options.ssrManifestFilename || 'react-ssr-manifest.json';
108 + this.serverConsumerManifestFilename =
109 + options.serverConsumerManifestFilename || 'react-ssr-manifest.json';
110 }
111
112 apply(compiler: any) {
@@ -239,18 +239,18 @@ export default class ReactFlightWebpackPlugin {
239 const clientManifest: {
240 [string]: ImportManifestEntry,
241 } = {};
242 - type SSRModuleMap = {
242 + type ServerConsumerModuleMap = {
243 [string]: {
244 [string]: {specifier: string, name: string},
245 },
246 };
247 - const moduleMap: SSRModuleMap = {};
247 + const moduleMap: ServerConsumerModuleMap = {};
248 const ssrBundleConfig: {
249 moduleLoading: {
250 prefix: string,
251 crossOrigin: string | null,
252 },
253 - moduleMap: SSRModuleMap,
253 + moduleMap: ServerConsumerModuleMap,
254 } = {
255 moduleLoading: {
256 prefix: compilation.outputOptions.publicPath || '',
@@ -374,7 +374,7 @@ export default class ReactFlightWebpackPlugin {
374 );
375 const ssrOutput = JSON.stringify(ssrBundleConfig, null, 2);
376 compilation.emitAsset(
377 - _this.ssrManifestFilename,
377 + _this.serverConsumerManifestFilename,
378 new sources.RawSource(ssrOutput, false),
379 );
380 },
packages/react-server-dom-webpack/src/__tests__/ReactFlightDOMEdge-test.js
+18 -18
@@ -195,7 +195,7 @@ describe('ReactFlightDOMEdge', () => {
195 ReactServerDOMServer.renderToReadableStream(<App />, webpackMap),
196 );
197 const response = ReactServerDOMClient.createFromReadableStream(stream, {
198 - ssrManifest: {
198 + serverConsumerManifest: {
199 moduleMap: translationMap,
200 moduleLoading: webpackModuleLoading,
201 },
@@ -235,7 +235,7 @@ describe('ReactFlightDOMEdge', () => {
235 const result = await ReactServerDOMClient.createFromReadableStream(
236 stream2,
237 {
238 - ssrManifest: {
238 + serverConsumerManifest: {
239 moduleMap: null,
240 moduleLoading: null,
241 },
@@ -263,7 +263,7 @@ describe('ReactFlightDOMEdge', () => {
263 const result = await ReactServerDOMClient.createFromReadableStream(
264 stream2,
265 {
266 - ssrManifest: {
266 + serverConsumerManifest: {
267 moduleMap: null,
268 moduleLoading: null,
269 },
@@ -333,7 +333,7 @@ describe('ReactFlightDOMEdge', () => {
333 expect(timesRendered).toBeLessThan(5);
334
335 const model = await ReactServerDOMClient.createFromReadableStream(stream2, {
336 - ssrManifest: {
336 + serverConsumerManifest: {
337 moduleMap: null,
338 moduleLoading: null,
339 },
@@ -405,7 +405,7 @@ describe('ReactFlightDOMEdge', () => {
405
406 const model = await serverAct(() =>
407 ReactServerDOMClient.createFromReadableStream(stream2, {
408 - ssrManifest: {
408 + serverConsumerManifest: {
409 moduleMap: null,
410 moduleLoading: null,
411 },
@@ -462,7 +462,7 @@ describe('ReactFlightDOMEdge', () => {
462 passThrough(ReactServerDOMServer.renderToReadableStream(buffers)),
463 );
464 const result = await ReactServerDOMClient.createFromReadableStream(stream, {
465 - ssrManifest: {
465 + serverConsumerManifest: {
466 moduleMap: null,
467 moduleLoading: null,
468 },
@@ -482,7 +482,7 @@ describe('ReactFlightDOMEdge', () => {
482 passThrough(ReactServerDOMServer.renderToReadableStream(blob)),
483 );
484 const result = await ReactServerDOMClient.createFromReadableStream(stream, {
485 - ssrManifest: {
485 + serverConsumerManifest: {
486 moduleMap: null,
487 moduleLoading: null,
488 },
@@ -512,7 +512,7 @@ describe('ReactFlightDOMEdge', () => {
512 passThrough(ReactServerDOMServer.renderToReadableStream(formData)),
513 );
514 const result = await ReactServerDOMClient.createFromReadableStream(stream, {
515 - ssrManifest: {
515 + serverConsumerManifest: {
516 moduleMap: null,
517 moduleLoading: null,
518 },
@@ -547,7 +547,7 @@ describe('ReactFlightDOMEdge', () => {
547 const resultPromise = ReactServerDOMClient.createFromReadableStream(
548 stream,
549 {
550 - ssrManifest: {
550 + serverConsumerManifest: {
551 moduleMap: null,
552 moduleLoading: null,
553 },
@@ -587,7 +587,7 @@ describe('ReactFlightDOMEdge', () => {
587
588 const result = await serverAct(() =>
589 ReactServerDOMClient.createFromReadableStream(stream, {
590 - ssrManifest: {
590 + serverConsumerManifest: {
591 moduleMap: null,
592 moduleLoading: null,
593 },
@@ -635,7 +635,7 @@ describe('ReactFlightDOMEdge', () => {
635 // Parsing the root blocks because the module hasn't loaded yet
636 const result = await serverAct(() =>
637 ReactServerDOMClient.createFromReadableStream(stream, {
638 - ssrManifest: {
638 + serverConsumerManifest: {
639 moduleMap: null,
640 moduleLoading: null,
641 },
@@ -689,7 +689,7 @@ describe('ReactFlightDOMEdge', () => {
689 const result = await ReactServerDOMClient.createFromReadableStream(
690 stream2,
691 {
692 - ssrManifest: {
692 + serverConsumerManifest: {
693 moduleMap: null,
694 moduleLoading: null,
695 },
@@ -777,7 +777,7 @@ describe('ReactFlightDOMEdge', () => {
777 const result = await ReactServerDOMClient.createFromReadableStream(
778 stream1,
779 {
780 - ssrManifest: {
780 + serverConsumerManifest: {
781 moduleMap: null,
782 moduleLoading: null,
783 },
@@ -836,7 +836,7 @@ describe('ReactFlightDOMEdge', () => {
836 const result = await ReactServerDOMClient.createFromReadableStream(
837 stream1,
838 {
839 - ssrManifest: {
839 + serverConsumerManifest: {
840 moduleMap: null,
841 moduleLoading: null,
842 },
@@ -891,7 +891,7 @@ describe('ReactFlightDOMEdge', () => {
891
892 const rootModel = await serverAct(() =>
893 ReactServerDOMClient.createFromReadableStream(stream, {
894 - ssrManifest: {
894 + serverConsumerManifest: {
895 moduleMap: null,
896 moduleLoading: null,
897 },
@@ -995,7 +995,7 @@ describe('ReactFlightDOMEdge', () => {
995
996 const rootModel = await serverAct(() =>
997 ReactServerDOMClient.createFromReadableStream(stream, {
998 - ssrManifest: {
998 + serverConsumerManifest: {
999 moduleMap: null,
1000 moduleLoading: null,
1001 },
@@ -1079,7 +1079,7 @@ describe('ReactFlightDOMEdge', () => {
1079 }
1080
1081 const response = ReactServerDOMClient.createFromReadableStream(prelude, {
1082 - ssrManifest: {
1082 + serverConsumerManifest: {
1083 moduleMap: null,
1084 moduleLoading: null,
1085 },
@@ -1146,7 +1146,7 @@ describe('ReactFlightDOMEdge', () => {
1146 }
1147
1148 const response = ReactServerDOMClient.createFromReadableStream(prelude, {
1149 - ssrManifest: {
1149 + serverConsumerManifest: {
1150 moduleMap: null,
1151 moduleLoading: null,
1152 },
packages/react-server-dom-webpack/src/__tests__/ReactFlightDOMForm-test.js
+21 -21
@@ -166,7 +166,7 @@ describe('ReactFlightDOMForm', () => {
166 }
167 const rscStream = ReactServerDOMServer.renderToReadableStream(<App />);
168 const response = ReactServerDOMClient.createFromReadableStream(rscStream, {
169 - ssrManifest: {
169 + serverConsumerManifest: {
170 moduleMap: null,
171 moduleLoading: null,
172 },
@@ -232,7 +232,7 @@ describe('ReactFlightDOMForm', () => {
232 }
233 const rscStream = ReactServerDOMServer.renderToReadableStream(<App />);
234 const response = ReactServerDOMClient.createFromReadableStream(rscStream, {
235 - ssrManifest: {
235 + serverConsumerManifest: {
236 moduleMap: null,
237 moduleLoading: null,
238 },
@@ -272,7 +272,7 @@ describe('ReactFlightDOMForm', () => {
272 }
273 const rscStream = ReactServerDOMServer.renderToReadableStream(<App />);
274 const response = ReactServerDOMClient.createFromReadableStream(rscStream, {
275 - ssrManifest: {
275 + serverConsumerManifest: {
276 moduleMap: null,
277 moduleLoading: null,
278 },
@@ -343,7 +343,7 @@ describe('ReactFlightDOMForm', () => {
343 webpackMap,
344 );
345 const response = ReactServerDOMClient.createFromReadableStream(rscStream, {
346 - ssrManifest: {
346 + serverConsumerManifest: {
347 moduleMap: null,
348 moduleLoading: null,
349 },
@@ -391,7 +391,7 @@ describe('ReactFlightDOMForm', () => {
391 webpackMap,
392 );
393 const response = ReactServerDOMClient.createFromReadableStream(rscStream, {
394 - ssrManifest: {
394 + serverConsumerManifest: {
395 moduleMap: null,
396 moduleLoading: null,
397 },
@@ -444,7 +444,7 @@ describe('ReactFlightDOMForm', () => {
444 webpackMap,
445 );
446 const response = ReactServerDOMClient.createFromReadableStream(rscStream, {
447 - ssrManifest: {
447 + serverConsumerManifest: {
448 moduleMap: null,
449 moduleLoading: null,
450 },
@@ -469,7 +469,7 @@ describe('ReactFlightDOMForm', () => {
469 const postbackResponse = ReactServerDOMClient.createFromReadableStream(
470 postbackRscStream,
471 {
472 - ssrManifest: {
472 + serverConsumerManifest: {
473 moduleMap: null,
474 moduleLoading: null,
475 },
@@ -539,7 +539,7 @@ describe('ReactFlightDOMForm', () => {
539 const response = ReactServerDOMClient.createFromReadableStream(
540 rscStream,
541 {
542 - ssrManifest: {
542 + serverConsumerManifest: {
543 moduleMap: null,
544 moduleLoading: null,
545 },
@@ -569,7 +569,7 @@ describe('ReactFlightDOMForm', () => {
569 const postbackResponse = ReactServerDOMClient.createFromReadableStream(
570 postbackRscStream,
571 {
572 - ssrManifest: {
572 + serverConsumerManifest: {
573 moduleMap: null,
574 moduleLoading: null,
575 },
@@ -601,7 +601,7 @@ describe('ReactFlightDOMForm', () => {
601 const postbackResponse2 = ReactServerDOMClient.createFromReadableStream(
602 postbackRscStream2,
603 {
604 - ssrManifest: {
604 + serverConsumerManifest: {
605 moduleMap: null,
606 moduleLoading: null,
607 },
@@ -660,7 +660,7 @@ describe('ReactFlightDOMForm', () => {
660 webpackMap,
661 );
662 const response = ReactServerDOMClient.createFromReadableStream(rscStream, {
663 - ssrManifest: {
663 + serverConsumerManifest: {
664 moduleMap: null,
665 moduleLoading: null,
666 },
@@ -687,7 +687,7 @@ describe('ReactFlightDOMForm', () => {
687 const postbackResponse = ReactServerDOMClient.createFromReadableStream(
688 postbackRscStream,
689 {
690 - ssrManifest: {
690 + serverConsumerManifest: {
691 moduleMap: null,
692 moduleLoading: null,
693 },
@@ -738,7 +738,7 @@ describe('ReactFlightDOMForm', () => {
738 webpackMap,
739 );
740 const response = ReactServerDOMClient.createFromReadableStream(rscStream, {
741 - ssrManifest: {
741 + serverConsumerManifest: {
742 moduleMap: null,
743 moduleLoading: null,
744 },
@@ -766,7 +766,7 @@ describe('ReactFlightDOMForm', () => {
766 const postbackResponse = ReactServerDOMClient.createFromReadableStream(
767 postbackRscStream,
768 {
769 - ssrManifest: {
769 + serverConsumerManifest: {
770 moduleMap: null,
771 moduleLoading: null,
772 },
@@ -794,7 +794,7 @@ describe('ReactFlightDOMForm', () => {
794 const postbackResponse2 = ReactServerDOMClient.createFromReadableStream(
795 postbackRscStream2,
796 {
797 - ssrManifest: {
797 + serverConsumerManifest: {
798 moduleMap: null,
799 moduleLoading: null,
800 },
@@ -838,7 +838,7 @@ describe('ReactFlightDOMForm', () => {
838 webpackMap,
839 );
840 const response = ReactServerDOMClient.createFromReadableStream(rscStream, {
841 - ssrManifest: {
841 + serverConsumerManifest: {
842 moduleMap: null,
843 moduleLoading: null,
844 },
@@ -891,7 +891,7 @@ describe('ReactFlightDOMForm', () => {
891 webpackMap,
892 );
893 const response = ReactServerDOMClient.createFromReadableStream(rscStream, {
894 - ssrManifest: {
894 + serverConsumerManifest: {
895 moduleMap: null,
896 moduleLoading: null,
897 },
@@ -928,7 +928,7 @@ describe('ReactFlightDOMForm', () => {
928 webpackMap,
929 );
930 const response = ReactServerDOMClient.createFromReadableStream(rscStream, {
931 - ssrManifest: {
931 + serverConsumerManifest: {
932 moduleMap: null,
933 moduleLoading: null,
934 },
@@ -954,7 +954,7 @@ describe('ReactFlightDOMForm', () => {
954 const postbackResponse = ReactServerDOMClient.createFromReadableStream(
955 postbackRscStream,
956 {
957 - ssrManifest: {
957 + serverConsumerManifest: {
958 moduleMap: null,
959 moduleLoading: null,
960 },
@@ -1007,7 +1007,7 @@ describe('ReactFlightDOMForm', () => {
1007 webpackMap,
1008 );
1009 const response = ReactServerDOMClient.createFromReadableStream(rscStream, {
1010 - ssrManifest: {
1010 + serverConsumerManifest: {
1011 moduleMap: null,
1012 moduleLoading: null,
1013 },
@@ -1032,7 +1032,7 @@ describe('ReactFlightDOMForm', () => {
1032 );
1033 const postbackResponse =
1034 await ReactServerDOMClient.createFromReadableStream(postbackRscStream, {
1035 - ssrManifest: {
1035 + serverConsumerManifest: {
1036 moduleMap: null,
1037 moduleLoading: null,
1038 },
packages/react-server-dom-webpack/src/__tests__/ReactFlightDOMNode-test.js
+6 -6
@@ -130,7 +130,7 @@ describe('ReactFlightDOMNode', () => {
130 '*': ssrMetadata,
131 },
132 };
133 - const ssrManifest = {
133 + const serverConsumerManifest = {
134 moduleMap: translationMap,
135 moduleLoading: webpackModuleLoading,
136 };
@@ -151,7 +151,7 @@ describe('ReactFlightDOMNode', () => {
151 if (response) return use(response);
152 response = ReactServerDOMClient.createFromNodeStream(
153 readable,
154 - ssrManifest,
154 + serverConsumerManifest,
155 );
156 return use(response);
157 }
@@ -255,7 +255,7 @@ describe('ReactFlightDOMNode', () => {
255 '*': ssrMetadata,
256 },
257 };
258 - const ssrManifest = {
258 + const serverConsumerManifest = {
259 moduleMap: translationMap,
260 moduleLoading: webpackModuleLoading,
261 };
@@ -276,7 +276,7 @@ describe('ReactFlightDOMNode', () => {
276 if (response) return use(response);
277 response = ReactServerDOMClient.createFromNodeStream(
278 readable,
279 - ssrManifest,
279 + serverConsumerManifest,
280 {
281 nonce: 'r4nd0m',
282 },
@@ -426,7 +426,7 @@ describe('ReactFlightDOMNode', () => {
426 }
427
428 const response = ReactServerDOMClient.createFromNodeStream(prelude, {
429 - ssrManifest: {
429 + serverConsumerManifest: {
430 moduleMap: null,
431 moduleLoading: null,
432 },
@@ -492,7 +492,7 @@ describe('ReactFlightDOMNode', () => {
492 }
493
494 const response = ReactServerDOMClient.createFromNodeStream(prelude, {
495 - ssrManifest: {
495 + serverConsumerManifest: {
496 moduleMap: null,
497 moduleLoading: null,
498 },
packages/react-server-dom-webpack/src/client/ReactFlightClientConfigBundlerNode.js
+2 -2
@@ -24,7 +24,7 @@ import {
24 } from '../shared/ReactFlightImportMetadata';
25 import {prepareDestinationWithChunks} from 'react-client/src/ReactFlightClientConfig';
26
27 -export type SSRModuleMap = {
27 +export type ServerConsumerModuleMap = {
28 [clientId: string]: {
29 [clientExportName: string]: ClientReference<any>,
30 },
@@ -58,7 +58,7 @@ export function prepareDestinationForModule(
58 }
59
60 export function resolveClientReference<T>(
61 - bundlerConfig: SSRModuleMap,
61 + bundlerConfig: ServerConsumerModuleMap,
62 metadata: ClientReferenceMetadata,
63 ): ClientReference<T> {
64 const moduleExports = bundlerConfig[metadata[ID]];
packages/react-server-dom-webpack/src/client/ReactFlightClientConfigBundlerWebpack.js
+2 -2
@@ -30,7 +30,7 @@ import {prepareDestinationWithChunks} from 'react-client/src/ReactFlightClientCo
30
31 import {loadChunk} from 'react-client/src/ReactFlightClientConfig';
32
33 -export type SSRModuleMap = null | {
33 +export type ServerConsumerModuleMap = null | {
34 [clientId: string]: {
35 [clientExportName: string]: ClientReferenceManifestEntry,
36 },
@@ -63,7 +63,7 @@ export function prepareDestinationForModule(
63 }
64
65 export function resolveClientReference<T>(
66 - bundlerConfig: SSRModuleMap,
66 + bundlerConfig: ServerConsumerModuleMap,
67 metadata: ClientReferenceMetadata,
68 ): ClientReference<T> {
69 if (bundlerConfig) {
packages/react-server-dom-webpack/src/client/ReactFlightDOMClientEdge.js
+6 -6
@@ -17,12 +17,12 @@ import type {
17 import type {ReactServerValue} from 'react-client/src/ReactFlightReplyClient';
18
19 import type {
20 - SSRModuleMap,
20 + ServerConsumerModuleMap,
21 ModuleLoading,
22 } from 'react-client/src/ReactFlightClientConfig';
23
24 -type SSRManifest = {
25 - moduleMap: SSRModuleMap,
24 +type ServerConsumerManifest = {
25 + moduleMap: ServerConsumerModuleMap,
26 moduleLoading: ModuleLoading,
27 };
28
@@ -66,7 +66,7 @@ type EncodeFormActionCallback = <A>(
66 ) => ReactCustomFormAction;
67
68 export type Options = {
69 - ssrManifest: SSRManifest,
69 + serverConsumerManifest: ServerConsumerManifest,
70 nonce?: string,
71 encodeFormAction?: EncodeFormActionCallback,
72 temporaryReferences?: TemporaryReferenceSet,
@@ -77,8 +77,8 @@ export type Options = {
77
78 function createResponseFromOptions(options: Options) {
79 return createResponse(
80 - options.ssrManifest.moduleMap,
81 - options.ssrManifest.moduleLoading,
80 + options.serverConsumerManifest.moduleMap,
81 + options.serverConsumerManifest.moduleLoading,
82 noServerCall,
83 options.encodeFormAction,
84 typeof options.nonce === 'string' ? options.nonce : undefined,
packages/react-server-dom-webpack/src/client/ReactFlightDOMClientNode.js
+6 -6
@@ -15,12 +15,12 @@ import type {
15 } from 'react-client/src/ReactFlightClient';
16
17 import type {
18 - SSRModuleMap,
18 + ServerConsumerModuleMap,
19 ModuleLoading,
20 } from 'react-client/src/ReactFlightClientConfig';
21
22 -type SSRManifest = {
23 - moduleMap: SSRModuleMap,
22 +type ServerConsumerManifest = {
23 + moduleMap: ServerConsumerModuleMap,
24 moduleLoading: ModuleLoading,
25 };
26
@@ -67,12 +67,12 @@ export type Options = {
67
68 function createFromNodeStream<T>(
69 stream: Readable,
70 - ssrManifest: SSRManifest,
70 + serverConsumerManifest: ServerConsumerManifest,
71 options?: Options,
72 ): Thenable<T> {
73 const response: Response = createResponse(
74 - ssrManifest.moduleMap,
75 - ssrManifest.moduleLoading,
74 + serverConsumerManifest.moduleMap,
75 + serverConsumerManifest.moduleLoading,
76 noServerCall,
77 options ? options.encodeFormAction : undefined,
78 options && typeof options.nonce === 'string' ? options.nonce : undefined,