aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
diff options
context:
space:
mode:
authorGuillermo Iguaran <guilleiguaran@gmail.com>2019-01-05 18:29:55 -0500
committerGitHub <noreply@github.com>2019-01-05 18:29:55 -0500
commit1e09019088760adafaa122eb11c24effdb4c1160 (patch)
tree67de7e7bd5848ad5e49f2ff05e760b657b262faf /railties/lib
parent02d2958b6cd84d687d89112eb7e2306a6a89c082 (diff)
parent814b3cbdea0b56a0aa09206b0cdbe15f6e5ce8b1 (diff)
downloadrails-1e09019088760adafaa122eb11c24effdb4c1160.tar.gz
rails-1e09019088760adafaa122eb11c24effdb4c1160.tar.bz2
rails-1e09019088760adafaa122eb11c24effdb4c1160.zip
Merge pull request #34882 from bogdanvlviv/revert-129f8ac6ff
Revert "Remove node_modules path from assets load paths since we use webpack by default"
Diffstat (limited to 'railties/lib')
-rw-r--r--railties/lib/rails/generators/rails/app/templates/config/initializers/assets.rb.tt4
1 files changed, 4 insertions, 0 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/config/initializers/assets.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/initializers/assets.rb.tt
index fe48fc34ee..e92382f2d9 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/initializers/assets.rb.tt
+++ b/railties/lib/rails/generators/rails/app/templates/config/initializers/assets.rb.tt
@@ -5,6 +5,10 @@ Rails.application.config.assets.version = '1.0'
# Add additional assets to the asset load path.
# Rails.application.config.assets.paths << Emoji.images_path
+<%- unless options[:skip_javascript] -%>
+# Add Yarn node_modules folder to the asset load path.
+Rails.application.config.assets.paths << Rails.root.join('node_modules')
+<%- end -%>
# Precompile additional assets.
# application.js, application.css, and all non-JS/CSS in the app/assets