diff --git a/Gemfile.lock b/Gemfile.lock index 1bc1182cf..c6c8a738c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,88 +1,87 @@ GIT remote: https://github.com/rails/rails - revision: 9a2c639a0c24c12490a8f9ef324395a36949e15c + revision: eb1f7cca3bdb3c4e3350e15d8d060ec6a205aa88 ref: main specs: - actioncable (7.0.0.alpha) - actionpack (= 7.0.0.alpha) - activesupport (= 7.0.0.alpha) + actioncable (7.0.0.alpha2) + actionpack (= 7.0.0.alpha2) + activesupport (= 7.0.0.alpha2) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (7.0.0.alpha) - actionpack (= 7.0.0.alpha) - activejob (= 7.0.0.alpha) - activerecord (= 7.0.0.alpha) - activestorage (= 7.0.0.alpha) - activesupport (= 7.0.0.alpha) + actionmailbox (7.0.0.alpha2) + actionpack (= 7.0.0.alpha2) + activejob (= 7.0.0.alpha2) + activerecord (= 7.0.0.alpha2) + activestorage (= 7.0.0.alpha2) + activesupport (= 7.0.0.alpha2) mail (>= 2.7.1) - actionmailer (7.0.0.alpha) - actionpack (= 7.0.0.alpha) - actionview (= 7.0.0.alpha) - activejob (= 7.0.0.alpha) - activesupport (= 7.0.0.alpha) + actionmailer (7.0.0.alpha2) + actionpack (= 7.0.0.alpha2) + actionview (= 7.0.0.alpha2) + activejob (= 7.0.0.alpha2) + activesupport (= 7.0.0.alpha2) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (7.0.0.alpha) - actionview (= 7.0.0.alpha) - activesupport (= 7.0.0.alpha) + actionpack (7.0.0.alpha2) + actionview (= 7.0.0.alpha2) + activesupport (= 7.0.0.alpha2) rack (~> 2.0, >= 2.2.0) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (7.0.0.alpha) - actionpack (= 7.0.0.alpha) - activerecord (= 7.0.0.alpha) - activestorage (= 7.0.0.alpha) - activesupport (= 7.0.0.alpha) + actiontext (7.0.0.alpha2) + actionpack (= 7.0.0.alpha2) + activerecord (= 7.0.0.alpha2) + activestorage (= 7.0.0.alpha2) + activesupport (= 7.0.0.alpha2) nokogiri (>= 1.8.5) - actionview (7.0.0.alpha) - activesupport (= 7.0.0.alpha) + actionview (7.0.0.alpha2) + activesupport (= 7.0.0.alpha2) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (7.0.0.alpha) - activesupport (= 7.0.0.alpha) + activejob (7.0.0.alpha2) + activesupport (= 7.0.0.alpha2) globalid (>= 0.3.6) - activemodel (7.0.0.alpha) - activesupport (= 7.0.0.alpha) - activerecord (7.0.0.alpha) - activemodel (= 7.0.0.alpha) - activesupport (= 7.0.0.alpha) - activestorage (7.0.0.alpha) - actionpack (= 7.0.0.alpha) - activejob (= 7.0.0.alpha) - activerecord (= 7.0.0.alpha) - activesupport (= 7.0.0.alpha) - marcel (~> 1.0.0) + activemodel (7.0.0.alpha2) + activesupport (= 7.0.0.alpha2) + activerecord (7.0.0.alpha2) + activemodel (= 7.0.0.alpha2) + activesupport (= 7.0.0.alpha2) + activestorage (7.0.0.alpha2) + actionpack (= 7.0.0.alpha2) + activejob (= 7.0.0.alpha2) + activerecord (= 7.0.0.alpha2) + activesupport (= 7.0.0.alpha2) + marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (7.0.0.alpha) + activesupport (7.0.0.alpha2) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - zeitwerk (~> 2.3) - rails (7.0.0.alpha) - actioncable (= 7.0.0.alpha) - actionmailbox (= 7.0.0.alpha) - actionmailer (= 7.0.0.alpha) - actionpack (= 7.0.0.alpha) - actiontext (= 7.0.0.alpha) - actionview (= 7.0.0.alpha) - activejob (= 7.0.0.alpha) - activemodel (= 7.0.0.alpha) - activerecord (= 7.0.0.alpha) - activestorage (= 7.0.0.alpha) - activesupport (= 7.0.0.alpha) + rails (7.0.0.alpha2) + actioncable (= 7.0.0.alpha2) + actionmailbox (= 7.0.0.alpha2) + actionmailer (= 7.0.0.alpha2) + actionpack (= 7.0.0.alpha2) + actiontext (= 7.0.0.alpha2) + actionview (= 7.0.0.alpha2) + activejob (= 7.0.0.alpha2) + activemodel (= 7.0.0.alpha2) + activerecord (= 7.0.0.alpha2) + activestorage (= 7.0.0.alpha2) + activesupport (= 7.0.0.alpha2) bundler (>= 1.15.0) - railties (= 7.0.0.alpha) - sprockets-rails (>= 2.0.0) - railties (7.0.0.alpha) - actionpack (= 7.0.0.alpha) - activesupport (= 7.0.0.alpha) + railties (= 7.0.0.alpha2) + railties (7.0.0.alpha2) + actionpack (= 7.0.0.alpha2) + activesupport (= 7.0.0.alpha2) method_source - rake (>= 0.13) + rake (>= 12.2) thor (~> 1.0) + zeitwerk (~> 2.5.0.beta5) PATH remote: . @@ -129,8 +128,8 @@ GEM rubocop smart_properties erubi (1.10.0) - globalid (0.4.2) - activesupport (>= 4.2.0) + globalid (0.5.2) + activesupport (>= 5.0) haml (5.2.1) temple (>= 0.8.0) tilt @@ -139,19 +138,19 @@ GEM concurrent-ruby (~> 1.0) jbuilder (2.11.2) activesupport (>= 5.0.0) - loofah (2.10.0) + loofah (2.12.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) mini_mime (>= 0.1.1) - marcel (1.0.1) + marcel (1.0.2) method_source (1.0.0) - mini_mime (1.1.0) - mini_portile2 (2.5.3) + mini_mime (1.1.2) + mini_portile2 (2.6.1) minitest (5.6.0) - nio4r (2.5.7) - nokogiri (1.11.7) - mini_portile2 (~> 2.5.0) + nio4r (2.5.8) + nokogiri (1.12.5) + mini_portile2 (~> 2.6.1) racc (~> 1.4) parallel (1.20.1) parser (3.0.0.0) @@ -167,10 +166,10 @@ GEM rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.3.0) + rails-html-sanitizer (1.4.2) loofah (~> 2.3) rainbow (3.0.0) - rake (13.0.3) + rake (13.0.6) regexp_parser (1.8.2) rexml (3.2.5) rubocop (1.6.1) @@ -222,7 +221,7 @@ GEM tzinfo (2.0.4) concurrent-ruby (~> 1.0) unicode-display_width (1.6.1) - websocket-driver (0.7.4) + websocket-driver (0.7.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) xpath (3.2.0) @@ -230,7 +229,7 @@ GEM yard (0.9.26) yard-activesupport-concern (0.0.1) yard (>= 0.8) - zeitwerk (2.4.2) + zeitwerk (2.5.0.beta5) PLATFORMS ruby @@ -251,6 +250,7 @@ DEPENDENCIES simplecov (~> 0.18.0) simplecov-console (~> 0.7.2) slim (~> 4.0) + sprockets-rails (~> 3.2.2) view_component! yard (~> 0.9.25) yard-activesupport-concern diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index d482a1c47..961f94bfc 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -7,6 +7,10 @@ title: Changelog ## main +* Add `sprockets-rails` development dependency to fix test suite failures when using rails@main. + + *Blake Williams* + * Fix Ruby indentation warning. *Blake Williams* diff --git a/view_component.gemspec b/view_component.gemspec index 9650e9ff0..5412a1a29 100644 --- a/view_component.gemspec +++ b/view_component.gemspec @@ -44,6 +44,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency "simplecov", "~> 0.18.0" spec.add_development_dependency "simplecov-console", "~> 0.7.2" spec.add_development_dependency "slim", "~> 4.0" + spec.add_development_dependency "sprockets-rails", "~> 3.2.2" spec.add_development_dependency "yard", "~> 0.9.25" spec.add_development_dependency "yard-activesupport-concern" end