Skip to content

Commit 63760be

Browse files
committed
Remove semver_to_string
1 parent 01debc9 commit 63760be

File tree

4 files changed

+8
-14
lines changed

4 files changed

+8
-14
lines changed

lib/react_on_rails/configuration.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ def validate_generated_component_packs_loading_strategy
180180
1. Use :sync or :defer loading strategy instead of :async
181181
2. Upgrade to Shakapacker v8.2.0 or above to enable async script loading
182182
MSG
183-
if PackerUtils.shakapacker_version_requirement_met?([8, 2, 0])
183+
if PackerUtils.shakapacker_version_requirement_met?("8.2.0")
184184
self.generated_component_packs_loading_strategy ||= :async
185185
elsif generated_component_packs_loading_strategy.nil?
186186
Rails.logger.warn("**WARNING** #{msg}")

lib/react_on_rails/packer_utils.rb

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -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
197191
end

lib/react_on_rails/packs_generator.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ module ReactOnRails
66
# rubocop:disable Metrics/ClassLength
77
class PacksGenerator
88
CONTAINS_CLIENT_OR_SERVER_REGEX = /\.(server|client)($|\.)/
9-
MINIMUM_SHAKAPACKER_VERSION = [6, 5, 1].freeze
9+
MINIMUM_SHAKAPACKER_VERSION = "6.5.1"
1010

1111
def self.instance
1212
@instance ||= PacksGenerator.new

spec/react_on_rails/packer_utils_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
module ReactOnRails
66
describe PackerUtils do
77
describe ".shakapacker_version_requirement_met?" do
8-
minimum_version = [6, 5, 3]
8+
minimum_version = "6.5.3"
99

1010
it "returns false when version is lower than minimum_version" do
1111
allow(described_class).to receive(:shakapacker_version).and_return("6.5.0")
@@ -31,7 +31,7 @@ module ReactOnRails
3131
allow(described_class).to receive(:shakapacker_version).and_return("6.5.4")
3232
expect(described_class.shakapacker_version_requirement_met?(minimum_version)).to be(true)
3333

34-
allow(described_class).to receive(:shakapacker_version).and_return("7.7.7")
34+
allow(described_class).to receive(:shakapacker_version).and_return("7.0.0")
3535
expect(described_class.shakapacker_version_requirement_met?(minimum_version)).to be(true)
3636
end
3737
end

0 commit comments

Comments
 (0)