Merge pull request #1878 from sul-dlss/update-spotlight

Update Spotlight to v4

.solr_wrapper.yml

@@ -3,4 +3,4 @@
 collection:
   dir: solr/config/
   name: dlme
-version: 9.6.1
+version: 9.6.1

Gemfile

@@ -71,7 +71,9 @@ group :deployment do
 end
 
 gem 'blacklight', '~> 8.2'
-gem 'blacklight-spotlight', '~> 3.6.0.beta10'
+gem 'blacklight-spotlight', '~> 4.0'
+
+gem 'bootstrap_form', '~> 4.5' # needs to match Bootstrap version
 
 gem 'friendly_id'
 gem 'iiif-presentation', '~> 1.0'

Gemfile.lock

@@ -78,8 +78,9 @@ GEM
       minitest (>= 5.1)
       mutex_m
       tzinfo (~> 2.0)
-    acts-as-taggable-on (10.0.0)
-      activerecord (>= 6.1, < 7.2)
+    acts-as-taggable-on (11.0.0)
+      activerecord (>= 7.0, < 8.0)
+      zeitwerk (>= 2.4, < 3.0)
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
     airbrussh (1.5.3)
@@ -113,13 +114,13 @@ GEM
       blacklight (>= 7.0, < 9)
       rails
       ruby-oembed
-    blacklight-spotlight (3.6.0.beta10)
+    blacklight-spotlight (4.0.3)
       activejob-status
-      acts-as-taggable-on (>= 5.0, < 11)
+      acts-as-taggable-on (>= 5.0, < 12)
       autoprefixer-rails
       blacklight (>= 7.18, < 9)
       blacklight-gallery (>= 3.0, < 5)
-      bootstrap_form (~> 4.1)
+      bootstrap_form (>= 4.1, < 6)
       breadcrumbs_on_rails (>= 3.0, < 5)
       cancancan
       carrierwave (~> 2.2)
@@ -142,7 +143,7 @@ GEM
       openseadragon
       ostruct (!= 0.3.2, != 0.3.1, != 0.3.0)
       paper_trail (>= 11.0, < 16)
-      rails (>= 6.1, < 7.2)
+      rails (>= 7.0, < 8)
       redcarpet (>= 2.0.1, < 4)
       riiif (~> 2.0)
       roar (~> 1.1)
@@ -722,9 +723,10 @@ DEPENDENCIES
   blacklight-gallery (~> 4.2)
   blacklight-hierarchy (~> 6.1)
   blacklight-oembed (>= 0.1.0)
-  blacklight-spotlight (~> 3.6.0.beta10)
+  blacklight-spotlight (~> 4.0)
   blacklight_range_limit (~> 8.0)
   bootsnap (>= 1.4.4)
+  bootstrap_form (~> 4.5)
   cache_with_locale
   capistrano-passenger
   capistrano-rails

package.json

@@ -26,7 +26,7 @@
     "sass": "^1.58.3",
     "shakapacker": "^6.5.6",
     "sir-trevor": "^0.8.2",
-    "spotlight-frontend": "^3.6.0-beta.10",
+    "spotlight-frontend": "^4.0.3",
     "terser-webpack-plugin": "5",
     "url": "^0.11.0",
     "webpack": "5",

yarn.lock

@@ -4461,10 +4461,10 @@ spdy@^4.0.2:
     select-hose "^2.0.0"
     spdy-transport "^3.0.0"
 
-spotlight-frontend@^3.6.0-beta.10:
-  version "3.6.0-beta.10"
-  resolved "https://registry.yarnpkg.com/spotlight-frontend/-/spotlight-frontend-3.6.0-beta.10.tgz#ba3f7123539abea79e573dc0d59ff0b086e29e72"
-  integrity sha512-IvnJ9jkZbSjbYRxdkyi39SNGh5QOXe1ZGF5bMvpwV7rRNf+BL7xKcgJBqia4kKNHJnE4/tCKNiD+6UvSn/nwlg==
+spotlight-frontend@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/spotlight-frontend/-/spotlight-frontend-4.0.3.tgz#1f341dfcf01e1cef6e57b71a199ee4eb3a9c24fe"
+  integrity sha512-TORlL7bZvhrWDGeC+sLc90VJ2s0zenvazrH56q2pJw8dALiYA8k+H+otVGa7EhAb7NSEJS24Za9iRerYORpncQ==
 
 [email protected]:
   version "2.0.1"