Skip to content

Commit

Permalink
Update Ruby and Node dependencies
Browse files Browse the repository at this point in the history 
On Rails 7.0, lock concurrent-ruby to 1.3.4 to address rails/rails#54260

Rails 7.0 bundle has been updated with 3.3.x:

```
rvm use 3.3.6 do bash -c "BUNDLE_GEMFILE=gemfiles/rails_70/Gemfile bundle update"
```

Additionally, add a workaround to make sure that the test application
uses Tailwind v3. The current cssbundling-rails approach 

Close #8611

Ref: rails/cssbundling-rails#163
  • Loading branch information
@tagliala
tagliala committed Jan 26, 2025
1 parent c5dd8e4 commit ba9d02c
Show file tree
Hide file tree
Showing 8 changed files with 818 additions and 764 deletions.
37 changes: 21 additions & 16 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ GEM
xpath (~> 3.2)
childprocess (5.1.0)
logger (~> 1.5)
concurrent-ruby (1.3.4)
concurrent-ruby (1.3.5)
connection_pool (2.5.0)
crass (1.0.6)
cssbundling-rails (1.4.1)
Expand All @@ -138,7 +138,7 @@ GEM
bigdecimal
cucumber-gherkin (27.0.0)
cucumber-messages (>= 19.1.4, < 23)
cucumber-html-formatter (21.7.0)
cucumber-html-formatter (21.8.0)
cucumber-messages (> 19, < 27)
cucumber-messages (22.0.0)
cucumber-rails (3.1.0)
Expand Down Expand Up @@ -190,7 +190,7 @@ GEM
activesupport (>= 5.2)
highline (3.1.2)
reline
i18n (1.14.6)
i18n (1.14.7)
concurrent-ruby (~> 1.0)
i18n-spec (0.6.0)
iso
Expand All @@ -214,7 +214,8 @@ GEM
railties (>= 7.0)
responders (>= 2)
io-console (0.8.0)
irb (1.14.3)
irb (1.15.1)
pp (>= 0.6.0)
rdoc (>= 4.0.0)
reline (>= 0.4.2)
iso (0.4.0)
Expand All @@ -233,9 +234,10 @@ GEM
kaminari-core (= 1.2.2)
kaminari-core (1.2.2)
language_server-protocol (3.17.0.3)
launchy (3.0.1)
launchy (3.1.0)
addressable (~> 2.8)
childprocess (~> 5.0)
logger (~> 1.6)
logger (1.6.5)
loofah (2.24.0)
crass (~> 1.0.2)
Expand All @@ -259,22 +261,25 @@ GEM
timeout
net-smtp (0.5.0)
nio4r (2.7.4)
nokogiri (1.18.1-aarch64-linux-gnu)
nokogiri (1.18.2-aarch64-linux-gnu)
racc (~> 1.4)
nokogiri (1.18.1-arm64-darwin)
nokogiri (1.18.2-arm64-darwin)
racc (~> 1.4)
nokogiri (1.18.1-x86_64-darwin)
nokogiri (1.18.2-x86_64-darwin)
racc (~> 1.4)
nokogiri (1.18.1-x86_64-linux-gnu)
nokogiri (1.18.2-x86_64-linux-gnu)
racc (~> 1.4)
orm_adapter (0.5.0)
parallel (1.26.3)
parallel_tests (4.9.0)
parallel
parser (3.3.6.0)
parser (3.3.7.0)
ast (~> 2.4.1)
racc
psych (5.2.2)
pp (0.6.2)
prettyprint
prettyprint (0.2.0)
psych (5.2.3)
date
stringio
public_suffix (6.0.1)
Expand Down Expand Up @@ -327,7 +332,7 @@ GEM
activerecord (>= 6.1.5)
activesupport (>= 6.1.5)
i18n
rdoc (6.10.0)
rdoc (6.11.0)
psych (>= 4.0.0)
regexp_parser (2.10.0)
reline (0.6.0)
Expand Down Expand Up @@ -355,7 +360,7 @@ GEM
rspec-mocks (~> 3.13)
rspec-support (~> 3.13)
rspec-support (3.13.2)
rubocop (1.70.0)
rubocop (1.71.0)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
Expand All @@ -374,12 +379,12 @@ GEM
rubocop-performance (1.23.1)
rubocop (>= 1.48.1, < 2.0)
rubocop-ast (>= 1.31.1, < 2.0)
rubocop-rails (2.28.0)
rubocop-rails (2.29.1)
activesupport (>= 4.2.0)
rack (>= 1.1)
rubocop (>= 1.52.0, < 2.0)
rubocop-ast (>= 1.31.1, < 2.0)
rubocop-rspec (3.3.0)
rubocop-rspec (3.4.0)
rubocop (~> 1.61)
ruby-progressbar (1.13.0)
ruby2_keywords (0.0.5)
Expand Down Expand Up @@ -469,4 +474,4 @@ DEPENDENCIES
webrick

BUNDLED WITH
2.6.2
2.6.3
2 changes: 2 additions & 0 deletions gemfiles/rails_70/Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ group :development, :test do
gem "cssbundling-rails"
gem "importmap-rails"

gem "concurrent-ruby", "1.3.4" # Ref: rails/rails#54260

# FIXME: relax this dependency when Ruby 3.1 support will be dropped
gem "zeitwerk", "~> 2.6.18"
end
Expand Down
18 changes: 10 additions & 8 deletions gemfiles/rails_70/Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ GEM
bigdecimal
cucumber-gherkin (27.0.0)
cucumber-messages (>= 19.1.4, < 23)
cucumber-html-formatter (21.7.0)
cucumber-html-formatter (21.8.0)
cucumber-messages (> 19, < 27)
cucumber-messages (22.0.0)
cucumber-rails (3.1.0)
Expand Down Expand Up @@ -180,7 +180,7 @@ GEM
activesupport (>= 5.2)
highline (3.1.2)
reline
i18n (1.14.6)
i18n (1.14.7)
concurrent-ruby (~> 1.0)
i18n-spec (0.6.0)
iso
Expand Down Expand Up @@ -218,9 +218,10 @@ GEM
activerecord
kaminari-core (= 1.2.2)
kaminari-core (1.2.2)
launchy (3.0.1)
launchy (3.1.0)
addressable (~> 2.8)
childprocess (~> 5.0)
logger (~> 1.6)
logger (1.6.5)
loofah (2.24.0)
crass (~> 1.0.2)
Expand All @@ -247,18 +248,18 @@ GEM
net-smtp (0.5.0)
net-protocol
nio4r (2.7.4)
nokogiri (1.18.1)
nokogiri (1.18.2)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
nokogiri (1.18.1-arm64-darwin)
nokogiri (1.18.2-arm64-darwin)
racc (~> 1.4)
nokogiri (1.18.1-x86_64-linux-gnu)
nokogiri (1.18.2-x86_64-linux-gnu)
racc (~> 1.4)
orm_adapter (0.5.0)
parallel (1.26.3)
parallel_tests (4.9.0)
parallel
parser (3.3.6.0)
parser (3.3.7.0)
ast (~> 2.4.1)
racc
public_suffix (6.0.1)
Expand Down Expand Up @@ -381,6 +382,7 @@ DEPENDENCIES
activeadmin!
cancancan
capybara
concurrent-ruby (= 1.3.4)
cssbundling-rails
cucumber
cucumber-rails
Expand All @@ -406,4 +408,4 @@ DEPENDENCIES
zeitwerk (~> 2.6.18)

BUNDLED WITH
2.6.2
2.6.3
29 changes: 17 additions & 12 deletions gemfiles/rails_71/Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ GEM
xpath (~> 3.2)
childprocess (5.1.0)
logger (~> 1.5)
concurrent-ruby (1.3.4)
concurrent-ruby (1.3.5)
connection_pool (2.5.0)
crass (1.0.6)
cssbundling-rails (1.4.1)
Expand All @@ -144,7 +144,7 @@ GEM
bigdecimal
cucumber-gherkin (27.0.0)
cucumber-messages (>= 19.1.4, < 23)
cucumber-html-formatter (21.7.0)
cucumber-html-formatter (21.8.0)
cucumber-messages (> 19, < 27)
cucumber-messages (22.0.0)
cucumber-rails (3.1.0)
Expand Down Expand Up @@ -195,7 +195,7 @@ GEM
activesupport (>= 5.2)
highline (3.1.2)
reline
i18n (1.14.6)
i18n (1.14.7)
concurrent-ruby (~> 1.0)
i18n-spec (0.6.0)
iso
Expand All @@ -219,7 +219,8 @@ GEM
railties (>= 7.0)
responders (>= 2)
io-console (0.8.0)
irb (1.14.3)
irb (1.15.1)
pp (>= 0.6.0)
rdoc (>= 4.0.0)
reline (>= 0.4.2)
iso (0.4.0)
Expand All @@ -236,9 +237,10 @@ GEM
activerecord
kaminari-core (= 1.2.2)
kaminari-core (1.2.2)
launchy (3.0.1)
launchy (3.1.0)
addressable (~> 2.8)
childprocess (~> 5.0)
logger (~> 1.6)
logger (1.6.5)
loofah (2.24.0)
crass (~> 1.0.2)
Expand All @@ -264,21 +266,24 @@ GEM
timeout
net-smtp (0.5.0)
nio4r (2.7.4)
nokogiri (1.18.1)
nokogiri (1.18.2)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
nokogiri (1.18.1-arm64-darwin)
nokogiri (1.18.2-arm64-darwin)
racc (~> 1.4)
nokogiri (1.18.1-x86_64-linux-gnu)
nokogiri (1.18.2-x86_64-linux-gnu)
racc (~> 1.4)
orm_adapter (0.5.0)
parallel (1.26.3)
parallel_tests (4.9.0)
parallel
parser (3.3.6.0)
parser (3.3.7.0)
ast (~> 2.4.1)
racc
psych (5.2.2)
pp (0.6.2)
prettyprint
prettyprint (0.2.0)
psych (5.2.3)
date
stringio
public_suffix (6.0.1)
Expand Down Expand Up @@ -331,7 +336,7 @@ GEM
activerecord (>= 6.1.5)
activesupport (>= 6.1.5)
i18n
rdoc (6.10.0)
rdoc (6.11.0)
psych (>= 4.0.0)
regexp_parser (2.10.0)
reline (0.6.0)
Expand Down Expand Up @@ -438,4 +443,4 @@ DEPENDENCIES
zeitwerk (~> 2.6.18)

BUNDLED WITH
2.6.2
2.6.3
29 changes: 17 additions & 12 deletions gemfiles/rails_72/Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ GEM
xpath (~> 3.2)
childprocess (5.1.0)
logger (~> 1.5)
concurrent-ruby (1.3.4)
concurrent-ruby (1.3.5)
connection_pool (2.5.0)
crass (1.0.6)
cssbundling-rails (1.4.1)
Expand All @@ -138,7 +138,7 @@ GEM
bigdecimal
cucumber-gherkin (27.0.0)
cucumber-messages (>= 19.1.4, < 23)
cucumber-html-formatter (21.7.0)
cucumber-html-formatter (21.8.0)
cucumber-messages (> 19, < 27)
cucumber-messages (22.0.0)
cucumber-rails (3.1.0)
Expand Down Expand Up @@ -189,7 +189,7 @@ GEM
activesupport (>= 5.2)
highline (3.1.2)
reline
i18n (1.14.6)
i18n (1.14.7)
concurrent-ruby (~> 1.0)
i18n-spec (0.6.0)
iso
Expand All @@ -213,7 +213,8 @@ GEM
railties (>= 7.0)
responders (>= 2)
io-console (0.8.0)
irb (1.14.3)
irb (1.15.1)
pp (>= 0.6.0)
rdoc (>= 4.0.0)
reline (>= 0.4.2)
iso (0.4.0)
Expand All @@ -230,9 +231,10 @@ GEM
activerecord
kaminari-core (= 1.2.2)
kaminari-core (1.2.2)
launchy (3.0.1)
launchy (3.1.0)
addressable (~> 2.8)
childprocess (~> 5.0)
logger (~> 1.6)
logger (1.6.5)
loofah (2.24.0)
crass (~> 1.0.2)
Expand All @@ -257,21 +259,24 @@ GEM
timeout
net-smtp (0.5.0)
nio4r (2.7.4)
nokogiri (1.18.1)
nokogiri (1.18.2)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
nokogiri (1.18.1-arm64-darwin)
nokogiri (1.18.2-arm64-darwin)
racc (~> 1.4)
nokogiri (1.18.1-x86_64-linux-gnu)
nokogiri (1.18.2-x86_64-linux-gnu)
racc (~> 1.4)
orm_adapter (0.5.0)
parallel (1.26.3)
parallel_tests (4.9.0)
parallel
parser (3.3.6.0)
parser (3.3.7.0)
ast (~> 2.4.1)
racc
psych (5.2.2)
pp (0.6.2)
prettyprint
prettyprint (0.2.0)
psych (5.2.3)
date
stringio
public_suffix (6.0.1)
Expand Down Expand Up @@ -324,7 +329,7 @@ GEM
activerecord (>= 6.1.5)
activesupport (>= 6.1.5)
i18n
rdoc (6.10.0)
rdoc (6.11.0)
psych (>= 4.0.0)
regexp_parser (2.10.0)
reline (0.6.0)
Expand Down Expand Up @@ -432,4 +437,4 @@ DEPENDENCIES
zeitwerk (~> 2.6.18)

BUNDLED WITH
2.6.2
2.6.3
Loading

0 comments on commit ba9d02c

Please sign in to comment.