From 367255c8f5be695bf8aa9a73f03fa9aab020c769 Mon Sep 17 00:00:00 2001 From: Justin Coyne Date: Wed, 15 Feb 2023 09:58:25 -0600 Subject: [PATCH] Make leaflet an NPM dependency --- app/assets/javascripts/spotlight/admin/index.js | 2 +- app/views/layouts/spotlight/base.html.erb | 1 + blacklight-spotlight.gemspec | 1 - lib/generators/spotlight/install_generator.rb | 8 +++++--- lib/generators/spotlight/templates/spotlight.scss | 2 +- lib/spotlight/engine.rb | 1 - package.json | 3 ++- 7 files changed, 10 insertions(+), 8 deletions(-) diff --git a/app/assets/javascripts/spotlight/admin/index.js b/app/assets/javascripts/spotlight/admin/index.js index 5a7db5bf3d..b9e4e465ac 100644 --- a/app/assets/javascripts/spotlight/admin/index.js +++ b/app/assets/javascripts/spotlight/admin/index.js @@ -5,7 +5,7 @@ //= require bootstrap-tagsinput //= require jquery.serializejson //= require clipboard/dist/clipboard -//= require leaflet +//= require leaflet/dist/leaflet-src //= require leaflet-iiif //= require Leaflet.Editable //= require Path.Drag diff --git a/app/views/layouts/spotlight/base.html.erb b/app/views/layouts/spotlight/base.html.erb index 9e6b05ac6f..d4b28b50ef 100644 --- a/app/views/layouts/spotlight/base.html.erb +++ b/app/views/layouts/spotlight/base.html.erb @@ -13,6 +13,7 @@ <% else %> <%= stylesheet_link_tag "application" %> <% end %> + <%= javascript_include_tag "application" %> <%= csrf_meta_tags %> <%= content_for(:head) %> diff --git a/blacklight-spotlight.gemspec b/blacklight-spotlight.gemspec index 31f313f807..0758bc593a 100644 --- a/blacklight-spotlight.gemspec +++ b/blacklight-spotlight.gemspec @@ -40,7 +40,6 @@ these collections.) s.add_dependency 'i18n-active_record' s.add_dependency 'iiif_manifest' s.add_dependency 'iiif-presentation' - s.add_dependency 'leaflet-rails' s.add_dependency 'legato' s.add_dependency 'mini_magick' s.add_dependency 'nokogiri' diff --git a/lib/generators/spotlight/install_generator.rb b/lib/generators/spotlight/install_generator.rb index 09b47ff571..d226565e84 100644 --- a/lib/generators/spotlight/install_generator.rb +++ b/lib/generators/spotlight/install_generator.rb @@ -27,9 +27,6 @@ def add_js_rails6 # but since webpacker exists in the gemfile, we still need to run the # install before rails will start run 'bin/rails webpacker:install' - - say 'Install Clipboard' - run 'yarn add clipboard@1.7.1' end def add_js_rails7 @@ -38,6 +35,11 @@ def add_js_rails7 append_to_file 'app/assets/javascripts/application.js', "\n//= require_tree .\n" end + def add_js_deps + say 'Install Clipboard & Leaflet' + run 'yarn add clipboard@1.7.1 leaflet@^1.9.3' + end + def add_manifest append_to_file 'app/assets/config/manifest.js', "\n//= link spotlight/manifest.js" end diff --git a/lib/generators/spotlight/templates/spotlight.scss b/lib/generators/spotlight/templates/spotlight.scss index de18f5462c..bdf7a50bb0 100644 --- a/lib/generators/spotlight/templates/spotlight.scss +++ b/lib/generators/spotlight/templates/spotlight.scss @@ -4,5 +4,5 @@ @import 'spotlight/variables_bootstrap'; @import 'bootstrap'; @import 'sir-trevor/main'; -@import 'leaflet'; +@import 'leaflet/dist/leaflet'; @import 'spotlight/spotlight'; diff --git a/lib/spotlight/engine.rb b/lib/spotlight/engine.rb index ac225f4813..10d6491666 100644 --- a/lib/spotlight/engine.rb +++ b/lib/spotlight/engine.rb @@ -13,7 +13,6 @@ require 'faraday/follow_redirects' require 'friendly_id' require 'i18n/active_record' -require 'leaflet-rails' require 'paper_trail' require 'riiif' require 'spotlight/riiif_service' diff --git a/package.json b/package.json index 60ae97e4e9..193008b2fc 100644 --- a/package.json +++ b/package.json @@ -25,6 +25,7 @@ "not IE 11" ], "dependencies": { - "clipboard": "1.7.1" + "clipboard": "1.7.1", + "leaflet": "^1.9.3" } }