diff --git a/Gulpfile.js b/Gulpfile.js index e41c7529..bb79e8d7 100644 --- a/Gulpfile.js +++ b/Gulpfile.js @@ -8,7 +8,6 @@ var concat = require('gulp-concat'); var uglify = require('gulp-uglify'); var rename = require('gulp-rename'); var webpack = require('webpack'); -var eslint = require('gulp-eslint'); var map = require('map-stream'); var bump = require('gulp-bump'); var react = require('gulp-react'); @@ -160,12 +159,6 @@ gulp.task('bower-version', function() { gulp.task('bower', ['bower-build', 'bower-build-min', 'bower-build-debug', 'bower-version']); -gulp.task('lint', function() { - return gulp.src('src/js/ripple/*.js') - .pipe(eslint({ reset: true, configFile: './eslint.json' })) - .pipe(eslint.format()); -}); - gulp.task('watch', function() { gulp.watch('src/js/ripple/*', [ 'build-debug' ]); }); diff --git a/eslint.json b/eslint.json index 6f00afa0..1dbdf371 100644 --- a/eslint.json +++ b/eslint.json @@ -61,7 +61,6 @@ "no-space-before-semi": 1, "no-spaced-func": 1, "space-after-keywords": [ 1, "always" ], - "space-in-brackets": [ 1, "always" ], "space-infix-ops": 1, "space-return-throw-case": 1, "spaced-line-comment": 1, diff --git a/package.json b/package.json index c0f4c2c1..0ea0b2b2 100644 --- a/package.json +++ b/package.json @@ -27,11 +27,11 @@ "devDependencies": { "assert-diff": "0.0.4", "coveralls": "~2.10.0", + "eslint": "^0.13.0", "gulp": "~3.6.2", "gulp-bump": "~0.1.10", "gulp-clean-dest": "^0.1.0", "gulp-concat": "~2.2.0", - "gulp-eslint": "^0.2.0", "gulp-filelog": "^0.4.1", "gulp-flowtype": "^0.4.1", "gulp-plumber": "^0.6.6", @@ -52,7 +52,7 @@ "pretest": "node_modules/.bin/gulp concat-sjcl", "test": "./node_modules/.bin/istanbul test -x build/sjcl.js -x src/js/jsbn/* ./node_modules/mocha/bin/_mocha -- --reporter tap test/*-test.js", "coveralls": "cat ./coverage/lcov.info | ./node_modules/.bin/coveralls", - "lint": "./node_modules/.bin/gulp lint", + "lint": "eslint --reset -c eslint.json src/js/ripple/*.js", "perf": "./scripts/perf_test.sh" }, "repository": {