From ec3a3bd7b229a1d772e3b43b96775d0e9f2a06de Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 16 Feb 2022 09:53:07 -0600
Subject: [PATCH] Upgrade vm2 (a subdependency) to 3.9.7

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Evan Hahn <evanhahn@signal.org>
---
 ts/util/lint/exceptions.json | 34 ++++++++++++++++++++++------------
 yarn.lock                    | 22 +++++++++++++++-------
 2 files changed, 37 insertions(+), 19 deletions(-)

diff --git a/ts/util/lint/exceptions.json b/ts/util/lint/exceptions.json
index 4de27b3313..5fe30a675f 100644
--- a/ts/util/lint/exceptions.json
+++ b/ts/util/lint/exceptions.json
@@ -6969,24 +6969,34 @@
   },
   {
     "rule": "eval",
-    "path": "node_modules/vm2/lib/main.js",
+    "path": "node_modules/vm2/lib/nodevm.js",
     "line": "\t * @param {boolean} [options.eval=true] - Allow the dynamic evaluation of code via eval(code) or Function(code)().<br>",
-    "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)().<br>",
-    "reasonCategory": "exampleCode",
-    "updated": "2021-09-02T23:51:29.928Z"
+    "reasonCategory": "falseMatch",
+    "updated": "2022-02-16T15:30:35.122Z",
+    "reasonDetail": "falseMatch"
   },
   {
     "rule": "jQuery-wrap(",
-    "path": "node_modules/vm2/lib/main.js",
+    "path": "node_modules/vm2/lib/script.js",
     "line": "\twrap(prefix, suffix) {",
     "reasonCategory": "falseMatch",
-    "updated": "2021-09-02T23:51:29.928Z"
+    "updated": "2022-02-16T15:30:35.122Z"
+  },
+  {
+    "rule": "eval",
+    "path": "node_modules/vm2/lib/vm.js",
+    "line": "\t * @param {boolean} [options.eval=true] - Allow the dynamic evaluation of code via eval(code) or Function(code)().<br>",
+    "reasonCategory": "falseMatch",
+    "updated": "2022-02-16T15:30:35.122Z",
+    "reasonDetail": "This is a comment."
+  },
+  {
+    "rule": "jQuery-$(",
+    "path": "node_modules/vm2/node_modules/acorn/dist/acorn.js",
+    "line": "  // $$('#table-binary-unicode-properties > figure > table > tbody > tr > td:nth-child(1) code').map(el => el.innerText)",
+    "reasonCategory": "falseMatch",
+    "updated": "2022-02-16T15:30:35.122Z",
+    "reasonDetail": "This is a comment."
   },
   {
     "rule": "jQuery-wrap(",
diff --git a/yarn.lock b/yarn.lock
index f4098102b1..6ab4b0ba72 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3002,6 +3002,11 @@ acorn-jsx@^5.2.0:
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.2.0.tgz#4c66069173d6fdd68ed85239fc256226182b2ebe"
   integrity sha512-HiUX/+K2YpkpJ+SzBffkM/AQ2YE03S0U1kjTLVpoJdhZMOWy8qvXVN9JdLqv2QsaQ6MPYQIuNmwD8zOiYUofLQ==
 
+acorn-walk@^8.2.0:
+  version "8.2.0"
+  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1"
+  integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==
+
 acorn@^6.2.1:
   version "6.4.1"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.1.tgz#531e58ba3f51b9dacb9a6646ca4debf5b14ca474"
@@ -3012,10 +3017,10 @@ acorn@^7.4.0:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.0.tgz#e1ad486e6c54501634c6c397c5c121daa383607c"
   integrity sha512-+G7P8jJmCHr+S+cLfQxygbWhXy+8YTVGzAkpEbcLo2mLoL7tij/VG41QSHACSf5QgYRhMZYHuNc6drJaO0Da+w==
 
-acorn@^8.0.4:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.1.0.tgz#52311fd7037ae119cbb134309e901aa46295b3fe"
-  integrity sha512-LWCF/Wn0nfHOmJ9rzQApGnxnvgfROzGilS8936rqN/lfcYkY9MYZzdMqN+2NJ4SlTc+m5HiSa+kNfDtI64dwUA==
+acorn@^8.0.4, acorn@^8.7.0:
+  version "8.7.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.0.tgz#90951fde0f8f09df93549481e5fc141445b791cf"
+  integrity sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==
 
 address@1.1.0:
   version "1.1.0"
@@ -14967,9 +14972,12 @@ vm-browserify@^1.0.1:
   integrity sha512-iq+S7vZJE60yejDYM0ek6zg308+UZsdtPExWP9VZoCFCz1zkJoXFnAX7aZfd/ZwrkidzdUZL0C/ryW+JwAiIGw==
 
 vm2@^3.9.3:
-  version "3.9.5"
-  resolved "https://registry.yarnpkg.com/vm2/-/vm2-3.9.5.tgz#5288044860b4bbace443101fcd3bddb2a0aa2496"
-  integrity sha512-LuCAHZN75H9tdrAiLFf030oW7nJV5xwNMuk1ymOZwopmuK3d2H4L1Kv4+GFHgarKiLfXXLFU+7LDABHnwOkWng==
+  version "3.9.7"
+  resolved "https://registry.yarnpkg.com/vm2/-/vm2-3.9.7.tgz#bb87aa677c97c61e23a6cb6547e44e990517a6f6"
+  integrity sha512-g/GZ7V0Mlmch3eDVOATvAXr1GsJNg6kQ5PjvYy3HbJMCRn5slNbo/u73Uy7r5yUej1cRa3ZjtoVwcWSQuQ/fow==
+  dependencies:
+    acorn "^8.7.0"
+    acorn-walk "^8.2.0"
 
 warning@^3.0.0:
   version "3.0.0"