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

src/components/structures/FilePanel.tsx

@@ -16,8 +16,8 @@ limitations under the License.
 */
 
 import React, { createRef } from "react";
-import { Filter } from "matrix-js-sdk/src/filter";
 import {
+    Filter,
     EventTimelineSet,
     IRoomTimelineData,
     Direction,

src/components/structures/LoggedInView.tsx

@@ -22,10 +22,11 @@ import {
     RoomStateEvent,
     MatrixError,
     IUsageLimit,
+    SyncStateData,
+    SyncState,
 } 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 { isOnlyCtrlOrCmdKeyEvent, Key } from "../../Keyboard";
 import PageTypes from "../../PageTypes";
@@ -109,7 +110,7 @@ interface IProps {
 }
 
 interface IState {
-    syncErrorData?: ISyncStateData;
+    syncErrorData?: SyncStateData;
     usageLimitDismissed: boolean;
     usageLimitEventContent?: IUsageLimit;
     usageLimitEventTs?: number;
@@ -294,7 +295,7 @@ class LoggedInView extends React.Component<IProps, IState> {
         });
     };
 
-    private onSync = (syncState: SyncState | null, oldSyncState: SyncState | null, data?: ISyncStateData): void => {
+    private onSync = (syncState: SyncState | null, oldSyncState: SyncState | null, data?: SyncStateData): void => {
         const oldErrCode = (this.state.syncErrorData?.error as MatrixError)?.errcode;
         const newErrCode = (data?.error as MatrixError)?.errcode;
         if (syncState === oldSyncState && oldErrCode === newErrCode) return;

src/components/structures/MatrixChat.tsx

@@ -24,8 +24,9 @@ import {
     MatrixEventEvent,
     MatrixEvent,
     RoomType,
+    SyncStateData,
+    SyncState,
 } from "matrix-js-sdk/src/matrix";
-import { ISyncStateData, SyncState } from "matrix-js-sdk/src/sync";
 import { InvalidStoreError } from "matrix-js-sdk/src/errors";
 import { defer, IDeferred, QueryDict } from "matrix-js-sdk/src/utils";
 import { logger } from "matrix-js-sdk/src/logger";
@@ -1502,7 +1503,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
             return this.loggedInView.current.canResetTimelineInRoom(roomId);
         });
 
-        cli.on(ClientEvent.Sync, (state: SyncState, prevState: SyncState | null, data?: ISyncStateData) => {
+        cli.on(ClientEvent.Sync, (state: SyncState, prevState: SyncState | null, data?: SyncStateData) => {
             if (state === SyncState.Error || state === SyncState.Reconnecting) {
                 if (data?.error instanceof InvalidStoreError) {
                     Lifecycle.handleInvalidStoreError(data.error);

src/components/structures/RoomSearchView.tsx

@@ -15,8 +15,7 @@ limitations under the License.
 */
 
 import React, { forwardRef, useCallback, useContext, useEffect, useRef, useState } from "react";
-import { ISearchResults } from "matrix-js-sdk/src/@types/search";
-import { IThreadBundledRelationship, MatrixEvent } from "matrix-js-sdk/src/matrix";
+import { ISearchResults, IThreadBundledRelationship, MatrixEvent } from "matrix-js-sdk/src/matrix";
 import { THREAD_RELATION_TYPE } from "matrix-js-sdk/src/models/thread";
 import { logger } from "matrix-js-sdk/src/logger";
 

src/components/structures/RoomStatusBar.tsx

@@ -15,8 +15,7 @@ limitations under the License.
 */
 
 import React, { ReactNode } from "react";
-import { EventStatus, MatrixEvent, Room, MatrixError } from "matrix-js-sdk/src/matrix";
-import { SyncState, ISyncStateData } from "matrix-js-sdk/src/sync";
+import { EventStatus, MatrixEvent, Room, MatrixError, SyncState, SyncStateData } from "matrix-js-sdk/src/matrix";
 
 import { Icon as WarningIcon } from "../../../res/img/feather-customised/warning-triangle.svg";
 import { _t, _td } from "../../languageHandler";
@@ -81,7 +80,7 @@ interface IProps {
 
 interface IState {
     syncState: SyncState;
-    syncStateData: ISyncStateData;
+    syncStateData: SyncStateData;
     unsentMessages: MatrixEvent[];
     isResending: boolean;
 }
@@ -123,7 +122,7 @@ export default class RoomStatusBar extends React.PureComponent<IProps, IState> {
         }
     }
 
-    private onSyncStateChange = (state: SyncState, prevState: SyncState, data: ISyncStateData): void => {
+    private onSyncStateChange = (state: SyncState, prevState: SyncState, data: SyncStateData): void => {
         if (state === "SYNCING" && prevState === "SYNCING") {
             return;
         }

src/components/structures/RoomView.tsx

@@ -35,13 +35,13 @@ import {
     JoinRule,
     ClientEvent,
     MatrixError,
+    ISearchResults,
 } 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 { 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";
 
 import shouldHideEvent from "../../shouldHideEvent";
 import { _t } from "../../languageHandler";

src/components/structures/TimelinePanel.tsx

@@ -33,9 +33,9 @@ import {
     MatrixClient,
     Relations,
     MatrixError,
+    SyncState,
 } from "matrix-js-sdk/src/matrix";
 import { TimelineWindow } from "matrix-js-sdk/src/timeline-window";
-import { SyncState } from "matrix-js-sdk/src/sync";
 import { debounce, findLastIndex, throttle } from "lodash";
 import { logger } from "matrix-js-sdk/src/logger";
 import { Thread, ThreadEvent } from "matrix-js-sdk/src/models/thread";

src/components/views/dialogs/TermsDialog.tsx

@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 import React from "react";
-import { SERVICE_TYPES } from "matrix-js-sdk/src/service-types";
+import { SERVICE_TYPES } from "matrix-js-sdk/src/matrix";
 
 import { _t, pickBestLanguage } from "../../../languageHandler";
 import DialogButtons from "../elements/DialogButtons";

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

@@ -16,8 +16,15 @@ limitations under the License.
 
 import { useCallback, useEffect, useState } from "react";
 import { M_POLL_START } from "matrix-js-sdk/src/@types/polls";
-import { MatrixClient, Direction, EventTimeline, EventTimelineSet, Room } from "matrix-js-sdk/src/matrix";
-import { Filter, IFilterDefinition } from "matrix-js-sdk/src/filter";
+import {
+    MatrixClient,
+    Direction,
+    EventTimeline,
+    EventTimelineSet,
+    Room,
+    Filter,
+    IFilterDefinition,
+} from "matrix-js-sdk/src/matrix";
 import { logger } from "matrix-js-sdk/src/logger";
 
 const getOldestEventTimestamp = (timelineSet?: EventTimelineSet): number | undefined => {

src/components/views/rooms/LegacyRoomHeader.tsx

@@ -18,9 +18,8 @@ limitations under the License.
 import React, { FC, useState, useMemo, useCallback } from "react";
 import classNames from "classnames";
 import { throttle } from "lodash";
-import { RoomStateEvent } from "matrix-js-sdk/src/matrix";
+import { RoomStateEvent, ISearchResults } from "matrix-js-sdk/src/matrix";
 import { CallType } from "matrix-js-sdk/src/webrtc/call";
-import { ISearchResults } from "matrix-js-sdk/src/@types/search";
 
 import type { MatrixEvent, Room } from "matrix-js-sdk/src/matrix";
 import { _t } from "../../../languageHandler";

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

@@ -17,10 +17,9 @@ limitations under the License.
 */
 
 import React, { ReactNode } from "react";
-import { SERVICE_TYPES } from "matrix-js-sdk/src/service-types";
+import { SERVICE_TYPES, IDelegatedAuthConfig, M_AUTHENTICATION, HTTPError } 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 { IDelegatedAuthConfig, M_AUTHENTICATION, HTTPError } from "matrix-js-sdk/src/matrix";
 
 import { Icon as WarningIcon } from "../../../../../../res/img/feather-customised/warning-triangle.svg";
 import { UserFriendlyError, _t } from "../../../../../languageHandler";

src/components/views/voip/CallDuration.tsx

@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 import React, { FC, useState, useEffect, memo } from "react";
-import { GroupCall } from "matrix-js-sdk/src/webrtc/groupCall";
+import { GroupCall } from "matrix-js-sdk/src/matrix";
 
 import { formatPreciseDuration } from "../../../DateUtils";