Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade to Blacklight 8.4.0 #1415

Merged
merged 1 commit into from
Oct 30, 2024
Merged

Upgrade to Blacklight 8.4.0 #1415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
25 changes: 10 additions & 15 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion config/importmap.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down