Merge remote-tracking branch 'origin/develop' into dbkr/key_storage_toggle

test/test-utils/test-utils.ts

@@ -7,43 +7,43 @@ Please see LICENSE files in the repository root for full details.
 */
 
 import EventEmitter from "events";
-import { mocked, MockedObject } from "jest-mock";
+import { mocked, type MockedObject } from "jest-mock";
 import {
     MatrixEvent,
-    Room,
-    User,
-    IContent,
-    IEvent,
-    RoomMember,
-    MatrixClient,
-    EventTimeline,
-    RoomState,
+    type Room,
+    type User,
+    type IContent,
+    type IEvent,
+    type RoomMember,
+    type MatrixClient,
+    type EventTimeline,
+    type RoomState,
     EventType,
-    IEventRelation,
-    IUnsigned,
-    IPusher,
+    type IEventRelation,
+    type IUnsigned,
+    type IPusher,
     RoomType,
     KNOWN_SAFE_ROOM_VERSION,
     ConditionKind,
-    IPushRules,
+    type IPushRules,
     RelationType,
     JoinRule,
-    OidcClientConfig,
+    type OidcClientConfig,
+    type GroupCall,
 } from "matrix-js-sdk/src/matrix";
 import { KnownMembership } from "matrix-js-sdk/src/types";
 import { normalize } from "matrix-js-sdk/src/utils";
 import { ReEmitter } from "matrix-js-sdk/src/ReEmitter";
-import { MediaHandler } from "matrix-js-sdk/src/webrtc/mediaHandler";
+import { type MediaHandler } from "matrix-js-sdk/src/webrtc/mediaHandler";
 import { Feature, ServerSupport } from "matrix-js-sdk/src/feature";
-import { MapperOpts } from "matrix-js-sdk/src/event-mapper";
-import { MatrixRTCSessionManager, MatrixRTCSession } from "matrix-js-sdk/src/matrixrtc";
+import { type MapperOpts } from "matrix-js-sdk/src/event-mapper";
+import { type MatrixRTCSessionManager, type MatrixRTCSession } from "matrix-js-sdk/src/matrixrtc";
 
-import type { GroupCall } from "matrix-js-sdk/src/matrix";
 import type { Membership } from "matrix-js-sdk/src/types";
 import { MatrixClientPeg as peg } from "../../src/MatrixClientPeg";
-import { ValidatedServerConfig } from "../../src/utils/ValidatedServerConfig";
+import { type ValidatedServerConfig } from "../../src/utils/ValidatedServerConfig";
 import { EnhancedMap } from "../../src/utils/maps";
-import { AsyncStoreWithClient } from "../../src/stores/AsyncStoreWithClient";
+import { type AsyncStoreWithClient } from "../../src/stores/AsyncStoreWithClient";
 import MatrixClientBackedSettingsHandler from "../../src/settings/handlers/MatrixClientBackedSettingsHandler";
 
 /**