X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/fea08ef39b647b902e490da1a82f6446d641cd8a..1a20044dc7e5baaf836edae1a0631d7d34e76854:/config/initializers/assets.rb diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb index fe561bf69..85ce74f15 100644 --- a/config/initializers/assets.rb +++ b/config/initializers/assets.rb @@ -6,24 +6,13 @@ 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 +# 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 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 ) -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 << Proc.new { |path, fn| fn =~ /vendor\/assets\/iD/ } +# 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 )