From 48018b33cc3be0bd641838bb507f05fc7c82c2eb Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Wed, 8 Apr 2020 14:06:02 +0100
Subject: [PATCH] Upgrade matrix-react-sdk to 2.4.0-rc.1

---
 package.json |  2 +-
 yarn.lock    | 43 +++++++++++++++----------------------------
 2 files changed, 16 insertions(+), 29 deletions(-)

diff --git a/package.json b/package.json
index 12a66aeccf..7f6d6618f2 100644
--- a/package.json
+++ b/package.json
@@ -69,7 +69,7 @@
     "gfm.css": "^1.1.2",
     "highlight.js": "^9.13.1",
     "matrix-js-sdk": "5.3.0-rc.1",
-    "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop",
+    "matrix-react-sdk": "2.4.0-rc.1",
     "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz",
     "postcss-easings": "^2.0.0",
     "prop-types": "^15.7.2",
diff --git a/yarn.lock b/yarn.lock
index 4b86f741c2..02003bdf6d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4032,15 +4032,15 @@ emoji-regex@^8.0.0:
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
   integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
 
-emojibase-data@^4.0.2:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/emojibase-data/-/emojibase-data-4.2.1.tgz#3d1f0c69ddbb2ca7b7014f5e34654190802a40df"
-  integrity sha512-O0vxoPMgVkRq/uII/gdAjz9RwNv6ClJrd3J9QCCRC4btZRmeut/qohC/Fi+NNXUcjY08RWNTvxSnq/vij8hvrw==
+emojibase-data@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/emojibase-data/-/emojibase-data-5.0.1.tgz#ce6fe36b4affd3578e0be8779211018a2fdae960"
+  integrity sha512-rYWlogJ2q5P78U8Xx1vhsXHcYKu1wFnr7+o6z9QHssZ1SsJLTCkJINZIPHRFWuDreAUK457TkqHpdOXElu0fzA==
 
-emojibase-regex@^3.0.0:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/emojibase-regex/-/emojibase-regex-3.2.1.tgz#122935958c9a49c96bb29ac69ccbbac0b2e7022d"
-  integrity sha512-VAX2Rc2U/alu5q6P2cET2alzC63o1Uarm6Ea/b3ab+KOzxZT4JKmB0tCU1sTZvfNKa16KMLCK2k7hJBHJq4vWQ==
+emojibase-regex@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/emojibase-regex/-/emojibase-regex-4.0.1.tgz#a2cd4bbb42825422da9ec72f15e970bc2c90b46a"
+  integrity sha512-S42UHkFfz15i4NNz+wi9iMKFo+B6Kalc6PJLpYX0BUANViXw4vSyYZMFdBGRLduSabWHuEcTLZl9xOa2YP3eJw==
 
 emojis-list@^2.0.0:
   version "2.1.0"
@@ -7470,20 +7470,6 @@ matrix-js-sdk@5.3.0-rc.1:
     request "^2.88.0"
     unhomoglyph "^1.0.2"
 
-"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
-  version "5.2.0"
-  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/934ed37fdc90948273d7da3ec9f8728195c78a63"
-  dependencies:
-    "@babel/runtime" "^7.8.3"
-    another-json "^0.2.0"
-    browser-request "^0.3.3"
-    bs58 "^4.0.1"
-    content-type "^1.0.2"
-    loglevel "^1.6.4"
-    qs "^6.5.2"
-    request "^2.88.0"
-    unhomoglyph "^1.0.2"
-
 matrix-mock-request@^1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/matrix-mock-request/-/matrix-mock-request-1.2.3.tgz#56b15d86e2601a9b48a854844396d18caab649c8"
@@ -7492,9 +7478,10 @@ matrix-mock-request@^1.2.3:
     bluebird "^3.5.0"
     expect "^1.20.2"
 
-"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop":
-  version "2.3.1"
-  resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/84da483264c0ee7844415c4d1e9eb9dac161a9d4"
+matrix-react-sdk@2.4.0-rc.1:
+  version "2.4.0-rc.1"
+  resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-2.4.0-rc.1.tgz#df3aa2e0b80d74b0415558bd8d5dc56541d81660"
+  integrity sha512-/7xzNmH6TrLUOFPffhdAi78WHGjxn43Ggb8oRsNGV76yZ7g55/AO7uy4PvOLgAYBreuKowxjVmzboEIaHuP26g==
   dependencies:
     "@babel/runtime" "^7.8.3"
     blueimp-canvas-to-blob "^3.5.0"
@@ -7506,8 +7493,8 @@ matrix-mock-request@^1.2.3:
     create-react-class "^15.6.0"
     diff-dom "^4.1.3"
     diff-match-patch "^1.0.4"
-    emojibase-data "^4.0.2"
-    emojibase-regex "^3.0.0"
+    emojibase-data "^5.0.1"
+    emojibase-regex "^4.0.1"
     escape-html "^1.0.3"
     file-saver "^1.3.3"
     filesize "3.5.6"
@@ -7521,7 +7508,7 @@ matrix-mock-request@^1.2.3:
     is-ip "^2.0.0"
     linkifyjs "^2.1.6"
     lodash "^4.17.14"
-    matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop"
+    matrix-js-sdk "5.3.0-rc.1"
     minimist "^1.2.0"
     pako "^1.0.5"
     png-chunks-extract "^1.0.0"