From fa80e0f37478d4048e4ff647145b5da17a571561 Mon Sep 17 00:00:00 2001 From: Amir Ghezelbash Date: Thu, 10 Oct 2024 13:02:27 +0300 Subject: [PATCH 01/15] fix: Add abort controller to notifications api call (WPB-11013) --- packages/api-client/src/http/HttpClient.ts | 24 +++++++++++++------ .../NotificationAPI/NotificationAPI.ts | 16 ++++++++++--- .../api-client/src/tcp/WebSocketClient.ts | 16 +++---------- packages/core/src/Account.ts | 7 +++--- .../NotificationBackendRepository.ts | 4 ++-- .../src/notification/NotificationService.ts | 11 ++++----- 6 files changed, 44 insertions(+), 34 deletions(-) diff --git a/packages/api-client/src/http/HttpClient.ts b/packages/api-client/src/http/HttpClient.ts index 56b8505110..09e46d349f 100644 --- a/packages/api-client/src/http/HttpClient.ts +++ b/packages/api-client/src/http/HttpClient.ts @@ -131,7 +131,11 @@ export class HttpClient extends EventEmitter { } } - public async _sendRequest(config: AxiosRequestConfig, isFirstTry = true): Promise> { + public async _sendRequest( + config: AxiosRequestConfig, + isFirstTry = true, + abortController?: AbortController, + ): Promise> { if (this.accessTokenStore.accessToken) { // TODO: remove tokenAsParam const {token_type, access_token} = this.accessTokenStore.accessToken; @@ -145,6 +149,7 @@ export class HttpClient extends EventEmitter { try { const response = await this.client.request({ ...config, + signal: abortController?.signal, // We want to prefix all urls, except the ones with cookies which are attached to unprefixed urls url: config.withCredentials ? config.url : `${this.versionPrefix}${config.url}`, maxBodyLength: FILE_SIZE_100_MB, @@ -161,7 +166,7 @@ export class HttpClient extends EventEmitter { config['axios-retry'] = { retries: 0, }; - return this._sendRequest(config, false); + return this._sendRequest(config, false, abortController); }; const hasAccessToken = !!this.accessTokenStore?.accessToken; @@ -276,10 +281,11 @@ export class HttpClient extends EventEmitter { public async sendRequest( config: AxiosRequestConfig, isSynchronousRequest: boolean = false, + abortController?: AbortController, ): Promise> { const promise = isSynchronousRequest - ? this.requestQueue.add(() => this._sendRequest(config)) - : this._sendRequest(config); + ? this.requestQueue.add(() => this._sendRequest(config, true, abortController)) + : this._sendRequest(config, true, abortController); try { return await promise; @@ -289,14 +295,18 @@ export class HttpClient extends EventEmitter { const isTooManyRequestsError = axios.isAxiosError(error) && error.response?.status === 420; if (isTooManyRequestsError) { - return this.backOffQueue.add(() => this._sendRequest(config)); + return this.backOffQueue.add(() => this._sendRequest(config, true, abortController)); } throw error; } } - public sendJSON(config: AxiosRequestConfig, isSynchronousRequest: boolean = false): Promise> { + public sendJSON( + config: AxiosRequestConfig, + isSynchronousRequest: boolean = false, + abortController?: AbortController, + ): Promise> { const shouldGzipData = process.env.NODE_ENV !== 'test' && !!config.data && @@ -312,7 +322,7 @@ export class HttpClient extends EventEmitter { 'Content-Encoding': shouldGzipData ? 'gzip' : config.headers?.['Content-Encoding'], }; - return this.sendRequest(config, isSynchronousRequest); + return this.sendRequest(config, isSynchronousRequest, abortController); } public sendXML(config: AxiosRequestConfig): Promise> { diff --git a/packages/api-client/src/notification/NotificationAPI/NotificationAPI.ts b/packages/api-client/src/notification/NotificationAPI/NotificationAPI.ts index 1b820135c3..34b0da279f 100644 --- a/packages/api-client/src/notification/NotificationAPI/NotificationAPI.ts +++ b/packages/api-client/src/notification/NotificationAPI/NotificationAPI.ts @@ -65,6 +65,7 @@ export class NotificationAPI { clientId?: string, size: number = NOTIFICATION_SIZE_MAXIMUM, since?: string, + abortController?: AbortController, ): Promise { const config: AxiosRequestConfig = { method: 'get', @@ -76,7 +77,7 @@ export class NotificationAPI { url: NotificationAPI.URL.NOTIFICATION, }; - const response = await this.client.sendJSON(config); + const response = await this.client.sendJSON(config, false, abortController); return response.data; } @@ -86,7 +87,11 @@ export class NotificationAPI { * @param lastNotificationId Only return notifications more recent than this * @see https://staging-nginz-https.zinfra.io/swagger-ui/#!/push/fetchNotifications */ - public async getAllNotifications(clientId?: string, lastNotificationId?: string): Promise { + public async getAllNotifications( + clientId?: string, + lastNotificationId?: string, + abortController?: AbortController, + ): Promise { const getNotificationChunks = async ( notificationList: Notification[], currentClientId?: string, @@ -101,7 +106,12 @@ export class NotificationAPI { let hasMissedNotifications = false; try { - payload = await this.getNotifications(currentClientId, NOTIFICATION_SIZE_MAXIMUM, currentNotificationId); + payload = await this.getNotifications( + currentClientId, + NOTIFICATION_SIZE_MAXIMUM, + currentNotificationId, + abortController, + ); } catch (error) { const isAxiosError = axios.isAxiosError(error); diff --git a/packages/api-client/src/tcp/WebSocketClient.ts b/packages/api-client/src/tcp/WebSocketClient.ts index c99d669b91..be82cae200 100644 --- a/packages/api-client/src/tcp/WebSocketClient.ts +++ b/packages/api-client/src/tcp/WebSocketClient.ts @@ -42,17 +42,7 @@ export interface WebSocketClient { on(event: TOPIC.ON_STATE_CHANGE, listener: (state: WEBSOCKET_STATE) => void): this; } -export class AbortHandler { - private aborted = false; - - abort = () => { - this.aborted = true; - }; - - isAborted = () => this.aborted; -} - -export type OnConnect = (abortHandler: AbortHandler) => Promise; +export type OnConnect = (abortHandler: AbortController) => Promise; export class WebSocketClient extends EventEmitter { private clientId?: string; @@ -64,7 +54,7 @@ export class WebSocketClient extends EventEmitter { public client: HttpClient; private isSocketLocked: boolean; private bufferedMessages: string[]; - private abortHandler?: AbortHandler; + private abortHandler?: AbortController; public static readonly TOPIC = TOPIC; @@ -146,7 +136,7 @@ export class WebSocketClient extends EventEmitter { this.socket.setOnOpen(() => { this.onOpen(); if (onConnect) { - this.abortHandler = new AbortHandler(); + this.abortHandler = new AbortController(); void onConnect(this.abortHandler); } }); diff --git a/packages/core/src/Account.ts b/packages/core/src/Account.ts index 2fc16928ab..ec1ec3a0c4 100644 --- a/packages/core/src/Account.ts +++ b/packages/core/src/Account.ts @@ -32,7 +32,7 @@ import {SUBCONVERSATION_ID} from '@wireapp/api-client/lib/conversation'; import * as Events from '@wireapp/api-client/lib/event'; import {CONVERSATION_EVENT} from '@wireapp/api-client/lib/event'; import {Notification} from '@wireapp/api-client/lib/notification/'; -import {AbortHandler, WebSocketClient} from '@wireapp/api-client/lib/tcp/'; +import {WebSocketClient} from '@wireapp/api-client/lib/tcp/'; import {WEBSOCKET_STATE} from '@wireapp/api-client/lib/tcp/ReconnectingWebsocket'; import {QualifiedId} from '@wireapp/api-client/lib/user'; import {TimeInMillis} from '@wireapp/commons/lib/util/TimeUtil'; @@ -635,7 +635,7 @@ export class Account extends TypedEventEmitter { return onMissedNotifications(notificationId); }; - const processNotificationStream = async (abortHandler: AbortHandler) => { + const processNotificationStream = async (abortHandler: AbortController) => { // Lock websocket in order to buffer any message that arrives while we handle the notification stream this.apiClient.transport.ws.lock(); pauseMessageSending(); @@ -653,7 +653,7 @@ export class Account extends TypedEventEmitter { ); this.logger.info(`Finished processing notifications ${JSON.stringify(results)}`, results); - if (abortHandler.isAborted()) { + if (abortHandler.signal.aborted) { this.logger.warn('Ending connection process as websocket was closed'); return; } @@ -666,6 +666,7 @@ export class Account extends TypedEventEmitter { resumeMessageSending(); resumeRejoiningMLSConversations(); }; + this.apiClient.connect(processNotificationStream); return () => { diff --git a/packages/core/src/notification/NotificationBackendRepository.ts b/packages/core/src/notification/NotificationBackendRepository.ts index 755bd0531e..129d808733 100644 --- a/packages/core/src/notification/NotificationBackendRepository.ts +++ b/packages/core/src/notification/NotificationBackendRepository.ts @@ -24,8 +24,8 @@ import {APIClient} from '@wireapp/api-client'; export class NotificationBackendRepository { constructor(private readonly apiClient: APIClient) {} - public async getAllNotifications(clientId?: string, lastNotificationId?: string) { - return this.apiClient.api.notification.getAllNotifications(clientId, lastNotificationId); + public async getAllNotifications(clientId?: string, lastNotificationId?: string, abortController?: AbortController) { + return this.apiClient.api.notification.getAllNotifications(clientId, lastNotificationId, abortController); } public getLastNotification(clientId?: string): Promise { diff --git a/packages/core/src/notification/NotificationService.ts b/packages/core/src/notification/NotificationService.ts index 0eec751fc7..9733a86639 100644 --- a/packages/core/src/notification/NotificationService.ts +++ b/packages/core/src/notification/NotificationService.ts @@ -19,7 +19,6 @@ import {BackendEvent} from '@wireapp/api-client/lib/event'; import {Notification} from '@wireapp/api-client/lib/notification/'; -import {AbortHandler} from '@wireapp/api-client/lib/tcp'; import logdown from 'logdown'; import {APIClient} from '@wireapp/api-client'; @@ -90,9 +89,9 @@ export class NotificationService extends TypedEventEmitter { this.database = new NotificationDatabaseRepository(storeEngine); } - private async getAllNotifications(since: string) { + private async getAllNotifications(since: string, abortController: AbortController) { const clientId = this.apiClient.clientId; - return this.backend.getAllNotifications(clientId, since); + return this.backend.getAllNotifications(clientId, since, abortController); } /** Should only be called with a completely new client. */ @@ -140,10 +139,10 @@ export class NotificationService extends TypedEventEmitter { public async processNotificationStream( notificationHandler: NotificationHandler, onMissedNotifications: (notificationId: string) => void, - abortHandler: AbortHandler, + abortHandler: AbortController, ): Promise<{total: number; error: number; success: number}> { const lastNotificationId = await this.database.getLastNotificationId(); - const {notifications, missedNotification} = await this.getAllNotifications(lastNotificationId); + const {notifications, missedNotification} = await this.getAllNotifications(lastNotificationId, abortHandler); if (missedNotification) { onMissedNotifications(missedNotification); } @@ -155,7 +154,7 @@ export class NotificationService extends TypedEventEmitter { : `No notification to process from the stream`; this.logger.log(logMessage); for (const [index, notification] of notifications.entries()) { - if (abortHandler.isAborted()) { + if (abortHandler.signal.aborted) { /* Stop handling notifications if the websocket has been disconnected. * Upon reconnecting we are going to restart handling the notification stream for where we left of */ From 8d981a1a82b398c232567687365ab2a413b710e0 Mon Sep 17 00:00:00 2001 From: Amir Ghezelbash Date: Thu, 10 Oct 2024 14:00:22 +0300 Subject: [PATCH 02/15] Update packages/api-client/src/http/HttpClient.ts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Przemysław Jóźwik --- packages/api-client/src/http/HttpClient.ts | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/packages/api-client/src/http/HttpClient.ts b/packages/api-client/src/http/HttpClient.ts index 09e46d349f..90b40477ae 100644 --- a/packages/api-client/src/http/HttpClient.ts +++ b/packages/api-client/src/http/HttpClient.ts @@ -131,11 +131,16 @@ export class HttpClient extends EventEmitter { } } - public async _sendRequest( - config: AxiosRequestConfig, +type SendRequest = { + config: AxiosRequestConfig; + isFirstTry?: boolean, + abortController?: AbortController +} + public async _sendRequest({ + config, isFirstTry = true, - abortController?: AbortController, - ): Promise> { + abortController, + }): Promise> { if (this.accessTokenStore.accessToken) { // TODO: remove tokenAsParam const {token_type, access_token} = this.accessTokenStore.accessToken; From 8e2d8c404d544b3d86f5a48145a1fbf2a4527fd3 Mon Sep 17 00:00:00 2001 From: Amir Ghezelbash Date: Thu, 10 Oct 2024 14:00:32 +0300 Subject: [PATCH 03/15] Update packages/api-client/src/http/HttpClient.ts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Przemysław Jóźwik --- packages/api-client/src/http/HttpClient.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/api-client/src/http/HttpClient.ts b/packages/api-client/src/http/HttpClient.ts index 90b40477ae..f67545385f 100644 --- a/packages/api-client/src/http/HttpClient.ts +++ b/packages/api-client/src/http/HttpClient.ts @@ -171,7 +171,7 @@ type SendRequest = { config['axios-retry'] = { retries: 0, }; - return this._sendRequest(config, false, abortController); + return this._sendRequest({config, isFirstTry: false, abortController}); }; const hasAccessToken = !!this.accessTokenStore?.accessToken; From f9296d56ac0113242a88914c7cbfe0353f960540 Mon Sep 17 00:00:00 2001 From: Amir Ghezelbash Date: Thu, 10 Oct 2024 14:00:40 +0300 Subject: [PATCH 04/15] Update packages/api-client/src/http/HttpClient.ts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Przemysław Jóźwik --- packages/api-client/src/http/HttpClient.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/api-client/src/http/HttpClient.ts b/packages/api-client/src/http/HttpClient.ts index f67545385f..88898a06bb 100644 --- a/packages/api-client/src/http/HttpClient.ts +++ b/packages/api-client/src/http/HttpClient.ts @@ -289,8 +289,8 @@ type SendRequest = { abortController?: AbortController, ): Promise> { const promise = isSynchronousRequest - ? this.requestQueue.add(() => this._sendRequest(config, true, abortController)) - : this._sendRequest(config, true, abortController); + ? this.requestQueue.add(() => this._sendRequest({config, abortController})) + : this._sendRequest({config, abortController}); try { return await promise; From 44fee6566c39bdddc30640db976422457fb8ee3c Mon Sep 17 00:00:00 2001 From: Amir Ghezelbash Date: Thu, 10 Oct 2024 14:00:49 +0300 Subject: [PATCH 05/15] Update packages/api-client/src/http/HttpClient.ts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Przemysław Jóźwik --- packages/api-client/src/http/HttpClient.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/api-client/src/http/HttpClient.ts b/packages/api-client/src/http/HttpClient.ts index 88898a06bb..09e1c059e7 100644 --- a/packages/api-client/src/http/HttpClient.ts +++ b/packages/api-client/src/http/HttpClient.ts @@ -300,7 +300,7 @@ type SendRequest = { const isTooManyRequestsError = axios.isAxiosError(error) && error.response?.status === 420; if (isTooManyRequestsError) { - return this.backOffQueue.add(() => this._sendRequest(config, true, abortController)); + return this.backOffQueue.add(() => this._sendRequest({config, abortController})); } throw error; From 6768d8f62cb37b8596a36194bf77a7bad38c2f0a Mon Sep 17 00:00:00 2001 From: Amir Ghezelbash Date: Thu, 10 Oct 2024 14:00:56 +0300 Subject: [PATCH 06/15] Update packages/api-client/src/http/HttpClient.ts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Przemysław Jóźwik --- packages/api-client/src/http/HttpClient.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/api-client/src/http/HttpClient.ts b/packages/api-client/src/http/HttpClient.ts index 09e1c059e7..b3ceb5cee0 100644 --- a/packages/api-client/src/http/HttpClient.ts +++ b/packages/api-client/src/http/HttpClient.ts @@ -327,7 +327,7 @@ type SendRequest = { 'Content-Encoding': shouldGzipData ? 'gzip' : config.headers?.['Content-Encoding'], }; - return this.sendRequest(config, isSynchronousRequest, abortController); + return this.sendRequest({config, isFirstTry: isSynchronousRequest, abortController}); } public sendXML(config: AxiosRequestConfig): Promise> { From ea1ce9b942051d6e9992d0c2f5893c07f7b00f51 Mon Sep 17 00:00:00 2001 From: Amir Ghezelbash Date: Thu, 10 Oct 2024 14:02:54 +0300 Subject: [PATCH 07/15] fix broken code --- packages/api-client/src/http/HttpClient.ts | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/packages/api-client/src/http/HttpClient.ts b/packages/api-client/src/http/HttpClient.ts index b3ceb5cee0..19851aab0f 100644 --- a/packages/api-client/src/http/HttpClient.ts +++ b/packages/api-client/src/http/HttpClient.ts @@ -46,6 +46,12 @@ enum TOPIC { ON_INVALID_TOKEN = 'HttpClient.TOPIC.ON_INVALID_TOKEN', } +type SendRequest = { + config: AxiosRequestConfig; + isFirstTry?: boolean; + abortController?: AbortController; +}; + export interface HttpClient { on(event: TOPIC.ON_CONNECTION_STATE_CHANGE, listener: (state: ConnectionState) => void): this; @@ -131,16 +137,7 @@ export class HttpClient extends EventEmitter { } } -type SendRequest = { - config: AxiosRequestConfig; - isFirstTry?: boolean, - abortController?: AbortController -} - public async _sendRequest({ - config, - isFirstTry = true, - abortController, - }): Promise> { + public async _sendRequest({config, isFirstTry = true, abortController}: SendRequest): Promise> { if (this.accessTokenStore.accessToken) { // TODO: remove tokenAsParam const {token_type, access_token} = this.accessTokenStore.accessToken; @@ -327,7 +324,7 @@ type SendRequest = { 'Content-Encoding': shouldGzipData ? 'gzip' : config.headers?.['Content-Encoding'], }; - return this.sendRequest({config, isFirstTry: isSynchronousRequest, abortController}); + return this.sendRequest(config, isSynchronousRequest, abortController); } public sendXML(config: AxiosRequestConfig): Promise> { From 3e76752f7376f3c9163f33ccadcff6666702e498 Mon Sep 17 00:00:00 2001 From: Amir Ghezelbash Date: Thu, 10 Oct 2024 14:11:48 +0300 Subject: [PATCH 08/15] fix tests --- packages/api-client/src/http/HttpClient.test.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/api-client/src/http/HttpClient.test.ts b/packages/api-client/src/http/HttpClient.test.ts index c8a62211e4..68c2449bcd 100644 --- a/packages/api-client/src/http/HttpClient.test.ts +++ b/packages/api-client/src/http/HttpClient.test.ts @@ -56,7 +56,7 @@ describe('HttpClient', () => { return Promise.resolve(mockedAccessTokenStore.accessToken!); }; - await client._sendRequest({method: 'GET', baseURL: testConfig.urls.rest, url: AuthAPI.URL.ACCESS}); + await client._sendRequest({config: {method: 'GET', baseURL: testConfig.urls.rest, url: AuthAPI.URL.ACCESS}}); }); it('does not retry on 403 invalid token', async () => { @@ -73,7 +73,7 @@ describe('HttpClient', () => { let backendError; try { - await client._sendRequest({method: 'GET', baseURL: testConfig.urls.rest, url: AuthAPI.URL.ACCESS}); + await client._sendRequest({config: {method: 'GET', baseURL: testConfig.urls.rest, url: AuthAPI.URL.ACCESS}}); throw new Error('Should not resolve'); } catch (error) { backendError = error; @@ -97,7 +97,7 @@ describe('HttpClient', () => { }; let backendError; try { - await client._sendRequest({method: 'GET', baseURL: testConfig.urls.rest, url: AuthAPI.URL.ACCESS}); + await client._sendRequest({config: {method: 'GET', baseURL: testConfig.urls.rest, url: AuthAPI.URL.ACCESS}}); throw new Error('Should not resolve'); } catch (error) { backendError = error; From 4cbbbf1510332cf7e66cbf87b3789ca9a8d5e31a Mon Sep 17 00:00:00 2001 From: Amir Ghezelbash Date: Thu, 10 Oct 2024 14:46:14 +0300 Subject: [PATCH 09/15] fix broken tests --- packages/api-client/src/shims/browser/cookie.ts | 2 +- packages/api-client/src/shims/node/cookie.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/api-client/src/shims/browser/cookie.ts b/packages/api-client/src/shims/browser/cookie.ts index e287b4c26a..04d162d5af 100644 --- a/packages/api-client/src/shims/browser/cookie.ts +++ b/packages/api-client/src/shims/browser/cookie.ts @@ -26,4 +26,4 @@ export const retrieveCookie = (response: AxiosResponse): Promis Promise.resolve(response.data); export const sendRequestWithCookie = (client: HttpClient, config: AxiosRequestConfig): Promise> => - client._sendRequest(config); + client._sendRequest({config}); diff --git a/packages/api-client/src/shims/node/cookie.ts b/packages/api-client/src/shims/node/cookie.ts index 5681a90c80..33c997e6a5 100644 --- a/packages/api-client/src/shims/node/cookie.ts +++ b/packages/api-client/src/shims/node/cookie.ts @@ -63,5 +63,5 @@ export const sendRequestWithCookie = async ( config.headers.set('Cookie', `zuid=${cookie.zuid}`); config.withCredentials = true; } - return client._sendRequest(config); + return client._sendRequest({config}); }; From 19a88e545993e7185c74da0a12662b92d0e77bfd Mon Sep 17 00:00:00 2001 From: Amir Ghezelbash Date: Mon, 14 Oct 2024 11:34:59 +0300 Subject: [PATCH 10/15] remove @types/rimraf --- package.json | 1 - packages/bazinga64/package.json | 1 - packages/certificate-check/package.json | 1 - packages/commons/package.json | 1 - packages/copy-config/package.json | 1 - packages/core/package.json | 1 - packages/license-collector/package.json | 1 - packages/priority-queue/package.json | 1 - packages/promise-queue/package.json | 1 - packages/react-ui-kit/package.json | 1 - packages/store-engine-dexie/package.json | 1 - packages/store-engine-fs/package.json | 1 - packages/store-engine/package.json | 1 - packages/webapp-events/package.json | 1 - yarn.lock | 75 +----------------------- 15 files changed, 1 insertion(+), 88 deletions(-) diff --git a/package.json b/package.json index 5d9a76e1a4..7a7e15f054 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,6 @@ "@types/babel__core": "^7", "@types/jest": "^29.2.0", "@types/node": "^22.0.0", - "@types/rimraf": "4.0.5", "@typescript-eslint/eslint-plugin": "7.17.0", "@typescript-eslint/parser": "7.17.0", "@wireapp/eslint-config": "workspace:^", diff --git a/packages/bazinga64/package.json b/packages/bazinga64/package.json index 3fe7a2b597..6cfefb631f 100644 --- a/packages/bazinga64/package.json +++ b/packages/bazinga64/package.json @@ -26,7 +26,6 @@ "@types/jest": "^29.2.0", "@types/libsodium-wrappers-sumo": "0.7.8", "@types/node": "^22.0.0", - "@types/rimraf": "4.0.5", "cross-env": "7.0.3", "jest": "^29.2.1", "libsodium-wrappers-sumo": "0.7.15", diff --git a/packages/certificate-check/package.json b/packages/certificate-check/package.json index 0a67715652..dbdd5160bc 100644 --- a/packages/certificate-check/package.json +++ b/packages/certificate-check/package.json @@ -16,7 +16,6 @@ "@types/jest": "^29.2.0", "@types/jsrsasign": "10.5.14", "@types/node": "^22.0.0", - "@types/rimraf": "4.0.5", "jest": "^29.2.1", "rimraf": "6.0.1", "ts-node": "^10.9.1", diff --git a/packages/commons/package.json b/packages/commons/package.json index 10bde878a0..fccb98f50d 100644 --- a/packages/commons/package.json +++ b/packages/commons/package.json @@ -23,7 +23,6 @@ "@types/fs-extra": "11.0.4", "@types/jest": "^29.2.0", "@types/platform": "1.3.6", - "@types/rimraf": "4.0.5", "jest": "^29.2.1", "rimraf": "6.0.1", "typescript": "^5.0.4" diff --git a/packages/copy-config/package.json b/packages/copy-config/package.json index 6e87cd2b87..e9fe0b7b79 100644 --- a/packages/copy-config/package.json +++ b/packages/copy-config/package.json @@ -24,7 +24,6 @@ "@types/copy": "0.3.5", "@types/fs-extra": "11.0.4", "@types/jest": "^29.2.0", - "@types/rimraf": "4.0.5", "jest": "^29.2.1", "typescript": "^5.0.4" }, diff --git a/packages/core/package.json b/packages/core/package.json index 7209984977..c882cb777a 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -36,7 +36,6 @@ "@swc/jest": "^0.2.23", "@types/jest": "^29.2.0", "@types/long": "^5.0.0", - "@types/rimraf": "4.0.5", "@types/tough-cookie": "4.0.5", "@types/uuid": "9.0.8", "commander": "12.1.0", diff --git a/packages/license-collector/package.json b/packages/license-collector/package.json index e9f4fe9572..fa5d7069a1 100644 --- a/packages/license-collector/package.json +++ b/packages/license-collector/package.json @@ -20,7 +20,6 @@ "@types/fs-extra": "11.0.4", "@types/license-checker": "^25", "@types/npm-registry-package-info": "1.0.4", - "@types/rimraf": "4.0.5", "license-checker": "^25.0.1", "rimraf": "6.0.1", "typescript": "^5.0.4" diff --git a/packages/priority-queue/package.json b/packages/priority-queue/package.json index 48c6ced35f..27285605c6 100644 --- a/packages/priority-queue/package.json +++ b/packages/priority-queue/package.json @@ -12,7 +12,6 @@ "@swc/jest": "^0.2.23", "@types/jest": "^29.2.0", "@types/node": "^22.0.0", - "@types/rimraf": "4.0.5", "jest": "^29.2.1", "rimraf": "6.0.1", "ts-node": "^10.9.1", diff --git a/packages/promise-queue/package.json b/packages/promise-queue/package.json index d50b5ea551..f1064e2e8f 100644 --- a/packages/promise-queue/package.json +++ b/packages/promise-queue/package.json @@ -11,7 +11,6 @@ "@swc/core": "^1.3.10", "@swc/jest": "^0.2.23", "@types/jest": "^29.2.0", - "@types/rimraf": "4.0.5", "@wireapp/commons": "workspace:^", "jest": "^29.2.1", "rimraf": "6.0.1", diff --git a/packages/react-ui-kit/package.json b/packages/react-ui-kit/package.json index 9f5e016de2..8da2fb0ca6 100644 --- a/packages/react-ui-kit/package.json +++ b/packages/react-ui-kit/package.json @@ -33,7 +33,6 @@ "@types/node": "^22.0.0", "@types/react": "^18.0.25", "@types/react-dom": "^18.0.8", - "@types/rimraf": "4.0.5", "@types/webpack-env": "1.18.5", "babel-jest": "29.7.0", "babel-loader": "9.2.1", diff --git a/packages/store-engine-dexie/package.json b/packages/store-engine-dexie/package.json index 058a7d4db6..04685163df 100644 --- a/packages/store-engine-dexie/package.json +++ b/packages/store-engine-dexie/package.json @@ -18,7 +18,6 @@ "@swc/jest": "^0.2.23", "@types/jest": "^29.2.0", "@types/node": "^22.0.0", - "@types/rimraf": "4.0.5", "@types/uuid": "9.0.8", "@wireapp/store-engine": "5.1.8", "core-js": "^3.36.0", diff --git a/packages/store-engine-fs/package.json b/packages/store-engine-fs/package.json index b875739d4e..ddda2bdfd8 100644 --- a/packages/store-engine-fs/package.json +++ b/packages/store-engine-fs/package.json @@ -19,7 +19,6 @@ "@types/fs-extra": "11.0.4", "@types/jest": "^29.2.0", "@types/node": "^22.0.0", - "@types/rimraf": "4.0.5", "@wireapp/store-engine": "5.1.8", "jest": "^29.2.1", "rimraf": "6.0.1", diff --git a/packages/store-engine/package.json b/packages/store-engine/package.json index 0a6ef3951f..facfd35bc1 100644 --- a/packages/store-engine/package.json +++ b/packages/store-engine/package.json @@ -19,7 +19,6 @@ "@swc/jest": "^0.2.23", "@types/jest": "^29.2.0", "@types/node": "^22.0.0", - "@types/rimraf": "4.0.5", "jest": "^29.2.1", "rimraf": "6.0.1", "ts-node": "10.9.2", diff --git a/packages/webapp-events/package.json b/packages/webapp-events/package.json index 3323edfc19..6aa56ceddc 100644 --- a/packages/webapp-events/package.json +++ b/packages/webapp-events/package.json @@ -8,7 +8,6 @@ ], "main": "lib/index", "devDependencies": { - "@types/rimraf": "4.0.5", "rimraf": "6.0.1", "typescript": "^5.0.4" }, diff --git a/yarn.lock b/yarn.lock index 3cdb704b58..1d1921d5d7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4676,15 +4676,6 @@ __metadata: languageName: node linkType: hard -"@types/rimraf@npm:4.0.5": - version: 4.0.5 - resolution: "@types/rimraf@npm:4.0.5" - dependencies: - rimraf: "*" - checksum: 8c7201ff0ea89c4917d5010b22113e906930da65b6506ff4b45f99bde39099dc5195f095206fde8b84bc364cf801ee5eaf594c2676d3f3dd0e468344ab316187 - languageName: node - linkType: hard - "@types/semver@npm:^7.3.12": version: 7.5.0 resolution: "@types/semver@npm:7.5.0" @@ -5343,7 +5334,6 @@ __metadata: "@types/jest": ^29.2.0 "@types/jsrsasign": 10.5.14 "@types/node": ^22.0.0 - "@types/rimraf": 4.0.5 jest: ^29.2.1 jsrsasign: 11.1.0 rimraf: 6.0.1 @@ -5361,7 +5351,6 @@ __metadata: "@types/fs-extra": 11.0.4 "@types/jest": ^29.2.0 "@types/platform": 1.3.6 - "@types/rimraf": 4.0.5 ansi-regex: 5.0.1 fs-extra: 11.2.0 jest: ^29.2.1 @@ -5382,7 +5371,6 @@ __metadata: "@types/copy": 0.3.5 "@types/fs-extra": 11.0.4 "@types/jest": ^29.2.0 - "@types/rimraf": 4.0.5 axios: 1.7.7 copy: 0.3.2 cosmiconfig: 9.0.0 @@ -5413,7 +5401,6 @@ __metadata: "@swc/jest": ^0.2.23 "@types/jest": ^29.2.0 "@types/long": ^5.0.0 - "@types/rimraf": 4.0.5 "@types/tough-cookie": 4.0.5 "@types/uuid": 9.0.8 "@wireapp/api-client": "workspace:^" @@ -5501,7 +5488,6 @@ __metadata: "@types/fs-extra": 11.0.4 "@types/license-checker": ^25 "@types/npm-registry-package-info": 1.0.4 - "@types/rimraf": 4.0.5 fs-extra: 11.2.0 license-checker: ^25.0.1 logdown: 3.3.1 @@ -5546,7 +5532,6 @@ __metadata: "@swc/jest": ^0.2.23 "@types/jest": ^29.2.0 "@types/node": ^22.0.0 - "@types/rimraf": 4.0.5 jest: ^29.2.1 rimraf: 6.0.1 ts-node: ^10.9.1 @@ -5561,7 +5546,6 @@ __metadata: "@swc/core": ^1.3.10 "@swc/jest": ^0.2.23 "@types/jest": ^29.2.0 - "@types/rimraf": 4.0.5 "@wireapp/commons": "workspace:^" jest: ^29.2.1 rimraf: 6.0.1 @@ -5616,7 +5600,6 @@ __metadata: "@types/node": ^22.0.0 "@types/react": ^18.0.25 "@types/react-dom": ^18.0.8 - "@types/rimraf": 4.0.5 "@types/webpack-env": 1.18.5 babel-jest: 29.7.0 babel-loader: 9.2.1 @@ -5653,7 +5636,6 @@ __metadata: "@swc/jest": ^0.2.23 "@types/jest": ^29.2.0 "@types/node": ^22.0.0 - "@types/rimraf": 4.0.5 "@types/uuid": 9.0.8 "@wireapp/store-engine": 5.1.8 core-js: ^3.36.0 @@ -5679,7 +5661,6 @@ __metadata: "@types/fs-extra": 11.0.4 "@types/jest": ^29.2.0 "@types/node": ^22.0.0 - "@types/rimraf": 4.0.5 "@wireapp/store-engine": 5.1.8 fs-extra: 11.2.0 jest: ^29.2.1 @@ -5699,7 +5680,6 @@ __metadata: "@swc/jest": ^0.2.23 "@types/jest": ^29.2.0 "@types/node": ^22.0.0 - "@types/rimraf": 4.0.5 jest: ^29.2.1 rimraf: 6.0.1 ts-node: 10.9.2 @@ -5720,7 +5700,6 @@ __metadata: version: 0.0.0-use.local resolution: "@wireapp/webapp-events@workspace:packages/webapp-events" dependencies: - "@types/rimraf": 4.0.5 rimraf: 6.0.1 typescript: ^5.0.4 languageName: unknown @@ -6667,7 +6646,6 @@ __metadata: "@types/jest": ^29.2.0 "@types/libsodium-wrappers-sumo": 0.7.8 "@types/node": ^22.0.0 - "@types/rimraf": 4.0.5 cross-env: 7.0.3 jest: ^29.2.1 libsodium-wrappers-sumo: 0.7.15 @@ -10714,21 +10692,6 @@ __metadata: languageName: node linkType: hard -"glob@npm:^10.3.7": - version: 10.3.15 - resolution: "glob@npm:10.3.15" - dependencies: - foreground-child: ^3.1.0 - jackspeak: ^2.3.6 - minimatch: ^9.0.1 - minipass: ^7.0.4 - path-scurry: ^1.11.0 - bin: - glob: dist/esm/bin.mjs - checksum: c7aeae0b4eea0dfedc6682b71a8ad4d1ea9dfec0f2440571f916e1918c046824c8d441bbe1965c06fede025a0726c6daab5ae8019afe667364f43776eaaf9044 - languageName: node - linkType: hard - "glob@npm:^11.0.0": version: 11.0.0 resolution: "glob@npm:11.0.0" @@ -12391,7 +12354,7 @@ __metadata: languageName: node linkType: hard -"jackspeak@npm:^2.3.5, jackspeak@npm:^2.3.6": +"jackspeak@npm:^2.3.5": version: 2.3.6 resolution: "jackspeak@npm:2.3.6" dependencies: @@ -13765,13 +13728,6 @@ __metadata: languageName: node linkType: hard -"lru-cache@npm:^10.2.0": - version: 10.2.0 - resolution: "lru-cache@npm:10.2.0" - checksum: eee7ddda4a7475deac51ac81d7dd78709095c6fa46e8350dc2d22462559a1faa3b81ed931d5464b13d48cbd7e08b46100b6f768c76833912bc444b99c37e25db - languageName: node - linkType: hard - "lru-cache@npm:^10.2.2": version: 10.3.1 resolution: "lru-cache@npm:10.3.1" @@ -14361,13 +14317,6 @@ __metadata: languageName: node linkType: hard -"minipass@npm:^7.0.4": - version: 7.0.4 - resolution: "minipass@npm:7.0.4" - checksum: 87585e258b9488caf2e7acea242fd7856bbe9a2c84a7807643513a338d66f368c7d518200ad7b70a508664d408aa000517647b2930c259a8b1f9f0984f344a21 - languageName: node - linkType: hard - "minipass@npm:^7.1.2": version: 7.1.2 resolution: "minipass@npm:7.1.2" @@ -15620,16 +15569,6 @@ __metadata: languageName: node linkType: hard -"path-scurry@npm:^1.11.0": - version: 1.11.1 - resolution: "path-scurry@npm:1.11.1" - dependencies: - lru-cache: ^10.2.0 - minipass: ^5.0.0 || ^6.0.2 || ^7.0.0 - checksum: 890d5abcd593a7912dcce7cf7c6bf7a0b5648e3dee6caf0712c126ca0a65c7f3d7b9d769072a4d1baf370f61ce493ab5b038d59988688e0c5f3f646ee3c69023 - languageName: node - linkType: hard - "path-scurry@npm:^2.0.0": version: 2.0.0 resolution: "path-scurry@npm:2.0.0" @@ -17165,17 +17104,6 @@ __metadata: languageName: node linkType: hard -"rimraf@npm:*": - version: 5.0.7 - resolution: "rimraf@npm:5.0.7" - dependencies: - glob: ^10.3.7 - bin: - rimraf: dist/esm/bin.mjs - checksum: 884852abf8aefd4667448d87bdab04120a8641266c828cf382ac811713547eda18f81799d2146ffec3178f357d83d44ec01c10095949c82e23551660732bf14f - languageName: node - linkType: hard - "rimraf@npm:6.0.1": version: 6.0.1 resolution: "rimraf@npm:6.0.1" @@ -17228,7 +17156,6 @@ __metadata: "@types/babel__core": ^7 "@types/jest": ^29.2.0 "@types/node": ^22.0.0 - "@types/rimraf": 4.0.5 "@typescript-eslint/eslint-plugin": 7.17.0 "@typescript-eslint/parser": 7.17.0 "@wireapp/eslint-config": "workspace:^" From 10a239a5a3ee1347b8b4308592d1f41de6f67fa4 Mon Sep 17 00:00:00 2001 From: Amir Ghezelbash Date: Mon, 14 Oct 2024 11:35:13 +0300 Subject: [PATCH 11/15] add temporary skip lib check to tsconfig of core --- packages/core/tsconfig.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/core/tsconfig.json b/packages/core/tsconfig.json index deda1bd57a..4ddad24292 100644 --- a/packages/core/tsconfig.json +++ b/packages/core/tsconfig.json @@ -2,7 +2,8 @@ "extends": "../../tsconfig.json", "compilerOptions": { "esModuleInterop": true, - "outDir": "lib" + "outDir": "lib", + "skipLibCheck": true }, "exclude": ["node_modules", "src/test", "**.test.ts", "src/demo"], "include": ["src"] From 973606e96f984be35ae5ccc3a1731acaacc8967a Mon Sep 17 00:00:00 2001 From: Amir Ghezelbash Date: Mon, 14 Oct 2024 11:56:33 +0300 Subject: [PATCH 12/15] change version --- packages/api-client/package.json | 2 +- packages/core/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/api-client/package.json b/packages/api-client/package.json index 3bebec0e0a..dc36aa6a8e 100644 --- a/packages/api-client/package.json +++ b/packages/api-client/package.json @@ -66,6 +66,6 @@ "watch": "webpack serve --config webpack.browser.js", "prepare": "yarn dist" }, - "version": "27.6.0", + "version": "27.6.0-experimental-abort-controller.0", "gitHead": "5339f01fe01ef0871da8c8bc8662fbe9e604754a" } diff --git a/packages/core/package.json b/packages/core/package.json index c882cb777a..7db1951f6d 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -61,6 +61,6 @@ "test:coverage": "jest --coverage", "watch": "tsc --watch" }, - "version": "46.4.0", + "version": "46.4.0-experimental-abort-controller.0", "gitHead": "5339f01fe01ef0871da8c8bc8662fbe9e604754a" } From 8fe98da70ba343fbb2617dcf504a52047c8ecb85 Mon Sep 17 00:00:00 2001 From: Otto the Bot Date: Mon, 14 Oct 2024 09:04:10 +0000 Subject: [PATCH 13/15] chore: Publish [skip ci] - @wireapp/api-client@27.6.0-experimental-abort-controller.1 - bazinga64@6.3.9 - @wireapp/certificate-check@0.7.16 - @wireapp/commons@5.2.11 - @wireapp/copy-config@2.2.8 - @wireapp/core@46.4.0-experimental-abort-controller.1 - @wireapp/license-collector@0.12.9 - @wireapp/priority-queue@2.1.9 - @wireapp/promise-queue@2.3.6 - @wireapp/react-ui-kit@9.23.7 - @wireapp/store-engine-dexie@2.1.13 - @wireapp/store-engine-fs@3.1.9 - @wireapp/store-engine@5.1.9 - @wireapp/webapp-events@0.24.1 --- packages/api-client/package.json | 2 +- packages/bazinga64/package.json | 2 +- packages/certificate-check/package.json | 2 +- packages/commons/package.json | 2 +- packages/copy-config/package.json | 2 +- packages/core/package.json | 2 +- packages/license-collector/package.json | 2 +- packages/priority-queue/package.json | 2 +- packages/promise-queue/package.json | 2 +- packages/react-ui-kit/package.json | 2 +- packages/store-engine-dexie/package.json | 4 ++-- packages/store-engine-fs/package.json | 4 ++-- packages/store-engine/package.json | 2 +- packages/webapp-events/package.json | 2 +- yarn.lock | 6 +++--- 15 files changed, 19 insertions(+), 19 deletions(-) diff --git a/packages/api-client/package.json b/packages/api-client/package.json index dc36aa6a8e..a0c9205dd2 100644 --- a/packages/api-client/package.json +++ b/packages/api-client/package.json @@ -66,6 +66,6 @@ "watch": "webpack serve --config webpack.browser.js", "prepare": "yarn dist" }, - "version": "27.6.0-experimental-abort-controller.0", + "version": "27.6.0-experimental-abort-controller.1", "gitHead": "5339f01fe01ef0871da8c8bc8662fbe9e604754a" } diff --git a/packages/bazinga64/package.json b/packages/bazinga64/package.json index 6cfefb631f..2bc60ba485 100644 --- a/packages/bazinga64/package.json +++ b/packages/bazinga64/package.json @@ -40,5 +40,5 @@ "test": "jest", "test:coverage": "jest --coverage" }, - "version": "6.3.8" + "version": "6.3.9" } diff --git a/packages/certificate-check/package.json b/packages/certificate-check/package.json index dbdd5160bc..a60084ea4f 100644 --- a/packages/certificate-check/package.json +++ b/packages/certificate-check/package.json @@ -28,5 +28,5 @@ "test": "jest", "test:coverage": "jest --coverage" }, - "version": "0.7.15" + "version": "0.7.16" } diff --git a/packages/commons/package.json b/packages/commons/package.json index fccb98f50d..564debbbdb 100644 --- a/packages/commons/package.json +++ b/packages/commons/package.json @@ -35,5 +35,5 @@ "test:coverage": "yarn test", "test:watch": "yarn jest --watch" }, - "version": "5.2.10" + "version": "5.2.11" } diff --git a/packages/copy-config/package.json b/packages/copy-config/package.json index e9fe0b7b79..b4c705bcfd 100644 --- a/packages/copy-config/package.json +++ b/packages/copy-config/package.json @@ -34,5 +34,5 @@ "test": "jest", "test:coverage": "jest --coverage" }, - "version": "2.2.7" + "version": "2.2.8" } diff --git a/packages/core/package.json b/packages/core/package.json index 7db1951f6d..67ff107fca 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -61,6 +61,6 @@ "test:coverage": "jest --coverage", "watch": "tsc --watch" }, - "version": "46.4.0-experimental-abort-controller.0", + "version": "46.4.0-experimental-abort-controller.1", "gitHead": "5339f01fe01ef0871da8c8bc8662fbe9e604754a" } diff --git a/packages/license-collector/package.json b/packages/license-collector/package.json index fa5d7069a1..c224ef92dd 100644 --- a/packages/license-collector/package.json +++ b/packages/license-collector/package.json @@ -30,5 +30,5 @@ "dist": "yarn build", "start": "ts-node -r tsconfig-paths/register ./src/cli.ts" }, - "version": "0.12.8" + "version": "0.12.9" } diff --git a/packages/priority-queue/package.json b/packages/priority-queue/package.json index 27285605c6..b173cb3277 100644 --- a/packages/priority-queue/package.json +++ b/packages/priority-queue/package.json @@ -24,5 +24,5 @@ "test": "jest", "test:coverage": "jest --coverage" }, - "version": "2.1.8" + "version": "2.1.9" } diff --git a/packages/promise-queue/package.json b/packages/promise-queue/package.json index f1064e2e8f..a642b2d6a3 100644 --- a/packages/promise-queue/package.json +++ b/packages/promise-queue/package.json @@ -23,5 +23,5 @@ "test": "jest", "test:coverage": "jest --coverage" }, - "version": "2.3.5" + "version": "2.3.6" } diff --git a/packages/react-ui-kit/package.json b/packages/react-ui-kit/package.json index 8da2fb0ca6..a35ff0b1d9 100644 --- a/packages/react-ui-kit/package.json +++ b/packages/react-ui-kit/package.json @@ -69,5 +69,5 @@ "test:watch": "jest --watch", "test:update": "jest --updateSnapshot" }, - "version": "9.23.6" + "version": "9.23.7" } diff --git a/packages/store-engine-dexie/package.json b/packages/store-engine-dexie/package.json index 04685163df..64cbcf5cdf 100644 --- a/packages/store-engine-dexie/package.json +++ b/packages/store-engine-dexie/package.json @@ -19,7 +19,7 @@ "@types/jest": "^29.2.0", "@types/node": "^22.0.0", "@types/uuid": "9.0.8", - "@wireapp/store-engine": "5.1.8", + "@wireapp/store-engine": "5.1.9", "core-js": "^3.36.0", "fake-indexeddb": "^5.0.2", "jest": "^29.2.1", @@ -36,5 +36,5 @@ "test": "jest", "test:coverage": "jest --coverage" }, - "version": "2.1.12" + "version": "2.1.13" } diff --git a/packages/store-engine-fs/package.json b/packages/store-engine-fs/package.json index ddda2bdfd8..9e053f63e0 100644 --- a/packages/store-engine-fs/package.json +++ b/packages/store-engine-fs/package.json @@ -19,7 +19,7 @@ "@types/fs-extra": "11.0.4", "@types/jest": "^29.2.0", "@types/node": "^22.0.0", - "@wireapp/store-engine": "5.1.8", + "@wireapp/store-engine": "5.1.9", "jest": "^29.2.1", "rimraf": "6.0.1", "ts-node": "10.9.2", @@ -32,5 +32,5 @@ "test": "jest", "test:coverage": "jest --coverage" }, - "version": "3.1.8" + "version": "3.1.9" } diff --git a/packages/store-engine/package.json b/packages/store-engine/package.json index facfd35bc1..3a99d291be 100644 --- a/packages/store-engine/package.json +++ b/packages/store-engine/package.json @@ -31,5 +31,5 @@ "test": "jest", "test:coverage": "jest --coverage" }, - "version": "5.1.8" + "version": "5.1.9" } diff --git a/packages/webapp-events/package.json b/packages/webapp-events/package.json index 6aa56ceddc..1ea658bba0 100644 --- a/packages/webapp-events/package.json +++ b/packages/webapp-events/package.json @@ -17,5 +17,5 @@ "dist": "yarn build", "test": "exit 0" }, - "version": "0.24.0" + "version": "0.24.1" } diff --git a/yarn.lock b/yarn.lock index 1d1921d5d7..3f9b9c70c6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5637,7 +5637,7 @@ __metadata: "@types/jest": ^29.2.0 "@types/node": ^22.0.0 "@types/uuid": 9.0.8 - "@wireapp/store-engine": 5.1.8 + "@wireapp/store-engine": 5.1.9 core-js: ^3.36.0 dexie: ">3.2.0" fake-indexeddb: ^5.0.2 @@ -5661,7 +5661,7 @@ __metadata: "@types/fs-extra": 11.0.4 "@types/jest": ^29.2.0 "@types/node": ^22.0.0 - "@wireapp/store-engine": 5.1.8 + "@wireapp/store-engine": 5.1.9 fs-extra: 11.2.0 jest: ^29.2.1 rimraf: 6.0.1 @@ -5672,7 +5672,7 @@ __metadata: languageName: unknown linkType: soft -"@wireapp/store-engine@5.1.8, @wireapp/store-engine@workspace:*, @wireapp/store-engine@workspace:^, @wireapp/store-engine@workspace:packages/store-engine": +"@wireapp/store-engine@5.1.9, @wireapp/store-engine@workspace:*, @wireapp/store-engine@workspace:^, @wireapp/store-engine@workspace:packages/store-engine": version: 0.0.0-use.local resolution: "@wireapp/store-engine@workspace:packages/store-engine" dependencies: From 8ffc61c8616554edd58c2f8022460d5f98068c80 Mon Sep 17 00:00:00 2001 From: Amir Ghezelbash Date: Mon, 14 Oct 2024 12:41:14 +0300 Subject: [PATCH 14/15] remove experimental versions --- packages/api-client/package.json | 2 +- packages/core/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/api-client/package.json b/packages/api-client/package.json index dc36aa6a8e..3bebec0e0a 100644 --- a/packages/api-client/package.json +++ b/packages/api-client/package.json @@ -66,6 +66,6 @@ "watch": "webpack serve --config webpack.browser.js", "prepare": "yarn dist" }, - "version": "27.6.0-experimental-abort-controller.0", + "version": "27.6.0", "gitHead": "5339f01fe01ef0871da8c8bc8662fbe9e604754a" } diff --git a/packages/core/package.json b/packages/core/package.json index 7db1951f6d..c882cb777a 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -61,6 +61,6 @@ "test:coverage": "jest --coverage", "watch": "tsc --watch" }, - "version": "46.4.0-experimental-abort-controller.0", + "version": "46.4.0", "gitHead": "5339f01fe01ef0871da8c8bc8662fbe9e604754a" } From bf2116ef1d5172f2f452a0db7ebf9868db0179d5 Mon Sep 17 00:00:00 2001 From: Otto the Bot Date: Mon, 14 Oct 2024 09:49:32 +0000 Subject: [PATCH 15/15] chore: Publish [skip ci] - @wireapp/api-client@27.6.1 - bazinga64@6.3.10 - @wireapp/certificate-check@0.7.17 - @wireapp/commons@5.2.12 - @wireapp/copy-config@2.2.9 - @wireapp/core@46.4.1 - @wireapp/license-collector@0.12.10 - @wireapp/priority-queue@2.1.10 - @wireapp/promise-queue@2.3.7 - @wireapp/react-ui-kit@9.23.8 - @wireapp/store-engine-dexie@2.1.14 - @wireapp/store-engine-fs@3.1.10 - @wireapp/store-engine@5.1.10 - @wireapp/webapp-events@0.24.2 --- packages/api-client/package.json | 2 +- packages/bazinga64/package.json | 2 +- packages/certificate-check/package.json | 2 +- packages/commons/package.json | 2 +- packages/copy-config/package.json | 2 +- packages/core/package.json | 2 +- packages/license-collector/package.json | 2 +- packages/priority-queue/package.json | 2 +- packages/promise-queue/package.json | 2 +- packages/react-ui-kit/package.json | 2 +- packages/store-engine-dexie/package.json | 4 ++-- packages/store-engine-fs/package.json | 4 ++-- packages/store-engine/package.json | 2 +- packages/webapp-events/package.json | 2 +- yarn.lock | 6 +++--- 15 files changed, 19 insertions(+), 19 deletions(-) diff --git a/packages/api-client/package.json b/packages/api-client/package.json index 3bebec0e0a..dcb5b743bf 100644 --- a/packages/api-client/package.json +++ b/packages/api-client/package.json @@ -66,6 +66,6 @@ "watch": "webpack serve --config webpack.browser.js", "prepare": "yarn dist" }, - "version": "27.6.0", + "version": "27.6.1", "gitHead": "5339f01fe01ef0871da8c8bc8662fbe9e604754a" } diff --git a/packages/bazinga64/package.json b/packages/bazinga64/package.json index 2bc60ba485..523e975fb2 100644 --- a/packages/bazinga64/package.json +++ b/packages/bazinga64/package.json @@ -40,5 +40,5 @@ "test": "jest", "test:coverage": "jest --coverage" }, - "version": "6.3.9" + "version": "6.3.10" } diff --git a/packages/certificate-check/package.json b/packages/certificate-check/package.json index a60084ea4f..39a459aa97 100644 --- a/packages/certificate-check/package.json +++ b/packages/certificate-check/package.json @@ -28,5 +28,5 @@ "test": "jest", "test:coverage": "jest --coverage" }, - "version": "0.7.16" + "version": "0.7.17" } diff --git a/packages/commons/package.json b/packages/commons/package.json index 564debbbdb..388e1bb8fb 100644 --- a/packages/commons/package.json +++ b/packages/commons/package.json @@ -35,5 +35,5 @@ "test:coverage": "yarn test", "test:watch": "yarn jest --watch" }, - "version": "5.2.11" + "version": "5.2.12" } diff --git a/packages/copy-config/package.json b/packages/copy-config/package.json index b4c705bcfd..3d0748fbfc 100644 --- a/packages/copy-config/package.json +++ b/packages/copy-config/package.json @@ -34,5 +34,5 @@ "test": "jest", "test:coverage": "jest --coverage" }, - "version": "2.2.8" + "version": "2.2.9" } diff --git a/packages/core/package.json b/packages/core/package.json index c882cb777a..0c65382f96 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -61,6 +61,6 @@ "test:coverage": "jest --coverage", "watch": "tsc --watch" }, - "version": "46.4.0", + "version": "46.4.1", "gitHead": "5339f01fe01ef0871da8c8bc8662fbe9e604754a" } diff --git a/packages/license-collector/package.json b/packages/license-collector/package.json index c224ef92dd..c502f44e0d 100644 --- a/packages/license-collector/package.json +++ b/packages/license-collector/package.json @@ -30,5 +30,5 @@ "dist": "yarn build", "start": "ts-node -r tsconfig-paths/register ./src/cli.ts" }, - "version": "0.12.9" + "version": "0.12.10" } diff --git a/packages/priority-queue/package.json b/packages/priority-queue/package.json index b173cb3277..0e0fe31cd0 100644 --- a/packages/priority-queue/package.json +++ b/packages/priority-queue/package.json @@ -24,5 +24,5 @@ "test": "jest", "test:coverage": "jest --coverage" }, - "version": "2.1.9" + "version": "2.1.10" } diff --git a/packages/promise-queue/package.json b/packages/promise-queue/package.json index a642b2d6a3..2c6f57176f 100644 --- a/packages/promise-queue/package.json +++ b/packages/promise-queue/package.json @@ -23,5 +23,5 @@ "test": "jest", "test:coverage": "jest --coverage" }, - "version": "2.3.6" + "version": "2.3.7" } diff --git a/packages/react-ui-kit/package.json b/packages/react-ui-kit/package.json index a35ff0b1d9..935c5797c8 100644 --- a/packages/react-ui-kit/package.json +++ b/packages/react-ui-kit/package.json @@ -69,5 +69,5 @@ "test:watch": "jest --watch", "test:update": "jest --updateSnapshot" }, - "version": "9.23.7" + "version": "9.23.8" } diff --git a/packages/store-engine-dexie/package.json b/packages/store-engine-dexie/package.json index 64cbcf5cdf..73f66a8e73 100644 --- a/packages/store-engine-dexie/package.json +++ b/packages/store-engine-dexie/package.json @@ -19,7 +19,7 @@ "@types/jest": "^29.2.0", "@types/node": "^22.0.0", "@types/uuid": "9.0.8", - "@wireapp/store-engine": "5.1.9", + "@wireapp/store-engine": "5.1.10", "core-js": "^3.36.0", "fake-indexeddb": "^5.0.2", "jest": "^29.2.1", @@ -36,5 +36,5 @@ "test": "jest", "test:coverage": "jest --coverage" }, - "version": "2.1.13" + "version": "2.1.14" } diff --git a/packages/store-engine-fs/package.json b/packages/store-engine-fs/package.json index 9e053f63e0..e96b21a3aa 100644 --- a/packages/store-engine-fs/package.json +++ b/packages/store-engine-fs/package.json @@ -19,7 +19,7 @@ "@types/fs-extra": "11.0.4", "@types/jest": "^29.2.0", "@types/node": "^22.0.0", - "@wireapp/store-engine": "5.1.9", + "@wireapp/store-engine": "5.1.10", "jest": "^29.2.1", "rimraf": "6.0.1", "ts-node": "10.9.2", @@ -32,5 +32,5 @@ "test": "jest", "test:coverage": "jest --coverage" }, - "version": "3.1.9" + "version": "3.1.10" } diff --git a/packages/store-engine/package.json b/packages/store-engine/package.json index 3a99d291be..08e4f7aece 100644 --- a/packages/store-engine/package.json +++ b/packages/store-engine/package.json @@ -31,5 +31,5 @@ "test": "jest", "test:coverage": "jest --coverage" }, - "version": "5.1.9" + "version": "5.1.10" } diff --git a/packages/webapp-events/package.json b/packages/webapp-events/package.json index 1ea658bba0..85e6ef0cbf 100644 --- a/packages/webapp-events/package.json +++ b/packages/webapp-events/package.json @@ -17,5 +17,5 @@ "dist": "yarn build", "test": "exit 0" }, - "version": "0.24.1" + "version": "0.24.2" } diff --git a/yarn.lock b/yarn.lock index 3f9b9c70c6..0e14b5a23c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5637,7 +5637,7 @@ __metadata: "@types/jest": ^29.2.0 "@types/node": ^22.0.0 "@types/uuid": 9.0.8 - "@wireapp/store-engine": 5.1.9 + "@wireapp/store-engine": 5.1.10 core-js: ^3.36.0 dexie: ">3.2.0" fake-indexeddb: ^5.0.2 @@ -5661,7 +5661,7 @@ __metadata: "@types/fs-extra": 11.0.4 "@types/jest": ^29.2.0 "@types/node": ^22.0.0 - "@wireapp/store-engine": 5.1.9 + "@wireapp/store-engine": 5.1.10 fs-extra: 11.2.0 jest: ^29.2.1 rimraf: 6.0.1 @@ -5672,7 +5672,7 @@ __metadata: languageName: unknown linkType: soft -"@wireapp/store-engine@5.1.9, @wireapp/store-engine@workspace:*, @wireapp/store-engine@workspace:^, @wireapp/store-engine@workspace:packages/store-engine": +"@wireapp/store-engine@5.1.10, @wireapp/store-engine@workspace:*, @wireapp/store-engine@workspace:^, @wireapp/store-engine@workspace:packages/store-engine": version: 0.0.0-use.local resolution: "@wireapp/store-engine@workspace:packages/store-engine" dependencies: