From 0685fa26227b5be62b758207817639ad313b1401 Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Tue, 8 Jun 2021 17:18:16 +0200 Subject: [PATCH] update olm to 3.2.3 --- package.json | 2 +- scripts/post-install.js | 2 +- yarn.lock | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 175c5cd8..58f9b38f 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,7 @@ "base64-arraybuffer": "^0.2.0", "bs58": "^4.0.1", "es6-promise": "https://github.com/bwindels/es6-promise.git#bwindels/expose-flush", - "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz", + "@matrix-org/olm": "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.3.tgz", "text-encoding": "^0.7.0" } } diff --git a/scripts/post-install.js b/scripts/post-install.js index 828474ef..150807c3 100644 --- a/scripts/post-install.js +++ b/scripts/post-install.js @@ -70,7 +70,7 @@ async function populateLib() { const libDir = path.join(projectDir, "lib/"); await removeDirIfExists(libDir); await fs.mkdir(libDir); - const olmSrcDir = path.dirname(require.resolve("olm")); + const olmSrcDir = path.dirname(require.resolve("@matrix-org/olm")); const olmDstDir = path.join(libDir, "olm/"); await fs.mkdir(olmDstDir); for (const file of ["olm.js", "olm.wasm", "olm_legacy.js"]) { diff --git a/yarn.lock b/yarn.lock index 0a6bc448..c1e14fe4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -861,6 +861,10 @@ minimatch "^3.0.4" strip-json-comments "^3.1.1" +"@matrix-org/olm@https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.3.tgz": + version "3.2.3" + resolved "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.3.tgz#cc332fdd25c08ef0e40f4d33fc3f822a0f98b6f4" + "@rollup/plugin-babel@^5.1.0": version "5.2.1" resolved "https://registry.yarnpkg.com/@rollup/plugin-babel/-/plugin-babel-5.2.1.tgz#20fc8f8864dc0eaa1c5578408459606808f72924" @@ -2069,10 +2073,6 @@ object.assign@^4.1.0: has-symbols "^1.0.0" object-keys "^1.0.11" -"olm@https://packages.matrix.org/npm/olm/olm-3.1.4.tgz": - version "3.1.4" - resolved "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz#0f03128b7d3b2f614d2216409a1dfccca765fdb3" - on-finished@~2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"