File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 22
33var chalk = require ( 'chalk' ) ;
44var extend = require ( 'node.extend' ) ;
5- var es = require ( 'event -stream' ) ;
5+ var mergeStream = require ( 'merge -stream' ) ;
66var path = require ( 'path' ) ;
77var through = require ( 'through2' ) ;
88var vinylSourceStream = require ( 'vinyl-source-stream' ) ;
@@ -191,7 +191,7 @@ module.exports = function(gulp, userConfig) {
191191 }
192192
193193 if ( streams . length ) {
194- return es . merge . apply ( null , streams ) . pipe ( gulp . dest ( config . dist . markupDir ) ) ;
194+ return mergeStream . apply ( null , streams ) . pipe ( gulp . dest ( config . dist . markupDir ) ) ;
195195 }
196196 } ) ;
197197
Original file line number Diff line number Diff line change 3535 "browserify-ngmin" : " ^0.1.0" ,
3636 "casperjs" : " ^1.1.0-beta3" ,
3737 "chalk" : " ^0.4.0" ,
38- "event-stream" : " ~3.1.0" ,
3938 "glob-stream" : " ^3.1.9" ,
4039 "gulp-base64" : " ~0.0.3" ,
4140 "gulp-clean" : " ~0.2.4" ,
5756 "karma-chrome-launcher" : " ^0.1.3" ,
5857 "karma-jasmine" : " ^0.2.1" ,
5958 "karma-mocha-reporter" : " ^0.2.2" ,
59+ "merge-stream" : " ^0.1.1" ,
6060 "node.extend" : " ~1.0.10" ,
6161 "through2" : " ^0.4.1" ,
6262 "uglifyify" : " ~2.1.1" ,
You can’t perform that action at this time.
0 commit comments