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

Commit 3c370c6

Browse files
toger5toger5
authored
Remove MatrixRTC realted import ES lint exceptions using a index.ts for matrixrtc (#12780)
* update restricted import rules for matrixrtc * review * upgrade matrix-js-sdk * add missing import
1 parent 2e0716c commit 3c370c6

File tree

12 files changed

+45
-61
lines changed

12 files changed

+45
-61
lines changed

‎.eslintrc.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@ module.exports = {
142142
"!matrix-js-sdk/src/models/read-receipt",
143143
"!matrix-js-sdk/src/models/relations-container",
144144
"!matrix-js-sdk/src/models/related-relations",
145+
"!matrix-js-sdk/src/matrixrtc",
145146
],
146147
message: "Please use matrix-js-sdk/src/matrix instead",
147148
},

‎src/Notifier.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@ import {
3232
} from "matrix-js-sdk/src/matrix";
3333
import { logger } from "matrix-js-sdk/src/logger";
3434
import { PermissionChanged as PermissionChangedEvent } from "@matrix-org/analytics-events/types/typescript/PermissionChanged";
35-
// eslint-disable-next-line no-restricted-imports
36-
import { MatrixRTCSession } from "matrix-js-sdk/src/matrixrtc/MatrixRTCSession";
35+
import { MatrixRTCSession } from "matrix-js-sdk/src/matrixrtc";
3736

3837
import { MatrixClientPeg } from "./MatrixClientPeg";
3938
import { PosthogAnalytics } from "./PosthogAnalytics";

‎src/components/views/voip/CallDuration.tsx

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

1717
import React, { FC, useState, useEffect, memo } from "react";
18-
// eslint-disable-next-line no-restricted-imports
19-
import { MatrixRTCSession } from "matrix-js-sdk/src/matrixrtc/MatrixRTCSession";
18+
import { MatrixRTCSession } from "matrix-js-sdk/src/matrixrtc";
2019

2120
import { formatPreciseDuration } from "../../../DateUtils";
2221

‎src/models/Call.ts

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,13 @@ import { randomString } from "matrix-js-sdk/src/randomstring";
3030
import { CallType } from "matrix-js-sdk/src/webrtc/call";
3131
import { NamespacedValue } from "matrix-js-sdk/src/NamespacedValue";
3232
import { IWidgetApiRequest } from "matrix-widget-api";
33-
// eslint-disable-next-line no-restricted-imports
34-
import { MatrixRTCSession, MatrixRTCSessionEvent } from "matrix-js-sdk/src/matrixrtc/MatrixRTCSession";
35-
// eslint-disable-next-line no-restricted-imports
36-
import { CallMembership } from "matrix-js-sdk/src/matrixrtc/CallMembership";
37-
// eslint-disable-next-line no-restricted-imports
38-
import { MatrixRTCSessionManagerEvents } from "matrix-js-sdk/src/matrixrtc/MatrixRTCSessionManager";
39-
// eslint-disable-next-line no-restricted-imports
40-
import { ICallNotifyContent } from "matrix-js-sdk/src/matrixrtc/types";
33+
import {
34+
MatrixRTCSession,
35+
MatrixRTCSessionEvent,
36+
CallMembership,
37+
MatrixRTCSessionManagerEvents,
38+
ICallNotifyContent,
39+
} from "matrix-js-sdk/src/matrixrtc";
4140

4241
import type EventEmitter from "events";
4342
import type { ClientWidgetApi, IWidgetData } from "matrix-widget-api";

‎src/stores/CallStore.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,7 @@ limitations under the License.
1616

1717
import { logger } from "matrix-js-sdk/src/logger";
1818
import { GroupCallEventHandlerEvent } from "matrix-js-sdk/src/webrtc/groupCallEventHandler";
19-
// eslint-disable-next-line no-restricted-imports
20-
import { MatrixRTCSessionManagerEvents } from "matrix-js-sdk/src/matrixrtc/MatrixRTCSessionManager";
21-
// eslint-disable-next-line no-restricted-imports
22-
import { MatrixRTCSession } from "matrix-js-sdk/src/matrixrtc/MatrixRTCSession";
19+
import { MatrixRTCSession, MatrixRTCSessionManagerEvents } from "matrix-js-sdk/src/matrixrtc";
2320

2421
import type { GroupCall, Room } from "matrix-js-sdk/src/matrix";
2522
import defaultDispatcher from "../dispatcher/dispatcher";

‎test/Notifier-test.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,7 @@ import {
2626
SyncState,
2727
} from "matrix-js-sdk/src/matrix";
2828
import { waitFor } from "@testing-library/react";
29-
// eslint-disable-next-line no-restricted-imports
30-
import { MatrixRTCSession } from "matrix-js-sdk/src/matrixrtc/MatrixRTCSession";
31-
// eslint-disable-next-line no-restricted-imports
32-
import { CallMembership } from "matrix-js-sdk/src/matrixrtc/CallMembership";
29+
import { CallMembership, MatrixRTCSession } from "matrix-js-sdk/src/matrixrtc";
3330

3431
import BasePlatform from "../src/BasePlatform";
3532
import Notifier from "../src/Notifier";

‎test/components/views/rooms/LegacyRoomHeader-test.tsx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,7 @@ import { ClientWidgetApi, Widget } from "matrix-widget-api";
3232
import EventEmitter from "events";
3333
import { setupJestCanvasMock } from "jest-canvas-mock";
3434
import { ViewRoomOpts } from "@matrix-org/react-sdk-module-api/lib/lifecycles/RoomViewLifecycle";
35-
// eslint-disable-next-line no-restricted-imports
36-
import { MatrixRTCSessionManagerEvents } from "matrix-js-sdk/src/matrixrtc/MatrixRTCSessionManager";
37-
// eslint-disable-next-line no-restricted-imports
38-
import { MatrixRTCSession } from "matrix-js-sdk/src/matrixrtc/MatrixRTCSession";
35+
import { MatrixRTCSession, MatrixRTCSessionManagerEvents } from "matrix-js-sdk/src/matrixrtc";
3936

4037
import type { MatrixClient, MatrixEvent, RoomMember } from "matrix-js-sdk/src/matrix";
4138
import type { MatrixCall } from "matrix-js-sdk/src/webrtc/call";

‎test/createRoom-test.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@ limitations under the License.
1717
import { mocked, Mocked } from "jest-mock";
1818
import { MatrixClient, Device, Preset, RoomType } from "matrix-js-sdk/src/matrix";
1919
import { CryptoApi } from "matrix-js-sdk/src/crypto-api";
20-
// eslint-disable-next-line no-restricted-imports
21-
import { MatrixRTCSession } from "matrix-js-sdk/src/matrixrtc/MatrixRTCSession";
20+
import { MatrixRTCSession } from "matrix-js-sdk/src/matrixrtc";
2221

2322
import { stubClient, setupAsyncStoreWithClient, mockPlatformPeg, getMockClientWithEventEmitter } from "./test-utils";
2423
import { MatrixClientPeg } from "../src/MatrixClientPeg";

‎test/models/Call-test.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ import {
2828
} from "matrix-js-sdk/src/matrix";
2929
import { KnownMembership } from "matrix-js-sdk/src/types";
3030
import { Widget } from "matrix-widget-api";
31-
// eslint-disable-next-line no-restricted-imports
32-
import { MatrixRTCSessionManagerEvents } from "matrix-js-sdk/src/matrixrtc/MatrixRTCSessionManager";
33-
// eslint-disable-next-line no-restricted-imports
34-
import { CallMembership } from "matrix-js-sdk/src/matrixrtc/CallMembership";
35-
// eslint-disable-next-line no-restricted-imports
36-
import { MatrixRTCSession, MatrixRTCSessionEvent } from "matrix-js-sdk/src/matrixrtc/MatrixRTCSession";
31+
import {
32+
CallMembership,
33+
MatrixRTCSessionManagerEvents,
34+
MatrixRTCSession,
35+
MatrixRTCSessionEvent,
36+
} from "matrix-js-sdk/src/matrixrtc";
3737

3838
import type { Mocked } from "jest-mock";
3939
import type { MatrixClient, IMyDevice, RoomMember } from "matrix-js-sdk/src/matrix";

‎test/test-utils/test-utils.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,7 @@ import { ReEmitter } from "matrix-js-sdk/src/ReEmitter";
4444
import { MediaHandler } from "matrix-js-sdk/src/webrtc/mediaHandler";
4545
import { Feature, ServerSupport } from "matrix-js-sdk/src/feature";
4646
import { MapperOpts } from "matrix-js-sdk/src/event-mapper";
47-
// eslint-disable-next-line no-restricted-imports
48-
import { MatrixRTCSessionManager } from "matrix-js-sdk/src/matrixrtc/MatrixRTCSessionManager";
49-
// eslint-disable-next-line no-restricted-imports
50-
import { MatrixRTCSession } from "matrix-js-sdk/src/matrixrtc/MatrixRTCSession";
47+
import { MatrixRTCSessionManager, MatrixRTCSession } from "matrix-js-sdk/src/matrixrtc";
5148

5249
import type { GroupCall } from "matrix-js-sdk/src/matrix";
5350
import type { Membership } from "matrix-js-sdk/src/types";

‎test/toasts/IncomingCallToast-test.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ import { render, screen, cleanup, fireEvent, waitFor } from "@testing-library/re
1919
import { mocked, Mocked } from "jest-mock";
2020
import { Room, RoomStateEvent, MatrixEvent, MatrixEventEvent, MatrixClient } from "matrix-js-sdk/src/matrix";
2121
import { ClientWidgetApi, Widget } from "matrix-widget-api";
22-
// eslint-disable-next-line no-restricted-imports
23-
import { ICallNotifyContent } from "matrix-js-sdk/src/matrixrtc/types";
22+
import { ICallNotifyContent } from "matrix-js-sdk/src/matrixrtc";
2423

2524
import type { RoomMember } from "matrix-js-sdk/src/matrix";
2625
import {

‎yarn.lock

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1845,10 +1845,10 @@
18451845
emojibase "^15.0.0"
18461846
emojibase-data "^15.0.0"
18471847

1848-
"@matrix-org/matrix-sdk-crypto-wasm@^5.0.0":
1849-
version "5.0.0"
1850-
resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-wasm/-/matrix-sdk-crypto-wasm-5.0.0.tgz#f45a7bccaad218c05bcf9e7c8ca783c9d9a07af4"
1851-
integrity sha512-37ASjCKSTU5ycGfkP+LUXG4Ok6OAf6vE+1qU6uwWhe6FwadCS3vVWzJYd/3d9BQFwsx4GhFTIAXrW4iLG85rmQ==
1848+
"@matrix-org/matrix-sdk-crypto-wasm@^7.0.0":
1849+
version "7.0.0"
1850+
resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-wasm/-/matrix-sdk-crypto-wasm-7.0.0.tgz#8d6abdb9ded8656cc9e2a7909913a34bf3fc9b3a"
1851+
integrity sha512-MOencXiW/gI5MuTtCNsuojjwT5DXCrjMqv9xOslJC9h2tPdLFFFMGr58dY5Lis4DRd9MRWcgrGowUIHOqieWTA==
18521852

18531853
"@matrix-org/matrix-wysiwyg@2.37.4":
18541854
version "2.37.4"
@@ -3477,10 +3477,10 @@ balanced-match@^2.0.0:
34773477
resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-2.0.0.tgz#dc70f920d78db8b858535795867bf48f820633d9"
34783478
integrity sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==
34793479

3480-
base-x@^4.0.0:
3481-
version "4.0.0"
3482-
resolved "https://registry.yarnpkg.com/base-x/-/base-x-4.0.0.tgz#d0e3b7753450c73f8ad2389b5c018a4af7b2224a"
3483-
integrity sha512-FuwxlW4H5kh37X/oW59pwTzzTKRzfrrQwhmyspRM7swOEZcHtDZSCt45U6oKgtuFE+WYPblePMVIPR4RZrh/hw==
3480+
base-x@^5.0.0:
3481+
version "5.0.0"
3482+
resolved "https://registry.yarnpkg.com/base-x/-/base-x-5.0.0.tgz#6d835ceae379130e1a4cb846a70ac4746f28ea9b"
3483+
integrity sha512-sMW3VGSX1QWVFA6l8U62MLKz29rRfpTlYdCqLdpLo1/Yd4zZwSbnUaDfciIAowAqvq7YFnWq9hrhdg1KYgc1lQ==
34843484

34853485
base64-arraybuffer@^1.0.2:
34863486
version "1.0.2"
@@ -3572,12 +3572,12 @@ browserslist@^4.22.2, browserslist@^4.23.0, browserslist@^4.23.1:
35723572
node-releases "^2.0.14"
35733573
update-browserslist-db "^1.1.0"
35743574

3575-
bs58@^5.0.0:
3576-
version "5.0.0"
3577-
resolved "https://registry.yarnpkg.com/bs58/-/bs58-5.0.0.tgz#865575b4d13c09ea2a84622df6c8cbeb54ffc279"
3578-
integrity sha512-r+ihvQJvahgYT50JD05dyJNKlmmSlMoOGwn1lCcEzanPglg7TxYjioQUYehQ9mAR/+hOSd2jRc/Z2y5UxBymvQ==
3575+
bs58@^6.0.0:
3576+
version "6.0.0"
3577+
resolved "https://registry.yarnpkg.com/bs58/-/bs58-6.0.0.tgz#a2cda0130558535dd281a2f8697df79caaf425d8"
3578+
integrity sha512-PD0wEnEYg6ijszw/u8s+iI3H17cTymlrwkKhDhPZq+Sokl3AU4htyBFTjAeNAlCCmg0f53g6ih3jATyCKftTfw==
35793579
dependencies:
3580-
base-x "^4.0.0"
3580+
base-x "^5.0.0"
35813581

35823582
bser@2.1.1:
35833583
version "2.1.1"
@@ -6632,9 +6632,9 @@ lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21:
66326632
integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
66336633

66346634
loglevel@^1.7.1:
6635-
version "1.8.1"
6636-
resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.8.1.tgz#5c621f83d5b48c54ae93b6156353f555963377b4"
6637-
integrity sha512-tCRIJM51SHjAayKwC+QAg8hT8vg6z7GSgLJKGvzuPb1Wc+hLzqtuVLxp6/HzSPOozuK+8ErAhy7U/sVzw8Dgfg==
6635+
version "1.9.1"
6636+
resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.9.1.tgz#d63976ac9bcd03c7c873116d41c2a85bafff1be7"
6637+
integrity sha512-hP3I3kCrDIMuRwAwHltphhDM1r8i55H33GgqjXbrisuJhF4kRhW1dNuxsRklp4bXl8DSdLaNLuiL4A/LWRfxvg==
66386638

66396639
long@^5.2.0:
66406640
version "5.2.3"
@@ -6752,13 +6752,13 @@ matrix-events-sdk@0.0.1:
67526752
integrity sha512-1QEOsXO+bhyCroIe2/A5OwaxHvBm7EsSQ46DEDn8RBIfQwN5HWBpFvyWWR4QY0KHPPnnJdI99wgRiAl7Ad5qaA==
67536753

67546754
"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
6755-
version "33.1.0"
6756-
resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/987ec1e62fcdbd626d5abcba5e9dcdaa9eaaa758"
6755+
version "34.0.0"
6756+
resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/6b261b98c9e7fad891f777a0786830206685de57"
67576757
dependencies:
67586758
"@babel/runtime" "^7.12.5"
6759-
"@matrix-org/matrix-sdk-crypto-wasm" "^5.0.0"
6759+
"@matrix-org/matrix-sdk-crypto-wasm" "^7.0.0"
67606760
another-json "^0.2.0"
6761-
bs58 "^5.0.0"
6761+
bs58 "^6.0.0"
67626762
content-type "^1.0.4"
67636763
jwt-decode "^4.0.0"
67646764
loglevel "^1.7.1"
@@ -8068,9 +8068,9 @@ schema-utils@^3.0.0:
80688068
ajv-keywords "^3.5.2"
80698069

80708070
sdp-transform@^2.14.1:
8071-
version "2.14.1"
8072-
resolved "https://registry.yarnpkg.com/sdp-transform/-/sdp-transform-2.14.1.tgz#2bb443583d478dee217df4caa284c46b870d5827"
8073-
integrity sha512-RjZyX3nVwJyCuTo5tGPx+PZWkDMCg7oOLpSlhjDdZfwUoNqG1mM8nyj31IGHyaPWXhjbP7cdK3qZ2bmkJ1GzRw==
8071+
version "2.14.2"
8072+
resolved "https://registry.yarnpkg.com/sdp-transform/-/sdp-transform-2.14.2.tgz#d2cee6a1f7abe44e6332ac6cbb94e8600f32d813"
8073+
integrity sha512-icY6jVao7MfKCieyo1AyxFYm1baiM+fA00qW/KrNNVlkxHAd34riEKuEkUe4bBb3gJwLJZM+xT60Yj1QL8rHiA==
80748074

80758075
seedrandom@^3.0.5:
80768076
version "3.0.5"

0 commit comments

Comments
 (0)