From d4638f88259765d654a8eb816ace8af463bb4b3a Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Wed, 14 Jul 2021 17:20:15 +0100
Subject: [PATCH] Bump to RC versions of js-sdk and react-sdk

---
 package.json |  4 ++--
 yarn.lock    | 32 +++++++++++++++++++++++---------
 2 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/package.json b/package.json
index e9e5660b79..55a896dbd9 100644
--- a/package.json
+++ b/package.json
@@ -60,8 +60,8 @@
     "highlight.js": "^10.5.0",
     "jsrsasign": "^10.2.0",
     "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-js-sdk": "12.1.0-rc.1",
+    "matrix-react-sdk": "3.26.0-rc.1",
     "matrix-widget-api": "^0.1.0-beta.15",
     "prop-types": "^15.7.2",
     "react": "^17.0.2",
diff --git a/yarn.lock b/yarn.lock
index 3e5cba0398..6f5a18b1bf 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2407,6 +2407,11 @@ bluebird@^3.5.0, bluebird@^3.5.5:
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
   integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
 
+blurhash@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/blurhash/-/blurhash-1.1.3.tgz#dc325af7da836d07a0861d830bdd63694382483e"
+  integrity sha512-yUhPJvXexbqbyijCIE/T2NCXcj9iNPhWmOKbPTuR/cm7Q5snXYIfnVnz6m7MWOXxODMz/Cr3UcVkRdHiuDVRDw==
+
 bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.11.9:
   version "4.12.0"
   resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88"
@@ -7274,9 +7279,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==
 
-matrix-js-sdk@12.0.0, "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
-  version "12.0.0"
-  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/284e2bb911d2dffeff4c819436d1fde20d56646b"
+matrix-js-sdk@12.1.0-rc.1:
+  version "12.1.0-rc.1"
+  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-12.1.0-rc.1.tgz#4bc4e2342525c622e1a87b264e6f55560632b90c"
+  integrity sha512-F7d1e1Bm8zZqXkTKIyNeT4uA85u65nfrW2b8NwDMV+gtKNF0DOzUfUzOGD7CnjJKpyKNTQluUiwka+bXiGAVkw==
   dependencies:
     "@babel/runtime" "^7.12.5"
     another-json "^0.2.0"
@@ -7297,12 +7303,14 @@ 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.24.0"
-  resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/e290fdaabcb0259b26412b34b3ec4cd11e76164a"
+matrix-react-sdk@3.26.0-rc.1:
+  version "3.26.0-rc.1"
+  resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.26.0-rc.1.tgz#d4f14eeba572eafb03fa3d2904d56029e3a3f241"
+  integrity sha512-S/FGXAPJpaY/EUkQS27FhXKQ4NPR2YBSLYEyxeGywHzQlkvieYzK9eNPpLOrXVMCYbCm/SLV4r3nwWV3tJ5m7w==
   dependencies:
     "@babel/runtime" "^7.12.5"
     await-lock "^2.1.0"
+    blurhash "^1.1.3"
     browser-encrypt-attachment "^0.3.0"
     browser-request "^0.3.3"
     cheerio "^1.0.0-rc.9"
@@ -7326,8 +7334,8 @@ matrix-mock-request@^1.2.3:
     katex "^0.12.0"
     linkifyjs "^2.1.9"
     lodash "^4.17.20"
-    matrix-js-sdk "12.0.0"
-    matrix-widget-api "^0.1.0-beta.14"
+    matrix-js-sdk "12.1.0-rc.1"
+    matrix-widget-api "^0.1.0-beta.15"
     minimist "^1.2.5"
     opus-recorder "^8.0.3"
     pako "^2.0.3"
@@ -7337,7 +7345,8 @@ matrix-mock-request@^1.2.3:
     qrcode "^1.4.4"
     re-resizable "^6.9.0"
     react "^17.0.2"
-    react-beautiful-dnd "^4.0.1"
+    react-beautiful-dnd "^13.1.0"
+    react-blurhash "^0.1.3"
     react-dom "^17.0.2"
     react-focus-lock "^2.5.0"
     react-transition-group "^4.4.1"
@@ -9559,6 +9568,11 @@ react-beautiful-dnd@^13.1.0:
     redux "^4.0.4"
     use-memo-one "^1.1.1"
 
+react-blurhash@^0.1.3:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/react-blurhash/-/react-blurhash-0.1.3.tgz#735f28f8f07fb358d7efe7e7e6dc65a7272bf89e"
+  integrity sha512-Q9lqbXg92NU6/2DoIl/cBM8YWL+Z4X66OiG4aT9ozOgjBwx104LHFCH5stf6aF+s0Q9Wf310Ul+dG+VXJltmPg==
+
 react-clientside-effect@^1.2.2:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/react-clientside-effect/-/react-clientside-effect-1.2.3.tgz#95c95f520addfb71743608b990bfe01eb002012b"