From 6094b8be9a9d6b042b1c4278b0455358cf158f36 Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Fri, 27 Sep 2019 14:46:05 +0100 Subject: [PATCH] Change back to develop branch for deps --- package.json | 4 ++-- yarn.lock | 12 +++++------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index 4c121d076f..ea37c9f033 100644 --- a/package.json +++ b/package.json @@ -74,8 +74,8 @@ "gemini-scrollbar": "github:matrix-org/gemini-scrollbar#91e1e566", "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", - "matrix-js-sdk": "2.4.0", - "matrix-react-sdk": "1.6.0", + "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", + "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", "modernizr": "^3.6.0", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.0.tgz", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index ab06b8c28f..30fed2c068 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5815,10 +5815,9 @@ math-random@^1.0.1: resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.4.tgz#5dd6943c938548267016d4e34f057583080c514c" integrity sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A== -matrix-js-sdk@2.4.0: +"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": version "2.4.0" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-2.4.0.tgz#cce30af79fac9ec176695afc9affa2fff377e0e3" - integrity sha512-X0sdegRum7hzNXBT/vfxF05BiaXeZ8nZE3lO4hvE2UnnSqjDJLFM79muWuv6a0xrITcV4C8kKW7sH+oJb4d93Q== + resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/562bf9331bd5ee8701625cd9632c8e73374b18f4" dependencies: another-json "^0.2.0" babel-runtime "^6.26.0" @@ -5839,10 +5838,9 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@1.6.0: +"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop": version "1.6.0" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.6.0.tgz#0e5b9a2a699602823a609b5684749cf2ff2bab38" - integrity sha512-w23R0BIOr1ovQzFZryiCk3NKVHbA3/8MGPdTHOr+pZkj83N9ijp9DmFwmiY+T/O7dlLAO/E1Kn5uqzHGETkszg== + resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/9221dcd1544b9cb540971dee5ea260372e873fbf" dependencies: babel-plugin-syntax-dynamic-import "^6.18.0" babel-runtime "^6.26.0" @@ -5873,7 +5871,7 @@ matrix-react-sdk@1.6.0: linkifyjs "^2.1.6" lodash "^4.17.14" lolex "4.2" - matrix-js-sdk "2.4.0" + matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop" optimist "^0.6.1" pako "^1.0.5" png-chunks-extract "^1.0.0"