Merge pull request #1948 from sul-dlss/restore-spotlight

Restore Spotlight javascript

app/assets/javascripts/blacklight_gallery.js

@@ -0,0 +1 @@
+//= require blacklight_gallery/blacklight-gallery

app/assets/javascripts/spotlight.js

@@ -0,0 +1,10 @@
+// require the parts of spotlight/application rather than using it directly in order to
+// work around https://github.com/projectblacklight/spotlight/pull/2921
+
+//= require leaflet
+//= require sir-trevor
+//= require clipboard
+//= require tiny-slider
+//= require typeahead.bundle.min.js
+
+//= require spotlight/spotlight

app/javascript/entry.js

@@ -1,5 +1,8 @@
 // This is the entrypoint for the importmap build.
 // Configure your import map in config/importmap.rb. Read more: https://github.com/rails/importmap-rails
+import jQuery from 'jquery'
+window.jQuery = jQuery
+window.$ = jQuery
 
 import "@hotwired/turbo-rails"
 
@@ -8,13 +11,11 @@ import "controllers"
 import 'bootstrap'
 import Blacklight from 'blacklight'
 import 'openseadragon-rails/rails'
-import 'blacklight-gallery'
 
 window.Blacklight = Blacklight
 
 import { I18n } from 'i18n-js'
 export const i18n = new I18n()
-window.i18n = i18n
 
 import 'transform_result'
 import 'blacklight-hierarchy'

app/views/layouts/spotlight/base.html.erb

@@ -18,7 +18,6 @@
     <%= description %>
     <%= twitter_card %>
     <%= opengraph %>
-    <script src="https://code.jquery.com/jquery-3.7.1.min.js" integrity="sha256-/JqT3SQfawRcv/BIHPThkBvs0OEvtFFmqPF/lYI/Cxo=" crossorigin="anonymous"></script>
     <%= javascript_importmap_tags 'entry' %>
     <%= javascript_include_tag "application", defer: true %>
     <%= javascript_tag "window.addEventListener('load', () => window.sirTrevorIcon = '#{asset_path('spotlight/blocks/sir-trevor-icons.svg')}')" %>