diff options
| author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2016-11-29 10:04:47 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-29 10:04:47 -0500 |
| commit | 43e42ad385f1048e6ec7a9df6c83daa5ef003870 (patch) | |
| tree | ee63a13fccf9318a12ea6b513d103ba6abd26139 /railties/lib/rails/generators/rails/app/templates/bin/setup.tt | |
| parent | ffb81ad6e3326332556e8eab867fe1a27a989bf5 (diff) | |
| parent | 9a95e13989380e59245d3d6fb0853953b806742c (diff) | |
| download | rails-43e42ad385f1048e6ec7a9df6c83daa5ef003870.tar.gz rails-43e42ad385f1048e6ec7a9df6c83daa5ef003870.tar.bz2 rails-43e42ad385f1048e6ec7a9df6c83daa5ef003870.zip | |
Merge pull request #26836 from Liceth/npm
Add Yarn support in new apps using --yarn option
Diffstat (limited to 'railties/lib/rails/generators/rails/app/templates/bin/setup.tt')
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/bin/setup.tt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/bin/setup.tt b/railties/lib/rails/generators/rails/app/templates/bin/setup.tt index 8635e97b76..c82a922eef 100644 --- a/railties/lib/rails/generators/rails/app/templates/bin/setup.tt +++ b/railties/lib/rails/generators/rails/app/templates/bin/setup.tt @@ -16,8 +16,11 @@ chdir APP_ROOT do puts '== Installing dependencies ==' system! 'gem install bundler --conservative' system('bundle check') || system!('bundle install') -<% unless options.skip_active_record -%> +<% if options[:yarn] %> + system! 'yarn' +<% end %> +<% unless options.skip_active_record -%> # puts "\n== Copying sample files ==" # unless File.exist?('config/database.yml') # cp 'config/database.yml.sample', 'config/database.yml' |