Merge pull request #3093 from element-hq/toger5/src-to-lib-import

Transition from consuming js-sdk source to `lib` (build output)

src/@types/global.d.ts

@@ -5,7 +5,6 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 
-import "matrix-js-sdk/src/@types/global";
 import { type setLogLevel as setLKLogLevel } from "livekit-client";
 
 import type { DurationFormat as PolyfillDurationFormat } from "@formatjs/intl-durationformat";

src/@types/matrix-js-sdk.d.ts

@@ -11,7 +11,7 @@ import {
 } from "../reactions";
 
 // Extend Matrix JS SDK types via Typescript declaration merging to support unspecced event fields and types
-declare module "matrix-js-sdk/src/types" {
+declare module "matrix-js-sdk/lib/types" {
   export interface TimelineEvents {
     [ElementCallReactionEventType]: ECallReactionEventContent;
   }

src/App.tsx

@@ -9,7 +9,7 @@ import { type FC, type JSX, Suspense, useEffect, useState } from "react";
 import { BrowserRouter, Route, useLocation, Routes } from "react-router-dom";
 import * as Sentry from "@sentry/react";
 import { TooltipProvider } from "@vector-im/compound-web";
-import { logger } from "matrix-js-sdk/src/logger";
+import { logger } from "matrix-js-sdk/lib/logger";
 
 import { HomePage } from "./home/HomePage";
 import { LoginPage } from "./auth/LoginPage";

src/Avatar.test.tsx

@@ -7,7 +7,7 @@ Please see LICENSE in the repository root for full details.
 
 import { afterEach, expect, test, vi } from "vitest";
 import { render, screen } from "@testing-library/react";
-import { type MatrixClient } from "matrix-js-sdk/src/client";
+import { type MatrixClient } from "matrix-js-sdk";
 import { type FC, type PropsWithChildren } from "react";
 
 import { ClientContextProvider } from "./ClientContext";

src/Avatar.tsx

@@ -13,7 +13,7 @@ import {
   useEffect,
 } from "react";
 import { Avatar as CompoundAvatar } from "@vector-im/compound-web";
-import { type MatrixClient } from "matrix-js-sdk/src/client";
+import { type MatrixClient } from "matrix-js-sdk";
 
 import { useClientState } from "./ClientContext";
 

src/ClientContext.tsx

@@ -17,9 +17,9 @@ import {
   type JSX,
 } from "react";
 import { useNavigate } from "react-router-dom";
-import { logger } from "matrix-js-sdk/src/logger";
+import { logger } from "matrix-js-sdk/lib/logger";
-import { type ISyncStateData, type SyncState } from "matrix-js-sdk/src/sync";
+import { type ISyncStateData, type SyncState } from "matrix-js-sdk/lib/sync";
-import { ClientEvent, type MatrixClient } from "matrix-js-sdk/src/client";
+import { ClientEvent, type MatrixClient } from "matrix-js-sdk";
 
 import type { WidgetApi } from "matrix-widget-api";
 import { ErrorPage } from "./FullScreenView";

src/ErrorView.tsx

@@ -15,7 +15,7 @@ import {
   type ReactElement,
 } from "react";
 import { useTranslation } from "react-i18next";
-import { logger } from "matrix-js-sdk/src/logger";
+import { logger } from "matrix-js-sdk/lib/logger";
 
 import { RageshakeButton } from "./settings/RageshakeButton";
 import styles from "./ErrorView.module.css";

src/FullScreenView.tsx

@@ -9,7 +9,7 @@ import { type FC, type ReactElement, type ReactNode, useEffect } from "react";
 import classNames from "classnames";
 import { useTranslation } from "react-i18next";
 import * as Sentry from "@sentry/react";
-import { logger } from "matrix-js-sdk/src/logger";
+import { logger } from "matrix-js-sdk/lib/logger";
 import { ErrorIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
 
 import { Header, HeaderLogo, LeftNav, RightNav } from "./Header";

src/IndexedDBWorker.ts

@@ -5,7 +5,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 
-import { IndexedDBStoreWorker } from "matrix-js-sdk/src/indexeddb-worker";
+import { IndexedDBStoreWorker } from "matrix-js-sdk/lib/indexeddb-worker";
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const remoteWorker = new IndexedDBStoreWorker((self as any).postMessage);

src/UrlParams.ts

@@ -7,7 +7,7 @@ Please see LICENSE in the repository root for full details.
 
 import { useMemo } from "react";
 import { useLocation } from "react-router-dom";
-import { logger } from "matrix-js-sdk/src/logger";
+import { logger } from "matrix-js-sdk/lib/logger";
 
 import { Config } from "./config/Config";
 import { type EncryptionSystem } from "./e2ee/sharedKeyManagement";

src/UserMenuContainer.tsx

@@ -7,7 +7,7 @@ Please see LICENSE in the repository root for full details.
 
 import { type FC, useCallback, useState } from "react";
 import { useNavigate, useLocation } from "react-router-dom";
-import { logger } from "matrix-js-sdk/src/logger";
+import { logger } from "matrix-js-sdk/lib/logger";
 
 import { useClientLegacy } from "./ClientContext";
 import { useProfile } from "./profile/useProfile";

src/analytics/PosthogAnalytics.ts

@@ -10,8 +10,8 @@ import posthog, {
   type PostHog,
   type Properties,
 } from "posthog-js";
-import { logger } from "matrix-js-sdk/src/logger";
+import { logger } from "matrix-js-sdk/lib/logger";
-import { type MatrixClient } from "matrix-js-sdk/src/matrix";
+import { type MatrixClient } from "matrix-js-sdk";
 import { type Subscription } from "rxjs";
 
 import { widget } from "../widget";

src/analytics/PosthogEvents.ts

@@ -6,8 +6,8 @@ Please see LICENSE in the repository root for full details.
 */
 
 import { type DisconnectReason } from "livekit-client";
-import { logger } from "matrix-js-sdk/src/logger";
+import { logger } from "matrix-js-sdk/lib/logger";
-import { type MatrixRTCSession } from "matrix-js-sdk/src/matrixrtc";
+import { type MatrixRTCSession } from "matrix-js-sdk/lib/matrixrtc";
 
 import {
   type IPosthogEvent,

src/analytics/PosthogSpanProcessor.ts

@@ -11,7 +11,7 @@ import {
   type Span,
 } from "@opentelemetry/sdk-trace-base";
 import { hrTimeToMilliseconds } from "@opentelemetry/core";
-import { logger } from "matrix-js-sdk/src/logger";
+import { logger } from "matrix-js-sdk/lib/logger";
 
 import { PosthogAnalytics } from "./PosthogAnalytics";
 

src/auth/RegisterPage.tsx

@@ -16,9 +16,9 @@ import {
 } from "react";
 import { useNavigate, useLocation } from "react-router-dom";
 import { captureException } from "@sentry/react";
-import { sleep } from "matrix-js-sdk/src/utils";
+import { sleep } from "matrix-js-sdk/lib/utils";
 import { Trans, useTranslation } from "react-i18next";
-import { logger } from "matrix-js-sdk/src/logger";
+import { logger } from "matrix-js-sdk/lib/logger";
 import { Button, Text } from "@vector-im/compound-web";
 
 import { FieldRow, InputField, ErrorMessage } from "../input/Input";

src/auth/useInteractiveLogin.ts

@@ -6,12 +6,12 @@ Please see LICENSE in the repository root for full details.
 */
 
 import { useCallback } from "react";
-import { InteractiveAuth } from "matrix-js-sdk/src/interactive-auth";
+import { InteractiveAuth } from "matrix-js-sdk";
 import {
   createClient,
   type LoginResponse,
   type MatrixClient,
-} from "matrix-js-sdk/src/matrix";
+} from "matrix-js-sdk";
 
 import { initClient } from "../utils/matrix";
 import { type Session } from "../ClientContext";

src/auth/useInteractiveRegistration.ts

@@ -6,13 +6,13 @@ Please see LICENSE in the repository root for full details.
 */
 
 import { useState, useEffect, useCallback, useRef } from "react";
-import { InteractiveAuth } from "matrix-js-sdk/src/interactive-auth";
+import { InteractiveAuth } from "matrix-js-sdk";
 import {
   createClient,
   type MatrixClient,
   type RegisterResponse,
-} from "matrix-js-sdk/src/matrix";
+} from "matrix-js-sdk";
-import { logger } from "matrix-js-sdk/src/logger";
+import { logger } from "matrix-js-sdk/lib/logger";
 
 import { initClient } from "../utils/matrix";
 import { type Session } from "../ClientContext";

src/auth/useRecaptcha.ts

@@ -6,9 +6,9 @@ Please see LICENSE in the repository root for full details.
 */
 
 import { useEffect, useCallback, useRef, useState } from "react";
-import { secureRandomString } from "matrix-js-sdk/src/randomstring";
+import { secureRandomString } from "matrix-js-sdk/lib/randomstring";
 import { useTranslation } from "react-i18next";
-import { logger } from "matrix-js-sdk/src/logger";
+import { logger } from "matrix-js-sdk/lib/logger";
 
 import { translatedError } from "../TranslatedError";
 declare global {

src/auth/useRegisterPasswordlessUser.ts

@@ -6,7 +6,7 @@ Please see LICENSE in the repository root for full details.
 */
 
 import { useCallback } from "react";
-import { secureRandomString } from "matrix-js-sdk/src/randomstring";
+import { secureRandomString } from "matrix-js-sdk/lib/randomstring";
 
 import { useClient } from "../ClientContext";
 import { useInteractiveRegistration } from "../auth/useInteractiveRegistration";

src/button/ReactionToggleButton.test.tsx

@@ -10,7 +10,7 @@ import { expect, test } from "vitest";
 import { TooltipProvider } from "@vector-im/compound-web";
 import { userEvent } from "@testing-library/user-event";
 import { type ReactNode } from "react";
-import { type MatrixRTCSession } from "matrix-js-sdk/src/matrixrtc/MatrixRTCSession";
+import { type MatrixRTCSession } from "matrix-js-sdk/lib/matrixrtc";
 
 import { ReactionToggleButton } from "./ReactionToggleButton";
 import { ElementCallReactionEventType } from "../reactions";

src/button/ReactionToggleButton.tsx

@@ -22,7 +22,7 @@ import {
   useState,
 } from "react";
 import { useTranslation } from "react-i18next";
-import { logger } from "matrix-js-sdk/src/logger";
+import { logger } from "matrix-js-sdk/lib/logger";
 import classNames from "classnames";
 import { useObservableState } from "observable-hooks";
 import { map } from "rxjs";

src/e2ee/matrixKeyProvider.test.ts

@@ -9,7 +9,7 @@ import { describe, expect, test, vi } from "vitest";
 import {
   type MatrixRTCSession,
   MatrixRTCSessionEvent,
-} from "matrix-js-sdk/src/matrixrtc";
+} from "matrix-js-sdk/lib/matrixrtc";
 import { KeyProviderEvent } from "livekit-client";
 
 import { MatrixKeyProvider } from "./matrixKeyProvider";

src/e2ee/matrixKeyProvider.ts

@@ -6,11 +6,11 @@ Please see LICENSE in the repository root for full details.
 */
 
 import { BaseKeyProvider, createKeyMaterialFromBuffer } from "livekit-client";
-import { logger } from "matrix-js-sdk/src/logger";
+import { logger } from "matrix-js-sdk/lib/logger";
 import {
   type MatrixRTCSession,
   MatrixRTCSessionEvent,
-} from "matrix-js-sdk/src/matrixrtc/MatrixRTCSession";
+} from "matrix-js-sdk/lib/matrixrtc";
 
 export class MatrixKeyProvider extends BaseKeyProvider {
   private rtcSession?: MatrixRTCSession;

src/grid/Grid.tsx

@@ -32,7 +32,7 @@ import {
 } from "react";
 import useMeasure from "react-use-measure";
 import classNames from "classnames";
-import { logger } from "matrix-js-sdk/src/logger";
+import { logger } from "matrix-js-sdk/lib/logger";
 import { useObservableEagerState } from "observable-hooks";
 import { fromEvent, map, startWith } from "rxjs";
 

src/home/CallList.test.tsx

@@ -6,7 +6,7 @@ Please see LICENSE in the repository root for full details.
 */
 
 import { render, type RenderResult } from "@testing-library/react";
-import { type MatrixClient } from "matrix-js-sdk/src/matrix";
+import { type MatrixClient } from "matrix-js-sdk";
 import { MemoryRouter } from "react-router-dom";
 import { describe, expect, it } from "vitest";
 

src/home/CallList.tsx

@@ -6,9 +6,7 @@ Please see LICENSE in the repository root for full details.
 */
 
 import { Link } from "react-router-dom";
-import { type MatrixClient } from "matrix-js-sdk/src/client";
+import { type RoomMember, type Room, type MatrixClient } from "matrix-js-sdk";
-import { type RoomMember } from "matrix-js-sdk/src/models/room-member";
-import { type Room } from "matrix-js-sdk/src/models/room";
 import { type FC, useCallback, type MouseEvent, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { IconButton, Text } from "@vector-im/compound-web";

src/home/RegisteredView.tsx

@@ -12,10 +12,10 @@ import {
   type FormEventHandler,
   type FC,
 } from "react";
-import { type MatrixClient } from "matrix-js-sdk/src/client";
+import { type MatrixClient } from "matrix-js-sdk";
 import { useTranslation } from "react-i18next";
 import { Heading, Text } from "@vector-im/compound-web";
-import { logger } from "matrix-js-sdk/src/logger";
+import { logger } from "matrix-js-sdk/lib/logger";
 import { Button } from "@vector-im/compound-web";
 import { useNavigate } from "react-router-dom";
 

src/home/UnauthenticatedView.tsx

@@ -6,10 +6,10 @@ Please see LICENSE in the repository root for full details.
 */
 
 import { type FC, useCallback, useState, type FormEventHandler } from "react";
-import { secureRandomString } from "matrix-js-sdk/src/randomstring";
+import { secureRandomString } from "matrix-js-sdk/lib/randomstring";
 import { Trans, useTranslation } from "react-i18next";
 import { Button, Heading, Text } from "@vector-im/compound-web";
-import { logger } from "matrix-js-sdk/src/logger";
+import { logger } from "matrix-js-sdk/lib/logger";
 import { useNavigate } from "react-router-dom";
 
 import { useClient } from "../ClientContext";

src/home/useGroupCallRooms.ts

@@ -5,14 +5,21 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 
-import { type MatrixClient } from "matrix-js-sdk/src/client";
+import {
-import { type Room, RoomEvent } from "matrix-js-sdk/src/models/room";
+  type MatrixClient,
-import { type RoomMember } from "matrix-js-sdk/src/models/room-member";
+  type RoomMember,
+  type Room,
+  RoomEvent,
+  EventTimeline,
+  EventType,
+  JoinRule,
+  KnownMembership,
+} from "matrix-js-sdk";
 import { useState, useEffect } from "react";
-import { EventTimeline, EventType, JoinRule } from "matrix-js-sdk/src/matrix";
+import {
-import { type MatrixRTCSession } from "matrix-js-sdk/src/matrixrtc/MatrixRTCSession";
+  MatrixRTCSessionManagerEvents,
-import { MatrixRTCSessionManagerEvents } from "matrix-js-sdk/src/matrixrtc/MatrixRTCSessionManager";
+  type MatrixRTCSession,
-import { KnownMembership } from "matrix-js-sdk/src/types";
+} from "matrix-js-sdk/lib/matrixrtc";
 
 import { getKeyForRoom } from "../e2ee/sharedKeyManagement";
 

src/initializer.tsx

@@ -14,7 +14,7 @@ import i18n, {
 import { initReactI18next } from "react-i18next";
 import LanguageDetector from "i18next-browser-languagedetector";
 import * as Sentry from "@sentry/react";
-import { logger } from "matrix-js-sdk/src/logger";
+import { logger } from "matrix-js-sdk/lib/logger";
 import { shouldPolyfill as shouldPolyfillSegmenter } from "@formatjs/intl-segmenter/should-polyfill";
 import { shouldPolyfill as shouldPolyfillDurationFormat } from "@formatjs/intl-durationformat/should-polyfill";
 import {

src/livekit/MediaDevicesContext.tsx

@@ -19,7 +19,7 @@ import {
 import { createMediaDeviceObserver } from "@livekit/components-core";
 import { map, startWith } from "rxjs";
 import { useObservableEagerState } from "observable-hooks";
-import { logger } from "matrix-js-sdk/src/logger";
+import { logger } from "matrix-js-sdk/lib/logger";
 
 import {
   useSetting,

src/livekit/openIDSFU.ts

@@ -5,11 +5,11 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 
-import { type IOpenIDToken, type MatrixClient } from "matrix-js-sdk/src/matrix";
+import { type IOpenIDToken, type MatrixClient } from "matrix-js-sdk";
-import { logger } from "matrix-js-sdk/src/logger";
+import { logger } from "matrix-js-sdk/lib/logger";
-import { type MatrixRTCSession } from "matrix-js-sdk/src/matrixrtc/MatrixRTCSession";
+import { type MatrixRTCSession } from "matrix-js-sdk/lib/matrixrtc";
 import { useEffect, useState } from "react";
-import { type LivekitFocus } from "matrix-js-sdk/src/matrixrtc/LivekitFocus";
+import { type LivekitFocus } from "matrix-js-sdk/lib/matrixrtc";
 
 import { useActiveLivekitFocus } from "../room/useActiveFocus";
 import { useErrorBoundary } from "../useErrorBoundary";

src/livekit/useECConnectionState.ts

@@ -15,7 +15,7 @@ import {
   Track,
 } from "livekit-client";
 import { useCallback, useEffect, useRef, useState } from "react";
-import { logger } from "matrix-js-sdk/src/logger";
+import { logger } from "matrix-js-sdk/lib/logger";
 import * as Sentry from "@sentry/react";
 
 import { type SFUConfig, sfuConfigEquals } from "./openIDSFU";

src/livekit/useLiveKit.ts

@@ -15,8 +15,8 @@ import {
 } from "livekit-client";
 import { useEffect, useMemo, useRef } from "react";
 import E2EEWorker from "livekit-client/e2ee-worker?worker";
-import { logger } from "matrix-js-sdk/src/logger";
+import { logger } from "matrix-js-sdk/lib/logger";
-import { type MatrixRTCSession } from "matrix-js-sdk/src/matrixrtc/MatrixRTCSession";
+import { type MatrixRTCSession } from "matrix-js-sdk/lib/matrixrtc";
 
 import { defaultLiveKitOptions } from "./options";
 import { type SFUConfig } from "./openIDSFU";

src/main.tsx

@@ -9,12 +9,12 @@ Please see LICENSE in the repository root for full details.
 // function gets set. It needs to be not in the same file as we use
 // createClient, or the typescript transpiler gets confused about
 // dependency references.
-import "matrix-js-sdk/src/browser-index";
+import "matrix-js-sdk/lib/browser-index";
 
 import { StrictMode } from "react";
 import { createRoot } from "react-dom/client";
 import "./index.css";
-import { logger } from "matrix-js-sdk/src/logger";
+import { logger } from "matrix-js-sdk/lib/logger";
 import {
   setLogExtension as setLKLogExtension,
   setLogLevel as setLKLogLevel,

src/otel/OTelCall.ts

@@ -6,12 +6,12 @@ Please see LICENSE in the repository root for full details.
 */
 
 import { type Span } from "@opentelemetry/api";
-import { type MatrixCall } from "matrix-js-sdk/src/matrix";
+import { type MatrixCall } from "matrix-js-sdk";
-import { CallEvent } from "matrix-js-sdk/src/webrtc/call";
+import { CallEvent } from "matrix-js-sdk/lib/webrtc/call";
 import {
   type TransceiverStats,
   type CallFeedStats,
-} from "matrix-js-sdk/src/webrtc/stats/statsReport";
+} from "matrix-js-sdk/lib/webrtc/stats/statsReport";
 
 import { ObjectFlattener } from "./ObjectFlattener";
 import { ElementCallOpenTelemetry } from "./otel";

src/otel/OTelCallAbstractMediaStreamSpan.ts

@@ -6,7 +6,7 @@ Please see LICENSE in the repository root for full details.
 */
 
 import opentelemetry, { type Span } from "@opentelemetry/api";
-import { type TrackStats } from "matrix-js-sdk/src/webrtc/stats/statsReport";
+import { type TrackStats } from "matrix-js-sdk/lib/webrtc/stats/statsReport";
 
 import { type ElementCallOpenTelemetry } from "./otel";
 import { OTelCallMediaStreamTrackSpan } from "./OTelCallMediaStreamTrackSpan";

src/otel/OTelCallFeedMediaStreamSpan.ts

@@ -9,7 +9,7 @@ import { type Span } from "@opentelemetry/api";
 import {
   type CallFeedStats,
   type TrackStats,
-} from "matrix-js-sdk/src/webrtc/stats/statsReport";
+} from "matrix-js-sdk/lib/webrtc/stats/statsReport";
 
 import { type ElementCallOpenTelemetry } from "./otel";
 import { OTelCallAbstractMediaStreamSpan } from "./OTelCallAbstractMediaStreamSpan";

src/otel/OTelCallMediaStreamTrackSpan.ts

@@ -5,7 +5,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 
-import { type TrackStats } from "matrix-js-sdk/src/webrtc/stats/statsReport";
+import { type TrackStats } from "matrix-js-sdk/lib/webrtc/stats/statsReport";
 import opentelemetry, { type Span } from "@opentelemetry/api";
 
 import { type ElementCallOpenTelemetry } from "./otel";

src/otel/OTelCallTransceiverMediaStreamSpan.ts

@@ -9,7 +9,7 @@ import { type Span } from "@opentelemetry/api";
 import {
   type TrackStats,
   type TransceiverStats,
-} from "matrix-js-sdk/src/webrtc/stats/statsReport";
+} from "matrix-js-sdk/lib/webrtc/stats/statsReport";
 
 import { type ElementCallOpenTelemetry } from "./otel";
 import { OTelCallAbstractMediaStreamSpan } from "./OTelCallAbstractMediaStreamSpan";

src/otel/OTelGroupCallMembership.ts

@@ -15,26 +15,26 @@ import {
   type MatrixClient,
   type MatrixEvent,
   type RoomMember,
-} from "matrix-js-sdk/src/matrix";
+} from "matrix-js-sdk";
-import { logger } from "matrix-js-sdk/src/logger";
+import { logger } from "matrix-js-sdk/lib/logger";
 import {
   type CallError,
   type CallState,
   type MatrixCall,
   type VoipEvent,
-} from "matrix-js-sdk/src/webrtc/call";
+} from "matrix-js-sdk/lib/webrtc/call";
 import {
   type CallsByUserAndDevice,
   type GroupCallError,
   GroupCallEvent,
   type GroupCallStatsReport,
-} from "matrix-js-sdk/src/webrtc/groupCall";
+} from "matrix-js-sdk/lib/webrtc/groupCall";
 import {
   type ConnectionStatsReport,
   type ByteSentStatsReport,
   type SummaryStatsReport,
   type CallFeedReport,
-} from "matrix-js-sdk/src/webrtc/stats/statsReport";
+} from "matrix-js-sdk/lib/webrtc/stats/statsReport";
 
 import { ElementCallOpenTelemetry } from "./otel";
 import { ObjectFlattener } from "./ObjectFlattener";

src/otel/ObjectFlattener.test.ts

@@ -5,12 +5,12 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 
-import { type GroupCallStatsReport } from "matrix-js-sdk/src/webrtc/groupCall";
+import { type GroupCallStatsReport } from "matrix-js-sdk/lib/webrtc/groupCall";
 import {
   type AudioConcealment,
   type ByteSentStatsReport,
   type ConnectionStatsReport,
-} from "matrix-js-sdk/src/webrtc/stats/statsReport";
+} from "matrix-js-sdk/lib/webrtc/stats/statsReport";
 import { describe, expect, it } from "vitest";
 
 import { ObjectFlattener } from "../../src/otel/ObjectFlattener";

src/otel/ObjectFlattener.ts

@@ -5,13 +5,13 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 import { type Attributes } from "@opentelemetry/api";
-import { type VoipEvent } from "matrix-js-sdk/src/webrtc/call";
+import { type VoipEvent } from "matrix-js-sdk/lib/webrtc/call";
-import { type GroupCallStatsReport } from "matrix-js-sdk/src/webrtc/groupCall";
+import { type GroupCallStatsReport } from "matrix-js-sdk/lib/webrtc/groupCall";
 import {
   type ByteSentStatsReport,
   type ConnectionStatsReport,
   type SummaryStatsReport,
-} from "matrix-js-sdk/src/webrtc/stats/statsReport";
+} from "matrix-js-sdk/lib/webrtc/stats/statsReport";
 
 export class ObjectFlattener {
   public static flattenReportObject(

src/otel/otel.ts

@@ -11,7 +11,7 @@ import { WebTracerProvider } from "@opentelemetry/sdk-trace-web";
 import opentelemetry, { type Tracer } from "@opentelemetry/api";
 import { Resource } from "@opentelemetry/resources";
 import { SemanticResourceAttributes } from "@opentelemetry/semantic-conventions";
-import { logger } from "matrix-js-sdk/src/logger";
+import { logger } from "matrix-js-sdk/lib/logger";
 
 import { PosthogSpanProcessor } from "../analytics/PosthogSpanProcessor";
 import { Config } from "../config/Config";

src/profile/useProfile.ts

@@ -5,12 +5,15 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 
-import { type MatrixClient } from "matrix-js-sdk/src/client";
+import {
-import { type MatrixEvent } from "matrix-js-sdk/src/models/event";
+  type MatrixEvent,
-import { type User, UserEvent } from "matrix-js-sdk/src/models/user";
+  type User,
-import { type FileType } from "matrix-js-sdk/src/http-api";
+  type MatrixClient,
+  UserEvent,
+  type FileType,
+} from "matrix-js-sdk";
 import { useState, useCallback, useEffect } from "react";
-import { logger } from "matrix-js-sdk/src/logger";
+import { logger } from "matrix-js-sdk/lib/logger";
 
 interface ProfileLoadState {
   success: boolean;

src/reactions/ReactionsReader.test.tsx

@@ -7,14 +7,14 @@ Please see LICENSE in the repository root for full details.
 
 import { renderHook } from "@testing-library/react";
 import { afterEach, test, vitest } from "vitest";
-import { type MatrixRTCSession } from "matrix-js-sdk/src/matrixrtc";
+import { type MatrixRTCSession } from "matrix-js-sdk/lib/matrixrtc";
 import {
   RoomEvent as MatrixRoomEvent,
   MatrixEvent,
   type IRoomTimelineData,
   EventType,
   MatrixEventEvent,
-} from "matrix-js-sdk/src/matrix";
+} from "matrix-js-sdk";
 
 import { ReactionsReader, REACTION_ACTIVE_TIME_MS } from "./ReactionsReader";
 import {

src/reactions/ReactionsReader.ts

@@ -9,15 +9,15 @@ import {
   type CallMembership,
   MatrixRTCSessionEvent,
   type MatrixRTCSession,
-} from "matrix-js-sdk/src/matrixrtc";
+} from "matrix-js-sdk/lib/matrixrtc";
-import { logger } from "matrix-js-sdk/src/logger";
+import { logger } from "matrix-js-sdk/lib/logger";
-import { type MatrixEvent, MatrixEventEvent } from "matrix-js-sdk/src/matrix";
+import { type MatrixEvent, MatrixEventEvent } from "matrix-js-sdk";
-import { type ReactionEventContent } from "matrix-js-sdk/src/types";
+import { type ReactionEventContent } from "matrix-js-sdk/lib/types";
 import {
   RelationType,
   EventType,
   RoomEvent as MatrixRoomEvent,
-} from "matrix-js-sdk/src/matrix";
+} from "matrix-js-sdk";
 import { BehaviorSubject, delay, type Subscription } from "rxjs";
 
 import {

src/reactions/index.ts

@@ -5,7 +5,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 
-import { type RelationType } from "matrix-js-sdk/src/types";
+import { type RelationType } from "matrix-js-sdk";
 
 import catSoundOgg from "../sound/reactions/cat.ogg?url";
 import catSoundMp3 from "../sound/reactions/cat.mp3?url";

src/reactions/useReactionsSender.tsx

@@ -5,7 +5,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 
-import { EventType, RelationType } from "matrix-js-sdk/src/matrix";
+import { EventType, RelationType } from "matrix-js-sdk";
 import {
   createContext,
   useContext,
@@ -14,8 +14,8 @@ import {
   useMemo,
   type JSX,
 } from "react";
-import { type MatrixRTCSession } from "matrix-js-sdk/src/matrixrtc/MatrixRTCSession";
+import { type MatrixRTCSession } from "matrix-js-sdk/lib/matrixrtc";
-import { logger } from "matrix-js-sdk/src/logger";
+import { logger } from "matrix-js-sdk/lib/logger";
 import { useObservableEagerState } from "observable-hooks";
 
 import { useMatrixRTCSessionMemberships } from "../useMatrixRTCSessionMemberships";

src/room/AppSelectionModal.tsx

@@ -15,7 +15,7 @@ import {
 import { useTranslation } from "react-i18next";
 import { Button, Text } from "@vector-im/compound-web";
 import { PopOutIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
-import { logger } from "matrix-js-sdk/src/logger";
+import { logger } from "matrix-js-sdk/lib/logger";
 
 import { Modal } from "../Modal";
 import { useRoomEncryptionSystem } from "../e2ee/sharedKeyManagement";

src/room/CallEndedView.tsx

@@ -6,11 +6,11 @@ Please see LICENSE in the repository root for full details.
 */
 
 import { type FC, type FormEventHandler, useCallback, useState } from "react";
-import { type MatrixClient } from "matrix-js-sdk/src/client";
+import { type MatrixClient } from "matrix-js-sdk";
 import { Trans, useTranslation } from "react-i18next";
 import { Button, Heading, Text } from "@vector-im/compound-web";
 import { useNavigate } from "react-router-dom";
-import { logger } from "matrix-js-sdk/src/logger";
+import { logger } from "matrix-js-sdk/lib/logger";
 
 import styles from "./CallEndedView.module.css";
 import feedbackStyle from "../input/FeedbackInput.module.css";

src/room/CallEventAudioRenderer.test.tsx

@@ -16,7 +16,7 @@ import {
   afterEach,
 } from "vitest";
 import { act } from "react";
-import { type CallMembership } from "matrix-js-sdk/src/matrixrtc";
+import { type CallMembership } from "matrix-js-sdk/lib/matrixrtc";
 
 import { mockRtcMembership } from "../utils/test";
 import {

src/room/GroupCallView.test.tsx

@@ -14,13 +14,12 @@ import {
   vi,
 } from "vitest";
 import { render, waitFor, screen } from "@testing-library/react";
-import { type MatrixClient } from "matrix-js-sdk/src/client";
+import { type MatrixClient, JoinRule, type RoomState } from "matrix-js-sdk";
-import { type MatrixRTCSession } from "matrix-js-sdk/src/matrixrtc";
+import { type MatrixRTCSession } from "matrix-js-sdk/lib/matrixrtc";
 import { of } from "rxjs";
-import { JoinRule, type RoomState } from "matrix-js-sdk/src/matrix";
 import { BrowserRouter } from "react-router-dom";
 import userEvent from "@testing-library/user-event";
-import { type RelationsContainer } from "matrix-js-sdk/src/models/relations-container";
+import { type RelationsContainer } from "matrix-js-sdk/lib/models/relations-container";
 import { useState } from "react";
 import { TooltipProvider } from "@vector-im/compound-web";
 

src/room/GroupCallView.tsx

@@ -13,17 +13,16 @@ import {
   useMemo,
   useState,
 } from "react";
-import { type MatrixClient } from "matrix-js-sdk/src/client";
+import { type MatrixClient, JoinRule, type Room } from "matrix-js-sdk";
 import {
   Room as LivekitRoom,
   isE2EESupported as isE2EESupportedBrowser,
 } from "livekit-client";
-import { logger } from "matrix-js-sdk/src/logger";
+import { logger } from "matrix-js-sdk/lib/logger";
 import {
   MatrixRTCSessionEvent,
   type MatrixRTCSession,
-} from "matrix-js-sdk/src/matrixrtc/MatrixRTCSession";
+} from "matrix-js-sdk/lib/matrixrtc";
-import { JoinRule, type Room } from "matrix-js-sdk/src/matrix";
 import { useNavigate } from "react-router-dom";
 
 import type { IWidgetApiRequest } from "matrix-widget-api";

src/room/InCallView.tsx

@@ -11,7 +11,7 @@ import {
   useLocalParticipant,
 } from "@livekit/components-react";
 import { ConnectionState, type Room } from "livekit-client";
-import { type MatrixClient } from "matrix-js-sdk/src/client";
+import { type MatrixClient } from "matrix-js-sdk";
 import {
   type FC,
   type PointerEvent,
@@ -26,11 +26,11 @@ import {
   type JSX,
 } from "react";
 import useMeasure from "react-use-measure";
-import { type MatrixRTCSession } from "matrix-js-sdk/src/matrixrtc/MatrixRTCSession";
+import { type MatrixRTCSession } from "matrix-js-sdk/lib/matrixrtc";
 import classNames from "classnames";
 import { BehaviorSubject, map } from "rxjs";
 import { useObservable, useObservableEagerState } from "observable-hooks";
-import { logger } from "matrix-js-sdk/src/logger";
+import { logger } from "matrix-js-sdk/lib/logger";
 
 import LogoMark from "../icons/LogoMark.svg?react";
 import LogoType from "../icons/LogoType.svg?react";

src/room/InviteModal.test.tsx

@@ -7,7 +7,7 @@ Please see LICENSE in the repository root for full details.
 
 import { render, screen } from "@testing-library/react";
 import { expect, test, vi } from "vitest";
-import { type Room } from "matrix-js-sdk/src/matrix";
+import { type Room } from "matrix-js-sdk";
 import { axe } from "vitest-axe";
 import { BrowserRouter } from "react-router-dom";
 import userEvent from "@testing-library/user-event";

src/room/InviteModal.tsx

@@ -13,7 +13,7 @@ import {
   useState,
 } from "react";
 import { useTranslation } from "react-i18next";
-import { type Room } from "matrix-js-sdk/src/matrix";
+import { type Room } from "matrix-js-sdk";
 import { Button, Text } from "@vector-im/compound-web";
 import {
   LinkIcon,

src/room/LobbyView.tsx

@@ -7,10 +7,10 @@ Please see LICENSE in the repository root for full details.
 
 import { type FC, useCallback, useMemo, useState, type JSX } from "react";
 import { useTranslation } from "react-i18next";
-import { type MatrixClient } from "matrix-js-sdk/src/matrix";
+import { type MatrixClient } from "matrix-js-sdk";
 import { Button } from "@vector-im/compound-web";
 import classNames from "classnames";
-import { logger } from "matrix-js-sdk/src/logger";
+import { logger } from "matrix-js-sdk/lib/logger";
 import { usePreviewTracks } from "@livekit/components-react";
 import { type LocalVideoTrack, Track } from "livekit-client";
 import { useObservable } from "observable-hooks";

src/room/MuteStates.ts

@@ -13,7 +13,7 @@ import {
   useMemo,
 } from "react";
 import { type IWidgetApiRequest } from "matrix-widget-api";
-import { logger } from "matrix-js-sdk/src/logger";
+import { logger } from "matrix-js-sdk/lib/logger";
 
 import {
   type MediaDevice,

src/room/RoomAuthView.tsx

@@ -8,7 +8,7 @@ Please see LICENSE in the repository root for full details.
 import { type FC, useCallback, useState } from "react";
 import { useLocation } from "react-router-dom";
 import { Trans, useTranslation } from "react-i18next";
-import { logger } from "matrix-js-sdk/src/logger";
+import { logger } from "matrix-js-sdk/lib/logger";
 import { Button, Heading, Text } from "@vector-im/compound-web";
 
 import styles from "./RoomAuthView.module.css";

src/room/RoomPage.tsx

@@ -13,13 +13,13 @@ import {
   useRef,
   type JSX,
 } from "react";
-import { logger } from "matrix-js-sdk/src/logger";
+import { type MatrixError } from "matrix-js-sdk";
+import { logger } from "matrix-js-sdk/lib/logger";
 import { Trans, useTranslation } from "react-i18next";
 import {
   CheckIcon,
   UnknownSolidIcon,
 } from "@vector-im/compound-design-tokens/assets/web/icons";
-import { type MatrixError } from "matrix-js-sdk/src/http-api";
 
 import { useClientLegacy } from "../ClientContext";
 import { ErrorPage, FullScreenView, LoadingPage } from "../FullScreenView";

src/room/checkForParallelCalls.test.ts

@@ -6,7 +6,7 @@ Please see LICENSE in the repository root for full details.
 */
 
 import { vi, type Mocked, test, expect } from "vitest";
-import { type RoomState } from "matrix-js-sdk/src/models/room-state";
+import { type RoomState } from "matrix-js-sdk";
 
 import { PosthogAnalytics } from "../../src/analytics/PosthogAnalytics";
 import { checkForParallelCalls } from "../../src/room/checkForParallelCalls";

src/room/checkForParallelCalls.ts

@@ -5,8 +5,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 
-import { EventType } from "matrix-js-sdk/src/@types/event";
+import { EventType, type RoomState } from "matrix-js-sdk";
-import { type RoomState } from "matrix-js-sdk/src/models/room-state";
 
 import { PosthogAnalytics } from "../analytics/PosthogAnalytics";
 

src/room/useActiveFocus.ts

@@ -8,14 +8,11 @@ Please see LICENSE in the repository root for full details.
 import {
   type MatrixRTCSession,
   MatrixRTCSessionEvent,
-} from "matrix-js-sdk/src/matrixrtc/MatrixRTCSession";
+} from "matrix-js-sdk/lib/matrixrtc";
 import { useCallback, useEffect, useState } from "react";
-import { deepCompare } from "matrix-js-sdk/src/utils";
+import { deepCompare } from "matrix-js-sdk/lib/utils";
-import { logger } from "matrix-js-sdk/src/logger";
+import { logger } from "matrix-js-sdk/lib/logger";
-import {
+import { type LivekitFocus, isLivekitFocus } from "matrix-js-sdk/lib/matrixrtc";
-  type LivekitFocus,
-  isLivekitFocus,
-} from "matrix-js-sdk/src/matrixrtc/LivekitFocus";
 
 /**
  * Gets the currently active (livekit) focus for a MatrixRTC session

src/room/useJoinRule.ts

@@ -6,9 +6,8 @@ Please see LICENSE in the repository root for full details.
 */
 
 import { useCallback } from "react";
-import { type JoinRule } from "matrix-js-sdk/src/matrix";
 
-import type { Room } from "matrix-js-sdk/src/models/room";
+import type { JoinRule, Room } from "matrix-js-sdk";
 import { useRoomState } from "./useRoomState";
 
 export function useJoinRule(room: Room): JoinRule {

src/room/useLoadGroupCall.ts

@@ -13,18 +13,20 @@ import {
   type ComponentType,
   type SVGAttributes,
 } from "react";
-import { logger } from "matrix-js-sdk/src/logger";
-import { EventType } from "matrix-js-sdk/src/@types/event";
 import {
+  JoinRule,
+  EventType,
+  SyncState,
+  MatrixError,
+  KnownMembership,
   ClientEvent,
   type MatrixClient,
   type RoomSummary,
-} from "matrix-js-sdk/src/client";
+  RoomEvent,
-import { SyncState } from "matrix-js-sdk/src/sync";
+  type Room,
-import { type MatrixRTCSession } from "matrix-js-sdk/src/matrixrtc/MatrixRTCSession";
+} from "matrix-js-sdk";
-import { RoomEvent, type Room } from "matrix-js-sdk/src/models/room";
+import { logger } from "matrix-js-sdk/lib/logger";
-import { KnownMembership } from "matrix-js-sdk/src/types";
+import { type MatrixRTCSession } from "matrix-js-sdk/lib/matrixrtc";
-import { JoinRule, MatrixError } from "matrix-js-sdk/src/matrix";
 import { useTranslation } from "react-i18next";
 import {
   AdminIcon,

src/room/useRoomAvatar.ts

@@ -6,7 +6,7 @@ Please see LICENSE in the repository root for full details.
 */
 
 import { useCallback } from "react";
-import { type Room } from "matrix-js-sdk/src/models/room";
+import { type Room } from "matrix-js-sdk";
 
 import { useRoomState } from "./useRoomState";
 

src/room/useRoomName.ts

@@ -5,7 +5,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 
-import { type Room, RoomEvent } from "matrix-js-sdk/src/matrix";
+import { type Room, RoomEvent } from "matrix-js-sdk";
 import { useState } from "react";
 
 import { useTypedEventEmitter } from "../useEvents";

src/room/useRoomState.ts

@@ -5,13 +5,9 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 
-import {
-  type RoomState,
-  RoomStateEvent,
-} from "matrix-js-sdk/src/models/room-state";
 import { useCallback, useMemo, useState } from "react";
+import { type RoomState, RoomStateEvent, type Room } from "matrix-js-sdk";
 
-import type { Room } from "matrix-js-sdk/src/models/room";
 import { useTypedEventEmitter } from "../useEvents";
 
 /**

src/room/useSwitchCamera.ts

@@ -20,7 +20,7 @@ import {
   TrackEvent,
 } from "livekit-client";
 import { useObservable, useObservableEagerState } from "observable-hooks";
-import { logger } from "matrix-js-sdk/src/logger";
+import { logger } from "matrix-js-sdk/lib/logger";
 
 import { useMediaDevices } from "../livekit/MediaDevicesContext";
 import { platform } from "../Platform";

src/rtcSessionHelpers.test.ts

@@ -5,9 +5,9 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 
-import { type MatrixRTCSession } from "matrix-js-sdk/src/matrixrtc/MatrixRTCSession";
+import { type MatrixRTCSession } from "matrix-js-sdk/lib/matrixrtc";
 import { expect, onTestFinished, test, vi } from "vitest";
-import { AutoDiscovery } from "matrix-js-sdk/src/autodiscovery";
+import { AutoDiscovery } from "matrix-js-sdk/lib/autodiscovery";
 import EventEmitter from "events";
 
 import { enterRTCSession, leaveRTCSession } from "../src/rtcSessionHelpers";

src/rtcSessionHelpers.ts

@@ -5,15 +5,15 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 
-import { type MatrixRTCSession } from "matrix-js-sdk/src/matrixrtc/MatrixRTCSession";
+import { type MatrixRTCSession } from "matrix-js-sdk/lib/matrixrtc";
-import { logger } from "matrix-js-sdk/src/logger";
+import { logger } from "matrix-js-sdk/lib/logger";
 import {
   isLivekitFocus,
   isLivekitFocusConfig,
   type LivekitFocus,
   type LivekitFocusActive,
-} from "matrix-js-sdk/src/matrixrtc/LivekitFocus";
+} from "matrix-js-sdk/lib/matrixrtc";
-import { AutoDiscovery } from "matrix-js-sdk/src/autodiscovery";
+import { AutoDiscovery } from "matrix-js-sdk/lib/autodiscovery";
 
 import { PosthogAnalytics } from "./analytics/PosthogAnalytics";
 import { Config } from "./config/Config";

src/settings/DeveloperSettingsTab.tsx

@@ -17,7 +17,7 @@ import {
   showConnectionStats as showConnectionStatsSetting,
   useNewMembershipManagerSetting,
 } from "./settings";
-import type { MatrixClient } from "matrix-js-sdk/src/client";
+import type { MatrixClient } from "matrix-js-sdk";
 import type { Room as LivekitRoom } from "livekit-client";
 import styles from "./DeveloperSettingsTab.module.css";
 interface Props {

src/settings/FeedbackSettingsTab.tsx

@@ -6,10 +6,10 @@ Please see LICENSE in the repository root for full details.
 */
 
 import { type ChangeEvent, type FC, useCallback } from "react";
-import { secureRandomString } from "matrix-js-sdk/src/randomstring";
+import { secureRandomString } from "matrix-js-sdk/lib/randomstring";
 import { Trans, useTranslation } from "react-i18next";
 import { Button, Text } from "@vector-im/compound-web";
-import { logger } from "matrix-js-sdk/src/logger";
+import { logger } from "matrix-js-sdk/lib/logger";
 
 import { FieldRow, InputField, ErrorMessage } from "../input/Input";
 import { useSubmitRageshake, useRageshakeRequest } from "./submit-rageshake";

src/settings/ProfileSettingsTab.tsx

@@ -6,9 +6,9 @@ Please see LICENSE in the repository root for full details.
 */
 
 import { type FC, useCallback, useEffect, useMemo, useRef } from "react";
-import { type MatrixClient } from "matrix-js-sdk/src/client";
+import { type MatrixClient } from "matrix-js-sdk";
 import { useTranslation } from "react-i18next";
-import { logger } from "matrix-js-sdk/src/logger";
+import { logger } from "matrix-js-sdk/lib/logger";
 
 import { useProfile } from "../profile/useProfile";
 import { FieldRow, InputField, ErrorMessage } from "../input/Input";

src/settings/RageshakeButton.tsx

@@ -8,7 +8,7 @@ Please see LICENSE in the repository root for full details.
 import { useTranslation } from "react-i18next";
 import { type FC, useCallback, type JSX } from "react";
 import { Button } from "@vector-im/compound-web";
-import { logger } from "matrix-js-sdk/src/logger";
+import { logger } from "matrix-js-sdk/lib/logger";
 
 import { Config } from "../config/Config";
 import styles from "./RageshakeButton.module.css";

src/settings/SettingsModal.tsx

@@ -7,7 +7,7 @@ Please see LICENSE in the repository root for full details.
 
 import { type FC, useState } from "react";
 import { useTranslation } from "react-i18next";
-import { type MatrixClient } from "matrix-js-sdk/src/matrix";
+import { type MatrixClient } from "matrix-js-sdk";
 import { Root as Form } from "@vector-im/compound-web";
 import { type Room as LivekitRoom } from "livekit-client";
 

src/settings/rageshake.ts

@@ -29,8 +29,8 @@ Please see LICENSE in the repository root for full details.
 
 import EventEmitter from "events";
 import { throttle } from "lodash-es";
-import { type Logger, logger } from "matrix-js-sdk/src/logger";
+import { type Logger, logger } from "matrix-js-sdk/lib/logger";
-import { secureRandomString } from "matrix-js-sdk/src/randomstring";
+import { secureRandomString } from "matrix-js-sdk/lib/randomstring";
 import { type LoggingMethod } from "loglevel";
 
 import type loglevel from "loglevel";

src/settings/settings.ts

@@ -5,7 +5,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 
-import { logger } from "matrix-js-sdk/src/logger";
+import { logger } from "matrix-js-sdk/lib/logger";
 import { BehaviorSubject, type Observable } from "rxjs";
 import { useObservableEagerState } from "observable-hooks";
 

src/settings/submit-rageshake.ts

@@ -6,13 +6,13 @@ Please see LICENSE in the repository root for full details.
 */
 
 import { type ComponentProps, useCallback, useEffect, useState } from "react";
-import { logger } from "matrix-js-sdk/src/logger";
+import { logger } from "matrix-js-sdk/lib/logger";
 import {
   ClientEvent,
   type MatrixClient,
   type MatrixEvent,
-} from "matrix-js-sdk/src/matrix";
+} from "matrix-js-sdk";
-import { type CryptoApi } from "matrix-js-sdk/src/crypto-api";
+import { type CryptoApi } from "matrix-js-sdk/lib/crypto-api";
 
 import { getLogsForReport } from "./rageshake";
 import { useClient } from "../ClientContext";

src/soundUtils.ts

@@ -5,7 +5,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 
-import { logger } from "matrix-js-sdk/src/logger";
+import { logger } from "matrix-js-sdk/lib/logger";
 
 import { isFailure } from "./utils/fetch";
 

src/state/CallViewModel.test.ts

@@ -17,7 +17,7 @@ import {
   skip,
   switchMap,
 } from "rxjs";
-import { type MatrixClient } from "matrix-js-sdk/src/matrix";
+import { type MatrixClient } from "matrix-js-sdk";
 import {
   ConnectionState,
   type LocalParticipant,
@@ -30,7 +30,7 @@ import { isEqual } from "lodash-es";
 import {
   type CallMembership,
   type MatrixRTCSession,
-} from "matrix-js-sdk/src/matrixrtc";
+} from "matrix-js-sdk/lib/matrixrtc";
 
 import { CallViewModel, type Layout } from "./CallViewModel";
 import {

src/state/CallViewModel.ts

@@ -18,11 +18,7 @@ import {
   type RemoteParticipant,
   Track,
 } from "livekit-client";
-import {
+import { RoomStateEvent, type Room, type RoomMember } from "matrix-js-sdk";
-  RoomStateEvent,
-  type Room,
-  type RoomMember,
-} from "matrix-js-sdk/src/matrix";
 import {
   BehaviorSubject,
   EMPTY,
@@ -49,12 +45,12 @@ import {
   timer,
   withLatestFrom,
 } from "rxjs";
-import { logger } from "matrix-js-sdk/src/logger";
+import { logger } from "matrix-js-sdk/lib/logger";
 import {
   type CallMembership,
   type MatrixRTCSession,
   MatrixRTCSessionEvent,
-} from "matrix-js-sdk/src/matrixrtc";
+} from "matrix-js-sdk/lib/matrixrtc";
 
 import { ViewModel } from "./ViewModel";
 import {

src/state/MediaViewModel.ts

@@ -26,7 +26,7 @@ import {
   RoomEvent as LivekitRoomEvent,
   RemoteTrack,
 } from "livekit-client";
-import { type RoomMember } from "matrix-js-sdk/src/matrix";
+import { type RoomMember } from "matrix-js-sdk";
 import {
   BehaviorSubject,
   type Observable,

src/state/TileStore.ts

@@ -6,7 +6,7 @@ Please see LICENSE in the repository root for full details.
 */
 
 import { BehaviorSubject } from "rxjs";
-import { logger } from "matrix-js-sdk/src/logger";
+import { logger } from "matrix-js-sdk/lib/logger";
 
 import { type MediaViewModel, type UserMediaViewModel } from "./MediaViewModel";
 import { GridTileViewModel, SpotlightTileViewModel } from "./TileViewModel";

src/tile/GridTile.test.tsx

@@ -10,7 +10,7 @@ import { test, expect } from "vitest";
 import { render, screen } from "@testing-library/react";
 import { axe } from "vitest-axe";
 import { of } from "rxjs";
-import { type MatrixRTCSession } from "matrix-js-sdk/src/matrixrtc/MatrixRTCSession";
+import { type MatrixRTCSession } from "matrix-js-sdk/lib/matrixrtc";
 
 import { GridTile } from "./GridTile";
 import { mockRtcMembership, withRemoteMedia } from "../utils/test";

src/tile/MediaView.tsx

@@ -7,7 +7,7 @@ Please see LICENSE in the repository root for full details.
 
 import { type TrackReferenceOrPlaceholder } from "@livekit/components-core";
 import { animated } from "@react-spring/web";
-import { type RoomMember } from "matrix-js-sdk/src/matrix";
+import { type RoomMember } from "matrix-js-sdk";
 import { type ComponentProps, type ReactNode, forwardRef } from "react";
 import { useTranslation } from "react-i18next";
 import classNames from "classnames";

src/tile/SpotlightTile.tsx

@@ -26,7 +26,7 @@ import { useObservableEagerState, useObservableRef } from "observable-hooks";
 import { useTranslation } from "react-i18next";
 import classNames from "classnames";
 import { type TrackReferenceOrPlaceholder } from "@livekit/components-core";
-import { type RoomMember } from "matrix-js-sdk/src/matrix";
+import { type RoomMember } from "matrix-js-sdk";
 
 import { MediaView } from "./MediaView";
 import styles from "./SpotlightTile.module.css";

src/useAudioContext.tsx

@@ -5,7 +5,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 
-import { logger } from "matrix-js-sdk/src/logger";
+import { logger } from "matrix-js-sdk/lib/logger";
 import { useState, useEffect } from "react";
 
 import {

src/useEvents.ts

@@ -11,7 +11,7 @@ import type {
   Listener,
   ListenerMap,
   TypedEventEmitter,
-} from "matrix-js-sdk/src/models/typed-event-emitter";
+} from "matrix-js-sdk/lib/models/typed-event-emitter";
 
 // Shortcut for registering a listener on an EventTarget
 export function useEventTarget<T extends Event>(

src/useMatrixRTCSessionJoinState.ts

@@ -5,11 +5,11 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 
-import { logger } from "matrix-js-sdk/src/logger";
+import { logger } from "matrix-js-sdk/lib/logger";
 import {
   type MatrixRTCSession,
   MatrixRTCSessionEvent,
-} from "matrix-js-sdk/src/matrixrtc/MatrixRTCSession";
+} from "matrix-js-sdk/lib/matrixrtc";
 import { useEffect, useState } from "react";
 
 export function useMatrixRTCSessionJoinState(

src/useMatrixRTCSessionMemberships.ts

@@ -5,12 +5,12 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 
-import { logger } from "matrix-js-sdk/src/logger";
+import { logger } from "matrix-js-sdk/lib/logger";
-import { type CallMembership } from "matrix-js-sdk/src/matrixrtc/CallMembership";
 import {
+  type CallMembership,
   type MatrixRTCSession,
   MatrixRTCSessionEvent,
-} from "matrix-js-sdk/src/matrixrtc/MatrixRTCSession";
+} from "matrix-js-sdk/lib/matrixrtc";
 import { useCallback, useEffect, useState } from "react";
 
 export function useMatrixRTCSessionMemberships(

src/useTheme.ts

@@ -7,7 +7,7 @@ Please see LICENSE in the repository root for full details.
 
 import { useEffect, useLayoutEffect, useRef, useState } from "react";
 import { WidgetApiToWidgetAction } from "matrix-widget-api";
-import { type IThemeChangeActionRequest } from "matrix-widget-api/lib/interfaces/ThemeChangeAction";
+import { type IThemeChangeActionRequest } from "matrix-widget-api";
 
 import { getUrlParams } from "./UrlParams";
 import { widget } from "./widget";

src/useWakeLock.ts

@@ -5,7 +5,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 
-import { logger } from "matrix-js-sdk/src/logger";
+import { logger } from "matrix-js-sdk/lib/logger";
 import { useEffect } from "react";
 
 /**

src/utils/displayname-integration.test.ts

@@ -14,14 +14,14 @@ import { mockMatrixRoom } from "./test";
 // Ideally these tests would be in ./displayname.test.ts but I can't figure out how to
 // just spy on the removeHiddenChars() function without impacting the other tests.
 // So, these tests are in this separate test file.
-vi.mock("matrix-js-sdk/src/utils");
+vi.mock("matrix-js-sdk/lib/utils");
 
 describe("shouldDisambiguate", () => {
   // eslint-disable-next-line @typescript-eslint/consistent-type-imports
-  let jsUtils: typeof import("matrix-js-sdk/src/utils");
+  let jsUtils: typeof import("matrix-js-sdk/lib/utils");
 
   beforeAll(async () => {
-    jsUtils = await import("matrix-js-sdk/src/utils");
+    jsUtils = await import("matrix-js-sdk/lib/utils");
     vi.spyOn(jsUtils, "removeHiddenChars").mockImplementation((str) => str);
   });
   afterEach(() => {

src/utils/displayname.ts

@@ -8,10 +8,10 @@ Please see LICENSE in the repository root for full details.
 import {
   removeDirectionOverrideChars,
   removeHiddenChars as removeHiddenCharsUncached,
-} from "matrix-js-sdk/src/utils";
+} from "matrix-js-sdk/lib/utils";
 
-import type { Room } from "matrix-js-sdk/src/matrix";
+import type { Room } from "matrix-js-sdk";
-import type { CallMembership } from "matrix-js-sdk/src/matrixrtc";
+import type { CallMembership } from "matrix-js-sdk/lib/matrixrtc";
 
 // Calling removeHiddenChars() can be slow on Safari, so we cache the results.
 // To illustrate a simple benchmark:

src/utils/matrix.ts

@@ -5,23 +5,21 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 
-import { IndexedDBStore } from "matrix-js-sdk/src/store/indexeddb";
-import { MemoryStore } from "matrix-js-sdk/src/store/memory";
 import {
+  ClientEvent,
   calculateRetryBackoff,
   createClient,
-  type ICreateClientOpts,
+  IndexedDBStore,
+  MemoryStore,
   Preset,
   Visibility,
-} from "matrix-js-sdk/src/matrix";
+} from "matrix-js-sdk";
-import { ClientEvent } from "matrix-js-sdk/src/client";
+import { type ISyncStateData, type SyncState } from "matrix-js-sdk/lib/sync";
-import { type ISyncStateData, type SyncState } from "matrix-js-sdk/src/sync";
+import { logger } from "matrix-js-sdk/lib/logger";
-import { logger } from "matrix-js-sdk/src/logger";
+import { secureRandomBase64Url } from "matrix-js-sdk/lib/randomstring";
-import { secureRandomBase64Url } from "matrix-js-sdk/src/randomstring";
+import { sleep } from "matrix-js-sdk/lib/utils";
-import { sleep } from "matrix-js-sdk/src/utils";
 
-import type { MatrixClient } from "matrix-js-sdk/src/client";
+import type { ICreateClientOpts, MatrixClient, Room } from "matrix-js-sdk";
-import type { Room } from "matrix-js-sdk/src/models/room";
 import IndexedDBWorker from "../IndexedDBWorker?worker";
 import { generateUrlSearchParams, getUrlParams } from "../UrlParams";
 import { Config } from "../config/Config";

src/utils/spa.ts

@@ -5,9 +5,8 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 
-import { type ICreateClientOpts } from "matrix-js-sdk/src/client";
+import { type ICreateClientOpts, MatrixError } from "matrix-js-sdk";
-import { MatrixError } from "matrix-js-sdk/src/http-api";
+import { logger } from "matrix-js-sdk/lib/logger";
-import { logger } from "matrix-js-sdk/src/logger";
 
 import { Config } from "../config/Config";
 import { fallbackICEServerAllowed, initClient } from "./matrix";

src/utils/test-viewmodel.ts

@@ -6,17 +6,16 @@ Please see LICENSE in the repository root for full details.
 */
 
 import { ConnectionState } from "livekit-client";
-import { type MatrixClient } from "matrix-js-sdk/src/client";
-import { type RoomMember } from "matrix-js-sdk/src/matrix";
 import {
   type CallMembership,
   type MatrixRTCSession,
-} from "matrix-js-sdk/src/matrixrtc";
+} from "matrix-js-sdk/lib/matrixrtc";
 import { BehaviorSubject, of } from "rxjs";
 import { vitest } from "vitest";
-import { type RelationsContainer } from "matrix-js-sdk/src/models/relations-container";
+import { type RelationsContainer } from "matrix-js-sdk/lib/models/relations-container";
 import EventEmitter from "events";
 
+import type { RoomMember, MatrixClient } from "matrix-js-sdk";
 import { E2eeType } from "../e2ee/e2eeType";
 import { CallViewModel } from "../state/CallViewModel";
 import { mockLivekitRoom, mockMatrixRoom, MockRTCSession } from "./test";

src/utils/test.ts

@@ -13,14 +13,14 @@ import {
   MatrixEvent,
   type Room,
   TypedEventEmitter,
-} from "matrix-js-sdk/src/matrix";
+} from "matrix-js-sdk";
 import {
   CallMembership,
   type Focus,
   MatrixRTCSessionEvent,
   type MatrixRTCSessionEventHandlerMap,
   type SessionMembershipData,
-} from "matrix-js-sdk/src/matrixrtc";
+} from "matrix-js-sdk/lib/matrixrtc";
 import {
   type LocalParticipant,
   type LocalTrackPublication,