Update Bower dependencies

yeoman · Jun 27, 2015 · 5c5af36 · 5c5af36
1 parent a5d8cc8
commit 5c5af36
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 7 deletions.
diff --git a/app/index.js b/app/index.js
@@ -149,16 +149,35 @@ module.exports = generators.Base.extend({
 
       if (this.includeBootstrap) {
         if (this.includeSass) {
-          bowerJson.dependencies['bootstrap-sass'] = '~3.3.0';
+          bowerJson.dependencies['bootstrap-sass'] = '~3.3.5';
+          bowerJson.overrides = {
+            'bootstrap-sass': {
+              'main': [
+                'assets/stylesheets/_bootstrap.scss',
+                'assets/fonts/bootstrap/*',
+                'assets/javascripts/bootstrap.js'
+              ]
+            }
+          };
         } else {
-          bowerJson.dependencies['bootstrap'] = '~3.3.0';
+          bowerJson.dependencies['bootstrap'] = '~3.3.5';
+          bowerJson.overrides = {
+            'bootstrap': {
+              'main': [
+                'less/bootstrap.less',
+                'dist/css/bootstrap.css',
+                'dist/js/bootstrap.js',
+                'dist/fonts/*'
+              ]
+            }
+          };
         }
       } else {
-        bowerJson.dependencies['jquery'] = '~1.11.1';
+        bowerJson.dependencies['jquery'] = '~2.1.4';
       }
 
       if (this.includeModernizr) {
-        bowerJson.dependencies['modernizr'] = '~2.8.2';
+        bowerJson.dependencies['modernizr'] = '~2.8.3';
       }
 
       this.fs.writeJSON('bower.json', bowerJson);

diff --git a/app/templates/index.html b/app/templates/index.html
@@ -9,9 +9,6 @@
     <!-- Place favicon.ico and apple-touch-icon.png in the root directory -->
     <!-- build:css styles/vendor.css -->
     <!-- bower:css -->
-<% if (includeBootstrap && !includeSass) { -%>
-    <link rel="stylesheet" href="bower_components/bootstrap/dist/css/bootstrap.css">
-<% } -%>
     <!-- endbower -->
     <!-- endbuild -->
     <!-- build:css(.tmp) styles/main.css -->