react_on_rails 12.0.5.beta.0 → 12.4.0.rc.0

data/lib/react_on_rails/react_component/render_options.rb

@@ -11,6 +11,7 @@ module ReactOnRails
 
       NO_PROPS = {}.freeze
 
+      # TODO: remove the required for named params
       def initialize(react_component_name: required("react_component_name"), options: required("options"))
         @react_component_name = react_component_name.camelize
         @options = options
@@ -18,12 +19,16 @@ module ReactOnRails
 
       attr_reader :react_component_name
 
+      def throw_js_errors
+        options.fetch(:throw_js_errors, false)
+      end
+
       def props
         options.fetch(:props) { NO_PROPS }
       end
 
       def random_dom_id
-        retrieve_key(:random_dom_id)
+        retrieve_configuration_value_for(:random_dom_id)
       end
 
       def dom_id
@@ -49,23 +54,23 @@ module ReactOnRails
       end
 
       def prerender
-        retrieve_key(:prerender)
+        retrieve_configuration_value_for(:prerender)
       end
 
       def trace
-        retrieve_key(:trace)
+        retrieve_configuration_value_for(:trace)
       end
 
       def replay_console
-        retrieve_key(:replay_console)
+        retrieve_configuration_value_for(:replay_console)
       end
 
       def raise_on_prerender_error
-        retrieve_key(:raise_on_prerender_error)
+        retrieve_configuration_value_for(:raise_on_prerender_error)
       end
 
       def logging_on_server
-        retrieve_key(:logging_on_server)
+        retrieve_configuration_value_for(:logging_on_server)
       end
 
       def to_s
@@ -76,6 +81,10 @@ module ReactOnRails
         options[key]
       end
 
+      def set_option(key, value)
+        options[key] = value
+      end
+
       private
 
       attr_reader :options
@@ -88,7 +97,7 @@ module ReactOnRails
         "#{base_dom_id}-#{SecureRandom.uuid}"
       end
 
-      def retrieve_key(key)
+      def retrieve_configuration_value_for(key)
         options.fetch(key) do
           ReactOnRails.configuration.public_send(key)
         end

data/lib/react_on_rails/server_rendering_pool/ruby_embedded_java_script.rb

@@ -150,6 +150,10 @@ module ReactOnRails
         end
 
         def execjs_timer_polyfills
+          if ReactOnRails::Utils.react_on_rails_pro? && ReactOnRailsPro.configuration.execjs_polyfills == false
+            return ""
+          end
+
           <<~JS
             function getStackTrace () {
               var stack;
@@ -187,8 +191,10 @@ module ReactOnRails
         end
 
         # Reimplement console methods for replaying on the client
+        # Save a handle to the original console if needed.
         def console_polyfill
           <<~JS
+            var debugConsole = console;
             var console = { history: [] };
             ['error', 'log', 'info', 'warn'].forEach(function (level) {
               console[level] = function () {
@@ -202,6 +208,11 @@ module ReactOnRails
           JS
         end
 
+        if defined?(ScoutApm)
+          include ScoutApm::Tracer
+          instrument_method :exec_server_render_js, type: "ReactOnRails", name: "ExecJs React Server Rendering"
+        end
+
         private
 
         def file_url_to_string(url)

data/lib/react_on_rails/utils.rb

@@ -158,15 +158,29 @@ module ReactOnRails
     end
 
     def self.gem_available?(name)
-      Gem::Specification.find_all_by_name(name).present?
+      Gem.loaded_specs[name].present?
     rescue Gem::LoadError
       false
     rescue StandardError
       Gem.available?(name).present?
     end
 
+    # Todo -- remove this for v13, as we don't need both boolean and number
     def self.react_on_rails_pro?
-      @react_on_rails_pro ||= gem_available?("react_on_rails_pro")
+      return @react_on_rails_pro if defined?(@react_on_rails_pro)
+
+      @react_on_rails_pro = gem_available?("react_on_rails_pro")
+    end
+
+    # Return an empty string if React on Rails Pro is not installed
+    def self.react_on_rails_pro_version
+      return @react_on_rails_pro_version if defined?(@react_on_rails_pro_version)
+
+      @react_on_rails_pro_version = if react_on_rails_pro?
+                                      Gem.loaded_specs["react_on_rails_pro"].version.to_s
+                                    else
+                                      ""
+                                    end
     end
 
     def self.smart_trim(str, max_length = 1000)

data/lib/react_on_rails/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ReactOnRails
-  VERSION = "12.0.5.beta.0"
+  VERSION = "12.4.0.rc.0"
 end

data/lib/react_on_rails/webpacker_utils.rb

@@ -2,8 +2,12 @@
 
 module ReactOnRails
   module WebpackerUtils
+    # TODO: V13 code should be cleaned up so that the webpacker gem is required.
+    # This check should only be done at startup.
     def self.using_webpacker?
-      ReactOnRails::Utils.gem_available?("webpacker")
+      return @using_webpacker if defined?(@using_webpacker)
+
+      @using_webpacker = ReactOnRails::Utils.gem_available?("webpacker")
     end
 
     def self.webpacker_webpack_production_config_exists?

data/lib/tasks/assets.rake

@@ -6,9 +6,10 @@
 require "active_support"
 
 ENV["RAILS_ENV"] ||= ENV["RACK_ENV"] || "development"
-ENV["NODE_ENV"]  ||= "development"
 
-unless ReactOnRails::WebpackerUtils.webpacker_webpack_production_config_exists?
+skip_react_on_rails_precompile = %w[no false n f].include?(ENV["REACT_ON_RAILS_PRECOMPILE"])
+
+if !skip_react_on_rails_precompile && !ReactOnRails::WebpackerUtils.webpacker_webpack_production_config_exists?
   # Ensure that rails/webpacker does not call bin/webpack if we're providing
   # the build command.
   ENV["WEBPACKER_PRECOMPILE"] = "false"
@@ -47,10 +48,20 @@ namespace :react_on_rails do
       configuration file config/webpack/production.js exists.
     DESC
     task webpack: :locale do
-      if ReactOnRails.configuration.build_production_command.present?
-        sh ReactOnRails::Utils.prepend_cd_node_modules_directory(
-          ReactOnRails.configuration.build_production_command
-        ).to_s
+      build_production_command = ReactOnRails.configuration.build_production_command
+      if build_production_command.present?
+        if build_production_command.is_a?(String)
+          sh ReactOnRails::Utils.prepend_cd_node_modules_directory(
+            build_production_command
+          ).to_s
+        elsif build_production_command.methods.include?(:call)
+          build_production_command.call
+        else
+          msg = "ReactonRails.configuration.build_production_command is improperly configured. "\
+                "Value = #{build_production_command} with class #{build_production_command.class}"
+          puts Rainbow(msg).red
+          exit!(1)
+        end
       else
         msg = <<~MSG
           React on Rails is aborting webpack compilation from task react_on_rails:assets:webpack

data/package.json

@@ -1,56 +1,51 @@
 {
   "name": "react-on-rails",
-  "version": "12.0.5-beta.0",
+  "version": "12.4.0-rc.0",
   "description": "react-on-rails JavaScript for react_on_rails Ruby gem",
   "main": "node_package/lib/ReactOnRails.js",
   "directories": {
     "doc": "docs"
   },
   "devDependencies": {
-    "@babel/cli": "^7.0.0",
-    "@babel/core": "^7.0.0",
-    "@babel/plugin-transform-runtime": "^7.0.0",
-    "@babel/plugin-transform-typescript": "^7.8.7",
-    "@babel/preset-env": "^7.0.0",
-    "@babel/preset-react": "^7.0.0",
-    "@babel/types": "^7.0.0",
-    "@types/jest": "^25.1.4",
-    "@types/node": "^13.9.0",
+    "@babel/cli": "^7.12.10",
+    "@babel/core": "^7.12.10",
+    "@babel/plugin-transform-runtime": "^7.12.10",
+    "@babel/plugin-transform-typescript": "^7.12.1",
+    "@babel/preset-env": "^7.12.10",
+    "@babel/preset-react": "^7.12.10",
+    "@babel/types": "^7.12.10",
+    "@types/jest": "^26.0.18",
+    "@types/node": "^14.14.11",
     "@types/react": "^16.9.23",
     "@types/react-dom": "^16.9.5",
     "@types/turbolinks": "^5.2.0",
-    "@typescript-eslint/eslint-plugin": "^2.23.0",
-    "@typescript-eslint/parser": "^2.23.0",
-    "babel-loader": "^8.0.2",
+    "@typescript-eslint/eslint-plugin": "^4.10.0",
+    "@typescript-eslint/parser": "^4.10.0",
     "babelify": "^10.0.0",
     "blue-tape": "^1.0.0",
     "create-react-class": "^15.6.0",
-    "eslint": "^6.8.0",
-    "eslint-config-prettier": "^6.10.1",
+    "eslint": "^7.15.0",
+    "eslint-config-prettier": "^7.0.0",
     "eslint-config-shakacode": "^16.0.1",
-    "eslint-plugin-import": "^2.6.1",
-    "eslint-plugin-jsx-a11y": "^6.1.2",
-    "eslint-plugin-prettier": "^3.0.0",
-    "eslint-plugin-react": "^7.1.0",
-    "jest": "^25.1.0",
-    "jsdom": "^11.1.0",
+    "eslint-plugin-import": "^2.22.1",
+    "eslint-plugin-jsx-a11y": "^6.4.1",
+    "eslint-plugin-prettier": "^3.3.0",
+    "eslint-plugin-react": "^7.21.5",
+    "jest": "^26.6.3",
+    "jsdom": "^16.4.0",
     "nps": "^5.9.3",
-    "prettier": "^2.0.1",
+    "prettier": "^2.2.1",
     "prettier-eslint-cli": "^5.0.0",
     "prop-types": "^15.5.10",
     "react": "^16.5.2",
     "react-dom": "^16.5.2",
     "react-transform-hmr": "^1.0.4",
     "redux": "^4.0.1",
-    "release-it": "^8.2.0",
-    "ts-jest": "^25.2.1",
-    "tslint-config-prettier": "^1.18.0",
-    "typescript": "^3.8.3",
-    "webpack": "^3.4.1",
-    "webpack-manifest-plugin": "^1.2.1"
+    "ts-jest": "^26.4.4",
+    "typescript": "^4.1.2"
   },
   "dependencies": {
-    "@babel/runtime-corejs3": "^7.9.6",
+    "@babel/runtime-corejs3": "^7.12.5",
     "concurrently": "^5.1.0"
   },
   "peerDependencies": {

data/rakelib/release.rake

@@ -11,6 +11,8 @@ class RaisingMessageHandler
   end
 end
 
+# rubocop:disable Metrics/BlockLength
+
 desc("Releases both the gem and node package using the given version.
 
 IMPORTANT: the gem version must be in valid rubygem format (no dashes).
@@ -19,7 +21,7 @@ for the node package version. This only makes a difference for pre-release
 versions such as `3.0.0.beta.1` (yarn version would be `3.0.0-beta.1`).
 
 This task depends on the gem-release (ruby gem) and release-it (node package)
-which are installed via `bundle install` and `yarn`
+which are installed via `bundle install` and `yarn global add release-it`
 
 1st argument: The new version in rubygem format (no dashes). Pass no argument to
               automatically perform a patch version bump.
@@ -55,16 +57,30 @@ task :release, %i[gem_version dry_run tools_install] do |_t, args|
   # Update dummy app's Gemfile.lock
   bundle_install_in(dummy_app_dir)
 
-  # Stage changes so far
-  sh_in_dir(gem_root, "git add .")
-
   # Will bump the yarn version, commit, tag the commit, push to repo, and release on yarn
-  release_it_command = +"$(yarn bin)/release-it"
+  release_it_command = +"release-it"
   release_it_command << " #{npm_version}" unless npm_version.strip.empty?
-  release_it_command << " --non-interactive --npm.publish"
+  release_it_command << " --ci --npm.publish --no-git.requireCleanWorkingDir"
   release_it_command << " --dry-run --verbose" if is_dry_run
   sh_in_dir(gem_root, release_it_command)
 
   # Release the new gem version
   sh_in_dir(gem_root, "gem release") unless is_dry_run
+
+  msg = <<~MSG
+    Once you have successfully published, run these commands to update the spec apps:
+
+    cd #{dummy_app_dir}; bundle update react_on_rails
+    cd #{gem_root}#{' '}
+    git commit -a -m 'Update Gemfile.lock for spec app'
+    git push
+  MSG
+  puts msg
+end
+# rubocop:enable Metrics/BlockLength
+
+task :test do
+  unbundled_sh_in_dir(gem_root, "cd #{dummy_app_dir}; bundle update react_on_rails")
+  sh_in_dir(gem_root, "git commit -a -m 'Update Gemfile.lock for spec app'")
+  sh_in_dir(gem_root, "git push")
 end

data/rakelib/task_helpers.rb

@@ -16,13 +16,26 @@ module ReactOnRails
       File.join(gem_root, "spec/dummy")
     end
 
-    # Executes a string or an array of strings in a shell in the given directory
+    # Executes a string or an array of strings in a shell in the given directory in an unbundled environment
     def sh_in_dir(dir, *shell_commands)
       shell_commands.flatten.each { |shell_command| sh %(cd #{dir} && #{shell_command.strip}) }
     end
 
+    # Executes a string or an array of strings in a shell in the given directory
+    def unbundled_sh_in_dir(dir, *shell_commands)
+      Dir.chdir(dir) do
+        # Without `with_unbundled_env`, running bundle in the child directories won't correctly
+        # update the Gemfile.lock
+        Bundler.with_unbundled_env do
+          shell_commands.flatten.each do |shell_command|
+            sh(shell_command.strip)
+          end
+        end
+      end
+    end
+
     def bundle_install_in(dir)
-      sh_in_dir(dir, "bundle install")
+      unbundled_sh_in_dir(dir, "bundle install")
     end
 
     def bundle_install_in_no_turbolinks(dir)