diff --git a/src/app/features/settings/notifications/PushNotifications.tsx b/src/app/features/settings/notifications/PushNotifications.tsx index 3e1683f8..08310d28 100644 --- a/src/app/features/settings/notifications/PushNotifications.tsx +++ b/src/app/features/settings/notifications/PushNotifications.tsx @@ -1,4 +1,4 @@ -import { MatrixClient } from 'matrix-js-sdk'; +import { MatrixClient } from '$types/matrix-sdk'; import { ClientConfig } from '../../../hooks/useClientConfig'; type PushSubscriptionState = [ diff --git a/src/app/hooks/useAppVisibility.ts b/src/app/hooks/useAppVisibility.ts index 6e2ff2bf..0688f263 100644 --- a/src/app/hooks/useAppVisibility.ts +++ b/src/app/hooks/useAppVisibility.ts @@ -1,5 +1,5 @@ import { useEffect } from 'react'; -import { MatrixClient } from 'matrix-js-sdk'; +import { MatrixClient } from '$types/matrix-sdk'; import { useAtom } from 'jotai'; import { togglePusher } from '../features/settings/notifications/PushNotifications'; import { appEvents } from '../utils/appEvents'; diff --git a/src/app/pages/client/ToRoomEvent.tsx b/src/app/pages/client/ToRoomEvent.tsx index 8b4d3558..41d47b81 100644 --- a/src/app/pages/client/ToRoomEvent.tsx +++ b/src/app/pages/client/ToRoomEvent.tsx @@ -1,7 +1,7 @@ import { useEffect, useState, useCallback } from 'react'; import { useParams } from 'react-router-dom'; import { useAtomValue } from 'jotai'; -import { SyncState } from 'matrix-js-sdk'; +import { SyncState } from '$types/matrix-sdk'; import { useRoomNavigate } from '../../hooks/useRoomNavigate'; import { useMatrixClient } from '../../hooks/useMatrixClient'; diff --git a/src/types/matrix-sdk.ts b/src/types/matrix-sdk.ts index 2e08feca..f5063275 100644 --- a/src/types/matrix-sdk.ts +++ b/src/types/matrix-sdk.ts @@ -1,8 +1,12 @@ +import { MatrixClient, ICreateClientOpts } from 'matrix-js-sdk/lib/client'; +import { MatrixScheduler } from 'matrix-js-sdk/lib/scheduler'; +import { MemoryStore } from 'matrix-js-sdk/lib/store/memory'; +import { MemoryCryptoStore } from 'matrix-js-sdk/lib/crypto/store/memory-crypto-store'; + // App-facing Matrix SDK import boundary. // Import Matrix symbols from this module instead of matrix-js-sdk directly. export * from 'matrix-js-sdk/lib/client'; export * from 'matrix-js-sdk/lib/serverCapabilities'; -export * from 'matrix-js-sdk/lib/embedded'; export * from 'matrix-js-sdk/lib/http-api/index'; export * from 'matrix-js-sdk/lib/autodiscovery'; export * from 'matrix-js-sdk/lib/errors'; @@ -10,7 +14,18 @@ export * from 'matrix-js-sdk/lib/interactive-auth'; export * from 'matrix-js-sdk/lib/content-repo'; export * from 'matrix-js-sdk/lib/sync'; export * from 'matrix-js-sdk/lib/sync-accumulator'; -export { createClient } from 'matrix-js-sdk/lib/matrix'; + +const amendClientOpts = (opts: ICreateClientOpts): ICreateClientOpts => { + opts.store ??= new MemoryStore({ localStorage: globalThis.localStorage }); + opts.scheduler ??= new MatrixScheduler(); + opts.cryptoStore ??= new MemoryCryptoStore(); + return opts; +}; + +// Intentionally avoid importing createClient from matrix-js-sdk/lib/matrix to sidestep +// a production bundling init-order bug involving RoomWidgetClient re-exports. +export const createClient = (opts: ICreateClientOpts): MatrixClient => + new MatrixClient(amendClientOpts(opts)); export * from 'matrix-js-sdk/lib/models/event'; export * from 'matrix-js-sdk/lib/models/room';