v3.0.14

updated eslint config
fixed logged error in integration tests
2025-12-07 14:40:55 +03:00 · 2019-08-02 12:13:39 -07:00 · 2019-08-02 12:03:53 -07:00 · 2019-08-02 11:26:52 -07:00
10 changed files with 231 additions and 79 deletions
--- a/.eslintignore
+++ b/.eslintignore
@@ -2,5 +2,6 @@ dist
 assets
 firefox
 coverage
+android/app/build
 app/locale.js
 app/capabilities.js
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@@ -4,6 +4,7 @@ env:

 extends:
  - eslint:recommended
+  - prettier
  - plugin:node/recommended
  - plugin:security/recommended

@@ -22,13 +23,5 @@ rules:
  security/detect-non-literal-fs-filename: off
  security/detect-object-injection: off

-  eol-last: [error, always]
-  eqeqeq: error
-  no-alert: warn
-  no-console: warn
-  no-path-concat: error
  no-unused-vars: [error, {argsIgnorePattern: "^_|err|event|next|reject"}]
-  no-var: error
-  one-var: [error, never]
-  prefer-const: error
-  quotes: [error, single, {avoidEscape: true}]
+  require-atomic-updates: warn
--- a/app/api.js
+++ b/app/api.js
@@ -312,12 +312,13 @@ export function downloadStream(id, keychain) {

 //////////////////

-function download(id, keychain, onprogress, canceller) {
+async function download(id, keychain, onprogress, canceller) {
+  const auth = await keychain.authHeader();
  const xhr = new XMLHttpRequest();
  canceller.oncancel = function() {
    xhr.abort();
  };
-  return new Promise(async function(resolve, reject) {
+  return new Promise(function(resolve, reject) {
    xhr.addEventListener('loadend', function() {
      canceller.oncancel = function() {};
      const authHeader = xhr.getResponseHeader('WWW-Authenticate');
@@ -337,7 +338,6 @@ function download(id, keychain, onprogress, canceller) {
        onprogress(event.loaded);
      }
    });
-    const auth = await keychain.authHeader();
    xhr.open('get', getApiUrl(`/api/download/blob/${id}`));
    xhr.setRequestHeader('Authorization', auth);
    xhr.responseType = 'blob';
--- a/app/streams.js
+++ b/app/streams.js
@@ -1,4 +1,4 @@
-/* global ReadableStream TransformStream */
+/* global TransformStream */

 export function transformStream(readable, transformer, oncancel) {
  try {
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
  "name": "firefox-send",
-  "version": "3.0.13",
+  "version": "3.0.14",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
@@ -1275,9 +1275,9 @@
      }
    },
    "@google-cloud/common": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@google-cloud/common/-/common-2.0.4.tgz",
-      "integrity": "sha512-Q2QN2KL+6w8Idl2mAI01Q72ZizJdQ+aPJUYQ+COwnUR7njskjdtHHU/Jh14ilNIzOMw+OIdIF4ebwOdsqh23QQ==",
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@google-cloud/common/-/common-2.0.5.tgz",
+      "integrity": "sha512-xnhyFQDmX9qM6j3VgP9URSdMnv/d5hi/LJljtEj31CVS+IMCSDj2jj7p4t99vTshteIyCVQ2Q/dhr1dOLYpAkw==",
      "requires": {
        "@google-cloud/projectify": "^1.0.0",
        "@google-cloud/promisify": "^1.0.0",
@@ -1286,7 +1286,7 @@
        "duplexify": "^3.6.0",
        "ent": "^2.2.0",
        "extend": "^3.0.2",
-        "google-auth-library": "^4.0.0",
+        "google-auth-library": "^5.0.0",
        "retry-request": "^4.0.0",
        "teeny-request": "^4.0.0"
      },
@@ -1327,9 +1327,9 @@
      "integrity": "sha512-7WfV4R/3YV5T30WRZW0lqmvZy9hE2/p9MvpI34WuKa2Wz62mLu5XplGTFEMK6uTbJCLWUxTcZ4J4IyClKucE5g=="
    },
    "@google-cloud/storage": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@google-cloud/storage/-/storage-3.0.3.tgz",
-      "integrity": "sha512-62N6qRCnY9zi5bK1O+IX/wQEU8NL2D4Tuo3DrrgY5Fk5n8lHlTLJLHZi730k/v2Vr1p1+fG0trfB8eNIUjkW/A==",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@google-cloud/storage/-/storage-3.0.4.tgz",
+      "integrity": "sha512-d/4ph98ljx+iovUvGV6ch545Fvn0t8r7NKdAXGNbR4F2KtD+OfX16rgYgWKffKzpTkd4aFB+hm8NVnzYwqcqXg==",
      "requires": {
        "@google-cloud/common": "^2.0.0",
        "@google-cloud/paginator": "^1.0.0",
@@ -1347,7 +1347,7 @@
        "mime-types": "^2.0.8",
        "onetime": "^5.1.0",
        "p-limit": "^2.2.0",
-        "pumpify": "^1.5.1",
+        "pumpify": "^2.0.0",
        "snakeize": "^0.1.0",
        "stream-events": "^1.0.1",
        "through2": "^3.0.0",
@@ -1383,6 +1383,38 @@
            "mimic-fn": "^2.1.0"
          }
        },
+        "pump": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+          "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+          "requires": {
+            "end-of-stream": "^1.1.0",
+            "once": "^1.3.1"
+          }
+        },
+        "pumpify": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-2.0.0.tgz",
+          "integrity": "sha512-ieN9HmpFPt4J4U4qnjN4BxrnqpPPXJyp3qFErxfwBtFOec6ewpIHdS2eu3TkmGW6S+RzFGEOGpm5ih/X/onRPQ==",
+          "requires": {
+            "duplexify": "^4.1.1",
+            "inherits": "^2.0.3",
+            "pump": "^3.0.0"
+          },
+          "dependencies": {
+            "duplexify": {
+              "version": "4.1.1",
+              "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-4.1.1.tgz",
+              "integrity": "sha512-DY3xVEmVHTv1wSzKNbwoU6nVjzI369Y6sPoqfYr0/xlx3IdX2n94xIszTcjPO8W8ZIv0Wb0PXNcjuZyT4wiICA==",
+              "requires": {
+                "end-of-stream": "^1.4.1",
+                "inherits": "^2.0.3",
+                "readable-stream": "^3.1.1",
+                "stream-shift": "^1.0.0"
+              }
+            }
+          }
+        },
        "readable-stream": {
          "version": "3.4.0",
          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.4.0.tgz",
@@ -2308,9 +2340,9 @@
      }
    },
    "aws-sdk": {
-      "version": "2.502.0",
-      "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.502.0.tgz",
-      "integrity": "sha512-VHFdbnJLuzON/35qE4x33PwzWFxAR/0A1wCIvc3sfOVisiGFuvBhQKC24uBlvFMrdPDnrL+8wKCHwfICgCqZtw==",
+      "version": "2.503.0",
+      "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.503.0.tgz",
+      "integrity": "sha512-DPwRxhPYCGNvKL9rUhpAoOVpMRyISbVMlXykLQknYo7wyOI+jYcyA7t8H7IFPAqj4ZG+R+Au9tO/KT4im+2gbg==",
      "requires": {
        "buffer": "4.9.1",
        "events": "1.1.1",
@@ -5591,6 +5623,23 @@
        }
      }
    },
+    "eslint-config-prettier": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-6.0.0.tgz",
+      "integrity": "sha512-vDrcCFE3+2ixNT5H83g28bO/uYAwibJxerXPj+E7op4qzBCsAV36QfvdAyVOoNxKAH2Os/e01T/2x++V0LPukA==",
+      "dev": true,
+      "requires": {
+        "get-stdin": "^6.0.0"
+      },
+      "dependencies": {
+        "get-stdin": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-6.0.0.tgz",
+          "integrity": "sha512-jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g==",
+          "dev": true
+        }
+      }
+    },
    "eslint-plugin-es": {
      "version": "1.4.0",
      "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-1.4.0.tgz",
@@ -7221,14 +7270,14 @@
      }
    },
    "gcs-resumable-upload": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/gcs-resumable-upload/-/gcs-resumable-upload-2.2.2.tgz",
-      "integrity": "sha512-pAkIVrYlRJ59d0QQHy1qU9JYVOjgwLz+SlPtn4S1Q3ckLYXfzZTd/47HnDra0u85j6BawnVQhNJxJTR+VZVsVg==",
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/gcs-resumable-upload/-/gcs-resumable-upload-2.2.3.tgz",
+      "integrity": "sha512-LNmrW+Yel0gbqZ5NZMMXJTH74SS6nGUP9Uca4pPY9bRIYDHJ5/TFAAaHsxCWf8+tid/4eIdNevrv9PDjPTPTeg==",
      "requires": {
        "abort-controller": "^3.0.0",
        "configstore": "^5.0.0",
        "gaxios": "^2.0.0",
-        "google-auth-library": "^4.0.0",
+        "google-auth-library": "^5.0.0",
        "pumpify": "^2.0.0",
        "stream-events": "^1.0.4"
      },
@@ -7479,9 +7528,9 @@
      }
    },
    "google-auth-library": {
-      "version": "4.2.6",
-      "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-4.2.6.tgz",
-      "integrity": "sha512-oJ6tCA9rbsYeIVY+mcLPFHa2hatz3XO6idYIrlI/KhhlMxZrO3tKyU8O2Pxu5KnSBBP7Wj4HtbM1LLKngNFaFw==",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-5.1.1.tgz",
+      "integrity": "sha512-Au/lHG0Nvafprs8O66xu9qzfj/uEXWR+jmrhE2zHd9rh7mA+4b5H21rMP3xgQwmHXZHOOVN1GEuCEwlUut3gvg==",
      "requires": {
        "arrify": "^2.0.0",
        "base64-js": "^1.3.0",
@@ -8240,6 +8289,12 @@
      "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=",
      "dev": true
    },
+    "infer-owner": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz",
+      "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==",
+      "dev": true
+    },
    "inflight": {
      "version": "1.0.6",
      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
@@ -9797,9 +9852,9 @@
      },
      "dependencies": {
        "semver": {
-          "version": "6.2.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.2.0.tgz",
-          "integrity": "sha512-jdFC1VdUGT/2Scgbimf7FSx9iJLXoqfglSF+gJeuNWVpiE37OIbc1jywR/GJyFdz3mnkz2/id0L0J/cr0izR5A=="
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
        }
      }
    },
@@ -13200,6 +13255,7 @@
      "version": "2.0.1",
      "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
      "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
+      "dev": true,
      "requires": {
        "end-of-stream": "^1.1.0",
        "once": "^1.3.1"
@@ -13209,6 +13265,7 @@
      "version": "1.5.1",
      "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz",
      "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==",
+      "dev": true,
      "requires": {
        "duplexify": "^3.6.0",
        "inherits": "^2.0.3",
@@ -14724,9 +14781,9 @@
      }
    },
    "source-map-support": {
-      "version": "0.5.12",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.12.tgz",
-      "integrity": "sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==",
+      "version": "0.5.13",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz",
+      "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==",
      "dev": true,
      "requires": {
        "buffer-from": "^1.0.0",
@@ -15688,9 +15745,9 @@
      }
    },
    "tailwindcss": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-1.0.5.tgz",
-      "integrity": "sha512-e5edrSKqNOvWAVEutXN5czeJSXjQQxO7zNN4RDd5vQF/JTxnKdndcMFIC6p6YkRvcGFKPCZ/0rY1zZvPeq9V4A==",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-1.0.6.tgz",
+      "integrity": "sha512-hhdvXpnlYNnxfZCpldMypSWRzgmoQbKBy3namGlsP0Gs+qM8EwF3DBVUPoq8wJYbBFjzrgatE4czWJ6f12Y9+Q==",
      "dev": true,
      "requires": {
        "autoprefixer": "^9.4.5",
@@ -15813,28 +15870,86 @@
      }
    },
    "terser-webpack-plugin": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.3.0.tgz",
-      "integrity": "sha512-W2YWmxPjjkUcOWa4pBEv4OP4er1aeQJlSo2UhtCFQCuRXEHjOFscO8VyWHj9JLlA0RzQb8Y2/Ta78XZvT54uGg==",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.1.tgz",
+      "integrity": "sha512-ZXmmfiwtCLfz8WKZyYUuuHf3dMYEjg8NrjHMb0JqHVHVOSkzp3cW2/XG1fP3tRhqEqSzMwzzRQGtAPbs4Cncxg==",
      "dev": true,
      "requires": {
-        "cacache": "^11.3.2",
-        "find-cache-dir": "^2.0.0",
+        "cacache": "^12.0.2",
+        "find-cache-dir": "^2.1.0",
        "is-wsl": "^1.1.0",
-        "loader-utils": "^1.2.3",
        "schema-utils": "^1.0.0",
        "serialize-javascript": "^1.7.0",
        "source-map": "^0.6.1",
-        "terser": "^4.0.0",
-        "webpack-sources": "^1.3.0",
+        "terser": "^4.1.2",
+        "webpack-sources": "^1.4.0",
        "worker-farm": "^1.7.0"
      },
      "dependencies": {
+        "bluebird": {
+          "version": "3.5.5",
+          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.5.tgz",
+          "integrity": "sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w==",
+          "dev": true
+        },
+        "cacache": {
+          "version": "12.0.2",
+          "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.2.tgz",
+          "integrity": "sha512-ifKgxH2CKhJEg6tNdAwziu6Q33EvuG26tYcda6PT3WKisZcYDXsnEdnRv67Po3yCzFfaSoMjGZzJyD2c3DT1dg==",
+          "dev": true,
+          "requires": {
+            "bluebird": "^3.5.5",
+            "chownr": "^1.1.1",
+            "figgy-pudding": "^3.5.1",
+            "glob": "^7.1.4",
+            "graceful-fs": "^4.1.15",
+            "infer-owner": "^1.0.3",
+            "lru-cache": "^5.1.1",
+            "mississippi": "^3.0.0",
+            "mkdirp": "^0.5.1",
+            "move-concurrently": "^1.0.1",
+            "promise-inflight": "^1.0.1",
+            "rimraf": "^2.6.3",
+            "ssri": "^6.0.1",
+            "unique-filename": "^1.1.1",
+            "y18n": "^4.0.0"
+          }
+        },
+        "glob": {
+          "version": "7.1.4",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz",
+          "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
        "source-map": {
          "version": "0.6.1",
          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
          "dev": true
+        },
+        "webpack-sources": {
+          "version": "1.4.1",
+          "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.1.tgz",
+          "integrity": "sha512-XSz38193PTo/1csJabKaV4b53uRVotlMgqJXm3s3eje0Bu6gQTxYDqpD38CmQfDBA+gN+QqaGjasuC8I/7eW3Q==",
+          "dev": true,
+          "requires": {
+            "source-list-map": "^2.0.0",
+            "source-map": "~0.6.1"
+          }
+        },
+        "y18n": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
+          "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
+          "dev": true
        }
      }
    },
@@ -17070,34 +17185,34 @@
      }
    },
    "webpack": {
-      "version": "4.38.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.38.0.tgz",
-      "integrity": "sha512-lbuFsVOq8PZY+1Ytz/mYOvYOo+d4IJ31hHk/7iyoeWtwN33V+5HYotSH+UIb9tq914ey0Hot7z6HugD+je3sWw==",
+      "version": "4.39.1",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.39.1.tgz",
+      "integrity": "sha512-/LAb2TJ2z+eVwisldp3dqTEoNhzp/TLCZlmZm3GGGAlnfIWDgOEE758j/9atklNLfRyhKbZTCOIoPqLJXeBLbQ==",
      "dev": true,
      "requires": {
        "@webassemblyjs/ast": "1.8.5",
        "@webassemblyjs/helper-module-context": "1.8.5",
        "@webassemblyjs/wasm-edit": "1.8.5",
        "@webassemblyjs/wasm-parser": "1.8.5",
-        "acorn": "^6.2.0",
-        "ajv": "^6.1.0",
-        "ajv-keywords": "^3.1.0",
-        "chrome-trace-event": "^1.0.0",
+        "acorn": "^6.2.1",
+        "ajv": "^6.10.2",
+        "ajv-keywords": "^3.4.1",
+        "chrome-trace-event": "^1.0.2",
        "enhanced-resolve": "^4.1.0",
-        "eslint-scope": "^4.0.0",
+        "eslint-scope": "^4.0.3",
        "json-parse-better-errors": "^1.0.2",
-        "loader-runner": "^2.3.0",
-        "loader-utils": "^1.1.0",
-        "memory-fs": "~0.4.1",
-        "micromatch": "^3.1.8",
-        "mkdirp": "~0.5.0",
-        "neo-async": "^2.5.0",
-        "node-libs-browser": "^2.0.0",
+        "loader-runner": "^2.4.0",
+        "loader-utils": "^1.2.3",
+        "memory-fs": "^0.4.1",
+        "micromatch": "^3.1.10",
+        "mkdirp": "^0.5.1",
+        "neo-async": "^2.6.1",
+        "node-libs-browser": "^2.2.1",
        "schema-utils": "^1.0.0",
-        "tapable": "^1.1.0",
-        "terser-webpack-plugin": "^1.1.0",
-        "watchpack": "^1.5.0",
-        "webpack-sources": "^1.3.0"
+        "tapable": "^1.1.3",
+        "terser-webpack-plugin": "^1.4.1",
+        "watchpack": "^1.6.0",
+        "webpack-sources": "^1.4.1"
      },
      "dependencies": {
        "acorn": {
@@ -17106,6 +17221,24 @@
          "integrity": "sha512-JD0xT5FCRDNyjDda3Lrg/IxFscp9q4tiYtxE1/nOzlKCk7hIRuYjhq1kCNkbPjMRMZuFq20HNQn1I9k8Oj0E+Q==",
          "dev": true
        },
+        "ajv": {
+          "version": "6.10.2",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz",
+          "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "^2.0.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "ajv-keywords": {
+          "version": "3.4.1",
+          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.4.1.tgz",
+          "integrity": "sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ==",
+          "dev": true
+        },
        "eslint-scope": {
          "version": "4.0.3",
          "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz",
@@ -17115,6 +17248,28 @@
            "esrecurse": "^4.1.0",
            "estraverse": "^4.1.1"
          }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
+        "tapable": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz",
+          "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==",
+          "dev": true
+        },
+        "webpack-sources": {
+          "version": "1.4.1",
+          "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.1.tgz",
+          "integrity": "sha512-XSz38193PTo/1csJabKaV4b53uRVotlMgqJXm3s3eje0Bu6gQTxYDqpD38CmQfDBA+gN+QqaGjasuC8I/7eW3Q==",
+          "dev": true,
+          "requires": {
+            "source-list-map": "^2.0.0",
+            "source-map": "~0.6.1"
+          }
        }
      }
    },
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
  "name": "firefox-send",
  "description": "File Sharing Experiment",
-  "version": "3.0.13",
+  "version": "3.0.14",
  "author": "Mozilla (https://mozilla.org)",
  "repository": "mozilla/send",
  "homepage": "https://github.com/mozilla/send/",
@@ -80,6 +80,7 @@
    "css-mqpacker": "^7.0.0",
    "cssnano": "^4.1.10",
    "eslint": "^6.1.0",
+    "eslint-config-prettier": "^6.0.0",
    "eslint-plugin-mocha": "^6.0.0",
    "eslint-plugin-node": "^9.1.0",
    "eslint-plugin-security": "^1.4.0",
@@ -118,7 +119,7 @@
    "stylelint-no-unsupported-browser-features": "^3.0.2",
    "svgo": "^1.3.0",
    "svgo-loader": "^2.2.1",
-    "tailwindcss": "^1.0.5",
+    "tailwindcss": "^1.0.6",
    "val-loader": "^1.1.1",
    "wdio-docker-service": "^1.4.2",
    "wdio-dot-reporter": "0.0.10",
@@ -128,7 +129,7 @@
    "wdio-selenium-standalone-service": "0.0.12",
    "wdio-spec-reporter": "^0.1.5",
    "webdriverio": "^4.14.4",
-    "webpack": "^4.38.0",
+    "webpack": "^4.39.1",
    "webpack-cli": "^3.3.6",
    "webpack-dev-middleware": "^3.7.0",
    "webpack-dev-server": "^3.7.2",
@@ -136,16 +137,16 @@
    "webpack-unassert-loader": "^1.2.0"
  },
  "dependencies": {
-    "@google-cloud/storage": "^3.0.3",
-    "aws-sdk": "^2.502.0",
+    "@fluent/bundle": "^0.13.0",
+    "@fluent/langneg": "^0.3.0",
+    "@google-cloud/storage": "^3.0.4",
+    "aws-sdk": "^2.503.0",
    "body-parser": "^1.19.0",
    "choo": "^6.13.3",
    "cldr-core": "^35.1.0",
    "convict": "^5.1.0",
    "express": "^4.17.1",
    "express-ws": "github:dannycoates/express-ws",
-    "@fluent/bundle": "^0.13.0",
-    "@fluent/langneg": "^0.3.0",
    "fxa-geodb": "^1.0.4",
    "helmet": "^3.20.0",
    "mkdirp": "^0.5.1",
--- a/scripts/get-prod-locales.js
+++ b/scripts/get-prod-locales.js
@@ -19,8 +19,8 @@ exec(cmd)
    const locales = Object.keys(summary)
      .filter(locale => {
        const loc = summary[locale];
-        const hasMissing = loc.hasOwnProperty('missing');
-        const hasErrors = loc.hasOwnProperty('errors');
+        const hasMissing = Object.prototype.hasOwnProperty.call(loc, 'missing');
+        const hasErrors = Object.prototype.hasOwnProperty.call(loc, 'errors');
        return !hasMissing && !hasErrors;
      })
      .sort();
--- a/scripts/lint-locales.js
+++ b/scripts/lint-locales.js
@@ -33,7 +33,7 @@ function filterErrors(details) {
    .sort()
    .map(locale => {
      const data = details[locale]
-        .filter(item => item.hasOwnProperty('error'))
+        .filter(item => Object.prototype.hasOwnProperty.call(item, 'error'))
        .map(({ error }) => error);
      return { locale, data };
    })
--- a/test/.eslintrc.yml
+++ b/test/.eslintrc.yml
@@ -19,5 +19,7 @@ rules:
  mocha/no-pending-tests: error
  mocha/no-return-and-callback: warn
  mocha/no-skipped-tests: error
+  mocha/no-setup-in-describe: off
+  mocha/no-hooks-for-single-case: off

  no-console: off # ¯\_(ツ)_/¯
--- a/test/testServer.js
+++ b/test/testServer.js
@@ -18,8 +18,8 @@ module.exports = {
      app.use(wpm);
      assets.setMiddleware(wpm);
      expressWs(app, null, { perMessageDeflate: false });
-      app.ws('/api/ws', require('../server/routes/ws'));
      routes(app);
+      app.ws('/api/ws', require('../server/routes/ws'));
      tests(app);
      wpm.waitUntilValid(() => {
        server = app.listen(8000, resolve);
Author	SHA1	Message	Date
Danny Coates	80fb42ad3d	v3.0.14	2019-08-02 12:13:39 -07:00
Danny Coates	f036df5f47	updated eslint config	2019-08-02 12:03:53 -07:00
Danny Coates	20c063db7c	fixed logged error in integration tests	2019-08-02 11:26:52 -07:00