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

Unpin Sprockets gem and upgrade to version 4. #1404

Merged
merged 1 commit into from
Sep 14, 2021
Merged

Unpin Sprockets gem and upgrade to version 4. #1404

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
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ gem "rqrcode"
gem "sassc-rails"
gem "sentry-rails"
gem "sentry-ruby"
gem "sprockets", "3.7.2"
gem "sprockets"
gem "two_factor_authentication"
gem "tzinfo-data"
gem "uk_postcode", "~> 2.1"
Expand Down
4 changes: 2 additions & 2 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,7 @@ GEM
spring (2.1.1)
spring-commands-rspec (1.0.4)
spring (>= 0.9.1)
sprockets (3.7.2)
sprockets (4.0.2)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.2.2)
Expand Down Expand Up @@ -499,7 +499,7 @@ DEPENDENCIES
simplecov
simplecov-console
spring-commands-rspec
sprockets (= 3.7.2)
sprockets
timecop (~> 0.9.2)
two_factor_authentication
tzinfo-data
Expand Down
3 changes: 3 additions & 0 deletions app/assets/config/manifest.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
//= link_tree ../images
//= link_directory ../stylesheets .css
//= link_directory ../javascripts .js
//= link accessible-autocomplete.min.css
//= link html5shiv.js
//= link govuk-logotype-crown.png
11 changes: 1 addition & 10 deletions config/initializers/assets.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,11 @@
# Version of your assets, change this if you want to expire all your assets.
Rails.application.config.assets.version = "1.0"

Rails.application.config.assets.precompile += %w[
govuk-logotype-crown.png
application_ie8.css
html5shiv.js
accessible-autocomplete.min.js
accessible-autocomplete.min.css
tick.svg
cross.svg
]

Rails.application.config.assets.paths += [
Rails.root.join("node_modules/govuk-frontend/govuk/assets/images"),
Rails.root.join("node_modules/govuk-frontend/govuk/assets/fonts"),
Rails.root.join("node_modules/govuk-frontend/govuk"),
Rails.root.join("node_modules/govwifi-shared-frontend/dist"),
Rails.root.join("node_modules/html5shiv/dist"),
Rails.root.join("vendor/assets/stylesheets"),
]