From 12a0412641c9269d811ace0c483d35893ad082d2 Mon Sep 17 00:00:00 2001 From: Thomas Belin Date: Mon, 27 Feb 2023 11:08:31 +0100 Subject: [PATCH 01/97] fix: Detect deleted clients when sending a message (#14755) There could be situations where we know of clients, but do not have a session with them. Which means that, when we try to encrypt for those clients, we will try to get the prekeys from them to which the backend will say that there are no prekeys. Previously we would just filter them out and ignore them. Now the core warns the webapp that those clients have been deleted and that the webapp should wipe them out from the DB --- package.json | 2 +- yarn.lock | 35 +++++++++++++++++++++++------------ 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index 0525fffdbe9..1e62a990087 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "@emotion/react": "11.10.6", "@types/eslint": "8.4.10", "@wireapp/avs": "9.0.23", - "@wireapp/core": "38.15.0", + "@wireapp/core": "38.15.1", "@wireapp/lru-cache": "3.8.1", "@wireapp/react-ui-kit": "9.3.8", "@wireapp/store-engine-dexie": "2.0.4", diff --git a/yarn.lock b/yarn.lock index 887f3e1b44e..c1d1ae36915 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4623,14 +4623,14 @@ __metadata: languageName: node linkType: hard -"@wireapp/api-client@npm:^22.17.0": - version: 22.17.0 - resolution: "@wireapp/api-client@npm:22.17.0" +"@wireapp/api-client@npm:^22.17.1": + version: 22.17.1 + resolution: "@wireapp/api-client@npm:22.17.1" dependencies: "@wireapp/commons": ^5.0.4 "@wireapp/priority-queue": ^2.0.3 "@wireapp/protocol-messaging": 1.44.0 - axios: 1.3.3 + axios: 1.3.4 axios-retry: 3.4.0 http-status-codes: 2.2.0 logdown: 3.3.1 @@ -4638,7 +4638,7 @@ __metadata: spark-md5: 3.0.2 tough-cookie: 4.1.2 ws: 8.11.0 - checksum: 5db09aa7576e7dc51e1fe384bab08a10d8bd908da37dc39e55c4667d4a691f8077551b41180498931a50d638b2204360666e9b6a171852491103ad9aed4ded74 + checksum: 4d17c62d8582fd08d71b369c79840d02d5cf6ff71eb801e01fe73cfbc9eb1fb9671b630e645d3644332d98badf944bd46f79565404a55562c18d0d2ef70305c7 languageName: node linkType: hard @@ -4691,11 +4691,11 @@ __metadata: languageName: node linkType: hard -"@wireapp/core@npm:38.15.0": - version: 38.15.0 - resolution: "@wireapp/core@npm:38.15.0" +"@wireapp/core@npm:38.15.1": + version: 38.15.1 + resolution: "@wireapp/core@npm:38.15.1" dependencies: - "@wireapp/api-client": ^22.17.0 + "@wireapp/api-client": ^22.17.1 "@wireapp/commons": ^5.0.4 "@wireapp/core-crypto": 0.6.2 "@wireapp/cryptobox": 12.8.0 @@ -4703,7 +4703,7 @@ __metadata: "@wireapp/protocol-messaging": 1.44.0 "@wireapp/store-engine": 5.0.3 "@wireapp/store-engine-dexie": ^2.0.5 - axios: 1.3.3 + axios: 1.3.4 bazinga64: 6.0.4 hash.js: 1.1.7 http-status-codes: 2.2.0 @@ -4711,7 +4711,7 @@ __metadata: logdown: 3.3.1 long: ^5.2.0 uuidjs: 4.2.13 - checksum: 91fe509aef85fd35720c1be03f740d0b342e2083da8ad149c413ed8ba0bc5889103751c00102b50d44667de8257f2f91c1f8329e98ed4aa1d47893c5c30e8343 + checksum: a819772957a4f7772dddd798dcaa30934e234edcb893ef38d9155efde6d2682b4da30bb7a1849fe81eea388cd1406d7e17e0c19f3b4e01573c96172cbaf9ae13 languageName: node linkType: hard @@ -5547,6 +5547,17 @@ __metadata: languageName: node linkType: hard +"axios@npm:1.3.4": + version: 1.3.4 + resolution: "axios@npm:1.3.4" + dependencies: + follow-redirects: ^1.15.0 + form-data: ^4.0.0 + proxy-from-env: ^1.1.0 + checksum: 7440edefcf8498bc3cdf39de00443e8101f249972c83b739c6e880d9d669fea9486372dbe8739e88b3bf8bb1ad15f6106693f206f078f4516fe8fd47b1c3093c + languageName: node + linkType: hard + "axobject-query@npm:^3.1.1": version: 3.1.1 resolution: "axobject-query@npm:3.1.1" @@ -17101,7 +17112,7 @@ __metadata: "@typescript-eslint/parser": ^5.53.0 "@wireapp/avs": 9.0.23 "@wireapp/copy-config": 2.0.9 - "@wireapp/core": 38.15.0 + "@wireapp/core": 38.15.1 "@wireapp/eslint-config": 2.1.1 "@wireapp/lru-cache": 3.8.1 "@wireapp/prettier-config": 0.5.2 From 9435072901473fc503799edfdd1a6c129dd564f9 Mon Sep 17 00:00:00 2001 From: Thomas Belin Date: Mon, 27 Feb 2023 11:29:13 +0100 Subject: [PATCH 02/97] feat: Fully enable coreCrypto (#14756) --- src/script/service/CoreSingleton.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/script/service/CoreSingleton.ts b/src/script/service/CoreSingleton.ts index b6d60b06aa4..515043704b7 100644 --- a/src/script/service/CoreSingleton.ts +++ b/src/script/service/CoreSingleton.ts @@ -22,7 +22,6 @@ import {container, singleton} from 'tsyringe'; import {Account} from '@wireapp/core'; -import {getStorage} from 'Util/localStorage'; import {isTemporaryClientAndNonPersistent, supportsCoreCryptoProteus, supportsMLS} from 'Util/util'; import {APIClient} from './APIClientSingleton'; @@ -73,7 +72,7 @@ export class Core extends Account { */ systemCrypto: window.systemCrypto, - useCoreCrypto: getStorage()?.getItem('useCoreCrypto') === '1', + useCoreCrypto: true, }, nbPrekeys: 100, }); From 7908f20bbb762510749fc1b6153dde80647a34ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Przemys=C5=82aw=20J=C3=B3=C5=BAwik?= Date: Mon, 27 Feb 2023 14:39:29 +0100 Subject: [PATCH 03/97] fix: Shortcut for incoming call not work properly (#14753) * fix: Shortcut for incoming call not work properly * add information about caputre option --- src/script/components/calling/CallingCell.tsx | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/src/script/components/calling/CallingCell.tsx b/src/script/components/calling/CallingCell.tsx index ec093fdae99..a27dc81f941 100644 --- a/src/script/components/calling/CallingCell.tsx +++ b/src/script/components/calling/CallingCell.tsx @@ -234,14 +234,22 @@ const CallingCell: React.FC = ({ const answerOrRejectCall = useCallback( (event: KeyboardEvent) => { + const answerCallShortcut = !event.shiftKey && event.ctrlKey && isEnterKey(event); + const hangUpCallShortcut = event.ctrlKey && event.shiftKey && isEnterKey(event); + const removeEventListener = () => window.removeEventListener('keydown', answerOrRejectCall); - if (!event.shiftKey && event.ctrlKey && isEnterKey(event)) { + if (answerCallShortcut || hangUpCallShortcut) { + event.preventDefault(); + event.stopPropagation(); + } + + if (answerCallShortcut) { answerCall(); removeEventListener(); } - if (event.ctrlKey && event.shiftKey && isEnterKey(event)) { + if (hangUpCallShortcut) { callActions.reject(call); removeEventListener(); } @@ -251,10 +259,13 @@ const CallingCell: React.FC = ({ useEffect(() => { if (isIncoming) { - window.addEventListener('keydown', answerOrRejectCall); + // Capture will be dispatched to registered element before being dispatched to any EventTarget beneath it in the DOM Tree. + // It's needed because when someone is calling we need to change order of shortcuts to the top of keyboard usage. + // If we didn't pass this prop other Event Listeners will be dispatched in same time. + document.addEventListener('keydown', answerOrRejectCall, {capture: true}); return () => { - window.removeEventListener('keydown', answerOrRejectCall); + document.removeEventListener('keydown', answerOrRejectCall, {capture: true}); }; } From 3c871495bb2b00774ac28a0eca31d2a0dd8291de Mon Sep 17 00:00:00 2001 From: Thomas Belin Date: Mon, 27 Feb 2023 15:22:32 +0100 Subject: [PATCH 04/97] runfix: make sure identity is wiped when device is deleted on backend (#14758) --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 1e62a990087..a3ba36964ec 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "@emotion/react": "11.10.6", "@types/eslint": "8.4.10", "@wireapp/avs": "9.0.23", - "@wireapp/core": "38.15.1", + "@wireapp/core": "38.15.2", "@wireapp/lru-cache": "3.8.1", "@wireapp/react-ui-kit": "9.3.8", "@wireapp/store-engine-dexie": "2.0.4", diff --git a/yarn.lock b/yarn.lock index c1d1ae36915..f0703c78306 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4691,9 +4691,9 @@ __metadata: languageName: node linkType: hard -"@wireapp/core@npm:38.15.1": - version: 38.15.1 - resolution: "@wireapp/core@npm:38.15.1" +"@wireapp/core@npm:38.15.2": + version: 38.15.2 + resolution: "@wireapp/core@npm:38.15.2" dependencies: "@wireapp/api-client": ^22.17.1 "@wireapp/commons": ^5.0.4 @@ -4711,7 +4711,7 @@ __metadata: logdown: 3.3.1 long: ^5.2.0 uuidjs: 4.2.13 - checksum: a819772957a4f7772dddd798dcaa30934e234edcb893ef38d9155efde6d2682b4da30bb7a1849fe81eea388cd1406d7e17e0c19f3b4e01573c96172cbaf9ae13 + checksum: 2b5ae2c83fd8f4e2a68527a779ae721c8e441ee0f3df5e8e81acbdce7bb95e24ec933cf6d895dc12a587af749f44b80460cb02c2cddf426b77196761e58deddd languageName: node linkType: hard @@ -17112,7 +17112,7 @@ __metadata: "@typescript-eslint/parser": ^5.53.0 "@wireapp/avs": 9.0.23 "@wireapp/copy-config": 2.0.9 - "@wireapp/core": 38.15.1 + "@wireapp/core": 38.15.2 "@wireapp/eslint-config": 2.1.1 "@wireapp/lru-cache": 3.8.1 "@wireapp/prettier-config": 0.5.2 From 3eda2f08533cbea29f2ddf6c590621eb1dc22743 Mon Sep 17 00:00:00 2001 From: Otto the Bot Date: Wed, 1 Mar 2023 09:19:18 +0100 Subject: [PATCH 05/97] chore: Update translations (#14761) --- src/i18n/de-DE.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/i18n/de-DE.json b/src/i18n/de-DE.json index cdb96954369..bf3dc013ad0 100644 --- a/src/i18n/de-DE.json +++ b/src/i18n/de-DE.json @@ -365,7 +365,7 @@ "conversationJoin.invalidCreateAccountText": "für Gruppenkommunikation und Telefonkonferenzen.", "conversationJoin.invalidHeadline": "Unterhaltung nicht gefunden", "conversationJoin.invalidSubhead": "Der Link zu dieser Gruppenunterhaltung ist abgelaufen oder nicht mehr gültig.", - "conversationJoin.loginLink": "Login", + "conversationJoin.loginLink": "Anmelden", "conversationJoin.namePlaceholder": "Ihr Name", "conversationJoin.subhead": "Nehmen Sie als temporärer Gast an der Unterhaltung teil (Zugang verfällt nach 24 Stunden)", "conversationJoin.unsupportedJoinHeadline": "Sie wurden zu einer Unterhaltung in {brandName} eingeladen", @@ -607,9 +607,9 @@ "index.createTeam": "Sichere Zusammenarbeit für Unternehmen, Institutionen und Organisationen", "index.enterprise": "Anmeldung für Unternehmen", "index.goBack": "Zurück", - "index.login": "Login", + "index.login": "Anmelden", "index.loginInfo": "Bereits registriert?", - "index.ssoLogin": "Einloggen mit SSO", + "index.ssoLogin": "Anmelden mit SSO", "index.welcome": "Willkommen bei {brandName}", "initDecryption": "Entschlüssele Events", "initEvents": "Nachrichten werden geladen", From b58328e1134c796961b44049b58eb71b44ac56e1 Mon Sep 17 00:00:00 2001 From: Thomas Belin Date: Wed, 1 Mar 2023 10:55:52 +0100 Subject: [PATCH 06/97] refactor: Kill all non-domain-aware apis (#14760) --- package.json | 2 +- src/__mocks__/@wireapp/core.ts | 2 +- src/script/Config.ts | 2 +- src/script/calling/CallingRepository.ts | 49 ++++--------------- src/script/client/ClientRepository.ts | 4 +- src/script/client/ClientService.ts | 8 --- .../Message/VerificationMessage.test.tsx | 2 +- src/script/connection/ConnectionRepository.ts | 2 +- src/script/connection/ConnectionService.ts | 5 +- .../ConversationRepository.test.ts | 4 +- .../conversation/ConversationRepository.ts | 14 ++---- .../conversation/ConversationService.ts | 39 --------------- .../conversation/MessageRepository.test.ts | 2 +- src/script/conversation/MessageRepository.ts | 39 ++++++--------- .../entity/message/VerificationMessage.ts | 10 ++-- src/script/user/UserRepository.ts | 30 ++++-------- src/script/user/UserService.ts | 2 +- src/script/util/DebugUtil.ts | 5 +- src/script/util/TypePredicateUtil.test.ts | 22 +-------- src/script/util/TypePredicateUtil.ts | 14 ------ .../view_model/CallingViewModel.mocks.ts | 2 +- .../view_model/CallingViewModel.test.ts | 8 +-- test/unit_tests/user/UserRepositorySpec.js | 4 +- yarn.lock | 20 ++++---- 24 files changed, 73 insertions(+), 218 deletions(-) diff --git a/package.json b/package.json index a3ba36964ec..6780e702566 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "@emotion/react": "11.10.6", "@types/eslint": "8.4.10", "@wireapp/avs": "9.0.23", - "@wireapp/core": "38.15.2", + "@wireapp/core": "39.0.0", "@wireapp/lru-cache": "3.8.1", "@wireapp/react-ui-kit": "9.3.8", "@wireapp/store-engine-dexie": "2.0.4", diff --git a/src/__mocks__/@wireapp/core.ts b/src/__mocks__/@wireapp/core.ts index 1d766e75b6a..84ef3cd9643 100644 --- a/src/__mocks__/@wireapp/core.ts +++ b/src/__mocks__/@wireapp/core.ts @@ -21,7 +21,7 @@ import {EventEmitter} from 'stream'; export class Account extends EventEmitter { backendFeatures = { - federationEndpoints: false, + federationEndpoints: true, }; configureMLSCallbacks = jest.fn(); diff --git a/src/script/Config.ts b/src/script/Config.ts index d48ab3f1c81..72f595c2d27 100644 --- a/src/script/Config.ts +++ b/src/script/Config.ts @@ -118,7 +118,7 @@ export class Configuration { readonly ALLOWED_IMAGE_TYPES = ['image/bmp', 'image/gif', 'image/jpeg', 'image/jpg', 'image/png']; /** Which versions of the backend api do we support */ - readonly SUPPORTED_API_VERSIONS = [3, 2, 1, 0]; + readonly SUPPORTED_API_VERSIONS = [3, 2, 1]; } let instance: Configuration; diff --git a/src/script/calling/CallingRepository.ts b/src/script/calling/CallingRepository.ts index e7bba7a9baa..0bbd057c17e 100644 --- a/src/script/calling/CallingRepository.ts +++ b/src/script/calling/CallingRepository.ts @@ -18,7 +18,7 @@ */ import type {CallConfigData} from '@wireapp/api-client/lib/account/CallConfigData'; -import type {QualifiedUserClients, UserClients} from '@wireapp/api-client/lib/conversation'; +import type {QualifiedUserClients} from '@wireapp/api-client/lib/conversation'; import type {QualifiedId} from '@wireapp/api-client/lib/user'; import type {WebappProperties} from '@wireapp/api-client/lib/user/data'; import {MessageSendingState} from '@wireapp/core/lib/conversation'; @@ -1069,23 +1069,7 @@ export class CallingRepository { return selfParticipant.sharesCamera() && selfParticipant.hasActiveVideo(); } - private mapTargets(targets: SendMessageTarget): UserClients { - const recipients: UserClients = {}; - - for (const target of targets.clients) { - const {userid, clientid} = target; - - if (!recipients[userid]) { - recipients[userid] = []; - } - - recipients[userid].push(clientid); - } - - return recipients; - } - - private mapQualifiedTargets(targets: SendMessageTarget): QualifiedUserClients { + private mapTargets(targets: SendMessageTarget): QualifiedUserClients { const recipients = targets.clients.reduce((acc, {userid, clientid}) => { const {domain: parsedDomain, id} = this.parseQualifiedId(userid); const domain = parsedDomain || this.selfUser?.domain || ''; @@ -1141,9 +1125,7 @@ export class CallingRepository { if (typeof targets === 'string') { const parsedTargets: SendMessageTarget = JSON.parse(targets); - const recipients = this.core.backendFeatures.federationEndpoints - ? this.mapQualifiedTargets(parsedTargets) - : this.mapTargets(parsedTargets); + const recipients = this.mapTargets(parsedTargets); options = { nativePush: true, recipients, @@ -1189,25 +1171,12 @@ export class CallingRepository { } }; - readonly convertParticipantsToCallingMessageRecepients = ( - participants: Participant[], - ): UserClients | QualifiedUserClients => { - const isFederated = this.core.backendFeatures.federationEndpoints; - - if (isFederated) { - return participants.reduce((participants, participant) => { - participants[participant.user.domain] ||= {}; - participants[participant.user.domain][participant.user.id] = [participant.clientId]; - return participants; - }, {} as QualifiedUserClients); - } - - const recipients: UserClients = {}; - for (const participant of participants) { - recipients[participant.user.id] = [participant.clientId]; - } - - return recipients; + readonly convertParticipantsToCallingMessageRecepients = (participants: Participant[]): QualifiedUserClients => { + return participants.reduce((participants, participant) => { + participants[participant.user.domain] ||= {}; + participants[participant.user.domain][participant.user.id] = [participant.clientId]; + return participants; + }, {} as QualifiedUserClients); }; readonly sendModeratorMute = (conversationId: QualifiedId, participants: Participant[]) => { diff --git a/src/script/client/ClientRepository.ts b/src/script/client/ClientRepository.ts index e7ffccc9252..56aabfca93b 100644 --- a/src/script/client/ClientRepository.ts +++ b/src/script/client/ClientRepository.ts @@ -215,7 +215,7 @@ export class ClientRepository { private updateClientSchemaInDb(userId: QualifiedId, clientPayload: PublicClient): Promise { const clientRecord: ClientRecord = { ...clientPayload, - domain: this.core.backendFeatures.federationEndpoints ? userId.domain : undefined, + domain: userId.domain, meta: { is_verified: false, primary_key: constructClientId(userId, clientPayload.id), @@ -438,7 +438,7 @@ export class ClientRepository { if (backendClient) { const {client, wasUpdated} = ClientMapper.updateClient(databaseClient, { ...backendClient, - domain: this.core.backendFeatures.federationEndpoints ? userId.domain : undefined, + domain: userId.domain, }); delete clientsFromBackend[clientId]; diff --git a/src/script/client/ClientService.ts b/src/script/client/ClientService.ts index 2f262176620..a57522356b1 100644 --- a/src/script/client/ClientService.ts +++ b/src/script/client/ClientService.ts @@ -22,7 +22,6 @@ import type { RegisteredClient, QualifiedUserClientMap, ClientCapabilityData, - PublicClient, } from '@wireapp/api-client/lib/client'; import type {QualifiedId} from '@wireapp/api-client/lib/user'; import {container} from 'tsyringe'; @@ -107,13 +106,6 @@ export class ClientService { * @see https://staging-nginz-https.zinfra.io/swagger-ui/#!/users/getClients */ async getClientsByUserIds(userIds: QualifiedId[]): Promise { - if (!this.apiClient.backendFeatures.federationEndpoints) { - const clientsMap: {[userId: string]: PublicClient[]} = {}; - for (const {id} of userIds) { - clientsMap[id] = await this.apiClient.api.user.getClients(id); - } - return {'': clientsMap}; - } const listedClients = await this.apiClient.api.user.postListClients({qualified_users: userIds}); return listedClients.qualified_user_map; } diff --git a/src/script/components/MessagesList/Message/VerificationMessage.test.tsx b/src/script/components/MessagesList/Message/VerificationMessage.test.tsx index 3cea9ac663c..476084f08f6 100644 --- a/src/script/components/MessagesList/Message/VerificationMessage.test.tsx +++ b/src/script/components/MessagesList/Message/VerificationMessage.test.tsx @@ -34,7 +34,7 @@ const createVerificationMessage = (partialVerificationMessage: Partial false), unsafeSenderName: ko.pureComputed(() => 'senderName'), userEntities: ko.observableArray([] as User[]), - userIds: ko.observableArray([] as (string | QualifiedUserId)[]), + userIds: ko.observableArray([] as QualifiedUserId[]), ...partialVerificationMessage, }; return verificationMessage as VerificationMessageEntity; diff --git a/src/script/connection/ConnectionRepository.ts b/src/script/connection/ConnectionRepository.ts index f469b436c3e..9aa09ef511e 100644 --- a/src/script/connection/ConnectionRepository.ts +++ b/src/script/connection/ConnectionRepository.ts @@ -185,7 +185,7 @@ export class ConnectionRepository { */ public async createConnection(userEntity: User): Promise { try { - const response = await this.connectionService.postConnections(userEntity.qualifiedId, userEntity.name()); + const response = await this.connectionService.postConnections(userEntity.qualifiedId); const connectionEvent = {connection: response, user: {name: userEntity.name()}}; await this.onUserConnection(connectionEvent, EventRepository.SOURCE.INJECTED); return true; diff --git a/src/script/connection/ConnectionService.ts b/src/script/connection/ConnectionService.ts index 7f011052881..6e1274edcc2 100644 --- a/src/script/connection/ConnectionService.ts +++ b/src/script/connection/ConnectionService.ts @@ -48,11 +48,10 @@ export class ConnectionService { * @see https://staging-nginz-https.zinfra.io/swagger-ui/tab.html#!//createConnection * * @param userId User ID of the user to request a connection with - * @param name Name of the conversation being initiated (1 256 characters) * @returns Promise that resolves when the connection request was created */ - postConnections(userId: QualifiedId, name: string): Promise { - return this.apiClient.api.connection.postConnection(userId, name); + postConnections(userId: QualifiedId): Promise { + return this.apiClient.api.connection.postConnection(userId); } /** diff --git a/src/script/conversation/ConversationRepository.test.ts b/src/script/conversation/ConversationRepository.test.ts index d7782461399..50ae319b04c 100644 --- a/src/script/conversation/ConversationRepository.test.ts +++ b/src/script/conversation/ConversationRepository.test.ts @@ -536,9 +536,7 @@ describe('ConversationRepository', () => { xhr.respond(HTTP_STATUS.OK, {'Content-Type': 'application/json'}, JSON.stringify(users)); }); - const matchConversations = new RegExp( - `${escapeRegex(Config.getConfig().BACKEND_REST)}/conversations/([a-z0-9-]+)`, - ); + const matchConversations = new RegExp(`${escapeRegex(Config.getConfig().BACKEND_REST)}/conversations/.*/(.*)`); (server as any).respondWith('GET', matchConversations, (xhr: any, conversationId: string) => { const conversation = { access: [CONVERSATION_ACCESS.PRIVATE], diff --git a/src/script/conversation/ConversationRepository.ts b/src/script/conversation/ConversationRepository.ts index fc26d5a3668..8f25cccde84 100644 --- a/src/script/conversation/ConversationRepository.ts +++ b/src/script/conversation/ConversationRepository.ts @@ -189,7 +189,7 @@ export class ConversationRepository { this.messageRepository.setClientMismatchHandler(async (mismatch, conversation, silent, consentType) => { //we filter out self client id to omit it in mismatch check const {userId, clientId} = this.core; - const domain = this.core.backendFeatures.federationEndpoints ? userState.self().domain : ''; + const domain = userState.self().domain; const selfClient = {domain, userId, clientId}; const filteredMissing = mismatch.missing && removeClientFromUserClientMap(mismatch.missing, selfClient); @@ -372,14 +372,10 @@ export class ConversationRepository { options: Partial = {}, ): Promise { const userIds = userEntities.map(user => user.qualifiedId); - const usersPayload = this.core.backendFeatures.federationEndpoints - ? { - qualified_users: userIds, - users: [] as string[], - } - : { - users: userIds.map(({id}) => id), - }; + const usersPayload = { + qualified_users: userIds, + users: [] as string[], + }; let payload: NewConversation & {conversation_role: string} = { conversation_role: DefaultRole.WIRE_MEMBER, diff --git a/src/script/conversation/ConversationService.ts b/src/script/conversation/ConversationService.ts index 87fe2b5a1fd..05b4ab7dc9e 100644 --- a/src/script/conversation/ConversationService.ts +++ b/src/script/conversation/ConversationService.ts @@ -19,11 +19,9 @@ import type { CONVERSATION_ACCESS_ROLE, - ClientMismatch, Conversation as BackendConversation, ConversationCode, CONVERSATION_ACCESS, - NewOTRMessage, } from '@wireapp/api-client/lib/conversation'; import type { ConversationJoinData, @@ -280,43 +278,6 @@ export class ConversationService { return this.apiClient.api.conversation.postBot(conversationId, providerId, serviceId); } - /** - * Post an encrypted message to a conversation. - * - * @note If "recipients" are not specified you will receive a list of all missing OTR recipients (user-client-map). - * @note Options for the precondition check on missing clients are: - * - `false` - all clients - * - `Array` - only clients of listed users - * - `true` - force sending - * - * @see https://staging-nginz-https.zinfra.io/swagger-ui/#!/conversations/postOtrMessage - * @example How to send "recipients" payload - * "recipients": { - * "": { - * "": "" - * } - * } - * - * @param conversationId ID of conversation to send message in - * @param payload Payload to be posted - * @returns Promise that resolves when the message was sent - */ - postEncryptedMessage( - conversationId: QualifiedId, - payload: NewOTRMessage, - preconditionOption?: boolean | string[], - ): Promise { - const reportMissing = Array.isArray(preconditionOption) ? preconditionOption : undefined; - const ignoreMissing = preconditionOption === true ? true : undefined; - - if (reportMissing) { - payload.report_missing = reportMissing; - } - - // TODO(federation): add domain in the postOTRMessage (?) - return this.apiClient.api.conversation.postOTRMessage(payload.sender, conversationId.id, payload, ignoreMissing); - } - //############################################################################## // Database interactions //############################################################################## diff --git a/src/script/conversation/MessageRepository.test.ts b/src/script/conversation/MessageRepository.test.ts index 7cb9b047107..96b3f70e492 100644 --- a/src/script/conversation/MessageRepository.test.ts +++ b/src/script/conversation/MessageRepository.test.ts @@ -232,7 +232,7 @@ describe('MessageRepository', () => { expect(core.service!.conversation.send).toHaveBeenCalledWith( expect.objectContaining({ payload: expect.objectContaining({deleted: {messageId: messageToDelete.id}}), - userIds: {selfid: [], user1: []}, + userIds: {'': {selfid: [], user1: []}}, }), ); }); diff --git a/src/script/conversation/MessageRepository.ts b/src/script/conversation/MessageRepository.ts index 3cad719df14..fbbe5d24ed6 100644 --- a/src/script/conversation/MessageRepository.ts +++ b/src/script/conversation/MessageRepository.ts @@ -45,7 +45,7 @@ import { import * as MessageBuilder from '@wireapp/core/lib/conversation/message/MessageBuilder'; import {OtrMessage} from '@wireapp/core/lib/conversation/message/OtrMessage'; import {TextContentBuilder} from '@wireapp/core/lib/conversation/message/TextContentBuilder'; -import {isQualifiedUserClients, isUserClients} from '@wireapp/core/lib/util'; +import {isQualifiedUserClients} from '@wireapp/core/lib/util'; import {amplify} from 'amplify'; import {StatusCodes as HTTP_STATUS} from 'http-status-codes'; import {container} from 'tsyringe'; @@ -111,7 +111,7 @@ import {UserState} from '../user/UserState'; export interface MessageSendingOptions { /** Send native push notification for message. Default is `true`. */ nativePush?: boolean; - recipients?: QualifiedId[] | QualifiedUserClients | UserClients; + recipients?: QualifiedId[] | QualifiedUserClients; } export enum CONSENT_TYPE { @@ -814,13 +814,13 @@ export class MessageRepository { private async sendSessionReset(userId: QualifiedId, clientId: string, conversation: Conversation) { const sessionReset = MessageBuilder.buildSessionResetMessage(); - const userClient = {[userId.id]: [clientId]}; + const userClient = {[userId.domain]: {[userId.id]: [clientId]}}; await this.conversationService.send({ conversationId: conversation.qualifiedId, payload: sessionReset, protocol: ConversationProtocol.PROTEUS, targetMode: MessageTargetMode.USERS_CLIENTS, - userIds: this.core.backendFeatures.federationEndpoints ? {[userId.domain]: userClient} : userClient, // we target this message to the specific client of the user (no need for mismatch handling here) + userIds: userClient, // we target this message to the specific client of the user (no need for mismatch handling here) }); } @@ -1080,13 +1080,11 @@ export class MessageRepository { UserRepository.CONFIG.MAXIMUM_TEAM_SIZE_BROADCAST, ); - const recipients = this.core.backendFeatures.federationEndpoints - ? this.createQualifiedRecipients(users) - : this.createRecipients(users); - - this.core.service!.broadcast.broadcastGenericMessage(genericMessage, recipients, false, mismatch => { - this.onClientMismatch?.(mismatch); - }); + await this.core.service!.broadcast.broadcastGenericMessage( + genericMessage, + this.createRecipients(users), + this.onClientMismatch, + ); }; /** @@ -1140,7 +1138,7 @@ export class MessageRepository { return undefined; } - private createQualifiedRecipients(users: User[]): QualifiedUserClients { + private createRecipients(users: User[]): QualifiedUserClients { return users.reduce((userClients, user) => { userClients[user.domain] ||= {}; userClients[user.domain][user.id] = user.devices().map(client => client.id); @@ -1148,19 +1146,12 @@ export class MessageRepository { }, {} as QualifiedUserClients); } - private createRecipients(users: User[]): UserClients { - return users.reduce((userClients, user) => { - userClients[user.id] = user.devices().map(client => client.id); - return userClients; - }, {} as UserClients); - } - private async generateRecipients( conversation: Conversation, - recipients?: QualifiedId[] | QualifiedUserClients | UserClients, + recipients?: QualifiedId[] | QualifiedUserClients, skipSelf?: boolean, - ): Promise { - if (isQualifiedUserClients(recipients) || isUserClients(recipients)) { + ): Promise { + if (isQualifiedUserClients(recipients)) { // If we get a userId>client pairs, we just return those, no need to create recipients return recipients; } @@ -1177,9 +1168,7 @@ export class MessageRepository { await this.userRepository.assignAllClients(); } - return this.core.backendFeatures.federationEndpoints - ? this.createQualifiedRecipients(filteredUsers) - : this.createRecipients(filteredUsers); + return this.createRecipients(filteredUsers); } /** diff --git a/src/script/entity/message/VerificationMessage.ts b/src/script/entity/message/VerificationMessage.ts index d3dfc3757e2..3f21dc71eab 100644 --- a/src/script/entity/message/VerificationMessage.ts +++ b/src/script/entity/message/VerificationMessage.ts @@ -21,7 +21,7 @@ import ko from 'knockout'; import {QualifiedUserId} from '@wireapp/protocol-messaging'; -import {isQualifiedId} from 'Util/TypePredicateUtil'; +import {matchQualifiedIds} from 'Util/QualifiedId'; import {Message} from './Message'; @@ -31,7 +31,7 @@ import type {User} from '../User'; export class VerificationMessage extends Message { public readonly userEntities: ko.ObservableArray; - public userIds: ko.ObservableArray; + public userIds: ko.ObservableArray; public verificationMessageType: ko.Observable; public readonly isSelfClient: ko.PureComputed; @@ -42,15 +42,13 @@ export class VerificationMessage extends Message { this.affect_order(false); this.verificationMessageType = ko.observable(); - this.userIds = ko.observableArray(); + this.userIds = ko.observableArray(); this.userEntities = ko.observableArray(); this.isSelfClient = ko.pureComputed(() => { const messageUserId = this.userIds()?.length === 1 && this.userIds()[0]; - return isQualifiedId(messageUserId) - ? messageUserId.id === this.user().id && messageUserId.domain === this.user().domain - : messageUserId === this.user().id; + return matchQualifiedIds(messageUserId, this.user().qualifiedId); }); } } diff --git a/src/script/user/UserRepository.ts b/src/script/user/UserRepository.ts index 9a16e0e5d6b..796ca82dc0b 100644 --- a/src/script/user/UserRepository.ts +++ b/src/script/user/UserRepository.ts @@ -48,7 +48,7 @@ import {t} from 'Util/LocalizerUtil'; import {getLogger, Logger} from 'Util/Logger'; import {matchQualifiedIds} from 'Util/QualifiedId'; import {fixWebsocketString} from 'Util/StringUtil'; -import {isAxiosError, isBackendError, isQualifiedId} from 'Util/TypePredicateUtil'; +import {isAxiosError, isBackendError} from 'Util/TypePredicateUtil'; import {valueFromType} from './AvailabilityMapper'; import {showAvailabilityModal} from './AvailabilityModal'; @@ -520,13 +520,8 @@ export class UserRepository { /** * Find a local user. */ - findUserById(userId: string | QualifiedId): User | undefined { - return this.userState.users().find(knownUser => { - return typeof userId === 'string' - ? knownUser.id === userId - : // Don't check for the domain when the user query has no domain - matchQualifiedIds(knownUser, userId); - }); + findUserById(userId: QualifiedId): User | undefined { + return this.userState.users().find(knownUser => matchQualifiedIds(knownUser, userId)); } /** @@ -628,10 +623,6 @@ export class UserRepository { return knownUserEntities.concat(userEntities); } - getUserFromBackend(userId: string): Promise { - return this.userService.getUser(userId); - } - getUserListFromBackend(userIds: QualifiedId[]): Promise { const qualifiedUserIds = userIds.map(({id, domain}) => ({domain: domain || this.userState.self().domain, id})); return this.userService.getUsers(qualifiedUserIds); @@ -676,7 +667,7 @@ export class UserRepository { /** * Update a local user from the backend by ID. */ - updateUserById = async (userId: string | QualifiedId): Promise => { + updateUserById = async (userId: QualifiedId): Promise => { const localUserEntity = this.findUserById(userId) || new User('', ''); const updatedUserData = await this.userService.getUser(userId); const updatedUserEntity = this.userMapper.updateUserFromObject(localUserEntity, updatedUserData); @@ -688,15 +679,12 @@ export class UserRepository { } }; - static findMatchingUser(userId: string | QualifiedId, userEntities: User[]): User | undefined { - if (isQualifiedId(userId)) { - return userEntities.find(userEntity => matchQualifiedIds(userEntity, userId)); - } - return userEntities.find(userEntity => userEntity.id === userId); + static findMatchingUser(userId: QualifiedId, userEntities: User[]): User | undefined { + return userEntities.find(userEntity => matchQualifiedIds(userEntity, userId)); } - static createDeletedUser(userId: string | QualifiedId): User { - const userEntity = isQualifiedId(userId) ? new User(userId.id, userId.domain) : new User(userId, null); + static createDeletedUser(userId: QualifiedId): User { + const userEntity = new User(userId.id, userId.domain); userEntity.isDeleted = true; userEntity.name(t('nonexistentUser')); return userEntity; @@ -706,7 +694,7 @@ export class UserRepository { * Add user entities for suspended users. * @returns User entities */ - private addSuspendedUsers(userIds: string[] | QualifiedId[], userEntities: User[]): User[] { + private addSuspendedUsers(userIds: QualifiedId[], userEntities: User[]): User[] { for (const userId of userIds) { const matchingUserIds = UserRepository.findMatchingUser(userId, userEntities); diff --git a/src/script/user/UserService.ts b/src/script/user/UserService.ts index 39192beedf3..db53bf4ef3b 100644 --- a/src/script/user/UserService.ts +++ b/src/script/user/UserService.ts @@ -123,7 +123,7 @@ export class UserService { * * @see https://staging-nginz-https.zinfra.io/swagger-ui/#!/users/user */ - getUser(userId: string | QualifiedId): Promise { + getUser(userId: QualifiedId): Promise { return this.apiClient.api.user.getUser(userId); } } diff --git a/src/script/util/DebugUtil.ts b/src/script/util/DebugUtil.ts index 771a2338afd..ef142571d7f 100644 --- a/src/script/util/DebugUtil.ts +++ b/src/script/util/DebugUtil.ts @@ -114,10 +114,9 @@ export class DebugUtil { } /** Used by QA test automation. */ - async breakSession(userId: string | QualifiedId, clientId: string): Promise { + async breakSession(userId: QualifiedId, clientId: string): Promise { const proteusService = this.core.service!.proteus; - const qualifiedId = typeof userId === 'string' ? {domain: '', id: userId} : userId; - const sessionId = proteusService.constructSessionId(qualifiedId, clientId); + const sessionId = proteusService.constructSessionId(userId, clientId); await proteusService['cryptoClient'].debugBreakSession(sessionId); } diff --git a/src/script/util/TypePredicateUtil.test.ts b/src/script/util/TypePredicateUtil.test.ts index 12c3786f918..bd1fad4c806 100644 --- a/src/script/util/TypePredicateUtil.test.ts +++ b/src/script/util/TypePredicateUtil.test.ts @@ -20,9 +20,7 @@ import {BackendError, BackendErrorLabel} from '@wireapp/api-client/lib/http/'; import type {AxiosError} from 'axios'; -import {isAxiosError, isBackendError, isQualifiedUserClientEntityMap} from 'Util/TypePredicateUtil'; - -import {QualifiedUserClientEntityMap, UserClientEntityMap} from '../client'; +import {isAxiosError, isBackendError} from 'Util/TypePredicateUtil'; describe('TypePredicateUtil', () => { describe('isAxiosError', () => { @@ -66,22 +64,4 @@ describe('TypePredicateUtil', () => { expect(actual).toBeFalsy(); }); }); - - describe('isQualifiedUserClientEntityMap', () => { - it('recognizes a QualifiedUserClientEntityMap', () => { - const userId = '532af01e-1e24-4366-aacf-33b67d4ee376'; - const usersMap: QualifiedUserClientEntityMap = {'example.com': {[userId]: []}}; - const actual = isQualifiedUserClientEntityMap(usersMap); - - expect(actual).toBeTruthy(); - }); - - it('recognizes a UserClientEntityMap', () => { - const userId = '532af01e-1e24-4366-aacf-33b67d4ee376'; - const usersMap: UserClientEntityMap = {[userId]: []}; - const actual = isQualifiedUserClientEntityMap(usersMap); - - expect(actual).toBeFalsy(); - }); - }); }); diff --git a/src/script/util/TypePredicateUtil.ts b/src/script/util/TypePredicateUtil.ts index 2fd2c0a2899..9d4b55699dd 100644 --- a/src/script/util/TypePredicateUtil.ts +++ b/src/script/util/TypePredicateUtil.ts @@ -18,10 +18,8 @@ */ import type {BackendError} from '@wireapp/api-client/lib/http/'; -import type {QualifiedId} from '@wireapp/api-client/lib/user/'; import {AxiosError} from 'axios'; -import {QualifiedUserClientEntityMap} from '../client'; import {Conversation} from '../entity/Conversation'; import {User} from '../entity/User'; import {ClientRecord} from '../storage/record/ClientRecord'; @@ -38,14 +36,6 @@ export function isUser(userCandidate: any): userCandidate is User { return userCandidate instanceof User; } -export function isQualifiedIdArray(ids: string[] | QualifiedId[]): ids is QualifiedId[] { - return !!ids.length && isQualifiedId(ids[0]); -} - -export function isQualifiedId(userId: string | QualifiedId): userId is QualifiedId { - return typeof userId === 'object' && 'domain' in userId; -} - export function isConversationEntity(conversation: any): conversation is Conversation { return conversation instanceof Conversation; } @@ -53,7 +43,3 @@ export function isConversationEntity(conversation: any): conversation is Convers export function isClientRecord(record: any): record is ClientRecord { return !!record.meta; } - -export function isQualifiedUserClientEntityMap(map: any): map is QualifiedUserClientEntityMap { - return Object.keys(map)[0]?.includes('.'); -} diff --git a/src/script/view_model/CallingViewModel.mocks.ts b/src/script/view_model/CallingViewModel.mocks.ts index 5b783457f8d..24f4467cc51 100644 --- a/src/script/view_model/CallingViewModel.mocks.ts +++ b/src/script/view_model/CallingViewModel.mocks.ts @@ -47,7 +47,7 @@ export const mockCallingRepository = { export const callState = new CallState(); -export function buildCall(conversationId: string | QualifiedId, convType = CONV_TYPE.ONEONONE) { +export function buildCall(conversationId: QualifiedId, convType = CONV_TYPE.ONEONONE) { const qualifiedId = typeof conversationId === 'string' ? {id: conversationId, domain: ''} : conversationId; return new Call({id: 'user1', domain: ''}, qualifiedId, convType, {} as any, CALL_TYPE.NORMAL, { currentAvailableDeviceId: {audioOutput: ko.observable()}, diff --git a/src/script/view_model/CallingViewModel.test.ts b/src/script/view_model/CallingViewModel.test.ts index 4773b1d1f07..6d69eea2f20 100644 --- a/src/script/view_model/CallingViewModel.test.ts +++ b/src/script/view_model/CallingViewModel.test.ts @@ -45,7 +45,7 @@ describe('CallingViewModel', () => { describe('answerCall', () => { it('answers a call directly if no call is ongoing', async () => { const callingViewModel = buildCallingViewModel(); - const call = buildCall('conversation1'); + const call = buildCall({id: 'conversation1', domain: ''}); await callingViewModel.callActions.answer(call); expect(mockCallingRepository.answerCall).toHaveBeenCalledWith(call); }); @@ -53,12 +53,12 @@ describe('CallingViewModel', () => { it('lets the user leave previous call before answering a new one', async () => { jest.useFakeTimers(); const callingViewModel = buildCallingViewModel(); - const joinedCall = buildCall('conversation1'); + const joinedCall = buildCall({id: 'conversation1', domain: ''}); joinedCall.state(STATE.MEDIA_ESTAB); callState.calls.push(joinedCall); jest.spyOn(PrimaryModal, 'show').mockImplementation((_, payload) => payload.primaryAction?.action?.()); - const newCall = buildCall('conversation2'); + const newCall = buildCall({id: 'conversation2', domain: ''}); Promise.resolve().then(() => { jest.runAllTimers(); }); @@ -82,7 +82,7 @@ describe('CallingViewModel', () => { it('lets the user leave previous call before starting a new one', async () => { jest.useFakeTimers(); const callingViewModel = buildCallingViewModel(); - const joinedCall = buildCall('conversation1'); + const joinedCall = buildCall({id: 'conversation1', domain: ''}); joinedCall.state(STATE.MEDIA_ESTAB); callState.calls.push(joinedCall); diff --git a/test/unit_tests/user/UserRepositorySpec.js b/test/unit_tests/user/UserRepositorySpec.js index c05374e91a9..c747c8625a0 100644 --- a/test/unit_tests/user/UserRepositorySpec.js +++ b/test/unit_tests/user/UserRepositorySpec.js @@ -163,13 +163,13 @@ describe('UserRepository', () => { }); it('should find an existing user', () => { - const userEntity = testFactory.user_repository.findUserById(user.id); + const userEntity = testFactory.user_repository.findUserById({id: user.id, domain: ''}); expect(userEntity).toEqual(user); }); it('should not find an unknown user', () => { - const userEntity = testFactory.user_repository.findUserById('1'); + const userEntity = testFactory.user_repository.findUserById({id: '1', domain: ''}); expect(userEntity).toBe(undefined); }); diff --git a/yarn.lock b/yarn.lock index f0703c78306..d70cd63cf00 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4623,9 +4623,9 @@ __metadata: languageName: node linkType: hard -"@wireapp/api-client@npm:^22.17.1": - version: 22.17.1 - resolution: "@wireapp/api-client@npm:22.17.1" +"@wireapp/api-client@npm:^23.0.0": + version: 23.0.0 + resolution: "@wireapp/api-client@npm:23.0.0" dependencies: "@wireapp/commons": ^5.0.4 "@wireapp/priority-queue": ^2.0.3 @@ -4638,7 +4638,7 @@ __metadata: spark-md5: 3.0.2 tough-cookie: 4.1.2 ws: 8.11.0 - checksum: 4d17c62d8582fd08d71b369c79840d02d5cf6ff71eb801e01fe73cfbc9eb1fb9671b630e645d3644332d98badf944bd46f79565404a55562c18d0d2ef70305c7 + checksum: ead3502f68c7cc07b1b3a4212dd1c423067babd715b9a03801de7a3f80921f574e2b52702a1fc83b0fa4b3c534711e8a15bdebbbf955246d993d0735f8d05b35 languageName: node linkType: hard @@ -4691,11 +4691,11 @@ __metadata: languageName: node linkType: hard -"@wireapp/core@npm:38.15.2": - version: 38.15.2 - resolution: "@wireapp/core@npm:38.15.2" +"@wireapp/core@npm:39.0.0": + version: 39.0.0 + resolution: "@wireapp/core@npm:39.0.0" dependencies: - "@wireapp/api-client": ^22.17.1 + "@wireapp/api-client": ^23.0.0 "@wireapp/commons": ^5.0.4 "@wireapp/core-crypto": 0.6.2 "@wireapp/cryptobox": 12.8.0 @@ -4711,7 +4711,7 @@ __metadata: logdown: 3.3.1 long: ^5.2.0 uuidjs: 4.2.13 - checksum: 2b5ae2c83fd8f4e2a68527a779ae721c8e441ee0f3df5e8e81acbdce7bb95e24ec933cf6d895dc12a587af749f44b80460cb02c2cddf426b77196761e58deddd + checksum: 488048273f35acbe889574b4b10af33715da10676461b3ed6f07be4af2117f380d9fb4740f998391d44ba98ca1142b4ba6b6dcf2b0892d6b3439f183a17e4cc4 languageName: node linkType: hard @@ -17112,7 +17112,7 @@ __metadata: "@typescript-eslint/parser": ^5.53.0 "@wireapp/avs": 9.0.23 "@wireapp/copy-config": 2.0.9 - "@wireapp/core": 38.15.2 + "@wireapp/core": 39.0.0 "@wireapp/eslint-config": 2.1.1 "@wireapp/lru-cache": 3.8.1 "@wireapp/prettier-config": 0.5.2 From 16c36feed328c88c4cb49081873c16b9704bdbc3 Mon Sep 17 00:00:00 2001 From: Thomas Belin Date: Wed, 1 Mar 2023 11:27:26 +0100 Subject: [PATCH 07/97] feat: Add server flag to enable CoreCrypto [FS-1594] (#14759) --- .env.localhost | 1 + package.json | 2 +- server/ServerConfig.ts | 1 + server/config.ts | 1 + src/script/service/CoreSingleton.ts | 2 +- src/types/Wire.types.ts | 1 + yarn.lock | 10 +++++----- 7 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.env.localhost b/.env.localhost index d09dba2c6fa..457b01c690e 100644 --- a/.env.localhost +++ b/.env.localhost @@ -17,6 +17,7 @@ ENABLE_DEV_BACKEND_API="true" #FEATURE_APPLOCK_UNFOCUS_TIMEOUT="30" #FEATURE_APPLOCK_SCHEDULED_TIMEOUT="30" #FEATURE_ENABLE_MLS="true" +#FEATURE_USE_CORE_CRYPTO="true" # staging BACKEND_REST="https://staging-nginz-https.zinfra.io" diff --git a/package.json b/package.json index 6780e702566..80f1f9df989 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "@emotion/react": "11.10.6", "@types/eslint": "8.4.10", "@wireapp/avs": "9.0.23", - "@wireapp/core": "39.0.0", + "@wireapp/core": "39.0.1", "@wireapp/lru-cache": "3.8.1", "@wireapp/react-ui-kit": "9.3.8", "@wireapp/store-engine-dexie": "2.0.4", diff --git a/server/ServerConfig.ts b/server/ServerConfig.ts index ef7cb29e9fd..9fec679883b 100644 --- a/server/ServerConfig.ts +++ b/server/ServerConfig.ts @@ -51,6 +51,7 @@ export interface ServerConfig { MLS_CONFIG_KEYING_MATERIAL_UPDATE_THRESHOLD: number; PERSIST_TEMPORARY_CLIENTS: boolean; SHOW_LOADING_INFORMATION: boolean; + USE_CORE_CRYPTO: boolean; }; MAX_GROUP_PARTICIPANTS: number; MAX_VIDEO_PARTICIPANTS: number; diff --git a/server/config.ts b/server/config.ts index 21c99631671..9d7e1268656 100644 --- a/server/config.ts +++ b/server/config.ts @@ -154,6 +154,7 @@ const config: ServerConfig = { Number(process.env.FEATURE_MLS_CONFIG_KEYING_MATERIAL_UPDATE_THRESHOLD), PERSIST_TEMPORARY_CLIENTS: process.env.FEATURE_PERSIST_TEMPORARY_CLIENTS != 'false', SHOW_LOADING_INFORMATION: process.env.FEATURE_SHOW_LOADING_INFORMATION == 'true', + USE_CORE_CRYPTO: process.env.FEATURE_USE_CORE_CRYPTO == 'true', }, MAX_GROUP_PARTICIPANTS: (process.env.MAX_GROUP_PARTICIPANTS && Number(process.env.MAX_GROUP_PARTICIPANTS)) || 500, MAX_VIDEO_PARTICIPANTS: (process.env.MAX_VIDEO_PARTICIPANTS && Number(process.env.MAX_VIDEO_PARTICIPANTS)) || 4, diff --git a/src/script/service/CoreSingleton.ts b/src/script/service/CoreSingleton.ts index 515043704b7..90bf3e40df7 100644 --- a/src/script/service/CoreSingleton.ts +++ b/src/script/service/CoreSingleton.ts @@ -72,7 +72,7 @@ export class Core extends Account { */ systemCrypto: window.systemCrypto, - useCoreCrypto: true, + useCoreCrypto: Config.getConfig().FEATURE.USE_CORE_CRYPTO, }, nbPrekeys: 100, }); diff --git a/src/types/Wire.types.ts b/src/types/Wire.types.ts index 1415459a671..48a48c62e3c 100644 --- a/src/types/Wire.types.ts +++ b/src/types/Wire.types.ts @@ -41,6 +41,7 @@ type FeatureVariables = { MLS_CONFIG_KEYING_MATERIAL_UPDATE_THRESHOLD: number; PERSIST_TEMPORARY_CLIENTS: boolean; SHOW_LOADING_INFORMATION: boolean; + USE_CORE_CRYPTO: boolean; }; type URLVariables = { diff --git a/yarn.lock b/yarn.lock index d70cd63cf00..7be38cdac45 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4691,9 +4691,9 @@ __metadata: languageName: node linkType: hard -"@wireapp/core@npm:39.0.0": - version: 39.0.0 - resolution: "@wireapp/core@npm:39.0.0" +"@wireapp/core@npm:39.0.1": + version: 39.0.1 + resolution: "@wireapp/core@npm:39.0.1" dependencies: "@wireapp/api-client": ^23.0.0 "@wireapp/commons": ^5.0.4 @@ -4711,7 +4711,7 @@ __metadata: logdown: 3.3.1 long: ^5.2.0 uuidjs: 4.2.13 - checksum: 488048273f35acbe889574b4b10af33715da10676461b3ed6f07be4af2117f380d9fb4740f998391d44ba98ca1142b4ba6b6dcf2b0892d6b3439f183a17e4cc4 + checksum: 17add06a6099ce71a0d8e78db188178bbd4f7b9c8d3464acafc27dd091f0c81bf6680019e78e8ddd4555ce0c9b2c40f8a5482a387e83c2aa808911620d3eddc6 languageName: node linkType: hard @@ -17112,7 +17112,7 @@ __metadata: "@typescript-eslint/parser": ^5.53.0 "@wireapp/avs": 9.0.23 "@wireapp/copy-config": 2.0.9 - "@wireapp/core": 39.0.0 + "@wireapp/core": 39.0.1 "@wireapp/eslint-config": 2.1.1 "@wireapp/lru-cache": 3.8.1 "@wireapp/prettier-config": 0.5.2 From 7f8a5621a28cdbbc0f7ace549acde8ccabd888d2 Mon Sep 17 00:00:00 2001 From: Amir Ghezelbash Date: Wed, 1 Mar 2023 15:02:36 +0330 Subject: [PATCH 08/97] fix: Fully clear input bar after sending a japanese text (SQSERVICES-1900) (#14762) --- src/script/components/InputBar/InputBar.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/script/components/InputBar/InputBar.tsx b/src/script/components/InputBar/InputBar.tsx index 33cc0100742..bd233c52557 100644 --- a/src/script/components/InputBar/InputBar.tsx +++ b/src/script/components/InputBar/InputBar.tsx @@ -222,7 +222,9 @@ const InputBar = ({ setCurrentMentions([]); if (resetInputValue) { - setInputValue(''); + setTimeout(() => { + setInputValue(''); + }, 0); } }; From 2c44f5371281f0bbbe18ed47940d4324235a5e97 Mon Sep 17 00:00:00 2001 From: Amir Ghezelbash Date: Wed, 1 Mar 2023 16:40:46 +0330 Subject: [PATCH 09/97] docs: Add explanation for setTimeout in InputBar (#14763) --- src/script/components/InputBar/InputBar.tsx | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/script/components/InputBar/InputBar.tsx b/src/script/components/InputBar/InputBar.tsx index bd233c52557..c132c38e4e2 100644 --- a/src/script/components/InputBar/InputBar.tsx +++ b/src/script/components/InputBar/InputBar.tsx @@ -222,6 +222,15 @@ const InputBar = ({ setCurrentMentions([]); if (resetInputValue) { + /* + When trying to update a textarea with japanese value to + empty in onKeyDown handler the text is not fully cleared + and some parts of text is pasted by the OS/Browser after + we do setInputValue(''); + To fix this we have to add a setTimeout in order to postpone + the operation of clearing the text to after of the proccess + of the onKeyDown and onKeyUp DOM events. + */ setTimeout(() => { setInputValue(''); }, 0); From d0f398a061cfef7d85a9215576d89760617908ee Mon Sep 17 00:00:00 2001 From: Thomas Belin Date: Wed, 1 Mar 2023 14:43:18 +0100 Subject: [PATCH 10/97] runfix: Avoid crash when mismatch on new domain happens (#14765) --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 80f1f9df989..78de382a00c 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "@emotion/react": "11.10.6", "@types/eslint": "8.4.10", "@wireapp/avs": "9.0.23", - "@wireapp/core": "39.0.1", + "@wireapp/core": "39.0.2", "@wireapp/lru-cache": "3.8.1", "@wireapp/react-ui-kit": "9.3.8", "@wireapp/store-engine-dexie": "2.0.4", diff --git a/yarn.lock b/yarn.lock index 7be38cdac45..a850c3990a6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4691,9 +4691,9 @@ __metadata: languageName: node linkType: hard -"@wireapp/core@npm:39.0.1": - version: 39.0.1 - resolution: "@wireapp/core@npm:39.0.1" +"@wireapp/core@npm:39.0.2": + version: 39.0.2 + resolution: "@wireapp/core@npm:39.0.2" dependencies: "@wireapp/api-client": ^23.0.0 "@wireapp/commons": ^5.0.4 @@ -4711,7 +4711,7 @@ __metadata: logdown: 3.3.1 long: ^5.2.0 uuidjs: 4.2.13 - checksum: 17add06a6099ce71a0d8e78db188178bbd4f7b9c8d3464acafc27dd091f0c81bf6680019e78e8ddd4555ce0c9b2c40f8a5482a387e83c2aa808911620d3eddc6 + checksum: 6b3a82b8750f8b925ab5b0d73a778cf47f8054097881fb71e9f1ac77cbc7da72b027646aa1bed649a18490ad5b070c073f99625c05205bee53190c66cf0888b8 languageName: node linkType: hard @@ -17112,7 +17112,7 @@ __metadata: "@typescript-eslint/parser": ^5.53.0 "@wireapp/avs": 9.0.23 "@wireapp/copy-config": 2.0.9 - "@wireapp/core": 39.0.1 + "@wireapp/core": 39.0.2 "@wireapp/eslint-config": 2.1.1 "@wireapp/lru-cache": 3.8.1 "@wireapp/prettier-config": 0.5.2 From 019c2cb8fc172f02fc563cdb78b4468b6c7f6430 Mon Sep 17 00:00:00 2001 From: Amir Ghezelbash Date: Thu, 2 Mar 2023 15:44:42 +0330 Subject: [PATCH 11/97] docs: Update hiring link (#14766) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a14a08c15a8..c00df646050 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Wire™ -[![We are hiring](https://github.com/wireapp/wire/blob/master/assets/header-small.png?raw=true)](https://wire.softgarden.io/job/616102) +[![We are hiring](https://github.com/wireapp/wire/blob/master/assets/header-small.png?raw=true)](https://wire.softgarden.io/en/vacancies) This repository is part of the source code of Wire. You can find more information at [wire.com](https://wire.com) or by contacting opensource@wire.com. From 6818212deb3f9cba7a39bae8e78b92b238ff9520 Mon Sep 17 00:00:00 2001 From: Timothy LeBon Date: Thu, 2 Mar 2023 13:27:59 +0100 Subject: [PATCH 12/97] fix: remove immediate login for 2fa+entropy case [SQSERVICES-1709] (#14767) * fix: add query key and remove immediate login for 2fa+entropy case * fix: issue with missing domain --- src/script/auth/page/ConversationJoin.tsx | 4 ++-- src/script/auth/page/Login.tsx | 5 ++++- src/script/auth/route.ts | 1 + 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/script/auth/page/ConversationJoin.tsx b/src/script/auth/page/ConversationJoin.tsx index 3d406e268dc..47a14ed52c0 100644 --- a/src/script/auth/page/ConversationJoin.tsx +++ b/src/script/auth/page/ConversationJoin.tsx @@ -160,7 +160,7 @@ const ConversationJoinComponent = ({ */ await setLastEventDate(new Date(conversationEvent.time)); - routeToApp(conversationEvent.conversation, conversationEvent.qualified_conversation.domain); + routeToApp(conversationEvent.conversation, conversationEvent.qualified_conversation?.domain ?? ''); } catch (error) { if (error.label) { switch (error.label) { @@ -314,7 +314,7 @@ const ConversationJoinComponent = ({ onClick={async () => { try { const conversationEvent = await doJoinConversationByCode(conversationKey, conversationCode); - routeToApp(conversationEvent.conversation, conversationEvent.qualified_conversation.domain); + routeToApp(conversationEvent.conversation, conversationEvent.qualified_conversation?.domain ?? ''); } catch (error) { console.warn('Unable to join conversation with existing account', error); } diff --git a/src/script/auth/page/Login.tsx b/src/script/auth/page/Login.tsx index 6a82e1a722a..00c7885bab0 100644 --- a/src/script/auth/page/Login.tsx +++ b/src/script/auth/page/Login.tsx @@ -157,7 +157,9 @@ const LoginComponent = ({ useEffect(() => { resetAuthError(); const isImmediateLogin = UrlUtil.hasURLParameter(QUERY_KEY.IMMEDIATE_LOGIN); - if (isImmediateLogin) { + const is2FAEntropy = UrlUtil.hasURLParameter(QUERY_KEY.TWO_FACTOR) && isEntropyRequired; + + if (isImmediateLogin && !is2FAEntropy) { immediateLogin(); } return () => { @@ -173,6 +175,7 @@ const LoginComponent = ({ return navigate(ROUTE.HISTORY_INFO); } catch (error) { logger.error('Unable to login immediately', error); + setShowEntropyForm(false); } }; diff --git a/src/script/auth/route.ts b/src/script/auth/route.ts index 8b32bc6f35c..18628729619 100644 --- a/src/script/auth/route.ts +++ b/src/script/auth/route.ts @@ -34,6 +34,7 @@ export const QUERY_KEY = { PWA_AWARE: 'pwa_aware', SSO_AUTO_LOGIN: 'sso_auto_login', TRACKING: 'tracking', + TWO_FACTOR: '2fa', }; export const FORWARDED_QUERY_KEYS = [ From ea9a2f640c927326a845f425c29e2d694894802b Mon Sep 17 00:00:00 2001 From: Thomas Belin Date: Thu, 2 Mar 2023 14:47:04 +0100 Subject: [PATCH 13/97] refactor: Remove usage of ClientMismatch (#14769) --- package.json | 2 +- src/script/calling/CallingRepository.ts | 7 +-- .../conversation/ClientMismatchUtil.test.ts | 52 +++++++++++-------- src/script/conversation/ClientMismatchUtil.ts | 21 +++----- .../conversation/ConversationRepository.ts | 3 +- src/script/conversation/MessageRepository.ts | 16 ++---- yarn.lock | 20 +++---- 7 files changed, 56 insertions(+), 65 deletions(-) diff --git a/package.json b/package.json index 78de382a00c..c2b35cec77e 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "@emotion/react": "11.10.6", "@types/eslint": "8.4.10", "@wireapp/avs": "9.0.23", - "@wireapp/core": "39.0.2", + "@wireapp/core": "39.1.3", "@wireapp/lru-cache": "3.8.1", "@wireapp/react-ui-kit": "9.3.8", "@wireapp/store-engine-dexie": "2.0.4", diff --git a/src/script/calling/CallingRepository.ts b/src/script/calling/CallingRepository.ts index 0bbd057c17e..faf2d1f86db 100644 --- a/src/script/calling/CallingRepository.ts +++ b/src/script/calling/CallingRepository.ts @@ -22,8 +22,7 @@ import type {QualifiedUserClients} from '@wireapp/api-client/lib/conversation'; import type {QualifiedId} from '@wireapp/api-client/lib/user'; import type {WebappProperties} from '@wireapp/api-client/lib/user/data'; import {MessageSendingState} from '@wireapp/core/lib/conversation'; -import {flattenQualifiedUserClients, flattenUserClients} from '@wireapp/core/lib/conversation/message/UserClientsUtil'; -import {isQualifiedUserClients} from '@wireapp/core/lib/util'; +import {flattenUserMap} from '@wireapp/core/lib/conversation/message/UserClientsUtil'; import {amplify} from 'amplify'; import axios from 'axios'; import ko from 'knockout'; @@ -335,9 +334,7 @@ export class CallingRepository { const allClients = await this.core.service!.conversation.fetchAllParticipantsClients(call.conversationId); if (!conversation.isUsingMLSProtocol) { - const qualifiedClients = isQualifiedUserClients(allClients) - ? flattenQualifiedUserClients(allClients) - : flattenUserClients(allClients); + const qualifiedClients = flattenUserMap(allClients); const clients: Clients = flatten( qualifiedClients.map(({data, userId}) => diff --git a/src/script/conversation/ClientMismatchUtil.test.ts b/src/script/conversation/ClientMismatchUtil.test.ts index 931a4788cde..d68b9f25e74 100644 --- a/src/script/conversation/ClientMismatchUtil.test.ts +++ b/src/script/conversation/ClientMismatchUtil.test.ts @@ -54,12 +54,16 @@ describe('ClientMismatchUtil', () => { it('extract missing and deleted clients from a mismatch when no users given', () => { const mismatch = { deleted: { - user3: ['client1', 'client2'], - user4: ['client1', 'client2'], + domain: { + user3: ['client1', 'client2'], + user4: ['client1', 'client2'], + }, }, missing: { - user1: ['client1', 'client2'], - user2: ['client1', 'client2'], + domain: { + user1: ['client1', 'client2'], + user2: ['client1', 'client2'], + }, }, }; const {missingClients, deletedClients, missingUserIds, emptyUsers} = extractClientDiff(mismatch); @@ -67,24 +71,28 @@ describe('ClientMismatchUtil', () => { expect(emptyUsers).toEqual([]); expect(missingUserIds).toEqual([]); expect(missingClients).toEqual([ - {clients: ['client1', 'client2'], userId: {domain: '', id: 'user1'}}, - {clients: ['client1', 'client2'], userId: {domain: '', id: 'user2'}}, + {clients: ['client1', 'client2'], userId: {domain: 'domain', id: 'user1'}}, + {clients: ['client1', 'client2'], userId: {domain: 'domain', id: 'user2'}}, ]); expect(deletedClients).toEqual([ - {clients: ['client1', 'client2'], userId: {domain: '', id: 'user3'}}, - {clients: ['client1', 'client2'], userId: {domain: '', id: 'user4'}}, + {clients: ['client1', 'client2'], userId: {domain: 'domain', id: 'user3'}}, + {clients: ['client1', 'client2'], userId: {domain: 'domain', id: 'user4'}}, ]); }); it('extract full diff with mismatch when users are given', () => { const mismatch = { deleted: { - user3: ['client1', 'client2'], - user4: ['client1'], + domain: { + user3: ['client1', 'client2'], + user4: ['client1'], + }, }, missing: { - user1: ['client1', 'client2'], - user2: ['client1', 'client2'], + domain: { + user1: ['client1', 'client2'], + user2: ['client1', 'client2'], + }, }, }; const userWithoutClients = new User('user3'); @@ -100,24 +108,26 @@ describe('ClientMismatchUtil', () => { expect(emptyUsers).toEqual([userWithoutClients]); expect(missingUserIds).toEqual([ - {domain: '', id: 'user1'}, - {domain: '', id: 'user2'}, + {domain: 'domain', id: 'user1'}, + {domain: 'domain', id: 'user2'}, ]); expect(missingClients).toEqual([ - {clients: ['client1', 'client2'], userId: {domain: '', id: 'user1'}}, - {clients: ['client1', 'client2'], userId: {domain: '', id: 'user2'}}, + {clients: ['client1', 'client2'], userId: {domain: 'domain', id: 'user1'}}, + {clients: ['client1', 'client2'], userId: {domain: 'domain', id: 'user2'}}, ]); expect(deletedClients).toEqual([ - {clients: ['client1', 'client2'], userId: {domain: '', id: 'user3'}}, - {clients: ['client1'], userId: {domain: '', id: 'user4'}}, + {clients: ['client1', 'client2'], userId: {domain: 'domain', id: 'user3'}}, + {clients: ['client1'], userId: {domain: 'domain', id: 'user4'}}, ]); }); it('only gives unknown missing clients when users are given', () => { const mismatch = { missing: { - user1: ['client1', 'client2'], - user2: ['client1', 'client2'], + domain: { + user1: ['client1', 'client2'], + user2: ['client1', 'client2'], + }, }, }; const user1 = new User('user1'); @@ -128,7 +138,7 @@ describe('ClientMismatchUtil', () => { const {missingClients} = extractClientDiff(mismatch, [user1, user2]); - expect(missingClients).toEqual([{clients: ['client2'], userId: {domain: '', id: 'user2'}}]); + expect(missingClients).toEqual([{clients: ['client2'], userId: {domain: 'domain', id: 'user2'}}]); }); }); }); diff --git a/src/script/conversation/ClientMismatchUtil.ts b/src/script/conversation/ClientMismatchUtil.ts index ada4c7ab049..5f3664b94d0 100644 --- a/src/script/conversation/ClientMismatchUtil.ts +++ b/src/script/conversation/ClientMismatchUtil.ts @@ -17,14 +17,9 @@ * */ -import type { - ClientMismatch, - MessageSendingStatus, - QualifiedUserClients, - UserClients, -} from '@wireapp/api-client/lib/conversation/'; +import type {MessageSendingStatus, QualifiedUserClients, UserClients} from '@wireapp/api-client/lib/conversation/'; import {QualifiedId} from '@wireapp/api-client/lib/user'; -import {flattenQualifiedUserClients, flattenUserClients} from '@wireapp/core/lib/conversation/message/UserClientsUtil'; +import {flattenUserMap} from '@wireapp/core/lib/conversation/message/UserClientsUtil'; import {isQualifiedUserClients} from '@wireapp/core/lib/util'; import {difference, intersection} from 'underscore'; @@ -53,17 +48,13 @@ type ClientDiff = { * @param users? A list a users against which to match the mismatch. (if not given will dumbly flatten the given mismatch) */ export function extractClientDiff( - {deleted = {}, redundant = {}, missing = {}}: Partial | Partial, + {deleted = {}, redundant = {}, missing = {}}: Partial, users?: User[], defaultDomain: string = '', ): ClientDiff { - const allDeleted = {...deleted, ...redundant} as QualifiedUserClients | UserClients; - const deletedClients = isQualifiedUserClients(allDeleted) - ? flattenQualifiedUserClients(allDeleted) - : flattenUserClients(allDeleted, defaultDomain); - const missingClients = isQualifiedUserClients(missing) - ? flattenQualifiedUserClients(missing) - : flattenUserClients(missing, defaultDomain); + const allDeleted = {...deleted, ...redundant} as QualifiedUserClients; + const deletedClients = flattenUserMap(allDeleted); + const missingClients = flattenUserMap(missing); const toClientDiff = ({userId, data}: {data: string[]; userId: QualifiedId}) => ({clients: data, userId}); diff --git a/src/script/conversation/ConversationRepository.ts b/src/script/conversation/ConversationRepository.ts index 8f25cccde84..c828eadf41b 100644 --- a/src/script/conversation/ConversationRepository.ts +++ b/src/script/conversation/ConversationRepository.ts @@ -18,7 +18,6 @@ */ import { - ClientMismatch, Conversation as BackendConversation, ConversationProtocol, CONVERSATION_TYPE, @@ -193,7 +192,7 @@ export class ConversationRepository { const selfClient = {domain, userId, clientId}; const filteredMissing = mismatch.missing && removeClientFromUserClientMap(mismatch.missing, selfClient); - const filteredMismatch = {...mismatch, missing: filteredMissing} as ClientMismatch | MessageSendingStatus; + const filteredMismatch = {...mismatch, missing: filteredMissing} as MessageSendingStatus; const {missingClients, deletedClients, emptyUsers, missingUserIds} = extractClientDiff( filteredMismatch, diff --git a/src/script/conversation/MessageRepository.ts b/src/script/conversation/MessageRepository.ts index fbbe5d24ed6..1ebf90227a6 100644 --- a/src/script/conversation/MessageRepository.ts +++ b/src/script/conversation/MessageRepository.ts @@ -17,13 +17,7 @@ * */ -import { - ClientMismatch, - ConversationProtocol, - MessageSendingStatus, - QualifiedUserClients, - UserClients, -} from '@wireapp/api-client/lib/conversation'; +import {ConversationProtocol, MessageSendingStatus, QualifiedUserClients} from '@wireapp/api-client/lib/conversation'; import {QualifiedId, RequestCancellationError, User as APIClientUser} from '@wireapp/api-client/lib/user'; import { MessageSendingState, @@ -123,7 +117,7 @@ export enum CONSENT_TYPE { export type ContributedSegmentations = Record; type ClientMismatchHandlerFn = ( - mismatch: Partial | Partial, + mismatch: Partial, conversation?: Conversation, silent?: boolean, consentType?: CONSENT_TYPE, @@ -203,10 +197,10 @@ export class MessageRepository { */ public async updateMissingClients( conversation: Conversation, - allClients: UserClients | QualifiedUserClients, + allClients: QualifiedUserClients, consentType?: CONSENT_TYPE, ) { - const mismatch = {missing: allClients} as ClientMismatch; + const mismatch = {missing: allClients} as MessageSendingStatus; return this.onClientMismatch?.(mismatch, conversation, false, consentType); } @@ -1247,7 +1241,7 @@ export class MessageRepository { const missing = await this.conversationService.fetchAllParticipantsClients(conversation.qualifiedId); const deleted = findDeletedClients(missing, await this.generateRecipients(conversation)); - await this.onClientMismatch?.({deleted, missing} as ClientMismatch, conversation, true); + await this.onClientMismatch?.({deleted, missing} as MessageSendingStatus, conversation, true); if (blockSystemMessage) { conversation.blockLegalHoldMessage = false; } diff --git a/yarn.lock b/yarn.lock index a850c3990a6..0cd8a81fd45 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4623,9 +4623,9 @@ __metadata: languageName: node linkType: hard -"@wireapp/api-client@npm:^23.0.0": - version: 23.0.0 - resolution: "@wireapp/api-client@npm:23.0.0" +"@wireapp/api-client@npm:^23.1.1": + version: 23.1.1 + resolution: "@wireapp/api-client@npm:23.1.1" dependencies: "@wireapp/commons": ^5.0.4 "@wireapp/priority-queue": ^2.0.3 @@ -4638,7 +4638,7 @@ __metadata: spark-md5: 3.0.2 tough-cookie: 4.1.2 ws: 8.11.0 - checksum: ead3502f68c7cc07b1b3a4212dd1c423067babd715b9a03801de7a3f80921f574e2b52702a1fc83b0fa4b3c534711e8a15bdebbbf955246d993d0735f8d05b35 + checksum: 67730321863605a1bb6fea1cb6e986bc873604de04494f24438624ffd4323333382fd9a5aa9d997e5fca8c69cf4d6fba0ed48d1c2c052ccc92e41cba569e7c08 languageName: node linkType: hard @@ -4691,11 +4691,11 @@ __metadata: languageName: node linkType: hard -"@wireapp/core@npm:39.0.2": - version: 39.0.2 - resolution: "@wireapp/core@npm:39.0.2" +"@wireapp/core@npm:39.1.3": + version: 39.1.3 + resolution: "@wireapp/core@npm:39.1.3" dependencies: - "@wireapp/api-client": ^23.0.0 + "@wireapp/api-client": ^23.1.1 "@wireapp/commons": ^5.0.4 "@wireapp/core-crypto": 0.6.2 "@wireapp/cryptobox": 12.8.0 @@ -4711,7 +4711,7 @@ __metadata: logdown: 3.3.1 long: ^5.2.0 uuidjs: 4.2.13 - checksum: 6b3a82b8750f8b925ab5b0d73a778cf47f8054097881fb71e9f1ac77cbc7da72b027646aa1bed649a18490ad5b070c073f99625c05205bee53190c66cf0888b8 + checksum: ccaa3c635f7324f9ffc70b435bdcd84a6168f6c16f2d7f2ed3d6f41af6224df5ae2641dd6096091b75da09b925d241b9c4b9f1f3e09489d3c618ee81847c8898 languageName: node linkType: hard @@ -17112,7 +17112,7 @@ __metadata: "@typescript-eslint/parser": ^5.53.0 "@wireapp/avs": 9.0.23 "@wireapp/copy-config": 2.0.9 - "@wireapp/core": 39.0.2 + "@wireapp/core": 39.1.3 "@wireapp/eslint-config": 2.1.1 "@wireapp/lru-cache": 3.8.1 "@wireapp/prettier-config": 0.5.2 From f75fa877b3ced879c7c9d407367971dd7e51f5d3 Mon Sep 17 00:00:00 2001 From: Amir Ghezelbash Date: Thu, 2 Mar 2023 18:10:00 +0330 Subject: [PATCH 14/97] runfix: Move input reset to onSend in inputBar (SQSERVICES-1900) (#14770) --- src/script/components/InputBar/InputBar.tsx | 27 ++++++++++----------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/src/script/components/InputBar/InputBar.tsx b/src/script/components/InputBar/InputBar.tsx index c132c38e4e2..38ea52cbb94 100644 --- a/src/script/components/InputBar/InputBar.tsx +++ b/src/script/components/InputBar/InputBar.tsx @@ -222,18 +222,7 @@ const InputBar = ({ setCurrentMentions([]); if (resetInputValue) { - /* - When trying to update a textarea with japanese value to - empty in onKeyDown handler the text is not fully cleared - and some parts of text is pasted by the OS/Browser after - we do setInputValue(''); - To fix this we have to add a setTimeout in order to postpone - the operation of clearing the text to after of the proccess - of the onKeyDown and onKeyUp DOM events. - */ - setTimeout(() => { - setInputValue(''); - }, 0); + setInputValue(''); } }; @@ -553,8 +542,18 @@ const InputBar = ({ } else { sendMessage(messageText, updatedMentions); } - - resetDraftState(true); + /* + When trying to update a textarea with japanese value to + empty in onKeyDown handler the text is not fully cleared + and some parts of text is pasted by the OS/Browser after + we do setInputValue(''); + To fix this we have to add a setTimeout in order to postpone + the operation of clearing the text to after of the proccess + of the onKeyDown and onKeyUp DOM events. + */ + setTimeout(() => { + resetDraftState(true); + }, 0); textareaRef.current?.focus(); }; From af9944855bfc295274e6680b070010c9e4825192 Mon Sep 17 00:00:00 2001 From: Thomas Belin Date: Thu, 2 Mar 2023 16:27:44 +0100 Subject: [PATCH 15/97] chore: Add user id in visual debug util (#14768) --- .../Message/ContentMessage/ContentMessage.tsx | 6 +++- src/script/util/DebugUtil.ts | 31 +++++++++++++++++++ src/script/util/KeyboardUtil.ts | 28 ----------------- src/style/foundation/debug.less | 22 +++++++++++-- 4 files changed, 55 insertions(+), 32 deletions(-) diff --git a/src/script/components/MessagesList/Message/ContentMessage/ContentMessage.tsx b/src/script/components/MessagesList/Message/ContentMessage/ContentMessage.tsx index aa2532aa5b1..335296dbe28 100644 --- a/src/script/components/MessagesList/Message/ContentMessage/ContentMessage.tsx +++ b/src/script/components/MessagesList/Message/ContentMessage/ContentMessage.tsx @@ -134,7 +134,11 @@ const ContentMessageComponent: React.FC = ({
-

+

{headerSenderName}

diff --git a/src/script/util/DebugUtil.ts b/src/script/util/DebugUtil.ts index ef142571d7f..1586117428b 100644 --- a/src/script/util/DebugUtil.ts +++ b/src/script/util/DebugUtil.ts @@ -30,6 +30,7 @@ import type {Notification} from '@wireapp/api-client/lib/notification/'; import type {QualifiedId} from '@wireapp/api-client/lib/user'; import {DatabaseKeys} from '@wireapp/core/lib/notification/NotificationDatabaseRepository'; import Dexie from 'dexie'; +import keyboardjs from 'keyboardjs'; import {container} from 'tsyringe'; import {getLogger, Logger} from 'Util/Logger'; @@ -92,6 +93,36 @@ export class DebugUtil { this.messageRepository = message; this.logger = getLogger('DebugUtil'); + + keyboardjs.bind('command+shift+1', this.toggleDebugUi); + } + + /** will print all the ids of entities that show on screen (userIds, conversationIds, messageIds) */ + toggleDebugUi(): void { + const removeDebugInfo = (els: NodeListOf) => els.forEach(el => el.parentNode?.removeChild(el)); + + const addDebugInfo = (els: NodeListOf) => + els.forEach(el => { + const debugInfo = document.createElement('div'); + debugInfo.classList.add('debug-info'); + const value = el.dataset.uieUid; + if (value) { + debugInfo.textContent = value; + el.appendChild(debugInfo); + } + }); + + const debugInfos = document.querySelectorAll('.debug-info'); + const isShowingDebugInfo = debugInfos.length > 0; + + if (isShowingDebugInfo) { + removeDebugInfo(debugInfos); + } else { + const debugElements = document.querySelectorAll( + '.message[data-uie-uid], .conversation-list-cell[data-uie-uid], [data-uie-name=sender-name]', + ); + addDebugInfo(debugElements); + } } breakLastNotificationId() { diff --git a/src/script/util/KeyboardUtil.ts b/src/script/util/KeyboardUtil.ts index cd894eeef8e..14419a4f86d 100644 --- a/src/script/util/KeyboardUtil.ts +++ b/src/script/util/KeyboardUtil.ts @@ -125,8 +125,6 @@ const escKeyHandlers: KeyboardHandler[] = []; document.addEventListener('keydown', event => { if (event.key === 'Escape') { escKeyHandlers.forEach(handler => handler(event)); - } else if (isMetaKey(event) && event.shiftKey && (isKey(event, '1') || isKey(event, '!'))) { - handleDebugKey(); } }); @@ -155,29 +153,3 @@ export const handleEnterDown = (event: React.KeyboardEvent | Keyboa } return true; }; - -const handleDebugKey = () => { - const removeDebugInfo = (els: NodeListOf) => els.forEach(el => el.parentNode?.removeChild(el)); - - const addDebugInfo = (els: NodeListOf) => - els.forEach(el => { - const debugInfo = document.createElement('div'); - debugInfo.classList.add('debug-info'); - if (el.dataset.uieUid) { - debugInfo.textContent = el.dataset.uieUid; - } - el.appendChild(debugInfo); - }); - - const debugInfos = document.querySelectorAll('.debug-info'); - const isShowingDebugInfo = debugInfos.length > 0; - - if (isShowingDebugInfo) { - removeDebugInfo(debugInfos); - } else { - const debugElements = document.querySelectorAll( - '.message[data-uie-uid], .conversation-list-cell[data-uie-uid]', - ); - addDebugInfo(debugElements); - } -}; diff --git a/src/style/foundation/debug.less b/src/style/foundation/debug.less index 74cc665a0df..3b1dd4c45bf 100644 --- a/src/style/foundation/debug.less +++ b/src/style/foundation/debug.less @@ -13,15 +13,31 @@ body { color: #fff; font-size: 10px; font-weight: 300; - opacity: 1; + opacity: 0.5; user-select: text; + &:hover { + opacity: 1; + } } .message[data-uie-uid] .debug-info { - background-color: rgba(0, 0, 128, 0.5); + &::before { + content: 'message: '; + } + background-color: rgba(0, 0, 128); + } + + [data-uie-name='sender-name'][data-uie-uid] .debug-info { + &::before { + content: 'user: '; + } + background-color: rgba(0, 128, 32); } .conversation-list-cell[data-uie-uid] .debug-info { - background-color: rgba(128, 0, 0, 0.5); + &::before { + content: 'conversation: '; + } + background-color: rgba(128, 0, 0); } } From a5056044ce8e4ba7ed35e06dc43fc23ecda43e50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patryk=20G=C3=B3rka?= Date: Fri, 3 Mar 2023 14:04:27 +0100 Subject: [PATCH 16/97] feat: clear mls group on conversation delete (#14772) --- src/script/conversation/ConversationRepository.ts | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/script/conversation/ConversationRepository.ts b/src/script/conversation/ConversationRepository.ts index c828eadf41b..3719e2f3a01 100644 --- a/src/script/conversation/ConversationRepository.ts +++ b/src/script/conversation/ConversationRepository.ts @@ -838,7 +838,7 @@ export class ConversationRepository { }); } - private readonly deleteConversationLocally = (conversationId: QualifiedId, skipNotification: boolean) => { + private readonly deleteConversationLocally = async (conversationId: QualifiedId, skipNotification: boolean) => { const conversationEntity = this.conversationState.findConversation(conversationId); if (!conversationEntity) { return; @@ -856,7 +856,13 @@ export class ConversationRepository { this.conversationLabelRepository.saveLabels(); } this.deleteConversationFromRepository(conversationId); - this.conversationService.deleteConversationFromDb(conversationId); + await this.conversationService.deleteConversationFromDb(conversationId); + if (conversationEntity.protocol === ConversationProtocol.MLS) { + const {groupId} = conversationEntity; + if (groupId) { + await this.core.service!.conversation.wipeMLSConversation(groupId); + } + } }; public async getAllUsersInConversation(conversationId: QualifiedId): Promise { @@ -2013,7 +2019,8 @@ export class ConversationRepository { .then(conversationEntity => this.checkConversationParticipants(conversationEntity, eventJson, eventSource)) .then(conversationEntity => this.triggerFeatureEventHandlers(conversationEntity, eventJson)) .then( - conversationEntity => this.reactToConversationEvent(conversationEntity, eventJson, eventSource) as EntityObject, + conversationEntity => + this.reactToConversationEvent(conversationEntity, eventJson, eventSource) as Promise, ) .then((entityObject = {} as EntityObject) => { if (type !== CONVERSATION_EVENT.MEMBER_JOIN && type !== CONVERSATION_EVENT.MEMBER_LEAVE) { @@ -2153,7 +2160,7 @@ export class ConversationRepository { * @param eventSource Source of event * @returns Resolves when the event has been treated */ - private reactToConversationEvent( + private async reactToConversationEvent( conversationEntity: Conversation, eventJson: IncomingEvent, eventSource: EventSource, From 48e3b656aeb28e6f07d762e760be203020d0da3e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 5 Mar 2023 16:01:57 +0000 Subject: [PATCH 17/97] chore(deps-dev): Bump rimraf from 4.1.2 to 4.3.0 in /server (#14773) Bumps [rimraf](https://github.com/isaacs/rimraf) from 4.1.2 to 4.3.0. - [Release notes](https://github.com/isaacs/rimraf/releases) - [Changelog](https://github.com/isaacs/rimraf/blob/main/CHANGELOG.md) - [Commits](https://github.com/isaacs/rimraf/compare/v4.1.2...v4.3.0) --- updated-dependencies: - dependency-name: rimraf dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- server/package.json | 2 +- server/yarn.lock | 57 +++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 53 insertions(+), 6 deletions(-) diff --git a/server/package.json b/server/package.json index 37b953b2845..de57621319d 100644 --- a/server/package.json +++ b/server/package.json @@ -31,7 +31,7 @@ "@types/jest": "^29.4.0", "@types/node": "18.11.18", "jest": "29.4.3", - "rimraf": "4.1.2", + "rimraf": "4.3.0", "typescript": "4.9.5" }, "scripts": { diff --git a/server/yarn.lock b/server/yarn.lock index caabd203e58..27bc240c8be 100644 --- a/server/yarn.lock +++ b/server/yarn.lock @@ -2706,6 +2706,18 @@ __metadata: languageName: node linkType: hard +"glob@npm:^9.2.0": + version: 9.2.1 + resolution: "glob@npm:9.2.1" + dependencies: + fs.realpath: ^1.0.0 + minimatch: ^7.4.1 + minipass: ^4.2.4 + path-scurry: ^1.6.1 + checksum: ef9b1c32491e6b532bdd0d2abcc3c9f48e83446609e11285869156982fc5a756dfbaa6f59f797712343bd1e22500ac15708692806633653fde4ef67c85e2aab7 + languageName: node + linkType: hard + "globals@npm:^11.1.0": version: 11.12.0 resolution: "globals@npm:11.12.0" @@ -3799,6 +3811,13 @@ __metadata: languageName: node linkType: hard +"lru-cache@npm:^7.14.1": + version: 7.18.2 + resolution: "lru-cache@npm:7.18.2" + checksum: 51e9c6f960a747cb2ed13dfda4238905a5633c590c0f9e52b0ea971a9660b93c0bbf13a5feac36ef18356736a006259eff9afe8bf57a463ed8f21fbc43720120 + languageName: node + linkType: hard + "lru-cache@npm:^7.7.1": version: 7.14.1 resolution: "lru-cache@npm:7.14.1" @@ -3962,6 +3981,15 @@ __metadata: languageName: node linkType: hard +"minimatch@npm:^7.4.1": + version: 7.4.2 + resolution: "minimatch@npm:7.4.2" + dependencies: + brace-expansion: ^2.0.1 + checksum: 9e341b04e69d5ab03e4206dcb61c8a158e3b8709628bf5e1a4eaa9f3b72c0ba925e24ad959b1f6ce6835caa5a927131d5087fae6836b69e7d99d7d5e63ef0bd8 + languageName: node + linkType: hard + "minimist@npm:^1.2.5": version: 1.2.7 resolution: "minimist@npm:1.2.7" @@ -4038,6 +4066,13 @@ __metadata: languageName: node linkType: hard +"minipass@npm:^4.0.2, minipass@npm:^4.2.4": + version: 4.2.4 + resolution: "minipass@npm:4.2.4" + checksum: c664f2ae4401408d1e7a6e4f50aca45f87b1b0634bc9261136df5c378e313e77355765f73f59c4a5abcadcdf43d83fcd3eb14e4a7cdcce8e36508e2290345753 + languageName: node + linkType: hard + "minizlib@npm:^2.1.1, minizlib@npm:^2.1.2": version: 2.1.2 resolution: "minizlib@npm:2.1.2" @@ -4454,6 +4489,16 @@ __metadata: languageName: node linkType: hard +"path-scurry@npm:^1.6.1": + version: 1.6.1 + resolution: "path-scurry@npm:1.6.1" + dependencies: + lru-cache: ^7.14.1 + minipass: ^4.0.2 + checksum: 7ba57e823cb7bb879669a4e5e05a283cde1bb9e81b6d806b2609f8d8026d0aef08f4b655b17fc86b21c9c32807851bba95ca715db5ab0605fb13c7a3e9172e42 + languageName: node + linkType: hard + "path-to-regexp@npm:0.1.7": version: 0.1.7 resolution: "path-to-regexp@npm:0.1.7" @@ -4863,12 +4908,14 @@ __metadata: languageName: node linkType: hard -"rimraf@npm:4.1.2": - version: 4.1.2 - resolution: "rimraf@npm:4.1.2" +"rimraf@npm:4.3.0": + version: 4.3.0 + resolution: "rimraf@npm:4.3.0" + dependencies: + glob: ^9.2.0 bin: rimraf: dist/cjs/src/bin.js - checksum: 480b8147fd9bcbef3ac118f88a7b1169c3872977a3411a0c84df838bfc30e175a394c0db6f9619fc8b8a886a18c6d779d5e74f380a0075ecc710afaf81b3f50c + checksum: 48498f1eeb9b6b848605d93fa79e7bf3c57bb47807500ee636848dc0fd3b69b6b532f1ce9d4e46c4feeb4c3ff0e8ab85cd177cbbbd65f635f8bc8cb88aee151c languageName: node linkType: hard @@ -5614,7 +5661,7 @@ __metadata: nocache: 3.0.4 opn: 6.0.0 pm2: 5.2.2 - rimraf: 4.1.2 + rimraf: 4.3.0 typescript: 4.9.5 languageName: unknown linkType: soft From 26408a256dd542a4e823230a242fbbf561b2ff5d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 5 Mar 2023 16:02:38 +0000 Subject: [PATCH 18/97] chore(deps-dev): Bump cspell from 6.27.0 to 6.28.0 (#14774) Bumps [cspell](https://github.com/streetsidesoftware/cspell) from 6.27.0 to 6.28.0. - [Release notes](https://github.com/streetsidesoftware/cspell/releases) - [Changelog](https://github.com/streetsidesoftware/cspell/blob/main/CHANGELOG.md) - [Commits](https://github.com/streetsidesoftware/cspell/compare/v6.27.0...v6.28.0) --- updated-dependencies: - dependency-name: cspell dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 190 +++++++++++++++++++++++++++------------------------ 2 files changed, 102 insertions(+), 90 deletions(-) diff --git a/package.json b/package.json index c2b35cec77e..b1ddbe755c2 100644 --- a/package.json +++ b/package.json @@ -103,7 +103,7 @@ "babel-loader": "9.1.2", "caniuse-lite": "^1.0.30001458", "cross-env": "7.0.3", - "cspell": "6.27.0", + "cspell": "6.28.0", "css-loader": "^6.7.3", "cssnano": "^5.1.14", "dexie": "^3.2.2", diff --git a/yarn.lock b/yarn.lock index 0cd8a81fd45..ebf3ae8379c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1622,9 +1622,9 @@ __metadata: languageName: node linkType: hard -"@cspell/cspell-bundled-dicts@npm:6.27.0": - version: 6.27.0 - resolution: "@cspell/cspell-bundled-dicts@npm:6.27.0" +"@cspell/cspell-bundled-dicts@npm:6.28.0": + version: 6.28.0 + resolution: "@cspell/cspell-bundled-dicts@npm:6.28.0" dependencies: "@cspell/dict-ada": ^4.0.1 "@cspell/dict-aws": ^3.0.0 @@ -1672,28 +1672,28 @@ __metadata: "@cspell/dict-swift": ^2.0.1 "@cspell/dict-typescript": ^3.1.1 "@cspell/dict-vue": ^3.0.0 - checksum: 1c5bea8182a7ec3b3181f7b9c6ebf45ae35841374013b0aca94f84019523f7edba5727667efcb5dbdbe1108d02449ab0f91eafa961d4062dcf111116c3226711 + checksum: 5c99743b0869c85b35c0a7ffc91cce89df44cf6b5fdc700a8c7d9ef0415b03b06ad875adf3a334ad3940fe8e65ed0e0123f1cc5eae6cda74f6cfccce63e49eb0 languageName: node linkType: hard -"@cspell/cspell-pipe@npm:6.27.0": - version: 6.27.0 - resolution: "@cspell/cspell-pipe@npm:6.27.0" - checksum: 3b38047021db18ae16bf57da640e667ec79b8dc89ab0dfbcd540d68c90bdc0e8dbb860fcf0f995039dabc2d2b6b8390f3a171243bbed32af4ea0ff75fa114c4c +"@cspell/cspell-pipe@npm:6.28.0": + version: 6.28.0 + resolution: "@cspell/cspell-pipe@npm:6.28.0" + checksum: d7021e7b08f98d2e48f208d75837b2137da723f5de85caec988ca541e2b5ca0181e8aa474713da1fb0de4fd993e9e07a88537aa18530272a069c78c9aa20a410 languageName: node linkType: hard -"@cspell/cspell-service-bus@npm:6.27.0": - version: 6.27.0 - resolution: "@cspell/cspell-service-bus@npm:6.27.0" - checksum: 12e4d31c64a0a105cb9f7dac033d78492dfad6cd6fe818592bc37164a9cba00b2da8d1b9a584519bd95787fd766fcefbb97e4fdcb61264f4740e9226d2bf4219 +"@cspell/cspell-service-bus@npm:6.28.0": + version: 6.28.0 + resolution: "@cspell/cspell-service-bus@npm:6.28.0" + checksum: 8f96566539dd860e77343982f1ce663582fbeda3583c2a91e236cdd1036d0cf0b6f7a30f42b3b80912bb48e65be9333c3158fe69b3caa47880902bb9a751df09 languageName: node linkType: hard -"@cspell/cspell-types@npm:6.27.0": - version: 6.27.0 - resolution: "@cspell/cspell-types@npm:6.27.0" - checksum: 735d41410d966d0eb690c33eae0d0df1d87d054640cf279cdcd0aa9a774e0ea097b08b70794e9ebbb83ef5ecd7cbf2fb4902a6be41f810861bb982a0eac02267 +"@cspell/cspell-types@npm:6.28.0": + version: 6.28.0 + resolution: "@cspell/cspell-types@npm:6.28.0" + checksum: ea9702df67911fc475e8e5123a76ab801b513948d280433125858fbddd0cdba0a6c3dc1eefc6a42e1cebe14b1c50a5152472d2cd8d06c3bb47230d358a408789 languageName: node linkType: hard @@ -2019,19 +2019,19 @@ __metadata: languageName: node linkType: hard -"@cspell/dynamic-import@npm:6.27.0": - version: 6.27.0 - resolution: "@cspell/dynamic-import@npm:6.27.0" +"@cspell/dynamic-import@npm:6.28.0": + version: 6.28.0 + resolution: "@cspell/dynamic-import@npm:6.28.0" dependencies: import-meta-resolve: ^2.2.1 - checksum: 23c36ce113ec08b60a27b0c53caf3d29bc1c62f7968b16e25c2b33efd6175c835686a5162f246250fac78ae9871d9b4554fec33bde4f319320137f71241d9f2c + checksum: 0b5dc40a45388a1922fac13472f4bf92e47c88da94bcdb23d3536f03570257bf843e9c670d2a30d6f78ad15d8656def4384f0a1f93b7ca42d03de1ef5412f7e6 languageName: node linkType: hard -"@cspell/strong-weak-map@npm:6.27.0": - version: 6.27.0 - resolution: "@cspell/strong-weak-map@npm:6.27.0" - checksum: 7d0a942a745b21609cb0159657a848a2e14421d48e01efe14334819076c7f7c4b441aa7e7dd86ecdea09d234483040e9f9744f16fdc63a14b31285e38c63ec1f +"@cspell/strong-weak-map@npm:6.28.0": + version: 6.28.0 + resolution: "@cspell/strong-weak-map@npm:6.28.0" + checksum: 5fa5fd500972076951e0f8cde3922228c8815abf0d99b6e19144512743f6021cb4734b210084e026f0d0f0df687257b622941b80ba3e7eeb579fe67e9197998a languageName: node linkType: hard @@ -6561,6 +6561,18 @@ __metadata: languageName: node linkType: hard +"cosmiconfig@npm:^8.1.0": + version: 8.1.0 + resolution: "cosmiconfig@npm:8.1.0" + dependencies: + import-fresh: ^3.2.1 + js-yaml: ^4.1.0 + parse-json: ^5.0.0 + path-type: ^4.0.0 + checksum: 78a1846acc4935ab4d928e3f768ee2ad2fddbec96377935462749206568423ff4757140ac7f2ccd1f547f86309b8448c04b26588848b5a1520f2e9741cdeecf0 + languageName: node + linkType: hard + "countly-sdk-web@npm:22.6.5": version: 22.6.5 resolution: "countly-sdk-web@npm:22.6.5" @@ -6638,114 +6650,114 @@ __metadata: languageName: node linkType: hard -"cspell-dictionary@npm:6.27.0": - version: 6.27.0 - resolution: "cspell-dictionary@npm:6.27.0" +"cspell-dictionary@npm:6.28.0": + version: 6.28.0 + resolution: "cspell-dictionary@npm:6.28.0" dependencies: - "@cspell/cspell-pipe": 6.27.0 - "@cspell/cspell-types": 6.27.0 - cspell-trie-lib: 6.27.0 + "@cspell/cspell-pipe": 6.28.0 + "@cspell/cspell-types": 6.28.0 + cspell-trie-lib: 6.28.0 fast-equals: ^4.0.3 - gensequence: ^4.0.3 - checksum: a08fe05e6df30ea07bc1390df17f022d8bea126dddc2ecc32e0c5f9400c0316c366f01aa2ded17a4139f00ffa8857b46f04937fb11ef1aa730223b78ae938e5d + gensequence: ^5.0.2 + checksum: cc49a843d04e7beb3cf9e3874c59df4d5878aee04ae643ac854c3681d4eee9a2d1d75dd32c455392dda01d5539eb6099c69f2d544bbec398c3a0a7a833219836 languageName: node linkType: hard -"cspell-gitignore@npm:6.27.0": - version: 6.27.0 - resolution: "cspell-gitignore@npm:6.27.0" +"cspell-gitignore@npm:6.28.0": + version: 6.28.0 + resolution: "cspell-gitignore@npm:6.28.0" dependencies: - cspell-glob: 6.27.0 + cspell-glob: 6.28.0 find-up: ^5.0.0 bin: cspell-gitignore: bin.js - checksum: ddb9978cbb0a1b801c750eebae4cb0ff32ebacdefc48044dc21dec6b1516ce2fdb58148e372659fc509356c113727550387ee336d257f54655bcc1c6d2d4e0a1 + checksum: 0c8e590ff166c89ec32542bca5bb0a0481a5bcc60671ae497dcaa1ad4a44e593799285a27f84ddccfe218bf2782af21dac4fefc68b12bebbc7236b6adaa25deb languageName: node linkType: hard -"cspell-glob@npm:6.27.0": - version: 6.27.0 - resolution: "cspell-glob@npm:6.27.0" +"cspell-glob@npm:6.28.0": + version: 6.28.0 + resolution: "cspell-glob@npm:6.28.0" dependencies: micromatch: ^4.0.5 - checksum: fc095d7d7bb121021980636fd9eed11d9af1e077a8c4ae4b865744356dec56c5cdbae59478f543dc49245d3d4a84a57b8d9d24115db1888542a6abee8ec5fbc8 + checksum: 054ee7b40a88d76e626a66155cd1d8329058b46a302f2321a1f17995da862e7cc8c57580f0d95763d4eded3845ad181b104991f05cc6ec653082742a15e85789 languageName: node linkType: hard -"cspell-grammar@npm:6.27.0": - version: 6.27.0 - resolution: "cspell-grammar@npm:6.27.0" +"cspell-grammar@npm:6.28.0": + version: 6.28.0 + resolution: "cspell-grammar@npm:6.28.0" dependencies: - "@cspell/cspell-pipe": 6.27.0 - "@cspell/cspell-types": 6.27.0 + "@cspell/cspell-pipe": 6.28.0 + "@cspell/cspell-types": 6.28.0 bin: cspell-grammar: bin.js - checksum: f100f7efa2333980e5b812c1eaed98f741654a690a41bafe20b4e6b89fcc5ded17ed7d76b26d6045c5ee385802a27359afdb357bce4f743a6d63141918c464af + checksum: dd194625841c7db82a7b15e9ffcd6250e84fff578d1cd5cd62d6c78bc7aae75cb1dded4ce461f785a71a8e13a224e0458272d18de2f71399de97f1a0acb77d12 languageName: node linkType: hard -"cspell-io@npm:6.27.0": - version: 6.27.0 - resolution: "cspell-io@npm:6.27.0" +"cspell-io@npm:6.28.0": + version: 6.28.0 + resolution: "cspell-io@npm:6.28.0" dependencies: - "@cspell/cspell-service-bus": 6.27.0 + "@cspell/cspell-service-bus": 6.28.0 node-fetch: ^2.6.9 - checksum: 356d2609453156b52558ba72e6f3a9ff72e12a077a234f9b3c8028ad5467fe1b4634d9eb6b8c3fde0fabc1a7b2d594f4bda9280ce7b960c80c0a6c795fba0907 + checksum: 5deaedea891dcaa08230c4464d0c1c6b7867284dc3710e1fe4ca9ba1fedf502550598dd9960b92b4be42355be8c330015789a4b10b9e7171ceae4c47483530e2 languageName: node linkType: hard -"cspell-lib@npm:6.27.0": - version: 6.27.0 - resolution: "cspell-lib@npm:6.27.0" +"cspell-lib@npm:6.28.0": + version: 6.28.0 + resolution: "cspell-lib@npm:6.28.0" dependencies: - "@cspell/cspell-bundled-dicts": 6.27.0 - "@cspell/cspell-pipe": 6.27.0 - "@cspell/cspell-types": 6.27.0 - "@cspell/strong-weak-map": 6.27.0 + "@cspell/cspell-bundled-dicts": 6.28.0 + "@cspell/cspell-pipe": 6.28.0 + "@cspell/cspell-types": 6.28.0 + "@cspell/strong-weak-map": 6.28.0 clear-module: ^4.1.2 comment-json: ^4.2.3 configstore: ^5.0.1 - cosmiconfig: 8.0.0 - cspell-dictionary: 6.27.0 - cspell-glob: 6.27.0 - cspell-grammar: 6.27.0 - cspell-io: 6.27.0 - cspell-trie-lib: 6.27.0 + cosmiconfig: ^8.1.0 + cspell-dictionary: 6.28.0 + cspell-glob: 6.28.0 + cspell-grammar: 6.28.0 + cspell-io: 6.28.0 + cspell-trie-lib: 6.28.0 fast-equals: ^4.0.3 find-up: ^5.0.0 - gensequence: ^4.0.3 + gensequence: ^5.0.2 import-fresh: ^3.3.0 resolve-from: ^5.0.0 resolve-global: ^1.0.0 vscode-languageserver-textdocument: ^1.0.8 vscode-uri: ^3.0.7 - checksum: b1f7ff36a03a25931b3b729145f440124a97be860d2e067d674956cbb615511bfbb8b1469054bcb418c7a0090af40ee83679fc39af8939a2b04cc812ed7be0de + checksum: 9b31d2199d853dbbb892fb06ad887363e1781a7a80e21c1d1723819162d955a3d14d437e20b646665a7a819c02fd4072f7201a1cacddf7ab3fe9b7a8e7028d16 languageName: node linkType: hard -"cspell-trie-lib@npm:6.27.0": - version: 6.27.0 - resolution: "cspell-trie-lib@npm:6.27.0" +"cspell-trie-lib@npm:6.28.0": + version: 6.28.0 + resolution: "cspell-trie-lib@npm:6.28.0" dependencies: - "@cspell/cspell-pipe": 6.27.0 - "@cspell/cspell-types": 6.27.0 - gensequence: ^4.0.3 - checksum: de3ce08fa5a0ae39715098758c28da76ab74e34b3dce796cf77380cca29e884b0b69c0d694e2d139d93d7ac7ce4e7c1201287890ad55de71c67e36a4f6a75512 + "@cspell/cspell-pipe": 6.28.0 + "@cspell/cspell-types": 6.28.0 + gensequence: ^5.0.2 + checksum: 666ad0484d93a8d7b0605a2503561694260e46fd75147ab95ae6b6022ae39d7013810edf3f78583cb86ea9df83a2d57b54620719af09aeb0c6b67725ebedeb01 languageName: node linkType: hard -"cspell@npm:6.27.0": - version: 6.27.0 - resolution: "cspell@npm:6.27.0" +"cspell@npm:6.28.0": + version: 6.28.0 + resolution: "cspell@npm:6.28.0" dependencies: - "@cspell/cspell-pipe": 6.27.0 - "@cspell/dynamic-import": 6.27.0 + "@cspell/cspell-pipe": 6.28.0 + "@cspell/dynamic-import": 6.28.0 chalk: ^4.1.2 commander: ^10.0.0 - cspell-gitignore: 6.27.0 - cspell-glob: 6.27.0 - cspell-io: 6.27.0 - cspell-lib: 6.27.0 + cspell-gitignore: 6.28.0 + cspell-glob: 6.28.0 + cspell-io: 6.28.0 + cspell-lib: 6.28.0 fast-glob: ^3.2.12 fast-json-stable-stringify: ^2.1.0 file-entry-cache: ^6.0.1 @@ -6756,7 +6768,7 @@ __metadata: vscode-uri: ^3.0.7 bin: cspell: bin.js - checksum: 4a56a68a6f40bb8c2c4ddba8d410ee72e3ae8bd083c75359cf035da999d09c97892aa14812e47f02c523c6727630a2ede93c5b662cb024170ceaf89a48625941 + checksum: cdb70b8ccd6be026b9dec4f462cd709bccb64c2f001c6cb7ec549b6a4053649cc9d29361d2865fc8abf198a5764ac7f7d659ebf92647b14146605081767b60ee languageName: node linkType: hard @@ -8780,10 +8792,10 @@ __metadata: languageName: node linkType: hard -"gensequence@npm:^4.0.3": - version: 4.0.3 - resolution: "gensequence@npm:4.0.3" - checksum: 541824a242bb0a64e7e58b595c753a5a9cd07c02a1c6c41928e0d6e09f16047e774deab470ae484e4aded29cfe03a6325a3090dd6e5a0c32ff3726606b09ffc4 +"gensequence@npm:^5.0.2": + version: 5.0.2 + resolution: "gensequence@npm:5.0.2" + checksum: b94af8d6591bbf5bc568813f31efbc5bfca010d83bce2a6c82dcf4211f56be8e13df956b239fecb1d7492bf02218e3d36dbc47e6f872df256312a507ae9ccd25 languageName: node linkType: hard @@ -17133,7 +17145,7 @@ __metadata: core-js: 3.25.5 countly-sdk-web: 22.6.5 cross-env: 7.0.3 - cspell: 6.27.0 + cspell: 6.28.0 css-loader: ^6.7.3 cssnano: ^5.1.14 date-fns: 2.29.3 From bd577028172df2ed180b673e2533238da919b0f0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 5 Mar 2023 16:05:25 +0000 Subject: [PATCH 19/97] chore(deps-dev): Bump @typescript-eslint/eslint-plugin (#14775) Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 5.53.0 to 5.54.0. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v5.54.0/packages/eslint-plugin) --- updated-dependencies: - dependency-name: "@typescript-eslint/eslint-plugin" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 87 +++++++++++++++++++++++++++++++++++++++------------- 2 files changed, 67 insertions(+), 22 deletions(-) diff --git a/package.json b/package.json index b1ddbe755c2..33a0818cf43 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "@types/uint32": "0.2.0", "@types/underscore": "1.11.4", "@types/webpack-env": "1.18.0", - "@typescript-eslint/eslint-plugin": "^5.53.0", + "@typescript-eslint/eslint-plugin": "^5.54.0", "@typescript-eslint/parser": "^5.53.0", "@wireapp/copy-config": "2.0.9", "@wireapp/eslint-config": "2.1.1", diff --git a/yarn.lock b/yarn.lock index ebf3ae8379c..33fa2893e10 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4120,13 +4120,13 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/eslint-plugin@npm:^5.53.0": - version: 5.53.0 - resolution: "@typescript-eslint/eslint-plugin@npm:5.53.0" +"@typescript-eslint/eslint-plugin@npm:^5.54.0": + version: 5.54.0 + resolution: "@typescript-eslint/eslint-plugin@npm:5.54.0" dependencies: - "@typescript-eslint/scope-manager": 5.53.0 - "@typescript-eslint/type-utils": 5.53.0 - "@typescript-eslint/utils": 5.53.0 + "@typescript-eslint/scope-manager": 5.54.0 + "@typescript-eslint/type-utils": 5.54.0 + "@typescript-eslint/utils": 5.54.0 debug: ^4.3.4 grapheme-splitter: ^1.0.4 ignore: ^5.2.0 @@ -4140,7 +4140,7 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 12dffe65969d8e5248c86a700fe46a737e55ecafb276933e747b4731eab6266fe55e2d43a34b8b340179fe248e127d861cd016a7614b1b9804cd0687c99616d1 + checksum: 4fdb520b8e0f6b9eb878206ddfa4212522f170d1507d7aba8a975159a198efa37af6d2d17982dd560317452d0748f2e2da5dd7347b172bc4446d1c5562ce2e94 languageName: node linkType: hard @@ -4212,12 +4212,22 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/type-utils@npm:5.53.0": - version: 5.53.0 - resolution: "@typescript-eslint/type-utils@npm:5.53.0" +"@typescript-eslint/scope-manager@npm:5.54.0": + version: 5.54.0 + resolution: "@typescript-eslint/scope-manager@npm:5.54.0" dependencies: - "@typescript-eslint/typescript-estree": 5.53.0 - "@typescript-eslint/utils": 5.53.0 + "@typescript-eslint/types": 5.54.0 + "@typescript-eslint/visitor-keys": 5.54.0 + checksum: e50f12396de0ddb94aab119bdd5f4769b80dd2c273e137fd25e5811e25114d7a3d3668cdb3c454aca9537e940744881d62a1fed2ec86f07f60533dc7382ae15c + languageName: node + linkType: hard + +"@typescript-eslint/type-utils@npm:5.54.0": + version: 5.54.0 + resolution: "@typescript-eslint/type-utils@npm:5.54.0" + dependencies: + "@typescript-eslint/typescript-estree": 5.54.0 + "@typescript-eslint/utils": 5.54.0 debug: ^4.3.4 tsutils: ^3.21.0 peerDependencies: @@ -4225,7 +4235,7 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 52c40967c5fabd58c2ae8bf519ef89e4feb511e4df630aeaeac8335661a79b6b3a32d30a61a5f1d8acc703f21c4d90751a5d41cda1b35d08867524da11bc2e1d + checksum: 9cb5b52c7277bdf74b9ea3282fc40f41fda90ea4b1d33039044476e43cf05a766b1294e7d45f429594f2776828f7d17729cfa4ea027315f3df883e748ba57514 languageName: node linkType: hard @@ -4257,6 +4267,13 @@ __metadata: languageName: node linkType: hard +"@typescript-eslint/types@npm:5.54.0": + version: 5.54.0 + resolution: "@typescript-eslint/types@npm:5.54.0" + checksum: 0f66b1b93078f3afea6dfcd3d4e2f0abea4f60cd0c613c2cf13f85098e5bf786185484c9846ed80b6c4272de2c31a70c5a8aacb91314cf1b6da7dcb8855cb7ac + languageName: node + linkType: hard + "@typescript-eslint/typescript-estree@npm:5.10.1": version: 5.10.1 resolution: "@typescript-eslint/typescript-estree@npm:5.10.1" @@ -4329,6 +4346,24 @@ __metadata: languageName: node linkType: hard +"@typescript-eslint/typescript-estree@npm:5.54.0": + version: 5.54.0 + resolution: "@typescript-eslint/typescript-estree@npm:5.54.0" + dependencies: + "@typescript-eslint/types": 5.54.0 + "@typescript-eslint/visitor-keys": 5.54.0 + debug: ^4.3.4 + globby: ^11.1.0 + is-glob: ^4.0.3 + semver: ^7.3.7 + tsutils: ^3.21.0 + peerDependenciesMeta: + typescript: + optional: true + checksum: 377c75c34c4f95b7ab6218c1d96a6db3ea6ed6727711b6a09354582fe0157861dc1b6fb9e3f7113cd09741f713735d59d5ab5845457f5733a4ebad7470bf600a + languageName: node + linkType: hard + "@typescript-eslint/utils@npm:5.10.1": version: 5.10.1 resolution: "@typescript-eslint/utils@npm:5.10.1" @@ -4345,21 +4380,21 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/utils@npm:5.53.0": - version: 5.53.0 - resolution: "@typescript-eslint/utils@npm:5.53.0" +"@typescript-eslint/utils@npm:5.54.0": + version: 5.54.0 + resolution: "@typescript-eslint/utils@npm:5.54.0" dependencies: "@types/json-schema": ^7.0.9 "@types/semver": ^7.3.12 - "@typescript-eslint/scope-manager": 5.53.0 - "@typescript-eslint/types": 5.53.0 - "@typescript-eslint/typescript-estree": 5.53.0 + "@typescript-eslint/scope-manager": 5.54.0 + "@typescript-eslint/types": 5.54.0 + "@typescript-eslint/typescript-estree": 5.54.0 eslint-scope: ^5.1.1 eslint-utils: ^3.0.0 semver: ^7.3.7 peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 - checksum: 18e6bac14ae853385a74123759850bca367904723e170c37416fc014673eb714afb6bb090367bff61494a8387e941b6af65ee5f4f845f7177fabb4df85e01643 + checksum: b8f344fc2961c7af530b93e53d5a17b5084cdf550b381082e3fb7f349ef16e718d9eebde1b9fc2d8fc4ecf8d60d334b004359977247554265c1afc87323bed37 languageName: node linkType: hard @@ -4439,6 +4474,16 @@ __metadata: languageName: node linkType: hard +"@typescript-eslint/visitor-keys@npm:5.54.0": + version: 5.54.0 + resolution: "@typescript-eslint/visitor-keys@npm:5.54.0" + dependencies: + "@typescript-eslint/types": 5.54.0 + eslint-visitor-keys: ^3.3.0 + checksum: 17fc323c09e6272b603cdaec30a99916600fbbb737e1fbc8c1727a487753b4363cea112277fa43e0562bff34bdd1de9ad73ff9433118b1fd469b112fad0313ca + languageName: node + linkType: hard + "@webassemblyjs/ast@npm:1.11.1": version: 1.11.1 resolution: "@webassemblyjs/ast@npm:1.11.1" @@ -17120,7 +17165,7 @@ __metadata: "@types/uint32": 0.2.0 "@types/underscore": 1.11.4 "@types/webpack-env": 1.18.0 - "@typescript-eslint/eslint-plugin": ^5.53.0 + "@typescript-eslint/eslint-plugin": ^5.54.0 "@typescript-eslint/parser": ^5.53.0 "@wireapp/avs": 9.0.23 "@wireapp/copy-config": 2.0.9 From 4778bfe07aec38a87e24be2015a57449cc545087 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 5 Mar 2023 16:08:35 +0000 Subject: [PATCH 20/97] chore(deps-dev): Bump caniuse-lite from 1.0.30001458 to 1.0.30001460 (#14777) Bumps [caniuse-lite](https://github.com/browserslist/caniuse-lite) from 1.0.30001458 to 1.0.30001460. - [Release notes](https://github.com/browserslist/caniuse-lite/releases) - [Commits](https://github.com/browserslist/caniuse-lite/compare/1.0.30001458...1.0.30001460) --- updated-dependencies: - dependency-name: caniuse-lite dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 33a0818cf43..215be43b4ca 100644 --- a/package.json +++ b/package.json @@ -101,7 +101,7 @@ "archiver": "^5.3.1", "autoprefixer": "^10.4.13", "babel-loader": "9.1.2", - "caniuse-lite": "^1.0.30001458", + "caniuse-lite": "^1.0.30001460", "cross-env": "7.0.3", "cspell": "6.28.0", "css-loader": "^6.7.3", diff --git a/yarn.lock b/yarn.lock index 33fa2893e10..63797d3f15d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6056,10 +6056,10 @@ __metadata: languageName: node linkType: hard -"caniuse-lite@npm:^1.0.30001458": - version: 1.0.30001458 - resolution: "caniuse-lite@npm:1.0.30001458" - checksum: 258cc5a25babbbfe483bf788c6f321a19400ff80b2bf156b360bac09a6f9f4da44516350d187a30395667cb142c682d9ea96577ea0df236d35f76234b07ccb41 +"caniuse-lite@npm:^1.0.30001460": + version: 1.0.30001460 + resolution: "caniuse-lite@npm:1.0.30001460" + checksum: dad91eb82aa65aecf33ad6a04ad620b9df6f0152020dc6c1874224e8c6f4aa50695f585201b3dfcd2760b3c43326a86c9505cc03af856698fbef67b267ef786f languageName: node linkType: hard @@ -17184,7 +17184,7 @@ __metadata: autoprefixer: ^10.4.13 babel-loader: 9.1.2 beautiful-react-hooks: ^3.12.2 - caniuse-lite: ^1.0.30001458 + caniuse-lite: ^1.0.30001460 classnames: 2.3.2 copy-webpack-plugin: 11.0.0 core-js: 3.25.5 From ecbe7d8f3a0012d4840d3f87b65a30e5f695734e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 5 Mar 2023 16:11:30 +0000 Subject: [PATCH 21/97] chore(deps): Bump @wireapp/react-ui-kit from 9.3.8 to 9.3.9 (#14778) Bumps [@wireapp/react-ui-kit](https://github.com/wireapp/wire-web-packages) from 9.3.8 to 9.3.9. - [Release notes](https://github.com/wireapp/wire-web-packages/releases) - [Commits](https://github.com/wireapp/wire-web-packages/compare/@wireapp/react-ui-kit@9.3.8...@wireapp/react-ui-kit@9.3.9) --- updated-dependencies: - dependency-name: "@wireapp/react-ui-kit" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 215be43b4ca..09295a72326 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "@wireapp/avs": "9.0.23", "@wireapp/core": "39.1.3", "@wireapp/lru-cache": "3.8.1", - "@wireapp/react-ui-kit": "9.3.8", + "@wireapp/react-ui-kit": "9.3.9", "@wireapp/store-engine-dexie": "2.0.4", "@wireapp/store-engine-sqleet": "1.8.9", "@wireapp/webapp-events": "0.16.0", diff --git a/yarn.lock b/yarn.lock index 63797d3f15d..a8d932935dc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4867,9 +4867,9 @@ __metadata: languageName: node linkType: hard -"@wireapp/react-ui-kit@npm:9.3.8": - version: 9.3.8 - resolution: "@wireapp/react-ui-kit@npm:9.3.8" +"@wireapp/react-ui-kit@npm:9.3.9": + version: 9.3.9 + resolution: "@wireapp/react-ui-kit@npm:9.3.9" dependencies: "@types/color": 3.0.3 color: 4.2.3 @@ -4884,7 +4884,7 @@ __metadata: peerDependenciesMeta: "@types/react": optional: true - checksum: 49f2bba66d3b5c45b0538cb425fe6b34e4be2fb4fad76745d24f215b371a4598a2d1067f7208b8270123670b9bc76d5226df732cf2227c3f1678c2e5f3d2b5c0 + checksum: fe352f5fe0472c148d36377a723911e57cb27bd3ce577b4712d0d24849ca8747b4b4e46e518b023c4ca0a50a97a42c3bed76cf36a89513b2ede7e08a62df3dd7 languageName: node linkType: hard @@ -17173,7 +17173,7 @@ __metadata: "@wireapp/eslint-config": 2.1.1 "@wireapp/lru-cache": 3.8.1 "@wireapp/prettier-config": 0.5.2 - "@wireapp/react-ui-kit": 9.3.8 + "@wireapp/react-ui-kit": 9.3.9 "@wireapp/store-engine": ^5.0.3 "@wireapp/store-engine-dexie": 2.0.4 "@wireapp/store-engine-sqleet": 1.8.9 From 09f917e5b2ec61d3dd9eca562e9ca40bf72f5ff1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 5 Mar 2023 16:13:08 +0000 Subject: [PATCH 22/97] chore(deps-dev): Bump @types/node from 18.14.1 to 18.14.6 (#14779) Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 18.14.1 to 18.14.6. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node) --- updated-dependencies: - dependency-name: "@types/node" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 09295a72326..c650f35336f 100644 --- a/package.json +++ b/package.json @@ -76,7 +76,7 @@ "@types/libsodium-wrappers": "^0", "@types/linkify-it": "3.0.2", "@types/markdown-it": "12.2.3", - "@types/node": "^18.14.1", + "@types/node": "^18.14.6", "@types/open-graph": "0.2.2", "@types/platform": "1.3.4", "@types/prettier": "^2.7.2", diff --git a/yarn.lock b/yarn.lock index a8d932935dc..959e7154d46 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3869,10 +3869,10 @@ __metadata: languageName: node linkType: hard -"@types/node@npm:^18.14.1": - version: 18.14.1 - resolution: "@types/node@npm:18.14.1" - checksum: 58556bbdb0050e44a4934742c1da2530812782c06d266a758e669e44c5aa196166c5fce45fdb03f016876717e3840478b3220129bb77367f979607564047f0a3 +"@types/node@npm:^18.14.6": + version: 18.14.6 + resolution: "@types/node@npm:18.14.6" + checksum: 2f88f482cabadc6dbddd627a1674239e68c3c9beab56eb4ae2309fb96fd17fc3a509d99b0309bafe13b58529574f49ecf3a583f2ebe2896dd32fe4be436dc96e languageName: node linkType: hard @@ -17150,7 +17150,7 @@ __metadata: "@types/libsodium-wrappers": ^0 "@types/linkify-it": 3.0.2 "@types/markdown-it": 12.2.3 - "@types/node": ^18.14.1 + "@types/node": ^18.14.6 "@types/open-graph": 0.2.2 "@types/platform": 1.3.4 "@types/prettier": ^2.7.2 From e081c9d3ea2cd81697e30b4e35592a4d6bce6f92 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 5 Mar 2023 16:13:42 +0000 Subject: [PATCH 23/97] chore(deps): Bump react-router-dom from 6.8.1 to 6.8.2 (#14780) Bumps [react-router-dom](https://github.com/remix-run/react-router/tree/HEAD/packages/react-router-dom) from 6.8.1 to 6.8.2. - [Release notes](https://github.com/remix-run/react-router/releases) - [Changelog](https://github.com/remix-run/react-router/blob/main/packages/react-router-dom/CHANGELOG.md) - [Commits](https://github.com/remix-run/react-router/commits/react-router-dom@6.8.2/packages/react-router-dom) --- updated-dependencies: - dependency-name: react-router-dom dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 32 +++++++++++++++++++++++++------- 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index c650f35336f..2ae81c37154 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "react-intl": "6.2.10", "react-redux": "8.0.5", "react-router": "6.8.1", - "react-router-dom": "6.8.1", + "react-router-dom": "6.8.2", "react-transition-group": "4.4.5", "redux": "4.2.1", "redux-logdown": "1.0.4", diff --git a/yarn.lock b/yarn.lock index 959e7154d46..8eacc67c033 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3244,6 +3244,13 @@ __metadata: languageName: node linkType: hard +"@remix-run/router@npm:1.3.3": + version: 1.3.3 + resolution: "@remix-run/router@npm:1.3.3" + checksum: 9280f1c3e44c0fb84a74b401b5a47022dace06d5da0f26a7a68c7c0e57ad5ef95d30f3c2d333df2db3b63f84de81f7f8caa7e53189a7709d6c3eb466d126ed76 + languageName: node + linkType: hard + "@rollup/plugin-babel@npm:^5.2.0": version: 5.2.2 resolution: "@rollup/plugin-babel@npm:5.2.2" @@ -14235,16 +14242,16 @@ __metadata: languageName: node linkType: hard -"react-router-dom@npm:6.8.1": - version: 6.8.1 - resolution: "react-router-dom@npm:6.8.1" +"react-router-dom@npm:6.8.2": + version: 6.8.2 + resolution: "react-router-dom@npm:6.8.2" dependencies: - "@remix-run/router": 1.3.2 - react-router: 6.8.1 + "@remix-run/router": 1.3.3 + react-router: 6.8.2 peerDependencies: react: ">=16.8" react-dom: ">=16.8" - checksum: fb1a9f5c7e4c83536ee7e6493f3c13f6abda66da69f9191fb8b087ab188ecc18a3a32575813a280cbeca67bcb8b0dcb6dbcef7ed599e03f38a44d694f4abcf14 + checksum: eddc8b88e26c66408df894bdcf95efd6731e21b7cbfd7417cd456f0043916279e0559b06c6cdc19c2a55c6aefc4cc745fa4065d3505e519a95adbef0cc89e77f languageName: node linkType: hard @@ -14259,6 +14266,17 @@ __metadata: languageName: node linkType: hard +"react-router@npm:6.8.2": + version: 6.8.2 + resolution: "react-router@npm:6.8.2" + dependencies: + "@remix-run/router": 1.3.3 + peerDependencies: + react: ">=16.8" + checksum: 9e98d03e1f18bfd5a35144a0c675adaf7c46a9ad436efdea2b52ef3a6e501ac6174a67ea90004e1339cd45019d6b1eb370627518320f7af9323ae74e0c6756ad + languageName: node + linkType: hard + "react-select@npm:5.7.0": version: 5.7.0 resolution: "react-select@npm:5.7.0" @@ -17262,7 +17280,7 @@ __metadata: react-intl: 6.2.10 react-redux: 8.0.5 react-router: 6.8.1 - react-router-dom: 6.8.1 + react-router-dom: 6.8.2 react-transition-group: 4.4.5 redux: 4.2.1 redux-devtools-extension: 2.13.9 From 0f652efb8dc2fe616da7904fa002b5941c1dd03d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 5 Mar 2023 16:13:58 +0000 Subject: [PATCH 24/97] chore(deps-dev): Bump @wireapp/copy-config from 2.0.9 to 2.0.10 (#14776) Bumps [@wireapp/copy-config](https://github.com/wireapp/wire-web-packages) from 2.0.9 to 2.0.10. - [Release notes](https://github.com/wireapp/wire-web-packages/releases) - [Commits](https://github.com/wireapp/wire-web-packages/compare/@wireapp/copy-config@2.0.9...@wireapp/copy-config@2.0.10) --- updated-dependencies: - dependency-name: "@wireapp/copy-config" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 45 +++++++++++---------------------------------- 2 files changed, 12 insertions(+), 35 deletions(-) diff --git a/package.json b/package.json index 2ae81c37154..380fa56077b 100644 --- a/package.json +++ b/package.json @@ -93,7 +93,7 @@ "@types/webpack-env": "1.18.0", "@typescript-eslint/eslint-plugin": "^5.54.0", "@typescript-eslint/parser": "^5.53.0", - "@wireapp/copy-config": "2.0.9", + "@wireapp/copy-config": "2.0.10", "@wireapp/eslint-config": "2.1.1", "@wireapp/prettier-config": "0.5.2", "@wireapp/store-engine": "^5.0.3", diff --git a/yarn.lock b/yarn.lock index 8eacc67c033..c513776b91c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4720,19 +4720,19 @@ __metadata: languageName: node linkType: hard -"@wireapp/copy-config@npm:2.0.9": - version: 2.0.9 - resolution: "@wireapp/copy-config@npm:2.0.9" +"@wireapp/copy-config@npm:2.0.10": + version: 2.0.10 + resolution: "@wireapp/copy-config@npm:2.0.10" dependencies: - axios: 1.3.3 + axios: 1.3.4 copy: 0.3.2 - cosmiconfig: 8.0.0 + cosmiconfig: 8.1.0 fs-extra: 11.1.0 jszip: 3.10.1 logdown: 3.3.1 bin: copy-config: lib/cli.js - checksum: 15f8a8f61e1b9cc7a143ae76f8288adb8858ab8d8fdf20ce31f9e9c692a18e6cb2a1139f1205f143647c38d4ee230f5db0ffd923f2edaf082f959890be48bf30 + checksum: 974bf7c454d4e83361df08a9b33c59e46be772f272a349bfc5d154cdd987f8e1657091d3dc488493f4d01395ab932b4746f58b1713b4c10329650aa257d28c97 languageName: node linkType: hard @@ -5588,17 +5588,6 @@ __metadata: languageName: node linkType: hard -"axios@npm:1.3.3": - version: 1.3.3 - resolution: "axios@npm:1.3.3" - dependencies: - follow-redirects: ^1.15.0 - form-data: ^4.0.0 - proxy-from-env: ^1.1.0 - checksum: b734a4bc348e2fa27150a7d4289d783fa405feb3f79f8daf28fd05813a12c8525ae9d3854aafe7ba041b005a4a751a0ba3b923331ceed41296ae14c7e54e2f26 - languageName: node - linkType: hard - "axios@npm:1.3.4": version: 1.3.4 resolution: "axios@npm:1.3.4" @@ -6588,15 +6577,15 @@ __metadata: languageName: node linkType: hard -"cosmiconfig@npm:8.0.0": - version: 8.0.0 - resolution: "cosmiconfig@npm:8.0.0" +"cosmiconfig@npm:8.1.0, cosmiconfig@npm:^8.1.0": + version: 8.1.0 + resolution: "cosmiconfig@npm:8.1.0" dependencies: import-fresh: ^3.2.1 js-yaml: ^4.1.0 parse-json: ^5.0.0 path-type: ^4.0.0 - checksum: ff4cdf89ac1ae52e7520816622c21a9e04380d04b82d653f5139ec581aa4f7f29e096d46770bc76c4a63c225367e88a1dfa233ea791669a35101f5f9b972c7d1 + checksum: 78a1846acc4935ab4d928e3f768ee2ad2fddbec96377935462749206568423ff4757140ac7f2ccd1f547f86309b8448c04b26588848b5a1520f2e9741cdeecf0 languageName: node linkType: hard @@ -6613,18 +6602,6 @@ __metadata: languageName: node linkType: hard -"cosmiconfig@npm:^8.1.0": - version: 8.1.0 - resolution: "cosmiconfig@npm:8.1.0" - dependencies: - import-fresh: ^3.2.1 - js-yaml: ^4.1.0 - parse-json: ^5.0.0 - path-type: ^4.0.0 - checksum: 78a1846acc4935ab4d928e3f768ee2ad2fddbec96377935462749206568423ff4757140ac7f2ccd1f547f86309b8448c04b26588848b5a1520f2e9741cdeecf0 - languageName: node - linkType: hard - "countly-sdk-web@npm:22.6.5": version: 22.6.5 resolution: "countly-sdk-web@npm:22.6.5" @@ -17186,7 +17163,7 @@ __metadata: "@typescript-eslint/eslint-plugin": ^5.54.0 "@typescript-eslint/parser": ^5.53.0 "@wireapp/avs": 9.0.23 - "@wireapp/copy-config": 2.0.9 + "@wireapp/copy-config": 2.0.10 "@wireapp/core": 39.1.3 "@wireapp/eslint-config": 2.1.1 "@wireapp/lru-cache": 3.8.1 From 236035098f48bf7efecbdb19e62dc53a7093130a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 5 Mar 2023 16:17:49 +0000 Subject: [PATCH 25/97] chore(deps-dev): Bump simple-git from 3.16.1 to 3.17.0 (#14782) Bumps [simple-git](https://github.com/steveukx/git-js/tree/HEAD/simple-git) from 3.16.1 to 3.17.0. - [Release notes](https://github.com/steveukx/git-js/releases) - [Changelog](https://github.com/steveukx/git-js/blob/main/simple-git/CHANGELOG.md) - [Commits](https://github.com/steveukx/git-js/commits/simple-git@3.17.0/simple-git) --- updated-dependencies: - dependency-name: simple-git dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 380fa56077b..172fbb64e51 100644 --- a/package.json +++ b/package.json @@ -158,7 +158,7 @@ "redux-devtools-extension": "2.13.9", "redux-mock-store": "1.5.4", "seedrandom": "^3.0.5", - "simple-git": "3.16.1", + "simple-git": "3.17.0", "sinon": "15.0.1", "snabbdom": "3.5.1", "style-loader": "^3.3.1", diff --git a/yarn.lock b/yarn.lock index c513776b91c..64ba35aac8f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -15086,14 +15086,14 @@ __metadata: languageName: node linkType: hard -"simple-git@npm:3.16.1": - version: 3.16.1 - resolution: "simple-git@npm:3.16.1" +"simple-git@npm:3.17.0": + version: 3.17.0 + resolution: "simple-git@npm:3.17.0" dependencies: "@kwsites/file-exists": ^1.1.1 "@kwsites/promise-deferred": ^1.1.1 debug: ^4.3.4 - checksum: 02ed36d580ea20efc0d26571742d120ff86edebba5a94cc91c8de17529d4e8cf4ea57fc11cbbae11f4713400fab11df5e4f1639cfbf643fcce5e80e79effa762 + checksum: 977a05cb0b5087296348b5afa682ce552f43234f5fd29b44c3d7f56b3682d10dcb03752a418e508aaffcbdb6ea2e304a3ef10095197d6743d2353adb85f32592 languageName: node linkType: hard @@ -17265,7 +17265,7 @@ __metadata: redux-mock-store: 1.5.4 redux-thunk: 2.4.2 seedrandom: ^3.0.5 - simple-git: 3.16.1 + simple-git: 3.17.0 sinon: 15.0.1 snabbdom: 3.5.1 speakingurl: 14.0.1 From 4d25a2600ecb493f9288fa5bcb8f5d9a2aa1b12d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 5 Mar 2023 16:20:26 +0000 Subject: [PATCH 26/97] chore(deps): Bump zustand from 4.3.3 to 4.3.5 (#14784) Bumps [zustand](https://github.com/pmndrs/zustand) from 4.3.3 to 4.3.5. - [Release notes](https://github.com/pmndrs/zustand/releases) - [Commits](https://github.com/pmndrs/zustand/compare/v4.3.3...v4.3.5) --- updated-dependencies: - dependency-name: zustand dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 172fbb64e51..4adc713c140 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "underscore": "1.13.6", "uuidjs": "4.2.13", "webrtc-adapter": "6.4.8", - "zustand": "4.3.3" + "zustand": "4.3.5" }, "devDependencies": { "@babel/core": "7.21.0", diff --git a/yarn.lock b/yarn.lock index 64ba35aac8f..499ac6ec3cf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -17290,7 +17290,7 @@ __metadata: webpack-hot-middleware: 2.25.3 webrtc-adapter: 6.4.8 workbox-webpack-plugin: 6.5.4 - zustand: 4.3.3 + zustand: 4.3.5 languageName: unknown linkType: soft @@ -17744,9 +17744,9 @@ __metadata: languageName: node linkType: hard -"zustand@npm:4.3.3": - version: 4.3.3 - resolution: "zustand@npm:4.3.3" +"zustand@npm:4.3.5": + version: 4.3.5 + resolution: "zustand@npm:4.3.5" dependencies: use-sync-external-store: 1.2.0 peerDependencies: @@ -17757,6 +17757,6 @@ __metadata: optional: true react: optional: true - checksum: fe0277ab0ce14849dea254cbdcfe83d4614364d38e616875f75ef2419f29085f5b03605efabeb33189a4557e647efaa294e0984c4f642e0566f445a7b207cdd6 + checksum: 166099ecadd870e5e0f51b5b443b71145149447b2bfe557d73254891dd0fe603d55c93e560649a7c31a30b4a180dd6d4f4d90463636fd54c3393ace3b68dbc67 languageName: node linkType: hard From af7dc5775c16b1f2172e1108aa11b728647fa36f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 5 Mar 2023 16:20:38 +0000 Subject: [PATCH 27/97] chore(deps): Bump react-router from 6.8.1 to 6.8.2 (#14781) Bumps [react-router](https://github.com/remix-run/react-router/tree/HEAD/packages/react-router) from 6.8.1 to 6.8.2. - [Release notes](https://github.com/remix-run/react-router/releases) - [Changelog](https://github.com/remix-run/react-router/blob/main/packages/react-router/CHANGELOG.md) - [Commits](https://github.com/remix-run/react-router/commits/react-router@6.8.2/packages/react-router) --- updated-dependencies: - dependency-name: react-router dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 20 +------------------- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/package.json b/package.json index 4adc713c140..e28ffa65638 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "react-dom": "18.2.0", "react-intl": "6.2.10", "react-redux": "8.0.5", - "react-router": "6.8.1", + "react-router": "6.8.2", "react-router-dom": "6.8.2", "react-transition-group": "4.4.5", "redux": "4.2.1", diff --git a/yarn.lock b/yarn.lock index 499ac6ec3cf..46831245aa5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3237,13 +3237,6 @@ __metadata: languageName: node linkType: hard -"@remix-run/router@npm:1.3.2": - version: 1.3.2 - resolution: "@remix-run/router@npm:1.3.2" - checksum: ee2108b87d4a1241cdea137dd7e1741ee679228bd33fd81e22a6bb2940f81186cefe9a85e26d60cc49bbcc1bdbc57d1954b7d4d62f8a51ef69feddfc899f55fa - languageName: node - linkType: hard - "@remix-run/router@npm:1.3.3": version: 1.3.3 resolution: "@remix-run/router@npm:1.3.3" @@ -14232,17 +14225,6 @@ __metadata: languageName: node linkType: hard -"react-router@npm:6.8.1": - version: 6.8.1 - resolution: "react-router@npm:6.8.1" - dependencies: - "@remix-run/router": 1.3.2 - peerDependencies: - react: ">=16.8" - checksum: 8e7cc7a516adeb6060911861af99d9b512893c15ec732cbf8574872919be4f3fe439ffa8c0876d1bcbced880d081bfeda3c01cb505b5a243565d10500ee0ac36 - languageName: node - linkType: hard - "react-router@npm:6.8.2": version: 6.8.2 resolution: "react-router@npm:6.8.2" @@ -17256,7 +17238,7 @@ __metadata: react-dom: 18.2.0 react-intl: 6.2.10 react-redux: 8.0.5 - react-router: 6.8.1 + react-router: 6.8.2 react-router-dom: 6.8.2 react-transition-group: 4.4.5 redux: 4.2.1 From efceb589a30729a666d48adb2bae725e74402ae5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 5 Mar 2023 16:21:36 +0000 Subject: [PATCH 28/97] chore(deps-dev): Bump @typescript-eslint/parser from 5.53.0 to 5.54.0 (#14783) Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) from 5.53.0 to 5.54.0. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v5.54.0/packages/parser) --- updated-dependencies: - dependency-name: "@typescript-eslint/parser" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 61 +++++++--------------------------------------------- 2 files changed, 9 insertions(+), 54 deletions(-) diff --git a/package.json b/package.json index e28ffa65638..0fbe15f2c60 100644 --- a/package.json +++ b/package.json @@ -92,7 +92,7 @@ "@types/underscore": "1.11.4", "@types/webpack-env": "1.18.0", "@typescript-eslint/eslint-plugin": "^5.54.0", - "@typescript-eslint/parser": "^5.53.0", + "@typescript-eslint/parser": "^5.54.0", "@wireapp/copy-config": "2.0.10", "@wireapp/eslint-config": "2.1.1", "@wireapp/prettier-config": "0.5.2", diff --git a/yarn.lock b/yarn.lock index 46831245aa5..f948c8f0f57 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4155,20 +4155,20 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/parser@npm:^5.53.0": - version: 5.53.0 - resolution: "@typescript-eslint/parser@npm:5.53.0" +"@typescript-eslint/parser@npm:^5.54.0": + version: 5.54.0 + resolution: "@typescript-eslint/parser@npm:5.54.0" dependencies: - "@typescript-eslint/scope-manager": 5.53.0 - "@typescript-eslint/types": 5.53.0 - "@typescript-eslint/typescript-estree": 5.53.0 + "@typescript-eslint/scope-manager": 5.54.0 + "@typescript-eslint/types": 5.54.0 + "@typescript-eslint/typescript-estree": 5.54.0 debug: ^4.3.4 peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 peerDependenciesMeta: typescript: optional: true - checksum: 979e5d63793a9e64998b1f956ba0f00f8a2674db3a664fafce7b2433323f5248bd776af8305e2419d73a9d94c55176fee099abc5c153b4cc52e5765c725c1edd + checksum: 368d6dd85be42c3f518f0ddeed23ecd1d3c9484a77ae291ee4e08e2703ed379bed613bde014cd8ab2a3e06e85dd8aef201112ae5e3d2a07deba29ae80bb1fe06 languageName: node linkType: hard @@ -4202,16 +4202,6 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/scope-manager@npm:5.53.0": - version: 5.53.0 - resolution: "@typescript-eslint/scope-manager@npm:5.53.0" - dependencies: - "@typescript-eslint/types": 5.53.0 - "@typescript-eslint/visitor-keys": 5.53.0 - checksum: 51f31dc01e95908611f402441f58404da80a338c0237b2b82f4a7b0b2e8868c4bfe8f7cf44b2567dd56533de609156a5d4ac54bb1f9f09c7014b99428aef2543 - languageName: node - linkType: hard - "@typescript-eslint/scope-manager@npm:5.54.0": version: 5.54.0 resolution: "@typescript-eslint/scope-manager@npm:5.54.0" @@ -4260,13 +4250,6 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/types@npm:5.53.0": - version: 5.53.0 - resolution: "@typescript-eslint/types@npm:5.53.0" - checksum: b0eaf23de4ab13697d4d2095838c959a3f410c30f0d19091e5ca08e62320c3cc3c72bcb631823fb6a4fbb31db0a059e386a0801244930d0a88a6a698e5f46548 - languageName: node - linkType: hard - "@typescript-eslint/types@npm:5.54.0": version: 5.54.0 resolution: "@typescript-eslint/types@npm:5.54.0" @@ -4328,24 +4311,6 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/typescript-estree@npm:5.53.0": - version: 5.53.0 - resolution: "@typescript-eslint/typescript-estree@npm:5.53.0" - dependencies: - "@typescript-eslint/types": 5.53.0 - "@typescript-eslint/visitor-keys": 5.53.0 - debug: ^4.3.4 - globby: ^11.1.0 - is-glob: ^4.0.3 - semver: ^7.3.7 - tsutils: ^3.21.0 - peerDependenciesMeta: - typescript: - optional: true - checksum: 6e119c8e4167c8495d728c5556a834545a9c064918dd5e7b79b0d836726f4f8e2a0297b0ac82bf2b71f1e5427552217d0b59d8fb1406fd79bd3bf91b75dca873 - languageName: node - linkType: hard - "@typescript-eslint/typescript-estree@npm:5.54.0": version: 5.54.0 resolution: "@typescript-eslint/typescript-estree@npm:5.54.0" @@ -4464,16 +4429,6 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/visitor-keys@npm:5.53.0": - version: 5.53.0 - resolution: "@typescript-eslint/visitor-keys@npm:5.53.0" - dependencies: - "@typescript-eslint/types": 5.53.0 - eslint-visitor-keys: ^3.3.0 - checksum: 090695883c15364c6f401e97f56b13db0f31c1114f3bd22562bd41734864d27f6a3c80de33957e9dedab2d5f94b0f4480ba3fde1d4574e74dca4593917b7b54a - languageName: node - linkType: hard - "@typescript-eslint/visitor-keys@npm:5.54.0": version: 5.54.0 resolution: "@typescript-eslint/visitor-keys@npm:5.54.0" @@ -17143,7 +17098,7 @@ __metadata: "@types/underscore": 1.11.4 "@types/webpack-env": 1.18.0 "@typescript-eslint/eslint-plugin": ^5.54.0 - "@typescript-eslint/parser": ^5.53.0 + "@typescript-eslint/parser": ^5.54.0 "@wireapp/avs": 9.0.23 "@wireapp/copy-config": 2.0.10 "@wireapp/core": 39.1.3 From 92571534b798f8b40822c76b088b4ed2a106aca9 Mon Sep 17 00:00:00 2001 From: Thomas Belin Date: Mon, 6 Mar 2023 16:57:43 +0300 Subject: [PATCH 29/97] fix: Do not mark api v3 as fully supported yet --- src/script/Config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/script/Config.ts b/src/script/Config.ts index 72f595c2d27..2b35878d241 100644 --- a/src/script/Config.ts +++ b/src/script/Config.ts @@ -118,7 +118,7 @@ export class Configuration { readonly ALLOWED_IMAGE_TYPES = ['image/bmp', 'image/gif', 'image/jpeg', 'image/jpg', 'image/png']; /** Which versions of the backend api do we support */ - readonly SUPPORTED_API_VERSIONS = [3, 2, 1]; + readonly SUPPORTED_API_VERSIONS = [2, 1]; } let instance: Configuration; From bb2a116b164aaa0dcfb77adc0bab25d5fb6d2f61 Mon Sep 17 00:00:00 2001 From: Thomas Belin Date: Mon, 6 Mar 2023 15:41:43 +0100 Subject: [PATCH 30/97] fix: Prepare for api v4 (#14786) --- package.json | 2 +- src/script/Config.ts | 2 +- yarn.lock | 20 ++++++++++---------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index 0fbe15f2c60..08d736d4104 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "@emotion/react": "11.10.6", "@types/eslint": "8.4.10", "@wireapp/avs": "9.0.23", - "@wireapp/core": "39.1.3", + "@wireapp/core": "39.1.4", "@wireapp/lru-cache": "3.8.1", "@wireapp/react-ui-kit": "9.3.9", "@wireapp/store-engine-dexie": "2.0.4", diff --git a/src/script/Config.ts b/src/script/Config.ts index 2b35878d241..72f595c2d27 100644 --- a/src/script/Config.ts +++ b/src/script/Config.ts @@ -118,7 +118,7 @@ export class Configuration { readonly ALLOWED_IMAGE_TYPES = ['image/bmp', 'image/gif', 'image/jpeg', 'image/jpg', 'image/png']; /** Which versions of the backend api do we support */ - readonly SUPPORTED_API_VERSIONS = [2, 1]; + readonly SUPPORTED_API_VERSIONS = [3, 2, 1]; } let instance: Configuration; diff --git a/yarn.lock b/yarn.lock index f948c8f0f57..d95a5cbc8e5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4623,9 +4623,9 @@ __metadata: languageName: node linkType: hard -"@wireapp/api-client@npm:^23.1.1": - version: 23.1.1 - resolution: "@wireapp/api-client@npm:23.1.1" +"@wireapp/api-client@npm:^23.1.2": + version: 23.1.2 + resolution: "@wireapp/api-client@npm:23.1.2" dependencies: "@wireapp/commons": ^5.0.4 "@wireapp/priority-queue": ^2.0.3 @@ -4638,7 +4638,7 @@ __metadata: spark-md5: 3.0.2 tough-cookie: 4.1.2 ws: 8.11.0 - checksum: 67730321863605a1bb6fea1cb6e986bc873604de04494f24438624ffd4323333382fd9a5aa9d997e5fca8c69cf4d6fba0ed48d1c2c052ccc92e41cba569e7c08 + checksum: d99ddff2b4771d0a4ff38592d03da7ca95f5755c754fb40b6c286d8883f4514e92ee94d432f0594a703c267ad77baa207779e520948b8a7663c3552062f3ca3a languageName: node linkType: hard @@ -4691,11 +4691,11 @@ __metadata: languageName: node linkType: hard -"@wireapp/core@npm:39.1.3": - version: 39.1.3 - resolution: "@wireapp/core@npm:39.1.3" +"@wireapp/core@npm:39.1.4": + version: 39.1.4 + resolution: "@wireapp/core@npm:39.1.4" dependencies: - "@wireapp/api-client": ^23.1.1 + "@wireapp/api-client": ^23.1.2 "@wireapp/commons": ^5.0.4 "@wireapp/core-crypto": 0.6.2 "@wireapp/cryptobox": 12.8.0 @@ -4711,7 +4711,7 @@ __metadata: logdown: 3.3.1 long: ^5.2.0 uuidjs: 4.2.13 - checksum: ccaa3c635f7324f9ffc70b435bdcd84a6168f6c16f2d7f2ed3d6f41af6224df5ae2641dd6096091b75da09b925d241b9c4b9f1f3e09489d3c618ee81847c8898 + checksum: 4ceb70937eebdd1d39bf4372bf928bbb7942318247627224c5d996951baf297c0f47616e155dfc7f506023e9a36aa6daba7dff0fbc9678c9fe0e6bd1ddbc63fc languageName: node linkType: hard @@ -17101,7 +17101,7 @@ __metadata: "@typescript-eslint/parser": ^5.54.0 "@wireapp/avs": 9.0.23 "@wireapp/copy-config": 2.0.10 - "@wireapp/core": 39.1.3 + "@wireapp/core": 39.1.4 "@wireapp/eslint-config": 2.1.1 "@wireapp/lru-cache": 3.8.1 "@wireapp/prettier-config": 0.5.2 From 02675392e48ccbad00bb2e4415b2b97d07596741 Mon Sep 17 00:00:00 2001 From: Thomas Belin Date: Tue, 7 Mar 2023 11:17:33 +0100 Subject: [PATCH 31/97] runfix: Use range for supported api version (#14789) --- package.json | 2 +- src/script/Config.ts | 4 ++-- src/script/auth/main.tsx | 3 ++- src/script/main/app.ts | 3 ++- yarn.lock | 20 ++++++++++---------- 5 files changed, 17 insertions(+), 15 deletions(-) diff --git a/package.json b/package.json index 08d736d4104..8b7ca79a1d8 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "@emotion/react": "11.10.6", "@types/eslint": "8.4.10", "@wireapp/avs": "9.0.23", - "@wireapp/core": "39.1.4", + "@wireapp/core": "39.1.5", "@wireapp/lru-cache": "3.8.1", "@wireapp/react-ui-kit": "9.3.9", "@wireapp/store-engine-dexie": "2.0.4", diff --git a/src/script/Config.ts b/src/script/Config.ts index 72f595c2d27..0bd9b55cc58 100644 --- a/src/script/Config.ts +++ b/src/script/Config.ts @@ -117,8 +117,8 @@ export class Configuration { /** Image MIME types */ readonly ALLOWED_IMAGE_TYPES = ['image/bmp', 'image/gif', 'image/jpeg', 'image/jpg', 'image/png']; - /** Which versions of the backend api do we support */ - readonly SUPPORTED_API_VERSIONS = [3, 2, 1]; + /** Which min and max version of the backend api do we support */ + readonly SUPPORTED_API_RANGE = [1, env.ENABLE_DEV_BACKEND_API ? Infinity : 3]; } let instance: Configuration; diff --git a/src/script/auth/main.tsx b/src/script/auth/main.tsx index 561cbfd2da9..ecbd2a1cf15 100644 --- a/src/script/auth/main.tsx +++ b/src/script/auth/main.tsx @@ -74,7 +74,8 @@ const render = (Component: FC): void => { async function runApp() { const config = Config.getConfig(); - await core.useAPIVersion(config.SUPPORTED_API_VERSIONS, config.ENABLE_DEV_BACKEND_API); + const [min, max] = config.SUPPORTED_API_RANGE; + await core.useAPIVersion(min, max, config.ENABLE_DEV_BACKEND_API); render(Root); if (module.hot) { module.hot.accept('./page/Root', () => { diff --git a/src/script/main/app.ts b/src/script/main/app.ts index 93937b4004a..7580b3e5104 100644 --- a/src/script/main/app.ts +++ b/src/script/main/app.ts @@ -333,7 +333,8 @@ export class App { */ async initApp(clientType: ClientType, onProgress: (progress: number, message?: string) => void) { // add body information - await this.core.useAPIVersion(this.config.SUPPORTED_API_VERSIONS, this.config.ENABLE_DEV_BACKEND_API); + const [apiVersionMin, apiVersionMax] = this.config.SUPPORTED_API_RANGE; + await this.core.useAPIVersion(apiVersionMin, apiVersionMax, this.config.ENABLE_DEV_BACKEND_API); const osCssClass = Runtime.isMacOS() ? 'os-mac' : 'os-pc'; const platformCssClass = Runtime.isDesktopApp() ? 'platform-electron' : 'platform-web'; document.body.classList.add(osCssClass, platformCssClass); diff --git a/yarn.lock b/yarn.lock index d95a5cbc8e5..ff1bee4e3f9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4623,9 +4623,9 @@ __metadata: languageName: node linkType: hard -"@wireapp/api-client@npm:^23.1.2": - version: 23.1.2 - resolution: "@wireapp/api-client@npm:23.1.2" +"@wireapp/api-client@npm:^23.1.3": + version: 23.1.3 + resolution: "@wireapp/api-client@npm:23.1.3" dependencies: "@wireapp/commons": ^5.0.4 "@wireapp/priority-queue": ^2.0.3 @@ -4638,7 +4638,7 @@ __metadata: spark-md5: 3.0.2 tough-cookie: 4.1.2 ws: 8.11.0 - checksum: d99ddff2b4771d0a4ff38592d03da7ca95f5755c754fb40b6c286d8883f4514e92ee94d432f0594a703c267ad77baa207779e520948b8a7663c3552062f3ca3a + checksum: 40acaffdddb20e81613cb70555f434855cb5a59936df1209e4c182453f4e59c80fb1b2b38400262e046a35b470e60d11aad332605820d236d060a4301b6b30a7 languageName: node linkType: hard @@ -4691,11 +4691,11 @@ __metadata: languageName: node linkType: hard -"@wireapp/core@npm:39.1.4": - version: 39.1.4 - resolution: "@wireapp/core@npm:39.1.4" +"@wireapp/core@npm:39.1.5": + version: 39.1.5 + resolution: "@wireapp/core@npm:39.1.5" dependencies: - "@wireapp/api-client": ^23.1.2 + "@wireapp/api-client": ^23.1.3 "@wireapp/commons": ^5.0.4 "@wireapp/core-crypto": 0.6.2 "@wireapp/cryptobox": 12.8.0 @@ -4711,7 +4711,7 @@ __metadata: logdown: 3.3.1 long: ^5.2.0 uuidjs: 4.2.13 - checksum: 4ceb70937eebdd1d39bf4372bf928bbb7942318247627224c5d996951baf297c0f47616e155dfc7f506023e9a36aa6daba7dff0fbc9678c9fe0e6bd1ddbc63fc + checksum: ad5271625e31e312b2c172e26bbe590c6cff223090267d8389fe4da018a820dcf8bb589cb0d9d956b79535d037ddc2f6c99456038cd71af70f9c7b45e2001a1a languageName: node linkType: hard @@ -17101,7 +17101,7 @@ __metadata: "@typescript-eslint/parser": ^5.54.0 "@wireapp/avs": 9.0.23 "@wireapp/copy-config": 2.0.10 - "@wireapp/core": 39.1.4 + "@wireapp/core": 39.1.5 "@wireapp/eslint-config": 2.1.1 "@wireapp/lru-cache": 3.8.1 "@wireapp/prettier-config": 0.5.2 From 0521b34b47667f7a660eb3e842a3c535d0da7444 Mon Sep 17 00:00:00 2001 From: Amir Ghezelbash Date: Tue, 7 Mar 2023 14:31:15 +0330 Subject: [PATCH 32/97] feat: Add avatar upload loading state (SQSERVICES-1936) (#14790) --- .../accountPreferences/AvatarInput.tsx | 42 ++++++++++++------- src/style/content/preferences/account.less | 4 ++ 2 files changed, 31 insertions(+), 15 deletions(-) diff --git a/src/script/page/MainContent/panels/preferences/accountPreferences/AvatarInput.tsx b/src/script/page/MainContent/panels/preferences/accountPreferences/AvatarInput.tsx index 8a1304175dd..79a3f2a2c9b 100644 --- a/src/script/page/MainContent/panels/preferences/accountPreferences/AvatarInput.tsx +++ b/src/script/page/MainContent/panels/preferences/accountPreferences/AvatarInput.tsx @@ -17,9 +17,10 @@ * */ -import React from 'react'; +import {useState, useRef, FC} from 'react'; import {TabIndex} from '@wireapp/react-ui-kit/lib/types/enums'; +import cx from 'classnames'; import {Avatar, AVATAR_SIZE} from 'Components/Avatar'; import {PrimaryModal} from 'Components/Modals/PrimaryModal'; @@ -44,8 +45,9 @@ interface AvatarInputProps { const FILE_TYPES = ['image/bmp', 'image/jpeg', 'image/jpg', 'image/png', '.jpg-large']; const logger = getLogger('AvatarInput'); -const AvatarInput: React.FC = ({selfUser, isActivatedAccount, userRepository}) => { - const inputRef = React.useRef(null); +const AvatarInput: FC = ({selfUser, isActivatedAccount, userRepository}) => { + const inputRef = useRef(null); + const [isUploading, setIsUploading] = useState(false); if (!isActivatedAccount) { return ; @@ -75,6 +77,8 @@ const AvatarInput: React.FC = ({selfUser, isActivatedAccount, return showUploadWarning(titleString, messageString); } + setIsUploading(true); + const minHeight = UserRepository.CONFIG.MINIMUM_PICTURE_SIZE.HEIGHT; const minWidth = UserRepository.CONFIG.MINIMUM_PICTURE_SIZE.WIDTH; @@ -90,6 +94,8 @@ const AvatarInput: React.FC = ({selfUser, isActivatedAccount, } catch (error) { logger.error('Failed to validate profile image', error); return false; + } finally { + setIsUploading(false); } }; @@ -97,6 +103,21 @@ const AvatarInput: React.FC = ({selfUser, isActivatedAccount, inputRef.current?.click(); }; + const onFileInputChange = (files: FileList) => { + if (isUploading) { + return; + } + const newUserPicture = files.item(0); + if (newUserPicture) { + setPicture(newUserPicture).catch(error => { + const isInvalidUpdate = error.type === UserError.TYPE.INVALID_UPDATE; + if (!isInvalidUpdate) { + throw error; + } + }); + } + }; + return (
= ({selfUser, isActivatedAccount, aria-label={`${t('tooltipPreferencesPicture')}`} > diff --git a/src/style/content/preferences/account.less b/src/style/content/preferences/account.less index 0d8de8519f7..cbd0cbef4f1 100644 --- a/src/style/content/preferences/account.less +++ b/src/style/content/preferences/account.less @@ -150,6 +150,10 @@ position: absolute; left: @offscreen-left; } + + &.loading { + cursor: progress; + } } .preferences-history-backup-import-field { From 1209baae89a98501575ec065e26e493e529978ba Mon Sep 17 00:00:00 2001 From: Amir Ghezelbash Date: Tue, 7 Mar 2023 18:00:50 +0300 Subject: [PATCH 33/97] feat: Adjust styles of VS-NfD banner (SQSERVICES-1733) (#14792) --- .../calling/FullscreenVideoCall.tsx | 7 +- src/script/components/input/ClassifiedBar.tsx | 27 +++---- src/style/common/accent-color.less | 1 + src/style/components/classified-bar.less | 71 +++++++++++++++++++ src/style/foundation/main.less | 1 + 5 files changed, 86 insertions(+), 21 deletions(-) create mode 100644 src/style/components/classified-bar.less diff --git a/src/script/components/calling/FullscreenVideoCall.tsx b/src/script/components/calling/FullscreenVideoCall.tsx index 7b6fd5732af..c96d1fb812b 100644 --- a/src/script/components/calling/FullscreenVideoCall.tsx +++ b/src/script/components/calling/FullscreenVideoCall.tsx @@ -213,13 +213,14 @@ const FullscreenVideoCall: React.FC = ({ users={conversationParticipants} classifiedDomains={classifiedDomains} style={{ - display: 'inline-block', - left: '12px', lineHeight: '1.5em', margin: '1em 0', padding: '0 1em', position: 'absolute', - width: 'auto', + display: 'flex', + right: 0, + left: 0, + bottom: 100, }} /> )} diff --git a/src/script/components/input/ClassifiedBar.tsx b/src/script/components/input/ClassifiedBar.tsx index d710dfd8095..081846e7926 100644 --- a/src/script/components/input/ClassifiedBar.tsx +++ b/src/script/components/input/ClassifiedBar.tsx @@ -20,7 +20,9 @@ import React from 'react'; import {CSSObject} from '@emotion/react'; +import cx from 'classnames'; +import {Icon} from 'Components/Icon'; import {User} from 'src/script/entity/User'; import {t} from 'Util/LocalizerUtil'; @@ -37,31 +39,20 @@ interface ClassifiedBarProps { users: User[]; } -const barStyle = (highContrast: boolean): CSSObject => ({ - alignItems: 'center', - backgroundColor: `var(--${highContrast ? 'background' : 'app-bg-secondary'})`, - borderColor: 'var(--foreground-fade-40)', - borderStyle: highContrast ? 'none' : 'solid', - borderWidth: '1px 0', - color: `var(--${highContrast ? 'app-bg' : 'background'})`, - display: 'flex', - fontSize: '0.6875rem', - fontWeight: 600, - height: '16px', - justifyContent: 'center', - textTransform: 'uppercase', - width: '100%', -}); - const ClassifiedBar: React.FC = ({users, classifiedDomains, style}) => { if (typeof classifiedDomains === 'undefined') { return null; } const classified = isClassified(users, classifiedDomains); const text = classified ? t('conversationClassified') : t('conversationNotClassified'); - const highContrast = !classified; + return ( -
+
+ {classified ? : } {text}
); diff --git a/src/style/common/accent-color.less b/src/style/common/accent-color.less index dd158231a5a..2433a789067 100644 --- a/src/style/common/accent-color.less +++ b/src/style/common/accent-color.less @@ -89,6 +89,7 @@ @green-dark-600: #26af49; @green-dark-700: #1d8337; @green-dark-800: #135824; +@green-dark-900: #0e421b; @turquoise-50: #e5f1f3; @turquoise-100: #cce2e7; diff --git a/src/style/components/classified-bar.less b/src/style/components/classified-bar.less new file mode 100644 index 00000000000..016bb3db151 --- /dev/null +++ b/src/style/components/classified-bar.less @@ -0,0 +1,71 @@ +/* + * Wire + * Copyright (C) 2023 Wire Swiss GmbH + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see http://www.gnu.org/licenses/. + * + */ + +.classified-bar { + display: flex; + width: 100%; + height: 16px; + align-items: center; + justify-content: center; + padding: 12px 0; + border-width: 1px 0; + font-size: 0.6875rem; + font-weight: 600; + text-transform: uppercase; + + & svg { + margin-right: 5px; + } + + &.green { + border-style: solid; + border-color: var(--green-500); + background-color: @green-50; + color: var(--green-500); + & svg { + width: 12px; + fill: var(--green-500); + } + } + + &.red { + border-style: none; + background-color: @red-600; + color: var(--white); + & svg { + width: 12px; + fill: var(--white); + } + } + + body.theme-dark & { + &.green { + border-style: none; + background-color: @green-dark-900; + } + + &.red { + background-color: @red-dark-500; + color: var(--black); + & svg { + fill: var(--black); + } + } + } +} diff --git a/src/style/foundation/main.less b/src/style/foundation/main.less index 326a492d587..fd0a0724f57 100644 --- a/src/style/foundation/main.less +++ b/src/style/foundation/main.less @@ -62,6 +62,7 @@ @import '../components/search-input'; @import '../components/availability-state'; @import '../components/image'; +@import '../components/classified-bar'; @import '../components/copy-to-clipboard'; @import '../components/device-card'; @import '../components/ephemeral-timer'; From 9814a3d1d79df831140b09fd07d6a422496772af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patryk=20G=C3=B3rka?= Date: Tue, 7 Mar 2023 18:09:03 +0300 Subject: [PATCH 34/97] feat: check if call epoch change event was fired by parent conversation (#14788) * feat: check if call epoch change event was fired by parent conversation * refactor: inject conversationState directly to mlsConference module method * chore: add comments --- src/script/calling/mlsConference.ts | 23 ++++++++++++++++++++--- src/script/view_model/CallingViewModel.ts | 4 ++-- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/src/script/calling/mlsConference.ts b/src/script/calling/mlsConference.ts index c124cbf4ff0..702b1c31805 100644 --- a/src/script/calling/mlsConference.ts +++ b/src/script/calling/mlsConference.ts @@ -24,6 +24,8 @@ import {constructFullyQualifiedClientId} from '@wireapp/core/lib/util/fullyQuali import {SubconversationEpochInfoMember} from './CallingRepository'; +import {ConversationState} from '../conversation/ConversationState'; + const KEY_LENGTH = 32; const generateSubconversationMembers = async ( @@ -89,7 +91,7 @@ export const getSubconversationEpochInfo = async ( }; export const subscribeToEpochUpdates = async ( - {mlsService}: {mlsService: MLSService}, + {mlsService, conversationState}: {mlsService: MLSService; conversationState: ConversationState}, conversationId: QualifiedId, onEpochUpdate: (info: { members: SubconversationEpochInfoMember[]; @@ -104,11 +106,26 @@ export const subscribeToEpochUpdates = async ( const forwardNewEpoch = async ({groupId, epoch}: {groupId: string; epoch: number}) => { if (groupId !== subconversationGroupId) { - return; + // if the epoch update did not happen in the subconversation directly, check if it happened in the parent conversation + const parentConversation = conversationState.findConversationByGroupId(groupId); + if (!parentConversation) { + return; + } + + const foundSubconversationGroupId = await mlsService.getGroupIdFromConversationId?.( + parentConversation.qualifiedId, + SUBCONVERSATION_ID.CONFERENCE, + ); + + // if the conference subconversation of parent conversation is not known, ignore the epoch update + if (foundSubconversationGroupId !== subconversationGroupId) { + return; + } } const {keyLength, secretKey, members} = await getSubconversationEpochInfo({mlsService}, conversationId); - onEpochUpdate({epoch: Number(epoch), keyLength, secretKey, members}); + + return onEpochUpdate({epoch: Number(epoch), keyLength, secretKey, members}); }; mlsService.on('newEpoch', forwardNewEpoch); diff --git a/src/script/view_model/CallingViewModel.ts b/src/script/view_model/CallingViewModel.ts index cfdfd8b86b7..6f83f5df8a1 100644 --- a/src/script/view_model/CallingViewModel.ts +++ b/src/script/view_model/CallingViewModel.ts @@ -162,7 +162,7 @@ export class CallingViewModel { if (conversation.isUsingMLSProtocol) { const unsubscribe = await subscribeToEpochUpdates( - {mlsService: this.mlsService}, + {mlsService: this.mlsService, conversationState: this.conversationState}, conversation.qualifiedId, ({epoch, keyLength, secretKey, members}) => { this.callingRepository.setEpochInfo(conversation.qualifiedId, {epoch, keyLength, secretKey}, members); @@ -176,7 +176,7 @@ export class CallingViewModel { const joinOngoingMlsConference = async (call: Call) => { const unsubscribe = await subscribeToEpochUpdates( - {mlsService: this.mlsService}, + {mlsService: this.mlsService, conversationState: this.conversationState}, call.conversationId, ({epoch, keyLength, secretKey, members}) => { this.callingRepository.setEpochInfo(call.conversationId, {epoch, keyLength, secretKey}, members); From 2ae0f846250c00ffd245910e999f338ae7653c0d Mon Sep 17 00:00:00 2001 From: Otto the Bot Date: Tue, 7 Mar 2023 16:14:44 +0100 Subject: [PATCH 35/97] chore: Update translations (#14785) --- src/i18n/de-DE.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/i18n/de-DE.json b/src/i18n/de-DE.json index bf3dc013ad0..d347f5254b6 100644 --- a/src/i18n/de-DE.json +++ b/src/i18n/de-DE.json @@ -670,9 +670,9 @@ "messageDetailsTitle": "Details", "messageDetailsTitleLikes": "Gefällt{{count}}", "messageDetailsTitleReceipts": "Gelesen{{count}}", - "messageFailedToSendHideDetails": "Hide details", + "messageFailedToSendHideDetails": "Details verbergen", "messageFailedToSendParticipants": "{{count}} Participants", - "messageFailedToSendShowDetails": "Show details", + "messageFailedToSendShowDetails": "Details anzeigen", "messageFailedToSendToOne": "will receive your message later.", "messageFailedToSendToSome": "had issues receiving this message.", "messageFailedToSendWillNotReceive": "will not receive the message.", @@ -1254,7 +1254,7 @@ "userListSelectedContacts": "Ausgewählt ({{selectedContacts}})", "userNotFoundMessage": "Entweder fehlt die Berechtigung für dieses Konto oder die Person nutzt {{brandName}} nicht.", "userNotFoundTitle": "{{brandName}} kann diese Person nicht finden.", - "userNotVerified": "Get certainty about {{user}}’s identity before connecting.", + "userNotVerified": "Verschaffen Sie sich Gewissheit über die Identität von {{user}}, bevor Sie den Kontakt hinzufügen.", "userProfileButtonConnect": "Kontakt hinzufügen", "userProfileButtonIgnore": "Ignorieren", "userProfileButtonUnblock": "Freigeben", From e35708b8a0769bea60d30dc96023a64d0b5af327 Mon Sep 17 00:00:00 2001 From: Thomas Belin Date: Tue, 7 Mar 2023 19:32:16 +0300 Subject: [PATCH 36/97] fix: Do not try to load deleted users on app load [FS-1607] (#14794) --- src/script/main/app.ts | 2 +- src/script/user/UserRepository.ts | 38 +++++++++++++++++++------------ src/script/user/UserService.ts | 16 +++++++++++-- 3 files changed, 39 insertions(+), 17 deletions(-) diff --git a/src/script/main/app.ts b/src/script/main/app.ts index 7580b3e5104..c1eeed579eb 100644 --- a/src/script/main/app.ts +++ b/src/script/main/app.ts @@ -409,7 +409,7 @@ export class App { await conversationRepository.conversationRoleRepository.loadTeamRoles(); - await userRepository.loadUsers(); + await userRepository.loadTeamUserAvailabilities(); await eventRepository.connectWebSocket(this.core, ({done, total}) => { const baseMessage = t('initDecryption'); diff --git a/src/script/user/UserRepository.ts b/src/script/user/UserRepository.ts index 796ca82dc0b..d20983f08a2 100644 --- a/src/script/user/UserRepository.ts +++ b/src/script/user/UserRepository.ts @@ -161,22 +161,32 @@ export class UserRepository { } }; - async loadUsers(): Promise { - if (this.userState.isTeam()) { - const users = await this.userService.loadUserFromDb(); - - if (users.length) { - this.logger.log(`Loaded state of '${users.length}' users from database`, users); + /** + * Will load the availability status to the team users and subscribe to changes. + */ + async loadTeamUserAvailabilities(): Promise { + const users = this.userState.users(); + if (this.userState.isTeam() && users.length) { + const availabilities = await this.userService.loadUserFromDb(); + + this.logger.log(`Loaded state of '${users.length}' users from database`, users); + /** availabilities we have in the DB that are not matching any loaded users */ + const orphanAvailabilities = availabilities.filter( + availability => !users.find(user => matchQualifiedIds(user.qualifiedId, availability)), + ); - await Promise.all( - users.map(async user => { - const userEntity = await this.getUserById({domain: user.domain, id: user.id}); - userEntity.availability(user.availability); - }), - ); - } + // Remove availabilities that are not linked to any loaded users + orphanAvailabilities.forEach(async availability => { + await this.userService.removeUserFromDb({id: availability.id, domain: availability.domain ?? ''}); + }); - this.userState.users().forEach(userEntity => userEntity.subscribeToChanges()); + users.forEach(user => { + const userAvailability = availabilities.find(availability => matchQualifiedIds(availability, user.qualifiedId)); + if (userAvailability) { + user.availability(userAvailability.availability); + } + user.subscribeToChanges(); + }); } } diff --git a/src/script/user/UserService.ts b/src/script/user/UserService.ts index db53bf4ef3b..747909ef311 100644 --- a/src/script/user/UserService.ts +++ b/src/script/user/UserService.ts @@ -28,6 +28,12 @@ import {StorageSchemata} from '../storage/StorageSchemata'; import {StorageService} from '../storage/StorageService'; import {constructUserPrimaryKey} from '../util/StorageUtil'; +type StoredUser = { + availability: number; + id: string; + domain?: string; +}; + export class UserService { private readonly logger: Logger; private readonly USER_STORE_NAME: string; @@ -49,8 +55,14 @@ export class UserService { * @todo There might be more keys which are returned by this function * @returns Resolves with all the stored user states */ - loadUserFromDb(): Promise<{availability: number; domain?: string; id: string}[]> { - return this.storageService.getAll(this.USER_STORE_NAME); + async loadUserFromDb(): Promise<{availability: number; domain: string; id: string}[]> { + const users = await this.storageService.getAll(this.USER_STORE_NAME); + return users.map(user => ({...user, domain: user.domain ?? ''})); + } + + async removeUserFromDb(user: {id: string; domain: string}): Promise { + const primaryKey = constructUserPrimaryKey(user); + await this.storageService.delete(this.USER_STORE_NAME, primaryKey); } /** From 0a0b3c3196a548355cbef3133f989fff74709219 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patryk=20G=C3=B3rka?= Date: Thu, 9 Mar 2023 11:52:10 +0300 Subject: [PATCH 37/97] fix: leave call on conversation delete [FS-1608] (#14795) * fix: leave call after conversation was deleted * chore: bump core version * test: align test to current implementetion --- package.json | 2 +- src/script/calling/CallingRepository.ts | 6 +++--- .../conversation/ConversationRepository.ts | 3 +++ .../view_model/CallingViewModel.mocks.ts | 18 +++++++++--------- src/script/view_model/CallingViewModel.ts | 9 ++++----- yarn.lock | 10 +++++----- 6 files changed, 25 insertions(+), 23 deletions(-) diff --git a/package.json b/package.json index 8b7ca79a1d8..bf0e4866dc9 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "@emotion/react": "11.10.6", "@types/eslint": "8.4.10", "@wireapp/avs": "9.0.23", - "@wireapp/core": "39.1.5", + "@wireapp/core": "39.1.6", "@wireapp/lru-cache": "3.8.1", "@wireapp/react-ui-kit": "9.3.9", "@wireapp/store-engine-dexie": "2.0.4", diff --git a/src/script/calling/CallingRepository.ts b/src/script/calling/CallingRepository.ts index faf2d1f86db..17a7c81d105 100644 --- a/src/script/calling/CallingRepository.ts +++ b/src/script/calling/CallingRepository.ts @@ -131,7 +131,7 @@ export class CallingRepository { private avsVersion: number = 0; private incomingCallCallback: (call: Call) => void; private requestNewEpochCallback: (conversationId: QualifiedId) => void; - private callClosedCallback: (conversationId: QualifiedId) => void; + private callClosedCallback: (conversationId: QualifiedId, conversationType: CONV_TYPE) => void; private callParticipantChangedCallback: (conversationId: QualifiedId, members: QualifiedWcallMember[]) => void; private isReady: boolean = false; /** will cache the query to media stream (in order to avoid asking the system for streams multiple times when we have multiple peers) */ @@ -415,7 +415,7 @@ export class CallingRepository { this.incomingCallCallback = callback; } - onCallClosed(callback: (conversationId: QualifiedId) => void): void { + onCallClosed(callback: (conversationId: QualifiedId, conversationType: CONV_TYPE) => void): void { this.callClosedCallback = callback; } @@ -1233,7 +1233,7 @@ export class CallingRepository { return; } - this.callClosedCallback(conversationId); + this.callClosedCallback(conversationId, call.conversationType); if (reason === REASON.NORMAL) { this.callState.selectableScreens([]); diff --git a/src/script/conversation/ConversationRepository.ts b/src/script/conversation/ConversationRepository.ts index 3719e2f3a01..22b2aa033f4 100644 --- a/src/script/conversation/ConversationRepository.ts +++ b/src/script/conversation/ConversationRepository.ts @@ -843,6 +843,9 @@ export class ConversationRepository { if (!conversationEntity) { return; } + + this.leaveCall(conversationEntity.qualifiedId, LEAVE_CALL_REASON.USER_MANUALY_LEFT_CONVERSATION); + if (this.conversationState.isActiveConversation(conversationEntity)) { const nextConversation = this.getNextConversation(conversationEntity); amplify.publish(WebAppEvents.CONVERSATION.SHOW, nextConversation, {}); diff --git a/src/script/view_model/CallingViewModel.mocks.ts b/src/script/view_model/CallingViewModel.mocks.ts index 24f4467cc51..58f393cad0f 100644 --- a/src/script/view_model/CallingViewModel.mocks.ts +++ b/src/script/view_model/CallingViewModel.mocks.ts @@ -28,11 +28,8 @@ import {CallingViewModel} from './CallingViewModel'; import {Call} from '../calling/Call'; import {CallingRepository} from '../calling/CallingRepository'; import {CallState} from '../calling/CallState'; -import {Conversation} from '../entity/Conversation'; import {Core} from '../service/CoreSingleton'; -let callClosedCallback: (conversationId: QualifiedId) => void = (conversationId: QualifiedId) => {}; - export const mockCallingRepository = { startCall: jest.fn(), answerCall: jest.fn(), @@ -40,8 +37,8 @@ export const mockCallingRepository = { onRequestClientsCallback: jest.fn(), onRequestNewEpochCallback: jest.fn(), onCallParticipantChangedCallback: jest.fn(), - onCallClosed: jest.fn().mockImplementation(callback => (callClosedCallback = callback)), - leaveCall: jest.fn().mockImplementation(conversationId => callClosedCallback(conversationId)), + onCallClosed: jest.fn(), + leaveCall: jest.fn(), setEpochInfo: jest.fn(), } as unknown as CallingRepository; @@ -73,10 +70,6 @@ export function buildCallingViewModel() { mockCore, ); - jest - .spyOn(callingViewModel, 'getConversationById') - .mockImplementation(() => ({isUsingMLSProtocol: true} as Conversation)); - return callingViewModel; } @@ -148,5 +141,12 @@ export const prepareMLSConferenceMocks = (parentGroupId: string, subGroupId: str jest.spyOn(mockCore.service!.mls!, 'exportSecretKey').mockResolvedValue(mockSecretKey); + let callClosedCallback: (conversationId: QualifiedId, callType: CONV_TYPE) => void; + + jest.spyOn(mockCallingRepository, 'onCallClosed').mockImplementation(callback => (callClosedCallback = callback)); + jest + .spyOn(mockCallingRepository, 'leaveCall') + .mockImplementation(conversationId => callClosedCallback(conversationId, CONV_TYPE.CONFERENCE_MLS)); + return {expectedMemberListResult, mockSecretKey, mockEpochNumber, mockKeyLength}; }; diff --git a/src/script/view_model/CallingViewModel.ts b/src/script/view_model/CallingViewModel.ts index 6f83f5df8a1..8f6185f147c 100644 --- a/src/script/view_model/CallingViewModel.ts +++ b/src/script/view_model/CallingViewModel.ts @@ -240,10 +240,9 @@ export class CallingViewModel { this.callingRepository.setEpochInfo(conversationId, {epoch, keyLength, secretKey}, members); }; - const leaveCall = async (conversationId: QualifiedId) => { - const conversation = this.getConversationById(conversationId); - - if (!conversation?.isUsingMLSProtocol) { + const closeCall = async (conversationId: QualifiedId, conversationType: CONV_TYPE) => { + // There's nothing we need to do for non-mls calls + if (conversationType !== CONV_TYPE.CONFERENCE_MLS) { return; } @@ -336,7 +335,7 @@ export class CallingViewModel { this.callingRepository.onRequestNewEpochCallback(conversationId => updateEpochInfo(conversationId, true)); //once the call gets closed (eg. we leave a call or get dropped), we remove ourselfes from subconversation and unsubscribe from all the call events - this.callingRepository.onCallClosed(leaveCall); + this.callingRepository.onCallClosed(closeCall); //handle participant change avs callback to detect stale clients in subconversations this.callingRepository.onCallParticipantChangedCallback(handleCallParticipantChange); diff --git a/yarn.lock b/yarn.lock index ff1bee4e3f9..fc080a0a56c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4691,9 +4691,9 @@ __metadata: languageName: node linkType: hard -"@wireapp/core@npm:39.1.5": - version: 39.1.5 - resolution: "@wireapp/core@npm:39.1.5" +"@wireapp/core@npm:39.1.6": + version: 39.1.6 + resolution: "@wireapp/core@npm:39.1.6" dependencies: "@wireapp/api-client": ^23.1.3 "@wireapp/commons": ^5.0.4 @@ -4711,7 +4711,7 @@ __metadata: logdown: 3.3.1 long: ^5.2.0 uuidjs: 4.2.13 - checksum: ad5271625e31e312b2c172e26bbe590c6cff223090267d8389fe4da018a820dcf8bb589cb0d9d956b79535d037ddc2f6c99456038cd71af70f9c7b45e2001a1a + checksum: 7de3e325da60e49fd204986aedc7731b763f998de30a6c9ceef0e03b57a74d6b988b32e2977b8d9e0e56c6102bf2931f07a48913e4123021ea21504b314b43de languageName: node linkType: hard @@ -17101,7 +17101,7 @@ __metadata: "@typescript-eslint/parser": ^5.54.0 "@wireapp/avs": 9.0.23 "@wireapp/copy-config": 2.0.10 - "@wireapp/core": 39.1.5 + "@wireapp/core": 39.1.6 "@wireapp/eslint-config": 2.1.1 "@wireapp/lru-cache": 3.8.1 "@wireapp/prettier-config": 0.5.2 From 2b0bef93939c02c8b17f4ca54360efff4ce89779 Mon Sep 17 00:00:00 2001 From: Thomas Belin Date: Fri, 10 Mar 2023 15:14:30 +0300 Subject: [PATCH 38/97] fix: Improve message sending performances (#14800) --- src/script/event/EventService.ts | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/script/event/EventService.ts b/src/script/event/EventService.ts index 5894aeb4db6..c965ad6b083 100644 --- a/src/script/event/EventService.ts +++ b/src/script/event/EventService.ts @@ -127,12 +127,18 @@ export class EventService { try { if (this.storageService.db) { - return await this.storageService.db - .table(StorageSchemata.OBJECT_STORE.EVENTS) - .where('conversation') - .equals(conversationId) - .filter(item => item.data?.replacing_message_id === eventId || item.id === eventId) - .first(); + const eventStore = this.storageService.db.table(StorageSchemata.OBJECT_STORE.EVENTS); + // First lookup the event by its direct id (using the index) + const event = eventStore.where('id').equals(eventId).first(); + return ( + event || + // If the event was not found, fallback to filtering all the events and check if a `replacing` message is found + eventStore + .where('conversation') + .equals(conversationId) + .filter(item => item.data?.replacing_message_id === eventId || item.id === eventId) + .first() + ); } const records = await this.storageService.getAll(StorageSchemata.OBJECT_STORE.EVENTS); From c40c0f764515c5470d7279c2719654e526e9754d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patryk=20G=C3=B3rka?= Date: Fri, 10 Mar 2023 21:19:49 +0300 Subject: [PATCH 39/97] chore: bump avs package version (#14802) --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index bf0e4866dc9..7f1d5d23290 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "dependencies": { "@emotion/react": "11.10.6", "@types/eslint": "8.4.10", - "@wireapp/avs": "9.0.23", + "@wireapp/avs": "9.1.11", "@wireapp/core": "39.1.6", "@wireapp/lru-cache": "3.8.1", "@wireapp/react-ui-kit": "9.3.9", diff --git a/yarn.lock b/yarn.lock index fc080a0a56c..b0aac44d837 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4642,10 +4642,10 @@ __metadata: languageName: node linkType: hard -"@wireapp/avs@npm:9.0.23": - version: 9.0.23 - resolution: "@wireapp/avs@npm:9.0.23" - checksum: a36cc6c63ce43e2b82a851220b22baa0443c805d8df2db80dff8f774953fdf74a72e3a3238d6a5a8ca6053c1feb6e9ad2a38b2eae41b02c71be7a414d97eb0bb +"@wireapp/avs@npm:9.1.11": + version: 9.1.11 + resolution: "@wireapp/avs@npm:9.1.11" + checksum: 9fe240ef1c051e85a1365a0cdf748740f376fe14bcb959e643db155a404cf0c73de17635bb1559d717fd6aabf160d665b58bd3a981ee55f4aaef97f9f8d634af languageName: node linkType: hard @@ -17099,7 +17099,7 @@ __metadata: "@types/webpack-env": 1.18.0 "@typescript-eslint/eslint-plugin": ^5.54.0 "@typescript-eslint/parser": ^5.54.0 - "@wireapp/avs": 9.0.23 + "@wireapp/avs": 9.1.11 "@wireapp/copy-config": 2.0.10 "@wireapp/core": 39.1.6 "@wireapp/eslint-config": 2.1.1 From b22c25af424a0e8133aa11bcf8582219064b69ae Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 12 Mar 2023 16:01:03 +0000 Subject: [PATCH 40/97] chore(deps-dev): Bump rimraf from 4.3.0 to 4.4.0 in /server (#14803) Bumps [rimraf](https://github.com/isaacs/rimraf) from 4.3.0 to 4.4.0. - [Release notes](https://github.com/isaacs/rimraf/releases) - [Changelog](https://github.com/isaacs/rimraf/blob/main/CHANGELOG.md) - [Commits](https://github.com/isaacs/rimraf/compare/v4.3.0...v4.4.0) --- updated-dependencies: - dependency-name: rimraf dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- server/package.json | 2 +- server/yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/server/package.json b/server/package.json index de57621319d..cc11a97cd85 100644 --- a/server/package.json +++ b/server/package.json @@ -31,7 +31,7 @@ "@types/jest": "^29.4.0", "@types/node": "18.11.18", "jest": "29.4.3", - "rimraf": "4.3.0", + "rimraf": "4.4.0", "typescript": "4.9.5" }, "scripts": { diff --git a/server/yarn.lock b/server/yarn.lock index 27bc240c8be..b1f0c6cdffb 100644 --- a/server/yarn.lock +++ b/server/yarn.lock @@ -4908,14 +4908,14 @@ __metadata: languageName: node linkType: hard -"rimraf@npm:4.3.0": - version: 4.3.0 - resolution: "rimraf@npm:4.3.0" +"rimraf@npm:4.4.0": + version: 4.4.0 + resolution: "rimraf@npm:4.4.0" dependencies: glob: ^9.2.0 bin: rimraf: dist/cjs/src/bin.js - checksum: 48498f1eeb9b6b848605d93fa79e7bf3c57bb47807500ee636848dc0fd3b69b6b532f1ce9d4e46c4feeb4c3ff0e8ab85cd177cbbbd65f635f8bc8cb88aee151c + checksum: 0cedaf9d138589d1bb0ab851f05804c6d30827aa66563472b04ab76245f83537e23e7b94f1f79ea6c368c0d84a18fcde6a756fca3a44c967e08792671b3a0a6e languageName: node linkType: hard @@ -5661,7 +5661,7 @@ __metadata: nocache: 3.0.4 opn: 6.0.0 pm2: 5.2.2 - rimraf: 4.3.0 + rimraf: 4.4.0 typescript: 4.9.5 languageName: unknown linkType: soft From f747a5fe87f043cb0736b50e46a250f2671cded4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 12 Mar 2023 16:02:13 +0000 Subject: [PATCH 41/97] chore(deps-dev): Bump eslint-config-prettier from 8.6.0 to 8.7.0 (#14804) Bumps [eslint-config-prettier](https://github.com/prettier/eslint-config-prettier) from 8.6.0 to 8.7.0. - [Release notes](https://github.com/prettier/eslint-config-prettier/releases) - [Changelog](https://github.com/prettier/eslint-config-prettier/blob/main/CHANGELOG.md) - [Commits](https://github.com/prettier/eslint-config-prettier/compare/v8.6.0...v8.7.0) --- updated-dependencies: - dependency-name: eslint-config-prettier dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 7f1d5d23290..d7bb30f95bb 100644 --- a/package.json +++ b/package.json @@ -110,7 +110,7 @@ "dotenv": "16.0.3", "dpdm": "3.12.0", "eslint": "^8.34.0", - "eslint-config-prettier": "^8.6.0", + "eslint-config-prettier": "^8.7.0", "eslint-import-resolver-alias": "^1.1.2", "eslint-import-resolver-typescript": "^3.5.3", "eslint-plugin-babel": "5.3.1", diff --git a/yarn.lock b/yarn.lock index b0aac44d837..a37de744735 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7691,14 +7691,14 @@ __metadata: languageName: node linkType: hard -"eslint-config-prettier@npm:^8.6.0": - version: 8.6.0 - resolution: "eslint-config-prettier@npm:8.6.0" +"eslint-config-prettier@npm:^8.7.0": + version: 8.7.0 + resolution: "eslint-config-prettier@npm:8.7.0" peerDependencies: eslint: ">=7.0.0" bin: eslint-config-prettier: bin/cli.js - checksum: ff0d0dfc839a556355422293428637e8d35693de58dabf8638bf0b6529131a109d0b2ade77521aa6e54573bb842d7d9d322e465dd73dd61c7590fa3834c3fa81 + checksum: b05bc7f2296ce3e0925c14147849706544870e0382d38af2352d709a6cf8521bdaff2bd8e5021f1780e570775a8ffa1d2bac28b8065d90d43a3f1f98fd26ce52 languageName: node linkType: hard @@ -17131,7 +17131,7 @@ __metadata: dotenv: 16.0.3 dpdm: 3.12.0 eslint: ^8.34.0 - eslint-config-prettier: ^8.6.0 + eslint-config-prettier: ^8.7.0 eslint-import-resolver-alias: ^1.1.2 eslint-import-resolver-typescript: ^3.5.3 eslint-plugin-babel: 5.3.1 From b6ab4eedf94d7523a6e5f82a71102851923039c8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 12 Mar 2023 16:03:13 +0000 Subject: [PATCH 42/97] chore(deps-dev): Bump lint-staged from 13.1.2 to 13.2.0 (#14805) Bumps [lint-staged](https://github.com/okonet/lint-staged) from 13.1.2 to 13.2.0. - [Release notes](https://github.com/okonet/lint-staged/releases) - [Commits](https://github.com/okonet/lint-staged/compare/v13.1.2...v13.2.0) --- updated-dependencies: - dependency-name: lint-staged dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 91 ++++++++++++++++++++++++++++++++-------------------- 2 files changed, 57 insertions(+), 36 deletions(-) diff --git a/package.json b/package.json index d7bb30f95bb..e5e4028a1f7 100644 --- a/package.json +++ b/package.json @@ -143,7 +143,7 @@ "jsdom-worker": "0.3.0", "less": "3.13.1", "less-loader": "^11.1.0", - "lint-staged": "13.1.2", + "lint-staged": "13.2.0", "node-fetch": "2.6.9", "os-browserify": "0.3.0", "path-browserify": "1.0.1", diff --git a/yarn.lock b/yarn.lock index a37de744735..fdff67eb3f1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6016,6 +6016,13 @@ __metadata: languageName: node linkType: hard +"chalk@npm:5.2.0": + version: 5.2.0 + resolution: "chalk@npm:5.2.0" + checksum: 03d8060277de6cf2fd567dc25fcf770593eb5bb85f460ce443e49255a30ff1242edd0c90a06a03803b0466ff0687a939b41db1757bec987113e83de89a003caa + languageName: node + linkType: hard + "chalk@npm:^2.0.0, chalk@npm:^2.3.0": version: 2.4.2 resolution: "chalk@npm:2.4.2" @@ -8246,20 +8253,20 @@ __metadata: languageName: node linkType: hard -"execa@npm:^6.1.0": - version: 6.1.0 - resolution: "execa@npm:6.1.0" +"execa@npm:^7.0.0": + version: 7.1.0 + resolution: "execa@npm:7.1.0" dependencies: cross-spawn: ^7.0.3 get-stream: ^6.0.1 - human-signals: ^3.0.1 + human-signals: ^4.3.0 is-stream: ^3.0.0 merge-stream: ^2.0.0 npm-run-path: ^5.1.0 onetime: ^6.0.0 signal-exit: ^3.0.7 strip-final-newline: ^3.0.0 - checksum: 1a4af799839134f5c72eb63d525b87304c1114a63aa71676c91d57ccef2e26f2f53e14c11384ab11c4ec479be1efa83d11c8190e00040355c2c5c3364327fa8e + checksum: feb446802885a0bace8400efdd7320f811203a53af29e8a65a6ff18e58582909eefeec31e163fbee9debcfeb7d464be2887beeb85c817ca873ac720064404247 languageName: node linkType: hard @@ -9357,10 +9364,10 @@ __metadata: languageName: node linkType: hard -"human-signals@npm:^3.0.1": - version: 3.0.1 - resolution: "human-signals@npm:3.0.1" - checksum: f252a7769c8094a5c9dc6772816bdb417b188820b04c8b42d0fc468e03a0ba905b1dd07afabe9385cc83504af1ccc2b985cd1e4aeeeb8e0029896c5af2e6f354 +"human-signals@npm:^4.3.0": + version: 4.3.0 + resolution: "human-signals@npm:4.3.0" + checksum: 662b976b1063a8afb8fd7fa50bde6975997e17ea6ceba2aad54aacf1dc239a2cd7d14d27b3ceca0c6288627f4b45c56c2c89618455ff52cd9377c02d6328cd7c languageName: node linkType: hard @@ -11344,7 +11351,14 @@ __metadata: languageName: node linkType: hard -"lilconfig@npm:2.0.6, lilconfig@npm:^2.0.3": +"lilconfig@npm:2.1.0": + version: 2.1.0 + resolution: "lilconfig@npm:2.1.0" + checksum: 8549bb352b8192375fed4a74694cd61ad293904eee33f9d4866c2192865c44c4eb35d10782966242634e0cbc1e91fe62b1247f148dc5514918e3a966da7ea117 + languageName: node + linkType: hard + +"lilconfig@npm:^2.0.3": version: 2.0.6 resolution: "lilconfig@npm:2.0.6" checksum: 40a3cd72f103b1be5975f2ac1850810b61d4053e20ab09be8d3aeddfe042187e1ba70b4651a7e70f95efa1642e7dc8b2ae395b317b7d7753b241b43cef7c0f7d @@ -11376,39 +11390,39 @@ __metadata: languageName: node linkType: hard -"lint-staged@npm:13.1.2": - version: 13.1.2 - resolution: "lint-staged@npm:13.1.2" +"lint-staged@npm:13.2.0": + version: 13.2.0 + resolution: "lint-staged@npm:13.2.0" dependencies: + chalk: 5.2.0 cli-truncate: ^3.1.0 - colorette: ^2.0.19 - commander: ^9.4.1 + commander: ^10.0.0 debug: ^4.3.4 - execa: ^6.1.0 - lilconfig: 2.0.6 - listr2: ^5.0.5 + execa: ^7.0.0 + lilconfig: 2.1.0 + listr2: ^5.0.7 micromatch: ^4.0.5 normalize-path: ^3.0.0 - object-inspect: ^1.12.2 + object-inspect: ^1.12.3 pidtree: ^0.6.0 string-argv: ^0.3.1 - yaml: ^2.1.3 + yaml: ^2.2.1 bin: lint-staged: bin/lint-staged.js - checksum: f854ad5c88542b8f06e27f3b4046927a4f3d4a451a04e079526559d819a325762268f65bd2df7156bcc0cb5f531f621c42cdb824b403f537c78305adc9e56a54 + checksum: dcaa8fbbde567eb8ac27230a18b3a22f30c278c524c0e27cf7d4110d662d5d33ed68a585a2e1b05075ef1c262e853f557a5ae046188b723603246d63e6b9f07b languageName: node linkType: hard -"listr2@npm:^5.0.5": - version: 5.0.6 - resolution: "listr2@npm:5.0.6" +"listr2@npm:^5.0.7": + version: 5.0.8 + resolution: "listr2@npm:5.0.8" dependencies: cli-truncate: ^2.1.0 colorette: ^2.0.19 log-update: ^4.0.0 p-map: ^4.0.0 rfdc: ^1.3.0 - rxjs: ^7.5.7 + rxjs: ^7.8.0 through: ^2.3.8 wrap-ansi: ^7.0.0 peerDependencies: @@ -11416,7 +11430,7 @@ __metadata: peerDependenciesMeta: enquirer: optional: true - checksum: 18975d690988aa2cce18fea9bacfc12c2607948ff9f7b7fd5b3e2b64d059b6e1961f8d06b4e1400d4c6bc18af84c7c145c2d22a1d392464fdb197c53b062e3d5 + checksum: 8be9f5632627c4df0dc33f452c98d415a49e5f1614650d3cab1b103c33e95f2a7a0e9f3e1e5de00d51bf0b4179acd8ff11b25be77dbe097cf3773c05e728d46c languageName: node linkType: hard @@ -12468,6 +12482,13 @@ __metadata: languageName: node linkType: hard +"object-inspect@npm:^1.12.3": + version: 1.12.3 + resolution: "object-inspect@npm:1.12.3" + checksum: dabfd824d97a5f407e6d5d24810d888859f6be394d8b733a77442b277e0808860555176719c5905e765e3743a7cada6b8b0a3b85e5331c530fd418cc8ae991db + languageName: node + linkType: hard + "object-is@npm:^1.1.5": version: 1.1.5 resolution: "object-is@npm:1.1.5" @@ -14814,12 +14835,12 @@ __metadata: languageName: node linkType: hard -"rxjs@npm:^7.5.7": - version: 7.5.7 - resolution: "rxjs@npm:7.5.7" +"rxjs@npm:^7.8.0": + version: 7.8.0 + resolution: "rxjs@npm:7.8.0" dependencies: tslib: ^2.1.0 - checksum: edabcdb73b0f7e0f5f6e05c2077aff8c52222ac939069729704357d6406438acca831c24210db320aba269e86dbe1a400f3769c89101791885121a342fb15d9c + checksum: 61b4d4fd323c1043d8d6ceb91f24183b28bcf5def4f01ca111511d5c6b66755bc5578587fe714ef5d67cf4c9f2e26f4490d4e1d8cabf9bd5967687835e9866a2 languageName: node linkType: hard @@ -17173,7 +17194,7 @@ __metadata: less-loader: ^11.1.0 libsodium-wrappers: 0.7.10 linkify-it: 4.0.1 - lint-staged: 13.1.2 + lint-staged: 13.2.0 long: 5.2.1 markdown-it: 13.0.1 murmurhash: 2.0.1 @@ -17589,10 +17610,10 @@ __metadata: languageName: node linkType: hard -"yaml@npm:^2.1.3": - version: 2.1.3 - resolution: "yaml@npm:2.1.3" - checksum: 91316062324a93f9cb547469092392e7d004ff8f70c40fecb420f042a4870b2181557350da56c92f07bd44b8f7a252b0be26e6ade1f548e1f4351bdd01c9d3c7 +"yaml@npm:^2.2.1": + version: 2.2.1 + resolution: "yaml@npm:2.2.1" + checksum: 84f68cbe462d5da4e7ded4a8bded949ffa912bc264472e5a684c3d45b22d8f73a3019963a32164023bdf3d83cfb6f5b58ff7b2b10ef5b717c630f40bd6369a23 languageName: node linkType: hard From 937d016ae00f6a30aa5a9f37812733617b901bf5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 12 Mar 2023 16:05:57 +0000 Subject: [PATCH 43/97] chore(deps-dev): Bump @typescript-eslint/eslint-plugin (#14807) Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 5.54.0 to 5.54.1. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v5.54.1/packages/eslint-plugin) --- updated-dependencies: - dependency-name: "@typescript-eslint/eslint-plugin" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 87 +++++++++++++++++++++++++++++++++++++++------------- 2 files changed, 67 insertions(+), 22 deletions(-) diff --git a/package.json b/package.json index e5e4028a1f7..14740a4cae7 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "@types/uint32": "0.2.0", "@types/underscore": "1.11.4", "@types/webpack-env": "1.18.0", - "@typescript-eslint/eslint-plugin": "^5.54.0", + "@typescript-eslint/eslint-plugin": "^5.54.1", "@typescript-eslint/parser": "^5.54.0", "@wireapp/copy-config": "2.0.10", "@wireapp/eslint-config": "2.1.1", diff --git a/yarn.lock b/yarn.lock index fdff67eb3f1..132c23390a7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4120,13 +4120,13 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/eslint-plugin@npm:^5.54.0": - version: 5.54.0 - resolution: "@typescript-eslint/eslint-plugin@npm:5.54.0" +"@typescript-eslint/eslint-plugin@npm:^5.54.1": + version: 5.54.1 + resolution: "@typescript-eslint/eslint-plugin@npm:5.54.1" dependencies: - "@typescript-eslint/scope-manager": 5.54.0 - "@typescript-eslint/type-utils": 5.54.0 - "@typescript-eslint/utils": 5.54.0 + "@typescript-eslint/scope-manager": 5.54.1 + "@typescript-eslint/type-utils": 5.54.1 + "@typescript-eslint/utils": 5.54.1 debug: ^4.3.4 grapheme-splitter: ^1.0.4 ignore: ^5.2.0 @@ -4140,7 +4140,7 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 4fdb520b8e0f6b9eb878206ddfa4212522f170d1507d7aba8a975159a198efa37af6d2d17982dd560317452d0748f2e2da5dd7347b172bc4446d1c5562ce2e94 + checksum: 76476c08ca0142a9bf6e2381f5cd1c037d86fbafa9c0dded4a97bd3b23b5962dd2c3943bade11b21d674195674f0e36dbf80faa15a1906f5a2ca1f699baf1dd5 languageName: node linkType: hard @@ -4212,12 +4212,22 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/type-utils@npm:5.54.0": - version: 5.54.0 - resolution: "@typescript-eslint/type-utils@npm:5.54.0" +"@typescript-eslint/scope-manager@npm:5.54.1": + version: 5.54.1 + resolution: "@typescript-eslint/scope-manager@npm:5.54.1" dependencies: - "@typescript-eslint/typescript-estree": 5.54.0 - "@typescript-eslint/utils": 5.54.0 + "@typescript-eslint/types": 5.54.1 + "@typescript-eslint/visitor-keys": 5.54.1 + checksum: 9add24cf3a7852634ad0680a827646860ac4698a6ac8aae31e8b781e29f59e84b51f0cdaacffd0747811012647f01b51969d988da9b302ead374ceebffbe204b + languageName: node + linkType: hard + +"@typescript-eslint/type-utils@npm:5.54.1": + version: 5.54.1 + resolution: "@typescript-eslint/type-utils@npm:5.54.1" + dependencies: + "@typescript-eslint/typescript-estree": 5.54.1 + "@typescript-eslint/utils": 5.54.1 debug: ^4.3.4 tsutils: ^3.21.0 peerDependencies: @@ -4225,7 +4235,7 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 9cb5b52c7277bdf74b9ea3282fc40f41fda90ea4b1d33039044476e43cf05a766b1294e7d45f429594f2776828f7d17729cfa4ea027315f3df883e748ba57514 + checksum: 0073838b782b7f4619775be124ca6643fec43a2d56043eaf3ceb100960a5193f14ac747b28ce17a5c9ac643fdee8abda82a7d905c81521358de7b27a2dcbc9af languageName: node linkType: hard @@ -4257,6 +4267,13 @@ __metadata: languageName: node linkType: hard +"@typescript-eslint/types@npm:5.54.1": + version: 5.54.1 + resolution: "@typescript-eslint/types@npm:5.54.1" + checksum: 84a8f725cfa10646af389659e09c510c38d82c65960c7b613f844a264acc0e197471cba03f3e8f4b6411bc35dca28922c8352a7bd44621411c73fd6dd4096da2 + languageName: node + linkType: hard + "@typescript-eslint/typescript-estree@npm:5.10.1": version: 5.10.1 resolution: "@typescript-eslint/typescript-estree@npm:5.10.1" @@ -4329,6 +4346,24 @@ __metadata: languageName: node linkType: hard +"@typescript-eslint/typescript-estree@npm:5.54.1": + version: 5.54.1 + resolution: "@typescript-eslint/typescript-estree@npm:5.54.1" + dependencies: + "@typescript-eslint/types": 5.54.1 + "@typescript-eslint/visitor-keys": 5.54.1 + debug: ^4.3.4 + globby: ^11.1.0 + is-glob: ^4.0.3 + semver: ^7.3.7 + tsutils: ^3.21.0 + peerDependenciesMeta: + typescript: + optional: true + checksum: ea42bdb4832fa96fa1121237c9b664ac4506e2836646651e08a8542c8601d78af6c288779707f893ca4c884221829bb7d7b4b43c4a9c3ed959519266d03a139b + languageName: node + linkType: hard + "@typescript-eslint/utils@npm:5.10.1": version: 5.10.1 resolution: "@typescript-eslint/utils@npm:5.10.1" @@ -4345,21 +4380,21 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/utils@npm:5.54.0": - version: 5.54.0 - resolution: "@typescript-eslint/utils@npm:5.54.0" +"@typescript-eslint/utils@npm:5.54.1": + version: 5.54.1 + resolution: "@typescript-eslint/utils@npm:5.54.1" dependencies: "@types/json-schema": ^7.0.9 "@types/semver": ^7.3.12 - "@typescript-eslint/scope-manager": 5.54.0 - "@typescript-eslint/types": 5.54.0 - "@typescript-eslint/typescript-estree": 5.54.0 + "@typescript-eslint/scope-manager": 5.54.1 + "@typescript-eslint/types": 5.54.1 + "@typescript-eslint/typescript-estree": 5.54.1 eslint-scope: ^5.1.1 eslint-utils: ^3.0.0 semver: ^7.3.7 peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 - checksum: b8f344fc2961c7af530b93e53d5a17b5084cdf550b381082e3fb7f349ef16e718d9eebde1b9fc2d8fc4ecf8d60d334b004359977247554265c1afc87323bed37 + checksum: 8f428ea4d338ce85d55fd0c9ae2b217b323f29f51b7c9f8077fef7001ca21d28b032c5e5165b67ae6057aef69edb0e7a164c3c483703be6f3e4e574248bbc399 languageName: node linkType: hard @@ -4439,6 +4474,16 @@ __metadata: languageName: node linkType: hard +"@typescript-eslint/visitor-keys@npm:5.54.1": + version: 5.54.1 + resolution: "@typescript-eslint/visitor-keys@npm:5.54.1" + dependencies: + "@typescript-eslint/types": 5.54.1 + eslint-visitor-keys: ^3.3.0 + checksum: 3a691abd2a43b86a0c41526d14a2afcc93a2e0512b5f8b9ec43f6029c493870808036eae5ee4fc655d26e1999017c4a4dffb241f47c36c2a1238ec9fbd08719c + languageName: node + linkType: hard + "@webassemblyjs/ast@npm:1.11.1": version: 1.11.1 resolution: "@webassemblyjs/ast@npm:1.11.1" @@ -17118,7 +17163,7 @@ __metadata: "@types/uint32": 0.2.0 "@types/underscore": 1.11.4 "@types/webpack-env": 1.18.0 - "@typescript-eslint/eslint-plugin": ^5.54.0 + "@typescript-eslint/eslint-plugin": ^5.54.1 "@typescript-eslint/parser": ^5.54.0 "@wireapp/avs": 9.1.11 "@wireapp/copy-config": 2.0.10 From 3601e6632e05d2132ef5d8845b9c3ac167a2de2a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 12 Mar 2023 16:06:56 +0000 Subject: [PATCH 44/97] chore(deps-dev): Bump caniuse-lite from 1.0.30001460 to 1.0.30001464 (#14808) Bumps [caniuse-lite](https://github.com/browserslist/caniuse-lite) from 1.0.30001460 to 1.0.30001464. - [Release notes](https://github.com/browserslist/caniuse-lite/releases) - [Commits](https://github.com/browserslist/caniuse-lite/compare/1.0.30001460...1.0.30001464) --- updated-dependencies: - dependency-name: caniuse-lite dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 14740a4cae7..0f800b7f1d2 100644 --- a/package.json +++ b/package.json @@ -101,7 +101,7 @@ "archiver": "^5.3.1", "autoprefixer": "^10.4.13", "babel-loader": "9.1.2", - "caniuse-lite": "^1.0.30001460", + "caniuse-lite": "^1.0.30001464", "cross-env": "7.0.3", "cspell": "6.28.0", "css-loader": "^6.7.3", diff --git a/yarn.lock b/yarn.lock index 132c23390a7..1b362930209 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6045,10 +6045,10 @@ __metadata: languageName: node linkType: hard -"caniuse-lite@npm:^1.0.30001460": - version: 1.0.30001460 - resolution: "caniuse-lite@npm:1.0.30001460" - checksum: dad91eb82aa65aecf33ad6a04ad620b9df6f0152020dc6c1874224e8c6f4aa50695f585201b3dfcd2760b3c43326a86c9505cc03af856698fbef67b267ef786f +"caniuse-lite@npm:^1.0.30001464": + version: 1.0.30001464 + resolution: "caniuse-lite@npm:1.0.30001464" + checksum: 67cdee102c1660d62d7b9dbd4740bb7af096236618f2509fd2e0039d50db5f02fb87c21d90b6d573fdcf50deaf3c84503d009e871502b5c221d0ba1dec18ba11 languageName: node linkType: hard @@ -17182,7 +17182,7 @@ __metadata: autoprefixer: ^10.4.13 babel-loader: 9.1.2 beautiful-react-hooks: ^3.12.2 - caniuse-lite: ^1.0.30001460 + caniuse-lite: ^1.0.30001464 classnames: 2.3.2 copy-webpack-plugin: 11.0.0 core-js: 3.25.5 From fe13c759f2e2113f6b1d58d086a009ec3e1b63d0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 12 Mar 2023 16:07:36 +0000 Subject: [PATCH 45/97] chore(deps-dev): Bump @types/node from 18.14.6 to 18.15.0 (#14809) Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 18.14.6 to 18.15.0. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node) --- updated-dependencies: - dependency-name: "@types/node" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 0f800b7f1d2..5835983186c 100644 --- a/package.json +++ b/package.json @@ -76,7 +76,7 @@ "@types/libsodium-wrappers": "^0", "@types/linkify-it": "3.0.2", "@types/markdown-it": "12.2.3", - "@types/node": "^18.14.6", + "@types/node": "^18.15.0", "@types/open-graph": "0.2.2", "@types/platform": "1.3.4", "@types/prettier": "^2.7.2", diff --git a/yarn.lock b/yarn.lock index 1b362930209..a2ba1739638 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3869,10 +3869,10 @@ __metadata: languageName: node linkType: hard -"@types/node@npm:^18.14.6": - version: 18.14.6 - resolution: "@types/node@npm:18.14.6" - checksum: 2f88f482cabadc6dbddd627a1674239e68c3c9beab56eb4ae2309fb96fd17fc3a509d99b0309bafe13b58529574f49ecf3a583f2ebe2896dd32fe4be436dc96e +"@types/node@npm:^18.15.0": + version: 18.15.0 + resolution: "@types/node@npm:18.15.0" + checksum: d81372276dd5053b1743338b61a2178ff9722dc609189d01fc7d1c2acd539414039e0e4780678730514390dad3f29c366a28c29e8dbd5b0025651181f6dd6669 languageName: node linkType: hard @@ -17148,7 +17148,7 @@ __metadata: "@types/libsodium-wrappers": ^0 "@types/linkify-it": 3.0.2 "@types/markdown-it": 12.2.3 - "@types/node": ^18.14.6 + "@types/node": ^18.15.0 "@types/open-graph": 0.2.2 "@types/platform": 1.3.4 "@types/prettier": ^2.7.2 From 018da71cd8eda89933dab6009434992c099fa0c1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 12 Mar 2023 16:10:49 +0000 Subject: [PATCH 46/97] chore(deps-dev): Bump jest from 29.4.3 to 29.5.0 in /server (#14806) Bumps [jest](https://github.com/facebook/jest/tree/HEAD/packages/jest) from 29.4.3 to 29.5.0. - [Release notes](https://github.com/facebook/jest/releases) - [Changelog](https://github.com/facebook/jest/blob/main/CHANGELOG.md) - [Commits](https://github.com/facebook/jest/commits/v29.5.0/packages/jest) --- updated-dependencies: - dependency-name: jest dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- server/package.json | 2 +- server/yarn.lock | 623 ++++++++++++++++++++++---------------------- 2 files changed, 316 insertions(+), 309 deletions(-) diff --git a/server/package.json b/server/package.json index cc11a97cd85..84e496c514f 100644 --- a/server/package.json +++ b/server/package.json @@ -30,7 +30,7 @@ "@types/hbs": "4.0.1", "@types/jest": "^29.4.0", "@types/node": "18.11.18", - "jest": "29.4.3", + "jest": "29.5.0", "rimraf": "4.4.0", "typescript": "4.9.5" }, diff --git a/server/yarn.lock b/server/yarn.lock index b1f0c6cdffb..b7e5c592531 100644 --- a/server/yarn.lock +++ b/server/yarn.lock @@ -436,50 +436,50 @@ __metadata: languageName: node linkType: hard -"@jest/console@npm:^29.4.3": - version: 29.4.3 - resolution: "@jest/console@npm:29.4.3" +"@jest/console@npm:^29.5.0": + version: 29.5.0 + resolution: "@jest/console@npm:29.5.0" dependencies: - "@jest/types": ^29.4.3 + "@jest/types": ^29.5.0 "@types/node": "*" chalk: ^4.0.0 - jest-message-util: ^29.4.3 - jest-util: ^29.4.3 + jest-message-util: ^29.5.0 + jest-util: ^29.5.0 slash: ^3.0.0 - checksum: 8d9b163febe735153b523db527742309f4d598eda22f17f04e030060329bd3da4de7420fc1f7812f7a16f08273654a7de094c4b4e8b81a99dbfc17cfb1629008 + checksum: 9f4f4b8fabd1221361b7f2e92d4a90f5f8c2e2b29077249996ab3c8b7f765175ffee795368f8d6b5b2bb3adb32dc09319f7270c7c787b0d259e624e00e0f64a5 languageName: node linkType: hard -"@jest/core@npm:^29.4.3": - version: 29.4.3 - resolution: "@jest/core@npm:29.4.3" +"@jest/core@npm:^29.5.0": + version: 29.5.0 + resolution: "@jest/core@npm:29.5.0" dependencies: - "@jest/console": ^29.4.3 - "@jest/reporters": ^29.4.3 - "@jest/test-result": ^29.4.3 - "@jest/transform": ^29.4.3 - "@jest/types": ^29.4.3 + "@jest/console": ^29.5.0 + "@jest/reporters": ^29.5.0 + "@jest/test-result": ^29.5.0 + "@jest/transform": ^29.5.0 + "@jest/types": ^29.5.0 "@types/node": "*" ansi-escapes: ^4.2.1 chalk: ^4.0.0 ci-info: ^3.2.0 exit: ^0.1.2 graceful-fs: ^4.2.9 - jest-changed-files: ^29.4.3 - jest-config: ^29.4.3 - jest-haste-map: ^29.4.3 - jest-message-util: ^29.4.3 + jest-changed-files: ^29.5.0 + jest-config: ^29.5.0 + jest-haste-map: ^29.5.0 + jest-message-util: ^29.5.0 jest-regex-util: ^29.4.3 - jest-resolve: ^29.4.3 - jest-resolve-dependencies: ^29.4.3 - jest-runner: ^29.4.3 - jest-runtime: ^29.4.3 - jest-snapshot: ^29.4.3 - jest-util: ^29.4.3 - jest-validate: ^29.4.3 - jest-watcher: ^29.4.3 + jest-resolve: ^29.5.0 + jest-resolve-dependencies: ^29.5.0 + jest-runner: ^29.5.0 + jest-runtime: ^29.5.0 + jest-snapshot: ^29.5.0 + jest-util: ^29.5.0 + jest-validate: ^29.5.0 + jest-watcher: ^29.5.0 micromatch: ^4.0.4 - pretty-format: ^29.4.3 + pretty-format: ^29.5.0 slash: ^3.0.0 strip-ansi: ^6.0.0 peerDependencies: @@ -487,19 +487,19 @@ __metadata: peerDependenciesMeta: node-notifier: optional: true - checksum: 4aa10644d66f44f051d5dd9cdcedce27acc71216dbcc5e7adebdea458e27aefe27c78f457d7efd49f58b968c35f42de5a521590876e2013593e675120b9e6ab1 + checksum: 9e8f5243fe82d5a57f3971e1b96f320058df7c315328a3a827263f3b17f64be10c80f4a9c1b1773628b64d2de6d607c70b5b2d5bf13e7f5ad04223e9ef6aac06 languageName: node linkType: hard -"@jest/environment@npm:^29.4.3": - version: 29.4.3 - resolution: "@jest/environment@npm:29.4.3" +"@jest/environment@npm:^29.5.0": + version: 29.5.0 + resolution: "@jest/environment@npm:29.5.0" dependencies: - "@jest/fake-timers": ^29.4.3 - "@jest/types": ^29.4.3 + "@jest/fake-timers": ^29.5.0 + "@jest/types": ^29.5.0 "@types/node": "*" - jest-mock: ^29.4.3 - checksum: 7c1b0cc4e84b90f8a3bbeca9bbf088882c88aee70a81b3b8e24265dcb1cbc302cd1eee3319089cf65bfd39adbaea344903c712afea106cb8da6c86088d99c5fb + jest-mock: ^29.5.0 + checksum: 921de6325cd4817dec6685e5ff299b499b6379f3f9cf489b4b13588ee1f3820a0c77b49e6a087996b6de8f629f6f5251e636cba08d1bdb97d8071cc7d033c88a languageName: node linkType: hard @@ -512,60 +512,60 @@ __metadata: languageName: node linkType: hard -"@jest/expect-utils@npm:^29.4.3": - version: 29.4.3 - resolution: "@jest/expect-utils@npm:29.4.3" +"@jest/expect-utils@npm:^29.5.0": + version: 29.5.0 + resolution: "@jest/expect-utils@npm:29.5.0" dependencies: jest-get-type: ^29.4.3 - checksum: 2bbed39ff2fb59f5acac465a1ce7303e3b4b62b479e4f386261986c9827f7f799ea912761e22629c5daf10addf8513f16733c14a29c2647bb66d4ee625e9ff92 + checksum: c46fb677c88535cf83cf29f0a5b1f376c6a1109ddda266ad7da1a9cbc53cb441fa402dd61fc7b111ffc99603c11a9b3357ee41a1c0e035a58830bcb360871476 languageName: node linkType: hard -"@jest/expect@npm:^29.4.3": - version: 29.4.3 - resolution: "@jest/expect@npm:29.4.3" +"@jest/expect@npm:^29.5.0": + version: 29.5.0 + resolution: "@jest/expect@npm:29.5.0" dependencies: - expect: ^29.4.3 - jest-snapshot: ^29.4.3 - checksum: 08d0d40077ec99a7491fe59d05821dbd31126cfba70875855d8a063698b7126b5f6c309c50811caacc6ae2f727c6e44f51bdcf1d6c1ea832b4f020045ef22d45 + expect: ^29.5.0 + jest-snapshot: ^29.5.0 + checksum: bd10e295111547e6339137107d83986ab48d46561525393834d7d2d8b2ae9d5626653f3f5e48e5c3fa742ac982e97bdf1f541b53b9e1d117a247b08e938527f6 languageName: node linkType: hard -"@jest/fake-timers@npm:^29.4.3": - version: 29.4.3 - resolution: "@jest/fake-timers@npm:29.4.3" +"@jest/fake-timers@npm:^29.5.0": + version: 29.5.0 + resolution: "@jest/fake-timers@npm:29.5.0" dependencies: - "@jest/types": ^29.4.3 + "@jest/types": ^29.5.0 "@sinonjs/fake-timers": ^10.0.2 "@types/node": "*" - jest-message-util: ^29.4.3 - jest-mock: ^29.4.3 - jest-util: ^29.4.3 - checksum: adaceb9143c395cccf3d7baa0e49b7042c3092a554e8283146df19926247e34c21b5bde5688bb90e9e87b4a02e4587926c5d858ee0a38d397a63175d0a127874 + jest-message-util: ^29.5.0 + jest-mock: ^29.5.0 + jest-util: ^29.5.0 + checksum: 69930c6922341f244151ec0d27640852ec96237f730fc024da1f53143d31b43cde75d92f9d8e5937981cdce3b31416abc3a7090a0d22c2377512c4a6613244ee languageName: node linkType: hard -"@jest/globals@npm:^29.4.3": - version: 29.4.3 - resolution: "@jest/globals@npm:29.4.3" +"@jest/globals@npm:^29.5.0": + version: 29.5.0 + resolution: "@jest/globals@npm:29.5.0" dependencies: - "@jest/environment": ^29.4.3 - "@jest/expect": ^29.4.3 - "@jest/types": ^29.4.3 - jest-mock: ^29.4.3 - checksum: ea76b546ceb4aa5ce2bb3726df12f989b23150b51c9f7664790caa81b943012a657cf3a8525498af1c3518cdb387f54b816cfba1b0ddd22c7b20f03b1d7290b4 + "@jest/environment": ^29.5.0 + "@jest/expect": ^29.5.0 + "@jest/types": ^29.5.0 + jest-mock: ^29.5.0 + checksum: b309ab8f21b571a7c672608682e84bbdd3d2b554ddf81e4e32617fec0a69094a290ab42e3c8b2c66ba891882bfb1b8b2736720ea1285b3ad646d55c2abefedd9 languageName: node linkType: hard -"@jest/reporters@npm:^29.4.3": - version: 29.4.3 - resolution: "@jest/reporters@npm:29.4.3" +"@jest/reporters@npm:^29.5.0": + version: 29.5.0 + resolution: "@jest/reporters@npm:29.5.0" dependencies: "@bcoe/v8-coverage": ^0.2.3 - "@jest/console": ^29.4.3 - "@jest/test-result": ^29.4.3 - "@jest/transform": ^29.4.3 - "@jest/types": ^29.4.3 + "@jest/console": ^29.5.0 + "@jest/test-result": ^29.5.0 + "@jest/transform": ^29.5.0 + "@jest/types": ^29.5.0 "@jridgewell/trace-mapping": ^0.3.15 "@types/node": "*" chalk: ^4.0.0 @@ -578,9 +578,9 @@ __metadata: istanbul-lib-report: ^3.0.0 istanbul-lib-source-maps: ^4.0.0 istanbul-reports: ^3.1.3 - jest-message-util: ^29.4.3 - jest-util: ^29.4.3 - jest-worker: ^29.4.3 + jest-message-util: ^29.5.0 + jest-util: ^29.5.0 + jest-worker: ^29.5.0 slash: ^3.0.0 string-length: ^4.0.1 strip-ansi: ^6.0.0 @@ -590,7 +590,7 @@ __metadata: peerDependenciesMeta: node-notifier: optional: true - checksum: 7aa2e429c915bd96c3334962addd69d2bbf52065725757ddde26b293f8c4420a1e8c65363cc3e1e5ec89100a5273ccd3771bec58325a2cc0d97afdc81995073a + checksum: 481268aac9a4a75cc49c4df1273d6b111808dec815e9d009dad717c32383ebb0cebac76e820ad1ab44e207540e1c2fe1e640d44c4f262de92ab1933e057fdeeb languageName: node linkType: hard @@ -623,50 +623,50 @@ __metadata: languageName: node linkType: hard -"@jest/test-result@npm:^29.4.3": - version: 29.4.3 - resolution: "@jest/test-result@npm:29.4.3" +"@jest/test-result@npm:^29.5.0": + version: 29.5.0 + resolution: "@jest/test-result@npm:29.5.0" dependencies: - "@jest/console": ^29.4.3 - "@jest/types": ^29.4.3 + "@jest/console": ^29.5.0 + "@jest/types": ^29.5.0 "@types/istanbul-lib-coverage": ^2.0.0 collect-v8-coverage: ^1.0.0 - checksum: 164f102b96619ec283c2c39e208b8048e4674f75bf3c3a4f2e95048ae0f9226105add684b25f10d286d91c221625f877e2c1cfc3da46c42d7e1804da239318cb + checksum: 2e8ff5242227ab960c520c3ea0f6544c595cc1c42fa3873c158e9f4f685f4ec9670ec08a4af94ae3885c0005a43550a9595191ffbc27a0965df27d9d98bbf901 languageName: node linkType: hard -"@jest/test-sequencer@npm:^29.4.3": - version: 29.4.3 - resolution: "@jest/test-sequencer@npm:29.4.3" +"@jest/test-sequencer@npm:^29.5.0": + version: 29.5.0 + resolution: "@jest/test-sequencer@npm:29.5.0" dependencies: - "@jest/test-result": ^29.4.3 + "@jest/test-result": ^29.5.0 graceful-fs: ^4.2.9 - jest-haste-map: ^29.4.3 + jest-haste-map: ^29.5.0 slash: ^3.0.0 - checksum: 145e1fa9379e5be3587bde6d585b8aee5cf4442b06926928a87e9aec7de5be91b581711d627c6ca13144d244fe05e5d248c13b366b51bedc404f9dcfbfd79e9e + checksum: eca34b4aeb2fda6dfb7f9f4b064c858a7adf64ec5c6091b6f4ed9d3c19549177cbadcf1c615c4c182688fa1cf085c8c55c3ca6eea40719a34554b0bf071d842e languageName: node linkType: hard -"@jest/transform@npm:^29.4.3": - version: 29.4.3 - resolution: "@jest/transform@npm:29.4.3" +"@jest/transform@npm:^29.5.0": + version: 29.5.0 + resolution: "@jest/transform@npm:29.5.0" dependencies: "@babel/core": ^7.11.6 - "@jest/types": ^29.4.3 + "@jest/types": ^29.5.0 "@jridgewell/trace-mapping": ^0.3.15 babel-plugin-istanbul: ^6.1.1 chalk: ^4.0.0 convert-source-map: ^2.0.0 fast-json-stable-stringify: ^2.1.0 graceful-fs: ^4.2.9 - jest-haste-map: ^29.4.3 + jest-haste-map: ^29.5.0 jest-regex-util: ^29.4.3 - jest-util: ^29.4.3 + jest-util: ^29.5.0 micromatch: ^4.0.4 pirates: ^4.0.4 slash: ^3.0.0 write-file-atomic: ^4.0.2 - checksum: 082d74e04044213aa7baa8de29f8383e5010034f867969c8602a2447a4ef2f484cfaf2491eba3179ce42f369f7a0af419cbd087910f7e5caf7aa5d1fe03f2ff9 + checksum: d55d604085c157cf5112e165ff5ac1fa788873b3b31265fb4734ca59892ee24e44119964cc47eb6d178dd9512bbb6c576d1e20e51a201ff4e24d31e818a1c92d languageName: node linkType: hard @@ -684,9 +684,9 @@ __metadata: languageName: node linkType: hard -"@jest/types@npm:^29.4.3": - version: 29.4.3 - resolution: "@jest/types@npm:29.4.3" +"@jest/types@npm:^29.5.0": + version: 29.5.0 + resolution: "@jest/types@npm:29.5.0" dependencies: "@jest/schemas": ^29.4.3 "@types/istanbul-lib-coverage": ^2.0.0 @@ -694,7 +694,7 @@ __metadata: "@types/node": "*" "@types/yargs": ^17.0.8 chalk: ^4.0.0 - checksum: 1756f4149d360f98567f56f434144f7af23ed49a2c42889261a314df6b6654c2de70af618fb2ee0ee39cadaf10835b885845557184509503646c9cb9dcc02bac + checksum: 1811f94b19cf8a9460a289c4f056796cfc373480e0492692a6125a553cd1a63824bd846d7bb78820b7b6f758f6dd3c2d4558293bb676d541b2fa59c70fdf9d39 languageName: node linkType: hard @@ -1401,20 +1401,20 @@ __metadata: languageName: node linkType: hard -"babel-jest@npm:^29.4.3": - version: 29.4.3 - resolution: "babel-jest@npm:29.4.3" +"babel-jest@npm:^29.5.0": + version: 29.5.0 + resolution: "babel-jest@npm:29.5.0" dependencies: - "@jest/transform": ^29.4.3 + "@jest/transform": ^29.5.0 "@types/babel__core": ^7.1.14 babel-plugin-istanbul: ^6.1.1 - babel-preset-jest: ^29.4.3 + babel-preset-jest: ^29.5.0 chalk: ^4.0.0 graceful-fs: ^4.2.9 slash: ^3.0.0 peerDependencies: "@babel/core": ^7.8.0 - checksum: a1a95937adb5e717dbffc2eb9e583fa6d26c7e5d5b07bb492a2d7f68631510a363e9ff097eafb642ad642dfac9dc2b13872b584f680e166a4f0922c98ea95853 + checksum: eafb6d37deb71f0c80bf3c80215aa46732153e5e8bcd73f6ff47d92e5c0c98c8f7f75995d0efec6289c371edad3693cd8fa2367b0661c4deb71a3a7117267ede languageName: node linkType: hard @@ -1431,15 +1431,15 @@ __metadata: languageName: node linkType: hard -"babel-plugin-jest-hoist@npm:^29.4.3": - version: 29.4.3 - resolution: "babel-plugin-jest-hoist@npm:29.4.3" +"babel-plugin-jest-hoist@npm:^29.5.0": + version: 29.5.0 + resolution: "babel-plugin-jest-hoist@npm:29.5.0" dependencies: "@babel/template": ^7.3.3 "@babel/types": ^7.3.3 "@types/babel__core": ^7.1.14 "@types/babel__traverse": ^7.0.6 - checksum: c8702a6db6b30ec39dfb9f8e72b501c13895231ed80b15ed2648448f9f0c7b7cc4b1529beac31802ae655f63479a05110ca612815aa25fb1b0e6c874e1589137 + checksum: 099b5254073b6bc985b6d2d045ad26fb8ed30ff8ae6404c4fe8ee7cd0e98a820f69e3dfb871c7c65aae0f4b65af77046244c07bb92d49ef9005c90eedf681539 languageName: node linkType: hard @@ -1465,15 +1465,15 @@ __metadata: languageName: node linkType: hard -"babel-preset-jest@npm:^29.4.3": - version: 29.4.3 - resolution: "babel-preset-jest@npm:29.4.3" +"babel-preset-jest@npm:^29.5.0": + version: 29.5.0 + resolution: "babel-preset-jest@npm:29.5.0" dependencies: - babel-plugin-jest-hoist: ^29.4.3 + babel-plugin-jest-hoist: ^29.5.0 babel-preset-current-node-syntax: ^1.0.0 peerDependencies: "@babel/core": ^7.0.0 - checksum: a091721861ea2f8d969ace8fe06570cff8f2e847dbc6e4800abacbe63f72131abde615ce0a3b6648472c97e55a5be7f8bf7ae381e2b194ad2fa1737096febcf5 + checksum: 5566ca2762766c9319b4973d018d2fa08c0fcf6415c72cc54f4c8e7199e851ea8f5e6c6730f03ed7ed44fc8beefa959dd15911f2647dee47c615ff4faeddb1ad languageName: node linkType: hard @@ -2319,16 +2319,16 @@ __metadata: languageName: node linkType: hard -"expect@npm:^29.4.3": - version: 29.4.3 - resolution: "expect@npm:29.4.3" +"expect@npm:^29.5.0": + version: 29.5.0 + resolution: "expect@npm:29.5.0" dependencies: - "@jest/expect-utils": ^29.4.3 + "@jest/expect-utils": ^29.5.0 jest-get-type: ^29.4.3 - jest-matcher-utils: ^29.4.3 - jest-message-util: ^29.4.3 - jest-util: ^29.4.3 - checksum: ff9dd8c50c0c6fd4b2b00f6dbd7ab0e2063fe1953be81a8c10ae1c005c7f5667ba452918e2efb055504b72b701a4f82575a081a0a7158efb16d87991b0366feb + jest-matcher-utils: ^29.5.0 + jest-message-util: ^29.5.0 + jest-util: ^29.5.0 + checksum: 58f70b38693df6e5c6892db1bcd050f0e518d6f785175dc53917d4fa6a7359a048e5690e19ddcb96b65c4493881dd89a3dabdab1a84dfa55c10cdbdabf37b2d7 languageName: node linkType: hard @@ -3131,57 +3131,58 @@ __metadata: languageName: node linkType: hard -"jest-changed-files@npm:^29.4.3": - version: 29.4.3 - resolution: "jest-changed-files@npm:29.4.3" +"jest-changed-files@npm:^29.5.0": + version: 29.5.0 + resolution: "jest-changed-files@npm:29.5.0" dependencies: execa: ^5.0.0 p-limit: ^3.1.0 - checksum: 9a70bd8e92b37e18ad26d8bea97c516f41119fb7046b4255a13c76d557b0e54fa0629726de5a093fadfd6a0a08ce45da65a57086664d505b8db4b3133133e141 + checksum: a67a7cb3c11f8f92bd1b7c79e84f724cbd11a9ad51f3cdadafe3ce7ee3c79ee50dbea128f920f5fddc807e9e4e83f5462143094391feedd959a77dd20ab96cf3 languageName: node linkType: hard -"jest-circus@npm:^29.4.3": - version: 29.4.3 - resolution: "jest-circus@npm:29.4.3" +"jest-circus@npm:^29.5.0": + version: 29.5.0 + resolution: "jest-circus@npm:29.5.0" dependencies: - "@jest/environment": ^29.4.3 - "@jest/expect": ^29.4.3 - "@jest/test-result": ^29.4.3 - "@jest/types": ^29.4.3 + "@jest/environment": ^29.5.0 + "@jest/expect": ^29.5.0 + "@jest/test-result": ^29.5.0 + "@jest/types": ^29.5.0 "@types/node": "*" chalk: ^4.0.0 co: ^4.6.0 dedent: ^0.7.0 is-generator-fn: ^2.0.0 - jest-each: ^29.4.3 - jest-matcher-utils: ^29.4.3 - jest-message-util: ^29.4.3 - jest-runtime: ^29.4.3 - jest-snapshot: ^29.4.3 - jest-util: ^29.4.3 + jest-each: ^29.5.0 + jest-matcher-utils: ^29.5.0 + jest-message-util: ^29.5.0 + jest-runtime: ^29.5.0 + jest-snapshot: ^29.5.0 + jest-util: ^29.5.0 p-limit: ^3.1.0 - pretty-format: ^29.4.3 + pretty-format: ^29.5.0 + pure-rand: ^6.0.0 slash: ^3.0.0 stack-utils: ^2.0.3 - checksum: 2739bef9c888743b49ff3fe303131381618e5d2f250f613a91240d9c86e19e6874fc904cbd8bcb02ec9ec59a84e5dae4ffec929f0c6171e87ddbc05508a137f4 + checksum: 44ff5d06acedae6de6c866e20e3b61f83e29ab94cf9f960826e7e667de49c12dd9ab9dffd7fa3b7d1f9688a8b5bfb1ebebadbea69d9ed0d3f66af4a0ff8c2b27 languageName: node linkType: hard -"jest-cli@npm:^29.4.3": - version: 29.4.3 - resolution: "jest-cli@npm:29.4.3" +"jest-cli@npm:^29.5.0": + version: 29.5.0 + resolution: "jest-cli@npm:29.5.0" dependencies: - "@jest/core": ^29.4.3 - "@jest/test-result": ^29.4.3 - "@jest/types": ^29.4.3 + "@jest/core": ^29.5.0 + "@jest/test-result": ^29.5.0 + "@jest/types": ^29.5.0 chalk: ^4.0.0 exit: ^0.1.2 graceful-fs: ^4.2.9 import-local: ^3.0.2 - jest-config: ^29.4.3 - jest-util: ^29.4.3 - jest-validate: ^29.4.3 + jest-config: ^29.5.0 + jest-util: ^29.5.0 + jest-validate: ^29.5.0 prompts: ^2.0.1 yargs: ^17.3.1 peerDependencies: @@ -3191,34 +3192,34 @@ __metadata: optional: true bin: jest: bin/jest.js - checksum: f4c9f6d76cde2c60a4169acbebb3f862728be03bcf3fe0077d2e55da7f9f3c3e9483cfa6e936832d35eabf96ee5ebf0300c4b0bd43cffff099801793466bfdd8 + checksum: 39897bbbc0f0d8a6b975ab12fd13887eaa28d92e3dee9e0173a5cb913ae8cc2ae46e090d38c6d723e84d9d6724429cd08685b4e505fa447d31ca615630c7dbba languageName: node linkType: hard -"jest-config@npm:^29.4.3": - version: 29.4.3 - resolution: "jest-config@npm:29.4.3" +"jest-config@npm:^29.5.0": + version: 29.5.0 + resolution: "jest-config@npm:29.5.0" dependencies: "@babel/core": ^7.11.6 - "@jest/test-sequencer": ^29.4.3 - "@jest/types": ^29.4.3 - babel-jest: ^29.4.3 + "@jest/test-sequencer": ^29.5.0 + "@jest/types": ^29.5.0 + babel-jest: ^29.5.0 chalk: ^4.0.0 ci-info: ^3.2.0 deepmerge: ^4.2.2 glob: ^7.1.3 graceful-fs: ^4.2.9 - jest-circus: ^29.4.3 - jest-environment-node: ^29.4.3 + jest-circus: ^29.5.0 + jest-environment-node: ^29.5.0 jest-get-type: ^29.4.3 jest-regex-util: ^29.4.3 - jest-resolve: ^29.4.3 - jest-runner: ^29.4.3 - jest-util: ^29.4.3 - jest-validate: ^29.4.3 + jest-resolve: ^29.5.0 + jest-runner: ^29.5.0 + jest-util: ^29.5.0 + jest-validate: ^29.5.0 micromatch: ^4.0.4 parse-json: ^5.2.0 - pretty-format: ^29.4.3 + pretty-format: ^29.5.0 slash: ^3.0.0 strip-json-comments: ^3.1.1 peerDependencies: @@ -3229,7 +3230,7 @@ __metadata: optional: true ts-node: optional: true - checksum: 92f9a9c6850b18682cb01892774a33967472af23a5844438d8c68077d5f2a29b15b665e4e4db7de3d74002a6dca158cd5b2cb9f5debfd2cce5e1aee6c74e3873 + checksum: c37c4dab964c54ab293d4e302d40b09687037ac9d00b88348ec42366970747feeaf265e12e3750cd3660b40c518d4031335eda11ac10b70b10e60797ebbd4b9c languageName: node linkType: hard @@ -3245,15 +3246,15 @@ __metadata: languageName: node linkType: hard -"jest-diff@npm:^29.4.3": - version: 29.4.3 - resolution: "jest-diff@npm:29.4.3" +"jest-diff@npm:^29.5.0": + version: 29.5.0 + resolution: "jest-diff@npm:29.5.0" dependencies: chalk: ^4.0.0 diff-sequences: ^29.4.3 jest-get-type: ^29.4.3 - pretty-format: ^29.4.3 - checksum: 877fd1edffef6b319688c27b152e5b28e2bc4bcda5ce0ca90d7e137f9fafda4280bae25403d4c0bfd9806c2c0b15d966aa2dfaf5f9928ec8f1ccea7fa1d08ed6 + pretty-format: ^29.5.0 + checksum: dfd0f4a299b5d127779c76b40106c37854c89c3e0785098c717d52822d6620d227f6234c3a9291df204d619e799e3654159213bf93220f79c8e92a55475a3d39 languageName: node linkType: hard @@ -3266,30 +3267,30 @@ __metadata: languageName: node linkType: hard -"jest-each@npm:^29.4.3": - version: 29.4.3 - resolution: "jest-each@npm:29.4.3" +"jest-each@npm:^29.5.0": + version: 29.5.0 + resolution: "jest-each@npm:29.5.0" dependencies: - "@jest/types": ^29.4.3 + "@jest/types": ^29.5.0 chalk: ^4.0.0 jest-get-type: ^29.4.3 - jest-util: ^29.4.3 - pretty-format: ^29.4.3 - checksum: 1f72738338399efab0139eaea18bc198be0c6ed889770c8cbfa70bf9c724e8171fe1d3a29a94f9f39b8493ee6b2529bb350fb7c7c75e0d7eddfd28c253c79f9d + jest-util: ^29.5.0 + pretty-format: ^29.5.0 + checksum: b8b297534d25834c5d4e31e4c687359787b1e402519e42664eb704cc3a12a7a91a017565a75acb02e8cf9afd3f4eef3350bd785276bec0900184641b765ff7a5 languageName: node linkType: hard -"jest-environment-node@npm:^29.4.3": - version: 29.4.3 - resolution: "jest-environment-node@npm:29.4.3" +"jest-environment-node@npm:^29.5.0": + version: 29.5.0 + resolution: "jest-environment-node@npm:29.5.0" dependencies: - "@jest/environment": ^29.4.3 - "@jest/fake-timers": ^29.4.3 - "@jest/types": ^29.4.3 + "@jest/environment": ^29.5.0 + "@jest/fake-timers": ^29.5.0 + "@jest/types": ^29.5.0 "@types/node": "*" - jest-mock: ^29.4.3 - jest-util: ^29.4.3 - checksum: 3c7362edfdbd516e83af7367c95dde35761a482b174de9735c07633405486ec73e19624e9bea4333fca33c24e8d65eaa1aa6594e0cb6bfeeeb564ccc431ee61d + jest-mock: ^29.5.0 + jest-util: ^29.5.0 + checksum: 57981911cc20a4219b0da9e22b2e3c9f31b505e43f78e61c899e3227ded455ce1a3a9483842c69cfa4532f02cfb536ae0995bf245f9211608edacfc1e478d411 languageName: node linkType: hard @@ -3307,11 +3308,11 @@ __metadata: languageName: node linkType: hard -"jest-haste-map@npm:^29.4.3": - version: 29.4.3 - resolution: "jest-haste-map@npm:29.4.3" +"jest-haste-map@npm:^29.5.0": + version: 29.5.0 + resolution: "jest-haste-map@npm:29.5.0" dependencies: - "@jest/types": ^29.4.3 + "@jest/types": ^29.5.0 "@types/graceful-fs": ^4.1.3 "@types/node": "*" anymatch: ^3.0.3 @@ -3319,24 +3320,24 @@ __metadata: fsevents: ^2.3.2 graceful-fs: ^4.2.9 jest-regex-util: ^29.4.3 - jest-util: ^29.4.3 - jest-worker: ^29.4.3 + jest-util: ^29.5.0 + jest-worker: ^29.5.0 micromatch: ^4.0.4 walker: ^1.0.8 dependenciesMeta: fsevents: optional: true - checksum: c7a83ebe6008b3fe96a96235e8153092e54b14df68e0f4205faedec57450df26b658578495a71c6d82494c01fbb44bca98c1506a6b2b9c920696dcc5d2e2bc59 + checksum: 3828ff7783f168e34be2c63887f82a01634261f605dcae062d83f979a61c37739e21b9607ecb962256aea3fbe5a530a1acee062d0026fcb47c607c12796cf3b7 languageName: node linkType: hard -"jest-leak-detector@npm:^29.4.3": - version: 29.4.3 - resolution: "jest-leak-detector@npm:29.4.3" +"jest-leak-detector@npm:^29.5.0": + version: 29.5.0 + resolution: "jest-leak-detector@npm:29.5.0" dependencies: jest-get-type: ^29.4.3 - pretty-format: ^29.4.3 - checksum: ec2b45e6f0abce81bd0dd0f6fd06b433c24d1ec865267af7640fae540ec868b93752598e407a9184d9c7419cbf32e8789007cc8c1be1a84f8f7321a0f8ad01f1 + pretty-format: ^29.5.0 + checksum: 0fb845da7ac9cdfc9b3b2e35f6f623a41c547d7dc0103ceb0349013459d00de5870b5689a625e7e37f9644934b40e8f1dcdd5422d14d57470600350364676313 languageName: node linkType: hard @@ -3352,15 +3353,15 @@ __metadata: languageName: node linkType: hard -"jest-matcher-utils@npm:^29.4.3": - version: 29.4.3 - resolution: "jest-matcher-utils@npm:29.4.3" +"jest-matcher-utils@npm:^29.5.0": + version: 29.5.0 + resolution: "jest-matcher-utils@npm:29.5.0" dependencies: chalk: ^4.0.0 - jest-diff: ^29.4.3 + jest-diff: ^29.5.0 jest-get-type: ^29.4.3 - pretty-format: ^29.4.3 - checksum: 9e13cbe42d2113bab2691110c7c3ba5cec3b94abad2727e1de90929d0f67da444e9b2066da3b476b5bf788df53a8ede0e0a950cfb06a04e4d6d566d115ee4f1d + pretty-format: ^29.5.0 + checksum: 1d3e8c746e484a58ce194e3aad152eff21fd0896e8b8bf3d4ab1a4e2cbfed95fb143646f4ad9fdf6e42212b9e8fc033268b58e011b044a9929df45485deb5ac9 languageName: node linkType: hard @@ -3381,31 +3382,31 @@ __metadata: languageName: node linkType: hard -"jest-message-util@npm:^29.4.3": - version: 29.4.3 - resolution: "jest-message-util@npm:29.4.3" +"jest-message-util@npm:^29.5.0": + version: 29.5.0 + resolution: "jest-message-util@npm:29.5.0" dependencies: "@babel/code-frame": ^7.12.13 - "@jest/types": ^29.4.3 + "@jest/types": ^29.5.0 "@types/stack-utils": ^2.0.0 chalk: ^4.0.0 graceful-fs: ^4.2.9 micromatch: ^4.0.4 - pretty-format: ^29.4.3 + pretty-format: ^29.5.0 slash: ^3.0.0 stack-utils: ^2.0.3 - checksum: 64f06b9550021e68da0059020bea8691283cf818918810bb67192d7b7fb9b691c7eadf55c2ca3cd04df5394918f2327245077095cdc0d6b04be3532d2c7d0ced + checksum: daddece6bbf846eb6a2ab9be9f2446e54085bef4e5cecd13d2a538fa9c01cb89d38e564c6b74fd8e12d37ed9eface8a362240ae9f21d68b214590631e7a0d8bf languageName: node linkType: hard -"jest-mock@npm:^29.4.3": - version: 29.4.3 - resolution: "jest-mock@npm:29.4.3" +"jest-mock@npm:^29.5.0": + version: 29.5.0 + resolution: "jest-mock@npm:29.5.0" dependencies: - "@jest/types": ^29.4.3 + "@jest/types": ^29.5.0 "@types/node": "*" - jest-util: ^29.4.3 - checksum: 8eb4a29b02d2cd03faac0290b6df6d23b4ffa43f72b21c7fff3c7dd04a2797355b1e85862b70b15341dd33ee3a693b17db5520a6f6e6b81ee75601987de6a1a2 + jest-util: ^29.5.0 + checksum: 2a9cf07509948fa8608898c445f04fe4dd6e2049ff431e5531eee028c808d3ba3c67f226ac87b0cf383feaa1055776900d197c895e89783016886ac17a4ff10c languageName: node linkType: hard @@ -3428,95 +3429,95 @@ __metadata: languageName: node linkType: hard -"jest-resolve-dependencies@npm:^29.4.3": - version: 29.4.3 - resolution: "jest-resolve-dependencies@npm:29.4.3" +"jest-resolve-dependencies@npm:^29.5.0": + version: 29.5.0 + resolution: "jest-resolve-dependencies@npm:29.5.0" dependencies: jest-regex-util: ^29.4.3 - jest-snapshot: ^29.4.3 - checksum: 3ad934cd2170c9658d8800f84a975dafc866ec85b7ce391c640c09c3744ced337787620d8667dc8d1fa5e0b1493f973caa1a1bb980e4e6a50b46a1720baf0bd1 + jest-snapshot: ^29.5.0 + checksum: 479d2e5365d58fe23f2b87001e2e0adcbffe0147700e85abdec8f14b9703b0a55758c1929a9989e3f5d5e954fb88870ea4bfa04783523b664562fcf5f10b0edf languageName: node linkType: hard -"jest-resolve@npm:^29.4.3": - version: 29.4.3 - resolution: "jest-resolve@npm:29.4.3" +"jest-resolve@npm:^29.5.0": + version: 29.5.0 + resolution: "jest-resolve@npm:29.5.0" dependencies: chalk: ^4.0.0 graceful-fs: ^4.2.9 - jest-haste-map: ^29.4.3 + jest-haste-map: ^29.5.0 jest-pnp-resolver: ^1.2.2 - jest-util: ^29.4.3 - jest-validate: ^29.4.3 + jest-util: ^29.5.0 + jest-validate: ^29.5.0 resolve: ^1.20.0 resolve.exports: ^2.0.0 slash: ^3.0.0 - checksum: 056a66beccf833f3c7e5a8fc9bfec218886e87b0b103decdbdf11893669539df489d1490cd6d5f0eea35731e8be0d2e955a6710498f970d2eae734da4df029dc + checksum: 9a125f3cf323ceef512089339d35f3ee37f79fe16a831fb6a26773ea6a229b9e490d108fec7af334142e91845b5996de8e7cdd85a4d8d617078737d804e29c8f languageName: node linkType: hard -"jest-runner@npm:^29.4.3": - version: 29.4.3 - resolution: "jest-runner@npm:29.4.3" +"jest-runner@npm:^29.5.0": + version: 29.5.0 + resolution: "jest-runner@npm:29.5.0" dependencies: - "@jest/console": ^29.4.3 - "@jest/environment": ^29.4.3 - "@jest/test-result": ^29.4.3 - "@jest/transform": ^29.4.3 - "@jest/types": ^29.4.3 + "@jest/console": ^29.5.0 + "@jest/environment": ^29.5.0 + "@jest/test-result": ^29.5.0 + "@jest/transform": ^29.5.0 + "@jest/types": ^29.5.0 "@types/node": "*" chalk: ^4.0.0 emittery: ^0.13.1 graceful-fs: ^4.2.9 jest-docblock: ^29.4.3 - jest-environment-node: ^29.4.3 - jest-haste-map: ^29.4.3 - jest-leak-detector: ^29.4.3 - jest-message-util: ^29.4.3 - jest-resolve: ^29.4.3 - jest-runtime: ^29.4.3 - jest-util: ^29.4.3 - jest-watcher: ^29.4.3 - jest-worker: ^29.4.3 + jest-environment-node: ^29.5.0 + jest-haste-map: ^29.5.0 + jest-leak-detector: ^29.5.0 + jest-message-util: ^29.5.0 + jest-resolve: ^29.5.0 + jest-runtime: ^29.5.0 + jest-util: ^29.5.0 + jest-watcher: ^29.5.0 + jest-worker: ^29.5.0 p-limit: ^3.1.0 source-map-support: 0.5.13 - checksum: c41108e5da01e0b8fdc2a06c5042eb49bb1d8db0e0d4651769fd1b9fe84ab45188617c11a3a8e1c83748b29bfe57dd77001ec57e86e3e3c30f3534e0314f8882 + checksum: 437dea69c5dddca22032259787bac74790d5a171c9d804711415f31e5d1abfb64fa52f54a9015bb17a12b858fd0cf3f75ef6f3c9e94255a8596e179f707229c4 languageName: node linkType: hard -"jest-runtime@npm:^29.4.3": - version: 29.4.3 - resolution: "jest-runtime@npm:29.4.3" +"jest-runtime@npm:^29.5.0": + version: 29.5.0 + resolution: "jest-runtime@npm:29.5.0" dependencies: - "@jest/environment": ^29.4.3 - "@jest/fake-timers": ^29.4.3 - "@jest/globals": ^29.4.3 + "@jest/environment": ^29.5.0 + "@jest/fake-timers": ^29.5.0 + "@jest/globals": ^29.5.0 "@jest/source-map": ^29.4.3 - "@jest/test-result": ^29.4.3 - "@jest/transform": ^29.4.3 - "@jest/types": ^29.4.3 + "@jest/test-result": ^29.5.0 + "@jest/transform": ^29.5.0 + "@jest/types": ^29.5.0 "@types/node": "*" chalk: ^4.0.0 cjs-module-lexer: ^1.0.0 collect-v8-coverage: ^1.0.0 glob: ^7.1.3 graceful-fs: ^4.2.9 - jest-haste-map: ^29.4.3 - jest-message-util: ^29.4.3 - jest-mock: ^29.4.3 + jest-haste-map: ^29.5.0 + jest-message-util: ^29.5.0 + jest-mock: ^29.5.0 jest-regex-util: ^29.4.3 - jest-resolve: ^29.4.3 - jest-snapshot: ^29.4.3 - jest-util: ^29.4.3 + jest-resolve: ^29.5.0 + jest-snapshot: ^29.5.0 + jest-util: ^29.5.0 slash: ^3.0.0 strip-bom: ^4.0.0 - checksum: b99f8a910d1a38e7476058ba04ad44dfd3d93e837bb7c301d691e646a1085412fde87f06fbe271c9145f0e72d89400bfa7f6994bc30d456c7742269f37d0f570 + checksum: 7af27bd9d54cf1c5735404cf8d76c6509d5610b1ec0106a21baa815c1aff15d774ce534ac2834bc440dccfe6348bae1885fd9a806f23a94ddafdc0f5bae4b09d languageName: node linkType: hard -"jest-snapshot@npm:^29.4.3": - version: 29.4.3 - resolution: "jest-snapshot@npm:29.4.3" +"jest-snapshot@npm:^29.5.0": + version: 29.5.0 + resolution: "jest-snapshot@npm:29.5.0" dependencies: "@babel/core": ^7.11.6 "@babel/generator": ^7.7.2 @@ -3524,25 +3525,24 @@ __metadata: "@babel/plugin-syntax-typescript": ^7.7.2 "@babel/traverse": ^7.7.2 "@babel/types": ^7.3.3 - "@jest/expect-utils": ^29.4.3 - "@jest/transform": ^29.4.3 - "@jest/types": ^29.4.3 + "@jest/expect-utils": ^29.5.0 + "@jest/transform": ^29.5.0 + "@jest/types": ^29.5.0 "@types/babel__traverse": ^7.0.6 "@types/prettier": ^2.1.5 babel-preset-current-node-syntax: ^1.0.0 chalk: ^4.0.0 - expect: ^29.4.3 + expect: ^29.5.0 graceful-fs: ^4.2.9 - jest-diff: ^29.4.3 + jest-diff: ^29.5.0 jest-get-type: ^29.4.3 - jest-haste-map: ^29.4.3 - jest-matcher-utils: ^29.4.3 - jest-message-util: ^29.4.3 - jest-util: ^29.4.3 + jest-matcher-utils: ^29.5.0 + jest-message-util: ^29.5.0 + jest-util: ^29.5.0 natural-compare: ^1.4.0 - pretty-format: ^29.4.3 + pretty-format: ^29.5.0 semver: ^7.3.5 - checksum: 79ba52f2435e23ce72b1309be4b17fdbcb299d1c2ce97ebb61df9a62711e9463035f63b4c849181b2fe5aa17b3e09d30ee4668cc25fb3c6f59511c010b4d9494 + checksum: fe5df54122ed10eed625de6416a45bc4958d5062b018f05b152bf9785ab7f355dcd55e40cf5da63895bf8278f8d7b2bb4059b2cfbfdee18f509d455d37d8aa2b languageName: node linkType: hard @@ -3560,70 +3560,70 @@ __metadata: languageName: node linkType: hard -"jest-util@npm:^29.4.3": - version: 29.4.3 - resolution: "jest-util@npm:29.4.3" +"jest-util@npm:^29.5.0": + version: 29.5.0 + resolution: "jest-util@npm:29.5.0" dependencies: - "@jest/types": ^29.4.3 + "@jest/types": ^29.5.0 "@types/node": "*" chalk: ^4.0.0 ci-info: ^3.2.0 graceful-fs: ^4.2.9 picomatch: ^2.2.3 - checksum: 606b3e6077895baf8fb4ad4d08c134f37a6b81d5ba77ae654c942b1ae4b7294ab3b5a0eb93db34f129407b367970cf3b76bf5c80897b30f215f2bc8bf20a5f3f + checksum: fd9212950d34d2ecad8c990dda0d8ea59a8a554b0c188b53ea5d6c4a0829a64f2e1d49e6e85e812014933d17426d7136da4785f9cf76fff1799de51b88bc85d3 languageName: node linkType: hard -"jest-validate@npm:^29.4.3": - version: 29.4.3 - resolution: "jest-validate@npm:29.4.3" +"jest-validate@npm:^29.5.0": + version: 29.5.0 + resolution: "jest-validate@npm:29.5.0" dependencies: - "@jest/types": ^29.4.3 + "@jest/types": ^29.5.0 camelcase: ^6.2.0 chalk: ^4.0.0 jest-get-type: ^29.4.3 leven: ^3.1.0 - pretty-format: ^29.4.3 - checksum: 983e56430d86bed238448cae031535c1d908f760aa312cd4a4ec0e92f3bc1b6675415ddf57cdeceedb8ad9c698e5bcd10f0a856dfc93a8923bdecc7733f4ba80 + pretty-format: ^29.5.0 + checksum: 43ca5df7cb75572a254ac3e92fbbe7be6b6a1be898cc1e887a45d55ea003f7a112717d814a674d37f9f18f52d8de40873c8f084f17664ae562736c78dd44c6a1 languageName: node linkType: hard -"jest-watcher@npm:^29.4.3": - version: 29.4.3 - resolution: "jest-watcher@npm:29.4.3" +"jest-watcher@npm:^29.5.0": + version: 29.5.0 + resolution: "jest-watcher@npm:29.5.0" dependencies: - "@jest/test-result": ^29.4.3 - "@jest/types": ^29.4.3 + "@jest/test-result": ^29.5.0 + "@jest/types": ^29.5.0 "@types/node": "*" ansi-escapes: ^4.2.1 chalk: ^4.0.0 emittery: ^0.13.1 - jest-util: ^29.4.3 + jest-util: ^29.5.0 string-length: ^4.0.1 - checksum: 44b64991b3414db853c3756f14690028f4edef7aebfb204a4291cc1901c2239fa27a8687c5c5abbecc74bf613e0bb9b1378bf766430c9febcc71e9c0cb5ad8fc + checksum: 62303ac7bdc7e61a8b4239a239d018f7527739da2b2be6a81a7be25b74ca769f1c43ee8558ce8e72bb857245c46d6e03af331227ffb00a57280abb2a928aa776 languageName: node linkType: hard -"jest-worker@npm:^29.4.3": - version: 29.4.3 - resolution: "jest-worker@npm:29.4.3" +"jest-worker@npm:^29.5.0": + version: 29.5.0 + resolution: "jest-worker@npm:29.5.0" dependencies: "@types/node": "*" - jest-util: ^29.4.3 + jest-util: ^29.5.0 merge-stream: ^2.0.0 supports-color: ^8.0.0 - checksum: c99ae66f257564613e72c5797c3a68f21a22e1c1fb5f30d14695ff5b508a0d2405f22748f13a3df8d1015b5e16abb130170f81f047ff68f58b6b1d2ff6ebc51b + checksum: 1151a1ae3602b1ea7c42a8f1efe2b5a7bf927039deaa0827bf978880169899b705744e288f80a63603fb3fc2985e0071234986af7dc2c21c7a64333d8777c7c9 languageName: node linkType: hard -"jest@npm:29.4.3": - version: 29.4.3 - resolution: "jest@npm:29.4.3" +"jest@npm:29.5.0": + version: 29.5.0 + resolution: "jest@npm:29.5.0" dependencies: - "@jest/core": ^29.4.3 - "@jest/types": ^29.4.3 + "@jest/core": ^29.5.0 + "@jest/types": ^29.5.0 import-local: ^3.0.2 - jest-cli: ^29.4.3 + jest-cli: ^29.5.0 peerDependencies: node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0 peerDependenciesMeta: @@ -3631,7 +3631,7 @@ __metadata: optional: true bin: jest: bin/jest.js - checksum: 084d10d1ceaade3c40e6d3bbd71b9b71b8919ba6fbd6f1f6699bdc259a6ba2f7350c7ccbfa10c11f7e3e01662853650a6244210179542fe4ba87e77dc3f3109f + checksum: a8ff2eb0f421623412236e23cbe67c638127fffde466cba9606bc0c0553b4c1e5cb116d7e0ef990b5d1712851652c8ee461373b578df50857fe635b94ff455d5 languageName: node linkType: hard @@ -4678,14 +4678,14 @@ __metadata: languageName: node linkType: hard -"pretty-format@npm:^29.4.3": - version: 29.4.3 - resolution: "pretty-format@npm:29.4.3" +"pretty-format@npm:^29.5.0": + version: 29.5.0 + resolution: "pretty-format@npm:29.5.0" dependencies: "@jest/schemas": ^29.4.3 ansi-styles: ^5.0.0 react-is: ^18.0.0 - checksum: 3258b9a010bd79b3cf73783ad1e4592b6326fc981b6e31b742f316f14e7fbac09b48a9dbf274d092d9bde404db9fe16f518370e121837dc078a597392e6e5cc5 + checksum: 4065356b558e6db25b4d41a01efb386935a6c06a0c9c104ef5ce59f2f476b8210edb8b3949b386e60ada0a6dc5ebcb2e6ccddc8c64dfd1a9943c3c3a9e7eaf89 languageName: node linkType: hard @@ -4758,6 +4758,13 @@ __metadata: languageName: node linkType: hard +"pure-rand@npm:^6.0.0": + version: 6.0.0 + resolution: "pure-rand@npm:6.0.0" + checksum: ad1378d0a4859482d053a5264b2b485b445ece4bbc56f8959c233ea678b81ac2d613737925d496ded134eff5f29cc5546bf7492b6bce319ee27bebbad8a0c612 + languageName: node + linkType: hard + "qs@npm:6.11.0": version: 6.11.0 resolution: "qs@npm:6.11.0" @@ -5655,7 +5662,7 @@ __metadata: hbs: 4.2.0 helmet: 6.0.1 http-status-codes: 2.2.0 - jest: 29.4.3 + jest: 29.5.0 logdown: 3.3.1 maxmind: 4.3.8 nocache: 3.0.4 From 5b3001065560dee6ee54cd92dfde97851b6a93bf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 12 Mar 2023 16:11:26 +0000 Subject: [PATCH 47/97] chore(deps): Bump react-router-dom from 6.8.2 to 6.9.0 (#14812) Bumps [react-router-dom](https://github.com/remix-run/react-router/tree/HEAD/packages/react-router-dom) from 6.8.2 to 6.9.0. - [Release notes](https://github.com/remix-run/react-router/releases) - [Changelog](https://github.com/remix-run/react-router/blob/main/packages/react-router-dom/CHANGELOG.md) - [Commits](https://github.com/remix-run/react-router/commits/react-router-dom@6.9.0/packages/react-router-dom) --- updated-dependencies: - dependency-name: react-router-dom dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 32 +++++++++++++++++++++++++------- 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 5835983186c..3bbf2eb37c8 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "react-intl": "6.2.10", "react-redux": "8.0.5", "react-router": "6.8.2", - "react-router-dom": "6.8.2", + "react-router-dom": "6.9.0", "react-transition-group": "4.4.5", "redux": "4.2.1", "redux-logdown": "1.0.4", diff --git a/yarn.lock b/yarn.lock index a2ba1739638..e69a14fe5ca 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3244,6 +3244,13 @@ __metadata: languageName: node linkType: hard +"@remix-run/router@npm:1.4.0": + version: 1.4.0 + resolution: "@remix-run/router@npm:1.4.0" + checksum: 707dce35a2b8138005cf19e63f6fd3c4da05b4b892e9e9118e8b727c3b95953efe27307ca2df35084044df30fa1fc367cf0bbc98d1ded9020c82e61e6242caaf + languageName: node + linkType: hard + "@rollup/plugin-babel@npm:^5.2.0": version: 5.2.2 resolution: "@rollup/plugin-babel@npm:5.2.2" @@ -14233,16 +14240,16 @@ __metadata: languageName: node linkType: hard -"react-router-dom@npm:6.8.2": - version: 6.8.2 - resolution: "react-router-dom@npm:6.8.2" +"react-router-dom@npm:6.9.0": + version: 6.9.0 + resolution: "react-router-dom@npm:6.9.0" dependencies: - "@remix-run/router": 1.3.3 - react-router: 6.8.2 + "@remix-run/router": 1.4.0 + react-router: 6.9.0 peerDependencies: react: ">=16.8" react-dom: ">=16.8" - checksum: eddc8b88e26c66408df894bdcf95efd6731e21b7cbfd7417cd456f0043916279e0559b06c6cdc19c2a55c6aefc4cc745fa4065d3505e519a95adbef0cc89e77f + checksum: 4d593491ab8db5611feda70002c62902baebb84d5c1c5e5b6172496f31f91130deee132bf4240dea634a88cb86c76d6da348f15b9cd5e5197be455efd88edf72 languageName: node linkType: hard @@ -14257,6 +14264,17 @@ __metadata: languageName: node linkType: hard +"react-router@npm:6.9.0": + version: 6.9.0 + resolution: "react-router@npm:6.9.0" + dependencies: + "@remix-run/router": 1.4.0 + peerDependencies: + react: ">=16.8" + checksum: b2a5f42e042bee7a7f116ca7817b0e58359e5353d84887c9fe7a633d7490c03b1e0ae37cd01830c2a381e3d1e7d501bb4751e53cc3d491e25f36582d3f6e0546 + languageName: node + linkType: hard + "react-select@npm:5.7.0": version: 5.7.0 resolution: "react-select@npm:5.7.0" @@ -17260,7 +17278,7 @@ __metadata: react-intl: 6.2.10 react-redux: 8.0.5 react-router: 6.8.2 - react-router-dom: 6.8.2 + react-router-dom: 6.9.0 react-transition-group: 4.4.5 redux: 4.2.1 redux-devtools-extension: 2.13.9 From 9d8bc93d9c43e07e0c69324fb384ec9c6d86e516 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 12 Mar 2023 16:13:40 +0000 Subject: [PATCH 48/97] chore(deps): Bump zustand from 4.3.5 to 4.3.6 (#14813) Bumps [zustand](https://github.com/pmndrs/zustand) from 4.3.5 to 4.3.6. - [Release notes](https://github.com/pmndrs/zustand/releases) - [Commits](https://github.com/pmndrs/zustand/compare/v4.3.5...v4.3.6) --- updated-dependencies: - dependency-name: zustand dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 3bbf2eb37c8..262ba19a035 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "underscore": "1.13.6", "uuidjs": "4.2.13", "webrtc-adapter": "6.4.8", - "zustand": "4.3.5" + "zustand": "4.3.6" }, "devDependencies": { "@babel/core": "7.21.0", diff --git a/yarn.lock b/yarn.lock index e69a14fe5ca..cf39f3a08f4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -17311,7 +17311,7 @@ __metadata: webpack-hot-middleware: 2.25.3 webrtc-adapter: 6.4.8 workbox-webpack-plugin: 6.5.4 - zustand: 4.3.5 + zustand: 4.3.6 languageName: unknown linkType: soft @@ -17765,9 +17765,9 @@ __metadata: languageName: node linkType: hard -"zustand@npm:4.3.5": - version: 4.3.5 - resolution: "zustand@npm:4.3.5" +"zustand@npm:4.3.6": + version: 4.3.6 + resolution: "zustand@npm:4.3.6" dependencies: use-sync-external-store: 1.2.0 peerDependencies: @@ -17778,6 +17778,6 @@ __metadata: optional: true react: optional: true - checksum: 166099ecadd870e5e0f51b5b443b71145149447b2bfe557d73254891dd0fe603d55c93e560649a7c31a30b4a180dd6d4f4d90463636fd54c3393ace3b68dbc67 + checksum: 4d3cec03526f04ff3de6dc45b6f038c47f091836af9660fbf5f682cae1628221102882df20e4048dfe699a43f67424e5d6afc1116f3838a80eea5dd4f95ddaed languageName: node linkType: hard From cbc2d17a954a1caaf526ded056ec9c647ad42227 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 12 Mar 2023 16:13:45 +0000 Subject: [PATCH 49/97] chore(deps-dev): Bump webpack from 5.75.0 to 5.76.1 (#14811) Bumps [webpack](https://github.com/webpack/webpack) from 5.75.0 to 5.76.1. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](https://github.com/webpack/webpack/compare/v5.75.0...v5.76.1) --- updated-dependencies: - dependency-name: webpack dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 262ba19a035..3172ea98d4c 100644 --- a/package.json +++ b/package.json @@ -171,7 +171,7 @@ "ts-node": "10.9.1", "tsc-watch": "6.0.0", "typescript": "^4.9.5", - "webpack": "5.75.0", + "webpack": "5.76.1", "webpack-cli": "5.0.1", "webpack-dev-middleware": "6.0.1", "webpack-hot-middleware": "2.25.3", diff --git a/yarn.lock b/yarn.lock index cf39f3a08f4..8ae10586e17 100644 --- a/yarn.lock +++ b/yarn.lock @@ -16945,9 +16945,9 @@ __metadata: languageName: node linkType: hard -"webpack@npm:5.75.0": - version: 5.75.0 - resolution: "webpack@npm:5.75.0" +"webpack@npm:5.76.1": + version: 5.76.1 + resolution: "webpack@npm:5.76.1" dependencies: "@types/eslint-scope": ^3.7.3 "@types/estree": ^0.0.51 @@ -16978,7 +16978,7 @@ __metadata: optional: true bin: webpack: bin/webpack.js - checksum: 2bcc5f3c195f375944e8af2f00bf2feea39cb9fda5f763b0d1b00077f1c51783db25c94d3fae96a07dead9fa085e6ae7474417e5ab31719c9776ea5969ceb83a + checksum: b01fe0bc2dbca0e10d290ddb0bf81e807a031de48028176e2b21afd696b4d3f25ab9accdad888ef4a1f7c7f4d41f13d5bf2395b7653fdf3e5e3dafa54e56dab2 languageName: node linkType: hard @@ -17305,7 +17305,7 @@ __metadata: uint32: 0.2.1 underscore: 1.13.6 uuidjs: 4.2.13 - webpack: 5.75.0 + webpack: 5.76.1 webpack-cli: 5.0.1 webpack-dev-middleware: 6.0.1 webpack-hot-middleware: 2.25.3 From 3fc1d339bd613ac4ff3327d1277707e9f7737b3c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 12 Mar 2023 16:14:50 +0000 Subject: [PATCH 50/97] chore(deps): Bump @wireapp/react-ui-kit from 9.3.9 to 9.4.0 (#14814) Bumps [@wireapp/react-ui-kit](https://github.com/wireapp/wire-web-packages) from 9.3.9 to 9.4.0. - [Release notes](https://github.com/wireapp/wire-web-packages/releases) - [Commits](https://github.com/wireapp/wire-web-packages/compare/@wireapp/react-ui-kit@9.3.9...@wireapp/react-ui-kit@9.4.0) --- updated-dependencies: - dependency-name: "@wireapp/react-ui-kit" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 3172ea98d4c..615b6c0a2a0 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "@wireapp/avs": "9.1.11", "@wireapp/core": "39.1.6", "@wireapp/lru-cache": "3.8.1", - "@wireapp/react-ui-kit": "9.3.9", + "@wireapp/react-ui-kit": "9.4.0", "@wireapp/store-engine-dexie": "2.0.4", "@wireapp/store-engine-sqleet": "1.8.9", "@wireapp/webapp-events": "0.16.0", diff --git a/yarn.lock b/yarn.lock index 8ae10586e17..d37341d33f3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4874,9 +4874,9 @@ __metadata: languageName: node linkType: hard -"@wireapp/react-ui-kit@npm:9.3.9": - version: 9.3.9 - resolution: "@wireapp/react-ui-kit@npm:9.3.9" +"@wireapp/react-ui-kit@npm:9.4.0": + version: 9.4.0 + resolution: "@wireapp/react-ui-kit@npm:9.4.0" dependencies: "@types/color": 3.0.3 color: 4.2.3 @@ -4891,7 +4891,7 @@ __metadata: peerDependenciesMeta: "@types/react": optional: true - checksum: fe352f5fe0472c148d36377a723911e57cb27bd3ce577b4712d0d24849ca8747b4b4e46e518b023c4ca0a50a97a42c3bed76cf36a89513b2ede7e08a62df3dd7 + checksum: 058847c31afc8b74d6d77aec33b959c9178a14551dd7df1db92cbd5afc1ea6f8abf764ff0adf5961bb5e8f3e8186c99b746645e65cf0b72aa0478aa8640e0498 languageName: node linkType: hard @@ -17189,7 +17189,7 @@ __metadata: "@wireapp/eslint-config": 2.1.1 "@wireapp/lru-cache": 3.8.1 "@wireapp/prettier-config": 0.5.2 - "@wireapp/react-ui-kit": 9.3.9 + "@wireapp/react-ui-kit": 9.4.0 "@wireapp/store-engine": ^5.0.3 "@wireapp/store-engine-dexie": 2.0.4 "@wireapp/store-engine-sqleet": 1.8.9 From 95cb1cab2bc4a7565230d2cda1fb805a08341b6b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 12 Mar 2023 16:16:57 +0000 Subject: [PATCH 51/97] chore(deps-dev): Bump jest-environment-jsdom from 29.4.3 to 29.5.0 (#14816) Bumps [jest-environment-jsdom](https://github.com/facebook/jest/tree/HEAD/packages/jest-environment-jsdom) from 29.4.3 to 29.5.0. - [Release notes](https://github.com/facebook/jest/releases) - [Changelog](https://github.com/facebook/jest/blob/main/CHANGELOG.md) - [Commits](https://github.com/facebook/jest/commits/v29.5.0/packages/jest-environment-jsdom) --- updated-dependencies: - dependency-name: jest-environment-jsdom dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 113 ++++++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 104 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index 615b6c0a2a0..a59cb24b9a0 100644 --- a/package.json +++ b/package.json @@ -138,7 +138,7 @@ "intersection-observer": "0.12.2", "jest": "29.4.3", "jest-canvas-mock": "2.4.0", - "jest-environment-jsdom": "29.4.3", + "jest-environment-jsdom": "29.5.0", "jest-jasmine2": "29.4.3", "jsdom-worker": "0.3.0", "less": "3.13.1", diff --git a/yarn.lock b/yarn.lock index d37341d33f3..bf8869cfd9a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2766,6 +2766,18 @@ __metadata: languageName: node linkType: hard +"@jest/environment@npm:^29.5.0": + version: 29.5.0 + resolution: "@jest/environment@npm:29.5.0" + dependencies: + "@jest/fake-timers": ^29.5.0 + "@jest/types": ^29.5.0 + "@types/node": "*" + jest-mock: ^29.5.0 + checksum: 921de6325cd4817dec6685e5ff299b499b6379f3f9cf489b4b13588ee1f3820a0c77b49e6a087996b6de8f629f6f5251e636cba08d1bdb97d8071cc7d033c88a + languageName: node + linkType: hard + "@jest/expect-utils@npm:^29.4.1": version: 29.4.1 resolution: "@jest/expect-utils@npm:29.4.1" @@ -2808,6 +2820,20 @@ __metadata: languageName: node linkType: hard +"@jest/fake-timers@npm:^29.5.0": + version: 29.5.0 + resolution: "@jest/fake-timers@npm:29.5.0" + dependencies: + "@jest/types": ^29.5.0 + "@sinonjs/fake-timers": ^10.0.2 + "@types/node": "*" + jest-message-util: ^29.5.0 + jest-mock: ^29.5.0 + jest-util: ^29.5.0 + checksum: 69930c6922341f244151ec0d27640852ec96237f730fc024da1f53143d31b43cde75d92f9d8e5937981cdce3b31416abc3a7090a0d22c2377512c4a6613244ee + languageName: node + linkType: hard + "@jest/globals@npm:^29.4.3": version: 29.4.3 resolution: "@jest/globals@npm:29.4.3" @@ -2961,6 +2987,20 @@ __metadata: languageName: node linkType: hard +"@jest/types@npm:^29.5.0": + version: 29.5.0 + resolution: "@jest/types@npm:29.5.0" + dependencies: + "@jest/schemas": ^29.4.3 + "@types/istanbul-lib-coverage": ^2.0.0 + "@types/istanbul-reports": ^3.0.0 + "@types/node": "*" + "@types/yargs": ^17.0.8 + chalk: ^4.0.0 + checksum: 1811f94b19cf8a9460a289c4f056796cfc373480e0492692a6125a553cd1a63824bd846d7bb78820b7b6f758f6dd3c2d4558293bb676d541b2fa59c70fdf9d39 + languageName: node + linkType: hard + "@jridgewell/gen-mapping@npm:^0.1.0": version: 0.1.1 resolution: "@jridgewell/gen-mapping@npm:0.1.1" @@ -10473,24 +10513,24 @@ __metadata: languageName: node linkType: hard -"jest-environment-jsdom@npm:29.4.3": - version: 29.4.3 - resolution: "jest-environment-jsdom@npm:29.4.3" +"jest-environment-jsdom@npm:29.5.0": + version: 29.5.0 + resolution: "jest-environment-jsdom@npm:29.5.0" dependencies: - "@jest/environment": ^29.4.3 - "@jest/fake-timers": ^29.4.3 - "@jest/types": ^29.4.3 + "@jest/environment": ^29.5.0 + "@jest/fake-timers": ^29.5.0 + "@jest/types": ^29.5.0 "@types/jsdom": ^20.0.0 "@types/node": "*" - jest-mock: ^29.4.3 - jest-util: ^29.4.3 + jest-mock: ^29.5.0 + jest-util: ^29.5.0 jsdom: ^20.0.0 peerDependencies: canvas: ^2.5.0 peerDependenciesMeta: canvas: optional: true - checksum: 3fb29bb4b472e05a38fdb235aa936ad469dfa2f6c1cab97fe3d1a7c585351976d05c7bbbd715b9747f070a225dcf10a9166df1461e0fb838ea7a377a8e64bed4 + checksum: 3df7fc85275711f20b483ac8cd8c04500704ed0f69791eb55c574b38f5a39470f03d775cf20c1025bc1884916ac0573aa2fa4db1bb74225bc7fdd95ba97ad0da languageName: node linkType: hard @@ -10638,6 +10678,23 @@ __metadata: languageName: node linkType: hard +"jest-message-util@npm:^29.5.0": + version: 29.5.0 + resolution: "jest-message-util@npm:29.5.0" + dependencies: + "@babel/code-frame": ^7.12.13 + "@jest/types": ^29.5.0 + "@types/stack-utils": ^2.0.0 + chalk: ^4.0.0 + graceful-fs: ^4.2.9 + micromatch: ^4.0.4 + pretty-format: ^29.5.0 + slash: ^3.0.0 + stack-utils: ^2.0.3 + checksum: daddece6bbf846eb6a2ab9be9f2446e54085bef4e5cecd13d2a538fa9c01cb89d38e564c6b74fd8e12d37ed9eface8a362240ae9f21d68b214590631e7a0d8bf + languageName: node + linkType: hard + "jest-mock@npm:^29.4.3": version: 29.4.3 resolution: "jest-mock@npm:29.4.3" @@ -10649,6 +10706,17 @@ __metadata: languageName: node linkType: hard +"jest-mock@npm:^29.5.0": + version: 29.5.0 + resolution: "jest-mock@npm:29.5.0" + dependencies: + "@jest/types": ^29.5.0 + "@types/node": "*" + jest-util: ^29.5.0 + checksum: 2a9cf07509948fa8608898c445f04fe4dd6e2049ff431e5531eee028c808d3ba3c67f226ac87b0cf383feaa1055776900d197c895e89783016886ac17a4ff10c + languageName: node + linkType: hard + "jest-pnp-resolver@npm:^1.2.2": version: 1.2.2 resolution: "jest-pnp-resolver@npm:1.2.2" @@ -10814,6 +10882,20 @@ __metadata: languageName: node linkType: hard +"jest-util@npm:^29.5.0": + version: 29.5.0 + resolution: "jest-util@npm:29.5.0" + dependencies: + "@jest/types": ^29.5.0 + "@types/node": "*" + chalk: ^4.0.0 + ci-info: ^3.2.0 + graceful-fs: ^4.2.9 + picomatch: ^2.2.3 + checksum: fd9212950d34d2ecad8c990dda0d8ea59a8a554b0c188b53ea5d6c4a0829a64f2e1d49e6e85e812014933d17426d7136da4785f9cf76fff1799de51b88bc85d3 + languageName: node + linkType: hard + "jest-validate@npm:^29.4.3": version: 29.4.3 resolution: "jest-validate@npm:29.4.3" @@ -13957,6 +14039,17 @@ __metadata: languageName: node linkType: hard +"pretty-format@npm:^29.5.0": + version: 29.5.0 + resolution: "pretty-format@npm:29.5.0" + dependencies: + "@jest/schemas": ^29.4.3 + ansi-styles: ^5.0.0 + react-is: ^18.0.0 + checksum: 4065356b558e6db25b4d41a01efb386935a6c06a0c9c104ef5ce59f2f476b8210edb8b3949b386e60ada0a6dc5ebcb2e6ccddc8c64dfd1a9943c3c3a9e7eaf89 + languageName: node + linkType: hard + "process-nextick-args@npm:^2.0.0, process-nextick-args@npm:~2.0.0": version: 2.0.1 resolution: "process-nextick-args@npm:2.0.1" @@ -17245,7 +17338,7 @@ __metadata: intersection-observer: 0.12.2 jest: 29.4.3 jest-canvas-mock: 2.4.0 - jest-environment-jsdom: 29.4.3 + jest-environment-jsdom: 29.5.0 jest-jasmine2: 29.4.3 jquery: 3.6.3 js-cookie: 3.0.1 From 2e44e90319b7fdd96db7c38ded499d69bd62a86e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 12 Mar 2023 16:17:57 +0000 Subject: [PATCH 52/97] chore(deps): Bump react-router from 6.8.2 to 6.9.0 (#14815) Bumps [react-router](https://github.com/remix-run/react-router/tree/HEAD/packages/react-router) from 6.8.2 to 6.9.0. - [Release notes](https://github.com/remix-run/react-router/releases) - [Changelog](https://github.com/remix-run/react-router/blob/main/packages/react-router/CHANGELOG.md) - [Commits](https://github.com/remix-run/react-router/commits/react-router@6.9.0/packages/react-router) --- updated-dependencies: - dependency-name: react-router dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 20 +------------------- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/package.json b/package.json index a59cb24b9a0..830bcf86b05 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "react-dom": "18.2.0", "react-intl": "6.2.10", "react-redux": "8.0.5", - "react-router": "6.8.2", + "react-router": "6.9.0", "react-router-dom": "6.9.0", "react-transition-group": "4.4.5", "redux": "4.2.1", diff --git a/yarn.lock b/yarn.lock index bf8869cfd9a..b1b0677e4e8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3277,13 +3277,6 @@ __metadata: languageName: node linkType: hard -"@remix-run/router@npm:1.3.3": - version: 1.3.3 - resolution: "@remix-run/router@npm:1.3.3" - checksum: 9280f1c3e44c0fb84a74b401b5a47022dace06d5da0f26a7a68c7c0e57ad5ef95d30f3c2d333df2db3b63f84de81f7f8caa7e53189a7709d6c3eb466d126ed76 - languageName: node - linkType: hard - "@remix-run/router@npm:1.4.0": version: 1.4.0 resolution: "@remix-run/router@npm:1.4.0" @@ -14346,17 +14339,6 @@ __metadata: languageName: node linkType: hard -"react-router@npm:6.8.2": - version: 6.8.2 - resolution: "react-router@npm:6.8.2" - dependencies: - "@remix-run/router": 1.3.3 - peerDependencies: - react: ">=16.8" - checksum: 9e98d03e1f18bfd5a35144a0c675adaf7c46a9ad436efdea2b52ef3a6e501ac6174a67ea90004e1339cd45019d6b1eb370627518320f7af9323ae74e0c6756ad - languageName: node - linkType: hard - "react-router@npm:6.9.0": version: 6.9.0 resolution: "react-router@npm:6.9.0" @@ -17370,7 +17352,7 @@ __metadata: react-dom: 18.2.0 react-intl: 6.2.10 react-redux: 8.0.5 - react-router: 6.8.2 + react-router: 6.9.0 react-router-dom: 6.9.0 react-transition-group: 4.4.5 redux: 4.2.1 From 0fce019e83f40978aca3a48365d1360e84e52314 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 12 Mar 2023 16:18:49 +0000 Subject: [PATCH 53/97] chore(deps-dev): Bump cspell from 6.28.0 to 6.29.0 (#14818) Bumps [cspell](https://github.com/streetsidesoftware/cspell) from 6.28.0 to 6.29.0. - [Release notes](https://github.com/streetsidesoftware/cspell/releases) - [Changelog](https://github.com/streetsidesoftware/cspell/blob/main/CHANGELOG.md) - [Commits](https://github.com/streetsidesoftware/cspell/compare/v6.28.0...v6.29.0) --- updated-dependencies: - dependency-name: cspell dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 197 ++++++++++++++++++++++++++------------------------- 2 files changed, 100 insertions(+), 99 deletions(-) diff --git a/package.json b/package.json index 830bcf86b05..91803fd52c2 100644 --- a/package.json +++ b/package.json @@ -103,7 +103,7 @@ "babel-loader": "9.1.2", "caniuse-lite": "^1.0.30001464", "cross-env": "7.0.3", - "cspell": "6.28.0", + "cspell": "6.29.0", "css-loader": "^6.7.3", "cssnano": "^5.1.14", "dexie": "^3.2.2", diff --git a/yarn.lock b/yarn.lock index b1b0677e4e8..ed1b5ebf058 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1622,14 +1622,14 @@ __metadata: languageName: node linkType: hard -"@cspell/cspell-bundled-dicts@npm:6.28.0": - version: 6.28.0 - resolution: "@cspell/cspell-bundled-dicts@npm:6.28.0" +"@cspell/cspell-bundled-dicts@npm:6.29.0": + version: 6.29.0 + resolution: "@cspell/cspell-bundled-dicts@npm:6.29.0" dependencies: "@cspell/dict-ada": ^4.0.1 "@cspell/dict-aws": ^3.0.0 "@cspell/dict-bash": ^4.1.1 - "@cspell/dict-companies": ^3.0.8 + "@cspell/dict-companies": ^3.0.9 "@cspell/dict-cpp": ^4.0.3 "@cspell/dict-cryptocurrencies": ^3.0.1 "@cspell/dict-csharp": ^4.0.2 @@ -1661,39 +1661,39 @@ __metadata: "@cspell/dict-php": ^3.0.4 "@cspell/dict-powershell": ^4.0.2 "@cspell/dict-public-licenses": ^2.0.1 - "@cspell/dict-python": ^4.0.1 + "@cspell/dict-python": ^4.0.2 "@cspell/dict-r": ^2.0.1 "@cspell/dict-ruby": ^4.0.2 "@cspell/dict-rust": ^4.0.1 "@cspell/dict-scala": ^4.0.1 "@cspell/dict-software-terms": ^3.1.5 - "@cspell/dict-sql": ^2.0.2 + "@cspell/dict-sql": ^2.1.0 "@cspell/dict-svelte": ^1.0.2 "@cspell/dict-swift": ^2.0.1 "@cspell/dict-typescript": ^3.1.1 "@cspell/dict-vue": ^3.0.0 - checksum: 5c99743b0869c85b35c0a7ffc91cce89df44cf6b5fdc700a8c7d9ef0415b03b06ad875adf3a334ad3940fe8e65ed0e0123f1cc5eae6cda74f6cfccce63e49eb0 + checksum: 54334e514d72a922064b1af4455c291499dde908fab6beccccef8ccf3670a47907557f67ab4874e8882750a62336a50aa562f8df86a86d3b7a5adca7cc4965b4 languageName: node linkType: hard -"@cspell/cspell-pipe@npm:6.28.0": - version: 6.28.0 - resolution: "@cspell/cspell-pipe@npm:6.28.0" - checksum: d7021e7b08f98d2e48f208d75837b2137da723f5de85caec988ca541e2b5ca0181e8aa474713da1fb0de4fd993e9e07a88537aa18530272a069c78c9aa20a410 +"@cspell/cspell-pipe@npm:6.29.0": + version: 6.29.0 + resolution: "@cspell/cspell-pipe@npm:6.29.0" + checksum: d44dab891759320d93199d147c04798f5fe85d39668b5113f661ea29b601e4268451e465b219975038e2f33b83e033e40b2500b4ca5100f1da106b3b79c8c9e7 languageName: node linkType: hard -"@cspell/cspell-service-bus@npm:6.28.0": - version: 6.28.0 - resolution: "@cspell/cspell-service-bus@npm:6.28.0" - checksum: 8f96566539dd860e77343982f1ce663582fbeda3583c2a91e236cdd1036d0cf0b6f7a30f42b3b80912bb48e65be9333c3158fe69b3caa47880902bb9a751df09 +"@cspell/cspell-service-bus@npm:6.29.0": + version: 6.29.0 + resolution: "@cspell/cspell-service-bus@npm:6.29.0" + checksum: 86c45ca2875def4e41783653f394bc151f21eab91855785c938dcb1adc68f797ad4633a5f88e65d2ab058561563380cccd38e50b5c5bbd586d4d0192d705795e languageName: node linkType: hard -"@cspell/cspell-types@npm:6.28.0": - version: 6.28.0 - resolution: "@cspell/cspell-types@npm:6.28.0" - checksum: ea9702df67911fc475e8e5123a76ab801b513948d280433125858fbddd0cdba0a6c3dc1eefc6a42e1cebe14b1c50a5152472d2cd8d06c3bb47230d358a408789 +"@cspell/cspell-types@npm:6.29.0": + version: 6.29.0 + resolution: "@cspell/cspell-types@npm:6.29.0" + checksum: 346112da605c2221d7bd2b44d053fee24596ed002f4e5f8518ae960dfff0da8bcfe020c6a9e5a7469929a2db418cb0b380379ecbca2ce037d8016f90fbf4f91b languageName: node linkType: hard @@ -1718,10 +1718,10 @@ __metadata: languageName: node linkType: hard -"@cspell/dict-companies@npm:^3.0.8": - version: 3.0.8 - resolution: "@cspell/dict-companies@npm:3.0.8" - checksum: 29cc4d36bb04b9ee83eb22d3bffe0ad32923fa44b323e221146a6f5f883b4e08f718c200b112ef8489e495aa2d6b1bc05210f5afdd7c13d72f7f4ba64530d013 +"@cspell/dict-companies@npm:^3.0.9": + version: 3.0.9 + resolution: "@cspell/dict-companies@npm:3.0.9" + checksum: 9f6446707072002ec653b42d2a1c06f82a8d21445ed7e2953a6f9cded1d02f5f58735c387b1bcadead88825c4edce3daccdbf7136f5d6e2d79f02580ef5f55a4 languageName: node linkType: hard @@ -1942,10 +1942,10 @@ __metadata: languageName: node linkType: hard -"@cspell/dict-python@npm:^4.0.1": - version: 4.0.1 - resolution: "@cspell/dict-python@npm:4.0.1" - checksum: 83ceb2779c64fb8370dfb6070015cea6337905a7066d38e69508a20976236a5e691b9926f11f4a2391ad5676a9245b5bf981a9118db2ad483baab04741467956 +"@cspell/dict-python@npm:^4.0.2": + version: 4.0.2 + resolution: "@cspell/dict-python@npm:4.0.2" + checksum: 23825b92af39a9b43a6af3862babbeaf01a5718ffe621e9f487400dc62582e5bd840213af22f1b2f4a78ba8e8b24dbb4cd7de9c190aa2cfea2bff7c15338ae7a languageName: node linkType: hard @@ -1984,10 +1984,10 @@ __metadata: languageName: node linkType: hard -"@cspell/dict-sql@npm:^2.0.2": - version: 2.0.2 - resolution: "@cspell/dict-sql@npm:2.0.2" - checksum: 308201fceffc1e830c81338749b78edf96d4fc81f9a14b7327502feaca03f14bf4a213aa25d8f5622af26637e2e172c452fafc6c0f5ca31af3442a57c9818135 +"@cspell/dict-sql@npm:^2.1.0": + version: 2.1.0 + resolution: "@cspell/dict-sql@npm:2.1.0" + checksum: 12eb8f1d3cb9d2f7957375b7258f4e13c2482de3e46a567e4854159e1d6242ca6e25575ccbddcb5c10b1ca8f738d271eabce7c4538e1f31e610bcd002f800b4a languageName: node linkType: hard @@ -2019,19 +2019,19 @@ __metadata: languageName: node linkType: hard -"@cspell/dynamic-import@npm:6.28.0": - version: 6.28.0 - resolution: "@cspell/dynamic-import@npm:6.28.0" +"@cspell/dynamic-import@npm:6.29.0": + version: 6.29.0 + resolution: "@cspell/dynamic-import@npm:6.29.0" dependencies: import-meta-resolve: ^2.2.1 - checksum: 0b5dc40a45388a1922fac13472f4bf92e47c88da94bcdb23d3536f03570257bf843e9c670d2a30d6f78ad15d8656def4384f0a1f93b7ca42d03de1ef5412f7e6 + checksum: dc7d7e8f6ee46762e733d2394e33e7452713ce6d9b44ae58c2201f6e9840f73967025d4d1a0d77f57cae56fc34a96e21800aab78c64bf71d130f0d74ee7aef87 languageName: node linkType: hard -"@cspell/strong-weak-map@npm:6.28.0": - version: 6.28.0 - resolution: "@cspell/strong-weak-map@npm:6.28.0" - checksum: 5fa5fd500972076951e0f8cde3922228c8815abf0d99b6e19144512743f6021cb4734b210084e026f0d0f0df687257b622941b80ba3e7eeb579fe67e9197998a +"@cspell/strong-weak-map@npm:6.29.0": + version: 6.29.0 + resolution: "@cspell/strong-weak-map@npm:6.29.0" + checksum: 52fbcc5dce9c21cbe11297549d61043838f6eadd7303510cce1b19c84d562f0b85259f28cfa2221c4dfc811fe7841532bfd6e2fc8f63dac0e533171533ff37c7 languageName: node linkType: hard @@ -6719,79 +6719,79 @@ __metadata: languageName: node linkType: hard -"cspell-dictionary@npm:6.28.0": - version: 6.28.0 - resolution: "cspell-dictionary@npm:6.28.0" +"cspell-dictionary@npm:6.29.0": + version: 6.29.0 + resolution: "cspell-dictionary@npm:6.29.0" dependencies: - "@cspell/cspell-pipe": 6.28.0 - "@cspell/cspell-types": 6.28.0 - cspell-trie-lib: 6.28.0 + "@cspell/cspell-pipe": 6.29.0 + "@cspell/cspell-types": 6.29.0 + cspell-trie-lib: 6.29.0 fast-equals: ^4.0.3 gensequence: ^5.0.2 - checksum: cc49a843d04e7beb3cf9e3874c59df4d5878aee04ae643ac854c3681d4eee9a2d1d75dd32c455392dda01d5539eb6099c69f2d544bbec398c3a0a7a833219836 + checksum: 75cbd476399dbfb1cc0128dffc9cf677b1411a16daee80fae8a46c5075634d649c51ea1fc5575d2e069d0652c07b58e4a277eefb401da3ba52c586e1673aa36d languageName: node linkType: hard -"cspell-gitignore@npm:6.28.0": - version: 6.28.0 - resolution: "cspell-gitignore@npm:6.28.0" +"cspell-gitignore@npm:6.29.0": + version: 6.29.0 + resolution: "cspell-gitignore@npm:6.29.0" dependencies: - cspell-glob: 6.28.0 + cspell-glob: 6.29.0 find-up: ^5.0.0 bin: - cspell-gitignore: bin.js - checksum: 0c8e590ff166c89ec32542bca5bb0a0481a5bcc60671ae497dcaa1ad4a44e593799285a27f84ddccfe218bf2782af21dac4fefc68b12bebbc7236b6adaa25deb + cspell-gitignore: bin.mjs + checksum: bd5c20e4816d90e1248d106fd5e1bf933904d9e0a673da7271d7924ee14ab70cd648fff347cf585f6f51f9ee500c780d81a09c00a4a76e635e0b19966e940303 languageName: node linkType: hard -"cspell-glob@npm:6.28.0": - version: 6.28.0 - resolution: "cspell-glob@npm:6.28.0" +"cspell-glob@npm:6.29.0": + version: 6.29.0 + resolution: "cspell-glob@npm:6.29.0" dependencies: micromatch: ^4.0.5 - checksum: 054ee7b40a88d76e626a66155cd1d8329058b46a302f2321a1f17995da862e7cc8c57580f0d95763d4eded3845ad181b104991f05cc6ec653082742a15e85789 + checksum: 29aeadb39c402cd66cc8decb1f2d53020fa42212da71d8d91a7e2a7c171ceda75073ddb1158f418b306e62408509ee1ed57461ac7994d7578da9673dbd514e8d languageName: node linkType: hard -"cspell-grammar@npm:6.28.0": - version: 6.28.0 - resolution: "cspell-grammar@npm:6.28.0" +"cspell-grammar@npm:6.29.0": + version: 6.29.0 + resolution: "cspell-grammar@npm:6.29.0" dependencies: - "@cspell/cspell-pipe": 6.28.0 - "@cspell/cspell-types": 6.28.0 + "@cspell/cspell-pipe": 6.29.0 + "@cspell/cspell-types": 6.29.0 bin: - cspell-grammar: bin.js - checksum: dd194625841c7db82a7b15e9ffcd6250e84fff578d1cd5cd62d6c78bc7aae75cb1dded4ce461f785a71a8e13a224e0458272d18de2f71399de97f1a0acb77d12 + cspell-grammar: bin.mjs + checksum: e9bfdf909d445d5e1a911379e66eb918d366f29f63a75b3295c083efb31c8859ea1801b70597fb89a87bab659b65acb65b2dca2ed4253c7fa69ce5ed13efa143 languageName: node linkType: hard -"cspell-io@npm:6.28.0": - version: 6.28.0 - resolution: "cspell-io@npm:6.28.0" +"cspell-io@npm:6.29.0": + version: 6.29.0 + resolution: "cspell-io@npm:6.29.0" dependencies: - "@cspell/cspell-service-bus": 6.28.0 + "@cspell/cspell-service-bus": 6.29.0 node-fetch: ^2.6.9 - checksum: 5deaedea891dcaa08230c4464d0c1c6b7867284dc3710e1fe4ca9ba1fedf502550598dd9960b92b4be42355be8c330015789a4b10b9e7171ceae4c47483530e2 + checksum: f252d61661b97f22aec429eb969fc6ba1fbd860b72fc7832405f9aaf27261b0f90b70c0fbc5433ad4f831f6c542593e8c0f5fd82770c40a3d7de0fada3b1c30c languageName: node linkType: hard -"cspell-lib@npm:6.28.0": - version: 6.28.0 - resolution: "cspell-lib@npm:6.28.0" +"cspell-lib@npm:6.29.0": + version: 6.29.0 + resolution: "cspell-lib@npm:6.29.0" dependencies: - "@cspell/cspell-bundled-dicts": 6.28.0 - "@cspell/cspell-pipe": 6.28.0 - "@cspell/cspell-types": 6.28.0 - "@cspell/strong-weak-map": 6.28.0 + "@cspell/cspell-bundled-dicts": 6.29.0 + "@cspell/cspell-pipe": 6.29.0 + "@cspell/cspell-types": 6.29.0 + "@cspell/strong-weak-map": 6.29.0 clear-module: ^4.1.2 comment-json: ^4.2.3 configstore: ^5.0.1 cosmiconfig: ^8.1.0 - cspell-dictionary: 6.28.0 - cspell-glob: 6.28.0 - cspell-grammar: 6.28.0 - cspell-io: 6.28.0 - cspell-trie-lib: 6.28.0 + cspell-dictionary: 6.29.0 + cspell-glob: 6.29.0 + cspell-grammar: 6.29.0 + cspell-io: 6.29.0 + cspell-trie-lib: 6.29.0 fast-equals: ^4.0.3 find-up: ^5.0.0 gensequence: ^5.0.2 @@ -6800,33 +6800,33 @@ __metadata: resolve-global: ^1.0.0 vscode-languageserver-textdocument: ^1.0.8 vscode-uri: ^3.0.7 - checksum: 9b31d2199d853dbbb892fb06ad887363e1781a7a80e21c1d1723819162d955a3d14d437e20b646665a7a819c02fd4072f7201a1cacddf7ab3fe9b7a8e7028d16 + checksum: c8d05867673d02d778f41e284964c889a4282dca039b9dc3e646b5332792e834b871de1b110c67ccb914d671a69c2f5bb5a9c7c4dd165d55a4cc6c87932caa8d languageName: node linkType: hard -"cspell-trie-lib@npm:6.28.0": - version: 6.28.0 - resolution: "cspell-trie-lib@npm:6.28.0" +"cspell-trie-lib@npm:6.29.0": + version: 6.29.0 + resolution: "cspell-trie-lib@npm:6.29.0" dependencies: - "@cspell/cspell-pipe": 6.28.0 - "@cspell/cspell-types": 6.28.0 + "@cspell/cspell-pipe": 6.29.0 + "@cspell/cspell-types": 6.29.0 gensequence: ^5.0.2 - checksum: 666ad0484d93a8d7b0605a2503561694260e46fd75147ab95ae6b6022ae39d7013810edf3f78583cb86ea9df83a2d57b54620719af09aeb0c6b67725ebedeb01 + checksum: 8fcaace9e9e1e0e711888123f58aca37c0961160e6c4386be0c81cdc01b34b47df52786ca9e310a0fc139dc4242efff1b90385a7b3cc12faead5e6b9b7b9a560 languageName: node linkType: hard -"cspell@npm:6.28.0": - version: 6.28.0 - resolution: "cspell@npm:6.28.0" +"cspell@npm:6.29.0": + version: 6.29.0 + resolution: "cspell@npm:6.29.0" dependencies: - "@cspell/cspell-pipe": 6.28.0 - "@cspell/dynamic-import": 6.28.0 + "@cspell/cspell-pipe": 6.29.0 + "@cspell/dynamic-import": 6.29.0 chalk: ^4.1.2 commander: ^10.0.0 - cspell-gitignore: 6.28.0 - cspell-glob: 6.28.0 - cspell-io: 6.28.0 - cspell-lib: 6.28.0 + cspell-gitignore: 6.29.0 + cspell-glob: 6.29.0 + cspell-io: 6.29.0 + cspell-lib: 6.29.0 fast-glob: ^3.2.12 fast-json-stable-stringify: ^2.1.0 file-entry-cache: ^6.0.1 @@ -6837,7 +6837,8 @@ __metadata: vscode-uri: ^3.0.7 bin: cspell: bin.js - checksum: cdb70b8ccd6be026b9dec4f462cd709bccb64c2f001c6cb7ec549b6a4053649cc9d29361d2865fc8abf198a5764ac7f7d659ebf92647b14146605081767b60ee + cspell-esm: bin.mjs + checksum: ade7b1ceea995923a1aebb9cfa8c2e5a041876fdcf564c43c42d4ebf68de10b9e2e62f185ddb6e587c455a672cae8a74da85a3d2fe5688398a67e31cb3cab8aa languageName: node linkType: hard @@ -17281,7 +17282,7 @@ __metadata: core-js: 3.25.5 countly-sdk-web: 22.6.5 cross-env: 7.0.3 - cspell: 6.28.0 + cspell: 6.29.0 css-loader: ^6.7.3 cssnano: ^5.1.14 date-fns: 2.29.3 From 467387dcabc1ccfc0db28c8c34756859193d0d74 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 12 Mar 2023 16:19:32 +0000 Subject: [PATCH 54/97] chore(deps-dev): Bump terser-webpack-plugin from 5.3.6 to 5.3.7 (#14819) Bumps [terser-webpack-plugin](https://github.com/webpack-contrib/terser-webpack-plugin) from 5.3.6 to 5.3.7. - [Release notes](https://github.com/webpack-contrib/terser-webpack-plugin/releases) - [Changelog](https://github.com/webpack-contrib/terser-webpack-plugin/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/terser-webpack-plugin/compare/v5.3.6...v5.3.7) --- updated-dependencies: - dependency-name: terser-webpack-plugin dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 49 +++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 48 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 91803fd52c2..ac4abf8e7d6 100644 --- a/package.json +++ b/package.json @@ -166,7 +166,7 @@ "stylelint-config-idiomatic-order": "9.0.0", "stylelint-config-prettier": "9.0.5", "svg-inline-loader": "0.8.2", - "terser-webpack-plugin": "5.3.6", + "terser-webpack-plugin": "5.3.7", "text-encoding": "0.7.0", "ts-node": "10.9.1", "tsc-watch": "6.0.0", diff --git a/yarn.lock b/yarn.lock index ed1b5ebf058..f4eedc05edd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -15117,6 +15117,15 @@ __metadata: languageName: node linkType: hard +"serialize-javascript@npm:^6.0.1": + version: 6.0.1 + resolution: "serialize-javascript@npm:6.0.1" + dependencies: + randombytes: ^2.1.0 + checksum: 3c4f4cb61d0893b988415bdb67243637333f3f574e9e9cc9a006a2ced0b390b0b3b44aef8d51c951272a9002ec50885eefdc0298891bc27eb2fe7510ea87dc4f + languageName: node + linkType: hard + "set-blocking@npm:^2.0.0": version: 2.0.0 resolution: "set-blocking@npm:2.0.0" @@ -16019,7 +16028,29 @@ __metadata: languageName: node linkType: hard -"terser-webpack-plugin@npm:5.3.6, terser-webpack-plugin@npm:^5.1.3": +"terser-webpack-plugin@npm:5.3.7": + version: 5.3.7 + resolution: "terser-webpack-plugin@npm:5.3.7" + dependencies: + "@jridgewell/trace-mapping": ^0.3.17 + jest-worker: ^27.4.5 + schema-utils: ^3.1.1 + serialize-javascript: ^6.0.1 + terser: ^5.16.5 + peerDependencies: + webpack: ^5.1.0 + peerDependenciesMeta: + "@swc/core": + optional: true + esbuild: + optional: true + uglify-js: + optional: true + checksum: 095e699fdeeb553cdf2c6f75f983949271b396d9c201d7ae9fc633c45c1c1ad14c7257ef9d51ccc62213dd3e97f875870ba31550f6d4f1b6674f2615562da7f7 + languageName: node + linkType: hard + +"terser-webpack-plugin@npm:^5.1.3": version: 5.3.6 resolution: "terser-webpack-plugin@npm:5.3.6" dependencies: @@ -16055,6 +16086,20 @@ __metadata: languageName: node linkType: hard +"terser@npm:^5.16.5": + version: 5.16.6 + resolution: "terser@npm:5.16.6" + dependencies: + "@jridgewell/source-map": ^0.3.2 + acorn: ^8.5.0 + commander: ^2.20.0 + source-map-support: ~0.5.20 + bin: + terser: bin/terser + checksum: f763a7bcc7b98cb2bfc41434f7b92bfe8a701a12c92ea6049377736c8e6de328240d654a20dfe15ce170fd783491b9873fad9f4cd8fee4f6c6fb8ca407859dee + languageName: node + linkType: hard + "test-exclude@npm:^6.0.0": version: 6.0.0 resolution: "test-exclude@npm:6.0.0" @@ -17372,7 +17417,7 @@ __metadata: stylelint-config-prettier: 9.0.5 svg-inline-loader: 0.8.2 switch-path: 1.2.0 - terser-webpack-plugin: 5.3.6 + terser-webpack-plugin: 5.3.7 text-encoding: 0.7.0 ts-node: 10.9.1 tsc-watch: 6.0.0 From f8a36cab220d57c305053555030e494a2a491e88 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 12 Mar 2023 16:23:15 +0000 Subject: [PATCH 55/97] chore(deps-dev): Bump @typescript-eslint/parser from 5.54.0 to 5.54.1 (#14817) Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) from 5.54.0 to 5.54.1. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v5.54.1/packages/parser) --- updated-dependencies: - dependency-name: "@typescript-eslint/parser" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 61 +++++++--------------------------------------------- 2 files changed, 9 insertions(+), 54 deletions(-) diff --git a/package.json b/package.json index ac4abf8e7d6..d996bc578c0 100644 --- a/package.json +++ b/package.json @@ -92,7 +92,7 @@ "@types/underscore": "1.11.4", "@types/webpack-env": "1.18.0", "@typescript-eslint/eslint-plugin": "^5.54.1", - "@typescript-eslint/parser": "^5.54.0", + "@typescript-eslint/parser": "^5.54.1", "@wireapp/copy-config": "2.0.10", "@wireapp/eslint-config": "2.1.1", "@wireapp/prettier-config": "0.5.2", diff --git a/yarn.lock b/yarn.lock index f4eedc05edd..04873ecd4e8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4195,20 +4195,20 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/parser@npm:^5.54.0": - version: 5.54.0 - resolution: "@typescript-eslint/parser@npm:5.54.0" +"@typescript-eslint/parser@npm:^5.54.1": + version: 5.54.1 + resolution: "@typescript-eslint/parser@npm:5.54.1" dependencies: - "@typescript-eslint/scope-manager": 5.54.0 - "@typescript-eslint/types": 5.54.0 - "@typescript-eslint/typescript-estree": 5.54.0 + "@typescript-eslint/scope-manager": 5.54.1 + "@typescript-eslint/types": 5.54.1 + "@typescript-eslint/typescript-estree": 5.54.1 debug: ^4.3.4 peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 peerDependenciesMeta: typescript: optional: true - checksum: 368d6dd85be42c3f518f0ddeed23ecd1d3c9484a77ae291ee4e08e2703ed379bed613bde014cd8ab2a3e06e85dd8aef201112ae5e3d2a07deba29ae80bb1fe06 + checksum: f466513d306ca926b97c2cec1eebaf2cd15d45bd5633a4358f23ba9a4de1b0ec4630b1c20abc395943934ed1d2ef65f545fd6737c317a7abe579612101e8a83f languageName: node linkType: hard @@ -4242,16 +4242,6 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/scope-manager@npm:5.54.0": - version: 5.54.0 - resolution: "@typescript-eslint/scope-manager@npm:5.54.0" - dependencies: - "@typescript-eslint/types": 5.54.0 - "@typescript-eslint/visitor-keys": 5.54.0 - checksum: e50f12396de0ddb94aab119bdd5f4769b80dd2c273e137fd25e5811e25114d7a3d3668cdb3c454aca9537e940744881d62a1fed2ec86f07f60533dc7382ae15c - languageName: node - linkType: hard - "@typescript-eslint/scope-manager@npm:5.54.1": version: 5.54.1 resolution: "@typescript-eslint/scope-manager@npm:5.54.1" @@ -4300,13 +4290,6 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/types@npm:5.54.0": - version: 5.54.0 - resolution: "@typescript-eslint/types@npm:5.54.0" - checksum: 0f66b1b93078f3afea6dfcd3d4e2f0abea4f60cd0c613c2cf13f85098e5bf786185484c9846ed80b6c4272de2c31a70c5a8aacb91314cf1b6da7dcb8855cb7ac - languageName: node - linkType: hard - "@typescript-eslint/types@npm:5.54.1": version: 5.54.1 resolution: "@typescript-eslint/types@npm:5.54.1" @@ -4368,24 +4351,6 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/typescript-estree@npm:5.54.0": - version: 5.54.0 - resolution: "@typescript-eslint/typescript-estree@npm:5.54.0" - dependencies: - "@typescript-eslint/types": 5.54.0 - "@typescript-eslint/visitor-keys": 5.54.0 - debug: ^4.3.4 - globby: ^11.1.0 - is-glob: ^4.0.3 - semver: ^7.3.7 - tsutils: ^3.21.0 - peerDependenciesMeta: - typescript: - optional: true - checksum: 377c75c34c4f95b7ab6218c1d96a6db3ea6ed6727711b6a09354582fe0157861dc1b6fb9e3f7113cd09741f713735d59d5ab5845457f5733a4ebad7470bf600a - languageName: node - linkType: hard - "@typescript-eslint/typescript-estree@npm:5.54.1": version: 5.54.1 resolution: "@typescript-eslint/typescript-estree@npm:5.54.1" @@ -4504,16 +4469,6 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/visitor-keys@npm:5.54.0": - version: 5.54.0 - resolution: "@typescript-eslint/visitor-keys@npm:5.54.0" - dependencies: - "@typescript-eslint/types": 5.54.0 - eslint-visitor-keys: ^3.3.0 - checksum: 17fc323c09e6272b603cdaec30a99916600fbbb737e1fbc8c1727a487753b4363cea112277fa43e0562bff34bdd1de9ad73ff9433118b1fd469b112fad0313ca - languageName: node - linkType: hard - "@typescript-eslint/visitor-keys@npm:5.54.1": version: 5.54.1 resolution: "@typescript-eslint/visitor-keys@npm:5.54.1" @@ -17303,7 +17258,7 @@ __metadata: "@types/underscore": 1.11.4 "@types/webpack-env": 1.18.0 "@typescript-eslint/eslint-plugin": ^5.54.1 - "@typescript-eslint/parser": ^5.54.0 + "@typescript-eslint/parser": ^5.54.1 "@wireapp/avs": 9.1.11 "@wireapp/copy-config": 2.0.10 "@wireapp/core": 39.1.6 From d27ca318eda6e3ec541257ea3c31f7f232731ef4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 12 Mar 2023 16:23:26 +0000 Subject: [PATCH 56/97] chore(deps): Bump jquery from 3.6.3 to 3.6.4 (#14820) Bumps [jquery](https://github.com/jquery/jquery) from 3.6.3 to 3.6.4. - [Release notes](https://github.com/jquery/jquery/releases) - [Commits](https://github.com/jquery/jquery/compare/3.6.3...3.6.4) --- updated-dependencies: - dependency-name: jquery dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index d996bc578c0..76d1d25e855 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "dexie-batch": "0.4.3", "highlight.js": "11.7.0", "http-status-codes": "2.2.0", - "jquery": "3.6.3", + "jquery": "3.6.4", "js-cookie": "3.0.1", "jszip": "3.10.1", "keyboardjs": "2.7.0", diff --git a/yarn.lock b/yarn.lock index 04873ecd4e8..324aae274ff 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10928,10 +10928,10 @@ __metadata: languageName: node linkType: hard -"jquery@npm:3.6.3": - version: 3.6.3 - resolution: "jquery@npm:3.6.3" - checksum: 0fd366bdcaa0c84a7a8751ce20f8192290141913978b5059574426d9b01f4365daa675f95aab3eec94fd794d27b08d32078a2236bef404b8ba78073009988ce6 +"jquery@npm:3.6.4": + version: 3.6.4 + resolution: "jquery@npm:3.6.4" + checksum: 8354f7bd0a0424aa714ee1b6b1ef74b410f834eb5c8501682289b358bc151f11677f11188b544f3bb49309d6ec4d15d1a5de175661250c206b06185a252f706f languageName: node linkType: hard @@ -17323,7 +17323,7 @@ __metadata: jest-canvas-mock: 2.4.0 jest-environment-jsdom: 29.5.0 jest-jasmine2: 29.4.3 - jquery: 3.6.3 + jquery: 3.6.4 js-cookie: 3.0.1 jsdom-worker: 0.3.0 jszip: 3.10.1 From 75827cba16a49ea34d2a339378519f128c65f728 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 12 Mar 2023 16:29:06 +0000 Subject: [PATCH 57/97] chore(deps-dev): Bump jest-jasmine2 from 29.4.3 to 29.5.0 (#14821) Bumps [jest-jasmine2](https://github.com/facebook/jest/tree/HEAD/packages/jest-jasmine2) from 29.4.3 to 29.5.0. - [Release notes](https://github.com/facebook/jest/releases) - [Changelog](https://github.com/facebook/jest/blob/main/CHANGELOG.md) - [Commits](https://github.com/facebook/jest/commits/v29.5.0/packages/jest-jasmine2) --- updated-dependencies: - dependency-name: jest-jasmine2 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 289 ++++++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 274 insertions(+), 17 deletions(-) diff --git a/package.json b/package.json index 76d1d25e855..9e5e4740984 100644 --- a/package.json +++ b/package.json @@ -139,7 +139,7 @@ "jest": "29.4.3", "jest-canvas-mock": "2.4.0", "jest-environment-jsdom": "29.5.0", - "jest-jasmine2": "29.4.3", + "jest-jasmine2": "29.5.0", "jsdom-worker": "0.3.0", "less": "3.13.1", "less-loader": "^11.1.0", diff --git a/yarn.lock b/yarn.lock index 324aae274ff..17028a77b11 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2713,6 +2713,20 @@ __metadata: languageName: node linkType: hard +"@jest/console@npm:^29.5.0": + version: 29.5.0 + resolution: "@jest/console@npm:29.5.0" + dependencies: + "@jest/types": ^29.5.0 + "@types/node": "*" + chalk: ^4.0.0 + jest-message-util: ^29.5.0 + jest-util: ^29.5.0 + slash: ^3.0.0 + checksum: 9f4f4b8fabd1221361b7f2e92d4a90f5f8c2e2b29077249996ab3c8b7f765175ffee795368f8d6b5b2bb3adb32dc09319f7270c7c787b0d259e624e00e0f64a5 + languageName: node + linkType: hard + "@jest/core@npm:^29.4.3": version: 29.4.3 resolution: "@jest/core@npm:29.4.3" @@ -2796,6 +2810,15 @@ __metadata: languageName: node linkType: hard +"@jest/expect-utils@npm:^29.5.0": + version: 29.5.0 + resolution: "@jest/expect-utils@npm:29.5.0" + dependencies: + jest-get-type: ^29.4.3 + checksum: c46fb677c88535cf83cf29f0a5b1f376c6a1109ddda266ad7da1a9cbc53cb441fa402dd61fc7b111ffc99603c11a9b3357ee41a1c0e035a58830bcb360871476 + languageName: node + linkType: hard + "@jest/expect@npm:^29.4.3": version: 29.4.3 resolution: "@jest/expect@npm:29.4.3" @@ -2806,6 +2829,16 @@ __metadata: languageName: node linkType: hard +"@jest/expect@npm:^29.5.0": + version: 29.5.0 + resolution: "@jest/expect@npm:29.5.0" + dependencies: + expect: ^29.5.0 + jest-snapshot: ^29.5.0 + checksum: bd10e295111547e6339137107d83986ab48d46561525393834d7d2d8b2ae9d5626653f3f5e48e5c3fa742ac982e97bdf1f541b53b9e1d117a247b08e938527f6 + languageName: node + linkType: hard + "@jest/fake-timers@npm:^29.4.3": version: 29.4.3 resolution: "@jest/fake-timers@npm:29.4.3" @@ -2846,6 +2879,18 @@ __metadata: languageName: node linkType: hard +"@jest/globals@npm:^29.5.0": + version: 29.5.0 + resolution: "@jest/globals@npm:29.5.0" + dependencies: + "@jest/environment": ^29.5.0 + "@jest/expect": ^29.5.0 + "@jest/types": ^29.5.0 + jest-mock: ^29.5.0 + checksum: b309ab8f21b571a7c672608682e84bbdd3d2b554ddf81e4e32617fec0a69094a290ab42e3c8b2c66ba891882bfb1b8b2736720ea1285b3ad646d55c2abefedd9 + languageName: node + linkType: hard + "@jest/reporters@npm:^29.4.3": version: 29.4.3 resolution: "@jest/reporters@npm:29.4.3" @@ -2924,6 +2969,18 @@ __metadata: languageName: node linkType: hard +"@jest/test-result@npm:^29.5.0": + version: 29.5.0 + resolution: "@jest/test-result@npm:29.5.0" + dependencies: + "@jest/console": ^29.5.0 + "@jest/types": ^29.5.0 + "@types/istanbul-lib-coverage": ^2.0.0 + collect-v8-coverage: ^1.0.0 + checksum: 2e8ff5242227ab960c520c3ea0f6544c595cc1c42fa3873c158e9f4f685f4ec9670ec08a4af94ae3885c0005a43550a9595191ffbc27a0965df27d9d98bbf901 + languageName: node + linkType: hard + "@jest/test-sequencer@npm:^29.4.3": version: 29.4.3 resolution: "@jest/test-sequencer@npm:29.4.3" @@ -2959,6 +3016,29 @@ __metadata: languageName: node linkType: hard +"@jest/transform@npm:^29.5.0": + version: 29.5.0 + resolution: "@jest/transform@npm:29.5.0" + dependencies: + "@babel/core": ^7.11.6 + "@jest/types": ^29.5.0 + "@jridgewell/trace-mapping": ^0.3.15 + babel-plugin-istanbul: ^6.1.1 + chalk: ^4.0.0 + convert-source-map: ^2.0.0 + fast-json-stable-stringify: ^2.1.0 + graceful-fs: ^4.2.9 + jest-haste-map: ^29.5.0 + jest-regex-util: ^29.4.3 + jest-util: ^29.5.0 + micromatch: ^4.0.4 + pirates: ^4.0.4 + slash: ^3.0.0 + write-file-atomic: ^4.0.2 + checksum: d55d604085c157cf5112e165ff5ac1fa788873b3b31265fb4734ca59892ee24e44119964cc47eb6d178dd9512bbb6c576d1e20e51a201ff4e24d31e818a1c92d + languageName: node + linkType: hard + "@jest/types@npm:^29.4.1": version: 29.4.1 resolution: "@jest/types@npm:29.4.1" @@ -8353,6 +8433,19 @@ __metadata: languageName: node linkType: hard +"expect@npm:^29.5.0": + version: 29.5.0 + resolution: "expect@npm:29.5.0" + dependencies: + "@jest/expect-utils": ^29.5.0 + jest-get-type: ^29.4.3 + jest-matcher-utils: ^29.5.0 + jest-message-util: ^29.5.0 + jest-util: ^29.5.0 + checksum: 58f70b38693df6e5c6892db1bcd050f0e518d6f785175dc53917d4fa6a7359a048e5690e19ddcb96b65c4493881dd89a3dabdab1a84dfa55c10cdbdabf37b2d7 + languageName: node + linkType: hard + "extend-shallow@npm:^2.0.0, extend-shallow@npm:^2.0.1": version: 2.0.1 resolution: "extend-shallow@npm:2.0.1" @@ -10440,6 +10533,18 @@ __metadata: languageName: node linkType: hard +"jest-diff@npm:^29.5.0": + version: 29.5.0 + resolution: "jest-diff@npm:29.5.0" + dependencies: + chalk: ^4.0.0 + diff-sequences: ^29.4.3 + jest-get-type: ^29.4.3 + pretty-format: ^29.5.0 + checksum: dfd0f4a299b5d127779c76b40106c37854c89c3e0785098c717d52822d6620d227f6234c3a9291df204d619e799e3654159213bf93220f79c8e92a55475a3d39 + languageName: node + linkType: hard + "jest-docblock@npm:^29.4.3": version: 29.4.3 resolution: "jest-docblock@npm:29.4.3" @@ -10462,6 +10567,19 @@ __metadata: languageName: node linkType: hard +"jest-each@npm:^29.5.0": + version: 29.5.0 + resolution: "jest-each@npm:29.5.0" + dependencies: + "@jest/types": ^29.5.0 + chalk: ^4.0.0 + jest-get-type: ^29.4.3 + jest-util: ^29.5.0 + pretty-format: ^29.5.0 + checksum: b8b297534d25834c5d4e31e4c687359787b1e402519e42664eb704cc3a12a7a91a017565a75acb02e8cf9afd3f4eef3350bd785276bec0900184641b765ff7a5 + languageName: node + linkType: hard + "jest-environment-jsdom@npm:29.5.0": version: 29.5.0 resolution: "jest-environment-jsdom@npm:29.5.0" @@ -10534,28 +10652,51 @@ __metadata: languageName: node linkType: hard -"jest-jasmine2@npm:29.4.3": - version: 29.4.3 - resolution: "jest-jasmine2@npm:29.4.3" +"jest-haste-map@npm:^29.5.0": + version: 29.5.0 + resolution: "jest-haste-map@npm:29.5.0" dependencies: - "@jest/environment": ^29.4.3 - "@jest/expect": ^29.4.3 + "@jest/types": ^29.5.0 + "@types/graceful-fs": ^4.1.3 + "@types/node": "*" + anymatch: ^3.0.3 + fb-watchman: ^2.0.0 + fsevents: ^2.3.2 + graceful-fs: ^4.2.9 + jest-regex-util: ^29.4.3 + jest-util: ^29.5.0 + jest-worker: ^29.5.0 + micromatch: ^4.0.4 + walker: ^1.0.8 + dependenciesMeta: + fsevents: + optional: true + checksum: 3828ff7783f168e34be2c63887f82a01634261f605dcae062d83f979a61c37739e21b9607ecb962256aea3fbe5a530a1acee062d0026fcb47c607c12796cf3b7 + languageName: node + linkType: hard + +"jest-jasmine2@npm:29.5.0": + version: 29.5.0 + resolution: "jest-jasmine2@npm:29.5.0" + dependencies: + "@jest/environment": ^29.5.0 + "@jest/expect": ^29.5.0 "@jest/source-map": ^29.4.3 - "@jest/test-result": ^29.4.3 - "@jest/types": ^29.4.3 + "@jest/test-result": ^29.5.0 + "@jest/types": ^29.5.0 "@types/node": "*" chalk: ^4.0.0 co: ^4.6.0 is-generator-fn: ^2.0.0 - jest-each: ^29.4.3 - jest-matcher-utils: ^29.4.3 - jest-message-util: ^29.4.3 - jest-runtime: ^29.4.3 - jest-snapshot: ^29.4.3 - jest-util: ^29.4.3 + jest-each: ^29.5.0 + jest-matcher-utils: ^29.5.0 + jest-message-util: ^29.5.0 + jest-runtime: ^29.5.0 + jest-snapshot: ^29.5.0 + jest-util: ^29.5.0 p-limit: ^3.1.0 - pretty-format: ^29.4.3 - checksum: 9cbe70b55b4a9527b4f4641c012b8de522bcb1b00cd026edd9c0194398046de6907bd1e14c67100e9daa8751412a7c4e1143c1520118d047391caaeebf736d79 + pretty-format: ^29.5.0 + checksum: d76d845e495c72451ab50719fd13960b54064d92d53303a98435a6be0397ed12ff7e9336f34f50de58b2efdc3acf3784fa9f3554f4981596ada5a9a4a91c9585 languageName: node linkType: hard @@ -10593,6 +10734,18 @@ __metadata: languageName: node linkType: hard +"jest-matcher-utils@npm:^29.5.0": + version: 29.5.0 + resolution: "jest-matcher-utils@npm:29.5.0" + dependencies: + chalk: ^4.0.0 + jest-diff: ^29.5.0 + jest-get-type: ^29.4.3 + pretty-format: ^29.5.0 + checksum: 1d3e8c746e484a58ce194e3aad152eff21fd0896e8b8bf3d4ab1a4e2cbfed95fb143646f4ad9fdf6e42212b9e8fc033268b58e011b044a9929df45485deb5ac9 + languageName: node + linkType: hard + "jest-message-util@npm:^29.4.1": version: 29.4.1 resolution: "jest-message-util@npm:29.4.1" @@ -10712,6 +10865,23 @@ __metadata: languageName: node linkType: hard +"jest-resolve@npm:^29.5.0": + version: 29.5.0 + resolution: "jest-resolve@npm:29.5.0" + dependencies: + chalk: ^4.0.0 + graceful-fs: ^4.2.9 + jest-haste-map: ^29.5.0 + jest-pnp-resolver: ^1.2.2 + jest-util: ^29.5.0 + jest-validate: ^29.5.0 + resolve: ^1.20.0 + resolve.exports: ^2.0.0 + slash: ^3.0.0 + checksum: 9a125f3cf323ceef512089339d35f3ee37f79fe16a831fb6a26773ea6a229b9e490d108fec7af334142e91845b5996de8e7cdd85a4d8d617078737d804e29c8f + languageName: node + linkType: hard + "jest-runner@npm:^29.4.3": version: 29.4.3 resolution: "jest-runner@npm:29.4.3" @@ -10771,6 +10941,36 @@ __metadata: languageName: node linkType: hard +"jest-runtime@npm:^29.5.0": + version: 29.5.0 + resolution: "jest-runtime@npm:29.5.0" + dependencies: + "@jest/environment": ^29.5.0 + "@jest/fake-timers": ^29.5.0 + "@jest/globals": ^29.5.0 + "@jest/source-map": ^29.4.3 + "@jest/test-result": ^29.5.0 + "@jest/transform": ^29.5.0 + "@jest/types": ^29.5.0 + "@types/node": "*" + chalk: ^4.0.0 + cjs-module-lexer: ^1.0.0 + collect-v8-coverage: ^1.0.0 + glob: ^7.1.3 + graceful-fs: ^4.2.9 + jest-haste-map: ^29.5.0 + jest-message-util: ^29.5.0 + jest-mock: ^29.5.0 + jest-regex-util: ^29.4.3 + jest-resolve: ^29.5.0 + jest-snapshot: ^29.5.0 + jest-util: ^29.5.0 + slash: ^3.0.0 + strip-bom: ^4.0.0 + checksum: 7af27bd9d54cf1c5735404cf8d76c6509d5610b1ec0106a21baa815c1aff15d774ce534ac2834bc440dccfe6348bae1885fd9a806f23a94ddafdc0f5bae4b09d + languageName: node + linkType: hard + "jest-snapshot@npm:^29.4.3": version: 29.4.3 resolution: "jest-snapshot@npm:29.4.3" @@ -10803,6 +11003,37 @@ __metadata: languageName: node linkType: hard +"jest-snapshot@npm:^29.5.0": + version: 29.5.0 + resolution: "jest-snapshot@npm:29.5.0" + dependencies: + "@babel/core": ^7.11.6 + "@babel/generator": ^7.7.2 + "@babel/plugin-syntax-jsx": ^7.7.2 + "@babel/plugin-syntax-typescript": ^7.7.2 + "@babel/traverse": ^7.7.2 + "@babel/types": ^7.3.3 + "@jest/expect-utils": ^29.5.0 + "@jest/transform": ^29.5.0 + "@jest/types": ^29.5.0 + "@types/babel__traverse": ^7.0.6 + "@types/prettier": ^2.1.5 + babel-preset-current-node-syntax: ^1.0.0 + chalk: ^4.0.0 + expect: ^29.5.0 + graceful-fs: ^4.2.9 + jest-diff: ^29.5.0 + jest-get-type: ^29.4.3 + jest-matcher-utils: ^29.5.0 + jest-message-util: ^29.5.0 + jest-util: ^29.5.0 + natural-compare: ^1.4.0 + pretty-format: ^29.5.0 + semver: ^7.3.5 + checksum: fe5df54122ed10eed625de6416a45bc4958d5062b018f05b152bf9785ab7f355dcd55e40cf5da63895bf8278f8d7b2bb4059b2cfbfdee18f509d455d37d8aa2b + languageName: node + linkType: hard + "jest-util@npm:^29.4.1": version: 29.4.1 resolution: "jest-util@npm:29.4.1" @@ -10859,6 +11090,20 @@ __metadata: languageName: node linkType: hard +"jest-validate@npm:^29.5.0": + version: 29.5.0 + resolution: "jest-validate@npm:29.5.0" + dependencies: + "@jest/types": ^29.5.0 + camelcase: ^6.2.0 + chalk: ^4.0.0 + jest-get-type: ^29.4.3 + leven: ^3.1.0 + pretty-format: ^29.5.0 + checksum: 43ca5df7cb75572a254ac3e92fbbe7be6b6a1be898cc1e887a45d55ea003f7a112717d814a674d37f9f18f52d8de40873c8f084f17664ae562736c78dd44c6a1 + languageName: node + linkType: hard + "jest-watcher@npm:^29.4.3": version: 29.4.3 resolution: "jest-watcher@npm:29.4.3" @@ -10909,6 +11154,18 @@ __metadata: languageName: node linkType: hard +"jest-worker@npm:^29.5.0": + version: 29.5.0 + resolution: "jest-worker@npm:29.5.0" + dependencies: + "@types/node": "*" + jest-util: ^29.5.0 + merge-stream: ^2.0.0 + supports-color: ^8.0.0 + checksum: 1151a1ae3602b1ea7c42a8f1efe2b5a7bf927039deaa0827bf978880169899b705744e288f80a63603fb3fc2985e0071234986af7dc2c21c7a64333d8777c7c9 + languageName: node + linkType: hard + "jest@npm:29.4.3": version: 29.4.3 resolution: "jest@npm:29.4.3" @@ -17322,7 +17579,7 @@ __metadata: jest: 29.4.3 jest-canvas-mock: 2.4.0 jest-environment-jsdom: 29.5.0 - jest-jasmine2: 29.4.3 + jest-jasmine2: 29.5.0 jquery: 3.6.4 js-cookie: 3.0.1 jsdom-worker: 0.3.0 From 8ecc612782a6fbe28de0cf83832570095b515188 Mon Sep 17 00:00:00 2001 From: Thomas Belin Date: Mon, 13 Mar 2023 14:27:08 +0100 Subject: [PATCH 58/97] fix: Correct logic for sending broadcast messages when mismatch happens (#14824) --- src/script/conversation/ConversationRepository.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/script/conversation/ConversationRepository.ts b/src/script/conversation/ConversationRepository.ts index 22b2aa033f4..158442ba9a8 100644 --- a/src/script/conversation/ConversationRepository.ts +++ b/src/script/conversation/ConversationRepository.ts @@ -249,7 +249,11 @@ export class ConversationRepository { shouldWarnLegalHold = hasChangedLegalHoldStatus && newDevices.some(device => device.isLegalHold()); } } - return !conversation || silent + if (!conversation) { + // in case of a broadcast message, we want to keep sending the message even if there are some conversation degradation + return true; + } + return silent ? false : this.messageRepository.requestUserSendingPermission(conversation, shouldWarnLegalHold, consentType); }); From 23d023166453bc7898daab5106f2a9657e6d60ac Mon Sep 17 00:00:00 2001 From: Virgile <78490891+V-Gira@users.noreply.github.com> Date: Mon, 13 Mar 2023 15:46:42 +0100 Subject: [PATCH 59/97] feat: implement retry option on message failure to send [FS-1571] (#14757) * feat: implement retry option on message failure to send * refactor FailToSend to PartialFailureToSend * display error message and retry button on complete failure to send * correct logic to display gray message for failed status * add duplicate event handling for retrying to send a failed message * Implement retry option for text messages (no mentions, no quotes) and non functional discard button for assets * delete message on discard * add hash to outgoing quote * pass hash in quoted message middleware * handle quotes only if they are valid outgoing quotes * address code review and clarify comment * refactor retry and discard callbacks from ContentMessage to MessageWrapper --- src/i18n/en-US.json | 4 ++ .../ContentMessage/ContentMessage.test.tsx | 4 +- .../Message/ContentMessage/ContentMessage.tsx | 21 ++++++++- .../CompleteFailureToSend.tsx | 44 +++++++++++++++++++ .../Warnings/CompleteFailureToSend/index.ts | 20 +++++++++ .../PartialFailureToSend.test.tsx} | 14 +++--- .../PartialFailureToSend.tsx} | 2 +- .../index.ts | 2 +- .../Message/ContentMessage/Warnings/index.ts | 3 +- .../Message/ContentMessage/asset/index.tsx | 2 +- .../MessagesList/Message/MessageWrapper.tsx | 30 +++++++++++++ .../MessagesList/MessageList.test.tsx | 4 +- src/script/conversation/EventMapper.ts | 8 ++-- src/script/conversation/MessageRepository.ts | 32 +++++++++++--- src/script/event/EventRepository.ts | 26 ++++++----- .../preprocessor/QuotedMessageMiddleware.ts | 1 + 16 files changed, 181 insertions(+), 36 deletions(-) create mode 100644 src/script/components/MessagesList/Message/ContentMessage/Warnings/CompleteFailureToSend/CompleteFailureToSend.tsx create mode 100644 src/script/components/MessagesList/Message/ContentMessage/Warnings/CompleteFailureToSend/index.ts rename src/script/components/MessagesList/Message/ContentMessage/Warnings/{FailedToSend/FailedToSend.test.tsx => PartialFailureToSend/PartialFailureToSend.test.tsx} (84%) rename src/script/components/MessagesList/Message/ContentMessage/Warnings/{FailedToSend/FailedToSend.tsx => PartialFailureToSend/PartialFailureToSend.tsx} (97%) rename src/script/components/MessagesList/Message/ContentMessage/Warnings/{FailedToSend => PartialFailureToSend}/index.ts (94%) diff --git a/src/i18n/en-US.json b/src/i18n/en-US.json index 107e5dc7175..9cf00c9d056 100644 --- a/src/i18n/en-US.json +++ b/src/i18n/en-US.json @@ -662,6 +662,10 @@ "login.twoFactorLoginTitle": "Verify your account", "mediaBtnPause": "Pause", "mediaBtnPlay": "Play", + "messageCouldNotBeSent": "Message could not be sent due to connectivity issues.", + "messageCouldNotBeSentRetry": "Retry", + "messageWillNotBeSent": "File could not be sent due to connectivity issues.", + "messageWillNotBeSentDiscard": "Discard", "messageDetailsEdited": "Edited: {{edited}}", "messageDetailsNoLikes": "No one has liked this message yet.", "messageDetailsNoReceipts": "No one has read this message yet.", diff --git a/src/script/components/MessagesList/Message/ContentMessage/ContentMessage.test.tsx b/src/script/components/MessagesList/Message/ContentMessage/ContentMessage.test.tsx index 0e6bdb5ee5b..94bee3edb50 100644 --- a/src/script/components/MessagesList/Message/ContentMessage/ContentMessage.test.tsx +++ b/src/script/components/MessagesList/Message/ContentMessage/ContentMessage.test.tsx @@ -60,6 +60,8 @@ describe('message', () => { onClickReceipts: jest.fn(), onClickTimestamp: jest.fn(), onLike: jest.fn(), + onDiscard: jest.fn(), + onRetry: jest.fn(), previousMessage: undefined, selfId: {domain: '', id: createRandomUuid()}, isMsgElementsFocusable: true, @@ -94,6 +96,6 @@ describe('message', () => { const {getByText} = render( , ); - await waitFor(() => getByText(quoteText)); + expect(await waitFor(() => getByText(quoteText))).not.toBe(null); }); }); diff --git a/src/script/components/MessagesList/Message/ContentMessage/ContentMessage.tsx b/src/script/components/MessagesList/Message/ContentMessage/ContentMessage.tsx index 335296dbe28..af35cbf93f0 100644 --- a/src/script/components/MessagesList/Message/ContentMessage/ContentMessage.tsx +++ b/src/script/components/MessagesList/Message/ContentMessage/ContentMessage.tsx @@ -27,6 +27,7 @@ import {Conversation} from 'src/script/entity/Conversation'; import {CompositeMessage} from 'src/script/entity/message/CompositeMessage'; import {ContentMessage} from 'src/script/entity/message/ContentMessage'; import {Message} from 'src/script/entity/message/Message'; +import {StatusType} from 'src/script/message/StatusType'; import {useKoSubscribableChildren} from 'Util/ComponentUtil'; import {getMessageAriaLabel} from 'Util/conversationMessages'; import {KEY} from 'Util/KeyboardUtil'; @@ -37,7 +38,7 @@ import {ContentAsset} from './asset'; import {MessageFooterLike} from './MessageFooterLike'; import {MessageLike} from './MessageLike'; import {Quote} from './MessageQuote'; -import {FailedToSendWarning} from './Warnings'; +import {CompleteFailureToSendWarning, PartialFailureToSendWarning} from './Warnings'; import {MessageActions} from '..'; import {EphemeralStatusType} from '../../../../message/EphemeralStatusType'; @@ -57,6 +58,8 @@ export interface ContentMessageProps extends Omit void; + onDiscard: () => void; + onRetry: (message: ContentMessage) => void; previousMessage?: Message; quotedMessage?: ContentMessage; selfId: QualifiedId; @@ -81,6 +84,8 @@ const ContentMessageComponent: React.FC = ({ onClickLikes, onClickButton, onLike, + onDiscard, + onRetry, isMsgElementsFocusable, }) => { const msgFocusState = useMemo( @@ -98,6 +103,7 @@ const ContentMessageComponent: React.FC = ({ other_likes, was_edited, failedToSend, + status, } = useKoSubscribableChildren(message, [ 'headerSenderName', 'timestamp', @@ -107,6 +113,7 @@ const ContentMessageComponent: React.FC = ({ 'other_likes', 'was_edited', 'failedToSend', + 'status', ]); const shouldShowAvatar = (): boolean => { @@ -234,7 +241,17 @@ const ContentMessageComponent: React.FC = ({ /> ))} - {failedToSend && } + {failedToSend && ( + + )} + + {status === StatusType.FAILED && ( + onDiscard()} + onRetry={() => onRetry(message)} + /> + )} {!other_likes.length && message.isReactable() && (
diff --git a/src/script/components/MessagesList/Message/ContentMessage/Warnings/CompleteFailureToSend/CompleteFailureToSend.tsx b/src/script/components/MessagesList/Message/ContentMessage/Warnings/CompleteFailureToSend/CompleteFailureToSend.tsx new file mode 100644 index 00000000000..09fda0a4fad --- /dev/null +++ b/src/script/components/MessagesList/Message/ContentMessage/Warnings/CompleteFailureToSend/CompleteFailureToSend.tsx @@ -0,0 +1,44 @@ +/* + * Wire + * Copyright (C) 2023 Wire Swiss GmbH + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see http://www.gnu.org/licenses/. + * + */ + +import {Button, ButtonVariant} from '@wireapp/react-ui-kit'; + +import {t} from 'Util/LocalizerUtil'; + +import {warning} from '../Warnings.styles'; + +type Props = { + isTextAsset: boolean; + onRetry: () => void; + onDiscard?: () => void; +}; + +export const CompleteFailureToSendWarning = ({isTextAsset, onRetry, onDiscard}: Props) => { + return ( + <> +
+

{isTextAsset ? t('messageCouldNotBeSent') : t('messageWillNotBeSent')}

+ + +
+ + ); +}; diff --git a/src/script/components/MessagesList/Message/ContentMessage/Warnings/CompleteFailureToSend/index.ts b/src/script/components/MessagesList/Message/ContentMessage/Warnings/CompleteFailureToSend/index.ts new file mode 100644 index 00000000000..6750c809455 --- /dev/null +++ b/src/script/components/MessagesList/Message/ContentMessage/Warnings/CompleteFailureToSend/index.ts @@ -0,0 +1,20 @@ +/* + * Wire + * Copyright (C) 2023 Wire Swiss GmbH + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see http://www.gnu.org/licenses/. + * + */ + +export * from './CompleteFailureToSend'; diff --git a/src/script/components/MessagesList/Message/ContentMessage/Warnings/FailedToSend/FailedToSend.test.tsx b/src/script/components/MessagesList/Message/ContentMessage/Warnings/PartialFailureToSend/PartialFailureToSend.test.tsx similarity index 84% rename from src/script/components/MessagesList/Message/ContentMessage/Warnings/FailedToSend/FailedToSend.test.tsx rename to src/script/components/MessagesList/Message/ContentMessage/Warnings/PartialFailureToSend/PartialFailureToSend.test.tsx index 453ee37bc57..ac455a6e9cc 100644 --- a/src/script/components/MessagesList/Message/ContentMessage/Warnings/FailedToSend/FailedToSend.test.tsx +++ b/src/script/components/MessagesList/Message/ContentMessage/Warnings/PartialFailureToSend/PartialFailureToSend.test.tsx @@ -25,7 +25,7 @@ import {withTheme} from 'src/script/auth/util/test/TestUtil'; import {setStrings} from 'Util/LocalizerUtil'; import {createRandomUuid} from 'Util/util'; -import {FailedToSendWarning, User} from './FailedToSend'; +import {PartialFailureToSendWarning, User} from './PartialFailureToSend'; setStrings({en}); function generateUsers(nbUsers: number, domain: string) { @@ -46,13 +46,13 @@ function generateUserClients(users: User[]): QualifiedUserClients { return userClients; } -describe('FailedToSendWarning', () => { +describe('PartialFailureToSendWarning', () => { it('displays the number of users that did not get the message', () => { const nbUsers = Math.floor(Math.random() * 100); const users = generateUsers(nbUsers, 'domain'); const failedToSend = generateUserClients(users); - const {container} = render(withTheme()); + const {container} = render(withTheme()); expect(container.textContent).toContain(`${nbUsers} Participants had issues receiving this message`); }); @@ -66,7 +66,7 @@ describe('FailedToSendWarning', () => { ...generateUserClients(users1), ...generateUserClients(users2), }; - const {container} = render(withTheme()); + const {container} = render(withTheme()); expect(container.textContent).toContain( `${nbUsersDomain1 + nbUsersDomain2} Participants had issues receiving this message`, ); @@ -76,7 +76,7 @@ describe('FailedToSendWarning', () => { const users = generateUsers(1, 'domain'); const failedToSend = generateUserClients(users); const {queryByText, container} = render( - withTheme(), + withTheme(), ); expect(queryByText('Show details')).toBeNull(); @@ -85,7 +85,7 @@ describe('FailedToSendWarning', () => { it('toggles the extra info', () => { const failedToSend = generateUserClients(generateUsers(2, 'domain')); - const {getByText} = render(withTheme()); + const {getByText} = render(withTheme()); act(() => { getByText('Show details').click(); @@ -106,7 +106,7 @@ describe('FailedToSendWarning', () => { const failedToSend = generateUserClients(users); const {getByText, getAllByTestId} = render( - withTheme(), + withTheme(), ); act(() => { diff --git a/src/script/components/MessagesList/Message/ContentMessage/Warnings/FailedToSend/FailedToSend.tsx b/src/script/components/MessagesList/Message/ContentMessage/Warnings/PartialFailureToSend/PartialFailureToSend.tsx similarity index 97% rename from src/script/components/MessagesList/Message/ContentMessage/Warnings/FailedToSend/FailedToSend.tsx rename to src/script/components/MessagesList/Message/ContentMessage/Warnings/PartialFailureToSend/PartialFailureToSend.tsx index 59c62d62b72..b198e728de3 100644 --- a/src/script/components/MessagesList/Message/ContentMessage/Warnings/FailedToSend/FailedToSend.tsx +++ b/src/script/components/MessagesList/Message/ContentMessage/Warnings/PartialFailureToSend/PartialFailureToSend.tsx @@ -60,7 +60,7 @@ function generateNamedUsers(users: User[], userClients: QualifiedUserClients): P ); } -export const FailedToSendWarning = ({failedToSend, knownUsers}: Props) => { +export const PartialFailureToSendWarning = ({failedToSend, knownUsers}: Props) => { const [isOpen, setIsOpen] = useState(false); const userCount = Object.entries(failedToSend).reduce( diff --git a/src/script/components/MessagesList/Message/ContentMessage/Warnings/FailedToSend/index.ts b/src/script/components/MessagesList/Message/ContentMessage/Warnings/PartialFailureToSend/index.ts similarity index 94% rename from src/script/components/MessagesList/Message/ContentMessage/Warnings/FailedToSend/index.ts rename to src/script/components/MessagesList/Message/ContentMessage/Warnings/PartialFailureToSend/index.ts index 42882b455d6..896c2670e4c 100644 --- a/src/script/components/MessagesList/Message/ContentMessage/Warnings/FailedToSend/index.ts +++ b/src/script/components/MessagesList/Message/ContentMessage/Warnings/PartialFailureToSend/index.ts @@ -17,4 +17,4 @@ * */ -export * from './FailedToSend'; +export * from './PartialFailureToSend'; diff --git a/src/script/components/MessagesList/Message/ContentMessage/Warnings/index.ts b/src/script/components/MessagesList/Message/ContentMessage/Warnings/index.ts index 42882b455d6..1f24e749d3a 100644 --- a/src/script/components/MessagesList/Message/ContentMessage/Warnings/index.ts +++ b/src/script/components/MessagesList/Message/ContentMessage/Warnings/index.ts @@ -17,4 +17,5 @@ * */ -export * from './FailedToSend'; +export * from './PartialFailureToSend'; +export * from './CompleteFailureToSend'; diff --git a/src/script/components/MessagesList/Message/ContentMessage/asset/index.tsx b/src/script/components/MessagesList/Message/ContentMessage/asset/index.tsx index d95f0c366b6..5c36294a070 100644 --- a/src/script/components/MessagesList/Message/ContentMessage/asset/index.tsx +++ b/src/script/components/MessagesList/Message/ContentMessage/asset/index.tsx @@ -72,7 +72,7 @@ const ContentAsset = ({ onMessageClick={onClickMessage} text={(asset as Text).render(selfId, message.accent_color())} className={cx('text', { - 'text-foreground': status === StatusType.SENDING, + 'text-foreground': status === StatusType.SENDING || status === StatusType.FAILED, 'text-large': includesOnlyEmojis(asset.text), 'ephemeral-message-obfuscated': isObfuscated, })} diff --git a/src/script/components/MessagesList/Message/MessageWrapper.tsx b/src/script/components/MessagesList/Message/MessageWrapper.tsx index e3404ef63ab..77d5124549f 100644 --- a/src/script/components/MessagesList/Message/MessageWrapper.tsx +++ b/src/script/components/MessagesList/Message/MessageWrapper.tsx @@ -25,6 +25,11 @@ import {container} from 'tsyringe'; import {WebAppEvents} from '@wireapp/webapp-events'; +import {OutgoingQuote} from 'src/script/conversation/MessageRepository'; +import {ContentMessage} from 'src/script/entity/message/ContentMessage'; +import {Text} from 'src/script/entity/message/Text'; +import {MentionEntity} from 'src/script/message/MentionEntity'; +import {QuoteEntity} from 'src/script/message/QuoteEntity'; import {t} from 'Util/LocalizerUtil'; import {CallMessage} from './CallMessage'; @@ -90,6 +95,29 @@ export const MessageWrapper: React.FC { + const firstAsset = message.getFirstAsset(); + + if (firstAsset instanceof Text) { + const messageId = message.id; + const messageText = firstAsset.text; + const mentions: MentionEntity[] = firstAsset.mentions() && firstAsset.mentions(); + const incomingQuote = message.quote(); + + const isOutgoingQuote = (quoteEntity: QuoteEntity): quoteEntity is OutgoingQuote => { + return quoteEntity.hash !== undefined; + }; + const quote: OutgoingQuote | undefined = + incomingQuote && isOutgoingQuote(incomingQuote) ? (incomingQuote as OutgoingQuote) : undefined; + + await messageRepository.sendTextWithLinkPreview(conversation, messageText, mentions, quote, messageId); + } + }; + + const onDiscard = async () => { + await messageRepository.deleteMessageById(conversation, message.id); + }; + const contextMenuEntries = ko.pureComputed(() => { const entries: ContextMenuEntry[] = []; @@ -184,6 +212,8 @@ export const MessageWrapper: React.FC diff --git a/src/script/components/MessagesList/MessageList.test.tsx b/src/script/components/MessagesList/MessageList.test.tsx index 8210bcc52e9..dccb9feff95 100644 --- a/src/script/components/MessagesList/MessageList.test.tsx +++ b/src/script/components/MessagesList/MessageList.test.tsx @@ -92,11 +92,11 @@ describe('MessagesList', () => { params.conversation.addMessage(createTextMessage('first')); const {getByText} = render(); - await waitFor(() => getByText('first')); + expect(await waitFor(() => getByText('first'))).not.toBe(null); act(() => { params.conversation.addMessage(createTextMessage('second')); }); - await waitFor(() => getByText('second')); + expect(await waitFor(() => getByText('second'))).not.toBe(null); }); }); diff --git a/src/script/conversation/EventMapper.ts b/src/script/conversation/EventMapper.ts index 3612564ed0e..db11f783009 100644 --- a/src/script/conversation/EventMapper.ts +++ b/src/script/conversation/EventMapper.ts @@ -145,8 +145,8 @@ export class EventMapper { const {id, data: eventData, edited_time: editedTime, conversation, qualified_conversation} = event; if (eventData.quote) { - const {message_id: messageId, user_id: userId, error} = eventData.quote; - originalEntity.quote(new QuoteEntity({error, messageId, userId})); + const {hash: hash, message_id: messageId, user_id: userId, error} = eventData.quote; + originalEntity.quote(new QuoteEntity({error, hash, messageId, userId})); } if (id !== originalEntity.id && originalEntity.hasAssetText()) { @@ -198,7 +198,7 @@ export class EventMapper { originalEntity.id = id; if (originalEntity.isContent() || (originalEntity as Message).isPing()) { - originalEntity.status(event.status || StatusType.SENT); + originalEntity.status(event.status ?? StatusType.SENT); } originalEntity.replacing_message_id = eventData.replacing_message_id; @@ -377,7 +377,7 @@ export class EventMapper { } if (messageEntity.isContent() || messageEntity.isPing()) { - messageEntity.status((event as EventRecord).status || StatusType.SENT); + messageEntity.status((event as EventRecord).status ?? StatusType.SENT); } if (messageEntity.isComposite()) { diff --git a/src/script/conversation/MessageRepository.ts b/src/script/conversation/MessageRepository.ts index 1ebf90227a6..9a86b8b7d66 100644 --- a/src/script/conversation/MessageRepository.ts +++ b/src/script/conversation/MessageRepository.ts @@ -327,13 +327,16 @@ export class MessageRepository { textMessage: string, mentions: MentionEntity[], quoteEntity?: OutgoingQuote, + messageId?: string, ): Promise { const textPayload = { conversation, mentions, message: textMessage, - messageId: createRandomUuid(), // We set the id explicitely in order to be able to override the message if we generate a link preview quote: quoteEntity, + // We set the id explicitely in order to be able to override the message if we generate a link preview + // Similarly, we provide that same id when we retry to send a failed message in order to override the original + messageId: messageId ?? createRandomUuid(), }; const {state} = await this.sendText(textPayload); if (state !== MessageSendingState.CANCELED) { @@ -755,12 +758,17 @@ export class MessageRepository { return {id: payload.messageId, state: MessageSendingState.CANCELED}; } - const result = await this.conversationService.send(sendOptions); + try { + const result = await this.conversationService.send(sendOptions); - if (result.state === MessageSendingState.OUTGOING_SENT) { - await handleSuccess(result); + if (result.state === MessageSendingState.OUTGOING_SENT) { + await handleSuccess(result); + } + return result; + } catch (error) { + await this.updateMessageAsFailed(conversation, payload.messageId); + throw error; } - return result; } /** @@ -1132,6 +1140,20 @@ export class MessageRepository { return undefined; } + private async updateMessageAsFailed(conversationEntity: Conversation, eventId: string) { + try { + const messageEntity = await this.getMessageInConversationById(conversationEntity, eventId); + const updatedStatus = StatusType.FAILED; + messageEntity.status(updatedStatus); + return await this.eventService.updateEvent(messageEntity.primary_key, {status: updatedStatus}); + } catch (error) { + if ((error as any).type !== ConversationError.TYPE.MESSAGE_NOT_FOUND) { + throw error; + } + } + return undefined; + } + private createRecipients(users: User[]): QualifiedUserClients { return users.reduce((userClients, user) => { userClients[user.domain] ||= {}; diff --git a/src/script/event/EventRepository.ts b/src/script/event/EventRepository.ts index d4488434247..95d25fd60d8 100644 --- a/src/script/event/EventRepository.ts +++ b/src/script/event/EventRepository.ts @@ -53,6 +53,7 @@ import {CryptographyMapper} from '../cryptography/CryptographyMapper'; import {CryptographyError} from '../error/CryptographyError'; import {EventError} from '../error/EventError'; import {categoryFromEvent} from '../message/MessageCategorization'; +import {StatusType} from '../message/StatusType'; import type {EventRecord, StoredEvent} from '../storage'; import type {ServerTimeHandler} from '../time/serverTimeHandler'; import {EventName} from '../tracking/EventName'; @@ -498,7 +499,7 @@ export class EventRepository { const commonUpdates = EventRepository.getCommonMessageUpdates(originalEvent, newEvent); const specificUpdates = isLinkPreviewEdit - ? this.getUpdatesForLinkPreview(originalEvent, newEvent) + ? this.getUpdatesForMessage(originalEvent, newEvent) : EventRepository.getUpdatesForEditMessage(originalEvent, newEvent); const updates = {...specificUpdates, ...commonUpdates}; @@ -513,7 +514,7 @@ export class EventRepository { return this.handleAssetUpdate(originalEvent, newEvent); case ClientEvent.CONVERSATION.MESSAGE_ADD: - return this.handleLinkPreviewUpdate(originalEvent, newEvent); + return this.handleMessageUpdate(originalEvent, newEvent); default: this.throwValidationError(newEvent, `Forbidden type '${newEvent.type}' for duplicate events`); @@ -555,7 +556,7 @@ export class EventRepository { } } - private handleLinkPreviewUpdate(originalEvent: EventRecord, newEvent: MessageAddEvent) { + private handleMessageUpdate(originalEvent: EventRecord, newEvent: MessageAddEvent) { const newEventData = newEvent.data; const originalData = originalEvent.data; if (originalEvent.from !== newEvent.from) { @@ -565,15 +566,18 @@ export class EventRepository { } const containsLinkPreview = newEventData.previews && !!newEventData.previews.length; - if (!containsLinkPreview) { - const errorMessage = 'Link preview event does not contain previews'; + const isRetryAttempt = originalEvent.status === StatusType.FAILED; + + if (!containsLinkPreview && !isRetryAttempt) { + const errorMessage = + 'Message duplication event invalid: original message did not fail to send and does not contain link preview'; return this.throwValidationError(newEvent, errorMessage); } const textContentMatches = newEventData.content === originalData.content; if (!textContentMatches) { const errorMessage = 'ID of link preview reused'; - const logMessage = 'Text content for link preview not matching'; + const logMessage = 'Text content for message duplication not matching'; return this.throwValidationError(newEvent, errorMessage, logMessage); } @@ -582,7 +586,7 @@ export class EventRepository { return this.throwValidationError(newEvent, 'ID reused by same user'); } - const updates = this.getUpdatesForLinkPreview(originalEvent, newEvent); + const updates = this.getUpdatesForMessage(originalEvent, newEvent); const identifiedUpdates = {primary_key: originalEvent.primary_key, ...updates}; return this.eventService.replaceEvent(identifiedUpdates); } @@ -604,7 +608,7 @@ export class EventRepository { return {...newEvent, reactions: {}}; } - private getUpdatesForLinkPreview(originalEvent: EventRecord, newEvent: MessageAddEvent) { + private getUpdatesForMessage(originalEvent: EventRecord, newEvent: MessageAddEvent) { const newData = newEvent.data; const originalData = originalEvent.data; const updatingLinkPreview = !!originalData.previews.length; @@ -612,10 +616,10 @@ export class EventRepository { this.throwValidationError(newEvent, 'ID of link preview reused'); } - const textContentMatches = !newData.previews.length || newData.content === originalData.content; + const textContentMatches = !newData.previews?.length || newData.content === originalData.content; if (!textContentMatches) { - const logMessage = 'Text content for link preview not matching'; - const errorMessage = 'ID of link preview reused'; + const logMessage = 'Text content for message duplication not matching'; + const errorMessage = 'ID of duplicated message reused'; this.throwValidationError(newEvent, errorMessage, logMessage); } diff --git a/src/script/event/preprocessor/QuotedMessageMiddleware.ts b/src/script/event/preprocessor/QuotedMessageMiddleware.ts index a3c674f45d8..42cd8798836 100644 --- a/src/script/event/preprocessor/QuotedMessageMiddleware.ts +++ b/src/script/event/preprocessor/QuotedMessageMiddleware.ts @@ -125,6 +125,7 @@ export class QuotedMessageMiddleware { const quoteData = { message_id: messageId, user_id: quotedMessage.from, + hash: quote.quotedMessageSha256, }; const decoratedData = {...event.data, quote: quoteData}; From 74a9e44e3c5ec46cccdff204ab1f1f63bf68045f Mon Sep 17 00:00:00 2001 From: Thomas Belin Date: Mon, 13 Mar 2023 16:14:01 +0100 Subject: [PATCH 60/97] feat: Save failed to send data in DB (#14823) --- package.json | 2 +- .../PartialFailureToSend.test.tsx | 20 +++++++++---------- .../PartialFailureToSend.tsx | 10 ++++------ src/script/conversation/MessageRepository.ts | 2 +- src/script/entity/message/ContentMessage.ts | 3 ++- src/script/storage/record/EventRecord.ts | 5 ++++- yarn.lock | 18 ++++++++++++----- 7 files changed, 35 insertions(+), 25 deletions(-) diff --git a/package.json b/package.json index 9e5e4740984..c7d45142275 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "@emotion/react": "11.10.6", "@types/eslint": "8.4.10", "@wireapp/avs": "9.1.11", - "@wireapp/core": "39.1.6", + "@wireapp/core": "39.2.0", "@wireapp/lru-cache": "3.8.1", "@wireapp/react-ui-kit": "9.4.0", "@wireapp/store-engine-dexie": "2.0.4", diff --git a/src/script/components/MessagesList/Message/ContentMessage/Warnings/PartialFailureToSend/PartialFailureToSend.test.tsx b/src/script/components/MessagesList/Message/ContentMessage/Warnings/PartialFailureToSend/PartialFailureToSend.test.tsx index ac455a6e9cc..3756fe12bf2 100644 --- a/src/script/components/MessagesList/Message/ContentMessage/Warnings/PartialFailureToSend/PartialFailureToSend.test.tsx +++ b/src/script/components/MessagesList/Message/ContentMessage/Warnings/PartialFailureToSend/PartialFailureToSend.test.tsx @@ -51,8 +51,8 @@ describe('PartialFailureToSendWarning', () => { const nbUsers = Math.floor(Math.random() * 100); const users = generateUsers(nbUsers, 'domain'); - const failedToSend = generateUserClients(users); - const {container} = render(withTheme()); + const queued = generateUserClients(users); + const {container} = render(withTheme()); expect(container.textContent).toContain(`${nbUsers} Participants had issues receiving this message`); }); @@ -62,11 +62,11 @@ describe('PartialFailureToSendWarning', () => { const users1 = generateUsers(nbUsersDomain1, 'domain1'); const users2 = generateUsers(nbUsersDomain2, 'domain2'); - const failedToSend = { + const queued = { ...generateUserClients(users1), ...generateUserClients(users2), }; - const {container} = render(withTheme()); + const {container} = render(withTheme()); expect(container.textContent).toContain( `${nbUsersDomain1 + nbUsersDomain2} Participants had issues receiving this message`, ); @@ -74,9 +74,9 @@ describe('PartialFailureToSendWarning', () => { it('does not show the extra info toggle if there is only a single user', () => { const users = generateUsers(1, 'domain'); - const failedToSend = generateUserClients(users); + const queued = generateUserClients(users); const {queryByText, container} = render( - withTheme(), + withTheme(), ); expect(queryByText('Show details')).toBeNull(); @@ -84,8 +84,8 @@ describe('PartialFailureToSendWarning', () => { }); it('toggles the extra info', () => { - const failedToSend = generateUserClients(generateUsers(2, 'domain')); - const {getByText} = render(withTheme()); + const queued = generateUserClients(generateUsers(2, 'domain')); + const {getByText} = render(withTheme()); act(() => { getByText('Show details').click(); @@ -104,9 +104,9 @@ describe('PartialFailureToSendWarning', () => { const nbUsers = Math.floor(Math.random() * 10) + 2; const users = generateUsers(nbUsers, 'domain'); - const failedToSend = generateUserClients(users); + const queued = generateUserClients(users); const {getByText, getAllByTestId} = render( - withTheme(), + withTheme(), ); act(() => { diff --git a/src/script/components/MessagesList/Message/ContentMessage/Warnings/PartialFailureToSend/PartialFailureToSend.tsx b/src/script/components/MessagesList/Message/ContentMessage/Warnings/PartialFailureToSend/PartialFailureToSend.tsx index b198e728de3..66ebe53ad66 100644 --- a/src/script/components/MessagesList/Message/ContentMessage/Warnings/PartialFailureToSend/PartialFailureToSend.tsx +++ b/src/script/components/MessagesList/Message/ContentMessage/Warnings/PartialFailureToSend/PartialFailureToSend.tsx @@ -31,7 +31,7 @@ import {warning} from '../Warnings.styles'; export type User = {qualifiedId: QualifiedId; username: () => string}; type Props = { - failedToSend: QualifiedUserClients; + failedToSend: {queued?: QualifiedUserClients; failed?: QualifiedId[]}; knownUsers: User[]; }; @@ -62,15 +62,13 @@ function generateNamedUsers(users: User[], userClients: QualifiedUserClients): P export const PartialFailureToSendWarning = ({failedToSend, knownUsers}: Props) => { const [isOpen, setIsOpen] = useState(false); + const {queued = {}} = failedToSend; - const userCount = Object.entries(failedToSend).reduce( - (count, [_domain, users]) => count + Object.keys(users).length, - 0, - ); + const userCount = Object.entries(queued).reduce((count, [_domain, users]) => count + Object.keys(users).length, 0); const showToggle = userCount > 1; - const {namedUsers} = generateNamedUsers(knownUsers, failedToSend); + const {namedUsers} = generateNamedUsers(knownUsers, queued); const message = namedUsers.length === 1 diff --git a/src/script/conversation/MessageRepository.ts b/src/script/conversation/MessageRepository.ts index 9a86b8b7d66..5d8f3db70d8 100644 --- a/src/script/conversation/MessageRepository.ts +++ b/src/script/conversation/MessageRepository.ts @@ -1109,7 +1109,7 @@ export class MessageRepository { conversationEntity: Conversation, eventId: string, isoDate?: string, - failedToSend?: QualifiedUserClients, + failedToSend?: SendResult['failedToSend'], ) { try { const messageEntity = await this.getMessageInConversationById(conversationEntity, eventId); diff --git a/src/script/entity/message/ContentMessage.ts b/src/script/entity/message/ContentMessage.ts index e1e19fb5a5b..1084b17c453 100644 --- a/src/script/entity/message/ContentMessage.ts +++ b/src/script/entity/message/ContentMessage.ts @@ -45,7 +45,8 @@ export class ContentMessage extends Message { public readonly is_liked: ko.PureComputed; public readonly like_caption: ko.PureComputed; public readonly other_likes: ko.PureComputed; - public readonly failedToSend: ko.Observable = ko.observable(); + public readonly failedToSend: ko.Observable<{queued?: QualifiedUserClients; failed?: QualifiedId[]} | undefined> = + ko.observable(); public readonly quote: ko.Observable; // TODO: Rename to `reactionsUsers` public readonly reactions_user_ids: ko.PureComputed; diff --git a/src/script/storage/record/EventRecord.ts b/src/script/storage/record/EventRecord.ts index 97f7021c563..29bf4432d04 100644 --- a/src/script/storage/record/EventRecord.ts +++ b/src/script/storage/record/EventRecord.ts @@ -48,7 +48,10 @@ export type UserReactionMap = {[userId: string]: ReactionType}; type SentEvent = { /** sending status of the event*/ status: StatusType; - failedToSend?: QualifiedUserClients; + failedToSend?: { + queue?: QualifiedUserClients; + failed?: QualifiedId[]; + }; }; /** represents an event that was saved to the DB */ diff --git a/yarn.lock b/yarn.lock index 17028a77b11..dfa796ec802 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4811,9 +4811,9 @@ __metadata: languageName: node linkType: hard -"@wireapp/core@npm:39.1.6": - version: 39.1.6 - resolution: "@wireapp/core@npm:39.1.6" +"@wireapp/core@npm:39.2.0": + version: 39.2.0 + resolution: "@wireapp/core@npm:39.2.0" dependencies: "@wireapp/api-client": ^23.1.3 "@wireapp/commons": ^5.0.4 @@ -4825,13 +4825,14 @@ __metadata: "@wireapp/store-engine-dexie": ^2.0.5 axios: 1.3.4 bazinga64: 6.0.4 + deepmerge-ts: 4.3.0 hash.js: 1.1.7 http-status-codes: 2.2.0 idb: 7.1.1 logdown: 3.3.1 long: ^5.2.0 uuidjs: 4.2.13 - checksum: 7de3e325da60e49fd204986aedc7731b763f998de30a6c9ceef0e03b57a74d6b988b32e2977b8d9e0e56c6102bf2931f07a48913e4123021ea21504b314b43de + checksum: 676f98d206e643a67dc24bd3be8ae39f1949e1c944695c902f67c46f0b970fd8bd468d15373cbaa4846ea6343213c409d7eb5f6343904415c61ad85fecf3f8ba languageName: node linkType: hard @@ -7206,6 +7207,13 @@ __metadata: languageName: node linkType: hard +"deepmerge-ts@npm:4.3.0": + version: 4.3.0 + resolution: "deepmerge-ts@npm:4.3.0" + checksum: d5f8a96df9a2bc7177d59544b9390ba76e50fb725f776669068ca04eef319e98ee8870cf7b7ecca9f636b711d57cea571ac61553ee01101a614c045f7a86e0be + languageName: node + linkType: hard + "deepmerge@npm:^4.0.0, deepmerge@npm:^4.2.2": version: 4.2.2 resolution: "deepmerge@npm:4.2.2" @@ -17518,7 +17526,7 @@ __metadata: "@typescript-eslint/parser": ^5.54.1 "@wireapp/avs": 9.1.11 "@wireapp/copy-config": 2.0.10 - "@wireapp/core": 39.1.6 + "@wireapp/core": 39.2.0 "@wireapp/eslint-config": 2.1.1 "@wireapp/lru-cache": 3.8.1 "@wireapp/prettier-config": 0.5.2 From 21418a8c5af611354e2b1b579acfdbbedc889b30 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Mar 2023 16:14:06 +0000 Subject: [PATCH 61/97] chore(deps-dev): Bump jest from 29.4.3 to 29.5.0 (#14822) Bumps [jest](https://github.com/facebook/jest/tree/HEAD/packages/jest) from 29.4.3 to 29.5.0. - [Release notes](https://github.com/facebook/jest/releases) - [Changelog](https://github.com/facebook/jest/blob/main/CHANGELOG.md) - [Commits](https://github.com/facebook/jest/commits/v29.5.0/packages/jest) --- updated-dependencies: - dependency-name: jest dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 657 ++++++++++++--------------------------------------- 2 files changed, 158 insertions(+), 501 deletions(-) diff --git a/package.json b/package.json index c7d45142275..55cd1ff61d6 100644 --- a/package.json +++ b/package.json @@ -136,7 +136,7 @@ "husky": "7.0.4", "i18next-scanner": "4.1.1", "intersection-observer": "0.12.2", - "jest": "29.4.3", + "jest": "29.5.0", "jest-canvas-mock": "2.4.0", "jest-environment-jsdom": "29.5.0", "jest-jasmine2": "29.5.0", diff --git a/yarn.lock b/yarn.lock index dfa796ec802..a55efa39278 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2699,20 +2699,6 @@ __metadata: languageName: node linkType: hard -"@jest/console@npm:^29.4.3": - version: 29.4.3 - resolution: "@jest/console@npm:29.4.3" - dependencies: - "@jest/types": ^29.4.3 - "@types/node": "*" - chalk: ^4.0.0 - jest-message-util: ^29.4.3 - jest-util: ^29.4.3 - slash: ^3.0.0 - checksum: 8d9b163febe735153b523db527742309f4d598eda22f17f04e030060329bd3da4de7420fc1f7812f7a16f08273654a7de094c4b4e8b81a99dbfc17cfb1629008 - languageName: node - linkType: hard - "@jest/console@npm:^29.5.0": version: 29.5.0 resolution: "@jest/console@npm:29.5.0" @@ -2727,36 +2713,36 @@ __metadata: languageName: node linkType: hard -"@jest/core@npm:^29.4.3": - version: 29.4.3 - resolution: "@jest/core@npm:29.4.3" +"@jest/core@npm:^29.5.0": + version: 29.5.0 + resolution: "@jest/core@npm:29.5.0" dependencies: - "@jest/console": ^29.4.3 - "@jest/reporters": ^29.4.3 - "@jest/test-result": ^29.4.3 - "@jest/transform": ^29.4.3 - "@jest/types": ^29.4.3 + "@jest/console": ^29.5.0 + "@jest/reporters": ^29.5.0 + "@jest/test-result": ^29.5.0 + "@jest/transform": ^29.5.0 + "@jest/types": ^29.5.0 "@types/node": "*" ansi-escapes: ^4.2.1 chalk: ^4.0.0 ci-info: ^3.2.0 exit: ^0.1.2 graceful-fs: ^4.2.9 - jest-changed-files: ^29.4.3 - jest-config: ^29.4.3 - jest-haste-map: ^29.4.3 - jest-message-util: ^29.4.3 + jest-changed-files: ^29.5.0 + jest-config: ^29.5.0 + jest-haste-map: ^29.5.0 + jest-message-util: ^29.5.0 jest-regex-util: ^29.4.3 - jest-resolve: ^29.4.3 - jest-resolve-dependencies: ^29.4.3 - jest-runner: ^29.4.3 - jest-runtime: ^29.4.3 - jest-snapshot: ^29.4.3 - jest-util: ^29.4.3 - jest-validate: ^29.4.3 - jest-watcher: ^29.4.3 + jest-resolve: ^29.5.0 + jest-resolve-dependencies: ^29.5.0 + jest-runner: ^29.5.0 + jest-runtime: ^29.5.0 + jest-snapshot: ^29.5.0 + jest-util: ^29.5.0 + jest-validate: ^29.5.0 + jest-watcher: ^29.5.0 micromatch: ^4.0.4 - pretty-format: ^29.4.3 + pretty-format: ^29.5.0 slash: ^3.0.0 strip-ansi: ^6.0.0 peerDependencies: @@ -2764,19 +2750,7 @@ __metadata: peerDependenciesMeta: node-notifier: optional: true - checksum: 4aa10644d66f44f051d5dd9cdcedce27acc71216dbcc5e7adebdea458e27aefe27c78f457d7efd49f58b968c35f42de5a521590876e2013593e675120b9e6ab1 - languageName: node - linkType: hard - -"@jest/environment@npm:^29.4.3": - version: 29.4.3 - resolution: "@jest/environment@npm:29.4.3" - dependencies: - "@jest/fake-timers": ^29.4.3 - "@jest/types": ^29.4.3 - "@types/node": "*" - jest-mock: ^29.4.3 - checksum: 7c1b0cc4e84b90f8a3bbeca9bbf088882c88aee70a81b3b8e24265dcb1cbc302cd1eee3319089cf65bfd39adbaea344903c712afea106cb8da6c86088d99c5fb + checksum: 9e8f5243fe82d5a57f3971e1b96f320058df7c315328a3a827263f3b17f64be10c80f4a9c1b1773628b64d2de6d607c70b5b2d5bf13e7f5ad04223e9ef6aac06 languageName: node linkType: hard @@ -2801,15 +2775,6 @@ __metadata: languageName: node linkType: hard -"@jest/expect-utils@npm:^29.4.3": - version: 29.4.3 - resolution: "@jest/expect-utils@npm:29.4.3" - dependencies: - jest-get-type: ^29.4.3 - checksum: 2bbed39ff2fb59f5acac465a1ce7303e3b4b62b479e4f386261986c9827f7f799ea912761e22629c5daf10addf8513f16733c14a29c2647bb66d4ee625e9ff92 - languageName: node - linkType: hard - "@jest/expect-utils@npm:^29.5.0": version: 29.5.0 resolution: "@jest/expect-utils@npm:29.5.0" @@ -2819,16 +2784,6 @@ __metadata: languageName: node linkType: hard -"@jest/expect@npm:^29.4.3": - version: 29.4.3 - resolution: "@jest/expect@npm:29.4.3" - dependencies: - expect: ^29.4.3 - jest-snapshot: ^29.4.3 - checksum: 08d0d40077ec99a7491fe59d05821dbd31126cfba70875855d8a063698b7126b5f6c309c50811caacc6ae2f727c6e44f51bdcf1d6c1ea832b4f020045ef22d45 - languageName: node - linkType: hard - "@jest/expect@npm:^29.5.0": version: 29.5.0 resolution: "@jest/expect@npm:29.5.0" @@ -2839,20 +2794,6 @@ __metadata: languageName: node linkType: hard -"@jest/fake-timers@npm:^29.4.3": - version: 29.4.3 - resolution: "@jest/fake-timers@npm:29.4.3" - dependencies: - "@jest/types": ^29.4.3 - "@sinonjs/fake-timers": ^10.0.2 - "@types/node": "*" - jest-message-util: ^29.4.3 - jest-mock: ^29.4.3 - jest-util: ^29.4.3 - checksum: adaceb9143c395cccf3d7baa0e49b7042c3092a554e8283146df19926247e34c21b5bde5688bb90e9e87b4a02e4587926c5d858ee0a38d397a63175d0a127874 - languageName: node - linkType: hard - "@jest/fake-timers@npm:^29.5.0": version: 29.5.0 resolution: "@jest/fake-timers@npm:29.5.0" @@ -2867,18 +2808,6 @@ __metadata: languageName: node linkType: hard -"@jest/globals@npm:^29.4.3": - version: 29.4.3 - resolution: "@jest/globals@npm:29.4.3" - dependencies: - "@jest/environment": ^29.4.3 - "@jest/expect": ^29.4.3 - "@jest/types": ^29.4.3 - jest-mock: ^29.4.3 - checksum: ea76b546ceb4aa5ce2bb3726df12f989b23150b51c9f7664790caa81b943012a657cf3a8525498af1c3518cdb387f54b816cfba1b0ddd22c7b20f03b1d7290b4 - languageName: node - linkType: hard - "@jest/globals@npm:^29.5.0": version: 29.5.0 resolution: "@jest/globals@npm:29.5.0" @@ -2891,15 +2820,15 @@ __metadata: languageName: node linkType: hard -"@jest/reporters@npm:^29.4.3": - version: 29.4.3 - resolution: "@jest/reporters@npm:29.4.3" +"@jest/reporters@npm:^29.5.0": + version: 29.5.0 + resolution: "@jest/reporters@npm:29.5.0" dependencies: "@bcoe/v8-coverage": ^0.2.3 - "@jest/console": ^29.4.3 - "@jest/test-result": ^29.4.3 - "@jest/transform": ^29.4.3 - "@jest/types": ^29.4.3 + "@jest/console": ^29.5.0 + "@jest/test-result": ^29.5.0 + "@jest/transform": ^29.5.0 + "@jest/types": ^29.5.0 "@jridgewell/trace-mapping": ^0.3.15 "@types/node": "*" chalk: ^4.0.0 @@ -2912,9 +2841,9 @@ __metadata: istanbul-lib-report: ^3.0.0 istanbul-lib-source-maps: ^4.0.0 istanbul-reports: ^3.1.3 - jest-message-util: ^29.4.3 - jest-util: ^29.4.3 - jest-worker: ^29.4.3 + jest-message-util: ^29.5.0 + jest-util: ^29.5.0 + jest-worker: ^29.5.0 slash: ^3.0.0 string-length: ^4.0.1 strip-ansi: ^6.0.0 @@ -2924,7 +2853,7 @@ __metadata: peerDependenciesMeta: node-notifier: optional: true - checksum: 7aa2e429c915bd96c3334962addd69d2bbf52065725757ddde26b293f8c4420a1e8c65363cc3e1e5ec89100a5273ccd3771bec58325a2cc0d97afdc81995073a + checksum: 481268aac9a4a75cc49c4df1273d6b111808dec815e9d009dad717c32383ebb0cebac76e820ad1ab44e207540e1c2fe1e640d44c4f262de92ab1933e057fdeeb languageName: node linkType: hard @@ -2957,18 +2886,6 @@ __metadata: languageName: node linkType: hard -"@jest/test-result@npm:^29.4.3": - version: 29.4.3 - resolution: "@jest/test-result@npm:29.4.3" - dependencies: - "@jest/console": ^29.4.3 - "@jest/types": ^29.4.3 - "@types/istanbul-lib-coverage": ^2.0.0 - collect-v8-coverage: ^1.0.0 - checksum: 164f102b96619ec283c2c39e208b8048e4674f75bf3c3a4f2e95048ae0f9226105add684b25f10d286d91c221625f877e2c1cfc3da46c42d7e1804da239318cb - languageName: node - linkType: hard - "@jest/test-result@npm:^29.5.0": version: 29.5.0 resolution: "@jest/test-result@npm:29.5.0" @@ -2981,38 +2898,15 @@ __metadata: languageName: node linkType: hard -"@jest/test-sequencer@npm:^29.4.3": - version: 29.4.3 - resolution: "@jest/test-sequencer@npm:29.4.3" - dependencies: - "@jest/test-result": ^29.4.3 - graceful-fs: ^4.2.9 - jest-haste-map: ^29.4.3 - slash: ^3.0.0 - checksum: 145e1fa9379e5be3587bde6d585b8aee5cf4442b06926928a87e9aec7de5be91b581711d627c6ca13144d244fe05e5d248c13b366b51bedc404f9dcfbfd79e9e - languageName: node - linkType: hard - -"@jest/transform@npm:^29.4.3": - version: 29.4.3 - resolution: "@jest/transform@npm:29.4.3" +"@jest/test-sequencer@npm:^29.5.0": + version: 29.5.0 + resolution: "@jest/test-sequencer@npm:29.5.0" dependencies: - "@babel/core": ^7.11.6 - "@jest/types": ^29.4.3 - "@jridgewell/trace-mapping": ^0.3.15 - babel-plugin-istanbul: ^6.1.1 - chalk: ^4.0.0 - convert-source-map: ^2.0.0 - fast-json-stable-stringify: ^2.1.0 + "@jest/test-result": ^29.5.0 graceful-fs: ^4.2.9 - jest-haste-map: ^29.4.3 - jest-regex-util: ^29.4.3 - jest-util: ^29.4.3 - micromatch: ^4.0.4 - pirates: ^4.0.4 + jest-haste-map: ^29.5.0 slash: ^3.0.0 - write-file-atomic: ^4.0.2 - checksum: 082d74e04044213aa7baa8de29f8383e5010034f867969c8602a2447a4ef2f484cfaf2491eba3179ce42f369f7a0af419cbd087910f7e5caf7aa5d1fe03f2ff9 + checksum: eca34b4aeb2fda6dfb7f9f4b064c858a7adf64ec5c6091b6f4ed9d3c19549177cbadcf1c615c4c182688fa1cf085c8c55c3ca6eea40719a34554b0bf071d842e languageName: node linkType: hard @@ -3053,20 +2947,6 @@ __metadata: languageName: node linkType: hard -"@jest/types@npm:^29.4.3": - version: 29.4.3 - resolution: "@jest/types@npm:29.4.3" - dependencies: - "@jest/schemas": ^29.4.3 - "@types/istanbul-lib-coverage": ^2.0.0 - "@types/istanbul-reports": ^3.0.0 - "@types/node": "*" - "@types/yargs": ^17.0.8 - chalk: ^4.0.0 - checksum: 1756f4149d360f98567f56f434144f7af23ed49a2c42889261a314df6b6654c2de70af618fb2ee0ee39cadaf10835b885845557184509503646c9cb9dcc02bac - languageName: node - linkType: hard - "@jest/types@npm:^29.5.0": version: 29.5.0 resolution: "@jest/types@npm:29.5.0" @@ -5677,20 +5557,20 @@ __metadata: languageName: node linkType: hard -"babel-jest@npm:^29.4.3": - version: 29.4.3 - resolution: "babel-jest@npm:29.4.3" +"babel-jest@npm:^29.5.0": + version: 29.5.0 + resolution: "babel-jest@npm:29.5.0" dependencies: - "@jest/transform": ^29.4.3 + "@jest/transform": ^29.5.0 "@types/babel__core": ^7.1.14 babel-plugin-istanbul: ^6.1.1 - babel-preset-jest: ^29.4.3 + babel-preset-jest: ^29.5.0 chalk: ^4.0.0 graceful-fs: ^4.2.9 slash: ^3.0.0 peerDependencies: "@babel/core": ^7.8.0 - checksum: a1a95937adb5e717dbffc2eb9e583fa6d26c7e5d5b07bb492a2d7f68631510a363e9ff097eafb642ad642dfac9dc2b13872b584f680e166a4f0922c98ea95853 + checksum: eafb6d37deb71f0c80bf3c80215aa46732153e5e8bcd73f6ff47d92e5c0c98c8f7f75995d0efec6289c371edad3693cd8fa2367b0661c4deb71a3a7117267ede languageName: node linkType: hard @@ -5720,15 +5600,15 @@ __metadata: languageName: node linkType: hard -"babel-plugin-jest-hoist@npm:^29.4.3": - version: 29.4.3 - resolution: "babel-plugin-jest-hoist@npm:29.4.3" +"babel-plugin-jest-hoist@npm:^29.5.0": + version: 29.5.0 + resolution: "babel-plugin-jest-hoist@npm:29.5.0" dependencies: "@babel/template": ^7.3.3 "@babel/types": ^7.3.3 "@types/babel__core": ^7.1.14 "@types/babel__traverse": ^7.0.6 - checksum: c8702a6db6b30ec39dfb9f8e72b501c13895231ed80b15ed2648448f9f0c7b7cc4b1529beac31802ae655f63479a05110ca612815aa25fb1b0e6c874e1589137 + checksum: 099b5254073b6bc985b6d2d045ad26fb8ed30ff8ae6404c4fe8ee7cd0e98a820f69e3dfb871c7c65aae0f4b65af77046244c07bb92d49ef9005c90eedf681539 languageName: node linkType: hard @@ -5801,15 +5681,15 @@ __metadata: languageName: node linkType: hard -"babel-preset-jest@npm:^29.4.3": - version: 29.4.3 - resolution: "babel-preset-jest@npm:29.4.3" +"babel-preset-jest@npm:^29.5.0": + version: 29.5.0 + resolution: "babel-preset-jest@npm:29.5.0" dependencies: - babel-plugin-jest-hoist: ^29.4.3 + babel-plugin-jest-hoist: ^29.5.0 babel-preset-current-node-syntax: ^1.0.0 peerDependencies: "@babel/core": ^7.0.0 - checksum: a091721861ea2f8d969ace8fe06570cff8f2e847dbc6e4800abacbe63f72131abde615ce0a3b6648472c97e55a5be7f8bf7ae381e2b194ad2fa1737096febcf5 + checksum: 5566ca2762766c9319b4973d018d2fa08c0fcf6415c72cc54f4c8e7199e851ea8f5e6c6730f03ed7ed44fc8beefa959dd15911f2647dee47c615ff4faeddb1ad languageName: node linkType: hard @@ -8428,19 +8308,6 @@ __metadata: languageName: node linkType: hard -"expect@npm:^29.4.3": - version: 29.4.3 - resolution: "expect@npm:29.4.3" - dependencies: - "@jest/expect-utils": ^29.4.3 - jest-get-type: ^29.4.3 - jest-matcher-utils: ^29.4.3 - jest-message-util: ^29.4.3 - jest-util: ^29.4.3 - checksum: ff9dd8c50c0c6fd4b2b00f6dbd7ab0e2063fe1953be81a8c10ae1c005c7f5667ba452918e2efb055504b72b701a4f82575a081a0a7158efb16d87991b0366feb - languageName: node - linkType: hard - "expect@npm:^29.5.0": version: 29.5.0 resolution: "expect@npm:29.5.0" @@ -10415,57 +10282,58 @@ __metadata: languageName: node linkType: hard -"jest-changed-files@npm:^29.4.3": - version: 29.4.3 - resolution: "jest-changed-files@npm:29.4.3" +"jest-changed-files@npm:^29.5.0": + version: 29.5.0 + resolution: "jest-changed-files@npm:29.5.0" dependencies: execa: ^5.0.0 p-limit: ^3.1.0 - checksum: 9a70bd8e92b37e18ad26d8bea97c516f41119fb7046b4255a13c76d557b0e54fa0629726de5a093fadfd6a0a08ce45da65a57086664d505b8db4b3133133e141 + checksum: a67a7cb3c11f8f92bd1b7c79e84f724cbd11a9ad51f3cdadafe3ce7ee3c79ee50dbea128f920f5fddc807e9e4e83f5462143094391feedd959a77dd20ab96cf3 languageName: node linkType: hard -"jest-circus@npm:^29.4.3": - version: 29.4.3 - resolution: "jest-circus@npm:29.4.3" +"jest-circus@npm:^29.5.0": + version: 29.5.0 + resolution: "jest-circus@npm:29.5.0" dependencies: - "@jest/environment": ^29.4.3 - "@jest/expect": ^29.4.3 - "@jest/test-result": ^29.4.3 - "@jest/types": ^29.4.3 + "@jest/environment": ^29.5.0 + "@jest/expect": ^29.5.0 + "@jest/test-result": ^29.5.0 + "@jest/types": ^29.5.0 "@types/node": "*" chalk: ^4.0.0 co: ^4.6.0 dedent: ^0.7.0 is-generator-fn: ^2.0.0 - jest-each: ^29.4.3 - jest-matcher-utils: ^29.4.3 - jest-message-util: ^29.4.3 - jest-runtime: ^29.4.3 - jest-snapshot: ^29.4.3 - jest-util: ^29.4.3 + jest-each: ^29.5.0 + jest-matcher-utils: ^29.5.0 + jest-message-util: ^29.5.0 + jest-runtime: ^29.5.0 + jest-snapshot: ^29.5.0 + jest-util: ^29.5.0 p-limit: ^3.1.0 - pretty-format: ^29.4.3 + pretty-format: ^29.5.0 + pure-rand: ^6.0.0 slash: ^3.0.0 stack-utils: ^2.0.3 - checksum: 2739bef9c888743b49ff3fe303131381618e5d2f250f613a91240d9c86e19e6874fc904cbd8bcb02ec9ec59a84e5dae4ffec929f0c6171e87ddbc05508a137f4 + checksum: 44ff5d06acedae6de6c866e20e3b61f83e29ab94cf9f960826e7e667de49c12dd9ab9dffd7fa3b7d1f9688a8b5bfb1ebebadbea69d9ed0d3f66af4a0ff8c2b27 languageName: node linkType: hard -"jest-cli@npm:^29.4.3": - version: 29.4.3 - resolution: "jest-cli@npm:29.4.3" +"jest-cli@npm:^29.5.0": + version: 29.5.0 + resolution: "jest-cli@npm:29.5.0" dependencies: - "@jest/core": ^29.4.3 - "@jest/test-result": ^29.4.3 - "@jest/types": ^29.4.3 + "@jest/core": ^29.5.0 + "@jest/test-result": ^29.5.0 + "@jest/types": ^29.5.0 chalk: ^4.0.0 exit: ^0.1.2 graceful-fs: ^4.2.9 import-local: ^3.0.2 - jest-config: ^29.4.3 - jest-util: ^29.4.3 - jest-validate: ^29.4.3 + jest-config: ^29.5.0 + jest-util: ^29.5.0 + jest-validate: ^29.5.0 prompts: ^2.0.1 yargs: ^17.3.1 peerDependencies: @@ -10475,34 +10343,34 @@ __metadata: optional: true bin: jest: bin/jest.js - checksum: f4c9f6d76cde2c60a4169acbebb3f862728be03bcf3fe0077d2e55da7f9f3c3e9483cfa6e936832d35eabf96ee5ebf0300c4b0bd43cffff099801793466bfdd8 + checksum: 39897bbbc0f0d8a6b975ab12fd13887eaa28d92e3dee9e0173a5cb913ae8cc2ae46e090d38c6d723e84d9d6724429cd08685b4e505fa447d31ca615630c7dbba languageName: node linkType: hard -"jest-config@npm:^29.4.3": - version: 29.4.3 - resolution: "jest-config@npm:29.4.3" +"jest-config@npm:^29.5.0": + version: 29.5.0 + resolution: "jest-config@npm:29.5.0" dependencies: "@babel/core": ^7.11.6 - "@jest/test-sequencer": ^29.4.3 - "@jest/types": ^29.4.3 - babel-jest: ^29.4.3 + "@jest/test-sequencer": ^29.5.0 + "@jest/types": ^29.5.0 + babel-jest: ^29.5.0 chalk: ^4.0.0 ci-info: ^3.2.0 deepmerge: ^4.2.2 glob: ^7.1.3 graceful-fs: ^4.2.9 - jest-circus: ^29.4.3 - jest-environment-node: ^29.4.3 + jest-circus: ^29.5.0 + jest-environment-node: ^29.5.0 jest-get-type: ^29.4.3 jest-regex-util: ^29.4.3 - jest-resolve: ^29.4.3 - jest-runner: ^29.4.3 - jest-util: ^29.4.3 - jest-validate: ^29.4.3 + jest-resolve: ^29.5.0 + jest-runner: ^29.5.0 + jest-util: ^29.5.0 + jest-validate: ^29.5.0 micromatch: ^4.0.4 parse-json: ^5.2.0 - pretty-format: ^29.4.3 + pretty-format: ^29.5.0 slash: ^3.0.0 strip-json-comments: ^3.1.1 peerDependencies: @@ -10513,7 +10381,7 @@ __metadata: optional: true ts-node: optional: true - checksum: 92f9a9c6850b18682cb01892774a33967472af23a5844438d8c68077d5f2a29b15b665e4e4db7de3d74002a6dca158cd5b2cb9f5debfd2cce5e1aee6c74e3873 + checksum: c37c4dab964c54ab293d4e302d40b09687037ac9d00b88348ec42366970747feeaf265e12e3750cd3660b40c518d4031335eda11ac10b70b10e60797ebbd4b9c languageName: node linkType: hard @@ -10529,18 +10397,6 @@ __metadata: languageName: node linkType: hard -"jest-diff@npm:^29.4.3": - version: 29.4.3 - resolution: "jest-diff@npm:29.4.3" - dependencies: - chalk: ^4.0.0 - diff-sequences: ^29.4.3 - jest-get-type: ^29.4.3 - pretty-format: ^29.4.3 - checksum: 877fd1edffef6b319688c27b152e5b28e2bc4bcda5ce0ca90d7e137f9fafda4280bae25403d4c0bfd9806c2c0b15d966aa2dfaf5f9928ec8f1ccea7fa1d08ed6 - languageName: node - linkType: hard - "jest-diff@npm:^29.5.0": version: 29.5.0 resolution: "jest-diff@npm:29.5.0" @@ -10562,19 +10418,6 @@ __metadata: languageName: node linkType: hard -"jest-each@npm:^29.4.3": - version: 29.4.3 - resolution: "jest-each@npm:29.4.3" - dependencies: - "@jest/types": ^29.4.3 - chalk: ^4.0.0 - jest-get-type: ^29.4.3 - jest-util: ^29.4.3 - pretty-format: ^29.4.3 - checksum: 1f72738338399efab0139eaea18bc198be0c6ed889770c8cbfa70bf9c724e8171fe1d3a29a94f9f39b8493ee6b2529bb350fb7c7c75e0d7eddfd28c253c79f9d - languageName: node - linkType: hard - "jest-each@npm:^29.5.0": version: 29.5.0 resolution: "jest-each@npm:29.5.0" @@ -10609,17 +10452,17 @@ __metadata: languageName: node linkType: hard -"jest-environment-node@npm:^29.4.3": - version: 29.4.3 - resolution: "jest-environment-node@npm:29.4.3" +"jest-environment-node@npm:^29.5.0": + version: 29.5.0 + resolution: "jest-environment-node@npm:29.5.0" dependencies: - "@jest/environment": ^29.4.3 - "@jest/fake-timers": ^29.4.3 - "@jest/types": ^29.4.3 + "@jest/environment": ^29.5.0 + "@jest/fake-timers": ^29.5.0 + "@jest/types": ^29.5.0 "@types/node": "*" - jest-mock: ^29.4.3 - jest-util: ^29.4.3 - checksum: 3c7362edfdbd516e83af7367c95dde35761a482b174de9735c07633405486ec73e19624e9bea4333fca33c24e8d65eaa1aa6594e0cb6bfeeeb564ccc431ee61d + jest-mock: ^29.5.0 + jest-util: ^29.5.0 + checksum: 57981911cc20a4219b0da9e22b2e3c9f31b505e43f78e61c899e3227ded455ce1a3a9483842c69cfa4532f02cfb536ae0995bf245f9211608edacfc1e478d411 languageName: node linkType: hard @@ -10637,29 +10480,6 @@ __metadata: languageName: node linkType: hard -"jest-haste-map@npm:^29.4.3": - version: 29.4.3 - resolution: "jest-haste-map@npm:29.4.3" - dependencies: - "@jest/types": ^29.4.3 - "@types/graceful-fs": ^4.1.3 - "@types/node": "*" - anymatch: ^3.0.3 - fb-watchman: ^2.0.0 - fsevents: ^2.3.2 - graceful-fs: ^4.2.9 - jest-regex-util: ^29.4.3 - jest-util: ^29.4.3 - jest-worker: ^29.4.3 - micromatch: ^4.0.4 - walker: ^1.0.8 - dependenciesMeta: - fsevents: - optional: true - checksum: c7a83ebe6008b3fe96a96235e8153092e54b14df68e0f4205faedec57450df26b658578495a71c6d82494c01fbb44bca98c1506a6b2b9c920696dcc5d2e2bc59 - languageName: node - linkType: hard - "jest-haste-map@npm:^29.5.0": version: 29.5.0 resolution: "jest-haste-map@npm:29.5.0" @@ -10708,13 +10528,13 @@ __metadata: languageName: node linkType: hard -"jest-leak-detector@npm:^29.4.3": - version: 29.4.3 - resolution: "jest-leak-detector@npm:29.4.3" +"jest-leak-detector@npm:^29.5.0": + version: 29.5.0 + resolution: "jest-leak-detector@npm:29.5.0" dependencies: jest-get-type: ^29.4.3 - pretty-format: ^29.4.3 - checksum: ec2b45e6f0abce81bd0dd0f6fd06b433c24d1ec865267af7640fae540ec868b93752598e407a9184d9c7419cbf32e8789007cc8c1be1a84f8f7321a0f8ad01f1 + pretty-format: ^29.5.0 + checksum: 0fb845da7ac9cdfc9b3b2e35f6f623a41c547d7dc0103ceb0349013459d00de5870b5689a625e7e37f9644934b40e8f1dcdd5422d14d57470600350364676313 languageName: node linkType: hard @@ -10730,18 +10550,6 @@ __metadata: languageName: node linkType: hard -"jest-matcher-utils@npm:^29.4.3": - version: 29.4.3 - resolution: "jest-matcher-utils@npm:29.4.3" - dependencies: - chalk: ^4.0.0 - jest-diff: ^29.4.3 - jest-get-type: ^29.4.3 - pretty-format: ^29.4.3 - checksum: 9e13cbe42d2113bab2691110c7c3ba5cec3b94abad2727e1de90929d0f67da444e9b2066da3b476b5bf788df53a8ede0e0a950cfb06a04e4d6d566d115ee4f1d - languageName: node - linkType: hard - "jest-matcher-utils@npm:^29.5.0": version: 29.5.0 resolution: "jest-matcher-utils@npm:29.5.0" @@ -10771,23 +10579,6 @@ __metadata: languageName: node linkType: hard -"jest-message-util@npm:^29.4.3": - version: 29.4.3 - resolution: "jest-message-util@npm:29.4.3" - dependencies: - "@babel/code-frame": ^7.12.13 - "@jest/types": ^29.4.3 - "@types/stack-utils": ^2.0.0 - chalk: ^4.0.0 - graceful-fs: ^4.2.9 - micromatch: ^4.0.4 - pretty-format: ^29.4.3 - slash: ^3.0.0 - stack-utils: ^2.0.3 - checksum: 64f06b9550021e68da0059020bea8691283cf818918810bb67192d7b7fb9b691c7eadf55c2ca3cd04df5394918f2327245077095cdc0d6b04be3532d2c7d0ced - languageName: node - linkType: hard - "jest-message-util@npm:^29.5.0": version: 29.5.0 resolution: "jest-message-util@npm:29.5.0" @@ -10805,17 +10596,6 @@ __metadata: languageName: node linkType: hard -"jest-mock@npm:^29.4.3": - version: 29.4.3 - resolution: "jest-mock@npm:29.4.3" - dependencies: - "@jest/types": ^29.4.3 - "@types/node": "*" - jest-util: ^29.4.3 - checksum: 8eb4a29b02d2cd03faac0290b6df6d23b4ffa43f72b21c7fff3c7dd04a2797355b1e85862b70b15341dd33ee3a693b17db5520a6f6e6b81ee75601987de6a1a2 - languageName: node - linkType: hard - "jest-mock@npm:^29.5.0": version: 29.5.0 resolution: "jest-mock@npm:29.5.0" @@ -10846,30 +10626,13 @@ __metadata: languageName: node linkType: hard -"jest-resolve-dependencies@npm:^29.4.3": - version: 29.4.3 - resolution: "jest-resolve-dependencies@npm:29.4.3" +"jest-resolve-dependencies@npm:^29.5.0": + version: 29.5.0 + resolution: "jest-resolve-dependencies@npm:29.5.0" dependencies: jest-regex-util: ^29.4.3 - jest-snapshot: ^29.4.3 - checksum: 3ad934cd2170c9658d8800f84a975dafc866ec85b7ce391c640c09c3744ced337787620d8667dc8d1fa5e0b1493f973caa1a1bb980e4e6a50b46a1720baf0bd1 - languageName: node - linkType: hard - -"jest-resolve@npm:^29.4.3": - version: 29.4.3 - resolution: "jest-resolve@npm:29.4.3" - dependencies: - chalk: ^4.0.0 - graceful-fs: ^4.2.9 - jest-haste-map: ^29.4.3 - jest-pnp-resolver: ^1.2.2 - jest-util: ^29.4.3 - jest-validate: ^29.4.3 - resolve: ^1.20.0 - resolve.exports: ^2.0.0 - slash: ^3.0.0 - checksum: 056a66beccf833f3c7e5a8fc9bfec218886e87b0b103decdbdf11893669539df489d1490cd6d5f0eea35731e8be0d2e955a6710498f970d2eae734da4df029dc + jest-snapshot: ^29.5.0 + checksum: 479d2e5365d58fe23f2b87001e2e0adcbffe0147700e85abdec8f14b9703b0a55758c1929a9989e3f5d5e954fb88870ea4bfa04783523b664562fcf5f10b0edf languageName: node linkType: hard @@ -10890,62 +10653,32 @@ __metadata: languageName: node linkType: hard -"jest-runner@npm:^29.4.3": - version: 29.4.3 - resolution: "jest-runner@npm:29.4.3" +"jest-runner@npm:^29.5.0": + version: 29.5.0 + resolution: "jest-runner@npm:29.5.0" dependencies: - "@jest/console": ^29.4.3 - "@jest/environment": ^29.4.3 - "@jest/test-result": ^29.4.3 - "@jest/transform": ^29.4.3 - "@jest/types": ^29.4.3 + "@jest/console": ^29.5.0 + "@jest/environment": ^29.5.0 + "@jest/test-result": ^29.5.0 + "@jest/transform": ^29.5.0 + "@jest/types": ^29.5.0 "@types/node": "*" chalk: ^4.0.0 emittery: ^0.13.1 graceful-fs: ^4.2.9 jest-docblock: ^29.4.3 - jest-environment-node: ^29.4.3 - jest-haste-map: ^29.4.3 - jest-leak-detector: ^29.4.3 - jest-message-util: ^29.4.3 - jest-resolve: ^29.4.3 - jest-runtime: ^29.4.3 - jest-util: ^29.4.3 - jest-watcher: ^29.4.3 - jest-worker: ^29.4.3 + jest-environment-node: ^29.5.0 + jest-haste-map: ^29.5.0 + jest-leak-detector: ^29.5.0 + jest-message-util: ^29.5.0 + jest-resolve: ^29.5.0 + jest-runtime: ^29.5.0 + jest-util: ^29.5.0 + jest-watcher: ^29.5.0 + jest-worker: ^29.5.0 p-limit: ^3.1.0 source-map-support: 0.5.13 - checksum: c41108e5da01e0b8fdc2a06c5042eb49bb1d8db0e0d4651769fd1b9fe84ab45188617c11a3a8e1c83748b29bfe57dd77001ec57e86e3e3c30f3534e0314f8882 - languageName: node - linkType: hard - -"jest-runtime@npm:^29.4.3": - version: 29.4.3 - resolution: "jest-runtime@npm:29.4.3" - dependencies: - "@jest/environment": ^29.4.3 - "@jest/fake-timers": ^29.4.3 - "@jest/globals": ^29.4.3 - "@jest/source-map": ^29.4.3 - "@jest/test-result": ^29.4.3 - "@jest/transform": ^29.4.3 - "@jest/types": ^29.4.3 - "@types/node": "*" - chalk: ^4.0.0 - cjs-module-lexer: ^1.0.0 - collect-v8-coverage: ^1.0.0 - glob: ^7.1.3 - graceful-fs: ^4.2.9 - jest-haste-map: ^29.4.3 - jest-message-util: ^29.4.3 - jest-mock: ^29.4.3 - jest-regex-util: ^29.4.3 - jest-resolve: ^29.4.3 - jest-snapshot: ^29.4.3 - jest-util: ^29.4.3 - slash: ^3.0.0 - strip-bom: ^4.0.0 - checksum: b99f8a910d1a38e7476058ba04ad44dfd3d93e837bb7c301d691e646a1085412fde87f06fbe271c9145f0e72d89400bfa7f6994bc30d456c7742269f37d0f570 + checksum: 437dea69c5dddca22032259787bac74790d5a171c9d804711415f31e5d1abfb64fa52f54a9015bb17a12b858fd0cf3f75ef6f3c9e94255a8596e179f707229c4 languageName: node linkType: hard @@ -10979,38 +10712,6 @@ __metadata: languageName: node linkType: hard -"jest-snapshot@npm:^29.4.3": - version: 29.4.3 - resolution: "jest-snapshot@npm:29.4.3" - dependencies: - "@babel/core": ^7.11.6 - "@babel/generator": ^7.7.2 - "@babel/plugin-syntax-jsx": ^7.7.2 - "@babel/plugin-syntax-typescript": ^7.7.2 - "@babel/traverse": ^7.7.2 - "@babel/types": ^7.3.3 - "@jest/expect-utils": ^29.4.3 - "@jest/transform": ^29.4.3 - "@jest/types": ^29.4.3 - "@types/babel__traverse": ^7.0.6 - "@types/prettier": ^2.1.5 - babel-preset-current-node-syntax: ^1.0.0 - chalk: ^4.0.0 - expect: ^29.4.3 - graceful-fs: ^4.2.9 - jest-diff: ^29.4.3 - jest-get-type: ^29.4.3 - jest-haste-map: ^29.4.3 - jest-matcher-utils: ^29.4.3 - jest-message-util: ^29.4.3 - jest-util: ^29.4.3 - natural-compare: ^1.4.0 - pretty-format: ^29.4.3 - semver: ^7.3.5 - checksum: 79ba52f2435e23ce72b1309be4b17fdbcb299d1c2ce97ebb61df9a62711e9463035f63b4c849181b2fe5aa17b3e09d30ee4668cc25fb3c6f59511c010b4d9494 - languageName: node - linkType: hard - "jest-snapshot@npm:^29.5.0": version: 29.5.0 resolution: "jest-snapshot@npm:29.5.0" @@ -11056,20 +10757,6 @@ __metadata: languageName: node linkType: hard -"jest-util@npm:^29.4.3": - version: 29.4.3 - resolution: "jest-util@npm:29.4.3" - dependencies: - "@jest/types": ^29.4.3 - "@types/node": "*" - chalk: ^4.0.0 - ci-info: ^3.2.0 - graceful-fs: ^4.2.9 - picomatch: ^2.2.3 - checksum: 606b3e6077895baf8fb4ad4d08c134f37a6b81d5ba77ae654c942b1ae4b7294ab3b5a0eb93db34f129407b367970cf3b76bf5c80897b30f215f2bc8bf20a5f3f - languageName: node - linkType: hard - "jest-util@npm:^29.5.0": version: 29.5.0 resolution: "jest-util@npm:29.5.0" @@ -11084,20 +10771,6 @@ __metadata: languageName: node linkType: hard -"jest-validate@npm:^29.4.3": - version: 29.4.3 - resolution: "jest-validate@npm:29.4.3" - dependencies: - "@jest/types": ^29.4.3 - camelcase: ^6.2.0 - chalk: ^4.0.0 - jest-get-type: ^29.4.3 - leven: ^3.1.0 - pretty-format: ^29.4.3 - checksum: 983e56430d86bed238448cae031535c1d908f760aa312cd4a4ec0e92f3bc1b6675415ddf57cdeceedb8ad9c698e5bcd10f0a856dfc93a8923bdecc7733f4ba80 - languageName: node - linkType: hard - "jest-validate@npm:^29.5.0": version: 29.5.0 resolution: "jest-validate@npm:29.5.0" @@ -11112,19 +10785,19 @@ __metadata: languageName: node linkType: hard -"jest-watcher@npm:^29.4.3": - version: 29.4.3 - resolution: "jest-watcher@npm:29.4.3" +"jest-watcher@npm:^29.5.0": + version: 29.5.0 + resolution: "jest-watcher@npm:29.5.0" dependencies: - "@jest/test-result": ^29.4.3 - "@jest/types": ^29.4.3 + "@jest/test-result": ^29.5.0 + "@jest/types": ^29.5.0 "@types/node": "*" ansi-escapes: ^4.2.1 chalk: ^4.0.0 emittery: ^0.13.1 - jest-util: ^29.4.3 + jest-util: ^29.5.0 string-length: ^4.0.1 - checksum: 44b64991b3414db853c3756f14690028f4edef7aebfb204a4291cc1901c2239fa27a8687c5c5abbecc74bf613e0bb9b1378bf766430c9febcc71e9c0cb5ad8fc + checksum: 62303ac7bdc7e61a8b4239a239d018f7527739da2b2be6a81a7be25b74ca769f1c43ee8558ce8e72bb857245c46d6e03af331227ffb00a57280abb2a928aa776 languageName: node linkType: hard @@ -11150,18 +10823,6 @@ __metadata: languageName: node linkType: hard -"jest-worker@npm:^29.4.3": - version: 29.4.3 - resolution: "jest-worker@npm:29.4.3" - dependencies: - "@types/node": "*" - jest-util: ^29.4.3 - merge-stream: ^2.0.0 - supports-color: ^8.0.0 - checksum: c99ae66f257564613e72c5797c3a68f21a22e1c1fb5f30d14695ff5b508a0d2405f22748f13a3df8d1015b5e16abb130170f81f047ff68f58b6b1d2ff6ebc51b - languageName: node - linkType: hard - "jest-worker@npm:^29.5.0": version: 29.5.0 resolution: "jest-worker@npm:29.5.0" @@ -11174,14 +10835,14 @@ __metadata: languageName: node linkType: hard -"jest@npm:29.4.3": - version: 29.4.3 - resolution: "jest@npm:29.4.3" +"jest@npm:29.5.0": + version: 29.5.0 + resolution: "jest@npm:29.5.0" dependencies: - "@jest/core": ^29.4.3 - "@jest/types": ^29.4.3 + "@jest/core": ^29.5.0 + "@jest/types": ^29.5.0 import-local: ^3.0.2 - jest-cli: ^29.4.3 + jest-cli: ^29.5.0 peerDependencies: node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0 peerDependenciesMeta: @@ -11189,7 +10850,7 @@ __metadata: optional: true bin: jest: bin/jest.js - checksum: 084d10d1ceaade3c40e6d3bbd71b9b71b8919ba6fbd6f1f6699bdc259a6ba2f7350c7ccbfa10c11f7e3e01662853650a6244210179542fe4ba87e77dc3f3109f + checksum: a8ff2eb0f421623412236e23cbe67c638127fffde466cba9606bc0c0553b4c1e5cb116d7e0ef990b5d1712851652c8ee461373b578df50857fe635b94ff455d5 languageName: node linkType: hard @@ -14242,17 +13903,6 @@ __metadata: languageName: node linkType: hard -"pretty-format@npm:^29.4.3": - version: 29.4.3 - resolution: "pretty-format@npm:29.4.3" - dependencies: - "@jest/schemas": ^29.4.3 - ansi-styles: ^5.0.0 - react-is: ^18.0.0 - checksum: 3258b9a010bd79b3cf73783ad1e4592b6326fc981b6e31b742f316f14e7fbac09b48a9dbf274d092d9bde404db9fe16f518370e121837dc078a597392e6e5cc5 - languageName: node - linkType: hard - "pretty-format@npm:^29.5.0": version: 29.5.0 resolution: "pretty-format@npm:29.5.0" @@ -14419,6 +14069,13 @@ __metadata: languageName: node linkType: hard +"pure-rand@npm:^6.0.0": + version: 6.0.0 + resolution: "pure-rand@npm:6.0.0" + checksum: ad1378d0a4859482d053a5264b2b485b445ece4bbc56f8959c233ea678b81ac2d613737925d496ded134eff5f29cc5546bf7492b6bce319ee27bebbad8a0c612 + languageName: node + linkType: hard + "querystringify@npm:^2.1.1": version: 2.2.0 resolution: "querystringify@npm:2.2.0" @@ -17584,7 +17241,7 @@ __metadata: husky: 7.0.4 i18next-scanner: 4.1.1 intersection-observer: 0.12.2 - jest: 29.4.3 + jest: 29.5.0 jest-canvas-mock: 2.4.0 jest-environment-jsdom: 29.5.0 jest-jasmine2: 29.5.0 From 04b6dc0038f98fee8612395d53eb5f1d1ac60518 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Mar 2023 17:15:04 +0100 Subject: [PATCH 62/97] chore(deps): Bump srvaroa/labeler from 1.3 to 1.4 (#14796) --- .github/workflows/label.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/label.yml b/.github/workflows/label.yml index 4c403a3fd75..738a3050266 100644 --- a/.github/workflows/label.yml +++ b/.github/workflows/label.yml @@ -9,6 +9,6 @@ jobs: name: Label PR based on title runs-on: ubuntu-latest steps: - - uses: srvaroa/labeler@v1.3 + - uses: srvaroa/labeler@v1.4 env: GITHUB_TOKEN: ${{secrets.OTTO_THE_BOT_GH_TOKEN}} From 767021a60fdb5c00630897ad67ba43079e9c07b3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Mar 2023 17:34:20 +0100 Subject: [PATCH 63/97] chore(deps-dev): Bump @types/react from 18.0.27 to 18.0.28 (#14665) --- package.json | 6 +- yarn.lock | 751 ++++----------------------------------------------- 2 files changed, 49 insertions(+), 708 deletions(-) diff --git a/package.json b/package.json index 55cd1ff61d6..837b1dfd658 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "@wireapp/core": "39.2.0", "@wireapp/lru-cache": "3.8.1", "@wireapp/react-ui-kit": "9.4.0", - "@wireapp/store-engine-dexie": "2.0.4", + "@wireapp/store-engine-dexie": "2.0.5", "@wireapp/store-engine-sqleet": "1.8.9", "@wireapp/webapp-events": "0.16.0", "amplify": "https://github.com/wireapp/amplify#head=master", @@ -80,7 +80,7 @@ "@types/open-graph": "0.2.2", "@types/platform": "1.3.4", "@types/prettier": "^2.7.2", - "@types/react": "18.0.27", + "@types/react": "18.0.28", "@types/react-dom": "18.0.11", "@types/react-redux": "7.1.25", "@types/react-transition-group": "4.4.5", @@ -106,7 +106,7 @@ "cspell": "6.29.0", "css-loader": "^6.7.3", "cssnano": "^5.1.14", - "dexie": "^3.2.2", + "dexie": "3.2.3", "dotenv": "16.0.3", "dpdm": "3.12.0", "eslint": "^8.34.0", diff --git a/yarn.lock b/yarn.lock index a55efa39278..7eb1e8bb97f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5,15 +5,6 @@ __metadata: version: 6 cacheKey: 8 -"@ampproject/remapping@npm:^2.1.0": - version: 2.1.2 - resolution: "@ampproject/remapping@npm:2.1.2" - dependencies: - "@jridgewell/trace-mapping": ^0.3.0 - checksum: e023f92cdd9723f3042cde3b4d922adfeef0e198aa73486b0b6c034ad36af5f96e5c0cc72b335b30b2eb9852d907efc92af6bfcd3f4b4d286177ee32a189cf92 - languageName: node - linkType: hard - "@ampproject/remapping@npm:^2.2.0": version: 2.2.0 resolution: "@ampproject/remapping@npm:2.2.0" @@ -53,7 +44,7 @@ __metadata: languageName: node linkType: hard -"@babel/core@npm:7.21.0": +"@babel/core@npm:7.21.0, @babel/core@npm:^7.11.1, @babel/core@npm:^7.11.6, @babel/core@npm:^7.12.3": version: 7.21.0 resolution: "@babel/core@npm:7.21.0" dependencies: @@ -76,29 +67,6 @@ __metadata: languageName: node linkType: hard -"@babel/core@npm:^7.11.1, @babel/core@npm:^7.11.6, @babel/core@npm:^7.12.3": - version: 7.20.12 - resolution: "@babel/core@npm:7.20.12" - dependencies: - "@ampproject/remapping": ^2.1.0 - "@babel/code-frame": ^7.18.6 - "@babel/generator": ^7.20.7 - "@babel/helper-compilation-targets": ^7.20.7 - "@babel/helper-module-transforms": ^7.20.11 - "@babel/helpers": ^7.20.7 - "@babel/parser": ^7.20.7 - "@babel/template": ^7.20.7 - "@babel/traverse": ^7.20.12 - "@babel/types": ^7.20.7 - convert-source-map: ^1.7.0 - debug: ^4.1.0 - gensync: ^1.0.0-beta.2 - json5: ^2.2.2 - semver: ^6.3.0 - checksum: 62e6c3e2149a70b5c9729ef5f0d3e2e97e9dcde89fc039c8d8e3463d5d7ba9b29ee84d10faf79b61532ac1645aa62f2bd42338320617e6e3a8a4d8e2a27076e7 - languageName: node - linkType: hard - "@babel/eslint-parser@npm:7.19.1": version: 7.19.1 resolution: "@babel/eslint-parser@npm:7.19.1" @@ -113,18 +81,7 @@ __metadata: languageName: node linkType: hard -"@babel/generator@npm:^7.20.7, @babel/generator@npm:^7.7.2": - version: 7.20.7 - resolution: "@babel/generator@npm:7.20.7" - dependencies: - "@babel/types": ^7.20.7 - "@jridgewell/gen-mapping": ^0.3.2 - jsesc: ^2.5.1 - checksum: 84b6983ffdb50c80c1c2e3f3c32617a7133d8effd1065f3e0f9bba188a7d54ab42a4dd5e42b61b843c65f9dd1aa870036ff0f848ebd42707aaa8a2b6d31d04f5 - languageName: node - linkType: hard - -"@babel/generator@npm:^7.21.0, @babel/generator@npm:^7.21.1": +"@babel/generator@npm:^7.21.0, @babel/generator@npm:^7.21.1, @babel/generator@npm:^7.7.2": version: 7.21.1 resolution: "@babel/generator@npm:7.21.1" dependencies: @@ -170,25 +127,7 @@ __metadata: languageName: node linkType: hard -"@babel/helper-create-class-features-plugin@npm:^7.18.6": - version: 7.20.12 - resolution: "@babel/helper-create-class-features-plugin@npm:7.20.12" - dependencies: - "@babel/helper-annotate-as-pure": ^7.18.6 - "@babel/helper-environment-visitor": ^7.18.9 - "@babel/helper-function-name": ^7.19.0 - "@babel/helper-member-expression-to-functions": ^7.20.7 - "@babel/helper-optimise-call-expression": ^7.18.6 - "@babel/helper-replace-supers": ^7.20.7 - "@babel/helper-skip-transparent-expression-wrappers": ^7.20.0 - "@babel/helper-split-export-declaration": ^7.18.6 - peerDependencies: - "@babel/core": ^7.0.0 - checksum: 1e9ed4243b75278fa24deb40dc62bf537b79307987223a2d2d2ae5abf7ba6dc8435d6e3bb55d52ceb30d3e1eba88e7eb6a1885a8bb519e5cfc3e9dedb97d43e6 - languageName: node - linkType: hard - -"@babel/helper-create-class-features-plugin@npm:^7.21.0": +"@babel/helper-create-class-features-plugin@npm:^7.18.6, @babel/helper-create-class-features-plugin@npm:^7.21.0": version: 7.21.0 resolution: "@babel/helper-create-class-features-plugin@npm:7.21.0" dependencies: @@ -250,17 +189,7 @@ __metadata: languageName: node linkType: hard -"@babel/helper-function-name@npm:^7.18.9, @babel/helper-function-name@npm:^7.19.0": - version: 7.19.0 - resolution: "@babel/helper-function-name@npm:7.19.0" - dependencies: - "@babel/template": ^7.18.10 - "@babel/types": ^7.19.0 - checksum: eac1f5db428ba546270c2b8d750c24eb528b8fcfe50c81de2e0bdebf0e20f24bec688d4331533b782e4a907fad435244621ca2193cfcf80a86731299840e0f6e - languageName: node - linkType: hard - -"@babel/helper-function-name@npm:^7.21.0": +"@babel/helper-function-name@npm:^7.18.9, @babel/helper-function-name@npm:^7.19.0, @babel/helper-function-name@npm:^7.21.0": version: 7.21.0 resolution: "@babel/helper-function-name@npm:7.21.0" dependencies: @@ -279,16 +208,7 @@ __metadata: languageName: node linkType: hard -"@babel/helper-member-expression-to-functions@npm:^7.20.7": - version: 7.20.7 - resolution: "@babel/helper-member-expression-to-functions@npm:7.20.7" - dependencies: - "@babel/types": ^7.20.7 - checksum: cec17aab7e964830b0146e575bd141127032319f26ed864a65b35abd75ad618d264d3e11449b9b4e29cfd95bb1a7e774afddd4884fdcc29c36ac9cbd2b66359f - languageName: node - linkType: hard - -"@babel/helper-member-expression-to-functions@npm:^7.21.0": +"@babel/helper-member-expression-to-functions@npm:^7.20.7, @babel/helper-member-expression-to-functions@npm:^7.21.0": version: 7.21.0 resolution: "@babel/helper-member-expression-to-functions@npm:7.21.0" dependencies: @@ -306,23 +226,7 @@ __metadata: languageName: node linkType: hard -"@babel/helper-module-transforms@npm:^7.18.6, @babel/helper-module-transforms@npm:^7.19.6, @babel/helper-module-transforms@npm:^7.20.11": - version: 7.20.11 - resolution: "@babel/helper-module-transforms@npm:7.20.11" - dependencies: - "@babel/helper-environment-visitor": ^7.18.9 - "@babel/helper-module-imports": ^7.18.6 - "@babel/helper-simple-access": ^7.20.2 - "@babel/helper-split-export-declaration": ^7.18.6 - "@babel/helper-validator-identifier": ^7.19.1 - "@babel/template": ^7.20.7 - "@babel/traverse": ^7.20.10 - "@babel/types": ^7.20.7 - checksum: 29319ebafa693d48756c6ba0d871677bb0037e0da084fbe221a17c38d57093fc8aa38543c07d76e788266a937976e37ab4901971ca7f237c5ab45f524b9ecca0 - languageName: node - linkType: hard - -"@babel/helper-module-transforms@npm:^7.21.0": +"@babel/helper-module-transforms@npm:^7.18.6, @babel/helper-module-transforms@npm:^7.19.6, @babel/helper-module-transforms@npm:^7.21.0": version: 7.21.2 resolution: "@babel/helper-module-transforms@npm:7.21.2" dependencies: @@ -423,14 +327,7 @@ __metadata: languageName: node linkType: hard -"@babel/helper-validator-option@npm:^7.18.6": - version: 7.18.6 - resolution: "@babel/helper-validator-option@npm:7.18.6" - checksum: f9cc6eb7cc5d759c5abf006402180f8d5e4251e9198197428a97e05d65eb2f8ae5a0ce73b1dfd2d35af41d0eb780627a64edf98a4e71f064eeeacef8de58f2cf - languageName: node - linkType: hard - -"@babel/helper-validator-option@npm:^7.21.0": +"@babel/helper-validator-option@npm:^7.18.6, @babel/helper-validator-option@npm:^7.21.0": version: 7.21.0 resolution: "@babel/helper-validator-option@npm:7.21.0" checksum: 8ece4c78ffa5461fd8ab6b6e57cc51afad59df08192ed5d84b475af4a7193fc1cb794b59e3e7be64f3cdc4df7ac78bf3dbb20c129d7757ae078e6279ff8c2f07 @@ -449,17 +346,6 @@ __metadata: languageName: node linkType: hard -"@babel/helpers@npm:^7.20.7": - version: 7.20.7 - resolution: "@babel/helpers@npm:7.20.7" - dependencies: - "@babel/template": ^7.20.7 - "@babel/traverse": ^7.20.7 - "@babel/types": ^7.20.7 - checksum: 3fb10df3510ba7116a180d5fd983d0f558f7a65c3d599385dba991bff66b74174c88881bc12c2b3cf7284294fcac5b301ded49a8b0098bdf2ef61d0cad8010db - languageName: node - linkType: hard - "@babel/helpers@npm:^7.21.0": version: 7.21.0 resolution: "@babel/helpers@npm:7.21.0" @@ -482,16 +368,7 @@ __metadata: languageName: node linkType: hard -"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.9.4": - version: 7.20.7 - resolution: "@babel/parser@npm:7.20.7" - bin: - parser: ./bin/babel-parser.js - checksum: 25b5266e3bd4be837092685f6b7ef886f1308ff72659a24342eb646ae5014f61ed1771ce8fc20636c890fcae19304fc72c069564ca6075207b7fbf3f75367275 - languageName: node - linkType: hard - -"@babel/parser@npm:^7.21.0, @babel/parser@npm:^7.21.2": +"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.21.0, @babel/parser@npm:^7.21.2, @babel/parser@npm:^7.9.4": version: 7.21.2 resolution: "@babel/parser@npm:7.21.2" bin: @@ -838,7 +715,7 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-syntax-jsx@npm:^7.17.12, @babel/plugin-syntax-jsx@npm:^7.18.6, @babel/plugin-syntax-jsx@npm:^7.7.2": +"@babel/plugin-syntax-jsx@npm:^7.18.6, @babel/plugin-syntax-jsx@npm:^7.7.2": version: 7.18.6 resolution: "@babel/plugin-syntax-jsx@npm:7.18.6" dependencies: @@ -937,7 +814,7 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-syntax-typescript@npm:^7.20.0": +"@babel/plugin-syntax-typescript@npm:^7.20.0, @babel/plugin-syntax-typescript@npm:^7.7.2": version: 7.20.0 resolution: "@babel/plugin-syntax-typescript@npm:7.20.0" dependencies: @@ -948,17 +825,6 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-syntax-typescript@npm:^7.7.2": - version: 7.18.6 - resolution: "@babel/plugin-syntax-typescript@npm:7.18.6" - dependencies: - "@babel/helper-plugin-utils": ^7.18.6 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 2cde73725ec51118ebf410bf02d78781c03fa4d3185993fcc9d253b97443381b621c44810084c5dd68b92eb8bdfae0e5b163e91b32bebbb33852383d1815c05d - languageName: node - linkType: hard - "@babel/plugin-transform-arrow-functions@npm:^7.18.6": version: 7.18.6 resolution: "@babel/plugin-transform-arrow-functions@npm:7.18.6" @@ -1528,16 +1394,7 @@ __metadata: languageName: node linkType: hard -"@babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.0, @babel/runtime@npm:^7.12.1, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.16.3, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.8.7, @babel/runtime@npm:^7.9.2": - version: 7.20.1 - resolution: "@babel/runtime@npm:7.20.1" - dependencies: - regenerator-runtime: ^0.13.10 - checksum: 00567a333d3357925742a6f5e39394dcc0af6e6029103fe188158bf7ae8b0b3ee3c6c0f68fccc217f0a6cfa455f6be252298baf56b3f5ff37b34313b170cd9f6 - languageName: node - linkType: hard - -"@babel/runtime@npm:^7.15.4, @babel/runtime@npm:^7.20.7": +"@babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.0, @babel/runtime@npm:^7.12.1, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.15.4, @babel/runtime@npm:^7.16.3, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.20.7, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.8.7, @babel/runtime@npm:^7.9.2": version: 7.20.7 resolution: "@babel/runtime@npm:7.20.7" dependencies: @@ -1557,25 +1414,7 @@ __metadata: languageName: node linkType: hard -"@babel/traverse@npm:^7.18.11, @babel/traverse@npm:^7.20.10, @babel/traverse@npm:^7.20.12, @babel/traverse@npm:^7.20.7, @babel/traverse@npm:^7.7.2": - version: 7.20.12 - resolution: "@babel/traverse@npm:7.20.12" - dependencies: - "@babel/code-frame": ^7.18.6 - "@babel/generator": ^7.20.7 - "@babel/helper-environment-visitor": ^7.18.9 - "@babel/helper-function-name": ^7.19.0 - "@babel/helper-hoist-variables": ^7.18.6 - "@babel/helper-split-export-declaration": ^7.18.6 - "@babel/parser": ^7.20.7 - "@babel/types": ^7.20.7 - debug: ^4.1.0 - globals: ^11.1.0 - checksum: d758b355ab4f1e87984524b67785fa23d74e8a45d2ceb8bcf4d5b2b0cd15ee160db5e68c7078808542805774ca3802e2eafb1b9638afa4cd7f9ecabd0ca7fd56 - languageName: node - linkType: hard - -"@babel/traverse@npm:^7.21.0, @babel/traverse@npm:^7.21.2": +"@babel/traverse@npm:^7.18.11, @babel/traverse@npm:^7.20.7, @babel/traverse@npm:^7.21.0, @babel/traverse@npm:^7.21.2, @babel/traverse@npm:^7.7.2": version: 7.21.2 resolution: "@babel/traverse@npm:7.21.2" dependencies: @@ -1593,18 +1432,7 @@ __metadata: languageName: node linkType: hard -"@babel/types@npm:^7.0.0, @babel/types@npm:^7.18.10, @babel/types@npm:^7.18.6, @babel/types@npm:^7.18.9, @babel/types@npm:^7.19.0, @babel/types@npm:^7.20.0, @babel/types@npm:^7.20.2, @babel/types@npm:^7.20.7, @babel/types@npm:^7.3.0, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3": - version: 7.20.7 - resolution: "@babel/types@npm:7.20.7" - dependencies: - "@babel/helper-string-parser": ^7.19.4 - "@babel/helper-validator-identifier": ^7.19.1 - to-fast-properties: ^2.0.0 - checksum: b39af241f0b72bba67fd6d0d23914f6faec8c0eba8015c181cbd5ea92e59fc91a52a1ab490d3520c7dbd19ddb9ebb76c476308f6388764f16d8201e37fae6811 - languageName: node - linkType: hard - -"@babel/types@npm:^7.21.0, @babel/types@npm:^7.21.2": +"@babel/types@npm:^7.0.0, @babel/types@npm:^7.18.10, @babel/types@npm:^7.18.6, @babel/types@npm:^7.18.9, @babel/types@npm:^7.20.0, @babel/types@npm:^7.20.2, @babel/types@npm:^7.20.7, @babel/types@npm:^7.21.0, @babel/types@npm:^7.21.2, @babel/types@npm:^7.3.0, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3": version: 7.21.2 resolution: "@babel/types@npm:7.21.2" dependencies: @@ -2292,17 +2120,7 @@ __metadata: languageName: node linkType: hard -"@csstools/selector-specificity@npm:^2.0.0, @csstools/selector-specificity@npm:^2.0.2": - version: 2.0.2 - resolution: "@csstools/selector-specificity@npm:2.0.2" - peerDependencies: - postcss: ^8.2 - postcss-selector-parser: ^6.0.10 - checksum: a2045a27276a6cfe645b6e212afc217d9a43174ea7a1fa1ab8918d5a0ace72380fbd9837fe1920c547985c11a9070dc48c5c80d483d3f581ddf7aa688204d44f - languageName: node - linkType: hard - -"@csstools/selector-specificity@npm:^2.0.1": +"@csstools/selector-specificity@npm:^2.0.0, @csstools/selector-specificity@npm:^2.0.1, @csstools/selector-specificity@npm:^2.0.2": version: 2.1.1 resolution: "@csstools/selector-specificity@npm:2.1.1" peerDependencies: @@ -2319,28 +2137,6 @@ __metadata: languageName: node linkType: hard -"@emotion/babel-plugin@npm:^11.10.5": - version: 11.10.5 - resolution: "@emotion/babel-plugin@npm:11.10.5" - dependencies: - "@babel/helper-module-imports": ^7.16.7 - "@babel/plugin-syntax-jsx": ^7.17.12 - "@babel/runtime": ^7.18.3 - "@emotion/hash": ^0.9.0 - "@emotion/memoize": ^0.8.0 - "@emotion/serialize": ^1.1.1 - babel-plugin-macros: ^3.1.0 - convert-source-map: ^1.5.0 - escape-string-regexp: ^4.0.0 - find-root: ^1.1.0 - source-map: ^0.5.7 - stylis: 4.1.3 - peerDependencies: - "@babel/core": ^7.0.0 - checksum: e3353499c76c4422d6e900c0dfab73607056d9da86161a3f27c3459c193c4908050c5d252c68fcde231e13f02a9d8e0dc07d260317ae0e5206841e331cc4caae - languageName: node - linkType: hard - "@emotion/babel-plugin@npm:^11.10.6": version: 11.10.6 resolution: "@emotion/babel-plugin@npm:11.10.6" @@ -2396,7 +2192,7 @@ __metadata: languageName: node linkType: hard -"@emotion/react@npm:11.10.6": +"@emotion/react@npm:11.10.6, @emotion/react@npm:^11.8.1": version: 11.10.6 resolution: "@emotion/react@npm:11.10.6" dependencies: @@ -2417,30 +2213,6 @@ __metadata: languageName: node linkType: hard -"@emotion/react@npm:^11.8.1": - version: 11.10.5 - resolution: "@emotion/react@npm:11.10.5" - dependencies: - "@babel/runtime": ^7.18.3 - "@emotion/babel-plugin": ^11.10.5 - "@emotion/cache": ^11.10.5 - "@emotion/serialize": ^1.1.1 - "@emotion/use-insertion-effect-with-fallbacks": ^1.0.0 - "@emotion/utils": ^1.2.0 - "@emotion/weak-memoize": ^0.3.0 - hoist-non-react-statics: ^3.3.1 - peerDependencies: - "@babel/core": ^7.0.0 - react: ">=16.8.0" - peerDependenciesMeta: - "@babel/core": - optional: true - "@types/react": - optional: true - checksum: 32b67b28e9b6d6c53b970072680697f04c2521441050bdeb19a1a7f0164af549b4dad39ff375eda1b6a3cf1cc86ba2c6fa55460ec040e6ebbca3e9ec58353cf7 - languageName: node - linkType: hard - "@emotion/serialize@npm:^1.1.1": version: 1.1.1 resolution: "@emotion/serialize@npm:1.1.1" @@ -2766,15 +2538,6 @@ __metadata: languageName: node linkType: hard -"@jest/expect-utils@npm:^29.4.1": - version: 29.4.1 - resolution: "@jest/expect-utils@npm:29.4.1" - dependencies: - jest-get-type: ^29.2.0 - checksum: 865b4ee79d43e2457efb8ce3f58108f2fe141ce620350fe21d0baaf7e2f00b9b67f6e9c1c89760b1008c100e844fb03a6dda264418ed378243956904d9a88c69 - languageName: node - linkType: hard - "@jest/expect-utils@npm:^29.5.0": version: 29.5.0 resolution: "@jest/expect-utils@npm:29.5.0" @@ -2857,15 +2620,6 @@ __metadata: languageName: node linkType: hard -"@jest/schemas@npm:^29.4.0": - version: 29.4.0 - resolution: "@jest/schemas@npm:29.4.0" - dependencies: - "@sinclair/typebox": ^0.25.16 - checksum: 005c90b7b641af029133fa390c0c8a75b63edf651da6253d7c472a8f15ddd18aa139edcd4236e57f974006e39c67217925768115484dbd7bfed2eba224de8b7d - languageName: node - linkType: hard - "@jest/schemas@npm:^29.4.3": version: 29.4.3 resolution: "@jest/schemas@npm:29.4.3" @@ -2933,20 +2687,6 @@ __metadata: languageName: node linkType: hard -"@jest/types@npm:^29.4.1": - version: 29.4.1 - resolution: "@jest/types@npm:29.4.1" - dependencies: - "@jest/schemas": ^29.4.0 - "@types/istanbul-lib-coverage": ^2.0.0 - "@types/istanbul-reports": ^3.0.0 - "@types/node": "*" - "@types/yargs": ^17.0.8 - chalk: ^4.0.0 - checksum: 0aa0b6a210b3474289e5dcaa8e7abb2238dba8d0baf2eb5a3f080fb95e9a39e71e8abc96811d4ef7011f5d993755bb54515e9d827d7ebc2a2d4d9579d84f5a04 - languageName: node - linkType: hard - "@jest/types@npm:^29.5.0": version: 29.5.0 resolution: "@jest/types@npm:29.5.0" @@ -3023,17 +2763,7 @@ __metadata: languageName: node linkType: hard -"@jridgewell/trace-mapping@npm:^0.3.0, @jridgewell/trace-mapping@npm:^0.3.12, @jridgewell/trace-mapping@npm:^0.3.14, @jridgewell/trace-mapping@npm:^0.3.15, @jridgewell/trace-mapping@npm:^0.3.9": - version: 0.3.15 - resolution: "@jridgewell/trace-mapping@npm:0.3.15" - dependencies: - "@jridgewell/resolve-uri": ^3.0.3 - "@jridgewell/sourcemap-codec": ^1.4.10 - checksum: 38917e9c2b014d469a9f51c016ed506acbe44dd16ec2f6f99b553ebf3764d22abadbf992f2367b6d2b3511f3eae8ed3a8963f6c1030093fda23efd35ecab2bae - languageName: node - linkType: hard - -"@jridgewell/trace-mapping@npm:^0.3.17": +"@jridgewell/trace-mapping@npm:^0.3.12, @jridgewell/trace-mapping@npm:^0.3.15, @jridgewell/trace-mapping@npm:^0.3.17, @jridgewell/trace-mapping@npm:^0.3.9": version: 0.3.17 resolution: "@jridgewell/trace-mapping@npm:0.3.17" dependencies: @@ -3375,23 +3105,7 @@ __metadata: languageName: node linkType: hard -"@testing-library/dom@npm:^8.11.1": - version: 8.19.0 - resolution: "@testing-library/dom@npm:8.19.0" - dependencies: - "@babel/code-frame": ^7.10.4 - "@babel/runtime": ^7.12.5 - "@types/aria-query": ^4.2.0 - aria-query: ^5.0.0 - chalk: ^4.1.0 - dom-accessibility-api: ^0.5.9 - lz-string: ^1.4.4 - pretty-format: ^27.0.2 - checksum: 6bb93fef96703b6c47cf1b7cc8f71d402a9576084a94ba4e9926f51bd7bb1287fbb4f6942d82bd03fc6f3d998ae97e60f6aea4618f3a1ce6139597d2a4ecb7b9 - languageName: node - linkType: hard - -"@testing-library/dom@npm:^8.5.0": +"@testing-library/dom@npm:^8.11.1, @testing-library/dom@npm:^8.5.0": version: 8.20.0 resolution: "@testing-library/dom@npm:8.20.0" dependencies: @@ -3472,13 +3186,6 @@ __metadata: languageName: node linkType: hard -"@types/aria-query@npm:^4.2.0": - version: 4.2.1 - resolution: "@types/aria-query@npm:4.2.1" - checksum: cf60cc7aa0ed52514e8c7289776de9bb3321217d48f54c95d63e1e1eb9940689c1fd3e39d68da5eaee1541108363f0113007f67d6e32e7fbc983526f08e5f0ce - languageName: node - linkType: hard - "@types/aria-query@npm:^5.0.1": version: 5.0.1 resolution: "@types/aria-query@npm:5.0.1" @@ -3855,10 +3562,10 @@ __metadata: languageName: node linkType: hard -"@types/node@npm:*, @types/node@npm:>=13.7.0": - version: 18.11.18 - resolution: "@types/node@npm:18.11.18" - checksum: 03f17f9480f8d775c8a72da5ea7e9383db5f6d85aa5fefde90dd953a1449bd5e4ffde376f139da4f3744b4c83942166d2a7603969a6f8ea826edfb16e6e3b49d +"@types/node@npm:*, @types/node@npm:>=13.7.0, @types/node@npm:^18.15.0": + version: 18.15.0 + resolution: "@types/node@npm:18.15.0" + checksum: d81372276dd5053b1743338b61a2178ff9722dc609189d01fc7d1c2acd539414039e0e4780678730514390dad3f29c366a28c29e8dbd5b0025651181f6dd6669 languageName: node linkType: hard @@ -3869,13 +3576,6 @@ __metadata: languageName: node linkType: hard -"@types/node@npm:^18.15.0": - version: 18.15.0 - resolution: "@types/node@npm:18.15.0" - checksum: d81372276dd5053b1743338b61a2178ff9722dc609189d01fc7d1c2acd539414039e0e4780678730514390dad3f29c366a28c29e8dbd5b0025651181f6dd6669 - languageName: node - linkType: hard - "@types/node@npm:~14": version: 14.18.36 resolution: "@types/node@npm:14.18.36" @@ -3927,7 +3627,7 @@ __metadata: languageName: node linkType: hard -"@types/react-dom@npm:18.0.11": +"@types/react-dom@npm:18.0.11, @types/react-dom@npm:^18.0.0": version: 18.0.11 resolution: "@types/react-dom@npm:18.0.11" dependencies: @@ -3936,15 +3636,6 @@ __metadata: languageName: node linkType: hard -"@types/react-dom@npm:^18.0.0": - version: 18.0.10 - resolution: "@types/react-dom@npm:18.0.10" - dependencies: - "@types/react": "*" - checksum: ff8282d5005a0b1cd95fb65bf79d3d8485e4cfe2aaf052129033a178684b940014a3f4536bc20d573f8a01cf4c6f4770c74988cef7c2b5cac3041d9f172647e3 - languageName: node - linkType: hard - "@types/react-redux@npm:7.1.25": version: 7.1.25 resolution: "@types/react-redux@npm:7.1.25" @@ -3966,14 +3657,14 @@ __metadata: languageName: node linkType: hard -"@types/react@npm:*, @types/react@npm:16 || 17 || 18, @types/react@npm:18.0.27": - version: 18.0.27 - resolution: "@types/react@npm:18.0.27" +"@types/react@npm:*, @types/react@npm:16 || 17 || 18, @types/react@npm:18.0.28": + version: 18.0.28 + resolution: "@types/react@npm:18.0.28" dependencies: "@types/prop-types": "*" "@types/scheduler": "*" csstype: ^3.0.2 - checksum: 600fdbc39a92ea4a77047db3e12f05f67776a710f5918248c0189a59ac2a38900c9db5a5d2e433a16df528a3ecab1aa114b322cacea573bb1ca2fc0b094c52d1 + checksum: e752df961105e5127652460504785897ca6e77259e0da8f233f694f9e8f451cde7fa0709d4456ade0ff600c8ce909cfe29f9b08b9c247fa9b734e126ec53edd7 languageName: node linkType: hard @@ -4102,7 +3793,7 @@ __metadata: languageName: node linkType: hard -"@types/yargs@npm:^17.0.19": +"@types/yargs@npm:^17.0.19, @types/yargs@npm:^17.0.8": version: 17.0.20 resolution: "@types/yargs@npm:17.0.20" dependencies: @@ -4111,15 +3802,6 @@ __metadata: languageName: node linkType: hard -"@types/yargs@npm:^17.0.8": - version: 17.0.13 - resolution: "@types/yargs@npm:17.0.13" - dependencies: - "@types/yargs-parser": "*" - checksum: 0ab269abc2da2223cf0a8c16d578850fbe327d40fb85724b5c3f9f6cf38d03656ef699518c05d4df3bc337339ec6d0aad7df01682a9dca4783ad1ccc7336cf12 - languageName: node - linkType: hard - "@typescript-eslint/eslint-plugin@npm:^5.54.1": version: 5.54.1 resolution: "@typescript-eslint/eslint-plugin@npm:5.54.1" @@ -4182,26 +3864,6 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/scope-manager@npm:5.46.1": - version: 5.46.1 - resolution: "@typescript-eslint/scope-manager@npm:5.46.1" - dependencies: - "@typescript-eslint/types": 5.46.1 - "@typescript-eslint/visitor-keys": 5.46.1 - checksum: bf934603dc9c7da71eb26f415d13018f2a96dbba193a773bc440a5c93828365f09bb3db9be55189dfbbace414c6c48d7fad246c0d9717dab4676d0d79d6d8676 - languageName: node - linkType: hard - -"@typescript-eslint/scope-manager@npm:5.49.0": - version: 5.49.0 - resolution: "@typescript-eslint/scope-manager@npm:5.49.0" - dependencies: - "@typescript-eslint/types": 5.49.0 - "@typescript-eslint/visitor-keys": 5.49.0 - checksum: 466047e24ff8a4195f14aadde39375f22891bdaced09e58c89f2c32af0aa4a0d87e71a5f006f6ab76858e6f30c4b764b1e0ef7bc26713bb78add30638108c45f - languageName: node - linkType: hard - "@typescript-eslint/scope-manager@npm:5.54.1": version: 5.54.1 resolution: "@typescript-eslint/scope-manager@npm:5.54.1" @@ -4236,20 +3898,6 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/types@npm:5.46.1": - version: 5.46.1 - resolution: "@typescript-eslint/types@npm:5.46.1" - checksum: 91143d3304b8c70d69d9c8e5b7428cce3a222eacfbeb99e592d278668bcf998760731deae064a76157b9a0fc4911fe3178aa24e4ea6fe2ba68dd37113834c924 - languageName: node - linkType: hard - -"@typescript-eslint/types@npm:5.49.0": - version: 5.49.0 - resolution: "@typescript-eslint/types@npm:5.49.0" - checksum: 41f72a043007fc3f3356b5a38d7bfa54871545b4a309810a062f044cff25122413a9660ce6d83d1221762f60d067351d020b0cb68f7e1279817f53e77ce8f33d - languageName: node - linkType: hard - "@typescript-eslint/types@npm:5.54.1": version: 5.54.1 resolution: "@typescript-eslint/types@npm:5.54.1" @@ -4275,42 +3923,6 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/typescript-estree@npm:5.46.1": - version: 5.46.1 - resolution: "@typescript-eslint/typescript-estree@npm:5.46.1" - dependencies: - "@typescript-eslint/types": 5.46.1 - "@typescript-eslint/visitor-keys": 5.46.1 - debug: ^4.3.4 - globby: ^11.1.0 - is-glob: ^4.0.3 - semver: ^7.3.7 - tsutils: ^3.21.0 - peerDependenciesMeta: - typescript: - optional: true - checksum: 21499b927b4118cd51e841b2e1b7e55621135f923f461b75dc8ca8442de38a82da5a0232dce5229e0266b6fc12d70696e0e912fcf1483d4c44f02e4cad39ed98 - languageName: node - linkType: hard - -"@typescript-eslint/typescript-estree@npm:5.49.0": - version: 5.49.0 - resolution: "@typescript-eslint/typescript-estree@npm:5.49.0" - dependencies: - "@typescript-eslint/types": 5.49.0 - "@typescript-eslint/visitor-keys": 5.49.0 - debug: ^4.3.4 - globby: ^11.1.0 - is-glob: ^4.0.3 - semver: ^7.3.7 - tsutils: ^3.21.0 - peerDependenciesMeta: - typescript: - optional: true - checksum: f331af9f0ef3ce3157c421b8cc727dec5aa0a60add305aa4c676a02c63ec07799105268af192c5ed193a682b7ed804564d29d49bdbd2019678e495d80e65e29a - languageName: node - linkType: hard - "@typescript-eslint/typescript-estree@npm:5.54.1": version: 5.54.1 resolution: "@typescript-eslint/typescript-estree@npm:5.54.1" @@ -4345,7 +3957,7 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/utils@npm:5.54.1": +"@typescript-eslint/utils@npm:5.54.1, @typescript-eslint/utils@npm:^5.10.0, @typescript-eslint/utils@npm:^5.43.0": version: 5.54.1 resolution: "@typescript-eslint/utils@npm:5.54.1" dependencies: @@ -4363,42 +3975,6 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/utils@npm:^5.10.0": - version: 5.46.1 - resolution: "@typescript-eslint/utils@npm:5.46.1" - dependencies: - "@types/json-schema": ^7.0.9 - "@types/semver": ^7.3.12 - "@typescript-eslint/scope-manager": 5.46.1 - "@typescript-eslint/types": 5.46.1 - "@typescript-eslint/typescript-estree": 5.46.1 - eslint-scope: ^5.1.1 - eslint-utils: ^3.0.0 - semver: ^7.3.7 - peerDependencies: - eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 - checksum: db9fd1dfb2390e66041f9529d564f38ccf74042de68e0e1e3d319ba4d02d7cd969d75dc056f938b98acab53ad7c1e36c68eabb15c0b2e2296b081652fa8d3820 - languageName: node - linkType: hard - -"@typescript-eslint/utils@npm:^5.43.0": - version: 5.49.0 - resolution: "@typescript-eslint/utils@npm:5.49.0" - dependencies: - "@types/json-schema": ^7.0.9 - "@types/semver": ^7.3.12 - "@typescript-eslint/scope-manager": 5.49.0 - "@typescript-eslint/types": 5.49.0 - "@typescript-eslint/typescript-estree": 5.49.0 - eslint-scope: ^5.1.1 - eslint-utils: ^3.0.0 - semver: ^7.3.7 - peerDependencies: - eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 - checksum: 8218c566637d5104dfb2346216f8cb4c244f31c2a39e261aafe554b8abd48bd630a0d0807a0a8d776af8f9d9914c8776d86abf0a523049f3c5619c498a7e5b1e - languageName: node - linkType: hard - "@typescript-eslint/visitor-keys@npm:5.10.1": version: 5.10.1 resolution: "@typescript-eslint/visitor-keys@npm:5.10.1" @@ -4409,26 +3985,6 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/visitor-keys@npm:5.46.1": - version: 5.46.1 - resolution: "@typescript-eslint/visitor-keys@npm:5.46.1" - dependencies: - "@typescript-eslint/types": 5.46.1 - eslint-visitor-keys: ^3.3.0 - checksum: 952cf20e29a040e0820e52d6815097abf042ea8e1fd5d013c0a319284ea0e2e29e0ca9ef244717450a6eb9d32ebf7fa9ed91185675a27adc35c9ad070d561b7c - languageName: node - linkType: hard - -"@typescript-eslint/visitor-keys@npm:5.49.0": - version: 5.49.0 - resolution: "@typescript-eslint/visitor-keys@npm:5.49.0" - dependencies: - "@typescript-eslint/types": 5.49.0 - eslint-visitor-keys: ^3.3.0 - checksum: 46dc7bc713e8825d1fccba521fdf7c6e2f8829e491c2afd44dbe4105c6432e3c3dfe7e1ecb221401269d639264bb4af77b60a7b65521fcff9ab02cd31d8ef782 - languageName: node - linkType: hard - "@typescript-eslint/visitor-keys@npm:5.54.1": version: 5.54.1 resolution: "@typescript-eslint/visitor-keys@npm:5.54.1" @@ -4844,18 +4400,7 @@ __metadata: languageName: node linkType: hard -"@wireapp/store-engine-dexie@npm:2.0.4": - version: 2.0.4 - resolution: "@wireapp/store-engine-dexie@npm:2.0.4" - dependencies: - dexie: 3.2.2 - peerDependencies: - "@wireapp/store-engine": 5.x.x - checksum: 5128eb25ec2812e89787bc4c2e39ea7ae72aba4d2548e5675a013890e17993d0f6fb9db84a0eb4f76d31584a3436bfdfb4ae19562dc57885e77bf752190677a4 - languageName: node - linkType: hard - -"@wireapp/store-engine-dexie@npm:^2.0.5": +"@wireapp/store-engine-dexie@npm:2.0.5, @wireapp/store-engine-dexie@npm:^2.0.5": version: 2.0.5 resolution: "@wireapp/store-engine-dexie@npm:2.0.5" dependencies: @@ -5994,14 +5539,7 @@ __metadata: languageName: node linkType: hard -"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001400, caniuse-lite@npm:^1.0.30001426": - version: 1.0.30001446 - resolution: "caniuse-lite@npm:1.0.30001446" - checksum: b31a7e1837783afd7f3d4cb742689996c0a09d67394ddaa0609fd2bce00ceea65c448e25f91c03ba0f2d0e345b7e28fd5bc636c6760c949621a654c0effe74b5 - languageName: node - linkType: hard - -"caniuse-lite@npm:^1.0.30001464": +"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001400, caniuse-lite@npm:^1.0.30001426, caniuse-lite@npm:^1.0.30001464": version: 1.0.30001464 resolution: "caniuse-lite@npm:1.0.30001464" checksum: 67cdee102c1660d62d7b9dbd4740bb7af096236618f2509fd2e0039d50db5f02fb87c21d90b6d573fdcf50deaf3c84503d009e871502b5c221d0ba1dec18ba11 @@ -7180,7 +6718,7 @@ __metadata: languageName: node linkType: hard -"dexie@latest, dexie@npm:3.2.2, dexie@npm:^3.2.2": +dexie@latest: version: 3.2.2 resolution: "dexie@npm:3.2.2" checksum: 7a21079f7ab139ebd724a009917f9293f2b01c341e2a3cd51d2455dda4d4e78b9ca7de0373e963108395cf1921ce7f6556cac967c1e957005a3c7c11794ceccf @@ -7194,13 +6732,6 @@ __metadata: languageName: node linkType: hard -"diff-sequences@npm:^29.3.1": - version: 29.3.1 - resolution: "diff-sequences@npm:29.3.1" - checksum: 8edab8c383355022e470779a099852d595dd856f9f5bd7af24f177e74138a668932268b4c4fd54096eed643861575c3652d4ecbbb1a9d710488286aed3ffa443 - languageName: node - linkType: hard - "diff-sequences@npm:^29.4.3": version: 29.4.3 resolution: "diff-sequences@npm:29.4.3" @@ -8135,7 +7666,7 @@ __metadata: languageName: node linkType: hard -"espree@npm:^9.0.0": +"espree@npm:^9.0.0, espree@npm:^9.4.0": version: 9.4.1 resolution: "espree@npm:9.4.1" dependencies: @@ -8146,17 +7677,6 @@ __metadata: languageName: node linkType: hard -"espree@npm:^9.4.0": - version: 9.4.0 - resolution: "espree@npm:9.4.0" - dependencies: - acorn: ^8.8.0 - acorn-jsx: ^5.3.2 - eslint-visitor-keys: ^3.3.0 - checksum: 2e3020dde67892d2ba3632413b44d0dc31d92c29ce72267d7ec24216a562f0a6494d3696e2fa39a3ec8c0e0088d773947ab2925fbb716801a11eb8dd313ac89c - languageName: node - linkType: hard - "esprima-next@npm:^5.7.0": version: 5.7.0 resolution: "esprima-next@npm:5.7.0" @@ -8295,20 +7815,7 @@ __metadata: languageName: node linkType: hard -"expect@npm:^29.0.0": - version: 29.4.1 - resolution: "expect@npm:29.4.1" - dependencies: - "@jest/expect-utils": ^29.4.1 - jest-get-type: ^29.2.0 - jest-matcher-utils: ^29.4.1 - jest-message-util: ^29.4.1 - jest-util: ^29.4.1 - checksum: 5918f69371557bbceb01bc163cd0ac03e8cbbc5de761892a9c27ef17a1f9e94dc91edd8298b4eaca18b71ba4a9d521c74b072f0a46950b13d6b61123b0431836 - languageName: node - linkType: hard - -"expect@npm:^29.5.0": +"expect@npm:^29.0.0, expect@npm:^29.5.0": version: 29.5.0 resolution: "expect@npm:29.5.0" dependencies: @@ -10385,18 +9892,6 @@ __metadata: languageName: node linkType: hard -"jest-diff@npm:^29.4.1": - version: 29.4.1 - resolution: "jest-diff@npm:29.4.1" - dependencies: - chalk: ^4.0.0 - diff-sequences: ^29.3.1 - jest-get-type: ^29.2.0 - pretty-format: ^29.4.1 - checksum: 359af2d11a75bbb3c91e3def8cfd0ede00afc6fb5d69d9495f2af5f6e18f692adb940d8338a186159f75afe48088d82bce14e2cc272cad9a5c2148bf0bc7f6bf - languageName: node - linkType: hard - "jest-diff@npm:^29.5.0": version: 29.5.0 resolution: "jest-diff@npm:29.5.0" @@ -10466,13 +9961,6 @@ __metadata: languageName: node linkType: hard -"jest-get-type@npm:^29.2.0": - version: 29.2.0 - resolution: "jest-get-type@npm:29.2.0" - checksum: e396fd880a30d08940ed8a8e43cd4595db1b8ff09649018eb358ca701811137556bae82626af73459e3c0f8c5e972ed1e57fd3b1537b13a260893dac60a90942 - languageName: node - linkType: hard - "jest-get-type@npm:^29.4.3": version: 29.4.3 resolution: "jest-get-type@npm:29.4.3" @@ -10538,18 +10026,6 @@ __metadata: languageName: node linkType: hard -"jest-matcher-utils@npm:^29.4.1": - version: 29.4.1 - resolution: "jest-matcher-utils@npm:29.4.1" - dependencies: - chalk: ^4.0.0 - jest-diff: ^29.4.1 - jest-get-type: ^29.2.0 - pretty-format: ^29.4.1 - checksum: ea84dbcae82241cb28e94ff586660aeec51196d9245413dc516ce3aa78140b3ea728b1168b242281b59ad513b0148b9f12d674729bd043a894a3ba9d6ec164f4 - languageName: node - linkType: hard - "jest-matcher-utils@npm:^29.5.0": version: 29.5.0 resolution: "jest-matcher-utils@npm:29.5.0" @@ -10562,23 +10038,6 @@ __metadata: languageName: node linkType: hard -"jest-message-util@npm:^29.4.1": - version: 29.4.1 - resolution: "jest-message-util@npm:29.4.1" - dependencies: - "@babel/code-frame": ^7.12.13 - "@jest/types": ^29.4.1 - "@types/stack-utils": ^2.0.0 - chalk: ^4.0.0 - graceful-fs: ^4.2.9 - micromatch: ^4.0.4 - pretty-format: ^29.4.1 - slash: ^3.0.0 - stack-utils: ^2.0.3 - checksum: 7d49823401b6d42f0d2d63dd9c0f11d2f64783416f82a68634190abee46e600e25bb0b380c746726acc56e854687bb03a76e26e617fcdda78e8c6316423b694f - languageName: node - linkType: hard - "jest-message-util@npm:^29.5.0": version: 29.5.0 resolution: "jest-message-util@npm:29.5.0" @@ -10743,20 +10202,6 @@ __metadata: languageName: node linkType: hard -"jest-util@npm:^29.4.1": - version: 29.4.1 - resolution: "jest-util@npm:29.4.1" - dependencies: - "@jest/types": ^29.4.1 - "@types/node": "*" - chalk: ^4.0.0 - ci-info: ^3.2.0 - graceful-fs: ^4.2.9 - picomatch: ^2.2.3 - checksum: 10a0e6c448ace1386f728ee3b7669f67878bb0c2e668a902d11140cc3f75c89a18f4142a37a24ccb587ede20dad86d497b3e8df4f26848a9be50a44779d92bc9 - languageName: node - linkType: hard - "jest-util@npm:^29.5.0": version: 29.5.0 resolution: "jest-util@npm:29.5.0" @@ -11360,20 +10805,13 @@ __metadata: languageName: node linkType: hard -"lilconfig@npm:2.1.0": +"lilconfig@npm:2.1.0, lilconfig@npm:^2.0.3": version: 2.1.0 resolution: "lilconfig@npm:2.1.0" checksum: 8549bb352b8192375fed4a74694cd61ad293904eee33f9d4866c2192865c44c4eb35d10782966242634e0cbc1e91fe62b1247f148dc5514918e3a966da7ea117 languageName: node linkType: hard -"lilconfig@npm:^2.0.3": - version: 2.0.6 - resolution: "lilconfig@npm:2.0.6" - checksum: 40a3cd72f103b1be5975f2ac1850810b61d4053e20ab09be8d3aeddfe042187e1ba70b4651a7e70f95efa1642e7dc8b2ae395b317b7d7753b241b43cef7c0f7d - languageName: node - linkType: hard - "lines-and-columns@npm:^1.1.6": version: 1.1.6 resolution: "lines-and-columns@npm:1.1.6" @@ -12265,7 +11703,7 @@ __metadata: languageName: node linkType: hard -"node-fetch@npm:2.6.9, node-fetch@npm:^2.6.9": +"node-fetch@npm:2.6.9, node-fetch@npm:^2.6.7, node-fetch@npm:^2.6.9": version: 2.6.9 resolution: "node-fetch@npm:2.6.9" dependencies: @@ -12279,20 +11717,6 @@ __metadata: languageName: node linkType: hard -"node-fetch@npm:^2.6.7": - version: 2.6.8 - resolution: "node-fetch@npm:2.6.8" - dependencies: - whatwg-url: ^5.0.0 - peerDependencies: - encoding: ^0.1.0 - peerDependenciesMeta: - encoding: - optional: true - checksum: 91f57be68e29f9b1382750693619e199733a6936998e6d618f1aa779853ad8fc4a2facf170db7957bf1d2510bad33449edf74b5802713d81b63de5986fa3be00 - languageName: node - linkType: hard - "node-gyp@npm:latest": version: 9.2.0 resolution: "node-gyp@npm:9.2.0" @@ -12484,14 +11908,7 @@ __metadata: languageName: node linkType: hard -"object-inspect@npm:^1.12.2, object-inspect@npm:^1.9.0": - version: 1.12.2 - resolution: "object-inspect@npm:1.12.2" - checksum: a534fc1b8534284ed71f25ce3a496013b7ea030f3d1b77118f6b7b1713829262be9e6243acbcb3ef8c626e2b64186112cb7f6db74e37b2789b9c789ca23048b2 - languageName: node - linkType: hard - -"object-inspect@npm:^1.12.3": +"object-inspect@npm:^1.12.2, object-inspect@npm:^1.12.3, object-inspect@npm:^1.9.0": version: 1.12.3 resolution: "object-inspect@npm:1.12.3" checksum: dabfd824d97a5f407e6d5d24810d888859f6be394d8b733a77442b277e0808860555176719c5905e765e3743a7cada6b8b0a3b85e5331c530fd418cc8ae991db @@ -13892,18 +13309,7 @@ __metadata: languageName: node linkType: hard -"pretty-format@npm:^29.0.0, pretty-format@npm:^29.4.1": - version: 29.4.1 - resolution: "pretty-format@npm:29.4.1" - dependencies: - "@jest/schemas": ^29.4.0 - ansi-styles: ^5.0.0 - react-is: ^18.0.0 - checksum: bcc8e86bcf8e7f5106c96e2ea7905912bd17ae2aac76e4e0745d2a50df4b340638ed95090ee455a1c0f78189efa05077bd655ca08bf66292e83ebd7035fc46fd - languageName: node - linkType: hard - -"pretty-format@npm:^29.5.0": +"pretty-format@npm:^29.0.0, pretty-format@npm:^29.5.0": version: 29.5.0 resolution: "pretty-format@npm:29.5.0" dependencies: @@ -14458,7 +13864,7 @@ __metadata: languageName: node linkType: hard -"regenerator-runtime@npm:^0.13.10, regenerator-runtime@npm:^0.13.11": +"regenerator-runtime@npm:^0.13.11": version: 0.13.11 resolution: "regenerator-runtime@npm:0.13.11" checksum: 27481628d22a1c4e3ff551096a683b424242a216fee44685467307f14d58020af1e19660bf2e26064de946bad7eff28950eae9f8209d55723e2d9351e632bbb4 @@ -14985,16 +14391,7 @@ __metadata: languageName: node linkType: hard -"serialize-javascript@npm:^6.0.0": - version: 6.0.0 - resolution: "serialize-javascript@npm:6.0.0" - dependencies: - randombytes: ^2.1.0 - checksum: 56f90b562a1bdc92e55afb3e657c6397c01a902c588c0fe3d4c490efdcc97dcd2a3074ba12df9e94630f33a5ce5b76a74784a7041294628a6f4306e0ec84bf93 - languageName: node - linkType: hard - -"serialize-javascript@npm:^6.0.1": +"serialize-javascript@npm:^6.0.0, serialize-javascript@npm:^6.0.1": version: 6.0.1 resolution: "serialize-javascript@npm:6.0.1" dependencies: @@ -15905,7 +15302,7 @@ __metadata: languageName: node linkType: hard -"terser-webpack-plugin@npm:5.3.7": +"terser-webpack-plugin@npm:5.3.7, terser-webpack-plugin@npm:^5.1.3": version: 5.3.7 resolution: "terser-webpack-plugin@npm:5.3.7" dependencies: @@ -15927,43 +15324,7 @@ __metadata: languageName: node linkType: hard -"terser-webpack-plugin@npm:^5.1.3": - version: 5.3.6 - resolution: "terser-webpack-plugin@npm:5.3.6" - dependencies: - "@jridgewell/trace-mapping": ^0.3.14 - jest-worker: ^27.4.5 - schema-utils: ^3.1.1 - serialize-javascript: ^6.0.0 - terser: ^5.14.1 - peerDependencies: - webpack: ^5.1.0 - peerDependenciesMeta: - "@swc/core": - optional: true - esbuild: - optional: true - uglify-js: - optional: true - checksum: 8f3448d7fdb0434ce6a0c09d95c462bfd2f4a5a430233d854163337f734a7f5c07c74513d16081e06d4ca33d366d5b1a36f5444219bc41a7403afd6162107bad - languageName: node - linkType: hard - -"terser@npm:^5.0.0, terser@npm:^5.10.0, terser@npm:^5.14.1": - version: 5.15.1 - resolution: "terser@npm:5.15.1" - dependencies: - "@jridgewell/source-map": ^0.3.2 - acorn: ^8.5.0 - commander: ^2.20.0 - source-map-support: ~0.5.20 - bin: - terser: bin/terser - checksum: 9880a1e0956983a1ce5de204ea35121c0009fa41d582a6904ae850e1953a1a2cc021168439565280c5a8eee67c85a874175627e24989b046c7a72589b81c3979 - languageName: node - linkType: hard - -"terser@npm:^5.16.5": +"terser@npm:^5.0.0, terser@npm:^5.10.0, terser@npm:^5.16.5": version: 5.16.6 resolution: "terser@npm:5.16.6" dependencies: @@ -16363,17 +15724,7 @@ __metadata: languageName: node linkType: hard -"typescript@npm:^4.9.4": - version: 4.9.4 - resolution: "typescript@npm:4.9.4" - bin: - tsc: bin/tsc - tsserver: bin/tsserver - checksum: e782fb9e0031cb258a80000f6c13530288c6d63f1177ed43f770533fdc15740d271554cdae86701c1dd2c83b082cea808b07e97fd68b38a172a83dbf9e0d0ef9 - languageName: node - linkType: hard - -"typescript@npm:^4.9.5": +"typescript@npm:^4.9.4, typescript@npm:^4.9.5": version: 4.9.5 resolution: "typescript@npm:4.9.5" bin: @@ -16393,17 +15744,7 @@ __metadata: languageName: node linkType: hard -"typescript@patch:typescript@^4.9.4#~builtin": - version: 4.9.4 - resolution: "typescript@patch:typescript@npm%3A4.9.4#~builtin::version=4.9.4&hash=a1c5e5" - bin: - tsc: bin/tsc - tsserver: bin/tsserver - checksum: 37f6e2c3c5e2aa5934b85b0fddbf32eeac8b1bacf3a5b51d01946936d03f5377fe86255d4e5a4ae628fd0cd553386355ad362c57f13b4635064400f3e8e05b9d - languageName: node - linkType: hard - -"typescript@patch:typescript@^4.9.5#~builtin": +"typescript@patch:typescript@^4.9.4#~builtin, typescript@patch:typescript@^4.9.5#~builtin": version: 4.9.5 resolution: "typescript@patch:typescript@npm%3A4.9.5#~builtin::version=4.9.5&hash=a1c5e5" bin: @@ -17168,7 +16509,7 @@ __metadata: "@types/open-graph": 0.2.2 "@types/platform": 1.3.4 "@types/prettier": ^2.7.2 - "@types/react": 18.0.27 + "@types/react": 18.0.28 "@types/react-dom": 18.0.11 "@types/react-redux": 7.1.25 "@types/react-transition-group": 4.4.5 @@ -17189,7 +16530,7 @@ __metadata: "@wireapp/prettier-config": 0.5.2 "@wireapp/react-ui-kit": 9.4.0 "@wireapp/store-engine": ^5.0.3 - "@wireapp/store-engine-dexie": 2.0.4 + "@wireapp/store-engine-dexie": 2.0.5 "@wireapp/store-engine-sqleet": 1.8.9 "@wireapp/webapp-events": 0.16.0 adm-zip: 0.5.10 @@ -17208,7 +16549,7 @@ __metadata: css-loader: ^6.7.3 cssnano: ^5.1.14 date-fns: 2.29.3 - dexie: ^3.2.2 + dexie: 3.2.3 dexie-batch: 0.4.3 dotenv: 16.0.3 dpdm: 3.12.0 From 280fa380782e8f4b801584e58489dabcb5092c83 Mon Sep 17 00:00:00 2001 From: Virgile <78490891+V-Gira@users.noreply.github.com> Date: Mon, 13 Mar 2023 18:17:50 +0100 Subject: [PATCH 64/97] refactor: code legibility improvements for failure to send handling [FS-1571] (#14826) * refactor: code legibility improvements for failure to send handling [FS-1571] * address code review * remove unnecessary typing --- .../MessagesList/Message/MessageWrapper.tsx | 11 +++++------ src/script/conversation/EventMapper.ts | 2 +- src/script/conversation/MessageRepository.ts | 5 ++--- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/script/components/MessagesList/Message/MessageWrapper.tsx b/src/script/components/MessagesList/Message/MessageWrapper.tsx index 77d5124549f..1729fecb9e9 100644 --- a/src/script/components/MessagesList/Message/MessageWrapper.tsx +++ b/src/script/components/MessagesList/Message/MessageWrapper.tsx @@ -28,7 +28,6 @@ import {WebAppEvents} from '@wireapp/webapp-events'; import {OutgoingQuote} from 'src/script/conversation/MessageRepository'; import {ContentMessage} from 'src/script/entity/message/ContentMessage'; import {Text} from 'src/script/entity/message/Text'; -import {MentionEntity} from 'src/script/message/MentionEntity'; import {QuoteEntity} from 'src/script/message/QuoteEntity'; import {t} from 'Util/LocalizerUtil'; @@ -53,6 +52,10 @@ import {ContextMenuEntry} from '../../../ui/ContextMenu'; import {MessageParams} from './index'; +const isOutgoingQuote = (quoteEntity: QuoteEntity): quoteEntity is OutgoingQuote => { + return quoteEntity.hash !== undefined; +}; + export const MessageWrapper: React.FC = ({ message, conversation, @@ -101,12 +104,8 @@ export const MessageWrapper: React.FC { - return quoteEntity.hash !== undefined; - }; const quote: OutgoingQuote | undefined = incomingQuote && isOutgoingQuote(incomingQuote) ? (incomingQuote as OutgoingQuote) : undefined; diff --git a/src/script/conversation/EventMapper.ts b/src/script/conversation/EventMapper.ts index db11f783009..6e195aca368 100644 --- a/src/script/conversation/EventMapper.ts +++ b/src/script/conversation/EventMapper.ts @@ -145,7 +145,7 @@ export class EventMapper { const {id, data: eventData, edited_time: editedTime, conversation, qualified_conversation} = event; if (eventData.quote) { - const {hash: hash, message_id: messageId, user_id: userId, error} = eventData.quote; + const {hash, message_id: messageId, user_id: userId, error} = eventData.quote; originalEntity.quote(new QuoteEntity({error, hash, messageId, userId})); } diff --git a/src/script/conversation/MessageRepository.ts b/src/script/conversation/MessageRepository.ts index 5d8f3db70d8..251ba7e63ab 100644 --- a/src/script/conversation/MessageRepository.ts +++ b/src/script/conversation/MessageRepository.ts @@ -1143,9 +1143,8 @@ export class MessageRepository { private async updateMessageAsFailed(conversationEntity: Conversation, eventId: string) { try { const messageEntity = await this.getMessageInConversationById(conversationEntity, eventId); - const updatedStatus = StatusType.FAILED; - messageEntity.status(updatedStatus); - return await this.eventService.updateEvent(messageEntity.primary_key, {status: updatedStatus}); + messageEntity.status(StatusType.FAILED); + return await this.eventService.updateEvent(messageEntity.primary_key, {status: StatusType.FAILED}); } catch (error) { if ((error as any).type !== ConversationError.TYPE.MESSAGE_NOT_FOUND) { throw error; From 18a5dec780760f39fddd42a005a2119e386d79ac Mon Sep 17 00:00:00 2001 From: Otto the Bot Date: Tue, 14 Mar 2023 10:10:54 +0100 Subject: [PATCH 65/97] chore: Update translations (#14801) --- src/i18n/ar-SA.json | 4 ++++ src/i18n/bn-BD.json | 4 ++++ src/i18n/ca-ES.json | 4 ++++ src/i18n/cs-CZ.json | 4 ++++ src/i18n/da-DK.json | 4 ++++ src/i18n/de-DE.json | 14 +++++++++----- src/i18n/el-GR.json | 4 ++++ src/i18n/en-US.json | 4 ++-- src/i18n/es-ES.json | 4 ++++ src/i18n/et-EE.json | 4 ++++ src/i18n/fa-IR.json | 4 ++++ src/i18n/fi-FI.json | 4 ++++ src/i18n/fr-FR.json | 4 ++++ src/i18n/ga-IE.json | 4 ++++ src/i18n/he-IL.json | 4 ++++ src/i18n/hi-IN.json | 4 ++++ src/i18n/hr-HR.json | 4 ++++ src/i18n/hu-HU.json | 4 ++++ src/i18n/id-ID.json | 4 ++++ src/i18n/is-IS.json | 4 ++++ src/i18n/it-IT.json | 4 ++++ src/i18n/ja-JP.json | 4 ++++ src/i18n/lt-LT.json | 4 ++++ src/i18n/lv-LV.json | 4 ++++ src/i18n/ms-MY.json | 4 ++++ src/i18n/nl-NL.json | 4 ++++ src/i18n/no-NO.json | 4 ++++ src/i18n/pl-PL.json | 4 ++++ src/i18n/pt-BR.json | 4 ++++ src/i18n/pt-PT.json | 4 ++++ src/i18n/ro-RO.json | 4 ++++ src/i18n/ru-RU.json | 6 +++++- src/i18n/si-LK.json | 4 ++++ src/i18n/sk-SK.json | 4 ++++ src/i18n/sl-SI.json | 4 ++++ src/i18n/sr-SP.json | 4 ++++ src/i18n/sv-SE.json | 4 ++++ src/i18n/th-TH.json | 4 ++++ src/i18n/tr-TR.json | 4 ++++ src/i18n/uk-UA.json | 4 ++++ src/i18n/uz-UZ.json | 4 ++++ src/i18n/vi-VN.json | 4 ++++ src/i18n/zh-CN.json | 4 ++++ src/i18n/zh-HK.json | 4 ++++ src/i18n/zh-TW.json | 4 ++++ 45 files changed, 184 insertions(+), 8 deletions(-) diff --git a/src/i18n/ar-SA.json b/src/i18n/ar-SA.json index 86195263807..21eb877df33 100644 --- a/src/i18n/ar-SA.json +++ b/src/i18n/ar-SA.json @@ -662,6 +662,8 @@ "login.twoFactorLoginTitle": "Verify your account", "mediaBtnPause": "Pause", "mediaBtnPlay": "Play", + "messageCouldNotBeSent": "Message could not be sent due to connectivity issues.", + "messageCouldNotBeSentRetry": "Retry", "messageDetailsEdited": "Edited: {{edited}}", "messageDetailsNoLikes": "No one has liked this message yet.", "messageDetailsNoReceipts": "No one has read this message yet.", @@ -677,6 +679,8 @@ "messageFailedToSendToSome": "had issues receiving this message.", "messageFailedToSendWillNotReceive": "will not receive the message.", "messageFailedToSendWillReceive": "will receive the message later.", + "messageWillNotBeSent": "File could not be sent due to connectivity issues.", + "messageWillNotBeSentDiscard": "Discard", "mlsToggleInfo": "When this is on, conversation will use the new messaging layer security (MLS) protocol.", "mlsToggleName": "MLS", "modalAccountCreateAction": "موافق", diff --git a/src/i18n/bn-BD.json b/src/i18n/bn-BD.json index 107e5dc7175..7372d8f4cf6 100644 --- a/src/i18n/bn-BD.json +++ b/src/i18n/bn-BD.json @@ -662,6 +662,8 @@ "login.twoFactorLoginTitle": "Verify your account", "mediaBtnPause": "Pause", "mediaBtnPlay": "Play", + "messageCouldNotBeSent": "Message could not be sent due to connectivity issues.", + "messageCouldNotBeSentRetry": "Retry", "messageDetailsEdited": "Edited: {{edited}}", "messageDetailsNoLikes": "No one has liked this message yet.", "messageDetailsNoReceipts": "No one has read this message yet.", @@ -677,6 +679,8 @@ "messageFailedToSendToSome": "had issues receiving this message.", "messageFailedToSendWillNotReceive": "will not receive the message.", "messageFailedToSendWillReceive": "will receive the message later.", + "messageWillNotBeSent": "File could not be sent due to connectivity issues.", + "messageWillNotBeSentDiscard": "Discard", "mlsToggleInfo": "When this is on, conversation will use the new messaging layer security (MLS) protocol.", "mlsToggleName": "MLS", "modalAccountCreateAction": "OK", diff --git a/src/i18n/ca-ES.json b/src/i18n/ca-ES.json index 107e5dc7175..7372d8f4cf6 100644 --- a/src/i18n/ca-ES.json +++ b/src/i18n/ca-ES.json @@ -662,6 +662,8 @@ "login.twoFactorLoginTitle": "Verify your account", "mediaBtnPause": "Pause", "mediaBtnPlay": "Play", + "messageCouldNotBeSent": "Message could not be sent due to connectivity issues.", + "messageCouldNotBeSentRetry": "Retry", "messageDetailsEdited": "Edited: {{edited}}", "messageDetailsNoLikes": "No one has liked this message yet.", "messageDetailsNoReceipts": "No one has read this message yet.", @@ -677,6 +679,8 @@ "messageFailedToSendToSome": "had issues receiving this message.", "messageFailedToSendWillNotReceive": "will not receive the message.", "messageFailedToSendWillReceive": "will receive the message later.", + "messageWillNotBeSent": "File could not be sent due to connectivity issues.", + "messageWillNotBeSentDiscard": "Discard", "mlsToggleInfo": "When this is on, conversation will use the new messaging layer security (MLS) protocol.", "mlsToggleName": "MLS", "modalAccountCreateAction": "OK", diff --git a/src/i18n/cs-CZ.json b/src/i18n/cs-CZ.json index 2afd6540f4d..f891fa14ee9 100644 --- a/src/i18n/cs-CZ.json +++ b/src/i18n/cs-CZ.json @@ -662,6 +662,8 @@ "login.twoFactorLoginTitle": "Verify your account", "mediaBtnPause": "Pause", "mediaBtnPlay": "Play", + "messageCouldNotBeSent": "Message could not be sent due to connectivity issues.", + "messageCouldNotBeSentRetry": "Retry", "messageDetailsEdited": "Edited: {{edited}}", "messageDetailsNoLikes": "No one has liked this message yet.", "messageDetailsNoReceipts": "No one has read this message yet.", @@ -677,6 +679,8 @@ "messageFailedToSendToSome": "had issues receiving this message.", "messageFailedToSendWillNotReceive": "will not receive the message.", "messageFailedToSendWillReceive": "will receive the message later.", + "messageWillNotBeSent": "File could not be sent due to connectivity issues.", + "messageWillNotBeSentDiscard": "Discard", "mlsToggleInfo": "When this is on, conversation will use the new messaging layer security (MLS) protocol.", "mlsToggleName": "MLS", "modalAccountCreateAction": "OK", diff --git a/src/i18n/da-DK.json b/src/i18n/da-DK.json index 9f1fed6bb08..94d42ff46b9 100644 --- a/src/i18n/da-DK.json +++ b/src/i18n/da-DK.json @@ -662,6 +662,8 @@ "login.twoFactorLoginTitle": "Verify your account", "mediaBtnPause": "Pause", "mediaBtnPlay": "Play", + "messageCouldNotBeSent": "Message could not be sent due to connectivity issues.", + "messageCouldNotBeSentRetry": "Retry", "messageDetailsEdited": "Edited: {{edited}}", "messageDetailsNoLikes": "No one has liked this message yet.", "messageDetailsNoReceipts": "No one has read this message yet.", @@ -677,6 +679,8 @@ "messageFailedToSendToSome": "had issues receiving this message.", "messageFailedToSendWillNotReceive": "will not receive the message.", "messageFailedToSendWillReceive": "will receive the message later.", + "messageWillNotBeSent": "File could not be sent due to connectivity issues.", + "messageWillNotBeSentDiscard": "Discard", "mlsToggleInfo": "When this is on, conversation will use the new messaging layer security (MLS) protocol.", "mlsToggleName": "MLS", "modalAccountCreateAction": "OK", diff --git a/src/i18n/de-DE.json b/src/i18n/de-DE.json index d347f5254b6..eaa276cf04f 100644 --- a/src/i18n/de-DE.json +++ b/src/i18n/de-DE.json @@ -662,6 +662,8 @@ "login.twoFactorLoginTitle": "E-Mail-Adresse bestätigen", "mediaBtnPause": "Pause", "mediaBtnPlay": "Wiedergabe", + "messageCouldNotBeSent": "Nachricht konnte aufgrund von Verbindungsproblemen nicht gesendet werden.", + "messageCouldNotBeSentRetry": "Wiederholen", "messageDetailsEdited": "Bearbeitet: {{edited}}", "messageDetailsNoLikes": "Niemand hat diese Nachricht bisher mit Gefällt mir markiert.", "messageDetailsNoReceipts": "Niemand hat diese Nachricht bisher gelesen.", @@ -670,13 +672,15 @@ "messageDetailsTitle": "Details", "messageDetailsTitleLikes": "Gefällt{{count}}", "messageDetailsTitleReceipts": "Gelesen{{count}}", - "messageFailedToSendHideDetails": "Details verbergen", + "messageFailedToSendHideDetails": "Details ausblenden", "messageFailedToSendParticipants": "{{count}} Participants", "messageFailedToSendShowDetails": "Details anzeigen", "messageFailedToSendToOne": "will receive your message later.", "messageFailedToSendToSome": "had issues receiving this message.", "messageFailedToSendWillNotReceive": "will not receive the message.", "messageFailedToSendWillReceive": "will receive the message later.", + "messageWillNotBeSent": "Datei konnte aufgrund von Verbindungsproblemen nicht gesendet werden.", + "messageWillNotBeSentDiscard": "Discard", "mlsToggleInfo": "Wenn dies aktiviert ist, wird für die Unterhaltung das neue Messaging-Layer-Security-Protokoll (MLS) verwendet.", "mlsToggleName": "MLS", "modalAccountCreateAction": "Verstanden", @@ -1089,7 +1093,7 @@ "preferencesOptionsInputLevelNotDetected": "No audio detected from microphone", "preferencesOptionsNotifications": "Benachrichtigungen", "preferencesOptionsNotificationsNone": "Aus", - "preferencesOptionsNotificationsObfuscate": "Details verbergen", + "preferencesOptionsNotificationsObfuscate": "Details ausblenden", "preferencesOptionsNotificationsObfuscateMessage": "Absender anzeigen", "preferencesOptionsNotificationsOn": "Absender und Nachricht anzeigen", "preferencesOptionsPreviewsSendCheckbox": "Vorschau beim Senden von Links erstellen", @@ -1209,10 +1213,10 @@ "tooltipConversationEphemeralAriaLabel": "Schreiben Sie eine selbstlöschende Nachricht ein, derzeit auf {{time}} eingestellt", "tooltipConversationFile": "Datei senden", "tooltipConversationInfo": "Info zur Unterhaltung", - "tooltipConversationInputMoreThanTwoUserTyping": "{{user1}} und {{count}} weitere Personen tippen", - "tooltipConversationInputOneUserTyping": "{{user1}} tippt", + "tooltipConversationInputMoreThanTwoUserTyping": "{{user1}} und {{count}} weitere Personen schreiben", + "tooltipConversationInputOneUserTyping": "{{user1}} schreibt", "tooltipConversationInputPlaceholder": "Eine Nachricht schreiben", - "tooltipConversationInputTwoUserTyping": "{{user1}} und {{user2}} tippen", + "tooltipConversationInputTwoUserTyping": "{{user1}} und {{user2}} schreiben", "tooltipConversationPeople": "Unterhaltungsübersicht ({{shortcut}})", "tooltipConversationPicture": "Bild senden", "tooltipConversationPing": "Ping", diff --git a/src/i18n/el-GR.json b/src/i18n/el-GR.json index 46879ebd423..eb85bb999ef 100644 --- a/src/i18n/el-GR.json +++ b/src/i18n/el-GR.json @@ -662,6 +662,8 @@ "login.twoFactorLoginTitle": "Verify your account", "mediaBtnPause": "Pause", "mediaBtnPlay": "Play", + "messageCouldNotBeSent": "Message could not be sent due to connectivity issues.", + "messageCouldNotBeSentRetry": "Retry", "messageDetailsEdited": "Edited: {{edited}}", "messageDetailsNoLikes": "No one has liked this message yet.", "messageDetailsNoReceipts": "No one has read this message yet.", @@ -677,6 +679,8 @@ "messageFailedToSendToSome": "had issues receiving this message.", "messageFailedToSendWillNotReceive": "will not receive the message.", "messageFailedToSendWillReceive": "will receive the message later.", + "messageWillNotBeSent": "File could not be sent due to connectivity issues.", + "messageWillNotBeSentDiscard": "Discard", "mlsToggleInfo": "When this is on, conversation will use the new messaging layer security (MLS) protocol.", "mlsToggleName": "MLS", "modalAccountCreateAction": "Εντάξει", diff --git a/src/i18n/en-US.json b/src/i18n/en-US.json index 9cf00c9d056..7372d8f4cf6 100644 --- a/src/i18n/en-US.json +++ b/src/i18n/en-US.json @@ -664,8 +664,6 @@ "mediaBtnPlay": "Play", "messageCouldNotBeSent": "Message could not be sent due to connectivity issues.", "messageCouldNotBeSentRetry": "Retry", - "messageWillNotBeSent": "File could not be sent due to connectivity issues.", - "messageWillNotBeSentDiscard": "Discard", "messageDetailsEdited": "Edited: {{edited}}", "messageDetailsNoLikes": "No one has liked this message yet.", "messageDetailsNoReceipts": "No one has read this message yet.", @@ -681,6 +679,8 @@ "messageFailedToSendToSome": "had issues receiving this message.", "messageFailedToSendWillNotReceive": "will not receive the message.", "messageFailedToSendWillReceive": "will receive the message later.", + "messageWillNotBeSent": "File could not be sent due to connectivity issues.", + "messageWillNotBeSentDiscard": "Discard", "mlsToggleInfo": "When this is on, conversation will use the new messaging layer security (MLS) protocol.", "mlsToggleName": "MLS", "modalAccountCreateAction": "OK", diff --git a/src/i18n/es-ES.json b/src/i18n/es-ES.json index cecbfa17a7b..5a1edf218cd 100644 --- a/src/i18n/es-ES.json +++ b/src/i18n/es-ES.json @@ -662,6 +662,8 @@ "login.twoFactorLoginTitle": "Verify your account", "mediaBtnPause": "Pause", "mediaBtnPlay": "Play", + "messageCouldNotBeSent": "Message could not be sent due to connectivity issues.", + "messageCouldNotBeSentRetry": "Retry", "messageDetailsEdited": "Edited: {{edited}}", "messageDetailsNoLikes": "No one has liked this message yet.", "messageDetailsNoReceipts": "No one has read this message yet.", @@ -677,6 +679,8 @@ "messageFailedToSendToSome": "had issues receiving this message.", "messageFailedToSendWillNotReceive": "will not receive the message.", "messageFailedToSendWillReceive": "will receive the message later.", + "messageWillNotBeSent": "File could not be sent due to connectivity issues.", + "messageWillNotBeSentDiscard": "Discard", "mlsToggleInfo": "When this is on, conversation will use the new messaging layer security (MLS) protocol.", "mlsToggleName": "MLS", "modalAccountCreateAction": "OK", diff --git a/src/i18n/et-EE.json b/src/i18n/et-EE.json index 2eee245851f..ecfc789aa83 100644 --- a/src/i18n/et-EE.json +++ b/src/i18n/et-EE.json @@ -662,6 +662,8 @@ "login.twoFactorLoginTitle": "Verify your account", "mediaBtnPause": "Pause", "mediaBtnPlay": "Play", + "messageCouldNotBeSent": "Message could not be sent due to connectivity issues.", + "messageCouldNotBeSentRetry": "Retry", "messageDetailsEdited": "Muudetud: {{edited}}", "messageDetailsNoLikes": "Keegi pole seda sõnumit veel meeldivaks märkinud.", "messageDetailsNoReceipts": "Keegi pole seda sõnumit veel lugenud.", @@ -677,6 +679,8 @@ "messageFailedToSendToSome": "had issues receiving this message.", "messageFailedToSendWillNotReceive": "will not receive the message.", "messageFailedToSendWillReceive": "will receive the message later.", + "messageWillNotBeSent": "File could not be sent due to connectivity issues.", + "messageWillNotBeSentDiscard": "Discard", "mlsToggleInfo": "When this is on, conversation will use the new messaging layer security (MLS) protocol.", "mlsToggleName": "MLS", "modalAccountCreateAction": "OK", diff --git a/src/i18n/fa-IR.json b/src/i18n/fa-IR.json index 85b479f9252..7f9492657ec 100644 --- a/src/i18n/fa-IR.json +++ b/src/i18n/fa-IR.json @@ -662,6 +662,8 @@ "login.twoFactorLoginTitle": "Verify your account", "mediaBtnPause": "Pause", "mediaBtnPlay": "Play", + "messageCouldNotBeSent": "Message could not be sent due to connectivity issues.", + "messageCouldNotBeSentRetry": "Retry", "messageDetailsEdited": "Edited: {{edited}}", "messageDetailsNoLikes": "No one has liked this message yet.", "messageDetailsNoReceipts": "No one has read this message yet.", @@ -677,6 +679,8 @@ "messageFailedToSendToSome": "had issues receiving this message.", "messageFailedToSendWillNotReceive": "will not receive the message.", "messageFailedToSendWillReceive": "will receive the message later.", + "messageWillNotBeSent": "File could not be sent due to connectivity issues.", + "messageWillNotBeSentDiscard": "Discard", "mlsToggleInfo": "When this is on, conversation will use the new messaging layer security (MLS) protocol.", "mlsToggleName": "MLS", "modalAccountCreateAction": "تایید", diff --git a/src/i18n/fi-FI.json b/src/i18n/fi-FI.json index 8f2d92df67d..55b01ce8f48 100644 --- a/src/i18n/fi-FI.json +++ b/src/i18n/fi-FI.json @@ -662,6 +662,8 @@ "login.twoFactorLoginTitle": "Verify your account", "mediaBtnPause": "Pause", "mediaBtnPlay": "Play", + "messageCouldNotBeSent": "Message could not be sent due to connectivity issues.", + "messageCouldNotBeSentRetry": "Retry", "messageDetailsEdited": "Edited: {{edited}}", "messageDetailsNoLikes": "No one has liked this message yet.", "messageDetailsNoReceipts": "No one has read this message yet.", @@ -677,6 +679,8 @@ "messageFailedToSendToSome": "had issues receiving this message.", "messageFailedToSendWillNotReceive": "will not receive the message.", "messageFailedToSendWillReceive": "will receive the message later.", + "messageWillNotBeSent": "File could not be sent due to connectivity issues.", + "messageWillNotBeSentDiscard": "Discard", "mlsToggleInfo": "When this is on, conversation will use the new messaging layer security (MLS) protocol.", "mlsToggleName": "MLS", "modalAccountCreateAction": "OK", diff --git a/src/i18n/fr-FR.json b/src/i18n/fr-FR.json index 61d02efae74..7924cea7d4b 100644 --- a/src/i18n/fr-FR.json +++ b/src/i18n/fr-FR.json @@ -662,6 +662,8 @@ "login.twoFactorLoginTitle": "Verify your account", "mediaBtnPause": "Pause", "mediaBtnPlay": "Play", + "messageCouldNotBeSent": "Message could not be sent due to connectivity issues.", + "messageCouldNotBeSentRetry": "Retry", "messageDetailsEdited": "Édité : {{edited}}", "messageDetailsNoLikes": "Personne n’a encore aimé ce message.", "messageDetailsNoReceipts": "Personne n’a encore lu ce message.", @@ -677,6 +679,8 @@ "messageFailedToSendToSome": "had issues receiving this message.", "messageFailedToSendWillNotReceive": "will not receive the message.", "messageFailedToSendWillReceive": "will receive the message later.", + "messageWillNotBeSent": "File could not be sent due to connectivity issues.", + "messageWillNotBeSentDiscard": "Discard", "mlsToggleInfo": "When this is on, conversation will use the new messaging layer security (MLS) protocol.", "mlsToggleName": "MLS", "modalAccountCreateAction": "OK", diff --git a/src/i18n/ga-IE.json b/src/i18n/ga-IE.json index 107e5dc7175..7372d8f4cf6 100644 --- a/src/i18n/ga-IE.json +++ b/src/i18n/ga-IE.json @@ -662,6 +662,8 @@ "login.twoFactorLoginTitle": "Verify your account", "mediaBtnPause": "Pause", "mediaBtnPlay": "Play", + "messageCouldNotBeSent": "Message could not be sent due to connectivity issues.", + "messageCouldNotBeSentRetry": "Retry", "messageDetailsEdited": "Edited: {{edited}}", "messageDetailsNoLikes": "No one has liked this message yet.", "messageDetailsNoReceipts": "No one has read this message yet.", @@ -677,6 +679,8 @@ "messageFailedToSendToSome": "had issues receiving this message.", "messageFailedToSendWillNotReceive": "will not receive the message.", "messageFailedToSendWillReceive": "will receive the message later.", + "messageWillNotBeSent": "File could not be sent due to connectivity issues.", + "messageWillNotBeSentDiscard": "Discard", "mlsToggleInfo": "When this is on, conversation will use the new messaging layer security (MLS) protocol.", "mlsToggleName": "MLS", "modalAccountCreateAction": "OK", diff --git a/src/i18n/he-IL.json b/src/i18n/he-IL.json index 107e5dc7175..7372d8f4cf6 100644 --- a/src/i18n/he-IL.json +++ b/src/i18n/he-IL.json @@ -662,6 +662,8 @@ "login.twoFactorLoginTitle": "Verify your account", "mediaBtnPause": "Pause", "mediaBtnPlay": "Play", + "messageCouldNotBeSent": "Message could not be sent due to connectivity issues.", + "messageCouldNotBeSentRetry": "Retry", "messageDetailsEdited": "Edited: {{edited}}", "messageDetailsNoLikes": "No one has liked this message yet.", "messageDetailsNoReceipts": "No one has read this message yet.", @@ -677,6 +679,8 @@ "messageFailedToSendToSome": "had issues receiving this message.", "messageFailedToSendWillNotReceive": "will not receive the message.", "messageFailedToSendWillReceive": "will receive the message later.", + "messageWillNotBeSent": "File could not be sent due to connectivity issues.", + "messageWillNotBeSentDiscard": "Discard", "mlsToggleInfo": "When this is on, conversation will use the new messaging layer security (MLS) protocol.", "mlsToggleName": "MLS", "modalAccountCreateAction": "OK", diff --git a/src/i18n/hi-IN.json b/src/i18n/hi-IN.json index 7c3fa5fb165..8eb35edf133 100644 --- a/src/i18n/hi-IN.json +++ b/src/i18n/hi-IN.json @@ -662,6 +662,8 @@ "login.twoFactorLoginTitle": "Verify your account", "mediaBtnPause": "Pause", "mediaBtnPlay": "Play", + "messageCouldNotBeSent": "Message could not be sent due to connectivity issues.", + "messageCouldNotBeSentRetry": "Retry", "messageDetailsEdited": "Edited: {{edited}}", "messageDetailsNoLikes": "No one has liked this message yet.", "messageDetailsNoReceipts": "No one has read this message yet.", @@ -677,6 +679,8 @@ "messageFailedToSendToSome": "had issues receiving this message.", "messageFailedToSendWillNotReceive": "will not receive the message.", "messageFailedToSendWillReceive": "will receive the message later.", + "messageWillNotBeSent": "File could not be sent due to connectivity issues.", + "messageWillNotBeSentDiscard": "Discard", "mlsToggleInfo": "When this is on, conversation will use the new messaging layer security (MLS) protocol.", "mlsToggleName": "MLS", "modalAccountCreateAction": "OK", diff --git a/src/i18n/hr-HR.json b/src/i18n/hr-HR.json index c8e1941c6e0..fa8fc6a18a7 100644 --- a/src/i18n/hr-HR.json +++ b/src/i18n/hr-HR.json @@ -662,6 +662,8 @@ "login.twoFactorLoginTitle": "Verify your account", "mediaBtnPause": "Pause", "mediaBtnPlay": "Play", + "messageCouldNotBeSent": "Message could not be sent due to connectivity issues.", + "messageCouldNotBeSentRetry": "Retry", "messageDetailsEdited": "Uređeno: {{edited}}", "messageDetailsNoLikes": "Nikome se još nije svidjela poruka.", "messageDetailsNoReceipts": "Nitko još nije pročitao ovu poruku.", @@ -677,6 +679,8 @@ "messageFailedToSendToSome": "had issues receiving this message.", "messageFailedToSendWillNotReceive": "will not receive the message.", "messageFailedToSendWillReceive": "will receive the message later.", + "messageWillNotBeSent": "File could not be sent due to connectivity issues.", + "messageWillNotBeSentDiscard": "Discard", "mlsToggleInfo": "When this is on, conversation will use the new messaging layer security (MLS) protocol.", "mlsToggleName": "MLS", "modalAccountCreateAction": "U redu", diff --git a/src/i18n/hu-HU.json b/src/i18n/hu-HU.json index 65b4a32e947..1744a78f993 100644 --- a/src/i18n/hu-HU.json +++ b/src/i18n/hu-HU.json @@ -662,6 +662,8 @@ "login.twoFactorLoginTitle": "Verify your account", "mediaBtnPause": "Pause", "mediaBtnPlay": "Play", + "messageCouldNotBeSent": "Message could not be sent due to connectivity issues.", + "messageCouldNotBeSentRetry": "Retry", "messageDetailsEdited": "Szerkesztve: {{edited}}", "messageDetailsNoLikes": "Még senkinek nem tetszett ez az üzenet.", "messageDetailsNoReceipts": "Még senki nem olvasta el az üzenetet.", @@ -677,6 +679,8 @@ "messageFailedToSendToSome": "had issues receiving this message.", "messageFailedToSendWillNotReceive": "will not receive the message.", "messageFailedToSendWillReceive": "will receive the message later.", + "messageWillNotBeSent": "File could not be sent due to connectivity issues.", + "messageWillNotBeSentDiscard": "Discard", "mlsToggleInfo": "When this is on, conversation will use the new messaging layer security (MLS) protocol.", "mlsToggleName": "MLS", "modalAccountCreateAction": "OK", diff --git a/src/i18n/id-ID.json b/src/i18n/id-ID.json index a010d72ffd0..0d2bc2adc7a 100644 --- a/src/i18n/id-ID.json +++ b/src/i18n/id-ID.json @@ -662,6 +662,8 @@ "login.twoFactorLoginTitle": "Verify your account", "mediaBtnPause": "Pause", "mediaBtnPlay": "Play", + "messageCouldNotBeSent": "Message could not be sent due to connectivity issues.", + "messageCouldNotBeSentRetry": "Retry", "messageDetailsEdited": "Edited: {{edited}}", "messageDetailsNoLikes": "No one has liked this message yet.", "messageDetailsNoReceipts": "No one has read this message yet.", @@ -677,6 +679,8 @@ "messageFailedToSendToSome": "had issues receiving this message.", "messageFailedToSendWillNotReceive": "will not receive the message.", "messageFailedToSendWillReceive": "will receive the message later.", + "messageWillNotBeSent": "File could not be sent due to connectivity issues.", + "messageWillNotBeSentDiscard": "Discard", "mlsToggleInfo": "When this is on, conversation will use the new messaging layer security (MLS) protocol.", "mlsToggleName": "MLS", "modalAccountCreateAction": "OK", diff --git a/src/i18n/is-IS.json b/src/i18n/is-IS.json index 107e5dc7175..7372d8f4cf6 100644 --- a/src/i18n/is-IS.json +++ b/src/i18n/is-IS.json @@ -662,6 +662,8 @@ "login.twoFactorLoginTitle": "Verify your account", "mediaBtnPause": "Pause", "mediaBtnPlay": "Play", + "messageCouldNotBeSent": "Message could not be sent due to connectivity issues.", + "messageCouldNotBeSentRetry": "Retry", "messageDetailsEdited": "Edited: {{edited}}", "messageDetailsNoLikes": "No one has liked this message yet.", "messageDetailsNoReceipts": "No one has read this message yet.", @@ -677,6 +679,8 @@ "messageFailedToSendToSome": "had issues receiving this message.", "messageFailedToSendWillNotReceive": "will not receive the message.", "messageFailedToSendWillReceive": "will receive the message later.", + "messageWillNotBeSent": "File could not be sent due to connectivity issues.", + "messageWillNotBeSentDiscard": "Discard", "mlsToggleInfo": "When this is on, conversation will use the new messaging layer security (MLS) protocol.", "mlsToggleName": "MLS", "modalAccountCreateAction": "OK", diff --git a/src/i18n/it-IT.json b/src/i18n/it-IT.json index eab4f7d5010..e81a53acd68 100644 --- a/src/i18n/it-IT.json +++ b/src/i18n/it-IT.json @@ -662,6 +662,8 @@ "login.twoFactorLoginTitle": "Verify your account", "mediaBtnPause": "Pause", "mediaBtnPlay": "Play", + "messageCouldNotBeSent": "Message could not be sent due to connectivity issues.", + "messageCouldNotBeSentRetry": "Retry", "messageDetailsEdited": "Edited: {{edited}}", "messageDetailsNoLikes": "No one has liked this message yet.", "messageDetailsNoReceipts": "No one has read this message yet.", @@ -677,6 +679,8 @@ "messageFailedToSendToSome": "had issues receiving this message.", "messageFailedToSendWillNotReceive": "will not receive the message.", "messageFailedToSendWillReceive": "will receive the message later.", + "messageWillNotBeSent": "File could not be sent due to connectivity issues.", + "messageWillNotBeSentDiscard": "Discard", "mlsToggleInfo": "When this is on, conversation will use the new messaging layer security (MLS) protocol.", "mlsToggleName": "MLS", "modalAccountCreateAction": "OK", diff --git a/src/i18n/ja-JP.json b/src/i18n/ja-JP.json index 372d41b6910..78fd8135dce 100644 --- a/src/i18n/ja-JP.json +++ b/src/i18n/ja-JP.json @@ -662,6 +662,8 @@ "login.twoFactorLoginTitle": "Verify your account", "mediaBtnPause": "Pause", "mediaBtnPlay": "Play", + "messageCouldNotBeSent": "Message could not be sent due to connectivity issues.", + "messageCouldNotBeSentRetry": "Retry", "messageDetailsEdited": "編集済: {{edited}}", "messageDetailsNoLikes": "まだ、誰もこのメッセージにいいねしていません。", "messageDetailsNoReceipts": "まだ、誰もこのメッセージを読んでいません。", @@ -677,6 +679,8 @@ "messageFailedToSendToSome": "had issues receiving this message.", "messageFailedToSendWillNotReceive": "will not receive the message.", "messageFailedToSendWillReceive": "will receive the message later.", + "messageWillNotBeSent": "File could not be sent due to connectivity issues.", + "messageWillNotBeSentDiscard": "Discard", "mlsToggleInfo": "When this is on, conversation will use the new messaging layer security (MLS) protocol.", "mlsToggleName": "MLS", "modalAccountCreateAction": "OK", diff --git a/src/i18n/lt-LT.json b/src/i18n/lt-LT.json index 41a50b76da3..edc6cdef3b9 100644 --- a/src/i18n/lt-LT.json +++ b/src/i18n/lt-LT.json @@ -662,6 +662,8 @@ "login.twoFactorLoginTitle": "Verify your account", "mediaBtnPause": "Pause", "mediaBtnPlay": "Play", + "messageCouldNotBeSent": "Message could not be sent due to connectivity issues.", + "messageCouldNotBeSentRetry": "Retry", "messageDetailsEdited": "Taisyta: {{edited}}", "messageDetailsNoLikes": "Kol kas ši žinutė niekam nepatiko.", "messageDetailsNoReceipts": "Kol kas niekas neperskaitė šios žinutės.", @@ -677,6 +679,8 @@ "messageFailedToSendToSome": "had issues receiving this message.", "messageFailedToSendWillNotReceive": "will not receive the message.", "messageFailedToSendWillReceive": "will receive the message later.", + "messageWillNotBeSent": "File could not be sent due to connectivity issues.", + "messageWillNotBeSentDiscard": "Discard", "mlsToggleInfo": "When this is on, conversation will use the new messaging layer security (MLS) protocol.", "mlsToggleName": "MLS", "modalAccountCreateAction": "GERAI", diff --git a/src/i18n/lv-LV.json b/src/i18n/lv-LV.json index 98cb7d37da7..4645df356dc 100644 --- a/src/i18n/lv-LV.json +++ b/src/i18n/lv-LV.json @@ -662,6 +662,8 @@ "login.twoFactorLoginTitle": "Verify your account", "mediaBtnPause": "Pause", "mediaBtnPlay": "Play", + "messageCouldNotBeSent": "Message could not be sent due to connectivity issues.", + "messageCouldNotBeSentRetry": "Retry", "messageDetailsEdited": "Edited: {{edited}}", "messageDetailsNoLikes": "No one has liked this message yet.", "messageDetailsNoReceipts": "No one has read this message yet.", @@ -677,6 +679,8 @@ "messageFailedToSendToSome": "had issues receiving this message.", "messageFailedToSendWillNotReceive": "will not receive the message.", "messageFailedToSendWillReceive": "will receive the message later.", + "messageWillNotBeSent": "File could not be sent due to connectivity issues.", + "messageWillNotBeSentDiscard": "Discard", "mlsToggleInfo": "When this is on, conversation will use the new messaging layer security (MLS) protocol.", "mlsToggleName": "MLS", "modalAccountCreateAction": "Labi", diff --git a/src/i18n/ms-MY.json b/src/i18n/ms-MY.json index 107e5dc7175..7372d8f4cf6 100644 --- a/src/i18n/ms-MY.json +++ b/src/i18n/ms-MY.json @@ -662,6 +662,8 @@ "login.twoFactorLoginTitle": "Verify your account", "mediaBtnPause": "Pause", "mediaBtnPlay": "Play", + "messageCouldNotBeSent": "Message could not be sent due to connectivity issues.", + "messageCouldNotBeSentRetry": "Retry", "messageDetailsEdited": "Edited: {{edited}}", "messageDetailsNoLikes": "No one has liked this message yet.", "messageDetailsNoReceipts": "No one has read this message yet.", @@ -677,6 +679,8 @@ "messageFailedToSendToSome": "had issues receiving this message.", "messageFailedToSendWillNotReceive": "will not receive the message.", "messageFailedToSendWillReceive": "will receive the message later.", + "messageWillNotBeSent": "File could not be sent due to connectivity issues.", + "messageWillNotBeSentDiscard": "Discard", "mlsToggleInfo": "When this is on, conversation will use the new messaging layer security (MLS) protocol.", "mlsToggleName": "MLS", "modalAccountCreateAction": "OK", diff --git a/src/i18n/nl-NL.json b/src/i18n/nl-NL.json index 2ce981b1801..76ed605aa79 100644 --- a/src/i18n/nl-NL.json +++ b/src/i18n/nl-NL.json @@ -662,6 +662,8 @@ "login.twoFactorLoginTitle": "Verify your account", "mediaBtnPause": "Pause", "mediaBtnPlay": "Play", + "messageCouldNotBeSent": "Message could not be sent due to connectivity issues.", + "messageCouldNotBeSentRetry": "Retry", "messageDetailsEdited": "Edited: {{edited}}", "messageDetailsNoLikes": "No one has liked this message yet.", "messageDetailsNoReceipts": "No one has read this message yet.", @@ -677,6 +679,8 @@ "messageFailedToSendToSome": "had issues receiving this message.", "messageFailedToSendWillNotReceive": "will not receive the message.", "messageFailedToSendWillReceive": "will receive the message later.", + "messageWillNotBeSent": "File could not be sent due to connectivity issues.", + "messageWillNotBeSentDiscard": "Discard", "mlsToggleInfo": "When this is on, conversation will use the new messaging layer security (MLS) protocol.", "mlsToggleName": "MLS", "modalAccountCreateAction": "OK", diff --git a/src/i18n/no-NO.json b/src/i18n/no-NO.json index 9e3ead46648..cf2b5a4dc07 100644 --- a/src/i18n/no-NO.json +++ b/src/i18n/no-NO.json @@ -662,6 +662,8 @@ "login.twoFactorLoginTitle": "Verify your account", "mediaBtnPause": "Pause", "mediaBtnPlay": "Play", + "messageCouldNotBeSent": "Message could not be sent due to connectivity issues.", + "messageCouldNotBeSentRetry": "Retry", "messageDetailsEdited": "Edited: {{edited}}", "messageDetailsNoLikes": "No one has liked this message yet.", "messageDetailsNoReceipts": "No one has read this message yet.", @@ -677,6 +679,8 @@ "messageFailedToSendToSome": "had issues receiving this message.", "messageFailedToSendWillNotReceive": "will not receive the message.", "messageFailedToSendWillReceive": "will receive the message later.", + "messageWillNotBeSent": "File could not be sent due to connectivity issues.", + "messageWillNotBeSentDiscard": "Discard", "mlsToggleInfo": "When this is on, conversation will use the new messaging layer security (MLS) protocol.", "mlsToggleName": "MLS", "modalAccountCreateAction": "OK", diff --git a/src/i18n/pl-PL.json b/src/i18n/pl-PL.json index 35c875ef459..41a349cd1e0 100644 --- a/src/i18n/pl-PL.json +++ b/src/i18n/pl-PL.json @@ -662,6 +662,8 @@ "login.twoFactorLoginTitle": "Verify your account", "mediaBtnPause": "Pause", "mediaBtnPlay": "Play", + "messageCouldNotBeSent": "Message could not be sent due to connectivity issues.", + "messageCouldNotBeSentRetry": "Retry", "messageDetailsEdited": "Edited: {{edited}}", "messageDetailsNoLikes": "No one has liked this message yet.", "messageDetailsNoReceipts": "No one has read this message yet.", @@ -677,6 +679,8 @@ "messageFailedToSendToSome": "had issues receiving this message.", "messageFailedToSendWillNotReceive": "will not receive the message.", "messageFailedToSendWillReceive": "will receive the message later.", + "messageWillNotBeSent": "File could not be sent due to connectivity issues.", + "messageWillNotBeSentDiscard": "Discard", "mlsToggleInfo": "When this is on, conversation will use the new messaging layer security (MLS) protocol.", "mlsToggleName": "MLS", "modalAccountCreateAction": "OK", diff --git a/src/i18n/pt-BR.json b/src/i18n/pt-BR.json index b3df804e90c..6ef26318c69 100644 --- a/src/i18n/pt-BR.json +++ b/src/i18n/pt-BR.json @@ -662,6 +662,8 @@ "login.twoFactorLoginTitle": "Verifique sua conta", "mediaBtnPause": "Pausar", "mediaBtnPlay": "Reproduzir", + "messageCouldNotBeSent": "Message could not be sent due to connectivity issues.", + "messageCouldNotBeSentRetry": "Retry", "messageDetailsEdited": "Editado: {{edited}}", "messageDetailsNoLikes": "Ninguém curtiu esta mensagem ainda.", "messageDetailsNoReceipts": "Ninguém leu esta mensagem ainda.", @@ -677,6 +679,8 @@ "messageFailedToSendToSome": "had issues receiving this message.", "messageFailedToSendWillNotReceive": "will not receive the message.", "messageFailedToSendWillReceive": "will receive the message later.", + "messageWillNotBeSent": "File could not be sent due to connectivity issues.", + "messageWillNotBeSentDiscard": "Discard", "mlsToggleInfo": "Quando ativado, a conversa usará o novo protocolo de segurança de camada de mensagens (MLS).", "mlsToggleName": "MLS", "modalAccountCreateAction": "OK", diff --git a/src/i18n/pt-PT.json b/src/i18n/pt-PT.json index f81bf02b465..db29ae9c33d 100644 --- a/src/i18n/pt-PT.json +++ b/src/i18n/pt-PT.json @@ -662,6 +662,8 @@ "login.twoFactorLoginTitle": "Verify your account", "mediaBtnPause": "Pause", "mediaBtnPlay": "Play", + "messageCouldNotBeSent": "Message could not be sent due to connectivity issues.", + "messageCouldNotBeSentRetry": "Retry", "messageDetailsEdited": "Edited: {{edited}}", "messageDetailsNoLikes": "No one has liked this message yet.", "messageDetailsNoReceipts": "No one has read this message yet.", @@ -677,6 +679,8 @@ "messageFailedToSendToSome": "had issues receiving this message.", "messageFailedToSendWillNotReceive": "will not receive the message.", "messageFailedToSendWillReceive": "will receive the message later.", + "messageWillNotBeSent": "File could not be sent due to connectivity issues.", + "messageWillNotBeSentDiscard": "Discard", "mlsToggleInfo": "When this is on, conversation will use the new messaging layer security (MLS) protocol.", "mlsToggleName": "MLS", "modalAccountCreateAction": "OK", diff --git a/src/i18n/ro-RO.json b/src/i18n/ro-RO.json index 50d313b244c..1a783d949c3 100644 --- a/src/i18n/ro-RO.json +++ b/src/i18n/ro-RO.json @@ -662,6 +662,8 @@ "login.twoFactorLoginTitle": "Verify your account", "mediaBtnPause": "Pause", "mediaBtnPlay": "Play", + "messageCouldNotBeSent": "Message could not be sent due to connectivity issues.", + "messageCouldNotBeSentRetry": "Retry", "messageDetailsEdited": "Edited: {{edited}}", "messageDetailsNoLikes": "No one has liked this message yet.", "messageDetailsNoReceipts": "No one has read this message yet.", @@ -677,6 +679,8 @@ "messageFailedToSendToSome": "had issues receiving this message.", "messageFailedToSendWillNotReceive": "will not receive the message.", "messageFailedToSendWillReceive": "will receive the message later.", + "messageWillNotBeSent": "File could not be sent due to connectivity issues.", + "messageWillNotBeSentDiscard": "Discard", "mlsToggleInfo": "When this is on, conversation will use the new messaging layer security (MLS) protocol.", "mlsToggleName": "MLS", "modalAccountCreateAction": "OK", diff --git a/src/i18n/ru-RU.json b/src/i18n/ru-RU.json index 9f9df48b85b..b8db098043b 100644 --- a/src/i18n/ru-RU.json +++ b/src/i18n/ru-RU.json @@ -662,6 +662,8 @@ "login.twoFactorLoginTitle": "Подтвердите учетную запись", "mediaBtnPause": "Пауза", "mediaBtnPlay": "Воспроизвести", + "messageCouldNotBeSent": "Не удалось отправить сообщение из-за проблем с подключением.", + "messageCouldNotBeSentRetry": "Повторить", "messageDetailsEdited": "Изменено: {{edited}}", "messageDetailsNoLikes": "Сообщение еще никому не понравилось.", "messageDetailsNoReceipts": "Сообщение еще никем не прочитано.", @@ -677,6 +679,8 @@ "messageFailedToSendToSome": "возникли проблемы с получением этого сообщения.", "messageFailedToSendWillNotReceive": "не получит сообщение.", "messageFailedToSendWillReceive": "получит сообщение позднее.", + "messageWillNotBeSent": "Не удалось отправить файл из-за проблем с подключением.", + "messageWillNotBeSentDiscard": "Отменить", "mlsToggleInfo": "При включении в беседе будет использоваться новый протокол безопасности уровня обмена сообщениями (MLS).", "mlsToggleName": "MLS", "modalAccountCreateAction": "OK", @@ -1025,7 +1029,7 @@ "preferencesAccountSetAppLockPassphrase": "Установить код доступа к приложению", "preferencesAccountTeam": "Команда", "preferencesAccountTypingIndicatorCheckbox": "Индикатор набора текста", - "preferencesAccountTypingIndicatorsDetail": "Если этот параметр выключен, вы не сможете видеть, когда собеседники набирают текст, а собеседники не смогут видеть, когда вы набираете текст. Эта настройка применяется ко всем разговорам на этом устройстве.", + "preferencesAccountTypingIndicatorsDetail": "При выключении этого параметра вы не сможете видеть, когда собеседники набирают текст, а собеседники не смогут видеть, когда вы набираете текст. Эта настройка применяется ко всем беседам на этом устройстве.", "preferencesAccountUpdateLabel": "Изменить ваш статус на", "preferencesAccountUsername": "Псевдоним", "preferencesAccountUsernameAvailable": "Доступно", diff --git a/src/i18n/si-LK.json b/src/i18n/si-LK.json index 107e5dc7175..7372d8f4cf6 100644 --- a/src/i18n/si-LK.json +++ b/src/i18n/si-LK.json @@ -662,6 +662,8 @@ "login.twoFactorLoginTitle": "Verify your account", "mediaBtnPause": "Pause", "mediaBtnPlay": "Play", + "messageCouldNotBeSent": "Message could not be sent due to connectivity issues.", + "messageCouldNotBeSentRetry": "Retry", "messageDetailsEdited": "Edited: {{edited}}", "messageDetailsNoLikes": "No one has liked this message yet.", "messageDetailsNoReceipts": "No one has read this message yet.", @@ -677,6 +679,8 @@ "messageFailedToSendToSome": "had issues receiving this message.", "messageFailedToSendWillNotReceive": "will not receive the message.", "messageFailedToSendWillReceive": "will receive the message later.", + "messageWillNotBeSent": "File could not be sent due to connectivity issues.", + "messageWillNotBeSentDiscard": "Discard", "mlsToggleInfo": "When this is on, conversation will use the new messaging layer security (MLS) protocol.", "mlsToggleName": "MLS", "modalAccountCreateAction": "OK", diff --git a/src/i18n/sk-SK.json b/src/i18n/sk-SK.json index 10836ce258b..d490c7f4df3 100644 --- a/src/i18n/sk-SK.json +++ b/src/i18n/sk-SK.json @@ -662,6 +662,8 @@ "login.twoFactorLoginTitle": "Verify your account", "mediaBtnPause": "Pause", "mediaBtnPlay": "Play", + "messageCouldNotBeSent": "Message could not be sent due to connectivity issues.", + "messageCouldNotBeSentRetry": "Retry", "messageDetailsEdited": "Edited: {{edited}}", "messageDetailsNoLikes": "No one has liked this message yet.", "messageDetailsNoReceipts": "No one has read this message yet.", @@ -677,6 +679,8 @@ "messageFailedToSendToSome": "had issues receiving this message.", "messageFailedToSendWillNotReceive": "will not receive the message.", "messageFailedToSendWillReceive": "will receive the message later.", + "messageWillNotBeSent": "File could not be sent due to connectivity issues.", + "messageWillNotBeSentDiscard": "Discard", "mlsToggleInfo": "When this is on, conversation will use the new messaging layer security (MLS) protocol.", "mlsToggleName": "MLS", "modalAccountCreateAction": "OK", diff --git a/src/i18n/sl-SI.json b/src/i18n/sl-SI.json index 4a266a75bfb..a7c9c4c4eaf 100644 --- a/src/i18n/sl-SI.json +++ b/src/i18n/sl-SI.json @@ -662,6 +662,8 @@ "login.twoFactorLoginTitle": "Verify your account", "mediaBtnPause": "Pause", "mediaBtnPlay": "Play", + "messageCouldNotBeSent": "Message could not be sent due to connectivity issues.", + "messageCouldNotBeSentRetry": "Retry", "messageDetailsEdited": "Edited: {{edited}}", "messageDetailsNoLikes": "No one has liked this message yet.", "messageDetailsNoReceipts": "No one has read this message yet.", @@ -677,6 +679,8 @@ "messageFailedToSendToSome": "had issues receiving this message.", "messageFailedToSendWillNotReceive": "will not receive the message.", "messageFailedToSendWillReceive": "will receive the message later.", + "messageWillNotBeSent": "File could not be sent due to connectivity issues.", + "messageWillNotBeSentDiscard": "Discard", "mlsToggleInfo": "When this is on, conversation will use the new messaging layer security (MLS) protocol.", "mlsToggleName": "MLS", "modalAccountCreateAction": "V redu", diff --git a/src/i18n/sr-SP.json b/src/i18n/sr-SP.json index f2477e70bef..0df7ae8b266 100644 --- a/src/i18n/sr-SP.json +++ b/src/i18n/sr-SP.json @@ -662,6 +662,8 @@ "login.twoFactorLoginTitle": "Verify your account", "mediaBtnPause": "Pause", "mediaBtnPlay": "Play", + "messageCouldNotBeSent": "Message could not be sent due to connectivity issues.", + "messageCouldNotBeSentRetry": "Retry", "messageDetailsEdited": "Измењено: {{edited}}", "messageDetailsNoLikes": "Нико још није лајковао ову поруку", "messageDetailsNoReceipts": "Још нико није прочитао ову поруку.", @@ -677,6 +679,8 @@ "messageFailedToSendToSome": "had issues receiving this message.", "messageFailedToSendWillNotReceive": "will not receive the message.", "messageFailedToSendWillReceive": "will receive the message later.", + "messageWillNotBeSent": "File could not be sent due to connectivity issues.", + "messageWillNotBeSentDiscard": "Discard", "mlsToggleInfo": "When this is on, conversation will use the new messaging layer security (MLS) protocol.", "mlsToggleName": "MLS", "modalAccountCreateAction": "У реду", diff --git a/src/i18n/sv-SE.json b/src/i18n/sv-SE.json index b19cea3750f..bfd890925f6 100644 --- a/src/i18n/sv-SE.json +++ b/src/i18n/sv-SE.json @@ -662,6 +662,8 @@ "login.twoFactorLoginTitle": "Verify your account", "mediaBtnPause": "Pause", "mediaBtnPlay": "Play", + "messageCouldNotBeSent": "Message could not be sent due to connectivity issues.", + "messageCouldNotBeSentRetry": "Retry", "messageDetailsEdited": "Edited: {{edited}}", "messageDetailsNoLikes": "No one has liked this message yet.", "messageDetailsNoReceipts": "No one has read this message yet.", @@ -677,6 +679,8 @@ "messageFailedToSendToSome": "had issues receiving this message.", "messageFailedToSendWillNotReceive": "will not receive the message.", "messageFailedToSendWillReceive": "will receive the message later.", + "messageWillNotBeSent": "File could not be sent due to connectivity issues.", + "messageWillNotBeSentDiscard": "Discard", "mlsToggleInfo": "When this is on, conversation will use the new messaging layer security (MLS) protocol.", "mlsToggleName": "MLS", "modalAccountCreateAction": "OK", diff --git a/src/i18n/th-TH.json b/src/i18n/th-TH.json index 107e5dc7175..7372d8f4cf6 100644 --- a/src/i18n/th-TH.json +++ b/src/i18n/th-TH.json @@ -662,6 +662,8 @@ "login.twoFactorLoginTitle": "Verify your account", "mediaBtnPause": "Pause", "mediaBtnPlay": "Play", + "messageCouldNotBeSent": "Message could not be sent due to connectivity issues.", + "messageCouldNotBeSentRetry": "Retry", "messageDetailsEdited": "Edited: {{edited}}", "messageDetailsNoLikes": "No one has liked this message yet.", "messageDetailsNoReceipts": "No one has read this message yet.", @@ -677,6 +679,8 @@ "messageFailedToSendToSome": "had issues receiving this message.", "messageFailedToSendWillNotReceive": "will not receive the message.", "messageFailedToSendWillReceive": "will receive the message later.", + "messageWillNotBeSent": "File could not be sent due to connectivity issues.", + "messageWillNotBeSentDiscard": "Discard", "mlsToggleInfo": "When this is on, conversation will use the new messaging layer security (MLS) protocol.", "mlsToggleName": "MLS", "modalAccountCreateAction": "OK", diff --git a/src/i18n/tr-TR.json b/src/i18n/tr-TR.json index 877b357ef19..fc155896ca4 100644 --- a/src/i18n/tr-TR.json +++ b/src/i18n/tr-TR.json @@ -662,6 +662,8 @@ "login.twoFactorLoginTitle": "Verify your account", "mediaBtnPause": "Pause", "mediaBtnPlay": "Play", + "messageCouldNotBeSent": "Message could not be sent due to connectivity issues.", + "messageCouldNotBeSentRetry": "Retry", "messageDetailsEdited": "{{edited}}’da düzenlenmiş", "messageDetailsNoLikes": "Bu mesajı henüz kimse beğenmemiş.", "messageDetailsNoReceipts": "Bu mesajı henüz kimse okumamış.", @@ -677,6 +679,8 @@ "messageFailedToSendToSome": "had issues receiving this message.", "messageFailedToSendWillNotReceive": "will not receive the message.", "messageFailedToSendWillReceive": "will receive the message later.", + "messageWillNotBeSent": "File could not be sent due to connectivity issues.", + "messageWillNotBeSentDiscard": "Discard", "mlsToggleInfo": "When this is on, conversation will use the new messaging layer security (MLS) protocol.", "mlsToggleName": "MLS", "modalAccountCreateAction": "TAMAM", diff --git a/src/i18n/uk-UA.json b/src/i18n/uk-UA.json index 67a06f239fc..d449269fa50 100644 --- a/src/i18n/uk-UA.json +++ b/src/i18n/uk-UA.json @@ -662,6 +662,8 @@ "login.twoFactorLoginTitle": "Verify your account", "mediaBtnPause": "Pause", "mediaBtnPlay": "Play", + "messageCouldNotBeSent": "Message could not be sent due to connectivity issues.", + "messageCouldNotBeSentRetry": "Retry", "messageDetailsEdited": "Відредаговане: {{edited}}", "messageDetailsNoLikes": "Це повідомлення поки що ніхто не лайкнув.", "messageDetailsNoReceipts": "Це повідомлення поки що ніхто не переглянув.", @@ -677,6 +679,8 @@ "messageFailedToSendToSome": "had issues receiving this message.", "messageFailedToSendWillNotReceive": "will not receive the message.", "messageFailedToSendWillReceive": "will receive the message later.", + "messageWillNotBeSent": "File could not be sent due to connectivity issues.", + "messageWillNotBeSentDiscard": "Discard", "mlsToggleInfo": "When this is on, conversation will use the new messaging layer security (MLS) protocol.", "mlsToggleName": "MLS", "modalAccountCreateAction": "OK", diff --git a/src/i18n/uz-UZ.json b/src/i18n/uz-UZ.json index 107e5dc7175..7372d8f4cf6 100644 --- a/src/i18n/uz-UZ.json +++ b/src/i18n/uz-UZ.json @@ -662,6 +662,8 @@ "login.twoFactorLoginTitle": "Verify your account", "mediaBtnPause": "Pause", "mediaBtnPlay": "Play", + "messageCouldNotBeSent": "Message could not be sent due to connectivity issues.", + "messageCouldNotBeSentRetry": "Retry", "messageDetailsEdited": "Edited: {{edited}}", "messageDetailsNoLikes": "No one has liked this message yet.", "messageDetailsNoReceipts": "No one has read this message yet.", @@ -677,6 +679,8 @@ "messageFailedToSendToSome": "had issues receiving this message.", "messageFailedToSendWillNotReceive": "will not receive the message.", "messageFailedToSendWillReceive": "will receive the message later.", + "messageWillNotBeSent": "File could not be sent due to connectivity issues.", + "messageWillNotBeSentDiscard": "Discard", "mlsToggleInfo": "When this is on, conversation will use the new messaging layer security (MLS) protocol.", "mlsToggleName": "MLS", "modalAccountCreateAction": "OK", diff --git a/src/i18n/vi-VN.json b/src/i18n/vi-VN.json index 107e5dc7175..7372d8f4cf6 100644 --- a/src/i18n/vi-VN.json +++ b/src/i18n/vi-VN.json @@ -662,6 +662,8 @@ "login.twoFactorLoginTitle": "Verify your account", "mediaBtnPause": "Pause", "mediaBtnPlay": "Play", + "messageCouldNotBeSent": "Message could not be sent due to connectivity issues.", + "messageCouldNotBeSentRetry": "Retry", "messageDetailsEdited": "Edited: {{edited}}", "messageDetailsNoLikes": "No one has liked this message yet.", "messageDetailsNoReceipts": "No one has read this message yet.", @@ -677,6 +679,8 @@ "messageFailedToSendToSome": "had issues receiving this message.", "messageFailedToSendWillNotReceive": "will not receive the message.", "messageFailedToSendWillReceive": "will receive the message later.", + "messageWillNotBeSent": "File could not be sent due to connectivity issues.", + "messageWillNotBeSentDiscard": "Discard", "mlsToggleInfo": "When this is on, conversation will use the new messaging layer security (MLS) protocol.", "mlsToggleName": "MLS", "modalAccountCreateAction": "OK", diff --git a/src/i18n/zh-CN.json b/src/i18n/zh-CN.json index 79ede701a7c..c2ed4240633 100644 --- a/src/i18n/zh-CN.json +++ b/src/i18n/zh-CN.json @@ -662,6 +662,8 @@ "login.twoFactorLoginTitle": "Verify your account", "mediaBtnPause": "Pause", "mediaBtnPlay": "Play", + "messageCouldNotBeSent": "Message could not be sent due to connectivity issues.", + "messageCouldNotBeSentRetry": "Retry", "messageDetailsEdited": "Edited: {{edited}}", "messageDetailsNoLikes": "没有人喜欢这个消息。", "messageDetailsNoReceipts": "No one has read this message yet.", @@ -677,6 +679,8 @@ "messageFailedToSendToSome": "had issues receiving this message.", "messageFailedToSendWillNotReceive": "will not receive the message.", "messageFailedToSendWillReceive": "will receive the message later.", + "messageWillNotBeSent": "File could not be sent due to connectivity issues.", + "messageWillNotBeSentDiscard": "Discard", "mlsToggleInfo": "When this is on, conversation will use the new messaging layer security (MLS) protocol.", "mlsToggleName": "MLS", "modalAccountCreateAction": "确定", diff --git a/src/i18n/zh-HK.json b/src/i18n/zh-HK.json index 107e5dc7175..7372d8f4cf6 100644 --- a/src/i18n/zh-HK.json +++ b/src/i18n/zh-HK.json @@ -662,6 +662,8 @@ "login.twoFactorLoginTitle": "Verify your account", "mediaBtnPause": "Pause", "mediaBtnPlay": "Play", + "messageCouldNotBeSent": "Message could not be sent due to connectivity issues.", + "messageCouldNotBeSentRetry": "Retry", "messageDetailsEdited": "Edited: {{edited}}", "messageDetailsNoLikes": "No one has liked this message yet.", "messageDetailsNoReceipts": "No one has read this message yet.", @@ -677,6 +679,8 @@ "messageFailedToSendToSome": "had issues receiving this message.", "messageFailedToSendWillNotReceive": "will not receive the message.", "messageFailedToSendWillReceive": "will receive the message later.", + "messageWillNotBeSent": "File could not be sent due to connectivity issues.", + "messageWillNotBeSentDiscard": "Discard", "mlsToggleInfo": "When this is on, conversation will use the new messaging layer security (MLS) protocol.", "mlsToggleName": "MLS", "modalAccountCreateAction": "OK", diff --git a/src/i18n/zh-TW.json b/src/i18n/zh-TW.json index e965e674cf9..94f35ceb468 100644 --- a/src/i18n/zh-TW.json +++ b/src/i18n/zh-TW.json @@ -662,6 +662,8 @@ "login.twoFactorLoginTitle": "Verify your account", "mediaBtnPause": "Pause", "mediaBtnPlay": "Play", + "messageCouldNotBeSent": "Message could not be sent due to connectivity issues.", + "messageCouldNotBeSentRetry": "Retry", "messageDetailsEdited": "Edited: {{edited}}", "messageDetailsNoLikes": "No one has liked this message yet.", "messageDetailsNoReceipts": "No one has read this message yet.", @@ -677,6 +679,8 @@ "messageFailedToSendToSome": "had issues receiving this message.", "messageFailedToSendWillNotReceive": "will not receive the message.", "messageFailedToSendWillReceive": "will receive the message later.", + "messageWillNotBeSent": "File could not be sent due to connectivity issues.", + "messageWillNotBeSentDiscard": "Discard", "mlsToggleInfo": "When this is on, conversation will use the new messaging layer security (MLS) protocol.", "mlsToggleName": "MLS", "modalAccountCreateAction": "確認", From b6876a8d8dc231bd1602c3c98244e12b18bf1e65 Mon Sep 17 00:00:00 2001 From: Thomas Belin Date: Tue, 14 Mar 2023 11:03:46 +0100 Subject: [PATCH 66/97] fix: Avoid failed request to get all clients of a conversation (#14828) --- package.json | 2 +- src/script/conversation/ConversationRepository.ts | 8 ++++---- yarn.lock | 10 +++++----- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 837b1dfd658..d6712720def 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "@emotion/react": "11.10.6", "@types/eslint": "8.4.10", "@wireapp/avs": "9.1.11", - "@wireapp/core": "39.2.0", + "@wireapp/core": "39.2.3", "@wireapp/lru-cache": "3.8.1", "@wireapp/react-ui-kit": "9.4.0", "@wireapp/store-engine-dexie": "2.0.5", diff --git a/src/script/conversation/ConversationRepository.ts b/src/script/conversation/ConversationRepository.ts index 158442ba9a8..31172c9ba42 100644 --- a/src/script/conversation/ConversationRepository.ts +++ b/src/script/conversation/ConversationRepository.ts @@ -1357,7 +1357,7 @@ export class ConversationRepository { * Needs to be done to receive the latest epoch and avoid epoch mismatch errors */ - const qualifiedUserIds = userEntities.map(userEntity => userEntity.qualifiedId); + const qualifiedUsers = userEntities.map(userEntity => userEntity.qualifiedId); const {qualifiedId: conversationId, groupId} = conversation; @@ -1366,7 +1366,7 @@ export class ConversationRepository { const {events} = await this.core.service!.conversation.addUsersToMLSConversation({ conversationId, groupId, - qualifiedUserIds, + qualifiedUsers, }); if (!!events.length) { events.forEach(event => this.eventRepository.injectEvent(event)); @@ -1374,7 +1374,7 @@ export class ConversationRepository { } else { const conversationMemberJoinEvent = await this.core.service!.conversation.addUsersToProteusConversation({ conversationId, - qualifiedUserIds, + qualifiedUsers, }); if (conversationMemberJoinEvent) { this.eventRepository.injectEvent(conversationMemberJoinEvent, EventRepository.SOURCE.BACKEND_RESPONSE); @@ -1382,7 +1382,7 @@ export class ConversationRepository { } } catch (error) { if (error) { - this.handleAddToConversationError(error as BackendClientError, conversation, qualifiedUserIds); + this.handleAddToConversationError(error as BackendClientError, conversation, qualifiedUsers); } } } diff --git a/yarn.lock b/yarn.lock index 7eb1e8bb97f..9f8a5ecf0bc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4247,9 +4247,9 @@ __metadata: languageName: node linkType: hard -"@wireapp/core@npm:39.2.0": - version: 39.2.0 - resolution: "@wireapp/core@npm:39.2.0" +"@wireapp/core@npm:39.2.3": + version: 39.2.3 + resolution: "@wireapp/core@npm:39.2.3" dependencies: "@wireapp/api-client": ^23.1.3 "@wireapp/commons": ^5.0.4 @@ -4268,7 +4268,7 @@ __metadata: logdown: 3.3.1 long: ^5.2.0 uuidjs: 4.2.13 - checksum: 676f98d206e643a67dc24bd3be8ae39f1949e1c944695c902f67c46f0b970fd8bd468d15373cbaa4846ea6343213c409d7eb5f6343904415c61ad85fecf3f8ba + checksum: 8cd6f57a11b6069f5d95fa9895050cee58e0a1dc27da3c9b50bc7def898520e62656e324dd25e5001b5bcaf4c19cad0c36a61b3aa3f485c1b941837f0a30f2c8 languageName: node linkType: hard @@ -16524,7 +16524,7 @@ dexie@latest: "@typescript-eslint/parser": ^5.54.1 "@wireapp/avs": 9.1.11 "@wireapp/copy-config": 2.0.10 - "@wireapp/core": 39.2.0 + "@wireapp/core": 39.2.3 "@wireapp/eslint-config": 2.1.1 "@wireapp/lru-cache": 3.8.1 "@wireapp/prettier-config": 0.5.2 From cdc6d82ee5fa608cf7aa3268c3c08388be9eb7e8 Mon Sep 17 00:00:00 2001 From: Amir Ghezelbash Date: Tue, 14 Mar 2023 14:59:04 +0330 Subject: [PATCH 67/97] feat: Design adjustments for classifiedBar (SQSERVICES-1733) (#14799) * feat: Design adjustments for classifiedBar (SQSERVICES-1733) * fix no handle * delete temp changes --- .../components/Modals/UserModal/UserModal.tsx | 13 ++++++++++++- .../components/calling/FullscreenVideoCall.tsx | 1 - src/script/components/input/ClassifiedBar.tsx | 1 + src/script/components/panel/UserDetails.tsx | 8 +++++++- .../ConversationDetails/ConversationDetails.tsx | 1 + 5 files changed, 21 insertions(+), 3 deletions(-) diff --git a/src/script/components/Modals/UserModal/UserModal.tsx b/src/script/components/Modals/UserModal/UserModal.tsx index 88e9fee5695..b65f35ca282 100644 --- a/src/script/components/Modals/UserModal/UserModal.tsx +++ b/src/script/components/Modals/UserModal/UserModal.tsx @@ -198,7 +198,18 @@ const UserModal: React.FC = ({
{user && ( <> - + diff --git a/src/script/components/calling/FullscreenVideoCall.tsx b/src/script/components/calling/FullscreenVideoCall.tsx index c96d1fb812b..7fe54179af2 100644 --- a/src/script/components/calling/FullscreenVideoCall.tsx +++ b/src/script/components/calling/FullscreenVideoCall.tsx @@ -215,7 +215,6 @@ const FullscreenVideoCall: React.FC = ({ style={{ lineHeight: '1.5em', margin: '1em 0', - padding: '0 1em', position: 'absolute', display: 'flex', right: 0, diff --git a/src/script/components/input/ClassifiedBar.tsx b/src/script/components/input/ClassifiedBar.tsx index 081846e7926..f0a23c1d993 100644 --- a/src/script/components/input/ClassifiedBar.tsx +++ b/src/script/components/input/ClassifiedBar.tsx @@ -43,6 +43,7 @@ const ClassifiedBar: React.FC = ({users, classifiedDomains, if (typeof classifiedDomains === 'undefined') { return null; } + const classified = isClassified(users, classifiedDomains); const text = classified ? t('conversationClassified') : t('conversationNotClassified'); diff --git a/src/script/components/panel/UserDetails.tsx b/src/script/components/panel/UserDetails.tsx index b45fa132179..b2681c3de31 100644 --- a/src/script/components/panel/UserDetails.tsx +++ b/src/script/components/panel/UserDetails.tsx @@ -19,6 +19,7 @@ import React, {useEffect} from 'react'; +import {CSSObject} from '@emotion/react'; import {amplify} from 'amplify'; import {WebAppEvents} from '@wireapp/webapp-events'; @@ -39,6 +40,8 @@ export interface UserDetailsProps { isSelfVerified: boolean; isVerified?: boolean; participant: User; + avatarStyles?: React.CSSProperties; + classifiedBarStyles?: CSSObject; } const UserDetails: React.FC = ({ @@ -46,7 +49,9 @@ const UserDetails: React.FC = ({ participant, isSelfVerified, isGroupAdmin, + avatarStyles, classifiedDomains, + classifiedBarStyles, }) => { const user = useKoSubscribableChildren(participant, [ 'inTeam', @@ -99,7 +104,7 @@ const UserDetails: React.FC = ({ )} @@ -108,6 +113,7 @@ const UserDetails: React.FC = ({ participant={participant} avatarSize={AVATAR_SIZE.X_LARGE} data-uie-name="status-profile-picture" + style={avatarStyles} /> {badge && ( diff --git a/src/script/page/RightSidebar/ConversationDetails/ConversationDetails.tsx b/src/script/page/RightSidebar/ConversationDetails/ConversationDetails.tsx index 92888f5babb..d67dbdd62f4 100644 --- a/src/script/page/RightSidebar/ConversationDetails/ConversationDetails.tsx +++ b/src/script/page/RightSidebar/ConversationDetails/ConversationDetails.tsx @@ -295,6 +295,7 @@ const ConversationDetails = forwardRef isSelfVerified={isSelfVerified} badge={teamRepository.getRoleBadge(firstParticipant.id)} classifiedDomains={classifiedDomains} + classifiedBarStyles={{marginTop: 16}} /> From e9f5a6cb7e669eef26f96c6233d4505f7010292f Mon Sep 17 00:00:00 2001 From: Thomas Belin Date: Tue, 14 Mar 2023 15:01:51 +0100 Subject: [PATCH 68/97] fix: Improve inViewport detection of replies (#14829) --- src/script/components/utils/InViewport.tsx | 1 - src/script/util/DOM/overlayedObserver.ts | 6 +++--- src/script/util/DOM/viewportObserver.ts | 23 ++++++---------------- 3 files changed, 9 insertions(+), 21 deletions(-) diff --git a/src/script/components/utils/InViewport.tsx b/src/script/components/utils/InViewport.tsx index f8cb0d36805..4a652b95642 100644 --- a/src/script/components/utils/InViewport.tsx +++ b/src/script/components/utils/InViewport.tsx @@ -68,7 +68,6 @@ const InViewport: React.FC> = inViewport = isInViewport; triggerCallbackIfVisible(); }, - element.parentElement || undefined, requireFullyInView, allowBiggerThanViewport, ); diff --git a/src/script/util/DOM/overlayedObserver.ts b/src/script/util/DOM/overlayedObserver.ts index 7aa038d8d14..2450d2073c6 100644 --- a/src/script/util/DOM/overlayedObserver.ts +++ b/src/script/util/DOM/overlayedObserver.ts @@ -26,7 +26,7 @@ interface OverlayElement { * Keeps track of elements that are overlayed by other elements (thus not visible on screen). */ const overlayedElements = new Map(); -let overlayCheckerInterval: number = undefined; +let overlayCheckerInterval: number | undefined = undefined; function checkOverlayedElements() { overlayedElements.forEach(({onVisible, onChange}, element) => { @@ -35,7 +35,7 @@ function checkOverlayedElements() { return onChange(isVisible); } if (isVisible) { - onVisible(); + onVisible?.(); removeElement(element); } }); @@ -54,7 +54,7 @@ const isOverlayed = (domElement: HTMLElement): boolean => { const middlePointX = (box.right + box.left) / 2; const middlePointY = (box.bottom + box.top) / 2; const elementAtPoint = document.elementFromPoint(middlePointX, middlePointY); - return elementAtPoint && domElement !== elementAtPoint && !domElement.contains(elementAtPoint); + return !!elementAtPoint && domElement !== elementAtPoint && !domElement.contains(elementAtPoint); }; const onElementVisible = (element: HTMLElement, onVisible: () => void) => { diff --git a/src/script/util/DOM/viewportObserver.ts b/src/script/util/DOM/viewportObserver.ts index ea299e19139..4cc12bda037 100644 --- a/src/script/util/DOM/viewportObserver.ts +++ b/src/script/util/DOM/viewportObserver.ts @@ -21,16 +21,9 @@ const observedElements = new Map(); const tolerance = 0.8; const onIntersect: IntersectionObserverCallback = entries => { - entries.forEach(({intersectionRatio, intersectionRect, isIntersecting, target: element, rootBounds}) => { - const {onVisible, onChange, requireFullyInView, container, allowBiggerThanViewport} = - observedElements.get(element) || {}; - const isFullyInView = () => { - if (container) { - const minHeight = Math.min(container.clientHeight, element.clientHeight) * tolerance; - return intersectionRect.height >= minHeight; - } - return intersectionRatio >= tolerance; - }; + entries.forEach(({intersectionRatio, isIntersecting, target: element, rootBounds}) => { + const {onVisible, onChange, requireFullyInView, allowBiggerThanViewport} = observedElements.get(element) || {}; + const isFullyInView = intersectionRatio >= tolerance; const isBiggerThanRoot = () => { return ( @@ -40,7 +33,7 @@ const onIntersect: IntersectionObserverCallback = entries => { ); }; - const isVisible = isIntersecting && (!requireFullyInView || isFullyInView() || isBiggerThanRoot()); + const isVisible = isIntersecting && (!requireFullyInView || isFullyInView || isBiggerThanRoot()); if (onChange) { onChange(isVisible); @@ -64,16 +57,14 @@ const observer = new IntersectionObserver(onIntersect, options); * @param onVisible the callback to call when the element appears * @param requireFullyInView should the element be fully in view * @param allowBiggerThanViewport should fire when element is bigger than viewport - * @param container the element containing the element */ const onElementInViewport = ( element: HTMLElement, onVisible: Function, requireFullyInView?: boolean, allowBiggerThanViewport?: boolean, - container?: HTMLElement, ): void => { - observedElements.set(element, {allowBiggerThanViewport, container, onVisible, requireFullyInView}); + observedElements.set(element, {allowBiggerThanViewport, onVisible, requireFullyInView}); return observer.observe(element); }; @@ -84,17 +75,15 @@ const onElementInViewport = ( * @param onChange the callback to call when the element intersects or not * @param requireFullyInView should the element be fully in view * @param allowBiggerThanViewport should fire when element is bigger than viewport - * @param container the element containing the element */ const trackElement = ( element: HTMLElement, onChange: Function, - container?: HTMLElement, requireFullyInView = false, allowBiggerThanViewport = false, ): void => { if (element) { - observedElements.set(element, {allowBiggerThanViewport, container, onChange, requireFullyInView}); + observedElements.set(element, {allowBiggerThanViewport, onChange, requireFullyInView}); return observer.observe(element); } }; From 312ac5a0324fbc00773d7830beb4a9a1c18cfa14 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 14 Mar 2023 16:19:14 +0000 Subject: [PATCH 69/97] chore(deps): Bump crowdin/github-action from 1.7.0 to 1.7.1 (#14830) Bumps [crowdin/github-action](https://github.com/crowdin/github-action) from 1.7.0 to 1.7.1. - [Release notes](https://github.com/crowdin/github-action/releases) - [Commits](https://github.com/crowdin/github-action/compare/v1.7.0...v1.7.1) --- updated-dependencies: - dependency-name: crowdin/github-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/sync_translations.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sync_translations.yml b/.github/workflows/sync_translations.yml index 686ac5a817c..c57d5b1d7b2 100644 --- a/.github/workflows/sync_translations.yml +++ b/.github/workflows/sync_translations.yml @@ -37,7 +37,7 @@ jobs: run: yarn translate:merge - name: Download translations - uses: crowdin/github-action@v1.7.0 + uses: crowdin/github-action@v1.7.1 env: GITHUB_TOKEN: ${{secrets.OTTO_THE_BOT_GH_TOKEN}} CROWDIN_PROJECT_ID: 342359 From fed6f122e53a79925224de7a31c39e62050d618c Mon Sep 17 00:00:00 2001 From: Thomas Belin Date: Wed, 15 Mar 2023 17:47:16 +0100 Subject: [PATCH 70/97] fix: Consider self user when computing classified domains (#14831) --- src/script/components/ConnectRequests/index.tsx | 4 +++- src/script/components/InputBar/InputBar.tsx | 4 +++- .../Message/ContentMessage/ContentMessage.tsx | 2 +- src/script/components/calling/CallingCell.tsx | 4 +++- .../components/calling/FullscreenVideoCall.tsx | 10 +++++----- .../conversation/ConversationRepository.ts | 2 +- src/script/conversation/MessageRepository.ts | 5 +++-- src/script/entity/Conversation.ts | 16 ++++++++-------- 8 files changed, 27 insertions(+), 20 deletions(-) diff --git a/src/script/components/ConnectRequests/index.tsx b/src/script/components/ConnectRequests/index.tsx index b9a50623183..e432016b2b1 100644 --- a/src/script/components/ConnectRequests/index.tsx +++ b/src/script/components/ConnectRequests/index.tsx @@ -121,7 +121,9 @@ const ConnectRequests: FC = ({
{connectRequest.handle}
- {classifiedDomains && } + {classifiedDomains && ( + + )} } {classifiedDomains && !isConnectionRequest && ( - + )} {isReplying && !isEditing && } diff --git a/src/script/components/MessagesList/Message/ContentMessage/ContentMessage.tsx b/src/script/components/MessagesList/Message/ContentMessage/ContentMessage.tsx index af35cbf93f0..1255c20e545 100644 --- a/src/script/components/MessagesList/Message/ContentMessage/ContentMessage.tsx +++ b/src/script/components/MessagesList/Message/ContentMessage/ContentMessage.tsx @@ -242,7 +242,7 @@ const ContentMessageComponent: React.FC = ({ ))} {failedToSend && ( - + )} {status === StatusType.FAILED && ( diff --git a/src/script/components/calling/CallingCell.tsx b/src/script/components/calling/CallingCell.tsx index a27dc81f941..907c9392ef6 100644 --- a/src/script/components/calling/CallingCell.tsx +++ b/src/script/components/calling/CallingCell.tsx @@ -106,12 +106,14 @@ const CallingCell: React.FC = ({ const { isGroup, participating_user_ets: userEts, + allUserEntities: allUsers, selfUser, display_name: conversationName, roles, } = useKoSubscribableChildren(conversation, [ 'isGroup', 'participating_user_ets', + 'allUserEntities', 'selfUser', 'display_name', 'roles', @@ -445,7 +447,7 @@ const CallingCell: React.FC = ({ ) )} - {classifiedDomains && } + {classifiedDomains && } {!isDeclined && ( <> diff --git a/src/script/components/calling/FullscreenVideoCall.tsx b/src/script/components/calling/FullscreenVideoCall.tsx index 7fe54179af2..c5da4e2dde2 100644 --- a/src/script/components/calling/FullscreenVideoCall.tsx +++ b/src/script/components/calling/FullscreenVideoCall.tsx @@ -117,10 +117,10 @@ const FullscreenVideoCall: React.FC = ({ startedAt, participants, } = useKoSubscribableChildren(call, ['activeSpeakers', 'currentPage', 'pages', 'startedAt', 'participants']); - const {display_name: conversationName, participating_user_ets: conversationParticipants} = useKoSubscribableChildren( - conversation, - ['display_name', 'participating_user_ets'], - ); + const {display_name: conversationName, allUserEntities: allUsers} = useKoSubscribableChildren(conversation, [ + 'display_name', + 'allUserEntities', + ]); const {isVideoCallingEnabled, classifiedDomains} = useKoSubscribableChildren(teamState, [ 'isVideoCallingEnabled', 'classifiedDomains', @@ -210,7 +210,7 @@ const FullscreenVideoCall: React.FC = ({ {classifiedDomains && ( user!.qualifiedId); + const userIds = options.targetedUsers || conversation.allUserEntities().map(user => user!.qualifiedId); const payload = MessageBuilder.buildDeleteMessage({ messageId: message.id, }); @@ -1170,7 +1170,8 @@ export class MessageRepository { // If we get a userId>client pairs, we just return those, no need to create recipients return recipients; } - const filteredUsers = conversation.allUserEntities + const filteredUsers = conversation + .allUserEntities() // filter possible undefined values .flatMap(user => (user ? [user] : [])) // if users are given by the caller, we filter to only keep those users diff --git a/src/script/entity/Conversation.ts b/src/script/entity/Conversation.ts index 0886787e5f9..6f2f52a9b6a 100644 --- a/src/script/entity/Conversation.ts +++ b/src/script/entity/Conversation.ts @@ -157,6 +157,7 @@ export class Conversation { public readonly notificationState: ko.PureComputed; public readonly participating_user_ets: ko.ObservableArray; public readonly participating_user_ids: ko.ObservableArray; + public readonly allUserEntities: ko.PureComputed; public readonly receiptMode: ko.Observable; public readonly removed_from_conversation: ko.PureComputed; public readonly roles: ko.Observable>; @@ -213,6 +214,11 @@ export class Conversation { this.participating_user_ets = ko.observableArray([]); // Does not include self user this.participating_user_ids = ko.observableArray([]); // Does not include self user + this.allUserEntities = ko.pureComputed(() => { + const selfUser = this.selfUser(); + const selfUserArray = selfUser ? [selfUser] : []; + return selfUserArray.concat(this.participating_user_ets()); + }); this.selfUser = ko.observable(); this.roles = ko.observable({}); @@ -323,14 +329,14 @@ export class Conversation { return undefined; } - return this.allUserEntities.every(userEntity => userEntity.is_verified()); + return this.allUserEntities().every(userEntity => userEntity.is_verified()); }); this.legalHoldStatus = ko.observable(LegalHoldStatus.DISABLED); this.hasLegalHold = ko.computed(() => { const isInitialized = this.hasInitializedUsers(); - const hasLegalHold = isInitialized && this.allUserEntities.some(userEntity => userEntity.isOnLegalHold()); + const hasLegalHold = isInitialized && this.allUserEntities().some(userEntity => userEntity.isOnLegalHold()); if (isInitialized) { this.legalHoldStatus(hasLegalHold ? LegalHoldStatus.ENABLED : LegalHoldStatus.DISABLED); @@ -576,12 +582,6 @@ export class Conversation { ].forEach(property => (property as ko.Observable).subscribe(this.persistState)); } - get allUserEntities() { - const selfUser = this.selfUser(); - const selfUserArray = selfUser ? [selfUser] : []; - return selfUserArray.concat(this.participating_user_ets()); - } - readonly persistState = (): void => { if (this.shouldPersistStateChanges) { this.publishPersistState(); From a9db1c22cfbd3aa2a248a79e945dc364878e0b99 Mon Sep 17 00:00:00 2001 From: Thomas Belin Date: Thu, 16 Mar 2023 12:07:25 +0100 Subject: [PATCH 71/97] fix: Avoid coreCrypto prekeys id collisions [FS-1600] (#14833) --- package.json | 2 +- yarn.lock | 30 +++++++++++++++--------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/package.json b/package.json index d6712720def..24add6cfaf7 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "@emotion/react": "11.10.6", "@types/eslint": "8.4.10", "@wireapp/avs": "9.1.11", - "@wireapp/core": "39.2.3", + "@wireapp/core": "39.2.6", "@wireapp/lru-cache": "3.8.1", "@wireapp/react-ui-kit": "9.4.0", "@wireapp/store-engine-dexie": "2.0.5", diff --git a/yarn.lock b/yarn.lock index 9f8a5ecf0bc..70db89cd974 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4179,9 +4179,9 @@ __metadata: languageName: node linkType: hard -"@wireapp/api-client@npm:^23.1.3": - version: 23.1.3 - resolution: "@wireapp/api-client@npm:23.1.3" +"@wireapp/api-client@npm:^23.2.1": + version: 23.2.1 + resolution: "@wireapp/api-client@npm:23.2.1" dependencies: "@wireapp/commons": ^5.0.4 "@wireapp/priority-queue": ^2.0.3 @@ -4194,7 +4194,7 @@ __metadata: spark-md5: 3.0.2 tough-cookie: 4.1.2 ws: 8.11.0 - checksum: 40acaffdddb20e81613cb70555f434855cb5a59936df1209e4c182453f4e59c80fb1b2b38400262e046a35b470e60d11aad332605820d236d060a4301b6b30a7 + checksum: aeddbbe94001c23415de215b08b8cd3e61ce2dbd9887b44e13ec82782b1625d078af91b65025393ac6b8d00c714e8a65251d8e45ced39f42bb61f8071372abfb languageName: node linkType: hard @@ -4240,20 +4240,20 @@ __metadata: languageName: node linkType: hard -"@wireapp/core-crypto@npm:0.6.2": - version: 0.6.2 - resolution: "@wireapp/core-crypto@npm:0.6.2" - checksum: 0bdf7f60b2a913954b6f5a70a364aea4768a310be5e9a62dc35d2255c2dbb0b3e1634e945744cb621b1ab66989397b722c87f583c047d1d3e1be3c843557fb56 +"@wireapp/core-crypto@npm:0.7.0-rc.3": + version: 0.7.0-rc.3 + resolution: "@wireapp/core-crypto@npm:0.7.0-rc.3" + checksum: 76b70a66d094117f44dcffb05ac850333825a0acbf63e483c5e7cb50ca322f6295b0444adbb64d135d7b4cf7aaf25f1051e03c64732d8aa947d607d73f03d2a5 languageName: node linkType: hard -"@wireapp/core@npm:39.2.3": - version: 39.2.3 - resolution: "@wireapp/core@npm:39.2.3" +"@wireapp/core@npm:39.2.6": + version: 39.2.6 + resolution: "@wireapp/core@npm:39.2.6" dependencies: - "@wireapp/api-client": ^23.1.3 + "@wireapp/api-client": ^23.2.1 "@wireapp/commons": ^5.0.4 - "@wireapp/core-crypto": 0.6.2 + "@wireapp/core-crypto": 0.7.0-rc.3 "@wireapp/cryptobox": 12.8.0 "@wireapp/promise-queue": ^2.1.1 "@wireapp/protocol-messaging": 1.44.0 @@ -4268,7 +4268,7 @@ __metadata: logdown: 3.3.1 long: ^5.2.0 uuidjs: 4.2.13 - checksum: 8cd6f57a11b6069f5d95fa9895050cee58e0a1dc27da3c9b50bc7def898520e62656e324dd25e5001b5bcaf4c19cad0c36a61b3aa3f485c1b941837f0a30f2c8 + checksum: 239c3d0f25715bbf55eb9aa6a908df3d774d6485d13ad811e0ab67a571a4ba26c94e01c190cb68aa1c314914121b67ca24a0e29a070e5e5c917c043b77be6690 languageName: node linkType: hard @@ -16524,7 +16524,7 @@ dexie@latest: "@typescript-eslint/parser": ^5.54.1 "@wireapp/avs": 9.1.11 "@wireapp/copy-config": 2.0.10 - "@wireapp/core": 39.2.3 + "@wireapp/core": 39.2.6 "@wireapp/eslint-config": 2.1.1 "@wireapp/lru-cache": 3.8.1 "@wireapp/prettier-config": 0.5.2 From 4323ba2cd9d6e9bee3cba690e816e5aefcf1f2ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patryk=20G=C3=B3rka?= Date: Thu, 16 Mar 2023 13:10:19 +0100 Subject: [PATCH 72/97] runfix: stop enforcing cc auth rules clientside (#14834) * runfix: stop enforcing authorize rule on clientside * chore: bump core --- package.json | 2 +- src/script/mls/MLSConversations.ts | 14 ++------------ yarn.lock | 10 +++++----- 3 files changed, 8 insertions(+), 18 deletions(-) diff --git a/package.json b/package.json index 24add6cfaf7..7c34bfcbd68 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "@emotion/react": "11.10.6", "@types/eslint": "8.4.10", "@wireapp/avs": "9.1.11", - "@wireapp/core": "39.2.6", + "@wireapp/core": "39.2.7", "@wireapp/lru-cache": "3.8.1", "@wireapp/react-ui-kit": "9.4.0", "@wireapp/store-engine-dexie": "2.0.5", diff --git a/src/script/mls/MLSConversations.ts b/src/script/mls/MLSConversations.ts index 524f53bc65b..049bba0ed47 100644 --- a/src/script/mls/MLSConversations.ts +++ b/src/script/mls/MLSConversations.ts @@ -19,8 +19,6 @@ import {Account} from '@wireapp/core'; -import {arrayToBase64} from 'Util/util'; - import {useMLSConversationState} from './mlsConversationState'; import {ConversationRepository} from '../conversation/ConversationRepository'; @@ -45,20 +43,12 @@ export async function initMLSConversations( conversationRepository: MLSConversationRepository, ): Promise { core.configureMLSCallbacks({ - authorize: async groupIdBytes => { - const groupId = arrayToBase64(groupIdBytes); - const conversation = conversationRepository.findConversationByGroupId(groupId); - if (!conversation) { - // If the conversation is not found, it means it's being created by the self user, thus they have admin rights - return true; - } - return conversationRepository.conversationRoleRepository.isUserGroupAdmin(conversation, selfUser); - }, groupIdFromConversationId: async conversationId => { const conversation = await conversationRepository.getConversationById(conversationId); return conversation?.groupId; }, - // This is enforced by backend, no need to implement this on the client side. + // These rules are enforced by backend, no need to implement them on the client side. + authorize: async () => true, userAuthorize: async () => true, }); diff --git a/yarn.lock b/yarn.lock index 70db89cd974..5c5a802d3e7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4247,9 +4247,9 @@ __metadata: languageName: node linkType: hard -"@wireapp/core@npm:39.2.6": - version: 39.2.6 - resolution: "@wireapp/core@npm:39.2.6" +"@wireapp/core@npm:39.2.7": + version: 39.2.7 + resolution: "@wireapp/core@npm:39.2.7" dependencies: "@wireapp/api-client": ^23.2.1 "@wireapp/commons": ^5.0.4 @@ -4268,7 +4268,7 @@ __metadata: logdown: 3.3.1 long: ^5.2.0 uuidjs: 4.2.13 - checksum: 239c3d0f25715bbf55eb9aa6a908df3d774d6485d13ad811e0ab67a571a4ba26c94e01c190cb68aa1c314914121b67ca24a0e29a070e5e5c917c043b77be6690 + checksum: 19098878b11465db1eca697b7ca8ead129fc76d1e4281e86ed0687ec83826c54bebbcb6d6e71c4426006f23863b2c1e5667ddb4c453f4fdafe120ed626db1152 languageName: node linkType: hard @@ -16524,7 +16524,7 @@ dexie@latest: "@typescript-eslint/parser": ^5.54.1 "@wireapp/avs": 9.1.11 "@wireapp/copy-config": 2.0.10 - "@wireapp/core": 39.2.6 + "@wireapp/core": 39.2.7 "@wireapp/eslint-config": 2.1.1 "@wireapp/lru-cache": 3.8.1 "@wireapp/prettier-config": 0.5.2 From 6c6dfa2333dae99c60f78854e35d462b1ab6ba0b Mon Sep 17 00:00:00 2001 From: Thomas Belin Date: Thu, 16 Mar 2023 15:40:52 +0100 Subject: [PATCH 73/97] fix: Filter people in the conversation from the Add Participant list (#14835) --- src/script/components/UserSearchableList.tsx | 8 +++++++- .../AddParticipants/AddParticipants.tsx | 13 ++++--------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/script/components/UserSearchableList.tsx b/src/script/components/UserSearchableList.tsx index 2d6460495fd..75ff116dc0e 100644 --- a/src/script/components/UserSearchableList.tsx +++ b/src/script/components/UserSearchableList.tsx @@ -19,12 +19,14 @@ import React, {useCallback, useEffect, useState} from 'react'; +import {QualifiedId} from '@wireapp/api-client/lib/user'; import {container} from 'tsyringe'; import {debounce} from 'underscore'; import {partition} from 'Util/ArrayUtil'; import {useKoSubscribableChildren} from 'Util/ComponentUtil'; import {t} from 'Util/LocalizerUtil'; +import {matchQualifiedIds} from 'Util/QualifiedId'; import {sortByPriority} from 'Util/StringUtil'; import {UserList} from './UserList'; @@ -51,6 +53,8 @@ export type UserListProps = React.ComponentProps & { truncate?: boolean; userState?: UserState; dataUieName?: string; + /* will prevent showing those users in the list */ + excludeUsers?: QualifiedId[]; }; const UserSearchableList: React.FC = ({ @@ -150,7 +154,9 @@ const UserSearchableList: React.FC = ({ } : undefined; - const userList = foundUserEntities(); + const userList = foundUserEntities().filter( + user => !props.excludeUsers?.some(excludeId => matchQualifiedIds(user.qualifiedId, excludeId)), + ); const isEmptyUserList = userList.length === 0; const hasUsers = users.length === 0; const noResultsDataUieName = hasUsers ? 'status-all-added' : 'status-no-matches'; diff --git a/src/script/page/RightSidebar/AddParticipants/AddParticipants.tsx b/src/script/page/RightSidebar/AddParticipants/AddParticipants.tsx index 54b173d0a01..e6633080265 100644 --- a/src/script/page/RightSidebar/AddParticipants/AddParticipants.tsx +++ b/src/script/page/RightSidebar/AddParticipants/AddParticipants.tsx @@ -32,7 +32,6 @@ import {UserSearchableList} from 'Components/UserSearchableList'; import {useKoSubscribableChildren} from 'Util/ComponentUtil'; import {handleKeyDown} from 'Util/KeyboardUtil'; import {t} from 'Util/LocalizerUtil'; -import {matchQualifiedIds} from 'Util/QualifiedId'; import {safeWindowOpen} from 'Util/SanitizationUtil'; import {sortUsersByPriority} from 'Util/StringUtil'; @@ -115,17 +114,12 @@ const AddParticipants: FC = ({ const [isInitialServiceSearch, setIsInitialServiceSearch] = useState(true); const contacts = useMemo(() => { - let users: User[] = []; - if (isTeam) { const isTeamOrServices = isTeamOnly || isServicesRoom; - users = isTeamOrServices ? teamMembers.sort(sortUsersByPriority) : teamUsers; - } else { - users = connectedUsers; + return isTeamOrServices ? teamMembers.sort(sortUsersByPriority) : teamUsers; } - - return users.filter(userEntity => !participatingUserIds.find(userId => matchQualifiedIds(userEntity, userId))); - }, [connectedUsers, isServicesRoom, isTeam, isTeamOnly, participatingUserIds, teamMembers, teamUsers]); + return connectedUsers; + }, [connectedUsers, isServicesRoom, isTeam, isTeamOnly, teamMembers, teamUsers]); const enabledAddAction = selectedContacts.length > ENABLE_ADD_ACTIONS_LENGTH; @@ -240,6 +234,7 @@ const AddParticipants: FC = ({ searchRepository={searchRepository} teamRepository={teamRepository} conversationRepository={conversationRepository} + excludeUsers={participatingUserIds} isSelectable /> )} From 93b1ff90acc2b8b8e6c6b4d0a4fdaa0e42305381 Mon Sep 17 00:00:00 2001 From: Thomas Belin Date: Thu, 16 Mar 2023 19:26:55 +0100 Subject: [PATCH 74/97] fix: Let calling message update the event timestamp when before a deleted message (#14838) --- src/script/conversation/MessageRepository.ts | 5 +++-- src/script/entity/Conversation.ts | 5 ++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/script/conversation/MessageRepository.ts b/src/script/conversation/MessageRepository.ts index 50c816e72f0..ab12ff2898d 100644 --- a/src/script/conversation/MessageRepository.ts +++ b/src/script/conversation/MessageRepository.ts @@ -1053,11 +1053,12 @@ export class MessageRepository { conversationEntity.isShowingLastReceivedMessage() && conversationEntity.getNewestMessage()?.id === messageId; const deleteCount = await this.eventService.deleteEvent(conversationEntity.id, messageId); + const previousMessage = conversationEntity.getNewestMessage(); amplify.publish(WebAppEvents.CONVERSATION.MESSAGE.REMOVED, messageId, conversationEntity.id); - if (isLastDeleted && conversationEntity.getNewestMessage()?.timestamp()) { - conversationEntity.updateTimestamps(conversationEntity.getNewestMessage(), true); + if (isLastDeleted && previousMessage?.timestamp()) { + conversationEntity.updateTimestamps(previousMessage, true); } return deleteCount; diff --git a/src/script/entity/Conversation.ts b/src/script/entity/Conversation.ts index 6f2f52a9b6a..20ef7f06e7c 100644 --- a/src/script/entity/Conversation.ts +++ b/src/script/entity/Conversation.ts @@ -892,7 +892,10 @@ export class Conversation { if (message_et) { const timestamp = message_et.timestamp(); if (timestamp <= this.last_server_timestamp()) { - if (message_et.timestamp_affects_order()) { + // Some message do not bubble the conversation up in the conversation list (call messages for example or some system messages). + // Those should not update the conversation timestamp. + // This is ignored if the `forceUpdate` flag is set. + if (message_et.timestamp_affects_order() || forceUpdate) { this.setTimestamp(timestamp, TIMESTAMP_TYPE.LAST_EVENT, forceUpdate); const from_self = message_et.user()?.isMe; From 198c6c9fa37e5729d4fbdff30de4aa02eb9e7816 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 19 Mar 2023 16:03:06 +0000 Subject: [PATCH 75/97] chore(deps): Bump pm2 from 5.2.2 to 5.3.0 in /server (#14841) Bumps [pm2](https://github.com/Unitech/pm2) from 5.2.2 to 5.3.0. - [Release notes](https://github.com/Unitech/pm2/releases) - [Changelog](https://github.com/Unitech/pm2/blob/master/CHANGELOG.md) - [Commits](https://github.com/Unitech/pm2/compare/5.2.2...5.3.0) --- updated-dependencies: - dependency-name: pm2 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- server/package.json | 2 +- server/yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/server/package.json b/server/package.json index 84e496c514f..df9d8a56d55 100644 --- a/server/package.json +++ b/server/package.json @@ -19,7 +19,7 @@ "maxmind": "4.3.8", "nocache": "3.0.4", "opn": "6.0.0", - "pm2": "5.2.2" + "pm2": "5.3.0" }, "devDependencies": { "@types/express": "4.17.17", diff --git a/server/yarn.lock b/server/yarn.lock index b7e5c592531..a9b0d3cf2b1 100644 --- a/server/yarn.lock +++ b/server/yarn.lock @@ -4614,9 +4614,9 @@ __metadata: languageName: node linkType: hard -"pm2@npm:5.2.2": - version: 5.2.2 - resolution: "pm2@npm:5.2.2" +"pm2@npm:5.3.0": + version: 5.3.0 + resolution: "pm2@npm:5.3.0" dependencies: "@pm2/agent": ~2.0.0 "@pm2/io": ~5.0.0 @@ -4656,7 +4656,7 @@ __metadata: pm2-dev: bin/pm2-dev pm2-docker: bin/pm2-docker pm2-runtime: bin/pm2-runtime - checksum: 091213dc7fc220b814e91dea35525f6b37f3d27081345be82b42873c605055f339bec67287ab70a3d41c62fe2d3edbd58722f4b2c4aa5a3d5479d5e4900b0057 + checksum: ca1a655ab11b8aa8f7c10098578e7f0ed508fb19fae02694c5478f4167a75cb150eb2c305d734b7420696b70193bb765ffbbca498d2ce427f85ae9d25ef19842 languageName: node linkType: hard @@ -5667,7 +5667,7 @@ __metadata: maxmind: 4.3.8 nocache: 3.0.4 opn: 6.0.0 - pm2: 5.2.2 + pm2: 5.3.0 rimraf: 4.4.0 typescript: 4.9.5 languageName: unknown From bbc056fc11edb1372c5abc711b6646b29ec59704 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 19 Mar 2023 16:03:22 +0000 Subject: [PATCH 76/97] chore(deps-dev): Bump @types/jest from 29.4.0 to 29.5.0 in /server (#14843) Bumps [@types/jest](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/jest) from 29.4.0 to 29.5.0. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/jest) --- updated-dependencies: - dependency-name: "@types/jest" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- server/package.json | 2 +- server/yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/server/package.json b/server/package.json index df9d8a56d55..35c0c4618fe 100644 --- a/server/package.json +++ b/server/package.json @@ -28,7 +28,7 @@ "@types/fs-extra": "11.0.1", "@types/geolite2": "2.0.0", "@types/hbs": "4.0.1", - "@types/jest": "^29.4.0", + "@types/jest": "^29.5.0", "@types/node": "18.11.18", "jest": "29.5.0", "rimraf": "4.4.0", diff --git a/server/yarn.lock b/server/yarn.lock index a9b0d3cf2b1..20f86db09e3 100644 --- a/server/yarn.lock +++ b/server/yarn.lock @@ -1079,13 +1079,13 @@ __metadata: languageName: node linkType: hard -"@types/jest@npm:^29.4.0": - version: 29.4.0 - resolution: "@types/jest@npm:29.4.0" +"@types/jest@npm:^29.5.0": + version: 29.5.0 + resolution: "@types/jest@npm:29.5.0" dependencies: expect: ^29.0.0 pretty-format: ^29.0.0 - checksum: 23760282362a252e6690314584d83a47512d4cd61663e957ed3398ecf98195fe931c45606ee2f9def12f8ed7d8aa102d492ec42d26facdaf8b78094a31e6568e + checksum: cd877e5c56d299cceb8bfdcbb1a77723c706750dd3c3bc47403bc3599b8faff590a3b009c68bb5b11bf7a8c77d1fb01de5e124329b4a08e65f1cdda28b0ecdb8 languageName: node linkType: hard @@ -5649,7 +5649,7 @@ __metadata: "@types/fs-extra": 11.0.1 "@types/geolite2": 2.0.0 "@types/hbs": 4.0.1 - "@types/jest": ^29.4.0 + "@types/jest": ^29.5.0 "@types/node": 18.11.18 "@wireapp/commons": 5.0.4 dotenv: 16.0.3 From bcaf0afa8235ea31166946745188c1aab0fd17be Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 19 Mar 2023 16:03:47 +0000 Subject: [PATCH 77/97] chore(deps-dev): Bump @types/jest from 29.4.0 to 29.5.0 (#14842) Bumps [@types/jest](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/jest) from 29.4.0 to 29.5.0. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/jest) --- updated-dependencies: - dependency-name: "@types/jest" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 7c34bfcbd68..44fe1e0a7e5 100644 --- a/package.json +++ b/package.json @@ -68,7 +68,7 @@ "@types/fs-extra": "11.0.1", "@types/generate-changelog": "1.8.1", "@types/highlight.js": "10.1.0", - "@types/jest": "29.4.0", + "@types/jest": "29.5.0", "@types/jquery": "^3", "@types/js-cookie": "3.0.3", "@types/jsdom": "21.1.0", diff --git a/yarn.lock b/yarn.lock index 5c5a802d3e7..33458da9f4c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3421,13 +3421,13 @@ __metadata: languageName: node linkType: hard -"@types/jest@npm:29.4.0": - version: 29.4.0 - resolution: "@types/jest@npm:29.4.0" +"@types/jest@npm:29.5.0": + version: 29.5.0 + resolution: "@types/jest@npm:29.5.0" dependencies: expect: ^29.0.0 pretty-format: ^29.0.0 - checksum: 23760282362a252e6690314584d83a47512d4cd61663e957ed3398ecf98195fe931c45606ee2f9def12f8ed7d8aa102d492ec42d26facdaf8b78094a31e6568e + checksum: cd877e5c56d299cceb8bfdcbb1a77723c706750dd3c3bc47403bc3599b8faff590a3b009c68bb5b11bf7a8c77d1fb01de5e124329b4a08e65f1cdda28b0ecdb8 languageName: node linkType: hard @@ -16497,7 +16497,7 @@ dexie@latest: "@types/fs-extra": 11.0.1 "@types/generate-changelog": 1.8.1 "@types/highlight.js": 10.1.0 - "@types/jest": 29.4.0 + "@types/jest": 29.5.0 "@types/jquery": ^3 "@types/js-cookie": 3.0.3 "@types/jsdom": 21.1.0 From 1852aea5326a9a1b9a61ec9ef16530acfc443667 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 19 Mar 2023 16:06:33 +0000 Subject: [PATCH 78/97] chore(deps-dev): Bump cspell from 6.29.0 to 6.30.2 (#14845) Bumps [cspell](https://github.com/streetsidesoftware/cspell) from 6.29.0 to 6.30.2. - [Release notes](https://github.com/streetsidesoftware/cspell/releases) - [Changelog](https://github.com/streetsidesoftware/cspell/blob/main/CHANGELOG.md) - [Commits](https://github.com/streetsidesoftware/cspell/compare/v6.29.0...v6.30.2) --- updated-dependencies: - dependency-name: cspell dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 288 +++++++++++++++++++++++++++------------------------ 2 files changed, 151 insertions(+), 139 deletions(-) diff --git a/package.json b/package.json index 44fe1e0a7e5..522b6ea8705 100644 --- a/package.json +++ b/package.json @@ -103,7 +103,7 @@ "babel-loader": "9.1.2", "caniuse-lite": "^1.0.30001464", "cross-env": "7.0.3", - "cspell": "6.29.0", + "cspell": "6.30.2", "css-loader": "^6.7.3", "cssnano": "^5.1.14", "dexie": "3.2.3", diff --git a/yarn.lock b/yarn.lock index 33458da9f4c..727bfdb118c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1450,78 +1450,78 @@ __metadata: languageName: node linkType: hard -"@cspell/cspell-bundled-dicts@npm:6.29.0": - version: 6.29.0 - resolution: "@cspell/cspell-bundled-dicts@npm:6.29.0" +"@cspell/cspell-bundled-dicts@npm:6.30.2": + version: 6.30.2 + resolution: "@cspell/cspell-bundled-dicts@npm:6.30.2" dependencies: "@cspell/dict-ada": ^4.0.1 "@cspell/dict-aws": ^3.0.0 "@cspell/dict-bash": ^4.1.1 "@cspell/dict-companies": ^3.0.9 - "@cspell/dict-cpp": ^4.0.3 + "@cspell/dict-cpp": ^5.0.2 "@cspell/dict-cryptocurrencies": ^3.0.1 "@cspell/dict-csharp": ^4.0.2 "@cspell/dict-css": ^4.0.5 "@cspell/dict-dart": ^2.0.2 "@cspell/dict-django": ^4.0.2 "@cspell/dict-docker": ^1.1.6 - "@cspell/dict-dotnet": ^4.0.2 + "@cspell/dict-dotnet": ^5.0.0 "@cspell/dict-elixir": ^4.0.2 "@cspell/dict-en-common-misspellings": ^1.0.2 "@cspell/dict-en-gb": 1.1.33 - "@cspell/dict-en_us": ^4.3.0 + "@cspell/dict-en_us": ^4.3.1 "@cspell/dict-filetypes": ^3.0.0 "@cspell/dict-fonts": ^3.0.1 "@cspell/dict-fullstack": ^3.1.4 "@cspell/dict-gaming-terms": ^1.0.4 "@cspell/dict-git": ^2.0.0 - "@cspell/dict-golang": ^5.0.2 + "@cspell/dict-golang": ^6.0.1 "@cspell/dict-haskell": ^4.0.1 "@cspell/dict-html": ^4.0.3 "@cspell/dict-html-symbol-entities": ^4.0.0 "@cspell/dict-java": ^5.0.5 "@cspell/dict-k8s": ^1.0.1 - "@cspell/dict-latex": ^3.1.0 + "@cspell/dict-latex": ^4.0.0 "@cspell/dict-lorem-ipsum": ^3.0.0 "@cspell/dict-lua": ^4.0.1 "@cspell/dict-node": ^4.0.2 "@cspell/dict-npm": ^5.0.5 - "@cspell/dict-php": ^3.0.4 - "@cspell/dict-powershell": ^4.0.2 - "@cspell/dict-public-licenses": ^2.0.1 + "@cspell/dict-php": ^4.0.1 + "@cspell/dict-powershell": ^5.0.1 + "@cspell/dict-public-licenses": ^2.0.2 "@cspell/dict-python": ^4.0.2 "@cspell/dict-r": ^2.0.1 - "@cspell/dict-ruby": ^4.0.2 + "@cspell/dict-ruby": ^5.0.0 "@cspell/dict-rust": ^4.0.1 - "@cspell/dict-scala": ^4.0.1 + "@cspell/dict-scala": ^5.0.0 "@cspell/dict-software-terms": ^3.1.5 "@cspell/dict-sql": ^2.1.0 "@cspell/dict-svelte": ^1.0.2 "@cspell/dict-swift": ^2.0.1 "@cspell/dict-typescript": ^3.1.1 "@cspell/dict-vue": ^3.0.0 - checksum: 54334e514d72a922064b1af4455c291499dde908fab6beccccef8ccf3670a47907557f67ab4874e8882750a62336a50aa562f8df86a86d3b7a5adca7cc4965b4 + checksum: 5abc82358bbaa4bb8a7dae19ee25c39f296ccad9b291d99520ae2a51ff1bb4141f030ff8b5a2bc90e34127f5e281a030d225e746028f4e353b1ebadabd5c23b4 languageName: node linkType: hard -"@cspell/cspell-pipe@npm:6.29.0": - version: 6.29.0 - resolution: "@cspell/cspell-pipe@npm:6.29.0" - checksum: d44dab891759320d93199d147c04798f5fe85d39668b5113f661ea29b601e4268451e465b219975038e2f33b83e033e40b2500b4ca5100f1da106b3b79c8c9e7 +"@cspell/cspell-pipe@npm:6.30.2": + version: 6.30.2 + resolution: "@cspell/cspell-pipe@npm:6.30.2" + checksum: eef05ad52500789bc95e167ea3d25d470f59f57bba8e9c1900799cc9acddff1dabe0b6ae07c0cd5ac3a4a15fa8bbec68fa8b3fe845919ed3c436064ab7a4c925 languageName: node linkType: hard -"@cspell/cspell-service-bus@npm:6.29.0": - version: 6.29.0 - resolution: "@cspell/cspell-service-bus@npm:6.29.0" - checksum: 86c45ca2875def4e41783653f394bc151f21eab91855785c938dcb1adc68f797ad4633a5f88e65d2ab058561563380cccd38e50b5c5bbd586d4d0192d705795e +"@cspell/cspell-service-bus@npm:6.30.2": + version: 6.30.2 + resolution: "@cspell/cspell-service-bus@npm:6.30.2" + checksum: 2c933b7e1f0f003668e64b980e403914d30b22f3899aaff8458dacf43371ba3ef022e24efc0c235a89b9a3627b5fbbf01587890f5d580705f431e2b45e7310fb languageName: node linkType: hard -"@cspell/cspell-types@npm:6.29.0": - version: 6.29.0 - resolution: "@cspell/cspell-types@npm:6.29.0" - checksum: 346112da605c2221d7bd2b44d053fee24596ed002f4e5f8518ae960dfff0da8bcfe020c6a9e5a7469929a2db418cb0b380379ecbca2ce037d8016f90fbf4f91b +"@cspell/cspell-types@npm:6.30.2": + version: 6.30.2 + resolution: "@cspell/cspell-types@npm:6.30.2" + checksum: a41d2e59ac0b212cbdd74c135915bb7a6f43bc9146f22654684bcb49c1a9effcf42c44305d631d4e17282e199a31950494b64041eded607f5d39e87b825a25e7 languageName: node linkType: hard @@ -1553,10 +1553,10 @@ __metadata: languageName: node linkType: hard -"@cspell/dict-cpp@npm:^4.0.3": - version: 4.0.3 - resolution: "@cspell/dict-cpp@npm:4.0.3" - checksum: 49634b5eaa8b8b347e014fbc823cf8802ed5ae6e0b028ac360ddd2369a15c511692c4ff829118021ba5a60834fea461e35e4547d42e7e6f2269801557db4360b +"@cspell/dict-cpp@npm:^5.0.2": + version: 5.0.2 + resolution: "@cspell/dict-cpp@npm:5.0.2" + checksum: 6483cea117b1a8313c67d6be5211c490347f36a926d9b2c402740ddd2c15a395e9ba5bd09d038fe9355dd58eafb2f48d0d74658a86accb2ad1d177e0ccc326ab languageName: node linkType: hard @@ -1602,10 +1602,10 @@ __metadata: languageName: node linkType: hard -"@cspell/dict-dotnet@npm:^4.0.2": - version: 4.0.2 - resolution: "@cspell/dict-dotnet@npm:4.0.2" - checksum: 7a4f5d8f7070332e5cd36affbf73bca07371963f1a83afebd1c827cbcc41d38c96dcf2ba0404d12ebb16277fa44140967c2c8a5d2ae176b13a15bca81a81474d +"@cspell/dict-dotnet@npm:^5.0.0": + version: 5.0.0 + resolution: "@cspell/dict-dotnet@npm:5.0.0" + checksum: 3e55abd3cc0ecb0924caa245b83595c8e90b42a8fb438f3294d06ad32d30f3235dc8943a2865f06eaec5285a8d6a7df1db71fb228753d56a678a0f0cff87c24c languageName: node linkType: hard @@ -1630,10 +1630,10 @@ __metadata: languageName: node linkType: hard -"@cspell/dict-en_us@npm:^4.3.0": - version: 4.3.0 - resolution: "@cspell/dict-en_us@npm:4.3.0" - checksum: 421253a02a6ab39365825422467a118a614d9e190077471fdcd449d32ec4ee518419e406e3069a6372411be84e252111ce48985d348d1c23d16aaed736335b27 +"@cspell/dict-en_us@npm:^4.3.1": + version: 4.3.1 + resolution: "@cspell/dict-en_us@npm:4.3.1" + checksum: 15da93ff9a8248c89c96a08c3935f0e2b347461612f9609e906f2d7ff89ff180ad69dc64cea8afb9e861e69e11854e8fc4fd07ad643f7eb469b20c20f1ebc9c0 languageName: node linkType: hard @@ -1672,10 +1672,10 @@ __metadata: languageName: node linkType: hard -"@cspell/dict-golang@npm:^5.0.2": - version: 5.0.2 - resolution: "@cspell/dict-golang@npm:5.0.2" - checksum: e7fbc9c5e696e9e08ce5415ec2b13ddc45ae5dbef12f678022ef506d447da4ff811e82df3e0c25c12914ba0f9fc971f97a25e4e7f272a0d66880362159ea35ef +"@cspell/dict-golang@npm:^6.0.1": + version: 6.0.1 + resolution: "@cspell/dict-golang@npm:6.0.1" + checksum: 465dc7a879fa34be010aecc7dac9820bc93ea694abc24299757662c10b8d9f632df7d18c37b31d7dabb67b721bfa9a6d02bd50125e464f79e1d466aa8073a35b languageName: node linkType: hard @@ -1714,10 +1714,10 @@ __metadata: languageName: node linkType: hard -"@cspell/dict-latex@npm:^3.1.0": - version: 3.1.0 - resolution: "@cspell/dict-latex@npm:3.1.0" - checksum: 90dafd4c1d0f9a9bd9e36734e624ca3d891023a5477ca9df62037a4297c8f751be5b33cbf4def9356d8bcec65a4e1ae89862d80ebe30675e91d10d69e0852de6 +"@cspell/dict-latex@npm:^4.0.0": + version: 4.0.0 + resolution: "@cspell/dict-latex@npm:4.0.0" + checksum: 33a3f158d8c0151cbb4e6bd79ba1189d167b3916e1ce37d7b5754d18dffefe061320fa54c3cb482bd5c7cf37392d0112530b07a3eca63dffbe1069de317dc652 languageName: node linkType: hard @@ -1749,24 +1749,24 @@ __metadata: languageName: node linkType: hard -"@cspell/dict-php@npm:^3.0.4": - version: 3.0.4 - resolution: "@cspell/dict-php@npm:3.0.4" - checksum: ba3dcb8afcf214e331d1ee26c61130efb6192aaf62d24655582edf23d543605d42818fb146a3b13ae203a1b70b362d3f9f5c0e793984dafb3156aff979aa6a35 +"@cspell/dict-php@npm:^4.0.1": + version: 4.0.1 + resolution: "@cspell/dict-php@npm:4.0.1" + checksum: 163727eca4af8d2e5d759fdda2dcc80065bd01fbc44020dd26cf0d1a3d2906a0c9caa52a97ece9eafecea36d682609c7ffa77ad8d736505058505c64106d7c06 languageName: node linkType: hard -"@cspell/dict-powershell@npm:^4.0.2": - version: 4.0.2 - resolution: "@cspell/dict-powershell@npm:4.0.2" - checksum: c358dfea68e80a6381a7e192efb037dd3ed50f6e5add044f0d90385a957bdddd0eea235e719bfb4b10df435167ee85995a62ad778bbc16fcae16d0be3f99721b +"@cspell/dict-powershell@npm:^5.0.1": + version: 5.0.1 + resolution: "@cspell/dict-powershell@npm:5.0.1" + checksum: 42bb95e5eef228ccdb5c787b7492b77a028ac205ca27cc775fa792558b760814808bb65952214b2282131d7ab4cbd3f80c12c5bee9184b8559f0a2cf1e488008 languageName: node linkType: hard -"@cspell/dict-public-licenses@npm:^2.0.1": - version: 2.0.1 - resolution: "@cspell/dict-public-licenses@npm:2.0.1" - checksum: ce563b482df6f931290c0ba752417aedc993a173ae896002a4a30de9cd68418fa6a01664fe61239423388de09f17d8f68430f3ff95979a7e6e2090987aa7d968 +"@cspell/dict-public-licenses@npm:^2.0.2": + version: 2.0.2 + resolution: "@cspell/dict-public-licenses@npm:2.0.2" + checksum: 79f16b2c3a31208e299bd552d684f7f89da8e73bef97704e2d0e1bfc99448b9dd7758315b6ed5aa04f067908def11f0d481550843568f02cba8a2b2fd7a687ba languageName: node linkType: hard @@ -1784,10 +1784,10 @@ __metadata: languageName: node linkType: hard -"@cspell/dict-ruby@npm:^4.0.2": - version: 4.0.2 - resolution: "@cspell/dict-ruby@npm:4.0.2" - checksum: 6c6834e30dfcd3b9416d43a286e497d6d921415a1d240b35bf85f473a87364acafba5aa3172b7ddeea54dce5e3349e05b6dd73dc8226d7c205e98bb5af685995 +"@cspell/dict-ruby@npm:^5.0.0": + version: 5.0.0 + resolution: "@cspell/dict-ruby@npm:5.0.0" + checksum: e1f99f97fa3459a19f8f25dbae7d879e77bd503e9435aaf640d99ad4212223548fb9e5544d076f9a766f74829958178e814ebfe6f941738fb5e5452969bbdfb2 languageName: node linkType: hard @@ -1798,10 +1798,10 @@ __metadata: languageName: node linkType: hard -"@cspell/dict-scala@npm:^4.0.1": - version: 4.0.1 - resolution: "@cspell/dict-scala@npm:4.0.1" - checksum: 93e7f02b7891614a83f73daed471df6ddd53323dd17bfc7c4c52a1e2009f94861a416f7407c9f08a37ab36288d8f413f1ad67d440f9168ee57b1bb5280786709 +"@cspell/dict-scala@npm:^5.0.0": + version: 5.0.0 + resolution: "@cspell/dict-scala@npm:5.0.0" + checksum: 759dd8746e68e45299b65eeaf1dfd32d1e345fd80fd9a623af502266598c384198853001f70a700c454d8490fb9a5e1358ca1e0d7c0d43154a4f07e2d5531c72 languageName: node linkType: hard @@ -1847,19 +1847,19 @@ __metadata: languageName: node linkType: hard -"@cspell/dynamic-import@npm:6.29.0": - version: 6.29.0 - resolution: "@cspell/dynamic-import@npm:6.29.0" +"@cspell/dynamic-import@npm:6.30.2": + version: 6.30.2 + resolution: "@cspell/dynamic-import@npm:6.30.2" dependencies: - import-meta-resolve: ^2.2.1 - checksum: dc7d7e8f6ee46762e733d2394e33e7452713ce6d9b44ae58c2201f6e9840f73967025d4d1a0d77f57cae56fc34a96e21800aab78c64bf71d130f0d74ee7aef87 + import-meta-resolve: ^2.2.2 + checksum: a12a8b18be303c0bb6b9c737d72092686c97c38dafc14cbdd05396a0fb60ebffcd67778b77502b3f8cb9a485cb08e74d4a582e88a828026000ec7241b4050055 languageName: node linkType: hard -"@cspell/strong-weak-map@npm:6.29.0": - version: 6.29.0 - resolution: "@cspell/strong-weak-map@npm:6.29.0" - checksum: 52fbcc5dce9c21cbe11297549d61043838f6eadd7303510cce1b19c84d562f0b85259f28cfa2221c4dfc811fe7841532bfd6e2fc8f63dac0e533171533ff37c7 +"@cspell/strong-weak-map@npm:6.30.2": + version: 6.30.2 + resolution: "@cspell/strong-weak-map@npm:6.30.2" + checksum: 63f923a70bce89abb7955ad38ff1224b91b92afa4e310f333885bdd6b1220316ef51bb4d11455c9f65e5233d2d9504335409944649af5f722fed11e17df46d0a languageName: node linkType: hard @@ -6071,7 +6071,19 @@ __metadata: languageName: node linkType: hard -"cosmiconfig@npm:8.1.0, cosmiconfig@npm:^8.1.0": +"cosmiconfig@npm:8.0.0": + version: 8.0.0 + resolution: "cosmiconfig@npm:8.0.0" + dependencies: + import-fresh: ^3.2.1 + js-yaml: ^4.1.0 + parse-json: ^5.0.0 + path-type: ^4.0.0 + checksum: ff4cdf89ac1ae52e7520816622c21a9e04380d04b82d653f5139ec581aa4f7f29e096d46770bc76c4a63c225367e88a1dfa233ea791669a35101f5f9b972c7d1 + languageName: node + linkType: hard + +"cosmiconfig@npm:8.1.0": version: 8.1.0 resolution: "cosmiconfig@npm:8.1.0" dependencies: @@ -6173,79 +6185,79 @@ __metadata: languageName: node linkType: hard -"cspell-dictionary@npm:6.29.0": - version: 6.29.0 - resolution: "cspell-dictionary@npm:6.29.0" +"cspell-dictionary@npm:6.30.2": + version: 6.30.2 + resolution: "cspell-dictionary@npm:6.30.2" dependencies: - "@cspell/cspell-pipe": 6.29.0 - "@cspell/cspell-types": 6.29.0 - cspell-trie-lib: 6.29.0 + "@cspell/cspell-pipe": 6.30.2 + "@cspell/cspell-types": 6.30.2 + cspell-trie-lib: 6.30.2 fast-equals: ^4.0.3 gensequence: ^5.0.2 - checksum: 75cbd476399dbfb1cc0128dffc9cf677b1411a16daee80fae8a46c5075634d649c51ea1fc5575d2e069d0652c07b58e4a277eefb401da3ba52c586e1673aa36d + checksum: 76f8d9aa731ff6fcdb62e71d529826484dcbfda6ce1beed459ae4967a719b2e163e89fca15f152ae0b3f43300f12ae1eec6758aebd533712a54507c97bfa7cf5 languageName: node linkType: hard -"cspell-gitignore@npm:6.29.0": - version: 6.29.0 - resolution: "cspell-gitignore@npm:6.29.0" +"cspell-gitignore@npm:6.30.2": + version: 6.30.2 + resolution: "cspell-gitignore@npm:6.30.2" dependencies: - cspell-glob: 6.29.0 + cspell-glob: 6.30.2 find-up: ^5.0.0 bin: cspell-gitignore: bin.mjs - checksum: bd5c20e4816d90e1248d106fd5e1bf933904d9e0a673da7271d7924ee14ab70cd648fff347cf585f6f51f9ee500c780d81a09c00a4a76e635e0b19966e940303 + checksum: 7b732a26841ba7a73b8d871ebf97a248d1eb371c2ecf2c8c89f417cf7c2fb2d46e75c67d7a96ccdb1b9649f175647c78a0dc0c456b74f61595d2b25f7af19641 languageName: node linkType: hard -"cspell-glob@npm:6.29.0": - version: 6.29.0 - resolution: "cspell-glob@npm:6.29.0" +"cspell-glob@npm:6.30.2": + version: 6.30.2 + resolution: "cspell-glob@npm:6.30.2" dependencies: micromatch: ^4.0.5 - checksum: 29aeadb39c402cd66cc8decb1f2d53020fa42212da71d8d91a7e2a7c171ceda75073ddb1158f418b306e62408509ee1ed57461ac7994d7578da9673dbd514e8d + checksum: ae4934d7f8a63a168416d7697183840b5492bafda95a0abb476df900b671b4c75ee1d86c769665ff72c6b17b431c907fe109e26c7a1bc58f56d0028ea5bd963d languageName: node linkType: hard -"cspell-grammar@npm:6.29.0": - version: 6.29.0 - resolution: "cspell-grammar@npm:6.29.0" +"cspell-grammar@npm:6.30.2": + version: 6.30.2 + resolution: "cspell-grammar@npm:6.30.2" dependencies: - "@cspell/cspell-pipe": 6.29.0 - "@cspell/cspell-types": 6.29.0 + "@cspell/cspell-pipe": 6.30.2 + "@cspell/cspell-types": 6.30.2 bin: cspell-grammar: bin.mjs - checksum: e9bfdf909d445d5e1a911379e66eb918d366f29f63a75b3295c083efb31c8859ea1801b70597fb89a87bab659b65acb65b2dca2ed4253c7fa69ce5ed13efa143 + checksum: d5c4f11d915beda4236ad54c0954d3df5d0224c84cc19e5104a1a6b1cdfb41ed88fb6a7b8c4b3f5bb1159129c73a007d41fa92ffe4a0e3333ae53ec187b2bcb0 languageName: node linkType: hard -"cspell-io@npm:6.29.0": - version: 6.29.0 - resolution: "cspell-io@npm:6.29.0" +"cspell-io@npm:6.30.2": + version: 6.30.2 + resolution: "cspell-io@npm:6.30.2" dependencies: - "@cspell/cspell-service-bus": 6.29.0 + "@cspell/cspell-service-bus": 6.30.2 node-fetch: ^2.6.9 - checksum: f252d61661b97f22aec429eb969fc6ba1fbd860b72fc7832405f9aaf27261b0f90b70c0fbc5433ad4f831f6c542593e8c0f5fd82770c40a3d7de0fada3b1c30c + checksum: 71ed9eeddb3064f7fe160a0036c20d64e6d94567726175fc92fc2b80576066b2b39f7aecf5649c4bf6d23e4527602c23512f8054567fc0ed7e6e274f27b05793 languageName: node linkType: hard -"cspell-lib@npm:6.29.0": - version: 6.29.0 - resolution: "cspell-lib@npm:6.29.0" +"cspell-lib@npm:6.30.2": + version: 6.30.2 + resolution: "cspell-lib@npm:6.30.2" dependencies: - "@cspell/cspell-bundled-dicts": 6.29.0 - "@cspell/cspell-pipe": 6.29.0 - "@cspell/cspell-types": 6.29.0 - "@cspell/strong-weak-map": 6.29.0 + "@cspell/cspell-bundled-dicts": 6.30.2 + "@cspell/cspell-pipe": 6.30.2 + "@cspell/cspell-types": 6.30.2 + "@cspell/strong-weak-map": 6.30.2 clear-module: ^4.1.2 comment-json: ^4.2.3 configstore: ^5.0.1 - cosmiconfig: ^8.1.0 - cspell-dictionary: 6.29.0 - cspell-glob: 6.29.0 - cspell-grammar: 6.29.0 - cspell-io: 6.29.0 - cspell-trie-lib: 6.29.0 + cosmiconfig: 8.0.0 + cspell-dictionary: 6.30.2 + cspell-glob: 6.30.2 + cspell-grammar: 6.30.2 + cspell-io: 6.30.2 + cspell-trie-lib: 6.30.2 fast-equals: ^4.0.3 find-up: ^5.0.0 gensequence: ^5.0.2 @@ -6254,33 +6266,33 @@ __metadata: resolve-global: ^1.0.0 vscode-languageserver-textdocument: ^1.0.8 vscode-uri: ^3.0.7 - checksum: c8d05867673d02d778f41e284964c889a4282dca039b9dc3e646b5332792e834b871de1b110c67ccb914d671a69c2f5bb5a9c7c4dd165d55a4cc6c87932caa8d + checksum: 2a5ffb328da2ed630f8027a972309c283f46a7778a0f1d090c564dff92b8ddb49c9e4636f9c1535df624d918802f792f30138673cfbac6de98bfba818f16b47a languageName: node linkType: hard -"cspell-trie-lib@npm:6.29.0": - version: 6.29.0 - resolution: "cspell-trie-lib@npm:6.29.0" +"cspell-trie-lib@npm:6.30.2": + version: 6.30.2 + resolution: "cspell-trie-lib@npm:6.30.2" dependencies: - "@cspell/cspell-pipe": 6.29.0 - "@cspell/cspell-types": 6.29.0 + "@cspell/cspell-pipe": 6.30.2 + "@cspell/cspell-types": 6.30.2 gensequence: ^5.0.2 - checksum: 8fcaace9e9e1e0e711888123f58aca37c0961160e6c4386be0c81cdc01b34b47df52786ca9e310a0fc139dc4242efff1b90385a7b3cc12faead5e6b9b7b9a560 + checksum: e24ea590ed86ba6a7ef09fa048403eb10ca9e231f795d39c2ac5962319deeafd85ab645af7313388a5ee8ef5fc83ce23ff3f3cce11b2f4de1930fe31925d7cb8 languageName: node linkType: hard -"cspell@npm:6.29.0": - version: 6.29.0 - resolution: "cspell@npm:6.29.0" +"cspell@npm:6.30.2": + version: 6.30.2 + resolution: "cspell@npm:6.30.2" dependencies: - "@cspell/cspell-pipe": 6.29.0 - "@cspell/dynamic-import": 6.29.0 + "@cspell/cspell-pipe": 6.30.2 + "@cspell/dynamic-import": 6.30.2 chalk: ^4.1.2 commander: ^10.0.0 - cspell-gitignore: 6.29.0 - cspell-glob: 6.29.0 - cspell-io: 6.29.0 - cspell-lib: 6.29.0 + cspell-gitignore: 6.30.2 + cspell-glob: 6.30.2 + cspell-io: 6.30.2 + cspell-lib: 6.30.2 fast-glob: ^3.2.12 fast-json-stable-stringify: ^2.1.0 file-entry-cache: ^6.0.1 @@ -6292,7 +6304,7 @@ __metadata: bin: cspell: bin.js cspell-esm: bin.mjs - checksum: ade7b1ceea995923a1aebb9cfa8c2e5a041876fdcf564c43c42d4ebf68de10b9e2e62f185ddb6e587c455a672cae8a74da85a3d2fe5688398a67e31cb3cab8aa + checksum: e2065036e04526c2894f24d41901d8f368ad121a178df1ba8401c2889156688bc841381f1bad470180c83a8592f40e9dc66e00ce475976e45f63bb7be1d0189e languageName: node linkType: hard @@ -9028,10 +9040,10 @@ dexie@latest: languageName: node linkType: hard -"import-meta-resolve@npm:^2.2.1": - version: 2.2.1 - resolution: "import-meta-resolve@npm:2.2.1" - checksum: 8dd5ff7f6e96dea13653cbf79457588b9850949fde0412dba3cc944f8a61a155a3713d65878d903af6b0db7da960600ef66dfe994311743cdd49fe33dc91b0c5 +"import-meta-resolve@npm:^2.2.2": + version: 2.2.2 + resolution: "import-meta-resolve@npm:2.2.2" + checksum: 3a5910a6f914b5f06b307d7d1c25710bc56f12e21e923d5b2180dd0d53c6c2d51e7b55df26f168b63f5670babcaca9422b7a9429e877bbb8c1997d79bd65882b languageName: node linkType: hard @@ -16545,7 +16557,7 @@ dexie@latest: core-js: 3.25.5 countly-sdk-web: 22.6.5 cross-env: 7.0.3 - cspell: 6.29.0 + cspell: 6.30.2 css-loader: ^6.7.3 cssnano: ^5.1.14 date-fns: 2.29.3 From e5ae48eec17e8770bd32d174264aecfa66c139a6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 19 Mar 2023 16:09:34 +0000 Subject: [PATCH 79/97] chore(deps-dev): Bump @typescript-eslint/parser from 5.54.1 to 5.55.0 (#14847) Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) from 5.54.1 to 5.55.0. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v5.55.0/packages/parser) --- updated-dependencies: - dependency-name: "@typescript-eslint/parser" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 61 +++++++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 54 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index 522b6ea8705..a4cda83c4b3 100644 --- a/package.json +++ b/package.json @@ -92,7 +92,7 @@ "@types/underscore": "1.11.4", "@types/webpack-env": "1.18.0", "@typescript-eslint/eslint-plugin": "^5.54.1", - "@typescript-eslint/parser": "^5.54.1", + "@typescript-eslint/parser": "^5.55.0", "@wireapp/copy-config": "2.0.10", "@wireapp/eslint-config": "2.1.1", "@wireapp/prettier-config": "0.5.2", diff --git a/yarn.lock b/yarn.lock index 727bfdb118c..1e0d3ea285f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3837,20 +3837,20 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/parser@npm:^5.54.1": - version: 5.54.1 - resolution: "@typescript-eslint/parser@npm:5.54.1" +"@typescript-eslint/parser@npm:^5.55.0": + version: 5.55.0 + resolution: "@typescript-eslint/parser@npm:5.55.0" dependencies: - "@typescript-eslint/scope-manager": 5.54.1 - "@typescript-eslint/types": 5.54.1 - "@typescript-eslint/typescript-estree": 5.54.1 + "@typescript-eslint/scope-manager": 5.55.0 + "@typescript-eslint/types": 5.55.0 + "@typescript-eslint/typescript-estree": 5.55.0 debug: ^4.3.4 peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 peerDependenciesMeta: typescript: optional: true - checksum: f466513d306ca926b97c2cec1eebaf2cd15d45bd5633a4358f23ba9a4de1b0ec4630b1c20abc395943934ed1d2ef65f545fd6737c317a7abe579612101e8a83f + checksum: 48a20dc7e67960b5168b77bfb9d11d053a21d57bb83cf7b59f750191cbca5eea3b4636a8e6e75cc0aca5a84cdef91fed5440934fc2935f8c6fa71630a253a50c languageName: node linkType: hard @@ -3874,6 +3874,16 @@ __metadata: languageName: node linkType: hard +"@typescript-eslint/scope-manager@npm:5.55.0": + version: 5.55.0 + resolution: "@typescript-eslint/scope-manager@npm:5.55.0" + dependencies: + "@typescript-eslint/types": 5.55.0 + "@typescript-eslint/visitor-keys": 5.55.0 + checksum: f253db88f69a29e4abe2f567d0a611cc3e7fb1a911a2cc54a2f6baf16e3de4d1883b3f8e45ee61b3db9fa5543dda0fd7b608de9d28ba6173ab49bfd17ff90cad + languageName: node + linkType: hard + "@typescript-eslint/type-utils@npm:5.54.1": version: 5.54.1 resolution: "@typescript-eslint/type-utils@npm:5.54.1" @@ -3905,6 +3915,13 @@ __metadata: languageName: node linkType: hard +"@typescript-eslint/types@npm:5.55.0": + version: 5.55.0 + resolution: "@typescript-eslint/types@npm:5.55.0" + checksum: 7d851f09a2106514d3a9c7164d34758f30abfe554e3c7a02be75cdc7e16644e23ca32840a8f39a0321bc509927fb4d98ce91b22b21e8544ac56cef33b815a864 + languageName: node + linkType: hard + "@typescript-eslint/typescript-estree@npm:5.10.1": version: 5.10.1 resolution: "@typescript-eslint/typescript-estree@npm:5.10.1" @@ -3941,6 +3958,24 @@ __metadata: languageName: node linkType: hard +"@typescript-eslint/typescript-estree@npm:5.55.0": + version: 5.55.0 + resolution: "@typescript-eslint/typescript-estree@npm:5.55.0" + dependencies: + "@typescript-eslint/types": 5.55.0 + "@typescript-eslint/visitor-keys": 5.55.0 + debug: ^4.3.4 + globby: ^11.1.0 + is-glob: ^4.0.3 + semver: ^7.3.7 + tsutils: ^3.21.0 + peerDependenciesMeta: + typescript: + optional: true + checksum: d24a11aee3d01067018d99804f420aecb8af88e43bf170d5d14f6480bd378c0a81ce49a37f5d6c36e5f0f319e3fa8b099720f295f2767338be1a4f7e9a5323e1 + languageName: node + linkType: hard + "@typescript-eslint/utils@npm:5.10.1": version: 5.10.1 resolution: "@typescript-eslint/utils@npm:5.10.1" @@ -3995,6 +4030,16 @@ __metadata: languageName: node linkType: hard +"@typescript-eslint/visitor-keys@npm:5.55.0": + version: 5.55.0 + resolution: "@typescript-eslint/visitor-keys@npm:5.55.0" + dependencies: + "@typescript-eslint/types": 5.55.0 + eslint-visitor-keys: ^3.3.0 + checksum: 0b24c72dff99dd2cf41c19d20067f8ab20a38aa2e82c79c5530bec7cf651031e95c80702fc21c813c9b94e5f3d4cd210f13967b2966ef38abe548cb5f05848a3 + languageName: node + linkType: hard + "@webassemblyjs/ast@npm:1.11.1": version: 1.11.1 resolution: "@webassemblyjs/ast@npm:1.11.1" @@ -16533,7 +16578,7 @@ dexie@latest: "@types/underscore": 1.11.4 "@types/webpack-env": 1.18.0 "@typescript-eslint/eslint-plugin": ^5.54.1 - "@typescript-eslint/parser": ^5.54.1 + "@typescript-eslint/parser": ^5.55.0 "@wireapp/avs": 9.1.11 "@wireapp/copy-config": 2.0.10 "@wireapp/core": 39.2.7 From 2e5a0b14d78c094624b01f84d54460fa905c71ee Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 19 Mar 2023 16:11:21 +0000 Subject: [PATCH 80/97] chore(deps-dev): Bump @types/node from 18.15.0 to 18.15.3 (#14846) Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 18.15.0 to 18.15.3. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node) --- updated-dependencies: - dependency-name: "@types/node" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index a4cda83c4b3..cab452ede3b 100644 --- a/package.json +++ b/package.json @@ -76,7 +76,7 @@ "@types/libsodium-wrappers": "^0", "@types/linkify-it": "3.0.2", "@types/markdown-it": "12.2.3", - "@types/node": "^18.15.0", + "@types/node": "^18.15.3", "@types/open-graph": "0.2.2", "@types/platform": "1.3.4", "@types/prettier": "^2.7.2", diff --git a/yarn.lock b/yarn.lock index 1e0d3ea285f..076362a5a46 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3562,7 +3562,7 @@ __metadata: languageName: node linkType: hard -"@types/node@npm:*, @types/node@npm:>=13.7.0, @types/node@npm:^18.15.0": +"@types/node@npm:*, @types/node@npm:>=13.7.0": version: 18.15.0 resolution: "@types/node@npm:18.15.0" checksum: d81372276dd5053b1743338b61a2178ff9722dc609189d01fc7d1c2acd539414039e0e4780678730514390dad3f29c366a28c29e8dbd5b0025651181f6dd6669 @@ -3576,6 +3576,13 @@ __metadata: languageName: node linkType: hard +"@types/node@npm:^18.15.3": + version: 18.15.3 + resolution: "@types/node@npm:18.15.3" + checksum: 31b1d92475a82c30de29aa6c0771b18a276552d191283b4423ba2d61b3f01159bf0d02576c0b7cc834b043997893800db6bb47f246083ed85aa45e79c80875d7 + languageName: node + linkType: hard + "@types/node@npm:~14": version: 14.18.36 resolution: "@types/node@npm:14.18.36" @@ -16562,7 +16569,7 @@ dexie@latest: "@types/libsodium-wrappers": ^0 "@types/linkify-it": 3.0.2 "@types/markdown-it": 12.2.3 - "@types/node": ^18.15.0 + "@types/node": ^18.15.3 "@types/open-graph": 0.2.2 "@types/platform": 1.3.4 "@types/prettier": ^2.7.2 From fc2bb6cb384a5f0b282f3bfc29c467840f353be0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 19 Mar 2023 16:11:45 +0000 Subject: [PATCH 81/97] chore(deps-dev): Bump sinon from 15.0.1 to 15.0.2 (#14848) Bumps [sinon](https://github.com/sinonjs/sinon) from 15.0.1 to 15.0.2. - [Release notes](https://github.com/sinonjs/sinon/releases) - [Changelog](https://github.com/sinonjs/sinon/blob/main/docs/changelog.md) - [Commits](https://github.com/sinonjs/sinon/compare/v15.0.1...v15.0.2) --- updated-dependencies: - dependency-name: sinon dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 63 ++++++++++++++++++++++------------------------------ 2 files changed, 28 insertions(+), 37 deletions(-) diff --git a/package.json b/package.json index cab452ede3b..b97afb730b0 100644 --- a/package.json +++ b/package.json @@ -159,7 +159,7 @@ "redux-mock-store": "1.5.4", "seedrandom": "^3.0.5", "simple-git": "3.17.0", - "sinon": "15.0.1", + "sinon": "15.0.2", "snabbdom": "3.5.1", "style-loader": "^3.3.1", "stylelint": "14.16.1", diff --git a/yarn.lock b/yarn.lock index 076362a5a46..c2d62101dbf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3039,25 +3039,25 @@ __metadata: languageName: node linkType: hard -"@sinonjs/commons@npm:^1.7.0": - version: 1.8.3 - resolution: "@sinonjs/commons@npm:1.8.3" +"@sinonjs/commons@npm:^2.0.0": + version: 2.0.0 + resolution: "@sinonjs/commons@npm:2.0.0" dependencies: type-detect: 4.0.8 - checksum: 6159726db5ce6bf9f2297f8427f7ca5b3dff45b31e5cee23496f1fa6ef0bb4eab878b23fb2c5e6446381f6a66aba4968ef2fc255c1180d753d4b8c271636a2e5 + checksum: 5023ba17edf2b85ed58262313b8e9b59e23c6860681a9af0200f239fe939e2b79736d04a260e8270ddd57196851dde3ba754d7230be5c5234e777ae2ca8af137 languageName: node linkType: hard -"@sinonjs/commons@npm:^2.0.0": - version: 2.0.0 - resolution: "@sinonjs/commons@npm:2.0.0" +"@sinonjs/commons@npm:^3.0.0": + version: 3.0.0 + resolution: "@sinonjs/commons@npm:3.0.0" dependencies: type-detect: 4.0.8 - checksum: 5023ba17edf2b85ed58262313b8e9b59e23c6860681a9af0200f239fe939e2b79736d04a260e8270ddd57196851dde3ba754d7230be5c5234e777ae2ca8af137 + checksum: b4b5b73d4df4560fb8c0c7b38c7ad4aeabedd362f3373859d804c988c725889cde33550e4bcc7cd316a30f5152a2d1d43db71b6d0c38f5feef71fd8d016763f8 languageName: node linkType: hard -"@sinonjs/fake-timers@npm:10.0.2, @sinonjs/fake-timers@npm:^10.0.2": +"@sinonjs/fake-timers@npm:^10.0.2": version: 10.0.2 resolution: "@sinonjs/fake-timers@npm:10.0.2" dependencies: @@ -3066,15 +3066,6 @@ __metadata: languageName: node linkType: hard -"@sinonjs/fake-timers@npm:^7.0.4": - version: 7.1.2 - resolution: "@sinonjs/fake-timers@npm:7.1.2" - dependencies: - "@sinonjs/commons": ^1.7.0 - checksum: c84773d7973edad5511a31d2cc75023447b5cf714a84de9bb50eda45dda88a0d3bd2c30bf6e6e936da50a048d5352e2151c694e13e59b97d187ba1f329e9a00c - languageName: node - linkType: hard - "@sinonjs/samsam@npm:^7.0.1": version: 7.0.1 resolution: "@sinonjs/samsam@npm:7.0.1" @@ -6810,10 +6801,10 @@ dexie@latest: languageName: node linkType: hard -"diff@npm:^5.0.0": - version: 5.0.0 - resolution: "diff@npm:5.0.0" - checksum: f19fe29284b633afdb2725c2a8bb7d25761ea54d321d8e67987ac851c5294be4afeab532bd84531e02583a3fe7f4014aa314a3eda84f5590e7a9e6b371ef3b46 +"diff@npm:^5.1.0": + version: 5.1.0 + resolution: "diff@npm:5.1.0" + checksum: c7bf0df7c9bfbe1cf8a678fd1b2137c4fb11be117a67bc18a0e03ae75105e8533dbfb1cda6b46beb3586ef5aed22143ef9d70713977d5fb1f9114e21455fba90 languageName: node linkType: hard @@ -11715,16 +11706,16 @@ dexie@latest: languageName: node linkType: hard -"nise@npm:^5.1.2": - version: 5.1.2 - resolution: "nise@npm:5.1.2" +"nise@npm:^5.1.4": + version: 5.1.4 + resolution: "nise@npm:5.1.4" dependencies: "@sinonjs/commons": ^2.0.0 - "@sinonjs/fake-timers": ^7.0.4 + "@sinonjs/fake-timers": ^10.0.2 "@sinonjs/text-encoding": ^0.7.1 just-extend: ^4.0.2 path-to-regexp: ^1.7.0 - checksum: 688c557333dcbc5b41f4f1f1b0ea32fb0f8b424541a8958140bc61074980362c954b2aeb027c282de26b9ddcb4b230656f68ac4206777499e405dd7e716ec1f8 + checksum: bc57c10eaec28a6a7ddfb2e1e9b21d5e1fe22710e514f8858ae477cf9c7e9c891475674d5241519193403db43d16c3675f4207bc094a7a27b7e4f56584a78c1b languageName: node linkType: hard @@ -14557,17 +14548,17 @@ dexie@latest: languageName: node linkType: hard -"sinon@npm:15.0.1": - version: 15.0.1 - resolution: "sinon@npm:15.0.1" +"sinon@npm:15.0.2": + version: 15.0.2 + resolution: "sinon@npm:15.0.2" dependencies: - "@sinonjs/commons": ^2.0.0 - "@sinonjs/fake-timers": 10.0.2 + "@sinonjs/commons": ^3.0.0 + "@sinonjs/fake-timers": ^10.0.2 "@sinonjs/samsam": ^7.0.1 - diff: ^5.0.0 - nise: ^5.1.2 + diff: ^5.1.0 + nise: ^5.1.4 supports-color: ^7.2.0 - checksum: 4b5acff291b4650cf736bf45fc9eceed44dceca63b663cbd55926dd688fe8e9baa4b4629e296ee5d5b64245aedec5c540fea0416b8bb35bccfb98ca9e9ed87f3 + checksum: 98eb555442db3985d7fe0d90e23f081f3df71adffa0a50b049bcd2abbf5c2d71a43aeaa1e3c02500164cff5233d2f102f777356ebe8bfc257cb7059c1b2778b0 languageName: node linkType: hard @@ -16690,7 +16681,7 @@ dexie@latest: redux-thunk: 2.4.2 seedrandom: ^3.0.5 simple-git: 3.17.0 - sinon: 15.0.1 + sinon: 15.0.2 snabbdom: 3.5.1 speakingurl: 14.0.1 style-loader: ^3.3.1 From 693b820b0df11c61662ab8272c0175332e5b13c8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 19 Mar 2023 16:12:28 +0000 Subject: [PATCH 82/97] chore(deps-dev): Bump i18next-scanner from 4.1.1 to 4.2.0 (#14849) Bumps [i18next-scanner](https://github.com/i18next/i18next-scanner) from 4.1.1 to 4.2.0. - [Release notes](https://github.com/i18next/i18next-scanner/releases) - [Commits](https://github.com/i18next/i18next-scanner/compare/v4.1.1...v4.2.0) --- updated-dependencies: - dependency-name: i18next-scanner dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index b97afb730b0..c9d9c469121 100644 --- a/package.json +++ b/package.json @@ -134,7 +134,7 @@ "generate-changelog": "1.8.0", "html-webpack-plugin": "^5.5.0", "husky": "7.0.4", - "i18next-scanner": "4.1.1", + "i18next-scanner": "4.2.0", "intersection-observer": "0.12.2", "jest": "29.5.0", "jest-canvas-mock": "2.4.0", diff --git a/yarn.lock b/yarn.lock index c2d62101dbf..125994d80b9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8960,9 +8960,9 @@ dexie@latest: languageName: node linkType: hard -"i18next-scanner@npm:4.1.1": - version: 4.1.1 - resolution: "i18next-scanner@npm:4.1.1" +"i18next-scanner@npm:4.2.0": + version: 4.2.0 + resolution: "i18next-scanner@npm:4.2.0" dependencies: acorn: ^8.0.4 acorn-dynamic-import: ^4.0.0 @@ -8986,7 +8986,7 @@ dexie@latest: vinyl-fs: ^3.0.1 bin: i18next-scanner: bin/cli.js - checksum: d5cbe840a6e2bb629c84a0ae4d1a76ae32f4870a6e1f55acb0b658907b341b8ed634fca269a234b7a9446106182247e96b6409cb98251ba4f33864ed4d795854 + checksum: 8c199fe7529171a03f1b71d0e964c65f9d6baf0c971a4f11f4545fa13fd09f5ef4788131afe1ed166a90c8771e75ea6a9b1966b3bdaa87f7d5800dbfe5c9e34c languageName: node linkType: hard @@ -16635,7 +16635,7 @@ dexie@latest: html-webpack-plugin: ^5.5.0 http-status-codes: 2.2.0 husky: 7.0.4 - i18next-scanner: 4.1.1 + i18next-scanner: 4.2.0 intersection-observer: 0.12.2 jest: 29.5.0 jest-canvas-mock: 2.4.0 From efb8a0398729b18378286afa7823ed9a8a44c297 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 19 Mar 2023 16:13:24 +0000 Subject: [PATCH 83/97] chore(deps-dev): Bump @babel/core from 7.21.0 to 7.21.3 (#14850) Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.21.0 to 7.21.3. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.21.3/packages/babel-core) --- updated-dependencies: - dependency-name: "@babel/core" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 77 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index c9d9c469121..5e6f07ad033 100644 --- a/package.json +++ b/package.json @@ -50,7 +50,7 @@ "zustand": "4.3.6" }, "devDependencies": { - "@babel/core": "7.21.0", + "@babel/core": "7.21.3", "@babel/eslint-parser": "7.19.1", "@babel/plugin-proposal-decorators": "7.21.0", "@babel/preset-env": "7.20.2", diff --git a/yarn.lock b/yarn.lock index 125994d80b9..4536cf817e5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -44,7 +44,30 @@ __metadata: languageName: node linkType: hard -"@babel/core@npm:7.21.0, @babel/core@npm:^7.11.1, @babel/core@npm:^7.11.6, @babel/core@npm:^7.12.3": +"@babel/core@npm:7.21.3": + version: 7.21.3 + resolution: "@babel/core@npm:7.21.3" + dependencies: + "@ampproject/remapping": ^2.2.0 + "@babel/code-frame": ^7.18.6 + "@babel/generator": ^7.21.3 + "@babel/helper-compilation-targets": ^7.20.7 + "@babel/helper-module-transforms": ^7.21.2 + "@babel/helpers": ^7.21.0 + "@babel/parser": ^7.21.3 + "@babel/template": ^7.20.7 + "@babel/traverse": ^7.21.3 + "@babel/types": ^7.21.3 + convert-source-map: ^1.7.0 + debug: ^4.1.0 + gensync: ^1.0.0-beta.2 + json5: ^2.2.2 + semver: ^6.3.0 + checksum: bef25fbea96f461bf79bd1d0e4f0cdce679fd5ada464a89c1141ddba59ae1adfdbb23e04440c266ed525712d33d5ffd818cd8b0c25b1dee0e648d5559516153a + languageName: node + linkType: hard + +"@babel/core@npm:^7.11.1, @babel/core@npm:^7.11.6, @babel/core@npm:^7.12.3": version: 7.21.0 resolution: "@babel/core@npm:7.21.0" dependencies: @@ -93,6 +116,18 @@ __metadata: languageName: node linkType: hard +"@babel/generator@npm:^7.21.3": + version: 7.21.3 + resolution: "@babel/generator@npm:7.21.3" + dependencies: + "@babel/types": ^7.21.3 + "@jridgewell/gen-mapping": ^0.3.2 + "@jridgewell/trace-mapping": ^0.3.17 + jsesc: ^2.5.1 + checksum: be6bb5a32a0273260b91210d4137b7b5da148a2db8dd324654275cb0af865ae59de5e1536e93ac83423b2586415059e1c24cf94293026755cf995757238da749 + languageName: node + linkType: hard + "@babel/helper-annotate-as-pure@npm:^7.18.6": version: 7.18.6 resolution: "@babel/helper-annotate-as-pure@npm:7.18.6" @@ -226,7 +261,7 @@ __metadata: languageName: node linkType: hard -"@babel/helper-module-transforms@npm:^7.18.6, @babel/helper-module-transforms@npm:^7.19.6, @babel/helper-module-transforms@npm:^7.21.0": +"@babel/helper-module-transforms@npm:^7.18.6, @babel/helper-module-transforms@npm:^7.19.6, @babel/helper-module-transforms@npm:^7.21.0, @babel/helper-module-transforms@npm:^7.21.2": version: 7.21.2 resolution: "@babel/helper-module-transforms@npm:7.21.2" dependencies: @@ -377,6 +412,15 @@ __metadata: languageName: node linkType: hard +"@babel/parser@npm:^7.21.3": + version: 7.21.3 + resolution: "@babel/parser@npm:7.21.3" + bin: + parser: ./bin/babel-parser.js + checksum: a71e6456a1260c2a943736b56cc0acdf5f2a53c6c79e545f56618967e51f9b710d1d3359264e7c979313a7153741b1d95ad8860834cc2ab4ce4f428b13cc07be + languageName: node + linkType: hard + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:^7.18.6": version: 7.18.6 resolution: "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:7.18.6" @@ -1432,6 +1476,24 @@ __metadata: languageName: node linkType: hard +"@babel/traverse@npm:^7.21.3": + version: 7.21.3 + resolution: "@babel/traverse@npm:7.21.3" + dependencies: + "@babel/code-frame": ^7.18.6 + "@babel/generator": ^7.21.3 + "@babel/helper-environment-visitor": ^7.18.9 + "@babel/helper-function-name": ^7.21.0 + "@babel/helper-hoist-variables": ^7.18.6 + "@babel/helper-split-export-declaration": ^7.18.6 + "@babel/parser": ^7.21.3 + "@babel/types": ^7.21.3 + debug: ^4.1.0 + globals: ^11.1.0 + checksum: 0af5bcd47a2fc501592b90ac1feae9d449afb9ab0772a4f6e68230f4cd3a475795d538c1de3f880fe3414b6c2820bac84d02c6549eea796f39d74a603717447b + languageName: node + linkType: hard + "@babel/types@npm:^7.0.0, @babel/types@npm:^7.18.10, @babel/types@npm:^7.18.6, @babel/types@npm:^7.18.9, @babel/types@npm:^7.20.0, @babel/types@npm:^7.20.2, @babel/types@npm:^7.20.7, @babel/types@npm:^7.21.0, @babel/types@npm:^7.21.2, @babel/types@npm:^7.3.0, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3": version: 7.21.2 resolution: "@babel/types@npm:7.21.2" @@ -1443,6 +1505,17 @@ __metadata: languageName: node linkType: hard +"@babel/types@npm:^7.21.3": + version: 7.21.3 + resolution: "@babel/types@npm:7.21.3" + dependencies: + "@babel/helper-string-parser": ^7.19.4 + "@babel/helper-validator-identifier": ^7.19.1 + to-fast-properties: ^2.0.0 + checksum: b750274718ba9cefd0b81836c464009bb6ba339fccce51b9baff497a0a2d96c044c61dc90cf203cec0adc770454b53a9681c3f7716883c802b85ab84c365ba35 + languageName: node + linkType: hard + "@bcoe/v8-coverage@npm:^0.2.3": version: 0.2.3 resolution: "@bcoe/v8-coverage@npm:0.2.3" @@ -16532,7 +16605,7 @@ dexie@latest: version: 0.0.0-use.local resolution: "wire-webapp@workspace:." dependencies: - "@babel/core": 7.21.0 + "@babel/core": 7.21.3 "@babel/eslint-parser": 7.19.1 "@babel/plugin-proposal-decorators": 7.21.0 "@babel/preset-env": 7.20.2 From d9335f7b406dec9f61a76f97043e3d630db924ce Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 19 Mar 2023 16:15:28 +0000 Subject: [PATCH 84/97] chore(deps-dev): Bump caniuse-lite from 1.0.30001464 to 1.0.30001468 (#14851) Bumps [caniuse-lite](https://github.com/browserslist/caniuse-lite) from 1.0.30001464 to 1.0.30001468. - [Release notes](https://github.com/browserslist/caniuse-lite/releases) - [Commits](https://github.com/browserslist/caniuse-lite/compare/1.0.30001464...1.0.30001468) --- updated-dependencies: - dependency-name: caniuse-lite dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 5e6f07ad033..1b81c699c5d 100644 --- a/package.json +++ b/package.json @@ -101,7 +101,7 @@ "archiver": "^5.3.1", "autoprefixer": "^10.4.13", "babel-loader": "9.1.2", - "caniuse-lite": "^1.0.30001464", + "caniuse-lite": "^1.0.30001468", "cross-env": "7.0.3", "cspell": "6.30.2", "css-loader": "^6.7.3", diff --git a/yarn.lock b/yarn.lock index 4536cf817e5..094c0ea1119 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5655,13 +5655,20 @@ __metadata: languageName: node linkType: hard -"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001400, caniuse-lite@npm:^1.0.30001426, caniuse-lite@npm:^1.0.30001464": +"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001400, caniuse-lite@npm:^1.0.30001426": version: 1.0.30001464 resolution: "caniuse-lite@npm:1.0.30001464" checksum: 67cdee102c1660d62d7b9dbd4740bb7af096236618f2509fd2e0039d50db5f02fb87c21d90b6d573fdcf50deaf3c84503d009e871502b5c221d0ba1dec18ba11 languageName: node linkType: hard +"caniuse-lite@npm:^1.0.30001468": + version: 1.0.30001468 + resolution: "caniuse-lite@npm:1.0.30001468" + checksum: 39f23ce5af90fee37004bee334cd809a20f8aa46ef08244f75e33d2e32b53cfebee205018769a2712937fa05ea5a1c0249175771ffee561acd1e8e05c54f9a67 + languageName: node + linkType: hard + "catharsis@npm:^0.9.0": version: 0.9.0 resolution: "catharsis@npm:0.9.0" @@ -16667,7 +16674,7 @@ dexie@latest: autoprefixer: ^10.4.13 babel-loader: 9.1.2 beautiful-react-hooks: ^3.12.2 - caniuse-lite: ^1.0.30001464 + caniuse-lite: ^1.0.30001468 classnames: 2.3.2 copy-webpack-plugin: 11.0.0 core-js: 3.25.5 From b303d68ae8492e98deb1bde9627aa88c11bf7ba3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 19 Mar 2023 16:18:06 +0000 Subject: [PATCH 85/97] chore(deps-dev): Bump eslint-plugin-typescript-sort-keys (#14852) Bumps [eslint-plugin-typescript-sort-keys](https://github.com/infctr/eslint-plugin-typescript-sort-keys) from 2.1.0 to 2.3.0. - [Release notes](https://github.com/infctr/eslint-plugin-typescript-sort-keys/releases) - [Changelog](https://github.com/infctr/eslint-plugin-typescript-sort-keys/blob/master/CHANGELOG.md) - [Commits](https://github.com/infctr/eslint-plugin-typescript-sort-keys/compare/v2.1.0...v2.3.0) --- updated-dependencies: - dependency-name: eslint-plugin-typescript-sort-keys dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index 1b81c699c5d..b38cc038981 100644 --- a/package.json +++ b/package.json @@ -128,7 +128,7 @@ "eslint-plugin-simple-import-sort": "^8.0.0", "eslint-plugin-sort-keys-fix": "1.1.2", "eslint-plugin-testing-library": "^5.10.2", - "eslint-plugin-typescript-sort-keys": "2.1.0", + "eslint-plugin-typescript-sort-keys": "2.3.0", "eslint-plugin-unused-imports": "^2.0.0", "fake-indexeddb": "4.0.1", "generate-changelog": "1.8.0", diff --git a/yarn.lock b/yarn.lock index 094c0ea1119..76238a6c55b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7652,9 +7652,9 @@ dexie@latest: languageName: node linkType: hard -"eslint-plugin-typescript-sort-keys@npm:2.1.0": - version: 2.1.0 - resolution: "eslint-plugin-typescript-sort-keys@npm:2.1.0" +"eslint-plugin-typescript-sort-keys@npm:2.3.0": + version: 2.3.0 + resolution: "eslint-plugin-typescript-sort-keys@npm:2.3.0" dependencies: "@typescript-eslint/experimental-utils": ^5.0.0 json-schema: ^0.4.0 @@ -7662,8 +7662,8 @@ dexie@latest: peerDependencies: "@typescript-eslint/parser": ^1 || ^2 || ^3 || ^4 || ^5 eslint: ^5 || ^6 || ^7 || ^8 - typescript: ^3 || ^4 - checksum: 98ea442519ca9cdd36aa4d7d4e4f3d96d16a9287e32ea69209865ff3cd10ce33d9c4acb86ddc2cc0406a072aea319841496e66b512f79c58aaf3924d85f73683 + typescript: ^3 || ^4 || ^5 + checksum: 3c00e77c2761dbd7c5b6d61883ddfb587eb32f4f5bddf2694f88ec278ac4e1f1c14694d04755c55cc6ed5313d7dcd407c376034cbc1871904f242f368a013091 languageName: node linkType: hard @@ -16707,7 +16707,7 @@ dexie@latest: eslint-plugin-simple-import-sort: ^8.0.0 eslint-plugin-sort-keys-fix: 1.1.2 eslint-plugin-testing-library: ^5.10.2 - eslint-plugin-typescript-sort-keys: 2.1.0 + eslint-plugin-typescript-sort-keys: 2.3.0 eslint-plugin-unused-imports: ^2.0.0 fake-indexeddb: 4.0.1 generate-changelog: 1.8.0 From 7e3499c80d9a92128d7da331c2f0e0681abf07e0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 19 Mar 2023 16:20:31 +0000 Subject: [PATCH 86/97] chore(deps-dev): Bump webpack from 5.76.1 to 5.76.2 (#14855) Bumps [webpack](https://github.com/webpack/webpack) from 5.76.1 to 5.76.2. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](https://github.com/webpack/webpack/compare/v5.76.1...v5.76.2) --- updated-dependencies: - dependency-name: webpack dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index b38cc038981..5a89c5124f5 100644 --- a/package.json +++ b/package.json @@ -171,7 +171,7 @@ "ts-node": "10.9.1", "tsc-watch": "6.0.0", "typescript": "^4.9.5", - "webpack": "5.76.1", + "webpack": "5.76.2", "webpack-cli": "5.0.1", "webpack-dev-middleware": "6.0.1", "webpack-hot-middleware": "2.25.3", diff --git a/yarn.lock b/yarn.lock index 76238a6c55b..ea1726ba2e7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -16419,9 +16419,9 @@ dexie@latest: languageName: node linkType: hard -"webpack@npm:5.76.1": - version: 5.76.1 - resolution: "webpack@npm:5.76.1" +"webpack@npm:5.76.2": + version: 5.76.2 + resolution: "webpack@npm:5.76.2" dependencies: "@types/eslint-scope": ^3.7.3 "@types/estree": ^0.0.51 @@ -16452,7 +16452,7 @@ dexie@latest: optional: true bin: webpack: bin/webpack.js - checksum: b01fe0bc2dbca0e10d290ddb0bf81e807a031de48028176e2b21afd696b4d3f25ab9accdad888ef4a1f7c7f4d41f13d5bf2395b7653fdf3e5e3dafa54e56dab2 + checksum: 86db98299a175c371031449c26077e87b33acd8f45de7f7945ed4b9b37c8ca11bc5169af9c44743efccd4d55e08042a3aa3a3bc42aff831309a0821ffbcd395e languageName: node linkType: hard @@ -16779,7 +16779,7 @@ dexie@latest: uint32: 0.2.1 underscore: 1.13.6 uuidjs: 4.2.13 - webpack: 5.76.1 + webpack: 5.76.2 webpack-cli: 5.0.1 webpack-dev-middleware: 6.0.1 webpack-hot-middleware: 2.25.3 From a2a8540dbcf72a5aeabd4daabeb319254fe45dcd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 19 Mar 2023 16:21:19 +0000 Subject: [PATCH 87/97] chore(deps-dev): Bump @typescript-eslint/eslint-plugin (#14854) Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 5.54.1 to 5.55.0. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v5.55.0/packages/eslint-plugin) --- updated-dependencies: - dependency-name: "@typescript-eslint/eslint-plugin" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 68 +++++++++++++++++++++++++++++++++++++++------------- 2 files changed, 53 insertions(+), 17 deletions(-) diff --git a/package.json b/package.json index 5a89c5124f5..2a4a6cc5eb8 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "@types/uint32": "0.2.0", "@types/underscore": "1.11.4", "@types/webpack-env": "1.18.0", - "@typescript-eslint/eslint-plugin": "^5.54.1", + "@typescript-eslint/eslint-plugin": "^5.55.0", "@typescript-eslint/parser": "^5.55.0", "@wireapp/copy-config": "2.0.10", "@wireapp/eslint-config": "2.1.1", diff --git a/yarn.lock b/yarn.lock index ea1726ba2e7..41d9784c244 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2347,6 +2347,24 @@ __metadata: languageName: node linkType: hard +"@eslint-community/eslint-utils@npm:^4.2.0": + version: 4.3.0 + resolution: "@eslint-community/eslint-utils@npm:4.3.0" + dependencies: + eslint-visitor-keys: ^3.3.0 + peerDependencies: + eslint: ^6.0.0 || ^7.0.0 || >=8.0.0 + checksum: f487760a692f0f1fef76e248ad72976919576ba57edc2b1b1dc1d182553bae6b5bf7b078e654da85d04f0af8a485d20bd26280002768f4fbcd2e330078340cb0 + languageName: node + linkType: hard + +"@eslint-community/regexpp@npm:^4.4.0": + version: 4.4.0 + resolution: "@eslint-community/regexpp@npm:4.4.0" + checksum: 2d127af0c752b80e8a782eacfe996a86925d21de92da3ffc6f9e615e701145e44a62e26bdd88bfac2cd76779c39ba8d9875a91046ec5e7e5f23cb647c247ea6a + languageName: node + linkType: hard + "@eslint/eslintrc@npm:^1.4.1": version: 1.4.1 resolution: "@eslint/eslintrc@npm:1.4.1" @@ -3873,18 +3891,18 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/eslint-plugin@npm:^5.54.1": - version: 5.54.1 - resolution: "@typescript-eslint/eslint-plugin@npm:5.54.1" +"@typescript-eslint/eslint-plugin@npm:^5.55.0": + version: 5.55.0 + resolution: "@typescript-eslint/eslint-plugin@npm:5.55.0" dependencies: - "@typescript-eslint/scope-manager": 5.54.1 - "@typescript-eslint/type-utils": 5.54.1 - "@typescript-eslint/utils": 5.54.1 + "@eslint-community/regexpp": ^4.4.0 + "@typescript-eslint/scope-manager": 5.55.0 + "@typescript-eslint/type-utils": 5.55.0 + "@typescript-eslint/utils": 5.55.0 debug: ^4.3.4 grapheme-splitter: ^1.0.4 ignore: ^5.2.0 natural-compare-lite: ^1.4.0 - regexpp: ^3.2.0 semver: ^7.3.7 tsutils: ^3.21.0 peerDependencies: @@ -3893,7 +3911,7 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 76476c08ca0142a9bf6e2381f5cd1c037d86fbafa9c0dded4a97bd3b23b5962dd2c3943bade11b21d674195674f0e36dbf80faa15a1906f5a2ca1f699baf1dd5 + checksum: e3239ec6016eeb73b8b4d8310581978e28b8d3378140a8eb70bd8e33ffd332266020c19d493e0ccae4edfd4abd6097608718c50308fe6288f4ffeb8e4784efd9 languageName: node linkType: hard @@ -3955,12 +3973,12 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/type-utils@npm:5.54.1": - version: 5.54.1 - resolution: "@typescript-eslint/type-utils@npm:5.54.1" +"@typescript-eslint/type-utils@npm:5.55.0": + version: 5.55.0 + resolution: "@typescript-eslint/type-utils@npm:5.55.0" dependencies: - "@typescript-eslint/typescript-estree": 5.54.1 - "@typescript-eslint/utils": 5.54.1 + "@typescript-eslint/typescript-estree": 5.55.0 + "@typescript-eslint/utils": 5.55.0 debug: ^4.3.4 tsutils: ^3.21.0 peerDependencies: @@ -3968,7 +3986,7 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 0073838b782b7f4619775be124ca6643fec43a2d56043eaf3ceb100960a5193f14ac747b28ce17a5c9ac643fdee8abda82a7d905c81521358de7b27a2dcbc9af + checksum: 5c60d441355b51f96b596324068c10605c74abb46748c0bbc6d8f7f2ea40acb6b4bda3b537105fa189172324c56d18bd88e7102e67f99f8c03bc05c6d0e2023d languageName: node linkType: hard @@ -4063,7 +4081,25 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/utils@npm:5.54.1, @typescript-eslint/utils@npm:^5.10.0, @typescript-eslint/utils@npm:^5.43.0": +"@typescript-eslint/utils@npm:5.55.0": + version: 5.55.0 + resolution: "@typescript-eslint/utils@npm:5.55.0" + dependencies: + "@eslint-community/eslint-utils": ^4.2.0 + "@types/json-schema": ^7.0.9 + "@types/semver": ^7.3.12 + "@typescript-eslint/scope-manager": 5.55.0 + "@typescript-eslint/types": 5.55.0 + "@typescript-eslint/typescript-estree": 5.55.0 + eslint-scope: ^5.1.1 + semver: ^7.3.7 + peerDependencies: + eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 + checksum: 368cfc3fb9d6af6901e739e2e41c3f7f1c1244576607445f4f59d95eccb237f73e1a75e7f0816ec9a32a0f1ec6bb4a3602a99e17e70fe184e62f7c69dcbe4b8d + languageName: node + linkType: hard + +"@typescript-eslint/utils@npm:^5.10.0, @typescript-eslint/utils@npm:^5.43.0": version: 5.54.1 resolution: "@typescript-eslint/utils@npm:5.54.1" dependencies: @@ -16655,7 +16691,7 @@ dexie@latest: "@types/uint32": 0.2.0 "@types/underscore": 1.11.4 "@types/webpack-env": 1.18.0 - "@typescript-eslint/eslint-plugin": ^5.54.1 + "@typescript-eslint/eslint-plugin": ^5.55.0 "@typescript-eslint/parser": ^5.55.0 "@wireapp/avs": 9.1.11 "@wireapp/copy-config": 2.0.10 From 0aeb39628f94387705c5e8080fb09bd4faad0a88 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 19 Mar 2023 16:21:44 +0000 Subject: [PATCH 88/97] chore(deps-dev): Bump @babel/eslint-parser from 7.19.1 to 7.21.3 (#14853) Bumps [@babel/eslint-parser](https://github.com/babel/babel/tree/HEAD/eslint/babel-eslint-parser) from 7.19.1 to 7.21.3. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.21.3/eslint/babel-eslint-parser) --- updated-dependencies: - dependency-name: "@babel/eslint-parser" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 2a4a6cc5eb8..65e883f2a62 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ }, "devDependencies": { "@babel/core": "7.21.3", - "@babel/eslint-parser": "7.19.1", + "@babel/eslint-parser": "7.21.3", "@babel/plugin-proposal-decorators": "7.21.0", "@babel/preset-env": "7.20.2", "@babel/preset-react": "7.18.6", diff --git a/yarn.lock b/yarn.lock index 41d9784c244..ae3cbebc90e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -90,9 +90,9 @@ __metadata: languageName: node linkType: hard -"@babel/eslint-parser@npm:7.19.1": - version: 7.19.1 - resolution: "@babel/eslint-parser@npm:7.19.1" +"@babel/eslint-parser@npm:7.21.3": + version: 7.21.3 + resolution: "@babel/eslint-parser@npm:7.21.3" dependencies: "@nicolo-ribaudo/eslint-scope-5-internals": 5.1.1-v1 eslint-visitor-keys: ^2.1.0 @@ -100,7 +100,7 @@ __metadata: peerDependencies: "@babel/core": ">=7.11.0" eslint: ^7.5.0 || ^8.0.0 - checksum: 6d5360f62f25ed097250657deb1bc4c4f51a5f5f2fe456e98cda13727753fdf7a11a109b4cfa03ef0dd6ced3beaeb703b76193c1141e29434d1f91f1bac0517d + checksum: cc44a26a518c62ca93cdbee4ec4fa195c5a69b4f85d696c9df572b1ada99446ebdf3caef58a124f401a798279a765f858c88292bc7a8fc0485c34e178b1a9e82 languageName: node linkType: hard @@ -16649,7 +16649,7 @@ dexie@latest: resolution: "wire-webapp@workspace:." dependencies: "@babel/core": 7.21.3 - "@babel/eslint-parser": 7.19.1 + "@babel/eslint-parser": 7.21.3 "@babel/plugin-proposal-decorators": 7.21.0 "@babel/preset-env": 7.20.2 "@babel/preset-react": 7.18.6 From ccdbb7b6f035534b79fea29d62b92b8e51758c5f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 19 Mar 2023 16:23:12 +0000 Subject: [PATCH 89/97] chore(deps-dev): Bump style-loader from 3.3.1 to 3.3.2 (#14857) Bumps [style-loader](https://github.com/webpack-contrib/style-loader) from 3.3.1 to 3.3.2. - [Release notes](https://github.com/webpack-contrib/style-loader/releases) - [Changelog](https://github.com/webpack-contrib/style-loader/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/style-loader/compare/v3.3.1...v3.3.2) --- updated-dependencies: - dependency-name: style-loader dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 65e883f2a62..1c3cad6febf 100644 --- a/package.json +++ b/package.json @@ -161,7 +161,7 @@ "simple-git": "3.17.0", "sinon": "15.0.2", "snabbdom": "3.5.1", - "style-loader": "^3.3.1", + "style-loader": "^3.3.2", "stylelint": "14.16.1", "stylelint-config-idiomatic-order": "9.0.0", "stylelint-config-prettier": "9.0.5", diff --git a/yarn.lock b/yarn.lock index ae3cbebc90e..721427d10ff 100644 --- a/yarn.lock +++ b/yarn.lock @@ -15172,12 +15172,12 @@ dexie@latest: languageName: node linkType: hard -"style-loader@npm:^3.3.1": - version: 3.3.1 - resolution: "style-loader@npm:3.3.1" +"style-loader@npm:^3.3.2": + version: 3.3.2 + resolution: "style-loader@npm:3.3.2" peerDependencies: webpack: ^5.0.0 - checksum: 470feef680f59e2fce4d6601b5c55b88c01ad8d1dd693c528ffd591ff5fd7c01a4eff3bdbe62f26f847d6bd2430c9ab594be23307cfe7a3446ab236683f0d066 + checksum: 5ee5ce2dc885369eccb55d429376e83d02570d473ac5edeb69fd65ee894847f1e51429cf078351f617bd04516ece8a1dd967f9f40464bd8fa76d903c6b2a6f08 languageName: node linkType: hard @@ -16800,7 +16800,7 @@ dexie@latest: sinon: 15.0.2 snabbdom: 3.5.1 speakingurl: 14.0.1 - style-loader: ^3.3.1 + style-loader: ^3.3.2 stylelint: 14.16.1 stylelint-config-idiomatic-order: 9.0.0 stylelint-config-prettier: 9.0.5 From d0e4f3b17c898114043b770c8bc04782d5dab5ea Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 19 Mar 2023 16:24:49 +0000 Subject: [PATCH 90/97] chore(deps-dev): Bump postcss-loader from 7.0.2 to 7.1.0 (#14858) Bumps [postcss-loader](https://github.com/webpack-contrib/postcss-loader) from 7.0.2 to 7.1.0. - [Release notes](https://github.com/webpack-contrib/postcss-loader/releases) - [Changelog](https://github.com/webpack-contrib/postcss-loader/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/postcss-loader/compare/v7.0.2...v7.1.0) --- updated-dependencies: - dependency-name: postcss-loader dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 35 +++++++++++++++++++++++++++-------- 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index 1c3cad6febf..757303f5ddd 100644 --- a/package.json +++ b/package.json @@ -150,7 +150,7 @@ "postcss": "8.4.21", "postcss-import": "^15.1.0", "postcss-less": "6.0.0", - "postcss-loader": "^7.0.2", + "postcss-loader": "^7.1.0", "postcss-preset-env": "^8.0.1", "postcss-scss": "4.0.6", "prettier": "^2.8.4", diff --git a/yarn.lock b/yarn.lock index 721427d10ff..1ae8b102b68 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6267,6 +6267,18 @@ __metadata: languageName: node linkType: hard +"cosmiconfig@npm:^8.0.0": + version: 8.1.3 + resolution: "cosmiconfig@npm:8.1.3" + dependencies: + import-fresh: ^3.2.1 + js-yaml: ^4.1.0 + parse-json: ^5.0.0 + path-type: ^4.0.0 + checksum: b3d277bc3a8a9e649bf4c3fc9740f4c52bf07387481302aa79839f595045368903bf26ea24a8f7f7b8b180bf46037b027c5cb63b1391ab099f3f78814a147b2b + languageName: node + linkType: hard + "countly-sdk-web@npm:22.6.5": version: 22.6.5 resolution: "countly-sdk-web@npm:22.6.5" @@ -10782,13 +10794,20 @@ dexie@latest: languageName: node linkType: hard -"klona@npm:^2.0.4, klona@npm:^2.0.5": +"klona@npm:^2.0.4": version: 2.0.5 resolution: "klona@npm:2.0.5" checksum: 8c976126ea252b766e648a4866e1bccff9d3b08432474ad80c559f6c7265cf7caede2498d463754d8c88c4759895edd8210c85c0d3155e6aae4968362889466f languageName: node linkType: hard +"klona@npm:^2.0.6": + version: 2.0.6 + resolution: "klona@npm:2.0.6" + checksum: ac9ee3732e42b96feb67faae4d27cf49494e8a3bf3fa7115ce242fe04786788e0aff4741a07a45a2462e2079aa983d73d38519c85d65b70ef11447bbc3c58ce7 + languageName: node + linkType: hard + "knockout@npm:3.5.1": version: 3.5.1 resolution: "knockout@npm:3.5.1" @@ -12886,17 +12905,17 @@ dexie@latest: languageName: node linkType: hard -"postcss-loader@npm:^7.0.2": - version: 7.0.2 - resolution: "postcss-loader@npm:7.0.2" +"postcss-loader@npm:^7.1.0": + version: 7.1.0 + resolution: "postcss-loader@npm:7.1.0" dependencies: - cosmiconfig: ^7.0.0 - klona: ^2.0.5 + cosmiconfig: ^8.0.0 + klona: ^2.0.6 semver: ^7.3.8 peerDependencies: postcss: ^7.0.0 || ^8.0.1 webpack: ^5.0.0 - checksum: 2d251537d482eb751f812c96c8b515f46d7c9905cad7afab33f0f34872670619b7440cefc9e2babbf89fb11b4708850d522d79fa5ff788227587645e78f16638 + checksum: 44e4018a8f2f81150f501a5ca56e59571d81c965b5a8581f5dbae5e55a113b79bde33c3de0d4397cbf36a3be0c24b7e7e37f0154b6e63df16185edd086d4e352 languageName: node linkType: hard @@ -16778,7 +16797,7 @@ dexie@latest: postcss: 8.4.21 postcss-import: ^15.1.0 postcss-less: 6.0.0 - postcss-loader: ^7.0.2 + postcss-loader: ^7.1.0 postcss-preset-env: ^8.0.1 postcss-scss: 4.0.6 prettier: ^2.8.4 From 3463dbd163089d1860ba5c2b33fc15b73042b0cb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 19 Mar 2023 16:26:25 +0000 Subject: [PATCH 91/97] chore(deps): Bump react-intl from 6.2.10 to 6.3.1 (#14859) Bumps [react-intl](https://github.com/formatjs/formatjs) from 6.2.10 to 6.3.1. - [Release notes](https://github.com/formatjs/formatjs/releases) - [Commits](https://github.com/formatjs/formatjs/compare/react-intl@6.2.10...react-intl@6.3.1) --- updated-dependencies: - dependency-name: react-intl dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 44 ++++++++++++++++++++++---------------------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/package.json b/package.json index 757303f5ddd..28cdb1067cf 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "platform": "1.3.6", "react": "18.2.0", "react-dom": "18.2.0", - "react-intl": "6.2.10", + "react-intl": "6.3.1", "react-redux": "8.0.5", "react-router": "6.9.0", "react-router-dom": "6.9.0", diff --git a/yarn.lock b/yarn.lock index 1ae8b102b68..3aeb50178de 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2429,12 +2429,12 @@ __metadata: languageName: node linkType: hard -"@formatjs/fast-memoize@npm:1.2.8": - version: 1.2.8 - resolution: "@formatjs/fast-memoize@npm:1.2.8" +"@formatjs/fast-memoize@npm:2.0.0": + version: 2.0.0 + resolution: "@formatjs/fast-memoize@npm:2.0.0" dependencies: tslib: ^2.4.0 - checksum: 19f7f04657363d3ca4854ba3e5ecf4ae5bf0575c12ba8b2b24a7128131b38d91cf2692aeab778d42e9aa2e27cd2ea3b1e23cabf8ce4dff42988dcf65582c3a94 + checksum: 0afca38e57a90bbb204cf56116f96c18066c4df6a46dbed010f4f9e724ff4efa0e3a9e73717a4112096b31a93cc2136d26ccce0acb16400843a30ef82440c8ae languageName: node linkType: hard @@ -2490,23 +2490,23 @@ __metadata: languageName: node linkType: hard -"@formatjs/intl@npm:2.6.7": - version: 2.6.7 - resolution: "@formatjs/intl@npm:2.6.7" +"@formatjs/intl@npm:2.6.8": + version: 2.6.8 + resolution: "@formatjs/intl@npm:2.6.8" dependencies: "@formatjs/ecma402-abstract": 1.14.3 - "@formatjs/fast-memoize": 1.2.8 + "@formatjs/fast-memoize": 2.0.0 "@formatjs/icu-messageformat-parser": 2.3.0 "@formatjs/intl-displaynames": 6.2.6 "@formatjs/intl-listformat": 7.1.9 - intl-messageformat: 10.3.1 + intl-messageformat: 10.3.2 tslib: ^2.4.0 peerDependencies: typescript: ^4.7 peerDependenciesMeta: typescript: optional: true - checksum: 24c6f56b99faaaca858f30b2d7e030a0e8ab6e2786cef6f0a6a669d6a31cb1e067c53214ed187fa856f1a32f9c1f320e33c3d6dc52571bfd673c779acfa9ae38 + checksum: bcd1cd5c89859c94d82dc7292f67bdf8d3956004d4d196bbd43911d41e749a49c588238d8aae5db4bbc409de6dcc53d97bccfd7d128651298d052a000ad1d1a0 languageName: node linkType: hard @@ -9288,15 +9288,15 @@ dexie@latest: languageName: node linkType: hard -"intl-messageformat@npm:10.3.1": - version: 10.3.1 - resolution: "intl-messageformat@npm:10.3.1" +"intl-messageformat@npm:10.3.2": + version: 10.3.2 + resolution: "intl-messageformat@npm:10.3.2" dependencies: "@formatjs/ecma402-abstract": 1.14.3 - "@formatjs/fast-memoize": 1.2.8 + "@formatjs/fast-memoize": 2.0.0 "@formatjs/icu-messageformat-parser": 2.3.0 tslib: ^2.4.0 - checksum: 926f07c8a09ad10feaf2619119b8fc77057cb263d6dec1a06a74ca62b530cfcdfa36f58bd40691c1d3cd41c350b75bc7d96f0e402a81e0ecb700d4d7d0d8cce9 + checksum: 466f2d01e6b7acc621699539266a24a0fbf66099fa0e3f1b74cbdba223280f9aef736236527b5248fef420743c5070244cc2d76506c323590e9b445ff10b4e00 languageName: node linkType: hard @@ -13723,19 +13723,19 @@ dexie@latest: languageName: node linkType: hard -"react-intl@npm:6.2.10": - version: 6.2.10 - resolution: "react-intl@npm:6.2.10" +"react-intl@npm:6.3.1": + version: 6.3.1 + resolution: "react-intl@npm:6.3.1" dependencies: "@formatjs/ecma402-abstract": 1.14.3 "@formatjs/icu-messageformat-parser": 2.3.0 - "@formatjs/intl": 2.6.7 + "@formatjs/intl": 2.6.8 "@formatjs/intl-displaynames": 6.2.6 "@formatjs/intl-listformat": 7.1.9 "@types/hoist-non-react-statics": ^3.3.1 "@types/react": 16 || 17 || 18 hoist-non-react-statics: ^3.3.2 - intl-messageformat: 10.3.1 + intl-messageformat: 10.3.2 tslib: ^2.4.0 peerDependencies: react: ^16.6.0 || 17 || 18 @@ -13743,7 +13743,7 @@ dexie@latest: peerDependenciesMeta: typescript: optional: true - checksum: a86e87c2cbb5c7cb1cae9db11fa8d60d42201e6781f62a8f6a97518fa12bf63c57a21293f45f70ead426ffc8446fa063d4f6a25f805b8e1f9066f2d01d5d5455 + checksum: 03b45e3603ed9017a9e0600a11eb27af9d8bb8c0654a6a0a1e60fa9c2c100603cec004c24dc92416ba6fc8f6be53de51332d32201badd7419f8668bc9950155c languageName: node linkType: hard @@ -16804,7 +16804,7 @@ dexie@latest: raf: 3.4.1 react: 18.2.0 react-dom: 18.2.0 - react-intl: 6.2.10 + react-intl: 6.3.1 react-redux: 8.0.5 react-router: 6.9.0 react-router-dom: 6.9.0 From 0695afa41e879b8689b499e76d0150216e1e3a49 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 19 Mar 2023 16:27:15 +0000 Subject: [PATCH 92/97] chore(deps): Bump @wireapp/react-ui-kit from 9.4.0 to 9.4.1 (#14860) Bumps [@wireapp/react-ui-kit](https://github.com/wireapp/wire-web-packages) from 9.4.0 to 9.4.1. - [Release notes](https://github.com/wireapp/wire-web-packages/releases) - [Commits](https://github.com/wireapp/wire-web-packages/compare/@wireapp/react-ui-kit@9.4.0...@wireapp/react-ui-kit@9.4.1) --- updated-dependencies: - dependency-name: "@wireapp/react-ui-kit" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 28cdb1067cf..b9355870cad 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "@wireapp/avs": "9.1.11", "@wireapp/core": "39.2.7", "@wireapp/lru-cache": "3.8.1", - "@wireapp/react-ui-kit": "9.4.0", + "@wireapp/react-ui-kit": "9.4.1", "@wireapp/store-engine-dexie": "2.0.5", "@wireapp/store-engine-sqleet": "1.8.9", "@wireapp/webapp-events": "0.16.0", diff --git a/yarn.lock b/yarn.lock index 3aeb50178de..5d4420807c7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4531,9 +4531,9 @@ __metadata: languageName: node linkType: hard -"@wireapp/react-ui-kit@npm:9.4.0": - version: 9.4.0 - resolution: "@wireapp/react-ui-kit@npm:9.4.0" +"@wireapp/react-ui-kit@npm:9.4.1": + version: 9.4.1 + resolution: "@wireapp/react-ui-kit@npm:9.4.1" dependencies: "@types/color": 3.0.3 color: 4.2.3 @@ -4548,7 +4548,7 @@ __metadata: peerDependenciesMeta: "@types/react": optional: true - checksum: 058847c31afc8b74d6d77aec33b959c9178a14551dd7df1db92cbd5afc1ea6f8abf764ff0adf5961bb5e8f3e8186c99b746645e65cf0b72aa0478aa8640e0498 + checksum: f1b7fdd412a5e005b7dc16bd876f55a0b6d40c9b8b99c206ad598edbeb8fc5e906b83bf416cd9bd3ffbaf24685c738f18198ef032708c7afea51fd07adebd29d languageName: node linkType: hard @@ -16718,7 +16718,7 @@ dexie@latest: "@wireapp/eslint-config": 2.1.1 "@wireapp/lru-cache": 3.8.1 "@wireapp/prettier-config": 0.5.2 - "@wireapp/react-ui-kit": 9.4.0 + "@wireapp/react-ui-kit": 9.4.1 "@wireapp/store-engine": ^5.0.3 "@wireapp/store-engine-dexie": 2.0.5 "@wireapp/store-engine-sqleet": 1.8.9 From ea1df95b9ea6a74231a643967e4dd5ec6bf1ec34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patryk=20G=C3=B3rka?= Date: Mon, 20 Mar 2023 09:52:20 +0100 Subject: [PATCH 93/97] chore: bump avs version (#14861) --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index b9355870cad..75bba6655e6 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "dependencies": { "@emotion/react": "11.10.6", "@types/eslint": "8.4.10", - "@wireapp/avs": "9.1.11", + "@wireapp/avs": "9.1.13", "@wireapp/core": "39.2.7", "@wireapp/lru-cache": "3.8.1", "@wireapp/react-ui-kit": "9.4.1", diff --git a/yarn.lock b/yarn.lock index 5d4420807c7..35fcabcc7b4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4350,10 +4350,10 @@ __metadata: languageName: node linkType: hard -"@wireapp/avs@npm:9.1.11": - version: 9.1.11 - resolution: "@wireapp/avs@npm:9.1.11" - checksum: 9fe240ef1c051e85a1365a0cdf748740f376fe14bcb959e643db155a404cf0c73de17635bb1559d717fd6aabf160d665b58bd3a981ee55f4aaef97f9f8d634af +"@wireapp/avs@npm:9.1.13": + version: 9.1.13 + resolution: "@wireapp/avs@npm:9.1.13" + checksum: 35346acce6982f4ad0bae6b174dfb2fff996428cf3446d5795de549bde5b39166c1828b152cf9a69353b2ec549ea515817ea235ddfa058dc017b216cf91c966a languageName: node linkType: hard @@ -16712,7 +16712,7 @@ dexie@latest: "@types/webpack-env": 1.18.0 "@typescript-eslint/eslint-plugin": ^5.55.0 "@typescript-eslint/parser": ^5.55.0 - "@wireapp/avs": 9.1.11 + "@wireapp/avs": 9.1.13 "@wireapp/copy-config": 2.0.10 "@wireapp/core": 39.2.7 "@wireapp/eslint-config": 2.1.1 From c39d613889c5dbf2eedeb7341bc99f1048a0adb0 Mon Sep 17 00:00:00 2001 From: Virgile <78490891+V-Gira@users.noreply.github.com> Date: Mon, 20 Mar 2023 10:56:58 +0100 Subject: [PATCH 94/97] feat: show warning about unreachable users [FS-1573] (#14836) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: show warning about unreachable users [FS-1573] * implement warning when some federated users will never receive a message * create unit tests for unreachable users and mix of named and unreachable users Co-authored-by: Thomas Belin * address cr Co-authored-by: Przemysław Jóźwik * replace message logic by if statement * rename reduceWithCommas to joinWith and add a separator arg --------- Co-authored-by: Thomas Belin Co-authored-by: Przemysław Jóźwik --- src/i18n/en-US.json | 13 +- .../PartialFailureToSend.test.tsx | 119 ++++++++++++++++-- .../PartialFailureToSend.tsx | 96 ++++++++++---- 3 files changed, 194 insertions(+), 34 deletions(-) diff --git a/src/i18n/en-US.json b/src/i18n/en-US.json index 7372d8f4cf6..19bd978856c 100644 --- a/src/i18n/en-US.json +++ b/src/i18n/en-US.json @@ -673,12 +673,15 @@ "messageDetailsTitleLikes": "Liked{{count}}", "messageDetailsTitleReceipts": "Read{{count}}", "messageFailedToSendHideDetails": "Hide details", - "messageFailedToSendParticipants": "{{count}} Participants", + "messageFailedToSendParticipants": "{{count}} participants", + "messageFailedToSendParticipantsFromDomain": "{{count}} participants from {{domain}}", + "messageFailedToSendParticipantsFromDomainSingular": "1 participant from {{domain}}", "messageFailedToSendShowDetails": "Show details", - "messageFailedToSendToOne": "will receive your message later.", - "messageFailedToSendToSome": "had issues receiving this message.", - "messageFailedToSendWillNotReceive": "will not receive the message.", - "messageFailedToSendWillReceive": "will receive the message later.", + "messageFailedToSendToSome": "didn't get your message.", + "messageFailedToSendWillNotReceive": "won't get your message.", + "messageFailedToSendWillNotReceiveSingular": "won't get your message.", + "messageFailedToSendWillReceive": "will get your message later.", + "messageFailedToSendWillReceiveSingular": "will get your message later.", "messageWillNotBeSent": "File could not be sent due to connectivity issues.", "messageWillNotBeSentDiscard": "Discard", "mlsToggleInfo": "When this is on, conversation will use the new messaging layer security (MLS) protocol.", diff --git a/src/script/components/MessagesList/Message/ContentMessage/Warnings/PartialFailureToSend/PartialFailureToSend.test.tsx b/src/script/components/MessagesList/Message/ContentMessage/Warnings/PartialFailureToSend/PartialFailureToSend.test.tsx index 3756fe12bf2..1972e71fc87 100644 --- a/src/script/components/MessagesList/Message/ContentMessage/Warnings/PartialFailureToSend/PartialFailureToSend.test.tsx +++ b/src/script/components/MessagesList/Message/ContentMessage/Warnings/PartialFailureToSend/PartialFailureToSend.test.tsx @@ -19,6 +19,7 @@ import {act, render} from '@testing-library/react'; import type {QualifiedUserClients} from '@wireapp/api-client/lib/conversation'; +import {QualifiedId} from '@wireapp/api-client/lib/user'; import en from 'I18n/en-US.json'; import {withTheme} from 'src/script/auth/util/test/TestUtil'; @@ -45,19 +46,26 @@ function generateUserClients(users: User[]): QualifiedUserClients { }); return userClients; } +function generateQualifiedIds(nbUsers: number, domain: string) { + const users: QualifiedId[] = []; + for (let i = 0; i < nbUsers; i++) { + users.push({id: createRandomUuid(), domain}); + } + return users; +} describe('PartialFailureToSendWarning', () => { it('displays the number of users that did not get the message', () => { - const nbUsers = Math.floor(Math.random() * 100); + const nbUsers = Math.floor(Math.random() * 100) + 2; const users = generateUsers(nbUsers, 'domain'); const queued = generateUserClients(users); const {container} = render(withTheme()); - expect(container.textContent).toContain(`${nbUsers} Participants had issues receiving this message`); + expect(container.textContent).toContain(`${nbUsers} participants didn't get your message`); }); - it('displays the number of users that did not get the message across multiple domains', () => { - const nbUsersDomain1 = Math.floor(Math.random() * 100); + it('displays the number of named users that did not get the message across multiple domains', () => { + const nbUsersDomain1 = Math.floor(Math.random() * 100) + 2; const nbUsersDomain2 = Math.floor(Math.random() * 100); const users1 = generateUsers(nbUsersDomain1, 'domain1'); const users2 = generateUsers(nbUsersDomain2, 'domain2'); @@ -67,12 +75,48 @@ describe('PartialFailureToSendWarning', () => { ...generateUserClients(users2), }; const {container} = render(withTheme()); + expect(container.textContent).toContain(`${nbUsersDomain1 + nbUsersDomain2} participants didn't get your message`); + }); + + it('displays the number of unreachable users that did not get the message across multiple domains', () => { + const nbUsersDomain1 = Math.floor(Math.random() * 100) + 2; + const nbUsersDomain2 = Math.floor(Math.random() * 100); + const users1 = generateQualifiedIds(nbUsersDomain1, 'domain1'); + const users2 = generateQualifiedIds(nbUsersDomain2, 'domain2'); + + const failed = [...users1, ...users2]; + const {container} = render(withTheme()); + expect(container.textContent).toContain(`${nbUsersDomain1 + nbUsersDomain2} participants didn't get your message`); + }); + + it('displays the number of users, named or unreachable that did not get the message across multiple domains', () => { + const nbUsersDomain1 = Math.floor(Math.random() * 100) + 2; + const nbUsersDomain2 = Math.floor(Math.random() * 100); + const users1 = generateUsers(nbUsersDomain1, 'domain1'); + const users2 = generateUsers(nbUsersDomain2, 'domain2'); + + const queued = { + ...generateUserClients(users1), + ...generateUserClients(users2), + }; + + const nbUnreachableUsersDomain1 = Math.floor(Math.random() * 100); + const nbUnreachableUsersDomain2 = Math.floor(Math.random() * 100); + const unreachableUsers1 = generateQualifiedIds(nbUnreachableUsersDomain1, 'domain1'); + const unreachableUsers2 = generateQualifiedIds(nbUnreachableUsersDomain2, 'domain2'); + + const failed = [...unreachableUsers1, ...unreachableUsers2]; + const {container} = render( + withTheme(), + ); expect(container.textContent).toContain( - `${nbUsersDomain1 + nbUsersDomain2} Participants had issues receiving this message`, + `${ + nbUsersDomain1 + nbUsersDomain2 + nbUnreachableUsersDomain1 + nbUnreachableUsersDomain2 + } participants didn't get your message`, ); }); - it('does not show the extra info toggle if there is only a single user', () => { + it('does not show the extra info toggle if there is only a single named user', () => { const users = generateUsers(1, 'domain'); const queued = generateUserClients(users); const {queryByText, container} = render( @@ -80,7 +124,18 @@ describe('PartialFailureToSendWarning', () => { ); expect(queryByText('Show details')).toBeNull(); - expect(container.textContent).toContain(`${users[0].username()} will receive your message later`); + expect(container.textContent).toContain(`${users[0].username()} will get your message later`); + }); + + it('does not show the extra info toggle if there is only a single unreachable user', () => { + const users = generateQualifiedIds(1, 'domain'); + const failed = users; + const {queryByText, container} = render( + withTheme(), + ); + + expect(queryByText('Show details')).toBeNull(); + expect(container.textContent).toContain(`1 participant from domain won't get your message`); }); it('toggles the extra info', () => { @@ -113,7 +168,55 @@ describe('PartialFailureToSendWarning', () => { getByText('Show details').click(); }); - expect(getAllByTestId('recipient')).toHaveLength(nbUsers); + expect(getAllByTestId('named-user')).toHaveLength(nbUsers); expect(getByText('Hide details')).not.toBeNull(); }); + + it('displays both the username of named participants and the correct domain of unreachable users when applicable', () => { + const nbNamedUsers = Math.floor(Math.random() * 10) + 2; + const namedUsers = generateUsers(nbNamedUsers, 'domain'); + const queued = generateUserClients(namedUsers); + + const nbUsersDomain1 = Math.floor(Math.random() * 10) + 2; + const nbUsersDomain2 = Math.floor(Math.random() * 10) + 2; + const failed = [ + ...generateQualifiedIds(nbUsersDomain1, 'domain1'), + ...generateQualifiedIds(nbUsersDomain2, 'domain2'), + ]; + + const {getByText, getAllByTestId, container} = render( + withTheme(), + ); + + act(() => { + getByText('Show details').click(); + }); + + expect(getAllByTestId('named-user')).toHaveLength(nbNamedUsers); + expect(container.textContent).toContain( + `${nbUsersDomain1} participants from domain1, ${nbUsersDomain2} participants from domain2 won't get your message`, + ); + }); + + it('displays the info toggle when there is a single named user and a single unreachable user', () => { + const namedUsers = generateUsers(1, 'domain1'); + const queued = generateUserClients(namedUsers); + + const failed = [...generateQualifiedIds(1, 'domain2')]; + + const {getByText} = render( + withTheme(), + ); + act(() => { + getByText('Show details').click(); + }); + + expect(getByText('Hide details')).not.toBeNull(); + + act(() => { + getByText('Hide details').click(); + }); + + expect(getByText('Show details')).not.toBeNull(); + }); }); diff --git a/src/script/components/MessagesList/Message/ContentMessage/Warnings/PartialFailureToSend/PartialFailureToSend.tsx b/src/script/components/MessagesList/Message/ContentMessage/Warnings/PartialFailureToSend/PartialFailureToSend.tsx index 66ebe53ad66..28f1cb30eab 100644 --- a/src/script/components/MessagesList/Message/ContentMessage/Warnings/PartialFailureToSend/PartialFailureToSend.tsx +++ b/src/script/components/MessagesList/Message/ContentMessage/Warnings/PartialFailureToSend/PartialFailureToSend.tsx @@ -21,6 +21,7 @@ import {useState} from 'react'; import type {QualifiedUserClients} from '@wireapp/api-client/lib/conversation'; import {QualifiedId} from '@wireapp/api-client/lib/user'; +import {countBy, map} from 'underscore'; import {Bold, Button, ButtonVariant} from '@wireapp/react-ui-kit'; @@ -60,23 +61,41 @@ function generateNamedUsers(users: User[], userClients: QualifiedUserClients): P ); } +function generateUnreachableUsers(users: QualifiedId[]) { + const userCountByDomain = countBy(users, 'domain'); + return map(userCountByDomain, (count, domain) => ({count, domain})); +} + +function joinWith(elements: React.ReactNode[], separator: string) { + return elements.reduce((prev, element) => { + return prev.length === 0 ? [element] : [...prev, separator, element]; + }, []); +} + export const PartialFailureToSendWarning = ({failedToSend, knownUsers}: Props) => { const [isOpen, setIsOpen] = useState(false); - const {queued = {}} = failedToSend; + const {queued = {}, failed = []} = failedToSend; - const userCount = Object.entries(queued).reduce((count, [_domain, users]) => count + Object.keys(users).length, 0); + const userCount = + Object.entries(queued).reduce((count, [_domain, users]) => count + Object.keys(users).length, 0) + failed.length; const showToggle = userCount > 1; const {namedUsers} = generateNamedUsers(knownUsers, queued); - const message = - namedUsers.length === 1 - ? {head: namedUsers[0].username(), rest: t('messageFailedToSendToOne')} - : { - head: t('messageFailedToSendParticipants', {count: userCount.toString()}), - rest: t('messageFailedToSendToSome'), - }; + const unreachableUsers = generateUnreachableUsers(failed); + + const message = {head: '', rest: ''}; + if (showToggle) { + message.head = t('messageFailedToSendParticipants', {count: userCount.toString()}); + message.rest = t('messageFailedToSendToSome'); + } else if (namedUsers.length === 1) { + message.head = namedUsers[0].username(); + message.rest = t('messageFailedToSendWillReceiveSingular'); + } else if (unreachableUsers.length === 1) { + message.head = t('messageFailedToSendParticipantsFromDomainSingular', {domain: unreachableUsers[0].domain}); + message.rest = t('messageFailedToSendWillNotReceiveSingular'); + } return (
@@ -86,18 +105,53 @@ export const PartialFailureToSendWarning = ({failedToSend, knownUsers}: Props) = {showToggle && ( <> {isOpen && ( -

- {namedUsers - .map(user => ( - - {user.username()} - - )) - .reduce((prev, element) => { - return prev.length === 0 ? [element] : [...prev, ', ', element]; - }, [])} - {` ${t('messageFailedToSendWillReceive')}`} -

+ <> + {/* maps through the known users that will receive the message later: + "Alice, Bob will get your message later" */} + {namedUsers.length !== 0 && ( +

+ {joinWith( + namedUsers.map(user => ( + + {user.username()} + + )), + ', ', + )} + {` ${t('messageFailedToSendWillReceive')}`} +

+ )} + + {/* maps through the unreachable users that will never receive the message: + "3 participants from alpha.domain, 1 participant from beta.domain won't get your message" */} + {failed && ( +

+ {joinWith( + unreachableUsers.map(user => ( + + {user.count > 1 + ? t('messageFailedToSendParticipantsFromDomain', { + count: user.count.toString(), + domain: user.domain, + }) + : t('messageFailedToSendParticipantsFromDomainSingular', { + domain: user.domain, + })} + + )), + ', ', + )} + {unreachableUsers.length === 1 + ? ` ${t('messageFailedToSendWillNotReceiveSingular')}` + : ` ${t('messageFailedToSendWillNotReceive')}`} +

+ )} + )}