aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/app_updater.rb
diff options
context:
space:
mode:
authorbogdanvlviv <bogdanvlviv@gmail.com>2018-10-21 23:08:43 +0300
committerbogdanvlviv <bogdanvlviv@gmail.com>2018-10-22 16:54:10 +0300
commit2e37fb655d44e29ea68c28957bfa047f40469aeb (patch)
tree9a13f4bece881d4bf81156c28726e50183bc5b1d /railties/lib/rails/app_updater.rb
parentdc6761592009e9146552fc9d6299bf58a34e187a (diff)
downloadrails-2e37fb655d44e29ea68c28957bfa047f40469aeb.tar.gz
rails-2e37fb655d44e29ea68c28957bfa047f40469aeb.tar.bz2
rails-2e37fb655d44e29ea68c28957bfa047f40469aeb.zip
Remove `--skip-yarn` in favor of `--skip-javascript`
Since #33079 Webpacker the default JavaScript compiler for Rails. Webpacker uses `yarn` so seems like it doesn't make sense for Rails to keep `--skip-yarn` option.
Diffstat (limited to 'railties/lib/rails/app_updater.rb')
-rw-r--r--railties/lib/rails/app_updater.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/app_updater.rb b/railties/lib/rails/app_updater.rb
index a243968a39..19d136e041 100644
--- a/railties/lib/rails/app_updater.rb
+++ b/railties/lib/rails/app_updater.rb
@@ -21,7 +21,7 @@ module Rails
private
def generator_options
options = { api: !!Rails.application.config.api_only, update: true }
- options[:skip_yarn] = !File.exist?(Rails.root.join("bin", "yarn"))
+ options[:skip_javascript] = !File.exist?(Rails.root.join("bin", "yarn"))
options[:skip_active_record] = !defined?(ActiveRecord::Railtie)
options[:skip_active_storage] = !defined?(ActiveStorage::Engine) || !defined?(ActiveRecord::Railtie)
options[:skip_action_mailer] = !defined?(ActionMailer::Railtie)