From b840520b3b595fa30fb555a2b816cfa0b0acf156 Mon Sep 17 00:00:00 2001
From: Justin Coyne <jcoyne@justincoyne.com>
Date: Wed, 18 Sep 2024 13:40:20 -0500
Subject: [PATCH] Upgrade to Blacklight 8.4.0

---
 Gemfile             |  3 +--
 Gemfile.lock        | 25 ++++++++++---------------
 config/importmap.rb |  2 +-
 package-lock.json   |  4 ++--
 package.json        |  2 +-
 5 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/Gemfile b/Gemfile
index bb9888db..a898ab41 100644
--- a/Gemfile
+++ b/Gemfile
@@ -62,8 +62,7 @@ group :production do
   gem 'pg'
 end
 
-#gem 'blacklight', '~> 8.3'
-gem 'blacklight', github: 'projectblacklight/blacklight', branch: 'main'
+gem 'blacklight', '~> 8.4'
 gem 'rsolr' # required for Blacklight
 gem 'geoblacklight', github: 'geoblacklight/geoblacklight', tag: 'v5.0.0-alpha.10'
 gem 'faraday', '~> 2.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index 3da9bd2e..e368b454 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -16,20 +16,6 @@ GIT
       vite_rails (~> 3.0)
       zeitwerk
 
-GIT
-  remote: https://github.com/projectblacklight/blacklight.git
-  revision: c4ce13eee7eb0819c72f35a46db4eb565e6dfaa6
-  branch: main
-  specs:
-    blacklight (8.3.0)
-      globalid
-      i18n (>= 1.7.0)
-      jbuilder (~> 2.7)
-      kaminari (>= 0.15)
-      ostruct (>= 0.3.2)
-      rails (>= 6.1, < 8)
-      view_component (>= 2.66, < 4)
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -128,6 +114,15 @@ GEM
     bcrypt_pbkdf (1.1.1-x86_64-darwin)
     bigdecimal (3.1.8)
     bindex (0.8.1)
+    blacklight (8.4.0)
+      globalid
+      i18n (>= 1.7.0)
+      jbuilder (~> 2.7)
+      kaminari (>= 0.15)
+      ostruct (>= 0.3.2)
+      rails (>= 6.1, < 8)
+      view_component (>= 2.66, < 4)
+      zeitwerk
     blacklight_dynamic_sitemap (0.6.0)
       blacklight (> 6.0)
       rails
@@ -612,7 +607,7 @@ PLATFORMS
 DEPENDENCIES
   axe-core-rspec
   bcrypt_pbkdf (~> 1.1)
-  blacklight!
+  blacklight (~> 8.4)
   blacklight_dynamic_sitemap (~> 0.3)
   bootsnap (>= 1.1.0)
   bootstrap (~> 5.3)
diff --git a/config/importmap.rb b/config/importmap.rb
index f34b1141..fcb2b6ed 100644
--- a/config/importmap.rb
+++ b/config/importmap.rb
@@ -10,7 +10,7 @@
 pin 'bootstrap', to: 'https://cdn.skypack.dev/bootstrap@5.3.3'
 
 # Blacklight
-pin 'blacklight', to: 'https://cdn.skypack.dev/blacklight-frontend@8.3.0/dist/blacklight.js'
+pin 'blacklight', to: 'https://cdn.skypack.dev/blacklight-frontend@8.4.0/dist/blacklight.js'
 pin '@github/auto-complete-element', to: 'https://cdn.skypack.dev/@github/auto-complete-element'
 
 # EarthWorks
diff --git a/package-lock.json b/package-lock.json
index 491a4779..1d101f81 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4,10 +4,9 @@
   "requires": true,
   "packages": {
     "": {
-      "name": "earthworks",
       "dependencies": {
         "@geoblacklight/frontend": "^5.0.0-alpha.10",
-        "blacklight-frontend": "^8.3.0",
+        "blacklight-frontend": "^8.4.0",
         "bootstrap": "^5.3.3",
         "bootstrap-slider": "^11.0.2",
         "leaflet": "^1.9.4",
@@ -2261,6 +2260,7 @@
       "version": "8.4.0",
       "resolved": "https://registry.npmjs.org/blacklight-frontend/-/blacklight-frontend-8.4.0.tgz",
       "integrity": "sha512-xycmoUUr8laqqRM9i8tIhzbow9ww/zMqXFVkaZjGhh5ntBNucUYTDfCHOIdOsaEKR+F5IPG5mm2wve5Uyds7kQ==",
+      "license": "Apache-2.0",
       "dependencies": {
         "bootstrap": ">=4.3.1 <6.0.0"
       }
diff --git a/package.json b/package.json
index d59c9dad..40d0c8be 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
   },
   "dependencies": {
     "@geoblacklight/frontend": "^5.0.0-alpha.10",
-    "blacklight-frontend": "^8.3.0",
+    "blacklight-frontend": "^8.4.0",
     "bootstrap": "^5.3.3",
     "bootstrap-slider": "^11.0.2",
     "leaflet": "^1.9.4",