From 2e3ddd61905b7402c7d1160530345dd612cb1793 Mon Sep 17 00:00:00 2001 From: Pierre de La Morinerie Date: Tue, 23 Feb 2021 15:42:10 +0000 Subject: [PATCH] gems: upgrade to Sprockets 4 --- Gemfile | 1 - Gemfile.lock | 3 +-- app/assets/config/manifest.js | 5 +++++ 3 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 app/assets/config/manifest.js diff --git a/Gemfile b/Gemfile index 91c4693e3..aec824937 100644 --- a/Gemfile +++ b/Gemfile @@ -74,7 +74,6 @@ gem 'sib-api-v3-sdk' gem 'skylight' gem 'smart_listing' gem 'spreadsheet_architect' -gem 'sprockets', '< 4' gem 'typhoeus' gem 'warden' gem 'webpacker' diff --git a/Gemfile.lock b/Gemfile.lock index b4e5fa2d7..374f79742 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -730,7 +730,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) @@ -916,7 +916,6 @@ DEPENDENCIES spreadsheet_architect spring spring-commands-rspec - sprockets (< 4) timecop typhoeus vcr diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js new file mode 100644 index 000000000..8890f53b3 --- /dev/null +++ b/app/assets/config/manifest.js @@ -0,0 +1,5 @@ +//= link application.css +//= link_tree ../images +//= link_tree ../fonts +//= link administrate/application.css +//= link administrate/application.js