Skip to content

Commit 95ecbf1

Browse files
fix some minor issues
1 parent 99d9f13 commit 95ecbf1

File tree

4 files changed

+14
-8
lines changed

4 files changed

+14
-8
lines changed

node_package/src/RSCProvider.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as React from 'react';
2-
import { RailsContextWithServerStreamingCapabilities } from './types/index.ts';
2+
import { RailsContext, RailsContextWithServerStreamingCapabilities } from './types/index.ts';
33
import getReactServerComponent from './getReactServerComponent.client.ts';
44

55
type RSCContextType = {
@@ -34,7 +34,7 @@ export const createRSCProvider = ({
3434
getServerComponent,
3535
createRSCPayloadKey,
3636
}: {
37-
railsContext: RailsContextWithServerStreamingCapabilities;
37+
railsContext: RailsContext;
3838
getServerComponent: typeof getReactServerComponent;
3939
createRSCPayloadKey: (componentName: string, componentProps: unknown) => string;
4040
}) => {

node_package/src/streamServerRenderedReactComponent.ts

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,11 @@ export const streamServerRenderedComponent = <T, P extends RenderParams>(
240240
getRSCPayloadStream: rscRequestTracker.getRSCPayloadStream.bind(rscRequestTracker),
241241
};
242242

243+
const optionsWithStreamingCapabilities = {
244+
...options,
245+
railsContext: railsContextWithStreamingCapabilities,
246+
};
247+
243248
try {
244249
const componentObj = ComponentRegistry.get(componentName);
245250
validateComponent(componentObj, componentName);
@@ -267,10 +272,10 @@ export const streamServerRenderedComponent = <T, P extends RenderParams>(
267272
}
268273
return result;
269274
});
270-
return renderStrategy(promiseAfterRejectingHash, options, streamingTrackers);
275+
return renderStrategy(promiseAfterRejectingHash, optionsWithStreamingCapabilities, streamingTrackers);
271276
}
272277

273-
return renderStrategy(reactRenderingResult, options, streamingTrackers);
278+
return renderStrategy(reactRenderingResult, optionsWithStreamingCapabilities, streamingTrackers);
274279
} catch (e) {
275280
const { readableStream, writeChunk, emitError, endStream } = transformRenderStreamChunksToResultObject({
276281
hasErrors: true,

node_package/src/types/index.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,10 @@ export const assertRailsContextWithServerComponentMetadata: (
8585
if (
8686
!context ||
8787
!('reactClientManifestFileName' in context) ||
88-
!('reactServerClientManifestFileName' in context) ||
89-
!('componentSpecificMetadata' in context)
88+
!('reactServerClientManifestFileName' in context)
9089
) {
9190
throwRailsContextMissingEntries(
92-
'server side RSC payload parameters, reactClientManifestFileName, reactServerClientManifestFileName, and componentSpecificMetadata',
91+
'server side RSC payload parameters, reactClientManifestFileName, and reactServerClientManifestFileName',
9392
);
9493
}
9594
};

node_package/src/wrapServerComponentRenderer/client.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,9 @@ const wrapServerComponentRenderer = (componentOrRenderFunction: ReactComponentOr
5454
throw new Error(`RSCClientRoot: No DOM node found for id: ${domNodeId}`);
5555
}
5656

57-
assertRailsContextWithServerStreamingCapabilities(railsContext);
57+
if (!railsContext) {
58+
throw new Error('RSCClientRoot: No railsContext provided');
59+
}
5860

5961
const RSCProvider = createRSCProvider({
6062
railsContext,

0 commit comments

Comments
 (0)