react_on_rails 10.0.0 → 11.0.0

data/lib/react_on_rails/configuration.rb

@@ -18,24 +18,43 @@ module ReactOnRails
     ensure_server_bundle_js_file_has_no_path
     check_i18n_directory_exists
     check_i18n_yml_directory_exists
+    check_server_render_method_is_only_execjs
+  end
+
+  def self.check_server_render_method_is_only_execjs
+    return if @configuration.server_render_method.blank? ||
+              @configuration.server_render_method == "ExecJS"
+
+    msg = <<-MSG.strip_heredoc
+      Error configuring /config/react_on_rails.rb: invalid value for `config.server_render_method`.
+      If you wish to use a server render method other than ExecJS, contact justin@shakacode.com
+      for details.
+    MSG
+    raise ReactOnRails::Error, msg
   end
 
   def self.check_i18n_directory_exists
-    return if @configuration.i18n_dir.blank?
+    return if @configuration.i18n_dir.nil?
     return if Dir.exist?(@configuration.i18n_dir)
 
-    raise "Error configuring /config/react_on_rails.rb: invalid value for `config.i18n_dir`. "\
-        "Directory does not exist: #{@configuration.i18n_dir}. Set to value to nil or comment it "\
-        "out if not using the React on Rails i18n feature."
+    msg = <<-MSG.strip_heredoc
+      Error configuring /config/react_on_rails.rb: invalid value for `config.i18n_dir`.
+      Directory does not exist: #{@configuration.i18n_dir}. Set to value to nil or comment it
+      out if not using the React on Rails i18n feature.
+    MSG
+    raise ReactOnRails::Error, msg
   end
 
   def self.check_i18n_yml_directory_exists
-    return if @configuration.i18n_yml_dir.blank?
+    return if @configuration.i18n_yml_dir.nil?
     return if Dir.exist?(@configuration.i18n_yml_dir)
 
-    raise "Error configuring /config/react_on_rails.rb: invalid value for `config.i18n_yml_dir`. "\
-        "Directory does not exist: #{@configuration.i18n_yml_dir}. Set to value to nil or comment it "\
-        "out if not using this i18n with React on Rails, or if you want to use all translation files."
+    msg = <<-MSG.strip_heredoc
+      Error configuring /config/react_on_rails.rb: invalid value for `config.i18n_yml_dir`.
+      Directory does not exist: #{@configuration.i18n_yml_dir}. Set to value to nil or comment it
+      out if not using this i18n with React on Rails, or if you want to use all translation files.
+    MSG
+    raise ReactOnRails::Error, msg
   end
 
   def self.ensure_generated_assets_dir_present
@@ -62,9 +81,8 @@ module ReactOnRails
     return unless @configuration.webpack_generated_files.empty?
 
     files = ["hello-world-bundle.js"]
-    if @configuration.server_bundle_js_file.present?
-      files << @configuration.server_bundle_js_file
-    end
+    files << @configuration.server_bundle_js_file if @configuration.server_bundle_js_file.present?
+
     @configuration.webpack_generated_files = files
   end
 
@@ -83,9 +101,8 @@ module ReactOnRails
 
   def self.configuration
     @configuration ||= Configuration.new(
-      node_modules_location: "",
+      node_modules_location: nil,
       generated_assets_dirs: nil,
-
       # generated_assets_dirs is deprecated
       generated_assets_dir: "",
       server_bundle_js_file: "",
@@ -98,15 +115,12 @@ module ReactOnRails
       server_renderer_pool_size: 1,
       server_renderer_timeout: 20,
       skip_display_none: nil,
-
       # skip_display_none is deprecated
       webpack_generated_files: %w[manifest.json],
       rendering_extension: nil,
-      server_render_method: "ExecJS",
+      server_render_method: nil,
       symlink_non_digested_assets_regex: nil,
       build_test_command: "",
-      i18n_dir: "",
-      i18n_yml_dir: "",
       build_production_command: ""
     )
   end
@@ -122,7 +136,7 @@ module ReactOnRails
                   :i18n_dir, :i18n_yml_dir,
                   :server_render_method, :symlink_non_digested_assets_regex
 
-    def initialize(node_modules_location: "", server_bundle_js_file: nil, prerender: nil,
+    def initialize(node_modules_location: nil, server_bundle_js_file: nil, prerender: nil,
                    replay_console: nil,
                    trace: nil, development_mode: nil,
                    logging_on_server: nil, server_renderer_pool_size: nil,
@@ -132,8 +146,8 @@ module ReactOnRails
                    rendering_extension: nil, build_test_command: nil,
                    build_production_command: nil,
                    i18n_dir: nil, i18n_yml_dir: nil,
-                   server_render_method: "ExecJS", symlink_non_digested_assets_regex: nil)
-      self.node_modules_location = node_modules_location
+                   server_render_method: nil, symlink_non_digested_assets_regex: nil)
+      self.node_modules_location = node_modules_location.present? ? node_modules_location : Rails.root
       self.server_bundle_js_file = server_bundle_js_file
       self.generated_assets_dirs = generated_assets_dirs
       self.generated_assets_dir = generated_assets_dir

data/lib/react_on_rails/error.rb

@@ -0,0 +1,4 @@
+module ReactOnRails
+  class Error < StandardError
+  end
+end

data/lib/react_on_rails/locales_to_js.rb

@@ -5,7 +5,7 @@ require "erb"
 module ReactOnRails
   class LocalesToJs
     def initialize
-      return if i18n_dir.blank?
+      return if i18n_dir.nil?
       return unless obsolete?
       @translations, @defaults = generate_translations
       convert
@@ -108,7 +108,7 @@ module ReactOnRails
         if v.is_a? Hash
           flatten(v).map { |hk, hv| h["#{k}.#{hk}".to_sym] = hv }
         else
-          h[k] = v
+          h[k] = v.gsub("%{", "{")
         end
       end
     end

data/lib/react_on_rails/prerender_error.rb

@@ -2,11 +2,11 @@
 
 # rubocop:disable: Layout/IndentHeredoc
 module ReactOnRails
-  class PrerenderError < RuntimeError
+  class PrerenderError < StandardError
     # err might be nil if JS caught the error
     def initialize(component_name: nil, err: nil, props: nil,
                    js_code: nil, console_messages: nil)
-      message = "ERROR in SERVER PRERENDERING\n".dup # rubocop:disable Performance/UnfreezeString
+      message = "ERROR in SERVER PRERENDERING\n".dup
       if err
         # rubocop:disable Layout/IndentHeredoc
         message << <<-MSG