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,22 +333,20 @@ gulp.task('serve-package', function () {
   servePackage(3001, packageServerHostname());
 });
 
-gulp.task('build',
-          ['build-js',
-           'build-css',
-           'build-fonts',
-           'build-images'],
+gulp.task('build', ['build-js',
+                    'build-css',
+                    'build-fonts',
+                    'build-images'],
           generateManifest);
 
-gulp.task('watch',
-          ['serve-package',
-           'serve-live-reload',
-           'watch-js',
-           'watch-css',
-           'watch-fonts',
-           'watch-images',
-           'watch-manifest',
-           'watch-templates']);
+gulp.task('watch', ['serve-package',
+                    'serve-live-reload',
+                    'watch-js',
+                    'watch-css',
+                    'watch-fonts',
+                    'watch-images',
+                    'watch-manifest',
+                    'watch-templates']);
 
 function runKarma(baseConfig, opts, done) {
   // See https://github.com/karma-runner/karma-mocha#configuration

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",

src/sidebar/reducers/selection.js

@@ -116,8 +116,8 @@ var update = {
   SELECT_TAB: function (state, action) {
     // Do nothing if the "new tab" is not a valid tab.
     if ([uiConstants.TAB_ANNOTATIONS,
-        uiConstants.TAB_NOTES,
-        uiConstants.TAB_ORPHANS].indexOf(action.tab) === -1) {
+         uiConstants.TAB_NOTES,
+         uiConstants.TAB_ORPHANS].indexOf(action.tab) === -1) {
       return {};
     }
     // Shortcut if the tab is already correct, to avoid resetting the sortKey

src/sidebar/test/oauth-auth-test.js

@@ -139,7 +139,7 @@ describe('oauth auth', function () {
             'https://hypothes.is/api/token',
             expectedBody,
             {headers: {'Content-Type': 'application/x-www-form-urlencoded'},
-          });
+            });
         };
       }