diff --git a/Gemfile b/Gemfile index 4d6db2cab..417367210 100644 --- a/Gemfile +++ b/Gemfile @@ -84,6 +84,7 @@ gem 'sib-api-v3-sdk' gem 'skylight' gem 'spreadsheet_architect' gem 'strong_migrations' # lint database migrations +gem 'turbo-rails' gem 'typhoeus' gem 'warden' gem 'webpacker' diff --git a/Gemfile.lock b/Gemfile.lock index ae2bd915b..b3fb8c66d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -723,6 +723,8 @@ GEM timecop (0.9.4) timeout (0.1.1) ttfunk (1.7.0) + turbo-rails (0.8.3) + rails (>= 6.0.0) typhoeus (1.4.0) ethon (>= 0.9.0) tzinfo (2.0.4) @@ -899,6 +901,7 @@ DEPENDENCIES spring-commands-rspec strong_migrations timecop + turbo-rails typhoeus vcr warden diff --git a/app/javascript/packs/application.js b/app/javascript/packs/application.js index 89b5c3e7a..cedb6d332 100644 --- a/app/javascript/packs/application.js +++ b/app/javascript/packs/application.js @@ -3,6 +3,7 @@ import Rails from '@rails/ujs'; import * as ActiveStorage from '@rails/activestorage'; import 'whatwg-fetch'; // window.fetch polyfill import { Application } from '@hotwired/stimulus'; +import { Turbo } from '@hotwired/turbo-rails'; import '../shared/page-update-event'; import '../shared/activestorage/ujs'; @@ -89,6 +90,7 @@ const DS = { // Start Rails helpers Rails.start(); ActiveStorage.start(); +Turbo.session.drive = false; const Stimulus = Application.start(); Stimulus.register('react', ReactController); diff --git a/package.json b/package.json index 1b064f9d4..8d68f6920 100644 --- a/package.json +++ b/package.json @@ -5,6 +5,7 @@ "@headlessui/react": "^1.5.0", "@heroicons/react": "^1.0.6", "@hotwired/stimulus": "^3.0.1", + "@hotwired/turbo-rails": "^7.1.1", "@mapbox/mapbox-gl-draw": "^1.3.0", "@popperjs/core": "^2.11.4", "@rails/actiontext": "^6.1.4-1", diff --git a/yarn.lock b/yarn.lock index f47219e4c..bec7b1041 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1274,6 +1274,19 @@ resolved "https://registry.yarnpkg.com/@hotwired/stimulus/-/stimulus-3.0.1.tgz#141f15645acaa3b133b7c247cad58ae252ffae85" integrity sha512-oHsJhgY2cip+K2ED7vKUNd2P+BEswVhrCYcJ802DSsblJFv7mPFVk3cQKvm2vHgHeDVdnj7oOKrBbzp1u8D+KA== +"@hotwired/turbo-rails@^7.1.1": + version "7.1.1" + resolved "https://registry.yarnpkg.com/@hotwired/turbo-rails/-/turbo-rails-7.1.1.tgz#35c03b92b5c86f0137ed08bef843d955ec9bbe83" + integrity sha512-ZXpxUjCfkdbuXfoGrsFK80qsVzACs8xCfie9rt2jMTSN6o1olXVA0Nrk8u02yNEwSiVJm/4QSOa8cUcMj6VQjg== + dependencies: + "@hotwired/turbo" "^7.1.0" + "@rails/actioncable" "^7.0" + +"@hotwired/turbo@^7.1.0": + version "7.1.0" + resolved "https://registry.yarnpkg.com/@hotwired/turbo/-/turbo-7.1.0.tgz#27e44e0e3dc5bd1d4bda0766d579cf5a14091cd7" + integrity sha512-Q8kGjqwPqER+CtpQudbH+3Zgs2X4zb6pBAlr6NsKTXadg45pAOvxI9i4QpuHbwSzR2+x87HUm+rot9F/Pe8rxA== + "@humanwhocodes/config-array@^0.5.0": version "0.5.0" resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.5.0.tgz#1407967d4c6eecd7388f83acf1eaf4d0c6e58ef9" @@ -1949,6 +1962,11 @@ resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.4.tgz#d8c7b8db9226d2d7664553a0741ad7d0397ee503" integrity sha512-q/ytXxO5NKvyT37pmisQAItCFqA7FD/vNb8dgaJy3/630Fsc+Mz9/9f2SziBoIZ30TJooXyTwZmhi1zjXmObYg== +"@rails/actioncable@^7.0": + version "7.0.2" + resolved "https://registry.yarnpkg.com/@rails/actioncable/-/actioncable-7.0.2.tgz#69a6d999f4087e0537dd38fe0963db1f4305d650" + integrity sha512-G26maXW1Kx0LxQdmNNuNjQlRO/QlXNr3QfuwKiOKb5FZQGYe2OwtHTGXBAjSoiu4dW36XYMT/+L1Wo1Yov4ZXA== + "@rails/actiontext@^6.1.4-1": version "6.1.4" resolved "https://registry.yarnpkg.com/@rails/actiontext/-/actiontext-6.1.4.tgz#ed8c7d2b68d66205301f4538ce65d04c48031f6b"