From d2c6577024d532c2e7bc61a7350b952dd6f78c1f Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Mon, 14 Aug 2023 09:58:55 +0100 Subject: [PATCH] Switch to importing more things from the main js-sdk export (#11394) --- .eslintrc.js | 20 +++++++++++++++++++ src/ContentMessages.ts | 2 +- src/components/structures/FilePanel.tsx | 2 +- src/components/structures/RoomSearchView.tsx | 8 ++++++-- src/components/structures/RoomView.tsx | 2 +- src/components/structures/ThreadPanel.tsx | 3 +-- src/components/structures/ThreadView.tsx | 11 ++++++++-- src/components/structures/TimelinePanel.tsx | 5 +++-- .../context_menus/MessageContextMenu.tsx | 2 +- .../dialogs/devtools/RoomNotifications.tsx | 3 +-- .../views/location/shareLocation.ts | 3 +-- .../right_panel/LegacyRoomHeaderButtons.tsx | 3 +-- .../views/right_panel/TimelineCard.tsx | 10 ++++++++-- src/components/views/rooms/EventTile.tsx | 3 ++- .../views/rooms/MessageComposer.tsx | 10 ++++++++-- .../views/rooms/MessageComposerButtons.tsx | 3 +-- .../views/rooms/SendMessageComposer.tsx | 2 +- src/components/views/rooms/ThreadSummary.tsx | 3 +-- .../rooms/wysiwyg_composer/utils/event.ts | 3 +-- .../rooms/wysiwyg_composer/utils/message.ts | 10 ++++++++-- src/indexing/EventIndex.ts | 3 ++- src/stores/room-list/MessagePreviewStore.ts | 3 +-- src/stores/widgets/StopGapWidgetDriver.ts | 2 +- src/utils/EventUtils.ts | 2 +- src/utils/Reply.ts | 3 +-- src/utils/StorageManager.ts | 4 +--- src/utils/createMatrixClient.ts | 6 +++--- .../structures/MessagePanel-test.tsx | 3 +-- .../structures/ThreadPanel-test.tsx | 10 ++++++++-- .../components/structures/ThreadView-test.tsx | 2 +- .../structures/TimelinePanel-test.tsx | 4 +--- .../context_menus/MessageContextMenu-test.tsx | 3 ++- .../views/messages/MessageActionBar-test.tsx | 12 +++++++++-- .../views/rooms/MessageComposer-test.tsx | 3 +-- test/components/views/rooms/RoomTile-test.tsx | 10 ++++++++-- test/test-utils/threads.ts | 3 +-- test/utils/EventUtils-test.ts | 2 +- 37 files changed, 120 insertions(+), 63 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index 09941cba7e..f3a6e36493 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -154,6 +154,26 @@ module.exports = { name: "matrix-js-sdk/src/sync", message: "Please use matrix-js-sdk/src/matrix instead", }, + { + name: "matrix-js-sdk/src/timeline-window", + message: "Please use matrix-js-sdk/src/matrix instead", + }, + { + name: "matrix-js-sdk/src/store/indexeddb", + message: "Please use matrix-js-sdk/src/matrix instead", + }, + { + name: "matrix-js-sdk/src/crypto/store/indexeddb-crypto-store", + message: "Please use matrix-js-sdk/src/matrix instead", + }, + { + name: "matrix-js-sdk/src/crypto/store/localStorage-crypto-store", + message: "Please use matrix-js-sdk/src/matrix instead", + }, + { + name: "matrix-js-sdk/src/models/thread", + 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/src/ContentMessages.ts b/src/ContentMessages.ts index 82df5706ac..14208e0d9e 100644 --- a/src/ContentMessages.ts +++ b/src/ContentMessages.ts @@ -26,11 +26,11 @@ import { MatrixEvent, UploadOpts, UploadProgress, + THREAD_RELATION_TYPE, } 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"; import { diff --git a/src/components/structures/FilePanel.tsx b/src/components/structures/FilePanel.tsx index 18e6db0908..c4cec7154a 100644 --- a/src/components/structures/FilePanel.tsx +++ b/src/components/structures/FilePanel.tsx @@ -25,8 +25,8 @@ import { MatrixEventEvent, Room, RoomEvent, + TimelineWindow, } from "matrix-js-sdk/src/matrix"; -import { TimelineWindow } from "matrix-js-sdk/src/timeline-window"; import { logger } from "matrix-js-sdk/src/logger"; import { MatrixClientPeg } from "../../MatrixClientPeg"; diff --git a/src/components/structures/RoomSearchView.tsx b/src/components/structures/RoomSearchView.tsx index ba552260e1..1b3d865194 100644 --- a/src/components/structures/RoomSearchView.tsx +++ b/src/components/structures/RoomSearchView.tsx @@ -15,8 +15,12 @@ limitations under the License. */ import React, { forwardRef, useCallback, useContext, useEffect, useRef, useState } from "react"; -import { ISearchResults, IThreadBundledRelationship, MatrixEvent } from "matrix-js-sdk/src/matrix"; -import { THREAD_RELATION_TYPE } from "matrix-js-sdk/src/models/thread"; +import { + ISearchResults, + IThreadBundledRelationship, + MatrixEvent, + THREAD_RELATION_TYPE, +} from "matrix-js-sdk/src/matrix"; import { logger } from "matrix-js-sdk/src/logger"; import ScrollPanel from "./ScrollPanel"; diff --git a/src/components/structures/RoomView.tsx b/src/components/structures/RoomView.tsx index 26190460a2..fe4d0c957c 100644 --- a/src/components/structures/RoomView.tsx +++ b/src/components/structures/RoomView.tsx @@ -36,12 +36,12 @@ import { ClientEvent, MatrixError, ISearchResults, + THREAD_RELATION_TYPE, } 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 shouldHideEvent from "../../shouldHideEvent"; import { _t } from "../../languageHandler"; diff --git a/src/components/structures/ThreadPanel.tsx b/src/components/structures/ThreadPanel.tsx index 976f0489b5..aacea7cd16 100644 --- a/src/components/structures/ThreadPanel.tsx +++ b/src/components/structures/ThreadPanel.tsx @@ -16,8 +16,7 @@ limitations under the License. import { Optional } from "matrix-events-sdk"; import React, { useContext, useEffect, useRef, useState } from "react"; -import { EventTimelineSet, Room } from "matrix-js-sdk/src/matrix"; -import { Thread } from "matrix-js-sdk/src/models/thread"; +import { EventTimelineSet, Room, Thread } from "matrix-js-sdk/src/matrix"; import BaseCard from "../views/right_panel/BaseCard"; import ResizeNotifier from "../../utils/ResizeNotifier"; diff --git a/src/components/structures/ThreadView.tsx b/src/components/structures/ThreadView.tsx index 8cc58e08c0..811d5bd544 100644 --- a/src/components/structures/ThreadView.tsx +++ b/src/components/structures/ThreadView.tsx @@ -15,8 +15,15 @@ limitations under the License. */ import React, { createRef, KeyboardEvent } from "react"; -import { Thread, THREAD_RELATION_TYPE, ThreadEvent } from "matrix-js-sdk/src/models/thread"; -import { Room, RoomEvent, IEventRelation, MatrixEvent } from "matrix-js-sdk/src/matrix"; +import { + Thread, + THREAD_RELATION_TYPE, + ThreadEvent, + Room, + RoomEvent, + IEventRelation, + MatrixEvent, +} from "matrix-js-sdk/src/matrix"; import { logger } from "matrix-js-sdk/src/logger"; import classNames from "classnames"; diff --git a/src/components/structures/TimelinePanel.tsx b/src/components/structures/TimelinePanel.tsx index be414bb590..8cf3edd223 100644 --- a/src/components/structures/TimelinePanel.tsx +++ b/src/components/structures/TimelinePanel.tsx @@ -34,11 +34,12 @@ import { Relations, MatrixError, SyncState, + TimelineWindow, + Thread, + ThreadEvent, } from "matrix-js-sdk/src/matrix"; -import { TimelineWindow } from "matrix-js-sdk/src/timeline-window"; 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 SettingsStore from "../../settings/SettingsStore"; diff --git a/src/components/views/context_menus/MessageContextMenu.tsx b/src/components/views/context_menus/MessageContextMenu.tsx index f26861dd68..012119c3c6 100644 --- a/src/components/views/context_menus/MessageContextMenu.tsx +++ b/src/components/views/context_menus/MessageContextMenu.tsx @@ -25,9 +25,9 @@ import { EventType, RelationType, Relations, + Thread, } from "matrix-js-sdk/src/matrix"; import { M_POLL_START } from "matrix-js-sdk/src/@types/polls"; -import { Thread } from "matrix-js-sdk/src/models/thread"; import { MatrixClientPeg } from "../../../MatrixClientPeg"; import dis from "../../../dispatcher/dispatcher"; diff --git a/src/components/views/dialogs/devtools/RoomNotifications.tsx b/src/components/views/dialogs/devtools/RoomNotifications.tsx index 31f33706d9..cbb0f3c0a6 100644 --- a/src/components/views/dialogs/devtools/RoomNotifications.tsx +++ b/src/components/views/dialogs/devtools/RoomNotifications.tsx @@ -14,8 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { NotificationCountType, Room } from "matrix-js-sdk/src/matrix"; -import { Thread } from "matrix-js-sdk/src/models/thread"; +import { NotificationCountType, Room, Thread } from "matrix-js-sdk/src/matrix"; import React, { useContext } from "react"; import { ReceiptType } from "matrix-js-sdk/src/@types/read_receipts"; import { ReadReceipt } from "matrix-js-sdk/src/models/read-receipt"; diff --git a/src/components/views/location/shareLocation.ts b/src/components/views/location/shareLocation.ts index 3ab29b2e52..a0c7b6febc 100644 --- a/src/components/views/location/shareLocation.ts +++ b/src/components/views/location/shareLocation.ts @@ -14,11 +14,10 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { MatrixClient, IContent, IEventRelation, MatrixError } from "matrix-js-sdk/src/matrix"; +import { MatrixClient, IContent, IEventRelation, MatrixError, THREAD_RELATION_TYPE } 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"; -import { THREAD_RELATION_TYPE } from "matrix-js-sdk/src/models/thread"; import { _t } from "../../../languageHandler"; import Modal from "../../../Modal"; diff --git a/src/components/views/right_panel/LegacyRoomHeaderButtons.tsx b/src/components/views/right_panel/LegacyRoomHeaderButtons.tsx index fa9afb1aa0..1256f40068 100644 --- a/src/components/views/right_panel/LegacyRoomHeaderButtons.tsx +++ b/src/components/views/right_panel/LegacyRoomHeaderButtons.tsx @@ -20,8 +20,7 @@ limitations under the License. import React from "react"; import classNames from "classnames"; -import { NotificationCountType, Room, RoomEvent } from "matrix-js-sdk/src/matrix"; -import { ThreadEvent } from "matrix-js-sdk/src/models/thread"; +import { NotificationCountType, Room, RoomEvent, ThreadEvent } from "matrix-js-sdk/src/matrix"; import { _t } from "../../../languageHandler"; import HeaderButton from "./HeaderButton"; diff --git a/src/components/views/right_panel/TimelineCard.tsx b/src/components/views/right_panel/TimelineCard.tsx index 24e97825b8..30a582d065 100644 --- a/src/components/views/right_panel/TimelineCard.tsx +++ b/src/components/views/right_panel/TimelineCard.tsx @@ -15,8 +15,14 @@ limitations under the License. */ import React from "react"; -import { IEventRelation, MatrixEvent, NotificationCountType, Room, EventTimelineSet } from "matrix-js-sdk/src/matrix"; -import { Thread } from "matrix-js-sdk/src/models/thread"; +import { + IEventRelation, + MatrixEvent, + NotificationCountType, + Room, + EventTimelineSet, + Thread, +} from "matrix-js-sdk/src/matrix"; import BaseCard from "./BaseCard"; import ResizeNotifier from "../../../utils/ResizeNotifier"; diff --git a/src/components/views/rooms/EventTile.tsx b/src/components/views/rooms/EventTile.tsx index 11bfe50f73..cab189c3a7 100644 --- a/src/components/views/rooms/EventTile.tsx +++ b/src/components/views/rooms/EventTile.tsx @@ -29,8 +29,9 @@ import { Room, RoomEvent, Relations, + Thread, + ThreadEvent, } from "matrix-js-sdk/src/matrix"; -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"; import { CryptoEvent } from "matrix-js-sdk/src/crypto"; diff --git a/src/components/views/rooms/MessageComposer.tsx b/src/components/views/rooms/MessageComposer.tsx index a13469ef8b..7c7624f6e5 100644 --- a/src/components/views/rooms/MessageComposer.tsx +++ b/src/components/views/rooms/MessageComposer.tsx @@ -16,9 +16,15 @@ limitations under the License. import React, { createRef, ReactNode } from "react"; import classNames from "classnames"; -import { IEventRelation, MatrixEvent, Room, RoomMember, EventType } from "matrix-js-sdk/src/matrix"; +import { + IEventRelation, + MatrixEvent, + Room, + RoomMember, + EventType, + THREAD_RELATION_TYPE, +} from "matrix-js-sdk/src/matrix"; import { Optional } from "matrix-events-sdk"; -import { THREAD_RELATION_TYPE } from "matrix-js-sdk/src/models/thread"; import { _t } from "../../../languageHandler"; import { MatrixClientPeg } from "../../../MatrixClientPeg"; diff --git a/src/components/views/rooms/MessageComposerButtons.tsx b/src/components/views/rooms/MessageComposerButtons.tsx index c88eb45991..ce6cd0727c 100644 --- a/src/components/views/rooms/MessageComposerButtons.tsx +++ b/src/components/views/rooms/MessageComposerButtons.tsx @@ -15,10 +15,9 @@ limitations under the License. */ import classNames from "classnames"; -import { IEventRelation, Room, MatrixClient } from "matrix-js-sdk/src/matrix"; +import { IEventRelation, Room, MatrixClient, THREAD_RELATION_TYPE } from "matrix-js-sdk/src/matrix"; import { M_POLL_START } from "matrix-js-sdk/src/@types/polls"; import React, { createContext, ReactElement, ReactNode, useContext, useRef } from "react"; -import { THREAD_RELATION_TYPE } from "matrix-js-sdk/src/models/thread"; import { _t } from "../../../languageHandler"; import AccessibleTooltipButton from "../elements/AccessibleTooltipButton"; diff --git a/src/components/views/rooms/SendMessageComposer.tsx b/src/components/views/rooms/SendMessageComposer.tsx index 08c22671d6..1c401df30b 100644 --- a/src/components/views/rooms/SendMessageComposer.tsx +++ b/src/components/views/rooms/SendMessageComposer.tsx @@ -25,11 +25,11 @@ import { EventType, MsgType, RelationType, + THREAD_RELATION_TYPE, } from "matrix-js-sdk/src/matrix"; import { DebouncedFunc, throttle } from "lodash"; 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"; import dis from "../../../dispatcher/dispatcher"; import EditorModel from "../../../editor/model"; diff --git a/src/components/views/rooms/ThreadSummary.tsx b/src/components/views/rooms/ThreadSummary.tsx index e589349317..b4cb64aea6 100644 --- a/src/components/views/rooms/ThreadSummary.tsx +++ b/src/components/views/rooms/ThreadSummary.tsx @@ -15,8 +15,7 @@ limitations under the License. */ import React, { useContext, useState } from "react"; -import { Thread, ThreadEvent } from "matrix-js-sdk/src/models/thread"; -import { IContent, MatrixEvent, MatrixEventEvent } from "matrix-js-sdk/src/matrix"; +import { Thread, ThreadEvent, IContent, MatrixEvent, MatrixEventEvent } from "matrix-js-sdk/src/matrix"; import { _t } from "../../../languageHandler"; import { CardContext } from "../right_panel/context"; diff --git a/src/components/views/rooms/wysiwyg_composer/utils/event.ts b/src/components/views/rooms/wysiwyg_composer/utils/event.ts index 2220b7d37a..3683c336ef 100644 --- a/src/components/views/rooms/wysiwyg_composer/utils/event.ts +++ b/src/components/views/rooms/wysiwyg_composer/utils/event.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 { THREAD_RELATION_TYPE } from "matrix-js-sdk/src/models/thread"; +import { MatrixClient, MatrixEvent, THREAD_RELATION_TYPE } from "matrix-js-sdk/src/matrix"; import EditorStateTransfer from "../../../../../utils/EditorStateTransfer"; import { IRoomState } from "../../../../structures/RoomView"; diff --git a/src/components/views/rooms/wysiwyg_composer/utils/message.ts b/src/components/views/rooms/wysiwyg_composer/utils/message.ts index 7e6f066497..35422dc93c 100644 --- a/src/components/views/rooms/wysiwyg_composer/utils/message.ts +++ b/src/components/views/rooms/wysiwyg_composer/utils/message.ts @@ -15,8 +15,14 @@ limitations under the License. */ import { Composer as ComposerEvent } from "@matrix-org/analytics-events/types/typescript/Composer"; -import { IContent, IEventRelation, MatrixEvent, ISendEventResponse, MatrixClient } from "matrix-js-sdk/src/matrix"; -import { THREAD_RELATION_TYPE } from "matrix-js-sdk/src/models/thread"; +import { + IContent, + IEventRelation, + MatrixEvent, + ISendEventResponse, + MatrixClient, + THREAD_RELATION_TYPE, +} from "matrix-js-sdk/src/matrix"; import { PosthogAnalytics } from "../../../../../PosthogAnalytics"; import SettingsStore from "../../../../../settings/SettingsStore"; diff --git a/src/indexing/EventIndex.ts b/src/indexing/EventIndex.ts index 4360ed92e9..97688d725a 100644 --- a/src/indexing/EventIndex.ts +++ b/src/indexing/EventIndex.ts @@ -35,8 +35,9 @@ import { IResultRoomEvents, SyncStateData, SyncState, + TimelineIndex, + TimelineWindow, } 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 { logger } from "matrix-js-sdk/src/logger"; diff --git a/src/stores/room-list/MessagePreviewStore.ts b/src/stores/room-list/MessagePreviewStore.ts index f14ebe657a..efec81a9e8 100644 --- a/src/stores/room-list/MessagePreviewStore.ts +++ b/src/stores/room-list/MessagePreviewStore.ts @@ -14,10 +14,9 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { Room, RelationType, MatrixEvent } from "matrix-js-sdk/src/matrix"; +import { Room, RelationType, MatrixEvent, Thread } from "matrix-js-sdk/src/matrix"; import { isNullOrUndefined } from "matrix-js-sdk/src/utils"; import { M_POLL_START } from "matrix-js-sdk/src/@types/polls"; -import { Thread } from "matrix-js-sdk/src/models/thread"; import { ActionPayload } from "../../dispatcher/payloads"; import { AsyncStoreWithClient } from "../AsyncStoreWithClient"; diff --git a/src/stores/widgets/StopGapWidgetDriver.ts b/src/stores/widgets/StopGapWidgetDriver.ts index 4b5b6662e2..df82dfe43e 100644 --- a/src/stores/widgets/StopGapWidgetDriver.ts +++ b/src/stores/widgets/StopGapWidgetDriver.ts @@ -41,9 +41,9 @@ import { MatrixEvent, Room, Direction, + THREAD_RELATION_TYPE, } 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 { ApprovalOpts, CapabilitiesOpts, diff --git a/src/utils/EventUtils.ts b/src/utils/EventUtils.ts index f08ce38870..50b5875682 100644 --- a/src/utils/EventUtils.ts +++ b/src/utils/EventUtils.ts @@ -22,12 +22,12 @@ import { MsgType, RelationType, MatrixClient, + THREAD_RELATION_TYPE, } from "matrix-js-sdk/src/matrix"; import { logger } from "matrix-js-sdk/src/logger"; import { M_POLL_END, M_POLL_START } from "matrix-js-sdk/src/@types/polls"; import { M_LOCATION } from "matrix-js-sdk/src/@types/location"; import { M_BEACON_INFO } from "matrix-js-sdk/src/@types/beacon"; -import { THREAD_RELATION_TYPE } from "matrix-js-sdk/src/models/thread"; import shouldHideEvent from "../shouldHideEvent"; import { GetRelationsForEvent } from "../components/views/rooms/EventTile"; diff --git a/src/utils/Reply.ts b/src/utils/Reply.ts index 4125d838e0..9e5420b1aa 100644 --- a/src/utils/Reply.ts +++ b/src/utils/Reply.ts @@ -15,10 +15,9 @@ * limitations under the License. */ -import { IContent, IEventRelation, MatrixEvent, MsgType } from "matrix-js-sdk/src/matrix"; +import { IContent, IEventRelation, MatrixEvent, MsgType, THREAD_RELATION_TYPE } 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 { 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/StorageManager.ts b/src/utils/StorageManager.ts index a7ed5d76aa..e4ac35e769 100644 --- a/src/utils/StorageManager.ts +++ b/src/utils/StorageManager.ts @@ -14,9 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { LocalStorageCryptoStore } from "matrix-js-sdk/src/crypto/store/localStorage-crypto-store"; -import { IndexedDBStore } from "matrix-js-sdk/src/store/indexeddb"; -import { IndexedDBCryptoStore } from "matrix-js-sdk/src/crypto/store/indexeddb-crypto-store"; +import { LocalStorageCryptoStore, IndexedDBStore, IndexedDBCryptoStore } from "matrix-js-sdk/src/matrix"; import { logger } from "matrix-js-sdk/src/logger"; const localStorage = window.localStorage; diff --git a/src/utils/createMatrixClient.ts b/src/utils/createMatrixClient.ts index cf2e22abb1..1bcfcba19e 100644 --- a/src/utils/createMatrixClient.ts +++ b/src/utils/createMatrixClient.ts @@ -19,10 +19,10 @@ import { ICreateClientOpts, MemoryCryptoStore, MemoryStore, + IndexedDBCryptoStore, + IndexedDBStore, + LocalStorageCryptoStore, } from "matrix-js-sdk/src/matrix"; -import { IndexedDBCryptoStore } from "matrix-js-sdk/src/crypto/store/indexeddb-crypto-store"; -import { IndexedDBStore } from "matrix-js-sdk/src/store/indexeddb"; -import { LocalStorageCryptoStore } from "matrix-js-sdk/src/crypto/store/localStorage-crypto-store"; // @ts-ignore - `.ts` is needed here to make TS happy import IndexedDBWorker from "../workers/indexeddb.worker.ts"; diff --git a/test/components/structures/MessagePanel-test.tsx b/test/components/structures/MessagePanel-test.tsx index 39ba8d482e..f368ca9515 100644 --- a/test/components/structures/MessagePanel-test.tsx +++ b/test/components/structures/MessagePanel-test.tsx @@ -17,9 +17,8 @@ limitations under the License. import React from "react"; import { EventEmitter } from "events"; -import { MatrixEvent, Room, RoomMember } from "matrix-js-sdk/src/matrix"; +import { MatrixEvent, Room, RoomMember, Thread } from "matrix-js-sdk/src/matrix"; import { render } from "@testing-library/react"; -import { Thread } from "matrix-js-sdk/src/models/thread"; import { ReceiptType } from "matrix-js-sdk/src/@types/read_receipts"; import MessagePanel, { shouldFormContinuation } from "../../../src/components/structures/MessagePanel"; diff --git a/test/components/structures/ThreadPanel-test.tsx b/test/components/structures/ThreadPanel-test.tsx index 3027ea3e02..b16463bddc 100644 --- a/test/components/structures/ThreadPanel-test.tsx +++ b/test/components/structures/ThreadPanel-test.tsx @@ -18,8 +18,14 @@ import React from "react"; import { render, screen, fireEvent, waitFor } from "@testing-library/react"; import "focus-visible"; // to fix context menus import { mocked } from "jest-mock"; -import { MatrixClient, MatrixEvent, PendingEventOrdering, Room } from "matrix-js-sdk/src/matrix"; -import { FeatureSupport, Thread } from "matrix-js-sdk/src/models/thread"; +import { + MatrixClient, + MatrixEvent, + PendingEventOrdering, + Room, + FeatureSupport, + Thread, +} from "matrix-js-sdk/src/matrix"; import ThreadPanel, { ThreadFilterType, ThreadPanelHeader } from "../../../src/components/structures/ThreadPanel"; import MatrixClientContext from "../../../src/contexts/MatrixClientContext"; diff --git a/test/components/structures/ThreadView-test.tsx b/test/components/structures/ThreadView-test.tsx index 00208338a6..a27b1eead1 100644 --- a/test/components/structures/ThreadView-test.tsx +++ b/test/components/structures/ThreadView-test.tsx @@ -25,8 +25,8 @@ import { Room, MatrixClient, PendingEventOrdering, + THREAD_RELATION_TYPE, } from "matrix-js-sdk/src/matrix"; -import { THREAD_RELATION_TYPE } from "matrix-js-sdk/src/models/thread"; import React, { useState } from "react"; import ThreadView from "../../../src/components/structures/ThreadView"; diff --git a/test/components/structures/TimelinePanel-test.tsx b/test/components/structures/TimelinePanel-test.tsx index 65b06e2a48..8fd36c9d5a 100644 --- a/test/components/structures/TimelinePanel-test.tsx +++ b/test/components/structures/TimelinePanel-test.tsx @@ -29,14 +29,12 @@ import { RoomState, TimelineWindow, EventTimeline, -} from "matrix-js-sdk/src/matrix"; -import { FeatureSupport, Thread, THREAD_RELATION_TYPE, ThreadEvent, ThreadFilterType, -} from "matrix-js-sdk/src/models/thread"; +} from "matrix-js-sdk/src/matrix"; import React, { createRef } from "react"; import { Mocked, mocked } from "jest-mock"; import { forEachRight } from "lodash"; diff --git a/test/components/views/context_menus/MessageContextMenu-test.tsx b/test/components/views/context_menus/MessageContextMenu-test.tsx index a8d1822fa8..42ab2dbe1b 100644 --- a/test/components/views/context_menus/MessageContextMenu-test.tsx +++ b/test/components/views/context_menus/MessageContextMenu-test.tsx @@ -25,10 +25,11 @@ import { Beacon, getBeaconInfoIdentifier, EventType, + FeatureSupport, + Thread, } 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 { FeatureSupport, Thread } from "matrix-js-sdk/src/models/thread"; import { mocked } from "jest-mock"; import { MatrixClientPeg } from "../../../../src/MatrixClientPeg"; diff --git a/test/components/views/messages/MessageActionBar-test.tsx b/test/components/views/messages/MessageActionBar-test.tsx index 634be112db..8f2fbe02a0 100644 --- a/test/components/views/messages/MessageActionBar-test.tsx +++ b/test/components/views/messages/MessageActionBar-test.tsx @@ -16,8 +16,16 @@ limitations under the License. import React from "react"; import { act, render, fireEvent } from "@testing-library/react"; -import { EventType, EventStatus, MatrixEvent, MatrixEventEvent, MsgType, Room } from "matrix-js-sdk/src/matrix"; -import { FeatureSupport, Thread } from "matrix-js-sdk/src/models/thread"; +import { + EventType, + EventStatus, + MatrixEvent, + MatrixEventEvent, + MsgType, + Room, + FeatureSupport, + Thread, +} from "matrix-js-sdk/src/matrix"; import MessageActionBar from "../../../../src/components/views/messages/MessageActionBar"; import { diff --git a/test/components/views/rooms/MessageComposer-test.tsx b/test/components/views/rooms/MessageComposer-test.tsx index d508c7b5e1..1aea150a8c 100644 --- a/test/components/views/rooms/MessageComposer-test.tsx +++ b/test/components/views/rooms/MessageComposer-test.tsx @@ -15,8 +15,7 @@ limitations under the License. */ import * as React from "react"; -import { EventType, MatrixEvent, Room, RoomMember } from "matrix-js-sdk/src/matrix"; -import { THREAD_RELATION_TYPE } from "matrix-js-sdk/src/models/thread"; +import { EventType, MatrixEvent, Room, RoomMember, THREAD_RELATION_TYPE } from "matrix-js-sdk/src/matrix"; import { act, render, screen } from "@testing-library/react"; import userEvent from "@testing-library/user-event"; diff --git a/test/components/views/rooms/RoomTile-test.tsx b/test/components/views/rooms/RoomTile-test.tsx index 1ec1b2d040..88fb465ac7 100644 --- a/test/components/views/rooms/RoomTile-test.tsx +++ b/test/components/views/rooms/RoomTile-test.tsx @@ -17,9 +17,15 @@ limitations under the License. import React from "react"; import { render, screen, act, RenderResult } from "@testing-library/react"; import { mocked, Mocked } from "jest-mock"; -import { MatrixClient, PendingEventOrdering, Room, MatrixEvent, RoomStateEvent } from "matrix-js-sdk/src/matrix"; +import { + MatrixClient, + PendingEventOrdering, + Room, + MatrixEvent, + RoomStateEvent, + Thread, +} from "matrix-js-sdk/src/matrix"; import { Widget } from "matrix-widget-api"; -import { Thread } from "matrix-js-sdk/src/models/thread"; import type { RoomMember } from "matrix-js-sdk/src/matrix"; import type { ClientWidgetApi } from "matrix-widget-api"; diff --git a/test/test-utils/threads.ts b/test/test-utils/threads.ts index 0bc6ea8b0a..4536ab8b1a 100644 --- a/test/test-utils/threads.ts +++ b/test/test-utils/threads.ts @@ -14,8 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { MatrixClient, MatrixEvent, MatrixEventEvent, RelationType, Room } from "matrix-js-sdk/src/matrix"; -import { Thread } from "matrix-js-sdk/src/models/thread"; +import { MatrixClient, MatrixEvent, MatrixEventEvent, RelationType, Room, Thread } from "matrix-js-sdk/src/matrix"; import { mkMessage, MessageEventProps } from "./test-utils"; diff --git a/test/utils/EventUtils-test.ts b/test/utils/EventUtils-test.ts index 6ad8f170b6..1d6aee98bc 100644 --- a/test/utils/EventUtils-test.ts +++ b/test/utils/EventUtils-test.ts @@ -25,8 +25,8 @@ import { PendingEventOrdering, RelationType, Room, + Thread, } from "matrix-js-sdk/src/matrix"; -import { Thread } from "matrix-js-sdk/src/models/thread"; import { MatrixClientPeg } from "../../src/MatrixClientPeg"; import {