@@ -3,8 +3,9 @@ var gulp = require("gulp");
33var merge = require ( "merge2" ) ;
44var concat = require ( "gulp-concat" ) ;
55var minify = require ( "gulp-minify" ) ;
6- var tslint = require ( "gulp-tslint" ) ;
76var watch = require ( "gulp-watch" ) ;
7+ var tslint = require ( "gulp-tslint" ) ;
8+ var eslint = require ( "gulp-eslint" ) ;
89
910var jasmine = require ( "gulp-jasmine" ) ;
1011var jasmineBrowser = require ( "gulp-jasmine-browser" ) ;
@@ -25,14 +26,9 @@ gulp.task("demots", function () {
2526} ) ;
2627
2728gulp . task ( "typescript" , function ( ) {
29+ gulp . start ( "tslint" ) ;
30+
2831 var tsResult = devTS . src ( )
29- . pipe ( tslint ( {
30- formatter : "prose"
31- } ) )
32- . pipe ( tslint . report ( {
33- emitError : false ,
34- summarizeFailureOutput : true
35- } ) )
3632 . pipe ( devTS ( ) ) ;
3733
3834 return merge ( [
@@ -86,7 +82,16 @@ gulp.task("tslint", function(){
8682 } ) ) ;
8783} ) ;
8884
89- gulp . task ( "lint" , [ "tslint" ] , function ( ) {
85+ gulp . task ( "eslint" , function ( ) {
86+ return gulp . src ( [ "dist/**/*.js" , "!dist/**/*.min.js" ] )
87+ . pipe ( eslint ( {
88+ configFile : ".eslintrc.json"
89+ } ) )
90+ . pipe ( eslint . format ( "stylish" ) )
91+ . pipe ( eslint . failAfterError ( ) ) ;
92+ } ) ;
93+
94+ gulp . task ( "lint" , [ "tslint" , "eslint" ] , function ( ) {
9095
9196} ) ;
9297
@@ -122,11 +127,19 @@ gulp.task("server", ["browsersync"], function () {
122127 port : 15666
123128 } ) ;
124129
125- gulp . watch ( "demo/**/*.ts" , [ "demots" ] ) ;
126130 gulp . watch ( "test/**/*.ts" , [ "test" ] ) ;
131+ gulp . watch ( "demo/**/*.ts" , [ "demots" ] ) ;
127132 gulp . watch ( "dev/**/*.ts" , [ "typescript" ] ) ;
128133
129134 gulp . watch ( "demo/**/*.html" ) . on ( "change" , browsersync . reload ) ;
130- gulp . watch ( "dist/**/*.js" ) . on ( "change" , browsersync . reload ) ;
135+ gulp . watch ( "dist/**/*.js" , [ "eslint" ] ) . on ( "change" , browsersync . reload ) ;
131136 gulp . watch ( "demo/**/*.js" ) . on ( "change" , browsersync . reload ) ;
137+ } ) ;
138+
139+ gulp . task ( "edit" , function ( ) {
140+ gulp . watch ( "test/**/*.ts" , [ "test" ] ) ;
141+ gulp . watch ( "dev/**/*.ts" , [ "typescript" ] ) ;
142+ gulp . watch ( "dist/**/*.js" , [ "eslint" ] ) ;
143+ gulp . watch ( "tslint.json" , [ "tslint" ] ) ;
144+ gulp . watch ( ".eslintrc.json" , [ "eslint" ] ) ;
132145} ) ;
0 commit comments