Remove PackerUtils.packer method entirely and use Shakapacker directly

justin808 · claude · justin808 · commit 8d03cc6cd8f1 · 2025-09-22T16:00:19.000-10:00
- Eliminate the packer method abstraction completely - Replace all packer method calls with direct Shakapacker references - Update all tests to mock Shakapacker directly instead of the packer method - Add require "shakapacker" at module level for test compatibility - Remove all unnecessary abstraction layers as suggested in code review - Simplifies codebase by removing unnecessary indirection - All tests passing with direct Shakapacker usage 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com>
diff --git a/lib/react_on_rails/packer_utils.rb b/lib/react_on_rails/packer_utils.rb
@@ -1,20 +1,15 @@
 # frozen_string_literal: true
 
+require "shakapacker"
+
 module ReactOnRails
   module PackerUtils
-    def self.packer
-      @packer ||= begin
-        require "shakapacker"
-        ::Shakapacker
-      end
-    end
-
     def self.dev_server_running?
-      packer.dev_server.running?
+      Shakapacker.dev_server.running?
     end
 
     def self.dev_server_url
-      "#{packer.dev_server.protocol}://#{packer.dev_server.host_with_port}"
+      "#{Shakapacker.dev_server.protocol}://#{Shakapacker.dev_server.host_with_port}"
     end
 
     def self.shakapacker_version
@@ -47,14 +42,14 @@ def self.supports_basic_pack_generation?
 
     def self.supports_autobundling?
       min_version = ReactOnRails::PacksGenerator::MINIMUM_SHAKAPACKER_VERSION_FOR_AUTO_REGISTRATION
-      packer.config.respond_to?(:nested_entries?) && shakapacker_version_requirement_met?(min_version)
+      ::Shakapacker.config.respond_to?(:nested_entries?) && shakapacker_version_requirement_met?(min_version)
     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.
     def self.bundle_js_uri_from_packer(bundle_name)
-      hashed_bundle_name = packer.manifest.lookup!(bundle_name)
+      hashed_bundle_name = ::Shakapacker.manifest.lookup!(bundle_name)
 
       # Support for hashing the server-bundle and having that built
       # the webpack-dev-server is provided by the config value
@@ -63,7 +58,7 @@ def self.bundle_js_uri_from_packer(bundle_name)
       is_bundle_running_on_server = (bundle_name == ReactOnRails.configuration.server_bundle_js_file) ||
                                     (bundle_name == ReactOnRails.configuration.rsc_bundle_js_file)
 
-      if packer.dev_server.running? && (!is_bundle_running_on_server ||
+      if ::Shakapacker.dev_server.running? && (!is_bundle_running_on_server ||
         ReactOnRails.configuration.same_bundle_for_client_and_server)
         "#{dev_server_url}#{hashed_bundle_name}"
       else
@@ -72,7 +67,7 @@ def self.bundle_js_uri_from_packer(bundle_name)
     end
 
     def self.public_output_uri_path
-      "#{packer.config.public_output_path.relative_path_from(packer.config.public_path)}/"
+      "#{::Shakapacker.config.public_output_path.relative_path_from(::Shakapacker.config.public_path)}/"
     end
 
     # The function doesn't ensure that the asset exists.
@@ -91,36 +86,36 @@ def self.precompile?
     end
 
     def self.packer_source_path
-      packer.config.source_path
+      ::Shakapacker.config.source_path
     end
 
     def self.packer_source_entry_path
-      packer.config.source_entry_path
+      ::Shakapacker.config.source_entry_path
     end
 
     def self.nested_entries?
-      packer.config.nested_entries?
+      ::Shakapacker.config.nested_entries?
     end
 
     def self.packer_public_output_path
-      packer.config.public_output_path.to_s
+      ::Shakapacker.config.public_output_path.to_s
     end
 
     def self.manifest_exists?
-      packer.config.public_manifest_path.exist?
+      ::Shakapacker.config.public_manifest_path.exist?
     end
 
     def self.packer_source_path_explicit?
-      packer.config.send(:data)[:source_path].present?
+      ::Shakapacker.config.send(:data)[:source_path].present?
     end
 
     def self.check_manifest_not_cached
-      return unless packer.config.cache_manifest?
+      return unless ::Shakapacker.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/shakapacker.yml file and set cache_manifest to false for test.
+          To fix this: edit your config/shaka::Shakapacker.yml file and set cache_manifest to false for test.
       MSG
       puts wrap_message(msg)
       exit!
@@ -140,8 +135,8 @@ 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/shakapacker.yml to enable nested entries. for more information read
+        **ERROR** ReactOnRails: `nested_entries` is configured to be disabled in shaka::Shakapacker. Please update \
+        config/shaka::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
 
@@ -150,18 +145,18 @@ def self.raise_nested_entries_disabled
 
     def self.raise_shakapacker_version_incompatible_for_autobundling
       msg = <<~MSG
-        **ERROR** ReactOnRails: Please upgrade Shakapacker to version #{ReactOnRails::PacksGenerator::MINIMUM_SHAKAPACKER_VERSION_FOR_AUTO_REGISTRATION} or \
+        **ERROR** ReactOnRails: Please upgrade ::Shakapacker to version #{ReactOnRails::PacksGenerator::MINIMUM_SHAKAPACKER_VERSION_FOR_AUTO_REGISTRATION} or \
         above to use the automated bundle generation feature (which requires nested_entries support). \
         The currently installed version is #{ReactOnRails::PackerUtils.shakapacker_version}. \
-        Basic pack generation requires Shakapacker #{ReactOnRails::PacksGenerator::MINIMUM_SHAKAPACKER_VERSION} or above.
+        Basic pack generation requires ::Shakapacker #{ReactOnRails::PacksGenerator::MINIMUM_SHAKAPACKER_VERSION} or above.
       MSG
 
       raise ReactOnRails::Error, msg
     end
 
     def self.raise_shakapacker_version_incompatible_for_basic_pack_generation
       msg = <<~MSG
-        **ERROR** ReactOnRails: Please upgrade Shakapacker to version #{ReactOnRails::PacksGenerator::MINIMUM_SHAKAPACKER_VERSION} or \
+        **ERROR** ReactOnRails: Please upgrade ::Shakapacker to version #{ReactOnRails::PacksGenerator::MINIMUM_SHAKAPACKER_VERSION} or \
         above to use basic pack generation features. The currently installed version is #{ReactOnRails::PackerUtils.shakapacker_version}.
       MSG
 
@@ -170,7 +165,7 @@ def self.raise_shakapacker_version_incompatible_for_basic_pack_generation
 
     def self.raise_shakapacker_not_installed
       msg = <<~MSG
-        **ERROR** ReactOnRails: Missing Shakapacker gem. Please upgrade to use Shakapacker \
+        **ERROR** ReactOnRails: Missing ::Shakapacker gem. Please upgrade to use ::Shakapacker \
         #{ReactOnRails::PacksGenerator::MINIMUM_SHAKAPACKER_VERSION} or above to use the \
         automated bundle generation feature.
       MSG
diff --git a/spec/react_on_rails/packer_utils_spec.rb b/spec/react_on_rails/packer_utils_spec.rb
@@ -42,18 +42,18 @@ module ReactOnRails
 
       context "when dev server is running" do
         before do
-          allow(described_class.packer).to receive(:dev_server).and_return(
+          allow(::Shakapacker).to receive(:dev_server).and_return(
             instance_double(
-              ReactOnRails::PackerUtils.packer::DevServer,
+              ::Shakapacker::DevServer,
               running?: true,
               protocol: "http",
               host_with_port: "localhost:3035"
             )
           )
 
-          allow(described_class.packer).to receive_message_chain("config.public_output_path")
+          allow(::Shakapacker).to receive_message_chain("config.public_output_path")
             .and_return(Pathname.new(public_output_path))
-          allow(described_class.packer).to receive_message_chain("config.public_path")
+          allow(::Shakapacker).to receive_message_chain("config.public_path")
             .and_return(Pathname.new("/path/to/public"))
         end
 
@@ -65,8 +65,8 @@ module ReactOnRails
 
       context "when dev server is not running" do
         before do
-          allow(described_class.packer).to receive_message_chain("dev_server.running?").and_return(false)
-          allow(described_class.packer).to receive_message_chain("config.public_output_path")
+          allow(::Shakapacker).to receive_message_chain("dev_server.running?").and_return(false)
+          allow(::Shakapacker).to receive_message_chain("config.public_output_path")
             .and_return(Pathname.new(public_output_path))
         end
 
@@ -78,28 +78,28 @@ module ReactOnRails
     end
 
     describe ".supports_async_loading?" do
-      it "returns true when Shakapacker >= 8.2.0" do
+      it "returns true when ::Shakapacker >= 8.2.0" do
         allow(described_class).to receive(:shakapacker_version_requirement_met?).with("8.2.0").and_return(true)
 
         expect(described_class.supports_async_loading?).to be(true)
       end
 
-      it "returns false when Shakapacker < 8.2.0" do
+      it "returns false when ::Shakapacker < 8.2.0" do
         allow(described_class).to receive(:shakapacker_version_requirement_met?).with("8.2.0").and_return(false)
 
         expect(described_class.supports_async_loading?).to be(false)
       end
     end
 
     describe ".supports_basic_pack_generation?" do
-      it "returns true when Shakapacker >= 6.5.1" do
+      it "returns true when ::Shakapacker >= 6.5.1" do
         allow(described_class).to receive(:shakapacker_version_requirement_met?)
           .with(ReactOnRails::PacksGenerator::MINIMUM_SHAKAPACKER_VERSION).and_return(true)
 
         expect(described_class.supports_basic_pack_generation?).to be(true)
       end
 
-      it "returns false when Shakapacker < 6.5.1" do
+      it "returns false when ::Shakapacker < 6.5.1" do
         allow(described_class).to receive(:shakapacker_version_requirement_met?)
           .with(ReactOnRails::PacksGenerator::MINIMUM_SHAKAPACKER_VERSION).and_return(false)
 
@@ -108,22 +108,22 @@ module ReactOnRails
     end
 
     describe ".supports_autobundling?" do
-      let(:mock_config) { instance_double("Shakapacker::Config") } # rubocop:disable RSpec/VerifiedDoubleReference
-      let(:mock_packer) { instance_double("Shakapacker", config: mock_config) } # rubocop:disable RSpec/VerifiedDoubleReference
+      let(:mock_config) { instance_double("::Shakapacker::Config") } # rubocop:disable RSpec/VerifiedDoubleReference
+      let(:mock_packer) { instance_double("::Shakapacker", config: mock_config) } # rubocop:disable RSpec/VerifiedDoubleReference
 
       before do
-        allow(described_class).to receive(:packer).and_return(mock_packer)
+        allow(::Shakapacker).to receive(:config).and_return(mock_config)
       end
 
-      it "returns true when Shakapacker >= 7.0.0 with nested_entries support" do
+      it "returns true when ::Shakapacker >= 7.0.0 with nested_entries support" do
         allow(mock_config).to receive(:respond_to?).with(:nested_entries?).and_return(true)
         allow(described_class).to receive(:shakapacker_version_requirement_met?)
           .with(ReactOnRails::PacksGenerator::MINIMUM_SHAKAPACKER_VERSION_FOR_AUTO_REGISTRATION).and_return(true)
 
         expect(described_class.supports_autobundling?).to be(true)
       end
 
-      it "returns false when Shakapacker < 7.0.0" do
+      it "returns false when ::Shakapacker < 7.0.0" do
         allow(mock_config).to receive(:respond_to?).with(:nested_entries?).and_return(true)
         allow(described_class).to receive(:shakapacker_version_requirement_met?)
           .with(ReactOnRails::PacksGenerator::MINIMUM_SHAKAPACKER_VERSION_FOR_AUTO_REGISTRATION).and_return(false)
diff --git a/spec/react_on_rails/test_helper/webpack_assets_status_checker_spec.rb b/spec/react_on_rails/test_helper/webpack_assets_status_checker_spec.rb
@@ -62,7 +62,7 @@
         let(:fixture_dirname) { "assets_with_manifest_exist_server_bundle_separate" }
 
         before do
-          Packer = ReactOnRails::PackerUtils.packer # rubocop:disable Lint/ConstantDefinitionInBlock, RSpec/LeakyConstantDeclaration
+          Packer = Shakapacker # rubocop:disable Lint/ConstantDefinitionInBlock, RSpec/LeakyConstantDeclaration
           allow(ReactOnRails::PackerUtils).to receive_messages(
             manifest_exists?: true,
             packer_public_output_path: generated_assets_full_path
diff --git a/spec/react_on_rails/utils_spec.rb b/spec/react_on_rails/utils_spec.rb
