From f0545ced65e7408e561623697e2b50a8c632a052 Mon Sep 17 00:00:00 2001 From: Timo Date: Thu, 13 Mar 2025 18:15:58 +0100 Subject: [PATCH] make it work withotu js-sdk changes --- src/ClientContext.tsx | 2 +- src/auth/useRecaptcha.ts | 2 +- src/auth/useRegisterPasswordlessUser.ts | 2 +- src/home/UnauthenticatedView.tsx | 2 +- src/room/GroupCallView.test.tsx | 2 +- src/room/GroupCallView.tsx | 2 +- src/room/InCallView.tsx | 2 +- src/room/MuteStates.ts | 2 +- src/settings/FeedbackSettingsTab.tsx | 2 +- src/settings/rageshake.ts | 2 +- src/useTheme.test.ts | 2 +- src/useTheme.ts | 4 ++-- src/utils/matrix.ts | 2 +- src/utils/test-viewmodel.ts | 2 +- src/widget.ts | 6 +++--- yarn.lock | 2 +- 16 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/ClientContext.tsx b/src/ClientContext.tsx index 01f5e848..25db3ca0 100644 --- a/src/ClientContext.tsx +++ b/src/ClientContext.tsx @@ -21,7 +21,7 @@ import { logger } from "matrix-js-sdk/lib/logger"; import { type ISyncStateData, type SyncState } from "matrix-js-sdk/lib/sync"; import { ClientEvent, type MatrixClient } from "matrix-js-sdk"; -import type { WidgetApi } from "matrix-js-sdk/lib/matrix-widget-api"; +import type { WidgetApi } from "matrix-widget-api"; import { ErrorPage } from "./FullScreenView"; import { widget } from "./widget"; import { diff --git a/src/auth/useRecaptcha.ts b/src/auth/useRecaptcha.ts index 738d5569..890c55fe 100644 --- a/src/auth/useRecaptcha.ts +++ b/src/auth/useRecaptcha.ts @@ -6,7 +6,7 @@ Please see LICENSE in the repository root for full details. */ import { useEffect, useCallback, useRef, useState } from "react"; -import { secureRandomString } from "matrix-js-sdk"; +import { secureRandomString } from "matrix-js-sdk/lib/randomstring"; import { useTranslation } from "react-i18next"; import { logger } from "matrix-js-sdk/lib/logger"; diff --git a/src/auth/useRegisterPasswordlessUser.ts b/src/auth/useRegisterPasswordlessUser.ts index e1160a89..e7c0626d 100644 --- a/src/auth/useRegisterPasswordlessUser.ts +++ b/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"; +import { secureRandomString } from "matrix-js-sdk/lib/randomstring"; import { useClient } from "../ClientContext"; import { useInteractiveRegistration } from "../auth/useInteractiveRegistration"; diff --git a/src/home/UnauthenticatedView.tsx b/src/home/UnauthenticatedView.tsx index be34f8f6..a0ef7c96 100644 --- a/src/home/UnauthenticatedView.tsx +++ b/src/home/UnauthenticatedView.tsx @@ -6,7 +6,7 @@ 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"; +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/lib/logger"; diff --git a/src/room/GroupCallView.test.tsx b/src/room/GroupCallView.test.tsx index aad1827b..0283bef1 100644 --- a/src/room/GroupCallView.test.tsx +++ b/src/room/GroupCallView.test.tsx @@ -13,7 +13,7 @@ import { of } from "rxjs"; import { JoinRule, type RoomState } from "matrix-js-sdk"; import { BrowserRouter } from "react-router-dom"; import userEvent from "@testing-library/user-event"; -import { type RelationsContainer } from "matrix-js-sdk"; +import { type RelationsContainer } from "matrix-js-sdk/lib/models/relations-container"; import { useState } from "react"; import { type MuteStates } from "./MuteStates"; diff --git a/src/room/GroupCallView.tsx b/src/room/GroupCallView.tsx index c6e7e3a8..06fcfa4e 100644 --- a/src/room/GroupCallView.tsx +++ b/src/room/GroupCallView.tsx @@ -26,7 +26,7 @@ import { import { JoinRule, type Room } from "matrix-js-sdk"; import { useNavigate } from "react-router-dom"; -import type { IWidgetApiRequest } from "matrix-js-sdk/lib/matrix-widget-api"; +import type { IWidgetApiRequest } from "matrix-widget-api"; import { ElementWidgetActions, type JoinCallData, diff --git a/src/room/InCallView.tsx b/src/room/InCallView.tsx index 99f8a282..53742fc2 100644 --- a/src/room/InCallView.tsx +++ b/src/room/InCallView.tsx @@ -34,7 +34,7 @@ import { logger } from "matrix-js-sdk/lib/logger"; import LogoMark from "../icons/LogoMark.svg?react"; import LogoType from "../icons/LogoType.svg?react"; -import type { IWidgetApiRequest } from "matrix-js-sdk/lib/matrix-widget-api"; +import type { IWidgetApiRequest } from "matrix-widget-api"; import { EndCallButton, MicButton, diff --git a/src/room/MuteStates.ts b/src/room/MuteStates.ts index af78d2eb..e57ba7d5 100644 --- a/src/room/MuteStates.ts +++ b/src/room/MuteStates.ts @@ -12,7 +12,7 @@ import { useEffect, useMemo, } from "react"; -import { type IWidgetApiRequest } from "matrix-js-sdk/lib/matrix-widget-api"; +import { type IWidgetApiRequest } from "matrix-widget-api"; import { logger } from "matrix-js-sdk/lib/logger"; import { diff --git a/src/settings/FeedbackSettingsTab.tsx b/src/settings/FeedbackSettingsTab.tsx index 2e330a28..07a0202e 100644 --- a/src/settings/FeedbackSettingsTab.tsx +++ b/src/settings/FeedbackSettingsTab.tsx @@ -6,7 +6,7 @@ Please see LICENSE in the repository root for full details. */ import { type ChangeEvent, type FC, useCallback } from "react"; -import { secureRandomString } from "matrix-js-sdk"; +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/lib/logger"; diff --git a/src/settings/rageshake.ts b/src/settings/rageshake.ts index 5e37d5b7..21ed5956 100644 --- a/src/settings/rageshake.ts +++ b/src/settings/rageshake.ts @@ -30,7 +30,7 @@ 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/lib/logger"; -import { secureRandomString } from "matrix-js-sdk"; +import { secureRandomString } from "matrix-js-sdk/lib/randomstring"; import { type LoggingMethod } from "loglevel"; import type loglevel from "loglevel"; diff --git a/src/useTheme.test.ts b/src/useTheme.test.ts index 7e8868fa..6e471462 100644 --- a/src/useTheme.test.ts +++ b/src/useTheme.test.ts @@ -16,7 +16,7 @@ import { vi, } from "vitest"; import EventEmitter from "events"; -import { WidgetApiToWidgetAction } from "matrix-js-sdk/lib/matrix-widget-api"; +import { WidgetApiToWidgetAction } from "matrix-widget-api"; import { useTheme } from "./useTheme"; import { getUrlParams } from "./UrlParams"; diff --git a/src/useTheme.ts b/src/useTheme.ts index 93ee55d4..e992aee7 100644 --- a/src/useTheme.ts +++ b/src/useTheme.ts @@ -6,8 +6,8 @@ Please see LICENSE in the repository root for full details. */ import { useEffect, useLayoutEffect, useRef, useState } from "react"; -import { WidgetApiToWidgetAction } from "matrix-js-sdk/lib/matrix-widget-api"; -import { type IThemeChangeActionRequest } from "matrix-js-sdk/lib/matrix-widget-api"; +import { WidgetApiToWidgetAction } from "matrix-widget-api"; +import { type IThemeChangeActionRequest } from "matrix-widget-api"; import { getUrlParams } from "./UrlParams"; import { widget } from "./widget"; diff --git a/src/utils/matrix.ts b/src/utils/matrix.ts index 27bc3bc8..acc7fa11 100644 --- a/src/utils/matrix.ts +++ b/src/utils/matrix.ts @@ -16,7 +16,7 @@ import { import { ClientEvent } from "matrix-js-sdk"; import { type ISyncStateData, type SyncState } from "matrix-js-sdk/lib/sync"; import { logger } from "matrix-js-sdk/lib/logger"; -import { secureRandomBase64Url } from "matrix-js-sdk"; +import { secureRandomBase64Url } from "matrix-js-sdk/lib/randomstring"; import type { MatrixClient, Room } from "matrix-js-sdk"; import IndexedDBWorker from "../IndexedDBWorker?worker"; diff --git a/src/utils/test-viewmodel.ts b/src/utils/test-viewmodel.ts index 9723d8ed..ca358c2c 100644 --- a/src/utils/test-viewmodel.ts +++ b/src/utils/test-viewmodel.ts @@ -14,7 +14,7 @@ import { } from "matrix-js-sdk/lib/matrixrtc"; import { BehaviorSubject, of } from "rxjs"; import { vitest } from "vitest"; -import { type RelationsContainer } from "matrix-js-sdk"; +import { type RelationsContainer } from "matrix-js-sdk/lib/models/relations-container"; import EventEmitter from "events"; import { E2eeType } from "../e2ee/e2eeType"; diff --git a/src/widget.ts b/src/widget.ts index f7fe053d..d3124dc9 100644 --- a/src/widget.ts +++ b/src/widget.ts @@ -6,16 +6,16 @@ Please see LICENSE in the repository root for full details. */ import { logger } from "matrix-js-sdk/lib/logger"; -import { EventType } from "matrix-js-sdk/lib/types"; +import { EventType } from "matrix-js-sdk"; import { createRoomWidgetClient } from "matrix-js-sdk"; import { WidgetApi, MatrixCapabilities, WidgetApiToWidgetAction, -} from "matrix-js-sdk/lib/matrix-widget-api"; +} from "matrix-widget-api"; import type { MatrixClient } from "matrix-js-sdk"; -import type { IWidgetApiRequest } from "matrix-js-sdk/lib/matrix-widget-api"; +import type { IWidgetApiRequest } from "matrix-widget-api"; import { LazyEventEmitter } from "./LazyEventEmitter"; import { getUrlParams } from "./UrlParams"; import { Config } from "./config/Config"; diff --git a/yarn.lock b/yarn.lock index 9b560160..c6b9c56b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6512,7 +6512,7 @@ matrix-events-sdk@0.0.1: unhomoglyph "^1.0.6" uuid "11" -matrix-widget-api@^1.10.0: +matrix-widget-api@1.11.0, matrix-widget-api@^1.10.0: version "1.11.0" resolved "https://registry.yarnpkg.com/matrix-widget-api/-/matrix-widget-api-1.11.0.tgz#2f548b11a7c0df789d5d4fdb5cc9ef7af8aef3da" integrity sha512-ED/9hrJqDWVLeED0g1uJnYRhINh3ZTquwurdM+Hc8wLVJIQ8G/r7A7z74NC+8bBIHQ1Jo7i1Uq5CoJp/TzFYrA==