From 50ca01f8d0202893185c480a5167b39c60017eab Mon Sep 17 00:00:00 2001 From: ElementRobot Date: Tue, 1 Aug 2023 12:52:44 +0100 Subject: [PATCH] Reset matrix-react-sdk back to develop branch --- package.json | 2 +- yarn.lock | 29 +++++++++++++++++++++++------ 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index 0298675395..7824ea7868 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "jsrsasign": "^10.5.25", "katex": "^0.16.0", "matrix-js-sdk": "27.1.0", - "matrix-react-sdk": "3.77.0", + "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", "matrix-widget-api": "^1.3.1", "react": "17.0.2", "react-dom": "17.0.2", diff --git a/yarn.lock b/yarn.lock index 72e64b253e..1dccbdc574 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1634,7 +1634,7 @@ resolved "https://registry.yarnpkg.com/@matrix-org/analytics-events/-/analytics-events-0.6.0.tgz#6552882f94d026f13da25d49e2a208287521c275" integrity sha512-bTvNpp8LkC/2sItHABd1vGHdB8iclAcdlIYrL0Cn6qT+aohpdjb1wZ0dhUcx3NK5Q98IduI43RVH33V4Li/X0A== -"@matrix-org/matrix-sdk-crypto-wasm@^1.2.0": +"@matrix-org/matrix-sdk-crypto-wasm@^1.1.0", "@matrix-org/matrix-sdk-crypto-wasm@^1.2.0": version "1.2.0" resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-wasm/-/matrix-sdk-crypto-wasm-1.2.0.tgz#115cd21cb2bba3c8166cf09e7d61da0902aa8973" integrity sha512-vmpbtXYFzfBSFjeAx/PNRjy7zyH+Xx2HVXNKdApgo3+hSALewcXwdOTJy5pKq+poumM2TjjKDhG2s6/zSDNUYg== @@ -1646,7 +1646,6 @@ "@matrix-org/olm@https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.14.tgz": version "3.2.14" - uid acd96c00a881d0f462e1f97a56c73742c8dbc984 resolved "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.14.tgz#acd96c00a881d0f462e1f97a56c73742c8dbc984" "@matrix-org/react-sdk-module-api@^1.0.0": @@ -8399,6 +8398,25 @@ matrix-js-sdk@27.1.0: jwt-decode "^3.1.2" loglevel "^1.7.1" matrix-events-sdk "0.0.1" + matrix-widget-api "^1.3.1" + oidc-client-ts "^2.2.4" + p-retry "4" + sdp-transform "^2.14.1" + unhomoglyph "^1.0.6" + uuid "9" + +"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": + version "27.1.0" + resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/5a782b7377b4ea2dd9e435be84ea97037e9a7421" + dependencies: + "@babel/runtime" "^7.12.5" + "@matrix-org/matrix-sdk-crypto-wasm" "^1.2.0" + another-json "^0.2.0" + bs58 "^5.0.0" + content-type "^1.0.4" + jwt-decode "^3.1.2" + loglevel "^1.7.1" + matrix-events-sdk "0.0.1" matrix-widget-api "^1.5.0" oidc-client-ts "^2.2.4" p-retry "4" @@ -8413,10 +8431,9 @@ matrix-mock-request@^2.5.0: dependencies: expect "^28.1.0" -matrix-react-sdk@3.77.0: +"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop": version "3.77.0" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.77.0.tgz#357eaec96b549befa79f0cfaf343c40249788d5d" - integrity sha512-Vi5oFxplzdqutz4oXcOOhJ4INwJ6LD4DX+PDD0xStmcXTAUljy/ecxzKMZfHc8WWDUSZvUFx1nJbLVLQiMv6Mw== + resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/9026996d9ed766236f2f7f4b23f13048d0c87d1c" dependencies: "@babel/runtime" "^7.12.5" "@matrix-org/analytics-events" "^0.6.0" @@ -8456,7 +8473,7 @@ matrix-react-sdk@3.77.0: maplibre-gl "^2.0.0" matrix-encrypt-attachment "^1.0.3" matrix-events-sdk "0.0.1" - matrix-js-sdk "27.1.0" + matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop" matrix-widget-api "^1.4.0" memoize-one "^6.0.0" minimist "^1.2.5"