chore(deps): update deps

package.json

@@ -94,10 +94,10 @@
     "eslint": "^6.8.0",
     "eslint-plugin-fxa": "^2.0.2",
     "eslint-plugin-jest": "^23.13.2",
-    "eslint-plugin-react": "^7.19.0",
+    "eslint-plugin-react": "7.19.0",
     "json": "^9.0.6",
-    "stylelint": "^13.4.0",
-    "stylelint-config-prettier": "^8.0.1"
+    "stylelint": "^13.6.1",
+    "stylelint-config-prettier": "^8.0.2"
   },
   "workspaces": [
     "packages/*"

packages/123done/package.json

@@ -21,11 +21,11 @@
   "private": true,
   "dependencies": {
     "client-sessions": "0.6.x",
-    "express": "4.16.4",
+    "express": "^4.17.1",
     "fxa-jwtool": "0.7.x",
     "morgan": "^1.10.0",
     "node-rsa": "1.0.5",
-    "redis": "0.7.1",
+    "redis": "^2.8.0",
     "request": "^2.88.2"
   },
   "engines": {

packages/browserid-verifier/package.json

@@ -16,13 +16,13 @@
   },
   "dependencies": {
     "async": "2.6.1",
-    "body-parser": "1.18.3",
+    "body-parser": "^1.19.0",
     "browserid-local-verify": "0.5.2",
     "compute-cluster": "0.0.9",
     "convict": "^6.0.0",
     "convict-format-with-moment": "^6.0.0",
     "convict-format-with-validator": "^6.0.0",
-    "express": "4.16.4",
+    "express": "^4.17.1",
     "intel": "1.2.0",
     "morgan": "^1.10.0",
     "mozlog": "2.2.0",

packages/fortress/package.json

@@ -22,7 +22,7 @@
   "dependencies": {
     "client-sessions": "0.6.x",
     "ejs": "^3.1.2",
-    "express": "4.16.4",
+    "express": "^4.17.1",
     "morgan": "^1.10.0"
   },
   "engines": {
@@ -38,8 +38,8 @@
     "npm-run-all": "4.1.5",
     "pm2": "^4.4.0",
     "prettier": "^2.0.5",
-    "stylelint": "^13.3.3",
-    "stylelint-config-prettier": "^8.0.1"
+    "stylelint": "^13.6.1",
+    "stylelint-config-prettier": "^8.0.2"
   },
   "scripts": {
     "lint": "npm-run-all --parallel lint:eslint lint:style",

packages/fxa-admin-panel/package.json

@@ -46,7 +46,7 @@
     "express-http-proxy": "^1.6.0",
     "fxa-react": "workspace:*",
     "graphql": "^14.6.0",
-    "helmet": "^3.21.3",
+    "helmet": "^3.23.3",
     "mozlog": "^2.2.0",
     "node-sass": "^4.13.1",
     "npm-run-all": "^4.1.5",
@@ -67,9 +67,9 @@
     "@storybook/addons": "^5.3.19",
     "@storybook/preset-create-react-app": "^2.1.1",
     "@storybook/react": "^5.3.19",
-    "@testing-library/dom": "~5.0.0",
-    "@testing-library/jest-dom": "^4.2.4",
-    "@testing-library/react": "^9.4.1",
+    "@testing-library/dom": "^6.15.0",
+    "@testing-library/jest-dom": "^5.11.0",
+    "@testing-library/react": "^9.5.0",
     "@testing-library/user-event": "^7.2.1",
     "@types/babel__core": "7.1.7",
     "@types/chance": "^1.0.10",
@@ -82,12 +82,12 @@
     "@types/jsdom": "^12.2.4",
     "@types/on-headers": "^1.0.0",
     "@types/react": "^16.8.0",
-    "@types/react-router-dom": "^5.1.3",
-    "@types/serve-static": "^1.13.3",
+    "@types/react-router-dom": "^5.1.5",
+    "@types/serve-static": "1.13.3",
     "@types/supertest": "^2.0.8",
     "@types/webpack": "4.41.16",
-    "@typescript-eslint/eslint-plugin": "^2.21.0",
-    "@typescript-eslint/parser": "^2.21.0",
+    "@typescript-eslint/eslint-plugin": "2.33.0",
+    "@typescript-eslint/parser": "2.33.0",
     "apollo-cache-inmemory": "^1.6.2",
     "apollo-link": "^1.2.12",
     "apollo-utilities": "^1.3.2",
@@ -96,7 +96,7 @@
     "eslint": "^6.8.0",
     "eslint-plugin-fxa": "^2.0.2",
     "eslint-plugin-jest": "^23.13.2",
-    "eslint-plugin-react": "^7.18.3",
+    "eslint-plugin-react": "7.19.0",
     "fxa-shared": "workspace:*",
     "jest": "^24.9.0",
     "pm2": "^4.4.0",

packages/fxa-admin-panel/tsconfig.json

@@ -4,7 +4,8 @@
     "noEmit": true,
     "types": [
       "jest",
-      "node"
+      "node",
+      "@testing-library/jest-dom"
     ],
     "lib": [
       "dom",

packages/fxa-admin-server/package.json

@@ -36,7 +36,7 @@
     "convict-format-with-moment": "^6.0.0",
     "convict-format-with-validator": "^6.0.0",
     "graphql": "^14.6.0",
-    "knex": "^0.20.11",
+    "knex": "^0.21.1",
     "mozlog": "^2.2.0",
     "mysql": "^2.18.1",
     "objection": "^2.1.3",
@@ -54,9 +54,9 @@
     "@types/mocha": "^7.0.2",
     "@types/node": "^13.9.1",
     "@types/proxyquire": "^1.3.28",
-    "@types/sinon": "^7.5.2",
+    "@types/sinon": "^9.0.4",
     "@types/supertest": "^2.0.8",
-    "@types/yargs": "^15.0.4",
+    "@types/yargs": "^15.0.5",
     "audit-filter": "^0.5.0",
     "chai": "^4.2.0",
     "chance": "^1.1.4",

packages/fxa-auth-db-mysql/package.json

@@ -36,7 +36,7 @@
     "convict-format-with-validator": "^6.0.0",
     "fxa-jwtool": "0.7.2",
     "fxa-shared": "workspace:*",
-    "ip": "1.1.5",
+    "ip": "^1.1.5",
     "mozlog": "2.2.0",
     "mysql": "^2.18.1",
     "mysql-patcher": "0.7.0",

packages/fxa-auth-server/docs/pushpayloads.schema.json

@@ -1,17 +1,33 @@
 {
   "title": "FxA Push Payload schema",
   "description": "This schema defines what is acceptable to send as a payload data with the Push API from the FxA servers to a device connected to FxA",
-  "$schema": "http://json-schema.org/draft-04/schema#",
+  "$schema": "http://json-schema.org/draft-07/schema#",
   "type": "object",
   "anyOf": [
-    { "$ref": "#/definitions/deviceConnected" },
-    { "$ref": "#/definitions/deviceDisconnected" },
-    { "$ref": "#/definitions/profileUpdated" },
-    { "$ref": "#/definitions/collectionsChanged" },
-    { "$ref": "#/definitions/passwordChanged" },
-    { "$ref": "#/definitions/passwordReset" },
-    { "$ref": "#/definitions/accountDestroyed" },
-    { "$ref": "#/definitions/commandReceived" }
+    {
+      "$ref": "#/definitions/deviceConnected"
+    },
+    {
+      "$ref": "#/definitions/deviceDisconnected"
+    },
+    {
+      "$ref": "#/definitions/profileUpdated"
+    },
+    {
+      "$ref": "#/definitions/collectionsChanged"
+    },
+    {
+      "$ref": "#/definitions/passwordChanged"
+    },
+    {
+      "$ref": "#/definitions/passwordReset"
+    },
+    {
+      "$ref": "#/definitions/accountDestroyed"
+    },
+    {
+      "$ref": "#/definitions/commandReceived"
+    }
   ],
   "definitions": {
     "deviceConnected": {
@@ -24,7 +40,7 @@
         "command": {
           "type": "string",
           "description": "Helps the receiving device discriminate payloads",
-          "enum": ["fxaccounts:device_connected"]
+          "const": "fxaccounts:device_connected"
         },
         "data": {
           "type": "object",
@@ -48,7 +64,7 @@
         },
         "command": {
           "type": "string",
-          "enum": ["fxaccounts:device_disconnected"]
+          "const": "fxaccounts:device_disconnected"
         },
         "data": {
           "type": "object",
@@ -72,7 +88,7 @@
         },
         "command": {
           "type": "string",
-          "enum": ["fxaccounts:profile_updated"]
+          "const": "fxaccounts:profile_updated"
         }
       },
       "additionalProperties": false
@@ -85,7 +101,7 @@
         },
         "command": {
           "type": "string",
-          "enum": ["sync:collection_changed"]
+          "const": "sync:collection_changed"
         },
         "data": {
           "type": "object",
@@ -128,7 +144,7 @@
         },
         "command": {
           "type": "string",
-          "enum": ["fxaccounts:password_changed"]
+          "const": "fxaccounts:password_changed"
         }
       },
       "additionalProperties": false
@@ -141,7 +157,7 @@
         },
         "command": {
           "type": "string",
-          "enum": ["fxaccounts:password_reset"]
+          "const": "fxaccounts:password_reset"
         }
       },
       "additionalProperties": false
@@ -154,7 +170,7 @@
         },
         "command": {
           "type": "string",
-          "enum": ["fxaccounts:account_destroyed"]
+          "const": "fxaccounts:account_destroyed"
         },
         "data": {
           "type": "object",
@@ -178,7 +194,7 @@
         },
         "command": {
           "type": "string",
-          "enum": ["fxaccounts:command_received"]
+          "const": "fxaccounts:command_received"
         },
         "data": {
           "type": "object",

packages/fxa-auth-server/package.json

@@ -46,7 +46,7 @@
     "@hapi/hoek": "^8.5.1",
     "@hapi/joi": "^15.1.1",
     "@sentry/node": "^5.17.0",
-    "ajv": "4.1.7",
+    "ajv": "^6.12.2",
     "aws-sdk": "^2.698.0",
     "base64url": "3.0.0",
     "bluebird": "^3.7.2",
@@ -81,7 +81,7 @@
     "node-uap": "git://github.com/mozilla-fxa/node-uap.git#96dc1f9f224422ec184395b6408cd1fc40ee452a",
     "node-zendesk": "^1.4.0",
     "nodemailer": "2.7.2",
-    "otplib": "11.0.1",
+    "otplib": "^11.0.1",
     "p-retry": "^4.2.0",
     "pem-jwk": "^2.0.0",
     "po2json": "0.4.5",
@@ -103,7 +103,7 @@
     "@types/chai": "^4.2.4",
     "@types/convict": "^5.2.1",
     "@types/hapi__hapi": "^19.0.3",
-    "@types/ioredis": "^4.14.8",
+    "@types/ioredis": "^4.16.7",
     "@types/joi": "^14.3.3",
     "@types/jsonwebtoken": "^8.3.5",
     "@types/jws": "^3.2.0",
@@ -153,6 +153,6 @@
     "through": "2.3.8",
     "ts-node": "^8.10.1",
     "typescript": "3.8.3",
-    "ws": "5.2.2"
+    "ws": "^6.2.1"
   }
 }

packages/fxa-content-server/package.json

@@ -47,7 +47,7 @@
     "backbone.cocktail": "0.5.9",
     "base32-decode": "1.0.0",
     "base64url": "3.0.0",
-    "body-parser": "1.18.2",
+    "body-parser": "^1.19.0",
     "cache-loader": "^3.0.1",
     "chosen-js": "git://github.com/mozilla-fxa/chosen.git#3bea55b356c249ae82980c04f67ccc98ff3b28b0",
     "connect-cachify": "0.0.17",
@@ -59,7 +59,7 @@
     "css-loader": "1.0.0",
     "duration-js": "3.6.0",
     "expose-loader": "0.7.5",
-    "express": "4.16.2",
+    "express": "^4.17.1",
     "extract-loader": "2.0.1",
     "fast-text-encoding": "^1.0.1",
     "file-loader": "^4.3.0",
@@ -75,7 +75,7 @@
     "grunt": "^1.1.0",
     "grunt-babel": "6.0.0",
     "grunt-cdn": "0.6.5",
-    "grunt-contrib-clean": "1.1.0",
+    "grunt-contrib-clean": "^2.0.0",
     "grunt-contrib-concat": "1.0.1",
     "grunt-contrib-copy": "1.0.0",
     "grunt-contrib-cssmin": "3.0.0",
@@ -88,7 +88,7 @@
     "grunt-usemin": "3.1.1",
     "grunt-z-schema": "0.1.0",
     "handlebars": "^4.5.2",
-    "helmet": "3.21.1",
+    "helmet": "^3.23.3",
     "hot-shots": "^7.6.0",
     "http-proxy-middleware": "^1.0.3",
     "i18n-abide": "0.0.26",
@@ -135,7 +135,7 @@
   },
   "devDependencies": {
     "@babel/cli": "7.7.4",
-    "@testing-library/react": "^8.0.4",
+    "@testing-library/react": "^9.5.0",
     "@types/backbone": "^1.4.1",
     "@types/sinon-chai": "3.2.4",
     "@types/sinon-express-mock": "1.3.8",
@@ -158,7 +158,7 @@
     "install": "0.12.1",
     "intern": "^4.5.0",
     "jsqr": "1.2.0",
-    "otplib": "7.1.0",
+    "otplib": "^11.0.1",
     "pm2": "^4.2.3",
     "prettier": "^2.0.5",
     "proxyquire": "^2.1.3",

packages/fxa-customs-server/package.json

@@ -28,12 +28,12 @@
     "@sentry/node": "^5.17.0",
     "bl": "1.1.2",
     "bluebird": "^3.7.2",
-    "bunyan": "1.8.0",
+    "bunyan": "^1.8.12",
     "convict": "^6.0.0",
     "convict-format-with-moment": "^6.0.0",
     "convict-format-with-validator": "^6.0.0",
     "deep-equal": "1.0.1",
-    "ip": "1.1.3",
+    "ip": "^1.1.5",
     "ip-reputation-js-client": "6.0.0",
     "lodash.isequal": "4.5.0",
     "lodash.merge": "4.6.2",

packages/fxa-dev-launcher/package.json

@@ -15,7 +15,7 @@
   "author": "Mozilla (https://mozilla.org/)",
   "license": "MPL-2.0",
   "dependencies": {
-    "chalk": "^1.1.3",
+    "chalk": "^2.4.2",
     "foxfire": "^2.0.0"
   },
   "devDependencies": {

packages/fxa-event-broker/package.json

@@ -58,7 +58,7 @@
     "@types/mocha": "^7.0.2",
     "@types/node": "^13.9.0",
     "@types/request-promise-native": "^1.0.17",
-    "@types/sinon": "^7.5.2",
+    "@types/sinon": "^9.0.4",
     "@types/uuid": "^7.0.0",
     "audit-filter": "^0.5.0",
     "chai": "^4.2.0",

packages/fxa-graphql-api/package.json

@@ -49,7 +49,7 @@
     "objection": "^2.1.3",
     "reflect-metadata": "^0.1.13",
     "superagent": "^5.2.2",
-    "tslib": "^2.0.0",
+    "tslib": "1.12.0",
     "type-graphql": "^0.17.6",
     "typedi": "^0.8.0"
   },
@@ -61,11 +61,11 @@
     "@types/get-stream": "3.0.2",
     "@types/graphql": "^14.5.0",
     "@types/graphql-upload": "8.0.3",
-    "@types/ioredis": "^4.16.2",
+    "@types/ioredis": "^4.16.7",
     "@types/mocha": "^7.0.2",
     "@types/node": "^12.x",
     "@types/proxyquire": "^1.3.28",
-    "@types/sinon": "^9.0.0",
+    "@types/sinon": "^9.0.4",
     "@types/superagent": "4.1.7",
     "@types/supertest": "^2.0.9",
     "@types/yargs": "^15.0.5",

packages/fxa-js-client/package.json

@@ -51,7 +51,7 @@
     "http-proxy": "^1.18.1",
     "load-grunt-tasks": "^5.1.0",
     "mocha": "^7.1.2",
-    "otplib": "7.1.0",
+    "otplib": "^11.0.1",
     "prettier": "^2.0.5",
     "sinon": "^9.0.2",
     "webpack": "^4.41.3"

packages/fxa-metrics-processor/package.json

@@ -30,7 +30,7 @@
     "@sentry/integrations": "^5.17.0",
     "@sentry/node": "^5.17.0",
     "@types/convict": "^5.2.1",
-    "ajv": "^6.12.0",
+    "ajv": "^6.12.2",
     "convict": "^6.0.0",
     "convict-format-with-moment": "^6.0.0",
     "convict-format-with-validator": "^6.0.0",
@@ -43,7 +43,7 @@
     "@types/chai": "^4.2.11",
     "@types/mocha": "^7.0.2",
     "@types/node": "^12.12.7",
-    "@types/sinon": "^9.0.0",
+    "@types/sinon": "^9.0.4",
     "audit-filter": "^0.5.0",
     "chai": "^4.2.0",
     "eslint": "^6.8.0",

packages/fxa-payments-server/package.json

@@ -40,13 +40,13 @@
     "@fluent/bundle": "^0.15.1",
     "@fluent/langneg": "^0.4.0",
     "@fluent/react": "^0.11.0",
-    "@rescripts/cli": "0.0.14",
+    "@rescripts/cli": "~0.0.14",
     "@storybook/addon-actions": "^5.3.19",
     "@storybook/addon-links": "^5.3.19",
     "@storybook/addons": "^5.3.19",
     "@storybook/react": "^5.3.19",
-    "@testing-library/jest-dom": "^4.2.4",
-    "@testing-library/react": "^9.3.2",
+    "@testing-library/jest-dom": "^5.11.0",
+    "@testing-library/react": "^9.5.0",
     "@types/classnames": "^2.2.9",
     "@types/jest": "^24.9.1",
     "@types/jsdom": "^12.2.4",
@@ -55,16 +55,16 @@
     "@types/react-dom": "^16.9.4",
     "@types/react-redux": "^7.1.5",
     "@types/react-router": "^5.1.3",
-    "@types/react-router-dom": "^4.3.3",
+    "@types/react-router-dom": "^5.1.5",
     "@types/redux-actions": "^2.6.0",
-    "@types/sinon": "^7.5.0",
+    "@types/sinon": "^9.0.4",
     "@types/storybook__addon-actions": "^3.4.2",
     "@types/storybook__addon-links": "^3.3.5",
     "@types/storybook__react": "^4.0.1",
     "@types/uuid": "^7.0.2",
-    "@types/webpack": "4.41.13",
-    "@typescript-eslint/eslint-plugin": "^2.33.0",
-    "@typescript-eslint/parser": "^2.33.0",
+    "@types/webpack": "4.41.16",
+    "@typescript-eslint/eslint-plugin": "2.33.0",
+    "@typescript-eslint/parser": "2.33.0",
     "async-wait-until": "^1.2.4",
     "audit-filter": "^0.5.0",
     "babel-eslint": "^10.1.0",
@@ -74,7 +74,7 @@
     "eslint": "^6.8.0",
     "eslint-plugin-fxa": "^2.0.2",
     "eslint-plugin-jest": "^23.13.2",
-    "eslint-plugin-react": "^7.17.0",
+    "eslint-plugin-react": "7.19.0",
     "express-http-proxy": "^1.6.0",
     "fetch-mock": "^8.1.0",
     "handlebars": "^4.5.3",
@@ -87,7 +87,7 @@
     "prettier": "^2.0.5",
     "redux-devtools-extension": "^2.13.8",
     "sinon": "^9.0.2",
-    "supertest": "4.0.2",
+    "supertest": "^4.0.2",
     "ts-jest": "^24.3.0",
     "ts-node": "^8.10.1",
     "typescript": "3.8.3",
@@ -98,7 +98,7 @@
     "@sentry/browser": "^5.17.0",
     "@sentry/node": "^5.17.0",
     "@types/fluent__react": "^0.10.0",
-    "@types/nock": "^10.0.1",
+    "@types/nock": "^11.1.0",
     "@types/react-document-title": "^2.0.3",
     "@types/react-stripe-elements": "^1.3.5",
     "@types/react-transition-group": "^4.2.3",
@@ -109,13 +109,13 @@
     "convict-format-with-validator": "^6.0.0",
     "dayjs": "^1.8.17",
     "eslint-plugin-jest": "^23.13.2",
-    "express": "^4.16.4",
+    "express": "^4.17.1",
     "fxa-content-server": "workspace:*",
     "fxa-geodb": "workspace:*",
     "fxa-react": "workspace:*",
     "fxa-settings": "workspace:*",
     "fxa-shared": "workspace:*",
-    "helmet": "3.21.1",
+    "helmet": "^3.23.3",
     "hot-shots": "^7.6.0",
     "intl-pluralrules": "^1.1.0",
     "joi": "^14.3.1",

packages/fxa-payments-server/tsconfig.json

@@ -3,7 +3,8 @@
   "compilerOptions": {
     "noEmit": true,
     "types": [
-      "jest"
+      "jest",
+      "@testing-library/jest-dom"
     ],
     "lib": [
       "dom",

packages/fxa-react/package.json

@@ -42,11 +42,11 @@
     "@storybook/addons": "^5.3.19",
     "@storybook/react": "^5.3.19",
     "@testing-library/dom": "^6.15.0",
-    "@testing-library/jest-dom": "^5.5.0",
-    "@testing-library/react": "^10.0.2",
-    "@testing-library/user-event": "^10.0.2",
+    "@testing-library/jest-dom": "^5.11.0",
+    "@testing-library/react": "^9.5.0",
+    "@testing-library/user-event": "^7.2.1",
     "@types/camelcase": "5.2.0",
-    "@types/file-loader": "4.2.0",
+    "@types/file-loader": "^4.2.0",
     "@types/jest": "^24.9.1",
     "@types/node": "^13.13.0",
     "@types/prettier": "2.0.1",

packages/fxa-react/tsconfig.json

@@ -3,7 +3,7 @@
   "compilerOptions": {
     "allowJs": false,
     "composite": true,
-    "types": ["jest", "testing-library__jest-dom"]
+    "types": ["jest", "@testing-library/jest-dom"]
   },
   "include": [
     "./components",

packages/fxa-settings/package.json

@@ -52,8 +52,8 @@
     "@storybook/addons": "^5.3.19",
     "@storybook/preset-create-react-app": "^2.1.1",
     "@storybook/react": "^5.3.19",
-    "@testing-library/dom": "^7.2.2",
-    "@testing-library/jest-dom": "^4.2.4",
+    "@testing-library/dom": "^6.15.0",
+    "@testing-library/jest-dom": "^5.11.0",
     "@testing-library/react": "^9.5.0",
     "@testing-library/user-event": "^7.2.1",
     "@types/babel__core": "7.1.7",
@@ -62,12 +62,12 @@
     "@types/node": "^12.12.35",
     "@types/react": "^16.9.34",
     "@types/react-dom": "^16.9.6",
-    "@types/webpack": "4.41.13",
+    "@types/webpack": "4.41.16",
     "babel-loader": "^8.0.0",
     "eslint": "^6.8.0",
     "eslint-plugin-fxa": "^2.0.2",
     "eslint-plugin-jest": "^23.13.2",
-    "eslint-plugin-react": "^7.19.0",
+    "eslint-plugin-react": "7.19.0",
     "fxa-shared": "workspace:*",
     "node-sass": "^4.14.0",
     "npm-run-all": "^4.1.5",

packages/fxa-settings/src/components/AccountDataHOC/index.test.tsx

@@ -19,6 +19,7 @@ it('renders without imploding', async () => {
   );
 
   await wait();
+
   expect(screen.getByTestId('children')).toBeInTheDocument();
 });
 
@@ -47,5 +48,6 @@ it('renders the error when loading fails', async () => {
   );
 
   await wait();
+
   expect(screen.getByTestId('error-loading-app')).toBeInTheDocument();
 });

packages/fxa-shared/package.json

@@ -36,7 +36,7 @@
     "@types/mocha": "^7.0.2",
     "@types/proxyquire": "^1.3.28",
     "@types/redis": "^2.8.16",
-    "@types/sinon": "^7.5.2",
+    "@types/sinon": "^9.0.4",
     "audit-filter": "^0.5.0",
     "chai": "^4.2.0",
     "eslint": "^6.8.0",
@@ -58,7 +58,7 @@
     "@sentry/browser": "^5.17.0",
     "@types/js-md5": "^0.4.2",
     "accept-language": "^2.0.17",
-    "ajv": "^6.12.0",
+    "ajv": "^6.12.2",
     "bluebird": "^3.7.2",
     "celebrate": "^10.0.1",
     "cors": "^2.8.5",