Skip to content

Commit f845397

Browse files
authored
Merge pull request #3093 from element-hq/toger5/src-to-lib-import
Transition from consuming js-sdk source to `lib` (build output)
2 parents 21140f6 + aab4efe commit f845397

File tree

103 files changed

+209
-225
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

103 files changed

+209
-225
lines changed

src/@types/global.d.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
55
Please see LICENSE in the repository root for full details.
66
*/
77

8-
import "matrix-js-sdk/src/@types/global";
98
import { type setLogLevel as setLKLogLevel } from "livekit-client";
109

1110
import type { DurationFormat as PolyfillDurationFormat } from "@formatjs/intl-durationformat";

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {
1111
} from "../reactions";
1212

1313
// Extend Matrix JS SDK types via Typescript declaration merging to support unspecced event fields and types
14-
declare module "matrix-js-sdk/src/types" {
14+
declare module "matrix-js-sdk/lib/types" {
1515
export interface TimelineEvents {
1616
[ElementCallReactionEventType]: ECallReactionEventContent;
1717
}

src/App.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { type FC, type JSX, Suspense, useEffect, useState } from "react";
99
import { BrowserRouter, Route, useLocation, Routes } from "react-router-dom";
1010
import * as Sentry from "@sentry/react";
1111
import { TooltipProvider } from "@vector-im/compound-web";
12-
import { logger } from "matrix-js-sdk/src/logger";
12+
import { logger } from "matrix-js-sdk/lib/logger";
1313

1414
import { HomePage } from "./home/HomePage";
1515
import { LoginPage } from "./auth/LoginPage";

src/Avatar.test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Please see LICENSE in the repository root for full details.
77

88
import { afterEach, expect, test, vi } from "vitest";
99
import { render, screen } from "@testing-library/react";
10-
import { type MatrixClient } from "matrix-js-sdk/src/client";
10+
import { type MatrixClient } from "matrix-js-sdk";
1111
import { type FC, type PropsWithChildren } from "react";
1212

1313
import { ClientContextProvider } from "./ClientContext";

src/Avatar.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import {
1313
useEffect,
1414
} from "react";
1515
import { Avatar as CompoundAvatar } from "@vector-im/compound-web";
16-
import { type MatrixClient } from "matrix-js-sdk/src/client";
16+
import { type MatrixClient } from "matrix-js-sdk";
1717

1818
import { useClientState } from "./ClientContext";
1919

src/ClientContext.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ import {
1717
type JSX,
1818
} from "react";
1919
import { useNavigate } from "react-router-dom";
20-
import { logger } from "matrix-js-sdk/src/logger";
21-
import { type ISyncStateData, type SyncState } from "matrix-js-sdk/src/sync";
22-
import { ClientEvent, type MatrixClient } from "matrix-js-sdk/src/client";
20+
import { logger } from "matrix-js-sdk/lib/logger";
21+
import { type ISyncStateData, type SyncState } from "matrix-js-sdk/lib/sync";
22+
import { ClientEvent, type MatrixClient } from "matrix-js-sdk";
2323

2424
import type { WidgetApi } from "matrix-widget-api";
2525
import { ErrorPage } from "./FullScreenView";

src/ErrorView.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import {
1515
type ReactElement,
1616
} from "react";
1717
import { useTranslation } from "react-i18next";
18-
import { logger } from "matrix-js-sdk/src/logger";
18+
import { logger } from "matrix-js-sdk/lib/logger";
1919

2020
import { RageshakeButton } from "./settings/RageshakeButton";
2121
import styles from "./ErrorView.module.css";

src/FullScreenView.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { type FC, type ReactElement, type ReactNode, useEffect } from "react";
99
import classNames from "classnames";
1010
import { useTranslation } from "react-i18next";
1111
import * as Sentry from "@sentry/react";
12-
import { logger } from "matrix-js-sdk/src/logger";
12+
import { logger } from "matrix-js-sdk/lib/logger";
1313
import { ErrorIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
1414

1515
import { Header, HeaderLogo, LeftNav, RightNav } from "./Header";

src/IndexedDBWorker.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
55
Please see LICENSE in the repository root for full details.
66
*/
77

8-
import { IndexedDBStoreWorker } from "matrix-js-sdk/src/indexeddb-worker";
8+
import { IndexedDBStoreWorker } from "matrix-js-sdk/lib/indexeddb-worker";
99

1010
// eslint-disable-next-line @typescript-eslint/no-explicit-any
1111
const remoteWorker = new IndexedDBStoreWorker((self as any).postMessage);

src/UrlParams.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Please see LICENSE in the repository root for full details.
77

88
import { useMemo } from "react";
99
import { useLocation } from "react-router-dom";
10-
import { logger } from "matrix-js-sdk/src/logger";
10+
import { logger } from "matrix-js-sdk/lib/logger";
1111

1212
import { Config } from "./config/Config";
1313
import { type EncryptionSystem } from "./e2ee/sharedKeyManagement";

0 commit comments

Comments
 (0)