Switch to importing @types/{event,partials} from main js-sdk export (#11369)

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";

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";
 

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.

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";

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";

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";

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";

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";

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";

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 {