diff options
| author | bogdanvlviv <bogdanvlviv@gmail.com> | 2018-10-22 17:04:40 +0300 |
|---|---|---|
| committer | bogdanvlviv <bogdanvlviv@gmail.com> | 2018-10-22 23:52:28 +0300 |
| commit | 129f8ac6ffcafb2e6e13c9ef13dda4cc47f5af0d (patch) | |
| tree | bdea0722dfd31728c0bdb6ca33c1542bf40fc65a /railties | |
| parent | 2e37fb655d44e29ea68c28957bfa047f40469aeb (diff) | |
| download | rails-129f8ac6ffcafb2e6e13c9ef13dda4cc47f5af0d.tar.gz rails-129f8ac6ffcafb2e6e13c9ef13dda4cc47f5af0d.tar.bz2 rails-129f8ac6ffcafb2e6e13c9ef13dda4cc47f5af0d.zip | |
Remove node_modules path from assets load paths since we use webpack by default
Related to #33079
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/initializers/assets.rb.tt | 4 | ||||
| -rw-r--r-- | railties/test/generators/shared_generator_tests.rb | 6 |
2 files changed, 1 insertions, 9 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 e92382f2d9..fe48fc34ee 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,10 +5,6 @@ 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 diff --git a/railties/test/generators/shared_generator_tests.rb b/railties/test/generators/shared_generator_tests.rb index a40ad158af..2dda856f25 100644 --- a/railties/test/generators/shared_generator_tests.rb +++ b/railties/test/generators/shared_generator_tests.rb @@ -339,16 +339,12 @@ module SharedGeneratorTests skip "#34009 disabled JS by default for plugins" if generator_class.name == "Rails::Generators::PluginGenerator" run_generator assert_file "#{application_path}/package.json", /dependencies/ - assert_file "#{application_path}/config/initializers/assets.rb", /node_modules/ + assert_file "#{application_path}/bin/yarn" end def test_generator_for_yarn_skipped run_generator([destination_root, "--skip-javascript"]) assert_no_file "#{application_path}/package.json" assert_no_file "#{application_path}/bin/yarn" - - assert_file "#{application_path}/config/initializers/assets.rb" do |content| - assert_no_match(/node_modules/, content) - end end end |