Merge tag 'v1.8.4' into build

* Fix a security issue with message key sharing. See https://matrix.org/blog/2021/09/13/vulnerability-disclosure-key-sharing
for details.

CHANGELOG.md

@@ -1,3 +1,10 @@
+Changes in [1.8.4](https://github.com/vector-im/element-web/releases/tag/v1.8.4) (2021-09-13)
+=================================================================================================
+
+## 🔒 SECURITY FIXES
+ * Fix a security issue with message key sharing. See https://matrix.org/blog/2021/09/13/vulnerability-disclosure-key-sharing
+   for details.
+
 Changes in [1.8.2](https://github.com/vector-im/element-desktop/releases/tag/v1.8.2) (2021-08-31)
 =================================================================================================
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "element-web",
-  "version": "1.8.2",
+  "version": "1.8.4",
   "description": "A feature-rich client for Matrix.org",
   "author": "New Vector Ltd.",
   "repository": {
@@ -61,8 +61,8 @@
     "highlight.js": "^10.5.0",
     "jsrsasign": "^10.2.0",
     "katex": "^0.12.0",
-    "matrix-js-sdk": "12.4.0",
-    "matrix-react-sdk": "3.29.0",
+    "matrix-js-sdk": "12.4.1",
+    "matrix-react-sdk": "3.29.1",
     "matrix-widget-api": "^0.1.0-beta.15",
     "prop-types": "^15.7.2",
     "react": "^17.0.2",

yarn.lock

@@ -7677,10 +7677,10 @@ mathml-tag-names@^2.1.3:
   resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3"
   integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
 
-[email protected].0:
-  version "12.4.0"
-  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-12.4.0.tgz#ff60306f9a9e39fd1ae6c7e501001f80eb779dd7"
-  integrity sha512-KamHmvNle4mkdErmNgVsGIL3n8/zgPe60DLVaEA2t4aSNwQLEmRS+oVpIgsO3ZrUivBvn4oc9sBqxP0OIl6kUg==
+[email protected].1:
+  version "12.4.1"
+  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-12.4.1.tgz#966f506b4146e4fafffa5bbe80f5c53515e1bc78"
+  integrity sha512-C9aSGX9e4GoCm0Rli+iGBXmcnRxnwETw7MvgNcSBfPaLHOMZi/wz4YOV7HEZK8R+OXuDrDYyglncWSJkkoDpAQ==
   dependencies:
     "@babel/runtime" "^7.12.5"
     another-json "^0.2.0"
@@ -7701,10 +7701,10 @@ matrix-mock-request@^1.2.3:
     bluebird "^3.5.0"
     expect "^1.20.2"
 
-[email protected].0:
-  version "3.29.0"
-  resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.29.0.tgz#ab8536fe712b156d911f1f19a89f6c8acca7eafd"
-  integrity sha512-20Acs/5rs8lhPvFcAza7bFPRZSfm8x3/KILTaQrztIMl1iCSmxLbqJNxhyRjVegLQPEXltdkI3unyKQngn5EYA==
+[email protected].1:
+  version "3.29.1"
+  resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.29.1.tgz#f01d11f46beb59308f44d525286b7d98a3fb352d"
+  integrity sha512-Cm38QrWMauEkqNj9r2LiuGedM35PuRYm/nYkXNVB5zs88jtT0XCdYpTsKsFGPlfy+b8nKX1rB/g4DVqBBQ3eaQ==
   dependencies:
     "@babel/runtime" "^7.12.5"
     "@sentry/browser" "^6.11.0"
@@ -7734,7 +7734,7 @@ [email protected]:
     katex "^0.12.0"
     linkifyjs "^2.1.9"
     lodash "^4.17.20"
-    matrix-js-sdk "12.4.0"
+    matrix-js-sdk "12.4.1"
     matrix-widget-api "^0.1.0-beta.15"
     minimist "^1.2.5"
     opus-recorder "^8.0.3"