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

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

diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
index fd6d1e4d24376b55fc8c789a0accf17fb843010e..85ce74f153ee1c2a9f3b95930cd74e32c5522847 100644 (file)
--- a/config/initializers/assets.rb
+++ b/config/initializers/assets.rb
@@ -1,23 +1,18 @@
 # 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.
 # 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'
+Rails.application.config.assets.version = "1.0"
+
+# Location of manifest file.
+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 Yarn node_modules folder to the asset load path.
+Rails.application.config.assets.paths << Rails.root.join("node_modules")

 
 # Precompile additional assets.
 
 # 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( index.js browse.js welcome.js fixthemap.js )
-Rails.application.config.assets.precompile += %w( user.js diary_entry.js swfobject.js )
-Rails.application.config.assets.precompile += %w( large-ltr.css small-ltr.css print-ltr.css )
-Rails.application.config.assets.precompile += %w( large-rtl.css small-rtl.css print-rtl.css )
-Rails.application.config.assets.precompile += %w( leaflet-all.css leaflet.ie.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( 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.js iD.css )
-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 )
+# application.js, application.css, and all non-JS/CSS in the app/assets
+# folder are already added.
+# Rails.application.config.assets.precompile += %w( admin.js admin.css )