diff --git a/.npmrc b/.npmrc deleted file mode 100644 index 45c69bb..0000000 --- a/.npmrc +++ /dev/null @@ -1 +0,0 @@ -@matrix-org:registry=https://gitlab.matrix.org/api/v4/packages/npm/ diff --git a/package-lock.json b/package-lock.json index 0c46af8..d8b3159 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,20 +1,19 @@ { "name": "node-red-contrib-matrix-chat", - "version": "0.3.0", + "version": "0.4.0", "lockfileVersion": 2, "requires": true, "packages": { "": { - "name": "node-red-contrib-matrix-chat", - "version": "0.3.0", + "version": "0.4.0", "license": "SEE LICENSE FILE", "dependencies": { - "@matrix-org/olm": "^3.2.8", "fs-extra": "^9.1.0", "got": "^11.8.2", "isomorphic-webcrypto": "^2.3.8", "matrix-js-sdk": "^15.3.0", "node-localstorage": "^2.2.1", + "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz", "process": "^0.11.10", "utf8": "^3.0.0" } @@ -2391,11 +2390,6 @@ "node": ">= 10.14.2" } }, - "node_modules/@matrix-org/olm": { - "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", - "integrity": "sha1-jVNjbQReF3biouxmE+VzMN2c6FY=" - }, "node_modules/@nodelib/fs.scandir": { "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", @@ -8072,6 +8066,12 @@ "node": ">=0.10.0" } }, + "node_modules/olm": { + "version": "3.2.1", + "resolved": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz", + "integrity": "sha512-B87bTpGIGieuV2FNauChjjQtVltwTGagQFoHm+3Dcse4amKAAGJB/I54dnP/JtbHZ+RYVoApM2OQ46Z4VH6eNg==", + "license": "Apache-2.0" + }, "node_modules/on-finished": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", @@ -13078,11 +13078,6 @@ "chalk": "^4.0.0" } }, - "@matrix-org/olm": { - "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", - "integrity": "sha1-jVNjbQReF3biouxmE+VzMN2c6FY=" - }, "@nodelib/fs.scandir": { "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", @@ -17026,7 +17021,6 @@ "optional": true, "peer": true, "requires": { - "@babel/core": "^7.14.0", "@babel/plugin-proposal-class-properties": "^7.0.0", "@babel/plugin-proposal-export-default-from": "^7.0.0", "@babel/plugin-proposal-nullish-coalescing-operator": "^7.0.0", @@ -17251,7 +17245,6 @@ "optional": true, "peer": true, "requires": { - "@babel/core": "^7.0.0", "@babel/plugin-proposal-class-properties": "^7.0.0", "@babel/plugin-proposal-export-default-from": "^7.0.0", "@babel/plugin-proposal-nullish-coalescing-operator": "^7.0.0", @@ -17299,7 +17292,6 @@ "optional": true, "peer": true, "requires": { - "@babel/core": "^7.14.0", "babel-preset-fbjs": "^3.4.0", "hermes-parser": "0.4.7", "metro-babel-transformer": "0.66.2", @@ -17315,7 +17307,6 @@ "optional": true, "peer": true, "requires": { - "@babel/core": "^7.14.0", "@babel/plugin-proposal-class-properties": "^7.0.0", "@babel/plugin-proposal-export-default-from": "^7.0.0", "@babel/plugin-proposal-nullish-coalescing-operator": "^7.0.0", @@ -17826,6 +17817,10 @@ "isobject": "^3.0.1" } }, + "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 0ada53c..4f58a26 100644 --- a/package.json +++ b/package.json @@ -1,14 +1,14 @@ { "name": "node-red-contrib-matrix-chat", - "version": "0.4.0", + "version": "0.4.1", "description": "Matrix chat server client for Node-RED", "dependencies": { - "@matrix-org/olm": "^3.2.8", "fs-extra": "^9.1.0", "got": "^11.8.2", "isomorphic-webcrypto": "^2.3.8", "matrix-js-sdk": "^15.3.0", "node-localstorage": "^2.2.1", + "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz", "process": "^0.11.10", "utf8": "^3.0.0" }, diff --git a/src/matrix-server-config.js b/src/matrix-server-config.js index da99ffd..6d463d2 100644 --- a/src/matrix-server-config.js +++ b/src/matrix-server-config.js @@ -1,4 +1,4 @@ -global.Olm = require('@matrix-org/olm'); +global.Olm = require('olm'); const fs = require("fs-extra"); const sdk = require("matrix-js-sdk"); const { LocalStorage } = require('node-localstorage');