Fix Rubocop Error

shakacode · Jan 26, 2023 · ea1769b · ea1769b
1 parent a4bbcac
commit ea1769b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/lib/react_on_rails/helper.rb b/lib/react_on_rails/helper.rb
@@ -94,8 +94,8 @@ def react_component(component_name, options = {})
     end
 
     def load_pack_for_component(component_name)
-      component_pack_file_path = "#{generated_components_pack(component_name)}.#{PacksGenerator.generated_pack_extension}"
-      is_component_pack_present = File.exist?(component_pack_file_path)
+
+      is_component_pack_present = File.exist?(generated_components_pack_path(component_name))
       is_development = ENV["RAILS_ENV"] == "development"
 
       if is_development && !is_component_pack_present
@@ -109,8 +109,10 @@ def load_pack_for_component(component_name)
       append_stylesheet_pack_tag "generated/#{component_name}"
     end
 
-    def generated_components_pack(component_name)
-      "#{ReactOnRails::WebpackerUtils.webpacker_source_entry_path}/generated/#{component_name}"
+    def generated_components_pack_path(component_name)
+      extension = PacksGenerator.generated_pack_extension
+
+      "#{ReactOnRails::WebpackerUtils.webpacker_source_entry_path}/generated/#{component_name}.#{extension}"
     end
 
     # react_component_hash is used to return multiple HTML strings for server rendering, such as for

diff --git a/lib/react_on_rails/packs_generator.rb b/lib/react_on_rails/packs_generator.rb
@@ -9,7 +9,11 @@ class PacksGenerator
     MINIMUM_SHAKAPACKER_MAJOR_VERSION = 6
     MINIMUM_SHAKAPACKER_MINOR_VERSION = 5
     MINIMUM_SHAKAPACKER_PATCH_VERSION = 1
-    GENERATED_PACK_EXTENSION = "js".freeze
+    self.GENERATED_PACK_EXTENSION = "js"
+
+    class << self
+      attr_accessor :GENERATED_PACK_EXTENSION
+    end
 
     def self.generate
       packs_generator = PacksGenerator.new
@@ -21,10 +25,6 @@ def self.raise_nested_entries_disabled
       packs_generator.raise_nested_entries_disabled
     end
 
-    def self.generated_pack_extension
-      GENERATED_PACK_EXTENSION
-    end
-
     def verify_setup_and_generate_packs
       return unless components_subdirectory.present?
 
@@ -157,7 +157,7 @@ def relative_path(from, to)
     end
 
     def generated_pack_path(file_path)
-      "#{generated_packs_directory_path}/#{component_name(file_path)}.#{generated_pack_extension}"
+      "#{generated_packs_directory_path}/#{component_name(file_path)}.#{GENERATED_PACK_EXTENSION}"
     end
 
     def component_name(file_path)