Update to latest eslint rules

Author: leebyron

.eslintrc

@@ -25,7 +25,7 @@
     "PATENTS"
   ],
   "options": {
-    "mocha": "--require scripts/mocha-bootload src/**/__tests__/**/*.js"
+    "mocha": "src/**/__tests__/**/*.js"
   },
   "scripts": {
     "prepublish": "npm test && npm run build",
@@ -47,7 +47,7 @@
   "devDependencies": {
     "babel-cli": "6.18.0",
     "babel-core": "6.18.2",
-    "babel-eslint": "6.0.4",
+    "babel-eslint": "7.1.0",
     "babel-plugin-check-es2015-constants": "6.8.0",
     "babel-plugin-syntax-async-functions": "6.13.0",
     "babel-plugin-transform-class-properties": "6.18.0",
@@ -70,14 +70,14 @@
     "babel-plugin-transform-object-rest-spread": "6.16.0",
     "babel-plugin-transform-regenerator": "6.16.1",
     "chai": "3.5.0",
-    "chai-as-promised": "5.3.0",
-    "coveralls": "2.11.9",
-    "eslint": "2.10.2",
-    "eslint-plugin-flowtype": "2.11.4",
+    "coveralls": "2.11.15",
+    "eslint": "3.10.2",
+    "eslint-plugin-babel": "3.3.0",
+    "eslint-plugin-flowtype": "2.25.0",
     "flow-bin": "0.25.0",
     "graphql": "0.7.0",
     "isparta": "4.0.0",
-    "mocha": "2.5.3",
-    "sane": "1.3.4"
+    "mocha": "3.1.2",
+    "sane": "1.4.1"
   }
 }

package.json

@@ -17,7 +17,7 @@ import { graphql } from 'graphql';
 
 describe('Star Wars connections', () => {
   it('fetches the first ship of the rebels', async () => {
-    var query = `
+    const query = `
       query RebelsShipsQuery {
         rebels {
           name,
@@ -31,7 +31,7 @@ describe('Star Wars connections', () => {
         }
       }
     `;
-    var expected = {
+    const expected = {
       rebels: {
         name: 'Alliance to Restore the Republic',
         ships: {
@@ -45,12 +45,12 @@ describe('Star Wars connections', () => {
         }
       }
     };
-    var result = await graphql(StarWarsSchema, query);
+    const result = await graphql(StarWarsSchema, query);
     expect(result).to.deep.equal({ data: expected });
   });
 
   it('fetches the first two ships of the rebels with a cursor', async () => {
-    var query = `
+    const query = `
       query MoreRebelShipsQuery {
         rebels {
           name,
@@ -65,7 +65,7 @@ describe('Star Wars connections', () => {
         }
       }
     `;
-    var expected = {
+    const expected = {
       rebels: {
         name: 'Alliance to Restore the Republic',
         ships: {
@@ -86,12 +86,12 @@ describe('Star Wars connections', () => {
         }
       }
     };
-    var result = await graphql(StarWarsSchema, query);
+    const result = await graphql(StarWarsSchema, query);
     expect(result).to.deep.equal({ data: expected });
   });
 
   it('fetches the next three ships of the rebels with a cursor', async () => {
-    var query = `
+    const query = `
       query EndOfRebelShipsQuery {
         rebels {
           name,
@@ -106,7 +106,7 @@ describe('Star Wars connections', () => {
         }
       }
     `;
-    var expected = {
+    const expected = {
       rebels: {
         name: 'Alliance to Restore the Republic',
         ships: {
@@ -133,12 +133,12 @@ describe('Star Wars connections', () => {
         }
       }
     };
-    var result = await graphql(StarWarsSchema, query);
+    const result = await graphql(StarWarsSchema, query);
     expect(result).to.deep.equal({ data: expected });
   });
 
   it('fetches no ships of the rebels at the end of connection', async () => {
-    var query = `
+    const query = `
       query RebelsQuery {
         rebels {
           name,
@@ -153,20 +153,20 @@ describe('Star Wars connections', () => {
         }
       }
     `;
-    var expected = {
+    const expected = {
       rebels: {
         name: 'Alliance to Restore the Republic',
         ships: {
           edges: []
         }
       }
     };
-    var result = await graphql(StarWarsSchema, query);
+    const result = await graphql(StarWarsSchema, query);
     expect(result).to.deep.equal({ data: expected });
   });
 
   it('identifies the end of the list', async () => {
-    var query = `
+    const query = `
       query EndOfRebelShipsQuery {
         rebels {
           name,
@@ -193,7 +193,7 @@ describe('Star Wars connections', () => {
         }
       }
     `;
-    var expected = {
+    const expected = {
       rebels: {
         name: 'Alliance to Restore the Republic',
         originalShips: {
@@ -237,7 +237,7 @@ describe('Star Wars connections', () => {
         }
       }
     };
-    var result = await graphql(StarWarsSchema, query);
+    const result = await graphql(StarWarsSchema, query);
     expect(result).to.deep.equal({ data: expected });
   });
 });

scripts/mocha-bootload.js

@@ -13,81 +13,81 @@
  * JSON objects in a more complex demo.
  */
 
-var xwing = {
+const xwing = {
   id: '1',
   name: 'X-Wing',
 };
 
-var ywing = {
+const ywing = {
   id: '2',
   name: 'Y-Wing',
 };
 
-var awing = {
+const awing = {
   id: '3',
   name: 'A-Wing',
 };
 
 // Yeah, technically it's Corellian. But it flew in the service of the rebels,
 // so for the purposes of this demo it's a rebel ship.
-var falcon = {
+const falcon = {
   id: '4',
   name: 'Millenium Falcon',
 };
 
-var homeOne = {
+const homeOne = {
   id: '5',
   name: 'Home One',
 };
 
-var tieFighter = {
+const tieFighter = {
   id: '6',
   name: 'TIE Fighter',
 };
 
-var tieInterceptor = {
+const tieInterceptor = {
   id: '7',
   name: 'TIE Interceptor',
 };
 
-var executor = {
+const executor = {
   id: '8',
   name: 'Executor',
 };
 
-var rebels = {
+const rebels = {
   id: '1',
   name: 'Alliance to Restore the Republic',
-  ships: ['1', '2', '3', '4', '5']
+  ships: [ '1', '2', '3', '4', '5' ]
 };
 
-var empire = {
+const empire = {
   id: '2',
   name: 'Galactic Empire',
-  ships: ['6', '7', '8']
+  ships: [ '6', '7', '8' ]
 };
 
-var data = {
+const data = {
   Faction: {
-    1: rebels,
-    2: empire
+    '1': rebels,
+    '2': empire
   },
   Ship: {
-    1: xwing,
-    2: ywing,
-    3: awing,
-    4: falcon,
-    5: homeOne,
-    6: tieFighter,
-    7: tieInterceptor,
-    8: executor
+    '1': xwing,
+    '2': ywing,
+    '3': awing,
+    '4': falcon,
+    '5': homeOne,
+    '6': tieFighter,
+    '7': tieInterceptor,
+    '8': executor
   }
 };
 
-var nextShip = 9;
+let nextShip = 9;
 export function createShip(shipName, factionId) {
-  var newShip = {
-    id: '' + (nextShip++),
+  const newShip = {
+    id: String(nextShip++),
     name: shipName
   };
   data.Ship[newShip.id] = newShip;

src/__tests__/starWarsConnectionTests.js

@@ -17,7 +17,7 @@ import { graphql } from 'graphql';
 
 describe('Star Wars mutations', () => {
   it('mutates the data set', async () => {
-    var mutation = `
+    const mutation = `
       mutation AddBWingQuery($input: IntroduceShipInput!) {
         introduceShip(input: $input) {
           ship {
@@ -31,14 +31,14 @@ describe('Star Wars mutations', () => {
         }
       }
     `;
-    var params = {
+    const params = {
       input: {
         shipName: 'B-Wing',
         factionId: '1',
         clientMutationId: 'abcde',
       }
     };
-    var expected = {
+    const expected = {
       introduceShip: {
         ship: {
           id: 'U2hpcDo5',
@@ -50,7 +50,7 @@ describe('Star Wars mutations', () => {
         clientMutationId: 'abcde',
       }
     };
-    var result = await graphql(StarWarsSchema, mutation, null, null, params);
+    const result = await graphql(StarWarsSchema, mutation, null, null, params);
     expect(result).to.deep.equal({ data: expected });
   });
 });