From a5871206fac1f31bf10ac3a07ca423d329656fbc Mon Sep 17 00:00:00 2001
From: Eric Eastwood <erice@element.io>
Date: Thu, 30 Jun 2022 18:23:45 +0200
Subject: [PATCH] Add support for JSX in stuff we import in Cypress test code
 (#8738)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add support for JSX in stuff we import in Cypress test code

Spawning from:

 - https://github.com/matrix-org/matrix-react-sdk/pull/8354#discussion_r883260722
 - https://github.com/matrix-org/matrix-react-sdk/pull/8354#discussion_r878660677

* Add problem import

* Inherit from existing type definitions

See https://github.com/matrix-org/matrix-react-sdk/pull/8738#discussion_r887350469

* Specify `commonjs`

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Remove `mxSettingsStore` as it's no longer needed

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

Co-authored-by: Šimon Brandner <simon.bra.ag@gmail.com>
---
 cypress/global.d.ts   |  3 +++
 cypress/tsconfig.json | 16 +++++++++++++---
 package.json          |  2 +-
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/cypress/global.d.ts b/cypress/global.d.ts
index 3d36daf951..2cbfff94c2 100644
--- a/cypress/global.d.ts
+++ b/cypress/global.d.ts
@@ -14,6 +14,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import "../src/@types/global";
+import "../src/@types/svg";
+import "../src/@types/raw-loader";
 import "matrix-js-sdk/src/@types/global";
 import type {
     MatrixClient,
diff --git a/cypress/tsconfig.json b/cypress/tsconfig.json
index e8db14a01f..bf92664f35 100644
--- a/cypress/tsconfig.json
+++ b/cypress/tsconfig.json
@@ -1,9 +1,19 @@
 {
     "compilerOptions": {
         "target": "es2016",
-        "lib": ["es2020", "dom"],
+        "jsx": "react",
+        "lib": [
+            "es2020",
+            "dom",
+            "dom.iterable"
+        ],
         "types": ["cypress", "@percy/cypress"],
-        "moduleResolution": "node"
+        "resolveJsonModule": true,
+        "esModuleInterop": true,
+        "moduleResolution": "node",
+        "module": "commonjs"
     },
-    "include": ["**/*.ts"]
+    "include": [
+        "**/*.ts"
+    ]
 }
diff --git a/package.json b/package.json
index 740333f8b5..727e23baf9 100644
--- a/package.json
+++ b/package.json
@@ -46,7 +46,7 @@
     "lint": "yarn lint:types && yarn lint:js && yarn lint:style",
     "lint:js": "eslint --max-warnings 0 src test cypress",
     "lint:js-fix": "eslint --fix src test cypress",
-    "lint:types": "tsc --noEmit --jsx react && tsc --noEmit -p cypress",
+    "lint:types": "tsc --noEmit --jsx react && tsc --noEmit --jsx react -p cypress",
     "lint:style": "stylelint \"res/css/**/*.scss\"",
     "test": "jest",
     "test:cypress": "cypress run",