From 85218621c44a7d1154079111721cd19a378c3b78 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Tue, 14 Dec 2021 08:46:00 -0800 Subject: [PATCH 1/5] Cut down on the necessary dependencies We only need a few things. --- Gemfile.lock | 4 +++- importmap-rails.gemspec | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 41b03fb..0761bc9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,7 +2,9 @@ PATH remote: . specs: importmap-rails (0.9.4) - rails (>= 6.0.0) + actionpack (>= 6.0.0) + activesupport (>= 6.0.0) + railties (>= 6.0.0) GEM remote: https://rubygems.org/ diff --git a/importmap-rails.gemspec b/importmap-rails.gemspec index 95091c8..c96ddd3 100644 --- a/importmap-rails.gemspec +++ b/importmap-rails.gemspec @@ -15,5 +15,7 @@ Gem::Specification.new do |spec| spec.files = Dir["{app,config,db,lib}/**/*", "MIT-LICENSE", "Rakefile", "README.md"] spec.required_ruby_version = ">= 2.7.0" - spec.add_dependency "rails", ">= 6.0.0" + spec.add_dependency "railties", ">= 6.0.0" + spec.add_dependency "actionpack", ">= 6.0.0" + spec.add_dependency "activesupport", ">= 6.0.0" end From 4d4e5062fa5c7c7cb94c91664a961b2665302414 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Tue, 14 Dec 2021 08:48:53 -0800 Subject: [PATCH 2/5] Already a dependency of actionpack --- importmap-rails.gemspec | 1 - 1 file changed, 1 deletion(-) diff --git a/importmap-rails.gemspec b/importmap-rails.gemspec index c96ddd3..5f13a13 100644 --- a/importmap-rails.gemspec +++ b/importmap-rails.gemspec @@ -17,5 +17,4 @@ Gem::Specification.new do |spec| spec.required_ruby_version = ">= 2.7.0" spec.add_dependency "railties", ">= 6.0.0" spec.add_dependency "actionpack", ">= 6.0.0" - spec.add_dependency "activesupport", ">= 6.0.0" end From f2545c9762798b304d646dd6fee0b62ed8b409ad Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Tue, 14 Dec 2021 08:51:22 -0800 Subject: [PATCH 3/5] Already a dependency of actionpack --- Gemfile.lock | 1 - 1 file changed, 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 0761bc9..b2f697e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -3,7 +3,6 @@ PATH specs: importmap-rails (0.9.4) actionpack (>= 6.0.0) - activesupport (>= 6.0.0) railties (>= 6.0.0) GEM From 42e701a49892bfbd6723496220ce694ce04ddf69 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Tue, 14 Dec 2021 08:56:43 -0800 Subject: [PATCH 4/5] Latest platforms --- Gemfile.lock | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index b2f697e..34a23ce 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -175,6 +175,7 @@ PLATFORMS arm64-darwin-20 arm64-darwin-21 x86_64-darwin-20 + x86_64-darwin-21 x86_64-linux DEPENDENCIES @@ -191,4 +192,4 @@ DEPENDENCIES webdrivers BUNDLED WITH - 2.2.30 + 2.2.33 From 3b00c984fc9d99539cf20edd8f482f8486de09c4 Mon Sep 17 00:00:00 2001 From: Richard Macklin <1863540+rmacklin@users.noreply.github.com> Date: Tue, 14 Dec 2021 09:21:30 -0800 Subject: [PATCH 5/5] Update additional lockfiles (#85) This can be done through the appraisal gem via `bundle exec appraisal install` or just through bundler via `for gemfile in $(ls gemfiles/*.gemfile); do BUNDLE_GEMFILE="$gemfile" bundle; done` --- gemfiles/rails_7_propshaft.gemfile.lock | 3 ++- gemfiles/rails_7_sprockets.gemfile.lock | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/gemfiles/rails_7_propshaft.gemfile.lock b/gemfiles/rails_7_propshaft.gemfile.lock index f6ed6bd..ad682c1 100644 --- a/gemfiles/rails_7_propshaft.gemfile.lock +++ b/gemfiles/rails_7_propshaft.gemfile.lock @@ -2,7 +2,8 @@ PATH remote: .. specs: importmap-rails (0.9.4) - rails (>= 6.0.0) + actionpack (>= 6.0.0) + railties (>= 6.0.0) GEM remote: https://rubygems.org/ diff --git a/gemfiles/rails_7_sprockets.gemfile.lock b/gemfiles/rails_7_sprockets.gemfile.lock index 93acafd..a8a5762 100644 --- a/gemfiles/rails_7_sprockets.gemfile.lock +++ b/gemfiles/rails_7_sprockets.gemfile.lock @@ -2,7 +2,8 @@ PATH remote: .. specs: importmap-rails (0.9.4) - rails (>= 6.0.0) + actionpack (>= 6.0.0) + railties (>= 6.0.0) GEM remote: https://rubygems.org/