1
1
var gulp = require ( 'gulp' ) ;
2
2
var gulpIf = require ( 'gulp-if' ) ;
3
+ var merge = require ( 'merge-stream' ) ;
3
4
var fs = require ( 'fs' ) ;
4
5
var cwd = process . cwd ( ) ;
5
6
var paths = require ( './paths' ) ;
@@ -27,7 +28,7 @@ exports.exec = function(langConfig, lintConfig) {
27
28
// with a .jshintrc file.
28
29
runJsHint ( lintConfig ) ;
29
30
} else {
30
- runEslint ( langConfig , lintConfig ) ;
31
+ return runEslint ( langConfig , lintConfig ) ;
31
32
}
32
33
} ;
33
34
@@ -52,7 +53,7 @@ function runJsHint(lintConfig) {
52
53
_runJsHint ( paths . srcPaths ) ;
53
54
}
54
55
if ( lintConfig . tests ) {
55
- _runJsHint ( [ paths . testSrcPath ] ) ;
56
+ return _runJsHint ( [ paths . testSrcPath ] ) ;
56
57
}
57
58
}
58
59
@@ -87,6 +88,8 @@ function runEslint(langConfig, lintConfig) {
87
88
return fixLint && file . eslint != null && file . eslint . fixed ;
88
89
}
89
90
91
+ var mergedStreams = merge ( ) ;
92
+
90
93
function _runEsLint ( pathSet , patterns ) {
91
94
92
95
function getSrcPaths ( path ) {
@@ -99,7 +102,7 @@ function runEslint(langConfig, lintConfig) {
99
102
100
103
for ( var i = 0 ; i < pathSet . length ; i ++ ) {
101
104
var srcPaths = getSrcPaths ( pathSet [ i ] ) ;
102
- gulp . src ( srcPaths )
105
+ var stream = gulp . src ( srcPaths )
103
106
. pipe ( eslint ( eslintConfig ) )
104
107
. pipe ( eslint . format ( ) )
105
108
. pipe ( eslint . results ( function ( results ) {
@@ -120,15 +123,19 @@ function runEslint(langConfig, lintConfig) {
120
123
}
121
124
}
122
125
} ) )
123
- . pipe ( gulpIf ( isFixed , gulp . dest ( pathSet [ i ] ) ) )
124
- ;
126
+ . pipe ( gulpIf ( isFixed , gulp . dest ( pathSet [ i ] ) ) ) ;
127
+
128
+ mergedStreams . add ( stream ) ;
125
129
}
126
130
}
131
+
127
132
if ( lintConfig . src ) {
128
133
_runEsLint ( [ cwd ] , [ 'index.js' ] ) ;
129
134
_runEsLint ( paths . srcPaths , [ '**/*.js' , '**/*.jsx' , '**/*.es6' ] ) ;
130
135
}
131
136
if ( lintConfig . tests ) {
132
137
_runEsLint ( [ paths . testSrcPath ] , [ '**/*.js' , '**/*.jsx' , '**/*.es6' ] ) ;
133
138
}
134
- }
139
+
140
+ return mergedStreams ;
141
+ }
0 commit comments