{"body":"This config is more generally applicable to all server-side Flight\r\nClients and not just SSR.","parents":["1839e1437f652819682f2c7970687ac19e551534"],"files":[{"status":"M","path":"fixtures\/flight\/server\/global.js"},{"status":"M","path":"packages\/react-client\/src\/ReactFlightClient.js"},{"status":"M","path":"packages\/react-client\/src\/forks\/ReactFlightClientConfig.custom.js"},{"status":"M","path":"packages\/react-client\/src\/forks\/ReactFlightClientConfig.dom-bun.js"},{"status":"M","path":"packages\/react-client\/src\/forks\/ReactFlightClientConfig.dom-legacy.js"},{"status":"M","path":"packages\/react-client\/src\/forks\/ReactFlightClientConfig.markup.js"},{"status":"M","path":"packages\/react-server-dom-esm\/src\/client\/ReactFlightClientConfigBundlerESM.js"},{"status":"M","path":"packages\/react-server-dom-turbopack\/src\/__tests__\/ReactFlightTurbopackDOMEdge-test.js"},{"status":"M","path":"packages\/react-server-dom-turbopack\/src\/client\/ReactFlightClientConfigBundlerNode.js"},{"status":"M","path":"packages\/react-server-dom-turbopack\/src\/client\/ReactFlightClientConfigBundlerTurbopack.js"},{"status":"M","path":"packages\/react-server-dom-turbopack\/src\/client\/ReactFlightDOMClientEdge.js"},{"status":"M","path":"packages\/react-server-dom-turbopack\/src\/client\/ReactFlightDOMClientNode.js"},{"status":"M","path":"packages\/react-server-dom-webpack\/src\/ReactFlightWebpackPlugin.js"},{"status":"M","path":"packages\/react-server-dom-webpack\/src\/__tests__\/ReactFlightDOMEdge-test.js"},{"status":"M","path":"packages\/react-server-dom-webpack\/src\/__tests__\/ReactFlightDOMForm-test.js"},{"status":"M","path":"packages\/react-server-dom-webpack\/src\/__tests__\/ReactFlightDOMNode-test.js"},{"status":"M","path":"packages\/react-server-dom-webpack\/src\/client\/ReactFlightClientConfigBundlerNode.js"},{"status":"M","path":"packages\/react-server-dom-webpack\/src\/client\/ReactFlightClientConfigBundlerWebpack.js"},{"status":"M","path":"packages\/react-server-dom-webpack\/src\/client\/ReactFlightDOMClientEdge.js"},{"status":"M","path":"packages\/react-server-dom-webpack\/src\/client\/ReactFlightDOMClientNode.js"}],"commit":{"authorName":"Sebastian Markbåge","revision":"39a7730b1311fb78642c36686820d8d1c79e58e4","shortRevision":"39a7730b13","authorEmail":"sebastian@calyptus.eu","authoredAt":"2024-10-19T20:45:20-04:00","subject":"Rename SSRManifest to ServerConsumerManifest (#31299)"},"patch":"diff --git a\/fixtures\/flight\/server\/global.js b\/fixtures\/flight\/server\/global.js\nindex 8133bf7912..a2fa737ae0 100644\n--- a\/fixtures\/flight\/server\/global.js\n+++ b\/fixtures\/flight\/server\/global.js\n@@ -130,7 +130,7 @@ async function renderApp(req, res, next) {\n buildPath = path.join(__dirname, '..\/build\/');\n }\n \/\/ Read the module map from the virtual file system.\n- const ssrManifest = JSON.parse(\n+ const serverConsumerManifest = JSON.parse(\n await virtualFs.readFile(\n path.join(buildPath, 'react-ssr-manifest.json'),\n 'utf8'\n@@ -160,14 +160,20 @@ async function renderApp(req, res, next) {\n rscResponse.pipe(rscResponse1);\n rscResponse.pipe(rscResponse2);\n \n- const {formState} = await createFromNodeStream(rscResponse1, ssrManifest);\n+ const {formState} = await createFromNodeStream(\n+ rscResponse1,\n+ serverConsumerManifest\n+ );\n rscResponse1.end();\n \n let cachedResult;\n let Root = () => {\n if (!cachedResult) {\n \/\/ Read this stream inside the render.\n- cachedResult = createFromNodeStream(rscResponse2, ssrManifest);\n+ cachedResult = createFromNodeStream(\n+ rscResponse2,\n+ serverConsumerManifest\n+ );\n }\n return React.use(cachedResult).root;\n };\ndiff --git a\/packages\/react-client\/src\/ReactFlightClient.js b\/packages\/react-client\/src\/ReactFlightClient.js\nindex 2a6165c932..bc8704d8d1 100644\n--- a\/packages\/react-client\/src\/ReactFlightClient.js\n+++ b\/packages\/react-client\/src\/ReactFlightClient.js\n@@ -20,7 +20,7 @@ import type {LazyComponent} from 'react\/src\/ReactLazy';\n import type {\n ClientReference,\n ClientReferenceMetadata,\n- SSRModuleMap,\n+ ServerConsumerModuleMap,\n StringDecoder,\n ModuleLoading,\n } from '.\/ReactFlightClientConfig';\n@@ -269,7 +269,7 @@ export type FindSourceMapURLCallback = (\n ) => null | string;\n \n export type Response = {\n- _bundlerConfig: SSRModuleMap,\n+ _bundlerConfig: ServerConsumerModuleMap,\n _moduleLoading: ModuleLoading,\n _callServer: CallServerCallback,\n _encodeFormAction: void | EncodeFormActionCallback,\n@@ -1420,7 +1420,7 @@ function missingCall() {\n \n function ResponseInstance(\n this: $FlowFixMe,\n- bundlerConfig: SSRModuleMap,\n+ bundlerConfig: ServerConsumerModuleMap,\n moduleLoading: ModuleLoading,\n callServer: void | CallServerCallback,\n encodeFormAction: void | EncodeFormActionCallback,\n@@ -1485,7 +1485,7 @@ function ResponseInstance(\n }\n \n export function createResponse(\n- bundlerConfig: SSRModuleMap,\n+ bundlerConfig: ServerConsumerModuleMap,\n moduleLoading: ModuleLoading,\n callServer: void | CallServerCallback,\n encodeFormAction: void | EncodeFormActionCallback,\ndiff --git a\/packages\/react-client\/src\/forks\/ReactFlightClientConfig.custom.js b\/packages\/react-client\/src\/forks\/ReactFlightClientConfig.custom.js\nindex 530d548a59..2f204fd51b 100644\n--- a\/packages\/react-client\/src\/forks\/ReactFlightClientConfig.custom.js\n+++ b\/packages\/react-client\/src\/forks\/ReactFlightClientConfig.custom.js\n@@ -26,7 +26,7 @@\n declare const $$$config: any;\n \n export opaque type ModuleLoading = mixed;\n-export opaque type SSRModuleMap = mixed;\n+export opaque type ServerConsumerModuleMap = mixed;\n export opaque type ServerManifest = mixed;\n export opaque type ServerReferenceId = string;\n export opaque type ClientReferenceMetadata = mixed;\ndiff --git a\/packages\/react-client\/src\/forks\/ReactFlightClientConfig.dom-bun.js b\/packages\/react-client\/src\/forks\/ReactFlightClientConfig.dom-bun.js\nindex 7b75983cdd..75c942966b 100644\n--- a\/packages\/react-client\/src\/forks\/ReactFlightClientConfig.dom-bun.js\n+++ b\/packages\/react-client\/src\/forks\/ReactFlightClientConfig.dom-bun.js\n@@ -15,7 +15,7 @@ export * from 'react-client\/src\/ReactClientConsoleConfigPlain';\n export * from 'react-dom-bindings\/src\/shared\/ReactFlightClientConfigDOM';\n \n export opaque type ModuleLoading = mixed;\n-export opaque type SSRModuleMap = mixed;\n+export opaque type ServerConsumerModuleMap = mixed;\n export opaque type ServerManifest = mixed;\n export opaque type ServerReferenceId = string;\n export opaque type ClientReferenceMetadata = mixed;\ndiff --git a\/packages\/react-client\/src\/forks\/ReactFlightClientConfig.dom-legacy.js b\/packages\/react-client\/src\/forks\/ReactFlightClientConfig.dom-legacy.js\nindex 05e937abdf..5be648ff0a 100644\n--- a\/packages\/react-client\/src\/forks\/ReactFlightClientConfig.dom-legacy.js\n+++ b\/packages\/react-client\/src\/forks\/ReactFlightClientConfig.dom-legacy.js\n@@ -15,7 +15,7 @@ export * from 'react-client\/src\/ReactClientConsoleConfigBrowser';\n \n export type Response = any;\n export opaque type ModuleLoading = mixed;\n-export opaque type SSRModuleMap = mixed;\n+export opaque type ServerConsumerModuleMap = mixed;\n export opaque type ServerManifest = mixed;\n export opaque type ServerReferenceId = string;\n export opaque type ClientReferenceMetadata = mixed;\ndiff --git a\/packages\/react-client\/src\/forks\/ReactFlightClientConfig.markup.js b\/packages\/react-client\/src\/forks\/ReactFlightClientConfig.markup.js\nindex ba86f7631f..b0b2f198fd 100644\n--- a\/packages\/react-client\/src\/forks\/ReactFlightClientConfig.markup.js\n+++ b\/packages\/react-client\/src\/forks\/ReactFlightClientConfig.markup.js\n@@ -16,7 +16,7 @@ export * from 'react-markup\/src\/ReactMarkupLegacyClientStreamConfig.js';\n export * from 'react-client\/src\/ReactClientConsoleConfigPlain';\n \n export type ModuleLoading = null;\n-export type SSRModuleMap = null;\n+export type ServerConsumerModuleMap = null;\n export opaque type ServerManifest = null;\n export opaque type ServerReferenceId = string;\n export opaque type ClientReferenceMetadata = null;\n@@ -33,7 +33,7 @@ export function prepareDestinationForModule(\n }\n \n export function resolveClientReference(\n- bundlerConfig: SSRModuleMap,\n+ bundlerConfig: ServerConsumerModuleMap,\n metadata: ClientReferenceMetadata,\n ): ClientReference {\n throw new Error(\ndiff --git a\/packages\/react-server-dom-esm\/src\/client\/ReactFlightClientConfigBundlerESM.js b\/packages\/react-server-dom-esm\/src\/client\/ReactFlightClientConfigBundlerESM.js\nindex 5db99dc8ff..6a74e63854 100644\n--- a\/packages\/react-server-dom-esm\/src\/client\/ReactFlightClientConfigBundlerESM.js\n+++ b\/packages\/react-server-dom-esm\/src\/client\/ReactFlightClientConfigBundlerESM.js\n@@ -14,7 +14,7 @@ import type {\n } from 'shared\/ReactTypes';\n import type {ModuleLoading} from 'react-client\/src\/ReactFlightClientConfig';\n \n-export type SSRModuleMap = string; \/\/ Module root path\n+export type ServerConsumerModuleMap = string; \/\/ Module root path\n \n export type ServerManifest = string; \/\/ Module root path\n \n@@ -48,7 +48,7 @@ export function prepareDestinationForModule(\n }\n \n export function resolveClientReference(\n- bundlerConfig: SSRModuleMap,\n+ bundlerConfig: ServerConsumerModuleMap,\n metadata: ClientReferenceMetadata,\n ): ClientReference {\n const baseURL = bundlerConfig;\ndiff --git a\/packages\/react-server-dom-turbopack\/src\/__tests__\/ReactFlightTurbopackDOMEdge-test.js b\/packages\/react-server-dom-turbopack\/src\/__tests__\/ReactFlightTurbopackDOMEdge-test.js\nindex 767e1f1ed0..5e4fd2cdd5 100644\n--- a\/packages\/react-server-dom-turbopack\/src\/__tests__\/ReactFlightTurbopackDOMEdge-test.js\n+++ b\/packages\/react-server-dom-turbopack\/src\/__tests__\/ReactFlightTurbopackDOMEdge-test.js\n@@ -97,7 +97,7 @@ describe('ReactFlightTurbopackDOMEdge', () => {\n turbopackMap,\n );\n const response = ReactServerDOMClient.createFromReadableStream(stream, {\n- ssrManifest: {\n+ serverManifest: {\n moduleMap: translationMap,\n moduleLoading: null,\n },\ndiff --git a\/packages\/react-server-dom-turbopack\/src\/client\/ReactFlightClientConfigBundlerNode.js b\/packages\/react-server-dom-turbopack\/src\/client\/ReactFlightClientConfigBundlerNode.js\nindex 36832c47e3..22321d41d0 100644\n--- a\/packages\/react-server-dom-turbopack\/src\/client\/ReactFlightClientConfigBundlerNode.js\n+++ b\/packages\/react-server-dom-turbopack\/src\/client\/ReactFlightClientConfigBundlerNode.js\n@@ -24,7 +24,7 @@ import {\n } from '..\/shared\/ReactFlightImportMetadata';\n import {prepareDestinationWithChunks} from 'react-client\/src\/ReactFlightClientConfig';\n \n-export type SSRModuleMap = {\n+export type ServerConsumerModuleMap = {\n [clientId: string]: {\n [clientExportName: string]: ClientReference,\n },\n@@ -58,7 +58,7 @@ export function prepareDestinationForModule(\n }\n \n export function resolveClientReference(\n- bundlerConfig: SSRModuleMap,\n+ bundlerConfig: ServerConsumerModuleMap,\n metadata: ClientReferenceMetadata,\n ): ClientReference {\n const moduleExports = bundlerConfig[metadata[ID]];\ndiff --git a\/packages\/react-server-dom-turbopack\/src\/client\/ReactFlightClientConfigBundlerTurbopack.js b\/packages\/react-server-dom-turbopack\/src\/client\/ReactFlightClientConfigBundlerTurbopack.js\nindex 2129702220..4ae4a3e365 100644\n--- a\/packages\/react-server-dom-turbopack\/src\/client\/ReactFlightClientConfigBundlerTurbopack.js\n+++ b\/packages\/react-server-dom-turbopack\/src\/client\/ReactFlightClientConfigBundlerTurbopack.js\n@@ -30,7 +30,7 @@ import {prepareDestinationWithChunks} from 'react-client\/src\/ReactFlightClientCo\n \n import {loadChunk} from 'react-client\/src\/ReactFlightClientConfig';\n \n-export type SSRModuleMap = null | {\n+export type ServerConsumerModuleMap = null | {\n [clientId: string]: {\n [clientExportName: string]: ClientReferenceManifestEntry,\n },\n@@ -63,7 +63,7 @@ export function prepareDestinationForModule(\n }\n \n export function resolveClientReference(\n- bundlerConfig: SSRModuleMap,\n+ bundlerConfig: ServerConsumerModuleMap,\n metadata: ClientReferenceMetadata,\n ): ClientReference {\n if (bundlerConfig) {\ndiff --git a\/packages\/react-server-dom-turbopack\/src\/client\/ReactFlightDOMClientEdge.js b\/packages\/react-server-dom-turbopack\/src\/client\/ReactFlightDOMClientEdge.js\nindex 956e014042..f9ac4e9d25 100644\n--- a\/packages\/react-server-dom-turbopack\/src\/client\/ReactFlightDOMClientEdge.js\n+++ b\/packages\/react-server-dom-turbopack\/src\/client\/ReactFlightDOMClientEdge.js\n@@ -17,12 +17,12 @@ import type {\n import type {ReactServerValue} from 'react-client\/src\/ReactFlightReplyClient';\n \n import type {\n- SSRModuleMap,\n+ ServerConsumerModuleMap,\n ModuleLoading,\n } from 'react-client\/src\/ReactFlightClientConfig';\n \n-type SSRManifest = {\n- moduleMap: SSRModuleMap,\n+type ServerConsumerManifest = {\n+ moduleMap: ServerConsumerModuleMap,\n moduleLoading: ModuleLoading,\n };\n \n@@ -66,7 +66,7 @@ type EncodeFormActionCallback = (\n ) => ReactCustomFormAction;\n \n export type Options = {\n- ssrManifest: SSRManifest,\n+ serverManifest: ServerConsumerManifest,\n nonce?: string,\n encodeFormAction?: EncodeFormActionCallback,\n temporaryReferences?: TemporaryReferenceSet,\n@@ -77,8 +77,8 @@ export type Options = {\n \n function createResponseFromOptions(options: Options) {\n return createResponse(\n- options.ssrManifest.moduleMap,\n- options.ssrManifest.moduleLoading,\n+ options.serverManifest.moduleMap,\n+ options.serverManifest.moduleLoading,\n noServerCall,\n options.encodeFormAction,\n typeof options.nonce === 'string' ? options.nonce : undefined,\ndiff --git a\/packages\/react-server-dom-turbopack\/src\/client\/ReactFlightDOMClientNode.js b\/packages\/react-server-dom-turbopack\/src\/client\/ReactFlightDOMClientNode.js\nindex d46364b781..528df26f11 100644\n--- a\/packages\/react-server-dom-turbopack\/src\/client\/ReactFlightDOMClientNode.js\n+++ b\/packages\/react-server-dom-turbopack\/src\/client\/ReactFlightDOMClientNode.js\n@@ -15,12 +15,12 @@ import type {\n } from 'react-client\/src\/ReactFlightClient';\n \n import type {\n- SSRModuleMap,\n+ ServerConsumerModuleMap,\n ModuleLoading,\n } from 'react-client\/src\/ReactFlightClientConfig';\n \n-type SSRManifest = {\n- moduleMap: SSRModuleMap,\n+type ServerConsumerManifest = {\n+ moduleMap: ServerConsumerModuleMap,\n moduleLoading: ModuleLoading,\n };\n \n@@ -66,12 +66,12 @@ export type Options = {\n \n function createFromNodeStream(\n stream: Readable,\n- ssrManifest: SSRManifest,\n+ serverConsumerManifest: ServerConsumerManifest,\n options?: Options,\n ): Thenable {\n const response: Response = createResponse(\n- ssrManifest.moduleMap,\n- ssrManifest.moduleLoading,\n+ serverConsumerManifest.moduleMap,\n+ serverConsumerManifest.moduleLoading,\n noServerCall,\n options ? options.encodeFormAction : undefined,\n options && typeof options.nonce === 'string' ? options.nonce : undefined,\ndiff --git a\/packages\/react-server-dom-webpack\/src\/ReactFlightWebpackPlugin.js b\/packages\/react-server-dom-webpack\/src\/ReactFlightWebpackPlugin.js\nindex 82b866e419..816b9f2a73 100644\n--- a\/packages\/react-server-dom-webpack\/src\/ReactFlightWebpackPlugin.js\n+++ b\/packages\/react-server-dom-webpack\/src\/ReactFlightWebpackPlugin.js\n@@ -58,7 +58,7 @@ type Options = {\n clientReferences?: ClientReferencePath | $ReadOnlyArray,\n chunkName?: string,\n clientManifestFilename?: string,\n- ssrManifestFilename?: string,\n+ serverConsumerManifestFilename?: string,\n };\n \n const PLUGIN_NAME = 'React Server Plugin';\n@@ -67,7 +67,7 @@ export default class ReactFlightWebpackPlugin {\n clientReferences: $ReadOnlyArray;\n chunkName: string;\n clientManifestFilename: string;\n- ssrManifestFilename: string;\n+ serverConsumerManifestFilename: string;\n \n constructor(options: Options) {\n if (!options || typeof options.isServer !== 'boolean') {\n@@ -105,8 +105,8 @@ export default class ReactFlightWebpackPlugin {\n }\n this.clientManifestFilename =\n options.clientManifestFilename || 'react-client-manifest.json';\n- this.ssrManifestFilename =\n- options.ssrManifestFilename || 'react-ssr-manifest.json';\n+ this.serverConsumerManifestFilename =\n+ options.serverConsumerManifestFilename || 'react-ssr-manifest.json';\n }\n \n apply(compiler: any) {\n@@ -239,18 +239,18 @@ export default class ReactFlightWebpackPlugin {\n const clientManifest: {\n [string]: ImportManifestEntry,\n } = {};\n- type SSRModuleMap = {\n+ type ServerConsumerModuleMap = {\n [string]: {\n [string]: {specifier: string, name: string},\n },\n };\n- const moduleMap: SSRModuleMap = {};\n+ const moduleMap: ServerConsumerModuleMap = {};\n const ssrBundleConfig: {\n moduleLoading: {\n prefix: string,\n crossOrigin: string | null,\n },\n- moduleMap: SSRModuleMap,\n+ moduleMap: ServerConsumerModuleMap,\n } = {\n moduleLoading: {\n prefix: compilation.outputOptions.publicPath || '',\n@@ -374,7 +374,7 @@ export default class ReactFlightWebpackPlugin {\n );\n const ssrOutput = JSON.stringify(ssrBundleConfig, null, 2);\n compilation.emitAsset(\n- _this.ssrManifestFilename,\n+ _this.serverConsumerManifestFilename,\n new sources.RawSource(ssrOutput, false),\n );\n },\ndiff --git a\/packages\/react-server-dom-webpack\/src\/__tests__\/ReactFlightDOMEdge-test.js b\/packages\/react-server-dom-webpack\/src\/__tests__\/ReactFlightDOMEdge-test.js\nindex 27dbcc067e..41cffe84d2 100644\n--- a\/packages\/react-server-dom-webpack\/src\/__tests__\/ReactFlightDOMEdge-test.js\n+++ b\/packages\/react-server-dom-webpack\/src\/__tests__\/ReactFlightDOMEdge-test.js\n@@ -195,7 +195,7 @@ describe('ReactFlightDOMEdge', () => {\n ReactServerDOMServer.renderToReadableStream(, webpackMap),\n );\n const response = ReactServerDOMClient.createFromReadableStream(stream, {\n- ssrManifest: {\n+ serverConsumerManifest: {\n moduleMap: translationMap,\n moduleLoading: webpackModuleLoading,\n },\n@@ -235,7 +235,7 @@ describe('ReactFlightDOMEdge', () => {\n const result = await ReactServerDOMClient.createFromReadableStream(\n stream2,\n {\n- ssrManifest: {\n+ serverConsumerManifest: {\n moduleMap: null,\n moduleLoading: null,\n },\n@@ -263,7 +263,7 @@ describe('ReactFlightDOMEdge', () => {\n const result = await ReactServerDOMClient.createFromReadableStream(\n stream2,\n {\n- ssrManifest: {\n+ serverConsumerManifest: {\n moduleMap: null,\n moduleLoading: null,\n },\n@@ -333,7 +333,7 @@ describe('ReactFlightDOMEdge', () => {\n expect(timesRendered).toBeLessThan(5);\n \n const model = await ReactServerDOMClient.createFromReadableStream(stream2, {\n- ssrManifest: {\n+ serverConsumerManifest: {\n moduleMap: null,\n moduleLoading: null,\n },\n@@ -405,7 +405,7 @@ describe('ReactFlightDOMEdge', () => {\n \n const model = await serverAct(() =>\n ReactServerDOMClient.createFromReadableStream(stream2, {\n- ssrManifest: {\n+ serverConsumerManifest: {\n moduleMap: null,\n moduleLoading: null,\n },\n@@ -462,7 +462,7 @@ describe('ReactFlightDOMEdge', () => {\n passThrough(ReactServerDOMServer.renderToReadableStream(buffers)),\n );\n const result = await ReactServerDOMClient.createFromReadableStream(stream, {\n- ssrManifest: {\n+ serverConsumerManifest: {\n moduleMap: null,\n moduleLoading: null,\n },\n@@ -482,7 +482,7 @@ describe('ReactFlightDOMEdge', () => {\n passThrough(ReactServerDOMServer.renderToReadableStream(blob)),\n );\n const result = await ReactServerDOMClient.createFromReadableStream(stream, {\n- ssrManifest: {\n+ serverConsumerManifest: {\n moduleMap: null,\n moduleLoading: null,\n },\n@@ -512,7 +512,7 @@ describe('ReactFlightDOMEdge', () => {\n passThrough(ReactServerDOMServer.renderToReadableStream(formData)),\n );\n const result = await ReactServerDOMClient.createFromReadableStream(stream, {\n- ssrManifest: {\n+ serverConsumerManifest: {\n moduleMap: null,\n moduleLoading: null,\n },\n@@ -547,7 +547,7 @@ describe('ReactFlightDOMEdge', () => {\n const resultPromise = ReactServerDOMClient.createFromReadableStream(\n stream,\n {\n- ssrManifest: {\n+ serverConsumerManifest: {\n moduleMap: null,\n moduleLoading: null,\n },\n@@ -587,7 +587,7 @@ describe('ReactFlightDOMEdge', () => {\n \n const result = await serverAct(() =>\n ReactServerDOMClient.createFromReadableStream(stream, {\n- ssrManifest: {\n+ serverConsumerManifest: {\n moduleMap: null,\n moduleLoading: null,\n },\n@@ -635,7 +635,7 @@ describe('ReactFlightDOMEdge', () => {\n \/\/ Parsing the root blocks because the module hasn't loaded yet\n const result = await serverAct(() =>\n ReactServerDOMClient.createFromReadableStream(stream, {\n- ssrManifest: {\n+ serverConsumerManifest: {\n moduleMap: null,\n moduleLoading: null,\n },\n@@ -689,7 +689,7 @@ describe('ReactFlightDOMEdge', () => {\n const result = await ReactServerDOMClient.createFromReadableStream(\n stream2,\n {\n- ssrManifest: {\n+ serverConsumerManifest: {\n moduleMap: null,\n moduleLoading: null,\n },\n@@ -777,7 +777,7 @@ describe('ReactFlightDOMEdge', () => {\n const result = await ReactServerDOMClient.createFromReadableStream(\n stream1,\n {\n- ssrManifest: {\n+ serverConsumerManifest: {\n moduleMap: null,\n moduleLoading: null,\n },\n@@ -836,7 +836,7 @@ describe('ReactFlightDOMEdge', () => {\n const result = await ReactServerDOMClient.createFromReadableStream(\n stream1,\n {\n- ssrManifest: {\n+ serverConsumerManifest: {\n moduleMap: null,\n moduleLoading: null,\n },\n@@ -891,7 +891,7 @@ describe('ReactFlightDOMEdge', () => {\n \n const rootModel = await serverAct(() =>\n ReactServerDOMClient.createFromReadableStream(stream, {\n- ssrManifest: {\n+ serverConsumerManifest: {\n moduleMap: null,\n moduleLoading: null,\n },\n@@ -995,7 +995,7 @@ describe('ReactFlightDOMEdge', () => {\n \n const rootModel = await serverAct(() =>\n ReactServerDOMClient.createFromReadableStream(stream, {\n- ssrManifest: {\n+ serverConsumerManifest: {\n moduleMap: null,\n moduleLoading: null,\n },\n@@ -1079,7 +1079,7 @@ describe('ReactFlightDOMEdge', () => {\n }\n \n const response = ReactServerDOMClient.createFromReadableStream(prelude, {\n- ssrManifest: {\n+ serverConsumerManifest: {\n moduleMap: null,\n moduleLoading: null,\n },\n@@ -1146,7 +1146,7 @@ describe('ReactFlightDOMEdge', () => {\n }\n \n const response = ReactServerDOMClient.createFromReadableStream(prelude, {\n- ssrManifest: {\n+ serverConsumerManifest: {\n moduleMap: null,\n moduleLoading: null,\n },\ndiff --git a\/packages\/react-server-dom-webpack\/src\/__tests__\/ReactFlightDOMForm-test.js b\/packages\/react-server-dom-webpack\/src\/__tests__\/ReactFlightDOMForm-test.js\nindex b2d13c7580..b33e2a38ed 100644\n--- a\/packages\/react-server-dom-webpack\/src\/__tests__\/ReactFlightDOMForm-test.js\n+++ b\/packages\/react-server-dom-webpack\/src\/__tests__\/ReactFlightDOMForm-test.js\n@@ -166,7 +166,7 @@ describe('ReactFlightDOMForm', () => {\n }\n const rscStream = ReactServerDOMServer.renderToReadableStream();\n const response = ReactServerDOMClient.createFromReadableStream(rscStream, {\n- ssrManifest: {\n+ serverConsumerManifest: {\n moduleMap: null,\n moduleLoading: null,\n },\n@@ -232,7 +232,7 @@ describe('ReactFlightDOMForm', () => {\n }\n const rscStream = ReactServerDOMServer.renderToReadableStream();\n const response = ReactServerDOMClient.createFromReadableStream(rscStream, {\n- ssrManifest: {\n+ serverConsumerManifest: {\n moduleMap: null,\n moduleLoading: null,\n },\n@@ -272,7 +272,7 @@ describe('ReactFlightDOMForm', () => {\n }\n const rscStream = ReactServerDOMServer.renderToReadableStream();\n const response = ReactServerDOMClient.createFromReadableStream(rscStream, {\n- ssrManifest: {\n+ serverConsumerManifest: {\n moduleMap: null,\n moduleLoading: null,\n },\n@@ -343,7 +343,7 @@ describe('ReactFlightDOMForm', () => {\n webpackMap,\n );\n const response = ReactServerDOMClient.createFromReadableStream(rscStream, {\n- ssrManifest: {\n+ serverConsumerManifest: {\n moduleMap: null,\n moduleLoading: null,\n },\n@@ -391,7 +391,7 @@ describe('ReactFlightDOMForm', () => {\n webpackMap,\n );\n const response = ReactServerDOMClient.createFromReadableStream(rscStream, {\n- ssrManifest: {\n+ serverConsumerManifest: {\n moduleMap: null,\n moduleLoading: null,\n },\n@@ -444,7 +444,7 @@ describe('ReactFlightDOMForm', () => {\n webpackMap,\n );\n const response = ReactServerDOMClient.createFromReadableStream(rscStream, {\n- ssrManifest: {\n+ serverConsumerManifest: {\n moduleMap: null,\n moduleLoading: null,\n },\n@@ -469,7 +469,7 @@ describe('ReactFlightDOMForm', () => {\n const postbackResponse = ReactServerDOMClient.createFromReadableStream(\n postbackRscStream,\n {\n- ssrManifest: {\n+ serverConsumerManifest: {\n moduleMap: null,\n moduleLoading: null,\n },\n@@ -539,7 +539,7 @@ describe('ReactFlightDOMForm', () => {\n const response = ReactServerDOMClient.createFromReadableStream(\n rscStream,\n {\n- ssrManifest: {\n+ serverConsumerManifest: {\n moduleMap: null,\n moduleLoading: null,\n },\n@@ -569,7 +569,7 @@ describe('ReactFlightDOMForm', () => {\n const postbackResponse = ReactServerDOMClient.createFromReadableStream(\n postbackRscStream,\n {\n- ssrManifest: {\n+ serverConsumerManifest: {\n moduleMap: null,\n moduleLoading: null,\n },\n@@ -601,7 +601,7 @@ describe('ReactFlightDOMForm', () => {\n const postbackResponse2 = ReactServerDOMClient.createFromReadableStream(\n postbackRscStream2,\n {\n- ssrManifest: {\n+ serverConsumerManifest: {\n moduleMap: null,\n moduleLoading: null,\n },\n@@ -660,7 +660,7 @@ describe('ReactFlightDOMForm', () => {\n webpackMap,\n );\n const response = ReactServerDOMClient.createFromReadableStream(rscStream, {\n- ssrManifest: {\n+ serverConsumerManifest: {\n moduleMap: null,\n moduleLoading: null,\n },\n@@ -687,7 +687,7 @@ describe('ReactFlightDOMForm', () => {\n const postbackResponse = ReactServerDOMClient.createFromReadableStream(\n postbackRscStream,\n {\n- ssrManifest: {\n+ serverConsumerManifest: {\n moduleMap: null,\n moduleLoading: null,\n },\n@@ -738,7 +738,7 @@ describe('ReactFlightDOMForm', () => {\n webpackMap,\n );\n const response = ReactServerDOMClient.createFromReadableStream(rscStream, {\n- ssrManifest: {\n+ serverConsumerManifest: {\n moduleMap: null,\n moduleLoading: null,\n },\n@@ -766,7 +766,7 @@ describe('ReactFlightDOMForm', () => {\n const postbackResponse = ReactServerDOMClient.createFromReadableStream(\n postbackRscStream,\n {\n- ssrManifest: {\n+ serverConsumerManifest: {\n moduleMap: null,\n moduleLoading: null,\n },\n@@ -794,7 +794,7 @@ describe('ReactFlightDOMForm', () => {\n const postbackResponse2 = ReactServerDOMClient.createFromReadableStream(\n postbackRscStream2,\n {\n- ssrManifest: {\n+ serverConsumerManifest: {\n moduleMap: null,\n moduleLoading: null,\n },\n@@ -838,7 +838,7 @@ describe('ReactFlightDOMForm', () => {\n webpackMap,\n );\n const response = ReactServerDOMClient.createFromReadableStream(rscStream, {\n- ssrManifest: {\n+ serverConsumerManifest: {\n moduleMap: null,\n moduleLoading: null,\n },\n@@ -891,7 +891,7 @@ describe('ReactFlightDOMForm', () => {\n webpackMap,\n );\n const response = ReactServerDOMClient.createFromReadableStream(rscStream, {\n- ssrManifest: {\n+ serverConsumerManifest: {\n moduleMap: null,\n moduleLoading: null,\n },\n@@ -928,7 +928,7 @@ describe('ReactFlightDOMForm', () => {\n webpackMap,\n );\n const response = ReactServerDOMClient.createFromReadableStream(rscStream, {\n- ssrManifest: {\n+ serverConsumerManifest: {\n moduleMap: null,\n moduleLoading: null,\n },\n@@ -954,7 +954,7 @@ describe('ReactFlightDOMForm', () => {\n const postbackResponse = ReactServerDOMClient.createFromReadableStream(\n postbackRscStream,\n {\n- ssrManifest: {\n+ serverConsumerManifest: {\n moduleMap: null,\n moduleLoading: null,\n },\n@@ -1007,7 +1007,7 @@ describe('ReactFlightDOMForm', () => {\n webpackMap,\n );\n const response = ReactServerDOMClient.createFromReadableStream(rscStream, {\n- ssrManifest: {\n+ serverConsumerManifest: {\n moduleMap: null,\n moduleLoading: null,\n },\n@@ -1032,7 +1032,7 @@ describe('ReactFlightDOMForm', () => {\n );\n const postbackResponse =\n await ReactServerDOMClient.createFromReadableStream(postbackRscStream, {\n- ssrManifest: {\n+ serverConsumerManifest: {\n moduleMap: null,\n moduleLoading: null,\n },\ndiff --git a\/packages\/react-server-dom-webpack\/src\/__tests__\/ReactFlightDOMNode-test.js b\/packages\/react-server-dom-webpack\/src\/__tests__\/ReactFlightDOMNode-test.js\nindex f2dca4a45c..6593044005 100644\n--- a\/packages\/react-server-dom-webpack\/src\/__tests__\/ReactFlightDOMNode-test.js\n+++ b\/packages\/react-server-dom-webpack\/src\/__tests__\/ReactFlightDOMNode-test.js\n@@ -130,7 +130,7 @@ describe('ReactFlightDOMNode', () => {\n '*': ssrMetadata,\n },\n };\n- const ssrManifest = {\n+ const serverConsumerManifest = {\n moduleMap: translationMap,\n moduleLoading: webpackModuleLoading,\n };\n@@ -151,7 +151,7 @@ describe('ReactFlightDOMNode', () => {\n if (response) return use(response);\n response = ReactServerDOMClient.createFromNodeStream(\n readable,\n- ssrManifest,\n+ serverConsumerManifest,\n );\n return use(response);\n }\n@@ -255,7 +255,7 @@ describe('ReactFlightDOMNode', () => {\n '*': ssrMetadata,\n },\n };\n- const ssrManifest = {\n+ const serverConsumerManifest = {\n moduleMap: translationMap,\n moduleLoading: webpackModuleLoading,\n };\n@@ -276,7 +276,7 @@ describe('ReactFlightDOMNode', () => {\n if (response) return use(response);\n response = ReactServerDOMClient.createFromNodeStream(\n readable,\n- ssrManifest,\n+ serverConsumerManifest,\n {\n nonce: 'r4nd0m',\n },\n@@ -426,7 +426,7 @@ describe('ReactFlightDOMNode', () => {\n }\n \n const response = ReactServerDOMClient.createFromNodeStream(prelude, {\n- ssrManifest: {\n+ serverConsumerManifest: {\n moduleMap: null,\n moduleLoading: null,\n },\n@@ -492,7 +492,7 @@ describe('ReactFlightDOMNode', () => {\n }\n \n const response = ReactServerDOMClient.createFromNodeStream(prelude, {\n- ssrManifest: {\n+ serverConsumerManifest: {\n moduleMap: null,\n moduleLoading: null,\n },\ndiff --git a\/packages\/react-server-dom-webpack\/src\/client\/ReactFlightClientConfigBundlerNode.js b\/packages\/react-server-dom-webpack\/src\/client\/ReactFlightClientConfigBundlerNode.js\nindex 36832c47e3..22321d41d0 100644\n--- a\/packages\/react-server-dom-webpack\/src\/client\/ReactFlightClientConfigBundlerNode.js\n+++ b\/packages\/react-server-dom-webpack\/src\/client\/ReactFlightClientConfigBundlerNode.js\n@@ -24,7 +24,7 @@ import {\n } from '..\/shared\/ReactFlightImportMetadata';\n import {prepareDestinationWithChunks} from 'react-client\/src\/ReactFlightClientConfig';\n \n-export type SSRModuleMap = {\n+export type ServerConsumerModuleMap = {\n [clientId: string]: {\n [clientExportName: string]: ClientReference,\n },\n@@ -58,7 +58,7 @@ export function prepareDestinationForModule(\n }\n \n export function resolveClientReference(\n- bundlerConfig: SSRModuleMap,\n+ bundlerConfig: ServerConsumerModuleMap,\n metadata: ClientReferenceMetadata,\n ): ClientReference {\n const moduleExports = bundlerConfig[metadata[ID]];\ndiff --git a\/packages\/react-server-dom-webpack\/src\/client\/ReactFlightClientConfigBundlerWebpack.js b\/packages\/react-server-dom-webpack\/src\/client\/ReactFlightClientConfigBundlerWebpack.js\nindex de3afd6c4e..521b19e5a7 100644\n--- a\/packages\/react-server-dom-webpack\/src\/client\/ReactFlightClientConfigBundlerWebpack.js\n+++ b\/packages\/react-server-dom-webpack\/src\/client\/ReactFlightClientConfigBundlerWebpack.js\n@@ -30,7 +30,7 @@ import {prepareDestinationWithChunks} from 'react-client\/src\/ReactFlightClientCo\n \n import {loadChunk} from 'react-client\/src\/ReactFlightClientConfig';\n \n-export type SSRModuleMap = null | {\n+export type ServerConsumerModuleMap = null | {\n [clientId: string]: {\n [clientExportName: string]: ClientReferenceManifestEntry,\n },\n@@ -63,7 +63,7 @@ export function prepareDestinationForModule(\n }\n \n export function resolveClientReference(\n- bundlerConfig: SSRModuleMap,\n+ bundlerConfig: ServerConsumerModuleMap,\n metadata: ClientReferenceMetadata,\n ): ClientReference {\n if (bundlerConfig) {\ndiff --git a\/packages\/react-server-dom-webpack\/src\/client\/ReactFlightDOMClientEdge.js b\/packages\/react-server-dom-webpack\/src\/client\/ReactFlightDOMClientEdge.js\nindex 956e014042..23bd02af42 100644\n--- a\/packages\/react-server-dom-webpack\/src\/client\/ReactFlightDOMClientEdge.js\n+++ b\/packages\/react-server-dom-webpack\/src\/client\/ReactFlightDOMClientEdge.js\n@@ -17,12 +17,12 @@ import type {\n import type {ReactServerValue} from 'react-client\/src\/ReactFlightReplyClient';\n \n import type {\n- SSRModuleMap,\n+ ServerConsumerModuleMap,\n ModuleLoading,\n } from 'react-client\/src\/ReactFlightClientConfig';\n \n-type SSRManifest = {\n- moduleMap: SSRModuleMap,\n+type ServerConsumerManifest = {\n+ moduleMap: ServerConsumerModuleMap,\n moduleLoading: ModuleLoading,\n };\n \n@@ -66,7 +66,7 @@ type EncodeFormActionCallback = (\n ) => ReactCustomFormAction;\n \n export type Options = {\n- ssrManifest: SSRManifest,\n+ serverConsumerManifest: ServerConsumerManifest,\n nonce?: string,\n encodeFormAction?: EncodeFormActionCallback,\n temporaryReferences?: TemporaryReferenceSet,\n@@ -77,8 +77,8 @@ export type Options = {\n \n function createResponseFromOptions(options: Options) {\n return createResponse(\n- options.ssrManifest.moduleMap,\n- options.ssrManifest.moduleLoading,\n+ options.serverConsumerManifest.moduleMap,\n+ options.serverConsumerManifest.moduleLoading,\n noServerCall,\n options.encodeFormAction,\n typeof options.nonce === 'string' ? options.nonce : undefined,\ndiff --git a\/packages\/react-server-dom-webpack\/src\/client\/ReactFlightDOMClientNode.js b\/packages\/react-server-dom-webpack\/src\/client\/ReactFlightDOMClientNode.js\nindex 25e94b2f8f..eab37b3bce 100644\n--- a\/packages\/react-server-dom-webpack\/src\/client\/ReactFlightDOMClientNode.js\n+++ b\/packages\/react-server-dom-webpack\/src\/client\/ReactFlightDOMClientNode.js\n@@ -15,12 +15,12 @@ import type {\n } from 'react-client\/src\/ReactFlightClient';\n \n import type {\n- SSRModuleMap,\n+ ServerConsumerModuleMap,\n ModuleLoading,\n } from 'react-client\/src\/ReactFlightClientConfig';\n \n-type SSRManifest = {\n- moduleMap: SSRModuleMap,\n+type ServerConsumerManifest = {\n+ moduleMap: ServerConsumerModuleMap,\n moduleLoading: ModuleLoading,\n };\n \n@@ -67,12 +67,12 @@ export type Options = {\n \n function createFromNodeStream(\n stream: Readable,\n- ssrManifest: SSRManifest,\n+ serverConsumerManifest: ServerConsumerManifest,\n options?: Options,\n ): Thenable {\n const response: Response = createResponse(\n- ssrManifest.moduleMap,\n- ssrManifest.moduleLoading,\n+ serverConsumerManifest.moduleMap,\n+ serverConsumerManifest.moduleLoading,\n noServerCall,\n options ? options.encodeFormAction : undefined,\n options && typeof options.nonce === 'string' ? options.nonce : undefined,\n"}

dillon1000/react

Files changed