matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-07-31 15:24:23 +03:00
Code Activity

Update all non-major dependencies (#4027)

Browse Source 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
This commit is contained in:
renovate[bot]
2024-01-24 09:23:28 +00:00
committed by GitHub
parent dc406ee2e8
commit 8e01b654bc
8 changed files with 29 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/downstream-artifacts.yml vendored
View File

@ -16,7 +16,7 @@ concurrency:
jobs: jobs:
build-element-web: build-element-web:
name: 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: with:
matrix-js-sdk-sha: ${{ github.sha }} matrix-js-sdk-sha: ${{ github.sha }}
react-sdk-repository: matrix-org/matrix-react-sdk react-sdk-repository: matrix-org/matrix-react-sdk

2
package.json
View File

@ -117,7 +117,7 @@
"jest-mock": "^29.0.0", "jest-mock": "^29.0.0",
"lint-staged": "^15.0.2", "lint-staged": "^15.0.2",
"matrix-mock-request": "^2.5.0", "matrix-mock-request": "^2.5.0",
"prettier": "3.1.1", "prettier": "3.2.4",
"rimraf": "^5.0.0", "rimraf": "^5.0.0",
"ts-node": "^10.9.1", "ts-node": "^10.9.1",
"typedoc": "^0.24.0", "typedoc": "^0.24.0",

10
spec/unit/crypto/verification/sas.spec.ts
View File

@ -189,10 +189,12 @@ describe("SAS verification", function () {
const origSendToDevice = bob.client.sendToDevice.bind(bob.client); const origSendToDevice = bob.client.sendToDevice.bind(bob.client);
bob.client.sendToDevice = async (type, map) => { bob.client.sendToDevice = async (type, map) => {
if (type === "m.key.verification.accept") { if (type === "m.key.verification.accept") {
macMethod = map.get(alice.client.getUserId()!)?.get(alice.client.deviceId!) macMethod = map
?.message_authentication_code; .get(alice.client.getUserId()!)
keyAgreement = map.get(alice.client.getUserId()!)?.get(alice.client.deviceId!) ?.get(alice.client.deviceId!)?.message_authentication_code;
?.key_agreement_protocol; keyAgreement = map
.get(alice.client.getUserId()!)
?.get(alice.client.deviceId!)?.key_agreement_protocol;
} }
return origSendToDevice(type, map); return origSendToDevice(type, map);
}; };

5
src/@types/extensible_events.ts
View File

@ -23,9 +23,8 @@ import { isProvided } from "../extensible_events_v1/utilities";
/** /**
* Represents the stable and unstable values of a given namespace. * Represents the stable and unstable values of a given namespace.
*/ */
export type TSNamespace<N> = N extends NamespacedValue<infer S, infer U> export type TSNamespace<N> =
? TSNamespaceValue<S> | TSNamespaceValue<U> N extends NamespacedValue<infer S, infer U> ? TSNamespaceValue<S> | TSNamespaceValue<U> : never;
: never;
/** /**
* Represents a namespaced value, if the value is a string. Used to extract provided types * Represents a namespaced value, if the value is a string. Used to extract provided types

5
src/models/event-timeline-set.ts
View File

@ -1003,8 +1003,9 @@ export class EventTimelineSet extends TypedEventEmitter<EmittedEvents, EventTime
if (!shouldLiveInRoom && !shouldLiveInThread) { if (!shouldLiveInRoom && !shouldLiveInThread) {
logger.warn( logger.warn(
`EventTimelineSet:canContain event encountered which cannot be added to any timeline roomId=${this.room `EventTimelineSet:canContain event encountered which cannot be added to any timeline roomId=${
?.roomId} eventId=${event.getId()} threadId=${event.threadRootId}`, this.room?.roomId
} eventId=${event.getId()} threadId=${event.threadRootId}`,
); );
} }

10
src/webrtc/call.ts
View File

@ -1309,8 +1309,9 @@ export class MatrixCall extends TypedEventEmitter<CallEvent, CallEventHandlerMap
const track = stream.getTracks().find((track) => track.kind === "video"); const track = stream.getTracks().find((track) => track.kind === "video");
const sender = this.transceivers.get(getTransceiverKey(SDPStreamMetadataPurpose.Usermedia, "video")) const sender = this.transceivers.get(
?.sender; getTransceiverKey(SDPStreamMetadataPurpose.Usermedia, "video"),
)?.sender;
sender?.replaceTrack(track ?? null); sender?.replaceTrack(track ?? null);
@ -1326,8 +1327,9 @@ export class MatrixCall extends TypedEventEmitter<CallEvent, CallEventHandlerMap
} }
} else { } else {
const track = this.localUsermediaStream?.getTracks().find((track) => track.kind === "video"); const track = this.localUsermediaStream?.getTracks().find((track) => track.kind === "video");
const sender = this.transceivers.get(getTransceiverKey(SDPStreamMetadataPurpose.Usermedia, "video")) const sender = this.transceivers.get(
?.sender; getTransceiverKey(SDPStreamMetadataPurpose.Usermedia, "video"),
)?.sender;
sender?.replaceTrack(track ?? null); sender?.replaceTrack(track ?? null);
this.client.getMediaHandler().stopScreensharingStream(this.localScreensharingStream!); this.client.getMediaHandler().stopScreensharingStream(this.localScreensharingStream!);

6
tsconfig.json
View File

@ -8,12 +8,12 @@
"noUnusedLocals": true, "noUnusedLocals": true,
"noEmit": true, "noEmit": true,
"declaration": true, "declaration": true,
"strict": true "strict": true,
}, },
"include": ["./src/**/*.ts", "./spec/**/*.ts"], "include": ["./src/**/*.ts", "./spec/**/*.ts"],
"typedocOptions": { "typedocOptions": {
"entryPoints": ["src/matrix.ts"], "entryPoints": ["src/matrix.ts"],
"excludeExternals": true, "excludeExternals": true,
"out": "_docs" "out": "_docs",
} },
} }

14
yarn.lock
View File

@ -3306,9 +3306,9 @@ eslint-plugin-import@^2.26.0:
tsconfig-paths "^3.15.0" tsconfig-paths "^3.15.0"
eslint-plugin-jest@^27.1.6: eslint-plugin-jest@^27.1.6:
version "27.6.2" version "27.6.3"
resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-27.6.2.tgz#8e69404fcd5dfeac03cac478f0ebb9bf2d8db56b" resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-27.6.3.tgz#8acb8b1e45597fe1f4d4cf25163d90119efc12be"
integrity sha512-CI1AlKrsNhYFoP48VU8BVWOi7+qHTq4bRxyUlGjeU8SfFt8abjXhjOuDzUoMp68DoXIx17KpNpIkMrl4s4ZW0g== integrity sha512-+YsJFVH6R+tOiO3gCJon5oqn4KWc+mDq2leudk8mrp8RFubLOo9CVyi3cib4L7XMpxExmkmBZQTPDYVBzgpgOA==
dependencies: dependencies:
"@typescript-eslint/utils" "^5.10.0" "@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" resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g== integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
prettier@3.1.1: prettier@3.2.4:
version "3.1.1" version "3.2.4"
resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.1.1.tgz#6ba9f23165d690b6cbdaa88cb0807278f7019848" resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.2.4.tgz#4723cadeac2ce7c9227de758e5ff9b14e075f283"
integrity sha512-22UbSzg8luF4UuZtzgiUOfcGM8s4tjBv6dJRT7j275NXsy2jb4aJa4NNveul5x4eqlF1wuhuR2RElK71RvmVaw== integrity sha512-FWu1oLHKCrtpO1ypU6J0SbK2d9Ckwysq6bHj/uaCP26DxrPpppCLQRGVuqAxSTvhF00AcvDRyYrLNW7ocBhFFQ==
pretty-format@^28.1.3: pretty-format@^28.1.3:
version "28.1.3" version "28.1.3"