diff --git a/CHANGELOG.md b/CHANGELOG.md index ea4b4ce5f..bb557901e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,10 @@ - 1.7.0-rc1 (2021-02-05) + 1.7.0 (2021-02-11) +=================== + +No significant changes. + + +1.7.0-rc1 (2021-02-05) ======================= Features diff --git a/docs/requirements.txt b/docs/requirements.txt index b25536a4f..05f588198 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,4 +1,3 @@ -# RTD is pinning mkdocs to 1.1 so do the same here -mkdocs<1.1 -mkdocs-bootswatch<1.1 +mkdocs==1.1.2 +mkdocs-bootswatch==1.1 pygments diff --git a/package-lock.json b/package-lock.json index 7bed64bdf..9d6d04c6f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "matrix-appservice-slack", - "version": "1.6.1", + "version": "1.7.0", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -50,9 +50,9 @@ } }, "@babel/runtime": { - "version": "7.12.5", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.5.tgz", - "integrity": "sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==", + "version": "7.12.13", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.13.tgz", + "integrity": "sha512-8+3UMPBrjFa/6TtKi/7sehPKqfAm4g6K+YQjyyFOLUTxzOngcRZTlAVY8sc2CORJYqdHQY8gRPHmn+qo15rCBw==", "requires": { "regenerator-runtime": "^0.13.4" } @@ -2085,9 +2085,9 @@ } }, "matrix-appservice-bridge": { - "version": "2.5.0-rc1", - "resolved": "https://registry.npmjs.org/matrix-appservice-bridge/-/matrix-appservice-bridge-2.5.0-rc1.tgz", - "integrity": "sha512-Yw+ePvuqMTOaup3Ed4gJ+uclnoeIoL0nFcWYmyDB3C5QzWMBfE78jSV4Xc/gLlVK/pcJ4NZQA2+tBZMfwxVoJQ==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/matrix-appservice-bridge/-/matrix-appservice-bridge-2.5.0.tgz", + "integrity": "sha512-L5Ddb78pqqfO6xM4SYM+Hv6N5VjmLF3D24h4g5ze5+xRfEFmfvmLdVu6rvIExawvk9i+LA0fZ95Qi3hc7SkgAQ==", "requires": { "chalk": "^4.1.0", "extend": "^3.0.2", @@ -2115,21 +2115,13 @@ "requires": { "argparse": "^2.0.1" } - }, - "prom-client": { - "version": "13.1.0", - "resolved": "https://registry.npmjs.org/prom-client/-/prom-client-13.1.0.tgz", - "integrity": "sha512-jT9VccZCWrJWXdyEtQddCDszYsiuWj5T0ekrPszi/WEegj3IZy6Mm09iOOVM86A4IKMWq8hZkT2dD9MaSe+sng==", - "requires": { - "tdigest": "^0.1.1" - } } } }, "matrix-js-sdk": { - "version": "9.5.1", - "resolved": "https://registry.npmjs.org/matrix-js-sdk/-/matrix-js-sdk-9.5.1.tgz", - "integrity": "sha512-01YbRuU50BDYytTZ5fdmdoQLqOGDT2F7X6vDBrYHpdaRN2jWuLCspQlOKFJKgv73gNhw9V9jfoZN+NxuwuUpUQ==", + "version": "9.6.0", + "resolved": "https://registry.npmjs.org/matrix-js-sdk/-/matrix-js-sdk-9.6.0.tgz", + "integrity": "sha512-zoNqB7z0C0QDncN7yD1K50c4C88VPofWaCQ0gNXqO/Ac1dr/xLF/46iNF9Y+dBwq7siBO9wEh20WFHMaRpeLOg==", "requires": { "@babel/runtime": "^7.12.5", "another-json": "^0.2.0", @@ -2137,7 +2129,7 @@ "bs58": "^4.0.1", "content-type": "^1.0.4", "loglevel": "^1.7.1", - "qs": "^6.9.4", + "qs": "^6.9.6", "request": "^2.88.2", "unhomoglyph": "^1.0.6" }, @@ -2806,7 +2798,6 @@ "version": "13.1.0", "resolved": "https://registry.npmjs.org/prom-client/-/prom-client-13.1.0.tgz", "integrity": "sha512-jT9VccZCWrJWXdyEtQddCDszYsiuWj5T0ekrPszi/WEegj3IZy6Mm09iOOVM86A4IKMWq8hZkT2dD9MaSe+sng==", - "dev": true, "requires": { "tdigest": "^0.1.1" } diff --git a/package.json b/package.json index f9c62ca4c..fab1dada0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "matrix-appservice-slack", - "version": "1.7.0-rc1", + "version": "1.7.0", "description": "A Matrix <--> Slack bridge", "main": "app.js", "scripts": { @@ -36,7 +36,7 @@ "chai": "^4.2.0", "escape-string-regexp": "^4.0.0", "matrix-appservice": "^0.7.1", - "matrix-appservice-bridge": "v2.5.0-rc1", + "matrix-appservice-bridge": "v2.5.0", "minimist": "^1.2.5", "nedb": "^1.8.0", "node-emoji": "^1.10.0",