diff --git a/app/assets/javascripts/spotlight/admin/index.js b/app/assets/javascripts/spotlight/admin/index.js index 1b4e1a662..b9e4e465a 100644 --- a/app/assets/javascripts/spotlight/admin/index.js +++ b/app/assets/javascripts/spotlight/admin/index.js @@ -4,8 +4,8 @@ //= require parameterize //= require bootstrap-tagsinput //= require jquery.serializejson -//= require clipboard -//= require leaflet +//= require clipboard/dist/clipboard +//= 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 9e6b05ac6..d4b28b50e 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 7f3cd5bcb..0758bc593 100644 --- a/blacklight-spotlight.gemspec +++ b/blacklight-spotlight.gemspec @@ -29,7 +29,6 @@ these collections.) s.add_dependency 'breadcrumbs_on_rails', '>= 3.0', '< 5' s.add_dependency 'cancancan' s.add_dependency 'carrierwave', '~> 2.2' - s.add_dependency 'clipboard-rails', '~> 1.5' s.add_dependency 'devise', '~> 4.1' s.add_dependency 'devise_invitable' s.add_dependency 'faraday' @@ -41,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 0ca9020f8..d226565e8 100644 --- a/lib/generators/spotlight/install_generator.rb +++ b/lib/generators/spotlight/install_generator.rb @@ -35,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 de18f5462..86a9b949f 100644 --- a/lib/generators/spotlight/templates/spotlight.scss +++ b/lib/generators/spotlight/templates/spotlight.scss @@ -4,5 +4,4 @@ @import 'spotlight/variables_bootstrap'; @import 'bootstrap'; @import 'sir-trevor/main'; -@import 'leaflet'; @import 'spotlight/spotlight'; diff --git a/lib/spotlight/engine.rb b/lib/spotlight/engine.rb index 13bfb84dd..10d649166 100644 --- a/lib/spotlight/engine.rb +++ b/lib/spotlight/engine.rb @@ -9,12 +9,10 @@ require 'activejob-status' require 'autoprefixer-rails' require 'blacklight' -require 'clipboard/rails' require 'faraday' require 'faraday/follow_redirects' require 'friendly_id' require 'i18n/active_record' -require 'leaflet-rails' require 'paper_trail' require 'riiif' require 'spotlight/riiif_service' @@ -66,6 +64,8 @@ class Engine < ::Rails::Engine end initializer 'spotlight.assets.precompile' do |app| + config.assets.paths << Rails.root.join('node_modules') + app.config.assets.precompile += %w[spotlight/default_thumbnail.jpg spotlight/default_browse_thumbnail.jpg] Sprockets::ES6.configuration = { 'modules' => 'umd', 'moduleIds' => true } diff --git a/package.json b/package.json index f7054ba32..193008b2f 100644 --- a/package.json +++ b/package.json @@ -25,5 +25,7 @@ "not IE 11" ], "dependencies": { + "clipboard": "1.7.1", + "leaflet": "^1.9.3" } }