diff --git a/.github/workflows/downstream-artifacts.yml b/.github/workflows/downstream-artifacts.yml index f49d5df25..cf57c3af2 100644 --- a/.github/workflows/downstream-artifacts.yml +++ b/.github/workflows/downstream-artifacts.yml @@ -16,7 +16,7 @@ concurrency: jobs: build-element-web: name: Build element-web - uses: matrix-org/matrix-react-sdk/.github/workflows/element-web.yaml@v3.88.0 + uses: matrix-org/matrix-react-sdk/.github/workflows/element-web.yaml@v3.90.0 with: matrix-js-sdk-sha: ${{ github.sha }} react-sdk-repository: matrix-org/matrix-react-sdk diff --git a/package.json b/package.json index accf1fcfa..66453a493 100644 --- a/package.json +++ b/package.json @@ -117,7 +117,7 @@ "jest-mock": "^29.0.0", "lint-staged": "^15.0.2", "matrix-mock-request": "^2.5.0", - "prettier": "3.1.1", + "prettier": "3.2.4", "rimraf": "^5.0.0", "ts-node": "^10.9.1", "typedoc": "^0.24.0", diff --git a/spec/unit/crypto/verification/sas.spec.ts b/spec/unit/crypto/verification/sas.spec.ts index a37a104d7..ba73ced6a 100644 --- a/spec/unit/crypto/verification/sas.spec.ts +++ b/spec/unit/crypto/verification/sas.spec.ts @@ -189,10 +189,12 @@ describe("SAS verification", function () { const origSendToDevice = bob.client.sendToDevice.bind(bob.client); bob.client.sendToDevice = async (type, map) => { if (type === "m.key.verification.accept") { - macMethod = map.get(alice.client.getUserId()!)?.get(alice.client.deviceId!) - ?.message_authentication_code; - keyAgreement = map.get(alice.client.getUserId()!)?.get(alice.client.deviceId!) - ?.key_agreement_protocol; + macMethod = map + .get(alice.client.getUserId()!) + ?.get(alice.client.deviceId!)?.message_authentication_code; + keyAgreement = map + .get(alice.client.getUserId()!) + ?.get(alice.client.deviceId!)?.key_agreement_protocol; } return origSendToDevice(type, map); }; diff --git a/src/@types/extensible_events.ts b/src/@types/extensible_events.ts index db9ea1806..9b16e0e43 100644 --- a/src/@types/extensible_events.ts +++ b/src/@types/extensible_events.ts @@ -23,9 +23,8 @@ import { isProvided } from "../extensible_events_v1/utilities"; /** * Represents the stable and unstable values of a given namespace. */ -export type TSNamespace = N extends NamespacedValue - ? TSNamespaceValue | TSNamespaceValue - : never; +export type TSNamespace = + N extends NamespacedValue ? TSNamespaceValue | TSNamespaceValue : never; /** * Represents a namespaced value, if the value is a string. Used to extract provided types diff --git a/src/models/event-timeline-set.ts b/src/models/event-timeline-set.ts index 6175ac9ae..b23b5ca16 100644 --- a/src/models/event-timeline-set.ts +++ b/src/models/event-timeline-set.ts @@ -1003,8 +1003,9 @@ export class EventTimelineSet extends TypedEventEmitter track.kind === "video"); - const sender = this.transceivers.get(getTransceiverKey(SDPStreamMetadataPurpose.Usermedia, "video")) - ?.sender; + const sender = this.transceivers.get( + getTransceiverKey(SDPStreamMetadataPurpose.Usermedia, "video"), + )?.sender; sender?.replaceTrack(track ?? null); @@ -1326,8 +1327,9 @@ export class MatrixCall extends TypedEventEmitter track.kind === "video"); - const sender = this.transceivers.get(getTransceiverKey(SDPStreamMetadataPurpose.Usermedia, "video")) - ?.sender; + const sender = this.transceivers.get( + getTransceiverKey(SDPStreamMetadataPurpose.Usermedia, "video"), + )?.sender; sender?.replaceTrack(track ?? null); this.client.getMediaHandler().stopScreensharingStream(this.localScreensharingStream!); diff --git a/tsconfig.json b/tsconfig.json index 13fed86c4..f55a2c991 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -8,12 +8,12 @@ "noUnusedLocals": true, "noEmit": true, "declaration": true, - "strict": true + "strict": true, }, "include": ["./src/**/*.ts", "./spec/**/*.ts"], "typedocOptions": { "entryPoints": ["src/matrix.ts"], "excludeExternals": true, - "out": "_docs" - } + "out": "_docs", + }, } diff --git a/yarn.lock b/yarn.lock index 1b16a8c93..0d45f7b15 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3306,9 +3306,9 @@ eslint-plugin-import@^2.26.0: tsconfig-paths "^3.15.0" eslint-plugin-jest@^27.1.6: - version "27.6.2" - resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-27.6.2.tgz#8e69404fcd5dfeac03cac478f0ebb9bf2d8db56b" - integrity sha512-CI1AlKrsNhYFoP48VU8BVWOi7+qHTq4bRxyUlGjeU8SfFt8abjXhjOuDzUoMp68DoXIx17KpNpIkMrl4s4ZW0g== + version "27.6.3" + resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-27.6.3.tgz#8acb8b1e45597fe1f4d4cf25163d90119efc12be" + integrity sha512-+YsJFVH6R+tOiO3gCJon5oqn4KWc+mDq2leudk8mrp8RFubLOo9CVyi3cib4L7XMpxExmkmBZQTPDYVBzgpgOA== dependencies: "@typescript-eslint/utils" "^5.10.0" @@ -5526,10 +5526,10 @@ prelude-ls@^1.2.1: resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396" integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g== -prettier@3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.1.1.tgz#6ba9f23165d690b6cbdaa88cb0807278f7019848" - integrity sha512-22UbSzg8luF4UuZtzgiUOfcGM8s4tjBv6dJRT7j275NXsy2jb4aJa4NNveul5x4eqlF1wuhuR2RElK71RvmVaw== +prettier@3.2.4: + version "3.2.4" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.2.4.tgz#4723cadeac2ce7c9227de758e5ff9b14e075f283" + integrity sha512-FWu1oLHKCrtpO1ypU6J0SbK2d9Ckwysq6bHj/uaCP26DxrPpppCLQRGVuqAxSTvhF00AcvDRyYrLNW7ocBhFFQ== pretty-format@^28.1.3: version "28.1.3"