From b4b477e44c72956796c17aa7a290c4c43e7346e7 Mon Sep 17 00:00:00 2001
From: Fedor Indutny <79877362+indutny-signal@users.noreply.github.com>
Date: Tue, 22 Nov 2022 14:46:21 -0800
Subject: [PATCH] Update TypeScript to 4.9.3

---
 .storybook/main.js                    |  3 +++
 package.json                          |  2 +-
 patches/@formatjs+intl+2.4.1.patch    | 17 +++++++++++++++++
 ts/test-node/license_comments_test.ts |  2 +-
 ts/util/lint/license_comments.ts      |  2 +-
 yarn.lock                             |  8 ++++----
 6 files changed, 27 insertions(+), 7 deletions(-)
 create mode 100644 patches/@formatjs+intl+2.4.1.patch

diff --git a/.storybook/main.js b/.storybook/main.js
index 7bc792d74..ec928b64d 100644
--- a/.storybook/main.js
+++ b/.storybook/main.js
@@ -20,4 +20,7 @@ module.exports = {
     // Deprecated! Please remove when all uses have been migrated to controls.
     '@storybook/addon-knobs',
   ],
+  features: {
+    storyStoreV7: true,
+  },
 };
diff --git a/package.json b/package.json
index 85351c72d..c49e4470e 100644
--- a/package.json
+++ b/package.json
@@ -307,7 +307,7 @@
     "ts-loader": "4.1.0",
     "ts-node": "8.3.0",
     "typed-scss-modules": "4.1.1",
-    "typescript": "4.8.4",
+    "typescript": "4.9.3",
     "webpack": "5.30.0",
     "webpack-cli": "4.9.2",
     "webpack-dev-server": "4.7.4"
diff --git a/patches/@formatjs+intl+2.4.1.patch b/patches/@formatjs+intl+2.4.1.patch
new file mode 100644
index 000000000..66fbd7b50
--- /dev/null
+++ b/patches/@formatjs+intl+2.4.1.patch
@@ -0,0 +1,17 @@
+diff --git a/node_modules/@formatjs/intl/src/types.d.ts b/node_modules/@formatjs/intl/src/types.d.ts
+index 1f73905..9abaacd 100644
+--- a/node_modules/@formatjs/intl/src/types.d.ts
++++ b/node_modules/@formatjs/intl/src/types.d.ts
+@@ -8,10 +8,8 @@ import { DEFAULT_INTL_CONFIG } from './utils';
+ import { NumberFormatOptions } from '@formatjs/ecma402-abstract';
+ declare global {
+     namespace FormatjsIntl {
+-        interface Message {
+-        }
+-        interface IntlConfig {
+-        }
++        interface Message { ids?: string }
++        interface IntlConfig { locale?: string }
+         interface Formats {
+         }
+     }
diff --git a/ts/test-node/license_comments_test.ts b/ts/test-node/license_comments_test.ts
index f4e9dbda6..bf20ce6be 100644
--- a/ts/test-node/license_comments_test.ts
+++ b/ts/test-node/license_comments_test.ts
@@ -32,7 +32,7 @@ describe('license comments', () => {
       const { groups = {} } =
         firstLine.match(
           /Copyright (?<startYearWithDash>\d{4}-)?(?<endYearString>\d{4}) Signal Messenger, LLC/
-        ) || [];
+        ) || {};
       const { startYearWithDash, endYearString } = groups;
       const endYear = Number(endYearString);
 
diff --git a/ts/util/lint/license_comments.ts b/ts/util/lint/license_comments.ts
index 47bffb514..a692ac7a2 100644
--- a/ts/util/lint/license_comments.ts
+++ b/ts/util/lint/license_comments.ts
@@ -151,7 +151,7 @@ async function main() {
   await forEachRelevantFile(async file => {
     const [firstLine] = await readFirstLines(file, 1);
     const { groups = {} } =
-      firstLine.match(/(?:\d{4}-)?(?<endYearString>\d{4})/) || [];
+      firstLine.match(/(?:\d{4}-)?(?<endYearString>\d{4})/) || {};
     const { endYearString } = groups;
     const endYear = Number(endYearString);
 
diff --git a/yarn.lock b/yarn.lock
index b7f83e87b..ce9eb3699 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -17151,10 +17151,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.8.4:
-  version "4.8.4"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.4.tgz#c464abca159669597be5f96b8943500b238e60e6"
-  integrity sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==
+typescript@4.9.3:
+  version "4.9.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.3.tgz#3aea307c1746b8c384435d8ac36b8a2e580d85db"
+  integrity sha512-CIfGzTelbKNEnLpLdGFgdyKhG23CKdKgQPOBc+OUNrkJ2vr+KSzsSV5kq5iWhEQbok+quxgGzrAtGWCyU7tHnA==
 
 typescript@^4.5.5:
   version "4.5.5"