From fdf2478e4d2c8a4c1338783f4fc8797fbd8db5ae Mon Sep 17 00:00:00 2001 From: Rex Schrader Date: Thu, 27 Aug 2015 10:09:55 -0700 Subject: [PATCH 1/2] Fix bootstrap.js always excluded Added test for `filters.uibootstrap` to exclude `bootstrap.js` --- app/templates/Gruntfile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/Gruntfile.js b/app/templates/Gruntfile.js index 666681a89..32455da55 100644 --- a/app/templates/Gruntfile.js +++ b/app/templates/Gruntfile.js @@ -249,7 +249,7 @@ module.exports = function (grunt) { wiredep: { options: { exclude: [ - /bootstrap.js/, + <% if(filters.uibootstrap) { %>/bootstrap.js/,<% } %> '/json3/', '/es5-shim/'<% if(!filters.css) { %>, /font-awesome\.css/<% if(filters.bootstrap) { %>, From 0494b9ef471b7620cfc4e66ad654d45a1fed9eaf Mon Sep 17 00:00:00 2001 From: Rex Schrader Date: Thu, 27 Aug 2015 14:13:05 -0700 Subject: [PATCH 2/2] fix(wiredep): only exclude bootstrap.js when ui-bootstrap is chosen --- app/templates/Gruntfile.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/templates/Gruntfile.js b/app/templates/Gruntfile.js index 32455da55..fb5675cfd 100644 --- a/app/templates/Gruntfile.js +++ b/app/templates/Gruntfile.js @@ -248,8 +248,8 @@ module.exports = function (grunt) { // Automatically inject Bower components into the app and karma.conf.js wiredep: { options: { - exclude: [ - <% if(filters.uibootstrap) { %>/bootstrap.js/,<% } %> + exclude: [ <% if(filters.uibootstrap) { %> + /bootstrap.js/,<% } %> '/json3/', '/es5-shim/'<% if(!filters.css) { %>, /font-awesome\.css/<% if(filters.bootstrap) { %>,