diff options
| author | bogdanvlviv <bogdanvlviv@gmail.com> | 2018-10-21 22:40:01 +0300 |
|---|---|---|
| committer | bogdanvlviv <bogdanvlviv@gmail.com> | 2018-10-21 22:40:01 +0300 |
| commit | 9629354abbb5e96142834497f80d267e96536ced (patch) | |
| tree | 3e5b7d2c81083cf02944ee092a30d4b280d0c50a /railties | |
| parent | b004e767e03f11eb7e13828a5efbe030eb861cb0 (diff) | |
| download | rails-9629354abbb5e96142834497f80d267e96536ced.tar.gz rails-9629354abbb5e96142834497f80d267e96536ced.tar.bz2 rails-9629354abbb5e96142834497f80d267e96536ced.zip | |
Remove yarn's files from `.gitignore` template for new rails app
Webpacker already does it,
see https://github.com/rails/webpacker/blob/895d2cfc15eda2edae9e667c642a02523d958f53/lib/install/template.rb#L25-L33
I also opened PR https://github.com/rails/webpacker/pull/1765 in order
to make it add `/yarn-error.log` file too.
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/gitignore.tt | 7 | ||||
| -rw-r--r-- | railties/test/generators/shared_generator_tests.rb | 10 |
2 files changed, 1 insertions, 16 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/gitignore.tt b/railties/lib/rails/generators/rails/app/templates/gitignore.tt index 4e114fb1d9..38c3ab1319 100644 --- a/railties/lib/rails/generators/rails/app/templates/gitignore.tt +++ b/railties/lib/rails/generators/rails/app/templates/gitignore.tt @@ -28,13 +28,8 @@ !/storage/.keep <% end -%> <% end -%> - -<% unless options.skip_yarn? -%> -/node_modules -/yarn-error.log - -<% end -%> <% unless options.api? -%> + /public/assets <% end -%> .byebug_history diff --git a/railties/test/generators/shared_generator_tests.rb b/railties/test/generators/shared_generator_tests.rb index 398466aa22..9b980bd52b 100644 --- a/railties/test/generators/shared_generator_tests.rb +++ b/railties/test/generators/shared_generator_tests.rb @@ -339,11 +339,6 @@ module SharedGeneratorTests run_generator assert_file "#{application_path}/package.json", /dependencies/ assert_file "#{application_path}/config/initializers/assets.rb", /node_modules/ - - assert_file ".gitignore" do |content| - assert_match(/node_modules/, content) - assert_match(/yarn-error\.log/, content) - end end def test_generator_for_yarn_skipped @@ -354,10 +349,5 @@ module SharedGeneratorTests assert_file "#{application_path}/config/initializers/assets.rb" do |content| assert_no_match(/node_modules/, content) end - - assert_file ".gitignore" do |content| - assert_no_match(/node_modules/, content) - assert_no_match(/yarn-error\.log/, content) - end end end |