Skip to content

Commit bcfddd6

Browse files
linting
1 parent ce37122 commit bcfddd6

File tree

2 files changed

+10
-9
lines changed

2 files changed

+10
-9
lines changed

lib/react_on_rails/helper.rb

+3-2
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@ def build_react_component_result_for_server_streamed_content(
399399
render_options: required("render_options")
400400
)
401401
is_first_chunk = true
402-
rendered_html_stream = rendered_html_stream.transform do |chunk_json_result|
402+
rendered_html_stream.transform do |chunk_json_result|
403403
if is_first_chunk
404404
is_first_chunk = false
405405
next build_react_component_result_for_server_rendered_string(
@@ -411,7 +411,8 @@ def build_react_component_result_for_server_streamed_content(
411411
end
412412

413413
result_console_script = render_options.replay_console ? chunk_json_result["consoleReplayScript"] : ""
414-
# No need to prepend component_specification_tag or add rails context again as they're already included in the first chunk
414+
# No need to prepend component_specification_tag or add rails context again
415+
# as they're already included in the first chunk
415416
compose_react_component_html_with_spec_and_console(
416417
"", chunk_json_result["html"], result_console_script
417418
)

lib/react_on_rails/server_rendering_pool/ruby_embedded_java_script.rb

+7-7
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ def reset_pool_if_server_bundle_was_modified
4646
# Note, js_code does not have to be based on React.
4747
# js_code MUST RETURN json stringify Object
4848
# Calling code will probably call 'html_safe' on return value before rendering to the view.
49-
# rubocop:disable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity
49+
# rubocop:disable Metrics/CyclomaticComplexity
5050
def exec_server_render_js(js_code, render_options, js_evaluator = nil)
5151
js_evaluator ||= self
5252
if render_options.trace
@@ -57,10 +57,10 @@ def exec_server_render_js(js_code, render_options, js_evaluator = nil)
5757
end
5858
begin
5959
result = if render_options.stream?
60-
js_evaluator.eval_streaming_js(js_code, render_options)
61-
else
62-
js_evaluator.eval_js(js_code, render_options)
63-
end
60+
js_evaluator.eval_streaming_js(js_code, render_options)
61+
else
62+
js_evaluator.eval_js(js_code, render_options)
63+
end
6464
rescue StandardError => err
6565
msg = <<~MSG
6666
Error evaluating server bundle. Check your webpack configuration.
@@ -75,14 +75,14 @@ def exec_server_render_js(js_code, render_options, js_evaluator = nil)
7575
end
7676
raise ReactOnRails::Error, msg, err.backtrace
7777
end
78-
78+
7979
return parse_result_and_replay_console_messages(result, render_options) unless render_options.stream?
8080

8181
# Streamed component is returned as stream of strings.
8282
# We need to parse each chunk and replay the console messages.
8383
result.transform { |chunk| parse_result_and_replay_console_messages(chunk, render_options) }
8484
end
85-
# rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity
85+
# rubocop:enable Metrics/CyclomaticComplexity
8686

8787
def trace_js_code_used(msg, js_code, file_name = "tmp/server-generated.js", force: false)
8888
return unless ReactOnRails.configuration.trace || force

0 commit comments

Comments
 (0)