diff options
| author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2016-07-26 13:25:30 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-26 13:25:30 -0500 |
| commit | cbc61f513641ef3c311d671c322dc93f2d37d7fc (patch) | |
| tree | da77dea5bbf51719c9c12b3e9bbf992af9a44154 /railties/lib | |
| parent | 49315e278944b65f2ffd1c95caf342b17a692327 (diff) | |
| parent | 09ed4e95acd56a62449c8817d6e7c62bc34d2262 (diff) | |
| download | rails-cbc61f513641ef3c311d671c322dc93f2d37d7fc.tar.gz rails-cbc61f513641ef3c311d671c322dc93f2d37d7fc.tar.bz2 rails-cbc61f513641ef3c311d671c322dc93f2d37d7fc.zip | |
Merge pull request #25919 from benpickles/skip-javascript-also-skips-uglifier
Uglifier should not be included when generating a new app with `--skip-javascript`
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/rails/generators/app_base.rb | 8 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt | 4 |
2 files changed, 9 insertions, 3 deletions
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb index af3c6dead3..8d4056c202 100644 --- a/railties/lib/rails/generators/app_base.rb +++ b/railties/lib/rails/generators/app_base.rb @@ -299,9 +299,11 @@ module Rails gems << GemfileEntry.github('sass-rails', 'rails/sass-rails', nil, 'Use SCSS for stylesheets') - gems << GemfileEntry.version('uglifier', - '>= 1.3.0', - 'Use Uglifier as compressor for JavaScript assets') + if !options[:skip_javascript] + gems << GemfileEntry.version('uglifier', + '>= 1.3.0', + 'Use Uglifier as compressor for JavaScript assets') + end gems end diff --git a/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt index 363af05459..7deab5dbb1 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt +++ b/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt @@ -19,8 +19,12 @@ Rails.application.configure do config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present? <%- unless options.skip_sprockets? -%> + <%- if options.skip_javascript? -%> + # Compress CSS. + <%- else -%> # Compress JavaScripts and CSS. config.assets.js_compressor = :uglifier + <%- end -%> # config.assets.css_compressor = :sass # Do not fallback to assets pipeline if a precompiled asset is missed. |