Switch to importing more things from the main js-sdk export (#11376)

src/components/structures/RoomView.tsx

@@ -34,11 +34,11 @@ import {
     HistoryVisibility,
     JoinRule,
     ClientEvent,
+    MatrixError,
 } from "matrix-js-sdk/src/matrix";
 import { logger } from "matrix-js-sdk/src/logger";
 import { CallState, MatrixCall } from "matrix-js-sdk/src/webrtc/call";
 import { throttle } from "lodash";
-import { MatrixError } from "matrix-js-sdk/src/http-api";
 import { CryptoEvent } from "matrix-js-sdk/src/crypto";
 import { THREAD_RELATION_TYPE } from "matrix-js-sdk/src/models/thread";
 import { ISearchResults } from "matrix-js-sdk/src/@types/search";

src/components/structures/TimelinePanel.tsx

@@ -31,6 +31,8 @@ import {
     RelationType,
     ClientEvent,
     MatrixClient,
+    Relations,
+    MatrixError,
 } from "matrix-js-sdk/src/matrix";
 import { TimelineWindow } from "matrix-js-sdk/src/timeline-window";
 import { SyncState } from "matrix-js-sdk/src/sync";
@@ -38,8 +40,6 @@ import { debounce, findLastIndex, throttle } from "lodash";
 import { logger } from "matrix-js-sdk/src/logger";
 import { Thread, ThreadEvent } from "matrix-js-sdk/src/models/thread";
 import { ReceiptType } from "matrix-js-sdk/src/@types/read_receipts";
-import { MatrixError } from "matrix-js-sdk/src/http-api";
-import { Relations } from "matrix-js-sdk/src/models/relations";
 
 import SettingsStore from "../../settings/SettingsStore";
 import { Layout } from "../../settings/enums/Layout";

src/components/structures/auth/SoftLogout.tsx

@@ -18,7 +18,7 @@ import React, { ChangeEvent, SyntheticEvent } from "react";
 import { logger } from "matrix-js-sdk/src/logger";
 import { Optional } from "matrix-events-sdk";
 import { ISSOFlow, LoginFlow, SSOAction } from "matrix-js-sdk/src/@types/auth";
-import { MatrixError } from "matrix-js-sdk/src/http-api";
+import { MatrixError } from "matrix-js-sdk/src/matrix";
 
 import { _t } from "../../../languageHandler";
 import dis from "../../../dispatcher/dispatcher";

src/components/views/context_menus/MessageContextMenu.tsx

@@ -24,8 +24,8 @@ import {
     RoomMemberEvent,
     EventType,
     RelationType,
+    Relations,
 } 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";
 

src/components/views/dialogs/MessageEditHistoryDialog.tsx

@@ -15,10 +15,9 @@ limitations under the License.
 */
 
 import React from "react";
-import { MatrixEvent, EventType, RelationType, MatrixClient } from "matrix-js-sdk/src/matrix";
+import { MatrixEvent, EventType, RelationType, MatrixClient, MatrixError } from "matrix-js-sdk/src/matrix";
 import { defer } from "matrix-js-sdk/src/utils";
 import { logger } from "matrix-js-sdk/src/logger";
-import { MatrixError } from "matrix-js-sdk/src/http-api";
 
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import { _t } from "../../../languageHandler";

src/components/views/emojipicker/ReactionPicker.tsx

@@ -16,8 +16,7 @@ limitations under the License.
 */
 
 import React from "react";
-import { MatrixEvent, EventType, RelationType } from "matrix-js-sdk/src/matrix";
-import { Relations, RelationsEvent } from "matrix-js-sdk/src/models/relations";
+import { MatrixEvent, EventType, RelationType, Relations, RelationsEvent } from "matrix-js-sdk/src/matrix";
 
 import EmojiPicker from "./EmojiPicker";
 import { MatrixClientPeg } from "../../../MatrixClientPeg";

src/components/views/location/shareLocation.ts

@@ -14,8 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { MatrixClient, IContent, IEventRelation } from "matrix-js-sdk/src/matrix";
-import { MatrixError } from "matrix-js-sdk/src/http-api";
+import { MatrixClient, IContent, IEventRelation, MatrixError } from "matrix-js-sdk/src/matrix";
 import { makeLocationContent, makeBeaconInfoContent } from "matrix-js-sdk/src/content-helpers";
 import { logger } from "matrix-js-sdk/src/logger";
 import { LocationAssetType } from "matrix-js-sdk/src/@types/location";

src/components/views/messages/DateSeparator.tsx

@@ -16,9 +16,8 @@ limitations under the License.
 */
 
 import React from "react";
-import { Direction } from "matrix-js-sdk/src/matrix";
+import { Direction, ConnectionError, MatrixError, HTTPError } from "matrix-js-sdk/src/matrix";
 import { logger } from "matrix-js-sdk/src/logger";
-import { ConnectionError, MatrixError, HTTPError } from "matrix-js-sdk/src/http-api";
 
 import { _t } from "../../../languageHandler";
 import { formatFullDateNoDay, formatFullDateNoTime } from "../../../DateUtils";

src/components/views/messages/MPollBody.tsx

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

src/components/views/messages/MessageActionBar.tsx

@@ -30,7 +30,7 @@ import { Icon as TrashcanIcon } from "../../../../res/img/element-icons/trashcan
 import { Icon as ReplyIcon } from "../../../../res/img/element-icons/room/message-bar/reply.svg";
 import { Icon as ExpandMessageIcon } from "../../../../res/img/element-icons/expand-message.svg";
 import { Icon as CollapseMessageIcon } from "../../../../res/img/element-icons/collapse-message.svg";
-import type { Relations } from "matrix-js-sdk/src/models/relations";
+import type { Relations } from "matrix-js-sdk/src/matrix";
 import { _t } from "../../../languageHandler";
 import dis, { defaultDispatcher } from "../../../dispatcher/dispatcher";
 import ContextMenu, { aboveLeftOf, ContextMenuTooltipButton, useContextMenu } from "../../structures/ContextMenu";

src/components/views/messages/ReactionsRow.tsx

@@ -16,8 +16,7 @@ limitations under the License.
 
 import React, { SyntheticEvent } from "react";
 import classNames from "classnames";
-import { MatrixEvent, MatrixEventEvent } from "matrix-js-sdk/src/matrix";
-import { Relations, RelationsEvent } from "matrix-js-sdk/src/models/relations";
+import { MatrixEvent, MatrixEventEvent, Relations, RelationsEvent } from "matrix-js-sdk/src/matrix";
 import { uniqBy } from "lodash";
 
 import { _t } from "../../../languageHandler";

src/components/views/polls/pollHistory/PollListItemEnded.tsx

@@ -16,8 +16,7 @@ limitations under the License.
 
 import React, { useEffect, useState } from "react";
 import { PollAnswerSubevent } from "matrix-js-sdk/src/extensible_events_v1/PollStartEvent";
-import { MatrixEvent, Poll, PollEvent } from "matrix-js-sdk/src/matrix";
-import { Relations } from "matrix-js-sdk/src/models/relations";
+import { MatrixEvent, Poll, PollEvent, Relations } from "matrix-js-sdk/src/matrix";
 
 import { Icon as PollIcon } from "../../../../../res/img/element-icons/room/composer/poll.svg";
 import { _t } from "../../../../languageHandler";

src/components/views/rooms/EventTile.tsx

@@ -28,8 +28,8 @@ import {
     NotificationCountType,
     Room,
     RoomEvent,
+    Relations,
 } from "matrix-js-sdk/src/matrix";
-import { Relations } from "matrix-js-sdk/src/models/relations";
 import { Thread, ThreadEvent } from "matrix-js-sdk/src/models/thread";
 import { logger } from "matrix-js-sdk/src/logger";
 import { CallErrorCode } from "matrix-js-sdk/src/webrtc/call";

src/components/views/rooms/PinnedEventTile.tsx

@@ -16,8 +16,7 @@ limitations under the License.
 */
 
 import React from "react";
-import { MatrixEvent, EventType, RelationType } from "matrix-js-sdk/src/matrix";
-import { Relations } from "matrix-js-sdk/src/models/relations";
+import { MatrixEvent, EventType, RelationType, Relations } from "matrix-js-sdk/src/matrix";
 
 import dis from "../../../dispatcher/dispatcher";
 import { Action } from "../../../dispatcher/actions";

src/components/views/rooms/RoomPreviewBar.tsx

@@ -15,8 +15,15 @@ limitations under the License.
 */
 
 import React, { ChangeEvent, ReactNode } from "react";
-import { Room, RoomMember, EventType, RoomType, IJoinRuleEventContent, JoinRule } from "matrix-js-sdk/src/matrix";
-import { MatrixError } from "matrix-js-sdk/src/http-api";
+import {
+    Room,
+    RoomMember,
+    EventType,
+    RoomType,
+    IJoinRuleEventContent,
+    JoinRule,
+    MatrixError,
+} from "matrix-js-sdk/src/matrix";
 import classNames from "classnames";
 import { RoomPreviewOpts, RoomViewLifecycle } from "@matrix-org/react-sdk-module-api/lib/lifecycles/RoomViewLifecycle";
 

src/components/views/settings/Notifications.tsx

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

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

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

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

@@ -15,8 +15,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/matrix";
+import { IPusher, PUSHER_DEVICE_ID } from "matrix-js-sdk/src/matrix";
 import { LocalNotificationSettings } from "matrix-js-sdk/src/@types/local_notifications";
 
 import { _t } from "../../../../languageHandler";

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

@@ -25,9 +25,9 @@ import {
     PUSHER_DEVICE_ID,
     PUSHER_ENABLED,
     UNSTABLE_MSC3852_LAST_SEEN_UA,
+    MatrixError,
 } from "matrix-js-sdk/src/matrix";
 import { VerificationRequest } from "matrix-js-sdk/src/crypto-api";
-import { MatrixError } from "matrix-js-sdk/src/http-api";
 import { logger } from "matrix-js-sdk/src/logger";
 import { LocalNotificationSettings } from "matrix-js-sdk/src/@types/local_notifications";
 import { CryptoEvent } from "matrix-js-sdk/src/crypto";