Make leaflet an NPM dependency

projectblacklight · Feb 15, 2023 · be36840 · be36840
1 parent eff600e
commit be36840
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 7 deletions.
diff --git a/app/assets/javascripts/spotlight/admin/index.js b/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

diff --git 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
@@ -19,8 +19,8 @@ def add_js
 
       run 'bundle exec rails webpacker:install'
 
-      say 'Install Clipboard'
-      run 'yarn add clipboard@1.7.1'
+      say 'Install Clipboard & Leaflet'
+      run 'yarn add clipboard@1.7.1 leaflet@^1.9.3'
     end
 
     def add_manifest

diff --git 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
@@ -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
@@ -25,6 +25,7 @@
     "not IE 11"
   ],
   "dependencies": {
-    "clipboard": "1.7.1"
+    "clipboard": "1.7.1",
+    "leaflet": "^1.9.3"
   }
 }