From 13df897896122fa3c68f0859fe34218962ea0131 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 26 Nov 2024 13:42:27 +0000 Subject: [PATCH 01/10] v34.13.0-rc.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ef7342cd70e..6ebe111f056 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "matrix-js-sdk", - "version": "34.12.0", + "version": "34.13.0-rc.0", "description": "Matrix Client-Server SDK for Javascript", "engines": { "node": ">=20.0.0" From 125e45c24db9d0d5042d2b0d603ead142437cc1a Mon Sep 17 00:00:00 2001 From: Florian Duros Date: Fri, 29 Nov 2024 10:49:32 +0100 Subject: [PATCH 02/10] Deprecate remaining legacy functions and move `CryptoEvent.LegacyCryptoStoreMigrationProgress` handler (#4560) * Deprecate legacy functions in `MatrixClient` * Move `CryptoEvent.LegacyCryptoStoreMigrationProgress` handler in rust crypto * Remove `olmLib` usage in `MatrixClient` --- src/client.ts | 8 ++++++-- src/crypto-api/CryptoEventHandlerMap.ts | 1 + src/crypto/index.ts | 2 -- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/client.ts b/src/client.ts index 2e72dcf4353..5ef823a298b 100644 --- a/src/client.ts +++ b/src/client.ts @@ -46,7 +46,6 @@ import { noUnsafeEventProps, QueryDict, replaceParam, safeSet, sleep } from "./u import { Direction, EventTimeline } from "./models/event-timeline.ts"; import { IActionsObject, PushProcessor } from "./pushprocessor.ts"; import { AutoDiscovery, AutoDiscoveryAction } from "./autodiscovery.ts"; -import * as olmlib from "./crypto/olmlib.ts"; import { decodeBase64, encodeBase64, encodeUnpaddedBase64Url } from "./base64.ts"; import { IExportedDevice as IExportedOlmDevice } from "./crypto/OlmDevice.ts"; import { IOlmDevice } from "./crypto/algorithms/megolm.ts"; @@ -252,6 +251,9 @@ export type Store = IStore; export type ResetTimelineCallback = (roomId: string) => boolean; const SCROLLBACK_DELAY_MS = 3000; +/** + * @deprecated Not supported for Rust Cryptography. + */ export const CRYPTO_ENABLED: boolean = isCryptoAvailable(); const TURN_CHECK_INTERVAL = 10 * 60 * 1000; // poll for turn credentials every 10 minutes @@ -2430,6 +2432,8 @@ export class MatrixClient extends TypedEventEmitter { const prom = this.setDeviceVerification(userId, deviceId, verified, null, null); @@ -10115,7 +10119,7 @@ export class MatrixClient extends TypedEventEmitter void; [CryptoEvent.WillUpdateDevices]: (users: string[], initialFetch: boolean) => void; [CryptoEvent.DevicesUpdated]: (users: string[], initialFetch: boolean) => void; + [CryptoEvent.LegacyCryptoStoreMigrationProgress]: (progress: number, total: number) => void; } & RustBackupCryptoEventMap; diff --git a/src/crypto/index.ts b/src/crypto/index.ts index 8cb04dd5e03..acbb4e318db 100644 --- a/src/crypto/index.ts +++ b/src/crypto/index.ts @@ -326,8 +326,6 @@ export type CryptoEventHandlerMap = CryptoApiCryptoEventHandlerMap & { */ [CryptoEvent.Warning]: (type: string) => void; [CryptoEvent.UserCrossSigningUpdated]: (userId: string) => void; - - [CryptoEvent.LegacyCryptoStoreMigrationProgress]: (progress: number, total: number) => void; }; export class Crypto extends TypedEventEmitter implements CryptoBackend { From 97ef1dc6dff82e45de13d73d606b0c2f0cb00b86 Mon Sep 17 00:00:00 2001 From: Florian Duros Date: Fri, 29 Nov 2024 10:49:52 +0100 Subject: [PATCH 03/10] Remove deprecated calls of `MatrixClient` (#4563) --- src/models/relations.ts | 6 ++++-- src/models/room.ts | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/models/relations.ts b/src/models/relations.ts index 87a9b7522bb..bb7f05648d7 100644 --- a/src/models/relations.ts +++ b/src/models/relations.ts @@ -20,6 +20,7 @@ import { RelationType } from "../@types/event.ts"; import { TypedEventEmitter } from "./typed-event-emitter.ts"; import { MatrixClient } from "../client.ts"; import { Room } from "./room.ts"; +import { CryptoBackend } from "../common-crypto/CryptoBackend.ts"; export enum RelationsEvent { Add = "Relations.add", @@ -323,8 +324,9 @@ export class Relations extends TypedEventEmitter { * @returns Signals when all events have been decrypted */ public async decryptCriticalEvents(): Promise { - if (!this.client.isCryptoEnabled()) return; + if (!this.client.getCrypto()) return; const readReceiptEventId = this.getEventReadUpTo(this.client.getUserId()!, true); const events = this.getLiveTimeline().getEvents(); @@ -567,7 +567,7 @@ export class Room extends ReadReceipt { * @returns Signals when all events have been decrypted */ public async decryptAllEvents(): Promise { - if (!this.client.isCryptoEnabled()) return; + if (!this.client.getCrypto()) return; const decryptionPromises = this.getUnfilteredTimelineSet() .getLiveTimeline() From edac6a9983bd604c17535a9ae673dc979c7b61c4 Mon Sep 17 00:00:00 2001 From: Florian Duros Date: Fri, 29 Nov 2024 11:04:20 +0100 Subject: [PATCH 04/10] Replace deprecate imports (#4565) * Replace deprecate imports * Deprecate `CryptoBackend.getEventEncryptionInfo` * Add deprecated alternative --- src/common-crypto/CryptoBackend.ts | 1 + src/rust-crypto/backup.ts | 2 +- src/rust-crypto/libolm_migration.ts | 9 +++++++-- src/testing.ts | 3 +-- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/common-crypto/CryptoBackend.ts b/src/common-crypto/CryptoBackend.ts index bbd6e5ec682..76fb57aa624 100644 --- a/src/common-crypto/CryptoBackend.ts +++ b/src/common-crypto/CryptoBackend.ts @@ -78,6 +78,7 @@ export interface CryptoBackend extends SyncCryptoCallbacks, CryptoApi { * Get information about the encryption of an event * * @param event - event to be checked + * @deprecated Use {@link CryptoApi#getEncryptionInfoForEvent} instead */ getEventEncryptionInfo(event: MatrixEvent): IEncryptedEventInfo; diff --git a/src/rust-crypto/backup.ts b/src/rust-crypto/backup.ts index 1b25c313189..69e37d48444 100644 --- a/src/rust-crypto/backup.ts +++ b/src/rust-crypto/backup.ts @@ -30,7 +30,6 @@ import { } from "../crypto-api/keybackup.ts"; import { logger } from "../logger.ts"; import { ClientPrefix, IHttpOpts, MatrixError, MatrixHttpApi, Method } from "../http-api/index.ts"; -import { IMegolmSessionData } from "../crypto/index.ts"; import { TypedEventEmitter } from "../models/typed-event-emitter.ts"; import { encodeUri, logDuration } from "../utils.ts"; import { OutgoingRequestProcessor } from "./OutgoingRequestProcessor.ts"; @@ -38,6 +37,7 @@ import { sleep } from "../utils.ts"; import { BackupDecryptor } from "../common-crypto/CryptoBackend.ts"; import { ImportRoomKeyProgressData, ImportRoomKeysOpts, CryptoEvent } from "../crypto-api/index.ts"; import { AESEncryptedSecretStoragePayload } from "../@types/AESEncryptedSecretStoragePayload.ts"; +import { IMegolmSessionData } from "../@types/crypto.ts"; /** Authentification of the backup info, depends on algorithm */ type AuthData = KeyBackupInfo["auth_data"]; diff --git a/src/rust-crypto/libolm_migration.ts b/src/rust-crypto/libolm_migration.ts index 4a9784485b1..f23f9d7df41 100644 --- a/src/rust-crypto/libolm_migration.ts +++ b/src/rust-crypto/libolm_migration.ts @@ -21,7 +21,6 @@ import { CryptoStore, MigrationState, SecretStorePrivateKeys } from "../crypto/s import { IndexedDBCryptoStore } from "../crypto/store/indexeddb-crypto-store.ts"; import { IHttpOpts, MatrixHttpApi } from "../http-api/index.ts"; import { requestKeyBackupVersion } from "./backup.ts"; -import { IRoomEncryption } from "../crypto/RoomList.ts"; import { CrossSigningKeyInfo, Curve25519AuthData } from "../crypto-api/index.ts"; import { RustCrypto } from "./rust-crypto.ts"; import { KeyBackupInfo } from "../crypto-api/keybackup.ts"; @@ -30,6 +29,12 @@ import { encodeBase64 } from "../base64.ts"; import decryptAESSecretStorageItem from "../utils/decryptAESSecretStorageItem.ts"; import { AESEncryptedSecretStoragePayload } from "../@types/AESEncryptedSecretStoragePayload.ts"; +interface LegacyRoomEncryption { + algorithm: string; + rotation_period_ms?: number; + rotation_period_msgs?: number; +} + /** * Determine if any data needs migrating from the legacy store, and do so. * @@ -375,7 +380,7 @@ export async function migrateRoomSettingsFromLegacyCrypto({ return; } - let rooms: Record = {}; + let rooms: Record = {}; await legacyStore.doTxn("readwrite", [IndexedDBCryptoStore.STORE_ROOMS], (txn) => { legacyStore.getEndToEndRooms(txn, (result) => { diff --git a/src/testing.ts b/src/testing.ts index ba609ad0984..eab7e019de3 100644 --- a/src/testing.ts +++ b/src/testing.ts @@ -25,9 +25,8 @@ limitations under the License. import { IContent, IEvent, IUnsigned, MatrixEvent } from "./models/event.ts"; import { RoomMember } from "./models/room-member.ts"; import { EventType } from "./@types/event.ts"; -import { DecryptionError } from "./crypto/algorithms/index.ts"; import { DecryptionFailureCode } from "./crypto-api/index.ts"; -import { EventDecryptionResult } from "./common-crypto/CryptoBackend.ts"; +import { DecryptionError, EventDecryptionResult } from "./common-crypto/CryptoBackend.ts"; /** * Create a {@link MatrixEvent}. From bc5246970c39505bbd2b558f52e0d02bcca1548f Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Mon, 2 Dec 2024 09:14:45 +0000 Subject: [PATCH 05/10] Extract release sanity checks to reusable workflow (#4546) Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- .github/workflows/release-checks.yml | 37 ++++++++++++++++++++++++++++ .github/workflows/release-make.yml | 22 ++++------------- 2 files changed, 42 insertions(+), 17 deletions(-) create mode 100644 .github/workflows/release-checks.yml diff --git a/.github/workflows/release-checks.yml b/.github/workflows/release-checks.yml new file mode 100644 index 00000000000..1f20acea22c --- /dev/null +++ b/.github/workflows/release-checks.yml @@ -0,0 +1,37 @@ +name: Release Sanity checks +on: + workflow_call: + secrets: + GITHUB_TOKEN: + required: true + inputs: + repository: + type: string + required: true + description: "The repository (in form owner/repo) to check for release blockers" + +permissions: {} +jobs: + checks: + name: Sanity checks + runs-on: ubuntu-24.04 + steps: + - name: Check for X-Release-Blocker label on any open issues or PRs + uses: actions/github-script@v7 + env: + REPO: ${{ inputs.repository }} + with: + github-token: ${{ secrets.GITHUB_TOKEN }} + script: | + const { REPO } = process.env; + const { data } = await github.rest.search.issuesAndPullRequests({ + q: `repo:${REPO} label:X-Release-Blocker is:open`, + per_page: 50, + }); + + if (data.total_count) { + data.items.forEach(item => { + core.error(`Release blocker: ${item.html_url}`); + }); + core.setFailed(`Found release blockers!`); + } diff --git a/.github/workflows/release-make.yml b/.github/workflows/release-make.yml index 55e07a936fc..a72aacac923 100644 --- a/.github/workflows/release-make.yml +++ b/.github/workflows/release-make.yml @@ -42,26 +42,14 @@ permissions: {} jobs: checks: name: Sanity checks - runs-on: ubuntu-24.04 permissions: issues: read pull-requests: read - steps: - - name: Check for X-Release-Blocker label on any open issues or PRs - uses: actions/github-script@v7 - with: - script: | - const { data } = await github.rest.search.issuesAndPullRequests({ - q: `repo:${context.repo.owner}/${context.repo.repo} label:X-Release-Blocker is:open`, - per_page: 50, - }); - - if (data.total_count) { - data.items.forEach(item => { - core.error(`Release blocker: ${item.html_url}`); - }); - core.setFailed(`Found release blockers!`); - } + uses: matrix-org/matrix-js-sdk/.github/workflows/release-checks.yml@develop + secrets: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + repository: ${{ github.repository }} release: name: Release From 8863e42e350cbb2fe32c22984e875d7012f2d696 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Mon, 2 Dec 2024 09:56:52 +0000 Subject: [PATCH 06/10] More typescript linting (#3310) * More typescript linting * Improve types Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Discard changes to src/models/MSC3089TreeSpace.ts * Discard changes to src/realtime-callbacks.ts * Fix tests Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Improve coverage Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --------- Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- .eslintrc.cjs | 1 + spec/integ/matrix-client-methods.spec.ts | 22 +++++++++++++++++++ spec/test-utils/webrtc.ts | 3 +++ spec/unit/webrtc/groupCall.spec.ts | 2 +- src/@types/global.d.ts | 2 +- src/autodiscovery.ts | 2 +- src/client.ts | 14 ++++-------- src/crypto/EncryptionSetup.ts | 2 +- src/crypto/dehydration.ts | 6 ++--- src/crypto/store/localStorage-crypto-store.ts | 4 ++-- src/models/event.ts | 8 +++---- src/sliding-sync.ts | 12 +++++----- src/store/indexeddb.ts | 2 +- src/webrtc/call.ts | 6 ++--- src/webrtc/groupCall.ts | 2 +- src/webrtc/stats/callFeedStatsReporter.ts | 7 ++---- src/webrtc/stats/media/mediaTrackHandler.ts | 10 ++------- 17 files changed, 58 insertions(+), 47 deletions(-) diff --git a/.eslintrc.cjs b/.eslintrc.cjs index 50ca8d622e7..7bad5c8177a 100644 --- a/.eslintrc.cjs +++ b/.eslintrc.cjs @@ -138,6 +138,7 @@ module.exports = { tryExtensions: [".ts"], }, ], + "no-extra-boolean-cast": "error", }, }, { diff --git a/spec/integ/matrix-client-methods.spec.ts b/spec/integ/matrix-client-methods.spec.ts index b5347e3b559..d5ec9677b19 100644 --- a/spec/integ/matrix-client-methods.spec.ts +++ b/spec/integ/matrix-client-methods.spec.ts @@ -1915,6 +1915,28 @@ describe("MatrixClient", function () { return prom; }); }); + + describe("getDomain", () => { + it("should return null if no userId is set", () => { + const client = new MatrixClient({ baseUrl: "http://localhost" }); + expect(client.getDomain()).toBeNull(); + }); + + it("should return the domain of the userId", () => { + expect(client.getDomain()).toBe("localhost"); + }); + }); + + describe("getUserIdLocalpart", () => { + it("should return null if no userId is set", () => { + const client = new MatrixClient({ baseUrl: "http://localhost" }); + expect(client.getUserIdLocalpart()).toBeNull(); + }); + + it("should return the localpart of the userId", () => { + expect(client.getUserIdLocalpart()).toBe("alice"); + }); + }); }); function withThreadId(event: MatrixEvent, newThreadId: string): MatrixEvent { diff --git a/spec/test-utils/webrtc.ts b/spec/test-utils/webrtc.ts index fbc6d93be26..924d024cafc 100644 --- a/spec/test-utils/webrtc.ts +++ b/spec/test-utils/webrtc.ts @@ -481,6 +481,9 @@ export class MockCallMatrixClient extends TypedEventEmitter { - client = new MatrixClient({ baseUrl: "base_url" }); + client = new MatrixClient({ baseUrl: "base_url", userId: "my_user_id" }); jest.spyOn(client, "sendStateEvent").mockResolvedValue({} as any); }); diff --git a/src/@types/global.d.ts b/src/@types/global.d.ts index 0b51c2b229a..5a280f0e2ce 100644 --- a/src/@types/global.d.ts +++ b/src/@types/global.d.ts @@ -65,6 +65,6 @@ declare global { interface Navigator { // We check for the webkit-prefixed getUserMedia to detect if we're // on webkit: we should check if we still need to do this - webkitGetUserMedia: DummyInterfaceWeShouldntBeUsingThis; + webkitGetUserMedia?: DummyInterfaceWeShouldntBeUsingThis; } } diff --git a/src/autodiscovery.ts b/src/autodiscovery.ts index b321dcddccb..d9243e4daf3 100644 --- a/src/autodiscovery.ts +++ b/src/autodiscovery.ts @@ -130,7 +130,7 @@ export class AutoDiscovery { * configuration, which may include error states. Rejects on unexpected * failure, not when verification fails. */ - public static async fromDiscoveryConfig(wellknown: IClientWellKnown): Promise { + public static async fromDiscoveryConfig(wellknown?: IClientWellKnown): Promise { // Step 1 is to get the config, which is provided to us here. // We default to an error state to make the first few checks easier to diff --git a/src/client.ts b/src/client.ts index 5ef823a298b..478e2784e51 100644 --- a/src/client.ts +++ b/src/client.ts @@ -1832,10 +1832,7 @@ export class MatrixClient extends TypedEventEmitter { diff --git a/src/crypto/store/localStorage-crypto-store.ts b/src/crypto/store/localStorage-crypto-store.ts index d24e648d634..818a831406d 100644 --- a/src/crypto/store/localStorage-crypto-store.ts +++ b/src/crypto/store/localStorage-crypto-store.ts @@ -162,7 +162,7 @@ export class LocalStorageCryptoStore extends MemoryCryptoStore implements Crypto func: (session: ISessionInfo) => void, ): void { const sessions = this._getEndToEndSessions(deviceKey); - func(sessions[sessionId] || {}); + func(sessions[sessionId] ?? {}); } public getEndToEndSessions( @@ -170,7 +170,7 @@ export class LocalStorageCryptoStore extends MemoryCryptoStore implements Crypto txn: unknown, func: (sessions: { [sessionId: string]: ISessionInfo }) => void, ): void { - func(this._getEndToEndSessions(deviceKey) || {}); + func(this._getEndToEndSessions(deviceKey) ?? {}); } public getAllEndToEndSessions(txn: unknown, func: (session: ISessionInfo) => void): void { diff --git a/src/models/event.ts b/src/models/event.ts index 5ce7e9fb998..bdb75f5ea2b 100644 --- a/src/models/event.ts +++ b/src/models/event.ts @@ -559,9 +559,9 @@ export class MatrixEvent extends TypedEventEmitter { const list = this.lists.get(key); if (!list || !resp) { @@ -934,7 +934,7 @@ export class SlidingSync extends TypedEventEmitter = new Set(); if (!doNotUpdateList) { for (const [key, list] of Object.entries(resp.lists)) { - list.ops = list.ops || []; + list.ops = list.ops ?? []; if (list.ops.length > 0) { listKeysWithUpdates.add(key); } diff --git a/src/store/indexeddb.ts b/src/store/indexeddb.ts index dfed00df272..8705f4a5c48 100644 --- a/src/store/indexeddb.ts +++ b/src/store/indexeddb.ts @@ -42,7 +42,7 @@ const WRITE_DELAY_MS = 1000 * 60 * 5; // once every 5 minutes interface IOpts extends IBaseOpts { /** The Indexed DB interface e.g. `window.indexedDB` */ - indexedDB: IDBFactory; + indexedDB?: IDBFactory; /** Optional database name. The same name must be used to open the same database. */ dbName?: string; /** Optional factory to spin up a Worker to execute the IDB transactions within. */ diff --git a/src/webrtc/call.ts b/src/webrtc/call.ts index c2b24cadb82..c1203e24707 100644 --- a/src/webrtc/call.ts +++ b/src/webrtc/call.ts @@ -3016,9 +3016,9 @@ export function supportsMatrixCall(): boolean { // is that the browser throwing a SecurityError will brick the client creation process. try { const supported = Boolean( - window.RTCPeerConnection || - window.RTCSessionDescription || - window.RTCIceCandidate || + window.RTCPeerConnection ?? + window.RTCSessionDescription ?? + window.RTCIceCandidate ?? navigator.mediaDevices, ); if (!supported) { diff --git a/src/webrtc/groupCall.ts b/src/webrtc/groupCall.ts index 6f0266d4a13..0d2538538f4 100644 --- a/src/webrtc/groupCall.ts +++ b/src/webrtc/groupCall.ts @@ -1445,7 +1445,7 @@ export class GroupCall extends TypedEventEmitter< * Recalculates and updates the participant map to match the room state. */ private updateParticipants(): void { - const localMember = this.room.getMember(this.client.getUserId()!)!; + const localMember = this.room.getMember(this.client.getSafeUserId()); if (!localMember) { // The client hasn't fetched enough of the room state to get our own member // event. This probably shouldn't happen, but sanity check & exit for now. diff --git a/src/webrtc/stats/callFeedStatsReporter.ts b/src/webrtc/stats/callFeedStatsReporter.ts index d219f717277..e78438acbe7 100644 --- a/src/webrtc/stats/callFeedStatsReporter.ts +++ b/src/webrtc/stats/callFeedStatsReporter.ts @@ -49,8 +49,8 @@ export class CallFeedStatsReporter { return { id: track.id, kind: track.kind, - settingDeviceId: settingDeviceId ? settingDeviceId : "unknown", - constrainDeviceId: constrainDeviceId ? constrainDeviceId : "unknown", + settingDeviceId: settingDeviceId ?? "unknown", + constrainDeviceId: constrainDeviceId ?? "unknown", muted: track.muted, enabled: track.enabled, readyState: track.readyState, @@ -63,9 +63,6 @@ export class CallFeedStatsReporter { callFeeds: CallFeed[], prefix = "unknown", ): CallFeedReport { - if (!report.callFeeds) { - report.callFeeds = []; - } callFeeds.forEach((feed) => { const audioTracks = feed.stream.getAudioTracks(); const videoTracks = feed.stream.getVideoTracks(); diff --git a/src/webrtc/stats/media/mediaTrackHandler.ts b/src/webrtc/stats/media/mediaTrackHandler.ts index 31f1264b3ea..8d2108c0b37 100644 --- a/src/webrtc/stats/media/mediaTrackHandler.ts +++ b/src/webrtc/stats/media/mediaTrackHandler.ts @@ -49,18 +49,12 @@ export class MediaTrackHandler { public getLocalTrackIdByMid(mid: string): string | undefined { const transceiver = this.pc.getTransceivers().find((t) => t.mid === mid); - if (transceiver !== undefined && !!transceiver.sender && !!transceiver.sender.track) { - return transceiver.sender.track.id; - } - return undefined; + return transceiver?.sender?.track?.id; } public getRemoteTrackIdByMid(mid: string): string | undefined { const transceiver = this.pc.getTransceivers().find((t) => t.mid === mid); - if (transceiver !== undefined && !!transceiver.receiver && !!transceiver.receiver.track) { - return transceiver.receiver.track.id; - } - return undefined; + return transceiver?.receiver?.track?.id; } public getActiveSimulcastStreams(): number { From 051f4e2ab9b992e67a348312cb7c77031a193ced Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Mon, 2 Dec 2024 10:47:35 +0000 Subject: [PATCH 07/10] Fix release-checks to not use reserved name GITHUB_TOKEN Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- .github/workflows/release-checks.yml | 9 +++++---- .github/workflows/release-make.yml | 4 ---- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/.github/workflows/release-checks.yml b/.github/workflows/release-checks.yml index 1f20acea22c..b83b4dd1ce8 100644 --- a/.github/workflows/release-checks.yml +++ b/.github/workflows/release-checks.yml @@ -2,12 +2,13 @@ name: Release Sanity checks on: workflow_call: secrets: - GITHUB_TOKEN: - required: true + ELEMENT_BOT_TOKEN: + required: false inputs: repository: type: string - required: true + required: false + default: ${{ github.repository }} description: "The repository (in form owner/repo) to check for release blockers" permissions: {} @@ -21,7 +22,7 @@ jobs: env: REPO: ${{ inputs.repository }} with: - github-token: ${{ secrets.GITHUB_TOKEN }} + github-token: ${{ secrets.ELEMENT_BOT_TOKEN || secrets.GITHUB_TOKEN }} script: | const { REPO } = process.env; const { data } = await github.rest.search.issuesAndPullRequests({ diff --git a/.github/workflows/release-make.yml b/.github/workflows/release-make.yml index a72aacac923..421115e68f1 100644 --- a/.github/workflows/release-make.yml +++ b/.github/workflows/release-make.yml @@ -46,10 +46,6 @@ jobs: issues: read pull-requests: read uses: matrix-org/matrix-js-sdk/.github/workflows/release-checks.yml@develop - secrets: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - repository: ${{ github.repository }} release: name: Release From ab78acc7da0754c29abe04c47b63438e2e4caec2 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 3 Dec 2024 11:19:56 +0000 Subject: [PATCH 08/10] Update typedoc (#4568) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 298 ++++++--------------------------------------------- 2 files changed, 36 insertions(+), 264 deletions(-) diff --git a/package.json b/package.json index 009bb295f37..08cf6eefa0a 100644 --- a/package.json +++ b/package.json @@ -120,7 +120,7 @@ "prettier": "3.4.1", "rimraf": "^6.0.0", "ts-node": "^10.9.2", - "typedoc": "^0.26.0", + "typedoc": "^0.27.0", "typedoc-plugin-coverage": "^3.0.0", "typedoc-plugin-mdn-links": "^4.0.0", "typedoc-plugin-missing-exports": "^3.0.0", diff --git a/yarn.lock b/yarn.lock index 0684d205c20..4c14db37071 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1163,6 +1163,15 @@ resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.57.1.tgz#de633db3ec2ef6a3c89e2f19038063e8a122e2c2" integrity sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q== +"@gerrit0/mini-shiki@^1.24.0": + version "1.24.1" + resolved "https://registry.yarnpkg.com/@gerrit0/mini-shiki/-/mini-shiki-1.24.1.tgz#60ef10f4e2cfac7a9223e10b88c128438aa44fd8" + integrity sha512-PNP/Gjv3VqU7z7DjRgO3F9Ok5frTKqtpV+LJW1RzMcr2zpRk0ulhEWnbcNGXzPC7BZyWMIHrkfQX2GZRfxrn6Q== + dependencies: + "@shikijs/engine-oniguruma" "^1.24.0" + "@shikijs/types" "^1.24.0" + "@shikijs/vscode-textmate" "^9.3.0" + "@humanwhocodes/config-array@^0.13.0": version "0.13.0" resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.13.0.tgz#fb907624df3256d04b9aa2df50d7aa97ec648748" @@ -1573,39 +1582,18 @@ resolved "https://registry.yarnpkg.com/@rtsao/scc/-/scc-1.1.0.tgz#927dd2fae9bc3361403ac2c7a00c32ddce9ad7e8" integrity sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g== -"@shikijs/core@1.22.2": - version "1.22.2" - resolved "https://registry.yarnpkg.com/@shikijs/core/-/core-1.22.2.tgz#9c22bd4cc8a4d6c062461cfd35e1faa6c617ca25" - integrity sha512-bvIQcd8BEeR1yFvOYv6HDiyta2FFVePbzeowf5pPS1avczrPK+cjmaxxh0nx5QzbON7+Sv0sQfQVciO7bN72sg== +"@shikijs/engine-oniguruma@^1.24.0": + version "1.24.0" + resolved "https://registry.yarnpkg.com/@shikijs/engine-oniguruma/-/engine-oniguruma-1.24.0.tgz#4e6f49413fbc96dabfa30cb232ca1acf5ca1a446" + integrity sha512-Eua0qNOL73Y82lGA4GF5P+G2+VXX9XnuUxkiUuwcxQPH4wom+tE39kZpBFXfUuwNYxHSkrSxpB1p4kyRW0moSg== dependencies: - "@shikijs/engine-javascript" "1.22.2" - "@shikijs/engine-oniguruma" "1.22.2" - "@shikijs/types" "1.22.2" + "@shikijs/types" "1.24.0" "@shikijs/vscode-textmate" "^9.3.0" - "@types/hast" "^3.0.4" - hast-util-to-html "^9.0.3" -"@shikijs/engine-javascript@1.22.2": - version "1.22.2" - resolved "https://registry.yarnpkg.com/@shikijs/engine-javascript/-/engine-javascript-1.22.2.tgz#62e90dbd2ed1d78b972ad7d0a1f8ffaaf5e43279" - integrity sha512-iOvql09ql6m+3d1vtvP8fLCVCK7BQD1pJFmHIECsujB0V32BJ0Ab6hxk1ewVSMFA58FI0pR2Had9BKZdyQrxTw== - dependencies: - "@shikijs/types" "1.22.2" - "@shikijs/vscode-textmate" "^9.3.0" - oniguruma-to-js "0.4.3" - -"@shikijs/engine-oniguruma@1.22.2": - version "1.22.2" - resolved "https://registry.yarnpkg.com/@shikijs/engine-oniguruma/-/engine-oniguruma-1.22.2.tgz#b12a44e3faf486e19fbcf8952f4b56b9b9b8d9b8" - integrity sha512-GIZPAGzQOy56mGvWMoZRPggn0dTlBf1gutV5TdceLCZlFNqWmuc7u+CzD0Gd9vQUTgLbrt0KLzz6FNprqYAxlA== - dependencies: - "@shikijs/types" "1.22.2" - "@shikijs/vscode-textmate" "^9.3.0" - -"@shikijs/types@1.22.2": - version "1.22.2" - resolved "https://registry.yarnpkg.com/@shikijs/types/-/types-1.22.2.tgz#695a283f19963fe0638fc2646862ba5cfc4623a8" - integrity sha512-NCWDa6LGZqTuzjsGfXOBWfjS/fDIbDdmVDug+7ykVe1IKT4c1gakrvlfFYp5NhAXH/lyqLM8wsAPo5wNy73Feg== +"@shikijs/types@1.24.0", "@shikijs/types@^1.24.0": + version "1.24.0" + resolved "https://registry.yarnpkg.com/@shikijs/types/-/types-1.24.0.tgz#a1755b125cb8fb1780a876a0a57242939eafd79f" + integrity sha512-aptbEuq1Pk88DMlCe+FzXNnBZ17LCiLIGWAeCWhoFDzia5Q5Krx3DgnULLiouSdd6+LUM39XwXGppqYE0Ghtug== dependencies: "@shikijs/vscode-textmate" "^9.3.0" "@types/hast" "^3.0.4" @@ -1754,7 +1742,7 @@ dependencies: "@types/node" "*" -"@types/hast@^3.0.0", "@types/hast@^3.0.4": +"@types/hast@^3.0.4": version "3.0.4" resolved "https://registry.yarnpkg.com/@types/hast/-/hast-3.0.4.tgz#1d6b39993b82cea6ad783945b0508c25903e15aa" integrity sha512-WPs+bbQw5aCj+x6laNGWLH3wviHtoCv/P3+otBhbOhJgG8qtpdAMlTCxLtsTWA7LH1Oh/bFCHsBn0TPS5m30EQ== @@ -1802,13 +1790,6 @@ resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee" integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ== -"@types/mdast@^4.0.0": - version "4.0.4" - resolved "https://registry.yarnpkg.com/@types/mdast/-/mdast-4.0.4.tgz#7ccf72edd2f1aa7dd3437e180c64373585804dd6" - integrity sha512-kGaNbPh1k7AFzgpud/gMdvIm5xuECykRR+JnWKQno9TAXVa6WIVCGTPvYGekIDL4uwCZQSYbUxNBSb1aUo79oA== - dependencies: - "@types/unist" "*" - "@types/ms@*": version "0.7.34" resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.34.tgz#10964ba0dee6ac4cd462e2795b6bebd407303433" @@ -1853,7 +1834,7 @@ resolved "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-4.0.5.tgz#cb6e2a691b70cb177c6e3ae9c1d2e8b2ea8cd304" integrity sha512-/Ad8+nIOV7Rl++6f1BdKxFSMgmoqEoYbHRpPcx3JEfv8VRsQe9Z4mCXeJBzxs7mbHY/XOZZuXlRNfhpVPbs6ZA== -"@types/unist@*", "@types/unist@^3.0.0": +"@types/unist@*": version "3.0.3" resolved "https://registry.yarnpkg.com/@types/unist/-/unist-3.0.3.tgz#acaab0f919ce69cce629c2d4ed2eb4adc1b6c20c" integrity sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q== @@ -2001,7 +1982,7 @@ "@typescript-eslint/types" "8.16.0" eslint-visitor-keys "^4.2.0" -"@ungap/structured-clone@^1.0.0", "@ungap/structured-clone@^1.2.0": +"@ungap/structured-clone@^1.2.0": version "1.2.0" resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406" integrity sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ== @@ -2444,11 +2425,6 @@ caniuse-lite@^1.0.30001669: resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001684.tgz#0eca437bab7d5f03452ff0ef9de8299be6b08e16" integrity sha512-G1LRwLIQjBQoyq0ZJGqGIJUXzJ8irpbjHLpVRXDvBEScFJ9b17sgK6vlx0GAJFE21okD7zXl08rRRUfq6HdoEQ== -ccount@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/ccount/-/ccount-2.0.1.tgz#17a3bf82302e0870d6da43a01311a8bc02a3ecf5" - integrity sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg== - chalk@5.2.0: version "5.2.0" resolved "https://registry.yarnpkg.com/chalk/-/chalk-5.2.0.tgz#249623b7d66869c673699fb66d65723e54dfcfb3" @@ -2481,16 +2457,6 @@ char-regex@^1.0.2: resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf" integrity sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw== -character-entities-html4@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/character-entities-html4/-/character-entities-html4-2.1.0.tgz#1f1adb940c971a4b22ba39ddca6b618dc6e56b2b" - integrity sha512-1v7fgQRj6hnSwFpq1Eu0ynr/CDEw0rXo2B61qXrLNdHZmPKgb7fqS1a2JwF0rISo9q77jDI8VMEHoApn8qDoZA== - -character-entities-legacy@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/character-entities-legacy/-/character-entities-legacy-3.0.0.tgz#76bc83a90738901d7bc223a9e93759fdd560125b" - integrity sha512-RpPp0asT/6ufRm//AJVwpViZbGM/MkjQFxJccQRHmISF/22NBtsHqAWmL+/pmkPWoIUJdWyeVleTl1wydHATVQ== - chokidar@^3.6.0: version "3.6.0" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.6.0.tgz#197c6cc669ef2a8dc5e7b4d97ee4e092c3eb0d5b" @@ -2608,11 +2574,6 @@ combined-stream@^1.0.8: dependencies: delayed-stream "~1.0.0" -comma-separated-tokens@^2.0.0: - version "2.0.3" - resolved "https://registry.yarnpkg.com/comma-separated-tokens/-/comma-separated-tokens-2.0.3.tgz#4e89c9458acb61bc8fef19f4529973b2392839ee" - integrity sha512-Fu4hJdvzeylCfQPp9SGWidpzrMs7tTrlu6Vb8XGaRGck8QSNZJJp538Wrb60Lax4fPwR64ViY468OIUTbRlGZg== - commander@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068" @@ -2804,7 +2765,7 @@ delayed-stream@~1.0.0: resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ== -dequal@^2.0.0, dequal@^2.0.3: +dequal@^2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/dequal/-/dequal-2.0.3.tgz#2644214f1997d39ed0ee0ece72335490a7ac67be" integrity sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA== @@ -2814,13 +2775,6 @@ detect-newline@^3.0.0: resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651" integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA== -devlop@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/devlop/-/devlop-1.1.0.tgz#4db7c2ca4dc6e0e834c30be70c94bbc976dc7018" - integrity sha512-RWmIqhcFf1lRYBvNmr7qTNuyCt/7/ns2jbpp1+PalgE/rDQcBT0fioSMUpJ93irlUhC5hrg4cYqe6U+0ImW0rA== - dependencies: - dequal "^2.0.0" - diff-sequences@^28.1.1: version "28.1.1" resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-28.1.1.tgz#9989dc731266dc2903457a70e996f3a041913ac6" @@ -3798,30 +3752,6 @@ hasown@^2.0.0, hasown@^2.0.1, hasown@^2.0.2: dependencies: function-bind "^1.1.2" -hast-util-to-html@^9.0.3: - version "9.0.3" - resolved "https://registry.yarnpkg.com/hast-util-to-html/-/hast-util-to-html-9.0.3.tgz#a9999a0ba6b4919576a9105129fead85d37f302b" - integrity sha512-M17uBDzMJ9RPCqLMO92gNNUDuBSq10a25SDBI08iCCxmorf4Yy6sYHK57n9WAbRAAaU+DuR4W6GN9K4DFZesYg== - dependencies: - "@types/hast" "^3.0.0" - "@types/unist" "^3.0.0" - ccount "^2.0.0" - comma-separated-tokens "^2.0.0" - hast-util-whitespace "^3.0.0" - html-void-elements "^3.0.0" - mdast-util-to-hast "^13.0.0" - property-information "^6.0.0" - space-separated-tokens "^2.0.0" - stringify-entities "^4.0.0" - zwitch "^2.0.4" - -hast-util-whitespace@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/hast-util-whitespace/-/hast-util-whitespace-3.0.0.tgz#7778ed9d3c92dd9e8c5c8f648a49c21fc51cb621" - integrity sha512-88JUN06ipLwsnv+dVn+OIYOvAuvBMy/Qoi6O7mQHxdPXpjy+Cd6xRkWwux7DKO+4sYILtLBRIKgsdpS2gQc7qw== - dependencies: - "@types/hast" "^3.0.0" - hosted-git-info@^2.1.4: version "2.8.9" resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9" @@ -3839,11 +3769,6 @@ html-escaper@^2.0.0: resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453" integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg== -html-void-elements@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/html-void-elements/-/html-void-elements-3.0.0.tgz#fc9dbd84af9e747249034d4d62602def6517f1d7" - integrity sha512-bEqo66MRXsUGxWHV5IP0PUiAWwoEjba4VCzg0LjFJBpchPaTfyfCKTG6bc5F8ucKec3q5y6qOdGyYTSBEvhCrg== - http-proxy-agent@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz#5129800203520d434f142bc78ff3c170800f2b43" @@ -4973,21 +4898,6 @@ matrix-widget-api@^1.10.0: "@types/events" "^3.0.0" events "^3.2.0" -mdast-util-to-hast@^13.0.0: - version "13.2.0" - resolved "https://registry.yarnpkg.com/mdast-util-to-hast/-/mdast-util-to-hast-13.2.0.tgz#5ca58e5b921cc0a3ded1bc02eed79a4fe4fe41f4" - integrity sha512-QGYKEuUsYT9ykKBCMOEDLsU5JRObWQusAolFMeko/tYPufNkRffBAQjIE+99jbA87xv6FgmjLtwjh9wBWajwAA== - dependencies: - "@types/hast" "^3.0.0" - "@types/mdast" "^4.0.0" - "@ungap/structured-clone" "^1.0.0" - devlop "^1.0.0" - micromark-util-sanitize-uri "^2.0.0" - trim-lines "^3.0.0" - unist-util-position "^5.0.0" - unist-util-visit "^5.0.0" - vfile "^6.0.0" - mdurl@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-2.0.0.tgz#80676ec0433025dd3e17ee983d0fe8de5a2237e0" @@ -5003,38 +4913,6 @@ merge2@^1.3.0: resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== -micromark-util-character@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/micromark-util-character/-/micromark-util-character-2.1.1.tgz#2f987831a40d4c510ac261e89852c4e9703ccda6" - integrity sha512-wv8tdUTJ3thSFFFJKtpYKOYiGP2+v96Hvk4Tu8KpCAsTMs6yi+nVmGh1syvSCsaxz45J6Jbw+9DD6g97+NV67Q== - dependencies: - micromark-util-symbol "^2.0.0" - micromark-util-types "^2.0.0" - -micromark-util-encode@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/micromark-util-encode/-/micromark-util-encode-2.0.1.tgz#0d51d1c095551cfaac368326963cf55f15f540b8" - integrity sha512-c3cVx2y4KqUnwopcO9b/SCdo2O67LwJJ/UyqGfbigahfegL9myoEFoDYZgkT7f36T0bLrM9hZTAaAyH+PCAXjw== - -micromark-util-sanitize-uri@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/micromark-util-sanitize-uri/-/micromark-util-sanitize-uri-2.0.1.tgz#ab89789b818a58752b73d6b55238621b7faa8fd7" - integrity sha512-9N9IomZ/YuGGZZmQec1MbgxtlgougxTodVwDzzEouPKo3qFWvymFHWcnDi2vzV1ff6kas9ucW+o3yzJK9YB1AQ== - dependencies: - micromark-util-character "^2.0.0" - micromark-util-encode "^2.0.0" - micromark-util-symbol "^2.0.0" - -micromark-util-symbol@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/micromark-util-symbol/-/micromark-util-symbol-2.0.1.tgz#e5da494e8eb2b071a0d08fb34f6cefec6c0a19b8" - integrity sha512-vs5t8Apaud9N28kgCrRUdEed4UJ+wWNvicHLPxCa9ENlYuAY31M0ETy5y1vA33YoNPDFTghEbnh6efaE8h4x0Q== - -micromark-util-types@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/micromark-util-types/-/micromark-util-types-2.0.1.tgz#a3edfda3022c6c6b55bfb049ef5b75d70af50709" - integrity sha512-534m2WhVTddrcKVepwmVEVnUAmtrx9bfIjNoQHRqfnvdaHQiFytEhJoTgpWJvDEXCO5gLTQh3wYC1PgOJA4NSQ== - micromatch@^4.0.4, micromatch@~4.0.8: version "4.0.8" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202" @@ -5255,13 +5133,6 @@ onetime@^7.0.0: dependencies: mimic-function "^5.0.0" -oniguruma-to-js@0.4.3: - version "0.4.3" - resolved "https://registry.yarnpkg.com/oniguruma-to-js/-/oniguruma-to-js-0.4.3.tgz#8d899714c21f5c7d59a3c0008ca50e848086d740" - integrity sha512-X0jWUcAlxORhOqqBREgPMgnshB7ZGYszBNspP+tS9hPD3l13CdaXcHbgImoHUHlrvGx/7AvFEkTRhAGYh+jzjQ== - dependencies: - regex "^4.3.2" - optionator@^0.9.3: version "0.9.4" resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.4.tgz#7ea1c1a5d91d764fb282139c88fe11e182a3a734" @@ -5493,11 +5364,6 @@ prompts@^2.0.1: kleur "^3.0.3" sisteransi "^1.0.5" -property-information@^6.0.0: - version "6.5.0" - resolved "https://registry.yarnpkg.com/property-information/-/property-information-6.5.0.tgz#6212fbb52ba757e92ef4fb9d657563b933b7ffec" - integrity sha512-PgTgs/BlvHxOu8QuEN7wi5A0OmXaBcHpmCSTehcs6Uuu9IkDIEo13Hy7n898RHfrQ49vKCoGeWZSaAK01nwVig== - psl@^1.1.33: version "1.9.0" resolved "https://registry.yarnpkg.com/psl/-/psl-1.9.0.tgz#d0df2a137f00794565fcaf3b2c00cd09f8d5a5a7" @@ -5600,11 +5466,6 @@ regenerator-transform@^0.15.2: dependencies: "@babel/runtime" "^7.8.4" -regex@^4.3.2: - version "4.4.0" - resolved "https://registry.yarnpkg.com/regex/-/regex-4.4.0.tgz#cb731e2819f230fad69089e1bd854fef7569e90a" - integrity sha512-uCUSuobNVeqUupowbdZub6ggI5/JZkYyJdDogddJr60L764oxC2pMZov1fQ3wM9bdyzUILDG+Sqx6NAKAz9rKQ== - regexp-tree@^0.1.27: version "0.1.27" resolved "https://registry.yarnpkg.com/regexp-tree/-/regexp-tree-0.1.27.tgz#2198f0ef54518ffa743fe74d983b56ffd631b6cd" @@ -5852,18 +5713,6 @@ shebang-regex@^3.0.0: resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== -shiki@^1.16.2: - version "1.22.2" - resolved "https://registry.yarnpkg.com/shiki/-/shiki-1.22.2.tgz#ed109a3d0850504ad5a1edf8496470a2121c5b7b" - integrity sha512-3IZau0NdGKXhH2bBlUk4w1IHNxPh6A5B2sUpyY+8utLu2j/h1QpFkAaUA1bAMxOWWGtTWcAh531vnS4NJKS/lA== - dependencies: - "@shikijs/core" "1.22.2" - "@shikijs/engine-javascript" "1.22.2" - "@shikijs/engine-oniguruma" "1.22.2" - "@shikijs/types" "1.22.2" - "@shikijs/vscode-textmate" "^9.3.0" - "@types/hast" "^3.0.4" - side-channel@^1.0.4: version "1.0.6" resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.6.tgz#abd25fb7cd24baf45466406b1096b7831c9215f2" @@ -5938,11 +5787,6 @@ source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1: resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== -space-separated-tokens@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/space-separated-tokens/-/space-separated-tokens-2.0.2.tgz#1ecd9d2350a3844572c3f4a312bceb018348859f" - integrity sha512-PEGlAwrG8yXGXRjW32fGbg66JAlOAwbObuqVoJpv/mRgoWDQfgH1wDPvtzWyUSNAXBGSk8h755YDbbcEy3SH2Q== - spdx-correct@^3.0.0: version "3.2.0" resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.2.0.tgz#4f5ab0668f0059e34f9c00dce331784a12de4e9c" @@ -6066,14 +5910,6 @@ string.prototype.trimstart@^1.0.8: define-properties "^1.2.1" es-object-atoms "^1.0.0" -stringify-entities@^4.0.0: - version "4.0.4" - resolved "https://registry.yarnpkg.com/stringify-entities/-/stringify-entities-4.0.4.tgz#b3b79ef5f277cc4ac73caeb0236c5ba939b3a4f3" - integrity sha512-IwfBptatlO+QCJUo19AqvrPNqlVMpW9YEL2LIVY+Rpv2qsjCGxaDLNRgeGsQWJhfItebuJhsGSLjaBbNSQ+ieg== - dependencies: - character-entities-html4 "^2.0.0" - character-entities-legacy "^3.0.0" - "strip-ansi-cjs@npm:strip-ansi@^6.0.1": version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" @@ -6241,11 +6077,6 @@ tr46@~0.0.3: resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a" integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw== -trim-lines@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/trim-lines/-/trim-lines-3.0.1.tgz#d802e332a07df861c48802c04321017b1bd87338" - integrity sha512-kRj8B+YHZCc9kQYdWfJB2/oUl9rA99qbowYYBtr4ui4mZyAQ2JpvVBd/6U2YloATfqBhBTSMhTpgBHtU0Mf3Rg== - ts-api-utils@^1.3.0: version "1.4.2" resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.4.2.tgz#a6a6dff26117ac7965624fc118525971edc6a82a" @@ -6372,25 +6203,25 @@ typedoc-plugin-coverage@^3.0.0: integrity sha512-I8fLeQEERncGn4sUlGZ+B1ehx4L7VRwqa3i6AP+PFfvZK0ToXBGkh9sK7xs8l8FLPXq7Cv0yVy4YCEGgWNzDBw== typedoc-plugin-mdn-links@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/typedoc-plugin-mdn-links/-/typedoc-plugin-mdn-links-4.0.1.tgz#103d6b16bf98bbe2dda21644b67264fd63a6e6f3" - integrity sha512-vt0+5VHvAhdZ02OvfD3O7NySoU+cDEUc5XjApBN4dxCR7CcLk2FqgzKHlDiJjzcsFkLZRvc4Znj2sV8m9AuDsg== + version "4.0.3" + resolved "https://registry.yarnpkg.com/typedoc-plugin-mdn-links/-/typedoc-plugin-mdn-links-4.0.3.tgz#30d22be00bc7689a98c0b223b6a487ff6f338ec7" + integrity sha512-q18V8nXF4MqMBGABPVodfxmU2VLK+C7RpyKgrEGP1oP3MAdavLM8Hmeh7zUJAZ4ky+zotO5ZXfhgChegmaDWug== typedoc-plugin-missing-exports@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/typedoc-plugin-missing-exports/-/typedoc-plugin-missing-exports-3.1.0.tgz#cab4952c19cae1ab3f91cbbf2d7d17564682b023" integrity sha512-Sogbaj+qDa21NjB3SlIw4JXSwmcl/WOjwiPNaVEcPhpNG/MiRTtpwV81cT7h1cbu9StpONFPbddYWR0KV/fTWA== -typedoc@^0.26.0: - version "0.26.11" - resolved "https://registry.yarnpkg.com/typedoc/-/typedoc-0.26.11.tgz#124b43a5637b7f3237b8c721691b44738c5c9dc9" - integrity sha512-sFEgRRtrcDl2FxVP58Ze++ZK2UQAEvtvvH8rRlig1Ja3o7dDaMHmaBfvJmdGnNEFaLTpQsN8dpvZaTqJSu/Ugw== +typedoc@^0.27.0: + version "0.27.2" + resolved "https://registry.yarnpkg.com/typedoc/-/typedoc-0.27.2.tgz#8a4e0303f4c49174af21e981e0b60e8a637d8167" + integrity sha512-C2ima5TZJHU3ecnRIz50lKd1BsYck5LhYQIy7MRPmjuSEJreUEAt+uAVcZgY7wZsSORzEI7xW8miZIdxv/cbmw== dependencies: + "@gerrit0/mini-shiki" "^1.24.0" lunr "^2.3.9" markdown-it "^14.1.0" minimatch "^9.0.5" - shiki "^1.16.2" - yaml "^2.5.1" + yaml "^2.6.1" typescript@^5.4.2: version "5.6.3" @@ -6445,44 +6276,6 @@ unicode-property-aliases-ecmascript@^2.0.0: resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz#43d41e3be698bd493ef911077c9b131f827e8ccd" integrity sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w== -unist-util-is@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-6.0.0.tgz#b775956486aff107a9ded971d996c173374be424" - integrity sha512-2qCTHimwdxLfz+YzdGfkqNlH0tLi9xjTnHddPmJwtIG9MGsdbutfTc4P+haPD7l7Cjxf/WZj+we5qfVPvvxfYw== - dependencies: - "@types/unist" "^3.0.0" - -unist-util-position@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/unist-util-position/-/unist-util-position-5.0.0.tgz#678f20ab5ca1207a97d7ea8a388373c9cf896be4" - integrity sha512-fucsC7HjXvkB5R3kTCO7kUjRdrS0BJt3M/FPxmHMBOm8JQi2BsHAHFsy27E0EolP8rp0NzXsJ+jNPyDWvOJZPA== - dependencies: - "@types/unist" "^3.0.0" - -unist-util-stringify-position@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-4.0.0.tgz#449c6e21a880e0855bf5aabadeb3a740314abac2" - integrity sha512-0ASV06AAoKCDkS2+xw5RXJywruurpbC4JZSm7nr7MOt1ojAzvyyaO+UxZf18j8FCF6kmzCZKcAgN/yu2gm2XgQ== - dependencies: - "@types/unist" "^3.0.0" - -unist-util-visit-parents@^6.0.0: - version "6.0.1" - resolved "https://registry.yarnpkg.com/unist-util-visit-parents/-/unist-util-visit-parents-6.0.1.tgz#4d5f85755c3b8f0dc69e21eca5d6d82d22162815" - integrity sha512-L/PqWzfTP9lzzEa6CKs0k2nARxTdZduw3zyh8d2NVBnsyvHjSX4TWse388YrrQKbvI8w20fGjGlhgT96WwKykw== - dependencies: - "@types/unist" "^3.0.0" - unist-util-is "^6.0.0" - -unist-util-visit@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-5.0.0.tgz#a7de1f31f72ffd3519ea71814cccf5fd6a9217d6" - integrity sha512-MR04uvD+07cwl/yhVuVWAtw+3GOR/knlL55Nd/wAdblk27GCVt3lqpTivy/tkJcZoNPzTwS1Y+KMojlLDhoTzg== - dependencies: - "@types/unist" "^3.0.0" - unist-util-is "^6.0.0" - unist-util-visit-parents "^6.0.0" - universalify@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.2.0.tgz#6451760566fa857534745ab1dde952d1b1761be0" @@ -6543,22 +6336,6 @@ validate-npm-package-license@^3.0.1: spdx-correct "^3.0.0" spdx-expression-parse "^3.0.0" -vfile-message@^4.0.0: - version "4.0.2" - resolved "https://registry.yarnpkg.com/vfile-message/-/vfile-message-4.0.2.tgz#c883c9f677c72c166362fd635f21fc165a7d1181" - integrity sha512-jRDZ1IMLttGj41KcZvlrYAaI3CfqpLpfpf+Mfig13viT6NKvRzWZ+lXz0Y5D60w6uJIBAOGq9mSHf0gktF0duw== - dependencies: - "@types/unist" "^3.0.0" - unist-util-stringify-position "^4.0.0" - -vfile@^6.0.0: - version "6.0.3" - resolved "https://registry.yarnpkg.com/vfile/-/vfile-6.0.3.tgz#3652ab1c496531852bf55a6bac57af981ebc38ab" - integrity sha512-KzIbH/9tXat2u30jf+smMwFCsno4wHVdNmzFyL+T/L3UGqqk6JKfVqOFOZEpZSHADH1k40ab6NUIXZq422ov3Q== - dependencies: - "@types/unist" "^3.0.0" - vfile-message "^4.0.0" - w3c-xmlserializer@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-4.0.0.tgz#aebdc84920d806222936e3cdce408e32488a3073" @@ -6756,10 +6533,10 @@ yallist@^3.0.2: resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd" integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g== -yaml@^2.5.1: - version "2.6.0" - resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.6.0.tgz#14059ad9d0b1680d0f04d3a60fe00f3a857303c3" - integrity sha512-a6ae//JvKDEra2kdi1qzCyrJW/WZCgFi8ydDV+eXExl95t+5R+ijnqHJbz9tmMh8FUjx3iv2fCQ4dclAQlO2UQ== +yaml@^2.6.1: + version "2.6.1" + resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.6.1.tgz#42f2b1ba89203f374609572d5349fb8686500773" + integrity sha512-7r0XPzioN/Q9kXBro/XPnA6kznR73DHq+GXh5ON7ZozRO6aMjbmiBuKste2wslTFkC5d1dw0GooOCepZXJ2SAg== yaml@~2.5.0: version "2.5.1" @@ -6803,8 +6580,3 @@ zod@^3.22.4: version "3.23.8" resolved "https://registry.yarnpkg.com/zod/-/zod-3.23.8.tgz#e37b957b5d52079769fb8097099b592f0ef4067d" integrity sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g== - -zwitch@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/zwitch/-/zwitch-2.0.4.tgz#c827d4b0acb76fc3e685a4c6ec2902d51070e9d7" - integrity sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A== From b8e332b53d0d36cfc019fefffe7fc76bba11df65 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 3 Dec 2024 11:47:14 +0000 Subject: [PATCH 09/10] Update dependency typescript to v5.7.2 (#4553) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 4c14db37071..2cfe41e0730 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6224,9 +6224,9 @@ typedoc@^0.27.0: yaml "^2.6.1" typescript@^5.4.2: - version "5.6.3" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.6.3.tgz#5f3449e31c9d94febb17de03cc081dd56d81db5b" - integrity sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw== + version "5.7.2" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.7.2.tgz#3169cf8c4c8a828cde53ba9ecb3d2b1d5dd67be6" + integrity sha512-i5t66RHxDvVN40HfDd1PsEThGNnlMCMT3jMUuoh9/0TaqWevNontacunWyN02LA9/fIbEWlcHZcgTKb9QoaLfg== uc.micro@^2.0.0, uc.micro@^2.1.0: version "2.1.0" From d3f5526ec07dcbd0e4677a56b5e53f7d3a4cbcc2 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 3 Dec 2024 12:23:40 +0000 Subject: [PATCH 10/10] v34.13.0 --- CHANGELOG.md | 19 +++++++++++++++++++ package.json | 2 +- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a2fdd431444..d2687d1bdd3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,22 @@ +Changes in [34.13.0](https://github.com/matrix-org/matrix-js-sdk/releases/tag/v34.13.0) (2024-12-03) +==================================================================================================== +## 🦖 Deprecations + +* Deprecate `MatrixClient.isEventSenderVerified` ([#4527](https://github.com/matrix-org/matrix-js-sdk/pull/4527)). Contributed by @florianduros. +* Add `restoreKeybackup` to `CryptoApi`. ([#4476](https://github.com/matrix-org/matrix-js-sdk/pull/4476)). Contributed by @florianduros. + +## ✨ Features + +* Ensure we disambiguate display names which look like MXIDs ([#4540](https://github.com/matrix-org/matrix-js-sdk/pull/4540)). Contributed by @t3chguy. +* Add `CryptoApi.getBackupInfo` ([#4512](https://github.com/matrix-org/matrix-js-sdk/pull/4512)). Contributed by @florianduros. +* Fix local echo in embedded mode ([#4498](https://github.com/matrix-org/matrix-js-sdk/pull/4498)). Contributed by @toger5. +* Add `restoreKeybackup` to `CryptoApi`. ([#4476](https://github.com/matrix-org/matrix-js-sdk/pull/4476)). Contributed by @florianduros. + +## 🐛 Bug Fixes + +* Fix `RustBackupManager` remaining values after current backup removal ([#4537](https://github.com/matrix-org/matrix-js-sdk/pull/4537)). Contributed by @florianduros. + + Changes in [34.12.0](https://github.com/matrix-org/matrix-js-sdk/releases/tag/v34.12.0) (2024-11-19) ==================================================================================================== ## 🦖 Deprecations diff --git a/package.json b/package.json index 6ebe111f056..acf66a0c72d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "matrix-js-sdk", - "version": "34.13.0-rc.0", + "version": "34.13.0", "description": "Matrix Client-Server SDK for Javascript", "engines": { "node": ">=20.0.0"