diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2017-08-15 16:50:10 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-15 16:50:10 -0400 |
| commit | 692fab26b142c724f0b824db5029c70a88676808 (patch) | |
| tree | 580a413396820b617e1479a9bb87316b52d8c9b9 /railties/lib | |
| parent | d8bf5d73c39ff6758b3a86a58b1b096006f4bb42 (diff) | |
| parent | 1a1f319cd498ee926aa7b0e3481b213de59be041 (diff) | |
| download | rails-692fab26b142c724f0b824db5029c70a88676808.tar.gz rails-692fab26b142c724f0b824db5029c70a88676808.tar.bz2 rails-692fab26b142c724f0b824db5029c70a88676808.zip | |
Merge pull request #30238 from bogdanvlviv/add-skip_yarn-for-plugin_generator
Add `--skip-yarn` option to the plugin generator
Diffstat (limited to 'railties/lib')
3 files changed, 5 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/gitignore b/railties/lib/rails/generators/rails/app/templates/gitignore index d8eeb1772d..83a7b211aa 100644 --- a/railties/lib/rails/generators/rails/app/templates/gitignore +++ b/railties/lib/rails/generators/rails/app/templates/gitignore @@ -27,7 +27,6 @@ <% unless options.skip_yarn? -%> /node_modules /yarn-error.log - <% end -%> <% unless options.api? -%> diff --git a/railties/lib/rails/generators/rails/plugin/plugin_generator.rb b/railties/lib/rails/generators/rails/plugin/plugin_generator.rb index a0de708913..eb941adf95 100644 --- a/railties/lib/rails/generators/rails/plugin/plugin_generator.rb +++ b/railties/lib/rails/generators/rails/plugin/plugin_generator.rb @@ -89,7 +89,7 @@ task default: :test PASSTHROUGH_OPTIONS = [ :skip_active_record, :skip_action_mailer, :skip_javascript, :skip_action_cable, :skip_sprockets, :database, - :javascript, :api, :quiet, :pretend, :skip + :javascript, :skip_yarn, :api, :quiet, :pretend, :skip ] def generate_test_dummy(force = false) diff --git a/railties/lib/rails/generators/rails/plugin/templates/gitignore b/railties/lib/rails/generators/rails/plugin/templates/gitignore index 757172e6a6..8c7cad74ed 100644 --- a/railties/lib/rails/generators/rails/plugin/templates/gitignore +++ b/railties/lib/rails/generators/rails/plugin/templates/gitignore @@ -5,5 +5,9 @@ pkg/ <%= dummy_path %>/db/*.sqlite3 <%= dummy_path %>/db/*.sqlite3-journal <%= dummy_path %>/log/*.log +<% unless options[:skip_yarn] -%> +<%= dummy_path %>/node_modules/ +<%= dummy_path %>/yarn-error.log +<% end -%> <%= dummy_path %>/tmp/ <% end -%> |