Merge branch 'develop' of github.com:vector-im/element-desktop into t3chguy/types

# Conflicts:
#	yarn.lock

package.json

@@ -61,6 +61,7 @@
     "@types/jest": "^29.0.0",
     "@types/minimist": "^1.2.1",
     "@types/mkdirp": "^1.0.2",
+    "@types/node": "^16",
     "@types/pacote": "^11.1.1",
     "@types/rimraf": "^3.0.2",
     "@typescript-eslint/eslint-plugin": "^5.42.0",
@@ -101,9 +102,6 @@
     "matrix-seshat": "^2.3.3",
     "keytar": "^7.9.0"
   },
-  "resolutions": {
-    "@types/node": "16.11.38"
-  },
   "build": {
     "appId": "im.riot.app",
     "asarUnpack": "**/*.node",

yarn.lock

@@ -2709,10 +2709,15 @@
     "@types/node" "*"
     form-data "^3.0.0"
 
-"@types/node@*", "@types/node@16.11.38", "@types/node@^16.11.26", "@types/node@^17.0.36":
-  version "16.11.38"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.38.tgz#be0edd097b23eace6c471c525a74b3f98803017f"
-  integrity sha512-hjO/0K140An3GWDw2HJfq7gko3wWeznbjXgg+rzPdVzhe198hp4x2i1dgveAOEiFKd8sOilAxzoSJiVv5P/CUg==
+"@types/node@*", "@types/node@^16.11.26", "@types/node@^16":
+  version "16.18.4"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.4.tgz#712ba61b4caf091fc6490301b1888356638c17bd"
+  integrity sha512-9qGjJ5GyShZjUfx2ArBIGM+xExdfLvvaCyQR0t6yRXKPcWCVYF/WemtX/uIU3r7FYECXRXkIiw2Vnhn6y8d+pw==
+
+"@types/node@^17.0.36":
+  version "17.0.45"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.45.tgz#2c0fafd78705e7a18b7906b5201a522719dc5190"
+  integrity sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==
 
 "@types/normalize-package-data@^2.4.0":
   version "2.4.1"