Skip to content

Commit

Permalink
fix(gulp:wiredep): copy exclude array code from Grunt
Browse files Browse the repository at this point in the history
the previous `exclude` array didn't contain any EJS

fixes #1739
  • Loading branch information
Awk34 committed Mar 23, 2016
1 parent 79b1db7 commit 2997e34
Showing 1 changed file with 17 additions and 15 deletions.
32 changes: 17 additions & 15 deletions app/templates/gulpfile.babel(gulp).js
Original file line number Diff line number Diff line change
Expand Up @@ -478,14 +478,15 @@ gulp.task('test:client', ['wiredep:test', 'constant'<% if(filters.ts) { %>, 'tsd
gulp.task('wiredep:client', () => {
return gulp.src(paths.client.mainView)
.pipe(wiredep({
exclude: [
/bootstrap-sass-official/,
/bootstrap.js/,
/json3/,
/es5-shim/,
/bootstrap.css/,
/font-awesome.css/
],
exclude: [<% if(filters.uibootstrap) { %>
/bootstrap.js/,<% } %>
'/json3/',
'/es5-shim/'<% if(!filters.css) { %>,
/font-awesome\.css/<% if(filters.bootstrap) { %>,
/bootstrap\.css/<% if(filters.sass) { %>,

This comment has been minimized.

Copy link
@rubenvereecken

rubenvereecken Mar 23, 2016

Not to be annoying, but aren't there other filters that would like to exclude bootstrap.css? Like stylus? Not sure if that's covered by this.

This comment has been minimized.

Copy link
@Awk34

Awk34 Mar 23, 2016

Author Member

Nope. The LESS & Stylus main files include bootstrap.css. The main Sass file includes bootstrap.scss.

This comment has been minimized.

Copy link
@rubenvereecken

rubenvereecken Mar 23, 2016

Cool, thanks for the explanation.

/bootstrap-sass-official/<% } if(filters.oauth) { %>,
/bootstrap-social\.css/<% }}} %>
]
ignorePath: clientPath
}))
.pipe(gulp.dest(`${clientPath}/`));
Expand All @@ -494,14 +495,15 @@ gulp.task('wiredep:client', () => {
gulp.task('wiredep:test', () => {
return gulp.src(paths.karma)
.pipe(wiredep({
exclude: [
/bootstrap-sass-official/,
/bootstrap.js/,
exclude: [<% if(filters.uibootstrap) { %>
/bootstrap.js/,<% } %>
'/json3/',
'/es5-shim/',
/bootstrap.css/,
/font-awesome.css/
],
'/es5-shim/'<% if(!filters.css) { %>,
/font-awesome\.css/<% if(filters.bootstrap) { %>,
/bootstrap\.css/<% if(filters.sass) { %>,
/bootstrap-sass-official/<% } if(filters.oauth) { %>,
/bootstrap-social\.css/<% }}} %>
]
devDependencies: true
}))
.pipe(gulp.dest('./'));
Expand Down

0 comments on commit 2997e34

Please sign in to comment.