Merge pull request #16294 from vector-im/jryans/upgrade-deps-2021-01

Upgrade deps 2021-01

babel.config.js

@@ -8,7 +8,7 @@ module.exports = {
         }],
         "@babel/preset-typescript",
         "@babel/preset-flow",
-        "@babel/preset-react"
+        "@babel/preset-react",
     ],
     "plugins": [
         ["@babel/plugin-proposal-decorators", {legacy: true}],
@@ -16,8 +16,10 @@ module.exports = {
         "@babel/plugin-proposal-numeric-separator",
         "@babel/plugin-proposal-class-properties",
         "@babel/plugin-proposal-object-rest-spread",
+        "@babel/plugin-proposal-optional-chaining",
+        "@babel/plugin-proposal-nullish-coalescing-operator",
         "@babel/plugin-transform-flow-comments",
         "@babel/plugin-syntax-dynamic-import",
-        "@babel/plugin-transform-runtime"
+        "@babel/plugin-transform-runtime",
-    ]
+    ],
 };

package.json

@@ -55,94 +55,99 @@
   "dependencies": {
     "browser-request": "^0.3.3",
     "gfm.css": "^1.1.2",
-    "highlight.js": "^10.4.1",
+    "highlight.js": "^10.5.0",
-    "jsrsasign": "^9.1.5",
+    "jsrsasign": "^10.1.5",
     "katex": "^0.12.0",
     "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
     "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop",
     "matrix-widget-api": "0.1.0-beta.11",
     "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz",
     "prop-types": "^15.7.2",
-    "react": "^16.9.0",
+    "react": "^16.14.0",
-    "react-dom": "^16.9.0",
+    "react-dom": "^16.14.0",
     "sanitize-html": "github:apostrophecms/sanitize-html#3c7f93f2058f696f5359e3e58d464161647226db",
-    "ua-parser-js": "^0.7.19",
+    "ua-parser-js": "^0.7.23",
     "url": "^0.11.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.7.5",
+    "@babel/core": "^7.12.10",
-    "@babel/plugin-proposal-class-properties": "^7.7.4",
+    "@babel/plugin-proposal-class-properties": "^7.12.1",
-    "@babel/plugin-proposal-decorators": "^7.7.4",
+    "@babel/plugin-proposal-decorators": "^7.12.12",
-    "@babel/plugin-proposal-export-default-from": "^7.7.4",
+    "@babel/plugin-proposal-export-default-from": "^7.12.1",
-    "@babel/plugin-proposal-numeric-separator": "^7.7.4",
+    "@babel/plugin-proposal-nullish-coalescing-operator": "^7.12.1",
-    "@babel/plugin-proposal-object-rest-spread": "^7.7.4",
+    "@babel/plugin-proposal-numeric-separator": "^7.12.7",
-    "@babel/plugin-syntax-dynamic-import": "^7.7.4",
+    "@babel/plugin-proposal-object-rest-spread": "^7.12.1",
-    "@babel/plugin-transform-flow-comments": "^7.7.4",
+    "@babel/plugin-proposal-optional-chaining": "^7.12.7",
-    "@babel/plugin-transform-runtime": "^7.7.6",
+    "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-    "@babel/preset-env": "^7.7.6",
+    "@babel/plugin-transform-flow-comments": "^7.12.1",
-    "@babel/preset-flow": "^7.7.4",
+    "@babel/plugin-transform-runtime": "^7.12.10",
-    "@babel/preset-react": "^7.7.4",
+    "@babel/preset-env": "^7.12.11",
-    "@babel/preset-typescript": "^7.7.4",
+    "@babel/preset-flow": "^7.12.1",
-    "@babel/register": "^7.7.4",
+    "@babel/preset-react": "^7.12.10",
-    "@babel/runtime": "^7.7.6",
+    "@babel/preset-typescript": "^7.12.7",
+    "@babel/register": "^7.12.10",
+    "@babel/runtime": "^7.12.5",
     "@types/flux": "^3.1.9",
     "@types/modernizr": "^3.5.3",
-    "@types/node": "^12.12.41",
+    "@types/node": "^14.14.22",
-    "@types/react": "16.9",
+    "@types/react": "^16.9",
-    "@types/react-dom": "^16.9.4",
+    "@types/react-dom": "^16.9.10",
-    "@types/sanitize-html": "^1.23.3",
+    "@types/sanitize-html": "^1.27.1",
-    "autoprefixer": "^9.7.3",
+    "autoprefixer": "^9.8.6",
-    "babel-eslint": "^10.0.3",
+    "babel-eslint": "^10.1.0",
-    "babel-jest": "^24.9.0",
+    "babel-jest": "^26.6.3",
-    "babel-loader": "^8.0.6",
+    "babel-loader": "^8.2.2",
     "canvas": "^2.6.1",
-    "chokidar": "^3.3.1",
+    "chokidar": "^3.5.1",
-    "concurrently": "^4.0.1",
+    "concurrently": "^5.3.0",
-    "cpx": "^1.3.2",
+    "cpx": "^1.5.0",
-    "css-loader": "^3.3.2",
+    "css-loader": "^3.6.0",
-    "eslint": "7.3.1",
+    "eslint": "7.18.0",
-    "eslint-config-matrix-org": "^0.1.2",
+    "eslint-config-matrix-org": "^0.2.0",
-    "eslint-plugin-babel": "^4.1.2",
+    "eslint-plugin-babel": "^5.3.1",
-    "eslint-plugin-flowtype": "^2.50.3",
+    "eslint-plugin-flowtype": "^5.2.0",
-    "eslint-plugin-react": "^7.11.1",
+    "eslint-plugin-react": "^7.22.0",
-    "eslint-plugin-react-hooks": "^2.2.0",
+    "eslint-plugin-react-hooks": "^4.2.0",
     "extract-text-webpack-plugin": "^4.0.0-beta.0",
-    "fake-indexeddb": "^3.0.0",
+    "fake-indexeddb": "^3.1.2",
-    "file-loader": "^5.0.2",
+    "file-loader": "^5.1.0",
     "fs-extra": "^0.30.0",
     "html-webpack-plugin": "^3.2.0",
-    "jest": "^26.5.2",
+    "jest": "^26.6.3",
     "jest-environment-jsdom-sixteen": "^1.0.3",
-    "json-loader": "^0.5.3",
+    "json-loader": "^0.5.7",
-    "loader-utils": "^1.2.3",
+    "loader-utils": "^1.4.0",
     "matrix-mock-request": "^1.2.3",
     "matrix-react-test-utils": "^0.2.2",
-    "mini-css-extract-plugin": "^0.8.0",
+    "mini-css-extract-plugin": "^0.12.0",
-    "minimist": "^1.2.0",
+    "minimist": "^1.2.5",
-    "mkdirp": "^0.5.1",
+    "mkdirp": "^1.0.4",
-    "modernizr": "^3.6.0",
+    "modernizr": "^3.11.4",
-    "node-fetch": "^2.6.0",
+    "node-fetch": "^2.6.1",
-    "optimize-css-assets-webpack-plugin": "^5.0.3",
+    "optimize-css-assets-webpack-plugin": "^5.0.4",
     "postcss-easings": "^2.0.0",
     "postcss-extend": "^1.0.5",
-    "postcss-hexrgba": "^2.0.0",
+    "postcss-hexrgba": "^2.0.1",
     "postcss-import": "^12.0.1",
     "postcss-loader": "^3.0.0",
     "postcss-mixins": "^6.2.3",
-    "postcss-nested": "^4.2.1",
+    "postcss-nested": "^4.2.3",
     "postcss-preset-env": "^6.7.0",
-    "postcss-scss": "^2.0.0",
+    "postcss-scss": "^2.1.1",
     "postcss-simple-vars": "^5.0.2",
     "postcss-strip-inline-comments": "^0.1.5",
-    "rimraf": "^2.4.3",
+    "rimraf": "^3.0.2",
     "shell-escape": "^0.2.0",
     "simple-proxy-agent": "^1.1.0",
-    "stylelint": "^12.0.1",
+    "stylelint": "^13.9.0",
-    "terser-webpack-plugin": "^2.3.0",
+    "terser-webpack-plugin": "^2.3.8",
-    "typescript": "^3.7.3",
+    "typescript": "^4.1.3",
-    "webpack": "^4.41.2",
+    "webpack": "^4.46.0",
-    "webpack-cli": "^3.3.10",
+    "webpack-cli": "^3.3.12",
-    "webpack-dev-server": "^3.9.0"
+    "webpack-dev-server": "^3.11.2"
+  },
+  "resolutions": {
+    "**/@types/react": "^16.14"
   },
   "jest": {
     "testEnvironment": "jest-environment-jsdom-sixteen",

src/vector/index.ts

@@ -150,7 +150,7 @@ async function start() {
         // error handling begins here
         // ##########################
         if (!acceptBrowser) {
-            await new Promise(resolve => {
+            await new Promise<void>(resolve => {
                 console.error("Browser is missing required features.");
                 // take to a different landing page to AWOOOOOGA at the user
                 showIncompatibleBrowser(() => {