From 7036600fa7734601cea0bea52a2d5cedff0d31d5 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Tue, 11 Jan 2022 15:09:18 +0000
Subject: [PATCH] Upgrade matrix-react-sdk to 3.38.0-rc.1
---
package.json | 2 +-
yarn.lock | 67 +++++++---------------------------------------------
2 files changed, 9 insertions(+), 60 deletions(-)
diff --git a/package.json b/package.json
index 1b2c6be1ef..244cd1056b 100644
--- a/package.json
+++ b/package.json
@@ -61,7 +61,7 @@
"jsrsasign": "^10.2.0",
"katex": "^0.12.0",
"matrix-js-sdk": "15.4.0-rc.1",
- "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop",
+ "matrix-react-sdk": "3.38.0-rc.1",
"matrix-widget-api": "^0.1.0-beta.18",
"prop-types": "^15.7.2",
"react": "17.0.2",
diff --git a/yarn.lock b/yarn.lock
index 714b3b4e75..03922ca366 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4738,15 +4738,6 @@ eslint-import-resolver-node@^0.3.6:
debug "^3.2.7"
resolve "^1.20.0"
-eslint-module-utils@^2.7.1:
- version "2.7.1"
- resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.1.tgz#b435001c9f8dd4ab7f6d0efcae4b9696d4c24b7c"
- integrity sha512-fjoetBXQZq2tSTWZ9yWVl2KuFrTZZH3V+9iD1V1RfpDgxzJR+mPd/KZmMiA8gbPqdBzpNiEHOuT7IYEWxrH0zQ==
- dependencies:
- debug "^3.2.7"
- find-up "^2.1.0"
- pkg-dir "^2.0.0"
-
eslint-module-utils@^2.7.2:
version "2.7.2"
resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.2.tgz#1d0aa455dcf41052339b63cada8ab5fd57577129"
@@ -4755,25 +4746,6 @@ eslint-module-utils@^2.7.2:
debug "^3.2.7"
find-up "^2.1.0"
-eslint-plugin-import@^2.25.2:
- version "2.25.3"
- resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.25.3.tgz#a554b5f66e08fb4f6dc99221866e57cfff824766"
- integrity sha512-RzAVbby+72IB3iOEL8clzPLzL3wpDrlwjsTBAQXgyp5SeTqqY+0bFubwuo+y/HLhNZcXV4XqTBO4LGsfyHIDXg==
- dependencies:
- array-includes "^3.1.4"
- array.prototype.flat "^1.2.5"
- debug "^2.6.9"
- doctrine "^2.1.0"
- eslint-import-resolver-node "^0.3.6"
- eslint-module-utils "^2.7.1"
- has "^1.0.3"
- is-core-module "^2.8.0"
- is-glob "^4.0.3"
- minimatch "^3.0.4"
- object.values "^1.1.5"
- resolve "^1.20.0"
- tsconfig-paths "^3.11.0"
-
eslint-plugin-import@^2.25.4:
version "2.25.4"
resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.25.4.tgz#322f3f916a4e9e991ac7af32032c25ce313209f1"
@@ -8069,9 +8041,9 @@ 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@https://github.com/matrix-org/matrix-analytics-events.git#1eab4356548c97722a183912fda1ceabbe8cc7c1":
+"matrix-analytics-events@git+https://github.com/matrix-org/matrix-analytics-events.git#1eab4356548c97722a183912fda1ceabbe8cc7c1":
version "0.0.1"
- resolved "https://github.com/matrix-org/matrix-analytics-events.git#1eab4356548c97722a183912fda1ceabbe8cc7c1"
+ resolved "git+https://github.com/matrix-org/matrix-analytics-events.git#1eab4356548c97722a183912fda1ceabbe8cc7c1"
matrix-js-sdk@15.4.0-rc.1:
version "15.4.0-rc.1"
@@ -8089,22 +8061,6 @@ matrix-js-sdk@15.4.0-rc.1:
request "^2.88.2"
unhomoglyph "^1.0.6"
-"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
- version "15.3.0"
- resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/f780e1dbc3918d3665f3b7f1214562f598486670"
- 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"
- eslint-plugin-import "^2.25.2"
- loglevel "^1.7.1"
- 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"
@@ -8113,9 +8069,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.37.0"
- resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/2330292c24f53138f2ce1db42be45355ce6c3fdf"
+matrix-react-sdk@3.38.0-rc.1:
+ version "3.38.0-rc.1"
+ resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.38.0-rc.1.tgz#e3f9bedfcf25c7184fe174de901b864578146b3b"
+ integrity sha512-8BgMDT0vJ+vpaLwE/GPXm3A88gOPnvSrQuSC8zLD/34KeTyLi2q5vppv65f/oTPOSxrs2DSSwbJRLDKZNRW2ig==
dependencies:
"@babel/runtime" "^7.12.5"
"@sentry/browser" "^6.11.0"
@@ -8134,7 +8091,6 @@ matrix-mock-request@^1.2.3:
emojibase-data "^6.2.0"
emojibase-regex "^5.1.3"
escape-html "^1.0.3"
- eslint-plugin-import "^2.25.2"
file-saver "^2.0.5"
filesize "6.1.0"
flux "2.1.1"
@@ -8150,7 +8106,7 @@ matrix-mock-request@^1.2.3:
lodash "^4.17.20"
maplibre-gl "^1.15.2"
matrix-analytics-events "https://github.com/matrix-org/matrix-analytics-events.git#1eab4356548c97722a183912fda1ceabbe8cc7c1"
- matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop"
+ matrix-js-sdk "15.4.0-rc.1"
matrix-widget-api "^0.1.0-beta.18"
minimist "^1.2.5"
opus-recorder "^8.0.3"
@@ -9391,13 +9347,6 @@ pirates@^4.0.0, pirates@^4.0.1:
resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.4.tgz#07df81e61028e402735cdd49db701e4885b4e6e6"
integrity sha512-ZIrVPH+A52Dw84R0L3/VS9Op04PuQ2SEoJL6bkshmiTic/HldyW9Tf7oH5mhJZBK7NmDx27vSMrYEXPXclpDKw==
-pkg-dir@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b"
- integrity sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=
- dependencies:
- find-up "^2.1.0"
-
pkg-dir@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3"
@@ -12262,7 +12211,7 @@ trough@^1.0.0:
resolved "https://registry.yarnpkg.com/trough/-/trough-1.0.5.tgz#b8b639cefad7d0bb2abd37d433ff8293efa5f406"
integrity sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA==
-tsconfig-paths@^3.11.0, tsconfig-paths@^3.12.0:
+tsconfig-paths@^3.12.0:
version "3.12.0"
resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.12.0.tgz#19769aca6ee8f6a1a341e38c8fa45dd9fb18899b"
integrity sha512-e5adrnOYT6zqVnWqZu7i/BQ3BnhzvGbjEjejFXO20lKIKpwTaupkCPgEfv4GZK1IBciJUEhYs3J3p75FdaTFVg==