From 31af1a7f3d1dd0e1a41af885eda06663f25251bf Mon Sep 17 00:00:00 2001
From: Jyri-Petteri Paloposki <jyri-petteri.paloposki@iki.fi>
Date: Thu, 20 Aug 2020 12:16:33 +0300
Subject: [PATCH] Move asset precompile config to config/manifest.js for
 Sprockets 4.

---
 app/assets/config/manifest.js                         | 3 +++
 app/assets/stylesheets/black.scss                     | 2 +-
 app/assets/stylesheets/{ => include}/icons.scss       | 0
 app/assets/stylesheets/{ => include}/legacy.scss      | 0
 app/assets/stylesheets/{ => include}/login.scss       | 0
 app/assets/stylesheets/{ => include}/manifest.scss    | 0
 app/assets/stylesheets/{ => include}/tracks-logo.scss | 0
 app/assets/stylesheets/{ => include}/tracks.scss      | 0
 app/assets/stylesheets/light_blue.scss                | 2 +-
 config/initializers/assets.rb                         | 5 -----
 10 files changed, 5 insertions(+), 7 deletions(-)
 create mode 100644 app/assets/config/manifest.js
 rename app/assets/stylesheets/{ => include}/icons.scss (100%)
 rename app/assets/stylesheets/{ => include}/legacy.scss (100%)
 rename app/assets/stylesheets/{ => include}/login.scss (100%)
 rename app/assets/stylesheets/{ => include}/manifest.scss (100%)
 rename app/assets/stylesheets/{ => include}/tracks-logo.scss (100%)
 rename app/assets/stylesheets/{ => include}/tracks.scss (100%)

diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js
new file mode 100644
index 00000000..b16e53d6
--- /dev/null
+++ b/app/assets/config/manifest.js
@@ -0,0 +1,3 @@
+//= link_tree ../images
+//= link_directory ../javascripts .js
+//= link_directory ../stylesheets .css
diff --git a/app/assets/stylesheets/black.scss b/app/assets/stylesheets/black.scss
index edff8b5c..86647a0b 100644
--- a/app/assets/stylesheets/black.scss
+++ b/app/assets/stylesheets/black.scss
@@ -9,4 +9,4 @@ $link-bgcolor: $link-color;
 $box-tablink-color: unset;
 
 // Import all components
-@import 'manifest';
+@import 'include/manifest';
diff --git a/app/assets/stylesheets/icons.scss b/app/assets/stylesheets/include/icons.scss
similarity index 100%
rename from app/assets/stylesheets/icons.scss
rename to app/assets/stylesheets/include/icons.scss
diff --git a/app/assets/stylesheets/legacy.scss b/app/assets/stylesheets/include/legacy.scss
similarity index 100%
rename from app/assets/stylesheets/legacy.scss
rename to app/assets/stylesheets/include/legacy.scss
diff --git a/app/assets/stylesheets/login.scss b/app/assets/stylesheets/include/login.scss
similarity index 100%
rename from app/assets/stylesheets/login.scss
rename to app/assets/stylesheets/include/login.scss
diff --git a/app/assets/stylesheets/manifest.scss b/app/assets/stylesheets/include/manifest.scss
similarity index 100%
rename from app/assets/stylesheets/manifest.scss
rename to app/assets/stylesheets/include/manifest.scss
diff --git a/app/assets/stylesheets/tracks-logo.scss b/app/assets/stylesheets/include/tracks-logo.scss
similarity index 100%
rename from app/assets/stylesheets/tracks-logo.scss
rename to app/assets/stylesheets/include/tracks-logo.scss
diff --git a/app/assets/stylesheets/tracks.scss b/app/assets/stylesheets/include/tracks.scss
similarity index 100%
rename from app/assets/stylesheets/tracks.scss
rename to app/assets/stylesheets/include/tracks.scss
diff --git a/app/assets/stylesheets/light_blue.scss b/app/assets/stylesheets/light_blue.scss
index ae2972c1..9d6ea71e 100644
--- a/app/assets/stylesheets/light_blue.scss
+++ b/app/assets/stylesheets/light_blue.scss
@@ -9,4 +9,4 @@ $link-bgcolor: unset;
 $box-tablink-color: lighten(#000, 85%);
 
 // Import all components
-@import 'manifest';
+@import 'include/manifest';
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
index 117d2895..719bc58e 100644
--- a/config/initializers/assets.rb
+++ b/config/initializers/assets.rb
@@ -7,8 +7,3 @@ Rails.application.config.assets.version = '1.0'
 # Rails.application.config.assets.paths << Emoji.images_path
 # Add Yarn node_modules folder to the asset load path.
 Rails.application.config.assets.paths << Rails.root.join('node_modules')
-
-# Precompile additional assets.
-# application.js, application.css, and all non-JS/CSS in the app/assets
-# folder are already added.
-Rails.application.config.assets.precompile += %w( light_blue.css black.css print.css mobile.css jquery-ui/datepicker-*.js )