Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: revert bad turbo 8 merge #2259

Merged
merged 1 commit into from
Dec 19, 2023
Merged

chore: revert bad turbo 8 merge #2259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
1 change: 0 additions & 1 deletion app/javascript/js/application.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
5 changes: 0 additions & 5 deletions app/javascript/js/custom-stream-actions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 = () => {
Expand Down
2 changes: 0 additions & 2 deletions app/views/avo/associations/create.turbo_stream.erb
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions app/views/layouts/avo/application.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %>">
Expand Down
2 changes: 1 addition & 1 deletion avo.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
20 changes: 13 additions & 7 deletions gemfiles/rails_6.0_ruby_3.0.3.gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -489,6 +494,7 @@ GEM
PLATFORMS
arm64-darwin-21
arm64-darwin-22
arm64-darwin-23
x86_64-linux

DEPENDENCIES
Expand Down Expand Up @@ -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)
Expand All @@ -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
Expand Down
22 changes: 15 additions & 7 deletions gemfiles/rails_6.0_ruby_3.2.2.gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -493,6 +500,7 @@ GEM
zeitwerk (2.6.12)

PLATFORMS
arm64-darwin-23
x86_64-linux

DEPENDENCIES
Expand Down Expand Up @@ -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)
Expand All @@ -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
Expand Down
20 changes: 13 additions & 7 deletions gemfiles/rails_6.1_ruby_3.0.3.gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -489,6 +494,7 @@ GEM
PLATFORMS
arm64-darwin-21
arm64-darwin-22
arm64-darwin-23
x86_64-linux

DEPENDENCIES
Expand Down Expand Up @@ -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)
Expand All @@ -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
Expand Down
22 changes: 15 additions & 7 deletions gemfiles/rails_6.1_ruby_3.2.2.gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -493,6 +500,7 @@ GEM
zeitwerk (2.6.12)

PLATFORMS
arm64-darwin-23
x86_64-linux

DEPENDENCIES
Expand Down Expand Up @@ -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)
Expand All @@ -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
Expand Down
Loading
Loading