From 5fbdbccdc6af850ac06f087797364e40b0d3773d Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 25 Jul 2023 09:29:52 +0100
Subject: [PATCH] Temporarily add missing @types imports (#11309)

* Add CI to typecheck without yarn link like in release process

* Temporarily add missing @types imports
---
 .github/workflows/static_analysis.yaml |  9 +++++++++
 package.json                           |  3 +++
 yarn.lock                              | 15 +++++++++++++++
 3 files changed, 27 insertions(+)

diff --git a/.github/workflows/static_analysis.yaml b/.github/workflows/static_analysis.yaml
index 43c2e408b6..fca0b15afa 100644
--- a/.github/workflows/static_analysis.yaml
+++ b/.github/workflows/static_analysis.yaml
@@ -43,6 +43,15 @@ jobs:
             - name: Typecheck (release mode)
               run: "yarn run lint:types"
 
+            # Temporary while we directly import matrix-js-sdk/src/* which means we need
+            # certain @types/* packages to make sense of matrix-js-sdk types.
+            - name: Typecheck (release mode; no yarn link)
+              if: github.event_name != 'pull_request'
+              run: |
+                  yarn unlink matrix-js-sdk
+                  yarn install --force
+                  yarn run lint:types
+
     i18n_lint:
         name: "i18n Check"
         uses: matrix-org/matrix-react-sdk/.github/workflows/i18n_check.yml@develop
diff --git a/package.json b/package.json
index e7c22c6c81..34cc53e984 100644
--- a/package.json
+++ b/package.json
@@ -149,6 +149,7 @@
         "@testing-library/react": "^12.1.5",
         "@testing-library/user-event": "^14.4.3",
         "@types/commonmark": "^0.27.4",
+        "@types/content-type": "^1.1.5",
         "@types/counterpart": "^0.18.1",
         "@types/diff-match-patch": "^1.0.32",
         "@types/escape-html": "^1.0.1",
@@ -169,8 +170,10 @@
         "@types/react-dom": "17.0.19",
         "@types/react-transition-group": "^4.4.0",
         "@types/sanitize-html": "2.9.0",
+        "@types/sdp-transform": "^2.4.6",
         "@types/tar-js": "^0.3.2",
         "@types/ua-parser-js": "^0.7.36",
+        "@types/uuid": "^9.0.2",
         "@types/zxcvbn": "^4.4.0",
         "@typescript-eslint/eslint-plugin": "^5.35.1",
         "@typescript-eslint/parser": "^5.6.0",
diff --git a/yarn.lock b/yarn.lock
index 84fe78d3b5..1820ee78b7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2345,6 +2345,11 @@
   resolved "https://registry.yarnpkg.com/@types/commonmark/-/commonmark-0.27.6.tgz#9836539fc11d3f37d48e54fc5c07f9856d0a1c40"
   integrity sha512-t3S2hOtSSuBp1H5PTFmekGFu9U9LBzGvHy93zHwusvj4RIGUrBQ4zHvw49CkJtAl6fZvsadKhYbv8WTxJLbBmw==
 
+"@types/content-type@^1.1.5":
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/@types/content-type/-/content-type-1.1.5.tgz#aa02dca40864749a9e2bf0161a6216da57e3ede5"
+  integrity sha512-dgMN+syt1xb7Hk8LU6AODOfPlvz5z1CbXpPuJE5ZrX9STfBOIXF09pEB8N7a97WT9dbngt3ksDCm6GW6yMrxfQ==
+
 "@types/counterpart@^0.18.1":
   version "0.18.1"
   resolved "https://registry.yarnpkg.com/@types/counterpart/-/counterpart-0.18.1.tgz#b1b784d9e54d9879f0a8cb12f2caedab65430fe8"
@@ -2620,6 +2625,11 @@
   resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.3.tgz#cef09e3ec9af1d63d2a6cc5b383a737e24e6dcf5"
   integrity sha512-5cJ8CB4yAx7BH1oMvdU0Jh9lrEXyPkar6F9G/ERswkCuvP4KQZfZkSjcMbAICCpQTN4OuZn8tz0HiKv9TGZgrQ==
 
+"@types/sdp-transform@^2.4.6":
+  version "2.4.6"
+  resolved "https://registry.yarnpkg.com/@types/sdp-transform/-/sdp-transform-2.4.6.tgz#f9cdba2b95c046bb155e5cd20bc96c5ca24597be"
+  integrity sha512-k3Nw6iaLoJbTjjY1tFT4L4IHNnLGJ52YacJNlNi6yqo76EYN1DiSPtuzzB7XnorZgrreUzCvzHDLklopmFdm7g==
+
 "@types/semver@^7.3.12":
   version "7.5.0"
   resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.0.tgz#591c1ce3a702c45ee15f47a42ade72c2fd78978a"
@@ -2662,6 +2672,11 @@
   resolved "https://registry.yarnpkg.com/@types/ua-parser-js/-/ua-parser-js-0.7.36.tgz#9bd0b47f26b5a3151be21ba4ce9f5fa457c5f190"
   integrity sha512-N1rW+njavs70y2cApeIw1vLMYXRwfBy+7trgavGuuTfOd7j1Yh7QTRc/yqsPl6ncokt72ZXuxEU0PiCp9bSwNQ==
 
+"@types/uuid@^9.0.2":
+  version "9.0.2"
+  resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-9.0.2.tgz#ede1d1b1e451548d44919dc226253e32a6952c4b"
+  integrity sha512-kNnC1GFBLuhImSnV7w4njQkUiJi0ZXUycu1rUaouPqiKlXkh77JKgdRnTAp1x5eBwcIwbtI+3otwzuIDEuDoxQ==
+
 "@types/yargs-parser@*":
   version "21.0.0"
   resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.0.tgz#0c60e537fa790f5f9472ed2776c2b71ec117351b"