Make tsc happy

t3chguy · t3chguy · commit f9372a307d97 · 2026-04-22T11:34:01.000+01:00
diff --git a/apps/desktop/hak/tsconfig.json b/apps/desktop/hak/tsconfig.json
@@ -1,6 +1,7 @@
 {
     "compilerOptions": {
-        "moduleResolution": "node",
+        "moduleResolution": "node16",
+        "module": "Node16",
         "esModuleInterop": true,
         "target": "es2022",
         "sourceMap": false,
diff --git a/apps/desktop/playwright/element-desktop-test.ts b/apps/desktop/playwright/element-desktop-test.ts
@@ -17,14 +17,14 @@ import { PassThrough } from "node:stream";
  * A PassThrough stream that captures all data written to it.
  */
 class CapturedPassThrough extends PassThrough {
-    private _chunks = [];
+    private _chunks: any[] = [];
 
     public constructor() {
         super();
         super.on("data", this.onData);
     }
 
-    private onData = (chunk): void => {
+    private onData = (chunk: any): void => {
         this._chunks.push(chunk);
     };
 
diff --git a/apps/desktop/playwright/tsconfig.json b/apps/desktop/playwright/tsconfig.json
@@ -1,11 +1,12 @@
 {
     "compilerOptions": {
         "resolveJsonModule": true,
-        "moduleResolution": "node",
+        "moduleResolution": "bundler",
         "esModuleInterop": true,
         "target": "es2022",
-        "module": "es2022",
-        "lib": ["es2022", "dom"],
+        "module": "ESNext",
+        "lib": ["es2024", "dom", "dom.iterable"],
+        "strictNullChecks": false,
         "types": ["node"]
     },
     "include": ["**/*.ts"]
diff --git a/apps/web/playwright/e2e/audio-player/audio-player.spec.ts b/apps/web/playwright/e2e/audio-player/audio-player.spec.ts
@@ -8,7 +8,7 @@ Please see LICENSE files in the repository root for full details.
 */
 
 import type { Locator, Page } from "@playwright/test";
-import { test, expect } from "../../element-web-test";
+import { test, expect, type ExtendedToMatchScreenshotOptions } from "../../element-web-test";
 import { SettingLevel } from "../../../src/settings/SettingLevel";
 import { Layout } from "../../../src/settings/enums/Layout";
 import { type ElementAppPage } from "../../pages/ElementAppPage";
@@ -94,7 +94,7 @@ test.describe("Audio player", { tag: ["@no-firefox", "@no-webkit"] }, () => {
         // Assert that rendering of the player settled and the play button is visible before taking a snapshot
         await checkPlayerVisibility(ircTile);
 
-        const screenshotOptions = {
+        const screenshotOptions: ExtendedToMatchScreenshotOptions = {
             css: `
                 /* The timestamp is of inconsistent width depending on the time the test runs at */
                 .mx_MessageTimestamp {
@@ -120,7 +120,7 @@ test.describe("Audio player", { tag: ["@no-firefox", "@no-webkit"] }, () => {
         };
 
         // Take a snapshot of mx_EventTile_last on IRC layout
-        screenshotOptions.clip = await page.locator(".mx_EventTile_last").boundingBox();
+        screenshotOptions.clip = (await page.locator(".mx_EventTile_last").boundingBox()) ?? undefined;
         await scrollToBottomOfTimeline(page);
         await expect(page).toMatchScreenshot(`${detail.replaceAll(" ", "-")}-irc-layout.png`, screenshotOptions);
 
@@ -129,7 +129,7 @@ test.describe("Audio player", { tag: ["@no-firefox", "@no-webkit"] }, () => {
         const groupTile = page.locator(".mx_EventTile_last[data-layout='group']");
         await groupTile.locator(".mx_MessageTimestamp").click();
         await checkPlayerVisibility(groupTile);
-        screenshotOptions.clip = await page.locator(".mx_EventTile_last").boundingBox();
+        screenshotOptions.clip = (await page.locator(".mx_EventTile_last").boundingBox()) ?? undefined;
         await scrollToBottomOfTimeline(page);
         await expect(page).toMatchScreenshot(`${detail.replaceAll(" ", "-")}-group-layout.png`, screenshotOptions);
 
@@ -138,7 +138,7 @@ test.describe("Audio player", { tag: ["@no-firefox", "@no-webkit"] }, () => {
         const bubbleTile = page.locator(".mx_EventTile_last[data-layout='bubble']");
         await bubbleTile.locator(".mx_MessageTimestamp").click();
         await checkPlayerVisibility(bubbleTile);
-        screenshotOptions.clip = await page.locator(".mx_EventTile_last").boundingBox();
+        screenshotOptions.clip = (await page.locator(".mx_EventTile_last").boundingBox()) ?? undefined;
         await scrollToBottomOfTimeline(page);
         await expect(page).toMatchScreenshot(`${detail.replaceAll(" ", "-")}-bubble-layout.png`, screenshotOptions);
     };
diff --git a/apps/web/playwright/e2e/crypto/crypto.spec.ts b/apps/web/playwright/e2e/crypto/crypto.spec.ts
@@ -44,7 +44,7 @@ const bobJoin = async (page: Page, bob: Bot) => {
         const bobRooms = cli.getRooms();
         if (!bobRooms.length) {
             await new Promise<void>((resolve) => {
-                const onMembership = (_event) => {
+                const onMembership = () => {
                     cli.off(window.matrixcs.RoomMemberEvent.Membership, onMembership);
                     resolve();
                 };
diff --git a/apps/web/playwright/e2e/crypto/decryption-failure-messages.spec.ts b/apps/web/playwright/e2e/crypto/decryption-failure-messages.spec.ts
@@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
 */
 
-import type { EmittedEvents, Preset } from "matrix-js-sdk/src/matrix";
+import type { Preset, RoomMemberEvent, RoomStateEvent } from "matrix-js-sdk/src/matrix";
 import { expect, test } from "../../element-web-test";
 import {
     createRoom,
@@ -122,7 +122,7 @@ test.describe("Cryptography", function () {
                 const roomId = await bob.evaluate(
                     async (client, { alice }) => {
                         const encryptionStatePromise = new Promise<void>((resolve) => {
-                            client.on("RoomState.events" as EmittedEvents, (event, _state, _lastStateEvent) => {
+                            client.on("RoomState.events" as RoomStateEvent.Events, (event, _state, _lastStateEvent) => {
                                 if (event.getType() === "m.room.encryption") {
                                     resolve();
                                 }
@@ -253,11 +253,14 @@ test.describe("Cryptography", function () {
 
                         // invite Alice
                         const inviteAlicePromise = new Promise<void>((resolve) => {
-                            client.on("RoomMember.membership" as EmittedEvents, (_event, member, _oldMembership?) => {
-                                if (member.userId === alice.userId && member.membership === "invite") {
-                                    resolve();
-                                }
-                            });
+                            client.on(
+                                "RoomMember.membership" as RoomMemberEvent.Membership,
+                                (_event, member, _oldMembership?) => {
+                                    if (member.userId === alice.userId && member.membership === "invite") {
+                                        resolve();
+                                    }
+                                },
+                            );
                         });
                         await client.invite(roomId, alice.userId);
                         // wait for the invite to come back so that we encrypt to Alice
@@ -271,11 +274,14 @@ test.describe("Cryptography", function () {
 
                         // kick Alice
                         const kickAlicePromise = new Promise<void>((resolve) => {
-                            client.on("RoomMember.membership" as EmittedEvents, (_event, member, _oldMembership?) => {
-                                if (member.userId === alice.userId && member.membership === "leave") {
-                                    resolve();
-                                }
-                            });
+                            client.on(
+                                "RoomMember.membership" as RoomMemberEvent.Membership,
+                                (_event, member, _oldMembership?) => {
+                                    if (member.userId === alice.userId && member.membership === "leave") {
+                                        resolve();
+                                    }
+                                },
+                            );
                         });
                         await client.kick(roomId, alice.userId);
                         await kickAlicePromise;
diff --git a/apps/web/playwright/e2e/crypto/dehydration.spec.ts b/apps/web/playwright/e2e/crypto/dehydration.spec.ts
@@ -166,13 +166,9 @@ async function getDehydratedDeviceIds(client: Client): Promise<string[]> {
     return await client.evaluate(async (client) => {
         const userId = client.getUserId();
         const devices = await client.getCrypto().getUserDeviceInfo([userId]);
-        return Array.from(
-            devices
-                .get(userId)
-                .values()
-                .filter((d) => d.dehydrated)
-                .map((d) => d.deviceId),
-        );
+        return Array.from(devices.get(userId).values())
+            .filter((d) => d.dehydrated)
+            .map((d) => d.deviceId);
     });
 }
 
diff --git a/apps/web/playwright/e2e/crypto/utils.ts b/apps/web/playwright/e2e/crypto/utils.ts
@@ -579,8 +579,8 @@ export async function deleteCachedSecrets(page: Page) {
     await page.evaluate(async () => {
         const removeCachedSecrets = new Promise((resolve) => {
             const request = window.indexedDB.open("matrix-js-sdk::matrix-sdk-crypto");
-            request.onsuccess = (event: Event & { target: { result: IDBDatabase } }) => {
-                const db = event.target.result;
+            request.onsuccess = function (this: IDBRequest) {
+                const db = this.result as IDBDatabase;
                 const request = db.transaction("core", "readwrite").objectStore("core").delete("private_identity");
                 request.onsuccess = () => {
                     db.close();
diff --git a/apps/web/playwright/e2e/read-receipts/read-receipts.spec.ts b/apps/web/playwright/e2e/read-receipts/read-receipts.spec.ts
@@ -7,7 +7,7 @@ Please see LICENSE files in the repository root for full details.
 */
 
 import type { JSHandle } from "@playwright/test";
-import type { MatrixEvent, ISendEventResponse, ReceiptType } from "matrix-js-sdk/src/matrix";
+import type { MatrixEvent, ISendEventResponse, ReceiptType, RelationType } from "matrix-js-sdk/src/matrix";
 import { expect } from "../../element-web-test";
 import { type ElementAppPage } from "../../pages/ElementAppPage";
 import { type Bot } from "../../pages/bot";
@@ -47,7 +47,7 @@ test.describe("Read receipts", { tag: "@mergequeue" }, () => {
                     getId: () => eventResponse.event_id,
                     threadRootId,
                     getTs: () => 1,
-                    isRelation: (relType) => {
+                    isRelation: (relType: RelationType) => {
                         return !relType || relType === "m.thread";
                     },
                 } as any as MatrixEvent;
diff --git a/apps/web/playwright/e2e/timeline/timeline.spec.ts b/apps/web/playwright/e2e/timeline/timeline.spec.ts
@@ -7,7 +7,7 @@ Please see LICENSE files in the repository root for full details.
 */
 
 import type { Locator, Page } from "@playwright/test";
-import type { ISendEventResponse, EventType, MsgType } from "matrix-js-sdk/src/matrix";
+import type { ISendEventResponse, EventType, MsgType, IContent } from "matrix-js-sdk/src/matrix";
 import { test, expect } from "../../element-web-test";
 import { SettingLevel } from "../../../src/settings/SettingLevel";
 import { Layout } from "../../../src/settings/enums/Layout";
@@ -50,11 +50,9 @@ const expectAvatar = async (cli: Client, e: Locator, avatarUrl: string): Promise
 };
 
 const sendEvent = async (client: Client, roomId: string, html = false): Promise<ISendEventResponse> => {
-    const content = {
+    const content: IContent = {
         msgtype: "m.text" as MsgType,
         body: "Message",
-        format: undefined,
-        formatted_body: undefined,
     };
     if (html) {
         content.format = "org.matrix.custom.html";
diff --git a/apps/web/playwright/e2e/utils.ts b/apps/web/playwright/e2e/utils.ts
@@ -42,15 +42,15 @@ export async function waitForRoom(
             return new Promise<Room>((resolve) => {
                 const room = matrixClient.getRoom(roomId);
 
-                if (window[predicateId](room)) {
+                if ((<any>window)[predicateId](room)) {
                     resolve(room);
                     return;
                 }
 
                 function onEvent(ev: MatrixEvent) {
                     if (ev.getRoomId() !== roomId) return;
 
-                    if (window[predicateId](room)) {
+                    if ((<any>window)[predicateId](room)) {
                         matrixClient.removeListener("event" as ClientEvent, onEvent);
                         resolve(room);
                     }
diff --git a/apps/web/playwright/element-web-test.ts b/apps/web/playwright/element-web-test.ts
@@ -107,7 +107,7 @@ export const test = base.extend<TestFixtures>({
     },
 });
 
-interface ExtendedToMatchScreenshotOptions extends ToMatchScreenshotOptions {
+export interface ExtendedToMatchScreenshotOptions extends ToMatchScreenshotOptions {
     includeDialogBackground?: boolean;
     showTooltips?: boolean;
     timeout?: number;
diff --git a/apps/web/playwright/pages/client.ts b/apps/web/playwright/pages/client.ts
@@ -7,7 +7,7 @@ Please see LICENSE files in the repository root for full details.
 */
 
 import { type JSHandle, type Page } from "@playwright/test";
-import { type PageFunctionOn } from "playwright-core/types/structs";
+import { type ElementHandle } from "playwright-core";
 
 import { Network } from "./network";
 import type {
@@ -30,6 +30,34 @@ import type {
 import type { RoomMessageEventContent } from "matrix-js-sdk/src/types";
 import { type CredentialsOptionalAccessToken } from "./bot";
 
+/** Types cribbed from playwright-core/types/structs as they are not importable */
+export type NoHandles<Arg> = Arg extends JSHandle
+    ? never
+    : Arg extends object
+      ? { [Key in keyof Arg]: NoHandles<Arg[Key]> }
+      : Arg;
+export type Unboxed<Arg> =
+    Arg extends ElementHandle<infer T>
+        ? T
+        : Arg extends JSHandle<infer T>
+          ? T
+          : Arg extends NoHandles<Arg>
+            ? Arg
+            : Arg extends [infer A0]
+              ? [Unboxed<A0>]
+              : Arg extends [infer A0, infer A1]
+                ? [Unboxed<A0>, Unboxed<A1>]
+                : Arg extends [infer A0, infer A1, infer A2]
+                  ? [Unboxed<A0>, Unboxed<A1>, Unboxed<A2>]
+                  : Arg extends [infer A0, infer A1, infer A2, infer A3]
+                    ? [Unboxed<A0>, Unboxed<A1>, Unboxed<A2>, Unboxed<A3>]
+                    : Arg extends Array<infer T>
+                      ? Array<Unboxed<T>>
+                      : Arg extends object
+                        ? { [Key in keyof Arg]: Unboxed<Arg[Key]> }
+                        : Arg;
+export type PageFunctionOn<On, Arg2, R> = string | ((on: On, arg2: Unboxed<Arg2>) => R | Promise<R>);
+
 export class Client {
     public network: Network;
     protected client: JSHandle<MatrixClient>;
diff --git a/apps/web/playwright/testcontainers/dendrite.ts b/apps/web/playwright/testcontainers/dendrite.ts
@@ -21,7 +21,7 @@ const DEFAULT_CONFIG = {
     global: {
         server_name: "localhost",
         private_key: "matrix_key.pem",
-        old_private_keys: null,
+        old_private_keys: null as any,
         key_validity_period: "168h0m0s",
         cache: {
             max_size_estimated: "1gb",
@@ -47,7 +47,7 @@ const DEFAULT_CONFIG = {
             room_name: "Server Alerts",
         },
         jetstream: {
-            addresses: null,
+            addresses: null as any,
             disable_tls_validation: false,
             storage_path: "./",
             topic_prefix: "Dendrite",
@@ -67,7 +67,7 @@ const DEFAULT_CONFIG = {
     },
     app_service_api: {
         disable_tls_validation: false,
-        config_files: null,
+        config_files: null as any,
     },
     client_api: {
         registration_disabled: false,
@@ -79,14 +79,14 @@ const DEFAULT_CONFIG = {
         recaptcha_bypass_secret: "",
         turn: {
             turn_user_lifetime: "5m",
-            turn_uris: null,
+            turn_uris: null as any,
             turn_shared_secret: "",
         },
         rate_limiting: {
             enabled: true,
             threshold: 20,
             cooloff_ms: 500,
-            exempt_user_ids: null,
+            exempt_user_ids: null as any,
         },
     },
     federation_api: {
@@ -140,7 +140,7 @@ const DEFAULT_CONFIG = {
         },
     },
     mscs: {
-        mscs: null,
+        mscs: null as any,
         database: {
             connection_string: "file:dendrite-msc.db",
         },
@@ -157,7 +157,7 @@ const DEFAULT_CONFIG = {
     },
     user_api: {
         bcrypt_cost: 10,
-        auto_join_rooms: null,
+        auto_join_rooms: null as any,
         account_database: {
             connection_string: "file:dendrite-userapi.db",
         },
@@ -183,12 +183,12 @@ const DEFAULT_CONFIG = {
             serviceName: "",
             disabled: false,
             rpc_metrics: false,
-            tags: [],
-            sampler: null,
-            reporter: null,
-            headers: null,
-            baggage_restrictions: null,
-            throttler: null,
+            tags: [] as any[],
+            sampler: null as any,
+            reporter: null as any,
+            headers: null as any,
+            baggage_restrictions: null as any,
+            throttler: null as any,
         },
     },
     logging: [
diff --git a/apps/web/playwright/tsconfig.json b/apps/web/playwright/tsconfig.json
@@ -2,12 +2,14 @@
     "compilerOptions": {
         "target": "es2022",
         "jsx": "react",
-        "lib": ["ESNext", "es2022", "dom", "dom.iterable"],
+        "lib": ["es2024", "dom", "dom.iterable"],
         "resolveJsonModule": true,
         "esModuleInterop": true,
-        "moduleResolution": "node",
-        "module": "es2022",
+        "moduleResolution": "bundler",
+        "module": "ESNext",
         "allowImportingTsExtensions": true,
+        "strictNullChecks": false,
+        "noImplicitAny": false,
         "types": ["node"]
     },
     "include": [
diff --git a/apps/web/src/@types/css.d.ts b/apps/web/src/@types/css.d.ts
diff --git a/apps/web/src/@types/global.d.ts b/apps/web/src/@types/global.d.ts
diff --git a/apps/web/src/@types/pcss.d.ts b/apps/web/src/@types/pcss.d.ts
diff --git a/apps/web/tsconfig.json b/apps/web/tsconfig.json
diff --git a/packages/playwright-common/src/fixtures/toasts.ts b/packages/playwright-common/src/fixtures/toasts.ts
diff --git a/packages/shared-components/vite.config.ts b/packages/shared-components/vite.config.ts

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"compilerOptions": {`
`3`		`- "moduleResolution": "node",`
	`3`	`+ "moduleResolution": "node16",`
	`4`	`+ "module": "Node16",`
`4`	`5`	`"esModuleInterop": true,`
`5`	`6`	`"target": "es2022",`
`6`	`7`	`"sourceMap": false,`