Skip to content

Commit 5404176

Browse files
committed
Fix buildConsoleReplay call sites after parameter reordering
Update serverRenderReactComponent and streamingUtils to use the new buildConsoleReplay signature where numberOfMessagesToSkip is the first parameter. - Change from consoleReplay(consoleHistory) to buildConsoleReplay(0, consoleHistory) - Change from consoleReplay() to buildConsoleReplay() - Fix Pro package streaming to use correct parameter order
1 parent e0afc7e commit 5404176

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

packages/react-on-rails-pro/src/streamingUtils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ export const transformRenderStreamChunksToResultObject = (renderState: StreamRen
112112
const transformStream = new PassThrough({
113113
transform(chunk: Buffer, _, callback) {
114114
const htmlChunk = chunk.toString();
115-
const consoleReplayScript = buildConsoleReplay(consoleHistory, previouslyReplayedConsoleMessages);
115+
const consoleReplayScript = buildConsoleReplay(previouslyReplayedConsoleMessages, consoleHistory);
116116
previouslyReplayedConsoleMessages = consoleHistory?.length || 0;
117117
const jsonChunk = JSON.stringify(createResultObject(htmlChunk, consoleReplayScript, renderState));
118118
this.push(`${jsonChunk}\n`);

packages/react-on-rails/src/serverRenderReactComponent.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { isValidElement, type ReactElement } from 'react';
33
// ComponentRegistry is accessed via globalThis.ReactOnRails.getComponent for cross-bundle compatibility
44
import createReactOutput from './createReactOutput.ts';
55
import { isPromise, isServerRenderHash } from './isServerRenderResult.ts';
6-
import { consoleReplay } from './buildConsoleReplay.ts';
6+
import buildConsoleReplay from './buildConsoleReplay.ts';
77
import handleError from './handleError.ts';
88
import { renderToString } from './ReactDOMServer.cts';
99
import { createResultObject, convertToError, validateComponent } from './serverRenderUtils.ts';
@@ -109,11 +109,11 @@ async function createPromiseResult(
109109
const consoleHistory = console.history;
110110
try {
111111
const html = await renderState.result;
112-
const consoleReplayScript = consoleReplay(consoleHistory);
112+
const consoleReplayScript = buildConsoleReplay(0, consoleHistory);
113113
return createResultObject(html, consoleReplayScript, renderState);
114114
} catch (e: unknown) {
115115
const errorRenderState = handleRenderingError(e, { componentName, throwJsErrors });
116-
const consoleReplayScript = consoleReplay(consoleHistory);
116+
const consoleReplayScript = buildConsoleReplay(0, consoleHistory);
117117
return createResultObject(errorRenderState.result, consoleReplayScript, errorRenderState);
118118
}
119119
}
@@ -128,7 +128,7 @@ function createFinalResult(
128128
return createPromiseResult({ ...renderState, result }, componentName, throwJsErrors);
129129
}
130130

131-
const consoleReplayScript = consoleReplay();
131+
const consoleReplayScript = buildConsoleReplay();
132132
return JSON.stringify(createResultObject(result, consoleReplayScript, renderState));
133133
}
134134

0 commit comments

Comments
 (0)