Update to sprockets 4.x

diff --git a/Gemfile.lock b/Gemfile.lock
index 5c6a91b264a1705ee72d2c2eca64e89569aa3295..97473d9ac53b8f4e08e7d79fb260cd48b0782f31 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -405,7 +405,7 @@ GEM
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
     smart_properties (1.15.0)
-    sprockets (3.7.2)
+    sprockets (4.0.0)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.2.1)

diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js
new file mode 100644 (file)
index 0000000..bc308b8
--- /dev/null
+++ b/app/assets/config/manifest.js
@@ -0,0 +1,23 @@
+//= link browserconfig.xml
+//= link manifest.json
+
+//= link_tree ../favicons
+//= link_tree ../images
+//= link_tree ../javascripts .js
+//= link_tree ../opensearch .xml
+//= link_directory ../stylesheets .css
+
+//= link_tree ../../../vendor/assets/iD/iD/img
+//= link_directory ../../../vendor/assets/iD/iD/locales .json
+
+//= link_directory ../../../vendor/assets/javascripts .js
+
+//= link_tree ../../../vendor/assets/leaflet .png
+
+//= link_directory ../../../vendor/assets/polyfill .js
+
+//= link_directory ../../../vendor/assets/potlatch2/help
+//= link_tree ../../../vendor/assets/potlatch2 .swf
+//= link_tree ../../../vendor/assets/potlatch2 .zip
+
+//= link_directory ../../../vendor/assets/swfobject

diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
index 4193fe482e777cb5ddb5f241cd48c700bf062f5b..255ae108e2a96b5eade11fcbb11d041dd608f5bf 100644 (file)
--- a/config/initializers/assets.rb
+++ b/config/initializers/assets.rb
@@ -9,25 +9,12 @@ Rails.application.config.assets.manifest = Rails.root.join("tmp", "manifest.json
 # Add additional assets to the asset load path.
 Rails.application.config.assets.paths << Rails.root.join("config")
 
+# Add additional assets to the asset load path.
+# 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[index.js browse.js welcome.js fixthemap.js]
-Rails.application.config.assets.precompile += %w[user.js login.js diary_entry.js messages.js edit/*.js i18n/*.js]
-Rails.application.config.assets.precompile += %w[screen-ltr.css print-ltr.css]
-Rails.application.config.assets.precompile += %w[screen-rtl.css print-rtl.css]
-Rails.application.config.assets.precompile += %w[leaflet-all.css leaflet.ie.css]
-Rails.application.config.assets.precompile += %w[id.js id.css]
-Rails.application.config.assets.precompile += %w[embed.js embed.css]
-Rails.application.config.assets.precompile += %w[errors.css]
-Rails.application.config.assets.precompile += %w[html5shiv.js es5.js es6.js]
-Rails.application.config.assets.precompile += %w[images/marker-*.png img/*-handle.png]
-Rails.application.config.assets.precompile += %w[swfobject.js expressInstall.swf]
-Rails.application.config.assets.precompile += %w[potlatch2.swf]
-Rails.application.config.assets.precompile += %w[potlatch2/assets.zip]
-Rails.application.config.assets.precompile += %w[potlatch2/FontLibrary.swf]
-Rails.application.config.assets.precompile += %w[potlatch2/locales/*.swf]
-Rails.application.config.assets.precompile += %w[help/introduction.*]
-Rails.application.config.assets.precompile += %w[iD/img/*.svg iD/img/*.png iD/img/*.gif]
-Rails.application.config.assets.precompile += %w[iD/img/pattern/*.png]
-Rails.application.config.assets.precompile += %w[iD/locales/*.json]
+# Rails.application.config.assets.precompile += %w( admin.js admin.css )