From e3f4a1c227c48671183a07fe24d0bf4f5433f880 Mon Sep 17 00:00:00 2001
From: greenkeeperio-bot <support@greenkeeper.io>
Date: Sat, 14 May 2016 15:38:51 -0400
Subject: [PATCH 1/5] chore(package): update dependencies

https://greenkeeper.io/
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 05b8ede3..30151b72 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,7 @@
     "babel-preset-es2015": "6.6.0",
     "babel-preset-stage-1": "6.5.0",
     "chai": "3.5.0",
-    "eslint": "2.8.0",
+    "eslint": "2.10.1",
     "gulp": "3.9.1",
     "gulp-babel": "6.1.2",
     "gulp-eslint": "2.0.0",

From b54f67b47adb65c897c32f27a9545db1f7e6c671 Mon Sep 17 00:00:00 2001
From: Zachary Golba <zachary.golba@postlight.com>
Date: Sat, 14 May 2016 16:28:26 -0400
Subject: [PATCH 2/5] fix: use eslint cli instead of gulp-eslint

---
 gulpfile.babel.js | 10 +---------
 package.json      |  5 +++--
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/gulpfile.babel.js b/gulpfile.babel.js
index 0c01d59c..ffdb8a5a 100644
--- a/gulpfile.babel.js
+++ b/gulpfile.babel.js
@@ -1,7 +1,6 @@
 import gulp from 'gulp';
 import babel from 'gulp-babel';
 import mocha from 'gulp-mocha';
-import eslint from 'gulp-eslint';
 import uglify from 'gulp-uglify';
 
 import rmrf from './src/packages/cli/utils/rmrf';
@@ -10,20 +9,13 @@ gulp.task('clean', () => {
   return rmrf('dist');
 });
 
-gulp.task('build', ['lint', 'clean'], () => {
+gulp.task('build', ['clean'], () => {
   return gulp.src('src/**/*.js')
     .pipe(babel())
     .pipe(uglify())
     .pipe(gulp.dest('dist'));
 });
 
-gulp.task('lint', () => {
-  return gulp.src('src/**/*.js')
-    .pipe(eslint())
-    .pipe(eslint.format())
-    .pipe(eslint.failAfterError());
-});
-
 gulp.task('test', ['build'], () => {
   return gulp.src([
     'test/helper.js',
diff --git a/package.json b/package.json
index 30151b72..4cc692d0 100644
--- a/package.json
+++ b/package.json
@@ -8,8 +8,10 @@
     "lux": "bin/lux"
   },
   "scripts": {
+    "build": "npm run lint && gulp build",
+    "lint": "eslint ./src/**",
     "start": "lux serve",
-    "test": "gulp test"
+    "test": "eslint ./src/** && gulp test"
   },
   "author": "Zachary Golba",
   "license": "MIT",
@@ -34,7 +36,6 @@
     "babel-preset-es2015": "6.6.0",
     "babel-preset-stage-1": "6.5.0",
     "chai": "3.5.0",
-    "eslint": "2.10.1",
     "gulp": "3.9.1",
     "gulp-babel": "6.1.2",
     "gulp-eslint": "2.0.0",

From dda943f8573dc63c37f978d61452d828dc60dacc Mon Sep 17 00:00:00 2001
From: Zachary Golba <zachary.golba@postlight.com>
Date: Sat, 14 May 2016 16:35:59 -0400
Subject: [PATCH 3/5] fix: eslint path in npm scripts

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 4cc692d0..c79e3355 100644
--- a/package.json
+++ b/package.json
@@ -9,9 +9,9 @@
   },
   "scripts": {
     "build": "npm run lint && gulp build",
-    "lint": "eslint ./src/**",
+    "lint": "./node_modules/.bin/eslint ./src/**",
     "start": "lux serve",
-    "test": "eslint ./src/** && gulp test"
+    "test": "npm run lint && gulp test"
   },
   "author": "Zachary Golba",
   "license": "MIT",

From ed84ede7f132ff62aa1abf2609f6a2f635372b67 Mon Sep 17 00:00:00 2001
From: Zachary Golba <zachary.golba@postlight.com>
Date: Sat, 14 May 2016 16:41:44 -0400
Subject: [PATCH 4/5] fix: globally install eslint on ci server

---
 .travis.yml  | 1 +
 package.json | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 421e3c52..7858ed07 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,6 +16,7 @@ before_script:
   - psql -c 'create database lux_test;' -U postgres
   - touch test/test-app/db/lux_test_test.sqlite
   - cd test/test-app && npm install && cd ../../
+  - npm install -g eslint
   - npm link
 
 env:
diff --git a/package.json b/package.json
index c79e3355..2a150247 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,7 @@
   },
   "scripts": {
     "build": "npm run lint && gulp build",
-    "lint": "./node_modules/.bin/eslint ./src/**",
+    "lint": "eslint ./src/**",
     "start": "lux serve",
     "test": "npm run lint && gulp test"
   },

From 17f5e510eea644a84c9eda9dc68b17a2841debcc Mon Sep 17 00:00:00 2001
From: Zachary Golba <zachary.golba@postlight.com>
Date: Sat, 14 May 2016 16:47:26 -0400
Subject: [PATCH 5/5] fix: globally install babel-eslint on ci server

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 7858ed07..f35163c6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,7 @@ before_script:
   - psql -c 'create database lux_test;' -U postgres
   - touch test/test-app/db/lux_test_test.sqlite
   - cd test/test-app && npm install && cd ../../
-  - npm install -g eslint
+  - npm install -g eslint babel-eslint
   - npm link
 
 env: