Skip to content

Commit 43d8552

Browse files
turt2liveturt2live
committed
Upgrade to develop dependencies
1 parent e88c5a0 commit 43d8552

File tree

2 files changed

+52
-42
lines changed

2 files changed

+52
-42
lines changed

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@
7474
"gemini-scrollbar": "github:matrix-org/gemini-scrollbar#91e1e566",
7575
"gfm.css": "^1.1.2",
7676
"highlight.js": "^9.13.1",
77-
"matrix-js-sdk": "2.3.2",
78-
"matrix-react-sdk": "1.5.3",
77+
"matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
78+
"matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop",
7979
"modernizr": "^3.6.0",
8080
"olm": "https://packages.matrix.org/npm/olm/olm-3.1.0.tgz",
8181
"prop-types": "^15.7.2",

‎yarn.lock‎

Lines changed: 50 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -2028,6 +2028,11 @@ caseless@~0.12.0:
20282028
resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
20292029
integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
20302030

2031+
chain-function@^1.0.0:
2032+
version "1.0.1"
2033+
resolved "https://registry.yarnpkg.com/chain-function/-/chain-function-1.0.1.tgz#c63045e5b4b663fb86f1c6e186adaf1de402a1cc"
2034+
integrity sha512-SxltgMwL9uCko5/ZCLiyG2B7R9fY4pDZUw7hJ4MhirdjBLosoDqkWABi3XMucddHdLiFJMb7PD2MZifZriuMTg==
2035+
20312036
chalk@2.4.2, "chalk@^1.1.3 || 2.x", chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.4.1, chalk@^2.4.2:
20322037
version "2.4.2"
20332038
resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
@@ -2946,6 +2951,13 @@ dom-converter@^0.2:
29462951
dependencies:
29472952
utila "~0.4"
29482953

2954+
dom-helpers@^3.2.0:
2955+
version "3.4.0"
2956+
resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-3.4.0.tgz#e9b369700f959f62ecde5a6babde4bccd9169af8"
2957+
integrity sha512-LnuPJ+dwqKDIyotW1VzmOZ5TONUN7CwkCR5hrgawTUbkBGYdeoNLZo6nNfGkCrjtE1nXXaj7iMMpDa8/d9WoIA==
2958+
dependencies:
2959+
"@babel/runtime" "^7.1.2"
2960+
29492961
dom-serialize@^2.2.0:
29502962
version "2.2.1"
29512963
resolved "https://registry.yarnpkg.com/dom-serialize/-/dom-serialize-2.2.1.tgz#562ae8999f44be5ea3076f5419dcd59eb43ac95b"
@@ -4076,7 +4088,7 @@ gauge@~2.7.3:
40764088
strip-ansi "^3.0.1"
40774089
wide-align "^1.1.0"
40784090

4079-
"gemini-scrollbar@github:matrix-org/gemini-scrollbar#91e1e566":
4091+
"gemini-scrollbar@github:matrix-org/gemini-scrollbar#91e1e566", gemini-scrollbar@matrix-org/gemini-scrollbar#91e1e566:
40804092
version "1.4.3"
40814093
resolved "https://codeload.github.com/matrix-org/gemini-scrollbar/tar.gz/91e1e566fa33324188f278801baf4a79f9f554ab"
40824094

@@ -5798,10 +5810,9 @@ math-random@^1.0.1:
57985810
resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.4.tgz#5dd6943c938548267016d4e34f057583080c514c"
57995811
integrity sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A==
58005812

5801-
matrix-js-sdk@2.3.2:
5813+
"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
58025814
version "2.3.2"
5803-
resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-2.3.2.tgz#341491e8396edbfe93cd034bce34acc6841af322"
5804-
integrity sha512-sWSqIvB0qEQgl3hPXLvhL0QPyH8161i37266yb6IAkprsJj4n0V/fiwzPd6Oft3Rv8ti4hBqsLN93dzYDPcupA==
5815+
resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/55b4595bbf52cdbf91edd7d326f72aabd6709dac"
58055816
dependencies:
58065817
another-json "^0.2.0"
58075818
babel-runtime "^6.26.0"
@@ -5822,10 +5833,9 @@ matrix-mock-request@^1.2.3:
58225833
bluebird "^3.5.0"
58235834
expect "^1.20.2"
58245835

5825-
matrix-react-sdk@1.5.3:
5836+
"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop":
58265837
version "1.5.3"
5827-
resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.5.3.tgz#778b819c5861940dc2fa19e37580a4f496b959c9"
5828-
integrity sha512-gvddTW9An0+cWCo5G78TjvRBUMiV6JoaFPv/DxJDF+McLNaVQxKC83keuN95jC02KwRFrb2vzqY4ZSEysHjU+g==
5838+
resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/3facb9be82f4a9c4cc1d6f71a9d59daa30cfde7b"
58295839
dependencies:
58305840
babel-plugin-syntax-dynamic-import "^6.18.0"
58315841
babel-runtime "^6.26.0"
@@ -5836,6 +5846,7 @@ matrix-react-sdk@1.5.3:
58365846
classnames "^2.1.2"
58375847
commonmark "^0.28.1"
58385848
counterpart "^0.18.0"
5849+
create-react-class "^15.6.0"
58395850
diff-dom "^4.1.3"
58405851
diff-match-patch "^1.0.4"
58415852
emojibase-data "^4.0.1"
@@ -5845,7 +5856,7 @@ matrix-react-sdk@1.5.3:
58455856
flux "2.1.1"
58465857
focus-trap-react "^3.0.5"
58475858
fuse.js "^2.2.0"
5848-
gemini-scrollbar "github:matrix-org/gemini-scrollbar#b302279"
5859+
gemini-scrollbar "github:matrix-org/gemini-scrollbar#91e1e566"
58495860
gfm.css "^1.1.1"
58505861
glob "^5.0.14"
58515862
highlight.js "^9.15.8"
@@ -5854,19 +5865,19 @@ matrix-react-sdk@1.5.3:
58545865
linkifyjs "^2.1.6"
58555866
lodash "^4.17.14"
58565867
lolex "2.3.2"
5857-
matrix-js-sdk "2.3.2"
5868+
matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop"
58585869
optimist "^0.6.1"
58595870
pako "^1.0.5"
58605871
png-chunks-extract "^1.0.0"
58615872
prop-types "^15.5.8"
58625873
qrcode-react "^0.1.16"
58635874
qs "^6.6.0"
58645875
querystring "^0.2.0"
5865-
react "^15.6.0"
5866-
react-addons-css-transition-group "15.3.2"
5876+
react "^16.9.0"
5877+
react-addons-css-transition-group "15.6.2"
58675878
react-beautiful-dnd "^4.0.1"
5868-
react-dom "^15.6.0"
5869-
react-gemini-scrollbar "github:matrix-org/react-gemini-scrollbar#5e97aef"
5879+
react-dom "^16.9.0"
5880+
react-gemini-scrollbar "github:matrix-org/react-gemini-scrollbar#9cf17f63b7c0b0ec5f31df27da0f82f7238dc594"
58705881
resize-observer-polyfill "^1.5.0"
58715882
sanitize-html "^1.18.4"
58725883
slate "^0.41.2"
@@ -7140,7 +7151,7 @@ promise@^7.0.3, promise@^7.1.1:
71407151
dependencies:
71417152
asap "~2.0.3"
71427153

7143-
prop-types@^15.5.10, prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2:
7154+
prop-types@^15.5.6, prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2:
71447155
version "15.7.2"
71457156
resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"
71467157
integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==
@@ -7327,10 +7338,12 @@ rc@^1.2.7, rc@^1.2.8:
73277338
minimist "^1.2.0"
73287339
strip-json-comments "~2.0.1"
73297340

7330-
react-addons-css-transition-group@15.3.2:
7331-
version "15.3.2"
7332-
resolved "https://registry.yarnpkg.com/react-addons-css-transition-group/-/react-addons-css-transition-group-15.3.2.tgz#d8fa52bec9bb61bdfde8b9e4652b80297cbff667"
7333-
integrity sha1-2PpSvsm7Yb396LnkZSuAKXy/9mc=
7341+
react-addons-css-transition-group@15.6.2:
7342+
version "15.6.2"
7343+
resolved "https://registry.yarnpkg.com/react-addons-css-transition-group/-/react-addons-css-transition-group-15.6.2.tgz#9e4376bcf40b5217d14ec68553081cee4b08a6d6"
7344+
integrity sha1-nkN2vPQLUhfRTsaFUwgc7ksIptY=
7345+
dependencies:
7346+
react-transition-group "^1.2.0"
73347347

73357348
react-beautiful-dnd@^4.0.1:
73367349
version "4.0.1"
@@ -7348,16 +7361,6 @@ react-beautiful-dnd@^4.0.1:
73487361
redux-thunk "^2.2.0"
73497362
reselect "^3.0.1"
73507363

7351-
react-dom@^15.6.0:
7352-
version "15.6.2"
7353-
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-15.6.2.tgz#41cfadf693b757faf2708443a1d1fd5a02bef730"
7354-
integrity sha1-Qc+t9pO3V/rycIRDodH9WgK+9zA=
7355-
dependencies:
7356-
fbjs "^0.8.9"
7357-
loose-envify "^1.1.0"
7358-
object-assign "^4.1.0"
7359-
prop-types "^15.5.10"
7360-
73617364
react-dom@^16.4.2, react-dom@^16.9.0:
73627365
version "16.9.0"
73637366
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.9.0.tgz#5e65527a5e26f22ae3701131bcccaee9fb0d3962"
@@ -7368,11 +7371,11 @@ react-dom@^16.4.2, react-dom@^16.9.0:
73687371
prop-types "^15.6.2"
73697372
scheduler "^0.15.0"
73707373

7371-
"react-gemini-scrollbar@github:matrix-org/react-gemini-scrollbar#5e97aef":
7374+
"react-gemini-scrollbar@github:matrix-org/react-gemini-scrollbar#9cf17f63b7c0b0ec5f31df27da0f82f7238dc594":
73727375
version "2.1.5"
7373-
resolved "https://codeload.github.com/matrix-org/react-gemini-scrollbar/tar.gz/5e97aef7e034efc8db1431f4b0efe3b26e249ae9"
7376+
resolved "https://codeload.github.com/matrix-org/react-gemini-scrollbar/tar.gz/9cf17f63b7c0b0ec5f31df27da0f82f7238dc594"
73747377
dependencies:
7375-
gemini-scrollbar matrix-org/gemini-scrollbar#b302279
7378+
gemini-scrollbar matrix-org/gemini-scrollbar#91e1e566
73767379

73777380
react-immutable-proptypes@^2.1.0:
73787381
version "2.1.0"
@@ -7411,16 +7414,16 @@ react-redux@^5.0.6:
74117414
react-is "^16.6.0"
74127415
react-lifecycles-compat "^3.0.0"
74137416

7414-
react@^15.6.0:
7415-
version "15.6.2"
7416-
resolved "https://registry.yarnpkg.com/react/-/react-15.6.2.tgz#dba0434ab439cfe82f108f0f511663908179aa72"
7417-
integrity sha1-26BDSrQ5z+gvEI8PURZjkIF5qnI=
7417+
react-transition-group@^1.2.0:
7418+
version "1.2.1"
7419+
resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-1.2.1.tgz#e11f72b257f921b213229a774df46612346c7ca6"
7420+
integrity sha512-CWaL3laCmgAFdxdKbhhps+c0HRGF4c+hdM4H23+FI1QBNUyx/AMeIJGWorehPNSaKnQNOAxL7PQmqMu78CDj3Q==
74187421
dependencies:
7419-
create-react-class "^15.6.0"
7420-
fbjs "^0.8.9"
7421-
loose-envify "^1.1.0"
7422-
object-assign "^4.1.0"
7423-
prop-types "^15.5.10"
7422+
chain-function "^1.0.0"
7423+
dom-helpers "^3.2.0"
7424+
loose-envify "^1.3.1"
7425+
prop-types "^15.5.6"
7426+
warning "^3.0.0"
74247427

74257428
react@^16.4.2, react@^16.9.0:
74267429
version "16.9.0"
@@ -9110,6 +9113,13 @@ void-elements@^2.0.0:
91109113
resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec"
91119114
integrity sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=
91129115

9116+
warning@^3.0.0:
9117+
version "3.0.0"
9118+
resolved "https://registry.yarnpkg.com/warning/-/warning-3.0.0.tgz#32e5377cb572de4ab04753bdf8821c01ed605b7c"
9119+
integrity sha1-MuU3fLVy3kqwR1O9+IIcAe1gW3w=
9120+
dependencies:
9121+
loose-envify "^1.0.0"
9122+
91139123
watchpack@^1.5.0:
91149124
version "1.6.0"
91159125
resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.6.0.tgz#4bc12c2ebe8aa277a71f1d3f14d685c7b446cd00"

0 commit comments

Comments
 (0)