diff --git a/jest.config.js b/jest.config.ts similarity index 97% rename from jest.config.js rename to jest.config.ts index 1a73aec02ba..4212c88ea8f 100644 --- a/jest.config.js +++ b/jest.config.ts @@ -30,6 +30,7 @@ module.exports = { 'Util/(.*)': '/src/script/util/$1', '^react(.*)$': '/node_modules/react$1', }, + reporters: ['default', 'github-actions'], setupFilesAfterEnv: ['/setupTests.js'], testEnvironment: 'jsdom', testEnvironmentOptions: { diff --git a/package.json b/package.json index 42ca8bf3a86..c310de14f7f 100644 --- a/package.json +++ b/package.json @@ -1,12 +1,13 @@ { "dependencies": { "@emotion/react": "11.10.4", - "@wireapp/avs": "8.2.16", - "@wireapp/core": "34.1.4", - "@wireapp/react-ui-kit": "8.17.10", - "@wireapp/store-engine-dexie": "1.7.11", + "@wireapp/antiscroll-2": "1.3.1", + "@wireapp/avs": "8.2.17", + "@wireapp/core": "35.0.0", + "@wireapp/react-ui-kit": "9.0.1", + "@wireapp/store-engine-dexie": "2.0.0", "@wireapp/store-engine-sqleet": "1.8.9", - "@wireapp/webapp-events": "0.14.9", + "@wireapp/webapp-events": "0.15.0", "amplify": "https://github.com/wireapp/amplify#head=master", "classnames": "2.3.2", "copy-webpack-plugin": "11.0.0", @@ -89,9 +90,9 @@ "@types/webpack-env": "1.18.0", "@typescript-eslint/eslint-plugin": "5.40.1", "@typescript-eslint/parser": "5.40.1", - "@wireapp/copy-config": "1.3.10", - "@wireapp/eslint-config": "1.12.12", - "@wireapp/prettier-config": "0.4.7", + "@wireapp/copy-config": "2.0.0", + "@wireapp/eslint-config": "2.0.0", + "@wireapp/prettier-config": "0.5.0", "adm-zip": "0.5.9", "autoprefixer": "9.8.8", "babel-loader": "8.2.5", @@ -237,6 +238,6 @@ "translate:upload": "yarn translate:merge && ts-node ./bin/translations_upload.ts", "translate:download": "ts-node ./bin/translations_download.ts" }, - "version": "0.21.0", + "version": "0.22.0", "packageManager": "yarn@3.2.3" } diff --git a/server/Server.ts b/server/Server.ts index 075d5d7d88e..e9634157d14 100644 --- a/server/Server.ts +++ b/server/Server.ts @@ -242,9 +242,11 @@ class Server { }; this.server = https .createServer(options, this.app) - .listen(this.config.SERVER.PORT_HTTP, () => resolve(this.config.SERVER.PORT_HTTP)); + .listen(this.config.SERVER.PORT_HTTP, '0.0.0.0', () => resolve(this.config.SERVER.PORT_HTTP)); } else { - this.server = this.app.listen(this.config.SERVER.PORT_HTTP, () => resolve(this.config.SERVER.PORT_HTTP)); + this.server = this.app.listen(this.config.SERVER.PORT_HTTP, '0.0.0.0', () => + resolve(this.config.SERVER.PORT_HTTP), + ); } } else { reject('Server port not specified.'); diff --git a/src/script/assets/AssetMapper.test.ts b/src/script/assets/AssetMapper.test.ts index 54809c8fc4b..661f5acb36b 100644 --- a/src/script/assets/AssetMapper.test.ts +++ b/src/script/assets/AssetMapper.test.ts @@ -17,7 +17,7 @@ * */ -import {UserAsset as APIClientUserAsset, UserAssetType} from '@wireapp/api-client/src/user/'; +import {UserAsset as APIClientUserAsset, UserAssetType} from '@wireapp/api-client/lib/user/'; import * as AssetMapper from './AssetMapper'; diff --git a/src/script/assets/AssetMapper.ts b/src/script/assets/AssetMapper.ts index 141acff6142..9a9bd2c9d3a 100644 --- a/src/script/assets/AssetMapper.ts +++ b/src/script/assets/AssetMapper.ts @@ -17,9 +17,9 @@ * */ -import type {Picture as APIClientPicture} from '@wireapp/api-client/src/self/'; -import {QualifiedId} from '@wireapp/api-client/src/user'; -import type {UserAsset as APIClientUserAsset} from '@wireapp/api-client/src/user/'; +import type {Picture as APIClientPicture} from '@wireapp/api-client/lib/self/'; +import {QualifiedId} from '@wireapp/api-client/lib/user'; +import type {UserAsset as APIClientUserAsset} from '@wireapp/api-client/lib/user/'; import {AssetRemoteData} from './AssetRemoteData'; diff --git a/src/script/assets/AssetRepository.test.ts b/src/script/assets/AssetRepository.test.ts index 201d91bd9b8..6fb4f927de1 100644 --- a/src/script/assets/AssetRepository.test.ts +++ b/src/script/assets/AssetRepository.test.ts @@ -17,7 +17,7 @@ * */ -import {AssetUploadData} from '@wireapp/api-client/src/asset/'; +import {AssetUploadData} from '@wireapp/api-client/lib/asset/'; import {container} from 'tsyringe'; import {createRandomUuid} from 'Util/util'; diff --git a/src/script/assets/AssetRepository.ts b/src/script/assets/AssetRepository.ts index 268fa2cba43..7b0829bfcfe 100644 --- a/src/script/assets/AssetRepository.ts +++ b/src/script/assets/AssetRepository.ts @@ -17,14 +17,14 @@ * */ -import {AssetOptions, AssetRetentionPolicy} from '@wireapp/api-client/src/asset/'; +import {AssetOptions, AssetRetentionPolicy} from '@wireapp/api-client/lib/asset/'; import {LegalHoldStatus} from '@wireapp/protocol-messaging'; import {StatusCodes as HTTP_STATUS} from 'http-status-codes'; import ko from 'knockout'; -import {singleton, container} from 'tsyringe'; +import {container, singleton} from 'tsyringe'; -import {Logger, getLogger} from 'Util/Logger'; -import {loadFileBuffer, loadImage, downloadBlob} from 'Util/util'; +import {getLogger, Logger} from 'Util/Logger'; +import {downloadBlob, loadFileBuffer, loadImage} from 'Util/util'; import {WebWorker} from 'Util/worker'; import {decryptAesAsset} from './AssetCrypto'; diff --git a/src/script/assets/AssetService.ts b/src/script/assets/AssetService.ts index 082b48fdf58..3e032f111b3 100644 --- a/src/script/assets/AssetService.ts +++ b/src/script/assets/AssetService.ts @@ -17,7 +17,7 @@ * */ -import {ProgressCallback} from '@wireapp/api-client/src/http/'; +import {ProgressCallback} from '@wireapp/api-client/lib/http/'; import {singleton, container} from 'tsyringe'; import {legacyAsset, assetV3, isValidApiPath} from 'Util/ValidationUtil'; diff --git a/src/script/audio/AudioRepository.ts b/src/script/audio/AudioRepository.ts index 10270eb521c..776434bdf78 100644 --- a/src/script/audio/AudioRepository.ts +++ b/src/script/audio/AudioRepository.ts @@ -17,7 +17,7 @@ * */ -import {AudioPreference, WebappProperties} from '@wireapp/api-client/src/user/data/'; +import {AudioPreference, WebappProperties} from '@wireapp/api-client/lib/user/data/'; import {WebAppEvents} from '@wireapp/webapp-events'; import {amplify} from 'amplify'; import {container} from 'tsyringe'; diff --git a/src/script/audio/AudioState.ts b/src/script/audio/AudioState.ts index 8cf5b1b54e0..f7be72a60d3 100644 --- a/src/script/audio/AudioState.ts +++ b/src/script/audio/AudioState.ts @@ -17,7 +17,7 @@ * */ -import {AudioPreference} from '@wireapp/api-client/src/user/data/'; +import {AudioPreference} from '@wireapp/api-client/lib/user/data/'; import ko from 'knockout'; import {singleton} from 'tsyringe'; diff --git a/src/script/auth/component/AccountForm.test.tsx b/src/script/auth/component/AccountForm.test.tsx index c79719f29cf..55a97e9009f 100644 --- a/src/script/auth/component/AccountForm.test.tsx +++ b/src/script/auth/component/AccountForm.test.tsx @@ -41,6 +41,13 @@ describe('when entering account data', () => { {}} />, mockStoreFactory()({ ...initialRootState, + authState: { + account: { + email: '', + name: '', + password: '', + }, + }, runtimeState: { hasCookieSupport: true, hasIndexedDbSupport: true, diff --git a/src/script/auth/component/ClientItem.tsx b/src/script/auth/component/ClientItem.tsx index 22ec65ebe40..9b663acbca0 100644 --- a/src/script/auth/component/ClientItem.tsx +++ b/src/script/auth/component/ClientItem.tsx @@ -19,19 +19,19 @@ import React, {useEffect, useState} from 'react'; -import {RegisteredClient} from '@wireapp/api-client/src/client/index'; +import {RegisteredClient} from '@wireapp/api-client/lib/client/index'; import { COLOR, ContainerXS, DeviceIcon, + FlexBox, Form, + IconButton, Input, Line, - IconButton, Small, Text, TrashIcon, - FlexBox, } from '@wireapp/react-ui-kit'; import {useIntl} from 'react-intl'; diff --git a/src/script/auth/component/ClientList.tsx b/src/script/auth/component/ClientList.tsx index 4614a0aa9bc..f7f76b55e7c 100644 --- a/src/script/auth/component/ClientList.tsx +++ b/src/script/auth/component/ClientList.tsx @@ -19,7 +19,7 @@ import React from 'react'; -import {ClientType} from '@wireapp/api-client/src/client/index'; +import {ClientType} from '@wireapp/api-client/lib/client/index'; import {ContainerXS, Loading} from '@wireapp/react-ui-kit'; import {connect} from 'react-redux'; import {useNavigate} from 'react-router-dom'; @@ -31,7 +31,7 @@ import {ClientItem} from './ClientItem'; import {actionRoot as ROOT_ACTIONS} from '../module/action/'; import * as LocalStorageAction from '../module/action/LocalStorageAction'; -import {RootState, bindActionCreators} from '../module/reducer'; +import {bindActionCreators, RootState} from '../module/reducer'; import {getEntropy} from '../module/selector/AuthSelector'; import * as ClientSelector from '../module/selector/ClientSelector'; import * as SelfSelector from '../module/selector/SelfSelector'; diff --git a/src/script/auth/component/LoginForm.tsx b/src/script/auth/component/LoginForm.tsx index ee85956331a..3423ce47a67 100644 --- a/src/script/auth/component/LoginForm.tsx +++ b/src/script/auth/component/LoginForm.tsx @@ -19,8 +19,8 @@ import React, {useRef, useState} from 'react'; -import {LoginData} from '@wireapp/api-client/src/auth'; -import {Input, Loading, Button} from '@wireapp/react-ui-kit'; +import {LoginData} from '@wireapp/api-client/lib/auth'; +import {Button, Input, Loading} from '@wireapp/react-ui-kit'; import {useIntl} from 'react-intl'; import {isValidEmail, isValidPhoneNumber, isValidUsername} from 'Util/ValidationUtil'; diff --git a/src/script/auth/component/PhoneLoginForm.tsx b/src/script/auth/component/PhoneLoginForm.tsx index 224fc533e56..4ed2641a76a 100644 --- a/src/script/auth/component/PhoneLoginForm.tsx +++ b/src/script/auth/component/PhoneLoginForm.tsx @@ -19,16 +19,16 @@ import React, {useRef, useState} from 'react'; -import {LoginData} from '@wireapp/api-client/src/auth'; +import {LoginData} from '@wireapp/api-client/lib/auth'; import { ArrowIcon, Input, InputBlock, InputSubmitCombo, Loading, - QUERY, RoundIconButton, Select, + QUERY, useMatchMedia, } from '@wireapp/react-ui-kit'; import {useIntl} from 'react-intl'; diff --git a/src/script/auth/component/WirelessContainer.tsx b/src/script/auth/component/WirelessContainer.tsx index e7b61eefcce..b435dd289cf 100644 --- a/src/script/auth/component/WirelessContainer.tsx +++ b/src/script/auth/component/WirelessContainer.tsx @@ -20,7 +20,7 @@ import React from 'react'; import {CloseIcon, Content, Footer, Header, Link, Small} from '@wireapp/react-ui-kit'; -import {SVGIcon} from '@wireapp/react-ui-kit/src/Icon/SVGIcon'; +import {SVGIcon} from '@wireapp/react-ui-kit/lib/Icon/SVGIcon'; import {FormattedMessage, useIntl} from 'react-intl'; import {Config} from '../../Config'; diff --git a/src/script/auth/localeConfig.ts b/src/script/auth/localeConfig.ts index f124bd7a0b5..44d8aa91c40 100644 --- a/src/script/auth/localeConfig.ts +++ b/src/script/auth/localeConfig.ts @@ -17,7 +17,7 @@ * */ -import {SupportedCurrency} from '@wireapp/api-client/src/team/payment/'; +import {SupportedCurrency} from '@wireapp/api-client/lib/team/payment/'; import {UrlUtil} from '@wireapp/commons'; import {QUERY_KEY} from './route'; diff --git a/src/script/auth/module/action/AuthAction.test.ts b/src/script/auth/module/action/AuthAction.test.ts index 09ec501f960..49819c6dede 100644 --- a/src/script/auth/module/action/AuthAction.test.ts +++ b/src/script/auth/module/action/AuthAction.test.ts @@ -18,7 +18,7 @@ */ import type {APIClient} from '@wireapp/api-client'; -import {ClientType} from '@wireapp/api-client/src/client/'; +import {ClientType} from '@wireapp/api-client/lib/client/'; import type {TypeUtil} from '@wireapp/commons'; import {StatusCodes as HTTP_STATUS} from 'http-status-codes'; diff --git a/src/script/auth/module/action/AuthAction.ts b/src/script/auth/module/action/AuthAction.ts index 87d9e971177..c2cae34b83d 100644 --- a/src/script/auth/module/action/AuthAction.ts +++ b/src/script/auth/module/action/AuthAction.ts @@ -17,10 +17,10 @@ * */ -import type {DomainData} from '@wireapp/api-client/src/account/DomainData'; -import type {LoginData, RegisterData, SendLoginCode} from '@wireapp/api-client/src/auth/'; -import {VerificationActionType} from '@wireapp/api-client/src/auth/VerificationActionType'; -import {ClientType} from '@wireapp/api-client/src/client/'; +import type {DomainData} from '@wireapp/api-client/lib/account/DomainData'; +import type {LoginData, RegisterData, SendLoginCode} from '@wireapp/api-client/lib/auth/'; +import {VerificationActionType} from '@wireapp/api-client/lib/auth/VerificationActionType'; +import {ClientType} from '@wireapp/api-client/lib/client/'; import type {Account} from '@wireapp/core'; import type {CRUDEngine} from '@wireapp/store-engine'; import {SQLeetEngine} from '@wireapp/store-engine-sqleet'; diff --git a/src/script/auth/module/action/ClientAction.ts b/src/script/auth/module/action/ClientAction.ts index 66795f2face..46cd78f2dbb 100644 --- a/src/script/auth/module/action/ClientAction.ts +++ b/src/script/auth/module/action/ClientAction.ts @@ -17,9 +17,9 @@ * */ -import {ClientClassification, ClientType, RegisteredClient} from '@wireapp/api-client/src/client/'; +import {ClientClassification, ClientType, RegisteredClient} from '@wireapp/api-client/lib/client/'; import {Runtime} from '@wireapp/commons'; -import type {ClientInfo} from '@wireapp/core/src/main/client/'; +import type {ClientInfo} from '@wireapp/core/lib/client/'; import {ClientActionCreator} from './creator/'; diff --git a/src/script/auth/module/action/ConversationAction.test.ts b/src/script/auth/module/action/ConversationAction.test.ts index e01173ae2bd..9b20f6fc1c3 100644 --- a/src/script/auth/module/action/ConversationAction.test.ts +++ b/src/script/auth/module/action/ConversationAction.test.ts @@ -17,7 +17,7 @@ * */ -import type {ConversationEvent} from '@wireapp/api-client/src/event/'; +import type {ConversationEvent} from '@wireapp/api-client/lib/event/'; import {ConversationActionCreator} from './creator'; diff --git a/src/script/auth/module/action/ConversationAction.ts b/src/script/auth/module/action/ConversationAction.ts index 78f664ced3f..938ced3dfee 100644 --- a/src/script/auth/module/action/ConversationAction.ts +++ b/src/script/auth/module/action/ConversationAction.ts @@ -17,7 +17,7 @@ * */ -import type {ConversationEvent} from '@wireapp/api-client/src/event/'; +import type {ConversationEvent} from '@wireapp/api-client/lib/event/'; import {ConversationActionCreator} from './creator/'; diff --git a/src/script/auth/module/action/InvitationAction.ts b/src/script/auth/module/action/InvitationAction.ts index cd43fad1ff3..1ca2420bbec 100644 --- a/src/script/auth/module/action/InvitationAction.ts +++ b/src/script/auth/module/action/InvitationAction.ts @@ -17,8 +17,8 @@ * */ -import type {NewTeamInvitation} from '@wireapp/api-client/src/team/'; -import {Role} from '@wireapp/api-client/src/team/member/'; +import type {NewTeamInvitation} from '@wireapp/api-client/lib/team/'; +import {Role} from '@wireapp/api-client/lib/team/member/'; import {StatusCodes as HTTP_STATUS} from 'http-status-codes'; import {BackendError} from './BackendError'; diff --git a/src/script/auth/module/action/SelfAction.test.ts b/src/script/auth/module/action/SelfAction.test.ts index 3a45db81741..700d1bae78b 100644 --- a/src/script/auth/module/action/SelfAction.test.ts +++ b/src/script/auth/module/action/SelfAction.test.ts @@ -17,7 +17,7 @@ * */ -import type {Self} from '@wireapp/api-client/src/self/'; +import type {Self} from '@wireapp/api-client/lib/self/'; import {StatusCodes as HTTP_STATUS} from 'http-status-codes'; import {SelfActionCreator} from './creator/'; diff --git a/src/script/auth/module/action/SelfAction.ts b/src/script/auth/module/action/SelfAction.ts index eb807390fa1..648a4b92dd4 100644 --- a/src/script/auth/module/action/SelfAction.ts +++ b/src/script/auth/module/action/SelfAction.ts @@ -17,7 +17,7 @@ * */ -import type {ChangePassword, ConsentType, Self} from '@wireapp/api-client/src/self/'; +import type {ChangePassword, ConsentType, Self} from '@wireapp/api-client/lib/self/'; import {StatusCodes as HTTP_STATUS} from 'http-status-codes'; import {Environment} from 'Util/Environment'; diff --git a/src/script/auth/module/action/WebSocketAction.ts b/src/script/auth/module/action/WebSocketAction.ts index 962e7522fdc..c6d0b17c68c 100644 --- a/src/script/auth/module/action/WebSocketAction.ts +++ b/src/script/auth/module/action/WebSocketAction.ts @@ -17,11 +17,11 @@ * */ -import * as Events from '@wireapp/api-client/src/event/'; -import {ConnectionState, HttpClient} from '@wireapp/api-client/src/http/'; -import {PayloadBundle, PayloadBundleType} from '@wireapp/core/src/main/conversation/'; -import type {UserUpdateMessage} from '@wireapp/core/src/main/conversation/message/UserMessage'; -import {UserMapper} from '@wireapp/core/src/main/user/UserMapper'; +import * as Events from '@wireapp/api-client/lib/event/'; +import {ConnectionState, HttpClient} from '@wireapp/api-client/lib/http/'; +import {PayloadBundle, PayloadBundleType} from '@wireapp/core/lib/conversation/'; +import type {UserUpdateMessage} from '@wireapp/core/lib/conversation/message/UserMessage'; +import {UserMapper} from '@wireapp/core/lib/user/UserMapper'; import {getLogger} from 'Util/Logger'; diff --git a/src/script/auth/module/action/creator/AuthActionCreator.ts b/src/script/auth/module/action/creator/AuthActionCreator.ts index 2e059f371ab..29f1923c3d1 100644 --- a/src/script/auth/module/action/creator/AuthActionCreator.ts +++ b/src/script/auth/module/action/creator/AuthActionCreator.ts @@ -17,8 +17,8 @@ * */ -import type {SSOSettings} from '@wireapp/api-client/src/account/SSOSettings'; -import type {LoginData, RegisterData} from '@wireapp/api-client/src/auth/'; +import type {SSOSettings} from '@wireapp/api-client/lib/account/SSOSettings'; +import type {LoginData, RegisterData} from '@wireapp/api-client/lib/auth/'; import type {RegistrationDataState} from '../../reducer/authReducer'; diff --git a/src/script/auth/module/action/creator/ClientActionCreator.ts b/src/script/auth/module/action/creator/ClientActionCreator.ts index 9db8eeddf0e..68fd56c1e14 100644 --- a/src/script/auth/module/action/creator/ClientActionCreator.ts +++ b/src/script/auth/module/action/creator/ClientActionCreator.ts @@ -17,7 +17,7 @@ * */ -import type {RegisteredClient} from '@wireapp/api-client/src/client/'; +import type {RegisteredClient} from '@wireapp/api-client/lib/client/'; import type {AppAction} from './'; diff --git a/src/script/auth/module/action/creator/ConversationActionCreator.ts b/src/script/auth/module/action/creator/ConversationActionCreator.ts index 6b99e4fbd85..723fc55ac7b 100644 --- a/src/script/auth/module/action/creator/ConversationActionCreator.ts +++ b/src/script/auth/module/action/creator/ConversationActionCreator.ts @@ -17,7 +17,7 @@ * */ -import type {ConversationEvent} from '@wireapp/api-client/src/event/'; +import type {ConversationEvent} from '@wireapp/api-client/lib/event/'; import type {AppAction} from '.'; diff --git a/src/script/auth/module/action/creator/InvitationActionCreator.ts b/src/script/auth/module/action/creator/InvitationActionCreator.ts index 06078c961c0..229d526d7e2 100644 --- a/src/script/auth/module/action/creator/InvitationActionCreator.ts +++ b/src/script/auth/module/action/creator/InvitationActionCreator.ts @@ -17,7 +17,7 @@ * */ -import type {TeamInvitation} from '@wireapp/api-client/src/team/'; +import type {TeamInvitation} from '@wireapp/api-client/lib/team/'; export enum INVITATION_ACTION { INVITE_ADD_FAILED = 'INVITE_ADD_FAILED', diff --git a/src/script/auth/module/action/creator/SelfActionCreator.ts b/src/script/auth/module/action/creator/SelfActionCreator.ts index d17dc53771c..4d8d906ee25 100644 --- a/src/script/auth/module/action/creator/SelfActionCreator.ts +++ b/src/script/auth/module/action/creator/SelfActionCreator.ts @@ -17,7 +17,7 @@ * */ -import type {Consent, Self} from '@wireapp/api-client/src/self/'; +import type {Consent, Self} from '@wireapp/api-client/lib/self/'; import type {AppAction} from '.'; diff --git a/src/script/auth/module/reducer/authReducer.ts b/src/script/auth/module/reducer/authReducer.ts index 2b77beab6fe..b6a7ea4fad9 100644 --- a/src/script/auth/module/reducer/authReducer.ts +++ b/src/script/auth/module/reducer/authReducer.ts @@ -17,11 +17,11 @@ * */ -import type {SSOSettings} from '@wireapp/api-client/src/account/SSOSettings'; -import type {LoginData} from '@wireapp/api-client/src/auth/'; -import {ClientType} from '@wireapp/api-client/src/client/'; -import type {TeamData} from '@wireapp/api-client/src/team/'; -import type {UserAsset} from '@wireapp/api-client/src/user/'; +import type {SSOSettings} from '@wireapp/api-client/lib/account/SSOSettings'; +import type {LoginData} from '@wireapp/api-client/lib/auth/'; +import {ClientType} from '@wireapp/api-client/lib/client/'; +import type {TeamData} from '@wireapp/api-client/lib/team/'; +import type {UserAsset} from '@wireapp/api-client/lib/user/'; import {Config} from '../../../Config'; import {AUTH_ACTION, AppActions, USER_ACTION} from '../action/creator/'; diff --git a/src/script/auth/module/reducer/clientReducer.ts b/src/script/auth/module/reducer/clientReducer.ts index 56231f23530..bda6dc810c8 100644 --- a/src/script/auth/module/reducer/clientReducer.ts +++ b/src/script/auth/module/reducer/clientReducer.ts @@ -17,7 +17,7 @@ * */ -import type {RegisteredClient} from '@wireapp/api-client/src/client/'; +import type {RegisteredClient} from '@wireapp/api-client/lib/client/'; import {AUTH_ACTION, AppActions, CLIENT_ACTION, NOTIFICATION_ACTION} from '../action/creator/'; diff --git a/src/script/auth/module/reducer/inviteReducer.ts b/src/script/auth/module/reducer/inviteReducer.ts index 01c035e1614..7b4bae954f6 100644 --- a/src/script/auth/module/reducer/inviteReducer.ts +++ b/src/script/auth/module/reducer/inviteReducer.ts @@ -17,7 +17,7 @@ * */ -import type {TeamInvitation} from '@wireapp/api-client/src/team/'; +import type {TeamInvitation} from '@wireapp/api-client/lib/team/'; import {INVITATION_ACTION, InvitationActions} from '../action/creator/'; diff --git a/src/script/auth/module/reducer/selfReducer.ts b/src/script/auth/module/reducer/selfReducer.ts index c14f098db44..f5903755611 100644 --- a/src/script/auth/module/reducer/selfReducer.ts +++ b/src/script/auth/module/reducer/selfReducer.ts @@ -17,7 +17,7 @@ * */ -import type {Self} from '@wireapp/api-client/src/self/'; +import type {Self} from '@wireapp/api-client/lib/self/'; import {AppActions, SELF_ACTION} from '../action/creator/'; diff --git a/src/script/auth/module/selector/AuthSelector.ts b/src/script/auth/module/selector/AuthSelector.ts index 5471cd05703..78f9f8477dc 100644 --- a/src/script/auth/module/selector/AuthSelector.ts +++ b/src/script/auth/module/selector/AuthSelector.ts @@ -17,7 +17,7 @@ * */ -import type {TeamData} from '@wireapp/api-client/src/team/'; +import type {TeamData} from '@wireapp/api-client/lib/team/'; import type {RootState} from '../reducer'; import type {RegistrationDataState} from '../reducer/authReducer'; diff --git a/src/script/auth/module/selector/ClientSelector.ts b/src/script/auth/module/selector/ClientSelector.ts index 983ce1e7b8c..bd3c6dd2c1d 100644 --- a/src/script/auth/module/selector/ClientSelector.ts +++ b/src/script/auth/module/selector/ClientSelector.ts @@ -17,7 +17,7 @@ * */ -import {ClientType, RegisteredClient} from '@wireapp/api-client/src/client/'; +import {ClientType, RegisteredClient} from '@wireapp/api-client/lib/client/'; import type {RootState} from '../reducer'; diff --git a/src/script/auth/module/selector/SelfSelector.ts b/src/script/auth/module/selector/SelfSelector.ts index dd9bf49fcf2..395de96f875 100644 --- a/src/script/auth/module/selector/SelfSelector.ts +++ b/src/script/auth/module/selector/SelfSelector.ts @@ -17,7 +17,7 @@ * */ -import type {Self} from '@wireapp/api-client/src/self/'; +import type {Self} from '@wireapp/api-client/lib/self/'; import {Config} from '../../../Config'; import type {RootState} from '../reducer'; diff --git a/src/script/auth/page/CheckPassword.tsx b/src/script/auth/page/CheckPassword.tsx index a0021a252eb..10774b08157 100644 --- a/src/script/auth/page/CheckPassword.tsx +++ b/src/script/auth/page/CheckPassword.tsx @@ -19,8 +19,8 @@ import React, {useEffect, useRef, useState} from 'react'; -import {LoginData} from '@wireapp/api-client/src/auth'; -import {BackendErrorLabel} from '@wireapp/api-client/src/http'; +import {LoginData} from '@wireapp/api-client/lib/auth'; +import {BackendErrorLabel} from '@wireapp/api-client/lib/http'; import { ArrowIcon, ContainerXS, diff --git a/src/script/auth/page/ConversationJoin.tsx b/src/script/auth/page/ConversationJoin.tsx index 0f2ca268f84..c19617ff2f2 100644 --- a/src/script/auth/page/ConversationJoin.tsx +++ b/src/script/auth/page/ConversationJoin.tsx @@ -19,7 +19,7 @@ import React, {useEffect, useState} from 'react'; -import type {RegisterData} from '@wireapp/api-client/src/auth'; +import type {RegisterData} from '@wireapp/api-client/lib/auth'; import {Runtime, UrlUtil} from '@wireapp/commons'; import { ArrowIcon, diff --git a/src/script/auth/page/CustomEnvironmentRedirect.tsx b/src/script/auth/page/CustomEnvironmentRedirect.tsx index c70d4e03a12..ffcd8b5115e 100644 --- a/src/script/auth/page/CustomEnvironmentRedirect.tsx +++ b/src/script/auth/page/CustomEnvironmentRedirect.tsx @@ -21,7 +21,7 @@ import {useEffect, useState} from 'react'; import {Runtime, UrlUtil} from '@wireapp/commons'; import {COLOR, ContainerXS, FlexBox, Text} from '@wireapp/react-ui-kit'; -import {SVGIcon} from '@wireapp/react-ui-kit/src/Icon/SVGIcon'; +import {SVGIcon} from '@wireapp/react-ui-kit/lib/Icon/SVGIcon'; import {useIntl} from 'react-intl'; import {connect} from 'react-redux'; import {AnyAction, Dispatch} from 'redux'; diff --git a/src/script/auth/page/EntropyContainer.test.tsx b/src/script/auth/page/EntropyContainer.test.tsx index f618068afa6..9b2df9f8381 100644 --- a/src/script/auth/page/EntropyContainer.test.tsx +++ b/src/script/auth/page/EntropyContainer.test.tsx @@ -21,20 +21,16 @@ import {render} from '@testing-library/react'; import {EntropyContainer} from './EntropyContainer'; -import {EntropyData} from '../../util/Entropy'; import {withIntl, withTheme} from '../util/test/TestUtil'; require('jest-canvas-mock'); describe('EntropyContainer', () => { - const mockonSetEntropy = jest.fn().mockImplementation((a: EntropyData) => { - // eslint-disable-next-line no-console - console.log(a); - }); + const mockonSetEntropy = jest.fn().mockImplementation(); it('renders elements', () => { const {getByText, queryByText} = render(withTheme(withIntl())); - expect(getByText(/Increase your account’s security/gi)).toBeTruthy(); - expect(getByText(/move your mouse/gi)).toBeTruthy(); - expect(queryByText(/success/gi)).toBeNull(); + expect(getByText(/Increase your account’s security/i)).toBeTruthy(); + expect(getByText(/move your mouse/i)).toBeTruthy(); + expect(queryByText(/success/i)).toBeNull(); }); }); diff --git a/src/script/auth/page/HistoryInfo.tsx b/src/script/auth/page/HistoryInfo.tsx index c67ca1c387d..73f9fd52b7f 100644 --- a/src/script/auth/page/HistoryInfo.tsx +++ b/src/script/auth/page/HistoryInfo.tsx @@ -19,7 +19,7 @@ import React from 'react'; -import {ClientType} from '@wireapp/api-client/src/client'; +import {ClientType} from '@wireapp/api-client/lib/client'; import {Button, ContainerXS, H1, Link, Paragraph} from '@wireapp/react-ui-kit'; import {FormattedMessage, useIntl} from 'react-intl'; import {connect} from 'react-redux'; diff --git a/src/script/auth/page/Index.tsx b/src/script/auth/page/Index.tsx index 8754ec55769..66c81dd6178 100644 --- a/src/script/auth/page/Index.tsx +++ b/src/script/auth/page/Index.tsx @@ -21,10 +21,10 @@ import React, {useEffect, useState} from 'react'; import {UrlUtil} from '@wireapp/commons'; import {Button, ButtonVariant, ContainerXS, ErrorMessage, Text} from '@wireapp/react-ui-kit'; -import {SVGIcon} from '@wireapp/react-ui-kit/src/Icon/SVGIcon'; +import {SVGIcon} from '@wireapp/react-ui-kit/lib/Icon/SVGIcon'; import {FormattedMessage, useIntl} from 'react-intl'; import {connect} from 'react-redux'; -import {useNavigate, Navigate} from 'react-router-dom'; +import {Navigate, useNavigate} from 'react-router-dom'; import {AnyAction, Dispatch} from 'redux'; import {Page} from './Page'; diff --git a/src/script/auth/page/Login.test.tsx b/src/script/auth/page/Login.test.tsx index 1a9621e43eb..5c87c53e757 100644 --- a/src/script/auth/page/Login.test.tsx +++ b/src/script/auth/page/Login.test.tsx @@ -18,7 +18,7 @@ */ import {fireEvent, waitFor} from '@testing-library/react'; -import {ClientType} from '@wireapp/api-client/src/client'; +import {ClientType} from '@wireapp/api-client/lib/client'; import {TypeUtil} from '@wireapp/commons'; import {Login} from './Login'; @@ -30,6 +30,7 @@ import {initialRootState} from '../module/reducer'; import {ROUTE} from '../route'; import {mockStoreFactory} from '../util/test/mockStoreFactory'; import {mountComponent} from '../util/test/TestUtil'; + jest.mock('../util/SVGProvider'); describe('Login', () => { it('successfully logs in with email', async () => { diff --git a/src/script/auth/page/Login.tsx b/src/script/auth/page/Login.tsx index ef43b1c9871..8cf97382bd2 100644 --- a/src/script/auth/page/Login.tsx +++ b/src/script/auth/page/Login.tsx @@ -19,15 +19,15 @@ import React, {useEffect, useRef, useState} from 'react'; -import {LoginData} from '@wireapp/api-client/src/auth'; -import {ClientType} from '@wireapp/api-client/src/client/index'; +import {LoginData} from '@wireapp/api-client/lib/auth'; +import {ClientType} from '@wireapp/api-client/lib/client/index'; import {Runtime, UrlUtil} from '@wireapp/commons'; import { ArrowIcon, - COLOR, Checkbox, CheckboxLabel, CodeInput, + COLOR, Column, Columns, Container, @@ -35,14 +35,14 @@ import { Form, H1, H2, - Label, IsMobile, - TextLink, + Label, + Link, + LinkVariant, Loading, Muted, Text, - LinkVariant, - Link, + TextLink, } from '@wireapp/react-ui-kit'; import {StatusCodes} from 'http-status-codes'; import {useIntl} from 'react-intl'; @@ -66,7 +66,7 @@ import {actionRoot} from '../module/action/'; import {BackendError} from '../module/action/BackendError'; import {LabeledError} from '../module/action/LabeledError'; import {ValidationError} from '../module/action/ValidationError'; -import {RootState, bindActionCreators} from '../module/reducer'; +import {bindActionCreators, RootState} from '../module/reducer'; import * as AuthSelector from '../module/selector/AuthSelector'; import {QUERY_KEY, ROUTE} from '../route'; import {parseError, parseValidationErrors} from '../util/errorUtil'; diff --git a/src/script/auth/page/Page.tsx b/src/script/auth/page/Page.tsx index 9dae824a379..2da0f934df8 100644 --- a/src/script/auth/page/Page.tsx +++ b/src/script/auth/page/Page.tsx @@ -19,7 +19,7 @@ import React from 'react'; -import {TeamData} from '@wireapp/api-client/src/team'; +import {TeamData} from '@wireapp/api-client/lib/team'; import {connect} from 'react-redux'; import {Navigate} from 'react-router-dom'; diff --git a/src/script/auth/page/PhoneLogin.test.tsx b/src/script/auth/page/PhoneLogin.test.tsx index 738a5f8f8da..da79b8252cd 100644 --- a/src/script/auth/page/PhoneLogin.test.tsx +++ b/src/script/auth/page/PhoneLogin.test.tsx @@ -18,7 +18,7 @@ */ import {fireEvent, waitFor} from '@testing-library/react'; -import {PasswordExistsError} from '@wireapp/api-client/src/auth'; +import {PasswordExistsError} from '@wireapp/api-client/lib/auth'; import {PhoneLogin} from './PhoneLogin'; diff --git a/src/script/auth/page/PhoneLogin.tsx b/src/script/auth/page/PhoneLogin.tsx index 36ce02a7386..06c2cbb06ed 100644 --- a/src/script/auth/page/PhoneLogin.tsx +++ b/src/script/auth/page/PhoneLogin.tsx @@ -24,14 +24,14 @@ import { InvalidPhoneNumberError, LoginData, PasswordExistsError, -} from '@wireapp/api-client/src/auth'; -import {ClientType} from '@wireapp/api-client/src/client/index'; +} from '@wireapp/api-client/lib/auth'; +import {ClientType} from '@wireapp/api-client/lib/client/index'; import {Runtime} from '@wireapp/commons'; import { ArrowIcon, - COLOR, Checkbox, CheckboxLabel, + COLOR, Column, Columns, Container, @@ -53,7 +53,7 @@ import {PhoneLoginForm} from '../component/PhoneLoginForm'; import {RouterLink} from '../component/RouterLink'; import {actionRoot} from '../module/action'; import {ValidationError} from '../module/action/ValidationError'; -import {RootState, bindActionCreators} from '../module/reducer'; +import {bindActionCreators, RootState} from '../module/reducer'; import * as AuthSelector from '../module/selector/AuthSelector'; import {ROUTE} from '../route'; import {isValidationError, parseError, parseValidationErrors} from '../util/errorUtil'; diff --git a/src/script/auth/page/Root.tsx b/src/script/auth/page/Root.tsx index 309500178f3..099e3879ebf 100644 --- a/src/script/auth/page/Root.tsx +++ b/src/script/auth/page/Root.tsx @@ -19,8 +19,8 @@ import React, {useEffect} from 'react'; -import {pathWithParams} from '@wireapp/commons/src/main/util/UrlUtil'; -import {StyledApp, Loading, ContainerXS, THEME_ID} from '@wireapp/react-ui-kit'; +import {pathWithParams} from '@wireapp/commons/lib/util/UrlUtil'; +import {ContainerXS, Loading, StyledApp, THEME_ID} from '@wireapp/react-ui-kit'; import {IntlProvider} from 'react-intl'; import {connect} from 'react-redux'; import {HashRouter as Router, Navigate, Route, Routes} from 'react-router-dom'; @@ -54,7 +54,7 @@ import {VerifyPhoneCode} from './VerifyPhoneCode'; import {Config} from '../../Config'; import {mapLanguage, normalizeLanguage} from '../localeConfig'; import {actionRoot as ROOT_ACTIONS} from '../module/action/'; -import {RootState, bindActionCreators} from '../module/reducer'; +import {bindActionCreators, RootState} from '../module/reducer'; import * as AuthSelector from '../module/selector/AuthSelector'; import * as CookieSelector from '../module/selector/CookieSelector'; import * as LanguageSelector from '../module/selector/LanguageSelector'; diff --git a/src/script/auth/page/SetHandle.tsx b/src/script/auth/page/SetHandle.tsx index 61a67be950d..a246adc633c 100644 --- a/src/script/auth/page/SetHandle.tsx +++ b/src/script/auth/page/SetHandle.tsx @@ -19,7 +19,7 @@ import React, {useEffect, useState} from 'react'; -import {ConsentType} from '@wireapp/api-client/src/self/index'; +import {ConsentType} from '@wireapp/api-client/lib/self/index'; import { ArrowIcon, ContainerXS, @@ -43,7 +43,7 @@ import {chooseHandleStrings} from '../../strings'; import {AcceptNewsModal} from '../component/AcceptNewsModal'; import {actionRoot as ROOT_ACTIONS} from '../module/action'; import {BackendError} from '../module/action/BackendError'; -import {RootState, bindActionCreators} from '../module/reducer'; +import {bindActionCreators, RootState} from '../module/reducer'; import * as SelfSelector from '../module/selector/SelfSelector'; import {ROUTE} from '../route'; import {parseError} from '../util/errorUtil'; diff --git a/src/script/auth/page/SingleSignOnForm.tsx b/src/script/auth/page/SingleSignOnForm.tsx index 6c9a853547d..bd2762f59a9 100644 --- a/src/script/auth/page/SingleSignOnForm.tsx +++ b/src/script/auth/page/SingleSignOnForm.tsx @@ -19,11 +19,11 @@ import React, {useEffect, useRef, useState} from 'react'; -import {ClientType} from '@wireapp/api-client/src/client/index'; -import {BackendErrorLabel} from '@wireapp/api-client/src/http'; -import {UrlUtil, Runtime} from '@wireapp/commons'; -import {pathWithParams} from '@wireapp/commons/src/main/util/UrlUtil'; -import {PATTERN, isValidEmail} from '@wireapp/commons/src/main/util/ValidationUtil'; +import {ClientType} from '@wireapp/api-client/lib/client/index'; +import {BackendErrorLabel} from '@wireapp/api-client/lib/http'; +import {Runtime, UrlUtil} from '@wireapp/commons'; +import {pathWithParams} from '@wireapp/commons/lib/util/UrlUtil'; +import {isValidEmail, PATTERN} from '@wireapp/commons/lib/util/ValidationUtil'; import { ArrowIcon, Checkbox, @@ -33,12 +33,12 @@ import { Input, InputBlock, InputSubmitCombo, - RoundIconButton, Loading, + RoundIconButton, } from '@wireapp/react-ui-kit'; import {FormattedMessage, useIntl} from 'react-intl'; import {connect} from 'react-redux'; -import {useNavigate, Navigate} from 'react-router-dom'; +import {Navigate, useNavigate} from 'react-router-dom'; import {AnyAction, Dispatch} from 'redux'; import {Config} from '../../Config'; @@ -46,7 +46,7 @@ import {loginStrings, logoutReasonStrings, ssoLoginStrings} from '../../strings' import {actionRoot as ROOT_ACTIONS} from '../module/action/'; import {BackendError} from '../module/action/BackendError'; import {ValidationError} from '../module/action/ValidationError'; -import {RootState, bindActionCreators} from '../module/reducer'; +import {bindActionCreators, RootState} from '../module/reducer'; import * as AuthSelector from '../module/selector/AuthSelector'; import * as ClientSelector from '../module/selector/ClientSelector'; import {QUERY_KEY, ROUTE} from '../route'; diff --git a/src/script/auth/page/VerifyPhoneCode.tsx b/src/script/auth/page/VerifyPhoneCode.tsx index d86cd710230..c55d28621c8 100644 --- a/src/script/auth/page/VerifyPhoneCode.tsx +++ b/src/script/auth/page/VerifyPhoneCode.tsx @@ -19,7 +19,7 @@ import React, {useEffect, useState} from 'react'; -import {LoginData} from '@wireapp/api-client/src/auth'; +import {LoginData} from '@wireapp/api-client/lib/auth'; import {CodeInput, Column, Columns, ContainerXS, H1} from '@wireapp/react-ui-kit'; import {useIntl} from 'react-intl'; import {connect} from 'react-redux'; @@ -35,7 +35,7 @@ import {actionRoot} from '../module/action'; import {BackendError} from '../module/action/BackendError'; import {LabeledError} from '../module/action/LabeledError'; import {ValidationError} from '../module/action/ValidationError'; -import {RootState, bindActionCreators} from '../module/reducer'; +import {bindActionCreators, RootState} from '../module/reducer'; import * as AuthSelector from '../module/selector/AuthSelector'; import {ROUTE} from '../route'; import {parseError} from '../util/errorUtil'; diff --git a/src/script/auth/util/test/TestUtil.tsx b/src/script/auth/util/test/TestUtil.tsx index c0d1d6f261a..ea348b748c3 100644 --- a/src/script/auth/util/test/TestUtil.tsx +++ b/src/script/auth/util/test/TestUtil.tsx @@ -20,7 +20,7 @@ import React from 'react'; import {render} from '@testing-library/react'; -import {RecursivePartial} from '@wireapp/commons/src/main/util/TypeUtil'; +import {RecursivePartial} from '@wireapp/commons/lib/util/TypeUtil'; import {StyledApp, THEME_ID} from '@wireapp/react-ui-kit'; import {IntlProvider} from 'react-intl'; import {Provider} from 'react-redux'; diff --git a/src/script/calling/Call.ts b/src/script/calling/Call.ts index b8f12711e15..456f631d9aa 100644 --- a/src/script/calling/Call.ts +++ b/src/script/calling/Call.ts @@ -17,7 +17,7 @@ * */ -import {QualifiedId} from '@wireapp/api-client/src/user'; +import {QualifiedId} from '@wireapp/api-client/lib/user'; import {CALL_TYPE, CONV_TYPE, STATE as CALL_STATE} from '@wireapp/avs'; import ko from 'knockout'; @@ -27,7 +27,7 @@ import {sortUsersByPriority} from 'Util/StringUtil'; import {MuteState} from './CallState'; import {CALL_MESSAGE_TYPE} from './enum/CallMessageType'; -import type {Participant, ClientId} from './Participant'; +import type {ClientId, Participant} from './Participant'; import {Config} from '../Config'; import type {MediaDevicesHandler} from '../media/MediaDevicesHandler'; diff --git a/src/script/calling/CallState.ts b/src/script/calling/CallState.ts index 6aa03201991..754b81ec4f3 100644 --- a/src/script/calling/CallState.ts +++ b/src/script/calling/CallState.ts @@ -17,7 +17,7 @@ * */ -import {QualifiedId} from '@wireapp/api-client/src/user'; +import {QualifiedId} from '@wireapp/api-client/lib/user'; import {REASON as CALL_REASON, STATE as CALL_STATE} from '@wireapp/avs'; import ko from 'knockout'; import {singleton} from 'tsyringe'; diff --git a/src/script/calling/CallingRepository.ts b/src/script/calling/CallingRepository.ts index b1ee2058c5c..bd73d1149a7 100644 --- a/src/script/calling/CallingRepository.ts +++ b/src/script/calling/CallingRepository.ts @@ -17,10 +17,10 @@ * */ -import type {CallConfigData} from '@wireapp/api-client/src/account/CallConfigData'; -import type {QualifiedUserClients, UserClients} from '@wireapp/api-client/src/conversation'; -import type {QualifiedId} from '@wireapp/api-client/src/user'; -import type {WebappProperties} from '@wireapp/api-client/src/user/data'; +import type {CallConfigData} from '@wireapp/api-client/lib/account/CallConfigData'; +import type {QualifiedUserClients, UserClients} 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 { CALL_TYPE, CONV_TYPE, @@ -38,17 +38,15 @@ import { WcallMember, } from '@wireapp/avs'; import {Runtime} from '@wireapp/commons'; -import {PayloadBundleState} from '@wireapp/core/src/main/conversation'; -import { - flattenQualifiedUserClients, - flattenUserClients, -} from '@wireapp/core/src/main/conversation/message/UserClientsUtil'; -import {isQualifiedUserClients} from '@wireapp/core/src/main/util'; +import {PayloadBundleState} from '@wireapp/core/lib/conversation'; +import {flattenQualifiedUserClients, flattenUserClients} from '@wireapp/core/lib/conversation/message/UserClientsUtil'; +import {isQualifiedUserClients} from '@wireapp/core/lib/util'; import {WebAppEvents} from '@wireapp/webapp-events'; import {amplify} from 'amplify'; import axios from 'axios'; import ko from 'knockout'; import {container} from 'tsyringe'; + import 'webrtc-adapter'; import {flatten} from 'Util/ArrayUtil'; diff --git a/src/script/calling/Participant.ts b/src/script/calling/Participant.ts index e792b463f17..ff691a960f1 100644 --- a/src/script/calling/Participant.ts +++ b/src/script/calling/Participant.ts @@ -17,7 +17,7 @@ * */ -import {QualifiedId} from '@wireapp/api-client/src/user'; +import {QualifiedId} from '@wireapp/api-client/lib/user'; import {VIDEO_STATE} from '@wireapp/avs'; import ko from 'knockout'; diff --git a/src/script/client/ClientEntity.ts b/src/script/client/ClientEntity.ts index 4a21d56603c..8f3df4346f1 100644 --- a/src/script/client/ClientEntity.ts +++ b/src/script/client/ClientEntity.ts @@ -17,7 +17,7 @@ * */ -import {ClientClassification, ClientType} from '@wireapp/api-client/src/client/'; +import {ClientClassification, ClientType} from '@wireapp/api-client/lib/client/'; import ko from 'knockout'; import {splitFingerprint} from 'Util/StringUtil'; diff --git a/src/script/client/ClientMapper.ts b/src/script/client/ClientMapper.ts index 7aa345f8e7f..8fea78ea5a5 100644 --- a/src/script/client/ClientMapper.ts +++ b/src/script/client/ClientMapper.ts @@ -17,7 +17,7 @@ * */ -import type {PublicClient, RegisteredClient} from '@wireapp/api-client/src/client'; +import type {PublicClient, RegisteredClient} from '@wireapp/api-client/lib/client'; import {ClientEntity} from './ClientEntity'; diff --git a/src/script/client/ClientRepository.test.ts b/src/script/client/ClientRepository.test.ts index f387d781b37..1f0ce0e36f3 100644 --- a/src/script/client/ClientRepository.test.ts +++ b/src/script/client/ClientRepository.test.ts @@ -17,7 +17,7 @@ * */ -import {ClientClassification, ClientType} from '@wireapp/api-client/src/client/'; +import {ClientClassification, ClientType} from '@wireapp/api-client/lib/client/'; import {Runtime} from '@wireapp/commons'; import {StatusCodes as HTTP_STATUS} from 'http-status-codes'; diff --git a/src/script/client/ClientRepository.ts b/src/script/client/ClientRepository.ts index 54c25f18242..571c2474498 100644 --- a/src/script/client/ClientRepository.ts +++ b/src/script/client/ClientRepository.ts @@ -17,9 +17,9 @@ * */ -import {ClientType, PublicClient, RegisteredClient, ClientCapability} from '@wireapp/api-client/src/client/'; -import {USER_EVENT, UserClientAddEvent, UserClientRemoveEvent} from '@wireapp/api-client/src/event'; -import {QualifiedId} from '@wireapp/api-client/src/user/'; +import {ClientCapability, ClientType, PublicClient, RegisteredClient} from '@wireapp/api-client/lib/client/'; +import {UserClientAddEvent, UserClientRemoveEvent, USER_EVENT} from '@wireapp/api-client/lib/event'; +import {QualifiedId} from '@wireapp/api-client/lib/user/'; import {Runtime} from '@wireapp/commons'; import {WebAppEvents} from '@wireapp/webapp-events'; import {amplify} from 'amplify'; @@ -29,7 +29,7 @@ import murmurhash from 'murmurhash'; import {container} from 'tsyringe'; import {t} from 'Util/LocalizerUtil'; -import {Logger, getLogger} from 'Util/Logger'; +import {getLogger, Logger} from 'Util/Logger'; import {matchQualifiedIds} from 'Util/QualifiedId'; import {loadValue} from 'Util/StorageUtil'; diff --git a/src/script/client/ClientService.ts b/src/script/client/ClientService.ts index 297fb23c8a9..2f262176620 100644 --- a/src/script/client/ClientService.ts +++ b/src/script/client/ClientService.ts @@ -23,8 +23,8 @@ import type { QualifiedUserClientMap, ClientCapabilityData, PublicClient, -} from '@wireapp/api-client/src/client'; -import type {QualifiedId} from '@wireapp/api-client/src/user'; +} from '@wireapp/api-client/lib/client'; +import type {QualifiedId} from '@wireapp/api-client/lib/user'; import {container} from 'tsyringe'; import {Logger, getLogger} from 'Util/Logger'; diff --git a/src/script/components/Emoji/useEmoji.tsx b/src/script/components/Emoji/useEmoji.tsx index 181cf4f78fe..0d257090855 100644 --- a/src/script/components/Emoji/useEmoji.tsx +++ b/src/script/components/Emoji/useEmoji.tsx @@ -19,7 +19,7 @@ import {KeyboardEvent, useEffect, useRef, useState} from 'react'; -import type {WebappProperties} from '@wireapp/api-client/src/user/data/'; +import type {WebappProperties} from '@wireapp/api-client/lib/user/data/'; import {WebAppEvents} from '@wireapp/webapp-events'; import {amplify} from 'amplify'; diff --git a/src/script/components/MessagesList/Message/ContentMessage/MessageQuote.tsx b/src/script/components/MessagesList/Message/ContentMessage/MessageQuote.tsx index 9f062613f49..276b78a9e96 100644 --- a/src/script/components/MessagesList/Message/ContentMessage/MessageQuote.tsx +++ b/src/script/components/MessagesList/Message/ContentMessage/MessageQuote.tsx @@ -20,13 +20,13 @@ import { FC, Fragment, - MouseEvent as ReactMouseEvent, KeyboardEvent as ReactKeyboardEvent, + MouseEvent as ReactMouseEvent, useEffect, useState, } from 'react'; -import {QualifiedId} from '@wireapp/api-client/src/user'; +import {QualifiedId} from '@wireapp/api-client/lib/user'; import {WebAppEvents} from '@wireapp/webapp-events'; import {amplify} from 'amplify'; import cx from 'classnames'; @@ -38,7 +38,7 @@ import {useKoSubscribableChildren} from 'Util/ComponentUtil'; import {includesOnlyEmojis} from 'Util/EmojiUtil'; import {handleKeyDown} from 'Util/KeyboardUtil'; import {t} from 'Util/LocalizerUtil'; -import {isBeforeToday, formatDateNumeral, formatTimeShort} from 'Util/TimeUtil'; +import {formatDateNumeral, formatTimeShort, isBeforeToday} from 'Util/TimeUtil'; import {useDisposableRef} from 'Util/useDisposableRef'; import {AudioAsset} from './asset/AudioAsset'; diff --git a/src/script/components/MessagesList/Message/ContentMessage/asset/index.tsx b/src/script/components/MessagesList/Message/ContentMessage/asset/index.tsx index 43fc072e4a9..529b5e25c10 100644 --- a/src/script/components/MessagesList/Message/ContentMessage/asset/index.tsx +++ b/src/script/components/MessagesList/Message/ContentMessage/asset/index.tsx @@ -17,7 +17,7 @@ * */ -import {QualifiedId} from '@wireapp/api-client/src/user'; +import {QualifiedId} from '@wireapp/api-client/lib/user'; import {Asset} from 'src/script/entity/message/Asset'; import type {FileAsset as FileAssetType} from 'src/script/entity/message/FileAsset'; diff --git a/src/script/components/MessagesList/Message/ContentMessage/index.tsx b/src/script/components/MessagesList/Message/ContentMessage/index.tsx index 245a10748f3..a8cf22e9aa6 100644 --- a/src/script/components/MessagesList/Message/ContentMessage/index.tsx +++ b/src/script/components/MessagesList/Message/ContentMessage/index.tsx @@ -19,7 +19,7 @@ import React from 'react'; -import {QualifiedId} from '@wireapp/api-client/src/user'; +import {QualifiedId} from '@wireapp/api-client/lib/user'; import {Avatar, AVATAR_SIZE} from 'Components/Avatar'; import {Icon} from 'Components/Icon'; diff --git a/src/script/components/MessagesList/Message/index.tsx b/src/script/components/MessagesList/Message/index.tsx index fcef0795c2a..521274f1046 100644 --- a/src/script/components/MessagesList/Message/index.tsx +++ b/src/script/components/MessagesList/Message/index.tsx @@ -18,13 +18,13 @@ */ import React, { - MouseEvent as ReactMouseEvent, KeyboardEvent as ReactKeyboardEvent, + MouseEvent as ReactMouseEvent, useLayoutEffect, useRef, } from 'react'; -import {QualifiedId} from '@wireapp/api-client/src/user'; +import {QualifiedId} from '@wireapp/api-client/lib/user'; import cx from 'classnames'; import {InViewport} from 'Components/utils/InViewport'; diff --git a/src/script/components/Modals/GroupCreation/GroupCreationModal.tsx b/src/script/components/Modals/GroupCreation/GroupCreationModal.tsx index 14ae8587d59..09bac9e9c8a 100644 --- a/src/script/components/Modals/GroupCreation/GroupCreationModal.tsx +++ b/src/script/components/Modals/GroupCreation/GroupCreationModal.tsx @@ -17,10 +17,10 @@ * */ -import React, {useContext, useEffect, useState, useMemo} from 'react'; +import React, {useContext, useEffect, useMemo, useState} from 'react'; -import {RECEIPT_MODE} from '@wireapp/api-client/src/conversation/data/ConversationReceiptModeUpdateData'; -import {ConversationProtocol} from '@wireapp/api-client/src/conversation/NewConversation'; +import {RECEIPT_MODE} from '@wireapp/api-client/lib/conversation/data/ConversationReceiptModeUpdateData'; +import {ConversationProtocol} from '@wireapp/api-client/lib/conversation/NewConversation'; import {Button, ButtonVariant, Select} from '@wireapp/react-ui-kit'; import {WebAppEvents} from '@wireapp/webapp-events'; import {amplify} from 'amplify'; @@ -35,7 +35,7 @@ import {BaseToggle} from 'Components/toggle/BaseToggle'; import {InfoToggle} from 'Components/toggle/InfoToggle'; import {UserSearchableList} from 'Components/UserSearchableList'; import {useKoSubscribableChildren} from 'Util/ComponentUtil'; -import {onEscKey, offEscKey, handleEnterDown} from 'Util/KeyboardUtil'; +import {handleEnterDown, offEscKey, onEscKey} from 'Util/KeyboardUtil'; import {t} from 'Util/LocalizerUtil'; import {getLogger} from 'Util/Logger'; import {sortUsersByPriority} from 'Util/StringUtil'; diff --git a/src/script/components/Modals/LegalHoldModal/LegalHoldModal.test.tsx b/src/script/components/Modals/LegalHoldModal/LegalHoldModal.test.tsx index 7c5af414169..407235d7a29 100644 --- a/src/script/components/Modals/LegalHoldModal/LegalHoldModal.test.tsx +++ b/src/script/components/Modals/LegalHoldModal/LegalHoldModal.test.tsx @@ -18,7 +18,7 @@ */ import {act, render} from '@testing-library/react'; -import type {QualifiedId} from '@wireapp/api-client/src/user/'; +import type {QualifiedId} from '@wireapp/api-client/lib/user/'; import ko from 'knockout'; import {useLegalHoldModalState} from 'Components/Modals/LegalHoldModal/LegalHoldModal.state'; diff --git a/src/script/components/Modals/LegalHoldModal/LegalHoldModal.tsx b/src/script/components/Modals/LegalHoldModal/LegalHoldModal.tsx index c4e4d29f9e2..c4e0e646fe9 100644 --- a/src/script/components/Modals/LegalHoldModal/LegalHoldModal.tsx +++ b/src/script/components/Modals/LegalHoldModal/LegalHoldModal.tsx @@ -19,7 +19,7 @@ import {FC, useCallback, useEffect, useRef, useState} from 'react'; -import {LegalHoldMemberStatus} from '@wireapp/api-client/src/team/legalhold/'; +import {LegalHoldMemberStatus} from '@wireapp/api-client/lib/team/legalhold/'; import cx from 'classnames'; import {StatusCodes as HTTP_STATUS} from 'http-status-codes'; diff --git a/src/script/components/Modals/UserModal/UserModal.test.tsx b/src/script/components/Modals/UserModal/UserModal.test.tsx index b5b177607be..7ef1f18a6a3 100644 --- a/src/script/components/Modals/UserModal/UserModal.test.tsx +++ b/src/script/components/Modals/UserModal/UserModal.test.tsx @@ -18,7 +18,7 @@ */ import {render, waitFor} from '@testing-library/react'; -import {QualifiedId} from '@wireapp/api-client/src/user'; +import {QualifiedId} from '@wireapp/api-client/lib/user'; import {User} from 'src/script/entity/User'; import {Core} from 'src/script/service/CoreSingleton'; diff --git a/src/script/components/Modals/UserModal/UserModal.tsx b/src/script/components/Modals/UserModal/UserModal.tsx index 0730ec21509..53e91c345bc 100644 --- a/src/script/components/Modals/UserModal/UserModal.tsx +++ b/src/script/components/Modals/UserModal/UserModal.tsx @@ -17,9 +17,9 @@ * */ -import React, {useState, useEffect} from 'react'; +import React, {useEffect, useState} from 'react'; -import {QualifiedId} from '@wireapp/api-client/src/user'; +import {QualifiedId} from '@wireapp/api-client/lib/user'; import cx from 'classnames'; import {noop} from 'jquery'; import {container} from 'tsyringe'; diff --git a/src/script/components/TitleBar/TitleBar.test.tsx b/src/script/components/TitleBar/TitleBar.test.tsx index 63a2a8f8d61..90187f4a768 100644 --- a/src/script/components/TitleBar/TitleBar.test.tsx +++ b/src/script/components/TitleBar/TitleBar.test.tsx @@ -18,7 +18,7 @@ */ import {fireEvent, render, waitFor} from '@testing-library/react'; -import {QualifiedId} from '@wireapp/api-client/src/user'; +import {QualifiedId} from '@wireapp/api-client/lib/user'; import {Runtime} from '@wireapp/commons'; import * as uiKit from '@wireapp/react-ui-kit'; import {WebAppEvents} from '@wireapp/webapp-events'; diff --git a/src/script/components/UserDevices.tsx b/src/script/components/UserDevices.tsx index cf041d2a4ab..1c4f75d2fd2 100644 --- a/src/script/components/UserDevices.tsx +++ b/src/script/components/UserDevices.tsx @@ -19,7 +19,7 @@ import React, {useEffect, useMemo, useState} from 'react'; -import {ClientClassification} from '@wireapp/api-client/src/client/'; +import {ClientClassification} from '@wireapp/api-client/lib/client/'; import {partition} from 'Util/ArrayUtil'; import {t} from 'Util/LocalizerUtil'; diff --git a/src/script/components/avatar/AvatarImage.test.tsx b/src/script/components/avatar/AvatarImage.test.tsx index d23a6f2e242..29fd8dc0b9c 100644 --- a/src/script/components/avatar/AvatarImage.test.tsx +++ b/src/script/components/avatar/AvatarImage.test.tsx @@ -17,8 +17,7 @@ * */ -import {waitFor, render} from '@testing-library/react'; -import {act} from 'react-dom/test-utils'; +import {render, waitFor} from '@testing-library/react'; import {AVATAR_SIZE} from 'Components/Avatar'; import {AssetRemoteData} from 'src/script/assets/AssetRemoteData'; @@ -52,7 +51,7 @@ describe('AvatarImage', () => { render(); - await act(() => waitFor(() => expect(assetRepoSpy.getObjectUrl).toHaveBeenCalledWith(resource))); + await waitFor(() => expect(assetRepoSpy.getObjectUrl).toHaveBeenCalledWith(resource)); }); it('fetches preview avatar image for low pixel ratio devices', async () => { @@ -77,7 +76,7 @@ describe('AvatarImage', () => { render(); - await act(() => waitFor(() => expect(assetRepoSpy.getObjectUrl).toHaveBeenCalledWith(resource))); + await waitFor(() => expect(assetRepoSpy.getObjectUrl).toHaveBeenCalledWith(resource)); }); it('fetches preview avatar image for small avatars', async () => { @@ -101,9 +100,7 @@ describe('AvatarImage', () => { render(); - await act(() => - waitFor(() => expect(assetRepoSpy.getObjectUrl).toHaveBeenCalledWith(participant.previewPictureResource())), - ); + await waitFor(() => expect(assetRepoSpy.getObjectUrl).toHaveBeenCalledWith(participant.previewPictureResource())); }); it('does not try to fetch non-existent avatar', async () => { @@ -123,6 +120,6 @@ describe('AvatarImage', () => { render(); - await act(() => waitFor(() => expect(assetRepoSpy.getObjectUrl).not.toHaveBeenCalled())); + await waitFor(() => expect(assetRepoSpy.getObjectUrl).not.toHaveBeenCalled()); }); }); diff --git a/src/script/components/calling/FullscreenVideoCall.tsx b/src/script/components/calling/FullscreenVideoCall.tsx index a6656ef7d31..3c4cda32cd4 100644 --- a/src/script/components/calling/FullscreenVideoCall.tsx +++ b/src/script/components/calling/FullscreenVideoCall.tsx @@ -343,7 +343,7 @@ const FullscreenVideoCall: React.FC = ({ css={{ display: 'flex', justifyContent: horizontalXsBreakpoint ? 'space-around' : 'space-between', - ...(horizontalXsBreakpoint && {width: '100%'} ), + ...(horizontalXsBreakpoint && {width: '100%'}), }} >
  • diff --git a/src/script/components/calling/GroupVideoGrid.tsx b/src/script/components/calling/GroupVideoGrid.tsx index e4b8c8a84e1..06e757d72d2 100644 --- a/src/script/components/calling/GroupVideoGrid.tsx +++ b/src/script/components/calling/GroupVideoGrid.tsx @@ -17,10 +17,10 @@ * */ -import React, {useState, useEffect, CSSProperties} from 'react'; +import React, {CSSProperties, useEffect, useState} from 'react'; import {css} from '@emotion/react'; -import {QualifiedId} from '@wireapp/api-client/src/user'; +import {QualifiedId} from '@wireapp/api-client/lib/user'; import {Avatar, AVATAR_SIZE} from 'Components/Avatar'; import {Icon} from 'Components/Icon'; diff --git a/src/script/components/calling/GroupVideoGridTile.tsx b/src/script/components/calling/GroupVideoGridTile.tsx index a8f0ed57ce6..b94b1012350 100644 --- a/src/script/components/calling/GroupVideoGridTile.tsx +++ b/src/script/components/calling/GroupVideoGridTile.tsx @@ -19,7 +19,7 @@ import React from 'react'; -import {QualifiedId} from '@wireapp/api-client/src/user'; +import {QualifiedId} from '@wireapp/api-client/lib/user'; import {VIDEO_STATE} from '@wireapp/avs'; import {Avatar, AVATAR_SIZE} from 'Components/Avatar'; diff --git a/src/script/components/list/ConversationListCallingCell.tsx b/src/script/components/list/ConversationListCallingCell.tsx index 67b225a4dbe..55dcfdeddb3 100644 --- a/src/script/components/list/ConversationListCallingCell.tsx +++ b/src/script/components/list/ConversationListCallingCell.tsx @@ -17,9 +17,9 @@ * */ -import React, {useState, useCallback} from 'react'; +import React, {useCallback, useState} from 'react'; -import {DefaultConversationRoleName} from '@wireapp/api-client/src/conversation/'; +import {DefaultConversationRoleName} from '@wireapp/api-client/lib/conversation/'; import {CALL_TYPE, CONV_TYPE, REASON as CALL_REASON, STATE as CALL_STATE} from '@wireapp/avs'; import cx from 'classnames'; import {container} from 'tsyringe'; @@ -47,7 +47,7 @@ import type {Multitasking} from '../../notification/NotificationRepository'; import {generateConversationUrl} from '../../router/routeGenerator'; import {createNavigate, createNavigateKeyboard} from '../../router/routerBindings'; import {TeamState} from '../../team/TeamState'; -import {showContextMenu, ContextMenuEntry} from '../../ui/ContextMenu'; +import {ContextMenuEntry, showContextMenu} from '../../ui/ContextMenu'; import {initFadingScrollbar} from '../../ui/fadingScrollbar'; import {CallActions, CallViewTab} from '../../view_model/CallingViewModel'; diff --git a/src/script/components/panel/ConversationProtocolDetails/ConversationProtocolDetails.test.tsx b/src/script/components/panel/ConversationProtocolDetails/ConversationProtocolDetails.test.tsx index 07a79e6aba7..b7c81818c64 100644 --- a/src/script/components/panel/ConversationProtocolDetails/ConversationProtocolDetails.test.tsx +++ b/src/script/components/panel/ConversationProtocolDetails/ConversationProtocolDetails.test.tsx @@ -18,7 +18,7 @@ */ import {render} from '@testing-library/react'; -import {ConversationProtocol} from '@wireapp/api-client/src/conversation/NewConversation'; +import {ConversationProtocol} from '@wireapp/api-client/lib/conversation/NewConversation'; import {ConversationProtocolDetails, Ciphersuite} from './ConversationProtocolDetails'; diff --git a/src/script/components/panel/ConversationProtocolDetails/ConversationProtocolDetails.tsx b/src/script/components/panel/ConversationProtocolDetails/ConversationProtocolDetails.tsx index 1dd823656e4..550c6ac0599 100644 --- a/src/script/components/panel/ConversationProtocolDetails/ConversationProtocolDetails.tsx +++ b/src/script/components/panel/ConversationProtocolDetails/ConversationProtocolDetails.tsx @@ -20,7 +20,7 @@ import React from 'react'; import {CSSObject} from '@emotion/react'; -import {ConversationProtocol} from '@wireapp/api-client/src/conversation/NewConversation'; +import {ConversationProtocol} from '@wireapp/api-client/lib/conversation/NewConversation'; import {t} from 'Util/LocalizerUtil'; diff --git a/src/script/components/panel/EnrichedFields.test.tsx b/src/script/components/panel/EnrichedFields.test.tsx index 04bb9c7d316..a12ce9fd45d 100644 --- a/src/script/components/panel/EnrichedFields.test.tsx +++ b/src/script/components/panel/EnrichedFields.test.tsx @@ -17,8 +17,8 @@ * */ -import {waitFor, render} from '@testing-library/react'; -import type {RichInfo} from '@wireapp/api-client/src/user/'; +import {render, waitFor} from '@testing-library/react'; +import type {RichInfo} from '@wireapp/api-client/lib/user/'; import {act} from 'react-dom/test-utils'; import {User} from 'src/script/entity/User'; diff --git a/src/script/components/panel/EnrichedFields.tsx b/src/script/components/panel/EnrichedFields.tsx index 772692a6bbc..5613598cb53 100644 --- a/src/script/components/panel/EnrichedFields.tsx +++ b/src/script/components/panel/EnrichedFields.tsx @@ -19,7 +19,7 @@ import React, {useEffect, useState} from 'react'; -import type {RichInfoField} from '@wireapp/api-client/src/user/RichInfo'; +import type {RichInfoField} from '@wireapp/api-client/lib/user/RichInfo'; import {container} from 'tsyringe'; import {registerReactComponent, useKoSubscribableChildren} from 'Util/ComponentUtil'; diff --git a/src/script/components/panel/UserActions.test.tsx b/src/script/components/panel/UserActions.test.tsx index 33e8a5f4073..77beca8c2a7 100644 --- a/src/script/components/panel/UserActions.test.tsx +++ b/src/script/components/panel/UserActions.test.tsx @@ -18,7 +18,7 @@ */ import {render} from '@testing-library/react'; -import {ConnectionStatus} from '@wireapp/api-client/src/connection/'; +import {ConnectionStatus} from '@wireapp/api-client/lib/connection/'; import ko from 'knockout'; import {ConversationRoleRepository} from 'src/script/conversation/ConversationRoleRepository'; @@ -27,7 +27,7 @@ import {User} from 'src/script/entity/User'; import {ActionsViewModel} from 'src/script/view_model/ActionsViewModel'; import {noop} from 'Util/util'; -import {UserActions, ActionIdentifier, Actions} from './UserActions'; +import {ActionIdentifier, Actions, UserActions} from './UserActions'; const actionsViewModel = {} as ActionsViewModel; diff --git a/src/script/components/panel/UserActions.tsx b/src/script/components/panel/UserActions.tsx index 7b21fd449c6..d0758d6972d 100644 --- a/src/script/components/panel/UserActions.tsx +++ b/src/script/components/panel/UserActions.tsx @@ -19,7 +19,7 @@ import React from 'react'; -import {CONVERSATION_TYPE} from '@wireapp/api-client/src/conversation'; +import {CONVERSATION_TYPE} from '@wireapp/api-client/lib/conversation'; import {WebAppEvents} from '@wireapp/webapp-events'; import {amplify} from 'amplify'; diff --git a/src/script/components/toggle/ReceiptModeToggle.test.tsx b/src/script/components/toggle/ReceiptModeToggle.test.tsx index 8a3303d555d..fbacec765d7 100644 --- a/src/script/components/toggle/ReceiptModeToggle.test.tsx +++ b/src/script/components/toggle/ReceiptModeToggle.test.tsx @@ -18,7 +18,7 @@ */ import {render} from '@testing-library/react'; -import {RECEIPT_MODE} from '@wireapp/api-client/src/conversation/data'; +import {RECEIPT_MODE} from '@wireapp/api-client/lib/conversation/data'; import {ReceiptModeToggle} from './ReceiptModeToggle'; diff --git a/src/script/components/toggle/ReceiptModeToggle.tsx b/src/script/components/toggle/ReceiptModeToggle.tsx index 8a71be6458c..3a106f50a9c 100644 --- a/src/script/components/toggle/ReceiptModeToggle.tsx +++ b/src/script/components/toggle/ReceiptModeToggle.tsx @@ -19,7 +19,7 @@ import React, {Fragment} from 'react'; -import {RECEIPT_MODE} from '@wireapp/api-client/src/conversation/data'; +import {RECEIPT_MODE} from '@wireapp/api-client/lib/conversation/data'; import {t} from 'Util/LocalizerUtil'; diff --git a/src/script/components/userDevices/DeviceCard.test.tsx b/src/script/components/userDevices/DeviceCard.test.tsx index fe8543c2563..8bb866686f1 100644 --- a/src/script/components/userDevices/DeviceCard.test.tsx +++ b/src/script/components/userDevices/DeviceCard.test.tsx @@ -18,7 +18,7 @@ */ import {render} from '@testing-library/react'; -import {ClientClassification} from '@wireapp/api-client/src/client/'; +import {ClientClassification} from '@wireapp/api-client/lib/client/'; import ko from 'knockout'; import {DeviceCard} from './DeviceCard'; diff --git a/src/script/components/userDevices/DeviceCard.tsx b/src/script/components/userDevices/DeviceCard.tsx index 6ec7d432093..50df15bc705 100644 --- a/src/script/components/userDevices/DeviceCard.tsx +++ b/src/script/components/userDevices/DeviceCard.tsx @@ -19,7 +19,7 @@ import React from 'react'; -import {ClientClassification} from '@wireapp/api-client/src/client'; +import {ClientClassification} from '@wireapp/api-client/lib/client'; import cx from 'classnames'; import {DeviceId} from 'Components/DeviceId'; diff --git a/src/script/connection/ConnectionEntity.ts b/src/script/connection/ConnectionEntity.ts index 2dcd3efe953..228bedd774b 100644 --- a/src/script/connection/ConnectionEntity.ts +++ b/src/script/connection/ConnectionEntity.ts @@ -17,8 +17,8 @@ * */ -import {ConnectionStatus} from '@wireapp/api-client/src/connection/'; -import {QualifiedId} from '@wireapp/api-client/src/user'; +import {ConnectionStatus} from '@wireapp/api-client/lib/connection/'; +import {QualifiedId} from '@wireapp/api-client/lib/user'; import ko from 'knockout'; export class ConnectionEntity { diff --git a/src/script/connection/ConnectionMapper.test.ts b/src/script/connection/ConnectionMapper.test.ts index 6d60432ccad..6dcda9b5f47 100644 --- a/src/script/connection/ConnectionMapper.test.ts +++ b/src/script/connection/ConnectionMapper.test.ts @@ -17,7 +17,7 @@ * */ -import {ConnectionStatus, Connection} from '@wireapp/api-client/src/connection/'; +import {Connection, ConnectionStatus} from '@wireapp/api-client/lib/connection/'; import {ConnectionMapper} from './ConnectionMapper'; diff --git a/src/script/connection/ConnectionMapper.ts b/src/script/connection/ConnectionMapper.ts index 7d9a64f2c61..1009d4c8e66 100644 --- a/src/script/connection/ConnectionMapper.ts +++ b/src/script/connection/ConnectionMapper.ts @@ -17,7 +17,7 @@ * */ -import type {Connection as ConnectionData} from '@wireapp/api-client/src/connection/'; +import type {Connection as ConnectionData} from '@wireapp/api-client/lib/connection/'; import {ConnectionEntity} from './ConnectionEntity'; diff --git a/src/script/connection/ConnectionRepository.ts b/src/script/connection/ConnectionRepository.ts index 62dda26e944..1e713f25e8b 100644 --- a/src/script/connection/ConnectionRepository.ts +++ b/src/script/connection/ConnectionRepository.ts @@ -17,12 +17,12 @@ * */ -import {ConnectionStatus} from '@wireapp/api-client/src/connection/'; -import {USER_EVENT, UserConnectionEvent} from '@wireapp/api-client/src/event/'; -import type {BackendEventType} from '@wireapp/api-client/src/event/BackendEvent'; -import {BackendErrorLabel} from '@wireapp/api-client/src/http/'; -import {QualifiedId} from '@wireapp/api-client/src/user'; -import type {UserConnectionData} from '@wireapp/api-client/src/user/data/'; +import {ConnectionStatus} from '@wireapp/api-client/lib/connection/'; +import {UserConnectionEvent, USER_EVENT} from '@wireapp/api-client/lib/event/'; +import type {BackendEventType} from '@wireapp/api-client/lib/event/BackendEvent'; +import {BackendErrorLabel} from '@wireapp/api-client/lib/http/'; +import {QualifiedId} from '@wireapp/api-client/lib/user'; +import type {UserConnectionData} from '@wireapp/api-client/lib/user/data/'; import {WebAppEvents} from '@wireapp/webapp-events'; import {amplify} from 'amplify'; import {container} from 'tsyringe'; diff --git a/src/script/connection/ConnectionService.ts b/src/script/connection/ConnectionService.ts index 45981624a5f..7f011052881 100644 --- a/src/script/connection/ConnectionService.ts +++ b/src/script/connection/ConnectionService.ts @@ -17,8 +17,8 @@ * */ -import type {Connection, ConnectionStatus} from '@wireapp/api-client/src/connection/'; -import {QualifiedId} from '@wireapp/api-client/src/user'; +import type {Connection, ConnectionStatus} from '@wireapp/api-client/lib/connection/'; +import {QualifiedId} from '@wireapp/api-client/lib/user'; import {container} from 'tsyringe'; import {APIClient} from '../service/APIClientSingleton'; diff --git a/src/script/conversation/AbstractConversationEventHandler.ts b/src/script/conversation/AbstractConversationEventHandler.ts index 5a8c7ac8925..5e7a5a99598 100644 --- a/src/script/conversation/AbstractConversationEventHandler.ts +++ b/src/script/conversation/AbstractConversationEventHandler.ts @@ -17,7 +17,7 @@ * */ -import {ConversationEvent} from '@wireapp/api-client/src/event'; +import {ConversationEvent} from '@wireapp/api-client/lib/event'; import {ClientConversationEvent} from './EventBuilder'; diff --git a/src/script/conversation/ClientMismatchUtil.ts b/src/script/conversation/ClientMismatchUtil.ts index 25febd948d6..ada4c7ab049 100644 --- a/src/script/conversation/ClientMismatchUtil.ts +++ b/src/script/conversation/ClientMismatchUtil.ts @@ -20,15 +20,12 @@ import type { ClientMismatch, MessageSendingStatus, - UserClients, QualifiedUserClients, -} from '@wireapp/api-client/src/conversation/'; -import {QualifiedId} from '@wireapp/api-client/src/user'; -import { - flattenQualifiedUserClients, - flattenUserClients, -} from '@wireapp/core/src/main/conversation/message/UserClientsUtil'; -import {isQualifiedUserClients} from '@wireapp/core/src/main/util'; + 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 {isQualifiedUserClients} from '@wireapp/core/lib/util'; import {difference, intersection} from 'underscore'; import {matchQualifiedIds} from 'Util/QualifiedId'; diff --git a/src/script/conversation/ConversationAccessPermission.test.ts b/src/script/conversation/ConversationAccessPermission.test.ts index 0f24b5777b7..662efccd42c 100644 --- a/src/script/conversation/ConversationAccessPermission.test.ts +++ b/src/script/conversation/ConversationAccessPermission.test.ts @@ -18,7 +18,7 @@ */ /* eslint-disable sort-keys-fix/sort-keys-fix */ -import {CONVERSATION_ACCESS, ACCESS_ROLE_V2} from '@wireapp/api-client/src/conversation/'; +import {CONVERSATION_ACCESS, ACCESS_ROLE_V2} from '@wireapp/api-client/lib/conversation/'; import {ACCESS_STATE, TEAM} from './AccessState'; import { diff --git a/src/script/conversation/ConversationAccessPermission.ts b/src/script/conversation/ConversationAccessPermission.ts index 20a2c0a0e3f..6537710b717 100644 --- a/src/script/conversation/ConversationAccessPermission.ts +++ b/src/script/conversation/ConversationAccessPermission.ts @@ -18,7 +18,7 @@ */ /* eslint-disable sort-keys-fix/sort-keys-fix */ -import {CONVERSATION_ACCESS, ACCESS_ROLE_V2} from '@wireapp/api-client/src/conversation/'; +import {ACCESS_ROLE_V2, CONVERSATION_ACCESS} from '@wireapp/api-client/lib/conversation/'; import {ACCESS_STATE, TEAM} from './AccessState'; diff --git a/src/script/conversation/ConversationEphemeralHandler.ts b/src/script/conversation/ConversationEphemeralHandler.ts index aaa3dd5730c..1286b38441e 100644 --- a/src/script/conversation/ConversationEphemeralHandler.ts +++ b/src/script/conversation/ConversationEphemeralHandler.ts @@ -17,11 +17,11 @@ * */ -import {CONVERSATION_EVENT, ConversationMessageTimerUpdateEvent} from '@wireapp/api-client/src/event/'; +import {ConversationMessageTimerUpdateEvent, CONVERSATION_EVENT} from '@wireapp/api-client/lib/event/'; import {Article, LinkPreview} from '@wireapp/protocol-messaging'; import ko from 'knockout'; -import {Logger, getLogger} from 'Util/Logger'; +import {getLogger, Logger} from 'Util/Logger'; import {clamp} from 'Util/NumberUtil'; import {obfuscate} from 'Util/StringUtil'; import {TIME_IN_MILLIS} from 'Util/TimeUtil'; diff --git a/src/script/conversation/ConversationFilter.test.ts b/src/script/conversation/ConversationFilter.test.ts index 6dec5723719..ff35efde45c 100644 --- a/src/script/conversation/ConversationFilter.test.ts +++ b/src/script/conversation/ConversationFilter.test.ts @@ -17,8 +17,8 @@ * */ -import {CONVERSATION_ACCESS, CONVERSATION_ACCESS_ROLE, CONVERSATION_TYPE} from '@wireapp/api-client/src/conversation'; -import {ConversationProtocol} from '@wireapp/api-client/src/conversation/NewConversation'; +import {CONVERSATION_ACCESS, CONVERSATION_ACCESS_ROLE, CONVERSATION_TYPE} from '@wireapp/api-client/lib/conversation'; +import {ConversationProtocol} from '@wireapp/api-client/lib/conversation/NewConversation'; import {ConversationFilter} from './ConversationFilter'; import {ConversationDatabaseData, ConversationMapper} from './ConversationMapper'; diff --git a/src/script/conversation/ConversationLabelRepository.ts b/src/script/conversation/ConversationLabelRepository.ts index 5b0152dc760..4b517ac3bac 100644 --- a/src/script/conversation/ConversationLabelRepository.ts +++ b/src/script/conversation/ConversationLabelRepository.ts @@ -17,13 +17,13 @@ * */ -import {USER_EVENT} from '@wireapp/api-client/src/event/'; +import {USER_EVENT} from '@wireapp/api-client/lib/event/'; import {WebAppEvents} from '@wireapp/webapp-events'; import {amplify} from 'amplify'; import ko from 'knockout'; import {t} from 'Util/LocalizerUtil'; -import {Logger, getLogger} from 'Util/Logger'; +import {getLogger, Logger} from 'Util/Logger'; import {TypedEventTarget} from 'Util/TypedEventTarget'; import {createRandomUuid} from 'Util/util'; diff --git a/src/script/conversation/ConversationMapper.test.ts b/src/script/conversation/ConversationMapper.test.ts index 32e6f41f698..e62312f6672 100644 --- a/src/script/conversation/ConversationMapper.test.ts +++ b/src/script/conversation/ConversationMapper.test.ts @@ -18,16 +18,16 @@ */ import { - CONVERSATION_TYPE, + Conversation as ConversationBackendData, CONVERSATION_ACCESS, CONVERSATION_ACCESS_ROLE, - Conversation as ConversationBackendData, + CONVERSATION_TYPE, Member as MemberBackendData, OtherMember as OtherMemberBackendData, RemoteConversations, -} from '@wireapp/api-client/src/conversation/'; -import {RECEIPT_MODE} from '@wireapp/api-client/src/conversation/data'; -import type {QualifiedId} from '@wireapp/api-client/src/user/'; +} from '@wireapp/api-client/lib/conversation/'; +import {RECEIPT_MODE} from '@wireapp/api-client/lib/conversation/data'; +import type {QualifiedId} from '@wireapp/api-client/lib/user/'; import { ConversationDatabaseData, diff --git a/src/script/conversation/ConversationMapper.ts b/src/script/conversation/ConversationMapper.ts index 3e045fc19ad..2ad5fcd9803 100644 --- a/src/script/conversation/ConversationMapper.ts +++ b/src/script/conversation/ConversationMapper.ts @@ -18,16 +18,16 @@ */ import { + ACCESS_ROLE_V2, Conversation as ConversationBackendData, ConversationCode, - DefaultConversationRoleName, CONVERSATION_ACCESS, CONVERSATION_ACCESS_ROLE, - ACCESS_ROLE_V2, CONVERSATION_TYPE, + DefaultConversationRoleName, RemoteConversations, -} from '@wireapp/api-client/src/conversation'; -import {QualifiedId} from '@wireapp/api-client/src/user'; +} from '@wireapp/api-client/lib/conversation'; +import {QualifiedId} from '@wireapp/api-client/lib/user'; import {LegalHoldStatus} from '@wireapp/protocol-messaging'; import ko from 'knockout'; import {isObject} from 'underscore'; @@ -38,7 +38,7 @@ import {ACCESS_STATE} from './AccessState'; import {ConversationStatus} from './ConversationStatus'; import {Conversation} from '../entity/Conversation'; -import {BASE_ERROR_TYPE, BaseError} from '../error/BaseError'; +import {BaseError, BASE_ERROR_TYPE} from '../error/BaseError'; import {ConversationError} from '../error/ConversationError'; import {ConversationRecord} from '../storage/record/ConversationRecord'; diff --git a/src/script/conversation/ConversationRepository.test.ts b/src/script/conversation/ConversationRepository.test.ts index 6627440232a..bc2983a9244 100644 --- a/src/script/conversation/ConversationRepository.test.ts +++ b/src/script/conversation/ConversationRepository.test.ts @@ -17,12 +17,12 @@ * */ -import {ClientClassification} from '@wireapp/api-client/src/client/'; -import {ConnectionStatus} from '@wireapp/api-client/src/connection/'; -import {CONVERSATION_TYPE, CONVERSATION_ACCESS, CONVERSATION_ACCESS_ROLE} from '@wireapp/api-client/src/conversation/'; -import {RECEIPT_MODE} from '@wireapp/api-client/src/conversation/data'; -import {ConversationProtocol} from '@wireapp/api-client/src/conversation/NewConversation'; -import {CONVERSATION_EVENT, ConversationCreateEvent, ConversationMemberJoinEvent} from '@wireapp/api-client/src/event/'; +import {ClientClassification} from '@wireapp/api-client/lib/client/'; +import {ConnectionStatus} from '@wireapp/api-client/lib/connection/'; +import {CONVERSATION_ACCESS, CONVERSATION_ACCESS_ROLE, CONVERSATION_TYPE} from '@wireapp/api-client/lib/conversation/'; +import {RECEIPT_MODE} from '@wireapp/api-client/lib/conversation/data'; +import {ConversationProtocol} from '@wireapp/api-client/lib/conversation/NewConversation'; +import {ConversationCreateEvent, ConversationMemberJoinEvent, CONVERSATION_EVENT} from '@wireapp/api-client/lib/event/'; import {WebAppEvents} from '@wireapp/webapp-events'; import {amplify} from 'amplify'; import {StatusCodes as HTTP_STATUS} from 'http-status-codes'; @@ -35,7 +35,7 @@ import {Config} from 'src/script/Config'; import {ConnectionEntity} from 'src/script/connection/ConnectionEntity'; import {ConversationDatabaseData, ConversationMapper} from 'src/script/conversation/ConversationMapper'; import {ConversationStatus} from 'src/script/conversation/ConversationStatus'; -import {EventBuilder, DeleteEvent, MessageHiddenEvent} from 'src/script/conversation/EventBuilder'; +import {DeleteEvent, EventBuilder, MessageHiddenEvent} from 'src/script/conversation/EventBuilder'; import {Conversation} from 'src/script/entity/Conversation'; import {Message} from 'src/script/entity/message/Message'; import {User} from 'src/script/entity/User'; diff --git a/src/script/conversation/ConversationRepository.ts b/src/script/conversation/ConversationRepository.ts index 12e405e6d79..cb98843c2d8 100644 --- a/src/script/conversation/ConversationRepository.ts +++ b/src/script/conversation/ConversationRepository.ts @@ -18,28 +18,28 @@ */ import { - DefaultConversationRoleName as DefaultRole, - CONVERSATION_TYPE, - NewConversation, Conversation as BackendConversation, ConversationProtocol, -} from '@wireapp/api-client/src/conversation/'; -import {ConversationReceiptModeUpdateData} from '@wireapp/api-client/src/conversation/data/'; + CONVERSATION_TYPE, + DefaultConversationRoleName as DefaultRole, + NewConversation, +} from '@wireapp/api-client/lib/conversation/'; +import {ConversationReceiptModeUpdateData} from '@wireapp/api-client/lib/conversation/data/'; import { - CONVERSATION_EVENT, - ConversationMessageTimerUpdateEvent, - ConversationRenameEvent, - ConversationMemberJoinEvent, ConversationCreateEvent, ConversationEvent, - ConversationReceiptModeUpdateEvent, + ConversationMemberJoinEvent, ConversationMemberLeaveEvent, ConversationMemberUpdateEvent, -} from '@wireapp/api-client/src/event'; -import {BackendErrorLabel} from '@wireapp/api-client/src/http/'; -import type {QualifiedId} from '@wireapp/api-client/src/user/'; -import {MLSReturnType} from '@wireapp/core/src/main/conversation'; -import {Confirmation, LegalHoldStatus, Asset as ProtobufAsset} from '@wireapp/protocol-messaging'; + ConversationMessageTimerUpdateEvent, + ConversationReceiptModeUpdateEvent, + ConversationRenameEvent, + CONVERSATION_EVENT, +} from '@wireapp/api-client/lib/event'; +import {BackendErrorLabel} from '@wireapp/api-client/lib/http/'; +import type {QualifiedId} from '@wireapp/api-client/lib/user/'; +import {MLSReturnType} from '@wireapp/core/lib/conversation'; +import {Asset as ProtobufAsset, Confirmation, LegalHoldStatus} from '@wireapp/protocol-messaging'; import {WebAppEvents} from '@wireapp/webapp-events'; import {amplify} from 'amplify'; import {StatusCodes as HTTP_STATUS} from 'http-status-codes'; @@ -50,15 +50,15 @@ import {flatten} from 'underscore'; import {getNextItem} from 'Util/ArrayUtil'; import {allowsAllFiles, getFileExtensionOrName, isAllowedFile} from 'Util/FileTypeUtil'; import {replaceLink, t} from 'Util/LocalizerUtil'; -import {Logger, getLogger} from 'Util/Logger'; +import {getLogger, Logger} from 'Util/Logger'; import {PromiseQueue} from 'Util/PromiseQueue'; import {matchQualifiedIds} from 'Util/QualifiedId'; import { compareTransliteration, + fixWebsocketString, sortByPriority, - startsWith, sortUsersByPriority, - fixWebsocketString, + startsWith, } from 'Util/StringUtil'; import {TIME_IN_MILLIS} from 'Util/TimeUtil'; import {base64ToArray, createRandomUuid, noop} from 'Util/util'; @@ -69,7 +69,7 @@ import {updateAccessRights} from './ConversationAccessPermission'; import {ConversationEphemeralHandler} from './ConversationEphemeralHandler'; import {ConversationFilter} from './ConversationFilter'; import {ConversationLabelRepository} from './ConversationLabelRepository'; -import {ConversationMapper, ConversationDatabaseData} from './ConversationMapper'; +import {ConversationDatabaseData, ConversationMapper} from './ConversationMapper'; import {ConversationRoleRepository} from './ConversationRoleRepository'; import {ConversationService} from './ConversationService'; import {ConversationState} from './ConversationState'; diff --git a/src/script/conversation/ConversationRoleRepository.test.ts b/src/script/conversation/ConversationRoleRepository.test.ts index 8e5f7106ae8..5b278204362 100644 --- a/src/script/conversation/ConversationRoleRepository.test.ts +++ b/src/script/conversation/ConversationRoleRepository.test.ts @@ -17,7 +17,7 @@ * */ -import {ConversationRole, DefaultConversationRoleName as DefaultRole} from '@wireapp/api-client/src/conversation/'; +import {ConversationRole, DefaultConversationRoleName as DefaultRole} from '@wireapp/api-client/lib/conversation/'; import {createRandomUuid} from 'Util/util'; diff --git a/src/script/conversation/ConversationRoleRepository.ts b/src/script/conversation/ConversationRoleRepository.ts index 286dcf168d0..bd6ad165bca 100644 --- a/src/script/conversation/ConversationRoleRepository.ts +++ b/src/script/conversation/ConversationRoleRepository.ts @@ -17,7 +17,7 @@ * */ -import {DefaultConversationRoleName as DefaultRole, ConversationRole} from '@wireapp/api-client/src/conversation/'; +import {DefaultConversationRoleName as DefaultRole, ConversationRole} from '@wireapp/api-client/lib/conversation/'; import {container} from 'tsyringe'; import {Logger, getLogger} from 'Util/Logger'; diff --git a/src/script/conversation/ConversationService.ts b/src/script/conversation/ConversationService.ts index 7f133842151..f5bc1950537 100644 --- a/src/script/conversation/ConversationService.ts +++ b/src/script/conversation/ConversationService.ts @@ -18,19 +18,19 @@ */ import type { - CONVERSATION_ACCESS, ACCESS_ROLE_V2, ClientMismatch, Conversation as BackendConversation, ConversationCode, + CONVERSATION_ACCESS, NewOTRMessage, -} from '@wireapp/api-client/src/conversation'; +} from '@wireapp/api-client/lib/conversation'; import type { + ConversationJoinData, ConversationMemberUpdateData, ConversationOtherMemberUpdateData, ConversationReceiptModeUpdateData, - ConversationJoinData, -} from '@wireapp/api-client/src/conversation/data'; +} from '@wireapp/api-client/lib/conversation/data'; import type { ConversationCodeDeleteEvent, ConversationCodeUpdateEvent, @@ -40,11 +40,11 @@ import type { ConversationMessageTimerUpdateEvent, ConversationReceiptModeUpdateEvent, ConversationRenameEvent, -} from '@wireapp/api-client/src/event'; -import {QualifiedId} from '@wireapp/api-client/src/user'; +} from '@wireapp/api-client/lib/event'; +import {QualifiedId} from '@wireapp/api-client/lib/user'; import {container} from 'tsyringe'; -import {Logger, getLogger} from 'Util/Logger'; +import {getLogger, Logger} from 'Util/Logger'; import type {Conversation as ConversationEntity} from '../entity/Conversation'; import type {EventService} from '../event/EventService'; diff --git a/src/script/conversation/ConversationState.ts b/src/script/conversation/ConversationState.ts index ec823793c37..daf9f89be31 100644 --- a/src/script/conversation/ConversationState.ts +++ b/src/script/conversation/ConversationState.ts @@ -17,8 +17,8 @@ * */ -import {ConnectionStatus} from '@wireapp/api-client/src/connection/'; -import {QualifiedId} from '@wireapp/api-client/src/user'; +import {ConnectionStatus} from '@wireapp/api-client/lib/connection/'; +import {QualifiedId} from '@wireapp/api-client/lib/user'; import ko from 'knockout'; import {container, singleton} from 'tsyringe'; diff --git a/src/script/conversation/ConversationStateHandler.ts b/src/script/conversation/ConversationStateHandler.ts index 89224243a56..26de4b86546 100644 --- a/src/script/conversation/ConversationStateHandler.ts +++ b/src/script/conversation/ConversationStateHandler.ts @@ -17,9 +17,9 @@ * */ -import {ConversationCode} from '@wireapp/api-client/src/conversation/'; -import {ConversationAccessUpdateData, ConversationAccessV2UpdateData} from '@wireapp/api-client/src/conversation/data/'; -import {CONVERSATION_EVENT} from '@wireapp/api-client/src/event/'; +import {ConversationCode} from '@wireapp/api-client/lib/conversation/'; +import {ConversationAccessUpdateData, ConversationAccessV2UpdateData} from '@wireapp/api-client/lib/conversation/data/'; +import {CONVERSATION_EVENT} from '@wireapp/api-client/lib/event/'; import {StatusCodes as HTTP_STATUS} from 'http-status-codes'; import {t} from 'Util/LocalizerUtil'; diff --git a/src/script/conversation/ConversationVerificationStateHandler.ts b/src/script/conversation/ConversationVerificationStateHandler.ts index e8553ce7ac3..a337786cf20 100644 --- a/src/script/conversation/ConversationVerificationStateHandler.ts +++ b/src/script/conversation/ConversationVerificationStateHandler.ts @@ -17,12 +17,12 @@ * */ -import type {QualifiedId} from '@wireapp/api-client/src/user/'; +import type {QualifiedId} from '@wireapp/api-client/lib/user/'; import {WebAppEvents} from '@wireapp/webapp-events'; import {amplify} from 'amplify'; import {container} from 'tsyringe'; -import {Logger, getLogger} from 'Util/Logger'; +import {getLogger, Logger} from 'Util/Logger'; import {matchQualifiedIds} from 'Util/QualifiedId'; import {ConversationState} from './ConversationState'; diff --git a/src/script/conversation/EventBuilder.test.ts b/src/script/conversation/EventBuilder.test.ts index 9784c8bdfb0..7a025e0cc50 100644 --- a/src/script/conversation/EventBuilder.test.ts +++ b/src/script/conversation/EventBuilder.test.ts @@ -17,7 +17,7 @@ * */ -import type {QualifiedId} from '@wireapp/api-client/src/user/'; +import type {QualifiedId} from '@wireapp/api-client/lib/user/'; import {DegradedMessageEventData, EventBuilder, GroupCreationEventData} from 'src/script/conversation/EventBuilder'; import {EventMapper} from 'src/script/conversation/EventMapper'; diff --git a/src/script/conversation/EventBuilder.ts b/src/script/conversation/EventBuilder.ts index 05b6f5e4aa7..86be155b2a1 100644 --- a/src/script/conversation/EventBuilder.ts +++ b/src/script/conversation/EventBuilder.ts @@ -17,11 +17,11 @@ * */ -import {MemberLeaveReason} from '@wireapp/api-client/src/conversation/data/'; -import {CONVERSATION_EVENT, ConversationOtrMessageAddEvent} from '@wireapp/api-client/src/event/'; -import type {QualifiedId} from '@wireapp/api-client/src/user/'; +import {MemberLeaveReason} from '@wireapp/api-client/lib/conversation/data/'; +import {ConversationOtrMessageAddEvent, CONVERSATION_EVENT} from '@wireapp/api-client/lib/event/'; +import type {QualifiedId} from '@wireapp/api-client/lib/user/'; import type {REASON as AVS_REASON} from '@wireapp/avs'; -import {ReactionType} from '@wireapp/core/src/main/conversation'; +import {ReactionType} from '@wireapp/core/lib/conversation'; import type {LegalHoldStatus} from '@wireapp/protocol-messaging'; import {createRandomUuid} from 'Util/util'; @@ -30,7 +30,7 @@ import {CALL_MESSAGE_TYPE} from '../calling/enum/CallMessageType'; import type {Conversation} from '../entity/Conversation'; import type {Message} from '../entity/message/Message'; import type {User} from '../entity/User'; -import {CALL, CONVERSATION, ClientEvent} from '../event/Client'; +import {CALL, ClientEvent, CONVERSATION} from '../event/Client'; import {StatusType} from '../message/StatusType'; import {VerificationMessageType} from '../message/VerificationMessageType'; import {AssetRecord, EventRecord} from '../storage'; diff --git a/src/script/conversation/EventMapper.ts b/src/script/conversation/EventMapper.ts index 3206a506a20..adad3227a06 100644 --- a/src/script/conversation/EventMapper.ts +++ b/src/script/conversation/EventMapper.ts @@ -17,7 +17,7 @@ * */ -import {CONVERSATION_EVENT, ConversationEvent} from '@wireapp/api-client/src/event/'; +import {CONVERSATION_EVENT, ConversationEvent} from '@wireapp/api-client/lib/event/'; import {LinkPreview, Mention} from '@wireapp/protocol-messaging'; import {t} from 'Util/LocalizerUtil'; diff --git a/src/script/conversation/MessageRepository.test.ts b/src/script/conversation/MessageRepository.test.ts index ee29091f640..2782cdbdbcd 100644 --- a/src/script/conversation/MessageRepository.test.ts +++ b/src/script/conversation/MessageRepository.test.ts @@ -17,10 +17,10 @@ * */ -import {ConnectionStatus} from '@wireapp/api-client/src/connection/'; -import {CONVERSATION_TYPE} from '@wireapp/api-client/src/conversation/'; -import {ConversationProtocol} from '@wireapp/api-client/src/conversation/NewConversation'; -import {PayloadBundleState} from '@wireapp/core/src/main/conversation'; +import {ConnectionStatus} from '@wireapp/api-client/lib/connection/'; +import {CONVERSATION_TYPE} from '@wireapp/api-client/lib/conversation/'; +import {ConversationProtocol} from '@wireapp/api-client/lib/conversation/NewConversation'; +import {PayloadBundleState} from '@wireapp/core/lib/conversation'; import {LegalHoldStatus} from '@wireapp/protocol-messaging'; import {container} from 'tsyringe'; diff --git a/src/script/conversation/MessageRepository.ts b/src/script/conversation/MessageRepository.ts index 89cdde0b5d6..bd3de007dd6 100644 --- a/src/script/conversation/MessageRepository.ts +++ b/src/script/conversation/MessageRepository.ts @@ -23,9 +23,9 @@ import { MessageSendingStatus, QualifiedUserClients, UserClients, -} from '@wireapp/api-client/src/conversation'; -import {QualifiedId, RequestCancellationError, User as APIClientUser} from '@wireapp/api-client/src/user'; -import {MessageTargetMode, PayloadBundleState, ReactionType} from '@wireapp/core/src/main/conversation'; +} from '@wireapp/api-client/lib/conversation'; +import {QualifiedId, RequestCancellationError, User as APIClientUser} from '@wireapp/api-client/lib/user'; +import {MessageTargetMode, PayloadBundleState, ReactionType} from '@wireapp/core/lib/conversation'; import { AudioMetaData, EditedTextContent, @@ -35,11 +35,11 @@ import { LinkPreviewUploadedContent, TextContent, VideoMetaData, -} from '@wireapp/core/src/main/conversation/content'; -import * as MessageBuilder from '@wireapp/core/src/main/conversation/message/MessageBuilder'; -import {OtrMessage} from '@wireapp/core/src/main/conversation/message/OtrMessage'; -import {TextContentBuilder} from '@wireapp/core/src/main/conversation/message/TextContentBuilder'; -import {isQualifiedUserClients, isUserClients} from '@wireapp/core/src/main/util'; +} from '@wireapp/core/lib/conversation/content'; +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 {Asset, Availability, Confirmation, GenericMessage} from '@wireapp/protocol-messaging'; import {WebAppEvents} from '@wireapp/webapp-events'; import {amplify} from 'amplify'; diff --git a/src/script/conversation/userClientsUtils.ts b/src/script/conversation/userClientsUtils.ts index ac48851e6ab..bbed430d35b 100644 --- a/src/script/conversation/userClientsUtils.ts +++ b/src/script/conversation/userClientsUtils.ts @@ -17,7 +17,7 @@ * */ -import {QualifiedId} from '@wireapp/api-client/src/user'; +import {QualifiedId} from '@wireapp/api-client/lib/user'; type UserClientsContainer = {[userId: string]: T[]}; type QualifiedUserClientsContainer = {[domain: string]: UserClientsContainer}; diff --git a/src/script/cryptography/CryptographyMapper.ts b/src/script/cryptography/CryptographyMapper.ts index e6fd042f31b..a11a69fa6ec 100644 --- a/src/script/cryptography/CryptographyMapper.ts +++ b/src/script/cryptography/CryptographyMapper.ts @@ -17,7 +17,7 @@ * */ -import {CONVERSATION_EVENT} from '@wireapp/api-client/src/event/'; +import {CONVERSATION_EVENT} from '@wireapp/api-client/lib/event/'; import { Asset, Availability, diff --git a/src/script/cryptography/CryptographyRepository.ts b/src/script/cryptography/CryptographyRepository.ts index b4db270706d..65e643c3126 100644 --- a/src/script/cryptography/CryptographyRepository.ts +++ b/src/script/cryptography/CryptographyRepository.ts @@ -17,8 +17,8 @@ * */ -import type {PreKey as BackendPreKey} from '@wireapp/api-client/src/auth/'; -import type {QualifiedId} from '@wireapp/api-client/src/user/'; +import type {PreKey as BackendPreKey} from '@wireapp/api-client/lib/auth/'; +import type {QualifiedId} from '@wireapp/api-client/lib/user/'; import {container} from 'tsyringe'; import {getLogger, Logger} from 'Util/Logger'; diff --git a/src/script/entity/Conversation.test.ts b/src/script/entity/Conversation.test.ts index 5314ff56c8d..e0112ba875a 100644 --- a/src/script/entity/Conversation.test.ts +++ b/src/script/entity/Conversation.test.ts @@ -19,9 +19,9 @@ //@ts-check -import {ConnectionStatus} from '@wireapp/api-client/src/connection/'; -import {CONVERSATION_TYPE} from '@wireapp/api-client/src/conversation/'; -import {CONVERSATION_EVENT} from '@wireapp/api-client/src/event/'; +import {ConnectionStatus} from '@wireapp/api-client/lib/connection/'; +import {CONVERSATION_TYPE} from '@wireapp/api-client/lib/conversation/'; +import {CONVERSATION_EVENT} from '@wireapp/api-client/lib/event/'; import {ClientEntity} from 'src/script/client/ClientEntity'; import {ConnectionMapper} from 'src/script/connection/ConnectionMapper'; @@ -1079,7 +1079,7 @@ describe('Conversation', () => { it('updates the participating user IDs with the user ID of the other party', () => { const connector_user_id = 'b43b376d-7b5a-4d77-89be-81a02892db8c'; - /** @type {import('@wireapp/api-client/src/connection/').Connection} */ + /** @type {import('@wireapp/api-client/lib/connection/').Connection} */ const payload_connection = { conversation: '15a7f358-8eba-4b8e-bcf2-61a08eb53349', from: '616cbbeb-1360-4e17-b333-e000662257bd', diff --git a/src/script/entity/Conversation.ts b/src/script/entity/Conversation.ts index f3d5424da65..c9e1ecb0127 100644 --- a/src/script/entity/Conversation.ts +++ b/src/script/entity/Conversation.ts @@ -22,10 +22,10 @@ import { CONVERSATION_ACCESS, CONVERSATION_ACCESS_ROLE, CONVERSATION_TYPE, -} from '@wireapp/api-client/src/conversation/'; -import {RECEIPT_MODE} from '@wireapp/api-client/src/conversation/data'; -import {ConversationProtocol} from '@wireapp/api-client/src/conversation/NewConversation'; -import {QualifiedId} from '@wireapp/api-client/src/user'; +} from '@wireapp/api-client/lib/conversation/'; +import {RECEIPT_MODE} from '@wireapp/api-client/lib/conversation/data'; +import {ConversationProtocol} from '@wireapp/api-client/lib/conversation/NewConversation'; +import {QualifiedId} from '@wireapp/api-client/lib/user'; import {Availability, LegalHoldStatus} from '@wireapp/protocol-messaging'; import {WebAppEvents} from '@wireapp/webapp-events'; import {amplify} from 'amplify'; diff --git a/src/script/entity/User.ts b/src/script/entity/User.ts index 327d8963aef..56225904e92 100644 --- a/src/script/entity/User.ts +++ b/src/script/entity/User.ts @@ -17,7 +17,7 @@ * */ -import {QualifiedId} from '@wireapp/api-client/src/user'; +import {QualifiedId} from '@wireapp/api-client/lib/user'; import {Availability} from '@wireapp/protocol-messaging'; import {WebAppEvents} from '@wireapp/webapp-events'; import {amplify} from 'amplify'; diff --git a/src/script/entity/message/ContentMessage.ts b/src/script/entity/message/ContentMessage.ts index a65316100ed..28334949208 100644 --- a/src/script/entity/message/ContentMessage.ts +++ b/src/script/entity/message/ContentMessage.ts @@ -17,8 +17,8 @@ * */ -import {QualifiedId} from '@wireapp/api-client/src/user'; -import type {ReactionType} from '@wireapp/core/src/main/conversation/ReactionType'; +import {QualifiedId} from '@wireapp/api-client/lib/user'; +import type {ReactionType} from '@wireapp/core/lib/conversation/ReactionType'; import ko from 'knockout'; import {copyText} from 'Util/ClipboardUtil'; @@ -35,7 +35,7 @@ import {AssetRepository} from '../../assets/AssetRepository'; import type {QuoteEntity} from '../../message/QuoteEntity'; import {SuperType} from '../../message/SuperType'; import {UserReactionMap} from '../../storage'; -import type {User} from '../User'; +import {User} from '../User'; export class ContentMessage extends Message { private readonly isLikedProvisional: ko.Observable; diff --git a/src/script/entity/message/DeleteConversationMessage.ts b/src/script/entity/message/DeleteConversationMessage.ts index 3f53d3972d4..33a578c92b3 100644 --- a/src/script/entity/message/DeleteConversationMessage.ts +++ b/src/script/entity/message/DeleteConversationMessage.ts @@ -17,7 +17,7 @@ * */ -import {TEAM_EVENT} from '@wireapp/api-client/src/event/TeamEvent'; +import {TEAM_EVENT} from '@wireapp/api-client/lib/event/TeamEvent'; import ko from 'knockout'; import {t} from 'Util/LocalizerUtil'; diff --git a/src/script/entity/message/MemberMessage.ts b/src/script/entity/message/MemberMessage.ts index 4669c00c3a3..08081c869ef 100644 --- a/src/script/entity/message/MemberMessage.ts +++ b/src/script/entity/message/MemberMessage.ts @@ -17,9 +17,9 @@ * */ -import {MemberLeaveReason} from '@wireapp/api-client/src/conversation/data/'; -import {CONVERSATION_EVENT} from '@wireapp/api-client/src/event/'; -import type {QualifiedId} from '@wireapp/api-client/src/user/'; +import {MemberLeaveReason} from '@wireapp/api-client/lib/conversation/data/'; +import {CONVERSATION_EVENT} from '@wireapp/api-client/lib/event/'; +import type {QualifiedId} from '@wireapp/api-client/lib/user/'; import ko from 'knockout'; import {Declension, joinNames, replaceLink, t} from 'Util/LocalizerUtil'; diff --git a/src/script/entity/message/Message.ts b/src/script/entity/message/Message.ts index 39b4bcfe0e6..08c58d89398 100644 --- a/src/script/entity/message/Message.ts +++ b/src/script/entity/message/Message.ts @@ -17,14 +17,14 @@ * */ -import {QualifiedId} from '@wireapp/api-client/src/user'; -import type {ReactionType} from '@wireapp/core/src/main/conversation/'; +import {QualifiedId} from '@wireapp/api-client/lib/user'; +import type {ReactionType} from '@wireapp/core/lib/conversation/'; import type {LegalHoldStatus} from '@wireapp/protocol-messaging'; import ko from 'knockout'; import {t} from 'Util/LocalizerUtil'; import {getUserName} from 'Util/SanitizationUtil'; -import {TIME_IN_MILLIS, formatDurationCaption, formatTimeShort, formatDateNumeral, fromUnixTime} from 'Util/TimeUtil'; +import {formatDateNumeral, formatDurationCaption, formatTimeShort, fromUnixTime, TIME_IN_MILLIS} from 'Util/TimeUtil'; import {CallingTimeoutMessage} from './CallingTimeoutMessage'; import type {CallMessage} from './CallMessage'; diff --git a/src/script/entity/message/MessageTimerUpdateMessage.ts b/src/script/entity/message/MessageTimerUpdateMessage.ts index 1b442aa0201..86f0b76874f 100644 --- a/src/script/entity/message/MessageTimerUpdateMessage.ts +++ b/src/script/entity/message/MessageTimerUpdateMessage.ts @@ -17,7 +17,7 @@ * */ -import {CONVERSATION_EVENT} from '@wireapp/api-client/src/event/'; +import {CONVERSATION_EVENT} from '@wireapp/api-client/lib/event/'; import ko from 'knockout'; import {t} from 'Util/LocalizerUtil'; diff --git a/src/script/entity/message/ReceiptModeUpdateMessage.ts b/src/script/entity/message/ReceiptModeUpdateMessage.ts index 572b7d1cf8c..cd8faa8b41b 100644 --- a/src/script/entity/message/ReceiptModeUpdateMessage.ts +++ b/src/script/entity/message/ReceiptModeUpdateMessage.ts @@ -17,7 +17,7 @@ * */ -import {CONVERSATION_EVENT} from '@wireapp/api-client/src/event/'; +import {CONVERSATION_EVENT} from '@wireapp/api-client/lib/event/'; import ko from 'knockout'; import {t} from 'Util/LocalizerUtil'; diff --git a/src/script/entity/message/RenameMessage.ts b/src/script/entity/message/RenameMessage.ts index 7c004595b14..cfbf57c19d1 100644 --- a/src/script/entity/message/RenameMessage.ts +++ b/src/script/entity/message/RenameMessage.ts @@ -17,7 +17,7 @@ * */ -import {CONVERSATION_EVENT} from '@wireapp/api-client/src/event/'; +import {CONVERSATION_EVENT} from '@wireapp/api-client/lib/event/'; import ko from 'knockout'; import {t} from 'Util/LocalizerUtil'; diff --git a/src/script/entity/message/Text.ts b/src/script/entity/message/Text.ts index bfa758d94fa..e0707781aee 100644 --- a/src/script/entity/message/Text.ts +++ b/src/script/entity/message/Text.ts @@ -17,7 +17,7 @@ * */ -import {QualifiedId} from '@wireapp/api-client/src/user'; +import {QualifiedId} from '@wireapp/api-client/lib/user'; import ko from 'knockout'; import {renderMessage} from 'Util/messageRenderer'; diff --git a/src/script/error/BackendClientError.ts b/src/script/error/BackendClientError.ts index 12f93944d81..602a6c39790 100644 --- a/src/script/error/BackendClientError.ts +++ b/src/script/error/BackendClientError.ts @@ -17,7 +17,7 @@ * */ -import {BackendErrorLabel} from '@wireapp/api-client/src/http/'; +import {BackendErrorLabel} from '@wireapp/api-client/lib/http/'; import {BaseError} from './BaseError'; diff --git a/src/script/event/EventRepository.test.ts b/src/script/event/EventRepository.test.ts index 4e42583f7d4..96e4d955650 100644 --- a/src/script/event/EventRepository.test.ts +++ b/src/script/event/EventRepository.test.ts @@ -17,7 +17,7 @@ * */ -import {CONVERSATION_EVENT, USER_EVENT} from '@wireapp/api-client/src/event/'; +import {CONVERSATION_EVENT, USER_EVENT} from '@wireapp/api-client/lib/event/'; import {Asset as ProtobufAsset} from '@wireapp/protocol-messaging'; import {AssetTransferState} from 'src/script/assets/AssetTransferState'; diff --git a/src/script/event/EventRepository.ts b/src/script/event/EventRepository.ts index f95790ff74c..21b877a9e4e 100644 --- a/src/script/event/EventRepository.ts +++ b/src/script/event/EventRepository.ts @@ -17,10 +17,10 @@ * */ -import {CONVERSATION_EVENT, USER_EVENT} from '@wireapp/api-client/src/event/'; +import {CONVERSATION_EVENT, USER_EVENT} from '@wireapp/api-client/lib/event/'; import {Account, ConnectionState, ProcessedEventPayload} from '@wireapp/core'; -import {PayloadBundleSource} from '@wireapp/core/src/main/conversation'; -import {HandledEventPayload} from '@wireapp/core/src/main/notification'; +import {PayloadBundleSource} from '@wireapp/core/lib/conversation'; +import {HandledEventPayload} from '@wireapp/core/lib/notification'; import {Asset as ProtobufAsset, GenericMessage} from '@wireapp/protocol-messaging'; import {WebAppEvents} from '@wireapp/webapp-events'; import {amplify} from 'amplify'; diff --git a/src/script/event/EventSource.ts b/src/script/event/EventSource.ts index af1632ecc32..64bbbecad0d 100644 --- a/src/script/event/EventSource.ts +++ b/src/script/event/EventSource.ts @@ -17,7 +17,7 @@ * */ -import {PayloadBundleSource} from '@wireapp/core/src/main/conversation'; +import {PayloadBundleSource} from '@wireapp/core/lib/conversation'; enum WebAppEventSource { BACKEND_RESPONSE = 'backend_response', diff --git a/src/script/event/EventTypeHandling.ts b/src/script/event/EventTypeHandling.ts index 67b7f3a6ae8..e6c27dd414e 100644 --- a/src/script/event/EventTypeHandling.ts +++ b/src/script/event/EventTypeHandling.ts @@ -17,7 +17,7 @@ * */ -import {CONVERSATION_EVENT} from '@wireapp/api-client/src/event/'; +import {CONVERSATION_EVENT} from '@wireapp/api-client/lib/event/'; import {ClientEvent} from './Client'; diff --git a/src/script/event/EventValidator.test.ts b/src/script/event/EventValidator.test.ts index 67e5445effa..7f5f145b652 100644 --- a/src/script/event/EventValidator.test.ts +++ b/src/script/event/EventValidator.test.ts @@ -17,8 +17,8 @@ * */ -import {CONVERSATION_TYPING} from '@wireapp/api-client/src/conversation/data/'; -import {CONVERSATION_EVENT, ConversationTypingEvent} from '@wireapp/api-client/src/event/'; +import {CONVERSATION_TYPING} from '@wireapp/api-client/lib/conversation/data/'; +import {ConversationTypingEvent, CONVERSATION_EVENT} from '@wireapp/api-client/lib/event/'; import {EventSource} from './EventSource'; import {EventValidation} from './EventValidation'; diff --git a/src/script/event/EventValidator.ts b/src/script/event/EventValidator.ts index d666b456fb3..82e15c44517 100644 --- a/src/script/event/EventValidator.ts +++ b/src/script/event/EventValidator.ts @@ -17,7 +17,7 @@ * */ -import {CONVERSATION_EVENT, USER_EVENT} from '@wireapp/api-client/src/event/'; +import {CONVERSATION_EVENT, USER_EVENT} from '@wireapp/api-client/lib/event/'; import {EventSource} from './EventSource'; import {EventValidation} from './EventValidation'; diff --git a/src/script/event/NotificationService.ts b/src/script/event/NotificationService.ts index e45f8c8665c..8a358869502 100644 --- a/src/script/event/NotificationService.ts +++ b/src/script/event/NotificationService.ts @@ -17,8 +17,8 @@ * */ -import type {NotificationList} from '@wireapp/api-client/src/notification/'; -import {DatabaseKeys} from '@wireapp/core/src/main/notification/NotificationDatabaseRepository'; +import type {NotificationList} from '@wireapp/api-client/lib/notification/'; +import {DatabaseKeys} from '@wireapp/core/lib/notification/NotificationDatabaseRepository'; import {container} from 'tsyringe'; import {APIClient} from '../service/APIClientSingleton'; diff --git a/src/script/event/preprocessor/ReceiptsMiddleware.ts b/src/script/event/preprocessor/ReceiptsMiddleware.ts index 67b16d39f17..11b81f29292 100644 --- a/src/script/event/preprocessor/ReceiptsMiddleware.ts +++ b/src/script/event/preprocessor/ReceiptsMiddleware.ts @@ -17,7 +17,7 @@ * */ -import {RECEIPT_MODE} from '@wireapp/api-client/src/conversation/data'; +import {RECEIPT_MODE} from '@wireapp/api-client/lib/conversation/data'; import {container} from 'tsyringe'; import {getLogger, Logger} from 'Util/Logger'; diff --git a/src/script/event/preprocessor/ServiceMiddleware.ts b/src/script/event/preprocessor/ServiceMiddleware.ts index df9959d1fb9..2de70bbdc64 100644 --- a/src/script/event/preprocessor/ServiceMiddleware.ts +++ b/src/script/event/preprocessor/ServiceMiddleware.ts @@ -17,8 +17,8 @@ * */ -import {CONVERSATION_EVENT} from '@wireapp/api-client/src/event/'; -import type {QualifiedId} from '@wireapp/api-client/src/user/'; +import {CONVERSATION_EVENT} from '@wireapp/api-client/lib/event/'; +import type {QualifiedId} from '@wireapp/api-client/lib/user/'; import {QualifiedUserId} from '@wireapp/protocol-messaging'; import {container} from 'tsyringe'; diff --git a/src/script/extension/GiphyService.ts b/src/script/extension/GiphyService.ts index a4cf054f0b1..e5031f2f744 100644 --- a/src/script/extension/GiphyService.ts +++ b/src/script/extension/GiphyService.ts @@ -22,7 +22,7 @@ import type { GiphyMultipleResult, GiphyResult, GiphyTrendingOptions, -} from '@wireapp/api-client/src/giphy'; +} from '@wireapp/api-client/lib/giphy'; import {container} from 'tsyringe'; import {APIClient} from '../service/APIClientSingleton'; diff --git a/src/script/guards/Protocol.ts b/src/script/guards/Protocol.ts index 7d147185e50..4d5bf739091 100644 --- a/src/script/guards/Protocol.ts +++ b/src/script/guards/Protocol.ts @@ -17,7 +17,7 @@ * */ -import {ConversationProtocol} from '@wireapp/api-client/src/conversation/NewConversation'; +import {ConversationProtocol} from '@wireapp/api-client/lib/conversation/NewConversation'; export interface ProtocolOption { label: string; diff --git a/src/script/integration/IntegrationRepository.ts b/src/script/integration/IntegrationRepository.ts index 1869b62d02c..32fdb5c87ee 100644 --- a/src/script/integration/IntegrationRepository.ts +++ b/src/script/integration/IntegrationRepository.ts @@ -17,12 +17,12 @@ * */ -import type {ConversationMemberJoinEvent} from '@wireapp/api-client/src/event/'; +import type {ConversationMemberJoinEvent} from '@wireapp/api-client/lib/event/'; import ko from 'knockout'; import {container} from 'tsyringe'; import {t} from 'Util/LocalizerUtil'; -import {Logger, getLogger} from 'Util/Logger'; +import {getLogger, Logger} from 'Util/Logger'; import {compareTransliteration, sortByPriority} from 'Util/StringUtil'; import {IntegrationMapper} from './IntegrationMapper'; diff --git a/src/script/integration/IntegrationService.ts b/src/script/integration/IntegrationService.ts index 98545a5d506..806d95cd3ec 100644 --- a/src/script/integration/IntegrationService.ts +++ b/src/script/integration/IntegrationService.ts @@ -17,7 +17,7 @@ * */ -import type {Provider, Service} from '@wireapp/api-client/src/team/service/'; +import type {Provider, Service} from '@wireapp/api-client/lib/team/service/'; import {container} from 'tsyringe'; import {APIClient} from '../service/APIClientSingleton'; diff --git a/src/script/integration/ServiceEntity.ts b/src/script/integration/ServiceEntity.ts index ca9b96d6571..3fd0d2b0489 100644 --- a/src/script/integration/ServiceEntity.ts +++ b/src/script/integration/ServiceEntity.ts @@ -17,7 +17,7 @@ * */ -import type {UserAsset as APIClientUserAsset} from '@wireapp/api-client/src/user/'; +import type {UserAsset as APIClientUserAsset} from '@wireapp/api-client/lib/user/'; import ko from 'knockout'; import {AssetRemoteData} from '../assets/AssetRemoteData'; diff --git a/src/script/legal-hold/LegalHoldEvaluator.ts b/src/script/legal-hold/LegalHoldEvaluator.ts index f4ced92a7c8..198bb7a88ea 100644 --- a/src/script/legal-hold/LegalHoldEvaluator.ts +++ b/src/script/legal-hold/LegalHoldEvaluator.ts @@ -17,7 +17,7 @@ * */ -import {CONVERSATION_EVENT} from '@wireapp/api-client/src/event'; +import {CONVERSATION_EVENT} from '@wireapp/api-client/lib/event'; import {LegalHoldStatus} from '@wireapp/protocol-messaging'; import type {Conversation} from '../entity/Conversation'; diff --git a/src/script/main/app.ts b/src/script/main/app.ts index 03572c3ba76..d836ee2735e 100644 --- a/src/script/main/app.ts +++ b/src/script/main/app.ts @@ -18,7 +18,7 @@ */ // Polyfill for "tsyringe" dependency injection -import {ClientType, ClientClassification} from '@wireapp/api-client/src/client/'; +import {ClientClassification, ClientType} from '@wireapp/api-client/lib/client/'; import {Runtime} from '@wireapp/commons'; import {WebAppEvents} from '@wireapp/webapp-events'; import {amplify} from 'amplify'; diff --git a/src/script/media/MediaParser.ts b/src/script/media/MediaParser.ts index 8d057e0d19a..e5e796dacb5 100644 --- a/src/script/media/MediaParser.ts +++ b/src/script/media/MediaParser.ts @@ -17,7 +17,7 @@ * */ -import type {WebappProperties} from '@wireapp/api-client/src/user/data/'; +import type {WebappProperties} from '@wireapp/api-client/lib/user/data/'; import {WebAppEvents} from '@wireapp/webapp-events'; import {amplify} from 'amplify'; diff --git a/src/script/message/MentionEntity.ts b/src/script/message/MentionEntity.ts index de499883774..c3100da38d7 100644 --- a/src/script/message/MentionEntity.ts +++ b/src/script/message/MentionEntity.ts @@ -17,8 +17,8 @@ * */ -import {QualifiedId} from '@wireapp/api-client/src/user'; -import {Mention, IMention} from '@wireapp/protocol-messaging'; +import {QualifiedId} from '@wireapp/api-client/lib/user'; +import {IMention, Mention} from '@wireapp/protocol-messaging'; import {matchQualifiedIds} from 'Util/QualifiedId'; import {isUUID} from 'Util/ValidationUtil'; diff --git a/src/script/mls/mlsConversationState/mlsConversationState.test.ts b/src/script/mls/mlsConversationState/mlsConversationState.test.ts index 9e02ced9396..32dd8f3aadd 100644 --- a/src/script/mls/mlsConversationState/mlsConversationState.test.ts +++ b/src/script/mls/mlsConversationState/mlsConversationState.test.ts @@ -17,7 +17,7 @@ * */ -import {ConversationProtocol} from '@wireapp/api-client/src/conversation'; +import {ConversationProtocol} from '@wireapp/api-client/lib/conversation'; import {createRandomUuid} from 'Util/util'; diff --git a/src/script/notification/NotificationRepository.ts b/src/script/notification/NotificationRepository.ts index 6361c0e73f9..f87c64fd166 100644 --- a/src/script/notification/NotificationRepository.ts +++ b/src/script/notification/NotificationRepository.ts @@ -17,8 +17,8 @@ * */ -import type {QualifiedId} from '@wireapp/api-client/src/user/'; -import {NotificationPreference, WebappProperties} from '@wireapp/api-client/src/user/data/'; +import type {QualifiedId} from '@wireapp/api-client/lib/user/'; +import {NotificationPreference, WebappProperties} from '@wireapp/api-client/lib/user/data/'; import {Runtime} from '@wireapp/commons'; import {Availability} from '@wireapp/protocol-messaging'; import {WebAppEvents} from '@wireapp/webapp-events'; @@ -27,11 +27,11 @@ import ko from 'knockout'; import {container} from 'tsyringe'; import {Declension, t} from 'Util/LocalizerUtil'; -import {Logger, getLogger} from 'Util/Logger'; +import {getLogger, Logger} from 'Util/Logger'; import {getRenderedTextContent} from 'Util/messageRenderer'; import {getUserName} from 'Util/SanitizationUtil'; import {truncate} from 'Util/StringUtil'; -import {TIME_IN_MILLIS, formatDuration} from 'Util/TimeUtil'; +import {formatDuration, TIME_IN_MILLIS} from 'Util/TimeUtil'; import {ValidationUtilError} from 'Util/ValidationUtil'; import {PermissionState} from './PermissionState'; diff --git a/src/script/notification/PreferenceNotificationRepository.test.ts b/src/script/notification/PreferenceNotificationRepository.test.ts index f2e6b5b22ea..d17ccb97785 100644 --- a/src/script/notification/PreferenceNotificationRepository.test.ts +++ b/src/script/notification/PreferenceNotificationRepository.test.ts @@ -17,12 +17,12 @@ * */ -import {USER_EVENT} from '@wireapp/api-client/src/event/'; +import {USER_EVENT} from '@wireapp/api-client/lib/event/'; import {WebAppEvents} from '@wireapp/webapp-events'; import {amplify} from 'amplify'; import ko from 'knockout'; -import {PreferenceNotificationRepository, Notification} from 'src/script/notification/PreferenceNotificationRepository'; +import {Notification, PreferenceNotificationRepository} from 'src/script/notification/PreferenceNotificationRepository'; import {PropertiesRepository} from 'src/script/properties/PropertiesRepository'; import {createRandomUuid} from 'Util/util'; diff --git a/src/script/notification/PreferenceNotificationRepository.ts b/src/script/notification/PreferenceNotificationRepository.ts index b1b821579e5..09ce4753547 100644 --- a/src/script/notification/PreferenceNotificationRepository.ts +++ b/src/script/notification/PreferenceNotificationRepository.ts @@ -17,9 +17,9 @@ * */ -import {ClientType} from '@wireapp/api-client/src/client'; -import {USER_EVENT, UserEvent} from '@wireapp/api-client/src/event'; -import type {QualifiedId} from '@wireapp/api-client/src/user'; +import {ClientType} from '@wireapp/api-client/lib/client'; +import {UserEvent, USER_EVENT} from '@wireapp/api-client/lib/event'; +import type {QualifiedId} from '@wireapp/api-client/lib/user'; import {WebAppEvents} from '@wireapp/webapp-events'; import {amplify} from 'amplify'; import ko from 'knockout'; diff --git a/src/script/page/AccentColorPicker.test.tsx b/src/script/page/AccentColorPicker/AccentColorPicker.test.tsx similarity index 97% rename from src/script/page/AccentColorPicker.test.tsx rename to src/script/page/AccentColorPicker/AccentColorPicker.test.tsx index 24e3d4381e8..5a71a74f5d0 100644 --- a/src/script/page/AccentColorPicker.test.tsx +++ b/src/script/page/AccentColorPicker/AccentColorPicker.test.tsx @@ -17,13 +17,13 @@ * */ -import {render, act} from '@testing-library/react'; +import {act, render} from '@testing-library/react'; import {AccentColor} from '@wireapp/commons'; import ko from 'knockout'; -import {AccentColorPicker, AccentColorPickerProps} from './AccentColorPicker'; +import {User} from 'src/script/entity/User'; -import {User} from '../entity/User'; +import {AccentColorPicker, AccentColorPickerProps} from './AccentColorPicker'; describe('AccentColorPicker', () => { it('shows expected accent colors', async () => { diff --git a/src/script/page/AccentColorPicker.tsx b/src/script/page/AccentColorPicker/AccentColorPicker.tsx similarity index 98% rename from src/script/page/AccentColorPicker.tsx rename to src/script/page/AccentColorPicker/AccentColorPicker.tsx index 8d5e9be87c7..e29d282c5b3 100644 --- a/src/script/page/AccentColorPicker.tsx +++ b/src/script/page/AccentColorPicker/AccentColorPicker.tsx @@ -21,13 +21,12 @@ import React from 'react'; import {CSSObject} from '@emotion/serialize'; +import {ACCENT_ID} from 'src/script/Config'; +import {User} from 'src/script/entity/User'; import {useKoSubscribableChildren} from 'Util/ComponentUtil'; import {CSS_SQUARE} from 'Util/CSSMixin'; import {t} from 'Util/LocalizerUtil'; -import {ACCENT_ID} from '../Config'; -import {User} from '../entity/User'; - export interface AccentColorPickerProps { doSetAccentColor: (id: number) => void; user: User; diff --git a/src/script/page/AccentColorPicker/index.ts b/src/script/page/AccentColorPicker/index.ts new file mode 100644 index 00000000000..806dad7bcb7 --- /dev/null +++ b/src/script/page/AccentColorPicker/index.ts @@ -0,0 +1,20 @@ +/* + * Wire + * Copyright (C) 2022 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 './AccentColorPicker'; diff --git a/src/script/page/AppLock.test.tsx b/src/script/page/AppLock/AppLock.test.tsx similarity index 94% rename from src/script/page/AppLock.test.tsx rename to src/script/page/AppLock/AppLock.test.tsx index 0bd78057ad0..da931509796 100644 --- a/src/script/page/AppLock.test.tsx +++ b/src/script/page/AppLock/AppLock.test.tsx @@ -18,7 +18,7 @@ */ import {act, render} from '@testing-library/react'; -import {FeatureStatus} from '@wireapp/api-client/src/team/feature/'; +import {FeatureStatus} from '@wireapp/api-client/lib/team/feature/'; import {WebAppEvents} from '@wireapp/webapp-events'; import {amplify} from 'amplify'; import ko from 'knockout'; @@ -27,11 +27,11 @@ import {createRandomUuid} from 'Util/util'; import {AppLock, APPLOCK_STATE} from './AppLock'; -import type {ClientRepository} from '../client/ClientRepository'; -import {TeamState} from '../team/TeamState'; -import {AppLockRepository} from '../user/AppLockRepository'; -import {AppLockState} from '../user/AppLockState'; -import {UserState} from '../user/UserState'; +import type {ClientRepository} from '../../client/ClientRepository'; +import {TeamState} from '../../team/TeamState'; +import {AppLockRepository} from '../../user/AppLockRepository'; +import {AppLockState} from '../../user/AppLockState'; +import {UserState} from '../../user/UserState'; // https://github.com/jedisct1/libsodium.js/issues/235 jest.mock('libsodium-wrappers-sumo', () => ({ diff --git a/src/script/page/AppLock.tsx b/src/script/page/AppLock/AppLock.tsx similarity index 98% rename from src/script/page/AppLock.tsx rename to src/script/page/AppLock/AppLock.tsx index 18b046fd464..5e9d6e7567b 100644 --- a/src/script/page/AppLock.tsx +++ b/src/script/page/AppLock/AppLock.tsx @@ -17,7 +17,7 @@ * */ -import React, {useState, useEffect, useRef, useCallback} from 'react'; +import React, {useCallback, useEffect, useRef, useState} from 'react'; import {ValidationUtil} from '@wireapp/commons'; import {WebAppEvents} from '@wireapp/webapp-events'; @@ -28,16 +28,15 @@ import {container} from 'tsyringe'; import {Icon} from 'Components/Icon'; import {ModalComponent} from 'Components/ModalComponent'; import {PrimaryModal} from 'Components/Modals/PrimaryModal'; +import {SIGN_OUT_REASON} from 'src/script/auth/SignOutReason'; +import {ClientRepository} from 'src/script/client/ClientRepository'; +import {ClientState} from 'src/script/client/ClientState'; +import {Config} from 'src/script/Config'; +import {AppLockRepository} from 'src/script/user/AppLockRepository'; +import {AppLockState} from 'src/script/user/AppLockState'; import {useKoSubscribableChildren} from 'Util/ComponentUtil'; import {t} from 'Util/LocalizerUtil'; -import {SIGN_OUT_REASON} from '../auth/SignOutReason'; -import {ClientRepository} from '../client/ClientRepository'; -import {ClientState} from '../client/ClientState'; -import {Config} from '../Config'; -import {AppLockRepository} from '../user/AppLockRepository'; -import {AppLockState} from '../user/AppLockState'; - export enum APPLOCK_STATE { FORGOT = 'applock.forgot', LOCKED = 'applock.locked', diff --git a/src/script/page/AppLock/index.ts b/src/script/page/AppLock/index.ts new file mode 100644 index 00000000000..80d406ad5d4 --- /dev/null +++ b/src/script/page/AppLock/index.ts @@ -0,0 +1,20 @@ +/* + * Wire + * Copyright (C) 2022 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 './AppLock'; diff --git a/src/script/page/LeftSidebar/panels/Conversations/GroupedConversations.tsx b/src/script/page/LeftSidebar/panels/Conversations/GroupedConversations.tsx index 77367e337b2..86658774acb 100644 --- a/src/script/page/LeftSidebar/panels/Conversations/GroupedConversations.tsx +++ b/src/script/page/LeftSidebar/panels/Conversations/GroupedConversations.tsx @@ -19,7 +19,7 @@ import React, {useEffect, useState} from 'react'; -import {QualifiedId} from '@wireapp/api-client/src/user'; +import {QualifiedId} from '@wireapp/api-client/lib/user'; import {container} from 'tsyringe'; import {ListViewModel} from 'src/script/view_model/ListViewModel'; diff --git a/src/script/page/LeftSidebar/panels/StartUI/PeopleTab.tsx b/src/script/page/LeftSidebar/panels/StartUI/PeopleTab.tsx index 6148c240805..743b6daaf05 100644 --- a/src/script/page/LeftSidebar/panels/StartUI/PeopleTab.tsx +++ b/src/script/page/LeftSidebar/panels/StartUI/PeopleTab.tsx @@ -19,7 +19,7 @@ import React, {useEffect, useRef, useState} from 'react'; -import {BackendErrorLabel} from '@wireapp/api-client/src/http'; +import {BackendErrorLabel} from '@wireapp/api-client/lib/http'; import {WebAppEvents} from '@wireapp/webapp-events'; import {amplify} from 'amplify'; import {StatusCodes as HTTP_STATUS} from 'http-status-codes'; diff --git a/src/script/page/LeftSidebar/panels/StartUI/components/GroupList.test.tsx b/src/script/page/LeftSidebar/panels/StartUI/components/GroupList.test.tsx index 24340b17723..e262b35c150 100644 --- a/src/script/page/LeftSidebar/panels/StartUI/components/GroupList.test.tsx +++ b/src/script/page/LeftSidebar/panels/StartUI/components/GroupList.test.tsx @@ -18,8 +18,8 @@ */ import {fireEvent, render} from '@testing-library/react'; -import {CONVERSATION_TYPE} from '@wireapp/api-client/src/conversation'; -import type {QualifiedId} from '@wireapp/api-client/src/user/'; +import {CONVERSATION_TYPE} from '@wireapp/api-client/lib/conversation'; +import type {QualifiedId} from '@wireapp/api-client/lib/user/'; import {createRandomUuid, noop} from 'Util/util'; diff --git a/src/script/page/LeftSidebar/panels/StartUI/components/topPeople/TopContact.tsx b/src/script/page/LeftSidebar/panels/StartUI/components/topPeople/TopContact.tsx index 55b4d354897..e22380668e8 100644 --- a/src/script/page/LeftSidebar/panels/StartUI/components/topPeople/TopContact.tsx +++ b/src/script/page/LeftSidebar/panels/StartUI/components/topPeople/TopContact.tsx @@ -19,7 +19,7 @@ import React, {useEffect, useState} from 'react'; -import {ConnectionStatus} from '@wireapp/api-client/src/connection'; +import {ConnectionStatus} from '@wireapp/api-client/lib/connection'; import {Avatar, AVATAR_SIZE} from 'Components/Avatar'; import {useKoSubscribableChildren} from 'Util/ComponentUtil'; diff --git a/src/script/page/LeftSidebar/panels/TemporatyGuestConversations.tsx b/src/script/page/LeftSidebar/panels/TemporatyGuestConversations.tsx index d9b17e7c473..c3e7822dc86 100644 --- a/src/script/page/LeftSidebar/panels/TemporatyGuestConversations.tsx +++ b/src/script/page/LeftSidebar/panels/TemporatyGuestConversations.tsx @@ -19,7 +19,7 @@ import React from 'react'; -import {QualifiedId} from '@wireapp/api-client/src/user'; +import {QualifiedId} from '@wireapp/api-client/lib/user'; import {Icon} from 'Components/Icon'; import {ConversationListCallingCell} from 'Components/list/ConversationListCallingCell'; diff --git a/src/script/page/MainContent/panels/Collection/CollectionSection.test.tsx b/src/script/page/MainContent/panels/Collection/CollectionSection.test.tsx index 1991218cc19..ebdecbacd14 100644 --- a/src/script/page/MainContent/panels/Collection/CollectionSection.test.tsx +++ b/src/script/page/MainContent/panels/Collection/CollectionSection.test.tsx @@ -17,7 +17,7 @@ * */ -import {render, fireEvent} from '@testing-library/react'; +import {fireEvent, render} from '@testing-library/react'; import {createRandomUuid} from 'Util/util'; diff --git a/src/script/page/MainContent/panels/preferences/OptionPreferences.tsx b/src/script/page/MainContent/panels/preferences/OptionPreferences.tsx index be2909a7e33..d6b985accca 100644 --- a/src/script/page/MainContent/panels/preferences/OptionPreferences.tsx +++ b/src/script/page/MainContent/panels/preferences/OptionPreferences.tsx @@ -19,7 +19,7 @@ import React, {useEffect, useState} from 'react'; -import {AudioPreference, WebappProperties, NotificationPreference} from '@wireapp/api-client/src/user/data/'; +import {AudioPreference, NotificationPreference, WebappProperties} from '@wireapp/api-client/lib/user/data/'; import {Checkbox, CheckboxLabel} from '@wireapp/react-ui-kit'; import {WebAppEvents} from '@wireapp/webapp-events'; import {amplify} from 'amplify'; diff --git a/src/script/page/MainContent/panels/preferences/accountPreferences/DataUsageSection.tsx b/src/script/page/MainContent/panels/preferences/accountPreferences/DataUsageSection.tsx index 0414777746e..e69cd3ccfb7 100644 --- a/src/script/page/MainContent/panels/preferences/accountPreferences/DataUsageSection.tsx +++ b/src/script/page/MainContent/panels/preferences/accountPreferences/DataUsageSection.tsx @@ -19,7 +19,7 @@ import React, {useEffect, useState} from 'react'; -import {WebappProperties} from '@wireapp/api-client/src/user/data/'; +import {WebappProperties} from '@wireapp/api-client/lib/user/data/'; import {Checkbox, CheckboxLabel} from '@wireapp/react-ui-kit'; import {WebAppEvents} from '@wireapp/webapp-events'; import {amplify} from 'amplify'; diff --git a/src/script/page/MainContent/panels/preferences/accountPreferences/PrivacySection.tsx b/src/script/page/MainContent/panels/preferences/accountPreferences/PrivacySection.tsx index f6d8b36528a..0738bdd882b 100644 --- a/src/script/page/MainContent/panels/preferences/accountPreferences/PrivacySection.tsx +++ b/src/script/page/MainContent/panels/preferences/accountPreferences/PrivacySection.tsx @@ -19,7 +19,7 @@ import React from 'react'; -import {RECEIPT_MODE} from '@wireapp/api-client/src/conversation/data'; +import {RECEIPT_MODE} from '@wireapp/api-client/lib/conversation/data'; import {Checkbox, CheckboxLabel} from '@wireapp/react-ui-kit'; import {container} from 'tsyringe'; diff --git a/src/script/page/MainContent/panels/preferences/avPreferences/CallOptions.tsx b/src/script/page/MainContent/panels/preferences/avPreferences/CallOptions.tsx index eaa741df451..9e0d9414c9b 100644 --- a/src/script/page/MainContent/panels/preferences/avPreferences/CallOptions.tsx +++ b/src/script/page/MainContent/panels/preferences/avPreferences/CallOptions.tsx @@ -19,7 +19,7 @@ import React, {useEffect, useRef, useState} from 'react'; -import type {WebappProperties} from '@wireapp/api-client/src/user/data/'; +import type {WebappProperties} from '@wireapp/api-client/lib/user/data/'; import {Checkbox, CheckboxLabel} from '@wireapp/react-ui-kit'; import {WebAppEvents} from '@wireapp/webapp-events'; import {amplify} from 'amplify'; diff --git a/src/script/page/MainContent/panels/preferences/devices/DevicesPreferences.tsx b/src/script/page/MainContent/panels/preferences/devices/DevicesPreferences.tsx index 8705bf6f7c6..b2d17865e13 100644 --- a/src/script/page/MainContent/panels/preferences/devices/DevicesPreferences.tsx +++ b/src/script/page/MainContent/panels/preferences/devices/DevicesPreferences.tsx @@ -19,7 +19,7 @@ import React, {useState} from 'react'; -import {QualifiedId} from '@wireapp/api-client/src/user'; +import {QualifiedId} from '@wireapp/api-client/lib/user'; import {container} from 'tsyringe'; import {Icon} from 'Components/Icon'; diff --git a/src/script/page/RightSidebar/ConversationDetails/ConversationDetails.tsx b/src/script/page/RightSidebar/ConversationDetails/ConversationDetails.tsx index 9e3f9b5d323..af6ec5611dd 100644 --- a/src/script/page/RightSidebar/ConversationDetails/ConversationDetails.tsx +++ b/src/script/page/RightSidebar/ConversationDetails/ConversationDetails.tsx @@ -19,7 +19,7 @@ import {FC, useCallback, useEffect, useMemo, useState} from 'react'; -import {RECEIPT_MODE} from '@wireapp/api-client/src/conversation/data/'; +import {RECEIPT_MODE} from '@wireapp/api-client/lib/conversation/data/'; import {Icon} from 'Components/Icon'; import {PanelActions} from 'Components/panel/PanelActions'; diff --git a/src/script/page/RightSidebar/ConversationDetails/components/ConversationDetailsOptions/ConversationDetailsOptions.tsx b/src/script/page/RightSidebar/ConversationDetails/components/ConversationDetailsOptions/ConversationDetailsOptions.tsx index 9853898299b..1011b6616eb 100644 --- a/src/script/page/RightSidebar/ConversationDetails/components/ConversationDetailsOptions/ConversationDetailsOptions.tsx +++ b/src/script/page/RightSidebar/ConversationDetails/components/ConversationDetailsOptions/ConversationDetailsOptions.tsx @@ -19,7 +19,7 @@ import {FC} from 'react'; -import {RECEIPT_MODE} from '@wireapp/api-client/src/conversation/data/'; +import {RECEIPT_MODE} from '@wireapp/api-client/lib/conversation/data/'; import {Icon} from 'Components/Icon'; import {ReceiptModeToggle} from 'Components/toggle/ReceiptModeToggle'; diff --git a/src/script/page/RightSidebar/GroupParticipantUser/GroupParticipantUser.tsx b/src/script/page/RightSidebar/GroupParticipantUser/GroupParticipantUser.tsx index 7a551b1b60e..9796650d338 100644 --- a/src/script/page/RightSidebar/GroupParticipantUser/GroupParticipantUser.tsx +++ b/src/script/page/RightSidebar/GroupParticipantUser/GroupParticipantUser.tsx @@ -19,7 +19,7 @@ import {FC, useEffect} from 'react'; -import {DefaultConversationRoleName as DefaultRole} from '@wireapp/api-client/src/conversation/'; +import {DefaultConversationRoleName as DefaultRole} from '@wireapp/api-client/lib/conversation/'; import {WebAppEvents} from '@wireapp/webapp-events'; import {amplify} from 'amplify'; diff --git a/src/script/page/RightSidebar/MessageDetails/MessageDetails.test.tsx b/src/script/page/RightSidebar/MessageDetails/MessageDetails.test.tsx index bb5bf9d4f23..b4b138ded9b 100644 --- a/src/script/page/RightSidebar/MessageDetails/MessageDetails.test.tsx +++ b/src/script/page/RightSidebar/MessageDetails/MessageDetails.test.tsx @@ -18,7 +18,7 @@ */ import {render, waitFor} from '@testing-library/react'; -import {QualifiedId} from '@wireapp/api-client/src/user'; +import {QualifiedId} from '@wireapp/api-client/lib/user'; import {Conversation} from 'src/script/entity/Conversation'; import {createRandomUuid} from 'Util/util'; diff --git a/src/script/page/RightSidebar/MessageDetails/MessageDetails.tsx b/src/script/page/RightSidebar/MessageDetails/MessageDetails.tsx index 398237a735e..d8b505b8bc3 100644 --- a/src/script/page/RightSidebar/MessageDetails/MessageDetails.tsx +++ b/src/script/page/RightSidebar/MessageDetails/MessageDetails.tsx @@ -19,7 +19,7 @@ import {FC, useCallback, useEffect, useMemo, useState} from 'react'; -import type {QualifiedId} from '@wireapp/api-client/src/user/'; +import type {QualifiedId} from '@wireapp/api-client/lib/user/'; import {WebAppEvents} from '@wireapp/webapp-events'; import {amplify} from 'amplify'; import cx from 'classnames'; diff --git a/src/script/page/message-list/AssetUploadButton/AssetUploadButton.test.tsx b/src/script/page/message-list/AssetUploadButton/AssetUploadButton.test.tsx new file mode 100644 index 00000000000..c144c503b2b --- /dev/null +++ b/src/script/page/message-list/AssetUploadButton/AssetUploadButton.test.tsx @@ -0,0 +1,67 @@ +/* + * Wire + * Copyright (C) 2022 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 {render, fireEvent} from '@testing-library/react'; + +import {AssetUploadButton} from './'; + +jest.mock('../../../Config', () => ({ + Config: { + getConfig: () => ({ + ALLOWED_IMAGE_TYPES: ['image/gif', 'image/avif'], + FEATURE: {ALLOWED_FILE_UPLOAD_EXTENSIONS: ['*']}, + }), + }, +})); + +const pngFile = new File(['(⌐□_□)'], 'chucknorris.png', {type: 'image/png'}); + +describe('AssetUploadButton', () => { + it('Does call onSelectFiles with uploaded file', () => { + const onSelectFiles = jest.fn(); + + const {container} = render(); + const fileInput = container.querySelector('input[type="file"]') as HTMLInputElement; + + fireEvent.change(fileInput, { + target: {files: [pngFile]}, + }); + + expect(onSelectFiles).toHaveBeenCalledWith([pngFile]); + }); + + it('Does reset a form with input after upload', () => { + const onSelectFiles = jest.fn(); + + const {container} = render(); + + const form = container.querySelector('form'); + jest.spyOn(form!, 'reset'); + + const fileInput = container.querySelector('input[type="file"]') as HTMLInputElement; + + fireEvent.change(fileInput, { + target: {files: [pngFile]}, + }); + + expect(onSelectFiles).toHaveBeenCalledWith([pngFile]); + expect(fileInput.files?.[0].name).toEqual(pngFile.name); + expect(form!.reset).toHaveBeenCalled(); + }); +}); diff --git a/src/script/page/message-list/AssetUploadButton/AssetUploadButton.tsx b/src/script/page/message-list/AssetUploadButton/AssetUploadButton.tsx new file mode 100644 index 00000000000..ad6a44e94ba --- /dev/null +++ b/src/script/page/message-list/AssetUploadButton/AssetUploadButton.tsx @@ -0,0 +1,72 @@ +/* + * Wire + * Copyright (C) 2022 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 {useRef} from 'react'; + +import {Icon} from 'Components/Icon'; +import {t} from 'Util/LocalizerUtil'; + +import {Config} from '../../../Config'; + +interface AssetUploadButtonProps { + onSelectFiles: (files: File[]) => void; +} + +export const AssetUploadButton = ({onSelectFiles}: AssetUploadButtonProps) => { + const acceptedFileTypes = Config.getConfig().FEATURE.ALLOWED_FILE_UPLOAD_EXTENSIONS.join(','); + + const fileRef = useRef(null); + const formRef = useRef(null); + + const handleFileChange = (event: React.ChangeEvent) => { + const {files} = event.target; + + if (!files) { + return; + } + + onSelectFiles(Array.from(files)); + + //reset file input's value resetting form wrapper + formRef.current?.reset(); + }; + + return ( +
    + +
    + ); +}; diff --git a/src/script/page/message-list/AssetUploadButton/index.ts b/src/script/page/message-list/AssetUploadButton/index.ts new file mode 100644 index 00000000000..597979b1ea9 --- /dev/null +++ b/src/script/page/message-list/AssetUploadButton/index.ts @@ -0,0 +1,20 @@ +/* + * Wire + * Copyright (C) 2022 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 './AssetUploadButton'; diff --git a/src/script/page/message-list/ImageUploadButton/ImageUploadButton.test.tsx b/src/script/page/message-list/ImageUploadButton/ImageUploadButton.test.tsx new file mode 100644 index 00000000000..232b2c0c7fb --- /dev/null +++ b/src/script/page/message-list/ImageUploadButton/ImageUploadButton.test.tsx @@ -0,0 +1,67 @@ +/* + * Wire + * Copyright (C) 2022 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 {render, fireEvent} from '@testing-library/react'; + +import {ImageUploadButton} from './'; + +jest.mock('../../../Config', () => ({ + Config: { + getConfig: () => ({ + ALLOWED_IMAGE_TYPES: ['image/gif', 'image/avif'], + FEATURE: {ALLOWED_FILE_UPLOAD_EXTENSIONS: ['*']}, + }), + }, +})); + +const pngFile = new File(['(⌐□_□)'], 'chucknorris.png', {type: 'image/png'}); + +describe('ImageUploadButton', () => { + it('Does call onSelectImages with uploaded image file', () => { + const onSelectImages = jest.fn(); + + const {container} = render(); + const fileInput = container.querySelector('input[type="file"]') as HTMLInputElement; + + fireEvent.change(fileInput, { + target: {files: [pngFile]}, + }); + + expect(onSelectImages).toHaveBeenCalledWith([pngFile]); + }); + + it('Does reset a form with input after upload', () => { + const onSelectImages = jest.fn(); + + const {container} = render(); + + const form = container.querySelector('form'); + jest.spyOn(form!, 'reset'); + + const fileInput = container.querySelector('input[type="file"]') as HTMLInputElement; + + fireEvent.change(fileInput, { + target: {files: [pngFile]}, + }); + + expect(onSelectImages).toHaveBeenCalledWith([pngFile]); + expect(fileInput.files?.[0].name).toEqual(pngFile.name); + expect(form!.reset).toHaveBeenCalled(); + }); +}); diff --git a/src/script/page/message-list/ImageUploadButton/ImageUploadButton.tsx b/src/script/page/message-list/ImageUploadButton/ImageUploadButton.tsx new file mode 100644 index 00000000000..289091dbf63 --- /dev/null +++ b/src/script/page/message-list/ImageUploadButton/ImageUploadButton.tsx @@ -0,0 +1,71 @@ +/* + * Wire + * Copyright (C) 2022 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 {useRef} from 'react'; + +import {Icon} from 'Components/Icon'; +import {t} from 'Util/LocalizerUtil'; + +import {Config} from '../../../Config'; + +interface ImageUploadButtonProps { + onSelectImages: (files: File[]) => void; +} + +export const ImageUploadButton = ({onSelectImages}: ImageUploadButtonProps) => { + const acceptedImageTypes = Config.getConfig().ALLOWED_IMAGE_TYPES.join(','); + + const imageRef = useRef(null); + const formRef = useRef(null); + + const handleImageFileChange = (event: React.ChangeEvent) => { + const {files} = event.target; + + if (!files) { + return; + } + + onSelectImages(Array.from(files)); + formRef.current?.reset(); + }; + + return ( +
    + +
    + ); +}; diff --git a/src/script/page/message-list/ImageUploadButton/index.ts b/src/script/page/message-list/ImageUploadButton/index.ts new file mode 100644 index 00000000000..072686c7769 --- /dev/null +++ b/src/script/page/message-list/ImageUploadButton/index.ts @@ -0,0 +1,20 @@ +/* + * Wire + * Copyright (C) 2022 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 './ImageUploadButton'; diff --git a/src/script/page/message-list/InputBarControls/ControlButtons.tsx b/src/script/page/message-list/InputBarControls/ControlButtons.tsx index 1bb35ab446a..e43104231cd 100644 --- a/src/script/page/message-list/InputBarControls/ControlButtons.tsx +++ b/src/script/page/message-list/InputBarControls/ControlButtons.tsx @@ -17,7 +17,7 @@ * */ -import React, {useRef} from 'react'; +import React from 'react'; import {Icon} from 'Components/Icon'; import {Conversation} from 'src/script/entity/Conversation'; @@ -25,7 +25,8 @@ import {t} from 'Util/LocalizerUtil'; import {GiphyButton} from './GiphyButton'; -import {Config} from '../../../Config'; +import {AssetUploadButton} from '../AssetUploadButton'; +import {ImageUploadButton} from '../ImageUploadButton'; import {MessageTimerButton} from '../MessageTimerButton'; export type ControlButtonsProps = { @@ -57,12 +58,6 @@ const ControlButtons: React.FC = ({ onCancelEditing, onGifClick, }) => { - const acceptedImageTypes = Config.getConfig().ALLOWED_IMAGE_TYPES.join(','); - const acceptedFileTypes = Config.getConfig().FEATURE.ALLOWED_FILE_UPLOAD_EXTENSIONS.join(','); - - const imageRef = useRef(null!); - const fileRef = useRef(null!); - const pingTooltip = t('tooltipConversationPing'); if (isEditing) { @@ -103,47 +98,11 @@ const ControlButtons: React.FC = ({
  • - +
  • - +
    • )} diff --git a/src/script/page/message-list/MessageTimerButton.test.tsx b/src/script/page/message-list/MessageTimerButton/MessageTimerButton.test.tsx similarity index 98% rename from src/script/page/message-list/MessageTimerButton.test.tsx rename to src/script/page/message-list/MessageTimerButton/MessageTimerButton.test.tsx index 38754c4f0d6..b202981697a 100644 --- a/src/script/page/message-list/MessageTimerButton.test.tsx +++ b/src/script/page/message-list/MessageTimerButton/MessageTimerButton.test.tsx @@ -20,14 +20,13 @@ import {fireEvent, render} from '@testing-library/react'; import ko from 'knockout'; +import type {Conversation} from 'src/script/entity/Conversation'; import {TeamState} from 'src/script/team/TeamState'; +import * as Context from 'src/script/ui/ContextMenu'; import {TIME_IN_MILLIS} from 'Util/TimeUtil'; import {MessageTimerButton} from './MessageTimerButton'; -import type {Conversation} from '../../entity/Conversation'; -import * as Context from '../../ui/ContextMenu'; - describe('MessageTimerButton', () => { it('hides the timer button when the feature is disabled', () => { const conversation: Partial = { diff --git a/src/script/page/message-list/MessageTimerButton.tsx b/src/script/page/message-list/MessageTimerButton/MessageTimerButton.tsx similarity index 92% rename from src/script/page/message-list/MessageTimerButton.tsx rename to src/script/page/message-list/MessageTimerButton/MessageTimerButton.tsx index 8f05258eb57..e11f7ed5c5a 100644 --- a/src/script/page/message-list/MessageTimerButton.tsx +++ b/src/script/page/message-list/MessageTimerButton/MessageTimerButton.tsx @@ -23,17 +23,16 @@ import cx from 'classnames'; import {container} from 'tsyringe'; import {Icon} from 'Components/Icon'; +import {Conversation} from 'src/script/entity/Conversation'; +import {EphemeralTimings} from 'src/script/ephemeral/EphemeralTimings'; +import {TeamState} from 'src/script/team/TeamState'; +import {showContextMenu} from 'src/script/ui/ContextMenu'; import {useKoSubscribableChildren} from 'Util/ComponentUtil'; import {KEY} from 'Util/KeyboardUtil'; import {t} from 'Util/LocalizerUtil'; -import {formatDuration, DurationUnit} from 'Util/TimeUtil'; +import {DurationUnit, formatDuration} from 'Util/TimeUtil'; import {setContextMenuPosition} from 'Util/util'; -import type {Conversation} from '../../entity/Conversation'; -import {EphemeralTimings} from '../../ephemeral/EphemeralTimings'; -import {TeamState} from '../../team/TeamState'; -import {showContextMenu} from '../../ui/ContextMenu'; - export interface MessageTimerButtonProps { conversation: Conversation; teamState?: TeamState; diff --git a/src/script/page/message-list/MessageTimerButton/index.ts b/src/script/page/message-list/MessageTimerButton/index.ts new file mode 100644 index 00000000000..5363ab400f7 --- /dev/null +++ b/src/script/page/message-list/MessageTimerButton/index.ts @@ -0,0 +1,20 @@ +/* + * Wire + * Copyright (C) 2022 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 './MessageTimerButton'; diff --git a/src/script/properties/PropertiesRepository.ts b/src/script/properties/PropertiesRepository.ts index 806e0e9070b..db376a1f604 100644 --- a/src/script/properties/PropertiesRepository.ts +++ b/src/script/properties/PropertiesRepository.ts @@ -17,16 +17,16 @@ * */ -import {RECEIPT_MODE} from '@wireapp/api-client/src/conversation/data'; -import {ConsentType} from '@wireapp/api-client/src/self/'; -import {AudioPreference, NotificationPreference, WebappProperties} from '@wireapp/api-client/src/user/data/'; +import {RECEIPT_MODE} from '@wireapp/api-client/lib/conversation/data'; +import {ConsentType} from '@wireapp/api-client/lib/self/'; +import {AudioPreference, NotificationPreference, WebappProperties} from '@wireapp/api-client/lib/user/data/'; import {WebAppEvents} from '@wireapp/webapp-events'; import {amplify} from 'amplify'; import ko from 'knockout'; import {Environment} from 'Util/Environment'; import {t} from 'Util/LocalizerUtil'; -import {Logger, getLogger} from 'Util/Logger'; +import {getLogger, Logger} from 'Util/Logger'; import type {PropertiesService} from './PropertiesService'; import {PROPERTIES_TYPE} from './PropertiesType'; diff --git a/src/script/search/SearchRepository.ts b/src/script/search/SearchRepository.ts index d989ef5cda2..e2059e43bb6 100644 --- a/src/script/search/SearchRepository.ts +++ b/src/script/search/SearchRepository.ts @@ -17,12 +17,12 @@ * */ -import type {QualifiedId} from '@wireapp/api-client/src/user/'; +import type {QualifiedId} from '@wireapp/api-client/lib/user/'; import {container} from 'tsyringe'; import {EMOJI_RANGES} from 'Util/EmojiUtil'; -import {Logger, getLogger} from 'Util/Logger'; -import {startsWith, computeTransliteration, sortByPriority, transliterationIndex} from 'Util/StringUtil'; +import {getLogger, Logger} from 'Util/Logger'; +import {computeTransliteration, sortByPriority, startsWith, transliterationIndex} from 'Util/StringUtil'; import type {SearchService} from './SearchService'; diff --git a/src/script/search/SearchService.ts b/src/script/search/SearchService.ts index 89c7aca77ca..1d4b32eeb79 100644 --- a/src/script/search/SearchService.ts +++ b/src/script/search/SearchService.ts @@ -17,7 +17,7 @@ * */ -import type {SearchResult} from '@wireapp/api-client/src/user/'; +import type {SearchResult} from '@wireapp/api-client/lib/user/'; import {container} from 'tsyringe'; import {APIClient} from '../service/APIClientSingleton'; diff --git a/src/script/self/SelfService.ts b/src/script/self/SelfService.ts index bb04079f0eb..4df92940cea 100644 --- a/src/script/self/SelfService.ts +++ b/src/script/self/SelfService.ts @@ -17,9 +17,9 @@ * */ -import type {TraceState} from '@wireapp/api-client/src/http/'; -import type {Consent, Self} from '@wireapp/api-client/src/self/'; -import type {UserUpdate} from '@wireapp/api-client/src/user/'; +import type {TraceState} from '@wireapp/api-client/lib/http/'; +import type {Consent, Self} from '@wireapp/api-client/lib/self/'; +import type {UserUpdate} from '@wireapp/api-client/lib/user/'; import {container} from 'tsyringe'; import {APIClient} from '../service/APIClientSingleton'; diff --git a/src/script/service/CoreSingleton.ts b/src/script/service/CoreSingleton.ts index a500bf5265d..f76f3630ab6 100644 --- a/src/script/service/CoreSingleton.ts +++ b/src/script/service/CoreSingleton.ts @@ -17,7 +17,7 @@ * */ -import {ClientType} from '@wireapp/api-client/src/client/'; +import {ClientType} from '@wireapp/api-client/lib/client/'; import {Account} from '@wireapp/core'; import {container, singleton} from 'tsyringe'; diff --git a/src/script/storage/record/ClientRecord.ts b/src/script/storage/record/ClientRecord.ts index 0ac4d96c113..c799097fff2 100644 --- a/src/script/storage/record/ClientRecord.ts +++ b/src/script/storage/record/ClientRecord.ts @@ -17,7 +17,7 @@ * */ -import type {ClientClassification} from '@wireapp/api-client/src/client/'; +import type {ClientClassification} from '@wireapp/api-client/lib/client/'; export interface ClientRecord { address?: string; diff --git a/src/script/storage/record/ConversationRecord.ts b/src/script/storage/record/ConversationRecord.ts index 75b518c6016..dae19808178 100644 --- a/src/script/storage/record/ConversationRecord.ts +++ b/src/script/storage/record/ConversationRecord.ts @@ -19,14 +19,14 @@ import { ACCESS_ROLE_V2, - DefaultConversationRoleName, CONVERSATION_ACCESS, CONVERSATION_ACCESS_ROLE, CONVERSATION_TYPE, -} from '@wireapp/api-client/src/conversation'; -import {RECEIPT_MODE} from '@wireapp/api-client/src/conversation/data'; -import {ConversationProtocol} from '@wireapp/api-client/src/conversation/NewConversation'; -import type {QualifiedId} from '@wireapp/api-client/src/user/'; + DefaultConversationRoleName, +} from '@wireapp/api-client/lib/conversation'; +import {RECEIPT_MODE} from '@wireapp/api-client/lib/conversation/data'; +import {ConversationProtocol} from '@wireapp/api-client/lib/conversation/NewConversation'; +import type {QualifiedId} from '@wireapp/api-client/lib/user/'; import {LegalHoldStatus} from '@wireapp/protocol-messaging'; import {ConversationStatus} from '../../conversation/ConversationStatus'; diff --git a/src/script/storage/record/EventRecord.ts b/src/script/storage/record/EventRecord.ts index fbf7104509e..619bd2ae721 100644 --- a/src/script/storage/record/EventRecord.ts +++ b/src/script/storage/record/EventRecord.ts @@ -17,8 +17,8 @@ * */ -import {QualifiedId} from '@wireapp/api-client/src/user'; -import type {ReactionType} from '@wireapp/core/src/main/conversation/'; +import {QualifiedId} from '@wireapp/api-client/lib/user'; +import type {ReactionType} from '@wireapp/core/lib/conversation/'; import {StatusType} from '../../message/StatusType'; diff --git a/src/script/strings.ts b/src/script/strings.ts index 266690bf825..8a5fd282269 100644 --- a/src/script/strings.ts +++ b/src/script/strings.ts @@ -36,7 +36,7 @@ * */ -import {BackendErrorLabel, SyntheticErrorLabel} from '@wireapp/api-client/src/http/'; +import {BackendErrorLabel, SyntheticErrorLabel} from '@wireapp/api-client/lib/http/'; import {defineMessages} from 'react-intl'; import {BackendError} from './auth/module/action/BackendError'; diff --git a/src/script/team/TeamMapper.ts b/src/script/team/TeamMapper.ts index 6d1ef1ccc7d..2df77e718b4 100644 --- a/src/script/team/TeamMapper.ts +++ b/src/script/team/TeamMapper.ts @@ -17,9 +17,9 @@ * */ -import type {MemberData, TeamData} from '@wireapp/api-client/src/team/'; -import type {TeamUpdateData} from '@wireapp/api-client/src/team/data/'; -import type {PermissionsData} from '@wireapp/api-client/src/team/member/PermissionsData'; +import type {MemberData, TeamData} from '@wireapp/api-client/lib/team/'; +import type {TeamUpdateData} from '@wireapp/api-client/lib/team/data/'; +import type {PermissionsData} from '@wireapp/api-client/lib/team/member/PermissionsData'; import {Logger, getLogger} from 'Util/Logger'; diff --git a/src/script/team/TeamMemberEntity.ts b/src/script/team/TeamMemberEntity.ts index dd6e089f089..522c7044efd 100644 --- a/src/script/team/TeamMemberEntity.ts +++ b/src/script/team/TeamMemberEntity.ts @@ -17,8 +17,8 @@ * */ -import type {LegalHoldMemberStatus} from '@wireapp/api-client/src/team/legalhold/LegalHoldMemberStatus'; -import type {PermissionsData} from '@wireapp/api-client/src/team/member/PermissionsData'; +import type {LegalHoldMemberStatus} from '@wireapp/api-client/lib/team/legalhold/LegalHoldMemberStatus'; +import type {PermissionsData} from '@wireapp/api-client/lib/team/member/PermissionsData'; export class TeamMemberEntity { permissions?: PermissionsData; diff --git a/src/script/team/TeamRepository.ts b/src/script/team/TeamRepository.ts index bae38d300b8..287d858c16c 100644 --- a/src/script/team/TeamRepository.ts +++ b/src/script/team/TeamRepository.ts @@ -17,7 +17,7 @@ * */ -import type {ConversationRolesList} from '@wireapp/api-client/src/conversation/ConversationRole'; +import type {ConversationRolesList} from '@wireapp/api-client/lib/conversation/ConversationRole'; import type { TeamConversationDeleteEvent, TeamDeleteEvent, @@ -26,11 +26,11 @@ import type { TeamMemberLeaveEvent, TeamMemberUpdateEvent, TeamUpdateEvent, -} from '@wireapp/api-client/src/event'; -import {TEAM_EVENT} from '@wireapp/api-client/src/event/TeamEvent'; -import {FeatureStatus, FEATURE_KEY, SelfDeletingTimeout} from '@wireapp/api-client/src/team/feature/'; -import type {FeatureList} from '@wireapp/api-client/src/team/feature/'; -import type {TeamData} from '@wireapp/api-client/src/team/team/TeamData'; +} from '@wireapp/api-client/lib/event'; +import {TEAM_EVENT} from '@wireapp/api-client/lib/event/TeamEvent'; +import type {FeatureList} from '@wireapp/api-client/lib/team/feature/'; +import {FeatureStatus, FEATURE_KEY, SelfDeletingTimeout} from '@wireapp/api-client/lib/team/feature/'; +import type {TeamData} from '@wireapp/api-client/lib/team/team/TeamData'; import {Runtime} from '@wireapp/commons'; import {Availability} from '@wireapp/protocol-messaging'; import {WebAppEvents} from '@wireapp/webapp-events'; @@ -39,7 +39,7 @@ import {container} from 'tsyringe'; import {Environment} from 'Util/Environment'; import {replaceLink, t} from 'Util/LocalizerUtil'; -import {Logger, getLogger} from 'Util/Logger'; +import {getLogger, Logger} from 'Util/Logger'; import {formatDuration, TIME_IN_MILLIS} from 'Util/TimeUtil'; import {loadDataUrl} from 'Util/util'; @@ -58,7 +58,7 @@ import {EventSource} from '../event/EventSource'; import {NOTIFICATION_HANDLING_STATE} from '../event/NotificationHandlingState'; import {IntegrationMapper} from '../integration/IntegrationMapper'; import {ServiceEntity} from '../integration/ServiceEntity'; -import {roleFromTeamPermissions, ROLE, ROLE as TEAM_ROLE} from '../user/UserPermission'; +import {ROLE, ROLE as TEAM_ROLE, roleFromTeamPermissions} from '../user/UserPermission'; import {UserRepository} from '../user/UserRepository'; import {UserState} from '../user/UserState'; diff --git a/src/script/team/TeamService.ts b/src/script/team/TeamService.ts index 5a665ef8f44..b0a21251598 100644 --- a/src/script/team/TeamService.ts +++ b/src/script/team/TeamService.ts @@ -17,13 +17,13 @@ * */ -import type {ConversationRolesList} from '@wireapp/api-client/src/conversation/ConversationRole'; -import type {FeatureList} from '@wireapp/api-client/src/team/feature/'; -import {FeatureStatus, FEATURE_KEY} from '@wireapp/api-client/src/team/feature/'; -import type {LegalHoldMemberData} from '@wireapp/api-client/src/team/legalhold/'; -import type {MemberData, Members} from '@wireapp/api-client/src/team/member/'; -import type {Services} from '@wireapp/api-client/src/team/service/'; -import type {TeamData} from '@wireapp/api-client/src/team/team/'; +import type {ConversationRolesList} from '@wireapp/api-client/lib/conversation/ConversationRole'; +import type {FeatureList} from '@wireapp/api-client/lib/team/feature/'; +import {FeatureStatus, FEATURE_KEY} from '@wireapp/api-client/lib/team/feature/'; +import type {LegalHoldMemberData} from '@wireapp/api-client/lib/team/legalhold/'; +import type {MemberData, Members} from '@wireapp/api-client/lib/team/member/'; +import type {Services} from '@wireapp/api-client/lib/team/service/'; +import type {TeamData} from '@wireapp/api-client/lib/team/team/'; import {container} from 'tsyringe'; import {APIClient} from '../service/APIClientSingleton'; diff --git a/src/script/team/TeamState.ts b/src/script/team/TeamState.ts index 29754424d76..cd6cd4475ca 100644 --- a/src/script/team/TeamState.ts +++ b/src/script/team/TeamState.ts @@ -17,7 +17,7 @@ * */ -import {FeatureList, FeatureStatus, SelfDeletingTimeout} from '@wireapp/api-client/src/team/feature/'; +import {FeatureList, FeatureStatus, SelfDeletingTimeout} from '@wireapp/api-client/lib/team/feature/'; import ko from 'knockout'; import {container, singleton} from 'tsyringe'; diff --git a/src/script/user/AppLockState.ts b/src/script/user/AppLockState.ts index ead2fd52fed..4149e6aa8fb 100644 --- a/src/script/user/AppLockState.ts +++ b/src/script/user/AppLockState.ts @@ -17,7 +17,7 @@ * */ -import {FeatureStatus} from '@wireapp/api-client/src/team/feature/'; +import {FeatureStatus} from '@wireapp/api-client/lib/team/feature/'; import ko from 'knockout'; import {container, singleton} from 'tsyringe'; diff --git a/src/script/user/RichProfileRepository.ts b/src/script/user/RichProfileRepository.ts index c886e512a58..8c4fbfe7245 100644 --- a/src/script/user/RichProfileRepository.ts +++ b/src/script/user/RichProfileRepository.ts @@ -17,7 +17,7 @@ * */ -import type {RichInfo} from '@wireapp/api-client/src/user/'; +import type {RichInfo} from '@wireapp/api-client/lib/user/'; import {container, singleton} from 'tsyringe'; import {APIClient} from '../service/APIClientSingleton'; diff --git a/src/script/user/UserFilter.ts b/src/script/user/UserFilter.ts index c5151b8dc71..d6eea66a33a 100644 --- a/src/script/user/UserFilter.ts +++ b/src/script/user/UserFilter.ts @@ -17,7 +17,7 @@ * */ -import {QualifiedId} from '@wireapp/api-client/src/user'; +import {QualifiedId} from '@wireapp/api-client/lib/user'; import {matchQualifiedIds} from 'Util/QualifiedId'; diff --git a/src/script/user/UserMapper.test.ts b/src/script/user/UserMapper.test.ts index 74909de34d7..c52201b146a 100644 --- a/src/script/user/UserMapper.test.ts +++ b/src/script/user/UserMapper.test.ts @@ -17,12 +17,12 @@ * */ -import {UserAsset, UserAssetType} from '@wireapp/api-client/src/user'; +import {UserAsset, UserAssetType} from '@wireapp/api-client/lib/user'; import {ACCENT_ID, Config} from 'src/script/Config'; import {User} from 'src/script/entity/User'; import {serverTimeHandler} from 'src/script/time/serverTimeHandler'; -import {payload, entities} from 'test/api/payloads'; +import {entities, payload} from 'test/api/payloads'; import {createRandomUuid} from 'Util/util'; import {UserMapper} from './UserMapper'; diff --git a/src/script/user/UserMapper.ts b/src/script/user/UserMapper.ts index dea6e232ab7..e33831b3600 100644 --- a/src/script/user/UserMapper.ts +++ b/src/script/user/UserMapper.ts @@ -17,8 +17,8 @@ * */ -import type {Self as APIClientSelf} from '@wireapp/api-client/src/self/'; -import type {User as APIClientUser} from '@wireapp/api-client/src/user/'; +import type {Self as APIClientSelf} from '@wireapp/api-client/lib/self/'; +import type {User as APIClientUser} from '@wireapp/api-client/lib/user/'; import {container} from 'tsyringe'; import {joaatHash} from 'Util/Crypto'; diff --git a/src/script/user/UserPermission.ts b/src/script/user/UserPermission.ts index 762ee2cbfc4..7af844c58d6 100644 --- a/src/script/user/UserPermission.ts +++ b/src/script/user/UserPermission.ts @@ -18,7 +18,7 @@ */ /* eslint-disable sort-keys-fix/sort-keys-fix */ -import type {PermissionsData} from '@wireapp/api-client/src/team/member/PermissionsData'; +import type {PermissionsData} from '@wireapp/api-client/lib/team/member/PermissionsData'; import {capitalizeFirstChar} from 'Util/StringUtil'; diff --git a/src/script/user/UserRepository.ts b/src/script/user/UserRepository.ts index 2ad64545d5e..7f7f397139a 100644 --- a/src/script/user/UserRepository.ts +++ b/src/script/user/UserRepository.ts @@ -17,22 +17,22 @@ * */ -import type {AddedClient, PublicClient} from '@wireapp/api-client/src/client'; +import type {AddedClient, PublicClient} from '@wireapp/api-client/lib/client'; import { UserEvent, UserLegalHoldDisableEvent, UserLegalHoldRequestEvent, USER_EVENT, -} from '@wireapp/api-client/src/event'; -import type {BackendError, TraceState} from '@wireapp/api-client/src/http'; -import {BackendErrorLabel} from '@wireapp/api-client/src/http'; -import {ConsentType, Self as APIClientSelf} from '@wireapp/api-client/src/self/'; -import type {QualifiedHandle, User as APIClientUser} from '@wireapp/api-client/src/user'; +} from '@wireapp/api-client/lib/event'; +import type {BackendError, TraceState} from '@wireapp/api-client/lib/http'; +import {BackendErrorLabel} from '@wireapp/api-client/lib/http'; +import {ConsentType, Self as APIClientSelf} from '@wireapp/api-client/lib/self/'; +import type {QualifiedHandle, User as APIClientUser} from '@wireapp/api-client/lib/user'; import { QualifiedId, UserAsset as APIClientUserAsset, UserAssetType as APIClientUserAssetType, -} from '@wireapp/api-client/src/user'; +} from '@wireapp/api-client/lib/user'; import type {AccentColor} from '@wireapp/commons'; import {Availability} from '@wireapp/protocol-messaging'; import {WebAppEvents} from '@wireapp/webapp-events'; diff --git a/src/script/user/UserService.ts b/src/script/user/UserService.ts index 4e3c311d009..39192beedf3 100644 --- a/src/script/user/UserService.ts +++ b/src/script/user/UserService.ts @@ -17,7 +17,7 @@ * */ -import type {User as APIClientUser, QualifiedHandle, QualifiedId} from '@wireapp/api-client/src/user/'; +import type {User as APIClientUser, QualifiedHandle, QualifiedId} from '@wireapp/api-client/lib/user/'; import {container} from 'tsyringe'; import {Logger, getLogger} from 'Util/Logger'; diff --git a/src/script/util/DebugUtil.ts b/src/script/util/DebugUtil.ts index 323cbef7b1c..b7ff8d5828a 100644 --- a/src/script/util/DebugUtil.ts +++ b/src/script/util/DebugUtil.ts @@ -17,18 +17,18 @@ * */ -import {ConnectionStatus} from '@wireapp/api-client/src/connection/'; -import {MemberLeaveReason} from '@wireapp/api-client/src/conversation/data/'; +import {ConnectionStatus} from '@wireapp/api-client/lib/connection/'; +import {MemberLeaveReason} from '@wireapp/api-client/lib/conversation/data/'; import { - CONVERSATION_EVENT, - USER_EVENT, BackendEvent, ConversationEvent, ConversationOtrMessageAddEvent, -} from '@wireapp/api-client/src/event/'; -import type {Notification} from '@wireapp/api-client/src/notification/'; -import type {QualifiedId} from '@wireapp/api-client/src/user'; -import {isQualifiedId} from '@wireapp/core/src/main/util'; + CONVERSATION_EVENT, + USER_EVENT, +} from '@wireapp/api-client/lib/event/'; +import type {Notification} from '@wireapp/api-client/lib/notification/'; +import type {QualifiedId} from '@wireapp/api-client/lib/user'; +import {isQualifiedId} from '@wireapp/core/lib/util'; import {util as ProteusUtil} from '@wireapp/proteus'; import Dexie from 'dexie'; import {container} from 'tsyringe'; diff --git a/src/script/util/StorageUtil.ts b/src/script/util/StorageUtil.ts index 67c46f2c79f..d81bc5a9c10 100644 --- a/src/script/util/StorageUtil.ts +++ b/src/script/util/StorageUtil.ts @@ -17,7 +17,7 @@ * */ -import {QualifiedId} from '@wireapp/api-client/src/user'; +import {QualifiedId} from '@wireapp/api-client/lib/user'; import {amplify} from 'amplify'; import {TIME_IN_MILLIS} from 'Util/TimeUtil'; diff --git a/src/script/util/TypePredicateUtil.test.ts b/src/script/util/TypePredicateUtil.test.ts index f08a77cde3a..f07daa4e336 100644 --- a/src/script/util/TypePredicateUtil.test.ts +++ b/src/script/util/TypePredicateUtil.test.ts @@ -17,7 +17,7 @@ * */ -import {BackendError, BackendErrorLabel} from '@wireapp/api-client/src/http/'; +import {BackendError, BackendErrorLabel} from '@wireapp/api-client/lib/http/'; import type {AxiosError} from 'axios'; import {isAxiosError, isBackendError, isQualifiedUserClientEntityMap} from 'Util/TypePredicateUtil'; diff --git a/src/script/util/TypePredicateUtil.ts b/src/script/util/TypePredicateUtil.ts index abead1fe7a0..63c52efac60 100644 --- a/src/script/util/TypePredicateUtil.ts +++ b/src/script/util/TypePredicateUtil.ts @@ -17,8 +17,8 @@ * */ -import type {BackendError} from '@wireapp/api-client/src/http/'; -import type {QualifiedId} from '@wireapp/api-client/src/user/'; +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/ClientRepository'; diff --git a/src/script/util/messageRenderer.ts b/src/script/util/messageRenderer.ts index 227b60359d4..1cc405b8bb0 100644 --- a/src/script/util/messageRenderer.ts +++ b/src/script/util/messageRenderer.ts @@ -17,7 +17,7 @@ * */ -import {QualifiedId} from '@wireapp/api-client/src/user'; +import {QualifiedId} from '@wireapp/api-client/lib/user'; import hljs from 'highlight.js'; import MarkdownIt from 'markdown-it'; import type Token from 'markdown-it/lib/token'; diff --git a/src/script/view_model/CallingViewModel.ts b/src/script/view_model/CallingViewModel.ts index 6e9f62ecda4..1777e539c49 100644 --- a/src/script/view_model/CallingViewModel.ts +++ b/src/script/view_model/CallingViewModel.ts @@ -17,7 +17,7 @@ * */ -import {QualifiedId} from '@wireapp/api-client/src/user'; +import {QualifiedId} from '@wireapp/api-client/lib/user'; import {CALL_TYPE, CONV_TYPE, REASON as CALL_REASON, STATE as CALL_STATE} from '@wireapp/avs'; import {Availability} from '@wireapp/protocol-messaging'; import ko from 'knockout'; diff --git a/src/script/view_model/ContentViewModel.ts b/src/script/view_model/ContentViewModel.ts index 12a5efdf3bc..bb38f3cdb5d 100644 --- a/src/script/view_model/ContentViewModel.ts +++ b/src/script/view_model/ContentViewModel.ts @@ -17,7 +17,7 @@ * */ -import {ConnectionStatus} from '@wireapp/api-client/src/connection/'; +import {ConnectionStatus} from '@wireapp/api-client/lib/connection/'; import {WebAppEvents} from '@wireapp/webapp-events'; import {amplify} from 'amplify'; import ko from 'knockout'; diff --git a/src/script/view_model/ThemeViewModel.ts b/src/script/view_model/ThemeViewModel.ts index bf06220d521..3d720299547 100644 --- a/src/script/view_model/ThemeViewModel.ts +++ b/src/script/view_model/ThemeViewModel.ts @@ -17,7 +17,7 @@ * */ -import type {WebappProperties} from '@wireapp/api-client/src/user/data/'; +import type {WebappProperties} from '@wireapp/api-client/lib/user/data/'; import {WebAppEvents} from '@wireapp/webapp-events'; import {amplify} from 'amplify'; diff --git a/src/style/common/mixins.less b/src/style/common/mixins.less index 663d37eca5c..5419e55b8c9 100644 --- a/src/style/common/mixins.less +++ b/src/style/common/mixins.less @@ -41,7 +41,7 @@ .setVariables(foreground background); .setColorFade(foreground, @foreground); .setColorFade(background, @background); - .setVariables(app-bg sidebar-bg sidebar-border-color main-color border-color app-bg-secondary conversation-list-bg-opacity); + .setVariables(app-bg sidebar-bg input-bar-bg sidebar-border-color main-color border-color app-bg-secondary conversation-list-bg-opacity); .setVariables(group-video-bg group-video-tile-bg inactive-call-button-bg inactive-call-button-border inactive-call-button-hover-bg inactive-call-button-hover-border disabled-call-button-bg disabled-call-button-border disabled-call-button-svg button-group-left-hover button-group-right-hover toggle-button-unselected-hover-border toggle-button-unselected-hover-bg); .setVariables(modal-bg modal-border-color); .setVariables(preference-account-input-bg); diff --git a/src/style/components/list/participant-item.less b/src/style/components/list/participant-item.less index c060923e8aa..8eee3b196c5 100644 --- a/src/style/components/list/participant-item.less +++ b/src/style/components/list/participant-item.less @@ -118,8 +118,8 @@ &__text { display: flex; - max-width: @participant-max-width; min-width: 0; // this will ensure that ellipses is working + max-width: @participant-max-width; height: @avatar-diameter-m; flex-direction: column; flex-grow: 1; diff --git a/src/style/content/conversation/input-bar.less b/src/style/content/conversation/input-bar.less index 632ad04684b..a5ee49f69f1 100644 --- a/src/style/content/conversation/input-bar.less +++ b/src/style/content/conversation/input-bar.less @@ -30,7 +30,7 @@ display: flex; flex-wrap: wrap; padding-right: 8px; - background-color: var(--app-bg-secondary); + background-color: var(--input-bar-bg); &--editing { background-color: var(--text-input-editing); diff --git a/src/style/foundation/themes.less b/src/style/foundation/themes.less index 462b2577834..b1b1bd77f3d 100644 --- a/src/style/foundation/themes.less +++ b/src/style/foundation/themes.less @@ -37,6 +37,7 @@ body.theme-default { @conversation-list-bg-opacity: fade(#000, 64%); @sidebar-box-shadow: #eee; @sidebar-box-shadow-lg: rgba(0, 0, 0, 0.12); + @input-bar-bg: var(--white); // ---------------------------------------------------------------------------- // Calling @@ -130,6 +131,7 @@ body.theme-dark { @border-color: var(--gray-90); @app-bg-secondary: var(--black); @conversation-list-bg-opacity: fade(#000, 78%); + @input-bar-bg: var(--gray-100); // ---------------------------------------------------------------------------- // Calling diff --git a/src/style/foundation/warnings.less b/src/style/foundation/warnings.less index 045130831b6..68d60b0a567 100644 --- a/src/style/foundation/warnings.less +++ b/src/style/foundation/warnings.less @@ -43,13 +43,13 @@ width: 100%; justify-content: center; background-color: var(--accent-color); - color: #fff; + color: var(--app-bg-secondary); a { - color: @w-white; + color: var(--app-bg-secondary); &:hover, &:focus { - color: fade(@w-white, 80%); + color: var(--app-bg); } } } diff --git a/test/helper/TestFactory.js b/test/helper/TestFactory.js index b5ecf346e60..f6d3e5e7fc3 100644 --- a/test/helper/TestFactory.js +++ b/test/helper/TestFactory.js @@ -22,7 +22,7 @@ /* eslint no-undef: "off" */ // Polyfill for "tsyringe" dependency injection -import {ClientClassification, ClientType} from '@wireapp/api-client/src/client/'; +import {ClientClassification, ClientType} from '@wireapp/api-client/lib/client/'; import 'core-js/full/reflect'; import ko from 'knockout'; import {container} from 'tsyringe'; diff --git a/test/helper/UserGenerator.ts b/test/helper/UserGenerator.ts index e482554e514..cdf6826887f 100644 --- a/test/helper/UserGenerator.ts +++ b/test/helper/UserGenerator.ts @@ -18,8 +18,8 @@ */ import {faker} from '@faker-js/faker'; -import type {User as APIClientUser} from '@wireapp/api-client/src/user/'; -import {UserAssetType} from '@wireapp/api-client/src/user/'; +import type {User as APIClientUser} from '@wireapp/api-client/lib/user/'; +import {UserAssetType} from '@wireapp/api-client/lib/user/'; import {createRandomUuid} from 'Util/util'; diff --git a/test/unit_tests/audio/AudioRepositorySpec.js b/test/unit_tests/audio/AudioRepositorySpec.js index 48dd4ad70e1..05f5fcdae96 100644 --- a/test/unit_tests/audio/AudioRepositorySpec.js +++ b/test/unit_tests/audio/AudioRepositorySpec.js @@ -17,7 +17,7 @@ * */ -import {AudioPreference} from '@wireapp/api-client/src/user/data/'; +import {AudioPreference} from '@wireapp/api-client/lib/user/data/'; import {difference} from 'underscore'; import {AudioPlayingType} from 'src/script/audio/AudioPlayingType'; diff --git a/test/unit_tests/client/ClientMapperSpec.js b/test/unit_tests/client/ClientMapperSpec.js index b1a5a76266d..10b6c1364de 100644 --- a/test/unit_tests/client/ClientMapperSpec.js +++ b/test/unit_tests/client/ClientMapperSpec.js @@ -17,7 +17,7 @@ * */ -import {ClientType} from '@wireapp/api-client/src/client/'; +import {ClientType} from '@wireapp/api-client/lib/client/'; import {ClientMapper} from 'src/script/client/ClientMapper'; diff --git a/test/unit_tests/connection/ConnectionRepositorySpec.js b/test/unit_tests/connection/ConnectionRepositorySpec.js index a162e523614..028e63a7823 100644 --- a/test/unit_tests/connection/ConnectionRepositorySpec.js +++ b/test/unit_tests/connection/ConnectionRepositorySpec.js @@ -17,7 +17,7 @@ * */ -import {ConnectionStatus} from '@wireapp/api-client/src/connection/'; +import {ConnectionStatus} from '@wireapp/api-client/lib/connection/'; import {WebAppEvents} from '@wireapp/webapp-events'; import {ConnectionEntity} from 'src/script/connection/ConnectionEntity'; diff --git a/test/unit_tests/cryptography/CryptographyMapperSpec.js b/test/unit_tests/cryptography/CryptographyMapperSpec.js index f02827f9c4e..ff118740144 100644 --- a/test/unit_tests/cryptography/CryptographyMapperSpec.js +++ b/test/unit_tests/cryptography/CryptographyMapperSpec.js @@ -17,8 +17,8 @@ * */ -import {CONVERSATION_EVENT} from '@wireapp/api-client/src/event/'; -import {ReactionType} from '@wireapp/core/src/main/conversation/'; +import {CONVERSATION_EVENT} from '@wireapp/api-client/lib/event/'; +import {ReactionType} from '@wireapp/core/lib/conversation/'; import { Asset, Availability, diff --git a/test/unit_tests/event/preprocessor/ServiceMiddlewareSpec.js b/test/unit_tests/event/preprocessor/ServiceMiddlewareSpec.js index 80c0cee2179..4283dd15ebe 100644 --- a/test/unit_tests/event/preprocessor/ServiceMiddlewareSpec.js +++ b/test/unit_tests/event/preprocessor/ServiceMiddlewareSpec.js @@ -17,7 +17,7 @@ * */ -import {CONVERSATION_EVENT} from '@wireapp/api-client/src/event/'; +import {CONVERSATION_EVENT} from '@wireapp/api-client/lib/event/'; import {Conversation} from 'src/script/entity/Conversation'; import {ClientEvent} from 'src/script/event/Client'; diff --git a/test/unit_tests/notification/NotificationRepositorySpec.js b/test/unit_tests/notification/NotificationRepositorySpec.js index cce0f3dc676..9e7225a17b8 100644 --- a/test/unit_tests/notification/NotificationRepositorySpec.js +++ b/test/unit_tests/notification/NotificationRepositorySpec.js @@ -17,9 +17,9 @@ * */ -import {CONVERSATION_TYPE} from '@wireapp/api-client/src/conversation/'; -import {CONVERSATION_EVENT} from '@wireapp/api-client/src/event/'; -import {NotificationPreference} from '@wireapp/api-client/src/user/data/'; +import {CONVERSATION_TYPE} from '@wireapp/api-client/lib/conversation/'; +import {CONVERSATION_EVENT} from '@wireapp/api-client/lib/event/'; +import {NotificationPreference} from '@wireapp/api-client/lib/user/data/'; import {Runtime} from '@wireapp/commons'; import {Availability} from '@wireapp/protocol-messaging'; import {WebAppEvents} from '@wireapp/webapp-events'; diff --git a/test/unit_tests/tracking/HelpersSpec.js b/test/unit_tests/tracking/HelpersSpec.js index a50087f7399..8c667e6b259 100644 --- a/test/unit_tests/tracking/HelpersSpec.js +++ b/test/unit_tests/tracking/HelpersSpec.js @@ -17,12 +17,12 @@ * */ -import {CONVERSATION_TYPE} from '@wireapp/api-client/src/conversation/'; +import {CONVERSATION_TYPE} from '@wireapp/api-client/lib/conversation/'; +import {createRandomUuid} from 'Util/util'; import {Conversation} from 'src/script/entity/Conversation'; import {ConversationType as ConversationTypeAttribute} from 'src/script/tracking/attribute'; import * as trackingHelpers from 'src/script/tracking/Helpers'; -import {createRandomUuid} from 'Util/util'; describe('trackingHelpers', () => { describe('getConversationType', () => { diff --git a/test/unit_tests/user/UserRepositorySpec.js b/test/unit_tests/user/UserRepositorySpec.js index aae9b9a9d21..c05374e91a9 100644 --- a/test/unit_tests/user/UserRepositorySpec.js +++ b/test/unit_tests/user/UserRepositorySpec.js @@ -17,7 +17,7 @@ * */ -import {RECEIPT_MODE} from '@wireapp/api-client/src/conversation/data'; +import {RECEIPT_MODE} from '@wireapp/api-client/lib/conversation/data'; import {StatusCodes as HTTP_STATUS} from 'http-status-codes'; import {ClientMapper} from 'src/script/client/ClientMapper'; diff --git a/test/unit_tests/view_model/WindowTitleViewModelSpec.js b/test/unit_tests/view_model/WindowTitleViewModelSpec.js index aa1bf697dcc..be575b91699 100644 --- a/test/unit_tests/view_model/WindowTitleViewModelSpec.js +++ b/test/unit_tests/view_model/WindowTitleViewModelSpec.js @@ -17,20 +17,21 @@ * */ -import 'src/script/localization/Localizer'; - -import {CONVERSATION_TYPE} from '@wireapp/api-client/src/conversation/'; +import {CONVERSATION_TYPE} from '@wireapp/api-client/lib/conversation/'; import {WebAppEvents} from '@wireapp/webapp-events'; import ko from 'knockout'; +import {setStrings, t} from 'Util/LocalizerUtil'; +import {createRandomUuid} from 'Util/util'; + +import 'src/script/localization/Localizer'; + import {NOTIFICATION_STATE} from 'src/script/conversation/NotificationSetting'; import {Conversation} from 'src/script/entity/Conversation'; import {ContentMessage} from 'src/script/entity/message/ContentMessage'; import {User} from 'src/script/entity/User'; import {ContentState} from 'src/script/view_model/ContentViewModel'; import {WindowTitleViewModel} from 'src/script/view_model/WindowTitleViewModel'; -import {t, setStrings} from 'Util/LocalizerUtil'; -import {createRandomUuid} from 'Util/util'; import {TestFactory} from '../../helper/TestFactory'; diff --git a/yarn.lock b/yarn.lock index 0ef35938b3a..ea6a5b14394 100644 --- a/yarn.lock +++ b/yarn.lock @@ -363,7 +363,7 @@ __metadata: languageName: node linkType: hard -"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.18.10, @babel/parser@npm:^7.19.6": +"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.18.10, @babel/parser@npm:^7.19.6, @babel/parser@npm:^7.9.4": version: 7.19.6 resolution: "@babel/parser@npm:7.19.6" bin: @@ -3318,14 +3318,7 @@ __metadata: languageName: node linkType: hard -"@types/long@npm:^4.0.1": - version: 4.0.1 - resolution: "@types/long@npm:4.0.1" - checksum: ff9653c33f5000d0f131fd98a950a0343e2e33107dd067a97ac4a3b9678e1a2e39ea44772ad920f54ef6e8f107f76bc92c2584ba905a0dc4253282a4101166d0 - languageName: node - linkType: hard - -"@types/markdown-it@npm:12.2.3": +"@types/markdown-it@npm:12.2.3, @types/markdown-it@npm:^12.2.3": version: 12.2.3 resolution: "@types/markdown-it@npm:12.2.3" dependencies: @@ -3996,13 +3989,20 @@ __metadata: languageName: node linkType: hard -"@wireapp/api-client@npm:^21.0.5": - version: 21.0.5 - resolution: "@wireapp/api-client@npm:21.0.5" +"@wireapp/antiscroll-2@npm:1.3.1": + version: 1.3.1 + resolution: "@wireapp/antiscroll-2@npm:1.3.1" + checksum: 28464b4a02250c13ad3816a0a7303fc9cf3cd4586b4202c192d25b82f64541dc3ebc7f5c147548f3e478df4a56e4ffa26edfcb806438d3ae453c7ba9fcd3b124 + languageName: node + linkType: hard + +"@wireapp/api-client@npm:^22.0.0": + version: 22.0.0 + resolution: "@wireapp/api-client@npm:22.0.0" dependencies: - "@wireapp/commons": ^4.5.0 - "@wireapp/priority-queue": ^1.8.11 - "@wireapp/protocol-messaging": 1.39.0 + "@wireapp/commons": ^5.0.0 + "@wireapp/priority-queue": ^2.0.0 + "@wireapp/protocol-messaging": 1.42.0 axios: 1.1.2 axios-retry: 3.3.1 http-status-codes: 2.2.0 @@ -4011,14 +4011,14 @@ __metadata: spark-md5: 3.0.2 tough-cookie: 4.1.2 ws: 8.9.0 - checksum: 3fc618b461fdb8cd37ca6cccc40eb73d0a325cc28993002b83e77713ee2e07f31fbd4f2a8951360377625581d6e6d4d1391a11fbb9bbe6bc1c818388fa3b1430 + checksum: fd27d6e9030798e3467db535bac9f7dfce2765fa337507a3d01c03babba5b158d1c5210f38eb5abde4471084714ba41795c5d574f74331bfb39c3eef30bb1e75 languageName: node linkType: hard -"@wireapp/avs@npm:8.2.16": - version: 8.2.16 - resolution: "@wireapp/avs@npm:8.2.16" - checksum: fc5f525fa77038048e788677a6d5c720a58e0c1ac7402043ae40d56a05eced1f8913fbe79e9eebe3047c7493c3257ab0f8dc87f0c63e81aa62b4ad577bf16d07 +"@wireapp/avs@npm:8.2.17": + version: 8.2.17 + resolution: "@wireapp/avs@npm:8.2.17" + checksum: defbcfe3b4a121533d430e77f7420f59c7362e6d91f78cd42eb8afdacdf447b70abb072f049a627a5c4a3ee5a1880632a25849a306bcd7e53c238b8aca14e081 languageName: node linkType: hard @@ -4029,31 +4029,31 @@ __metadata: languageName: node linkType: hard -"@wireapp/commons@npm:^4.5.0": - version: 4.5.0 - resolution: "@wireapp/commons@npm:4.5.0" +"@wireapp/commons@npm:^5.0.0": + version: 5.0.0 + resolution: "@wireapp/commons@npm:5.0.0" dependencies: ansi-regex: 5.0.1 fs-extra: 10.1.0 logdown: 3.3.1 platform: 1.3.6 - checksum: 8dc0e8cd599a4e581a87bf1b4abe484b6af2bee28ff6e9bd174a2256eadd51dd509b3946e2d01ce9af4d068494bc1ff81703947639510b3752a68bc223616f69 + checksum: 9950b0bc0709a9abae963f99aed8f9bef772fdad6fc4054abf95b660b093e20704f3db2316cdfc189d7ee8787f665dc3902049af20161d777a9eb6e86b3a2250 languageName: node linkType: hard -"@wireapp/copy-config@npm:1.3.10": - version: 1.3.10 - resolution: "@wireapp/copy-config@npm:1.3.10" +"@wireapp/copy-config@npm:2.0.0": + version: 2.0.0 + resolution: "@wireapp/copy-config@npm:2.0.0" dependencies: - axios: 1.1.3 + axios: 1.1.2 copy: 0.3.2 cosmiconfig: 7.0.1 fs-extra: 10.1.0 jszip: 3.10.1 logdown: 3.3.1 bin: - copy-config: src/main/cli.js - checksum: 20a4f2d8c7605382f78aae9e15e0ab1954370d25cf8831173464d12d32f85c14a238be013b3b314000d078446f80f4403b9249ae100b842a3be0ba8e782a9de1 + copy-config: lib/cli.js + checksum: 17cbfc5b1ca91f6ce28186adad39aa6e3b9f876092d23ad3fe04b547a6d2730c22ffc697bf43e316efac94ff6b5ae8a8e97ff2f27ef554eda49d196c4676da25 languageName: node linkType: hard @@ -4064,26 +4064,26 @@ __metadata: languageName: node linkType: hard -"@wireapp/core@npm:34.1.4": - version: 34.1.4 - resolution: "@wireapp/core@npm:34.1.4" +"@wireapp/core@npm:35.0.0": + version: 35.0.0 + resolution: "@wireapp/core@npm:35.0.0" dependencies: - "@wireapp/api-client": ^21.0.5 - "@wireapp/commons": ^4.5.0 + "@wireapp/api-client": ^22.0.0 + "@wireapp/commons": ^5.0.0 "@wireapp/core-crypto": 0.5.2 "@wireapp/cryptobox": 12.8.0 - "@wireapp/promise-queue": ^1.3.5 - "@wireapp/protocol-messaging": ^1.39.0 - "@wireapp/store-engine-dexie": ^1.7.12 + "@wireapp/promise-queue": ^2.0.0 + "@wireapp/protocol-messaging": 1.42.0 + "@wireapp/store-engine-dexie": ^2.0.0 axios: 1.1.2 - bazinga64: 5.11.11 + bazinga64: 6.0.0 hash.js: 1.1.7 http-status-codes: 2.2.0 idb: 7.1.0 logdown: 3.3.1 - long: 4.0.0 + long: ^5.2.0 uuidjs: 4.2.12 - checksum: d6e34adf52bbc332b4693f7911baf93820f5e03ee81d006e6a0e169075bf54831ba167a99bee0f104f60b0ab526f392efd1ce88a30c798cb3ec249938381fb7a + checksum: 218810278622c8bae77f918f62002595b6f8129b17621dd329e50c34dc2e325f084b2a14d72894f9520664078e270e957d37ffbe8d8bd74928a1e179d8f0c0e1 languageName: node linkType: hard @@ -4101,9 +4101,9 @@ __metadata: languageName: node linkType: hard -"@wireapp/eslint-config@npm:1.12.12": - version: 1.12.12 - resolution: "@wireapp/eslint-config@npm:1.12.12" +"@wireapp/eslint-config@npm:2.0.0": + version: 2.0.0 + resolution: "@wireapp/eslint-config@npm:2.0.0" peerDependencies: "@babel/eslint-parser": ">=7" "@typescript-eslint/eslint-plugin": ">=3" @@ -4118,7 +4118,7 @@ __metadata: eslint-plugin-react-hooks: ">=2" eslint-plugin-unused-imports: ">=1.1" prettier: ">=2" - checksum: f82875e77336c66bc3a70834c0ced76f7d066939cb79fc747c0fdcb5d352e93a5c7b45e6e533b9e13aaa0c44654e88f1f76262cd5321994bb3d559ea3499e3ca + checksum: 8555db048f69661785f36bccf6bdad790ee98b6b85f9b5ab6d11aa945551c60eb48154c2cf2a707b12eb53a7b0cb7917441f483cd2b727c962f3c79d9668d193 languageName: node linkType: hard @@ -4129,10 +4129,10 @@ __metadata: languageName: node linkType: hard -"@wireapp/prettier-config@npm:0.4.7": - version: 0.4.7 - resolution: "@wireapp/prettier-config@npm:0.4.7" - checksum: 7b00c430417bc7ff86bf64184db2b652611a106e644c89c3373decda5a1acda51a35993f5161039da5a157d85272b19cf8ed547e5fcde45912d57012199d7ccd +"@wireapp/prettier-config@npm:0.5.0": + version: 0.5.0 + resolution: "@wireapp/prettier-config@npm:0.5.0" + checksum: dbe802cf3a5c2e862cdbe9b4aae9d4bf3ac0879d35708cc145d689e272ef6ca5d0de71bab7a04dfb82e6231a5d60e9f1912a3488564d531c2e9dfff893b51e28 languageName: node linkType: hard @@ -4145,17 +4145,17 @@ __metadata: languageName: node linkType: hard -"@wireapp/priority-queue@npm:^1.8.11": - version: 1.8.11 - resolution: "@wireapp/priority-queue@npm:1.8.11" - checksum: 246d9905425d463c7fb055d3a3ee1d3588e3908570cf3d73ebfaad2b92b1408f04d9a45502448ea08d1524f4be3a91805f3cbba3b80994758a74c055077aa42d +"@wireapp/priority-queue@npm:^2.0.0": + version: 2.0.0 + resolution: "@wireapp/priority-queue@npm:2.0.0" + checksum: dcb06d202a20713514ec5c52ceb0c5f20cbe1e54c834ac28ac9c165449cf57c4ebe123ea5363a868f1d8ea1b4821fe44681c1909e6376b156420fa1202230dce languageName: node linkType: hard -"@wireapp/promise-queue@npm:^1.3.5": - version: 1.3.5 - resolution: "@wireapp/promise-queue@npm:1.3.5" - checksum: 35a687cfd3a8a2e4827f762ff938dd83437ecc27175014270ab9985ce40b4ef5253aae0f8062ca0e1dd65abe5e7dac50da4281e93f037fed881a381095f978b3 +"@wireapp/promise-queue@npm:^2.0.0": + version: 2.0.0 + resolution: "@wireapp/promise-queue@npm:2.0.0" + checksum: fa3659af52bad83f06d5737897502ac135cb149acb2031a24ad4a32f41ce98b2a5444d3e31bf256e6872fdd51813f9d8f6c0ce020b9d4196308f290d4528f38c languageName: node linkType: hard @@ -4171,18 +4171,21 @@ __metadata: languageName: node linkType: hard -"@wireapp/protocol-messaging@npm:1.39.0, @wireapp/protocol-messaging@npm:^1.39.0": - version: 1.39.0 - resolution: "@wireapp/protocol-messaging@npm:1.39.0" +"@wireapp/protocol-messaging@npm:1.42.0": + version: 1.42.0 + resolution: "@wireapp/protocol-messaging@npm:1.42.0" dependencies: - protobufjs: 6.11.3 - checksum: 2f905ff7c55905bdb467927e969d1ea6e22264e10c2262a51d2dcfe7bead0e1792a94c769f3de4f5c253c356440efa632173f6670d31db0834b2054d191940f4 + long: 5.2.0 + protobufjs: 7.1.2 + protobufjs-cli: 1.0.2 + typescript: 4.8.4 + checksum: 5ed5a07fdcca9ca269480ef838e5ef00dd9236e5cb7124d48732fed67065f67343c015734ace52d2d8a84ef183016b8520ad8b06386c49216904adb0b17cd72c languageName: node linkType: hard -"@wireapp/react-ui-kit@npm:8.17.10": - version: 8.17.10 - resolution: "@wireapp/react-ui-kit@npm:8.17.10" +"@wireapp/react-ui-kit@npm:9.0.1": + version: 9.0.1 + resolution: "@wireapp/react-ui-kit@npm:9.0.1" dependencies: "@types/color": 3.0.3 color: 4.2.3 @@ -4197,29 +4200,18 @@ __metadata: peerDependenciesMeta: "@types/react": optional: true - checksum: b7bdd5475a558c2de1331e596109a7e7ccafb9090b9c438189a933630ade0c0d3935fb7d4ecc946e029949b93d1e70def00b3a13148f297d1ed64e9b446d8d78 + checksum: 36351ff5478bb724c6143f5715aad3e49f42d8e124807ffc77487c307a313aff17c8fac8c3319d55f0f551f98085c69f0629ac197ab5138147987c4836c52be1 languageName: node linkType: hard -"@wireapp/store-engine-dexie@npm:1.7.11": - version: 1.7.11 - resolution: "@wireapp/store-engine-dexie@npm:1.7.11" - dependencies: - dexie: 3.2.2 - peerDependencies: - "@wireapp/store-engine": 4.x.x - checksum: 301550cf9c94f07e74039ad04d32de12f1ad5c22f18d15f9273f3d214a1e1ffabf5fde4b08ef5a7532cacb6ec26f0cb3c894f7e7c6f966981ee11c19e41b1d6f - languageName: node - linkType: hard - -"@wireapp/store-engine-dexie@npm:^1.7.12": - version: 1.7.12 - resolution: "@wireapp/store-engine-dexie@npm:1.7.12" +"@wireapp/store-engine-dexie@npm:2.0.0, @wireapp/store-engine-dexie@npm:^2.0.0": + version: 2.0.0 + resolution: "@wireapp/store-engine-dexie@npm:2.0.0" dependencies: dexie: 3.2.2 peerDependencies: "@wireapp/store-engine": 4.x.x - checksum: 6b866b90cdaef7cd718970c940aedb0b25ce01bcf0bedc266a3232c8741f6835f13c3d0358bc1ea32c2a88e3dc2bf10bdc6bfcea2bc4c18da5cdcb003e831b33 + checksum: 48f5e97c2f07b3e0a28c09b1f5edd8bb4f31e70ccecb7d211523d11a0c1479ddb16fc616e01c338a2a6404e0276535af6780fb85c4ccf9a9fc4b64f776501d85 languageName: node linkType: hard @@ -4245,10 +4237,10 @@ __metadata: languageName: node linkType: hard -"@wireapp/webapp-events@npm:0.14.9": - version: 0.14.9 - resolution: "@wireapp/webapp-events@npm:0.14.9" - checksum: 9ba6c96477aae9bed6bdf4b1bfc573fa2e3c12476938e7ff527dc358beb7754a610b8bb9a11d94827f587fd362cd9e44e6fa37f004658983aa27bb94cd944cb0 +"@wireapp/webapp-events@npm:0.15.0": + version: 0.15.0 + resolution: "@wireapp/webapp-events@npm:0.15.0" + checksum: 3209e685a29877fbedcd0fd7911f8cbe2ec2a4109e0435d5771a0370fd32c55d7fee8b5a8d3e521a13e001e6d47c845da5410386eea1fe51d4351b93a78e9484 languageName: node linkType: hard @@ -4953,17 +4945,6 @@ __metadata: languageName: node linkType: hard -"axios@npm:1.1.3": - version: 1.1.3 - resolution: "axios@npm:1.1.3" - dependencies: - follow-redirects: ^1.15.0 - form-data: ^4.0.0 - proxy-from-env: ^1.1.0 - checksum: cab3b17bf6092c9387f7023d699db093cfa23650b56c4422cd474d124b78b2e3b5a520f932c330664a58ab85b867b1c25a95cace475ef72d236888c852b84e6d - languageName: node - linkType: hard - "axobject-query@npm:^2.2.0": version: 2.2.0 resolution: "axobject-query@npm:2.2.0" @@ -5155,13 +5136,6 @@ __metadata: languageName: node linkType: hard -"bazinga64@npm:5.11.11": - version: 5.11.11 - resolution: "bazinga64@npm:5.11.11" - checksum: dd490fb39e23a7332b24a1d383a2b340427ebfec2b563219b853fde6fdcdd6d66dc6dade339474cc8554626445f4306f10c9b6d0c60393f297d5d3a8b432f477 - languageName: node - linkType: hard - "bazinga64@npm:5.11.9": version: 5.11.9 resolution: "bazinga64@npm:5.11.9" @@ -5169,6 +5143,13 @@ __metadata: languageName: node linkType: hard +"bazinga64@npm:6.0.0": + version: 6.0.0 + resolution: "bazinga64@npm:6.0.0" + checksum: 67a9c3aaa1c635a49a7dde6e60faf9aa0f973cc642daf92d372e6874ddda315ab7dccf53f744e12002b6f9000d9786036e260d2396f8309cfea09f64f8f68ce3 + languageName: node + linkType: hard + "big.js@npm:^5.2.2": version: 5.2.2 resolution: "big.js@npm:5.2.2" @@ -5198,7 +5179,7 @@ __metadata: languageName: node linkType: hard -"bluebird@npm:^3.0.6, bluebird@npm:^3.4.1": +"bluebird@npm:^3.0.6, bluebird@npm:^3.4.1, bluebird@npm:^3.7.2": version: 3.7.2 resolution: "bluebird@npm:3.7.2" checksum: 869417503c722e7dc54ca46715f70e15f4d9c602a423a02c825570862d12935be59ed9c7ba34a9b31f186c017c23cac6b54e35446f8353059c101da73eac22ef @@ -5463,6 +5444,15 @@ __metadata: languageName: node linkType: hard +"catharsis@npm:^0.9.0": + version: 0.9.0 + resolution: "catharsis@npm:0.9.0" + dependencies: + lodash: ^4.17.15 + checksum: da867df1fd01823ea5a7283886ba382f6eb5b1fe5af356e00fd944a02d9b867f4ea2fc7f61416c53427f62760fdbd41614f6e8ae37686d2c3a4696871526df20 + languageName: node + linkType: hard + "chalk@npm:^1.1.1": version: 1.1.3 resolution: "chalk@npm:1.1.3" @@ -6984,7 +6974,7 @@ __metadata: languageName: node linkType: hard -"entities@npm:^2.0.0": +"entities@npm:^2.0.0, entities@npm:~2.1.0": version: 2.1.0 resolution: "entities@npm:2.1.0" checksum: a10a877e489586a3f6a691fe49bf3fc4e58f06c8e80522f08214a5150ba457e7017b447d4913a3fa041bda06ee4c92517baa4d8d75373eaa79369e9639225ffd @@ -7150,6 +7140,25 @@ __metadata: languageName: node linkType: hard +"escodegen@npm:^1.13.0": + version: 1.14.3 + resolution: "escodegen@npm:1.14.3" + dependencies: + esprima: ^4.0.1 + estraverse: ^4.2.0 + esutils: ^2.0.2 + optionator: ^0.8.1 + source-map: ~0.6.1 + dependenciesMeta: + source-map: + optional: true + bin: + escodegen: bin/escodegen.js + esgenerate: bin/esgenerate.js + checksum: 381cdc4767ecdb221206bbbab021b467bbc2a6f5c9a99c9e6353040080bdd3dfe73d7604ad89a47aca6ea7d58bc635f6bd3fbc8da9a1998e9ddfa8372362ccd0 + languageName: node + linkType: hard + "escodegen@npm:^2.0.0": version: 2.0.0 resolution: "escodegen@npm:2.0.0" @@ -7538,7 +7547,7 @@ __metadata: languageName: node linkType: hard -"espree@npm:^9.4.0": +"espree@npm:^9.0.0, espree@npm:^9.4.0": version: 9.4.0 resolution: "espree@npm:9.4.0" dependencies: @@ -7587,7 +7596,7 @@ __metadata: languageName: node linkType: hard -"estraverse@npm:^4.1.1": +"estraverse@npm:^4.1.1, estraverse@npm:^4.2.0": version: 4.3.0 resolution: "estraverse@npm:4.3.0" checksum: a6299491f9940bb246124a8d44b7b7a413a8336f5436f9837aaa9330209bd9ee8af7e91a654a3545aee9c54b3308e78ee360cef1d777d37cfef77d2fa33b5827 @@ -8445,7 +8454,7 @@ __metadata: languageName: node linkType: hard -"glob@npm:^8.0.1, glob@npm:^8.0.3": +"glob@npm:^8.0.0, glob@npm:^8.0.1, glob@npm:^8.0.3": version: 8.0.3 resolution: "glob@npm:8.0.3" dependencies: @@ -8621,7 +8630,7 @@ __metadata: languageName: node linkType: hard -"graceful-fs@npm:^4.0.0, graceful-fs@npm:^4.1.11, graceful-fs@npm:^4.1.2, graceful-fs@npm:^4.1.4, graceful-fs@npm:^4.1.5, graceful-fs@npm:^4.1.6, graceful-fs@npm:^4.2.0, graceful-fs@npm:^4.2.4, graceful-fs@npm:^4.2.6, graceful-fs@npm:^4.2.9": +"graceful-fs@npm:^4.0.0, graceful-fs@npm:^4.1.11, graceful-fs@npm:^4.1.2, graceful-fs@npm:^4.1.4, graceful-fs@npm:^4.1.5, graceful-fs@npm:^4.1.6, graceful-fs@npm:^4.1.9, graceful-fs@npm:^4.2.0, graceful-fs@npm:^4.2.4, graceful-fs@npm:^4.2.6, graceful-fs@npm:^4.2.9": version: 4.2.10 resolution: "graceful-fs@npm:4.2.10" checksum: 3f109d70ae123951905d85032ebeae3c2a5a7a997430df00ea30df0e3a6c60cf6689b109654d6fdacd28810a053348c4d14642da1d075049e6be1ba5216218da @@ -10518,6 +10527,15 @@ __metadata: languageName: node linkType: hard +"js2xmlparser@npm:^4.0.2": + version: 4.0.2 + resolution: "js2xmlparser@npm:4.0.2" + dependencies: + xmlcreate: ^2.0.4 + checksum: 55e3af71dc0104941dfc3e85452230db42ff3870a5777d1ea26bc0c68743f49113a517a7b305421a932b29f10058a012a7da8f5ba07860a05a1dce9fe5b62962 + languageName: node + linkType: hard + "jsdoc-type-pratt-parser@npm:~3.1.0": version: 3.1.0 resolution: "jsdoc-type-pratt-parser@npm:3.1.0" @@ -10525,6 +10543,31 @@ __metadata: languageName: node linkType: hard +"jsdoc@npm:^3.6.3": + version: 3.6.11 + resolution: "jsdoc@npm:3.6.11" + dependencies: + "@babel/parser": ^7.9.4 + "@types/markdown-it": ^12.2.3 + bluebird: ^3.7.2 + catharsis: ^0.9.0 + escape-string-regexp: ^2.0.0 + js2xmlparser: ^4.0.2 + klaw: ^3.0.0 + markdown-it: ^12.3.2 + markdown-it-anchor: ^8.4.1 + marked: ^4.0.10 + mkdirp: ^1.0.4 + requizzle: ^0.2.3 + strip-json-comments: ^3.1.0 + taffydb: 2.6.2 + underscore: ~1.13.2 + bin: + jsdoc: jsdoc.js + checksum: 7920b5cba6200c8f56c9ac2ac5e89d06b6581dd1ce22e66976409fad8b68c16bfd8cd30fe9af58baeacc9f6bd9ba06d901ca4f5e234944f42a3c37e55e4ddcf0 + languageName: node + linkType: hard + "jsdom-worker@npm:0.3.0": version: 0.3.0 resolution: "jsdom-worker@npm:0.3.0" @@ -10736,6 +10779,15 @@ __metadata: languageName: node linkType: hard +"klaw@npm:^3.0.0": + version: 3.0.0 + resolution: "klaw@npm:3.0.0" + dependencies: + graceful-fs: ^4.1.9 + checksum: 1bf9de22392c80d28de8a2babd6f0de29fa52fcdc1654838fd35174b3641c168ec32b8b03022191e3c190efd535c31fce23f85e29cb260245571da7263ef418e + languageName: node + linkType: hard + "kleur@npm:^3.0.3": version: 3.0.3 resolution: "kleur@npm:3.0.3" @@ -10941,6 +10993,15 @@ __metadata: languageName: node linkType: hard +"linkify-it@npm:^3.0.1": + version: 3.0.3 + resolution: "linkify-it@npm:3.0.3" + dependencies: + uc.micro: ^1.0.1 + checksum: 31367a4bb70c5bbc9703246236b504b0a8e049bcd4e0de4291fa50f0ebdebf235b5eb54db6493cb0b1319357c6eeafc4324c9f4aa34b0b943d9f2e11a1268fbc + languageName: node + linkType: hard + "lint-staged@npm:13.0.3": version: 13.0.3 resolution: "lint-staged@npm:13.0.3" @@ -11177,7 +11238,7 @@ __metadata: languageName: node linkType: hard -"lodash@npm:^4.0.0, lodash@npm:^4.17.10, lodash@npm:^4.17.14, lodash@npm:^4.17.20, lodash@npm:^4.17.21, lodash@npm:^4.7.0, lodash@npm:~4.17.10, lodash@npm:~4.17.19, lodash@npm:~4.17.21": +"lodash@npm:^4.0.0, lodash@npm:^4.17.10, lodash@npm:^4.17.14, lodash@npm:^4.17.15, lodash@npm:^4.17.20, lodash@npm:^4.17.21, lodash@npm:^4.7.0, lodash@npm:~4.17.10, lodash@npm:~4.17.19, lodash@npm:~4.17.21": version: 4.17.21 resolution: "lodash@npm:4.17.21" checksum: eb835a2e51d381e561e508ce932ea50a8e5a68f4ebdd771ea240d3048244a8d13658acbd502cd4829768c56f2e16bdd4340b9ea141297d472517b83868e677f7 @@ -11234,14 +11295,7 @@ __metadata: languageName: node linkType: hard -"long@npm:4.0.0, long@npm:^4.0.0": - version: 4.0.0 - resolution: "long@npm:4.0.0" - checksum: 16afbe8f749c7c849db1f4de4e2e6a31ac6e617cead3bdc4f9605cb703cd20e1e9fc1a7baba674ffcca57d660a6e5b53a9e236d7b25a295d3855cca79cc06744 - languageName: node - linkType: hard - -"long@npm:5.2.0": +"long@npm:5.2.0, long@npm:^5.0.0, long@npm:^5.2.0": version: 5.2.0 resolution: "long@npm:5.2.0" checksum: 37aa4e67b9c3eebc6d9d675adcc9d06f06059ca268922a71273de389746bf07f0ff282f9e604d17fdf84c4149099b44e936ea2b621a6c4759a216621afa97efd @@ -11389,6 +11443,16 @@ __metadata: languageName: node linkType: hard +"markdown-it-anchor@npm:^8.4.1": + version: 8.6.5 + resolution: "markdown-it-anchor@npm:8.6.5" + peerDependencies: + "@types/markdown-it": "*" + markdown-it: "*" + checksum: 9a466279e52e3c04d67f1e706f2c14df9340e64ddac6eaad22ceaeca777e381103caa942464003e98765a7555bd1ccb5055b624565cb4522a7071dce6ae93460 + languageName: node + linkType: hard + "markdown-it@npm:13.0.1": version: 13.0.1 resolution: "markdown-it@npm:13.0.1" @@ -11404,6 +11468,30 @@ __metadata: languageName: node linkType: hard +"markdown-it@npm:^12.3.2": + version: 12.3.2 + resolution: "markdown-it@npm:12.3.2" + dependencies: + argparse: ^2.0.1 + entities: ~2.1.0 + linkify-it: ^3.0.1 + mdurl: ^1.0.1 + uc.micro: ^1.0.5 + bin: + markdown-it: bin/markdown-it.js + checksum: 890555711c1c00fa03b936ca2b213001a3b9b37dea140d8445ae4130ce16628392aad24b12e2a0a9935336ca5951f2957a38f4e5309a2e38eab44e25ff32a41e + languageName: node + linkType: hard + +"marked@npm:^4.0.10": + version: 4.1.1 + resolution: "marked@npm:4.1.1" + bin: + marked: bin/marked.js + checksum: 717e3357952ee53de831bf0eb110ed075bebca2376c58bcdf7ee523ef540d45308ad6d51b2c933da0968832ea4386f31c142ca65443e77c098e84f6cce73e418 + languageName: node + linkType: hard + "matched@npm:^0.4.1": version: 0.4.4 resolution: "matched@npm:0.4.4" @@ -13630,9 +13718,32 @@ __metadata: languageName: node linkType: hard -"protobufjs@npm:6.11.3": - version: 6.11.3 - resolution: "protobufjs@npm:6.11.3" +"protobufjs-cli@npm:1.0.2": + version: 1.0.2 + resolution: "protobufjs-cli@npm:1.0.2" + dependencies: + chalk: ^4.0.0 + escodegen: ^1.13.0 + espree: ^9.0.0 + estraverse: ^5.1.0 + glob: ^8.0.0 + jsdoc: ^3.6.3 + minimist: ^1.2.0 + semver: ^7.1.2 + tmp: ^0.2.1 + uglify-js: ^3.7.7 + peerDependencies: + protobufjs: ^7.0.0 + bin: + pbjs: bin/pbjs + pbts: bin/pbts + checksum: 75dfa8bb76ea390c4f4926120439892fce6c730ec56960e85d5f03cac9c390fd7467d1254833542d722616ab4cb64a622e6de2fb7c75e7c42972878ae447b773 + languageName: node + linkType: hard + +"protobufjs@npm:7.1.2": + version: 7.1.2 + resolution: "protobufjs@npm:7.1.2" dependencies: "@protobufjs/aspromise": ^1.1.2 "@protobufjs/base64": ^1.1.2 @@ -13644,13 +13755,9 @@ __metadata: "@protobufjs/path": ^1.1.2 "@protobufjs/pool": ^1.1.0 "@protobufjs/utf8": ^1.1.0 - "@types/long": ^4.0.1 "@types/node": ">=13.7.0" - long: ^4.0.0 - bin: - pbjs: bin/pbjs - pbts: bin/pbts - checksum: 4a6ce1964167e4c45c53fd8a312d7646415c777dd31b4ba346719947b88e61654912326101f927da387d6b6473ab52a7ea4f54d6f15d63b31130ce28e2e15070 + long: ^5.0.0 + checksum: ae41669b1b0372fb1d49f506f2d1f2b0fb3dc3cece85987b17bcb544e4cef7c8d27f480486cdec324146ad0a5d22a327166a7ea864a9b3e49cc3c92a5d3f6500 languageName: node linkType: hard @@ -14277,6 +14384,15 @@ __metadata: languageName: node linkType: hard +"requizzle@npm:^0.2.3": + version: 0.2.3 + resolution: "requizzle@npm:0.2.3" + dependencies: + lodash: ^4.17.14 + checksum: b1b27c6ad16a2621d4cdb57cd44f01d302974df60f84f94b4d9d313dfe1d375e5b1a12f46010929fe508e83c40696a2105d38c1d1906c228500ac72b23a0d0c6 + languageName: node + linkType: hard + "resolve-cwd@npm:^3.0.0": version: 3.0.0 resolution: "resolve-cwd@npm:3.0.0" @@ -14463,7 +14579,7 @@ __metadata: languageName: node linkType: hard -"rimraf@npm:^3.0.2, rimraf@npm:~3.0.2": +"rimraf@npm:^3.0.0, rimraf@npm:^3.0.2, rimraf@npm:~3.0.2": version: 3.0.2 resolution: "rimraf@npm:3.0.2" dependencies: @@ -14639,7 +14755,7 @@ __metadata: languageName: node linkType: hard -"semver@npm:^7.3.2, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.3.8": +"semver@npm:^7.1.2, semver@npm:^7.3.2, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.3.8": version: 7.3.8 resolution: "semver@npm:7.3.8" dependencies: @@ -15566,6 +15682,13 @@ __metadata: languageName: node linkType: hard +"taffydb@npm:2.6.2": + version: 2.6.2 + resolution: "taffydb@npm:2.6.2" + checksum: 8fea9cdff71735a40320c4beeb80cb98837076cb89614bc55ac5d67561f35ebae158cfc07a193a1099b5e32746433b2c086b0cd6d56f29aa7c7678e74968335b + languageName: node + linkType: hard + "tapable@npm:^2.1.1, tapable@npm:^2.2.0": version: 2.2.0 resolution: "tapable@npm:2.2.0" @@ -15737,6 +15860,15 @@ __metadata: languageName: node linkType: hard +"tmp@npm:^0.2.1": + version: 0.2.1 + resolution: "tmp@npm:0.2.1" + dependencies: + rimraf: ^3.0.0 + checksum: 8b1214654182575124498c87ca986ac53dc76ff36e8f0e0b67139a8d221eaecfdec108c0e6ec54d76f49f1f72ab9325500b246f562b926f85bcdfca8bf35df9e + languageName: node + linkType: hard + "tmpl@npm:1.0.5": version: 1.0.5 resolution: "tmpl@npm:1.0.5" @@ -16098,6 +16230,15 @@ __metadata: languageName: node linkType: hard +"uglify-js@npm:^3.7.7": + version: 3.17.4 + resolution: "uglify-js@npm:3.17.4" + bin: + uglifyjs: bin/uglifyjs + checksum: 7b3897df38b6fc7d7d9f4dcd658599d81aa2b1fb0d074829dd4e5290f7318dbca1f4af2f45acb833b95b1fe0ed4698662ab61b87e94328eb4c0a0d3435baf924 + languageName: node + linkType: hard + "uint32@npm:0.2.1": version: 0.2.1 resolution: "uint32@npm:0.2.1" @@ -16134,7 +16275,7 @@ __metadata: languageName: node linkType: hard -"underscore@npm:1.13.6": +"underscore@npm:1.13.6, underscore@npm:~1.13.2": version: 1.13.6 resolution: "underscore@npm:1.13.6" checksum: d5cedd14a9d0d91dd38c1ce6169e4455bb931f0aaf354108e47bd46d3f2da7464d49b2171a5cf786d61963204a42d01ea1332a903b7342ad428deaafaf70ec36 @@ -16863,15 +17004,16 @@ __metadata: "@types/webpack-env": 1.18.0 "@typescript-eslint/eslint-plugin": 5.40.1 "@typescript-eslint/parser": 5.40.1 - "@wireapp/avs": 8.2.16 - "@wireapp/copy-config": 1.3.10 - "@wireapp/core": 34.1.4 - "@wireapp/eslint-config": 1.12.12 - "@wireapp/prettier-config": 0.4.7 - "@wireapp/react-ui-kit": 8.17.10 - "@wireapp/store-engine-dexie": 1.7.11 + "@wireapp/antiscroll-2": 1.3.1 + "@wireapp/avs": 8.2.17 + "@wireapp/copy-config": 2.0.0 + "@wireapp/core": 35.0.0 + "@wireapp/eslint-config": 2.0.0 + "@wireapp/prettier-config": 0.5.0 + "@wireapp/react-ui-kit": 9.0.1 + "@wireapp/store-engine-dexie": 2.0.0 "@wireapp/store-engine-sqleet": 1.8.9 - "@wireapp/webapp-events": 0.14.9 + "@wireapp/webapp-events": 0.15.0 adm-zip: 0.5.9 amplify: "https://github.com/wireapp/amplify#head=master" autoprefixer: 9.8.8 @@ -17303,6 +17445,13 @@ __metadata: languageName: node linkType: hard +"xmlcreate@npm:^2.0.4": + version: 2.0.4 + resolution: "xmlcreate@npm:2.0.4" + checksum: b8dd52668b9aea77cd1408fa85538c14bb8dcc98b4e7bb51e76696c9c115d59eba7240298d0c4fd2caf8f1a8e283ab4e5c7b9a6bcfcf23a8b48f5068b677b748 + languageName: node + linkType: hard + "xtend@npm:~4.0.0, xtend@npm:~4.0.1": version: 4.0.2 resolution: "xtend@npm:4.0.2"