diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2017-05-26 17:57:50 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-26 17:57:49 -0400 |
| commit | 4c940b2dbfb457f67c6250b720f63501d74a45fd (patch) | |
| tree | 608f07174b8407ab7c4bd025a97504052573aed4 /railties | |
| parent | 0e453e9150f0ac9fa2bdff4511c3c806a3e45f49 (diff) | |
| parent | 7a2c539911fb56234c05158b6679f3be6eabf1ec (diff) | |
| download | rails-4c940b2dbfb457f67c6250b720f63501d74a45fd.tar.gz rails-4c940b2dbfb457f67c6250b720f63501d74a45fd.tar.bz2 rails-4c940b2dbfb457f67c6250b720f63501d74a45fd.zip | |
Merge pull request #29238 from ashishg-qburst/generator
Do not show --webpack option in the plugin help message
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/generators/app_base.rb | 4 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/app/app_generator.rb | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb index c715e5ac9f..e8b104a0b2 100644 --- a/railties/lib/rails/generators/app_base.rb +++ b/railties/lib/rails/generators/app_base.rb @@ -13,7 +13,6 @@ module Rails DATABASES = %w( mysql postgresql sqlite3 oracle frontbase ibm_db sqlserver ) JDBC_DATABASES = %w( jdbcmysql jdbcsqlite3 jdbcpostgresql jdbc ) DATABASES.concat(JDBC_DATABASES) - WEBPACKS = %w( react vue angular ) attr_accessor :rails_template add_shebang_option! @@ -31,9 +30,6 @@ module Rails class_option :database, type: :string, aliases: "-d", default: "sqlite3", desc: "Preconfigure for selected database (options: #{DATABASES.join('/')})" - class_option :webpack, type: :string, default: nil, - desc: "Preconfigure for app-like JavaScript with Webpack (options: #{WEBPACKS.join('/')})" - class_option :skip_yarn, type: :boolean, default: false, desc: "Don't use Yarn for managing JavaScript dependencies" diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb index 8ea151fd91..20ee4b108d 100644 --- a/railties/lib/rails/generators/rails/app/app_generator.rb +++ b/railties/lib/rails/generators/rails/app/app_generator.rb @@ -205,6 +205,8 @@ module Rails RESERVED_NAMES = %w[application destroy plugin runner test] class AppGenerator < AppBase # :nodoc: + WEBPACKS = %w( react vue angular ) + add_shared_options_for "application" # Add bin/rails options @@ -217,6 +219,9 @@ module Rails class_option :skip_bundle, type: :boolean, aliases: "-B", default: false, desc: "Don't run bundle install" + class_option :webpack, type: :string, default: nil, + desc: "Preconfigure for app-like JavaScript with Webpack (options: #{WEBPACKS.join('/')})" + def initialize(*args) super |