diff --git a/ACKNOWLEDGMENTS.md b/ACKNOWLEDGMENTS.md
index ce8d9deff..272d5988e 100644
--- a/ACKNOWLEDGMENTS.md
+++ b/ACKNOWLEDGMENTS.md
@@ -21,54 +21,6 @@ Signal Desktop makes use of the following open source projects.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-## @types/pino
-
- MIT License
-
- Copyright (c) Microsoft Corporation.
-
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to deal
- in the Software without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included in all
- copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- SOFTWARE
-
-## @types/pino-multi-stream
-
- MIT License
-
- Copyright (c) Microsoft Corporation.
-
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to deal
- in the Software without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included in all
- copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- SOFTWARE
-
## abort-controller
MIT License
diff --git a/package.json b/package.json
index 5accbafd8..4582ff8c8 100644
--- a/package.json
+++ b/package.json
@@ -75,8 +75,6 @@
"@popperjs/core": "2.9.2",
"@signalapp/signal-client": "0.9.0",
"@sindresorhus/is": "0.8.0",
- "@types/pino": "6.3.6",
- "@types/pino-multi-stream": "5.1.0",
"abort-controller": "3.0.0",
"array-move": "2.1.0",
"axe-core": "4.1.4",
@@ -129,7 +127,7 @@
"pino": "6.11.1",
"pino-multi-stream": "5.3.0",
"protobufjs": "6.10.2",
- "proxy-agent": "4.0.1",
+ "proxy-agent": "5.0.0",
"quill": "1.3.7",
"quill-delta": "4.0.1",
"react": "16.8.3",
@@ -210,6 +208,8 @@
"@types/node-forge": "0.9.5",
"@types/normalize-path": "3.0.0",
"@types/pify": "3.0.2",
+ "@types/pino": "6.3.6",
+ "@types/pino-multi-stream": "5.1.0",
"@types/quill": "1.3.10",
"@types/react": "16.8.5",
"@types/react-dom": "16.8.2",
diff --git a/ts/util/lint/exceptions.json b/ts/util/lint/exceptions.json
index 03337fdbd..06a44cf4b 100644
--- a/ts/util/lint/exceptions.json
+++ b/ts/util/lint/exceptions.json
@@ -12603,6 +12603,27 @@
"updated": "2020-08-26T00:10:28.628Z",
"reasonDetail": "isn't jquery"
},
+ {
+ "rule": "eval",
+ "path": "node_modules/vm2/lib/main.js",
+ "line": "\t * @param {boolean} [options.eval=true] - Allow the dynamic evaluation of code via eval(code) or Function(code)().
",
+ "reasonCategory": "exampleCode",
+ "updated": "2021-09-02T23:51:29.928Z"
+ },
+ {
+ "rule": "eval",
+ "path": "node_modules/vm2/lib/main.js",
+ "line": "\t * @param {boolean} [options.eval=true] - Allow the dynamic evaluation of code via eval(code) or Function(code)().
",
+ "reasonCategory": "exampleCode",
+ "updated": "2021-09-02T23:51:29.928Z"
+ },
+ {
+ "rule": "jQuery-wrap(",
+ "path": "node_modules/vm2/lib/main.js",
+ "line": "\twrap(prefix, suffix) {",
+ "reasonCategory": "falseMatch",
+ "updated": "2021-09-02T23:51:29.928Z"
+ },
{
"rule": "jQuery-wrap(",
"path": "node_modules/webpack-log/node_modules/ansi-colors/index.js",
diff --git a/yarn.lock b/yarn.lock
index 30af384e0..06322da51 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6656,14 +6656,15 @@ degenerator@^1.0.4:
escodegen "1.x.x"
esprima "3.x.x"
-degenerator@^2.2.0:
- version "2.2.0"
- resolved "https://registry.yarnpkg.com/degenerator/-/degenerator-2.2.0.tgz#49e98c11fa0293c5b26edfbb52f15729afcdb254"
- integrity sha512-aiQcQowF01RxFI4ZLFMpzyotbQonhNpBao6dkI8JPk5a+hmSjR5ErHp2CQySmQe8os3VBqLCIh87nDBgZXvsmg==
+degenerator@^3.0.1:
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/degenerator/-/degenerator-3.0.1.tgz#7ef78ec0c8577a544477308ddf1d2d6e88d51f5b"
+ integrity sha512-LFsIFEeLPlKvAKXu7j3ssIG6RT0TbI7/GhsqrI0DnHASEQjXQ0LUSYcjJteGgRGmZbl1TnMSxpNQIAiJ7Du5TQ==
dependencies:
ast-types "^0.13.2"
escodegen "^1.8.1"
esprima "^4.0.0"
+ vm2 "^3.9.3"
del@^4.1.1:
version "4.1.1"
@@ -13419,10 +13420,10 @@ pac-proxy-agent@^3.0.1:
raw-body "^2.2.0"
socks-proxy-agent "^4.0.1"
-pac-proxy-agent@^4.1.0:
- version "4.1.0"
- resolved "https://registry.yarnpkg.com/pac-proxy-agent/-/pac-proxy-agent-4.1.0.tgz#66883eeabadc915fc5e95457324cb0f0ac78defb"
- integrity sha512-ejNgYm2HTXSIYX9eFlkvqFp8hyJ374uDf0Zq5YUAifiSh1D6fo+iBivQZirGvVv8dCYUsLhmLBRhlAYvBKI5+Q==
+pac-proxy-agent@^5.0.0:
+ version "5.0.0"
+ resolved "https://registry.yarnpkg.com/pac-proxy-agent/-/pac-proxy-agent-5.0.0.tgz#b718f76475a6a5415c2efbe256c1c971c84f635e"
+ integrity sha512-CcFG3ZtnxO8McDigozwE3AqAw15zDvGH+OjXO4kzf7IkEKkQ4gxQ+3sdF50WmhQ4P/bVusXcqNE2S3XrNURwzQ==
dependencies:
"@tootallnate/once" "1"
agent-base "6"
@@ -13430,7 +13431,7 @@ pac-proxy-agent@^4.1.0:
get-uri "3"
http-proxy-agent "^4.0.1"
https-proxy-agent "5"
- pac-resolver "^4.1.0"
+ pac-resolver "^5.0.0"
raw-body "^2.2.0"
socks-proxy-agent "5"
@@ -13444,12 +13445,12 @@ pac-resolver@^3.0.0:
netmask "^1.0.6"
thunkify "^2.1.2"
-pac-resolver@^4.1.0:
- version "4.2.0"
- resolved "https://registry.yarnpkg.com/pac-resolver/-/pac-resolver-4.2.0.tgz#b82bcb9992d48166920bc83c7542abb454bd9bdd"
- integrity sha512-rPACZdUyuxT5Io/gFKUeeZFfE5T7ve7cAkE5TUZRRfuKP0u5Hocwe48X7ZEm6mYB+bTB0Qf+xlVlA/RM/i6RCQ==
+pac-resolver@^5.0.0:
+ version "5.0.0"
+ resolved "https://registry.yarnpkg.com/pac-resolver/-/pac-resolver-5.0.0.tgz#1d717a127b3d7a9407a16d6e1b012b13b9ba8dc0"
+ integrity sha512-H+/A6KitiHNNW+bxBKREk2MCGSxljfqRX76NjummWEYIat7ldVXRU3dhRIE3iXZ0nvGBk6smv3nntxKkzRL8NA==
dependencies:
- degenerator "^2.2.0"
+ degenerator "^3.0.1"
ip "^1.1.5"
netmask "^2.0.1"
@@ -14316,17 +14317,17 @@ proxy-addr@~2.0.5:
forwarded "~0.1.2"
ipaddr.js "1.9.0"
-proxy-agent@4.0.1:
- version "4.0.1"
- resolved "https://registry.yarnpkg.com/proxy-agent/-/proxy-agent-4.0.1.tgz#326c3250776c7044cd19655ccbfadf2e065a045c"
- integrity sha512-ODnQnW2jc/FUVwHHuaZEfN5otg/fMbvMxz9nMSUQfJ9JU7q2SZvSULSsjLloVgJOiv9yhc8GlNMKc4GkFmcVEA==
+proxy-agent@5.0.0:
+ version "5.0.0"
+ resolved "https://registry.yarnpkg.com/proxy-agent/-/proxy-agent-5.0.0.tgz#d31405c10d6e8431fde96cba7a0c027ce01d633b"
+ integrity sha512-gkH7BkvLVkSfX9Dk27W6TyNOWWZWRilRfk1XxGNWOYJ2TuedAv1yFpCaU9QSBmBe716XOTNpYNOzhysyw8xn7g==
dependencies:
agent-base "^6.0.0"
debug "4"
http-proxy-agent "^4.0.0"
https-proxy-agent "^5.0.0"
lru-cache "^5.1.1"
- pac-proxy-agent "^4.1.0"
+ pac-proxy-agent "^5.0.0"
proxy-from-env "^1.0.0"
socks-proxy-agent "^5.0.0"
@@ -18334,6 +18335,11 @@ vm-browserify@^1.0.1:
resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.0.tgz#bd76d6a23323e2ca8ffa12028dc04559c75f9019"
integrity sha512-iq+S7vZJE60yejDYM0ek6zg308+UZsdtPExWP9VZoCFCz1zkJoXFnAX7aZfd/ZwrkidzdUZL0C/ryW+JwAiIGw==
+vm2@^3.9.3:
+ version "3.9.3"
+ resolved "https://registry.yarnpkg.com/vm2/-/vm2-3.9.3.tgz#29917f6cc081cc43a3f580c26c5b553fd3c91f40"
+ integrity sha512-smLS+18RjXYMl9joyJxMNI9l4w7biW8ilSDaVRvFBDwOH8P0BK1ognFQTpg0wyQ6wIKLTblHJvROW692L/E53Q==
+
vscode-languageserver-types@^3.5.0:
version "3.15.1"
resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.15.1.tgz#17be71d78d2f6236d414f0001ce1ef4d23e6b6de"