react_on_rails 11.0.5 → 13.4.0

data/lib/react_on_rails/{react_on_rails_helper.rb → helper.rb}

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 # rubocop:disable Metrics/ModuleLength
+# rubocop:disable Metrics/MethodLength
 # NOTE:
 # For any heredoc JS:
 # 1. The white spacing in this file matters!
@@ -15,73 +16,25 @@ module ReactOnRails
   module Helper
     include ReactOnRails::Utils::Required
 
-    COMPONENT_HTML_KEY = "componentHtml".freeze
+    COMPONENT_HTML_KEY = "componentHtml"
 
-    # The env_javascript_include_tag and env_stylesheet_link_tag support the usage of a webpack
-    # dev server for providing the JS and CSS assets during development mode. See
-    # https://github.com/shakacode/react-webpack-rails-tutorial/ for a working example.
+    # react_component_name: can be a React function or class component or a "Render-Function".
+    # "Render-Functions" differ from a React function in that they take two parameters, the
+    #   props and the railsContext, like this:
     #
-    # The key options are `static` and `hot` which specify what you want for static vs. hot. Both of
-    # these params are optional, and support either a single value, or an array.
+    #   let MyReactComponentApp = (props, railsContext) => <MyReactComponent {...props}/>;
     #
-    # static vs. hot is picked based on whether
-    # ENV["REACT_ON_RAILS_ENV"] == "HOT"
+    #   Alternately, you can define the Render-Function with an additional property
+    #   `.renderFunction = true`:
     #
-    #   <%= env_stylesheet_link_tag(static: 'application_static',
-    #                               hot: 'application_non_webpack',
-    #                               media: 'all',
-    #                               'data-turbolinks-track' => "reload")  %>
+    #   let MyReactComponentApp = (props) => <MyReactComponent {...props}/>;
+    #   MyReactComponent.renderFunction = true;
     #
-    #   <!-- These do not use turbolinks, so no data-turbolinks-track -->
-    #   <!-- This is to load the hot assets. -->
-    #   <%= env_javascript_include_tag(hot: ['http://localhost:3500/vendor-bundle.js',
-    #                                        'http://localhost:3500/app-bundle.js']) %>
-    #
-    #   <!-- These do use turbolinks -->
-    #   <%= env_javascript_include_tag(static: 'application_static',
-    #                                  hot: 'application_non_webpack',
-    #                                  'data-turbolinks-track' => "reload") %>
-    #
-    # NOTE: for Turbolinks 2.x, use 'data-turbolinks-track' => true
-    # See application.html.erb for usage example
-    # https://github.com/shakacode/react-webpack-rails-tutorial/blob/master/app%2Fviews%2Flayouts%2Fapplication.html.erb
-    def env_javascript_include_tag(args = {})
-      send_tag_method(:javascript_include_tag, args)
-    end
-
-    # Helper to set CSS assets depending on if we want static or "hot", which means from the
-    # Webpack dev server.
-    #
-    # In this example, application_non_webpack is simply a CSS asset pipeline file which includes
-    # styles not placed in the webpack build.
-    #
-    # We don't need styles from the webpack build, as those will come via the JavaScript include
-    # tags.
-    #
-    # The key options are `static` and `hot` which specify what you want for static vs. hot. Both of
-    # these params are optional, and support either a single value, or an array.
-    #
-    #   <%= env_stylesheet_link_tag(static: 'application_static',
-    #                               hot: 'application_non_webpack',
-    #                               media: 'all',
-    #                               'data-turbolinks-track' => true)  %>
-    #
-    def env_stylesheet_link_tag(args = {})
-      send_tag_method(:stylesheet_link_tag, args)
-    end
-
-    # react_component_name: can be a React component, created using a ES6 class, or
-    #   React.createClass, or a
-    #    `generator function` that returns a React component
-    #      using ES6
-    #         let MyReactComponentApp = (props, railsContext) => <MyReactComponent {...props}/>;
-    #      or using ES5
-    #         var MyReactComponentApp = function(props, railsContext) { return <YourReactComponent {...props}/>; }
     #   Exposing the react_component_name is necessary to both a plain ReactComponent as well as
     #     a generator:
     #   See README.md for how to "register" your react components.
-    #   See spec/dummy/client/app/startup/serverRegistration.jsx and
-    #     spec/dummy/client/app/startup/ClientRegistration.jsx for examples of this
+    #   See spec/dummy/client/app/packs/server-bundle.js and
+    #     spec/dummy/client/app/packs/client-bundle.js for examples of this.
     #
     # options:
     #   props: Ruby Hash or JSON string which contains the properties to pass to the react object. Do
@@ -98,33 +51,41 @@ module ReactOnRails
     #   raise_on_prerender_error: <true/false> Default to false. True will raise exception on server
     #      if the JS code throws
     # Any other options are passed to the content tag, including the id.
+    # random_dom_id can be set to override the default from the config/initializers. That's only
+    # used if you have multiple instance of the same component on the Rails view.
     def react_component(component_name, options = {})
       internal_result = internal_react_component(component_name, options)
       server_rendered_html = internal_result[:result]["html"]
       console_script = internal_result[:result]["consoleReplayScript"]
+      render_options = internal_result[:render_options]
 
-      if server_rendered_html.is_a?(String)
+      case server_rendered_html
+      when String
         build_react_component_result_for_server_rendered_string(
           server_rendered_html: server_rendered_html,
           component_specification_tag: internal_result[:tag],
           console_script: console_script,
-          render_options: internal_result[:render_options]
+          render_options: render_options
         )
-      elsif server_rendered_html.is_a?(Hash)
-        msg = <<-MSG.strip_heredoc
-        Use react_component_hash (not react_component) to return a Hash to your ruby view code. See
-        https://github.com/shakacode/react_on_rails/blob/master/spec/dummy/client/app/startup/ReactHelmetServerApp.jsx
-        for an example of the necessary javascript configuration."
+      when Hash
+        msg = <<~MSG
+          Use react_component_hash (not react_component) to return a Hash to your ruby view code. See
+          https://github.com/shakacode/react_on_rails/blob/master/spec/dummy/client/app/startup/ReactHelmetServerApp.jsx
+          for an example of the necessary javascript configuration.
         MSG
         raise ReactOnRails::Error, msg
-
       else
-        msg = <<-MSG.strip_heredoc
-        ReactOnRails: server_rendered_html is expected to be a String for #{component_name}. If you're
-        trying to use a generator function to return a Hash to your ruby view code, then use
-        react_component_hash instead of react_component and see
-        https://github.com/shakacode/react_on_rails/blob/master/spec/dummy/client/app/startup/ReactHelmetServerApp.jsx
-        for an example of the JavaScript code."
+        class_name = server_rendered_html.class.name
+        msg = <<~MSG
+          ReactOnRails: server_rendered_html is expected to be a String or Hash for #{component_name}.
+          Type is #{class_name}
+          Value:
+          #{server_rendered_html}
+
+          If you're trying to use a Render-Function to return a Hash to your ruby view code, then use
+          react_component_hash instead of react_component and see
+          https://github.com/shakacode/react_on_rails/blob/master/spec/dummy/client/app/startup/ReactHelmetServerApp.jsx
+          for an example of the JavaScript code.
         MSG
         raise ReactOnRails::Error, msg
       end
@@ -135,7 +96,7 @@ module ReactOnRails
     # It is exactly like react_component except for the following:
     # 1. prerender: true is automatically added, as this method doesn't make sense for client only
     #    rendering.
-    # 2. Your JavaScript for server rendering must return an Object for the key server_rendered_html.
+    # 2. Your JavaScript Render-Function for server rendering must return an Object rather than a React component.
     # 3. Your view code must expect an object and not a string.
     #
     # Here is an example of the view code:
@@ -152,6 +113,7 @@ module ReactOnRails
       internal_result = internal_react_component(component_name, options)
       server_rendered_html = internal_result[:result]["html"]
       console_script = internal_result[:result]["consoleReplayScript"]
+      render_options = internal_result[:render_options]
 
       if server_rendered_html.is_a?(String) && internal_result[:result]["hasErrors"]
         server_rendered_html = { COMPONENT_HTML_KEY => internal_result[:result]["html"] }
@@ -162,13 +124,15 @@ module ReactOnRails
           server_rendered_html: server_rendered_html,
           component_specification_tag: internal_result[:tag],
           console_script: console_script,
-          render_options: internal_result[:render_options]
+          render_options: render_options
         )
       else
-        msg = <<-MSG.strip_heredoc
-          Generator function used by react_component_hash for #{component_name} is expected to return
+        msg = <<~MSG
+          Render-Function used by react_component_hash for #{component_name} is expected to return
           an Object. See https://github.com/shakacode/react_on_rails/blob/master/spec/dummy/client/app/startup/ReactHelmetServerApp.jsx
-          for an example of the JavaScript code."
+          for an example of the JavaScript code.
+          Note, your Render-Function must either take 2 params or have the property
+          `.renderFunction = true` added to it to distinguish it from a React Function Component.
         MSG
         raise ReactOnRails::Error, msg
       end
@@ -177,6 +141,9 @@ module ReactOnRails
     # Separate initialization of store from react_component allows multiple react_component calls to
     # use the same Redux store.
     #
+    # NOTE: This technique not recommended as it prevents dynamic code splitting for performance.
+    # Instead, you should use the standard react_component view helper.
+    #
     # store_name: name of the store, corresponding to your call to ReactOnRails.registerStores in your
     #             JavaScript code.
     # props: Ruby Hash or JSON string which contains the properties to pass to the redux store.
@@ -189,7 +156,7 @@ module ReactOnRails
         @registered_stores_defer_render ||= []
         @registered_stores_defer_render << redux_store_data
         "YOU SHOULD NOT SEE THIS ON YOUR VIEW -- Uses as a code block, like <% redux_store %> "\
-        "and not <%= redux store %>"
+          "and not <%= redux store %>"
       else
         @registered_stores ||= []
         @registered_stores << redux_store_data
@@ -205,7 +172,8 @@ module ReactOnRails
     # that contains a data props.
     def redux_store_hydration_data
       return if @registered_stores_defer_render.blank?
-      @registered_stores_defer_render.reduce("".dup) do |accum, redux_store_data|
+
+      @registered_stores_defer_render.reduce(+"") do |accum, redux_store_data|
         accum << render_redux_store_data(redux_store_data)
       end.html_safe
     end
@@ -217,7 +185,7 @@ module ReactOnRails
     # Helper method to take javascript expression and returns the output from evaluating it.
     # If you have more than one line that needs to be executed, wrap it in an IIFE.
     # JS exceptions are caught and console messages are handled properly.
-    # Options include:{ prerender:, trace:, raise_on_prerender_error: }
+    # Options include:{ prerender:, trace:, raise_on_prerender_error:, throw_js_errors: }
     def server_render_js(js_expression, options = {})
       render_options = ReactOnRails::ReactComponent::RenderOptions
                        .new(react_component_name: "generic-js", options: options)
@@ -227,6 +195,8 @@ module ReactOnRails
         var htmlResult = '';
         var consoleReplayScript = '';
         var hasErrors = false;
+        var renderingError = null;
+        var renderingErrorObject = {};
 
         try {
           htmlResult =
@@ -234,9 +204,17 @@ module ReactOnRails
               return #{js_expression};
             })();
         } catch(e) {
+          renderingError = e;
+          if (#{render_options.throw_js_errors}) {
+            throw e;
+          }
           htmlResult = ReactOnRails.handleError({e: e, name: null,
             jsCode: '#{escape_javascript(js_expression)}', serverSide: true});
           hasErrors = true;
+          renderingErrorObject = {
+            message: renderingError.message,
+            stack: renderingError.stack,
+          }
         }
 
         consoleReplayScript = ReactOnRails.buildConsoleReplay();
@@ -244,7 +222,8 @@ module ReactOnRails
         return JSON.stringify({
             html: htmlResult,
             consoleReplayScript: consoleReplayScript,
-            hasErrors: hasErrors
+            hasErrors: hasErrors,
+            renderingError: renderingErrorObject
         });
 
       })()
@@ -257,16 +236,17 @@ module ReactOnRails
       console_log_script = result["consoleLogScript"]
       raw("#{html}#{render_options.replay_console ? console_log_script : ''}")
     rescue ExecJS::ProgramError => err
-      raise ReactOnRails::PrerenderError, component_name: "N/A (server_render_js called)",
-                                          err: err,
-                                          js_code: js_code
+      raise ReactOnRails::PrerenderError.new(component_name: "N/A (server_render_js called)",
+                                             err: err,
+                                             js_code: js_code)
     end
 
     def json_safe_and_pretty(hash_or_string)
       return "{}" if hash_or_string.nil?
-      unless hash_or_string.class.in?([Hash, String])
+
+      unless hash_or_string.is_a?(String) || hash_or_string.is_a?(Hash)
         raise ReactOnRails::Error, "#{__method__} only accepts String or Hash as argument "\
-            "(#{hash_or_string.class} given)."
+                                   "(#{hash_or_string.class} given)."
       end
 
       json_value = hash_or_string.is_a?(String) ? hash_or_string : hash_or_string.to_json
@@ -274,8 +254,86 @@ module ReactOnRails
       ReactOnRails::JsonOutput.escape(json_value)
     end
 
+    # This is the definitive list of the default values used for the rails_context, which is the
+    # second parameter passed to both component and store Render-Functions.
+    # This method can be called from views and from the controller, as `helpers.rails_context`
+    #
+    # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity
+    def rails_context(server_side: true)
+      # ALERT: Keep in sync with node_package/src/types/index.ts for the properties of RailsContext
+      @rails_context ||= begin
+        result = {
+          railsEnv: Rails.env,
+          inMailer: in_mailer?,
+          # Locale settings
+          i18nLocale: I18n.locale,
+          i18nDefaultLocale: I18n.default_locale,
+          rorVersion: ReactOnRails::VERSION,
+          # TODO: v13 just use the version if existing
+          rorPro: ReactOnRails::Utils.react_on_rails_pro?
+        }
+        if ReactOnRails::Utils.react_on_rails_pro?
+          result[:rorProVersion] = ReactOnRails::Utils.react_on_rails_pro_version
+        end
+
+        if defined?(request) && request.present?
+          # Check for encoding of the request's original_url and try to force-encoding the
+          # URLs as UTF-8. This situation can occur in browsers that do not encode the
+          # entire URL as UTF-8 already, mostly on the Windows platform (IE11 and lower).
+          original_url_normalized = request.original_url
+          if original_url_normalized.encoding == Encoding::BINARY
+            original_url_normalized = original_url_normalized.force_encoding(Encoding::ISO_8859_1)
+                                                             .encode(Encoding::UTF_8)
+          end
+
+          # Using Addressable instead of standard URI to better deal with
+          # non-ASCII characters (see https://github.com/shakacode/react_on_rails/pull/405)
+          uri = Addressable::URI.parse(original_url_normalized)
+          # uri = Addressable::URI.parse("http://foo.com:3000/posts?id=30&limit=5#time=1305298413")
+
+          result.merge!(
+            # URL settings
+            href: uri.to_s,
+            location: "#{uri.path}#{uri.query.present? ? "?#{uri.query}" : ''}",
+            scheme: uri.scheme, # http
+            host: uri.host, # foo.com
+            port: uri.port,
+            pathname: uri.path, # /posts
+            search: uri.query, # id=30&limit=5
+            httpAcceptLanguage: request.env["HTTP_ACCEPT_LANGUAGE"]
+          )
+        end
+        if ReactOnRails.configuration.rendering_extension
+          custom_context = ReactOnRails.configuration.rendering_extension.custom_context(self)
+          result.merge!(custom_context) if custom_context
+        end
+        result
+      end
+
+      @rails_context.merge(serverSide: server_side)
+    end
+
+    def load_pack_for_generated_component(react_component_name, render_options)
+      return unless render_options.auto_load_bundle
+
+      ReactOnRails::WebpackerUtils.raise_nested_entries_disabled unless ReactOnRails::WebpackerUtils.nested_entries?
+      if Rails.env.development?
+        is_component_pack_present = File.exist?(generated_components_pack_path(react_component_name))
+        raise_missing_autoloaded_bundle(react_component_name) unless is_component_pack_present
+      end
+      append_javascript_pack_tag("generated/#{react_component_name}",
+                                 defer: ReactOnRails.configuration.defer_generated_component_packs)
+      append_stylesheet_pack_tag("generated/#{react_component_name}")
+    end
+
+    # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity
+
     private
 
+    def generated_components_pack_path(react_component_name)
+      "#{ReactOnRails::WebpackerUtils.webpacker_source_entry_path}/generated/#{react_component_name}.js"
+    end
+
     def build_react_component_result_for_server_rendered_string(
       server_rendered_html: required("server_rendered_html"),
       component_specification_tag: required("component_specification_tag"),
@@ -283,9 +341,15 @@ module ReactOnRails
       render_options: required("render_options")
     )
       content_tag_options = render_options.html_options
+      if content_tag_options.key?(:tag)
+        content_tag_options_html_tag = content_tag_options[:tag]
+        content_tag_options.delete(:tag)
+      else
+        content_tag_options_html_tag = "div"
+      end
       content_tag_options[:id] = render_options.dom_id
 
-      rendered_output = content_tag(:div,
+      rendered_output = content_tag(content_tag_options_html_tag.to_sym,
                                     server_rendered_html.html_safe,
                                     content_tag_options)
 
@@ -333,13 +397,11 @@ module ReactOnRails
 
     def compose_react_component_html_with_spec_and_console(component_specification_tag, rendered_output, console_script)
       # IMPORTANT: Ensure that we mark string as html_safe to avoid escaping.
-      # rubocop:disable Layout/IndentHeredoc
-      <<-HTML.html_safe
-#{rendered_output}
-      #{component_specification_tag}
-      #{console_script}
+      <<~HTML.html_safe
+        #{rendered_output}
+              #{component_specification_tag}
+              #{console_script}
       HTML
-      # rubocop:enable Layout/IndentHeredoc
     end
 
     # prepend the rails_context if not yet applied
@@ -372,7 +434,7 @@ module ReactOnRails
       # Setup the page_loaded_js, which is the same regardless of prerendering or not!
       # The reason is that React is smart about not doing extra work if the server rendering did its job.
       component_specification_tag = content_tag(:script,
-                                                json_safe_and_pretty(render_options.props).html_safe,
+                                                json_safe_and_pretty(render_options.client_props).html_safe,
                                                 type: "application/json",
                                                 class: "js-react-on-rails-component",
                                                 "data-component-name" => render_options.react_component_name,
@@ -382,6 +444,8 @@ module ReactOnRails
       # Create the HTML rendering part
       result = server_rendered_react_component(render_options)
 
+      load_pack_for_generated_component(react_component_name, render_options)
+
       {
         render_options: render_options,
         tag: component_specification_tag,
@@ -430,56 +494,48 @@ module ReactOnRails
       #
       # Read more here: http://timelessrepo.com/json-isnt-a-javascript-subset
 
-      # rubocop:disable Layout/IndentHeredoc
-      js_code = <<-JS
-(function() {
-  var railsContext = #{rails_context(server_side: true).to_json};
-#{initialize_redux_stores}
-  var props = #{props_string(props).gsub("\u2028", '\u2028').gsub("\u2029", '\u2029')};
-  return ReactOnRails.serverRenderReactComponent({
-    name: '#{react_component_name}',
-    domNodeId: '#{render_options.dom_id}',
-    props: props,
-    trace: #{render_options.trace},
-    railsContext: railsContext
-  });
-})()
-      JS
-      # rubocop:enable Layout/IndentHeredoc
+      js_code = ReactOnRails::ServerRenderingJsCode.server_rendering_component_js_code(
+        props_string: props_string(props).gsub("\u2028", '\u2028').gsub("\u2029", '\u2029'),
+        rails_context: rails_context(server_side: true).to_json,
+        redux_stores: initialize_redux_stores,
+        react_component_name: react_component_name,
+        render_options: render_options
+      )
 
       begin
         result = ReactOnRails::ServerRenderingPool.server_render_js_with_console_logging(js_code, render_options)
       rescue StandardError => err
         # This error came from the renderer
-        raise ReactOnRails::PrerenderError, component_name: react_component_name,
-                                            # Sanitize as this might be browser logged
-                                            props: sanitized_props_string(props),
-                                            err: err,
-                                            js_code: js_code
+        raise ReactOnRails::PrerenderError.new(component_name: react_component_name,
+                                               # Sanitize as this might be browser logged
+                                               props: sanitized_props_string(props),
+                                               err: err,
+                                               js_code: js_code)
       end
 
       if result["hasErrors"] && render_options.raise_on_prerender_error
         # We caught this exception on our backtrace handler
-        raise ReactOnRails::PrerenderError, component_name: react_component_name,
-                                            # Sanitize as this might be browser logged
-                                            props: sanitized_props_string(props),
-                                            err: nil,
-                                            js_code: js_code,
-                                            console_messages: result["consoleReplayScript"]
+        raise ReactOnRails::PrerenderError.new(component_name: react_component_name,
+                                               # Sanitize as this might be browser logged
+                                               props: sanitized_props_string(props),
+                                               err: nil,
+                                               js_code: js_code,
+                                               console_messages: result["consoleReplayScript"])
 
       end
       result
     end
 
     def initialize_redux_stores
-      return "" unless @registered_stores.present? || @registered_stores_defer_render.present?
-      declarations = "var reduxProps, store, storeGenerator;\n".dup
-      all_stores = (@registered_stores || []) + (@registered_stores_defer_render || [])
-
-      result = <<-JS.dup
+      result = +<<-JS
       ReactOnRails.clearHydratedStores();
       JS
 
+      return result unless @registered_stores.present? || @registered_stores_defer_render.present?
+
+      declarations = +"var reduxProps, store, storeGenerator;\n"
+      all_stores = (@registered_stores || []) + (@registered_stores_defer_render || [])
+
       result << all_stores.each_with_object(declarations) do |redux_store_data, memo|
         store_name = redux_store_data[:store_name]
         props = props_string(redux_store_data[:props])
@@ -493,79 +549,34 @@ module ReactOnRails
       result
     end
 
-    # This is the definitive list of the default values used for the rails_context, which is the
-    # second parameter passed to both component and store generator functions.
-    # rubocop:disable Metrics/AbcSize
-    def rails_context(server_side: required("server_side"))
-      @rails_context ||= begin
-        result = {
-          railsEnv: Rails.env,
-          inMailer: in_mailer?,
-          # Locale settings
-          i18nLocale: I18n.locale,
-          i18nDefaultLocale: I18n.default_locale,
-          rorVersion: ReactOnRails::VERSION,
-          rorPro: ReactOnRails::Utils.react_on_rails_pro?
-        }
-        if defined?(request) && request.present?
-          # Check for encoding of the request's original_url and try to force-encoding the
-          # URLs as UTF-8. This situation can occur in browsers that do not encode the
-          # entire URL as UTF-8 already, mostly on the Windows platform (IE11 and lower).
-          original_url_normalized = request.original_url
-          if original_url_normalized.encoding.to_s == "ASCII-8BIT"
-            original_url_normalized = original_url_normalized.force_encoding("ISO-8859-1").encode("UTF-8")
-          end
-
-          # Using Addressable instead of standard URI to better deal with
-          # non-ASCII characters (see https://github.com/shakacode/react_on_rails/pull/405)
-          uri = Addressable::URI.parse(original_url_normalized)
-          # uri = Addressable::URI.parse("http://foo.com:3000/posts?id=30&limit=5#time=1305298413")
-
-          result.merge!(
-            # URL settings
-            href: uri.to_s,
-            location: "#{uri.path}#{uri.query.present? ? "?#{uri.query}" : ''}",
-            scheme: uri.scheme, # http
-            host: uri.host, # foo.com
-            port: uri.port,
-            pathname: uri.path, # /posts
-            search: uri.query, # id=30&limit=5
-            httpAcceptLanguage: request.env["HTTP_ACCEPT_LANGUAGE"]
-          )
-        end
-        if ReactOnRails.configuration.rendering_extension
-          custom_context = ReactOnRails.configuration.rendering_extension.custom_context(self)
-          result.merge!(custom_context) if custom_context
-        end
-        result
-      end
-
-      @rails_context.merge(serverSide: server_side)
-    end
-
-    # rubocop:enable Metrics/AbcSize
-
     def replay_console_option(val)
       val.nil? ? ReactOnRails.configuration.replay_console : val
     end
 
-    def use_hot_reloading?
-      ENV["REACT_ON_RAILS_ENV"] == "HOT"
-    end
-
-    def send_tag_method(tag_method_name, args)
-      asset_type = use_hot_reloading? ? :hot : :static
-      assets = Array(args[asset_type])
-      options = args.delete_if { |key, _value| %i[hot static].include?(key) }
-      send(tag_method_name, *assets, options) unless assets.empty?
-    end
-
     def in_mailer?
       return false unless defined?(controller)
       return false unless defined?(ActionMailer::Base)
 
       controller.is_a?(ActionMailer::Base)
     end
+
+    if defined?(ScoutApm)
+      include ScoutApm::Tracer
+      instrument_method :react_component, type: "ReactOnRails", name: "react_component"
+      instrument_method :react_component_hash, type: "ReactOnRails", name: "react_component_hash"
+    end
+
+    def raise_missing_autoloaded_bundle(react_component_name)
+      msg = <<~MSG
+        **ERROR** ReactOnRails: Component "#{react_component_name}" is configured as "auto_load_bundle: true"
+        but the generated component entrypoint, which should have been at #{generated_components_pack_path(react_component_name)},
+        is missing. You might want to check that this component is in a directory named "#{ReactOnRails.configuration.components_subdirectory}"
+        & that "bundle exec rake react_on_rails:generate_packs" has been run.
+      MSG
+
+      raise ReactOnRails::Error, msg
+    end
   end
 end
 # rubocop:enable Metrics/ModuleLength
+# rubocop:enable Metrics/MethodLength

data/lib/react_on_rails/json_output.rb

@@ -11,7 +11,7 @@ module ReactOnRails
       "\u2028" => '\u2028',
       "\u2029" => '\u2029'
     }.freeze
-    ESCAPE_REGEXP = /[\u2028\u2029&><]/u
+    ESCAPE_REGEXP = /[\u2028\u2029&><]/u.freeze
 
     def self.escape(json)
       return escape_without_erb_util(json) if Utils.rails_version_less_than_4_1_1

data/lib/react_on_rails/json_parse_error.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module ReactOnRails
+  class JsonParseError < ::ReactOnRails::Error
+    attr_reader :json
+
+    def initialize(parse_error:, json:)
+      @json = json
+      @original_error = parse_error
+      super(parse_error.message)
+    end
+
+    def to_honeybadger_context
+      to_error_context
+    end
+
+    def raven_context
+      to_error_context
+    end
+
+    def to_error_context
+      {
+        original_error: @original_error,
+        json: @json
+      }
+    end
+  end
+end