Upgrade to sprockets 4

6 files changed, 15 insertions, 14 deletions

diff --git a/Gemfile.lock b/Gemfile.lock
index b8e0077a0..3a6990d88 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -680,7 +680,7 @@ GEM
     simplecov_json_formatter (0.1.4)
     sinon-rails (1.15.0)
       railties (>= 3.1)
-    sprockets (3.7.2)
+    sprockets (4.1.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.4.2)
diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js
index fc75a31f6..3b8db2b12 100644
--- a/app/assets/config/manifest.js
+++ b/app/assets/config/manifest.js
@@ -1,11 +1,14 @@
+//= link_tree ../images
+
+//= link main.js
+//= link mobile/mobile.js
 //= link contact-list.js
 //= link jquery3.js
 //= link jquery_ujs.js
-//= link main.js
 //= link jsxc.js
 //= link bookmarklet.js
 //= link mobile/bookmarklet.js
-//= link mobile/mobile.js
-//= link error_pages.css
+
 //= link admin.css
+//= link error_pages.css
 //= link rtl.css
diff --git a/config/application.rb b/config/application.rb
index 50524a735..83c82284d 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -74,14 +74,6 @@ module Diaspora
     # Speed up precompile by not loading the environment
     config.assets.initialize_on_precompile = false
 
-    # Precompile additional assets.
-    # (application.js, application.css, and all non-JS/CSS in the app/assets are already added)
-    config.assets.precompile = %w[
-      color_themes/*/desktop.css
-      color_themes/*/mobile.css
-      manifest.js
-    ]
-
     # See lib/tasks/assets.rake: non_digest_assets
     config.assets.non_digest_assets = %w(branding/logos/asterisk.png)
 
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 26db9c226..4f56e4017 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -27,7 +27,6 @@ Rails.application.configure do
   config.assets.precompile += %w[poltergeist_disable_transition.css]
 
   # Don't precompile all themes for tests
-  config.assets.precompile -= %w[color_themes/*/desktop.css color_themes/*/mobile.css]
   config.assets.precompile += %w[
     color_themes/original/desktop.css
     color_themes/dark_green/desktop.css
diff --git a/config/initializers/color_themes.rb b/config/initializers/color_themes.rb
index 7cabdba64..8231c73ac 100644
--- a/config/initializers/color_themes.rb
+++ b/config/initializers/color_themes.rb
@@ -17,3 +17,10 @@ if color_themes_file.exist?
 else
   AVAILABLE_COLOR_THEMES = ["original"].freeze
 end
+
+unless Rails.env.test?
+  AVAILABLE_COLOR_THEMES.each do |theme_code|
+    Rails.application.config.assets.precompile +=
+      %W[color_themes/#{theme_code}/desktop.css color_themes/#{theme_code}/mobile.css]
+  end
+end
diff --git a/lib/bookmarklet_renderer.rb b/lib/bookmarklet_renderer.rb
index a8e998a73..d15fb7261 100644
--- a/lib/bookmarklet_renderer.rb
+++ b/lib/bookmarklet_renderer.rb
@@ -16,7 +16,7 @@ class BookmarkletRenderer
     end
 
     def source
-      @source ||= Rails.application.assets["bookmarklet.js"].pathname.to_s
+      @source ||= Rails.application.assets["bookmarklet.js"].filename
     end
 
     def body