Add ruby 3 and node 16 & 18 in CI

.github/workflows/lint-js-and-ruby.yml

@@ -6,8 +6,8 @@ jobs:
   build:
     strategy:
       matrix:
-        ruby: [2.7]
-        node: [14]
+        ruby: [3]
+        node: [18]
     runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v2

.github/workflows/main.yml

@@ -6,8 +6,8 @@ jobs:
   build-dummy-app-webpack-test-bundles:
     strategy:
       matrix:
-        ruby: [2.7]
-        node: [14]
+        ruby: [2.7, 3.2]
+        node: [16, 18]
     runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v2

.github/workflows/package-js-tests.yml

@@ -6,7 +6,7 @@ jobs:
   build:
     strategy:
       matrix:
-        node: [14]
+        node: [16, 18]
     runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v2

.github/workflows/rspec-package-specs.yml

@@ -6,8 +6,8 @@ jobs:
   build:
     strategy:
       matrix:
-        ruby: [2.7]
-        node: [14]
+        ruby: [2.7, 3.2]
+        node: [16, 18]
     runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v2

.rubocop.yml

@@ -132,3 +132,8 @@ RSpec/MultipleMemoizedHelpers:
 Style/GlobalVars:
   Exclude:
     - 'spec/dummy/config/environments/development.rb'
+
+RSpec/NoExpectationExample:
+  AllowedPatterns:
+    - ^expect_
+    - ^assert_

Gemfile.development_dependencies

@@ -2,7 +2,7 @@
 
 gem "shakapacker", "7.0.1"
 gem "bootsnap", require: false
-gem "rails", "~> 7.0"
+gem "rails", "~> 7.0", ">= 7.0.1"
 gem "sqlite3"
 gem "sass-rails", "~> 6.0"
 gem "uglifier"
@@ -29,9 +29,9 @@ group :development, :test do
   gem "pry-doc"
   gem "pry-rails"
   gem "pry-rescue"
-  gem "rubocop", "1.14.0", require: false
-  gem "rubocop-performance", require: false
-  gem "rubocop-rspec", require: false
+  gem "rubocop", "~>1.56", require: false
+  gem "rubocop-performance", "~>1.18.0", require: false
+  gem "rubocop-rspec", "~>2.23.2", require: false
   gem "scss_lint", require: false
   gem "spring", "~> 4.0"
 end

lib/generators/react_on_rails/dev_tests_generator.rb

@@ -39,7 +39,7 @@ def replace_prerender_if_server_rendering
 
         hello_world_index = File.join(destination_root, "app", "views", "hello_world", "index.html.erb")
         hello_world_contents = File.read(hello_world_index)
-        new_hello_world_contents = hello_world_contents.gsub(/prerender: false/,
+        new_hello_world_contents = hello_world_contents.gsub("prerender: false",
                                                              "prerender: true")
 
         File.open(hello_world_index, "w+") { |f| f.puts new_hello_world_contents }

lib/generators/react_on_rails/templates/dev_tests/spec/rails_helper.rb

@@ -40,7 +40,7 @@
 # ActiveRecord::Migration.maintain_test_schema!
 
 RSpec.configure do |config|
-  config.before(:each, type: :system, js: true) do
+  config.before(:each, js: true, type: :system) do
     driven_by :selenium_chrome
   end
 
@@ -49,7 +49,7 @@
   ReactOnRails::TestHelper.configure_rspec_to_compile_assets(config)
 
   # Remove this line if you"re not using ActiveRecord or ActiveRecord fixtures
-  config.fixture_path = "#{::Rails.root}/spec/fixtures"
+  config.fixture_path = "#{Rails.root}/spec/fixtures"
 
   # If you"re not using ActiveRecord, or you"d prefer not to run each of your
   # examples within a transaction, remove the following line or assign false

lib/react_on_rails/configuration.rb

@@ -137,7 +137,7 @@ def check_autobundling_requirements_if_configured
     end
 
     def adjust_precompile_task
-      skip_react_on_rails_precompile = %w[no false n f].include?(ENV["REACT_ON_RAILS_PRECOMPILE"])
+      skip_react_on_rails_precompile = %w[no false n f].include?(ENV.fetch("REACT_ON_RAILS_PRECOMPILE", nil))
 
       return if skip_react_on_rails_precompile || build_production_command.blank?
 
@@ -187,7 +187,7 @@ def error_if_using_webpacker_and_generated_assets_dir_not_match_public_output_pa
       webpacker_public_output_path = ReactOnRails::WebpackerUtils.webpacker_public_output_path
 
       if File.expand_path(generated_assets_dir) == webpacker_public_output_path.to_s
-        Rails.logger.warn("You specified generated_assets_dir in `config/initializers/react_on_rails.rb` "\
+        Rails.logger.warn("You specified generated_assets_dir in `config/initializers/react_on_rails.rb` " \
                           "with Webpacker. Remove this line from your configuration file.")
       else
         msg = <<~MSG
@@ -225,20 +225,20 @@ def configure_generated_assets_dirs_deprecation
 
       if ReactOnRails::WebpackerUtils.using_webpacker?
         webpacker_public_output_path = ReactOnRails::WebpackerUtils.webpacker_public_output_path
-        Rails.logger.warn "Error configuring config/initializers/react_on_rails. Define neither the "\
-                          "generated_assets_dirs no the generated_assets_dir when using Webpacker. This is defined by "\
-                          "public_output_path specified in webpacker.yml = #{webpacker_public_output_path}."
+        Rails.logger.warn "Error configuring config/initializers/react_on_rails. Define neither the " \
+                          "generated_assets_dirs no the generated_assets_dir when using Webpacker. This is defined " \
+                          "by public_output_path specified in webpacker.yml = #{webpacker_public_output_path}."
         return
       end
 
-      Rails.logger.warn "[DEPRECATION] ReactOnRails: Use config.generated_assets_dir rather than "\
+      Rails.logger.warn "[DEPRECATION] ReactOnRails: Use config.generated_assets_dir rather than " \
                         "generated_assets_dirs"
       if generated_assets_dir.blank?
         self.generated_assets_dir = generated_assets_dirs
       else
-        Rails.logger.warn "[DEPRECATION] ReactOnRails. You have both generated_assets_dirs and "\
-                          "generated_assets_dir defined. Define ONLY generated_assets_dir if NOT using Webpacker"\
-                          " and define neither if using Webpacker"
+        Rails.logger.warn "[DEPRECATION] ReactOnRails. You have both generated_assets_dirs and " \
+                          "generated_assets_dir defined. Define ONLY generated_assets_dir if NOT using Webpacker " \
+                          "and define neither if using Webpacker"
       end
     end
 

lib/react_on_rails/git_utils.rb

@@ -4,13 +4,13 @@
 
 module ReactOnRails
   module GitUtils
-    def self.uncommitted_changes?(message_handler)
+    def self.uncommitted_changes?(message_handler, git_installed = $CHILD_STATUS.success?)
       return false if ENV["COVERAGE"] == "true"
 
       status = `git status --porcelain`
-      return false if $CHILD_STATUS.success? && status.empty?
+      return false if git_installed && status&.empty?
 
-      error = if $CHILD_STATUS.success?
+      error = if git_installed
                 "You have uncommitted code. Please commit or stash your changes before continuing"
               else
                 "You do not have Git installed. Please install Git, and commit your changes before continuing"

lib/react_on_rails/helper.rb

@@ -155,7 +155,7 @@ def redux_store(store_name, props: {}, defer: false)
       if defer
         @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 %> "\
+        "YOU SHOULD NOT SEE THIS ON YOUR VIEW -- Uses as a code block, like <% redux_store %> " \
           "and not <%= redux store %>"
       else
         @registered_stores ||= []
@@ -245,7 +245,7 @@ def json_safe_and_pretty(hash_or_string)
       return "{}" if hash_or_string.nil?
 
       unless hash_or_string.is_a?(String) || hash_or_string.is_a?(Hash)
-        raise ReactOnRails::Error, "#{__method__} only accepts String or Hash as argument "\
+        raise ReactOnRails::Error, "#{__method__} only accepts String or Hash as argument " \
                                    "(#{hash_or_string.class} given)."
       end
 

lib/react_on_rails/locales/base.rb

@@ -107,7 +107,7 @@ def convert
       end
 
       def generate_file(template, path)
-        result = ERB.new(template).result()
+        result = ERB.new(template).result
         File.write(path, result)
       end
 
@@ -157,7 +157,7 @@ def template_default
         <<-JS.strip_heredoc
           import { defineMessages } from 'react-intl';
 
-          const defaultLocale = \'#{default_locale}\';
+          const defaultLocale = '#{default_locale}';
 
           const defaultMessages = defineMessages(#{@defaults});
 

lib/react_on_rails/locales/to_js.rb

@@ -21,7 +21,7 @@ def template_default
         <<-JS.strip_heredoc
           import { defineMessages } from 'react-intl';
 
-          const defaultLocale = \'#{default_locale}\';
+          const defaultLocale = '#{default_locale}';
 
           const defaultMessages = defineMessages(#{@defaults});
 

lib/react_on_rails/packs_generator.rb

@@ -155,9 +155,7 @@ def component_name_to_path(paths)
     end
 
     def common_component_to_path
-      common_components_paths = Dir.glob("#{components_search_path}/*").reject do |f|
-        CONTAINS_CLIENT_OR_SERVER_REGEX.match?(f)
-      end
+      common_components_paths = Dir.glob("#{components_search_path}/*").grep_v(CONTAINS_CLIENT_OR_SERVER_REGEX)
       component_name_to_path(common_components_paths)
     end
 

lib/react_on_rails/react_component/render_options.rb

@@ -35,7 +35,7 @@ def client_props
                                                                           props.clone)
           end
 
-          raise ReactOnRails::Error, "ReactOnRails: your rendering_props_extension module is missing the "\
+          raise ReactOnRails::Error, "ReactOnRails: your rendering_props_extension module is missing the " \
                                      "required adjust_props_for_client_side_hydration method & can not be used"
         end
         props

lib/react_on_rails/server_rendering_pool/ruby_embedded_java_script.rb

@@ -5,9 +5,8 @@
 
 module ReactOnRails
   module ServerRenderingPool
-    # rubocop:disable Metrics/ClassLength
     class RubyEmbeddedJavaScript
-      # rubocop:enable Metrics/ClassLength
+      # rubocop:disable Metrics/ClassLength
       class << self
         def reset_pool
           options = {
@@ -125,8 +124,8 @@ def read_bundle_js_code
             File.read(server_js_file)
           end
         rescue StandardError => e
-          msg = "You specified server rendering JS file: #{server_js_file}, but it cannot be "\
-                "read. You may set the server_bundle_js_file in your configuration to be \"\" to "\
+          msg = "You specified server rendering JS file: #{server_js_file}, but it cannot be " \
+                "read. You may set the server_bundle_js_file in your configuration to be \"\" to " \
                 "avoid this warning.\nError is: #{e}"
           raise ReactOnRails::Error, msg
         end
@@ -145,15 +144,15 @@ def create_js_context
           begin
             if ReactOnRails.configuration.trace
               Rails.logger.info do
-                "[react_on_rails] Created JavaScript context with file "\
+                "[react_on_rails] Created JavaScript context with file " \
                   "#{ReactOnRails::Utils.server_bundle_js_file_path}"
               end
             end
             ExecJS.compile(base_js_code)
           rescue StandardError => e
-            msg = "ERROR when compiling base_js_code! "\
-                  "See file #{file_name} to "\
-                  "correlate line numbers of error. Error is\n\n#{e.message}"\
+            msg = "ERROR when compiling base_js_code! " \
+                  "See file #{file_name} to " \
+                  "correlate line numbers of error. Error is\n\n#{e.message}" \
                   "\n\n#{e.backtrace.join("\n")}"
             Rails.logger.error(msg)
             trace_js_code_used("Error when compiling JavaScript code for the context.", base_js_code,
@@ -192,8 +191,8 @@ def execjs_timer_polyfills
 
         def undefined_for_exec_js_logging(function_name)
           if ReactOnRails.configuration.trace
-            "console.error('[React on Rails Rendering] #{function_name} is not defined for server rendering.');\n"\
-              "  console.error(getStackTrace().join('\\n'));"
+            "console.error('[React on Rails Rendering] #{function_name} is not defined for server rendering.');\n  " \
+              "console.error(getStackTrace().join('\\n'));"
           else
             ""
           end
@@ -235,6 +234,7 @@ def file_url_to_string(url)
           raise ReactOnRails::Error, msg
         end
       end
+      # rubocop:enable Metrics/ClassLength
     end
   end
 end

lib/react_on_rails/test_helper.rb

@@ -80,8 +80,8 @@ def self.ensure_assets_compiled(webpack_assets_status_checker: nil,
 
         unless @printed_once
           puts
-          puts "====> React On Rails: Checking files in "\
-               "#{webpack_assets_status_checker.generated_assets_full_path} for "\
+          puts "====> React On Rails: Checking files in " \
+               "#{webpack_assets_status_checker.generated_assets_full_path} for " \
                "outdated/missing bundles based on source_path #{source_path}"
           puts
           @printed_once = true

lib/react_on_rails/test_helper/webpack_assets_status_checker.rb

@@ -62,10 +62,10 @@ def all_compiled_assets
           else
             file_list = make_file_list(make_globs(generated_assets_full_path)).to_ary
             puts "V" * 80
-            puts "Please define config.webpack_generated_files (array) so the test helper knows "\
-                 "which files are required. If you are using webpacker, you typically need to only "\
+            puts "Please define config.webpack_generated_files (array) so the test helper knows " \
+                 "which files are required. If you are using webpacker, you typically need to only " \
                  "include 'manifest.json'."
-            puts "Detected the possible following files to check for webpack compilation in "\
+            puts "Detected the possible following files to check for webpack compilation in " \
                  "#{generated_assets_full_path}"
             puts file_list.join("\n")
             puts "^" * 80

lib/react_on_rails/utils.rb

@@ -201,7 +201,7 @@ def self.smart_trim(str, max_length = 1000)
     def self.find_most_recent_mtime(files)
       files.reduce(1.year.ago) do |newest_time, file|
         mt = File.mtime(file)
-        mt > newest_time ? mt : newest_time
+        [mt, newest_time].max
       end
     end
 

lib/react_on_rails/version_checker.rb

@@ -52,7 +52,7 @@ def raise_differing_versions_warning
     end
 
     def raise_node_semver_version_warning
-      msg = "**ERROR** ReactOnRails: Your node package version for react-on-rails contains a "\
+      msg = "**ERROR** ReactOnRails: Your node package version for react-on-rails contains a " \
             "^ or ~\n#{common_error_msg}"
       raise ReactOnRails::Error, msg
     end

lib/tasks/assets.rake

@@ -18,7 +18,7 @@ namespace :react_on_rails do
         elsif build_production_command.methods.include?(:call)
           build_production_command.call
         else
-          msg = "ReactonRails.configuration.build_production_command is improperly configured. "\
+          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)