From 21cadb8a3b9f20d6c0eab5d970a0b5156ba11969 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Wed, 13 Jan 2021 13:10:30 +0000
Subject: [PATCH] Upgrade matrix-react-sdk to 3.12.0-rc.1

---
 package.json |  2 +-
 yarn.lock    | 23 +++++------------------
 2 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/package.json b/package.json
index 67688f3409..c8c163f505 100644
--- a/package.json
+++ b/package.json
@@ -59,7 +59,7 @@
     "jsrsasign": "^9.1.5",
     "katex": "^0.12.0",
     "matrix-js-sdk": "9.5.0-rc.1",
-    "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop",
+    "matrix-react-sdk": "3.12.0-rc.1",
     "matrix-widget-api": "^0.1.0-beta.10",
     "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz",
     "prop-types": "^15.7.2",
diff --git a/yarn.lock b/yarn.lock
index e937eaa9c8..e01aad70f1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7914,20 +7914,6 @@ matrix-js-sdk@9.5.0-rc.1:
     request "^2.88.2"
     unhomoglyph "^1.0.6"
 
-"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
-  version "9.4.1"
-  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/1717fcf499b943517213f2a81c41ffec0b50748e"
-  dependencies:
-    "@babel/runtime" "^7.12.5"
-    another-json "^0.2.0"
-    browser-request "^0.3.3"
-    bs58 "^4.0.1"
-    content-type "^1.0.4"
-    loglevel "^1.7.1"
-    qs "^6.9.4"
-    request "^2.88.2"
-    unhomoglyph "^1.0.6"
-
 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"
@@ -7936,9 +7922,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 "3.11.0"
-  resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/e551e7ac40a66954e1170528d80b97c34f08342e"
+matrix-react-sdk@3.12.0-rc.1:
+  version "3.12.0-rc.1"
+  resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.12.0-rc.1.tgz#e550c228c2b1aac0625c44a3afe95bf04a0023bc"
+  integrity sha512-U1q5Zk5aIo+wWN452zinzHnM/9DDjlhwGTRkaErA1Za0M1DHcTcCEEdLuU68SBBpgVf8APMgoQ8GzmfhQKi0Fg==
   dependencies:
     "@babel/runtime" "^7.10.5"
     await-lock "^2.0.1"
@@ -7967,7 +7954,7 @@ matrix-mock-request@^1.2.3:
     katex "^0.12.0"
     linkifyjs "^2.1.9"
     lodash "^4.17.19"
-    matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop"
+    matrix-js-sdk "9.5.0-rc.1"
     matrix-widget-api "^0.1.0-beta.10"
     minimist "^1.2.5"
     pako "^1.0.11"