diff --git a/Gemfile b/Gemfile index cf905dc1..02dfe919 100644 --- a/Gemfile +++ b/Gemfile @@ -67,7 +67,8 @@ group :deployment do gem 'dlss-capistrano' end -gem 'blacklight', '~> 8.1' +# Pin Blacklight to 8.1.0 until a fix is in for: https://github.com/projectblacklight/blacklight/commit/d8c0ec4435db34b85f83a2e4799bc15b0469ef27 +gem 'blacklight', '~> 8.1.0' gem 'blacklight-spotlight', '~> 3.6.0.beta6' gem 'friendly_id' diff --git a/Gemfile.lock b/Gemfile.lock index 7bf88058..535e3e58 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -90,10 +90,11 @@ GEM base64 (0.2.0) bcrypt (3.1.20) bcrypt_pbkdf (1.1.1) + bcrypt_pbkdf (1.1.1-arm64-darwin) bcrypt_pbkdf (1.1.1-x86_64-darwin) bigdecimal (3.1.8) bindex (0.8.1) - blacklight (8.2.0) + blacklight (8.1.0) globalid i18n (>= 1.7.0) jbuilder (~> 2.7) @@ -291,7 +292,9 @@ GEM faraday (>= 1, < 3) faraday-net_http (3.1.0) net-http - ffi (1.17.0) + ffi (1.17.0-arm64-darwin) + ffi (1.17.0-x86_64-darwin) + ffi (1.17.0-x86_64-linux-gnu) ffi-compiler (1.3.2) ffi (>= 1.15.5) rake @@ -418,6 +421,8 @@ GEM net-protocol net-ssh (7.2.3) nio4r (2.7.3) + nokogiri (1.16.5-arm64-darwin) + racc (~> 1.4) nokogiri (1.16.5-x86_64-darwin) racc (~> 1.4) nokogiri (1.16.5-x86_64-linux) @@ -647,6 +652,7 @@ GEM actionpack (>= 5.2) activesupport (>= 5.2) sprockets (>= 3.0.0) + sqlite3 (1.7.3-arm64-darwin) sqlite3 (1.7.3-x86_64-darwin) sqlite3 (1.7.3-x86_64-linux) sshkit (1.22.2) @@ -703,6 +709,7 @@ GEM zeitwerk (2.6.15) PLATFORMS + arm64-darwin-23 x86_64-darwin-19 x86_64-darwin-20 x86_64-darwin-21 @@ -710,7 +717,7 @@ PLATFORMS x86_64-linux DEPENDENCIES - blacklight (~> 8.1) + blacklight (~> 8.1.0) blacklight-gallery (~> 4.2) blacklight-hierarchy (~> 6.1) blacklight-oembed (>= 0.1.0) diff --git a/package.json b/package.json index d9a1e687..b5289bec 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "@blueprintjs/icons": "^4.11.0", "@hotwired/turbo-rails": "^7.2.5", "babel-loader": "8", - "blacklight-frontend": "^8.0.0-beta.8", + "blacklight-frontend": "8.0.1", "blacklight-gallery": "^4.0.2-beta.1", "blacklight-hierarchy": "^6.1.0", "blacklight-range-limit": "^8.2.4-beta.1", diff --git a/yarn.lock b/yarn.lock index 78758ac4..1c1db327 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1740,7 +1740,14 @@ binary-extensions@^2.0.0: resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.3.0.tgz#f6e14a97858d327252200242d4ccfe522c445522" integrity sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw== -"blacklight-frontend@>=7.1 || 8.0", "blacklight-frontend@>=7.1.0 <9", blacklight-frontend@^8.0.0-beta.8: +blacklight-frontend@8.0.1: + version "8.0.1" + resolved "https://registry.yarnpkg.com/blacklight-frontend/-/blacklight-frontend-8.0.1.tgz#20c923ea45e0d9c774ad3d23ef0bed2e31a12c71" + integrity sha512-KVQ4txligEJb3RZx4LpGEx/YDWRWgSDP7xdJOzudFLFwZ8eJAwbwc7L5ErXvuNwdSz0o6v5vf6IIr66Hpbg5TA== + dependencies: + bootstrap ">=4.3.1 <6.0.0" + +"blacklight-frontend@>=7.1 || 8.0", "blacklight-frontend@>=7.1.0 <9": version "8.2.0" resolved "https://registry.yarnpkg.com/blacklight-frontend/-/blacklight-frontend-8.2.0.tgz#fadd4b13594a429febbccada88643db661c76471" integrity sha512-pJo5tvFu1hv7u9jU4nxCwGPrxwOIj/ZOx52nBVHAZBdpwpLAapV/+oxHyb5dfeXzq/kbFP4gDZhXCGF3KHksTg==