chore: revert bad turbo 8 merge (#2259)

avo-hq · Dec 19, 2023 · 553efe6 · 553efe6
1 parent 62411c7
commit 553efe6
Show file tree

Hide file tree

Showing 17 changed files with 123 additions and 87 deletions.
diff --git 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
@@ -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
@@ -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
diff --git 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 %>
   </head>
   <body class="bg-application os-mac">
     <div class="relative flex flex-1 w-full min-h-full" data-controller="sidebar" data-sidebar-open-value="<%= @sidebar_open %>">

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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