Merge pull request #1067 from Gregurevic/shakapacker-7-compatitiblity

Shakapacker 7 compatibility (#1066)
mileszs · Aug 17, 2023 · 3b99205 · 3b99205
2 parents 4abf255 + 995126b
commit 3b99205
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/lib/wicked_pdf/wicked_pdf_helper/assets.rb b/lib/wicked_pdf/wicked_pdf_helper/assets.rb
@@ -231,12 +231,11 @@ def running_in_development?
       end
 
       def webpacker_version
-        return unless defined?(Webpacker)
-
-        # If webpacker is used, need to check for version
-        require 'webpacker/version'
-
-        Webpacker::VERSION
+        if defined?(Shakapacker)
+          Shakapacker::VERSION
+        elsif defined?(Webpacker)
+          Webpacker::VERSION
+        end
       end
     end
   end