update optional config for bootstrap loader, set bootstrap as a defau…

…lt generator option
shakacode · Nov 30, 2015 · 6142e1a · 6142e1a
1 parent 6e13d2e
commit 6142e1a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/lib/generators/react_on_rails/base_generator.rb b/lib/generators/react_on_rails/base_generator.rb
@@ -36,7 +36,7 @@ class BaseGenerator < Rails::Generators::Base # rubocop:disable Metrics/ClassLen
       # --bootstrap
       class_option :bootstrap,
                    type: :boolean,
-                   default: false,
+                   default: true,
                    desc: "Integrate Bootstrap, initialize files and regarding configs",
                    aliases: "-B"
 

diff --git a/lib/generators/react_on_rails/install_generator.rb b/lib/generators/react_on_rails/install_generator.rb
@@ -37,7 +37,7 @@ class InstallGenerator < Rails::Generators::Base
       # --bootstrap
       class_option :bootstrap,
                    type: :boolean,
-                   default: false,
+                   default: true,
                    desc: "Integrate Bootstrap, initialize files and regarding configs",
                    aliases: "-B"
 

diff --git a/lib/generators/react_on_rails/templates/base/base/client/webpack.client.hot.config.js.tt b/lib/generators/react_on_rails/templates/base/base/client/webpack.client.hot.config.js.tt
@@ -10,14 +10,13 @@ config.entry.app.push(
 
   // Webpack dev server
   'webpack-dev-server/client?http://localhost:4000',
-  'webpack/hot/dev-server'
+  'webpack/hot/dev-server'<%- if options.bootstrap? -%>,
 
-  <%- if options.bootstrap? -%>
   // See: https://github.com/shakacode/bootstrap-sass-loader
   // We're using the bootstrap-sass loader.
-  ,
   'bootstrap-sass!./bootstrap-sass.config.js'
   <%- end -%>
+
 );
 
 config.output = {