@@ -13,17 +13,17 @@ var gulp = require("gulp"),
1313//******************************************************************************
1414//* LINT
1515//******************************************************************************
16- gulp . task ( "lint" , function ( ) {
16+ gulp . task ( "lint" , function ( ) {
1717
1818 var config = {
1919 fornatter : "verbose" ,
2020 emitError : ( process . env . CI ) ? true : false
2121 } ;
2222
2323 return gulp . src ( [
24- "src/**/**.ts" ,
25- "test/**/**.test.ts"
26- ] )
24+ "src/**/**.ts" ,
25+ "test/**/**.test.ts"
26+ ] )
2727 . pipe ( tslint ( config ) )
2828 . pipe ( tslint . report ( ) ) ;
2929} ) ;
@@ -35,12 +35,12 @@ var tsLibProject = tsc.createProject("tsconfig.json", {
3535 module : "commonjs"
3636} ) ;
3737
38- gulp . task ( "build-lib" , function ( ) {
38+ gulp . task ( "build-lib" , function ( ) {
3939 return gulp . src ( [
40- "src/**/*.ts"
41- ] )
40+ "src/**/*.ts"
41+ ] )
4242 . pipe ( tsLibProject ( ) )
43- . on ( "error" , function ( err ) {
43+ . on ( "error" , function ( err ) {
4444 process . exit ( 1 ) ;
4545 } )
4646 . js . pipe ( gulp . dest ( "lib/" ) ) ;
@@ -50,12 +50,12 @@ var tsEsProject = tsc.createProject("tsconfig.json", {
5050 module : "es2015"
5151} ) ;
5252
53- gulp . task ( "build-es" , function ( ) {
53+ gulp . task ( "build-es" , function ( ) {
5454 return gulp . src ( [
55- "src/**/*.ts"
56- ] )
55+ "src/**/*.ts"
56+ ] )
5757 . pipe ( tsEsProject ( ) )
58- . on ( "error" , function ( err ) {
58+ . on ( "error" , function ( err ) {
5959 process . exit ( 1 ) ;
6060 } )
6161 . js . pipe ( gulp . dest ( "es/" ) ) ;
@@ -66,12 +66,12 @@ var tsDtsProject = tsc.createProject("tsconfig.json", {
6666 noResolve : false
6767} ) ;
6868
69- gulp . task ( "build-dts" , function ( ) {
69+ gulp . task ( "build-dts" , function ( ) {
7070 return gulp . src ( [
71- "src/**/*.ts"
72- ] )
71+ "src/**/*.ts"
72+ ] )
7373 . pipe ( tsDtsProject ( ) )
74- . on ( "error" , function ( err ) {
74+ . on ( "error" , function ( err ) {
7575 process . exit ( 1 ) ;
7676 } )
7777 . dts . pipe ( gulp . dest ( "dts" ) ) ;
@@ -83,35 +83,35 @@ gulp.task("build-dts", function() {
8383//******************************************************************************
8484var tstProject = tsc . createProject ( "tsconfig.json" ) ;
8585
86- gulp . task ( "build-src" , function ( ) {
86+ gulp . task ( "build-src" , function ( ) {
8787 return gulp . src ( [
88- "src/**/*.ts"
89- ] )
88+ "src/**/*.ts"
89+ ] )
9090 . pipe ( tstProject ( ) )
91- . on ( "error" , function ( err ) {
91+ . on ( "error" , function ( err ) {
9292 process . exit ( 1 ) ;
9393 } )
9494 . js . pipe ( gulp . dest ( "src/" ) ) ;
9595} ) ;
9696
9797var tsTestProject = tsc . createProject ( "tsconfig.json" , { rootDir : "./" } ) ;
9898
99- gulp . task ( "build-test" , function ( ) {
99+ gulp . task ( "build-test" , function ( ) {
100100 return gulp . src ( [
101- "test/**/*.ts"
102- ] )
101+ "test/**/*.ts"
102+ ] )
103103 . pipe ( tsTestProject ( ) )
104- . on ( "error" , function ( err ) {
104+ . on ( "error" , function ( err ) {
105105 process . exit ( 1 ) ;
106106 } )
107107 . js . pipe ( gulp . dest ( "./test/" ) ) ;
108108} ) ;
109109
110- gulp . task ( "mocha" , function ( ) {
110+ gulp . task ( "mocha" , function ( ) {
111111 return gulp . src ( [
112- "node_modules/reflect-metadata/Reflect.js" ,
113- "test/**/*.test.js"
114- ] )
112+ "node_modules/reflect-metadata/Reflect.js" ,
113+ "test/**/*.test.js"
114+ ] )
115115 . pipe ( mocha ( {
116116 ui : "bdd"
117117 } ) )
@@ -123,31 +123,37 @@ gulp.task("mocha", function() {
123123 ) ) ;
124124} ) ;
125125
126- gulp . task ( "istanbul:hook" , function ( ) {
126+ gulp . task ( "istanbul:hook" , function ( ) {
127127 return gulp . src ( [ "src/**/*.js" ] )
128128 // Covering files
129129 . pipe ( istanbul ( ) )
130130 // Force `require` to return covered files
131131 . pipe ( istanbul . hookRequire ( ) ) ;
132132} ) ;
133133
134- gulp . task ( "test" , function ( cb ) {
135- runSequence ( "istanbul:hook" , "mocha" , cb ) ;
136- } ) ;
137-
138- gulp . task ( "build" , function ( cb ) {
139- runSequence (
140- "lint" , [ "build-src" , "build-es" , "build-lib" , "build-dts" ] , // tests + build es and lib
141- "build-test" ,
142- cb ) ;
143- } ) ;
134+ gulp . task ( "test" , gulp . series (
135+ "istanbul:hook" ,
136+ "mocha" ,
137+ ) ) ;
138+
139+ gulp . task ( "build" ,
140+ gulp . series (
141+ "lint" ,
142+ gulp . parallel (
143+ "build-src"
144+ , "build-test"
145+ , "build-es"
146+ , "build-lib"
147+ , "build-dts"
148+ ) ,
149+
150+ )
151+ ) ;
144152
145153//******************************************************************************
146154//* DEFAULT
147155//******************************************************************************
148- gulp . task ( "default" , function ( cb ) {
149- runSequence (
150- "build" ,
151- "test" ,
152- cb ) ;
153- } ) ;
156+ gulp . task ( "default" , gulp . series (
157+ "build" ,
158+ "test" ,
159+ ) ) ;
0 commit comments