Update typescript to 4.8.4

ACKNOWLEDGMENTS.md

@@ -97,30 +97,6 @@ Signal Desktop makes use of the following open source projects.
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE
 
-## abort-controller
-
-    MIT License
-
-    Copyright (c) 2017 Toru Nagashima
-
-    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.
-
 ## array-move
 
     MIT License

package.json

@@ -84,12 +84,11 @@
   "dependencies": {
     "@formatjs/fast-memoize": "1.2.6",
     "@indutny/frameless-titlebar": "2.3.5",
-    "@popperjs/core": "2.9.2",
+    "@popperjs/core": "2.11.6",
-    "@react-spring/web": "9.4.5",
+    "@react-spring/web": "9.5.5",
     "@signalapp/libsignal-client": "0.21.1",
     "@sindresorhus/is": "0.8.0",
     "@types/fabric": "4.5.3",
-    "abort-controller": "3.0.0",
     "array-move": "2.1.0",
     "axe-core": "4.1.4",
     "backbone": "1.4.0",
@@ -236,8 +235,8 @@
     "@types/mkdirp": "0.5.2",
     "@types/mocha": "9.0.0",
     "@types/mustache": "4.1.2",
-    "@types/node": "16.11.29",
+    "@types/node": "16.18.3",
-    "@types/node-fetch": "2.5.7",
+    "@types/node-fetch": "2.6.2",
     "@types/normalize-path": "3.0.0",
     "@types/pify": "3.0.2",
     "@types/quill": "1.3.10",
@@ -308,7 +307,7 @@
     "ts-loader": "4.1.0",
     "ts-node": "8.3.0",
     "typed-scss-modules": "4.1.1",
-    "typescript": "4.6.2",
+    "typescript": "4.8.4",
     "webpack": "5.30.0",
     "webpack-cli": "4.9.2",
     "webpack-dev-server": "4.7.4"

patches/@types+backbone+1.4.5.patch

@@ -0,0 +1,13 @@
+diff --git a/node_modules/@types/backbone/index.d.ts b/node_modules/@types/backbone/index.d.ts
+index a172230..b85ab4c 100644
+--- a/node_modules/@types/backbone/index.d.ts
++++ b/node_modules/@types/backbone/index.d.ts
+@@ -218,7 +218,7 @@ declare namespace Backbone {
+      * E - Extensions to the model constructor options. You can accept additional constructor options
+      * by listing them in the E parameter.
+      */
+-    class Model<T = any, S = Backbone.ModelSetOptions, E = {}> extends ModelBase implements Events {
++    class Model<T extends Record<string, any> = any, S = Backbone.ModelSetOptions, E = {}> extends ModelBase implements Events {
+ 
+         /**
+         * Do not use, prefer TypeScript's extend functionality.

patches/@types+node-fetch+2.6.2.patch

@@ -0,0 +1,14 @@
+diff --git a/node_modules/@types/node-fetch/index.d.ts b/node_modules/@types/node-fetch/index.d.ts
+index 346d0b2..8b3efdd 100755
+--- a/node_modules/@types/node-fetch/index.d.ts
++++ b/node_modules/@types/node-fetch/index.d.ts
+@@ -19,7 +19,8 @@
+ import FormData = require('form-data');
+ import { RequestOptions } from "http";
+ import { URLSearchParams, URL } from "url";
+-import { AbortSignal } from "./externals";
++// Avoid type conflicts!
++// import { AbortSignal } from "./externals";
+ 
+ export class Request extends Body {
+     constructor(input: RequestInfo, init?: RequestInit);

ts/Intl.d.ts

@@ -1,33 +0,0 @@
-// Copyright 2021-2022 Signal Messenger, LLC
-// SPDX-License-Identifier: AGPL-3.0-only
-
-declare namespace Intl {
-  type SegmenterOptions = {
-    granularity?: 'grapheme' | 'word' | 'sentence';
-  };
-
-  type SegmentData = {
-    index: number;
-    input: string;
-    segment: string;
-    // According to [the proposal][0], `isWordLike` is a boolean when `granularity` is
-    //   "word" and undefined otherwise. There may be a more rigid way to enforce this
-    //   with TypeScript, but an optional property is okay for now.
-    //
-    // [0]: https://github.com/tc39/proposal-intl-segmenter/blob/e5f982f51cef810111dfeab835d6a934a7cae045/README.md
-    isWordLike?: boolean;
-  };
-
-  type Segments = {
-    containing(index: number): SegmentData;
-
-    [Symbol.iterator](): Iterator<SegmentData>;
-  };
-
-  // `Intl.Segmenter` is not yet in TypeScript's type definitions, so we add it.
-  class Segmenter {
-    constructor(locale?: string, options?: SegmenterOptions);
-
-    segment(str: string): Segments;
-  }
-}

ts/components/conversation/TimelineItem.tsx

@@ -240,11 +240,7 @@ export class TimelineItem extends React.PureComponent<PropsType> {
         );
       } else if (item.type === 'chatSessionRefreshed') {
         notification = (
-          <ChatSessionRefreshedNotification
+          <ChatSessionRefreshedNotification {...this.props} i18n={i18n} />
-            {...this.props}
-            {...item.data}
-            i18n={i18n}
-          />
         );
       } else if (item.type === 'deliveryIssue') {
         notification = (
@@ -297,13 +293,7 @@ export class TimelineItem extends React.PureComponent<PropsType> {
           <GroupV1Migration {...this.props} {...item.data} i18n={i18n} />
         );
       } else if (item.type === 'resetSessionNotification') {
-        notification = (
+        notification = <ResetSessionNotification {...this.props} i18n={i18n} />;
-          <ResetSessionNotification
-            {...this.props}
-            {...item.data}
-            i18n={i18n}
-          />
-        );
       } else if (item.type === 'profileChange') {
         notification = (
           <ProfileChangeNotification

ts/linkPreviews/linkPreviewFetch.ts

@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 
 import type { RequestInit, Response } from 'node-fetch';
-import type { AbortSignal as AbortSignalForNodeFetch } from 'abort-controller';
 import { blobToArrayBuffer } from 'blob-util';
 
 import type { MIMEType } from '../types/MIME';
@@ -450,7 +449,7 @@ export async function fetchLinkPreviewMetadata(
           Accept: 'text/html,application/xhtml+xml',
           'User-Agent': USER_AGENT,
         },
-        signal: abortSignal as AbortSignalForNodeFetch,
+        signal: abortSignal,
       },
       logger
     );
@@ -551,7 +550,7 @@ export async function fetchLinkPreviewImage(
           'User-Agent': USER_AGENT,
         },
         size: MAX_IMAGE_CONTENT_LENGTH,
-        signal: abortSignal as AbortSignalForNodeFetch,
+        signal: abortSignal,
       },
       logger
     );

ts/sql/Server.ts

@@ -355,7 +355,10 @@ type DatabaseQueryCache = Map<string, Statement<Array<unknown>>>;
 
 const statementCache = new WeakMap<Database, DatabaseQueryCache>();
 
-function prepare<T>(db: Database, query: string): Statement<T> {
+function prepare<T extends Array<unknown> | Record<string, unknown>>(
+  db: Database,
+  query: string
+): Statement<T> {
   let dbCache = statementCache.get(db);
   if (!dbCache) {
     dbCache = new Map();

ts/sql/main.ts

@@ -174,7 +174,13 @@ export class MainSQL {
       throw new Error('Not initialized');
     }
 
-    const { result, duration } = await this.send({
+    type SqlCallResult = Readonly<{
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      result: any;
+      duration: number;
+    }>;
+
+    const { result, duration } = await this.send<SqlCallResult>({
       type: 'sqlCall',
       method,
       args,

ts/test-electron/linkPreviews/linkPreviewFetch_test.ts

@@ -6,7 +6,6 @@ import { Response } from 'node-fetch';
 import * as sinon from 'sinon';
 import * as fs from 'fs';
 import * as path from 'path';
-import AbortController from 'abort-controller';
 import { IMAGE_JPEG, stringToMIMEType } from '../../types/MIME';
 import type { LoggerType } from '../../types/Logging';
 

ts/textsecure/WebAPI.ts

@@ -6,7 +6,6 @@
 /* eslint-disable no-restricted-syntax */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
-import AbortController from 'abort-controller';
 import type { Response } from 'node-fetch';
 import fetch from 'node-fetch';
 import ProxyAgent from 'proxy-agent';

ts/util/lint/exceptions.json

@@ -22,13 +22,6 @@
     "reasonCategory": "falseMatch",
     "updated": "2018-09-19T18:13:29.628Z"
   },
-  {
-    "rule": "React-useRef",
-    "path": "ts/components/conversation/TimelineMessage.tsx",
-    "line": "  const menuTriggerRef = useRef<Trigger | null>(null);",
-    "reasonCategory": "usageTrusted",
-    "updated": "2022-11-03T14:21:47.456Z"
-  },
   {
     "rule": "jQuery-globalEval(",
     "path": "components/mp3lameencoder/lib/Mp3LameEncoder.js",
@@ -644,42 +637,42 @@
   {
     "rule": "React-useRef",
     "path": "node_modules/@react-spring/shared/dist/react-spring-shared.cjs.dev.js",
-    "line": "  const committed = React.useRef();",
+    "line": "  const committed = react.useRef();",
     "reasonCategory": "usageTrusted",
     "updated": "2021-09-27T21:37:06.339Z"
   },
   {
     "rule": "React-useRef",
     "path": "node_modules/@react-spring/shared/dist/react-spring-shared.cjs.dev.js",
-    "line": "  const prevRef = React.useRef();",
+    "line": "  const prevRef = react.useRef();",
     "reasonCategory": "usageTrusted",
     "updated": "2021-09-27T21:37:06.339Z"
   },
   {
     "rule": "React-useRef",
     "path": "node_modules/@react-spring/shared/dist/react-spring-shared.cjs.dev.js",
-    "line": "  const isMounted = React.useRef(false);",
+    "line": "  const isMounted = react.useRef(false);",
     "reasonCategory": "usageTrusted",
     "updated": "2022-06-01T22:57:44.591Z"
   },
   {
     "rule": "React-useRef",
     "path": "node_modules/@react-spring/shared/dist/react-spring-shared.cjs.prod.js",
-    "line": "  const committed = React.useRef();",
+    "line": "  const committed = react.useRef();",
     "reasonCategory": "usageTrusted",
     "updated": "2021-09-27T21:37:06.339Z"
   },
   {
     "rule": "React-useRef",
     "path": "node_modules/@react-spring/shared/dist/react-spring-shared.cjs.prod.js",
-    "line": "  const prevRef = React.useRef();",
+    "line": "  const prevRef = react.useRef();",
     "reasonCategory": "usageTrusted",
     "updated": "2021-09-27T21:37:06.339Z"
   },
   {
     "rule": "React-useRef",
     "path": "node_modules/@react-spring/shared/dist/react-spring-shared.cjs.prod.js",
-    "line": "  const isMounted = React.useRef(false);",
+    "line": "  const isMounted = react.useRef(false);",
     "reasonCategory": "usageTrusted",
     "updated": "2022-06-01T22:57:44.591Z"
   },
@@ -9466,6 +9459,13 @@
     "updated": "2021-01-20T21:30:08.430Z",
     "reasonDetail": "Doesn't touch the DOM."
   },
+  {
+    "rule": "React-useRef",
+    "path": "ts/components/conversation/TimelineMessage.tsx",
+    "line": "  const menuTriggerRef = useRef<Trigger | null>(null);",
+    "reasonCategory": "usageTrusted",
+    "updated": "2022-11-03T14:21:47.456Z"
+  },
   {
     "rule": "React-useRef",
     "path": "ts/components/conversation/conversation-details/AddGroupMembersModal/ChooseGroupMembersModal.tsx",

ts/util/makeLookup.ts

@@ -1,17 +1,15 @@
-// Copyright 2019-2021 Signal Messenger, LLC
+// Copyright 2019-2022 Signal Messenger, LLC
 // SPDX-License-Identifier: AGPL-3.0-only
 
 export function makeLookup<T>(
   items: ReadonlyArray<T>,
   key: keyof T
 ): Record<string, T> {
-  return (items || []).reduce((lookup, item) => {
+  const result: Record<string, T> = {};
-    if (item !== undefined && item[key] !== undefined) {
+  for (const item of items) {
-      // The force cast is necessary if we want the keyof T above, and the flexibility
+    if (item != null && item[key] !== undefined) {
-      //   to pass anything in. And of course we're modifying a parameter!
+      result[String(item[key])] = item;
-      // eslint-disable-next-line no-param-reassign
-      lookup[String(item[key])] = item;
     }
-    return lookup;
+  }
-  }, {} as Record<string, T>);
+  return result;
 }

ts/util/popperUtil.ts

@@ -22,7 +22,10 @@ export const offsetDistanceModifier = (
  * Should probably be used with the "top-start", "top-end", "bottom-start", or
  * "bottom-end" placement.
  */
-export const sameWidthModifier: Modifier<'sameWidth', unknown> = {
+export const sameWidthModifier: Modifier<
+  'sameWidth',
+  Record<string, unknown>
+> = {
   name: 'sameWidth',
   enabled: true,
   phase: 'write',

yarn.lock

@@ -1873,10 +1873,10 @@
     schema-utils "^3.0.0"
     source-map "^0.7.3"
 
-"@popperjs/core@2.9.2":
+"@popperjs/core@2.11.6":
-  version "2.9.2"
+  version "2.11.6"
-  resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.9.2.tgz#adea7b6953cbb34651766b0548468e743c6a2353"
+  resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.6.tgz#cee20bd55e68a1720bdab363ecf0c821ded4cd45"
-  integrity sha512-VZMYa7+fXHdwIq1TDhSXoVmSPEGM/aa+6Aiq3nVVJ9bXr24zScr+NlKFKC3iPljA7ho/GAZr+d2jOf5GIRC30Q==
+  integrity sha512-50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw==
 
 "@protobufjs/aspromise@^1.1.1", "@protobufjs/aspromise@^1.1.2":
   version "1.1.2"
@@ -1921,51 +1921,51 @@
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570"
 
-"@react-spring/animated@~9.4.5":
+"@react-spring/animated@~9.5.5":
-  version "9.4.5"
+  version "9.5.5"
-  resolved "https://registry.yarnpkg.com/@react-spring/animated/-/animated-9.4.5.tgz#dd9921c716a4f4a3ed29491e0c0c9f8ca0eb1a54"
+  resolved "https://registry.yarnpkg.com/@react-spring/animated/-/animated-9.5.5.tgz#d3bfd0f62ed13a337463a55d2c93bb23c15bbf3e"
-  integrity sha512-KWqrtvJSMx6Fj9nMJkhTwM9r6LIriExDRV6YHZV9HKQsaolUFppgkOXpC+rsL1JEtEvKv6EkLLmSqHTnuYjiIA==
+  integrity sha512-glzViz7syQ3CE6BQOwAyr75cgh0qsihm5lkaf24I0DfU63cMm/3+br299UEYkuaHNmfDfM414uktiPlZCNJbQA==
   dependencies:
-    "@react-spring/shared" "~9.4.5"
+    "@react-spring/shared" "~9.5.5"
-    "@react-spring/types" "~9.4.5"
+    "@react-spring/types" "~9.5.5"
 
-"@react-spring/core@~9.4.5":
+"@react-spring/core@~9.5.5":
-  version "9.4.5"
+  version "9.5.5"
-  resolved "https://registry.yarnpkg.com/@react-spring/core/-/core-9.4.5.tgz#4616e1adc18dd10f5731f100ebdbe9518b89ba3c"
+  resolved "https://registry.yarnpkg.com/@react-spring/core/-/core-9.5.5.tgz#1d8a4c64630ee26b2295361e1eedfd716a85b4ae"
-  integrity sha512-83u3FzfQmGMJFwZLAJSwF24/ZJctwUkWtyPD7KYtNagrFeQKUH1I05ZuhmCmqW+2w1KDW1SFWQ43RawqfXKiiQ==
+  integrity sha512-shaJYb3iX18Au6gkk8ahaF0qx0LpS0Yd+ajb4asBaAQf6WPGuEdJsbsNSgei1/O13JyEATsJl20lkjeslJPMYA==
   dependencies:
-    "@react-spring/animated" "~9.4.5"
+    "@react-spring/animated" "~9.5.5"
-    "@react-spring/rafz" "~9.4.5"
+    "@react-spring/rafz" "~9.5.5"
-    "@react-spring/shared" "~9.4.5"
+    "@react-spring/shared" "~9.5.5"
-    "@react-spring/types" "~9.4.5"
+    "@react-spring/types" "~9.5.5"
 
-"@react-spring/rafz@~9.4.5":
+"@react-spring/rafz@~9.5.5":
-  version "9.4.5"
+  version "9.5.5"
-  resolved "https://registry.yarnpkg.com/@react-spring/rafz/-/rafz-9.4.5.tgz#84f809f287f2a66bbfbc66195db340482f886bd7"
+  resolved "https://registry.yarnpkg.com/@react-spring/rafz/-/rafz-9.5.5.tgz#62a49c5e294104b79db2a8afdf4f3a274c7f44ca"
-  integrity sha512-swGsutMwvnoyTRxvqhfJBtGM8Ipx6ks0RkIpNX9F/U7XmyPvBMGd3GgX/mqxZUpdlsuI1zr/jiYw+GXZxAlLcQ==
+  integrity sha512-F/CLwB0d10jL6My5vgzRQxCNY2RNyDJZedRBK7FsngdCmzoq3V4OqqNc/9voJb9qRC2wd55oGXUeXv2eIaFmsw==
 
-"@react-spring/shared@~9.4.5":
+"@react-spring/shared@~9.5.5":
-  version "9.4.5"
+  version "9.5.5"
-  resolved "https://registry.yarnpkg.com/@react-spring/shared/-/shared-9.4.5.tgz#4c3ad817bca547984fb1539204d752a412a6d829"
+  resolved "https://registry.yarnpkg.com/@react-spring/shared/-/shared-9.5.5.tgz#9be0b391d546e3e184a24ecbaf40acbaeab7fc73"
-  integrity sha512-JhMh3nFKsqyag0KM5IIM8BQANGscTdd0mMv3BXsUiMZrcjQTskyfnv5qxEeGWbJGGar52qr5kHuBHtCjQOzniA==
+  integrity sha512-YwW70Pa/YXPOwTutExHZmMQSHcNC90kJOnNR4G4mCDNV99hE98jWkIPDOsgqbYx3amIglcFPiYKMaQuGdr8dyQ==
   dependencies:
-    "@react-spring/rafz" "~9.4.5"
+    "@react-spring/rafz" "~9.5.5"
-    "@react-spring/types" "~9.4.5"
+    "@react-spring/types" "~9.5.5"
 
-"@react-spring/types@~9.4.5":
+"@react-spring/types@~9.5.5":
-  version "9.4.5"
+  version "9.5.5"
-  resolved "https://registry.yarnpkg.com/@react-spring/types/-/types-9.4.5.tgz#9c71e5ff866b5484a7ef3db822bf6c10e77bdd8c"
+  resolved "https://registry.yarnpkg.com/@react-spring/types/-/types-9.5.5.tgz#c8e94f1b9232ca7cb9d860ea67762ec401b1de14"
-  integrity sha512-mpRIamoHwql0ogxEUh9yr4TP0xU5CWyZxVQeccGkHHF8kPMErtDXJlxyo0lj+telRF35XNihtPTWoflqtyARmg==
+  integrity sha512-7I/qY8H7Enwasxr4jU6WmtNK+RZ4Z/XvSlDvjXFVe7ii1x0MoSlkw6pD7xuac8qrHQRm9BTcbZNyeeKApYsvCg==
 
-"@react-spring/web@9.4.5":
+"@react-spring/web@9.5.5":
-  version "9.4.5"
+  version "9.5.5"
-  resolved "https://registry.yarnpkg.com/@react-spring/web/-/web-9.4.5.tgz#b92f05b87cdc0963a59ee149e677dcaff09f680e"
+  resolved "https://registry.yarnpkg.com/@react-spring/web/-/web-9.5.5.tgz#d416abc591aaed930401f0c98a991a8c5b90c382"
-  integrity sha512-NGAkOtKmOzDEctL7MzRlQGv24sRce++0xAY7KlcxmeVkR7LRSGkoXHaIfm9ObzxPMcPHQYQhf3+X9jepIFNHQA==
+  integrity sha512-+moT8aDX/ho/XAhU+HRY9m0LVV9y9CK6NjSRaI+30Re150pB3iEip6QfnF4qnhSCQ5drpMF0XRXHgOTY/xbtFw==
   dependencies:
-    "@react-spring/animated" "~9.4.5"
+    "@react-spring/animated" "~9.5.5"
-    "@react-spring/core" "~9.4.5"
+    "@react-spring/core" "~9.5.5"
-    "@react-spring/shared" "~9.4.5"
+    "@react-spring/shared" "~9.5.5"
-    "@react-spring/types" "~9.4.5"
+    "@react-spring/types" "~9.5.5"
 
 "@signalapp/libsignal-client@0.21.1":
   version "0.21.1"
@@ -3482,10 +3482,10 @@
   resolved "https://registry.yarnpkg.com/@types/mustache/-/mustache-4.1.2.tgz#d0e158013c81674a5b6d8780bc3fe234e1804eaf"
   integrity sha512-c4OVMMcyodKQ9dpwBwh3ofK9P6U9ZktKU9S+p33UqwMNN1vlv2P0zJZUScTshnx7OEoIIRcCFNQ904sYxZz8kg==
 
-"@types/node-fetch@2.5.7":
+"@types/node-fetch@2.6.2":
-  version "2.5.7"
+  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.5.7.tgz#20a2afffa882ab04d44ca786449a276f9f6bbf3c"
+  resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.6.2.tgz#d1a9c5fd049d9415dce61571557104dec3ec81da"
-  integrity sha512-o2WVNf5UhWRkxlf6eq+jMZDu7kjgpgJfl4xVNlvryc95O/6F2ld8ztKX+qu+Rjyet93WAWm5LjeX9H5FGkODvw==
+  integrity sha512-DHqhlq5jeESLy19TYhLakJ07kNumXWjcDdxXsLUMJZ6ue8VZJj4kLPQVE/2mdHh3xZziNF1xppu5lwmS53HR+A==
   dependencies:
     "@types/node" "*"
     form-data "^3.0.0"
@@ -3503,10 +3503,10 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.17.tgz#a8ddf6e0c2341718d74ee3dc413a13a042c45a0c"
   integrity sha512-e8PUNQy1HgJGV3iU/Bp2+D/DXh3PYeyli8LgIwsQcs1Ar1LoaWHSIT6Rw+H2rNJmiq6SNWiDytfx8+gYj7wDHw==
 
-"@types/node@16.11.29":
+"@types/node@16.18.3":
-  version "16.11.29"
+  version "16.18.3"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.29.tgz#2422b0bf46afb2568dc71df903afa36f56bab8ea"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.3.tgz#d7f7ba828ad9e540270f01ce00d391c54e6e0abc"
-  integrity sha512-9dDdonLyPJQJ/kdOlDxAah+bTI+u2ccF3k62FErhquDuggoCX6piWez7j7o6yNE+rP2IRcZVQ6Tw4N0P38+rWA==
+  integrity sha512-jh6m0QUhIRcZpNv7Z/rpN+ZWXOicUUQbSoWks7Htkbb9IjFQj4kzcX/xFCkjstCj5flMsN8FiSvt+q+Tcs4Llg==
 
 "@types/node@^14.0.10 || ^16.0.0", "@types/node@^14.14.20 || ^16.0.0", "@types/node@^16.11.26":
   version "16.11.38"
@@ -4443,7 +4443,7 @@ abbrev@1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.0.tgz#d0554c2256636e2f56e7c2e5ad183f859428d81f"
 
-abort-controller@3.0.0, abort-controller@^3.0.0:
+abort-controller@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/abort-controller/-/abort-controller-3.0.0.tgz#eaf54d53b62bae4138e809ca225c8439a6efb392"
   integrity sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==
@@ -4794,9 +4794,9 @@ arg@4.1.0:
   integrity sha512-ZWc51jO3qegGkVh8Hwpv636EkbesNV5ZNQPCtRa+0qytRYPEs9IYT9qITY9buezqUH5uqyzlWLcufrzU2rffdg==
 
 arg@^4.1.0:
-  version "4.1.1"
+  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.1.tgz#485f8e7c390ce4c5f78257dbea80d4be11feda4c"
+  resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089"
-  integrity sha512-SlmP3fEA88MBv0PypnXZ8ZfJhwmDeIE3SP71j37AiXQBXYosPV0x6uISAaHYSlSVhmHOVkomen0tbGk6Anlebw==
+  integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==
 
 argparse@^1.0.7:
   version "1.0.9"
@@ -7214,9 +7214,9 @@ diff@5.0.0, diff@^5.0.0:
   integrity sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==
 
 diff@^4.0.1:
-  version "4.0.1"
+  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.1.tgz#0c667cb467ebbb5cea7f14f135cc2dba7780a8ff"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"
-  integrity sha512-s2+XdvhPCOF01LRQBC8hf4vhbVmI2CGS5aZnxLJlT5FtdhPCDFq80q++zK2KlrVorVDdL5BOGZ/VfLrVtYNF+Q==
+  integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==
 
 diffie-hellman@^5.0.0:
   version "5.0.2"
@@ -11775,9 +11775,9 @@ make-dir@^3.0.2, make-dir@^3.1.0:
     semver "^6.0.0"
 
 make-error@^1.1.1:
-  version "1.3.5"
+  version "1.3.6"
-  resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.5.tgz#efe4e81f6db28cadd605c70f29c831b58ef776c8"
+  resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
-  integrity sha512-c3sIjNUow0+8swNwVpqoH4YCShKNFkMaw6oH1mNS2haDZQqkeZFlHS3dhoeEbKKmJB4vXpJucU6oH75aDYeE9g==
+  integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
 
 make-fetch-happen@^10.0.3:
   version "10.1.2"
@@ -17117,10 +17117,10 @@ typeface-inter@3.18.1:
   resolved "https://registry.yarnpkg.com/typeface-inter/-/typeface-inter-3.18.1.tgz#24cccdf29923f318589783997be20a662cd3ab9c"
   integrity sha512-c+TBanYFCvmg3j5vPk+zxK4ocMZbPxMEmjnwG7rPQoV87xvQ6b07VbAOC0Va0XBbbZCGw6cWNeFuLeg1YQru3Q==
 
-typescript@4.6.2:
+typescript@4.8.4:
-  version "4.6.2"
+  version "4.8.4"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.6.2.tgz#fe12d2727b708f4eef40f51598b3398baa9611d4"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.4.tgz#c464abca159669597be5f96b8943500b238e60e6"
-  integrity sha512-HM/hFigTBHZhLXshn9sN37H085+hQGeJHJ/X7LpBWLID/fbc2acUMfU+lGD98X81sKP+pFa9f0DZmCwB9GnbAg==
+  integrity sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==
 
 typescript@^4.5.5:
   version "4.5.5"