From 078bcf0edaa9340c3f20163385b49c4a20dadb49 Mon Sep 17 00:00:00 2001 From: Adrian Date: Tue, 19 Dec 2023 15:25:02 +0200 Subject: [PATCH] chore: revert bad turbo 8 merge --- Gemfile.lock | 4 ++-- app/javascript/js/application.js | 1 - app/javascript/js/custom-stream-actions.js | 5 ---- .../avo/associations/create.turbo_stream.erb | 2 -- app/views/layouts/avo/application.html.erb | 2 -- avo.gemspec | 2 +- gemfiles/rails_6.0_ruby_3.0.3.gemfile.lock | 20 ++++++++++------ gemfiles/rails_6.0_ruby_3.2.2.gemfile.lock | 22 +++++++++++------ gemfiles/rails_6.1_ruby_3.0.3.gemfile.lock | 20 ++++++++++------ gemfiles/rails_6.1_ruby_3.2.2.gemfile.lock | 22 +++++++++++------ gemfiles/rails_7.0_ruby_3.0.3.gemfile.lock | 19 +++++++++------ gemfiles/rails_7.0_ruby_3.2.2.gemfile.lock | 21 ++++++++++------ gemfiles/rails_7.1_ruby_3.0.3.gemfile.lock | 21 ++++++++++------ gemfiles/rails_7.1_ruby_3.2.2.gemfile.lock | 21 ++++++++++------ lib/avo/engine.rb | 2 -- package.json | 2 +- yarn.lock | 24 +++++++------------ 17 files changed, 123 insertions(+), 87 deletions(-) delete mode 100644 app/views/avo/associations/create.turbo_stream.erb diff --git a/Gemfile.lock b/Gemfile.lock index b3f74f300c..c54eb0c566 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -13,7 +13,7 @@ PATH inline_svg meta-tags pagy - turbo-rails (~> 2.0.0.pre.beta.1) + turbo-rails turbo_power (>= 0.6.0) view_component (>= 3.7.0) zeitwerk (>= 2.6.12) @@ -498,7 +498,7 @@ GEM thor (1.3.0) tilt (2.3.0) timeout (0.4.1) - turbo-rails (2.0.0.pre.beta.1) + turbo-rails (1.4.0) actionpack (>= 6.0.0) activejob (>= 6.0.0) railties (>= 6.0.0) diff --git a/app/javascript/js/application.js b/app/javascript/js/application.js index 8202cb4767..7d0e360541 100644 --- a/app/javascript/js/application.js +++ b/app/javascript/js/application.js @@ -2,7 +2,6 @@ import 'mapkick/bundle' import { Alert, Popover } from 'tailwindcss-stimulus-components' import { Application } from '@hotwired/stimulus' -import { Turbo } from '@hotwired/turbo-rails' import TurboPower from 'turbo_power' TurboPower.initialize(Turbo.StreamActions) diff --git a/app/javascript/js/custom-stream-actions.js b/app/javascript/js/custom-stream-actions.js index 4e0e65fdac..b2605aa359 100644 --- a/app/javascript/js/custom-stream-actions.js +++ b/app/javascript/js/custom-stream-actions.js @@ -1,11 +1,6 @@ /* eslint-disable camelcase */ import { StreamActions } from '@hotwired/turbo' -StreamActions.close_modal = () => { - document.querySelector('turbo_frame#actions_show').innerHTML = '' - document.querySelector('turbo_frame#attach_modal').innerHTML = '' -} - // TODO: move these to the avo_filters gem StreamActions.close_filters_dropdown = () => { diff --git a/app/views/avo/associations/create.turbo_stream.erb b/app/views/avo/associations/create.turbo_stream.erb deleted file mode 100644 index 4f2806eb83..0000000000 --- a/app/views/avo/associations/create.turbo_stream.erb +++ /dev/null @@ -1,2 +0,0 @@ -<%= turbo_stream.turbo_frame_reload(:has_many_field_show_photo_comments) %> -<%= turbo_stream.close_modal %> diff --git a/app/views/layouts/avo/application.html.erb b/app/views/layouts/avo/application.html.erb index d49c0cdf81..0a492ac6bd 100644 --- a/app/views/layouts/avo/application.html.erb +++ b/app/views/layouts/avo/application.html.erb @@ -21,8 +21,6 @@ <% end %> <%= render Avo::AssetManager::JavascriptComponent.new asset_manager: Avo.asset_manager %> <%= render partial: 'avo/partials/head' %> - <%= turbo_refreshes_with method: :morph, scroll: :preserve %> - <%= content_for :head %>
diff --git a/avo.gemspec b/avo.gemspec index 1cf60fba66..ea5d8f0c3b 100644 --- a/avo.gemspec +++ b/avo.gemspec @@ -41,7 +41,7 @@ Gem::Specification.new do |spec| spec.add_dependency "httparty" spec.add_dependency "active_link_to" spec.add_dependency "view_component", ">= 3.7.0" - spec.add_dependency "turbo-rails", "~> 2.0.0.pre.beta.1" + spec.add_dependency "turbo-rails" spec.add_dependency "turbo_power", ">= 0.6.0" spec.add_dependency "addressable" spec.add_dependency "meta-tags" diff --git a/gemfiles/rails_6.0_ruby_3.0.3.gemfile.lock b/gemfiles/rails_6.0_ruby_3.0.3.gemfile.lock index 3f630d7288..f0d49d2826 100644 --- a/gemfiles/rails_6.0_ruby_3.0.3.gemfile.lock +++ b/gemfiles/rails_6.0_ruby_3.0.3.gemfile.lock @@ -150,6 +150,7 @@ GEM xpath (~> 3.2) chartkick (4.2.1) concurrent-ruby (1.2.2) + connection_pool (2.4.1) countries (5.3.0) unaccent (~> 0.3) crack (0.4.5) @@ -189,7 +190,7 @@ GEM faker (3.1.0) i18n (>= 1.8.11, < 2) ffi (1.15.5) - friendly_id (5.4.2) + friendly_id (5.5.1) activerecord (>= 4.0.0) fuubar (2.5.1) rspec-core (~> 3.0) @@ -204,9 +205,10 @@ GEM highline (2.1.0) hightop (0.3.0) activesupport (>= 5.2) - hotwire-livereload (1.2.3) + hotwire-livereload (1.3.0) + actioncable (>= 6.0.0) listen (>= 3.0.0) - rails (>= 6.0.0) + railties (>= 6.0.0) htmlbeautifier (1.4.2) httparty (0.21.0) mini_mime (>= 1.0.0) @@ -343,7 +345,10 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - redis (4.8.1) + redis (5.0.8) + redis-client (>= 0.17.0) + redis-client (0.19.0) + connection_pool regexp_parser (2.8.1) responders (3.1.0) actionpack (>= 5.2) @@ -489,6 +494,7 @@ GEM PLATFORMS arm64-darwin-21 arm64-darwin-22 + arm64-darwin-23 x86_64-linux DEPENDENCIES @@ -518,12 +524,12 @@ DEPENDENCIES erb-formatter factory_bot_rails faker - friendly_id (~> 5.4.0) + friendly_id (~> 5.5.1) fuubar gem-release groupdate hightop - hotwire-livereload (~> 1.2.3) + hotwire-livereload (~> 1.3.0) htmlbeautifier httparty i18n-tasks (~> 1.0.12) @@ -543,7 +549,7 @@ DEPENDENCIES rails (~> 6.0) rails-controller-testing ransack (~> 4.1, >= 4.1.1) - redis (~> 4.0) + redis (~> 5.0) ripper-tags rspec-rails (~> 6.0, >= 6.0.3) rubocop diff --git a/gemfiles/rails_6.0_ruby_3.2.2.gemfile.lock b/gemfiles/rails_6.0_ruby_3.2.2.gemfile.lock index e0ed6ea5d3..2076b0748a 100644 --- a/gemfiles/rails_6.0_ruby_3.2.2.gemfile.lock +++ b/gemfiles/rails_6.0_ruby_3.2.2.gemfile.lock @@ -150,6 +150,7 @@ GEM xpath (~> 3.2) chartkick (5.0.1) concurrent-ruby (1.2.2) + connection_pool (2.4.1) countries (5.4.0) unaccent (~> 0.3) crack (0.4.5) @@ -189,7 +190,7 @@ GEM faker (3.2.0) i18n (>= 1.8.11, < 2) ffi (1.15.5) - friendly_id (5.4.2) + friendly_id (5.5.1) activerecord (>= 4.0.0) fuubar (2.5.1) rspec-core (~> 3.0) @@ -204,9 +205,10 @@ GEM highline (2.1.0) hightop (0.3.0) activesupport (>= 5.2) - hotwire-livereload (1.2.3) + hotwire-livereload (1.3.0) + actioncable (>= 6.0.0) listen (>= 3.0.0) - rails (>= 6.0.0) + railties (>= 6.0.0) htmlbeautifier (1.4.2) httparty (0.21.0) mini_mime (>= 1.0.0) @@ -277,6 +279,8 @@ GEM net-smtp (0.3.3) net-protocol nio4r (2.5.9) + nokogiri (1.15.5-arm64-darwin) + racc (~> 1.4) nokogiri (1.15.5-x86_64-linux) racc (~> 1.4) orm_adapter (0.5.0) @@ -343,7 +347,10 @@ GEM rb-inotify (0.10.1) ffi (~> 1.0) rbs (2.8.4) - redis (4.8.1) + redis (5.0.8) + redis-client (>= 0.17.0) + redis-client (0.19.0) + connection_pool regexp_parser (2.8.1) responders (3.1.0) actionpack (>= 5.2) @@ -493,6 +500,7 @@ GEM zeitwerk (2.6.12) PLATFORMS + arm64-darwin-23 x86_64-linux DEPENDENCIES @@ -522,12 +530,12 @@ DEPENDENCIES erb-formatter factory_bot_rails faker - friendly_id (~> 5.4.0) + friendly_id (~> 5.5.1) fuubar gem-release groupdate hightop - hotwire-livereload (~> 1.2.3) + hotwire-livereload (~> 1.3.0) htmlbeautifier httparty i18n-tasks (~> 1.0.12) @@ -547,7 +555,7 @@ DEPENDENCIES rails (~> 6.0) rails-controller-testing ransack (~> 4.1, >= 4.1.1) - redis (~> 4.0) + redis (~> 5.0) ripper-tags rspec-rails (~> 6.0, >= 6.0.3) rubocop diff --git a/gemfiles/rails_6.1_ruby_3.0.3.gemfile.lock b/gemfiles/rails_6.1_ruby_3.0.3.gemfile.lock index 1dad4bba01..e5a37d3bc2 100644 --- a/gemfiles/rails_6.1_ruby_3.0.3.gemfile.lock +++ b/gemfiles/rails_6.1_ruby_3.0.3.gemfile.lock @@ -150,6 +150,7 @@ GEM xpath (~> 3.2) chartkick (4.2.1) concurrent-ruby (1.2.2) + connection_pool (2.4.1) countries (5.3.0) unaccent (~> 0.3) crack (0.4.5) @@ -189,7 +190,7 @@ GEM faker (3.1.0) i18n (>= 1.8.11, < 2) ffi (1.15.5) - friendly_id (5.4.2) + friendly_id (5.5.1) activerecord (>= 4.0.0) fuubar (2.5.1) rspec-core (~> 3.0) @@ -204,9 +205,10 @@ GEM highline (2.1.0) hightop (0.3.0) activesupport (>= 5.2) - hotwire-livereload (1.2.3) + hotwire-livereload (1.3.0) + actioncable (>= 6.0.0) listen (>= 3.0.0) - rails (>= 6.0.0) + railties (>= 6.0.0) htmlbeautifier (1.4.2) httparty (0.21.0) mini_mime (>= 1.0.0) @@ -343,7 +345,10 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - redis (4.8.1) + redis (5.0.8) + redis-client (>= 0.17.0) + redis-client (0.19.0) + connection_pool regexp_parser (2.8.1) responders (3.1.0) actionpack (>= 5.2) @@ -489,6 +494,7 @@ GEM PLATFORMS arm64-darwin-21 arm64-darwin-22 + arm64-darwin-23 x86_64-linux DEPENDENCIES @@ -518,12 +524,12 @@ DEPENDENCIES erb-formatter factory_bot_rails faker - friendly_id (~> 5.4.0) + friendly_id (~> 5.5.1) fuubar gem-release groupdate hightop - hotwire-livereload (~> 1.2.3) + hotwire-livereload (~> 1.3.0) htmlbeautifier httparty i18n-tasks (~> 1.0.12) @@ -543,7 +549,7 @@ DEPENDENCIES rails (~> 6.1) rails-controller-testing ransack (~> 4.1, >= 4.1.1) - redis (~> 4.0) + redis (~> 5.0) ripper-tags rspec-rails (~> 6.0, >= 6.0.3) rubocop diff --git a/gemfiles/rails_6.1_ruby_3.2.2.gemfile.lock b/gemfiles/rails_6.1_ruby_3.2.2.gemfile.lock index 7f0d04c7ca..a68551b3a6 100644 --- a/gemfiles/rails_6.1_ruby_3.2.2.gemfile.lock +++ b/gemfiles/rails_6.1_ruby_3.2.2.gemfile.lock @@ -150,6 +150,7 @@ GEM xpath (~> 3.2) chartkick (5.0.1) concurrent-ruby (1.2.2) + connection_pool (2.4.1) countries (5.4.0) unaccent (~> 0.3) crack (0.4.5) @@ -189,7 +190,7 @@ GEM faker (3.2.0) i18n (>= 1.8.11, < 2) ffi (1.15.5) - friendly_id (5.4.2) + friendly_id (5.5.1) activerecord (>= 4.0.0) fuubar (2.5.1) rspec-core (~> 3.0) @@ -204,9 +205,10 @@ GEM highline (2.1.0) hightop (0.3.0) activesupport (>= 5.2) - hotwire-livereload (1.2.3) + hotwire-livereload (1.3.0) + actioncable (>= 6.0.0) listen (>= 3.0.0) - rails (>= 6.0.0) + railties (>= 6.0.0) htmlbeautifier (1.4.2) httparty (0.21.0) mini_mime (>= 1.0.0) @@ -277,6 +279,8 @@ GEM net-smtp (0.3.3) net-protocol nio4r (2.5.9) + nokogiri (1.15.5-arm64-darwin) + racc (~> 1.4) nokogiri (1.15.5-x86_64-linux) racc (~> 1.4) orm_adapter (0.5.0) @@ -343,7 +347,10 @@ GEM rb-inotify (0.10.1) ffi (~> 1.0) rbs (2.8.4) - redis (4.8.1) + redis (5.0.8) + redis-client (>= 0.17.0) + redis-client (0.19.0) + connection_pool regexp_parser (2.8.1) responders (3.1.0) actionpack (>= 5.2) @@ -493,6 +500,7 @@ GEM zeitwerk (2.6.12) PLATFORMS + arm64-darwin-23 x86_64-linux DEPENDENCIES @@ -522,12 +530,12 @@ DEPENDENCIES erb-formatter factory_bot_rails faker - friendly_id (~> 5.4.0) + friendly_id (~> 5.5.1) fuubar gem-release groupdate hightop - hotwire-livereload (~> 1.2.3) + hotwire-livereload (~> 1.3.0) htmlbeautifier httparty i18n-tasks (~> 1.0.12) @@ -547,7 +555,7 @@ DEPENDENCIES rails (~> 6.1) rails-controller-testing ransack (~> 4.1, >= 4.1.1) - redis (~> 4.0) + redis (~> 5.0) ripper-tags rspec-rails (~> 6.0, >= 6.0.3) rubocop diff --git a/gemfiles/rails_7.0_ruby_3.0.3.gemfile.lock b/gemfiles/rails_7.0_ruby_3.0.3.gemfile.lock index a572846496..c138c53749 100644 --- a/gemfiles/rails_7.0_ruby_3.0.3.gemfile.lock +++ b/gemfiles/rails_7.0_ruby_3.0.3.gemfile.lock @@ -209,7 +209,7 @@ GEM faker (3.1.0) i18n (>= 1.8.11, < 2) ffi (1.15.5) - friendly_id (5.4.2) + friendly_id (5.5.1) activerecord (>= 4.0.0) fuubar (2.5.1) rspec-core (~> 3.0) @@ -224,9 +224,10 @@ GEM highline (2.1.0) hightop (0.3.0) activesupport (>= 5.2) - hotwire-livereload (1.2.3) + hotwire-livereload (1.3.0) + actioncable (>= 6.0.0) listen (>= 3.0.0) - rails (>= 6.0.0) + railties (>= 6.0.0) htmlbeautifier (1.4.2) httparty (0.21.0) mini_mime (>= 1.0.0) @@ -375,7 +376,10 @@ GEM rb-inotify (0.10.1) ffi (~> 1.0) rdoc (6.3.3) - redis (4.8.1) + redis (5.0.8) + redis-client (>= 0.17.0) + redis-client (0.19.0) + connection_pool regexp_parser (2.8.1) reline (0.4.1) io-console (~> 0.5) @@ -524,6 +528,7 @@ GEM PLATFORMS arm64-darwin-21 arm64-darwin-22 + arm64-darwin-23 x86_64-linux DEPENDENCIES @@ -553,12 +558,12 @@ DEPENDENCIES erb-formatter factory_bot_rails faker - friendly_id (~> 5.4.0) + friendly_id (~> 5.5.1) fuubar gem-release groupdate hightop - hotwire-livereload (~> 1.2.3) + hotwire-livereload (~> 1.3.0) htmlbeautifier httparty i18n-tasks (~> 1.0.12) @@ -578,7 +583,7 @@ DEPENDENCIES rails (~> 7.0) rails-controller-testing ransack (~> 4.1, >= 4.1.1) - redis (~> 4.0) + redis (~> 5.0) ripper-tags rspec-rails (~> 6.0, >= 6.0.3) rubocop diff --git a/gemfiles/rails_7.0_ruby_3.2.2.gemfile.lock b/gemfiles/rails_7.0_ruby_3.2.2.gemfile.lock index c25555e20d..8e3046f05a 100644 --- a/gemfiles/rails_7.0_ruby_3.2.2.gemfile.lock +++ b/gemfiles/rails_7.0_ruby_3.2.2.gemfile.lock @@ -209,7 +209,7 @@ GEM faker (3.2.0) i18n (>= 1.8.11, < 2) ffi (1.15.5) - friendly_id (5.4.2) + friendly_id (5.5.1) activerecord (>= 4.0.0) fuubar (2.5.1) rspec-core (~> 3.0) @@ -224,9 +224,10 @@ GEM highline (2.1.0) hightop (0.3.0) activesupport (>= 5.2) - hotwire-livereload (1.2.3) + hotwire-livereload (1.3.0) + actioncable (>= 6.0.0) listen (>= 3.0.0) - rails (>= 6.0.0) + railties (>= 6.0.0) htmlbeautifier (1.4.2) httparty (0.21.0) mini_mime (>= 1.0.0) @@ -302,6 +303,8 @@ GEM net-smtp (0.4.0) net-protocol nio4r (2.7.0) + nokogiri (1.15.5-arm64-darwin) + racc (~> 1.4) nokogiri (1.15.5-x86_64-linux) racc (~> 1.4) orm_adapter (0.5.0) @@ -375,7 +378,10 @@ GEM ffi (~> 1.0) rbs (2.8.4) rdoc (6.3.3) - redis (4.8.1) + redis (5.0.8) + redis-client (>= 0.17.0) + redis-client (0.19.0) + connection_pool regexp_parser (2.8.1) reline (0.4.1) io-console (~> 0.5) @@ -529,6 +535,7 @@ GEM zeitwerk (2.6.12) PLATFORMS + arm64-darwin-23 x86_64-linux DEPENDENCIES @@ -558,12 +565,12 @@ DEPENDENCIES erb-formatter factory_bot_rails faker - friendly_id (~> 5.4.0) + friendly_id (~> 5.5.1) fuubar gem-release groupdate hightop - hotwire-livereload (~> 1.2.3) + hotwire-livereload (~> 1.3.0) htmlbeautifier httparty i18n-tasks (~> 1.0.12) @@ -583,7 +590,7 @@ DEPENDENCIES rails (~> 7.0) rails-controller-testing ransack (~> 4.1, >= 4.1.1) - redis (~> 4.0) + redis (~> 5.0) ripper-tags rspec-rails (~> 6.0, >= 6.0.3) rubocop diff --git a/gemfiles/rails_7.1_ruby_3.0.3.gemfile.lock b/gemfiles/rails_7.1_ruby_3.0.3.gemfile.lock index d98eaf5110..28a30381df 100644 --- a/gemfiles/rails_7.1_ruby_3.0.3.gemfile.lock +++ b/gemfiles/rails_7.1_ruby_3.0.3.gemfile.lock @@ -209,7 +209,7 @@ GEM faker (3.2.2) i18n (>= 1.8.11, < 2) ffi (1.16.3) - friendly_id (5.4.2) + friendly_id (5.5.1) activerecord (>= 4.0.0) fuubar (2.5.1) rspec-core (~> 3.0) @@ -224,9 +224,10 @@ GEM highline (2.1.0) hightop (0.4.0) activesupport (>= 6.1) - hotwire-livereload (1.2.3) + hotwire-livereload (1.3.0) + actioncable (>= 6.0.0) listen (>= 3.0.0) - rails (>= 6.0.0) + railties (>= 6.0.0) htmlbeautifier (1.4.2) httparty (0.21.0) mini_mime (>= 1.0.0) @@ -302,6 +303,8 @@ GEM net-smtp (0.4.0) net-protocol nio4r (2.7.0) + nokogiri (1.15.5-arm64-darwin) + racc (~> 1.4) nokogiri (1.15.5-x86_64-linux) racc (~> 1.4) orm_adapter (0.5.0) @@ -375,7 +378,10 @@ GEM ffi (~> 1.0) rbs (2.8.4) rdoc (6.3.3) - redis (4.8.1) + redis (5.0.8) + redis-client (>= 0.17.0) + redis-client (0.19.0) + connection_pool regexp_parser (2.8.2) reline (0.4.1) io-console (~> 0.5) @@ -531,6 +537,7 @@ GEM zeitwerk (2.6.12) PLATFORMS + arm64-darwin-23 x86_64-linux DEPENDENCIES @@ -560,12 +567,12 @@ DEPENDENCIES erb-formatter factory_bot_rails faker - friendly_id (~> 5.4.0) + friendly_id (~> 5.5.1) fuubar gem-release groupdate hightop - hotwire-livereload (~> 1.2.3) + hotwire-livereload (~> 1.3.0) htmlbeautifier httparty i18n-tasks (~> 1.0.12) @@ -585,7 +592,7 @@ DEPENDENCIES rails (~> 7.1) rails-controller-testing ransack (~> 4.1, >= 4.1.1) - redis (~> 4.0) + redis (~> 5.0) ripper-tags rspec-rails (~> 6.0, >= 6.0.3) rubocop diff --git a/gemfiles/rails_7.1_ruby_3.2.2.gemfile.lock b/gemfiles/rails_7.1_ruby_3.2.2.gemfile.lock index d98eaf5110..28a30381df 100644 --- a/gemfiles/rails_7.1_ruby_3.2.2.gemfile.lock +++ b/gemfiles/rails_7.1_ruby_3.2.2.gemfile.lock @@ -209,7 +209,7 @@ GEM faker (3.2.2) i18n (>= 1.8.11, < 2) ffi (1.16.3) - friendly_id (5.4.2) + friendly_id (5.5.1) activerecord (>= 4.0.0) fuubar (2.5.1) rspec-core (~> 3.0) @@ -224,9 +224,10 @@ GEM highline (2.1.0) hightop (0.4.0) activesupport (>= 6.1) - hotwire-livereload (1.2.3) + hotwire-livereload (1.3.0) + actioncable (>= 6.0.0) listen (>= 3.0.0) - rails (>= 6.0.0) + railties (>= 6.0.0) htmlbeautifier (1.4.2) httparty (0.21.0) mini_mime (>= 1.0.0) @@ -302,6 +303,8 @@ GEM net-smtp (0.4.0) net-protocol nio4r (2.7.0) + nokogiri (1.15.5-arm64-darwin) + racc (~> 1.4) nokogiri (1.15.5-x86_64-linux) racc (~> 1.4) orm_adapter (0.5.0) @@ -375,7 +378,10 @@ GEM ffi (~> 1.0) rbs (2.8.4) rdoc (6.3.3) - redis (4.8.1) + redis (5.0.8) + redis-client (>= 0.17.0) + redis-client (0.19.0) + connection_pool regexp_parser (2.8.2) reline (0.4.1) io-console (~> 0.5) @@ -531,6 +537,7 @@ GEM zeitwerk (2.6.12) PLATFORMS + arm64-darwin-23 x86_64-linux DEPENDENCIES @@ -560,12 +567,12 @@ DEPENDENCIES erb-formatter factory_bot_rails faker - friendly_id (~> 5.4.0) + friendly_id (~> 5.5.1) fuubar gem-release groupdate hightop - hotwire-livereload (~> 1.2.3) + hotwire-livereload (~> 1.3.0) htmlbeautifier httparty i18n-tasks (~> 1.0.12) @@ -585,7 +592,7 @@ DEPENDENCIES rails (~> 7.1) rails-controller-testing ransack (~> 4.1, >= 4.1.1) - redis (~> 4.0) + redis (~> 5.0) ripper-tags rspec-rails (~> 6.0, >= 6.0.3) rubocop diff --git a/lib/avo/engine.rb b/lib/avo/engine.rb index cc8ab58853..fc84374db7 100644 --- a/lib/avo/engine.rb +++ b/lib/avo/engine.rb @@ -1,5 +1,3 @@ -require "active_support/core_ext/module/attribute_accessors_per_thread" - # requires all dependencies Gem.loaded_specs["avo"].dependencies.each do |d| case d.name diff --git a/package.json b/package.json index e4b0fbe30f..e117aee551 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "@algolia/autocomplete-theme-classic": "^1.0.0-alpha.46", "@babel/plugin-proposal-class-properties": "^7.12.1", "@hotwired/stimulus": "^3.2.2", - "@hotwired/turbo-rails": "^8.0.0-beta.1", + "@hotwired/turbo-rails": "^7.3.0", "@rails/activestorage": "^6.1.7", "@rails/ujs": "^6.1.0", "@tailwindcss/forms": "^0.5.7", diff --git a/yarn.lock b/yarn.lock index fdc7f37c8a..312524ce41 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1346,20 +1346,18 @@ resolved "https://registry.yarnpkg.com/@hotwired/stimulus/-/stimulus-3.2.2.tgz#071aab59c600fed95b97939e605ff261a4251608" integrity sha512-eGeIqNOQpXoPAIP7tC1+1Yc1yl1xnwYqg+3mzqxyrbE5pg5YFBZcA6YoTiByJB6DKAEsiWtl6tjTJS4IYtbB7A== -"@hotwired/turbo-rails@^8.0.0-beta.1": - version "8.0.0-beta.1" - resolved "https://registry.yarnpkg.com/@hotwired/turbo-rails/-/turbo-rails-8.0.0-beta.1.tgz#7d5bd2843caa5d8d224eb36f22078311163128bd" - integrity sha512-x9G95vehf5LR4yYGvhD4z6wBMbmAVi0V87FTfenrmXPru4SfOVDsCwdEINBWsLqOvCgRPQD9eY2nGyDfZlsukg== +"@hotwired/turbo-rails@^7.3.0": + version "7.3.0" + resolved "https://registry.yarnpkg.com/@hotwired/turbo-rails/-/turbo-rails-7.3.0.tgz#422c21752509f3edcd6c7b2725bbe9e157815f51" + integrity sha512-fvhO64vp/a2UVQ3jue9WTc2JisMv9XilIC7ViZmXAREVwiQ2S4UC7Go8f9A1j4Xu7DBI6SbFdqILk5ImqVoqyA== dependencies: - "@hotwired/turbo" "^8.0.0-beta.1" + "@hotwired/turbo" "^7.3.0" "@rails/actioncable" "^7.0" -"@hotwired/turbo@^8.0.0-beta.1": - version "8.0.0-beta.1" - resolved "https://registry.yarnpkg.com/@hotwired/turbo/-/turbo-8.0.0-beta.1.tgz#35a7086c4c959445db059ea4a9b9af85cdafa616" - integrity sha512-g66YmO/Oa+EThB3KkNDhrM9mFnNyRn6tqgwGiBHh4Vf+d3XjCznuWSG2o2e2cO/RlddVRtCwvBSMuG6sYQWX+g== - dependencies: - idiomorph "https://github.com/basecamp/idiomorph#rollout-build" +"@hotwired/turbo@^7.3.0": + version "7.3.0" + resolved "https://registry.yarnpkg.com/@hotwired/turbo/-/turbo-7.3.0.tgz#2226000fff1aabda9fd9587474565c9929dbf15d" + integrity sha512-Dcu+NaSvHLT7EjrDrkEmH4qET2ZJZ5IcCWmNXxNQTBwlnE5tBZfN6WxZ842n5cHV52DH/AKNirbPBtcEXDLW4g== "@humanwhocodes/config-array@^0.11.13": version "0.11.13" @@ -2883,10 +2881,6 @@ icss-utils@^5.0.0, icss-utils@^5.1.0: resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae" integrity sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA== -"idiomorph@https://github.com/basecamp/idiomorph#rollout-build": - version "0.0.8" - resolved "https://github.com/basecamp/idiomorph#e906820368e4c9c52489a3336b8c3826b1bf6de5" - ignore@^5.2.0: version "5.2.4" resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324"