Skip to content

Commit

Permalink
Merge pull request #783 from sul-dlss/propshaft
Browse files Browse the repository at this point in the history
Switch from sprockets to propshaft
  • Loading branch information
justinlittman authored Nov 6, 2023
2 parents 6f38bed + d318283 commit 8759335
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 9 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ gem 'htmlentities'
gem "importmap-rails" # Use JavaScript with ESM import maps
gem "jbuilder" # Build JSON APIs with ease
gem 'okcomputer' # application monitoring
gem "propshaft"
gem "puma", "~> 5.0" # web server for development
gem "rails", "~> 7.0.0"
gem 'recaptcha' # prevent robots spamming the feedback form
gem "sprockets-rails" # The original asset pipeline for Rails
gem "stimulus-rails" # Hotwire's modest JavaScript framework
gem 'tophat'
gem "turbo-rails" # Hotwire's SPA-like page accelerator
Expand Down
14 changes: 6 additions & 8 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,11 @@ GEM
parser (3.2.2.4)
ast (~> 2.4.1)
racc
propshaft (0.8.0)
actionpack (>= 7.0.0)
activesupport (>= 7.0.0)
rack
railties (>= 7.0.0)
psych (5.1.1.1)
stringio
public_suffix (5.0.3)
Expand Down Expand Up @@ -354,13 +359,6 @@ GEM
simplecov_json_formatter (~> 0.1)
simplecov-html (0.12.3)
simplecov_json_formatter (0.1.4)
sprockets (4.2.1)
concurrent-ruby (~> 1.0)
rack (>= 2.2.4, < 4)
sprockets-rails (3.4.2)
actionpack (>= 5.2)
activesupport (>= 5.2)
sprockets (>= 3.0.0)
sshkit (1.21.5)
net-scp (>= 1.1.2)
net-ssh (>= 2.8.0)
Expand Down Expand Up @@ -426,6 +424,7 @@ DEPENDENCIES
mods_display (~> 1.1, >= 1.3.2)
newrelic_rpm
okcomputer
propshaft
puma (~> 5.0)
rails (~> 7.0.0)
recaptcha
Expand All @@ -436,7 +435,6 @@ DEPENDENCIES
rubocop-rspec
selenium-webdriver (!= 3.13.0)
simplecov
sprockets-rails
stimulus-rails
tophat
turbo-rails
Expand Down

0 comments on commit 8759335

Please sign in to comment.