From 6cfd3d91b2efea83425016aa97011a41231b3bfb Mon Sep 17 00:00:00 2001
From: Gyandeep Singh <gyandeeps@gmail.com>
Date: Wed, 5 Oct 2016 16:44:25 -0500
Subject: [PATCH] Update: Eslint to 3.0 and update CI builds (fixes #4638)
 (#4680)

---
 .travis.yml                                            | 10 +++++++++-
 Makefile                                               |  1 -
 package.json                                           |  4 ++--
 packages/babel-cli/src/babel-doctor/rules/deduped.js   |  2 +-
 .../babel-cli/src/babel-doctor/rules/has-config.js     |  2 +-
 5 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 73b20a1c8d..1031126680 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,8 +10,16 @@ node_js:
 - '5'
 - '4'
 - '0.12'
-script: make test-ci
+script: 
+  - 'if [ -n "${LINT-}" ]; then make lint ; fi'
+  - 'if [ -z "${LINT-}" ]; then make test-ci ; fi'
 
+matrix:
+  fast_finish: true
+  include:
+    - node_js: "node"
+      env: LINT=true
+      
 notifications:
   on_success: change
   on_failure: always
diff --git a/Makefile b/Makefile
index f730c42ebf..e8aeb08b24 100644
--- a/Makefile
+++ b/Makefile
@@ -45,7 +45,6 @@ test-cov: clean
 	./scripts/test-cov.sh
 
 test-ci:
-	make lint
 	NODE_ENV=test make bootstrap
 	# if ./node_modules/.bin/semver `npm --version` -r ">=3.3.0"; then ./node_modules/.bin/flow check; fi
 	./scripts/test-cov.sh
diff --git a/package.json b/package.json
index ab9dbe7b97..da4f821f30 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,7 @@
   "devDependencies": {
     "async": "^1.5.0",
     "babel-core": "^6.13.2",
-    "babel-eslint": "^6.1.2",
+    "babel-eslint": "^7.0.0",
     "babel-plugin-transform-class-properties": "^6.6.0",
     "babel-plugin-transform-flow-strip-types": "^6.3.13",
     "babel-plugin-transform-runtime": "^6.3.13",
@@ -21,7 +21,7 @@
     "chalk": "1.1.1",
     "codecov.io": "^0.1.6",
     "derequire": "^2.0.2",
-    "eslint": "^2.13.1",
+    "eslint": "^3.7.1",
     "eslint-config-babel": "^1.0.1",
     "eslint-plugin-babel": "^3.3.0",
     "eslint-plugin-flow-vars": "^0.5.0",
diff --git a/packages/babel-cli/src/babel-doctor/rules/deduped.js b/packages/babel-cli/src/babel-doctor/rules/deduped.js
index 64f5afddab..43e28b6d7f 100644
--- a/packages/babel-cli/src/babel-doctor/rules/deduped.js
+++ b/packages/babel-cli/src/babel-doctor/rules/deduped.js
@@ -1,4 +1,4 @@
-export default async function (packages) {
+export default async function (packages) { // eslint-disable-line require-yield
   let foundDeps = {};
   let foundDuplicated = false;
   let duplicatedPackages = {};
diff --git a/packages/babel-cli/src/babel-doctor/rules/has-config.js b/packages/babel-cli/src/babel-doctor/rules/has-config.js
index 605cd457a7..83ef13c136 100644
--- a/packages/babel-cli/src/babel-doctor/rules/has-config.js
+++ b/packages/babel-cli/src/babel-doctor/rules/has-config.js
@@ -1,7 +1,7 @@
 import path from "path";
 import fs from "fs";
 
-export default async function () {
+export default async function () { // eslint-disable-line require-yield
   let cwd = process.cwd();
   let parts = cwd.split(path.sep);