diff --git a/.travis.yml b/.travis.yml index 23c230d2a5..6f97832cfa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,7 @@ before_script: - export PATH=$HOME/bin:$PATH - npm install -g bower gulp-cli@1 - bower install -- npm run lint +- gulp lint-eslint script: - xvfb-run wct - if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then wct -s 'windows 10/microsoftedge@14' -s 'windows 8.1/internet explorer@11' -s 'os x 10.11/safari@9' -s 'macos 10.12/safari@10' -s 'Linux/chrome@41'; fi diff --git a/gulpfile.js b/gulpfile.js index 6776cd1474..aa6d6b1f1f 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -242,13 +242,17 @@ gulp.task('estimate-size', ['clean'], () => { .pipe(gulp.dest(BUNDLED_DIR)) }); -gulp.task('lint', function() { +gulp.task('lint-eslint', function() { return gulp.src(['lib/**/*.html', 'test/unit/*.html', 'util/*.js']) .pipe(eslint()) .pipe(eslint.format()) .pipe(eslint.failAfterError()); }); +gulp.task('lint', (done) => { + runseq('lint-eslint', 'lint-closure', done); +}); + gulp.task('generate-closure-externs', ['clean'], () => { let genClosure = require('@polymer/gen-closure-declarations').generateDeclarations; return genClosure().then((declarations) => { diff --git a/package.json b/package.json index f71d5f7a94..a5135a2d33 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "scripts": { "build": "gulp", "test": "npm run lint && wct", - "lint": "gulp lint lint-closure" + "lint": "gulp lint" }, "repository": { "type": "git",