Skip to content
This repository was archived by the owner on Sep 11, 2024. It is now read-only.

Commit ad73b0c

Browse files
t3chguyt3chguy
authored
Switch to importing most things from the main matrix-js-sdk export (#11406)
* Switch to importing most things from the main matrix-js-sdk export * fix imports * Iterate * Fix tests
1 parent 0842559 commit ad73b0c

Some content is hidden

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

52 files changed

+262
-277
lines changed

‎.eslintrc.js

Lines changed: 87 additions & 114 deletions
Original file line numberDiff line numberDiff line change
@@ -62,118 +62,6 @@ module.exports = {
6262
name: "matrix-js-sdk/src/index",
6363
message: "Please use matrix-js-sdk/src/matrix instead",
6464
},
65-
{
66-
name: "matrix-js-sdk/src/models/typed-event-emitter",
67-
message: "Please use matrix-js-sdk/src/matrix instead",
68-
},
69-
{
70-
name: "matrix-js-sdk/src/models/room",
71-
message: "Please use matrix-js-sdk/src/matrix instead",
72-
},
73-
{
74-
name: "matrix-js-sdk/src/models/room-member",
75-
message: "Please use matrix-js-sdk/src/matrix instead",
76-
},
77-
{
78-
name: "matrix-js-sdk/src/models/room-state",
79-
message: "Please use matrix-js-sdk/src/matrix instead",
80-
},
81-
{
82-
name: "matrix-js-sdk/src/models/event",
83-
message: "Please use matrix-js-sdk/src/matrix instead",
84-
},
85-
{
86-
name: "matrix-js-sdk/src/models/event-status",
87-
message: "Please use matrix-js-sdk/src/matrix instead",
88-
},
89-
{
90-
name: "matrix-js-sdk/src/models/user",
91-
message: "Please use matrix-js-sdk/src/matrix instead",
92-
},
93-
{
94-
name: "matrix-js-sdk/src/models/device",
95-
message: "Please use matrix-js-sdk/src/matrix instead",
96-
},
97-
{
98-
name: "matrix-js-sdk/src/models/event-timeline",
99-
message: "Please use matrix-js-sdk/src/matrix instead",
100-
},
101-
{
102-
name: "matrix-js-sdk/src/models/event-timeline-set",
103-
message: "Please use matrix-js-sdk/src/matrix instead",
104-
},
105-
{
106-
name: "matrix-js-sdk/src/@types/partials",
107-
message: "Please use matrix-js-sdk/src/matrix instead",
108-
},
109-
{
110-
name: "matrix-js-sdk/src/@types/event",
111-
message: "Please use matrix-js-sdk/src/matrix instead",
112-
},
113-
{
114-
name: "matrix-js-sdk/src/client",
115-
message: "Please use matrix-js-sdk/src/matrix instead",
116-
},
117-
{
118-
name: "matrix-js-sdk/src/models/search-result",
119-
message: "Please use matrix-js-sdk/src/matrix instead",
120-
},
121-
{
122-
name: "matrix-js-sdk/src/models/poll",
123-
message: "Please use matrix-js-sdk/src/matrix instead",
124-
},
125-
{
126-
name: "matrix-js-sdk/src/models/relations",
127-
message: "Please use matrix-js-sdk/src/matrix instead",
128-
},
129-
{
130-
name: "matrix-js-sdk/src/http-api",
131-
message: "Please use matrix-js-sdk/src/matrix instead",
132-
},
133-
{
134-
name: "matrix-js-sdk/src/@types/PushRules",
135-
message: "Please use matrix-js-sdk/src/matrix instead",
136-
},
137-
{
138-
name: "matrix-js-sdk/src/@types/search",
139-
message: "Please use matrix-js-sdk/src/matrix instead",
140-
},
141-
{
142-
name: "matrix-js-sdk/src/filter",
143-
message: "Please use matrix-js-sdk/src/matrix instead",
144-
},
145-
{
146-
name: "matrix-js-sdk/src/webrtc/groupCall",
147-
message: "Please use matrix-js-sdk/src/matrix instead",
148-
},
149-
{
150-
name: "matrix-js-sdk/src/service-types",
151-
message: "Please use matrix-js-sdk/src/matrix instead",
152-
},
153-
{
154-
name: "matrix-js-sdk/src/sync",
155-
message: "Please use matrix-js-sdk/src/matrix instead",
156-
},
157-
{
158-
name: "matrix-js-sdk/src/timeline-window",
159-
message: "Please use matrix-js-sdk/src/matrix instead",
160-
},
161-
{
162-
name: "matrix-js-sdk/src/store/indexeddb",
163-
message: "Please use matrix-js-sdk/src/matrix instead",
164-
},
165-
{
166-
name: "matrix-js-sdk/src/crypto/store/indexeddb-crypto-store",
167-
message: "Please use matrix-js-sdk/src/matrix instead",
168-
},
169-
{
170-
name: "matrix-js-sdk/src/crypto/store/localStorage-crypto-store",
171-
message: "Please use matrix-js-sdk/src/matrix instead",
172-
},
173-
{
174-
name: "matrix-js-sdk/src/models/thread",
175-
message: "Please use matrix-js-sdk/src/matrix instead",
176-
},
17765
{
17866
name: "matrix-react-sdk",
17967
message: "Please use matrix-react-sdk/src/index instead",
@@ -185,8 +73,93 @@ module.exports = {
18573
],
18674
patterns: [
18775
{
188-
group: ["matrix-js-sdk/lib", "matrix-js-sdk/lib/", "matrix-js-sdk/lib/**"],
189-
message: "Please use matrix-js-sdk/src/* instead",
76+
group: [
77+
"matrix-js-sdk/src/**",
78+
"!matrix-js-sdk/src/matrix",
79+
"matrix-js-sdk/lib",
80+
"matrix-js-sdk/lib/",
81+
"matrix-js-sdk/lib/**",
82+
// XXX: Temporarily allow these as they are not available via the main export
83+
"!matrix-js-sdk/src/logger",
84+
"!matrix-js-sdk/src/errors",
85+
"!matrix-js-sdk/src/utils",
86+
"!matrix-js-sdk/src/version-support",
87+
"!matrix-js-sdk/src/randomstring",
88+
"!matrix-js-sdk/src/sliding-sync",
89+
"!matrix-js-sdk/src/browser-index",
90+
"!matrix-js-sdk/src/feature",
91+
"!matrix-js-sdk/src/NamespacedValue",
92+
"!matrix-js-sdk/src/ReEmitter",
93+
"!matrix-js-sdk/src/event-mapper",
94+
"!matrix-js-sdk/src/interactive-auth",
95+
"!matrix-js-sdk/src/secret-storage",
96+
"!matrix-js-sdk/src/room-hierarchy",
97+
"!matrix-js-sdk/src/rendezvous",
98+
"!matrix-js-sdk/src/rendezvous/transports",
99+
"!matrix-js-sdk/src/rendezvous/channels",
100+
"!matrix-js-sdk/src/indexeddb-worker",
101+
"!matrix-js-sdk/src/pushprocessor",
102+
"!matrix-js-sdk/src/extensible_events_v1",
103+
"!matrix-js-sdk/src/extensible_events_v1/PollStartEvent",
104+
"!matrix-js-sdk/src/extensible_events_v1/PollResponseEvent",
105+
"!matrix-js-sdk/src/extensible_events_v1/PollEndEvent",
106+
"!matrix-js-sdk/src/extensible_events_v1/InvalidEventError",
107+
"!matrix-js-sdk/src/crypto-api",
108+
"!matrix-js-sdk/src/crypto-api/verification",
109+
"!matrix-js-sdk/src/crypto",
110+
"!matrix-js-sdk/src/crypto/algorithms",
111+
"!matrix-js-sdk/src/crypto/api",
112+
"!matrix-js-sdk/src/crypto/aes",
113+
"!matrix-js-sdk/src/crypto/backup",
114+
"!matrix-js-sdk/src/crypto/olmlib",
115+
"!matrix-js-sdk/src/crypto/crypto",
116+
"!matrix-js-sdk/src/crypto/keybackup",
117+
"!matrix-js-sdk/src/crypto/RoomList",
118+
"!matrix-js-sdk/src/crypto/deviceinfo",
119+
"!matrix-js-sdk/src/crypto/key_passphrase",
120+
"!matrix-js-sdk/src/crypto/CrossSigning",
121+
"!matrix-js-sdk/src/crypto/recoverykey",
122+
"!matrix-js-sdk/src/crypto/dehydration",
123+
"!matrix-js-sdk/src/crypto/verification",
124+
"!matrix-js-sdk/src/crypto/verification/SAS",
125+
"!matrix-js-sdk/src/crypto/verification/QRCode",
126+
"!matrix-js-sdk/src/crypto/verification/request",
127+
"!matrix-js-sdk/src/crypto/verification/request/VerificationRequest",
128+
"!matrix-js-sdk/src/common-crypto",
129+
"!matrix-js-sdk/src/common-crypto/CryptoBackend",
130+
"!matrix-js-sdk/src/oidc",
131+
"!matrix-js-sdk/src/oidc/discovery",
132+
"!matrix-js-sdk/src/oidc/authorize",
133+
"!matrix-js-sdk/src/oidc/validate",
134+
"!matrix-js-sdk/src/oidc/error",
135+
"!matrix-js-sdk/src/oidc/register",
136+
"!matrix-js-sdk/src/webrtc",
137+
"!matrix-js-sdk/src/webrtc/call",
138+
"!matrix-js-sdk/src/webrtc/callFeed",
139+
"!matrix-js-sdk/src/webrtc/mediaHandler",
140+
"!matrix-js-sdk/src/webrtc/callEventTypes",
141+
"!matrix-js-sdk/src/webrtc/callEventHandler",
142+
"!matrix-js-sdk/src/webrtc/groupCallEventHandler",
143+
"!matrix-js-sdk/src/models",
144+
"!matrix-js-sdk/src/models/read-receipt",
145+
"!matrix-js-sdk/src/models/relations-container",
146+
"!matrix-js-sdk/src/models/related-relations",
147+
"!matrix-js-sdk/src/@types",
148+
"!matrix-js-sdk/src/@types/global",
149+
"!matrix-js-sdk/src/@types/auth",
150+
"!matrix-js-sdk/src/@types/beacon",
151+
"!matrix-js-sdk/src/@types/threepids",
152+
"!matrix-js-sdk/src/@types/polls",
153+
"!matrix-js-sdk/src/@types/crypto",
154+
"!matrix-js-sdk/src/@types/local_notifications",
155+
"!matrix-js-sdk/src/@types/location",
156+
"!matrix-js-sdk/src/@types/topic",
157+
"!matrix-js-sdk/src/@types/registration",
158+
"!matrix-js-sdk/src/@types/read_receipts",
159+
"!matrix-js-sdk/src/@types/extensible_events",
160+
"!matrix-js-sdk/src/@types/IIdentityServerProvider",
161+
],
162+
message: "Please use matrix-js-sdk/src/matrix instead",
190163
},
191164
],
192165
},

‎src/Lifecycle.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,11 @@ limitations under the License.
1818
*/
1919

2020
import { ReactNode } from "react";
21-
import { createClient, MatrixClient } from "matrix-js-sdk/src/matrix";
21+
import { createClient, MatrixClient, SSOAction } from "matrix-js-sdk/src/matrix";
2222
import { InvalidStoreError } from "matrix-js-sdk/src/errors";
2323
import { decryptAES, encryptAES, IEncryptedPayload } from "matrix-js-sdk/src/crypto/aes";
2424
import { QueryDict } from "matrix-js-sdk/src/utils";
2525
import { logger } from "matrix-js-sdk/src/logger";
26-
import { SSOAction } from "matrix-js-sdk/src/@types/auth";
2726
import { MINIMUM_MATRIX_VERSION } from "matrix-js-sdk/src/version-support";
2827

2928
import { IMatrixClientCreds, MatrixClientPeg } from "./MatrixClientPeg";

‎src/Login.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ See the License for the specific language governing permissions and
1515
limitations under the License.
1616
*/
1717

18-
import { createClient, MatrixClient } from "matrix-js-sdk/src/matrix";
18+
import { createClient, MatrixClient, LoginFlow } from "matrix-js-sdk/src/matrix";
1919
import { logger } from "matrix-js-sdk/src/logger";
20-
import { DELEGATED_OIDC_COMPATIBILITY, ILoginFlow, LoginFlow, LoginRequest } from "matrix-js-sdk/src/@types/auth";
20+
import { DELEGATED_OIDC_COMPATIBILITY, ILoginFlow, LoginRequest } from "matrix-js-sdk/src/@types/auth";
2121

2222
import { IMatrixClientCreds } from "./MatrixClientPeg";
2323
import SecurityCustomisations from "./customisations/Security";

‎src/MatrixClientPeg.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ import {
2626
EventTimelineSet,
2727
IStartClientOpts,
2828
MatrixClient,
29+
MemoryStore,
2930
} from "matrix-js-sdk/src/matrix";
30-
import { MemoryStore } from "matrix-js-sdk/src/store/memory";
3131
import * as utils from "matrix-js-sdk/src/utils";
3232
import { verificationMethods } from "matrix-js-sdk/src/crypto";
3333
import { SHOW_QR_CODE_METHOD } from "matrix-js-sdk/src/crypto/verification/QRCode";

‎src/SlashCommands.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ limitations under the License.
1818
*/
1919

2020
import * as React from "react";
21-
import { User, IContent, Direction } from "matrix-js-sdk/src/matrix";
22-
import * as ContentHelpers from "matrix-js-sdk/src/content-helpers";
21+
import { User, IContent, Direction, ContentHelpers } from "matrix-js-sdk/src/matrix";
2322
import { logger } from "matrix-js-sdk/src/logger";
2423
import { MRoomTopicEventContent } from "matrix-js-sdk/src/@types/topic";
2524

‎src/async-components/views/dialogs/security/CreateSecretStorageDialog.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,10 @@ import FileSaver from "file-saver";
2020
import { logger } from "matrix-js-sdk/src/logger";
2121
import { IKeyBackupInfo } from "matrix-js-sdk/src/crypto/keybackup";
2222
import { TrustInfo } from "matrix-js-sdk/src/crypto/backup";
23-
import { CrossSigningKeys, IAuthDict, MatrixError, UIAFlow } from "matrix-js-sdk/src/matrix";
23+
import { CrossSigningKeys, IAuthDict, MatrixError, UIAFlow, UIAResponse } from "matrix-js-sdk/src/matrix";
2424
import { IRecoveryKey } from "matrix-js-sdk/src/crypto/api";
2525
import { CryptoEvent } from "matrix-js-sdk/src/crypto";
2626
import classNames from "classnames";
27-
import { UIAResponse } from "matrix-js-sdk/src/@types/uia";
2827

2928
import { MatrixClientPeg } from "../../../../MatrixClientPeg";
3029
import { _t, _td } from "../../../../languageHandler";

‎src/components/structures/SpaceHierarchy.tsx

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,10 @@ import {
3838
RoomType,
3939
GuestAccess,
4040
HistoryVisibility,
41+
HierarchyRelation,
42+
HierarchyRoom,
4143
} from "matrix-js-sdk/src/matrix";
4244
import { RoomHierarchy } from "matrix-js-sdk/src/room-hierarchy";
43-
import { IHierarchyRelation, IHierarchyRoom } from "matrix-js-sdk/src/@types/spaces";
4445
import classNames from "classnames";
4546
import { sortBy, uniqBy } from "lodash";
4647
import { logger } from "matrix-js-sdk/src/logger";
@@ -85,7 +86,7 @@ interface IProps {
8586
}
8687

8788
interface ITileProps {
88-
room: IHierarchyRoom;
89+
room: HierarchyRoom;
8990
suggested?: boolean;
9091
selected?: boolean;
9192
numChildRooms?: number;
@@ -429,8 +430,8 @@ export const joinRoom = async (cli: MatrixClient, hierarchy: RoomHierarchy, room
429430
};
430431

431432
interface IHierarchyLevelProps {
432-
root: IHierarchyRoom;
433-
roomSet: Set<IHierarchyRoom>;
433+
root: HierarchyRoom;
434+
roomSet: Set<HierarchyRoom>;
434435
hierarchy: RoomHierarchy;
435436
parents: Set<string>;
436437
selectedMap?: Map<string, Set<string>>;
@@ -439,7 +440,7 @@ interface IHierarchyLevelProps {
439440
onToggleClick?(parentId: string, childId: string): void;
440441
}
441442

442-
export const toLocalRoom = (cli: MatrixClient, room: IHierarchyRoom, hierarchy: RoomHierarchy): IHierarchyRoom => {
443+
export const toLocalRoom = (cli: MatrixClient, room: HierarchyRoom, hierarchy: RoomHierarchy): HierarchyRoom => {
443444
const history = cli.getRoomUpgradeHistory(
444445
room.room_id,
445446
true,
@@ -497,14 +498,14 @@ export const HierarchyLevel: React.FC<IHierarchyLevelProps> = ({
497498
});
498499

499500
const [subspaces, childRooms] = sortedChildren.reduce(
500-
(result, ev: IHierarchyRelation) => {
501+
(result, ev: HierarchyRelation) => {
501502
const room = hierarchy.roomMap.get(ev.state_key);
502503
if (room && roomSet.has(room)) {
503504
result[room.room_type === RoomType.Space ? 0 : 1].push(toLocalRoom(cli, room, hierarchy));
504505
}
505506
return result;
506507
},
507-
[[] as IHierarchyRoom[], [] as IHierarchyRoom[]],
508+
[[] as HierarchyRoom[], [] as HierarchyRoom[]],
508509
);
509510

510511
const newParents = new Set(parents).add(root.room_id);
@@ -564,12 +565,12 @@ export const useRoomHierarchy = (
564565
space: Room,
565566
): {
566567
loading: boolean;
567-
rooms?: IHierarchyRoom[];
568+
rooms?: HierarchyRoom[];
568569
hierarchy?: RoomHierarchy;
569570
error?: Error;
570571
loadMore(pageSize?: number): Promise<void>;
571572
} => {
572-
const [rooms, setRooms] = useState<IHierarchyRoom[]>([]);
573+
const [rooms, setRooms] = useState<HierarchyRoom[]>([]);
573574
const [hierarchy, setHierarchy] = useState<RoomHierarchy>();
574575
const [error, setError] = useState<Error | undefined>();
575576

@@ -760,7 +761,7 @@ const SpaceHierarchy: React.FC<IProps> = ({ space, initialText = "", showRoom, a
760761

761762
const { loading, rooms, hierarchy, loadMore, error: hierarchyError } = useRoomHierarchy(space);
762763

763-
const filteredRoomSet = useMemo<Set<IHierarchyRoom>>(() => {
764+
const filteredRoomSet = useMemo<Set<HierarchyRoom>>(() => {
764765
if (!rooms?.length || !hierarchy) return new Set();
765766
const lcQuery = query.toLowerCase().trim();
766767
if (!lcQuery) return new Set(rooms);

‎src/components/structures/auth/Login.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ limitations under the License.
1717
import React, { ReactNode } from "react";
1818
import classNames from "classnames";
1919
import { logger } from "matrix-js-sdk/src/logger";
20-
import { ISSOFlow, SSOAction } from "matrix-js-sdk/src/@types/auth";
20+
import { SSOFlow, SSOAction } from "matrix-js-sdk/src/matrix";
2121

2222
import { _t, _td, UserFriendlyError } from "../../../languageHandler";
2323
import Login, { ClientLoginFlow, OidcNativeFlow } from "../../../Login";
@@ -487,7 +487,7 @@ export default class LoginComponent extends React.PureComponent<IProps, IState>
487487
};
488488

489489
private renderSsoStep = (loginType: "cas" | "sso"): JSX.Element => {
490-
const flow = this.state.flows?.find((flow) => flow.type === "m.login." + loginType) as ISSOFlow;
490+
const flow = this.state.flows?.find((flow) => flow.type === "m.login." + loginType) as SSOFlow;
491491

492492
return (
493493
<SSOButtons

0 commit comments

Comments
 (0)