Skip to content

Commit

Permalink
Reset matrix-react-sdk back to develop branch
Browse files Browse the repository at this point in the history
  • Loading branch information
RiotRobot committed Apr 12, 2022
1 parent 96d9fac commit 03ab123
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 28 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"jsrsasign": "^10.2.0",
"katex": "^0.12.0",
"matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
"matrix-react-sdk": "3.42.3",
"matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop",
"matrix-widget-api": "^0.1.0-beta.18",
"prop-types": "^15.7.2",
"react": "17.0.2",
Expand Down
36 changes: 9 additions & 27 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3001,11 +3001,6 @@ brorand@^1.0.1, brorand@^1.1.0:
resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=

browser-encrypt-attachment@^0.3.0:
version "0.3.0"
resolved "https://registry.yarnpkg.com/browser-encrypt-attachment/-/browser-encrypt-attachment-0.3.0.tgz#205a94caadf0dc7e81413941812f655bd190ff1c"
integrity sha1-IFqUyq3w3H6BQTlBgS9lW9GQ/xw=

browser-process-hrtime@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626"
Expand Down Expand Up @@ -8173,28 +8168,16 @@ mathml-tag-names@^2.1.3:
version "0.0.1"
resolved "https://codeload.github.com/matrix-org/matrix-analytics-events/tar.gz/daad3faed54f0b1f1e026a7498b4653e4d01cd90"

matrix-encrypt-attachment@^1.0.3:
version "1.0.3"
resolved "https://registry.yarnpkg.com/matrix-encrypt-attachment/-/matrix-encrypt-attachment-1.0.3.tgz#6e016587728c396549c833985f39cbf6c07ee97b"
integrity sha512-NwfoDY/yHL9Zo8KrY5GP8ymAoZJpEFKEK+IgJKdWf5xtsIFf7KIU2pbw8+Eq592j//nSDOC+/Ff4Fk8gVvDZpw==

matrix-events-sdk@^0.0.1-beta.7:
version "0.0.1-beta.7"
resolved "https://registry.yarnpkg.com/matrix-events-sdk/-/matrix-events-sdk-0.0.1-beta.7.tgz#5ffe45eba1f67cc8d7c2377736c728b322524934"
integrity sha512-9jl4wtWanUFSy2sr2lCjErN/oC8KTAtaeaozJtrgot1JiQcEI4Rda9OLgQ7nLKaqb4Z/QUx/fR3XpDzm5Jy1JA==

[email protected]:
version "17.0.0"
resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-17.0.0.tgz#6edf2f8d05da003e98a6cf5269a4717adfe4e406"
integrity sha512-8nv+a1e6n4x4DYKiBFRS6/CIpsE22+31K+9/4Y5MB8m3iraSVBtdZ5y/9ktQnjQuo9I85TvyqHL2obRWF7UD5Q==
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.7"
p-retry "^4.5.0"
qs "^6.9.6"
request "^2.88.2"
unhomoglyph "^1.0.6"

"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
version "17.0.0"
resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/b58d09aa9a7a3578c43185becb41ab0b17ce0f98"
Expand All @@ -8219,18 +8202,16 @@ matrix-mock-request@^1.2.3:
bluebird "^3.5.0"
expect "^1.20.2"

matrix-react-sdk@3.42.3:
"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop":
version "3.42.3"
resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.42.3.tgz#fd721a6d54a6a1964b15f4bc3f074e81af184962"
integrity sha512-nF2qDNTelLFhKb3vfrFZUy5K2L/+2RJ6Y+Dj+W8d8J9VskVH97oj7QrQyKMjo7TZOwsUi34v9hTi5xQZJUNsWA==
resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/7600182a35a7742820c5ab17988ef1b545c74759"
dependencies:
"@babel/runtime" "^7.12.5"
"@sentry/browser" "^6.11.0"
"@sentry/tracing" "^6.11.0"
"@types/geojson" "^7946.0.8"
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"
classnames "^2.2.6"
Expand Down Expand Up @@ -8259,8 +8240,9 @@ [email protected]:
lodash "^4.17.20"
maplibre-gl "^1.15.2"
matrix-analytics-events "github:matrix-org/matrix-analytics-events.git#daad3faed54f0b1f1e026a7498b4653e4d01cd90"
matrix-encrypt-attachment "^1.0.3"
matrix-events-sdk "^0.0.1-beta.7"
matrix-js-sdk "17.0.0"
matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop"
matrix-widget-api "^0.1.0-beta.18"
minimist "^1.2.5"
opus-recorder "^8.0.3"
Expand Down

0 comments on commit 03ab123

Please sign in to comment.