From 79efa50a34ea17909cd66b8f6aaa01ab507dac02 Mon Sep 17 00:00:00 2001 From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com> Date: Sat, 14 Aug 2021 18:21:43 +0100 Subject: [PATCH] Add Turbo and MRUJS --- app/assets/javascripts/darkswarm/all.js.coffee | 4 ++++ app/webpacker/packs/application.js | 6 ++++++ package.json | 2 ++ yarn.lock | 17 +++++++++++++++++ 4 files changed, 29 insertions(+) diff --git a/app/assets/javascripts/darkswarm/all.js.coffee b/app/assets/javascripts/darkswarm/all.js.coffee index 9b0944cbd5..c318cf573b 100644 --- a/app/assets/javascripts/darkswarm/all.js.coffee +++ b/app/assets/javascripts/darkswarm/all.js.coffee @@ -54,3 +54,7 @@ #= require_tree ./mixins #= require_tree ./directives #= require_tree . + +document.addEventListener "turbo:load", -> + angular.bootstrap document.body, ["Darkswarm"] + true diff --git a/app/webpacker/packs/application.js b/app/webpacker/packs/application.js index fdd6b29cb2..dc90949b19 100644 --- a/app/webpacker/packs/application.js +++ b/app/webpacker/packs/application.js @@ -7,3 +7,9 @@ import { definitionsFromContext } from "stimulus/webpack-helpers" const application = Application.start() const context = require.context("controllers", true, /.js$/) application.load(definitionsFromContext(context)) + +import mrujs from "mrujs" +import * as Turbo from "@hotwired/turbo" + +window.Turbo = Turbo +mrujs.start() diff --git a/package.json b/package.json index 6fb8a6323a..278484c9b4 100644 --- a/package.json +++ b/package.json @@ -27,9 +27,11 @@ }, "license": "AGPL-3.0", "dependencies": { + "@hotwired/turbo": "^7.0.0-rc.1", "@rails/webpacker": "5.4.2", "flatpickr": "^4.6.9", "moment": "^2.29.1", + "mrujs": "^0.3.7-beta.6", "shortcut-buttons-flatpickr": "^0.3.1", "stimulus": "^2.0.0", "webpack": "^4.46.0", diff --git a/yarn.lock b/yarn.lock index 779c809e24..925aafe029 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1599,6 +1599,11 @@ resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.2.5.tgz#8eed982e2ee6f7f4e44c253e12962980791efd46" integrity sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA== +"@hotwired/turbo@^7.0.0-rc.1": + version "7.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@hotwired/turbo/-/turbo-7.0.0-rc.1.tgz#a5c1be86def1cc39b3011c935c5734b8632af5c3" + integrity sha512-niNA68ku4TZYbV3biwTPf1L5CidP50S2xfeb5rGQfodvPB9UAtkqKFFRIA0LL8y0DG4MGIZ/QFlbvlmFea5p4w== + "@istanbuljs/load-nyc-config@^1.0.0": version "1.1.0" resolved "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz#fd3db1d59ecf7cf121e80650bb86712f9b55eced" @@ -8787,6 +8792,11 @@ moment@^2.29.1: resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3" integrity sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ== +"morphdom@>=2.6.0 <3.0.0": + version "2.6.1" + resolved "https://registry.yarnpkg.com/morphdom/-/morphdom-2.6.1.tgz#e868e24f989fa3183004b159aed643e628b4306e" + integrity sha512-Y8YRbAEP3eKykroIBWrjcfMw7mmwJfjhqdpSvoqinu8Y702nAwikpXcNFDiIkyvfCLxLM9Wu95RZqo4a9jFBaA== + move-concurrently@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92" @@ -8799,6 +8809,13 @@ move-concurrently@^1.0.1: rimraf "^2.5.4" run-queue "^1.0.3" +mrujs@^0.3.7-beta.6: + version "0.3.7-beta.6" + resolved "https://registry.yarnpkg.com/mrujs/-/mrujs-0.3.7-beta.6.tgz#ee06a3d60804b9b3c29c94b171031d4a909e48be" + integrity sha512-BP26BPrBOVRRxxuNBRSmT/yTqoy5/PeUafz21LVNVy8wBQTnfAMrU/FDt5arLkLhOkA4+YVXnAXM8xQC65jdkQ== + dependencies: + morphdom ">=2.6.0 <3.0.0" + ms@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"