refactoring

Author: AbanoubGhadban

lib/react_on_rails/helper.rb

@@ -644,7 +644,7 @@ def should_raise_streaming_prerender_error?(chunk_json_result, render_options)
     end
 
     # Returns object with values that are NOT html_safe!
-    def server_rendered_react_component(render_options) # rubocop:disable Metrics/CyclomaticComplexity
+    def server_rendered_react_component(render_options)
       return { "html" => "", "consoleReplayScript" => "" } unless render_options.prerender
 
       react_component_name = render_options.react_component_name

lib/react_on_rails/server_rendering_pool/ruby_embedded_java_script.rb

@@ -50,7 +50,7 @@ def reset_pool_if_server_bundle_was_modified
         # Note, js_code does not have to be based on React.
         # js_code MUST RETURN json stringify Object
         # Calling code will probably call 'html_safe' on return value before rendering to the view.
-        # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+        # rubocop:disable Metrics/CyclomaticComplexity
         def exec_server_render_js(js_code, render_options, js_evaluator = nil)
           js_evaluator ||= self
           if render_options.trace
@@ -89,7 +89,7 @@ def exec_server_render_js(js_code, render_options, js_evaluator = nil)
           # We need to parse each chunk and replay the console messages.
           result.transform { |chunk| parse_result_and_replay_console_messages(chunk, render_options) }
         end
-        # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+        # rubocop:enable Metrics/CyclomaticComplexity
 
         def trace_js_code_used(msg, js_code, file_name = "tmp/server-generated.js", force: false)
           return unless ReactOnRails.configuration.trace || force

node_package/src/loadReactClientManifest.ts

@@ -9,8 +9,13 @@ export default function loadReactClientManifest(reactClientManifestFileName: str
   // Thus, the __dirname of this code is where we can find the manifest file.
   const manifestPath = path.resolve(__dirname, reactClientManifestFileName);
   if (!loadedReactClientManifests.has(manifestPath)) {
-    const manifest = JSON.parse(fs.readFileSync(manifestPath, 'utf8'));
-    loadedReactClientManifests.set(manifestPath, manifest);
+    // TODO: convert to async
+    try {
+      const manifest = JSON.parse(fs.readFileSync(manifestPath, 'utf8'));
+      loadedReactClientManifests.set(manifestPath, manifest);
+    } catch (error) {
+      throw new Error(`Failed to load React client manifest from ${manifestPath}: ${error}`);
+    }
   }
 
   return loadedReactClientManifests.get(manifestPath)!;

node_package/src/registerServerComponent.ts

@@ -4,16 +4,13 @@ import RSCClientRoot from './RSCClientRoot';
 import { RegisterServerComponentOptions } from './types';
 
 const registerServerComponent = (options: RegisterServerComponentOptions, ...componentNames: string[]) => {
-  const componentsWrappedInRSCClientRoot = componentNames.reduce(
-    (acc, name) => ({
-      ...acc,
-      [name]: () => React.createElement(RSCClientRoot, {
-        componentName: name,
-        rscRenderingUrlPath: options.rscRenderingUrlPath
-      })
-    }),
-    {}
-  );
+  const componentsWrappedInRSCClientRoot: Record<string, () => React.ReactElement> = {};
+  for (const name of componentNames) {
+    componentsWrappedInRSCClientRoot[name] = () => React.createElement(RSCClientRoot, {
+      componentName: name,
+      rscRenderingUrlPath: options.rscRenderingUrlPath
+    });
+  }
   ReactOnRails.register(componentsWrappedInRSCClientRoot);
 };
 

node_package/src/transformRSCStreamAndReplayConsoleLogs.ts

@@ -10,11 +10,7 @@ export default function transformRSCStreamAndReplayConsoleLogs(stream: ReadableS
       while (!done) {
         const decodedValue = lastIncompleteChunk + decoder.decode(value);
         const chunks = decodedValue.split('\n');
-        if (!decodedValue.endsWith('\n')) {
-          lastIncompleteChunk = chunks.pop() ?? '';
-        } else {
-          lastIncompleteChunk = '';
-        }
+        lastIncompleteChunk = chunks.pop() ?? '';
 
         const jsonChunks = chunks
           .filter(line => line.trim() !== '')

spec/dummy/spec/support/script_tag_utils.rb

@@ -6,8 +6,8 @@
   opts = {}
   match do |actual|
     Nokogiri::HTML.fragment(actual).css("script").map do |script|
-      EquivalentXml.equivalent?(Nokogiri::HTML.fragment(script.to_s.delete(" \t\r\n")),
-                                Nokogiri::HTML.fragment(expected.delete(" \t\r\n")),
+      EquivalentXml.equivalent?(Nokogiri::HTML.fragment(script.to_s),
+                                Nokogiri::HTML.fragment(expected),
                                 opts)
     end.include?(true)
   end

spec/react_on_rails/utils_spec.rb

@@ -215,12 +215,12 @@ def mock_dev_server_running
 
           context "with server file in the manifest, used for client", packer_type.to_sym do
             it "returns the correct path hashed server path" do
-              Packer = ReactOnRails::PackerUtils.packer # rubocop:disable Lint/ConstantDefinitionInBlock, RSpec/LeakyConstantDeclaration
+              packer = ReactOnRails::PackerUtils.packer
               mock_bundle_configs(server_bundle_name: "webpack-bundle.js")
               allow(ReactOnRails).to receive_message_chain("configuration.same_bundle_for_client_and_server")
                 .and_return(true)
               mock_bundle_in_manifest("webpack-bundle.js", "webpack/development/webpack-bundle-123456.js")
-              allow(Packer).to receive_message_chain("dev_server.running?")
+              allow(packer).to receive_message_chain("dev_server.running?")
                 .and_return(false)
 
               path = described_class.server_bundle_js_file_path
@@ -278,12 +278,12 @@ def mock_dev_server_running
 
           context "with server file in the manifest, used for client", packer_type.to_sym do
             it "returns the correct path hashed server path" do
-              Packer = ReactOnRails::PackerUtils.packer # rubocop:disable Lint/ConstantDefinitionInBlock, RSpec/LeakyConstantDeclaration
+              packer = ReactOnRails::PackerUtils.packer
               mock_bundle_configs(rsc_bundle_name: "webpack-bundle.js")
               allow(ReactOnRails).to receive_message_chain("configuration.same_bundle_for_client_and_server")
                 .and_return(true)
               mock_bundle_in_manifest("webpack-bundle.js", "webpack/development/webpack-bundle-123456.js")
-              allow(Packer).to receive_message_chain("dev_server.running?")
+              allow(packer).to receive_message_chain("dev_server.running?")
                 .and_return(false)
 
               path = described_class.rsc_bundle_js_file_path