Skip to content

Commit 207fe72

Browse files
linting
1 parent 048c357 commit 207fe72

7 files changed

+12
-18
lines changed

node_package/src/RSCClientRoot.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import * as ReactDOMClient from 'react-dom/client';
77
import { createFromReadableStream } from 'react-on-rails-rsc/client';
88
import { fetch } from './utils';
99
import transformRSCStreamAndReplayConsoleLogs from './transformRSCStreamAndReplayConsoleLogs';
10-
import { RailsContext, RenderFunction } from './types';
10+
import { RailsContext, RenderFunction, RenderResult } from './types';
1111

1212
const { use } = React;
1313

@@ -44,14 +44,14 @@ const fetchRSC = ({ componentName, rscPayloadGenerationUrlPath, componentProps }
4444
};
4545

4646
const createRSCStreamFromPage = () => {
47-
let streamController: ReadableStreamController<unknown> | undefined;
48-
const stream = new ReadableStream({
47+
let streamController: ReadableStreamController<RenderResult> | undefined;
48+
const stream = new ReadableStream<RenderResult>({
4949
start(controller) {
5050
if (typeof window === 'undefined') {
5151
return;
5252
}
5353
const handleChunk = (chunk: unknown) => {
54-
controller.enqueue(chunk);
54+
controller.enqueue(chunk as RenderResult);
5555
};
5656
if (!window.__FLIGHT_DATA) {
5757
window.__FLIGHT_DATA = [];

node_package/src/RSCPayloadContainer.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ export default function RSCPayloadContainerWrapper({ RSCPayloadStream }: RSCPayl
5050
const [chunkPromises] = React.useState<Promise<StreamChunk>[]>(() => {
5151
const promises: Promise<StreamChunk>[] = [];
5252
let resolveCurrentPromise: (streamChunk: StreamChunk) => void = () => {};
53-
let rejectCurrentPromise: (error: Error) => void = () => {};
53+
let rejectCurrentPromise: (error: unknown) => void = () => {};
5454
const decoder = new TextDecoder();
5555

5656
const createNewPromise = () => {
@@ -64,7 +64,7 @@ export default function RSCPayloadContainerWrapper({ RSCPayloadStream }: RSCPayl
6464

6565
createNewPromise();
6666
RSCPayloadStream.on('data', (streamChunk) => {
67-
resolveCurrentPromise({ chunk: decoder.decode(streamChunk), isLastChunk: false });
67+
resolveCurrentPromise({ chunk: decoder.decode(streamChunk as Uint8Array), isLastChunk: false });
6868
createNewPromise();
6969
});
7070

node_package/src/RSCServerRoot.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import * as React from 'react';
22
import { createFromNodeStream } from 'react-on-rails-rsc/client.node';
3+
import { PassThrough } from 'stream';
34
import type { RenderFunction, RailsContext } from './types';
45
import transformRSCStream from './transformRSCNodeStreamAndReplayConsoleLogs';
56
import loadJsonFile from './loadJsonFile';
67
import RSCPayloadContainer from './RSCPayloadContainer';
7-
import { PassThrough } from 'stream';
88

99
declare global {
1010
function generateRSCPayload(

node_package/src/ReactOnRails.client.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ ctx.ReactOnRails = {
195195
},
196196

197197
resetOptions(): void {
198-
this.options = Object.assign({}, DEFAULT_OPTIONS);
198+
this.options = { ...DEFAULT_OPTIONS };
199199
},
200200

201201
isRSCBundle: false,

node_package/src/loadJsonFile.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export default async function loadJsonFile(fileName: string) {
1515
}
1616

1717
try {
18-
const file = JSON.parse(await fs.readFile(filePath, 'utf8'));
18+
const file = JSON.parse(await fs.readFile(filePath, 'utf8')) as LoadedJsonFile;
1919
loadedJsonFiles.set(filePath, file);
2020
return file;
2121
} catch (error) {

node_package/src/registerServerComponent/server.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ const registerServerComponent = (components: Record<string, ReactComponent>) =>
3131
railsContext?: RailsContext,
3232
) => RSCServerRoot({ componentName, componentProps }, railsContext);
3333
}
34-
return ReactOnRails.register(componentsWrappedInRSCServerRoot);
34+
ReactOnRails.register(componentsWrappedInRSCServerRoot);
3535
};
3636

3737
export default registerServerComponent;

node_package/src/transformRSCNodeStreamAndReplayConsoleLogs.ts

+2-8
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export default function transformRSCStream(stream: NodeJS.ReadableStream): NodeJ
77
const htmlExtractor = new Transform({
88
transform(oneOrMoreChunks, _, callback) {
99
try {
10-
const decodedChunk = lastIncompleteChunk + decoder.decode(oneOrMoreChunks);
10+
const decodedChunk = lastIncompleteChunk + decoder.decode(oneOrMoreChunks as Uint8Array);
1111
const separateChunks = decodedChunk.split('\n').filter((chunk) => chunk.trim() !== '');
1212

1313
if (!decodedChunk.endsWith('\n')) {
@@ -27,11 +27,5 @@ export default function transformRSCStream(stream: NodeJS.ReadableStream): NodeJ
2727
},
2828
});
2929

30-
try {
31-
return stream.pipe(htmlExtractor);
32-
} catch (error) {
33-
throw new Error(
34-
`Error transforming RSC stream (${stream.constructor.name}), (stream: ${stream}), stringified stream: ${JSON.stringify(stream)}, error: ${error}`,
35-
);
36-
}
30+
return stream.pipe(htmlExtractor);
3731
}

0 commit comments

Comments
 (0)