From 1373f9bdcf725f75832dc7401994cc76113a8a4e Mon Sep 17 00:00:00 2001 From: Kasper Timm Hansen Date: Mon, 12 Dec 2016 21:10:50 +0100 Subject: Don't assign a default to `webpack`. Unintentionally makes `--webpack` implied on `rails new apper`. If passed `--webpack` Thor assigns `"webpack"` to `options[:webpack]`, so we can check for that instead of `"base"`. --- railties/lib/rails/generators/app_base.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'railties/lib/rails/generators') diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb index b94630de15..15cc070e35 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: :string, default: "base", + class_option :webpack, type: :string, default: nil, desc: "Preconfigure for app-like JavaScript with Webpack" class_option :skip_yarn, type: :boolean, default: false, @@ -428,7 +428,7 @@ module Rails def run_webpack if !(webpack = options[:webpack]).nil? rails_command "webpacker:install" - rails_command "webpacker:install:#{webpack}" unless webpack == "base" + rails_command "webpacker:install:#{webpack}" unless webpack == "webpack" end end -- cgit v1.2.3