diff --git a/gulpfile.js b/gulpfile.js index c8052d8c27..d07e2b6d69 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -129,15 +129,12 @@ gulp.task('watch:server:run-tests', function () { }); // CSS linting task -gulp.task('csslint', function (done) { +gulp.task('csslint', function () { return gulp.src(defaultAssets.client.css) .pipe(plugins.csslint('.csslintrc')) - .pipe(plugins.csslint.reporter()) - .pipe(plugins.csslint.reporter(function (file) { - if (!file.csslint.errorCount) { - done(); - } - })); + .pipe(plugins.csslint.formatter()) + // Don't fail CSS issues yet + //.pipe(plugins.csslint.failFormatter()); }); // ESLint JS linting task @@ -469,4 +466,3 @@ gulp.task('debug', function (done) { gulp.task('prod', function (done) { runSequence(['copyLocalEnvConfig', 'makeUploadsDir', 'templatecache'], 'build', 'env:prod', 'lint', ['nodemon', 'watch'], done); }); - diff --git a/package.json b/package.json index bcecd37843..2227b2e7bb 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ "grunt": "~1.0.1", "grunt-cli": "~1.2.0", "helmet": "~2.1.2", - "jasmine-core": "~2.4.1", + "jasmine-core": "~2.5.0", "lodash": "~4.15.0", "lusca": "~1.4.1", "method-override": "~2.3.5", @@ -102,24 +102,24 @@ "gulp-angular-templatecache": "~1.8.0", "gulp-autoprefixer": "~3.1.0", "gulp-concat": "~2.6.0", - "gulp-csslint": "~0.2.0", - "gulp-csso": "~1.1.0", - "gulp-eslint": "~2.0.0", + "gulp-csslint": "~1.0.0", + "gulp-csso": "~2.0.0", + "gulp-eslint": "~3.0.1", "gulp-imagemin": "~2.4.0", "gulp-istanbul": "~1.1.1", - "gulp-less": "~3.0.5", + "gulp-less": "~3.1.0", "gulp-livereload": "~3.8.1", "gulp-load-plugins": "~1.2.0", "gulp-mocha": "~3.0.1", - "gulp-ng-annotate": "~1.1.0", + "gulp-ng-annotate": "~2.0.0", "gulp-node-inspector": "~0.1.0", - "gulp-nodemon": "~2.0.6", - "gulp-protractor": "~2.1.0", + "gulp-nodemon": "~2.1.0", + "gulp-protractor": "~3.0.0", "gulp-rename": "~1.2.2", - "gulp-sass": "~2.2.0", + "gulp-sass": "~2.3.0", "gulp-uglify": "~1.5.2", "gulp-util": "~3.0.7", - "imagemin-pngquant": "~4.2.0", + "imagemin-pngquant": "~5.0.0", "istanbul": "~0.4.2", "karma": "~0.13.21", "karma-chrome-launcher": "~0.2.2", @@ -132,9 +132,9 @@ "load-grunt-tasks": "~3.4.1", "mock-fs": "~3.11.0", "node-inspector": "~0.12.7", - "run-sequence": "~1.1.5", + "run-sequence": "~1.2.2", "semver": "~5.3.0", - "should": "~8.2.2", - "supertest": "~1.2.0" + "should": "~11.1.0", + "supertest": "~2.0.0" } }