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.

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

Switch to jsbundling-rails #2815

Merged
merged 19 commits into from
Feb 14, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ AllCops:
- "config/**/*"
- "vendor/**/*"
- "spec/fixtures/**/*"
- "node_modules/**/*"

Rails:
Enabled: true
Expand Down
4 changes: 3 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ gem 'config'
gem 'bootstrap', '~> 5.3'
gem 'bootstrap_form', '~> 5.4'
gem 'blacklight', '~> 8.0'
gem 'blacklight-gallery', '~> 4.4'
gem 'blacklight-gallery', '~> 4.8'
gem 'blacklight_heatmaps', '~> 1.4'
gem 'blacklight-spotlight', '~> 4.4', '>= 4.4.0'
gem 'twitter-typeahead-rails', '0.11.1.pre.corejavascript'
Expand Down Expand Up @@ -136,3 +136,5 @@ gem 'recaptcha', '~> 5.17.1'
gem 'rack-attack'

gem 'cssbundling-rails', '~> 1.4'

gem 'jsbundling-rails', '~> 1.3'
5 changes: 4 additions & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -463,6 +463,8 @@ GEM
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
jsbundling-rails (1.3.1)
railties (>= 6.0.0)
json (2.9.1)
jsonpath (1.1.5)
multi_json
Expand Down Expand Up @@ -934,7 +936,7 @@ DEPENDENCIES
acts-as-taggable-on
bibtex-ruby
blacklight (~> 8.0)
blacklight-gallery (~> 4.4)
blacklight-gallery (~> 4.8)
blacklight-oembed (~> 1.0)
blacklight-spotlight (~> 4.4, >= 4.4.0)
blacklight_advanced_search
Expand Down Expand Up @@ -969,6 +971,7 @@ DEPENDENCIES
iiif-presentation
jbuilder (~> 2.7)
jquery-rails
jsbundling-rails (~> 1.3)
jsonpath
letter_opener
listen (~> 3.3)
Expand Down
1 change: 1 addition & 0 deletions Procfile.dev
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
web: env RUBY_DEBUG_OPEN=true bin/rails server
css: yarn watch:css
js: yarn build --watch
1 change: 1 addition & 0 deletions app/assets/config/manifest.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@
//= link_tree ../builds
//= link_tree ../../../node_modules/openseadragon/build/openseadragon/images
//= link blacklight_gallery/manifest.js
//= link L.Control.Sidebar.js
41 changes: 0 additions & 41 deletions app/assets/javascripts/application.js

This file was deleted.

110 changes: 0 additions & 110 deletions app/assets/javascripts/bibliography.js

This file was deleted.

1 change: 0 additions & 1 deletion app/assets/javascripts/blacklight_heatmaps.js

This file was deleted.

5 changes: 0 additions & 5 deletions app/assets/javascripts/blacklight_oembed.js

This file was deleted.

44 changes: 0 additions & 44 deletions app/assets/javascripts/cited_documents.js

This file was deleted.

53 changes: 0 additions & 53 deletions app/assets/javascripts/exhibit_search_typeahead.js

This file was deleted.

Loading