Skip to content

Commit c86d3e4

Browse files
committed
Fix exact Pro gem pinning in rsc-pro auto-install
1 parent 7c0ecb8 commit c86d3e4

2 files changed

Lines changed: 5 additions & 3 deletions

File tree

react_on_rails/lib/generators/react_on_rails/pro_setup.rb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -483,7 +483,9 @@ def server_client_import_ready?
483483
end
484484

485485
def pro_gem_auto_install_command
486-
"bundle add #{PRO_GEM_NAME} --version='#{pro_gem_version_requirement}' --strict"
486+
command = "bundle add #{PRO_GEM_NAME} --version='#{pro_gem_version_requirement}'"
487+
command += " --strict" unless use_rsc_pro_mode?
488+
command
487489
end
488490

489491
def pro_gem_version_requirement

react_on_rails/spec/react_on_rails/generators/install_generator_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2881,7 +2881,7 @@ class ActiveSupport::TestCase
28812881
expect(install_generator.send(:missing_pro_gem?)).to be true
28822882
expect(Bundler).to have_received(:with_unbundled_env)
28832883
expect(Process).to have_received(:spawn)
2884-
.with("bundle add react_on_rails_pro --version='#{expected_pro_version}' --strict",
2884+
.with("bundle add react_on_rails_pro --version='#{expected_pro_version}'",
28852885
out: anything,
28862886
err: anything)
28872887
error_text = GeneratorMessages.messages.join("\n")
@@ -2895,7 +2895,7 @@ class ActiveSupport::TestCase
28952895

28962896
expect(install_generator.send(:missing_pro_gem?)).to be true
28972897
expect(Process).to have_received(:spawn)
2898-
.with("bundle add react_on_rails_pro --version='16.4.0.rc.5' --strict",
2898+
.with("bundle add react_on_rails_pro --version='16.4.0.rc.5'",
28992899
out: anything,
29002900
err: anything)
29012901
error_text = GeneratorMessages.messages.join("\n")

0 commit comments

Comments
 (0)