diff --git a/.eslintrc.js b/.eslintrc.js index 34b27055d7..d1c04b6ef8 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -102,6 +102,14 @@ module.exports = { name: "matrix-js-sdk/src/models/event-timeline-set", message: "Please use matrix-js-sdk/src/matrix instead", }, + { + name: "matrix-js-sdk/src/@types/partials", + message: "Please use matrix-js-sdk/src/matrix instead", + }, + { + name: "matrix-js-sdk/src/@types/event", + message: "Please use matrix-js-sdk/src/matrix instead", + }, { name: "matrix-react-sdk", message: "Please use matrix-react-sdk/src/index instead", diff --git a/cypress/e2e/room/room.spec.ts b/cypress/e2e/room/room.spec.ts index 843258a778..8d1108d280 100644 --- a/cypress/e2e/room/room.spec.ts +++ b/cypress/e2e/room/room.spec.ts @@ -16,7 +16,7 @@ limitations under the License. /// -import { EventType } from "matrix-js-sdk/src/@types/event"; +import { EventType } from "matrix-js-sdk/src/matrix"; import { HomeserverInstance } from "../../plugins/utils/homeserver"; import { MatrixClient } from "../../global"; diff --git a/src/ContentMessages.ts b/src/ContentMessages.ts index 8608f23bf0..52ccc1e8e9 100644 --- a/src/ContentMessages.ts +++ b/src/ContentMessages.ts @@ -17,12 +17,9 @@ limitations under the License. */ import { MatrixClient } from "matrix-js-sdk/src/client"; -import { MsgType } from "matrix-js-sdk/src/@types/event"; -import encrypt from "matrix-encrypt-attachment"; -import extractPngChunks from "png-chunks-extract"; -import { IImageInfo } from "matrix-js-sdk/src/@types/partials"; -import { logger } from "matrix-js-sdk/src/logger"; import { + MsgType, + IImageInfo, HTTPError, IEventRelation, ISendEventResponse, @@ -30,6 +27,9 @@ import { UploadOpts, UploadProgress, } from "matrix-js-sdk/src/matrix"; +import encrypt from "matrix-encrypt-attachment"; +import extractPngChunks from "png-chunks-extract"; +import { logger } from "matrix-js-sdk/src/logger"; import { THREAD_RELATION_TYPE } from "matrix-js-sdk/src/models/thread"; import { removeElement } from "matrix-js-sdk/src/utils"; diff --git a/src/Searching.ts b/src/Searching.ts index 894be0cf9c..cba7b6762e 100644 --- a/src/Searching.ts +++ b/src/Searching.ts @@ -23,9 +23,8 @@ import { SearchOrderBy, } from "matrix-js-sdk/src/@types/search"; import { IRoomEventFilter } from "matrix-js-sdk/src/filter"; -import { EventType } from "matrix-js-sdk/src/@types/event"; +import { EventType, MatrixClient } from "matrix-js-sdk/src/matrix"; import { SearchResult } from "matrix-js-sdk/src/models/search-result"; -import { MatrixClient } from "matrix-js-sdk/src/matrix"; import { ISearchArgs } from "./indexing/BaseEventIndexManager"; import EventIndexPeg from "./indexing/EventIndexPeg"; diff --git a/src/SlidingSyncManager.ts b/src/SlidingSyncManager.ts index c59075bbc9..5f459c0b9e 100644 --- a/src/SlidingSyncManager.ts +++ b/src/SlidingSyncManager.ts @@ -44,8 +44,7 @@ limitations under the License. * list ops) */ -import { MatrixClient } from "matrix-js-sdk/src/matrix"; -import { EventType } from "matrix-js-sdk/src/@types/event"; +import { MatrixClient, EventType } from "matrix-js-sdk/src/matrix"; import { MSC3575Filter, MSC3575List, diff --git a/src/TextForEvent.tsx b/src/TextForEvent.tsx index cf9a59f352..93896cd0aa 100644 --- a/src/TextForEvent.tsx +++ b/src/TextForEvent.tsx @@ -15,11 +15,17 @@ limitations under the License. */ import React from "react"; -import { MatrixEvent, MatrixClient } from "matrix-js-sdk/src/matrix"; +import { + MatrixEvent, + MatrixClient, + GuestAccess, + HistoryVisibility, + JoinRule, + EventType, + MsgType, +} from "matrix-js-sdk/src/matrix"; import { logger } from "matrix-js-sdk/src/logger"; import { removeDirectionOverrideChars } from "matrix-js-sdk/src/utils"; -import { GuestAccess, HistoryVisibility, JoinRule } from "matrix-js-sdk/src/@types/partials"; -import { EventType, MsgType } from "matrix-js-sdk/src/@types/event"; 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"; diff --git a/src/components/structures/LegacyCallEventGrouper.ts b/src/components/structures/LegacyCallEventGrouper.ts index e5942fea27..e4f29be4bf 100644 --- a/src/components/structures/LegacyCallEventGrouper.ts +++ b/src/components/structures/LegacyCallEventGrouper.ts @@ -14,8 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { EventType } from "matrix-js-sdk/src/@types/event"; -import { MatrixEvent } from "matrix-js-sdk/src/matrix"; +import { EventType, MatrixEvent } from "matrix-js-sdk/src/matrix"; import { CallEvent, CallState, CallType, MatrixCall } from "matrix-js-sdk/src/webrtc/call"; import { EventEmitter } from "events"; diff --git a/src/components/structures/LoggedInView.tsx b/src/components/structures/LoggedInView.tsx index 185b1ee005..873559a7c6 100644 --- a/src/components/structures/LoggedInView.tsx +++ b/src/components/structures/LoggedInView.tsx @@ -16,11 +16,10 @@ limitations under the License. import React, { ClipboardEvent } from "react"; import { ClientEvent, MatrixClient } from "matrix-js-sdk/src/client"; -import { MatrixEvent, RoomStateEvent, MatrixError } from "matrix-js-sdk/src/matrix"; +import { MatrixEvent, RoomStateEvent, MatrixError, IUsageLimit } from "matrix-js-sdk/src/matrix"; import { MatrixCall } from "matrix-js-sdk/src/webrtc/call"; import classNames from "classnames"; import { ISyncStateData, SyncState } from "matrix-js-sdk/src/sync"; -import { IUsageLimit } from "matrix-js-sdk/src/@types/partials"; import { isOnlyCtrlOrCmdKeyEvent, Key } from "../../Keyboard"; import PageTypes from "../../PageTypes"; diff --git a/src/components/structures/MatrixChat.tsx b/src/components/structures/MatrixChat.tsx index 59fe8ab822..c5298dcd0c 100644 --- a/src/components/structures/MatrixChat.tsx +++ b/src/components/structures/MatrixChat.tsx @@ -23,6 +23,7 @@ import { MatrixClient, MatrixEventEvent, MatrixEvent, + RoomType, } from "matrix-js-sdk/src/matrix"; import { ISyncStateData, SyncState } from "matrix-js-sdk/src/sync"; import { InvalidStoreError } from "matrix-js-sdk/src/errors"; @@ -30,7 +31,6 @@ import { defer, IDeferred, QueryDict } from "matrix-js-sdk/src/utils"; import { logger } from "matrix-js-sdk/src/logger"; import { throttle } from "lodash"; import { CryptoEvent } from "matrix-js-sdk/src/crypto"; -import { RoomType } from "matrix-js-sdk/src/@types/event"; import { DecryptionError } from "matrix-js-sdk/src/crypto/algorithms"; import { IKeyBackupInfo } from "matrix-js-sdk/src/crypto/keybackup"; diff --git a/src/components/structures/MessagePanel.tsx b/src/components/structures/MessagePanel.tsx index e624106182..957377f477 100644 --- a/src/components/structures/MessagePanel.tsx +++ b/src/components/structures/MessagePanel.tsx @@ -17,8 +17,7 @@ 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 } from "matrix-js-sdk/src/matrix"; -import { EventType } from "matrix-js-sdk/src/@types/event"; +import { Room, MatrixClient, RoomStateEvent, EventStatus, MatrixEvent, EventType } 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"; diff --git a/src/components/structures/RoomView.tsx b/src/components/structures/RoomView.tsx index 15c4a5f96c..81d385d174 100644 --- a/src/components/structures/RoomView.tsx +++ b/src/components/structures/RoomView.tsx @@ -30,16 +30,17 @@ import { MatrixEventEvent, EventTimeline, IRoomTimelineData, + EventType, + HistoryVisibility, + JoinRule, } from "matrix-js-sdk/src/matrix"; import { logger } from "matrix-js-sdk/src/logger"; -import { EventType } from "matrix-js-sdk/src/@types/event"; import { CallState, MatrixCall } from "matrix-js-sdk/src/webrtc/call"; import { throttle } from "lodash"; import { MatrixError } from "matrix-js-sdk/src/http-api"; import { ClientEvent } from "matrix-js-sdk/src/client"; import { CryptoEvent } from "matrix-js-sdk/src/crypto"; import { THREAD_RELATION_TYPE } from "matrix-js-sdk/src/models/thread"; -import { HistoryVisibility, JoinRule } from "matrix-js-sdk/src/@types/partials"; import { ISearchResults } from "matrix-js-sdk/src/@types/search"; import shouldHideEvent from "../../shouldHideEvent"; diff --git a/src/components/structures/SpaceHierarchy.tsx b/src/components/structures/SpaceHierarchy.tsx index 69876b1f65..4640ee9295 100644 --- a/src/components/structures/SpaceHierarchy.tsx +++ b/src/components/structures/SpaceHierarchy.tsx @@ -28,13 +28,21 @@ import React, { useRef, useState, } from "react"; -import { Room, RoomEvent, ClientEvent, MatrixClient, MatrixError } from "matrix-js-sdk/src/matrix"; +import { + Room, + RoomEvent, + ClientEvent, + MatrixClient, + MatrixError, + EventType, + RoomType, + GuestAccess, + HistoryVisibility, +} from "matrix-js-sdk/src/matrix"; import { RoomHierarchy } from "matrix-js-sdk/src/room-hierarchy"; -import { EventType, RoomType } from "matrix-js-sdk/src/@types/event"; import { IHierarchyRelation, IHierarchyRoom } from "matrix-js-sdk/src/@types/spaces"; import classNames from "classnames"; import { sortBy, uniqBy } from "lodash"; -import { GuestAccess, HistoryVisibility } from "matrix-js-sdk/src/@types/partials"; import { logger } from "matrix-js-sdk/src/logger"; import defaultDispatcher from "../../dispatcher/dispatcher"; diff --git a/src/components/structures/SpaceRoomView.tsx b/src/components/structures/SpaceRoomView.tsx index 315e466e41..06357fda0e 100644 --- a/src/components/structures/SpaceRoomView.tsx +++ b/src/components/structures/SpaceRoomView.tsx @@ -14,10 +14,8 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { EventType, RoomType } from "matrix-js-sdk/src/@types/event"; -import { JoinRule, Preset } from "matrix-js-sdk/src/@types/partials"; +import { EventType, RoomType, JoinRule, Preset, Room, RoomEvent } from "matrix-js-sdk/src/matrix"; import { logger } from "matrix-js-sdk/src/logger"; -import { Room, RoomEvent } from "matrix-js-sdk/src/matrix"; import React, { RefObject, useCallback, useContext, useRef, useState } from "react"; import MatrixClientContext from "../../contexts/MatrixClientContext"; diff --git a/src/components/structures/TimelinePanel.tsx b/src/components/structures/TimelinePanel.tsx index 4587ca023d..cb4ce3a3e0 100644 --- a/src/components/structures/TimelinePanel.tsx +++ b/src/components/structures/TimelinePanel.tsx @@ -27,9 +27,10 @@ import { IRoomTimelineData, Direction, EventTimeline, + EventType, + RelationType, } from "matrix-js-sdk/src/matrix"; import { TimelineWindow } from "matrix-js-sdk/src/timeline-window"; -import { EventType, RelationType } from "matrix-js-sdk/src/@types/event"; import { SyncState } from "matrix-js-sdk/src/sync"; import { debounce, findLastIndex, throttle } from "lodash"; import { logger } from "matrix-js-sdk/src/logger"; diff --git a/src/components/views/avatars/BaseAvatar.tsx b/src/components/views/avatars/BaseAvatar.tsx index 998827baa5..f0cd65f810 100644 --- a/src/components/views/avatars/BaseAvatar.tsx +++ b/src/components/views/avatars/BaseAvatar.tsx @@ -19,7 +19,7 @@ limitations under the License. import React, { useCallback, useContext, useEffect, useState } from "react"; import classNames from "classnames"; -import { ResizeMethod } from "matrix-js-sdk/src/@types/partials"; +import { ResizeMethod } from "matrix-js-sdk/src/matrix"; import { ClientEvent } from "matrix-js-sdk/src/client"; import * as AvatarLogic from "../../../Avatar"; diff --git a/src/components/views/avatars/DecoratedRoomAvatar.tsx b/src/components/views/avatars/DecoratedRoomAvatar.tsx index 17c428a7fc..fffb643061 100644 --- a/src/components/views/avatars/DecoratedRoomAvatar.tsx +++ b/src/components/views/avatars/DecoratedRoomAvatar.tsx @@ -16,9 +16,7 @@ limitations under the License. import React from "react"; import classNames from "classnames"; -import { Room, RoomEvent, MatrixEvent, User, UserEvent } from "matrix-js-sdk/src/matrix"; -import { EventType } from "matrix-js-sdk/src/@types/event"; -import { JoinRule } from "matrix-js-sdk/src/@types/partials"; +import { Room, RoomEvent, MatrixEvent, User, UserEvent, EventType, JoinRule } from "matrix-js-sdk/src/matrix"; import { UnstableValue } from "matrix-js-sdk/src/NamespacedValue"; import RoomAvatar from "./RoomAvatar"; diff --git a/src/components/views/avatars/MemberAvatar.tsx b/src/components/views/avatars/MemberAvatar.tsx index 715981a70c..6546a0ff4e 100644 --- a/src/components/views/avatars/MemberAvatar.tsx +++ b/src/components/views/avatars/MemberAvatar.tsx @@ -16,8 +16,7 @@ limitations under the License. */ import React, { ReactNode, useContext } from "react"; -import { RoomMember } from "matrix-js-sdk/src/matrix"; -import { ResizeMethod } from "matrix-js-sdk/src/@types/partials"; +import { RoomMember, ResizeMethod } from "matrix-js-sdk/src/matrix"; import dis from "../../../dispatcher/dispatcher"; import { Action } from "../../../dispatcher/actions"; diff --git a/src/components/views/avatars/RoomAvatar.tsx b/src/components/views/avatars/RoomAvatar.tsx index c9cbc8df1d..85a2d4929c 100644 --- a/src/components/views/avatars/RoomAvatar.tsx +++ b/src/components/views/avatars/RoomAvatar.tsx @@ -15,9 +15,8 @@ limitations under the License. */ import React, { ComponentProps } from "react"; -import { Room, RoomStateEvent, MatrixEvent } from "matrix-js-sdk/src/matrix"; +import { Room, RoomStateEvent, MatrixEvent, EventType, RoomType } from "matrix-js-sdk/src/matrix"; import classNames from "classnames"; -import { EventType, RoomType } from "matrix-js-sdk/src/@types/event"; import BaseAvatar from "./BaseAvatar"; import ImageView from "../elements/ImageView"; diff --git a/src/components/views/beacon/RoomCallBanner.tsx b/src/components/views/beacon/RoomCallBanner.tsx index c73355627c..2f27b0cfdd 100644 --- a/src/components/views/beacon/RoomCallBanner.tsx +++ b/src/components/views/beacon/RoomCallBanner.tsx @@ -15,8 +15,7 @@ limitations under the License. */ import React, { useCallback } from "react"; -import { EventType } from "matrix-js-sdk/src/@types/event"; -import { Room } from "matrix-js-sdk/src/matrix"; +import { EventType, Room } from "matrix-js-sdk/src/matrix"; import { logger } from "matrix-js-sdk/src/logger"; import { _t } from "../../../languageHandler"; diff --git a/src/components/views/context_menus/MessageContextMenu.tsx b/src/components/views/context_menus/MessageContextMenu.tsx index afc9b9864f..ffe35fa4ce 100644 --- a/src/components/views/context_menus/MessageContextMenu.tsx +++ b/src/components/views/context_menus/MessageContextMenu.tsx @@ -17,8 +17,14 @@ limitations under the License. */ import React, { createRef, useContext } from "react"; -import { EventStatus, MatrixEvent, MatrixEventEvent, RoomMemberEvent } from "matrix-js-sdk/src/matrix"; -import { EventType, RelationType } from "matrix-js-sdk/src/@types/event"; +import { + EventStatus, + MatrixEvent, + MatrixEventEvent, + RoomMemberEvent, + EventType, + RelationType, +} from "matrix-js-sdk/src/matrix"; import { Relations } from "matrix-js-sdk/src/models/relations"; import { M_POLL_START } from "matrix-js-sdk/src/@types/polls"; import { Thread } from "matrix-js-sdk/src/models/thread"; diff --git a/src/components/views/context_menus/SpaceContextMenu.tsx b/src/components/views/context_menus/SpaceContextMenu.tsx index e475c6dd94..811a88ca20 100644 --- a/src/components/views/context_menus/SpaceContextMenu.tsx +++ b/src/components/views/context_menus/SpaceContextMenu.tsx @@ -15,8 +15,7 @@ limitations under the License. */ import React, { useContext } from "react"; -import { Room } from "matrix-js-sdk/src/matrix"; -import { EventType, RoomType } from "matrix-js-sdk/src/@types/event"; +import { Room, EventType, RoomType } from "matrix-js-sdk/src/matrix"; import { IProps as IContextMenuProps } from "../../structures/ContextMenu"; import IconizedContextMenu, { IconizedContextMenuOption, IconizedContextMenuOptionList } from "./IconizedContextMenu"; diff --git a/src/components/views/dialogs/AddExistingToSpaceDialog.tsx b/src/components/views/dialogs/AddExistingToSpaceDialog.tsx index 63b97d5e41..e2d4481e0b 100644 --- a/src/components/views/dialogs/AddExistingToSpaceDialog.tsx +++ b/src/components/views/dialogs/AddExistingToSpaceDialog.tsx @@ -16,9 +16,8 @@ limitations under the License. import React, { ReactElement, ReactNode, RefObject, useContext, useMemo, useRef, useState } from "react"; import classNames from "classnames"; -import { Room } from "matrix-js-sdk/src/matrix"; +import { Room, EventType } from "matrix-js-sdk/src/matrix"; import { sleep } from "matrix-js-sdk/src/utils"; -import { EventType } from "matrix-js-sdk/src/@types/event"; import { logger } from "matrix-js-sdk/src/logger"; import { _t, _td } from "../../../languageHandler"; diff --git a/src/components/views/dialogs/BulkRedactDialog.tsx b/src/components/views/dialogs/BulkRedactDialog.tsx index fbb55e798f..bca1114306 100644 --- a/src/components/views/dialogs/BulkRedactDialog.tsx +++ b/src/components/views/dialogs/BulkRedactDialog.tsx @@ -17,8 +17,7 @@ limitations under the License. import React, { useState } from "react"; import { logger } from "matrix-js-sdk/src/logger"; import { MatrixClient } from "matrix-js-sdk/src/client"; -import { RoomMember, Room, MatrixEvent, EventTimeline } from "matrix-js-sdk/src/matrix"; -import { EventType } from "matrix-js-sdk/src/@types/event"; +import { RoomMember, Room, MatrixEvent, EventTimeline, EventType } from "matrix-js-sdk/src/matrix"; import { _t } from "../../../languageHandler"; import dis from "../../../dispatcher/dispatcher"; diff --git a/src/components/views/dialogs/CreateRoomDialog.tsx b/src/components/views/dialogs/CreateRoomDialog.tsx index ffdc04f283..817816913e 100644 --- a/src/components/views/dialogs/CreateRoomDialog.tsx +++ b/src/components/views/dialogs/CreateRoomDialog.tsx @@ -16,9 +16,7 @@ limitations under the License. */ import React, { ChangeEvent, createRef, KeyboardEvent, SyntheticEvent } from "react"; -import { Room } from "matrix-js-sdk/src/matrix"; -import { RoomType } from "matrix-js-sdk/src/@types/event"; -import { JoinRule, Preset, Visibility } from "matrix-js-sdk/src/@types/partials"; +import { Room, RoomType, JoinRule, Preset, Visibility } from "matrix-js-sdk/src/matrix"; import SdkConfig from "../../../SdkConfig"; import withValidation, { IFieldState, IValidationResult } from "../elements/Validation"; diff --git a/src/components/views/dialogs/CreateSubspaceDialog.tsx b/src/components/views/dialogs/CreateSubspaceDialog.tsx index d7b2153008..815dc595d6 100644 --- a/src/components/views/dialogs/CreateSubspaceDialog.tsx +++ b/src/components/views/dialogs/CreateSubspaceDialog.tsx @@ -15,8 +15,7 @@ limitations under the License. */ import React, { useRef, useState } from "react"; -import { Room } from "matrix-js-sdk/src/matrix"; -import { JoinRule } from "matrix-js-sdk/src/@types/partials"; +import { Room, JoinRule } from "matrix-js-sdk/src/matrix"; import { logger } from "matrix-js-sdk/src/logger"; import { _t } from "../../../languageHandler"; diff --git a/src/components/views/dialogs/ForwardDialog.tsx b/src/components/views/dialogs/ForwardDialog.tsx index 44d2b08d91..a2e484216b 100644 --- a/src/components/views/dialogs/ForwardDialog.tsx +++ b/src/components/views/dialogs/ForwardDialog.tsx @@ -16,9 +16,8 @@ limitations under the License. import React, { useEffect, useMemo, useState } from "react"; import classnames from "classnames"; -import { IContent, MatrixEvent, Room, RoomMember } from "matrix-js-sdk/src/matrix"; +import { IContent, MatrixEvent, Room, RoomMember, EventType } from "matrix-js-sdk/src/matrix"; import { MatrixClient } from "matrix-js-sdk/src/client"; -import { EventType } from "matrix-js-sdk/src/@types/event"; import { ILocationContent, LocationAssetType, M_TIMESTAMP } from "matrix-js-sdk/src/@types/location"; import { makeLocationContent } from "matrix-js-sdk/src/content-helpers"; import { M_BEACON } from "matrix-js-sdk/src/@types/beacon"; diff --git a/src/components/views/dialogs/LeaveSpaceDialog.tsx b/src/components/views/dialogs/LeaveSpaceDialog.tsx index 061ccea61e..cc31183414 100644 --- a/src/components/views/dialogs/LeaveSpaceDialog.tsx +++ b/src/components/views/dialogs/LeaveSpaceDialog.tsx @@ -15,8 +15,7 @@ limitations under the License. */ import React, { useMemo, useState } from "react"; -import { Room } from "matrix-js-sdk/src/matrix"; -import { JoinRule } from "matrix-js-sdk/src/@types/partials"; +import { Room, JoinRule } from "matrix-js-sdk/src/matrix"; import { _t } from "../../../languageHandler"; import DialogButtons from "../elements/DialogButtons"; diff --git a/src/components/views/dialogs/MessageEditHistoryDialog.tsx b/src/components/views/dialogs/MessageEditHistoryDialog.tsx index aac78fe6a7..9fed37e49c 100644 --- a/src/components/views/dialogs/MessageEditHistoryDialog.tsx +++ b/src/components/views/dialogs/MessageEditHistoryDialog.tsx @@ -15,8 +15,7 @@ limitations under the License. */ import React from "react"; -import { MatrixEvent } from "matrix-js-sdk/src/matrix"; -import { EventType, RelationType } from "matrix-js-sdk/src/@types/event"; +import { MatrixEvent, EventType, RelationType } from "matrix-js-sdk/src/matrix"; import { defer } from "matrix-js-sdk/src/utils"; import { logger } from "matrix-js-sdk/src/logger"; import { MatrixClient } from "matrix-js-sdk/src/client"; diff --git a/src/components/views/dialogs/RoomUpgradeWarningDialog.tsx b/src/components/views/dialogs/RoomUpgradeWarningDialog.tsx index 7b9813c1c9..a8ad1d94a6 100644 --- a/src/components/views/dialogs/RoomUpgradeWarningDialog.tsx +++ b/src/components/views/dialogs/RoomUpgradeWarningDialog.tsx @@ -15,8 +15,7 @@ limitations under the License. */ import React, { ReactNode, SyntheticEvent } from "react"; -import { EventType } from "matrix-js-sdk/src/@types/event"; -import { JoinRule } from "matrix-js-sdk/src/@types/partials"; +import { EventType, JoinRule } from "matrix-js-sdk/src/matrix"; import { _t } from "../../../languageHandler"; import SdkConfig from "../../../SdkConfig"; diff --git a/src/components/views/dialogs/devtools/ServersInRoom.tsx b/src/components/views/dialogs/devtools/ServersInRoom.tsx index 4570f60e6b..93ad33984b 100644 --- a/src/components/views/dialogs/devtools/ServersInRoom.tsx +++ b/src/components/views/dialogs/devtools/ServersInRoom.tsx @@ -16,7 +16,7 @@ limitations under the License. */ import React, { useContext, useMemo } from "react"; -import { EventType } from "matrix-js-sdk/src/@types/event"; +import { EventType } from "matrix-js-sdk/src/matrix"; import BaseTool, { DevtoolsContext, IDevtoolsProps } from "./BaseTool"; import { _t } from "../../../../languageHandler"; diff --git a/src/components/views/elements/EventListSummary.tsx b/src/components/views/elements/EventListSummary.tsx index ffe3c8d993..e0279a7c9c 100644 --- a/src/components/views/elements/EventListSummary.tsx +++ b/src/components/views/elements/EventListSummary.tsx @@ -17,8 +17,7 @@ limitations under the License. */ import React, { ComponentProps, ReactNode } from "react"; -import { MatrixEvent, RoomMember } from "matrix-js-sdk/src/matrix"; -import { EventType } from "matrix-js-sdk/src/@types/event"; +import { MatrixEvent, RoomMember, EventType } from "matrix-js-sdk/src/matrix"; import { _t } from "../../../languageHandler"; import { formatCommaSeparatedList } from "../../../utils/FormattingUtils"; diff --git a/src/components/views/elements/EventTilePreview.tsx b/src/components/views/elements/EventTilePreview.tsx index 662523f65d..fd11d372dc 100644 --- a/src/components/views/elements/EventTilePreview.tsx +++ b/src/components/views/elements/EventTilePreview.tsx @@ -16,8 +16,7 @@ limitations under the License. import React from "react"; import classnames from "classnames"; -import { MatrixEvent, RoomMember } from "matrix-js-sdk/src/matrix"; -import { MsgType } from "matrix-js-sdk/src/@types/event"; +import { MatrixEvent, RoomMember, MsgType } from "matrix-js-sdk/src/matrix"; import * as Avatar from "../../../Avatar"; import EventTile from "../rooms/EventTile"; diff --git a/src/components/views/elements/JoinRuleDropdown.tsx b/src/components/views/elements/JoinRuleDropdown.tsx index 1bfc0b0acf..55f5c0e0cf 100644 --- a/src/components/views/elements/JoinRuleDropdown.tsx +++ b/src/components/views/elements/JoinRuleDropdown.tsx @@ -15,7 +15,7 @@ limitations under the License. */ import React, { ReactElement } from "react"; -import { JoinRule } from "matrix-js-sdk/src/@types/partials"; +import { JoinRule } from "matrix-js-sdk/src/matrix"; import Dropdown from "./Dropdown"; import { NonEmptyArray } from "../../../@types/common"; diff --git a/src/components/views/elements/MiniAvatarUploader.tsx b/src/components/views/elements/MiniAvatarUploader.tsx index 663c8fd3d0..dd02d3238d 100644 --- a/src/components/views/elements/MiniAvatarUploader.tsx +++ b/src/components/views/elements/MiniAvatarUploader.tsx @@ -15,7 +15,7 @@ limitations under the License. */ import classNames from "classnames"; -import { EventType } from "matrix-js-sdk/src/@types/event"; +import { EventType } from "matrix-js-sdk/src/matrix"; import React, { useContext, useRef, useState, MouseEvent, ReactNode } from "react"; import MatrixClientContext from "../../../contexts/MatrixClientContext"; diff --git a/src/components/views/elements/RoomTopic.tsx b/src/components/views/elements/RoomTopic.tsx index 19ab09afd5..851e34bf8b 100644 --- a/src/components/views/elements/RoomTopic.tsx +++ b/src/components/views/elements/RoomTopic.tsx @@ -15,9 +15,8 @@ limitations under the License. */ import React, { useCallback, useContext, useRef } from "react"; -import { Room } from "matrix-js-sdk/src/matrix"; +import { Room, EventType } from "matrix-js-sdk/src/matrix"; import classNames from "classnames"; -import { EventType } from "matrix-js-sdk/src/@types/event"; import { useTopic } from "../../../hooks/room/useTopic"; import { Alignment } from "./Tooltip"; diff --git a/src/components/views/emojipicker/ReactionPicker.tsx b/src/components/views/emojipicker/ReactionPicker.tsx index c877dc5f7e..f3ed522e57 100644 --- a/src/components/views/emojipicker/ReactionPicker.tsx +++ b/src/components/views/emojipicker/ReactionPicker.tsx @@ -16,9 +16,8 @@ limitations under the License. */ import React from "react"; -import { MatrixEvent } from "matrix-js-sdk/src/matrix"; +import { MatrixEvent, EventType, RelationType } from "matrix-js-sdk/src/matrix"; import { Relations, RelationsEvent } from "matrix-js-sdk/src/models/relations"; -import { EventType, RelationType } from "matrix-js-sdk/src/@types/event"; import EmojiPicker from "./EmojiPicker"; import { MatrixClientPeg } from "../../../MatrixClientPeg"; diff --git a/src/components/views/messages/EditHistoryMessage.tsx b/src/components/views/messages/EditHistoryMessage.tsx index e11c4ddded..f49db88d7c 100644 --- a/src/components/views/messages/EditHistoryMessage.tsx +++ b/src/components/views/messages/EditHistoryMessage.tsx @@ -15,9 +15,8 @@ limitations under the License. */ import React, { createRef } from "react"; -import { EventStatus, IContent, MatrixEvent, MatrixEventEvent } from "matrix-js-sdk/src/matrix"; +import { EventStatus, IContent, MatrixEvent, MatrixEventEvent, MsgType } from "matrix-js-sdk/src/matrix"; import classNames from "classnames"; -import { MsgType } from "matrix-js-sdk/src/@types/event"; import * as HtmlUtils from "../../../HtmlUtils"; import { editBodyDiffToHtml } from "../../../utils/MessageDiffUtils"; diff --git a/src/components/views/messages/MKeyVerificationConclusion.tsx b/src/components/views/messages/MKeyVerificationConclusion.tsx index 211812051d..26a57e9993 100644 --- a/src/components/views/messages/MKeyVerificationConclusion.tsx +++ b/src/components/views/messages/MKeyVerificationConclusion.tsx @@ -16,9 +16,8 @@ limitations under the License. import React from "react"; import classNames from "classnames"; -import { MatrixEvent } from "matrix-js-sdk/src/matrix"; +import { MatrixEvent, EventType } from "matrix-js-sdk/src/matrix"; import { VerificationPhase, VerificationRequest, VerificationRequestEvent } from "matrix-js-sdk/src/crypto-api"; -import { EventType } from "matrix-js-sdk/src/@types/event"; import { CryptoEvent } from "matrix-js-sdk/src/crypto"; import { MatrixClientPeg } from "../../../MatrixClientPeg"; diff --git a/src/components/views/messages/MessageActionBar.tsx b/src/components/views/messages/MessageActionBar.tsx index 5f176e7cec..6b727c5de7 100644 --- a/src/components/views/messages/MessageActionBar.tsx +++ b/src/components/views/messages/MessageActionBar.tsx @@ -17,9 +17,8 @@ limitations under the License. */ import React, { ReactElement, useCallback, useContext, useEffect } from "react"; -import { EventStatus, MatrixEvent, MatrixEventEvent } from "matrix-js-sdk/src/matrix"; +import { EventStatus, MatrixEvent, MatrixEventEvent, MsgType, RelationType } from "matrix-js-sdk/src/matrix"; import classNames from "classnames"; -import { MsgType, RelationType } from "matrix-js-sdk/src/@types/event"; import { M_BEACON_INFO } from "matrix-js-sdk/src/@types/beacon"; import { Icon as ContextMenuIcon } from "../../../../res/img/element-icons/context-menu.svg"; diff --git a/src/components/views/messages/MessageEvent.tsx b/src/components/views/messages/MessageEvent.tsx index 57fc96e32a..dfadd5a231 100644 --- a/src/components/views/messages/MessageEvent.tsx +++ b/src/components/views/messages/MessageEvent.tsx @@ -15,11 +15,10 @@ limitations under the License. */ import React, { createRef } from "react"; -import { EventType, MsgType } from "matrix-js-sdk/src/@types/event"; +import { EventType, MsgType, MatrixEventEvent } from "matrix-js-sdk/src/matrix"; import { M_BEACON_INFO } from "matrix-js-sdk/src/@types/beacon"; import { M_LOCATION } from "matrix-js-sdk/src/@types/location"; import { M_POLL_END, M_POLL_START } from "matrix-js-sdk/src/@types/polls"; -import { MatrixEventEvent } from "matrix-js-sdk/src/matrix"; import SettingsStore from "../../../settings/SettingsStore"; import { Mjolnir } from "../../../mjolnir/Mjolnir"; diff --git a/src/components/views/messages/SenderProfile.tsx b/src/components/views/messages/SenderProfile.tsx index c86e8e8f86..20323b2e77 100644 --- a/src/components/views/messages/SenderProfile.tsx +++ b/src/components/views/messages/SenderProfile.tsx @@ -16,8 +16,7 @@ */ import React from "react"; -import { MatrixEvent } from "matrix-js-sdk/src/matrix"; -import { MsgType } from "matrix-js-sdk/src/@types/event"; +import { MatrixEvent, MsgType } from "matrix-js-sdk/src/matrix"; import DisambiguatedProfile from "./DisambiguatedProfile"; import { useRoomMemberProfile } from "../../../hooks/room/useRoomMemberProfile"; diff --git a/src/components/views/messages/TextualBody.tsx b/src/components/views/messages/TextualBody.tsx index 99ab61b1b6..88ed8adcd8 100644 --- a/src/components/views/messages/TextualBody.tsx +++ b/src/components/views/messages/TextualBody.tsx @@ -17,7 +17,7 @@ limitations under the License. import React, { createRef, SyntheticEvent, MouseEvent } from "react"; import ReactDOM from "react-dom"; import highlight from "highlight.js"; -import { MsgType } from "matrix-js-sdk/src/@types/event"; +import { MsgType } from "matrix-js-sdk/src/matrix"; import * as HtmlUtils from "../../../HtmlUtils"; import { formatDate } from "../../../DateUtils"; diff --git a/src/components/views/right_panel/PinnedMessagesCard.tsx b/src/components/views/right_panel/PinnedMessagesCard.tsx index 564f0197e1..04a384a04b 100644 --- a/src/components/views/right_panel/PinnedMessagesCard.tsx +++ b/src/components/views/right_panel/PinnedMessagesCard.tsx @@ -15,8 +15,7 @@ limitations under the License. */ import React, { useCallback, useContext, useEffect, useState } from "react"; -import { Room, RoomEvent, RoomStateEvent, MatrixEvent } from "matrix-js-sdk/src/matrix"; -import { EventType, RelationType } from "matrix-js-sdk/src/@types/event"; +import { Room, RoomEvent, RoomStateEvent, MatrixEvent, EventType, RelationType } from "matrix-js-sdk/src/matrix"; import { logger } from "matrix-js-sdk/src/logger"; import { Icon as ContextMenuIcon } from "../../../../res/img/element-icons/context-menu.svg"; diff --git a/src/components/views/right_panel/UserInfo.tsx b/src/components/views/right_panel/UserInfo.tsx index 96d3ae4792..7eff6d96f1 100644 --- a/src/components/views/right_panel/UserInfo.tsx +++ b/src/components/views/right_panel/UserInfo.tsx @@ -20,9 +20,8 @@ limitations under the License. import React, { ReactNode, useCallback, useContext, useEffect, useMemo, useState } from "react"; import classNames from "classnames"; import { ClientEvent, MatrixClient } from "matrix-js-sdk/src/client"; -import { RoomMember, Room, RoomStateEvent, MatrixEvent, User, Device } from "matrix-js-sdk/src/matrix"; +import { RoomMember, Room, RoomStateEvent, MatrixEvent, User, Device, EventType } from "matrix-js-sdk/src/matrix"; import { VerificationRequest } from "matrix-js-sdk/src/crypto-api"; -import { EventType } from "matrix-js-sdk/src/@types/event"; import { logger } from "matrix-js-sdk/src/logger"; import { CryptoEvent } from "matrix-js-sdk/src/crypto"; import { UserTrustLevel } from "matrix-js-sdk/src/crypto/CrossSigning"; diff --git a/src/components/views/room_settings/AliasSettings.tsx b/src/components/views/room_settings/AliasSettings.tsx index cbf701b38b..f1729b7596 100644 --- a/src/components/views/room_settings/AliasSettings.tsx +++ b/src/components/views/room_settings/AliasSettings.tsx @@ -15,9 +15,8 @@ limitations under the License. */ import React, { ChangeEvent, ContextType, createRef, SyntheticEvent } from "react"; -import { IContent, MatrixEvent } from "matrix-js-sdk/src/matrix"; +import { IContent, MatrixEvent, EventType } from "matrix-js-sdk/src/matrix"; import { logger } from "matrix-js-sdk/src/logger"; -import { EventType } from "matrix-js-sdk/src/@types/event"; import EditableItemList from "../elements/EditableItemList"; import { _t } from "../../../languageHandler"; diff --git a/src/components/views/room_settings/RoomPublishSetting.tsx b/src/components/views/room_settings/RoomPublishSetting.tsx index a2f93e4cc5..06b860947f 100644 --- a/src/components/views/room_settings/RoomPublishSetting.tsx +++ b/src/components/views/room_settings/RoomPublishSetting.tsx @@ -15,7 +15,7 @@ limitations under the License. */ import React from "react"; -import { JoinRule, Visibility } from "matrix-js-sdk/src/@types/partials"; +import { JoinRule, Visibility } from "matrix-js-sdk/src/matrix"; import LabelledToggleSwitch from "../elements/LabelledToggleSwitch"; import { _t } from "../../../languageHandler"; diff --git a/src/components/views/rooms/EditMessageComposer.tsx b/src/components/views/rooms/EditMessageComposer.tsx index b13349ea15..2565f6df5d 100644 --- a/src/components/views/rooms/EditMessageComposer.tsx +++ b/src/components/views/rooms/EditMessageComposer.tsx @@ -16,8 +16,7 @@ limitations under the License. import React, { createRef, KeyboardEvent } from "react"; import classNames from "classnames"; -import { EventStatus, IContent, MatrixEvent, Room } from "matrix-js-sdk/src/matrix"; -import { MsgType } from "matrix-js-sdk/src/@types/event"; +import { EventStatus, IContent, MatrixEvent, Room, MsgType } from "matrix-js-sdk/src/matrix"; import { logger } from "matrix-js-sdk/src/logger"; import { Composer as ComposerEvent } from "@matrix-org/analytics-events/types/typescript/Composer"; diff --git a/src/components/views/rooms/EventTile.tsx b/src/components/views/rooms/EventTile.tsx index 67bed8875b..c216d1335b 100644 --- a/src/components/views/rooms/EventTile.tsx +++ b/src/components/views/rooms/EventTile.tsx @@ -17,8 +17,10 @@ limitations under the License. import React, { createRef, forwardRef, MouseEvent, ReactNode, useRef } from "react"; import classNames from "classnames"; -import { EventType, MsgType, RelationType } from "matrix-js-sdk/src/@types/event"; import { + EventType, + MsgType, + RelationType, EventStatus, MatrixEvent, MatrixEventEvent, diff --git a/src/components/views/rooms/MemberList.tsx b/src/components/views/rooms/MemberList.tsx index f9346b42af..b24b3b137a 100644 --- a/src/components/views/rooms/MemberList.tsx +++ b/src/components/views/rooms/MemberList.tsx @@ -28,11 +28,11 @@ import { RoomStateEvent, User, UserEvent, + JoinRule, + EventType, } from "matrix-js-sdk/src/matrix"; import { throttle } from "lodash"; -import { JoinRule } from "matrix-js-sdk/src/@types/partials"; import { ClientEvent } from "matrix-js-sdk/src/client"; -import { EventType } from "matrix-js-sdk/src/@types/event"; import { _t } from "../../../languageHandler"; import dis from "../../../dispatcher/dispatcher"; diff --git a/src/components/views/rooms/MemberTile.tsx b/src/components/views/rooms/MemberTile.tsx index 5bda938a38..d53bac1d78 100644 --- a/src/components/views/rooms/MemberTile.tsx +++ b/src/components/views/rooms/MemberTile.tsx @@ -16,8 +16,7 @@ limitations under the License. */ import React from "react"; -import { RoomMember, RoomStateEvent, MatrixEvent } from "matrix-js-sdk/src/matrix"; -import { EventType } from "matrix-js-sdk/src/@types/event"; +import { RoomMember, RoomStateEvent, MatrixEvent, EventType } from "matrix-js-sdk/src/matrix"; import { DeviceInfo } from "matrix-js-sdk/src/crypto/deviceinfo"; import { CryptoEvent } from "matrix-js-sdk/src/crypto"; import { UserTrustLevel } from "matrix-js-sdk/src/crypto/CrossSigning"; diff --git a/src/components/views/rooms/MessageComposer.tsx b/src/components/views/rooms/MessageComposer.tsx index 2cfd1b8760..a13469ef8b 100644 --- a/src/components/views/rooms/MessageComposer.tsx +++ b/src/components/views/rooms/MessageComposer.tsx @@ -16,8 +16,7 @@ limitations under the License. import React, { createRef, ReactNode } from "react"; import classNames from "classnames"; -import { IEventRelation, MatrixEvent, Room, RoomMember } from "matrix-js-sdk/src/matrix"; -import { EventType } from "matrix-js-sdk/src/@types/event"; +import { IEventRelation, MatrixEvent, Room, RoomMember, EventType } from "matrix-js-sdk/src/matrix"; import { Optional } from "matrix-events-sdk"; import { THREAD_RELATION_TYPE } from "matrix-js-sdk/src/models/thread"; diff --git a/src/components/views/rooms/NewRoomIntro.tsx b/src/components/views/rooms/NewRoomIntro.tsx index 9cd6ba9d4e..1e2e2c50ba 100644 --- a/src/components/views/rooms/NewRoomIntro.tsx +++ b/src/components/views/rooms/NewRoomIntro.tsx @@ -15,9 +15,8 @@ limitations under the License. */ import React, { useContext } from "react"; -import { EventType } from "matrix-js-sdk/src/@types/event"; +import { EventType, Room, User } from "matrix-js-sdk/src/matrix"; import { MatrixClient } from "matrix-js-sdk/src/client"; -import { Room, User } from "matrix-js-sdk/src/matrix"; import MatrixClientContext from "../../../contexts/MatrixClientContext"; import RoomContext from "../../../contexts/RoomContext"; diff --git a/src/components/views/rooms/PinnedEventTile.tsx b/src/components/views/rooms/PinnedEventTile.tsx index 03870de378..6b2bdd35b4 100644 --- a/src/components/views/rooms/PinnedEventTile.tsx +++ b/src/components/views/rooms/PinnedEventTile.tsx @@ -16,9 +16,8 @@ limitations under the License. */ import React from "react"; -import { MatrixEvent } from "matrix-js-sdk/src/matrix"; +import { MatrixEvent, EventType, RelationType } from "matrix-js-sdk/src/matrix"; import { Relations } from "matrix-js-sdk/src/models/relations"; -import { EventType, RelationType } from "matrix-js-sdk/src/@types/event"; import dis from "../../../dispatcher/dispatcher"; import { Action } from "../../../dispatcher/actions"; diff --git a/src/components/views/rooms/ReplyTile.tsx b/src/components/views/rooms/ReplyTile.tsx index 45c209c68c..51aa86a13b 100644 --- a/src/components/views/rooms/ReplyTile.tsx +++ b/src/components/views/rooms/ReplyTile.tsx @@ -16,8 +16,7 @@ limitations under the License. import React, { createRef } from "react"; import classNames from "classnames"; -import { MatrixEvent, MatrixEventEvent } from "matrix-js-sdk/src/matrix"; -import { EventType, MsgType } from "matrix-js-sdk/src/@types/event"; +import { MatrixEvent, MatrixEventEvent, EventType, MsgType } from "matrix-js-sdk/src/matrix"; import { logger } from "matrix-js-sdk/src/logger"; import { _t } from "../../../languageHandler"; diff --git a/src/components/views/rooms/RoomInfoLine.tsx b/src/components/views/rooms/RoomInfoLine.tsx index eb931804cc..a18cc81301 100644 --- a/src/components/views/rooms/RoomInfoLine.tsx +++ b/src/components/views/rooms/RoomInfoLine.tsx @@ -15,8 +15,7 @@ limitations under the License. */ import React, { FC } from "react"; -import { Room } from "matrix-js-sdk/src/matrix"; -import { JoinRule } from "matrix-js-sdk/src/@types/partials"; +import { Room, JoinRule } from "matrix-js-sdk/src/matrix"; import { MatrixClient } from "matrix-js-sdk/src/client"; import { _t } from "../../../languageHandler"; diff --git a/src/components/views/rooms/RoomList.tsx b/src/components/views/rooms/RoomList.tsx index ffd99fc5ee..64d2c73926 100644 --- a/src/components/views/rooms/RoomList.tsx +++ b/src/components/views/rooms/RoomList.tsx @@ -14,8 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { EventType, RoomType } from "matrix-js-sdk/src/@types/event"; -import { Room } from "matrix-js-sdk/src/matrix"; +import { EventType, RoomType, Room } from "matrix-js-sdk/src/matrix"; import React, { ComponentType, createRef, ReactComponentElement, SyntheticEvent } from "react"; import { IState as IRovingTabIndexState, RovingTabIndexProvider } from "../../../accessibility/RovingTabIndex"; diff --git a/src/components/views/rooms/RoomListHeader.tsx b/src/components/views/rooms/RoomListHeader.tsx index 0c41d92ffc..f1f4f26d60 100644 --- a/src/components/views/rooms/RoomListHeader.tsx +++ b/src/components/views/rooms/RoomListHeader.tsx @@ -14,9 +14,8 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { EventType, RoomType } from "matrix-js-sdk/src/@types/event"; +import { EventType, RoomType, Room, RoomEvent } from "matrix-js-sdk/src/matrix"; import { ClientEvent } from "matrix-js-sdk/src/client"; -import { Room, RoomEvent } from "matrix-js-sdk/src/matrix"; import React, { useContext, useEffect, useState } from "react"; import MatrixClientContext from "../../../contexts/MatrixClientContext"; diff --git a/src/components/views/rooms/RoomPreviewBar.tsx b/src/components/views/rooms/RoomPreviewBar.tsx index 68d53b7c0e..5a2beb7bbf 100644 --- a/src/components/views/rooms/RoomPreviewBar.tsx +++ b/src/components/views/rooms/RoomPreviewBar.tsx @@ -15,10 +15,8 @@ limitations under the License. */ import React, { ChangeEvent, ReactNode } from "react"; -import { Room, RoomMember } from "matrix-js-sdk/src/matrix"; +import { Room, RoomMember, EventType, RoomType, IJoinRuleEventContent, JoinRule } from "matrix-js-sdk/src/matrix"; import { MatrixError } from "matrix-js-sdk/src/http-api"; -import { EventType, RoomType } from "matrix-js-sdk/src/@types/event"; -import { IJoinRuleEventContent, JoinRule } from "matrix-js-sdk/src/@types/partials"; import classNames from "classnames"; import { RoomPreviewOpts, RoomViewLifecycle } from "@matrix-org/react-sdk-module-api/lib/lifecycles/RoomViewLifecycle"; diff --git a/src/components/views/rooms/RoomPreviewCard.tsx b/src/components/views/rooms/RoomPreviewCard.tsx index f323a6e075..08b9c27adb 100644 --- a/src/components/views/rooms/RoomPreviewCard.tsx +++ b/src/components/views/rooms/RoomPreviewCard.tsx @@ -15,8 +15,7 @@ limitations under the License. */ import React, { FC, useContext, useState } from "react"; -import { Room } from "matrix-js-sdk/src/matrix"; -import { JoinRule } from "matrix-js-sdk/src/@types/partials"; +import { Room, JoinRule } from "matrix-js-sdk/src/matrix"; import { _t } from "../../../languageHandler"; import defaultDispatcher from "../../../dispatcher/dispatcher"; diff --git a/src/components/views/rooms/SendMessageComposer.tsx b/src/components/views/rooms/SendMessageComposer.tsx index b97e014aef..08c22671d6 100644 --- a/src/components/views/rooms/SendMessageComposer.tsx +++ b/src/components/views/rooms/SendMessageComposer.tsx @@ -16,9 +16,17 @@ limitations under the License. import React, { createRef, KeyboardEvent, SyntheticEvent } from "react"; import EMOJI_REGEX from "emojibase-regex"; -import { IContent, MatrixEvent, IEventRelation, IMentions, Room } from "matrix-js-sdk/src/matrix"; +import { + IContent, + MatrixEvent, + IEventRelation, + IMentions, + Room, + EventType, + MsgType, + RelationType, +} from "matrix-js-sdk/src/matrix"; import { DebouncedFunc, throttle } from "lodash"; -import { EventType, MsgType, RelationType } from "matrix-js-sdk/src/@types/event"; import { logger } from "matrix-js-sdk/src/logger"; import { Composer as ComposerEvent } from "@matrix-org/analytics-events/types/typescript/Composer"; import { THREAD_RELATION_TYPE } from "matrix-js-sdk/src/models/thread"; diff --git a/src/components/views/rooms/ThirdPartyMemberInfo.tsx b/src/components/views/rooms/ThirdPartyMemberInfo.tsx index 9b63109d09..0ffd0dc551 100644 --- a/src/components/views/rooms/ThirdPartyMemberInfo.tsx +++ b/src/components/views/rooms/ThirdPartyMemberInfo.tsx @@ -15,9 +15,8 @@ limitations under the License. */ import React from "react"; -import { MatrixEvent, Room, RoomStateEvent } from "matrix-js-sdk/src/matrix"; +import { MatrixEvent, Room, RoomStateEvent, EventType } from "matrix-js-sdk/src/matrix"; import { logger } from "matrix-js-sdk/src/logger"; -import { EventType } from "matrix-js-sdk/src/@types/event"; import { MatrixClientPeg } from "../../../MatrixClientPeg"; import { _t } from "../../../languageHandler"; diff --git a/src/components/views/settings/AddPrivilegedUsers.tsx b/src/components/views/settings/AddPrivilegedUsers.tsx index 529e67dbca..70df7fdd7d 100644 --- a/src/components/views/settings/AddPrivilegedUsers.tsx +++ b/src/components/views/settings/AddPrivilegedUsers.tsx @@ -15,8 +15,7 @@ limitations under the License. */ import React, { FormEvent, useCallback, useContext, useRef, useState } from "react"; -import { Room } from "matrix-js-sdk/src/matrix"; -import { EventType } from "matrix-js-sdk/src/@types/event"; +import { Room, EventType } from "matrix-js-sdk/src/matrix"; import { _t } from "../../../languageHandler"; import { ICompletion } from "../../../autocomplete/Autocompleter"; diff --git a/src/components/views/settings/JoinRuleSettings.tsx b/src/components/views/settings/JoinRuleSettings.tsx index b35cd9f53f..3c29b33842 100644 --- a/src/components/views/settings/JoinRuleSettings.tsx +++ b/src/components/views/settings/JoinRuleSettings.tsx @@ -15,9 +15,7 @@ limitations under the License. */ import React, { ReactNode } from "react"; -import { IJoinRuleEventContent, JoinRule, RestrictedAllowType } from "matrix-js-sdk/src/@types/partials"; -import { Room } from "matrix-js-sdk/src/matrix"; -import { EventType } from "matrix-js-sdk/src/@types/event"; +import { IJoinRuleEventContent, JoinRule, RestrictedAllowType, Room, EventType } from "matrix-js-sdk/src/matrix"; import StyledRadioGroup, { IDefinition } from "../elements/StyledRadioGroup"; import { _t } from "../../../languageHandler"; diff --git a/src/components/views/settings/devices/DeviceDetails.tsx b/src/components/views/settings/devices/DeviceDetails.tsx index fea916eb24..991e772b1f 100644 --- a/src/components/views/settings/devices/DeviceDetails.tsx +++ b/src/components/views/settings/devices/DeviceDetails.tsx @@ -17,7 +17,7 @@ limitations under the License. import React from "react"; import classNames from "classnames"; import { IPusher } from "matrix-js-sdk/src/@types/PushRules"; -import { PUSHER_ENABLED } from "matrix-js-sdk/src/@types/event"; +import { PUSHER_ENABLED } from "matrix-js-sdk/src/matrix"; import { LocalNotificationSettings } from "matrix-js-sdk/src/@types/local_notifications"; import { formatDate } from "../../../../DateUtils"; diff --git a/src/components/views/settings/devices/FilteredDeviceList.tsx b/src/components/views/settings/devices/FilteredDeviceList.tsx index 5ba5b0a83d..193ee73535 100644 --- a/src/components/views/settings/devices/FilteredDeviceList.tsx +++ b/src/components/views/settings/devices/FilteredDeviceList.tsx @@ -16,7 +16,7 @@ limitations under the License. import React, { ForwardedRef, forwardRef } from "react"; import { IPusher } from "matrix-js-sdk/src/@types/PushRules"; -import { PUSHER_DEVICE_ID } from "matrix-js-sdk/src/@types/event"; +import { PUSHER_DEVICE_ID } from "matrix-js-sdk/src/matrix"; import { LocalNotificationSettings } from "matrix-js-sdk/src/@types/local_notifications"; import { _t } from "../../../../languageHandler"; diff --git a/src/components/views/settings/tabs/room/AdvancedRoomSettingsTab.tsx b/src/components/views/settings/tabs/room/AdvancedRoomSettingsTab.tsx index a7068ea1cf..f45f0bb5f2 100644 --- a/src/components/views/settings/tabs/room/AdvancedRoomSettingsTab.tsx +++ b/src/components/views/settings/tabs/room/AdvancedRoomSettingsTab.tsx @@ -15,8 +15,7 @@ limitations under the License. */ import React from "react"; -import { EventType } from "matrix-js-sdk/src/@types/event"; -import { Room } from "matrix-js-sdk/src/matrix"; +import { EventType, Room } from "matrix-js-sdk/src/matrix"; import { _t } from "../../../../../languageHandler"; import AccessibleButton, { ButtonEvent } from "../../../elements/AccessibleButton"; diff --git a/src/components/views/settings/tabs/room/RolesRoomSettingsTab.tsx b/src/components/views/settings/tabs/room/RolesRoomSettingsTab.tsx index 9359a2fb6b..645eaf216f 100644 --- a/src/components/views/settings/tabs/room/RolesRoomSettingsTab.tsx +++ b/src/components/views/settings/tabs/room/RolesRoomSettingsTab.tsx @@ -15,8 +15,7 @@ limitations under the License. */ import React from "react"; -import { EventType } from "matrix-js-sdk/src/@types/event"; -import { RoomMember, RoomState, RoomStateEvent, Room, IContent } from "matrix-js-sdk/src/matrix"; +import { EventType, RoomMember, RoomState, RoomStateEvent, Room, IContent } from "matrix-js-sdk/src/matrix"; import { logger } from "matrix-js-sdk/src/logger"; import { throttle, get } from "lodash"; import { compare } from "matrix-js-sdk/src/utils"; diff --git a/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx b/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx index 42189a860b..354d2abc44 100644 --- a/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx +++ b/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx @@ -15,9 +15,15 @@ limitations under the License. */ import React, { ReactNode } from "react"; -import { GuestAccess, HistoryVisibility, JoinRule } from "matrix-js-sdk/src/@types/partials"; -import { MatrixEvent, RoomStateEvent, Room } from "matrix-js-sdk/src/matrix"; -import { EventType } from "matrix-js-sdk/src/@types/event"; +import { + GuestAccess, + HistoryVisibility, + JoinRule, + MatrixEvent, + RoomStateEvent, + Room, + EventType, +} from "matrix-js-sdk/src/matrix"; import { logger } from "matrix-js-sdk/src/logger"; import { Icon as WarningIcon } from "../../../../../../res/img/warning.svg"; diff --git a/src/components/views/settings/tabs/room/VoipRoomSettingsTab.tsx b/src/components/views/settings/tabs/room/VoipRoomSettingsTab.tsx index 15d75a53f4..f1704f6fe4 100644 --- a/src/components/views/settings/tabs/room/VoipRoomSettingsTab.tsx +++ b/src/components/views/settings/tabs/room/VoipRoomSettingsTab.tsx @@ -15,9 +15,7 @@ limitations under the License. */ import React, { useCallback, useMemo, useState } from "react"; -import { JoinRule } from "matrix-js-sdk/src/@types/partials"; -import { EventType } from "matrix-js-sdk/src/@types/event"; -import { RoomState, Room } from "matrix-js-sdk/src/matrix"; +import { JoinRule, EventType, RoomState, Room } from "matrix-js-sdk/src/matrix"; import { _t } from "../../../../../languageHandler"; import LabelledToggleSwitch from "../../../elements/LabelledToggleSwitch"; diff --git a/src/components/views/spaces/SpaceCreateMenu.tsx b/src/components/views/spaces/SpaceCreateMenu.tsx index a6a4b1ba69..b80f7c8196 100644 --- a/src/components/views/spaces/SpaceCreateMenu.tsx +++ b/src/components/views/spaces/SpaceCreateMenu.tsx @@ -26,11 +26,9 @@ import React, { ReactNode, } from "react"; import classNames from "classnames"; -import { RoomType } from "matrix-js-sdk/src/@types/event"; +import { RoomType, HistoryVisibility, Preset, Visibility, MatrixClient } from "matrix-js-sdk/src/matrix"; import { ICreateRoomOpts } from "matrix-js-sdk/src/@types/requests"; -import { HistoryVisibility, Preset, Visibility } from "matrix-js-sdk/src/@types/partials"; import { logger } from "matrix-js-sdk/src/logger"; -import { MatrixClient } from "matrix-js-sdk/src/matrix"; import { _t } from "../../../languageHandler"; import AccessibleTooltipButton from "../elements/AccessibleTooltipButton"; diff --git a/src/components/views/spaces/SpaceSettingsGeneralTab.tsx b/src/components/views/spaces/SpaceSettingsGeneralTab.tsx index 34a501cd60..7bf4ee8998 100644 --- a/src/components/views/spaces/SpaceSettingsGeneralTab.tsx +++ b/src/components/views/spaces/SpaceSettingsGeneralTab.tsx @@ -15,9 +15,8 @@ limitations under the License. */ import React, { useState } from "react"; -import { Room } from "matrix-js-sdk/src/matrix"; +import { Room, EventType } from "matrix-js-sdk/src/matrix"; import { MatrixClient } from "matrix-js-sdk/src/client"; -import { EventType } from "matrix-js-sdk/src/@types/event"; import { logger } from "matrix-js-sdk/src/logger"; import { _t } from "../../../languageHandler"; diff --git a/src/components/views/spaces/SpaceSettingsVisibilityTab.tsx b/src/components/views/spaces/SpaceSettingsVisibilityTab.tsx index 8df1e08a52..e4dde79cea 100644 --- a/src/components/views/spaces/SpaceSettingsVisibilityTab.tsx +++ b/src/components/views/spaces/SpaceSettingsVisibilityTab.tsx @@ -15,10 +15,8 @@ limitations under the License. */ import React, { useState } from "react"; -import { Room } from "matrix-js-sdk/src/matrix"; +import { Room, EventType, GuestAccess, HistoryVisibility, JoinRule } from "matrix-js-sdk/src/matrix"; import { MatrixClient } from "matrix-js-sdk/src/client"; -import { EventType } from "matrix-js-sdk/src/@types/event"; -import { GuestAccess, HistoryVisibility, JoinRule } from "matrix-js-sdk/src/@types/partials"; import { _t } from "../../../languageHandler"; import AccessibleButton from "../elements/AccessibleButton"; diff --git a/src/customisations/Media.ts b/src/customisations/Media.ts index 67831d49fe..d9e3bb3d20 100644 --- a/src/customisations/Media.ts +++ b/src/customisations/Media.ts @@ -15,7 +15,7 @@ */ import { MatrixClient } from "matrix-js-sdk/src/client"; -import { ResizeMethod } from "matrix-js-sdk/src/@types/partials"; +import { ResizeMethod } from "matrix-js-sdk/src/matrix"; import { Optional } from "matrix-events-sdk"; import { MatrixClientPeg } from "../MatrixClientPeg"; diff --git a/src/editor/deserialize.ts b/src/editor/deserialize.ts index 89f72a22be..3b9c1cee2c 100644 --- a/src/editor/deserialize.ts +++ b/src/editor/deserialize.ts @@ -15,8 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { MatrixEvent } from "matrix-js-sdk/src/matrix"; -import { MsgType } from "matrix-js-sdk/src/@types/event"; +import { MatrixEvent, MsgType } from "matrix-js-sdk/src/matrix"; import { checkBlockNode } from "../HtmlUtils"; import { getPrimaryPermalinkEntity } from "../utils/permalinks/Permalinks"; diff --git a/src/events/EventTileFactory.tsx b/src/events/EventTileFactory.tsx index 99b71eb1d9..1b06ad83b1 100644 --- a/src/events/EventTileFactory.tsx +++ b/src/events/EventTileFactory.tsx @@ -15,8 +15,7 @@ limitations under the License. */ import React from "react"; -import { MatrixEvent } from "matrix-js-sdk/src/matrix"; -import { EventType, MsgType, RelationType } from "matrix-js-sdk/src/@types/event"; +import { MatrixEvent, EventType, MsgType, RelationType } 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 { MatrixClient } from "matrix-js-sdk/src/client"; diff --git a/src/hooks/room/useTopic.ts b/src/hooks/room/useTopic.ts index 9750310ccf..11dc4e5275 100644 --- a/src/hooks/room/useTopic.ts +++ b/src/hooks/room/useTopic.ts @@ -15,8 +15,7 @@ limitations under the License. */ import { useEffect, useState } from "react"; -import { EventType } from "matrix-js-sdk/src/@types/event"; -import { MatrixEvent, Room, RoomStateEvent } from "matrix-js-sdk/src/matrix"; +import { EventType, MatrixEvent, Room, RoomStateEvent } from "matrix-js-sdk/src/matrix"; import { parseTopicContent, TopicState } from "matrix-js-sdk/src/content-helpers"; import { MRoomTopicEventContent } from "matrix-js-sdk/src/@types/topic"; import { Optional } from "matrix-events-sdk"; diff --git a/src/hooks/useIsEncrypted.ts b/src/hooks/useIsEncrypted.ts index 75fd5c9de9..88ba1ec20d 100644 --- a/src/hooks/useIsEncrypted.ts +++ b/src/hooks/useIsEncrypted.ts @@ -16,8 +16,7 @@ limitations under the License. import { useCallback, useState } from "react"; import { MatrixClient } from "matrix-js-sdk/src/client"; -import { MatrixEvent, Room, RoomStateEvent } from "matrix-js-sdk/src/matrix"; -import { EventType } from "matrix-js-sdk/src/@types/event"; +import { MatrixEvent, Room, RoomStateEvent, EventType } from "matrix-js-sdk/src/matrix"; import { useTypedEventEmitter } from "./useEventEmitter"; diff --git a/src/hooks/usePublicRoomDirectory.ts b/src/hooks/usePublicRoomDirectory.ts index d3c6b00c0b..531ae8d1ac 100644 --- a/src/hooks/usePublicRoomDirectory.ts +++ b/src/hooks/usePublicRoomDirectory.ts @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { RoomType } from "matrix-js-sdk/src/@types/event"; +import { RoomType } from "matrix-js-sdk/src/matrix"; import { IRoomDirectoryOptions } from "matrix-js-sdk/src/@types/requests"; import { IProtocol, IPublicRoomsChunkRoom } from "matrix-js-sdk/src/client"; import { useCallback, useEffect, useState } from "react"; diff --git a/src/indexing/EventIndex.ts b/src/indexing/EventIndex.ts index 6f12bc5e04..d4fdb6918f 100644 --- a/src/indexing/EventIndex.ts +++ b/src/indexing/EventIndex.ts @@ -26,12 +26,12 @@ import { EventTimeline, EventTimelineSet, IRoomTimelineData, + EventType, } from "matrix-js-sdk/src/matrix"; import { TimelineIndex, TimelineWindow } from "matrix-js-sdk/src/timeline-window"; import { sleep } from "matrix-js-sdk/src/utils"; import { IEventWithRoomId, IMatrixProfile, IResultRoomEvents } from "matrix-js-sdk/src/@types/search"; import { logger } from "matrix-js-sdk/src/logger"; -import { EventType } from "matrix-js-sdk/src/@types/event"; import { ClientEvent, MatrixClient } from "matrix-js-sdk/src/client"; import { ISyncStateData, SyncState } from "matrix-js-sdk/src/sync"; import { HTTPError } from "matrix-js-sdk/src/http-api"; diff --git a/src/mjolnir/Mjolnir.ts b/src/mjolnir/Mjolnir.ts index ff60c0ec78..6c5495a145 100644 --- a/src/mjolnir/Mjolnir.ts +++ b/src/mjolnir/Mjolnir.ts @@ -14,8 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { MatrixEvent, RoomStateEvent } from "matrix-js-sdk/src/matrix"; -import { Preset } from "matrix-js-sdk/src/@types/partials"; +import { MatrixEvent, RoomStateEvent, Preset } from "matrix-js-sdk/src/matrix"; import { logger } from "matrix-js-sdk/src/logger"; import { MatrixClientPeg } from "../MatrixClientPeg"; diff --git a/src/models/Call.ts b/src/models/Call.ts index e37efa3843..9f467d9c29 100644 --- a/src/models/Call.ts +++ b/src/models/Call.ts @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { TypedEventEmitter, RoomEvent, RoomStateEvent } from "matrix-js-sdk/src/matrix"; +import { TypedEventEmitter, RoomEvent, RoomStateEvent, EventType } from "matrix-js-sdk/src/matrix"; import { logger } from "matrix-js-sdk/src/logger"; import { randomString } from "matrix-js-sdk/src/randomstring"; import { MatrixClient } from "matrix-js-sdk/src/client"; @@ -28,7 +28,6 @@ import { GroupCallState, GroupCallType, } from "matrix-js-sdk/src/webrtc/groupCall"; -import { EventType } from "matrix-js-sdk/src/@types/event"; import type EventEmitter from "events"; import type { IMyDevice } from "matrix-js-sdk/src/client"; diff --git a/src/shouldHideEvent.ts b/src/shouldHideEvent.ts index ffc43bb00c..dcfc5d920c 100644 --- a/src/shouldHideEvent.ts +++ b/src/shouldHideEvent.ts @@ -14,8 +14,7 @@ limitations under the License. */ -import { MatrixEvent } from "matrix-js-sdk/src/matrix"; -import { EventType, RelationType } from "matrix-js-sdk/src/@types/event"; +import { MatrixEvent, EventType, RelationType } from "matrix-js-sdk/src/matrix"; import SettingsStore from "./settings/SettingsStore"; import { IRoomState } from "./components/structures/RoomView"; diff --git a/src/stores/OwnProfileStore.ts b/src/stores/OwnProfileStore.ts index eaaadd424d..5226055994 100644 --- a/src/stores/OwnProfileStore.ts +++ b/src/stores/OwnProfileStore.ts @@ -14,9 +14,8 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { MatrixEvent, RoomStateEvent, MatrixError, User, UserEvent } from "matrix-js-sdk/src/matrix"; +import { MatrixEvent, RoomStateEvent, MatrixError, User, UserEvent, EventType } from "matrix-js-sdk/src/matrix"; import { throttle } from "lodash"; -import { EventType } from "matrix-js-sdk/src/@types/event"; import { ActionPayload } from "../dispatcher/payloads"; import { AsyncStoreWithClient } from "./AsyncStoreWithClient"; diff --git a/src/stores/RoomViewStore.tsx b/src/stores/RoomViewStore.tsx index 9a4ac2ce06..30f01bda59 100644 --- a/src/stores/RoomViewStore.tsx +++ b/src/stores/RoomViewStore.tsx @@ -22,8 +22,7 @@ import { MatrixError } from "matrix-js-sdk/src/http-api"; import { logger } from "matrix-js-sdk/src/logger"; import { ViewRoom as ViewRoomEvent } from "@matrix-org/analytics-events/types/typescript/ViewRoom"; import { JoinedRoom as JoinedRoomEvent } from "@matrix-org/analytics-events/types/typescript/JoinedRoom"; -import { JoinRule } from "matrix-js-sdk/src/@types/partials"; -import { Room, MatrixEvent } from "matrix-js-sdk/src/matrix"; +import { JoinRule, Room, MatrixEvent } from "matrix-js-sdk/src/matrix"; import { Optional } from "matrix-events-sdk"; import EventEmitter from "events"; diff --git a/src/stores/ThreepidInviteStore.ts b/src/stores/ThreepidInviteStore.ts index c62974378f..e97cb14378 100644 --- a/src/stores/ThreepidInviteStore.ts +++ b/src/stores/ThreepidInviteStore.ts @@ -16,7 +16,7 @@ limitations under the License. import EventEmitter from "events"; import { base32 } from "rfc4648"; -import { RoomType } from "matrix-js-sdk/src/@types/event"; +import { RoomType } from "matrix-js-sdk/src/matrix"; // Dev note: the interface is split in two so we don't have to disable the // linter across the whole project. diff --git a/src/stores/VoiceRecordingStore.ts b/src/stores/VoiceRecordingStore.ts index ad0afb5bb5..ebfd17996f 100644 --- a/src/stores/VoiceRecordingStore.ts +++ b/src/stores/VoiceRecordingStore.ts @@ -15,8 +15,7 @@ limitations under the License. */ import { Optional } from "matrix-events-sdk"; -import { Room, IEventRelation } from "matrix-js-sdk/src/matrix"; -import { RelationType } from "matrix-js-sdk/src/@types/event"; +import { Room, IEventRelation, RelationType } from "matrix-js-sdk/src/matrix"; import { AsyncStoreWithClient } from "./AsyncStoreWithClient"; import defaultDispatcher from "../dispatcher/dispatcher"; diff --git a/src/stores/local-echo/RoomEchoChamber.ts b/src/stores/local-echo/RoomEchoChamber.ts index 860bdf406e..14442b41b9 100644 --- a/src/stores/local-echo/RoomEchoChamber.ts +++ b/src/stores/local-echo/RoomEchoChamber.ts @@ -14,8 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { MatrixEvent, ClientEvent, MatrixClient } from "matrix-js-sdk/src/matrix"; -import { EventType } from "matrix-js-sdk/src/@types/event"; +import { MatrixEvent, ClientEvent, MatrixClient, EventType } from "matrix-js-sdk/src/matrix"; import { GenericEchoChamber, implicitlyReverted, PROPERTY_UPDATED } from "./GenericEchoChamber"; import { getRoomNotifsState, RoomNotifState, setRoomNotifsState } from "../../RoomNotifs"; diff --git a/src/stores/room-list/RoomListStore.ts b/src/stores/room-list/RoomListStore.ts index 7bb6b98aea..c1d5804b1d 100644 --- a/src/stores/room-list/RoomListStore.ts +++ b/src/stores/room-list/RoomListStore.ts @@ -15,9 +15,8 @@ limitations under the License. */ import { MatrixClient } from "matrix-js-sdk/src/client"; -import { Room, RoomState } from "matrix-js-sdk/src/matrix"; +import { Room, RoomState, EventType } from "matrix-js-sdk/src/matrix"; import { logger } from "matrix-js-sdk/src/logger"; -import { EventType } from "matrix-js-sdk/src/@types/event"; import SettingsStore from "../../settings/SettingsStore"; import { DefaultTagID, OrderedDefaultTagIDs, RoomUpdateCause, TagID } from "./models"; diff --git a/src/stores/room-list/algorithms/tag-sorting/RecentAlgorithm.ts b/src/stores/room-list/algorithms/tag-sorting/RecentAlgorithm.ts index 9e825073c3..5b239a694f 100644 --- a/src/stores/room-list/algorithms/tag-sorting/RecentAlgorithm.ts +++ b/src/stores/room-list/algorithms/tag-sorting/RecentAlgorithm.ts @@ -14,8 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { Room, MatrixEvent } from "matrix-js-sdk/src/matrix"; -import { EventType } from "matrix-js-sdk/src/@types/event"; +import { Room, MatrixEvent, EventType } from "matrix-js-sdk/src/matrix"; import { TagID } from "../../models"; import { IAlgorithm } from "./IAlgorithm"; diff --git a/src/stores/room-list/previews/MessageEventPreview.ts b/src/stores/room-list/previews/MessageEventPreview.ts index 3ae479e2c6..3863bac3fa 100644 --- a/src/stores/room-list/previews/MessageEventPreview.ts +++ b/src/stores/room-list/previews/MessageEventPreview.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 { MsgType, RelationType } from "matrix-js-sdk/src/@types/event"; +import { MatrixEvent, MsgType, RelationType } from "matrix-js-sdk/src/matrix"; import { IPreview } from "./IPreview"; import { TagID } from "../models"; diff --git a/src/stores/spaces/SpaceStore.ts b/src/stores/spaces/SpaceStore.ts index dbdcb87800..fa3e8ec48b 100644 --- a/src/stores/spaces/SpaceStore.ts +++ b/src/stores/spaces/SpaceStore.ts @@ -15,8 +15,15 @@ limitations under the License. */ import { ListIteratee, Many, sortBy } from "lodash"; -import { EventType, RoomType } from "matrix-js-sdk/src/@types/event"; -import { Room, RoomEvent, RoomMember, RoomStateEvent, MatrixEvent } from "matrix-js-sdk/src/matrix"; +import { + EventType, + RoomType, + Room, + RoomEvent, + RoomMember, + RoomStateEvent, + MatrixEvent, +} from "matrix-js-sdk/src/matrix"; import { ClientEvent } from "matrix-js-sdk/src/client"; import { logger } from "matrix-js-sdk/src/logger"; import { ISendEventResponse } from "matrix-js-sdk/src/@types/requests"; diff --git a/src/stores/widgets/StopGapWidgetDriver.ts b/src/stores/widgets/StopGapWidgetDriver.ts index cc68b73a4b..96c9e453db 100644 --- a/src/stores/widgets/StopGapWidgetDriver.ts +++ b/src/stores/widgets/StopGapWidgetDriver.ts @@ -34,8 +34,7 @@ import { ISearchUserDirectoryResult, } from "matrix-widget-api"; import { ClientEvent, ITurnServer as IClientTurnServer } from "matrix-js-sdk/src/client"; -import { EventType } from "matrix-js-sdk/src/@types/event"; -import { IContent, MatrixEvent, Room, Direction } from "matrix-js-sdk/src/matrix"; +import { EventType, IContent, MatrixEvent, Room, Direction } from "matrix-js-sdk/src/matrix"; import { logger } from "matrix-js-sdk/src/logger"; import { THREAD_RELATION_TYPE } from "matrix-js-sdk/src/models/thread"; import { diff --git a/src/utils/DMRoomMap.ts b/src/utils/DMRoomMap.ts index a29131b51b..9709462be0 100644 --- a/src/utils/DMRoomMap.ts +++ b/src/utils/DMRoomMap.ts @@ -15,10 +15,9 @@ limitations under the License. */ import { uniq } from "lodash"; -import { Room, MatrixEvent } from "matrix-js-sdk/src/matrix"; +import { Room, MatrixEvent, EventType } from "matrix-js-sdk/src/matrix"; import { ClientEvent, MatrixClient } from "matrix-js-sdk/src/client"; import { logger } from "matrix-js-sdk/src/logger"; -import { EventType } from "matrix-js-sdk/src/@types/event"; import { Optional } from "matrix-events-sdk"; import { filterValidMDirect } from "./dm/filterValidMDirect"; diff --git a/src/utils/EventRenderingUtils.ts b/src/utils/EventRenderingUtils.ts index 325c15e800..a094283fcd 100644 --- a/src/utils/EventRenderingUtils.ts +++ b/src/utils/EventRenderingUtils.ts @@ -14,8 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { MatrixEvent, IContent, MatrixClient } from "matrix-js-sdk/src/matrix"; -import { EventType, MsgType } from "matrix-js-sdk/src/@types/event"; +import { MatrixEvent, IContent, MatrixClient, EventType, MsgType } from "matrix-js-sdk/src/matrix"; import { M_POLL_END, M_POLL_START } from "matrix-js-sdk/src/@types/polls"; import { M_BEACON_INFO } from "matrix-js-sdk/src/@types/beacon"; diff --git a/src/utils/EventUtils.ts b/src/utils/EventUtils.ts index 929d19a3bf..7f8a039612 100644 --- a/src/utils/EventUtils.ts +++ b/src/utils/EventUtils.ts @@ -14,8 +14,14 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { EventStatus, MatrixEvent } from "matrix-js-sdk/src/matrix"; -import { EventType, EVENT_VISIBILITY_CHANGE_TYPE, MsgType, RelationType } from "matrix-js-sdk/src/@types/event"; +import { + EventStatus, + MatrixEvent, + EventType, + EVENT_VISIBILITY_CHANGE_TYPE, + MsgType, + RelationType, +} from "matrix-js-sdk/src/matrix"; import { MatrixClient } from "matrix-js-sdk/src/client"; import { logger } from "matrix-js-sdk/src/logger"; import { M_POLL_END, M_POLL_START } from "matrix-js-sdk/src/@types/polls"; diff --git a/src/utils/MediaEventHelper.ts b/src/utils/MediaEventHelper.ts index f9461b6490..ea14b175ae 100644 --- a/src/utils/MediaEventHelper.ts +++ b/src/utils/MediaEventHelper.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 { EventType, MsgType } from "matrix-js-sdk/src/@types/event"; +import { MatrixEvent, EventType, MsgType } from "matrix-js-sdk/src/matrix"; import { logger } from "matrix-js-sdk/src/logger"; import { LazyValue } from "./LazyValue"; diff --git a/src/utils/MultiInviter.ts b/src/utils/MultiInviter.ts index 0066da81f3..5e1784fda8 100644 --- a/src/utils/MultiInviter.ts +++ b/src/utils/MultiInviter.ts @@ -18,8 +18,7 @@ import { MatrixError } from "matrix-js-sdk/src/http-api"; import { defer, IDeferred } from "matrix-js-sdk/src/utils"; import { logger } from "matrix-js-sdk/src/logger"; import { MatrixClient } from "matrix-js-sdk/src/client"; -import { EventType } from "matrix-js-sdk/src/@types/event"; -import { HistoryVisibility } from "matrix-js-sdk/src/@types/partials"; +import { EventType, HistoryVisibility } from "matrix-js-sdk/src/matrix"; import { AddressType, getAddressType } from "../UserAddress"; import { _t } from "../languageHandler"; diff --git a/src/utils/PinningUtils.ts b/src/utils/PinningUtils.ts index 3e0fda9019..d6baf40013 100644 --- a/src/utils/PinningUtils.ts +++ b/src/utils/PinningUtils.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 { EventType } from "matrix-js-sdk/src/@types/event"; +import { MatrixEvent, EventType } from "matrix-js-sdk/src/matrix"; import { M_POLL_START } from "matrix-js-sdk/src/@types/polls"; export default class PinningUtils { diff --git a/src/utils/Reply.ts b/src/utils/Reply.ts index 37d215a6e0..4125d838e0 100644 --- a/src/utils/Reply.ts +++ b/src/utils/Reply.ts @@ -15,11 +15,10 @@ * limitations under the License. */ -import { IContent, IEventRelation, MatrixEvent } from "matrix-js-sdk/src/matrix"; +import { IContent, IEventRelation, MatrixEvent, MsgType } from "matrix-js-sdk/src/matrix"; import sanitizeHtml from "sanitize-html"; import escapeHtml from "escape-html"; import { THREAD_RELATION_TYPE } from "matrix-js-sdk/src/models/thread"; -import { MsgType } from "matrix-js-sdk/src/@types/event"; 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"; diff --git a/src/utils/RoomUpgrade.ts b/src/utils/RoomUpgrade.ts index 97472acffd..949b7dcff1 100644 --- a/src/utils/RoomUpgrade.ts +++ b/src/utils/RoomUpgrade.ts @@ -14,8 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { Room } from "matrix-js-sdk/src/matrix"; -import { EventType } from "matrix-js-sdk/src/@types/event"; +import { Room, EventType } from "matrix-js-sdk/src/matrix"; import { logger } from "matrix-js-sdk/src/logger"; import { ClientEvent, MatrixClient } from "matrix-js-sdk/src/client"; diff --git a/src/utils/exportUtils/HtmlExport.tsx b/src/utils/exportUtils/HtmlExport.tsx index ec86e223b8..8f1c701b56 100644 --- a/src/utils/exportUtils/HtmlExport.tsx +++ b/src/utils/exportUtils/HtmlExport.tsx @@ -16,9 +16,8 @@ limitations under the License. import React from "react"; import ReactDOM from "react-dom"; -import { Room, MatrixEvent } from "matrix-js-sdk/src/matrix"; +import { Room, MatrixEvent, EventType, MsgType } from "matrix-js-sdk/src/matrix"; import { renderToStaticMarkup } from "react-dom/server"; -import { EventType, MsgType } from "matrix-js-sdk/src/@types/event"; import { logger } from "matrix-js-sdk/src/logger"; import escapeHtml from "escape-html"; diff --git a/src/utils/exportUtils/JSONExport.ts b/src/utils/exportUtils/JSONExport.ts index 225902e3c3..f3289800a2 100644 --- a/src/utils/exportUtils/JSONExport.ts +++ b/src/utils/exportUtils/JSONExport.ts @@ -14,8 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { Room, IEvent, MatrixEvent } from "matrix-js-sdk/src/matrix"; -import { EventType } from "matrix-js-sdk/src/@types/event"; +import { Room, IEvent, MatrixEvent, EventType } from "matrix-js-sdk/src/matrix"; import { logger } from "matrix-js-sdk/src/logger"; import Exporter from "./Exporter"; diff --git a/src/utils/notifications.ts b/src/utils/notifications.ts index d9415151cb..bb0fb18853 100644 --- a/src/utils/notifications.ts +++ b/src/utils/notifications.ts @@ -15,10 +15,9 @@ limitations under the License. */ import { MatrixClient } from "matrix-js-sdk/src/client"; -import { LOCAL_NOTIFICATION_SETTINGS_PREFIX } from "matrix-js-sdk/src/@types/event"; +import { LOCAL_NOTIFICATION_SETTINGS_PREFIX, NotificationCountType, Room } 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 { NotificationCountType, Room } from "matrix-js-sdk/src/matrix"; import SettingsStore from "../settings/SettingsStore"; diff --git a/src/utils/permalinks/Permalinks.ts b/src/utils/permalinks/Permalinks.ts index c5b1884f35..6f2219e772 100644 --- a/src/utils/permalinks/Permalinks.ts +++ b/src/utils/permalinks/Permalinks.ts @@ -16,9 +16,8 @@ limitations under the License. import isIp from "is-ip"; import * as utils from "matrix-js-sdk/src/utils"; -import { Room, MatrixClient, RoomStateEvent } from "matrix-js-sdk/src/matrix"; +import { Room, MatrixClient, RoomStateEvent, EventType } from "matrix-js-sdk/src/matrix"; import { logger } from "matrix-js-sdk/src/logger"; -import { EventType } from "matrix-js-sdk/src/@types/event"; import MatrixToPermalinkConstructor, { baseUrl as matrixtoBaseUrl, diff --git a/src/utils/space.tsx b/src/utils/space.tsx index 8d0793d819..541b4e282a 100644 --- a/src/utils/space.tsx +++ b/src/utils/space.tsx @@ -15,9 +15,7 @@ limitations under the License. */ import React from "react"; -import { Room, ICreateRoomStateEvent } from "matrix-js-sdk/src/matrix"; -import { RoomType, EventType } from "matrix-js-sdk/src/@types/event"; -import { JoinRule } from "matrix-js-sdk/src/@types/partials"; +import { Room, ICreateRoomStateEvent, RoomType, EventType, JoinRule } from "matrix-js-sdk/src/matrix"; import { calculateRoomVia } from "./permalinks/Permalinks"; import Modal from "../Modal"; diff --git a/src/widgets/CapabilityText.tsx b/src/widgets/CapabilityText.tsx index bbb0ebfb96..1d302f6c47 100644 --- a/src/widgets/CapabilityText.tsx +++ b/src/widgets/CapabilityText.tsx @@ -26,7 +26,7 @@ import { WidgetEventCapability, WidgetKind, } from "matrix-widget-api"; -import { EventType, MsgType } from "matrix-js-sdk/src/@types/event"; +import { EventType, MsgType } from "matrix-js-sdk/src/matrix"; import React from "react"; import { _t, _td, TranslatedString } from "../languageHandler"; diff --git a/test/components/structures/LegacyCallEventGrouper-test.ts b/test/components/structures/LegacyCallEventGrouper-test.ts index 294bfd42f9..ce6675c3bf 100644 --- a/test/components/structures/LegacyCallEventGrouper-test.ts +++ b/test/components/structures/LegacyCallEventGrouper-test.ts @@ -14,8 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { MatrixClient, MatrixEvent } from "matrix-js-sdk/src/matrix"; -import { EventType } from "matrix-js-sdk/src/@types/event"; +import { MatrixClient, MatrixEvent, EventType } from "matrix-js-sdk/src/matrix"; import { CallState } from "matrix-js-sdk/src/webrtc/call"; import { stubClient } from "../../test-utils"; diff --git a/test/components/structures/RoomSearchView-test.tsx b/test/components/structures/RoomSearchView-test.tsx index b9d98a34ab..94713b6852 100644 --- a/test/components/structures/RoomSearchView-test.tsx +++ b/test/components/structures/RoomSearchView-test.tsx @@ -17,11 +17,10 @@ limitations under the License. import React from "react"; import { mocked } from "jest-mock"; import { render, screen } from "@testing-library/react"; -import { Room, MatrixClient, IEvent, MatrixEvent } from "matrix-js-sdk/src/matrix"; +import { Room, MatrixClient, IEvent, MatrixEvent, EventType } from "matrix-js-sdk/src/matrix"; import { ISearchResults } from "matrix-js-sdk/src/@types/search"; import { defer } from "matrix-js-sdk/src/utils"; import { SearchResult } from "matrix-js-sdk/src/models/search-result"; -import { EventType } from "matrix-js-sdk/src/@types/event"; import { RoomSearchView } from "../../../src/components/structures/RoomSearchView"; import { SearchScope } from "../../../src/components/views/rooms/SearchBar"; diff --git a/test/components/structures/ThreadView-test.tsx b/test/components/structures/ThreadView-test.tsx index bbeb7c1903..86b25d8dce 100644 --- a/test/components/structures/ThreadView-test.tsx +++ b/test/components/structures/ThreadView-test.tsx @@ -17,9 +17,8 @@ limitations under the License. import { act, getByTestId, render, RenderResult, waitFor } from "@testing-library/react"; import userEvent from "@testing-library/user-event"; import { mocked } from "jest-mock"; -import { MsgType, RelationType } from "matrix-js-sdk/src/@types/event"; +import { MsgType, RelationType, EventStatus, MatrixEvent, Room } from "matrix-js-sdk/src/matrix"; import { MatrixClient, PendingEventOrdering } from "matrix-js-sdk/src/client"; -import { EventStatus, MatrixEvent, Room } from "matrix-js-sdk/src/matrix"; import { THREAD_RELATION_TYPE } from "matrix-js-sdk/src/models/thread"; import React, { useState } from "react"; diff --git a/test/components/views/dialogs/InviteDialog-test.tsx b/test/components/views/dialogs/InviteDialog-test.tsx index ab17540cff..4ca4fd8269 100644 --- a/test/components/views/dialogs/InviteDialog-test.tsx +++ b/test/components/views/dialogs/InviteDialog-test.tsx @@ -17,8 +17,7 @@ limitations under the License. import React from "react"; import { fireEvent, render, screen } from "@testing-library/react"; import userEvent from "@testing-library/user-event"; -import { RoomType } from "matrix-js-sdk/src/@types/event"; -import { MatrixClient, MatrixError, Room } from "matrix-js-sdk/src/matrix"; +import { RoomType, MatrixClient, MatrixError, Room } from "matrix-js-sdk/src/matrix"; import { sleep } from "matrix-js-sdk/src/utils"; import { mocked, Mocked } from "jest-mock"; diff --git a/test/components/views/right_panel/PinnedMessagesCard-test.tsx b/test/components/views/right_panel/PinnedMessagesCard-test.tsx index c7dfa6949c..ea45312ac1 100644 --- a/test/components/views/right_panel/PinnedMessagesCard-test.tsx +++ b/test/components/views/right_panel/PinnedMessagesCard-test.tsx @@ -17,8 +17,17 @@ limitations under the License. import React from "react"; import { render, act, RenderResult, fireEvent, waitForElementToBeRemoved, screen } from "@testing-library/react"; import { mocked } from "jest-mock"; -import { MatrixEvent, RoomStateEvent, IEvent, Room, EventTimelineSet, IMinimalEvent } from "matrix-js-sdk/src/matrix"; -import { EventType, RelationType, MsgType } from "matrix-js-sdk/src/@types/event"; +import { + MatrixEvent, + RoomStateEvent, + IEvent, + Room, + EventTimelineSet, + IMinimalEvent, + EventType, + RelationType, + MsgType, +} 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"; diff --git a/test/components/views/rooms/EventTile-test.tsx b/test/components/views/rooms/EventTile-test.tsx index 115f41ca10..a087f7515a 100644 --- a/test/components/views/rooms/EventTile-test.tsx +++ b/test/components/views/rooms/EventTile-test.tsx @@ -17,9 +17,8 @@ limitations under the License. import * as React from "react"; import { render, waitFor, screen, act, fireEvent } from "@testing-library/react"; import { mocked } from "jest-mock"; -import { EventType } from "matrix-js-sdk/src/@types/event"; +import { EventType, CryptoApi, TweakName, NotificationCountType, Room, MatrixEvent } from "matrix-js-sdk/src/matrix"; import { MatrixClient, PendingEventOrdering } from "matrix-js-sdk/src/client"; -import { CryptoApi, TweakName, NotificationCountType, Room, MatrixEvent } from "matrix-js-sdk/src/matrix"; import { DeviceTrustLevel, UserTrustLevel } from "matrix-js-sdk/src/crypto/CrossSigning"; import { DeviceInfo } from "matrix-js-sdk/src/crypto/deviceinfo"; import { IEncryptedEventInfo } from "matrix-js-sdk/src/crypto/api"; diff --git a/test/components/views/rooms/LegacyRoomHeader-test.tsx b/test/components/views/rooms/LegacyRoomHeader-test.tsx index db7fa01427..e3338f00be 100644 --- a/test/components/views/rooms/LegacyRoomHeader-test.tsx +++ b/test/components/views/rooms/LegacyRoomHeader-test.tsx @@ -17,8 +17,7 @@ limitations under the License. import React from "react"; import { render, screen, act, fireEvent, waitFor, getByRole, RenderResult } from "@testing-library/react"; import { mocked, Mocked } from "jest-mock"; -import { EventType, RoomType } from "matrix-js-sdk/src/@types/event"; -import { Room, RoomStateEvent } from "matrix-js-sdk/src/matrix"; +import { EventType, RoomType, Room, RoomStateEvent } from "matrix-js-sdk/src/matrix"; import { PendingEventOrdering } from "matrix-js-sdk/src/client"; import { CallType } from "matrix-js-sdk/src/webrtc/call"; import { ClientWidgetApi, Widget } from "matrix-widget-api"; diff --git a/test/components/views/rooms/RoomListHeader-test.tsx b/test/components/views/rooms/RoomListHeader-test.tsx index 0ca2dafd7c..53b994a9a0 100644 --- a/test/components/views/rooms/RoomListHeader-test.tsx +++ b/test/components/views/rooms/RoomListHeader-test.tsx @@ -16,8 +16,7 @@ limitations under the License. import React from "react"; import { MatrixClient } from "matrix-js-sdk/src/client"; -import { Room } from "matrix-js-sdk/src/matrix"; -import { EventType } from "matrix-js-sdk/src/@types/event"; +import { Room, EventType } from "matrix-js-sdk/src/matrix"; import { mocked } from "jest-mock"; import { act, render, screen, fireEvent, RenderResult } from "@testing-library/react"; diff --git a/test/components/views/rooms/RoomPreviewCard-test.tsx b/test/components/views/rooms/RoomPreviewCard-test.tsx index b492855191..1aeca307dd 100644 --- a/test/components/views/rooms/RoomPreviewCard-test.tsx +++ b/test/components/views/rooms/RoomPreviewCard-test.tsx @@ -18,8 +18,7 @@ import React from "react"; import { mocked, Mocked } from "jest-mock"; import { render, screen, act } from "@testing-library/react"; import { PendingEventOrdering } from "matrix-js-sdk/src/client"; -import { Room, RoomStateEvent } from "matrix-js-sdk/src/matrix"; -import { RoomType } from "matrix-js-sdk/src/@types/event"; +import { Room, RoomStateEvent, RoomType } from "matrix-js-sdk/src/matrix"; import type { MatrixClient } from "matrix-js-sdk/src/client"; import type { RoomMember } from "matrix-js-sdk/src/matrix"; diff --git a/test/components/views/rooms/SearchResultTile-test.tsx b/test/components/views/rooms/SearchResultTile-test.tsx index b856a3f0e9..381cb87210 100644 --- a/test/components/views/rooms/SearchResultTile-test.tsx +++ b/test/components/views/rooms/SearchResultTile-test.tsx @@ -15,8 +15,7 @@ limitations under the License. */ import * as React from "react"; -import { MatrixEvent, Room } from "matrix-js-sdk/src/matrix"; -import { EventType } from "matrix-js-sdk/src/@types/event"; +import { MatrixEvent, Room, EventType } from "matrix-js-sdk/src/matrix"; import { render, type RenderResult } from "@testing-library/react"; import { stubClient } from "../../../test-utils"; diff --git a/test/components/views/settings/devices/DeviceDetails-test.tsx b/test/components/views/settings/devices/DeviceDetails-test.tsx index 49173ffb5f..a3c359cdf5 100644 --- a/test/components/views/settings/devices/DeviceDetails-test.tsx +++ b/test/components/views/settings/devices/DeviceDetails-test.tsx @@ -16,7 +16,7 @@ limitations under the License. import React, { ComponentProps } from "react"; import { fireEvent, render } from "@testing-library/react"; -import { PUSHER_ENABLED } from "matrix-js-sdk/src/@types/event"; +import { PUSHER_ENABLED } from "matrix-js-sdk/src/matrix"; import DeviceDetails from "../../../../../src/components/views/settings/devices/DeviceDetails"; import { mkPusher } from "../../../../test-utils/test-utils"; diff --git a/test/components/views/settings/tabs/room/RolesRoomSettingsTab-test.tsx b/test/components/views/settings/tabs/room/RolesRoomSettingsTab-test.tsx index ddc374818c..8ab253ab65 100644 --- a/test/components/views/settings/tabs/room/RolesRoomSettingsTab-test.tsx +++ b/test/components/views/settings/tabs/room/RolesRoomSettingsTab-test.tsx @@ -17,8 +17,7 @@ limitations under the License. import React from "react"; import { fireEvent, render, RenderResult, screen } from "@testing-library/react"; import { MatrixClient } from "matrix-js-sdk/src/client"; -import { EventType } from "matrix-js-sdk/src/@types/event"; -import { MatrixEvent, Room, RoomMember } from "matrix-js-sdk/src/matrix"; +import { EventType, MatrixEvent, Room, RoomMember } from "matrix-js-sdk/src/matrix"; import { mocked } from "jest-mock"; import RolesRoomSettingsTab from "../../../../../../src/components/views/settings/tabs/room/RolesRoomSettingsTab"; diff --git a/test/components/views/settings/tabs/room/VoipRoomSettingsTab-test.tsx b/test/components/views/settings/tabs/room/VoipRoomSettingsTab-test.tsx index 4a637ac6f0..2912a47e36 100644 --- a/test/components/views/settings/tabs/room/VoipRoomSettingsTab-test.tsx +++ b/test/components/views/settings/tabs/room/VoipRoomSettingsTab-test.tsx @@ -17,9 +17,7 @@ limitations under the License. import React from "react"; import { fireEvent, render, RenderResult, waitFor } from "@testing-library/react"; import { MatrixClient } from "matrix-js-sdk/src/client"; -import { Room, MatrixEvent } from "matrix-js-sdk/src/matrix"; -import { EventType } from "matrix-js-sdk/src/@types/event"; -import { JoinRule } from "matrix-js-sdk/src/@types/partials"; +import { Room, MatrixEvent, EventType, JoinRule } from "matrix-js-sdk/src/matrix"; import { mkStubRoom, stubClient } from "../../../../../test-utils"; import { MatrixClientPeg } from "../../../../../../src/MatrixClientPeg"; diff --git a/test/components/views/spaces/SpaceSettingsVisibilityTab-test.tsx b/test/components/views/spaces/SpaceSettingsVisibilityTab-test.tsx index 9f5a66c84d..ef08e9ca48 100644 --- a/test/components/views/spaces/SpaceSettingsVisibilityTab-test.tsx +++ b/test/components/views/spaces/SpaceSettingsVisibilityTab-test.tsx @@ -18,8 +18,7 @@ import React from "react"; import { mocked } from "jest-mock"; import { randomString } from "matrix-js-sdk/src/randomstring"; import { act, fireEvent, render, RenderResult } from "@testing-library/react"; -import { EventType, MatrixClient, Room } from "matrix-js-sdk/src/matrix"; -import { GuestAccess, HistoryVisibility, JoinRule } from "matrix-js-sdk/src/@types/partials"; +import { EventType, MatrixClient, Room, GuestAccess, HistoryVisibility, JoinRule } from "matrix-js-sdk/src/matrix"; import _SpaceSettingsVisibilityTab from "../../../../src/components/views/spaces/SpaceSettingsVisibilityTab"; import { diff --git a/test/createRoom-test.ts b/test/createRoom-test.ts index 7bd4498811..0cdc5dd7f9 100644 --- a/test/createRoom-test.ts +++ b/test/createRoom-test.ts @@ -15,8 +15,7 @@ limitations under the License. */ import { mocked, Mocked } from "jest-mock"; -import { CryptoApi, MatrixClient, Device, Preset } from "matrix-js-sdk/src/matrix"; -import { RoomType } from "matrix-js-sdk/src/@types/event"; +import { CryptoApi, MatrixClient, Device, Preset, RoomType } from "matrix-js-sdk/src/matrix"; import { stubClient, setupAsyncStoreWithClient, mockPlatformPeg, getMockClientWithEventEmitter } from "./test-utils"; import { MatrixClientPeg } from "../src/MatrixClientPeg"; diff --git a/test/models/Call-test.ts b/test/models/Call-test.ts index be80fd1b0e..0ee74088b6 100644 --- a/test/models/Call-test.ts +++ b/test/models/Call-test.ts @@ -17,9 +17,8 @@ limitations under the License. import EventEmitter from "events"; import { mocked } from "jest-mock"; import { waitFor } from "@testing-library/react"; -import { RoomType } from "matrix-js-sdk/src/@types/event"; +import { RoomType, Room, RoomEvent, MatrixEvent, RoomStateEvent } from "matrix-js-sdk/src/matrix"; import { PendingEventOrdering } from "matrix-js-sdk/src/client"; -import { Room, RoomEvent, MatrixEvent, RoomStateEvent } from "matrix-js-sdk/src/matrix"; import { Widget } from "matrix-widget-api"; import { GroupCallIntent } from "matrix-js-sdk/src/webrtc/groupCall"; diff --git a/test/stores/SpaceStore-test.ts b/test/stores/SpaceStore-test.ts index 62ca2c2352..166040a021 100644 --- a/test/stores/SpaceStore-test.ts +++ b/test/stores/SpaceStore-test.ts @@ -16,8 +16,15 @@ limitations under the License. import { EventEmitter } from "events"; import { mocked } from "jest-mock"; -import { EventType } from "matrix-js-sdk/src/@types/event"; -import { RoomMember, RoomStateEvent, ClientEvent, MatrixEvent, Room, RoomEvent } from "matrix-js-sdk/src/matrix"; +import { + EventType, + RoomMember, + RoomStateEvent, + ClientEvent, + MatrixEvent, + Room, + RoomEvent, +} from "matrix-js-sdk/src/matrix"; import { defer } from "matrix-js-sdk/src/utils"; import SpaceStore from "../../src/stores/spaces/SpaceStore"; diff --git a/test/test-utils/events.ts b/test/test-utils/events.ts index 28189ffd8d..e27d24b373 100644 --- a/test/test-utils/events.ts +++ b/test/test-utils/events.ts @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { MsgType } from "matrix-js-sdk/src/@types/event"; +import { MsgType } from "matrix-js-sdk/src/matrix"; interface MessageContent { msgtype: MsgType; diff --git a/test/test-utils/test-utils.ts b/test/test-utils/test-utils.ts index 285929d8d6..788407fb9d 100644 --- a/test/test-utils/test-utils.ts +++ b/test/test-utils/test-utils.ts @@ -35,8 +35,8 @@ import { ConditionKind, IPushRules, RelationType, + JoinRule, } from "matrix-js-sdk/src/matrix"; -import { JoinRule } from "matrix-js-sdk/src/@types/partials"; 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";