diff options
| author | Ben Pickles <spideryoung@gmail.com> | 2016-07-20 21:35:00 +0100 |
|---|---|---|
| committer | Ben Pickles <spideryoung@gmail.com> | 2016-07-26 19:18:30 +0100 |
| commit | 09ed4e95acd56a62449c8817d6e7c62bc34d2262 (patch) | |
| tree | da77dea5bbf51719c9c12b3e9bbf992af9a44154 /railties | |
| parent | 49315e278944b65f2ffd1c95caf342b17a692327 (diff) | |
| download | rails-09ed4e95acd56a62449c8817d6e7c62bc34d2262.tar.gz rails-09ed4e95acd56a62449c8817d6e7c62bc34d2262.tar.bz2 rails-09ed4e95acd56a62449c8817d6e7c62bc34d2262.zip | |
A generated app should not include Uglifier with `--skip-javascript` option.
Diffstat (limited to 'railties')
4 files changed, 18 insertions, 3 deletions
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md index 1694abb61a..70f4b84237 100644 --- a/railties/CHANGELOG.md +++ b/railties/CHANGELOG.md @@ -1,3 +1,7 @@ +* A generated app should not include Uglifier with `--skip-javascript` option. + + *Ben Pickles* + * Set session store to cookie store internally and remove the initializer from the generated app. 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. diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index b968f9f207..09309b5cd0 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -468,6 +468,11 @@ class AppGeneratorTest < Rails::Generators::TestCase assert_file "Gemfile" do |content| assert_no_match(/coffee-rails/, content) assert_no_match(/jquery-rails/, content) + assert_no_match(/uglifier/, content) + end + + assert_file "config/environments/production.rb" do |content| + assert_no_match(/config\.assets\.js_compressor = :uglifier/, content) end end |