From 22ace3c5978320c589587de0e6e1c3b04c264e34 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Mon, 31 Jan 2022 15:08:03 +0000
Subject: [PATCH] Reset matrix-js-sdk back to develop branch
---
package.json | 2 +-
yarn.lock | 18 +++++++++++++++++-
2 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/package.json b/package.json
index 28c07776e4..fc579c65e8 100644
--- a/package.json
+++ b/package.json
@@ -60,7 +60,7 @@
"gfm.css": "^1.1.2",
"jsrsasign": "^10.2.0",
"katex": "^0.12.0",
- "matrix-js-sdk": "15.5.0",
+ "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
"matrix-react-sdk": "3.39.0",
"matrix-widget-api": "^0.1.0-beta.18",
"prop-types": "^15.7.2",
diff --git a/yarn.lock b/yarn.lock
index 8c4e17609b..123f1ccd6d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8047,7 +8047,7 @@ 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-analytics-events@github:matrix-org/matrix-analytics-events#1eab4356548c97722a183912fda1ceabbe8cc7c1":
+"matrix-analytics-events@github:matrix-org/matrix-analytics-events.git#1eab4356548c97722a183912fda1ceabbe8cc7c1":
version "0.0.1"
resolved "https://codeload.github.com/matrix-org/matrix-analytics-events/tar.gz/1eab4356548c97722a183912fda1ceabbe8cc7c1"
@@ -8073,6 +8073,22 @@ matrix-js-sdk@15.5.0:
request "^2.88.2"
unhomoglyph "^1.0.6"
+"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
+ version "15.5.0"
+ resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/cf8d2bf6efc5c6cebd87926c1c8041363c0ff350"
+ 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"
+ matrix-events-sdk "^0.0.1-beta.6"
+ p-retry "^4.5.0"
+ qs "^6.9.6"
+ 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"