Consume more imports from matrix-js-sdk/src/matrix (#11449)

.eslintrc.js

@@ -144,20 +144,6 @@ module.exports = {
                             "!matrix-js-sdk/src/models/read-receipt",
                             "!matrix-js-sdk/src/models/relations-container",
                             "!matrix-js-sdk/src/models/related-relations",
-                            "!matrix-js-sdk/src/@types",
-                            "!matrix-js-sdk/src/@types/global",
-                            "!matrix-js-sdk/src/@types/auth",
-                            "!matrix-js-sdk/src/@types/beacon",
-                            "!matrix-js-sdk/src/@types/threepids",
-                            "!matrix-js-sdk/src/@types/polls",
-                            "!matrix-js-sdk/src/@types/crypto",
-                            "!matrix-js-sdk/src/@types/local_notifications",
-                            "!matrix-js-sdk/src/@types/location",
-                            "!matrix-js-sdk/src/@types/topic",
-                            "!matrix-js-sdk/src/@types/registration",
-                            "!matrix-js-sdk/src/@types/read_receipts",
-                            "!matrix-js-sdk/src/@types/extensible_events",
-                            "!matrix-js-sdk/src/@types/IIdentityServerProvider",
                         ],
                         message: "Please use matrix-js-sdk/src/matrix instead",
                     },

cypress/e2e/read-receipts/read-receipts.spec.ts

@@ -16,8 +16,7 @@ limitations under the License.
 
 /// <reference types="cypress" />
 
-import type { MatrixClient, MatrixEvent, ISendEventResponse } from "matrix-js-sdk/src/matrix";
+import type { MatrixClient, MatrixEvent, ISendEventResponse, ReceiptType } from "matrix-js-sdk/src/matrix";
-import type { ReceiptType } from "matrix-js-sdk/src/@types/read_receipts";
 import { HomeserverInstance } from "../../plugins/utils/homeserver";
 
 describe("Read receipts", () => {

cypress/global.d.ts

@@ -17,6 +17,7 @@ limitations under the License.
 import "../src/@types/global";
 import "../src/@types/svg";
 import "../src/@types/raw-loader";
+// eslint-disable-next-line no-restricted-imports
 import "matrix-js-sdk/src/@types/global";
 import type {
     MatrixClient,

cypress/support/client.ts

@@ -26,8 +26,8 @@ import type {
     UploadOpts,
     ICreateRoomOpts,
     ISendEventResponse,
+    ReceiptType,
 } from "matrix-js-sdk/src/matrix";
-import type { ReceiptType } from "matrix-js-sdk/src/@types/read_receipts";
 import Chainable = Cypress.Chainable;
 import { UserCredentials } from "./login";
 

src/@types/global.d.ts

@@ -14,6 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+// eslint-disable-next-line no-restricted-imports
 import "matrix-js-sdk/src/@types/global"; // load matrix-js-sdk's type extensions first
 import "@types/modernizr";
 

src/AddThreepid.ts

@@ -24,8 +24,8 @@ import {
     MatrixClient,
     MatrixError,
     HTTPError,
+    IThreepid,
 } from "matrix-js-sdk/src/matrix";
-import { IThreepid } from "matrix-js-sdk/src/@types/threepids";
 
 import Modal from "./Modal";
 import { _t, UserFriendlyError } from "./languageHandler";

src/Login.ts

@@ -15,9 +15,15 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { createClient, MatrixClient, LoginFlow } from "matrix-js-sdk/src/matrix";
+import {
+    createClient,
+    MatrixClient,
+    LoginFlow,
+    DELEGATED_OIDC_COMPATIBILITY,
+    ILoginFlow,
+    LoginRequest,
+} from "matrix-js-sdk/src/matrix";
 import { logger } from "matrix-js-sdk/src/logger";
-import { DELEGATED_OIDC_COMPATIBILITY, ILoginFlow, LoginRequest } from "matrix-js-sdk/src/@types/auth";
 
 import { IMatrixClientCreds } from "./MatrixClientPeg";
 import SecurityCustomisations from "./customisations/Security";

src/Notifier.ts

@@ -27,9 +27,9 @@ import {
     SyncState,
     SyncStateData,
     IRoomTimelineData,
+    M_LOCATION,
 } from "matrix-js-sdk/src/matrix";
 import { logger } from "matrix-js-sdk/src/logger";
-import { M_LOCATION } from "matrix-js-sdk/src/@types/location";
 import { PermissionChanged as PermissionChangedEvent } from "@matrix-org/analytics-events/types/typescript/PermissionChanged";
 
 import { MatrixClientPeg } from "./MatrixClientPeg";

src/SlashCommands.tsx

@@ -18,9 +18,8 @@ limitations under the License.
 */
 
 import * as React from "react";
-import { User, IContent, Direction, ContentHelpers } from "matrix-js-sdk/src/matrix";
+import { User, IContent, Direction, ContentHelpers, MRoomTopicEventContent } from "matrix-js-sdk/src/matrix";
 import { logger } from "matrix-js-sdk/src/logger";
-import { MRoomTopicEventContent } from "matrix-js-sdk/src/@types/topic";
 
 import dis from "./dispatcher/dispatcher";
 import { _t, _td, UserFriendlyError } from "./languageHandler";

src/TextForEvent.tsx

@@ -23,10 +23,11 @@ import {
     JoinRule,
     EventType,
     MsgType,
+    M_POLL_START,
+    M_POLL_END,
 } from "matrix-js-sdk/src/matrix";
 import { logger } from "matrix-js-sdk/src/logger";
 import { removeDirectionOverrideChars } from "matrix-js-sdk/src/utils";
-import { M_POLL_START, M_POLL_END } from "matrix-js-sdk/src/@types/polls";
 import { PollStartEvent } from "matrix-js-sdk/src/extensible_events_v1/PollStartEvent";
 
 import { _t } from "./languageHandler";

src/Unread.ts

@@ -14,9 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { M_BEACON } from "matrix-js-sdk/src/@types/beacon";
+import { M_BEACON, Room, Thread, MatrixEvent, EventType, MatrixClient } from "matrix-js-sdk/src/matrix";
 import { logger } from "matrix-js-sdk/src/logger";
-import { Room, Thread, MatrixEvent, EventType, MatrixClient } from "matrix-js-sdk/src/matrix";
 
 import shouldHideEvent from "./shouldHideEvent";
 import { haveRendererForEvent } from "./events/EventTileFactory";

src/boundThreepids.ts

@@ -14,8 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { IThreepid, ThreepidMedium } from "matrix-js-sdk/src/@types/threepids";
+import { IThreepid, ThreepidMedium, MatrixClient, MatrixError } from "matrix-js-sdk/src/matrix";
-import { MatrixClient, MatrixError } from "matrix-js-sdk/src/matrix";
 
 import IdentityAuthClient from "./IdentityAuthClient";
 

src/components/structures/MessagePanel.tsx

@@ -17,9 +17,16 @@ limitations under the License.
 import React, { createRef, ReactNode, TransitionEvent } from "react";
 import ReactDOM from "react-dom";
 import classNames from "classnames";
-import { Room, MatrixClient, RoomStateEvent, EventStatus, MatrixEvent, EventType } from "matrix-js-sdk/src/matrix";
+import {
+    Room,
+    MatrixClient,
+    RoomStateEvent,
+    EventStatus,
+    MatrixEvent,
+    EventType,
+    M_BEACON_INFO,
+} from "matrix-js-sdk/src/matrix";
 import { logger } from "matrix-js-sdk/src/logger";
-import { M_BEACON_INFO } from "matrix-js-sdk/src/@types/beacon";
 import { isSupportedReceiptType } from "matrix-js-sdk/src/utils";
 import { Optional } from "matrix-events-sdk";
 

src/components/structures/TimelinePanel.tsx

@@ -37,10 +37,10 @@ import {
     TimelineWindow,
     Thread,
     ThreadEvent,
+    ReceiptType,
 } from "matrix-js-sdk/src/matrix";
 import { debounce, findLastIndex, throttle } from "lodash";
 import { logger } from "matrix-js-sdk/src/logger";
-import { ReceiptType } from "matrix-js-sdk/src/@types/read_receipts";
 
 import SettingsStore from "../../settings/SettingsStore";
 import { Layout } from "../../settings/enums/Layout";

src/components/structures/auth/Registration.tsx

@@ -26,11 +26,11 @@ import {
     MatrixClient,
     SSOFlow,
     SSOAction,
+    RegisterResponse,
 } from "matrix-js-sdk/src/matrix";
 import React, { Fragment, ReactNode } from "react";
 import classNames from "classnames";
 import { logger } from "matrix-js-sdk/src/logger";
-import { RegisterResponse } from "matrix-js-sdk/src/@types/registration";
 
 import { _t } from "../../../languageHandler";
 import { adminContactStrings, messageForResourceLimitError, resourceLimitStrings } from "../../../utils/ErrorUtils";

src/components/views/context_menus/MessageContextMenu.tsx

@@ -26,8 +26,8 @@ import {
     RelationType,
     Relations,
     Thread,
+    M_POLL_START,
 } from "matrix-js-sdk/src/matrix";
-import { M_POLL_START } from "matrix-js-sdk/src/@types/polls";
 
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import dis from "../../../dispatcher/dispatcher";

src/components/views/dialogs/ForwardDialog.tsx

@@ -24,9 +24,11 @@ import {
     EventType,
     MatrixClient,
     ContentHelpers,
+    ILocationContent,
+    LocationAssetType,
+    M_TIMESTAMP,
+    M_BEACON,
 } from "matrix-js-sdk/src/matrix";
-import { ILocationContent, LocationAssetType, M_TIMESTAMP } from "matrix-js-sdk/src/@types/location";
-import { M_BEACON } from "matrix-js-sdk/src/@types/beacon";
 
 import { _t } from "../../../languageHandler";
 import dis from "../../../dispatcher/dispatcher";

src/components/views/dialogs/devtools/RoomNotifications.tsx

@@ -14,9 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { NotificationCountType, Room, Thread } from "matrix-js-sdk/src/matrix";
+import { NotificationCountType, Room, Thread, ReceiptType } from "matrix-js-sdk/src/matrix";
 import React, { useContext } from "react";
-import { ReceiptType } from "matrix-js-sdk/src/@types/read_receipts";
 import { ReadReceipt } from "matrix-js-sdk/src/models/read-receipt";
 
 import MatrixClientContext from "../../../../contexts/MatrixClientContext";

src/components/views/elements/PollCreateDialog.tsx

@@ -15,15 +15,16 @@ limitations under the License.
 */
 
 import React, { ChangeEvent, createRef } from "react";
-import { Room, MatrixEvent } from "matrix-js-sdk/src/matrix";
 import {
+    Room,
+    MatrixEvent,
     KnownPollKind,
     M_POLL_KIND_DISCLOSED,
     M_POLL_KIND_UNDISCLOSED,
     M_POLL_START,
-} from "matrix-js-sdk/src/@types/polls";
+    IPartialEvent,
+} from "matrix-js-sdk/src/matrix";
 import { PollStartEvent } from "matrix-js-sdk/src/extensible_events_v1/PollStartEvent";
-import { IPartialEvent } from "matrix-js-sdk/src/@types/extensible_events";
 
 import ScrollableBaseModal, { IScrollableBaseState } from "../dialogs/ScrollableBaseModal";
 import QuestionDialog from "../dialogs/QuestionDialog";

src/components/views/elements/SSOButtons.tsx

@@ -17,9 +17,15 @@ limitations under the License.
 import React from "react";
 import { chunk } from "lodash";
 import classNames from "classnames";
-import { MatrixClient, IdentityProviderBrand, SSOFlow, SSOAction } from "matrix-js-sdk/src/matrix";
+import {
+    MatrixClient,
+    IdentityProviderBrand,
+    SSOFlow,
+    SSOAction,
+    IIdentityProvider,
+    DELEGATED_OIDC_COMPATIBILITY,
+} from "matrix-js-sdk/src/matrix";
 import { Signup } from "@matrix-org/analytics-events/types/typescript/Signup";
-import { IIdentityProvider, DELEGATED_OIDC_COMPATIBILITY } from "matrix-js-sdk/src/@types/auth";
 
 import PlatformPeg from "../../../PlatformPeg";
 import AccessibleButton from "./AccessibleButton";

src/components/views/messages/MBeaconBody.tsx

@@ -24,9 +24,9 @@ import {
     RelationType,
     IRedactOpts,
     ContentHelpers,
+    M_BEACON,
 } from "matrix-js-sdk/src/matrix";
 import { randomString } from "matrix-js-sdk/src/randomstring";
-import { M_BEACON } from "matrix-js-sdk/src/@types/beacon";
 import classNames from "classnames";
 
 import MatrixClientContext from "../../../contexts/MatrixClientContext";

src/components/views/messages/MPollBody.tsx

@@ -16,8 +16,16 @@ limitations under the License.
 
 import React, { ReactNode } from "react";
 import { logger } from "matrix-js-sdk/src/logger";
-import { MatrixEvent, MatrixClient, Relations, Poll, PollEvent } from "matrix-js-sdk/src/matrix";
+import {
-import { M_POLL_KIND_DISCLOSED, M_POLL_RESPONSE, M_POLL_START } from "matrix-js-sdk/src/@types/polls";
+    MatrixEvent,
+    MatrixClient,
+    Relations,
+    Poll,
+    PollEvent,
+    M_POLL_KIND_DISCLOSED,
+    M_POLL_RESPONSE,
+    M_POLL_START,
+} from "matrix-js-sdk/src/matrix";
 import { RelatedRelations } from "matrix-js-sdk/src/models/related-relations";
 import { PollStartEvent, PollAnswerSubevent } from "matrix-js-sdk/src/extensible_events_v1/PollStartEvent";
 import { PollResponseEvent } from "matrix-js-sdk/src/extensible_events_v1/PollResponseEvent";

src/components/views/messages/MPollEndBody.tsx

@@ -15,8 +15,7 @@ limitations under the License.
 */
 
 import React, { useEffect, useState, useContext, ForwardRefExoticComponent } from "react";
-import { MatrixEvent } from "matrix-js-sdk/src/matrix";
+import { MatrixEvent, M_TEXT } from "matrix-js-sdk/src/matrix";
-import { M_TEXT } from "matrix-js-sdk/src/@types/extensible_events";
 import { logger } from "matrix-js-sdk/src/logger";
 
 import { Icon as PollIcon } from "../../../../res/img/element-icons/room/composer/poll.svg";

src/components/views/messages/MessageActionBar.tsx

@@ -17,9 +17,15 @@ limitations under the License.
 */
 
 import React, { ReactElement, useCallback, useContext, useEffect } from "react";
-import { EventStatus, MatrixEvent, MatrixEventEvent, MsgType, RelationType } from "matrix-js-sdk/src/matrix";
+import {
+    EventStatus,
+    MatrixEvent,
+    MatrixEventEvent,
+    MsgType,
+    RelationType,
+    M_BEACON_INFO,
+} from "matrix-js-sdk/src/matrix";
 import classNames from "classnames";
-import { M_BEACON_INFO } from "matrix-js-sdk/src/@types/beacon";
 
 import { Icon as ContextMenuIcon } from "../../../../res/img/element-icons/context-menu.svg";
 import { Icon as EditIcon } from "../../../../res/img/element-icons/room/message-bar/edit.svg";

src/components/views/messages/MessageEvent.tsx

@@ -15,10 +15,15 @@ limitations under the License.
 */
 
 import React, { createRef } from "react";
-import { EventType, MsgType, MatrixEventEvent } from "matrix-js-sdk/src/matrix";
+import {
-import { M_BEACON_INFO } from "matrix-js-sdk/src/@types/beacon";
+    EventType,
-import { M_LOCATION } from "matrix-js-sdk/src/@types/location";
+    MsgType,
-import { M_POLL_END, M_POLL_START } from "matrix-js-sdk/src/@types/polls";
+    MatrixEventEvent,
+    M_BEACON_INFO,
+    M_LOCATION,
+    M_POLL_END,
+    M_POLL_START,
+} from "matrix-js-sdk/src/matrix";
 
 import SettingsStore from "../../../settings/SettingsStore";
 import { Mjolnir } from "../../../mjolnir/Mjolnir";

src/components/views/polls/pollHistory/fetchPastPolls.ts

@@ -15,8 +15,8 @@ limitations under the License.
 */
 
 import { useCallback, useEffect, useState } from "react";
-import { M_POLL_START } from "matrix-js-sdk/src/@types/polls";
 import {
+    M_POLL_START,
     MatrixClient,
     Direction,
     EventTimeline,

src/components/views/rooms/MessageComposerButtons.tsx

@@ -15,8 +15,7 @@ limitations under the License.
 */
 
 import classNames from "classnames";
-import { IEventRelation, Room, MatrixClient, THREAD_RELATION_TYPE } from "matrix-js-sdk/src/matrix";
+import { IEventRelation, Room, MatrixClient, THREAD_RELATION_TYPE, M_POLL_START } from "matrix-js-sdk/src/matrix";
-import { M_POLL_START } from "matrix-js-sdk/src/@types/polls";
 import React, { createContext, ReactElement, ReactNode, useContext, useRef } from "react";
 
 import { _t } from "../../../languageHandler";

src/components/views/settings/Notifications.tsx

@@ -15,10 +15,17 @@ limitations under the License.
 */
 
 import React, { ReactNode } from "react";
-import { IAnnotatedPushRule, IPusher, PushRuleAction, PushRuleKind, RuleId } from "matrix-js-sdk/src/matrix";
+import {
-import { IThreepid, ThreepidMedium } from "matrix-js-sdk/src/@types/threepids";
+    IAnnotatedPushRule,
+    IPusher,
+    PushRuleAction,
+    PushRuleKind,
+    RuleId,
+    IThreepid,
+    ThreepidMedium,
+    LocalNotificationSettings,
+} from "matrix-js-sdk/src/matrix";
 import { logger } from "matrix-js-sdk/src/logger";
-import { LocalNotificationSettings } from "matrix-js-sdk/src/@types/local_notifications";
 
 import Spinner from "../elements/Spinner";
 import { MatrixClientPeg } from "../../../MatrixClientPeg";

src/components/views/settings/SetIdServer.tsx

@@ -16,7 +16,7 @@ limitations under the License.
 
 import React, { ReactNode } from "react";
 import { logger } from "matrix-js-sdk/src/logger";
-import { IThreepid } from "matrix-js-sdk/src/@types/threepids";
+import { IThreepid } from "matrix-js-sdk/src/matrix";
 
 import { _t } from "../../../languageHandler";
 import { MatrixClientPeg } from "../../../MatrixClientPeg";

src/components/views/settings/account/EmailAddresses.tsx

@@ -16,9 +16,8 @@ limitations under the License.
 */
 
 import React from "react";
-import { ThreepidMedium } from "matrix-js-sdk/src/@types/threepids";
+import { ThreepidMedium, MatrixError } from "matrix-js-sdk/src/matrix";
 import { logger } from "matrix-js-sdk/src/logger";
-import { MatrixError } from "matrix-js-sdk/src/matrix";
 
 import { _t, UserFriendlyError } from "../../../../languageHandler";
 import { MatrixClientPeg } from "../../../../MatrixClientPeg";

src/components/views/settings/account/PhoneNumbers.tsx

@@ -16,7 +16,7 @@ limitations under the License.
 */
 
 import React from "react";
-import { ThreepidMedium } from "matrix-js-sdk/src/@types/threepids";
+import { ThreepidMedium } from "matrix-js-sdk/src/matrix";
 import { logger } from "matrix-js-sdk/src/logger";
 
 import { _t, UserFriendlyError } from "../../../../languageHandler";

src/components/views/settings/devices/CurrentDeviceSection.tsx

@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 import React, { useState } from "react";
-import { LocalNotificationSettings } from "matrix-js-sdk/src/@types/local_notifications";
+import { LocalNotificationSettings } from "matrix-js-sdk/src/matrix";
 
 import { _t } from "../../../../languageHandler";
 import Spinner from "../../elements/Spinner";

src/components/views/settings/devices/DeviceDetails.tsx

@@ -16,8 +16,7 @@ limitations under the License.
 
 import React from "react";
 import classNames from "classnames";
-import { IPusher, PUSHER_ENABLED } from "matrix-js-sdk/src/matrix";
+import { IPusher, PUSHER_ENABLED, LocalNotificationSettings } from "matrix-js-sdk/src/matrix";
-import { LocalNotificationSettings } from "matrix-js-sdk/src/@types/local_notifications";
 
 import { formatDate } from "../../../../DateUtils";
 import { _t } from "../../../../languageHandler";

src/components/views/settings/devices/FilteredDeviceList.tsx

@@ -15,8 +15,7 @@ limitations under the License.
 */
 
 import React, { ForwardedRef, forwardRef } from "react";
-import { IPusher, PUSHER_DEVICE_ID } from "matrix-js-sdk/src/matrix";
+import { IPusher, PUSHER_DEVICE_ID, LocalNotificationSettings } from "matrix-js-sdk/src/matrix";
-import { LocalNotificationSettings } from "matrix-js-sdk/src/@types/local_notifications";
 
 import { _t } from "../../../../languageHandler";
 import AccessibleButton from "../../elements/AccessibleButton";

src/components/views/settings/devices/useOwnDevices.ts

@@ -26,10 +26,10 @@ import {
     PUSHER_ENABLED,
     UNSTABLE_MSC3852_LAST_SEEN_UA,
     MatrixError,
+    LocalNotificationSettings,
 } from "matrix-js-sdk/src/matrix";
 import { VerificationRequest } from "matrix-js-sdk/src/crypto-api";
 import { logger } from "matrix-js-sdk/src/logger";
-import { LocalNotificationSettings } from "matrix-js-sdk/src/@types/local_notifications";
 import { CryptoEvent } from "matrix-js-sdk/src/crypto";
 
 import MatrixClientContext from "../../../../contexts/MatrixClientContext";

src/components/views/settings/notifications/NotificationPusherSettings.tsx

@@ -14,8 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { ThreepidMedium } from "matrix-js-sdk/src/@types/threepids";
+import { ThreepidMedium, IPusher } from "matrix-js-sdk/src/matrix";
-import { IPusher } from "matrix-js-sdk/src/matrix";
 import React, { useCallback, useMemo } from "react";
 
 import { useMatrixClientContext } from "../../../../contexts/MatrixClientContext";

src/components/views/settings/tabs/user/GeneralUserSettingsTab.tsx

@@ -17,8 +17,7 @@ limitations under the License.
 */
 
 import React, { ReactNode } from "react";
-import { SERVICE_TYPES, HTTPError } from "matrix-js-sdk/src/matrix";
+import { SERVICE_TYPES, HTTPError, IThreepid, ThreepidMedium } from "matrix-js-sdk/src/matrix";
-import { IThreepid, ThreepidMedium } from "matrix-js-sdk/src/@types/threepids";
 import { logger } from "matrix-js-sdk/src/logger";
 
 import { Icon as WarningIcon } from "../../../../../../res/img/feather-customised/warning-triangle.svg";

src/events/EventTileFactory.tsx

@@ -15,9 +15,17 @@ limitations under the License.
 */
 
 import React from "react";
-import { MatrixEvent, EventType, MsgType, RelationType, MatrixClient, GroupCallIntent } from "matrix-js-sdk/src/matrix";
+import {
+    MatrixEvent,
+    EventType,
+    MsgType,
+    RelationType,
+    MatrixClient,
+    GroupCallIntent,
+    M_POLL_END,
+    M_POLL_START,
+} from "matrix-js-sdk/src/matrix";
 import { Optional } from "matrix-events-sdk";
-import { M_POLL_END, M_POLL_START } from "matrix-js-sdk/src/@types/polls";
 
 import SettingsStore from "../settings/SettingsStore";
 import LegacyCallEventGrouper from "../components/structures/LegacyCallEventGrouper";

src/events/forward/getForwardableEvent.ts

@@ -14,9 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { M_POLL_END, M_POLL_START } from "matrix-js-sdk/src/@types/polls";
+import { M_POLL_END, M_POLL_START, M_BEACON_INFO, MatrixEvent, MatrixClient } from "matrix-js-sdk/src/matrix";
-import { M_BEACON_INFO } from "matrix-js-sdk/src/@types/beacon";
-import { MatrixEvent, MatrixClient } from "matrix-js-sdk/src/matrix";
 
 import { getShareableLocationEventForBeacon } from "../../utils/beacon/getShareableLocation";
 import { VoiceBroadcastInfoEventType } from "../../voice-broadcast/types";

src/events/location/getShareableLocationEvent.ts

@@ -14,8 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { M_BEACON_INFO } from "matrix-js-sdk/src/@types/beacon";
+import { M_BEACON_INFO, MatrixEvent, MatrixClient } from "matrix-js-sdk/src/matrix";
-import { MatrixEvent, MatrixClient } from "matrix-js-sdk/src/matrix";
 
 import { getShareableLocationEventForBeacon } from "../../utils/beacon/getShareableLocation";
 import { isLocationEvent } from "../../utils/EventUtils";

src/hooks/room/useTopic.ts

@@ -15,8 +15,14 @@ limitations under the License.
 */
 
 import { useEffect, useState } from "react";
-import { EventType, MatrixEvent, Room, RoomStateEvent, ContentHelpers } from "matrix-js-sdk/src/matrix";
+import {
-import { MRoomTopicEventContent } from "matrix-js-sdk/src/@types/topic";
+    EventType,
+    MatrixEvent,
+    Room,
+    RoomStateEvent,
+    ContentHelpers,
+    MRoomTopicEventContent,
+} from "matrix-js-sdk/src/matrix";
 import { Optional } from "matrix-events-sdk";
 
 import { useTypedEventEmitter } from "../useEventEmitter";

src/hooks/useThreepids.ts

@@ -14,8 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { MatrixClient } from "matrix-js-sdk/src/matrix";
+import { MatrixClient, IThreepid } from "matrix-js-sdk/src/matrix";
-import { IThreepid } from "matrix-js-sdk/src/@types/threepids";
 
 import { useAsyncRefreshMemo } from "./useAsyncRefreshMemo";
 

src/stores/OwnBeaconStore.ts

@@ -25,8 +25,9 @@ import {
     RoomState,
     RoomStateEvent,
     ContentHelpers,
+    MBeaconInfoEventContent,
+    M_BEACON,
 } from "matrix-js-sdk/src/matrix";
-import { MBeaconInfoEventContent, M_BEACON } from "matrix-js-sdk/src/@types/beacon";
 import { logger } from "matrix-js-sdk/src/logger";
 
 import defaultDispatcher from "../dispatcher/dispatcher";

src/stores/room-list/MessagePreviewStore.ts

@@ -14,9 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { Room, RelationType, MatrixEvent, Thread } from "matrix-js-sdk/src/matrix";
+import { Room, RelationType, MatrixEvent, Thread, M_POLL_START } from "matrix-js-sdk/src/matrix";
 import { isNullOrUndefined } from "matrix-js-sdk/src/utils";
-import { M_POLL_START } from "matrix-js-sdk/src/@types/polls";
 
 import { ActionPayload } from "../../dispatcher/payloads";
 import { AsyncStoreWithClient } from "../AsyncStoreWithClient";

src/stores/room-list/previews/PollStartEventPreview.ts

@@ -14,8 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { MatrixEvent } from "matrix-js-sdk/src/matrix";
+import { MatrixEvent, PollStartEventContent } from "matrix-js-sdk/src/matrix";
-import { PollStartEventContent } from "matrix-js-sdk/src/@types/polls";
 import { InvalidEventError } from "matrix-js-sdk/src/extensible_events_v1/InvalidEventError";
 import { PollStartEvent } from "matrix-js-sdk/src/extensible_events_v1/PollStartEvent";
 

src/utils/EventRenderingUtils.ts

@@ -14,9 +14,16 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { MatrixEvent, IContent, MatrixClient, EventType, MsgType } from "matrix-js-sdk/src/matrix";
+import {
-import { M_POLL_END, M_POLL_START } from "matrix-js-sdk/src/@types/polls";
+    MatrixEvent,
-import { M_BEACON_INFO } from "matrix-js-sdk/src/@types/beacon";
+    IContent,
+    MatrixClient,
+    EventType,
+    MsgType,
+    M_POLL_END,
+    M_POLL_START,
+    M_BEACON_INFO,
+} from "matrix-js-sdk/src/matrix";
 
 import SettingsStore from "../settings/SettingsStore";
 import { haveRendererForEvent, JitsiEventFactory, JSONEventFactory, pickFactory } from "../events/EventTileFactory";

src/utils/EventUtils.ts

@@ -23,11 +23,12 @@ import {
     RelationType,
     MatrixClient,
     THREAD_RELATION_TYPE,
+    M_POLL_END,
+    M_POLL_START,
+    M_LOCATION,
+    M_BEACON_INFO,
 } from "matrix-js-sdk/src/matrix";
 import { logger } from "matrix-js-sdk/src/logger";
-import { M_POLL_END, M_POLL_START } from "matrix-js-sdk/src/@types/polls";
-import { M_LOCATION } from "matrix-js-sdk/src/@types/location";
-import { M_BEACON_INFO } from "matrix-js-sdk/src/@types/beacon";
 
 import shouldHideEvent from "../shouldHideEvent";
 import { GetRelationsForEvent } from "../components/views/rooms/EventTile";

src/utils/PinningUtils.ts

@@ -14,8 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { MatrixEvent, EventType } from "matrix-js-sdk/src/matrix";
+import { MatrixEvent, EventType, M_POLL_START } from "matrix-js-sdk/src/matrix";
-import { M_POLL_START } from "matrix-js-sdk/src/@types/polls";
 
 export default class PinningUtils {
     /**

src/utils/Reply.ts

@@ -15,11 +15,18 @@
  * limitations under the License.
  */
 
-import { IContent, IEventRelation, MatrixEvent, MsgType, THREAD_RELATION_TYPE } from "matrix-js-sdk/src/matrix";
+import {
+    IContent,
+    IEventRelation,
+    MatrixEvent,
+    MsgType,
+    THREAD_RELATION_TYPE,
+    M_BEACON_INFO,
+    M_POLL_END,
+    M_POLL_START,
+} from "matrix-js-sdk/src/matrix";
 import sanitizeHtml from "sanitize-html";
 import escapeHtml from "escape-html";
-import { M_BEACON_INFO } from "matrix-js-sdk/src/@types/beacon";
-import { M_POLL_END, M_POLL_START } from "matrix-js-sdk/src/@types/polls";
 import { PollStartEvent } from "matrix-js-sdk/src/extensible_events_v1/PollStartEvent";
 
 import { PERMITTED_URL_SCHEMES } from "./UrlUtils";

src/utils/beacon/timeline.ts

@@ -14,8 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { MatrixEvent } from "matrix-js-sdk/src/matrix";
+import { MatrixEvent, M_BEACON_INFO } from "matrix-js-sdk/src/matrix";
-import { M_BEACON_INFO } from "matrix-js-sdk/src/@types/beacon";
 
 /**
  * beacon_info events without live property set to true

src/utils/location/isSelfLocation.ts

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { ILocationContent, LocationAssetType, M_ASSET } from "matrix-js-sdk/src/@types/location";
+import { ILocationContent, LocationAssetType, M_ASSET } from "matrix-js-sdk/src/matrix";
 
 export const isSelfLocation = (locationContent: ILocationContent): boolean => {
     const asset = M_ASSET.findIn(locationContent) as { type: string };

src/utils/location/locationEventGeoUri.ts

@@ -14,8 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { MatrixEvent } from "matrix-js-sdk/src/matrix";
+import { MatrixEvent, M_LOCATION } from "matrix-js-sdk/src/matrix";
-import { M_LOCATION } from "matrix-js-sdk/src/@types/location";
 
 /**
  * Find the geo-URI contained within a location event.

src/utils/location/map.ts

@@ -15,8 +15,7 @@ limitations under the License.
 */
 
 import * as maplibregl from "maplibre-gl";
-import { MatrixClient, MatrixEvent } from "matrix-js-sdk/src/matrix";
+import { MatrixClient, MatrixEvent, M_LOCATION } from "matrix-js-sdk/src/matrix";
-import { M_LOCATION } from "matrix-js-sdk/src/@types/location";
 import { logger } from "matrix-js-sdk/src/logger";
 
 import { _t } from "../../languageHandler";

src/utils/notifications.ts

@@ -19,9 +19,9 @@ import {
     LOCAL_NOTIFICATION_SETTINGS_PREFIX,
     NotificationCountType,
     Room,
+    LocalNotificationSettings,
+    ReceiptType,
 } from "matrix-js-sdk/src/matrix";
-import { LocalNotificationSettings } from "matrix-js-sdk/src/@types/local_notifications";
-import { ReceiptType } from "matrix-js-sdk/src/@types/read_receipts";
 
 import SettingsStore from "../settings/SettingsStore";
 

test/Reply-test.ts

@@ -14,10 +14,15 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { IContent, MatrixEvent, MsgType } from "matrix-js-sdk/src/matrix";
+import {
-import { M_BEACON_INFO } from "matrix-js-sdk/src/@types/beacon";
+    IContent,
-import { LocationAssetType, M_ASSET } from "matrix-js-sdk/src/@types/location";
+    MatrixEvent,
-import { M_POLL_END } from "matrix-js-sdk/src/@types/polls";
+    MsgType,
+    M_BEACON_INFO,
+    LocationAssetType,
+    M_ASSET,
+    M_POLL_END,
+} from "matrix-js-sdk/src/matrix";
 
 import {
     getNestedReplyText,

test/Unread-test.ts

@@ -15,8 +15,7 @@ limitations under the License.
 */
 
 import { mocked } from "jest-mock";
-import { MatrixEvent, EventType, MsgType, Room } from "matrix-js-sdk/src/matrix";
+import { MatrixEvent, EventType, MsgType, Room, ReceiptType } from "matrix-js-sdk/src/matrix";
-import { ReceiptType } from "matrix-js-sdk/src/@types/read_receipts";
 import { logger } from "matrix-js-sdk/src/logger";
 
 import { haveRendererForEvent } from "../src/events/EventTileFactory";

test/components/structures/MessagePanel-test.tsx

@@ -17,9 +17,8 @@ limitations under the License.
 
 import React from "react";
 import { EventEmitter } from "events";
-import { MatrixEvent, Room, RoomMember, Thread } from "matrix-js-sdk/src/matrix";
+import { MatrixEvent, Room, RoomMember, Thread, ReceiptType } from "matrix-js-sdk/src/matrix";
 import { render } from "@testing-library/react";
-import { ReceiptType } from "matrix-js-sdk/src/@types/read_receipts";
 
 import MessagePanel, { shouldFormContinuation } from "../../../src/components/structures/MessagePanel";
 import SettingsStore from "../../../src/settings/SettingsStore";

test/components/structures/TimelinePanel-test.tsx

@@ -15,8 +15,8 @@ limitations under the License.
 */
 
 import { render, waitFor, screen } from "@testing-library/react";
-import { ReceiptType } from "matrix-js-sdk/src/@types/read_receipts";
 import {
+    ReceiptType,
     EventTimelineSet,
     EventType,
     MatrixClient,

test/components/structures/auth/Login-test.tsx

@@ -18,7 +18,7 @@ import React from "react";
 import { fireEvent, render, screen, waitForElementToBeRemoved } from "@testing-library/react";
 import { mocked, MockedObject } from "jest-mock";
 import fetchMock from "fetch-mock-jest";
-import { DELEGATED_OIDC_COMPATIBILITY, IdentityProviderBrand } from "matrix-js-sdk/src/@types/auth";
+import { DELEGATED_OIDC_COMPATIBILITY, IdentityProviderBrand } from "matrix-js-sdk/src/matrix";
 import { logger } from "matrix-js-sdk/src/logger";
 import * as Matrix from "matrix-js-sdk/src/matrix";
 import { OidcError } from "matrix-js-sdk/src/oidc/error";

test/components/views/context_menus/MessageContextMenu-test.tsx

@@ -27,8 +27,8 @@ import {
     EventType,
     FeatureSupport,
     Thread,
+    M_POLL_KIND_DISCLOSED,
 } from "matrix-js-sdk/src/matrix";
-import { M_POLL_KIND_DISCLOSED } from "matrix-js-sdk/src/@types/polls";
 import { PollStartEvent } from "matrix-js-sdk/src/extensible_events_v1/PollStartEvent";
 import { mocked } from "jest-mock";
 

test/components/views/context_menus/RoomGeneralContextMenu-test.tsx

@@ -16,8 +16,7 @@ limitations under the License.
 
 import { fireEvent, getByLabelText, render, screen } from "@testing-library/react";
 import { mocked } from "jest-mock";
-import { ReceiptType } from "matrix-js-sdk/src/@types/read_receipts";
+import { ReceiptType, MatrixClient, PendingEventOrdering, Room } from "matrix-js-sdk/src/matrix";
-import { MatrixClient, PendingEventOrdering, Room } from "matrix-js-sdk/src/matrix";
 import React from "react";
 import userEvent from "@testing-library/user-event";
 

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

@@ -15,9 +15,15 @@ limitations under the License.
 */
 
 import React from "react";
-import { MatrixEvent, EventType } from "matrix-js-sdk/src/matrix";
+import {
-import { LocationAssetType, M_ASSET, M_LOCATION, M_TIMESTAMP } from "matrix-js-sdk/src/@types/location";
+    MatrixEvent,
-import { M_TEXT } from "matrix-js-sdk/src/@types/extensible_events";
+    EventType,
+    LocationAssetType,
+    M_ASSET,
+    M_LOCATION,
+    M_TIMESTAMP,
+    M_TEXT,
+} from "matrix-js-sdk/src/matrix";
 import { act, fireEvent, getByTestId, render, RenderResult, screen } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
 

test/components/views/elements/PollCreateDialog-test.tsx

@@ -16,10 +16,15 @@ limitations under the License.
 
 import React from "react";
 import { fireEvent, render, RenderResult } from "@testing-library/react";
-import { Room, MatrixEvent } from "matrix-js-sdk/src/matrix";
+import {
-import { M_POLL_KIND_DISCLOSED, M_POLL_KIND_UNDISCLOSED, M_POLL_START } from "matrix-js-sdk/src/@types/polls";
+    Room,
+    MatrixEvent,
+    M_POLL_KIND_DISCLOSED,
+    M_POLL_KIND_UNDISCLOSED,
+    M_POLL_START,
+    M_TEXT,
+} from "matrix-js-sdk/src/matrix";
 import { PollStartEvent } from "matrix-js-sdk/src/extensible_events_v1/PollStartEvent";
-import { M_TEXT } from "matrix-js-sdk/src/@types/extensible_events";
 
 import { getMockClientWithEventEmitter } from "../../../test-utils";
 import { MatrixClientPeg } from "../../../../src/MatrixClientPeg";

test/components/views/location/LocationShareMenu-test.tsx

@@ -16,9 +16,8 @@ limitations under the License.
 
 import React from "react";
 import { mocked } from "jest-mock";
-import { RoomMember, RelationType, MatrixClient } from "matrix-js-sdk/src/matrix";
+import { RoomMember, RelationType, MatrixClient, M_ASSET, LocationAssetType } from "matrix-js-sdk/src/matrix";
 import { logger } from "matrix-js-sdk/src/logger";
-import { M_ASSET, LocationAssetType } from "matrix-js-sdk/src/@types/location";
 import { act, fireEvent, render, RenderResult } from "@testing-library/react";
 import * as maplibregl from "maplibre-gl";
 

test/components/views/location/shareLocation-test.ts

@@ -15,8 +15,12 @@ limitations under the License.
 */
 
 import { mocked } from "jest-mock";
-import { ContentHelpers, MatrixClient } from "matrix-js-sdk/src/matrix";
+import {
-import { LegacyLocationEventContent, MLocationEventContent } from "matrix-js-sdk/src/@types/location";
+    ContentHelpers,
+    MatrixClient,
+    LegacyLocationEventContent,
+    MLocationEventContent,
+} from "matrix-js-sdk/src/matrix";
 
 import { doMaybeLocalRoomAction } from "../../../../src/utils/local-room";
 import {

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

@@ -24,8 +24,8 @@ import {
     MatrixEvent,
     EventType,
     Relations,
+    M_BEACON,
 } from "matrix-js-sdk/src/matrix";
-import { M_BEACON } from "matrix-js-sdk/src/@types/beacon";
 
 import MBeaconBody from "../../../../src/components/views/messages/MBeaconBody";
 import {

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

@@ -16,16 +16,17 @@ limitations under the License.
 
 import React from "react";
 import { fireEvent, render, RenderResult } from "@testing-library/react";
-import { MatrixEvent, Relations } from "matrix-js-sdk/src/matrix";
 import {
+    MatrixEvent,
+    Relations,
     M_POLL_KIND_DISCLOSED,
     M_POLL_KIND_UNDISCLOSED,
     M_POLL_RESPONSE,
     M_POLL_START,
     PollStartEventContent,
     PollAnswer,
-} from "matrix-js-sdk/src/@types/polls";
+    M_TEXT,
-import { M_TEXT } from "matrix-js-sdk/src/@types/extensible_events";
+} from "matrix-js-sdk/src/matrix";
 
 import MPollBody, { allVotes, findTopAnswer, isPollEnded } from "../../../../src/components/views/messages/MPollBody";
 import { IBodyProps } from "../../../../src/components/views/messages/IBodyProps";

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

@@ -16,9 +16,8 @@ limitations under the License.
 
 import React from "react";
 import { render } from "@testing-library/react";
-import { EventTimeline, MatrixEvent, Room } from "matrix-js-sdk/src/matrix";
+import { EventTimeline, MatrixEvent, Room, M_TEXT } from "matrix-js-sdk/src/matrix";
 import { logger } from "matrix-js-sdk/src/logger";
-import { M_TEXT } from "matrix-js-sdk/src/@types/extensible_events";
 
 import { IBodyProps } from "../../../../src/components/views/messages/IBodyProps";
 import { MPollEndBody } from "../../../../src/components/views/messages/MPollEndBody";

test/components/views/polls/pollHistory/PollHistory-test.tsx

@@ -16,8 +16,7 @@ limitations under the License.
 
 import React from "react";
 import { act, fireEvent, render } from "@testing-library/react";
-import { Filter, EventTimeline, Room, MatrixEvent } from "matrix-js-sdk/src/matrix";
+import { Filter, EventTimeline, Room, MatrixEvent, M_POLL_START } from "matrix-js-sdk/src/matrix";
-import { M_POLL_START } from "matrix-js-sdk/src/@types/polls";
 
 import { PollHistory } from "../../../../../src/components/views/polls/pollHistory/PollHistory";
 import {

test/components/views/polls/pollHistory/PollListItemEnded-test.tsx

@@ -16,8 +16,7 @@ limitations under the License.
 
 import React from "react";
 import { render } from "@testing-library/react";
-import { MatrixEvent, Poll, Room } from "matrix-js-sdk/src/matrix";
+import { MatrixEvent, Poll, Room, M_TEXT } from "matrix-js-sdk/src/matrix";
-import { M_TEXT } from "matrix-js-sdk/src/@types/extensible_events";
 
 import { PollListItemEnded } from "../../../../../src/components/views/polls/pollHistory/PollListItemEnded";
 import {

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

@@ -23,8 +23,8 @@ import {
     Room,
     MatrixClient,
     PendingEventOrdering,
+    ReceiptType,
 } from "matrix-js-sdk/src/matrix";
-import { ReceiptType } from "matrix-js-sdk/src/@types/read_receipts";
 import React from "react";
 
 import LegacyRoomHeaderButtons from "../../../../src/components/views/right_panel/LegacyRoomHeaderButtons";

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

@@ -27,8 +27,8 @@ import {
     EventType,
     RelationType,
     MsgType,
+    M_POLL_KIND_DISCLOSED,
 } from "matrix-js-sdk/src/matrix";
-import { M_POLL_KIND_DISCLOSED } from "matrix-js-sdk/src/@types/polls";
 import { PollStartEvent } from "matrix-js-sdk/src/extensible_events_v1/PollStartEvent";
 import { PollResponseEvent } from "matrix-js-sdk/src/extensible_events_v1/PollResponseEvent";
 import { PollEndEvent } from "matrix-js-sdk/src/extensible_events_v1/PollEndEvent";

test/components/views/rooms/NotificationBadge/UnreadNotificationBadge-test.tsx

@@ -25,8 +25,8 @@ import {
     Room,
     EventStatus,
     PendingEventOrdering,
+    ReceiptType,
 } from "matrix-js-sdk/src/matrix";
-import { ReceiptType } from "matrix-js-sdk/src/@types/read_receipts";
 
 import type { MatrixClient } from "matrix-js-sdk/src/matrix";
 import { mkThread } from "../../../../test-utils/threads";

test/components/views/settings/Notifications-test.tsx

@@ -27,9 +27,10 @@ import {
     ConditionKind,
     IPushRuleCondition,
     PushRuleKind,
+    IThreepid,
+    ThreepidMedium,
 } from "matrix-js-sdk/src/matrix";
 import { randomString } from "matrix-js-sdk/src/randomstring";
-import { IThreepid, ThreepidMedium } from "matrix-js-sdk/src/@types/threepids";
 import { act, fireEvent, getByTestId, render, screen, waitFor, within } from "@testing-library/react";
 import { mocked } from "jest-mock";
 import userEvent from "@testing-library/user-event";

test/components/views/settings/devices/LoginWithQR-test.tsx

@@ -18,7 +18,7 @@ import { cleanup, render, waitFor } from "@testing-library/react";
 import { mocked } from "jest-mock";
 import React from "react";
 import { MSC3906Rendezvous, RendezvousFailureReason } from "matrix-js-sdk/src/rendezvous";
-import { LoginTokenPostResponse } from "matrix-js-sdk/src/@types/auth";
+import { LoginTokenPostResponse } from "matrix-js-sdk/src/matrix";
 
 import LoginWithQR, { Click, Mode, Phase } from "../../../../../src/components/views/auth/LoginWithQR";
 import type { MatrixClient } from "matrix-js-sdk/src/matrix";

test/components/views/settings/discovery/EmailAddresses-test.tsx

@@ -16,8 +16,7 @@ limitations under the License.
 
 import React from "react";
 import { fireEvent, render, screen } from "@testing-library/react";
-import { IThreepid, ThreepidMedium } from "matrix-js-sdk/src/@types/threepids";
+import { IThreepid, ThreepidMedium, IRequestTokenResponse, MatrixError } from "matrix-js-sdk/src/matrix";
-import { IRequestTokenResponse, MatrixError } from "matrix-js-sdk/src/matrix";
 
 import { TranslationKey, UserFriendlyError } from "../../../../../src/languageHandler";
 import EmailAddresses, { EmailAddress } from "../../../../../src/components/views/settings/discovery/EmailAddresses";

test/components/views/settings/discovery/PhoneNumbers-test.tsx

@@ -16,7 +16,7 @@ limitations under the License.
 
 import React from "react";
 import { fireEvent, render, screen, waitFor } from "@testing-library/react";
-import { IThreepid, ThreepidMedium } from "matrix-js-sdk/src/@types/threepids";
+import { IThreepid, ThreepidMedium } from "matrix-js-sdk/src/matrix";
 import userEvent from "@testing-library/user-event";
 import { mocked } from "jest-mock";
 

test/components/views/settings/notifications/Notifications2-test.tsx

@@ -14,8 +14,15 @@ limitations under the License.
 
 import { act, findByRole, getByRole, queryByRole, render, waitFor } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
-import { ThreepidMedium } from "matrix-js-sdk/src/@types/threepids";
+import {
-import { IPushRules, MatrixClient, NotificationCountType, PushRuleKind, Room, RuleId } from "matrix-js-sdk/src/matrix";
+    ThreepidMedium,
+    IPushRules,
+    MatrixClient,
+    NotificationCountType,
+    PushRuleKind,
+    Room,
+    RuleId,
+} from "matrix-js-sdk/src/matrix";
 import React from "react";
 
 import NotificationSettings2 from "../../../../../src/components/views/settings/notifications/NotificationSettings2";

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

@@ -13,9 +13,8 @@ limitations under the License.
 
 import { fireEvent, render, screen, within } from "@testing-library/react";
 import React from "react";
-import { M_AUTHENTICATION } from "matrix-js-sdk/src/matrix";
+import { M_AUTHENTICATION, ThreepidMedium } from "matrix-js-sdk/src/matrix";
 import { logger } from "matrix-js-sdk/src/logger";
-import { ThreepidMedium } from "matrix-js-sdk/src/@types/threepids";
 
 import GeneralUserSettingsTab from "../../../../../../src/components/views/settings/tabs/user/GeneralUserSettingsTab";
 import MatrixClientContext from "../../../../../../src/contexts/MatrixClientContext";

test/stores/OwnBeaconStore-test.ts

@@ -23,8 +23,8 @@ import {
     RoomStateEvent,
     RoomMember,
     ContentHelpers,
+    M_BEACON,
 } from "matrix-js-sdk/src/matrix";
-import { M_BEACON } from "matrix-js-sdk/src/@types/beacon";
 import { logger } from "matrix-js-sdk/src/logger";
 import { Mocked } from "jest-mock";
 

test/test-utils/beacon.ts

@@ -22,8 +22,9 @@ import {
     getBeaconInfoIdentifier,
     ContentHelpers,
     LocationAssetType,
+    M_BEACON,
+    M_BEACON_INFO,
 } from "matrix-js-sdk/src/matrix";
-import { M_BEACON, M_BEACON_INFO } from "matrix-js-sdk/src/@types/beacon";
 
 import { getMockGeolocationPositionError } from "./location";
 import { makeRoomWithStateEvents } from "./room";

test/test-utils/location.ts

@@ -14,8 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { LocationAssetType, M_LOCATION } from "matrix-js-sdk/src/@types/location";
+import { LocationAssetType, M_LOCATION, MatrixEvent, EventType, ContentHelpers } from "matrix-js-sdk/src/matrix";
-import { MatrixEvent, EventType, ContentHelpers } from "matrix-js-sdk/src/matrix";
 
 let id = 1;
 export const makeLegacyLocationEvent = (geoUri: string): MatrixEvent => {

test/test-utils/poll.ts

@@ -15,15 +15,17 @@ limitations under the License.
 */
 
 import { Mocked } from "jest-mock";
-import { MatrixClient, MatrixEvent, Room } from "matrix-js-sdk/src/matrix";
 import {
+    MatrixClient,
+    MatrixEvent,
+    Room,
     M_POLL_START,
     PollAnswer,
     M_POLL_KIND_DISCLOSED,
     M_POLL_END,
     M_POLL_RESPONSE,
-} from "matrix-js-sdk/src/@types/polls";
+    M_TEXT,
-import { M_TEXT } from "matrix-js-sdk/src/@types/extensible_events";
+} from "matrix-js-sdk/src/matrix";
 import { uuid4 } from "@sentry/utils";
 
 import { flushPromises } from "./utilities";

test/test-utils/test-utils.ts

@@ -36,13 +36,13 @@ import {
     IPushRules,
     RelationType,
     JoinRule,
+    IEventDecryptionResult,
 } from "matrix-js-sdk/src/matrix";
 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 { Feature, ServerSupport } from "matrix-js-sdk/src/feature";
 import { CryptoBackend } from "matrix-js-sdk/src/common-crypto/CryptoBackend";
-import { IEventDecryptionResult } from "matrix-js-sdk/src/@types/crypto";
 import { MapperOpts } from "matrix-js-sdk/src/event-mapper";
 
 import type { GroupCall } from "matrix-js-sdk/src/matrix";

test/utils/EventUtils-test.ts

@@ -14,8 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { M_LOCATION } from "matrix-js-sdk/src/@types/location";
 import {
+    M_LOCATION,
     EventStatus,
     EventType,
     IEvent,

test/utils/beacon/duration-test.ts

@@ -14,8 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { M_TIMESTAMP } from "matrix-js-sdk/src/@types/location";
+import { M_TIMESTAMP, Beacon } from "matrix-js-sdk/src/matrix";
-import { Beacon } from "matrix-js-sdk/src/matrix";
 
 import { msUntilExpiry, sortBeaconsByLatestExpiry, sortBeaconsByLatestCreation } from "../../../src/utils/beacon";
 import { makeBeaconInfoEvent } from "../../test-utils";

test/utils/location/isSelfLocation-test.ts

@@ -14,15 +14,15 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { M_TEXT } from "matrix-js-sdk/src/@types/extensible_events";
 import {
+    M_TEXT,
     ILocationContent,
     LocationAssetType,
     M_ASSET,
     M_LOCATION,
     M_TIMESTAMP,
-} from "matrix-js-sdk/src/@types/location";
+    ContentHelpers,
-import { ContentHelpers } from "matrix-js-sdk/src/matrix";
+} from "matrix-js-sdk/src/matrix";
 
 import { isSelfLocation } from "../../../src/utils/location";
 

test/utils/notifications-test.ts

@@ -14,9 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { MatrixEvent, NotificationCountType, Room, MatrixClient } from "matrix-js-sdk/src/matrix";
+import { MatrixEvent, NotificationCountType, Room, MatrixClient, ReceiptType } from "matrix-js-sdk/src/matrix";
 import { Mocked, mocked } from "jest-mock";
-import { ReceiptType } from "matrix-js-sdk/src/@types/read_receipts";
 
 import {
     localNotificationsAreSilenced,

test/utils/threepids-test.ts

@@ -15,8 +15,7 @@ limitations under the License.
 */
 
 import { Mocked } from "jest-mock";
-import { IIdentityServerProvider } from "matrix-js-sdk/src/@types/IIdentityServerProvider";
+import { IIdentityServerProvider, MatrixClient } from "matrix-js-sdk/src/matrix";
-import { MatrixClient } from "matrix-js-sdk/src/matrix";
 
 import { DirectoryMember, ThreepidMember } from "../../src/utils/direct-messages";
 import { lookupThreePids, resolveThreePids } from "../../src/utils/threepids";