Make leaflet an NPM dependency

app/assets/javascripts/spotlight/admin/index.js

@@ -6,7 +6,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

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'

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 'bundle exec rails webpacker:install'
-
-      say 'Install Clipboard'
-      run 'yarn add [email protected]'
     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 [email protected] leaflet@^1.9.3'
+    end
+
     def add_manifest
       append_to_file 'app/assets/config/manifest.js', "\n//= link spotlight/manifest.js"
     end

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';

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'

package.json

@@ -25,6 +25,7 @@
     "not IE 11"
   ],
   "dependencies": {
-    "clipboard": "1.7.1"
+    "clipboard": "1.7.1",
+    "leaflet": "^1.9.3"
   }
 }