Skip to content

Commit ad90b12

Browse files
authored
Update matrix-appservice-bridge to 11.0.0 (#1083)
* Update matrix-appservice-bridge to 11.0.0 * Deduplicate express * Add changelog
1 parent d9d8d18 commit ad90b12

File tree

3 files changed

+22
-125
lines changed

3 files changed

+22
-125
lines changed

changelog.d/1083.misc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Update matrix-appservice-bridge to 11.0.0.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
"ioredis": "^5.6.1",
6464
"jira-client": "^8.2.2",
6565
"markdown-it": "^14.0.0",
66-
"matrix-appservice-bridge": "^10.3.3",
66+
"matrix-appservice-bridge": "^11.0.0",
6767
"matrix-bot-sdk": "npm:@vector-im/[email protected]",
6868
"matrix-widget-api": "^1.10.0",
6969
"micromatch": "^4.0.8",

yarn.lock

Lines changed: 20 additions & 124 deletions
Original file line numberDiff line numberDiff line change
@@ -938,14 +938,6 @@
938938
dependencies:
939939
"@lezer/common" "^1.0.0"
940940

941-
"@matrix-org/[email protected]":
942-
version "0.3.0-beta.1"
943-
resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-nodejs/-/matrix-sdk-crypto-nodejs-0.3.0-beta.1.tgz#e5dc6b505d42ddbb571e896cdc434e5ad5e3e1a6"
944-
integrity sha512-FfVjTVuY/HUUx1j3P60iGp7dnHLTXIvRMBHrE0gV4mMIXlH5wO+yqjvDqlKxIZSoW7jfdoRflSz9JnXDob2ocg==
945-
dependencies:
946-
https-proxy-agent "^7.0.5"
947-
node-downloader-helper "^2.1.9"
948-
949941
"@matrix-org/[email protected]":
950942
version "0.4.0-beta.1"
951943
resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-nodejs/-/matrix-sdk-crypto-nodejs-0.4.0-beta.1.tgz#2f467de06779010d45ed616cd02f2ae50cfc2646"
@@ -2291,17 +2283,17 @@
22912283
ts-xor "^1.3.0"
22922284
vaul "^1.0.0"
22932285

2294-
"@vector-im/matrix-bot-sdk@^0.7.1-element.11":
2295-
version "0.7.1-element.11"
2296-
resolved "https://registry.yarnpkg.com/@vector-im/matrix-bot-sdk/-/matrix-bot-sdk-0.7.1-element.11.tgz#5827d9d381d0290d6f87039840584d5c2d61b403"
2297-
integrity sha512-+Btt441GaegnuGO4b2JaGHNu4FYxy1Zi8vJxMk9VsSkGvZENNQB84hzXqfpKAk5UF2S5uGchCzN9TsXdZkWrWg==
2286+
"@vector-im/[email protected].14":
2287+
version "0.7.1-element.14"
2288+
resolved "https://registry.yarnpkg.com/@vector-im/matrix-bot-sdk/-/matrix-bot-sdk-0.7.1-element.14.tgz#369ca2bd8f5da1c7950500e32e364bc05675f0dd"
2289+
integrity sha512-iuuFc6ruVwFFAiizkYtvHo+yyUekjcoCP+/NhxKw1ko/LyVkUezT63FbFAYv5NNNdT690R/jOdImWCeKQkV/BQ==
22982290
dependencies:
2299-
"@matrix-org/matrix-sdk-crypto-nodejs" "0.3.0-beta.1"
2291+
"@matrix-org/matrix-sdk-crypto-nodejs" "0.4.0-beta.1"
23002292
"@types/express" "^4.17.21"
23012293
another-json "^0.2.0"
23022294
async-lock "^1.4.0"
23032295
chalk "4"
2304-
express "^4.18.2"
2296+
express "^4.21.2"
23052297
glob-to-regexp "^0.4.1"
23062298
hash.js "^1.1.7"
23072299
html-to-text "^9.0.5"
@@ -3263,11 +3255,6 @@ [email protected]:
32633255
resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
32643256
integrity sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==
32653257

3266-
3267-
version "0.6.0"
3268-
resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.6.0.tgz#2798b04b071b0ecbff0dbb62a505a8efa4e19051"
3269-
integrity sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==
3270-
32713258
32723259
version "0.7.1"
32733260
resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.7.1.tgz#2f73c42142d5d5cf71310a74fc4ae61670e5dbc9"
@@ -4131,44 +4118,7 @@ express-rate-limit@^7.1.5:
41314118
resolved "https://registry.yarnpkg.com/express-rate-limit/-/express-rate-limit-7.5.0.tgz#6a67990a724b4fbbc69119419feef50c51e8b28f"
41324119
integrity sha512-eB5zbQh5h+VenMPM3fh+nw1YExi5nMr6HUCR62ELSP11huvxm/Uir1H1QEyTkk5QX6A58pX6NmaTMceKZ0Eodg==
41334120

4134-
express@^4.18.1, express@^4.18.2:
4135-
version "4.20.0"
4136-
resolved "https://registry.yarnpkg.com/express/-/express-4.20.0.tgz#f1d08e591fcec770c07be4767af8eb9bcfd67c48"
4137-
integrity sha512-pLdae7I6QqShF5PnNTCVn4hI91Dx0Grkn2+IAsMTgMIKuQVte2dN9PeGSSAME2FR8anOhVA62QDIUaWVfEXVLw==
4138-
dependencies:
4139-
accepts "~1.3.8"
4140-
array-flatten "1.1.1"
4141-
body-parser "1.20.3"
4142-
content-disposition "0.5.4"
4143-
content-type "~1.0.4"
4144-
cookie "0.6.0"
4145-
cookie-signature "1.0.6"
4146-
debug "2.6.9"
4147-
depd "2.0.0"
4148-
encodeurl "~2.0.0"
4149-
escape-html "~1.0.3"
4150-
etag "~1.8.1"
4151-
finalhandler "1.2.0"
4152-
fresh "0.5.2"
4153-
http-errors "2.0.0"
4154-
merge-descriptors "1.0.3"
4155-
methods "~1.1.2"
4156-
on-finished "2.4.1"
4157-
parseurl "~1.3.3"
4158-
path-to-regexp "0.1.10"
4159-
proxy-addr "~2.0.7"
4160-
qs "6.11.0"
4161-
range-parser "~1.2.1"
4162-
safe-buffer "5.2.1"
4163-
send "0.19.0"
4164-
serve-static "1.16.0"
4165-
setprototypeof "1.2.0"
4166-
statuses "2.0.1"
4167-
type-is "~1.6.18"
4168-
utils-merge "1.0.1"
4169-
vary "~1.1.2"
4170-
4171-
express@^4.21.2:
4121+
express@^4.18.2, express@^4.21.2:
41724122
version "4.21.2"
41734123
resolved "https://registry.yarnpkg.com/express/-/express-4.21.2.tgz#cf250e48362174ead6cea4a566abef0162c1ec32"
41744124
integrity sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==
@@ -4301,19 +4251,6 @@ fill-range@^7.1.1:
43014251
dependencies:
43024252
to-regex-range "^5.0.1"
43034253

4304-
4305-
version "1.2.0"
4306-
resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.2.0.tgz#7d23fe5731b207b4640e4fcd00aec1f9207a7b32"
4307-
integrity sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==
4308-
dependencies:
4309-
debug "2.6.9"
4310-
encodeurl "~1.0.2"
4311-
escape-html "~1.0.3"
4312-
on-finished "2.4.1"
4313-
parseurl "~1.3.3"
4314-
statuses "2.0.1"
4315-
unpipe "~1.0.0"
4316-
43174254
43184255
version "1.3.1"
43194256
resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.3.1.tgz#0c575f1d1d324ddd1da35ad7ece3df7d19088019"
@@ -5406,7 +5343,7 @@ js-yaml@^3.13.1:
54065343
argparse "^1.0.7"
54075344
esprima "^4.0.0"
54085345

5409-
js-yaml@^4.0.0, js-yaml@^4.1.0:
5346+
js-yaml@^4.1.0:
54105347
version "4.1.0"
54115348
resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
54125349
integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
@@ -5809,22 +5746,22 @@ markdown-it@^14.0.0:
58095746
punycode.js "^2.3.1"
58105747
uc.micro "^2.1.0"
58115748

5812-
matrix-appservice-bridge@^10.3.3:
5813-
version "10.3.3"
5814-
resolved "https://registry.yarnpkg.com/matrix-appservice-bridge/-/matrix-appservice-bridge-10.3.3.tgz#7957cedee6b4e70b02ce837fdd8164b7ebbe8fd4"
5815-
integrity sha512-zgrCvc6ZJhtQQZQ5N8MJPQ3tatYkTqQXWo9KIQndtmOFTFaFPHHbP0bGnL96YPsc+5nI6HU6npCyoHzJtEfN1g==
5749+
matrix-appservice-bridge@^11.0.0:
5750+
version "11.0.0"
5751+
resolved "https://registry.yarnpkg.com/matrix-appservice-bridge/-/matrix-appservice-bridge-11.0.0.tgz#8a1493b76d77ce2f327e83f8640ecf8535ddfb2d"
5752+
integrity sha512-X7X9oQC1SjGVBZ7h0YuWYvqRXpOHUa9BueMUy4PwXj7ofP2eEQNqIOQFlynWli/Rz0fFAeYptFMRFqeVcMOl2Q==
58165753
dependencies:
58175754
"@alloc/quick-lru" "^5.2.0"
58185755
"@types/nedb" "^1.8.16"
5819-
"@vector-im/matrix-bot-sdk" "^0.7.1-element.11"
5756+
"@vector-im/matrix-bot-sdk" "0.7.1-element.14"
58205757
chalk "^4.1.0"
58215758
express "^4.18.2"
58225759
express-rate-limit "^7.1.5"
58235760
extend "^3.0.2"
58245761
ip-cidr "^3.0.0"
58255762
is-my-json-valid "^2.20.5"
5826-
js-yaml "^4.0.0"
5827-
matrix-appservice "^2.0.0"
5763+
js-yaml "^4.1.0"
5764+
matrix-appservice "^3.0.0"
58285765
nopt "^5.0.0"
58295766
p-queue "^6.6.2"
58305767
pkginfo "^0.4.1"
@@ -5833,13 +5770,13 @@ matrix-appservice-bridge@^10.3.3:
58335770
winston "^3.11.0"
58345771
winston-daily-rotate-file "^4.5.1"
58355772

5836-
matrix-appservice@^2.0.0:
5837-
version "2.0.0"
5838-
resolved "https://registry.yarnpkg.com/matrix-appservice/-/matrix-appservice-2.0.0.tgz#74b58e27477b4c1359da7c61878b7d18c6075261"
5839-
integrity sha512-HCIuJ5i0YuO8b0dMyGe5dqlsE4f3RzHU0MuMg/2gGAZ4HL3r7aSWOFbyIWStSSUrk1qCa9Eml0i4EnEi0pOtdA==
5773+
matrix-appservice@^3.0.0:
5774+
version "3.0.0"
5775+
resolved "https://registry.yarnpkg.com/matrix-appservice/-/matrix-appservice-3.0.0.tgz#cd5a68fb1f8b88780a829f752d1c20df5514c3f8"
5776+
integrity sha512-E5NMb4jtDnuXtPIHnLZ9RciLPPROzt94yPzuDsCXPKCRHhKpUQh6Ik6mPYM3fOMIGZ4sHxUtKdyJwP3Y+HVCVg==
58405777
dependencies:
58415778
body-parser "^1.19.0"
5842-
express "^4.18.1"
5779+
express "^4.18.2"
58435780
js-yaml "^4.1.0"
58445781
morgan "^1.10.0"
58455782

@@ -6420,11 +6357,6 @@ path-scurry@^2.0.0:
64206357
lru-cache "^11.0.0"
64216358
minipass "^7.1.2"
64226359

6423-
6424-
version "0.1.10"
6425-
resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.10.tgz#67e9108c5c0551b9e5326064387de4763c4d5f8b"
6426-
integrity sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w==
6427-
64286360
64296361
version "0.1.12"
64306362
resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.12.tgz#d5e1a12e478a976d432ef3c58d534b9923164bb7"
@@ -6668,13 +6600,6 @@ punycode@^2.1.0, punycode@^2.1.1:
66686600
resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.1.tgz#027422e2faec0b25e1549c3e1bd8309b9133b6e5"
66696601
integrity sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==
66706602

6671-
6672-
version "6.11.0"
6673-
resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.0.tgz#fd0d963446f7a65e1367e01abd85429453f0c37a"
6674-
integrity sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==
6675-
dependencies:
6676-
side-channel "^1.0.4"
6677-
66786603
66796604
version "6.13.0"
66806605
resolved "https://registry.yarnpkg.com/qs/-/qs-6.13.0.tgz#6ca3bd58439f7e245655798997787b0d88a51906"
@@ -7153,25 +7078,6 @@ semver@^7.6.0:
71537078
resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143"
71547079
integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==
71557080

7156-
7157-
version "0.18.0"
7158-
resolved "https://registry.yarnpkg.com/send/-/send-0.18.0.tgz#670167cc654b05f5aa4a767f9113bb371bc706be"
7159-
integrity sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==
7160-
dependencies:
7161-
debug "2.6.9"
7162-
depd "2.0.0"
7163-
destroy "1.2.0"
7164-
encodeurl "~1.0.2"
7165-
escape-html "~1.0.3"
7166-
etag "~1.8.1"
7167-
fresh "0.5.2"
7168-
http-errors "2.0.0"
7169-
mime "1.6.0"
7170-
ms "2.1.3"
7171-
on-finished "2.4.1"
7172-
range-parser "~1.2.1"
7173-
statuses "2.0.1"
7174-
71757081
71767082
version "0.19.0"
71777083
resolved "https://registry.yarnpkg.com/send/-/send-0.19.0.tgz#bbc5a388c8ea6c048967049dbeac0e4a3f09d7f8"
@@ -7198,16 +7104,6 @@ serialize-javascript@^6.0.2:
71987104
dependencies:
71997105
randombytes "^2.1.0"
72007106

7201-
7202-
version "1.16.0"
7203-
resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.16.0.tgz#2bf4ed49f8af311b519c46f272bf6ac3baf38a92"
7204-
integrity sha512-pDLK8zwl2eKaYrs8mrPZBJua4hMplRWJ1tIFksVC3FtBEBnl8dxgeHtsaMS8DhS9i4fLObaon6ABoc4/hQGdPA==
7205-
dependencies:
7206-
encodeurl "~1.0.2"
7207-
escape-html "~1.0.3"
7208-
parseurl "~1.3.3"
7209-
send "0.18.0"
7210-
72117107
72127108
version "1.16.2"
72137109
resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.16.2.tgz#b6a5343da47f6bdd2673848bf45754941e803296"

0 commit comments

Comments
 (0)