Skip to content

Commit 01debc9

Browse files
committed
Additional fixes
1 parent 4ca3592 commit 01debc9

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

lib/react_on_rails/packer_utils.rb

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,10 @@ def self.shakapacker_version
5757
end
5858

5959
def self.shakapacker_version_as_array
60-
Gem::Version.new(shakapacker_version).segments
60+
match = shakapacker_version.match(ReactOnRails::VersionChecker::VERSION_PARTS_REGEX)
61+
62+
# match[4] is the pre-release version, not normally a number but something like "beta.1" or `nil`
63+
@shakapacker_version_as_array = [match[1].to_i, match[2].to_i, match[3].to_i, match[4]].compact
6164
end
6265

6366
def self.shakapacker_version_requirement_met?(required_version)
@@ -171,7 +174,7 @@ def self.raise_shakapacker_version_incompatible_for_autobundling
171174
msg = <<~MSG
172175
**ERROR** ReactOnRails: Please upgrade Shakapacker to version #{semver_to_string(ReactOnRails::PacksGenerator::MINIMUM_SHAKAPACKER_VERSION)} or \
173176
above to use the automated bundle generation feature. The currently installed version is \
174-
#{semver_to_string(ReactOnRails::PackerUtils.shakapacker_version_as_array)}.
177+
#{ReactOnRails::PackerUtils.shakapacker_version}.
175178
MSG
176179

177180
raise ReactOnRails::Error, msg
@@ -188,7 +191,7 @@ def self.raise_shakapacker_not_installed
188191
end
189192

190193
def self.semver_to_string(ary)
191-
"#{ary[0]}.#{ary[1]}.#{ary[2]}"
194+
ary.join(".")
192195
end
193196
end
194197
end

0 commit comments

Comments
 (0)