@@ -10,7 +10,7 @@ def self.using_shakapacker_const?
1010 return @using_shakapacker_const if defined? ( @using_shakapacker_const )
1111
1212 @using_shakapacker_const = ReactOnRails ::Utils . gem_available? ( "shakapacker" ) &&
13- shakapacker_version_requirement_met? ( [ 7 , 0 , 0 ] )
13+ shakapacker_version_requirement_met? ( "7.0.0" )
1414 end
1515
1616 def self . using_webpacker_const?
@@ -64,9 +64,7 @@ def self.shakapacker_version_as_array
6464 end
6565
6666 def self . shakapacker_version_requirement_met? ( required_version )
67- req_ver = semver_to_string ( required_version )
68-
69- Gem ::Version . new ( shakapacker_version ) >= Gem ::Version . new ( req_ver )
67+ Gem ::Version . new ( shakapacker_version ) >= Gem ::Version . new ( required_version )
7068 end
7169
7270 # This returns either a URL for the webpack-dev-server, non-server bundle or
@@ -172,7 +170,7 @@ def self.raise_nested_entries_disabled
172170
173171 def self . raise_shakapacker_version_incompatible_for_autobundling
174172 msg = <<~MSG
175- **ERROR** ReactOnRails: Please upgrade Shakapacker to version #{ semver_to_string ( ReactOnRails ::PacksGenerator ::MINIMUM_SHAKAPACKER_VERSION ) } or \
173+ **ERROR** ReactOnRails: Please upgrade Shakapacker to version #{ ReactOnRails ::PacksGenerator ::MINIMUM_SHAKAPACKER_VERSION } or \
176174 above to use the automated bundle generation feature. The currently installed version is \
177175 #{ ReactOnRails ::PackerUtils . shakapacker_version } .
178176 MSG
@@ -183,15 +181,11 @@ def self.raise_shakapacker_version_incompatible_for_autobundling
183181 def self . raise_shakapacker_not_installed
184182 msg = <<~MSG
185183 **ERROR** ReactOnRails: Missing Shakapacker gem. Please upgrade to use Shakapacker \
186- #{ semver_to_string ( ReactOnRails ::PacksGenerator ::MINIMUM_SHAKAPACKER_VERSION ) } or above to use the \
184+ #{ ReactOnRails ::PacksGenerator ::MINIMUM_SHAKAPACKER_VERSION } or above to use the \
187185 automated bundle generation feature.
188186 MSG
189187
190188 raise ReactOnRails ::Error , msg
191189 end
192-
193- def self . semver_to_string ( ary )
194- ary . join ( "." )
195- end
196190 end
197191end
0 commit comments