From 27d492e9e21d2924388632c6cd1f6777d4da4fd4 Mon Sep 17 00:00:00 2001 From: David Baker <dave@matrix.org> Date: Tue, 10 May 2022 17:41:50 +0100 Subject: [PATCH] Pin js-sdk commit & add olm for types --- package.json | 3 ++- yarn.lock | 8 ++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 8fc95cf..59fa7ce 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "color-hash": "^2.0.1", "events": "^3.3.0", "lodash-move": "^1.1.1", - "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#dbkr/group-call-merge", + "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#acef1d7dd0b915368730efabee94deb42b2e4058", "mermaid": "^8.13.8", "normalize.css": "^8.0.1", "pako": "^2.0.4", @@ -52,6 +52,7 @@ }, "devDependencies": { "@babel/core": "^7.16.5", + "@matrix-org/olm": "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.8.tgz", "@storybook/react": "^6.5.0-alpha.5", "@typescript-eslint/eslint-plugin": "^5.22.0", "@typescript-eslint/parser": "^5.22.0", diff --git a/yarn.lock b/yarn.lock index b4d86fb..ca49628 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1364,6 +1364,10 @@ resolved "https://registry.yarnpkg.com/@juggle/resize-observer/-/resize-observer-3.3.1.tgz#b50a781709c81e10701004214340f25475a171a0" integrity sha512-zMM9Ds+SawiUkakS7y94Ymqx+S0ORzpG3frZirN3l+UlXUmSUR7hF4wxCVqW+ei94JzV5kt0uXBcoOEAuiydrw== +"@matrix-org/olm@https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.8.tgz": + version "3.2.8" + resolved "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.8.tgz#8d53636d045e1776e2a2ec6613e57330dd9ce856" + "@mdx-js/mdx@^1.6.22": version "1.6.22" resolved "https://registry.yarnpkg.com/@mdx-js/mdx/-/mdx-1.6.22.tgz#8a723157bf90e78f17dc0f27995398e6c731f1ba" @@ -8566,9 +8570,9 @@ 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" integrity sha512-9jl4wtWanUFSy2sr2lCjErN/oC8KTAtaeaozJtrgot1JiQcEI4Rda9OLgQ7nLKaqb4Z/QUx/fR3XpDzm5Jy1JA== -"matrix-js-sdk@github:matrix-org/matrix-js-sdk#dbkr/group-call-merge": +"matrix-js-sdk@github:matrix-org/matrix-js-sdk#acef1d7dd0b915368730efabee94deb42b2e4058": version "17.2.0" - resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/f4f05550ef602cc03a54de75db236afc62fb33ef" + resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/acef1d7dd0b915368730efabee94deb42b2e4058" dependencies: "@babel/runtime" "^7.12.5" another-json "^0.2.0"