diff --git a/Gemfile.lock b/Gemfile.lock index af4b3f945..60088f3a0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - react_on_rails (14.0.3) + react_on_rails (14.0.4) addressable connection_pool execjs (~> 2.5) @@ -369,6 +369,10 @@ GEM tins (1.33.0) bigdecimal sync + turbo-rails (2.0.6) + actionpack (>= 6.0.0) + activejob (>= 6.0.0) + railties (>= 6.0.0) turbolinks (5.2.1) turbolinks-source (~> 5.2) turbolinks-source (5.2.0) @@ -431,6 +435,7 @@ DEPENDENCIES spring (~> 4.0) sprockets (~> 4.0) sqlite3 (~> 1.6) + turbo-rails turbolinks uglifier webdrivers (= 5.3.0) diff --git a/spec/dummy/Gemfile.lock b/spec/dummy/Gemfile.lock index 3ffa8bda6..1202785a9 100644 --- a/spec/dummy/Gemfile.lock +++ b/spec/dummy/Gemfile.lock @@ -362,6 +362,10 @@ GEM timeout (0.4.1) tins (1.32.1) sync + turbo-rails (2.0.6) + actionpack (>= 6.0.0) + activejob (>= 6.0.0) + railties (>= 6.0.0) turbolinks (5.2.1) turbolinks-source (~> 5.2) turbolinks-source (5.2.0) @@ -423,6 +427,7 @@ DEPENDENCIES spring (~> 4.0) sprockets (~> 4.0) sqlite3 (~> 1.6) + turbo-rails turbolinks uglifier webdrivers (= 5.3.0) diff --git a/spec/dummy/client/app/packs/client-bundle.js b/spec/dummy/client/app/packs/client-bundle.js index 98d54618a..683a7871e 100644 --- a/spec/dummy/client/app/packs/client-bundle.js +++ b/spec/dummy/client/app/packs/client-bundle.js @@ -6,6 +6,7 @@ import '@hotwired/turbo-rails'; import ReactOnRails from 'react-on-rails'; +import HelloTurboStream from '../startup/HelloTurboStream'; import SharedReduxStore from '../stores/SharedReduxStore'; ReactOnRails.setOptions({ @@ -13,6 +14,10 @@ ReactOnRails.setOptions({ turbo: true, }); +ReactOnRails.register({ + HelloTurboStream +}); + ReactOnRails.registerStore({ SharedReduxStore, }); diff --git a/spec/dummy/yarn.lock b/spec/dummy/yarn.lock index 2c66fbf79..1a634f47d 100644 --- a/spec/dummy/yarn.lock +++ b/spec/dummy/yarn.lock @@ -2056,6 +2056,19 @@ resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.6.tgz#d5e0706cf8c6acd8c6032f8d54070af261bbbb2f" integrity sha512-ws57AidsDvREKrZKYffXddNkyaF14iHNHm8VQnZH6t99E8gczjNN0GpvcGny0imC80yQ0tHz1xVUKk/KFQSUyA== +"@hotwired/turbo-rails@^8.0.4": + version "8.0.5" + resolved "https://registry.yarnpkg.com/@hotwired/turbo-rails/-/turbo-rails-8.0.5.tgz#18c2f0e4f7f952307650308590edf5eb9544b0d3" + integrity sha512-1A9G9u28IRAl0C57z8Ka3AhNPyJdwfOrbjr+ABZk2ZEUw2QO7cJ0pgs77asUj2E/tzn1PgrxrSVu24W+1Q5uBA== + dependencies: + "@hotwired/turbo" "^8.0.5" + "@rails/actioncable" "^7.0" + +"@hotwired/turbo@^8.0.5": + version "8.0.5" + resolved "https://registry.yarnpkg.com/@hotwired/turbo/-/turbo-8.0.5.tgz#abae6dad018a891e4286e87fa0959217e3866d5a" + integrity sha512-TdZDA7fxVQ2ZycygvpnzjGPmFq4sO/E2QVg+2em/sJ3YTSsIWVEis8HmWlumz+c9DjWcUkcCuB+muF08TInpAQ== + "@jridgewell/gen-mapping@^0.1.0": version "0.1.1" resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz#e5d2e450306a9491e3bd77e323e38d7aff315996" @@ -2116,6 +2129,11 @@ schema-utils "^3.0.0" source-map "^0.7.3" +"@rails/actioncable@^7.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@rails/actioncable/-/actioncable-7.2.0.tgz#dee66d21bc125a9819dc8080ce896eac78d8c63f" + integrity sha512-crcsPF3skrqJkFZLxesZoyUEt8ol25XtTuOAUMdLa5qQKWTZpL8eLVW71bDCwKDQLbV2z5sBZ/XGEC0i+ZZa+A== + "@rescript/react@^0.10.3": version "0.10.3" resolved "https://registry.yarnpkg.com/@rescript/react/-/react-0.10.3.tgz#a2a8bed6b017940ec26c2154764b350f50348889"