Switch to importing matrix-js-sdk from its main export (#11360)

* Switch to importing TypedEventEmitter from main js-sdk export

* Switch to importing js-sdk/matrix in cypress

* Remove duplicated imports

* Fix lint:js-fix to run prettier last otherwise ESLint --fix may cause a mess

* Add lint rule

* Fix cypress-axe import

* Fix cypress-axe import

test/components/views/dialogs/IncomingSasDialog-test.tsx

@@ -24,7 +24,7 @@ import {
     VerifierEvent,
     VerifierEventHandlerMap,
 } from "matrix-js-sdk/src/crypto-api/verification";
-import { TypedEventEmitter } from "matrix-js-sdk/src/models/typed-event-emitter";
+import { TypedEventEmitter } from "matrix-js-sdk/src/matrix";
 
 import IncomingSasDialog from "../../../../src/components/views/dialogs/IncomingSasDialog";
 import { stubClient } from "../../../test-utils";

test/components/views/messages/MPollBody-test.tsx

@@ -28,7 +28,7 @@ import {
 } from "matrix-js-sdk/src/@types/polls";
 import { M_TEXT } from "matrix-js-sdk/src/@types/extensible_events";
 
-import { allVotes, findTopAnswer, isPollEnded } from "../../../../src/components/views/messages/MPollBody";
+import MPollBody, { allVotes, findTopAnswer, isPollEnded } from "../../../../src/components/views/messages/MPollBody";
 import { IBodyProps } from "../../../../src/components/views/messages/IBodyProps";
 import {
     flushPromises,
@@ -38,7 +38,6 @@ import {
     setupRoomWithPollEvents,
 } from "../../../test-utils";
 import MatrixClientContext from "../../../../src/contexts/MatrixClientContext";
-import MPollBody from "../../../../src/components/views/messages/MPollBody";
 import { RoomPermalinkCreator } from "../../../../src/utils/permalinks/Permalinks";
 import { MediaEventHelper } from "../../../../src/utils/MediaEventHelper";
 

test/components/views/right_panel/VerificationPanel-test.tsx

@@ -16,7 +16,6 @@ limitations under the License.
 
 import { act, render, waitFor } from "@testing-library/react";
 import React, { ComponentProps } from "react";
-import { TypedEventEmitter } from "matrix-js-sdk/src/models/typed-event-emitter";
 import { User } from "matrix-js-sdk/src/models/user";
 import { mocked, Mocked } from "jest-mock";
 import {
@@ -29,7 +28,7 @@ import {
     VerifierEvent,
     VerifierEventHandlerMap,
 } from "matrix-js-sdk/src/crypto-api/verification";
-import { Device, MatrixClient } from "matrix-js-sdk/src/matrix";
+import { TypedEventEmitter, Device, MatrixClient } from "matrix-js-sdk/src/matrix";
 
 import VerificationPanel from "../../../../src/components/views/right_panel/VerificationPanel";
 import { flushPromises, stubClient } from "../../../test-utils";

test/components/views/rooms/EventTile/EventTileThreadToolbar-test.tsx

@@ -16,8 +16,7 @@ limitations under the License.
 
 import { getByLabelText, render, RenderResult } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
-import React from "react";
-import { ComponentProps } from "react";
+import React, { ComponentProps } from "react";
 
 import { EventTileThreadToolbar } from "../../../../../src/components/views/rooms/EventTile/EventTileThreadToolbar";
 

test/components/views/rooms/LegacyRoomHeader-test.tsx

@@ -36,13 +36,13 @@ import {
     setupAsyncStoreWithClient,
     resetAsyncStoreWithClient,
     mockPlatformPeg,
+    mkEvent,
 } from "../../../test-utils";
 import { MatrixClientPeg } from "../../../../src/MatrixClientPeg";
 import DMRoomMap from "../../../../src/utils/DMRoomMap";
 import RoomHeader, { IProps as RoomHeaderProps } from "../../../../src/components/views/rooms/LegacyRoomHeader";
 import { SearchScope } from "../../../../src/components/views/rooms/SearchBar";
 import { E2EStatus } from "../../../../src/utils/ShieldUtils";
-import { mkEvent } from "../../../test-utils";
 import { IRoomState } from "../../../../src/components/structures/RoomView";
 import RoomContext from "../../../../src/contexts/RoomContext";
 import SdkConfig from "../../../../src/SdkConfig";

test/components/views/rooms/SendMessageComposer-test.tsx

@@ -39,7 +39,6 @@ import { RoomPermalinkCreator } from "../../../../src/utils/permalinks/Permalink
 import { mockPlatformPeg } from "../../../test-utils/platform";
 import { doMaybeLocalRoomAction } from "../../../../src/utils/local-room";
 import { addTextToComposer } from "../../../test-utils/composer";
-import dis from "../../../../src/dispatcher/dispatcher";
 import SettingsStore from "../../../../src/settings/SettingsStore";
 
 jest.mock("../../../../src/utils/local-room", () => ({
@@ -510,7 +509,7 @@ describe("<SendMessageComposer/>", () => {
                 msgtype: MsgType.Text,
             });
 
-            expect(dis.dispatch).toHaveBeenCalledWith({ action: `effects.confetti` });
+            expect(defaultDispatcher.dispatch).toHaveBeenCalledWith({ action: `effects.confetti` });
         });
 
         it("not to send chat effects on message sending for threads", () => {
@@ -537,7 +536,7 @@ describe("<SendMessageComposer/>", () => {
                 msgtype: MsgType.Text,
             });
 
-            expect(dis.dispatch).not.toHaveBeenCalledWith({ action: `effects.confetti` });
+            expect(defaultDispatcher.dispatch).not.toHaveBeenCalledWith({ action: `effects.confetti` });
         });
     });
 

test/components/views/rooms/wysiwyg_composer/EditWysiwygComposer-test.tsx

@@ -27,7 +27,6 @@ import { EditWysiwygComposer } from "../../../../../src/components/views/rooms/w
 import EditorStateTransfer from "../../../../../src/utils/EditorStateTransfer";
 import { Emoji } from "../../../../../src/components/views/rooms/wysiwyg_composer/components/Emoji";
 import { ChevronFace } from "../../../../../src/components/structures/ContextMenu";
-import dis from "../../../../../src/dispatcher/dispatcher";
 import { ComposerInsertPayload, ComposerType } from "../../../../../src/dispatcher/payloads/ComposerInsertPayload";
 import { ActionPayload } from "../../../../../src/dispatcher/payloads";
 import * as EmojiButton from "../../../../../src/components/views/rooms/EmojiButton";
@@ -290,8 +289,8 @@ describe("EditWysiwygComposer", () => {
         // RoomView is re-dispatching the composer messages.
         // It adds the composerType fields where the value refers if the composer is in editing or not
         // The listeners in the RTE ignore the message if the composerType is missing in the payload
-        const dispatcherRef = dis.register((payload: ActionPayload) => {
-            dis.dispatch<ComposerInsertPayload>({
+        const dispatcherRef = defaultDispatcher.register((payload: ActionPayload) => {
+            defaultDispatcher.dispatch<ComposerInsertPayload>({
                 ...(payload as ComposerInsertPayload),
                 composerType: ComposerType.Edit,
             });
@@ -301,6 +300,6 @@ describe("EditWysiwygComposer", () => {
 
         // Then
         await waitFor(() => expect(screen.getByRole("textbox")).toHaveTextContent(/🦫/));
-        dis.unregister(dispatcherRef);
+        defaultDispatcher.unregister(dispatcherRef);
     });
 });

test/components/views/settings/tabs/user/SessionManagerTab-test.tsx

@@ -35,16 +35,16 @@ import {
 } from "matrix-js-sdk/src/matrix";
 import { mocked } from "jest-mock";
 
-import { clearAllModals } from "../../../../../test-utils";
-import SessionManagerTab from "../../../../../../src/components/views/settings/tabs/user/SessionManagerTab";
-import MatrixClientContext from "../../../../../../src/contexts/MatrixClientContext";
 import {
+    clearAllModals,
     flushPromises,
     getMockClientWithEventEmitter,
     mkPusher,
     mockClientMethodsUser,
     mockPlatformPeg,
 } from "../../../../../test-utils";
+import SessionManagerTab from "../../../../../../src/components/views/settings/tabs/user/SessionManagerTab";
+import MatrixClientContext from "../../../../../../src/contexts/MatrixClientContext";
 import Modal from "../../../../../../src/Modal";
 import LogoutDialog from "../../../../../../src/components/views/dialogs/LogoutDialog";
 import { DeviceSecurityVariation, ExtendedDevice } from "../../../../../../src/components/views/settings/devices/types";

test/components/views/spaces/SpaceSettingsVisibilityTab-test.tsx

@@ -22,8 +22,13 @@ import { EventType, MatrixClient, Room } from "matrix-js-sdk/src/matrix";
 import { GuestAccess, HistoryVisibility, JoinRule } from "matrix-js-sdk/src/@types/partials";
 
 import _SpaceSettingsVisibilityTab from "../../../../src/components/views/spaces/SpaceSettingsVisibilityTab";
-import { createTestClient, mkEvent, wrapInMatrixClientContext } from "../../../test-utils";
-import { mkSpace, mockStateEventImplementation } from "../../../test-utils";
+import {
+    createTestClient,
+    mkEvent,
+    wrapInMatrixClientContext,
+    mkSpace,
+    mockStateEventImplementation,
+} from "../../../test-utils";
 import { MatrixClientPeg } from "../../../../src/MatrixClientPeg";
 
 const SpaceSettingsVisibilityTab = wrapInMatrixClientContext(_SpaceSettingsVisibilityTab);

test/components/views/toasts/VerificationRequestToast-test.tsx

@@ -21,9 +21,7 @@ import {
     VerificationRequest,
     VerificationRequestEvent,
 } from "matrix-js-sdk/src/crypto/verification/request/VerificationRequest";
-import { IMyDevice, MatrixClient } from "matrix-js-sdk/src/client";
-import { TypedEventEmitter } from "matrix-js-sdk/src/models/typed-event-emitter";
-import { Device } from "matrix-js-sdk/src/matrix";
+import { TypedEventEmitter, IMyDevice, MatrixClient, Device } from "matrix-js-sdk/src/matrix";
 
 import VerificationRequestToast from "../../../../src/components/views/toasts/VerificationRequestToast";
 import {