From 11c7d02a2db77651d819dfc592148b2c357d21fe Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Tue, 17 Sep 2019 10:44:29 -0600 Subject: [PATCH] Point to develop dependencies and fixed react-gemini-scrollbar Fixes https://github.com/vector-im/riot-web/issues/10894 See https://github.com/matrix-org/react-gemini-scrollbar/pull/3 --- package.json | 4 ++-- yarn.lock | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index 3a7343d8a1..57e63e1055 100644 --- a/package.json +++ b/package.json @@ -85,7 +85,7 @@ "linkifyjs": "^2.1.6", "lodash": "^4.17.14", "lolex": "2.3.2", - "matrix-js-sdk": "2.3.2", + "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", "optimist": "^0.6.1", "pako": "^1.0.5", "png-chunks-extract": "^1.0.0", @@ -97,7 +97,7 @@ "react-addons-css-transition-group": "15.6.2", "react-beautiful-dnd": "^4.0.1", "react-dom": "^16.9.0", - "react-gemini-scrollbar": "github:matrix-org/react-gemini-scrollbar#f644523", + "react-gemini-scrollbar": "github:matrix-org/react-gemini-scrollbar#d3a2b21", "resize-observer-polyfill": "^1.5.0", "sanitize-html": "^1.18.4", "slate": "^0.41.2", diff --git a/yarn.lock b/yarn.lock index 95ac5db8b8..d6591c9206 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5049,10 +5049,9 @@ mathml-tag-names@^2.0.1: resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.1.tgz#6dff66c99d55ecf739ca53c492e626f1d12a33cc" integrity sha512-pWB896KPGSGkp1XtyzRBftpTzwSOL0Gfk0wLvxt4f2mgzjY19o0LxJ3U25vNWTzsh7da+KTbuXQoQ3lOJZ8WHw== -matrix-js-sdk@2.3.2: +"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": version "2.3.2" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-2.3.2.tgz#341491e8396edbfe93cd034bce34acc6841af322" - integrity sha512-sWSqIvB0qEQgl3hPXLvhL0QPyH8161i37266yb6IAkprsJj4n0V/fiwzPd6Oft3Rv8ti4hBqsLN93dzYDPcupA== + resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/55b4595bbf52cdbf91edd7d326f72aabd6709dac" dependencies: another-json "^0.2.0" babel-runtime "^6.26.0" @@ -6389,9 +6388,9 @@ react-dom@^16.4.2, react-dom@^16.9.0: prop-types "^15.6.2" scheduler "^0.15.0" -"react-gemini-scrollbar@github:matrix-org/react-gemini-scrollbar#f644523": +"react-gemini-scrollbar@github:matrix-org/react-gemini-scrollbar#d3a2b21": version "2.1.5" - resolved "https://codeload.github.com/matrix-org/react-gemini-scrollbar/tar.gz/f64452388011d37d8a4427ba769153c30700ab8c" + resolved "https://codeload.github.com/matrix-org/react-gemini-scrollbar/tar.gz/d3a2b211016dd1af689341a6a2d348757b842f6b" dependencies: gemini-scrollbar matrix-org/gemini-scrollbar#91e1e566