mirror of
https://github.com/vector-im/element-web.git
synced 2024-09-10 07:05:14 +00:00
Reset matrix-react-sdk back to develop branch
This commit is contained in:
parent
7ce2538778
commit
951fdaf3ab
2 changed files with 20 additions and 32 deletions
|
@ -61,7 +61,7 @@
|
||||||
"jsrsasign": "^10.2.0",
|
"jsrsasign": "^10.2.0",
|
||||||
"katex": "^0.12.0",
|
"katex": "^0.12.0",
|
||||||
"matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
|
"matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
|
||||||
"matrix-react-sdk": "3.42.1",
|
"matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop",
|
||||||
"matrix-widget-api": "^0.1.0-beta.18",
|
"matrix-widget-api": "^0.1.0-beta.18",
|
||||||
"prop-types": "^15.7.2",
|
"prop-types": "^15.7.2",
|
||||||
"react": "17.0.2",
|
"react": "17.0.2",
|
||||||
|
|
50
yarn.lock
50
yarn.lock
|
@ -4676,15 +4676,20 @@ emoji-regex@^8.0.0:
|
||||||
resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
|
resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
|
||||||
integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
|
integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
|
||||||
|
|
||||||
emojibase-data@^6.2.0:
|
emojibase-data@7.0.0:
|
||||||
version "6.2.0"
|
version "7.0.0"
|
||||||
resolved "https://registry.yarnpkg.com/emojibase-data/-/emojibase-data-6.2.0.tgz#db6c75c36905284fa623f4aa5f468d2be6ed364a"
|
resolved "https://registry.yarnpkg.com/emojibase-data/-/emojibase-data-7.0.0.tgz#5e16ed265871d58b3ca7c3b2bc7d80853a55f34f"
|
||||||
integrity sha512-SWKaXD2QeQs06IE7qfJftsI5924Dqzp+V9xaa5RzZIEWhmlrG6Jt2iKwfgOPHu+5S8MEtOI7GdpKsXj46chXOw==
|
integrity sha512-ka3p06egA+jqWnUUjNfOwYAw4j9/+KyUcCpFjSItM0NjbL8n5qZfe1mskmGUP4TkuE5SbiOvG++CC1iN+53jKg==
|
||||||
|
|
||||||
emojibase-regex@^5.1.3:
|
emojibase-regex@6.0.0:
|
||||||
version "5.1.3"
|
version "6.0.0"
|
||||||
resolved "https://registry.yarnpkg.com/emojibase-regex/-/emojibase-regex-5.1.3.tgz#f0ef621ed6ec624becd2326f999fd4ea01b94554"
|
resolved "https://registry.yarnpkg.com/emojibase-regex/-/emojibase-regex-6.0.0.tgz#2d236f6bd38e6aa69089707eb06fe1f6a3270198"
|
||||||
integrity sha512-gT8T9LxLA8VJdI+8KQtyykB9qKzd7WuUL3M2yw6y9tplFeufOUANg3UKVaKUvkMcRNvZsSElWhxcJrx8WPE12g==
|
integrity sha512-vpo76XcjjFapY4Q1vZAp8fu07p9lNCZi0TMtpZ3XyHYRqnqYZTzHgSI7tMvpYmnD8xt9o4XC5oUaSJXT4Ky9Tw==
|
||||||
|
|
||||||
|
emojibase@6.0.2:
|
||||||
|
version "6.0.2"
|
||||||
|
resolved "https://registry.yarnpkg.com/emojibase/-/emojibase-6.0.2.tgz#1e76996b2bd9e6927e51f54c3995245b03eacb02"
|
||||||
|
integrity sha512-2h2eblOm86tj+lsJLgLYmEni13H74KNNu1NI1ZgMOX9ByWuvjFZLhETEUH1edpcd8srAlzhfJSD892UbpxfwsA==
|
||||||
|
|
||||||
emojis-list@^3.0.0:
|
emojis-list@^3.0.0:
|
||||||
version "3.0.0"
|
version "3.0.0"
|
||||||
|
@ -8220,23 +8225,6 @@ matrix-events-sdk@^0.0.1-beta.7:
|
||||||
resolved "https://registry.yarnpkg.com/matrix-events-sdk/-/matrix-events-sdk-0.0.1-beta.7.tgz#5ffe45eba1f67cc8d7c2377736c728b322524934"
|
resolved "https://registry.yarnpkg.com/matrix-events-sdk/-/matrix-events-sdk-0.0.1-beta.7.tgz#5ffe45eba1f67cc8d7c2377736c728b322524934"
|
||||||
integrity sha512-9jl4wtWanUFSy2sr2lCjErN/oC8KTAtaeaozJtrgot1JiQcEI4Rda9OLgQ7nLKaqb4Z/QUx/fR3XpDzm5Jy1JA==
|
integrity sha512-9jl4wtWanUFSy2sr2lCjErN/oC8KTAtaeaozJtrgot1JiQcEI4Rda9OLgQ7nLKaqb4Z/QUx/fR3XpDzm5Jy1JA==
|
||||||
|
|
||||||
matrix-js-sdk@16.0.1:
|
|
||||||
version "16.0.1"
|
|
||||||
resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-16.0.1.tgz#9b389ef16677ba648efad2929a7802af6f1dc81f"
|
|
||||||
integrity sha512-GRYZY7JZRqsVFa2nKO2qJbU4gQail2+1PgX2QDcibWizTL5Gh8YS384twprpIKqzdLHJ3d7H7A0L+uqc562ZsQ==
|
|
||||||
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":
|
"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
|
||||||
version "16.0.1"
|
version "16.0.1"
|
||||||
resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/bdc3da1fac3cb454b409325b6a50cd869b3d5d57"
|
resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/bdc3da1fac3cb454b409325b6a50cd869b3d5d57"
|
||||||
|
@ -8261,10 +8249,9 @@ matrix-mock-request@^1.2.3:
|
||||||
bluebird "^3.5.0"
|
bluebird "^3.5.0"
|
||||||
expect "^1.20.2"
|
expect "^1.20.2"
|
||||||
|
|
||||||
matrix-react-sdk@3.42.1:
|
"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop":
|
||||||
version "3.42.1"
|
version "3.42.1"
|
||||||
resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.42.1.tgz#15aec8c01f54cf8badf4423d7b1b8c3dc31d643e"
|
resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/2520d8178401f91a786c7c5d44c216b3bd34085b"
|
||||||
integrity sha512-XLNgoBkPc5qhJPX9o6kb1azua0Tgg7+NJ9pVyTM3J1lHXsP37oR9aeVLK7fGugnZEDN+fn0Hy9ROguAWNXruAA==
|
|
||||||
dependencies:
|
dependencies:
|
||||||
"@babel/runtime" "^7.12.5"
|
"@babel/runtime" "^7.12.5"
|
||||||
"@sentry/browser" "^6.11.0"
|
"@sentry/browser" "^6.11.0"
|
||||||
|
@ -8280,8 +8267,9 @@ matrix-react-sdk@3.42.1:
|
||||||
counterpart "^0.18.6"
|
counterpart "^0.18.6"
|
||||||
diff-dom "^4.2.2"
|
diff-dom "^4.2.2"
|
||||||
diff-match-patch "^1.0.5"
|
diff-match-patch "^1.0.5"
|
||||||
emojibase-data "^6.2.0"
|
emojibase "6.0.2"
|
||||||
emojibase-regex "^5.1.3"
|
emojibase-data "7.0.0"
|
||||||
|
emojibase-regex "6.0.0"
|
||||||
escape-html "^1.0.3"
|
escape-html "^1.0.3"
|
||||||
file-saver "^2.0.5"
|
file-saver "^2.0.5"
|
||||||
filesize "6.1.0"
|
filesize "6.1.0"
|
||||||
|
@ -8301,7 +8289,7 @@ matrix-react-sdk@3.42.1:
|
||||||
maplibre-gl "^1.15.2"
|
maplibre-gl "^1.15.2"
|
||||||
matrix-analytics-events "github:matrix-org/matrix-analytics-events.git#daad3faed54f0b1f1e026a7498b4653e4d01cd90"
|
matrix-analytics-events "github:matrix-org/matrix-analytics-events.git#daad3faed54f0b1f1e026a7498b4653e4d01cd90"
|
||||||
matrix-events-sdk "^0.0.1-beta.7"
|
matrix-events-sdk "^0.0.1-beta.7"
|
||||||
matrix-js-sdk "16.0.1"
|
matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop"
|
||||||
matrix-widget-api "^0.1.0-beta.18"
|
matrix-widget-api "^0.1.0-beta.18"
|
||||||
minimist "^1.2.5"
|
minimist "^1.2.5"
|
||||||
opus-recorder "^8.0.3"
|
opus-recorder "^8.0.3"
|
||||||
|
|
Loading…
Reference in a new issue