tiny changes

shakacode · Oct 20, 2024 · 00d547f · 00d547f
1 parent 2810ada
commit 00d547f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/lib/react_on_rails/server_rendering_pool/ruby_embedded_java_script.rb b/lib/react_on_rails/server_rendering_pool/ruby_embedded_java_script.rb
@@ -237,8 +237,6 @@ def parse_result_and_replay_console_messages(result_string, render_options)
  if render_options.logging_on_server
  console_script = result["consoleReplayScript"]
  console_script_lines = console_script.split("\n")
- # Skip the first two lines (new line and opening <script> tag) and the last line (closing </script> tag)
- console_script_lines = console_script_lines[2..-2]
  # Regular expression to match console.log or console.error calls with SERVER prefix
  re = /console\.(?:log|error)\.apply\(console, \["\[SERVER\] (?<msg>.*)"\]\);/
  console_script_lines&.each do |line|

diff --git a/node_package/src/buildConsoleReplay.ts b/node_package/src/buildConsoleReplay.ts
@@ -9,15 +9,15 @@ declare global {
  }
 }
 
-export function consoleReplay(customConsoleHistory: typeof console['history'] | undefined = undefined, skipFirstNumberOfMessages: number = 0): string {
+export function consoleReplay(customConsoleHistory: typeof console['history'] | undefined = undefined, numberOfMessagesToSkip: number = 0): string {
  // console.history is a global polyfill used in server rendering.
  const consoleHistory = customConsoleHistory ?? console.history;
 
  if (!(Array.isArray(consoleHistory))) {
  return '';
  }
 
- const lines = consoleHistory.slice(skipFirstNumberOfMessages).map(msg => {
+ const lines = consoleHistory.slice(numberOfMessagesToSkip).map(msg => {
  const stringifiedList = msg.arguments.map(arg => {
  let val: string;
  try {
@@ -44,6 +44,6 @@ export function consoleReplay(customConsoleHistory: typeof console['history'] |
  return lines.join('\n');
 }
 
-export default function buildConsoleReplay(customConsoleHistory: typeof console['history'] | undefined = undefined, skipFirstNumberOfMessages: number = 0): string {
- return RenderUtils.wrapInScriptTags('consoleReplayLog', consoleReplay(customConsoleHistory, skipFirstNumberOfMessages));
+export default function buildConsoleReplay(customConsoleHistory: typeof console['history'] | undefined = undefined, numberOfMessagesToSkip: number = 0): string {
+ return RenderUtils.wrapInScriptTags('consoleReplayLog', consoleReplay(customConsoleHistory, numberOfMessagesToSkip));
 }
diff --git a/node_package/src/serverRenderReactComponent.ts b/node_package/src/serverRenderReactComponent.ts
@@ -239,11 +239,10 @@ export const streamServerRenderedReactComponent = (options: RenderParams): Reada
  }
  });
 
- ReactDOMServer.renderToPipeableStream(reactRenderingResult)
- .pipe(transformStream);
+ ReactDOMServer.renderToPipeableStream(reactRenderingResult).pipe(transformStream);
 
  renderResult = transformStream;
- } catch (e: unknown) {
+ } catch (e) {
  if (throwJsErrors) {
  throw e;
  }