Merge pull request #325 from hypothesis/update-eslint

Update ESLint to v3.18.0

.eslintrc

@@ -7,6 +7,10 @@
     "mocha"
   ],
   "rules": {
-    "mocha/no-exclusive-tests": "error"
+    "mocha/no-exclusive-tests": "error",
+    "indent": ["error", 2, {
+      "ArrayExpression": "first",
+      "ObjectExpression": "first"
+    }]
   },
 }

gulpfile.js

@@ -333,15 +333,13 @@ gulp.task('serve-package', function () {
   servePackage(3001, packageServerHostname());
 });
 
-gulp.task('build',
-          ['build-js',
+gulp.task('build', ['build-js',
                     'build-css',
                     'build-fonts',
                     'build-images'],
           generateManifest);
 
-gulp.task('watch',
-          ['serve-package',
+gulp.task('watch', ['serve-package',
                     'serve-live-reload',
                     'watch-js',
                     'watch-css',

package.json

@@ -40,7 +40,7 @@
     "end-of-stream": "^1.1.0",
     "escape-html": "^1.0.3",
     "escape-string-regexp": "^1.0.5",
-    "eslint": "^3.0.1",
+    "eslint": "^3.18.0",
     "eslint-config-hypothesis": "^1.0.0",
     "eslint-plugin-mocha": "^4.8.0",
     "exorcist": "^0.4.0",