Skip to content

Commit 2997e34

Browse files
committed
fix(gulp:wiredep): copy exclude array code from Grunt
the previous `exclude` array didn't contain any EJS fixes angular-fullstack#1739
1 parent 79b1db7 commit 2997e34

File tree

1 file changed

+17
-15
lines changed

1 file changed

+17
-15
lines changed

Diff for: app/templates/gulpfile.babel(gulp).js

+17-15
Original file line numberDiff line numberDiff line change
@@ -478,14 +478,15 @@ gulp.task('test:client', ['wiredep:test', 'constant'<% if(filters.ts) { %>, 'tsd
478478
gulp.task('wiredep:client', () => {
479479
return gulp.src(paths.client.mainView)
480480
.pipe(wiredep({
481-
exclude: [
482-
/bootstrap-sass-official/,
483-
/bootstrap.js/,
484-
/json3/,
485-
/es5-shim/,
486-
/bootstrap.css/,
487-
/font-awesome.css/
488-
],
481+
exclude: [<% if(filters.uibootstrap) { %>
482+
/bootstrap.js/,<% } %>
483+
'/json3/',
484+
'/es5-shim/'<% if(!filters.css) { %>,
485+
/font-awesome\.css/<% if(filters.bootstrap) { %>,
486+
/bootstrap\.css/<% if(filters.sass) { %>,
487+
/bootstrap-sass-official/<% } if(filters.oauth) { %>,
488+
/bootstrap-social\.css/<% }}} %>
489+
]
489490
ignorePath: clientPath
490491
}))
491492
.pipe(gulp.dest(`${clientPath}/`));
@@ -494,14 +495,15 @@ gulp.task('wiredep:client', () => {
494495
gulp.task('wiredep:test', () => {
495496
return gulp.src(paths.karma)
496497
.pipe(wiredep({
497-
exclude: [
498-
/bootstrap-sass-official/,
499-
/bootstrap.js/,
498+
exclude: [<% if(filters.uibootstrap) { %>
499+
/bootstrap.js/,<% } %>
500500
'/json3/',
501-
'/es5-shim/',
502-
/bootstrap.css/,
503-
/font-awesome.css/
504-
],
501+
'/es5-shim/'<% if(!filters.css) { %>,
502+
/font-awesome\.css/<% if(filters.bootstrap) { %>,
503+
/bootstrap\.css/<% if(filters.sass) { %>,
504+
/bootstrap-sass-official/<% } if(filters.oauth) { %>,
505+
/bootstrap-social\.css/<% }}} %>
506+
]
505507
devDependencies: true
506508
}))
507509
.pipe(gulp.dest('./'));

0 commit comments

Comments
 (0)