Merge remote-tracking branch 'upstream/pull/5376'

[rails.git] / config / initializers / assets.rb

diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
index cbd93c1d8d38bdab1c94bb96fea848ae58ac4621..85ce74f153ee1c2a9f3b95930cd74e32c5522847 100644 (file)
--- a/config/initializers/assets.rb
+++ b/config/initializers/assets.rb
@@ -4,29 +4,15 @@
 Rails.application.config.assets.version = "1.0"
 
 # Location of manifest file.
 Rails.application.config.assets.version = "1.0"
 
 # Location of manifest file.

-Rails.application.config.assets.manifest = Rails.root.join("tmp", "manifest.json")
+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 << Rails.root.join("config")
 

+# 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.
 # 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]
-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[html5shiv.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 )