Fix #3450: Re-enable eslint-plugin-mozilla now that it is fixed.

.eslintignore

@@ -5,5 +5,3 @@ static/vendor
 /build
 /addon/webextension/build
 /firefox
-# TODO: reenable once mozilla/browser-test plugin is working:
-/test/addon/browser_screenshots_ui_check.js

.eslintrc.yml

@@ -5,7 +5,7 @@ env:
 
 extends:
   - eslint:recommended
-  #- plugin:mozilla/recommended
+  - plugin:mozilla/recommended
   - plugin:react/recommended
 
 parserOptions:
@@ -14,7 +14,7 @@ parserOptions:
     jsx: true
 
 plugins:
-  #- mozilla
+  - mozilla
   - react
   - promise
 
@@ -34,7 +34,6 @@ rules:
   no-var: off # TODO: change to "error"
   prefer-const: off # TODO: change to "error"
   quotes: [off, double] # TODO: change to "error"
-  no-unused-vars: off # TODO: change to "error"
 
   promise/always-return: off
   promise/avoid-new: off

addon/bootstrap.js

@@ -1,6 +1,4 @@
 /* globals ADDON_DISABLE */
-// TODO: re-enable
-/* eslint-disable */
 const OLD_ADDON_PREF_NAME = "extensions.jid1-NeEaf3sAHdKHPA@jetpack.deviceIdInfo";
 const OLD_ADDON_ID = "jid1-NeEaf3sAHdKHPA@jetpack";
 const ADDON_ID = "screenshots@mozilla.org";

addon/webextension/background/takeshot.js

@@ -180,7 +180,7 @@ this.takeshot = (function() {
       let enc = new TextEncoder("utf-8");
       body = enc.encode(body);
       body = concatBuffers(body.buffer, blobAsBuffer);
-      let tail = "\r\n" + "--" + boundary + "--";
+      let tail = `\r\n--${boundary}--`;
       tail = enc.encode(tail);
       body = concatBuffers(body, tail.buffer);
       return {
@@ -199,12 +199,12 @@ this.takeshot = (function() {
           {shot: JSON.stringify(shot.asJson())},
           "blob", "screenshot.png", blob
         );
-      } else {
+      }
         return {
           "content-type": "application/json",
           body: JSON.stringify(shot.asJson())
         };
-      }
+
     }).then((submission) => {
       headers["content-type"] = submission["content-type"];
       sendEvent("upload", "started", {eventValue: Math.floor(submission.body.length / 1000)});

circle.yml

@@ -2,7 +2,7 @@ machine:
   services:
     - docker
   node:
-    version: 6.10.0
+    version: 8.2.0
   environment:
     RDS_NAME: circle_test
     RDS_USERNAME: ubuntu

package.json

@@ -19,7 +19,6 @@
     "csurf": "1.9.0",
     "envc": "2.5.0",
     "escape-html": "1.0.3",
-    "eslint-plugin-no-unsanitized": "2.0.1",
     "express": "4.15.4",
     "fluent": "0.4.1",
     "fluent-intl-polyfill": "0.1.0",
@@ -57,8 +56,9 @@
     "browserify": "14.4.0",
     "david": "11.0.0",
     "envify": "4.1.0",
-    "eslint": "4.5.0",
-    "eslint-plugin-mozilla": "0.4.3",
+    "eslint": "4.7.1",
+    "eslint-plugin-mozilla": "0.4.4",
+    "eslint-plugin-no-unsanitized": "2.0.1",
     "eslint-plugin-promise": "3.5.0",
     "eslint-plugin-react": "^7.3.0",
     "fx-runner": "1.0.7",

server/src/pages/shotindex/controller.js

@@ -32,7 +32,7 @@ exports.launch = function(m) {
       return;
     }
     let authTimeout = setTimeout(() => {
-      // eslint-disable-next-line no-global-assign
+      // eslint-disable-next-line no-global-assign, no-native-reassign
       location = location.origin + "/#tour";
     }, FIVE_SECONDS);
     window.wantsauth.addAuthDataListener((data) => {

server/src/ravenclient.js

@@ -18,7 +18,7 @@ exports.sendRavenMessage = function(req, message, options) {
   options.extra.path = req.originalUrl;
   options.extra.method = req.method;
   options.extra.userAgent = req.headers['user-agent'];
-  options.extra.referrer = req.headers['referer'];
+  options.extra.referrer = req.headers.referer;
   options.extra.authenticated = !!req.deviceId;
   Raven.captureMessage(message, options);
 };

server/src/server.js

@@ -801,8 +801,8 @@ app.get("/images/:imageid", function(req, res) {
       notFound(req, res);
     } else {
       let localReferrer = false;
-      if (req.headers["referer"]) {
-        localReferrer = req.headers["referer"].startsWith(req.backend);
+      if (req.headers.referer) {
+        localReferrer = req.headers.referer.startsWith(req.backend);
       }
       if (!localReferrer) {
         let hasher = require("crypto").createHash("sha1");
@@ -821,7 +821,7 @@ app.get("/images/:imageid", function(req, res) {
         analytics.pageview({
           dp: analyticsUrl,
           dh: req.backend,
-          documentReferrer: req.headers["referer"],
+          documentReferrer: req.headers.referer,
           ua: req.headers["user-agent"]
         }).event({
           ec: "web",

test/addon/.eslintrc.yml

@@ -1,10 +1,5 @@
 env:
   node: true
 
-# TODO: re-enable
-#extends:
-#  - plugin:mozilla/browser-test
-
-rules:
-  no-unused-vars: off
-  no-undef: off
+extends:
+  - plugin:mozilla/browser-test

test/addon/browser_screenshots_ui_check.js

@@ -1,4 +1,3 @@
-/* eslint disable */
 "use strict";
 
 const BUTTON_ID = "pageAction-panel-screenshots";