Skip to content

Commit

Permalink
Merge pull request #1854 from sul-dlss/pin-blacklight
Browse files Browse the repository at this point in the history
Pin blacklight to 8.1.0 until JS in 8.2 is fixed
  • Loading branch information
taylor-steve authored Jun 3, 2024
2 parents e77b984 + 960377f commit 8ff8fd4
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 6 deletions.
3 changes: 2 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
13 changes: 10 additions & 3 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -703,14 +709,15 @@ GEM
zeitwerk (2.6.15)

PLATFORMS
arm64-darwin-23
x86_64-darwin-19
x86_64-darwin-20
x86_64-darwin-21
x86_64-darwin-22
x86_64-linux

DEPENDENCIES
blacklight (~> 8.1)
blacklight (~> 8.1.0)
blacklight-gallery (~> 4.2)
blacklight-hierarchy (~> 6.1)
blacklight-oembed (>= 0.1.0)
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
9 changes: 8 additions & 1 deletion yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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:
[email protected]:
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==
Expand Down

0 comments on commit 8ff8fd4

Please sign in to comment.