aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2016-12-12 11:07:28 -0800
committerDavid Heinemeier Hansson <david@loudthinking.com>2016-12-12 11:07:28 -0800
commitcfdf6e13689c67a108b1f3980f59a4e3933369c3 (patch)
treec426e0a5deb4e79624c7e3226a9dbd29457d2082 /railties/lib
parent5d07e8a326e3f1bd46228fbf4f1e59054eced62e (diff)
downloadrails-cfdf6e13689c67a108b1f3980f59a4e3933369c3.tar.gz
rails-cfdf6e13689c67a108b1f3980f59a4e3933369c3.tar.bz2
rails-cfdf6e13689c67a108b1f3980f59a4e3933369c3.zip
Add option to trigger JS framework-specific installation as part of webpack setup
Diffstat (limited to 'railties/lib')
-rw-r--r--railties/lib/rails/generators/app_base.rb7
1 files changed, 5 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
index 576c36fc86..b94630de15 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -33,7 +33,7 @@ module Rails
class_option :javascript, type: :string, aliases: "-j",
desc: "Preconfigure for selected JavaScript library"
- class_option :webpack, type: :boolean, default: false,
+ class_option :webpack, type: :string, default: "base",
desc: "Preconfigure for app-like JavaScript with Webpack"
class_option :skip_yarn, type: :boolean, default: false,
@@ -426,7 +426,10 @@ module Rails
end
def run_webpack
- rails_command "webpacker:install" if options[:webpack]
+ if !(webpack = options[:webpack]).nil?
+ rails_command "webpacker:install"
+ rails_command "webpacker:install:#{webpack}" unless webpack == "base"
+ end
end
def generate_spring_binstubs