Merge pull request #1941 from sul-dlss/works-locally

Move to global jQuery for importmap

Gemfile.lock

@@ -108,7 +108,7 @@ GEM
       rails (>= 6.1, < 9)
       view_component (>= 2.74, < 4)
       zeitwerk
-    blacklight-gallery (4.8.1)
+    blacklight-gallery (4.8.3)
       blacklight (>= 7.17, < 9)
       rails (>= 6.1, < 9)
     blacklight-hierarchy (6.4.0)
@@ -211,7 +211,7 @@ GEM
       mini_mime (>= 0.1.3)
       ssrf_filter (~> 1.0)
     clipboard-rails (1.7.1)
-    concurrent-ruby (1.3.4)
+    concurrent-ruby (1.3.5)
     config (5.5.2)
       deep_merge (~> 1.2, >= 1.2.1)
       ostruct
@@ -581,7 +581,7 @@ GEM
       zeitwerk (~> 2.6)
     rainbow (3.1.1)
     rake (13.2.1)
-    rdoc (6.10.0)
+    rdoc (6.11.0)
       psych (>= 4.0.0)
     recaptcha (5.18.0)
     redcarpet (3.6.0)

app/javascript/entry.js

@@ -1,8 +1,5 @@
 // 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"
 
@@ -17,6 +14,7 @@ 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,6 +18,7 @@
     <%= 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')}')" %>

config/importmap.rb

@@ -5,7 +5,7 @@
 pin "@hotwired/stimulus", to: "stimulus.min.js", preload: true
 pin "@hotwired/stimulus-loading", to: "stimulus-loading.js", preload: true
 pin_all_from "app/javascript/controllers", under: "controllers"
-pin "jquery", to: "https://ga.jspm.io/npm:jquery@3.6.3/dist/jquery.js"
+pin "jquery", to: "https://ga.jspm.io/npm:jquery@3.7.1/dist/jquery.js"
 pin "bootstrap", to: "https://ga.jspm.io/npm:[email protected]/dist/js/bootstrap.js"
 pin "popper.js", to: "https://ga.jspm.io/npm:[email protected]/dist/umd/popper.js"
 pin "i18n-js", to: "https://ga.jspm.io/npm:[email protected]/dist/import/index.js"