Skip to content

Commit c50c51b

Browse files
committed
Resolve merge conflicts after rebasing on master
- Fix parameter usage in buildConsoleReplay.ts (use consistent default syntax) - Update serverRenderReactComponent.ts to use buildConsoleReplay default export - Resolve package.json conflicts (use file: references for workspace deps) - All builds pass, lint checks pass
1 parent 7818afc commit c50c51b

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ export function consoleReplay(
5757
export default function buildConsoleReplay(
5858
numberOfMessagesToSkip = 0,
5959
customConsoleHistory: (typeof console)['history'] | undefined = undefined,
60-
nonce?: string,
60+
nonce: string | undefined = undefined,
6161
): string {
6262
const consoleReplayJS = consoleReplay(numberOfMessagesToSkip, customConsoleHistory);
6363
if (consoleReplayJS.length === 0) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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)