Fix Shakapacker version requirement from 8.2.0 to 8.0.0 for basic compatibility

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    react_on_rails (16.0.1.rc.0)
+    react_on_rails (16.0.1.rc.2)
       addressable
       connection_pool
       execjs (~> 2.5)

lib/generators/react_on_rails/base_generator.rb

@@ -41,7 +41,7 @@ def copy_base_files
         base_templates = %w[config/initializers/react_on_rails.rb]
         base_files.each { |file| copy_file("#{base_path}#{file}", file) }
         base_templates.each do |file|
-          template("#{base_path}/#{file}.tt", file, { packer_type: ReactOnRails::PackerUtils.packer_type })
+          template("#{base_path}/#{file}.tt", file)
         end
       end
 

lib/generators/react_on_rails/templates/base/base/config/initializers/react_on_rails.rb.tt

@@ -24,8 +24,8 @@ ReactOnRails.configure do |config|
   # to automatically refresh your webpack assets on every test run.
   #
   # Alternately, you can remove the `ReactOnRails::TestHelper.configure_rspec_to_compile_assets`
-  # and set the config/<%= config[:packer_type] %>.yml option for test to true.
-  config.build_test_command = "RAILS_ENV=test bin/<%= config[:packer_type] %>"
+  # and set the config/shakapacker.yml option for test to true.
+  config.build_test_command = "RAILS_ENV=test bin/shakapacker"
 
   ################################################################################
   ################################################################################

lib/react_on_rails/configuration.rb

@@ -180,7 +180,7 @@ def validate_generated_component_packs_loading_strategy
         1. Use :sync or :defer loading strategy instead of :async
         2. Upgrade to Shakapacker v8.2.0 or above to enable async script loading
       MSG
-      if PackerUtils.shakapacker_version_requirement_met?("8.2.0")
+      if PackerUtils.supports_async_loading?
         self.generated_component_packs_loading_strategy ||= :async
       elsif generated_component_packs_loading_strategy.nil?
         Rails.logger.warn("**WARNING** #{msg}")
@@ -198,11 +198,8 @@ def check_autobundling_requirements
       raise_missing_components_subdirectory if auto_load_bundle && !components_subdirectory.present?
       return unless components_subdirectory.present?
 
-      ReactOnRails::PackerUtils.raise_shakapacker_not_installed unless ReactOnRails::PackerUtils.using_packer?
       ReactOnRails::PackerUtils.raise_shakapacker_version_incompatible_for_autobundling unless
-        ReactOnRails::PackerUtils.shakapacker_version_requirement_met?(
-          ReactOnRails::PacksGenerator::MINIMUM_SHAKAPACKER_VERSION
-        )
+        ReactOnRails::PackerUtils.supports_auto_registration?
       ReactOnRails::PackerUtils.raise_nested_entries_disabled unless ReactOnRails::PackerUtils.nested_entries?
     end
 
@@ -221,8 +218,8 @@ def adjust_precompile_task
         # We set it very big so that it is not used, and then clean just
         # removes files older than 1 hour.
         versions = 100_000
-        puts "Invoking task #{ReactOnRails::PackerUtils.packer_type}:clean from React on Rails"
-        Rake::Task["#{ReactOnRails::PackerUtils.packer_type}:clean"].invoke(versions)
+        puts "Invoking task shakapacker:clean from React on Rails"
+        Rake::Task["shakapacker:clean"].invoke(versions)
       }
 
       if Rake::Task.task_defined?("assets:precompile")
@@ -237,22 +234,20 @@ def adjust_precompile_task
     end
 
     def error_if_using_packer_and_generated_assets_dir_not_match_public_output_path
-      return unless ReactOnRails::PackerUtils.using_packer?
-
       return if generated_assets_dir.blank?
 
       packer_public_output_path = ReactOnRails::PackerUtils.packer_public_output_path
 
       if File.expand_path(generated_assets_dir) == packer_public_output_path.to_s
         Rails.logger.warn("You specified generated_assets_dir in `config/initializers/react_on_rails.rb` " \
-                          "with #{ReactOnRails::PackerUtils.packer_type}. " \
+                          "with shakapacker. " \
                           "Remove this line from your configuration file.")
       else
         msg = <<~MSG
-          Error configuring /config/initializers/react_on_rails.rb: You are using #{ReactOnRails::PackerUtils.packer_type}
+          Error configuring /config/initializers/react_on_rails.rb: You are using shakapacker
           and your specified value for generated_assets_dir = #{generated_assets_dir}
           that does not match the value for public_output_path specified in
-          #{ReactOnRails::PackerUtils.packer_type}.yml = #{packer_public_output_path}. You should remove the configuration
+          shakapacker.yml = #{packer_public_output_path}. You should remove the configuration
           value for "generated_assets_dir" from your config/initializers/react_on_rails.rb file.
         MSG
         raise ReactOnRails::Error, msg
@@ -272,7 +267,7 @@ def check_server_render_method_is_only_execjs
     end
 
     def ensure_generated_assets_dir_present
-      return if generated_assets_dir.present? || ReactOnRails::PackerUtils.using_packer?
+      return if generated_assets_dir.present?
 
       self.generated_assets_dir = DEFAULT_GENERATED_ASSETS_DIR
       Rails.logger.warn "ReactOnRails: Set generated_assets_dir to default: #{DEFAULT_GENERATED_ASSETS_DIR}"
@@ -281,27 +276,14 @@ def ensure_generated_assets_dir_present
     def configure_generated_assets_dirs_deprecation
       return if generated_assets_dirs.blank?
 
-      if ReactOnRails::PackerUtils.using_packer?
-        packer_public_output_path = ReactOnRails::PackerUtils.packer_public_output_path
-        # rubocop:disable Layout/LineLength
-        packer_name = ReactOnRails::PackerUtils.packer_type&.upcase_first
-
-        Rails.logger.warn "Error configuring config/initializers/react_on_rails. Define neither the generated_assets_dirs nor " \
-                          "the generated_assets_dir when using #{packer_name}. This is defined by " \
-                          "public_output_path specified in #{ReactOnRails::PackerUtils.packer_type}.yml = #{packer_public_output_path}."
-        # rubocop:enable Layout/LineLength
-        return
-      end
+      packer_public_output_path = ReactOnRails::PackerUtils.packer_public_output_path
+      # rubocop:disable Layout/LineLength
+      packer_name = "Shakapacker"
 
-      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 Shakapacker " \
-                          "and define neither if using Webpacker"
-      end
+      Rails.logger.warn "Error configuring config/initializers/react_on_rails. Define neither the generated_assets_dirs nor " \
+                        "the generated_assets_dir when using #{packer_name}. This is defined by " \
+                        "public_output_path specified in shakapacker.yml = #{packer_public_output_path}."
+      # rubocop:enable Layout/LineLength
     end
 
     def ensure_webpack_generated_files_exists
@@ -333,17 +315,15 @@ def raise_missing_components_subdirectory
     end
 
     def compile_command_conflict_message
-      packer_name = ReactOnRails::PackerUtils.packer_type.upcase_first
-      packer_type = ReactOnRails::PackerUtils.packer_type
       <<~MSG
 
-        React on Rails and #{packer_name} error in configuration!
+        React on Rails and Shakapacker error in configuration!
         In order to use config/react_on_rails.rb config.build_production_command,
-        you must edit config/#{packer_type}.yml to include this value in the default configuration:
-        '#{packer_type}_precompile: false'
+        you must edit config/shakapacker.yml to include this value in the default configuration:
+        'shakapacker_precompile: false'
 
         Alternatively, remove the config/react_on_rails.rb config.build_production_command and the
-        default bin/#{packer_type} script will be used for assets:precompile.
+        default bin/shakapacker script will be used for assets:precompile.
 
       MSG
     end

lib/react_on_rails/packer_utils.rb

@@ -2,33 +2,12 @@
 
 module ReactOnRails
   module PackerUtils
-    def self.using_packer?
-      using_shakapacker_const?
-    end
-
-    def self.using_shakapacker_const?
-      return @using_shakapacker_const if defined?(@using_shakapacker_const)
-
-      @using_shakapacker_const = ReactOnRails::Utils.gem_available?("shakapacker") &&
-                                 shakapacker_version_requirement_met?("8.2.0")
-    end
-
-    def self.packer_type
-      return "shakapacker" if using_shakapacker_const?
-
-      nil
-    end
-
     def self.packer
-      return nil unless using_packer?
-
       require "shakapacker"
       ::Shakapacker
     end
 
     def self.dev_server_running?
-      return false unless using_packer?
-
       packer.dev_server.running?
     end
 
@@ -38,7 +17,6 @@ def self.dev_server_url
 
     def self.shakapacker_version
       return @shakapacker_version if defined?(@shakapacker_version)
-      return nil unless ReactOnRails::Utils.gem_available?("shakapacker")
 
       @shakapacker_version = Gem.loaded_specs["shakapacker"].version.to_s
     end
@@ -56,6 +34,15 @@ def self.shakapacker_version_requirement_met?(required_version)
       Gem::Version.new(shakapacker_version) >= Gem::Version.new(required_version)
     end
 
+    def self.supports_async_loading?
+      shakapacker_version_requirement_met?("8.2.0")
+    end
+
+    def self.supports_auto_registration?
+      packer.config.respond_to?(:nested_entries?) &&
+        shakapacker_version_requirement_met?("7.0.0")
+    end
+
     # This returns either a URL for the webpack-dev-server, non-server bundle or
     # the hashed server bundle if using the same bundle for the client.
     # Otherwise returns a file path.
@@ -93,9 +80,7 @@ def self.asset_uri_from_packer(asset_name)
     end
 
     def self.precompile?
-      return ::Shakapacker.config.shakapacker_precompile? if using_shakapacker_const?
-
-      false
+      ::Shakapacker.config.shakapacker_precompile?
     end
 
     def self.packer_source_path
@@ -123,12 +108,12 @@ def self.packer_source_path_explicit?
     end
 
     def self.check_manifest_not_cached
-      return unless using_packer? && packer.config.cache_manifest?
+      return unless packer.config.cache_manifest?
 
       msg = <<-MSG.strip_heredoc
           ERROR: you have enabled cache_manifest in the #{Rails.env} env when using the
           ReactOnRails::TestHelper.configure_rspec_to_compile_assets helper
-          To fix this: edit your config/#{packer_type}.yml file and set cache_manifest to false for test.
+          To fix this: edit your config/shakapacker.yml file and set cache_manifest to false for test.
       MSG
       puts wrap_message(msg)
       exit!
@@ -149,7 +134,7 @@ def self.webpack_assets_status_checker
     def self.raise_nested_entries_disabled
       msg = <<~MSG
         **ERROR** ReactOnRails: `nested_entries` is configured to be disabled in shakapacker. Please update \
-        config/#{packer_type}.yml to enable nested entries. for more information read
+        config/shakapacker.yml to enable nested entries. for more information read
         https://www.shakacode.com/react-on-rails/docs/guides/file-system-based-automated-bundle-generation.md#enable-nested_entries-for-shakapacker
       MSG
 

lib/react_on_rails/system_checker.rb

@@ -618,14 +618,13 @@ def report_shakapacker_version_with_threshold
           version = shakapacker_match[1].strip
 
           begin
-            # Use proper semantic version comparison
-            version_obj = Gem::Version.new(version)
-            threshold_version = Gem::Version.new("8.2")
+            # Validate version string format
+            Gem::Version.new(version)
 
-            if version_obj >= threshold_version
+            if ReactOnRails::PackerUtils.supports_auto_registration?
               add_success("✅ Shakapacker #{version} (supports React on Rails auto-registration)")
             else
-              add_warning("⚠️  Shakapacker #{version} - Version 8.2+ needed for React on Rails auto-registration")
+              add_warning("⚠️  Shakapacker #{version} - Version 7.0+ needed for React on Rails auto-registration")
             end
           rescue ArgumentError
             # Fallback for invalid version strings

lib/react_on_rails/test_helper.rb

@@ -86,10 +86,9 @@ def self.ensure_assets_compiled(webpack_assets_status_checker: nil,
           puts
           @printed_once = true
 
-          if ReactOnRails::PackerUtils.using_packer? &&
-             ReactOnRails::Utils.using_packer_source_path_is_not_defined_and_custom_node_modules?
+          if ReactOnRails::Utils.using_packer_source_path_is_not_defined_and_custom_node_modules?
             msg = <<-MSG.strip_heredoc
-              WARNING: Define config/#{ReactOnRails::PackerUtils.packer_type}.yml to include sourcePath to configure
+              WARNING: Define config/shakapacker.yml to include sourcePath to configure
               the location of your JavaScript source for React on Rails.
               Default location of #{source_path} is used.
             MSG

lib/react_on_rails/test_helper/webpack_assets_compiler.rb

@@ -16,7 +16,7 @@ def compile_assets
 
             React on Rails is aborting your test run
 
-            If you wish to use the config/#{ReactOnRails::PackerUtils.packer_type}.yml compile option for tests
+            If you wish to use the config/shakapacker.yml compile option for tests
             them remove your call to the ReactOnRails test helper.
           MSG
           puts Rainbow(msg).red

lib/react_on_rails/test_helper/webpack_assets_status_checker.rb

@@ -31,8 +31,7 @@ def stale_generated_webpack_files
       end
 
       def stale_generated_files(files)
-        manifest_needed = ReactOnRails::PackerUtils.using_packer? &&
-                          !ReactOnRails::PackerUtils.manifest_exists?
+        manifest_needed = !ReactOnRails::PackerUtils.manifest_exists?
 
         return ["manifest.json"] if manifest_needed
 

lib/react_on_rails/utils.rb

@@ -7,7 +7,7 @@
 require "active_support/core_ext/string"
 
 module ReactOnRails
-  module Utils # rubocop:disable Metrics/ModuleLength
+  module Utils
     TRUNCATION_FILLER = "\n... TRUNCATED #{
       Rainbow('To see the full output, set FULL_TEXT_ERRORS=true.').red
     } ...\n".freeze
@@ -78,22 +78,20 @@ def self.bundle_js_file_path(bundle_name)
       #    a. The webpack manifest plugin would have a race condition where the same manifest.json
       #       is edited by both the webpack-dev-server
       #    b. There is no good reason to hash the server bundle name.
-      if ReactOnRails::PackerUtils.using_packer? && bundle_name != "manifest.json"
+      if bundle_name == "manifest.json"
+        # Default to the non-hashed name in the specified output directory, which, for legacy
+        # React on Rails, this is the output directory picked up by the asset pipeline.
+        # For Shakapacker, this is the public output path defined in the (shaka/web)packer.yml file.
+        File.join(generated_assets_full_path, bundle_name)
+      else
         begin
           ReactOnRails::PackerUtils.bundle_js_uri_from_packer(bundle_name)
-        rescue Object.const_get(
-          ReactOnRails::PackerUtils.packer_type.capitalize
-        )::Manifest::MissingEntryError
+        rescue Shakapacker::Manifest::MissingEntryError
           File.expand_path(
             File.join(ReactOnRails::PackerUtils.packer_public_output_path,
                       bundle_name)
           )
         end
-      else
-        # Default to the non-hashed name in the specified output directory, which, for legacy
-        # React on Rails, this is the output directory picked up by the asset pipeline.
-        # For Shakapacker, this is the public output path defined in the (shaka/web)packer.yml file.
-        File.join(generated_assets_full_path, bundle_name)
       end
     end
 
@@ -115,11 +113,7 @@ def self.react_client_manifest_file_path
       return @react_client_manifest_path if @react_client_manifest_path && !Rails.env.development?
 
       file_name = ReactOnRails.configuration.react_client_manifest_file
-      @react_client_manifest_path = if ReactOnRails::PackerUtils.using_packer?
-                                      ReactOnRails::PackerUtils.asset_uri_from_packer(file_name)
-                                    else
-                                      File.join(generated_assets_full_path, file_name)
-                                    end
+      @react_client_manifest_path = ReactOnRails::PackerUtils.asset_uri_from_packer(file_name)
     end
 
     # React Server Manifest is generated by the server bundle.
@@ -161,26 +155,16 @@ def self.prepend_cd_node_modules_directory(cmd)
     end
 
     def self.source_path
-      if ReactOnRails::PackerUtils.using_packer?
-        ReactOnRails::PackerUtils.packer_source_path
-      else
-        ReactOnRails.configuration.node_modules_location
-      end
+      ReactOnRails::PackerUtils.packer_source_path
     end
 
     def self.using_packer_source_path_is_not_defined_and_custom_node_modules?
-      return false unless ReactOnRails::PackerUtils.using_packer?
-
       !ReactOnRails::PackerUtils.packer_source_path_explicit? &&
         ReactOnRails.configuration.node_modules_location.present?
     end
 
     def self.generated_assets_full_path
-      if ReactOnRails::PackerUtils.using_packer?
-        ReactOnRails::PackerUtils.packer_public_output_path
-      else
-        File.expand_path(ReactOnRails.configuration.generated_assets_dir)
-      end
+      ReactOnRails::PackerUtils.packer_public_output_path
     end
 
     def self.gem_available?(name)

spec/dummy/spec/helpers/react_on_rails_helper_spec.rb

@@ -3,16 +3,14 @@
 require "rails_helper"
 require "support/script_tag_utils"
 
-Packer = Object.const_get(ReactOnRails::PackerUtils.packer_type.capitalize)
-
 class PlainReactOnRailsHelper
   include ReactOnRailsHelper
   include ActionView::Helpers::TagHelper
 end
 
 # rubocop:disable Metrics/BlockLength
 describe ReactOnRailsHelper do
-  include Packer::Helper
+  include Shakapacker::Helper
 
   before do
     allow(self).to receive(:request) {