diff --git a/Gemfile b/Gemfile index 34d07ffa6..b1c4b1f48 100644 --- a/Gemfile +++ b/Gemfile @@ -51,7 +51,7 @@ gem "sassc-rails", "~> 2.1.2" gem "savon", "~> 2.12.1" gem "sitemap_generator", "~> 6.1.2" gem "social-share-button", "~> 1.2.4" -gem "sprockets", "~> 3.7.2" +gem "sprockets", "~> 4.0.2" gem "translator-text", "~> 0.1.0" gem "turbolinks", "~> 5.2.1" gem "turnout", "~> 2.5.0" diff --git a/Gemfile.lock b/Gemfile.lock index ebd507269..e4a65487e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -249,7 +249,7 @@ GEM faraday-net_http_persistent (1.2.0) faraday-patron (1.0.0) faraday-rack (1.0.0) - ffi (1.13.1) + ffi (1.15.4) font-awesome-sass (5.15.1) sassc (>= 1.11) foundation-rails (6.6.2.0) @@ -573,7 +573,7 @@ GEM sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - sassc (2.1.0) + sassc (2.4.0) ffi (~> 1.9) sassc-rails (2.1.2) railties (>= 4.0.0) @@ -611,7 +611,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-es6 (0.9.2) @@ -778,7 +778,7 @@ DEPENDENCIES social-share-button (~> 1.2.4) spring (~> 2.1.1) spring-commands-rspec (~> 1.0.4) - sprockets (~> 3.7.2) + sprockets (~> 4.0.2) translator-text (~> 0.1.0) turbolinks (~> 5.2.1) turnout (~> 2.5.0) diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js new file mode 100644 index 000000000..c952cc97e --- /dev/null +++ b/app/assets/config/manifest.js @@ -0,0 +1,14 @@ +//= link ckeditor/application.css +//= link ckeditor/application.js +// +//= link_tree ../images +//= link application.css +//= link application-rtl.css +//= link application.js +// +//= link ckeditor/config.js +//= link stat_graphs.js +//= link dashboard_graphs.js +//= link print.css +//= link pdf_fonts.css +//= link_tree ../../../vendor/assets/images diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb deleted file mode 100644 index 6904fc4d7..000000000 --- a/config/initializers/assets.rb +++ /dev/null @@ -1,22 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# Version of your assets, change this if you want to expire all your assets. -Rails.application.config.assets.version = "1.0" - -# Add additional assets to the asset load path -# Rails.application.config.assets.paths << Emoji.images_path - -# Precompile additional assets. -# application.js, application.css, and all non-JS/CSS in app/assets folder are already added. -# Rails.application.config.assets.precompile += %w( search.js ) -Rails.application.config.assets.precompile += %w[ckeditor/config.js] -Rails.application.config.assets.precompile += %w[stat_graphs.js] -Rails.application.config.assets.precompile += %w[dashboard_graphs.js] -Rails.application.config.assets.precompile += %w[application-rtl.css] -Rails.application.config.assets.precompile += %w[print.css] -Rails.application.config.assets.precompile += %w[pdf_fonts.css] -Rails.application.config.assets.precompile += %w[sdg/*.png] -Rails.application.config.assets.precompile += %w[sdg/**/*.png] -Rails.application.config.assets.precompile += %w[sdg/**/*.svg] - -# Loads custom images and custom fonts before app/assets/images and app/assets/fonts