Merge pull request #871 from hypothesis/dependabot/npm_and_yarn/eslint-4.19.1

Bump eslint from 3.19.0 to 4.19.1

package.json

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

src/annotator/plugin/test/document-test.js

@@ -229,7 +229,7 @@ describe('DocumentMeta', function() {
       const expected = (
         document.location.protocol + '//' +
           document.location.host +
-          document.location.pathname.replace(/[^\/]+$/, '') +
+          document.location.pathname.replace(/[^/]+$/, '') +
           'path'
       );
       assert.equal(result, expected);

src/annotator/util/observable.js

@@ -7,7 +7,7 @@
 
 const Observable = require('zen-observable');
 
- /**
+/**
   * Returns an observable of events emitted by a DOM event source
   * (eg. an Element, Document or Window).
   *
@@ -54,7 +54,7 @@ function delay(delay, src) {
   });
 }
 
- /**
+/**
   * Buffers events from a source Observable, waiting for a pause of `delay`
   * ms with no events before emitting the last value from `src`.
   *
@@ -86,7 +86,7 @@ function buffer(delay, src) {
   });
 }
 
- /**
+/**
   * Merges multiple streams of values into a single stream.
   *
   * @param {Array<Observable>} sources

src/shared/discovery.js

@@ -189,7 +189,7 @@ class Discovery {
         discovered = true;
       } else if (messageType === 'offer' || messageType === 'ack') {
         throw new Error(
-`A second Discovery server has been detected at ${origin}.
+          `A second Discovery server has been detected at ${origin}.
  This is unsupported and will cause unexpected behaviour.`
         );
       }

src/sidebar/media-embedder.js

@@ -134,7 +134,7 @@ const embedGenerators = [
       return null;
     }
 
-    const groups = /[&\?]v=([^&#]+)/.exec(link.search);
+    const groups = /[&?]v=([^&#]+)/.exec(link.search);
     if (groups) {
       return youTubeEmbed(groups[1], link);
     }
@@ -148,7 +148,7 @@ const embedGenerators = [
     }
 
     // extract video ID from URL
-    const groups = /^\/([^\/]+)\/?$/.exec(link.pathname);
+    const groups = /^\/([^/]+)\/?$/.exec(link.pathname);
     if (groups) {
       return youTubeEmbed(groups[1], link);
     }
@@ -161,7 +161,7 @@ const embedGenerators = [
       return null;
     }
 
-    const groups = /^\/([^\/\?#]+)\/?$/.exec(link.pathname);
+    const groups = /^\/([^/?#]+)\/?$/.exec(link.pathname);
     if (groups) {
       return vimeoEmbed(groups[1]);
     }
@@ -174,7 +174,7 @@ const embedGenerators = [
       return null;
     }
 
-    const groups = /^\/channels\/[^\/]+\/([^\/?#]+)\/?$/.exec(link.pathname);
+    const groups = /^\/channels\/[^/]+\/([^/?#]+)\/?$/.exec(link.pathname);
     if (groups) {
       return vimeoEmbed(groups[1]);
     }
@@ -219,7 +219,7 @@ const embedGenerators = [
     let endTime = linkParams.end;
 
     if (!startTime) {
-      const startPathParam = slug.match(/\/start\/([^\/]+)/);
+      const startPathParam = slug.match(/\/start\/([^/]+)/);
       if (startPathParam) {
         startTime = startPathParam[1];
         slug = slug.replace(startPathParam[0], '');
@@ -227,7 +227,7 @@ const embedGenerators = [
     }
 
     if (!endTime) {
-      const endPathParam = slug.match(/\/end\/([^\/]+)/);
+      const endPathParam = slug.match(/\/end\/([^/]+)/);
       if (endPathParam) {
         endTime = endPathParam[1];
         slug = slug.replace(endPathParam[0], '');

src/sidebar/services/frame-sync.js

@@ -16,7 +16,7 @@ const uiConstants = require('../ui-constants');
  *                    for PDFs
  */
 
- /**
+/**
   * Return a minimal representation of an annotation that can be sent from the
   * sidebar app to a connected frame.
   *

src/sidebar/store/modules/selection.js

@@ -24,7 +24,7 @@ const util = require('../util');
 */
 const TAB_DEFAULT = uiConstants.TAB_ANNOTATIONS;
 
- /**
+/**
   * Default sort keys for each tab.
   */
 const TAB_SORTKEY_DEFAULT = {};

src/sidebar/util/group-organizations.js

@@ -2,7 +2,7 @@
 
 const immutable = require('seamless-immutable');
 
- // TODO: Update when this is a property available on the API response
+// TODO: Update when this is a property available on the API response
 const DEFAULT_ORG_ID = '__default__';
 
 /**