From 2f1105e6d2c2b1a7d598b4927bc8a82c720a1013 Mon Sep 17 00:00:00 2001 From: Christoph Settgast Date: Mon, 24 May 2021 19:13:30 +0200 Subject: [PATCH] chore(deps) @matrix-org/olm@latest Bugfixes since 3.2.1, see https://gitlab.matrix.org/matrix-org/olm/-/blob/master/CHANGELOG.rst In 3.2.2 the package name changed to @matrix-org/olm, thus updating in Makefile & imports Signed-off-by: Christoph Settgast --- Makefile | 2 +- app.js | 2 +- package-lock.json | 8 ++++---- package.json | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 6866b249e7..1fbed4cbf1 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ CLEANCSS = ./node_modules/.bin/cleancss DEPLOY_DIR = libs LIBJITSIMEET_DIR = node_modules/lib-jitsi-meet/ LIBFLAC_DIR = node_modules/libflacjs/dist/min/ -OLM_DIR = node_modules/olm +OLM_DIR = node_modules/@matrix-org/olm RNNOISE_WASM_DIR = node_modules/rnnoise-wasm/dist/ TFLITE_WASM = react/features/stream-effects/virtual-background/vendor/tflite MEET_MODELS_DIR = react/features/stream-effects/virtual-background/vendor/models/ diff --git a/app.js b/app.js index 15b2ed9fa2..a7997f4efb 100644 --- a/app.js +++ b/app.js @@ -2,7 +2,7 @@ import 'jquery'; -import 'olm'; +import '@matrix-org/olm'; import 'focus-visible'; diff --git a/package-lock.json b/package-lock.json index 2989d97cc0..cf82eb2e9e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2903,6 +2903,10 @@ "react-is": "^16.8.0 || ^17.0.0" } }, + "@matrix-org/olm": { + "version": "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.3.tgz", + "integrity": "sha512-OhC9wwZ/ox9vputA1MR2A7QlYlvfXCV+tdbADOR7Jn7o9qoXh3HWf+AbSpXTK3daF0GIHA69Ws8XOnWqu5n53A==" + }, "@microsoft/microsoft-graph-client": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@microsoft/microsoft-graph-client/-/microsoft-graph-client-1.1.0.tgz", @@ -12960,10 +12964,6 @@ "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==", "dev": true }, - "olm": { - "version": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz", - "integrity": "sha512-B87bTpGIGieuV2FNauChjjQtVltwTGagQFoHm+3Dcse4amKAAGJB/I54dnP/JtbHZ+RYVoApM2OQ46Z4VH6eNg==" - }, "on-finished": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", diff --git a/package.json b/package.json index 49b6d0c305..a62d616e23 100644 --- a/package.json +++ b/package.json @@ -36,6 +36,7 @@ "@hapi/bourne": "2.0.0", "@jitsi/js-utils": "1.0.6", "@material-ui/core": "4.11.3", + "@matrix-org/olm": "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.3.tgz", "@microsoft/microsoft-graph-client": "1.1.0", "@react-native-async-storage/async-storage": "1.15.5", "@react-native-community/google-signin": "3.0.1", @@ -62,7 +63,6 @@ "lodash": "4.17.21", "moment": "2.29.1", "moment-duration-format": "2.2.2", - "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz", "optional-require": "1.0.3", "pixelmatch": "5.1.0", "promise.allsettled": "1.0.4",