Enable more oxlint rules

.github/workflows/tests.yml

@@ -119,8 +119,15 @@ jobs:
                   node-version: "lts/*"
                   cache: "pnpm"
 
-            - name: Install Deps
+            - name: Install Deps (layered)
+              run: "./scripts/layered.sh"
+              if: matrix.path != 'packages/shared-components'
+              env:
+                  JS_SDK_GITHUB_BASE_REF: ${{ inputs.matrix-js-sdk-sha }}
+
+            - name: Install Deps (normal)
               run: "pnpm install"
+              if: matrix.path == 'packages/shared-components'
 
             - name: Cache storybook & vitest
               uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6

apps/desktop/electron-builder.ts

@@ -75,7 +75,7 @@ if (process.env.VARIANT_PATH) {
     console.log(`Using variant configuration from '${process.env.VARIANT_PATH}':`);
     variant = {
         ...variant,
-        ...JSON.parse(fs.readFileSync(`${process.env.VARIANT_PATH}`, "utf8")),
+        ...JSON.parse(fs.readFileSync(process.env.VARIANT_PATH, "utf8")),
     };
 } else {
     console.warn(`No VARIANT_PATH specified, using default variant configuration '${DEFAULT_VARIANT}':`);

apps/desktop/element.io/nightly/config.json

@@ -51,15 +51,11 @@
     "features": {
         "threadsActivityCentre": true,
         "feature_spotlight": true,
-        "feature_group_calls": true,
         "feature_video_rooms": true,
         "feature_element_call_video_rooms": true
     },
     "setting_defaults": {
         "RustCrypto.staged_rollout_percent": 100
     },
-    "element_call": {
-        "url": "https://call.element.dev"
-    },
     "map_style_url": "https://api.maptiler.com/maps/streets/style.json?key=fU3vlMsMn4Jb6dnEIFsx"
 }

apps/desktop/element.io/release/config.json

@@ -50,10 +50,6 @@
     },
     "features": {
         "feature_video_rooms": true,
-        "feature_group_calls": true,
         "feature_element_call_video_rooms": true
-    },
-    "element_call": {
-        "url": "https://call.element.io"
     }
 }

apps/desktop/hak/matrix-seshat/check.ts

@@ -48,8 +48,9 @@ export default async function (hakEnv: HakEnv, moduleInfo: DependencyInfo): Prom
                             "` " +
                             "or your package manager if not using `rustup`",
                     );
+                    return;
                 }
-                fsProm.unlink("tmp").then(resolve);
+                resolve(fsProm.unlink("tmp"));
             },
         );
         rustc.stdin!.write("fn main() {}");

apps/desktop/playwright/e2e/launch/oidc.spec.ts

@@ -9,7 +9,7 @@ import { test, expect } from "../../element-desktop-test.js";
 
 declare global {
     interface ElectronPlatform {
-        getOidcCallbackUrl(): URL;
+        getOAuthCallbackUrl(): URL;
     }
 
     interface Window {
@@ -29,7 +29,7 @@ test.describe("OIDC Native", () => {
     test("should use OIDC callback URL without authority component", async ({ page }) => {
         await expect(
             page.evaluate<string>(() => {
-                return window.mxPlatformPeg.get().getOidcCallbackUrl().toString();
+                return window.mxPlatformPeg.get().getOAuthCallbackUrl().toString();
             }),
         ).resolves.toMatch(/io\.element\.(desktop|nightly):\/vector\/webapp\//);
     });

apps/desktop/scripts/hak/copy.ts

@@ -27,7 +27,7 @@ export default async function copy(hakEnv: HakEnv, moduleInfo: DependencyInfo):
         if (moduleInfo.moduleBuildDirs.length > 1) {
             if (!hakEnv.isMac()) {
                 console.error(
-                    "You asked me to copy multiple targets but I've only been taught " + "how to do that on macOS.",
+                    "You asked me to copy multiple targets but I've only been taught how to do that on macOS.",
                 );
                 throw new Error("Can't copy multiple targets on this platform");
             }

apps/desktop/scripts/hak/index.ts

@@ -132,7 +132,7 @@ async function main(): Promise<void> {
         for (const mod of modules) {
             const depInfo = deps[mod];
             if (depInfo === undefined) {
-                console.log("Module " + mod + " not found - is it in hakDependencies " + "in your package.json?");
+                console.log(`Module ${mod} not found - is it in hakDependencies in your package.json?`);
                 process.exit(1);
             }
             console.log("hak " + cmd + ": " + mod);

apps/desktop/src/vectormenu.test.ts

@@ -42,21 +42,19 @@ describe("buildMenuTemplate", () => {
             ({ buildMenuTemplate } = await import("./vectormenu.js"));
         });
 
-        if (platform === "darwin") {
-            it("should have an app-named item first", () => {
-                const menu = buildMenuTemplate();
-                expect(menu.items[0].label).toBe("ChatApp");
-            });
-        }
+        it.runIf(platform === "darwin")("should have an app-named item first", () => {
+            const menu = buildMenuTemplate();
+            expect(menu.items[0].label).toBe("ChatApp");
+        });
 
         it("should include expected `help` menu", () => {
             const menu = buildMenuTemplate();
 
             const helpMenu = menu.items.at(-1)!;
             expect(helpMenu.label).toBe("common|help");
             const helpSubmenu = helpMenu.submenu as unknown as MenuItemConstructorOptions[];
-            expect(helpSubmenu[0]!.label).toBe("common|brand_help");
-            helpSubmenu[0]!.click!(menu.items.at(-1)!, undefined, new Event("click") as KeyboardEvent);
+            expect(helpSubmenu[0].label).toBe("common|brand_help");
+            helpSubmenu[0].click!(menu.items.at(-1)!, undefined, new Event("click") as KeyboardEvent);
             expect(shell.openExternal).toHaveBeenCalledWith("https://i.need.help");
         });
     });

apps/web/@types/webpack-version-file-plugin.d.ts

@@ -13,6 +13,7 @@ declare module "webpack-version-file-plugin" {
         extras?: Record<string, string>;
     }
 
+    // oxlint-disable-next-line typescript/no-extraneous-class
     export default class VersionFilePlugin {
         public constructor(opts: Opts);
     }

apps/web/config.sample.json

@@ -42,8 +42,9 @@
         "preferred_domain": "meet.element.io"
     },
     "element_call": {
-        "url": "https://call.element.io",
-        "brand": "Element Call"
+        "brand": "Element Call",
+        "disable": false,
+        "use_exclusively": false
     },
     "map_style_url": "https://api.maptiler.com/maps/streets/style.json?key=fU3vlMsMn4Jb6dnEIFsx"
 }

apps/web/element.io/app/config.json

@@ -47,10 +47,6 @@
     },
     "features": {
         "feature_video_rooms": true,
-        "feature_group_calls": true,
         "feature_element_call_video_rooms": true
-    },
-    "element_call": {
-        "url": "https://call.element.io"
     }
 }

apps/web/element.io/develop/config.json

@@ -48,15 +48,11 @@
     "features": {
         "threadsActivityCentre": true,
         "feature_video_rooms": true,
-        "feature_group_calls": true,
         "feature_element_call_video_rooms": true
     },
     "setting_defaults": {
         "RustCrypto.staged_rollout_percent": 100,
         "Registration.mobileRegistrationHelper": true
     },
-    "element_call": {
-        "url": "https://call.element.dev"
-    },
     "map_style_url": "https://api.maptiler.com/maps/streets/style.json?key=fU3vlMsMn4Jb6dnEIFsx"
 }

apps/web/jest.config.ts

@@ -62,6 +62,8 @@ const config: Config = {
         // Ignore vitest tests
         "!<rootDir>/src/**/*.test.{ts,tsx}",
         "!<rootDir>/src/test/**",
+        // Exclude mocks
+        "!<rootDir>/src/**/*-{mock,mocks}.{ts,tsx}",
     ],
     coverageReporters: ["text-summary", ["lcov", { projectRoot: "../../" }]],
     prettierPath: null,

apps/web/package.json

@@ -85,7 +85,6 @@
         "matrix-widget-api": "^1.16.1",
         "memoize-one": "^6.0.0",
         "mime": "^4.0.4",
-        "oidc-client-ts": "^3.0.1",
         "opus-recorder": "^8.0.3",
         "pako": "^3.0.0",
         "png-chunks-extract": "^1.0.0",

apps/web/playwright/e2e/read-receipts/index.ts

@@ -609,7 +609,7 @@ class Helpers {
         const roomListContainer = this.page.getByTestId("room-list");
         const roomTiles = roomListContainer.getByRole("option");
         for (const [i, room] of rooms.entries()) {
-            await expect(roomTiles.nth(i)).toHaveAccessibleName(new RegExp(`${room.name}`));
+            await expect(roomTiles.nth(i)).toHaveAccessibleName(new RegExp(room.name));
         }
     }
 }

apps/web/playwright/e2e/read-receipts/read-receipts.spec.ts

@@ -120,19 +120,19 @@ test.describe("Read receipts", { tag: "@mergequeue" }, () => {
         await sendUnthreadedReadReceipt(app, main2);
 
         // (So the room has no unreads)
-        await expect(page.getByLabel(`${otherRoomName}`)).toBeVisible();
+        await expect(page.getByLabel(otherRoomName)).toBeVisible();
 
         // And we persuade the app to persist its state to indexeddb by reloading and waiting
         await page.reload();
-        await expect(page.getByLabel(`${selectedRoomName}`)).toBeVisible();
+        await expect(page.getByLabel(selectedRoomName)).toBeVisible();
 
         // And we reload again, fetching the persisted state FROM indexeddb
         await page.reload();
 
         // Then the room is read, because the persisted state correctly remembers both
         // receipts. (In #24629, the unthreaded receipt overwrote the main thread one,
         // meaning that the room still said it had unread messages.)
-        await expect(page.getByLabel(`${otherRoomName}`)).toBeVisible();
+        await expect(page.getByLabel(otherRoomName)).toBeVisible();
         await expect(page.getByLabel(`${otherRoomName} Unread messages.`)).not.toBeVisible();
     });
 
@@ -172,7 +172,7 @@ test.describe("Read receipts", { tag: "@mergequeue" }, () => {
         await sendThreadedReadReceipt(app, main3);
 
         // Then the room has no unreads
-        await expect(page.getByLabel(`${otherRoomName}`)).toBeVisible();
+        await expect(page.getByLabel(otherRoomName)).toBeVisible();
     });
 
     test("Recognises unread messages on other thread after receiving a receipt for earlier ones", async ({
@@ -210,7 +210,7 @@ test.describe("Read receipts", { tag: "@mergequeue" }, () => {
         await sendThreadedReadReceipt(app, thread1b, main1);
 
         // Then the room has no unreads
-        await expect(page.getByLabel(`${otherRoomName}`)).toBeVisible();
+        await expect(page.getByLabel(otherRoomName)).toBeVisible();
         await util.goTo({ name: otherRoomName, roomId: otherRoomId });
         await util.assertReadThread("Message 1");
     });
@@ -235,7 +235,7 @@ test.describe("Read receipts", { tag: "@mergequeue" }, () => {
         // thread. The one in main is read because the unthreaded
         // receipt is for a later event. The room should therefore be
         // read, and the thread unread.
-        await expect(page.getByLabel(`${otherRoomName}`)).toBeVisible();
+        await expect(page.getByLabel(otherRoomName)).toBeVisible();
         await util.goTo({ name: otherRoomName, roomId: otherRoomId });
         await util.assertUnreadThread("Message 1");
     });

apps/web/playwright/e2e/settings/account-user-settings-tab.spec.ts

@@ -92,8 +92,10 @@ test.describe("Account user settings tab", () => {
                             authorization_endpoint: `${EXTERNAL_ACCOUNT_MANAGEMENT_URL}authorize`,
                             token_endpoint: `${EXTERNAL_ACCOUNT_MANAGEMENT_URL}token`,
                             revocation_endpoint: `${EXTERNAL_ACCOUNT_MANAGEMENT_URL}revoke`,
+                            registration_endpoint: `${EXTERNAL_ACCOUNT_MANAGEMENT_URL}register`,
                             response_types_supported: ["code"],
-                            grant_types_supported: ["authorization_code"],
+                            grant_types_supported: ["authorization_code", "refresh_token"],
+                            response_modes_supported: ["query", "fragment"],
                             code_challenge_methods_supported: ["S256"],
                             account_management_uri: EXTERNAL_ACCOUNT_MANAGEMENT_URL,
                         },

apps/web/playwright/e2e/settings/room-settings/room-video-tab.spec.ts

@@ -8,8 +8,6 @@
 import { type Locator } from "@playwright/test";
 
 import { test, expect } from "../../../element-web-test";
-import { SettingLevel } from "../../../../src/settings/SettingLevel";
-
 test.describe("Voice & Video room settings tab", () => {
     const roomName = "Test room";
 
@@ -22,7 +20,6 @@ test.describe("Voice & Video room settings tab", () => {
     test.beforeEach(async ({ user, app, page }) => {
         // Execute client actions before setting, as the setting will force a reload.
         await app.client.createRoom({ name: roomName });
-        await app.settings.setValue("feature_group_calls", null, SettingLevel.DEVICE, true);
         await app.viewRoomByName(roomName);
         settings = await app.settings.openRoomSettings("Voice & Video");
     });