From 763a667d33a25bab0dadd7207b8963596136b357 Mon Sep 17 00:00:00 2001 From: Eric Pugh Date: Tue, 5 Nov 2024 06:28:11 -0500 Subject: [PATCH] Migrate to shepherd.js failed, commenting out tour.js --- app/assets/javascripts/core.js | 3 -- app/assets/stylesheets/core.css.scss | 2 +- app/javascript/application2.js | 2 +- config/importmap.rb | 2 ++ package.json | 2 +- yarn.lock | 51 +++++++++++++++++++++------- 6 files changed, 44 insertions(+), 18 deletions(-) diff --git a/app/assets/javascripts/core.js b/app/assets/javascripts/core.js index d96c7e5fd..e66f896ad 100644 --- a/app/assets/javascripts/core.js +++ b/app/assets/javascripts/core.js @@ -75,6 +75,3 @@ //= require_tree ./values //= require_tree ../templates //= require_tree ./components -//= require tether-shepherd/dist/js/tether -//= require tether-shepherd/dist/js/shepherd -//= require tour diff --git a/app/assets/stylesheets/core.css.scss b/app/assets/stylesheets/core.css.scss index 405bc6787..554c188b6 100644 --- a/app/assets/stylesheets/core.css.scss +++ b/app/assets/stylesheets/core.css.scss @@ -37,7 +37,7 @@ @import "admin2"; // Tour/Guides -@import "tether-shepherd/dist/css/shepherd-theme-arrows"; +@import "shepherd.js/dist/css/shepherd"; @import "tour"; // Screens diff --git a/app/javascript/application2.js b/app/javascript/application2.js index a8373f1e7..9ad64e8c5 100644 --- a/app/javascript/application2.js +++ b/app/javascript/application2.js @@ -21,5 +21,5 @@ import "theme-chrome"; //import "worker-javascript" //import "ace_config" - +//import "tour" // Can't figure out how to get Shepherd.js to load import "footer" diff --git a/config/importmap.rb b/config/importmap.rb index 99e29cc6a..b65ddd82c 100644 --- a/config/importmap.rb +++ b/config/importmap.rb @@ -13,3 +13,5 @@ pin "mode-lucene", to: "ace-builds/src-min-noconflict/mode-lucene.js" pin "theme-chrome", to: "ace-builds/src-min-noconflict/theme-chrome.js" pin 'footer', preload: true + +# pin 'tour' // Can't figure out how to get Shepherd.js to load diff --git a/package.json b/package.json index e059bbeb4..1728f5b93 100644 --- a/package.json +++ b/package.json @@ -39,8 +39,8 @@ "ngclipboard": "^2.0.0", "party-js": "^2.2.0", "popper.js": "^1.16.1", + "shepherd.js": "^14.1.0", "splainer-search": "2.33.0", - "tether-shepherd": "latest", "vega": "^5.27.0" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index a89a695d3..52a361613 100644 --- a/yarn.lock +++ b/yarn.lock @@ -30,6 +30,26 @@ resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9" integrity sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ== +"@floating-ui/core@^1.6.0": + version "1.6.8" + resolved "https://registry.yarnpkg.com/@floating-ui/core/-/core-1.6.8.tgz#aa43561be075815879305965020f492cdb43da12" + integrity sha512-7XJ9cPU+yI2QeLS+FCSlqNFZJq8arvswefkZrYI1yQBbftw6FyrZOxYSh+9S7z7TpeWlRt9zJ5IhM1WIL334jA== + dependencies: + "@floating-ui/utils" "^0.2.8" + +"@floating-ui/dom@^1.6.5": + version "1.6.12" + resolved "https://registry.yarnpkg.com/@floating-ui/dom/-/dom-1.6.12.tgz#6333dcb5a8ead3b2bf82f33d6bc410e95f54e556" + integrity sha512-NP83c0HjokcGVEMeoStg317VD9W7eDlGK7457dMBANbKA6GJZdc7rjujdgqzTaz93jkGgc5P/jeWbaCHnMNc+w== + dependencies: + "@floating-ui/core" "^1.6.0" + "@floating-ui/utils" "^0.2.8" + +"@floating-ui/utils@^0.2.8": + version "0.2.8" + resolved "https://registry.yarnpkg.com/@floating-ui/utils/-/utils-0.2.8.tgz#21a907684723bbbaa5f0974cf7730bd797eb8e62" + integrity sha512-kym7SodPp8/wloecOpcmSnWJsK7M0E5Wg8UcFA+uO4B9s5d0ywXOEro/8HM9x0rW+TljRzul/14UYz3TleT3ig== + "@popperjs/core@^2.11.6": version "2.11.8" resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.8.tgz#6b79032e760a0899cd4204710beede972a3a185f" @@ -61,6 +81,11 @@ dependencies: spark-md5 "^3.0.1" +"@scarf/scarf@^1.3.0": + version "1.3.0" + resolved "https://registry.yarnpkg.com/@scarf/scarf/-/scarf-1.3.0.tgz#f8c75560d0dace4452dee1e31995e6396e61f3ee" + integrity sha512-lHKK8M5CTcpFj2hZDB3wIjb0KAbEOgDmiJGDv1WBRfQgRm/a8/XMEkG/N1iM01xgbUDsPQwi42D+dFo1XPAKew== + "@socket.io/component-emitter@~3.1.0": version "3.1.2" resolved "https://registry.yarnpkg.com/@socket.io/component-emitter/-/component-emitter-3.1.2.tgz#821f8442f4175d8f0467b9daf26e3a18e2d02af2" @@ -871,6 +896,11 @@ debug@4, debug@^4.1.1, debug@^4.3.4, debug@^4.3.6, debug@^4.3.7, debug@~4.3.1, d dependencies: ms "^2.1.3" +deepmerge-ts@^7.1.1: + version "7.1.3" + resolved "https://registry.yarnpkg.com/deepmerge-ts/-/deepmerge-ts-7.1.3.tgz#9a07e5e7dff7afa8ddf48b90b7161ca9439ca4ca" + integrity sha512-qCSH6I0INPxd9Y1VtAiLpnYvz5O//6rCfJXKk0z66Up9/VOSr+1yS8XSKA5IWRxjocFGlzPyaZYe+jxq7OOLtQ== + define-data-property@^1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.4.tgz#894dc141bb7d3060ae4366f6a0107e68fbe48c5e" @@ -1977,6 +2007,15 @@ setprototypeof@1.2.0: resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424" integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw== +shepherd.js@^14.1.0: + version "14.1.0" + resolved "https://registry.yarnpkg.com/shepherd.js/-/shepherd.js-14.1.0.tgz#bbfccec9027426051976b6c98de8481c3de84cf9" + integrity sha512-nFJElQ0KLF0zaDBINHpnUeBQVEOfRPyDrYkJkOj4ziQIyvSkQeJogEIAWwtpCEIxZOWNXxMYXcPVErjGE9EP6Q== + dependencies: + "@floating-ui/dom" "^1.6.5" + "@scarf/scarf" "^1.3.0" + deepmerge-ts "^7.1.1" + side-channel@^1.0.6: version "1.0.6" resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.6.tgz#abd25fb7cd24baf45466406b1096b7831c9215f2" @@ -2144,18 +2183,6 @@ tar-stream@^3.1.5: fast-fifo "^1.2.0" streamx "^2.15.0" -tether-shepherd@latest: - version "1.8.1" - resolved "https://registry.yarnpkg.com/tether-shepherd/-/tether-shepherd-1.8.1.tgz#4fd9b2fdd9059f04b6c4249456d5ae145a3e9223" - integrity sha512-KO0GWox9vCwTV2V/gILhV+rlABnDSMGvkUKJ63h0rRqzsXPFR4A2/xpgADgcooiqGXyK4zI8ZmJ/lpM8MOfMxw== - dependencies: - tether "^1.0.1" - -tether@^1.0.1: - version "1.4.7" - resolved "https://registry.yarnpkg.com/tether/-/tether-1.4.7.tgz#d56a818590d8fe72e387f77a67f93ab96d8e1fb2" - integrity sha512-Z0J1aExjoFU8pybVkQAo/vD2wfSO63r+XOPfWQMC5qtf1bI7IWqNk4MiyBcgvvnY8kqnY06dVdvwTK2S3PU/Fw== - text-decoder@^1.1.0: version "1.2.0" resolved "https://registry.yarnpkg.com/text-decoder/-/text-decoder-1.2.0.tgz#85f19d4d5088e0b45cd841bdfaeac458dbffeefc"