chore: Update fuselage (#2673)

package.json

@@ -53,12 +53,12 @@
     "@emotion/css": "^11.7.1",
     "@emotion/react": "^11.7.1",
     "@emotion/styled": "^11.6.0",
+    "@rocket.chat/css-in-js": "^0.31.23-dev.165",
+    "@rocket.chat/fuselage": "^0.32.0-dev.391",
+    "@rocket.chat/fuselage-hooks": "^0.32.0-dev.304",
+    "@rocket.chat/fuselage-polyfills": "^0.31.23-dev.165",
+    "@rocket.chat/icons": "^0.32.0-dev.373",
     "@ewsjs/xhr": "^1.5.0",
-    "@rocket.chat/css-in-js": "^0.31.1",
-    "@rocket.chat/fuselage": "^0.31.1",
-    "@rocket.chat/fuselage-hooks": "^0.31.1",
-    "@rocket.chat/fuselage-polyfills": "^0.31.14",
-    "@rocket.chat/icons": "^0.31.1",
     "abort-controller": "^3.0.0",
     "axios": "^1.4.0",
     "electron-dl": "^3.5.0",
@@ -73,7 +73,7 @@
     "react-keyed-flatten-children": "^1.3.0",
     "react-redux": "^7.2.6",
     "redux": "^4.1.2",
-    "reselect": "^4.1.5",
+    "reselect": "4.1.6",
     "rimraf": "^3.0.2",
     "semver": "^7.3.5",
     "tslib": "^2.3.1"
@@ -89,8 +89,8 @@
     "@fiahfy/ico-convert": "^0.0.12",
     "@jest-runner/electron": "^3.0.1",
     "@rocket.chat/eslint-config": "^0.4.0",
-    "@rocket.chat/eslint-config-alt": "^0.31.1",
-    "@rocket.chat/prettier-config": "^0.31.1",
+    "@rocket.chat/eslint-config-alt": "^0.32.0-dev.143",
+    "@rocket.chat/prettier-config": "^0.31.23-dev.165",
     "@rollup/plugin-babel": "^5.3.0",
     "@rollup/plugin-commonjs": "^21.0.1",
     "@rollup/plugin-json": "^4.1.0",
@@ -112,7 +112,7 @@
     "chokidar": "^3.5.3",
     "conventional-changelog-cli": "^2.2.2",
     "convert-svg-to-png": "^0.5.0",
-    "electron": "^22.3.1",
+    "electron": "24.4.0",
     "electron-builder": "^23.6.0",
     "electron-devtools-installer": "^3.2.0",
     "electron-notarize": "^1.2.2",

src/app/PersistableValues.ts

@@ -1,8 +1,8 @@
 import type { Certificate } from 'electron';
 
-import { Download } from '../downloads/common';
-import { Server } from '../servers/common';
-import { WindowState } from '../ui/common';
+import type { Download } from '../downloads/common';
+import type { Server } from '../servers/common';
+import type { WindowState } from '../ui/common';
 
 type PersistableValues_0_0_0 = {
   currentServerUrl: string;

src/app/actions.ts

@@ -1,4 +1,4 @@
-import { PersistableValues } from './PersistableValues';
+import type { PersistableValues } from './PersistableValues';
 
 export const APP_ERROR_THROWN = 'app/error-thrown';
 export const APP_PATH_SET = 'app/path-set';

src/app/main/dev.ts

@@ -1,7 +1,8 @@
 import fs from 'fs';
 import path from 'path';
 
-import { app, WebContents } from 'electron';
+import type { WebContents } from 'electron';
+import { app } from 'electron';
 
 export const setUserDataDirectory = (): void => {
   if (process.env.NODE_ENV !== 'development' || process.mas) {

src/app/main/persistence.ts

@@ -1,7 +1,8 @@
 import { app } from 'electron';
 import ElectronStore from 'electron-store';
 
-import { PersistableValues, migrations } from '../PersistableValues';
+import type { PersistableValues } from '../PersistableValues';
+import { migrations } from '../PersistableValues';
 
 let electronStore: ElectronStore<PersistableValues>;
 

src/app/reducers/appPath.ts

@@ -1,6 +1,6 @@
-import { Reducer } from 'redux';
+import type { Reducer } from 'redux';
 
-import { ActionOf } from '../../store/actions';
+import type { ActionOf } from '../../store/actions';
 import { APP_PATH_SET } from '../actions';
 
 type AppPathAction = ActionOf<typeof APP_PATH_SET>;

src/app/reducers/appVersion.ts

@@ -1,6 +1,6 @@
-import { Reducer } from 'redux';
+import type { Reducer } from 'redux';
 
-import { ActionOf } from '../../store/actions';
+import type { ActionOf } from '../../store/actions';
 import { APP_VERSION_SET } from '../actions';
 
 type AppVersionAction = ActionOf<typeof APP_VERSION_SET>;

src/app/selectors.ts

@@ -1,7 +1,7 @@
 import { createStructuredSelector } from 'reselect';
 
-import { RootState } from '../store/rootReducer';
-import { PersistableValues } from './PersistableValues';
+import type { RootState } from '../store/rootReducer';
+import type { PersistableValues } from './PersistableValues';
 
 export const selectPersistableValues = createStructuredSelector<
   RootState,

src/buildAssets.ts

@@ -10,7 +10,7 @@ import { createElement } from 'react';
 import { renderToStaticMarkup } from 'react-dom/server';
 import rimraf from 'rimraf';
 
-import { Server } from './servers/common';
+import type { Server } from './servers/common';
 import DmgBackground from './ui/assets/DmgBackground';
 import NsisSideBar from './ui/assets/NsisSideBar';
 import AppIcon from './ui/icons/AppIcon';

src/deepLinks/actions.ts

@@ -1,4 +1,4 @@
-import { Server } from '../servers/common';
+import type { Server } from '../servers/common';
 
 export const DEEP_LINKS_SERVER_ADDED = 'deep-links/server-added';
 export const DEEP_LINKS_SERVER_FOCUSED = 'deep-links/server-focused';

src/deepLinks/main.ts

@@ -1,6 +1,7 @@
 import { URL } from 'url';
 
-import { app, WebContents } from 'electron';
+import type { WebContents } from 'electron';
+import { app } from 'electron';
 
 import {
   electronBuilderJsonInformation,

src/downloads/actions.ts

@@ -1,4 +1,4 @@
-import { Download } from './common';
+import type { Download } from './common';
 
 export const DOWNLOAD_CREATED = 'downloads/created';
 export const DOWNLOAD_REMOVED = 'dowloads/removed';

src/downloads/common.ts

@@ -1,4 +1,4 @@
-import { Server } from '../servers/common';
+import type { Server } from '../servers/common';
 
 export const DownloadStatus = {
   ALL: 'All',
@@ -15,7 +15,7 @@ export type Download = {
     | 'cancelled'
     | 'interrupted'
     | 'expired';
-  status: typeof DownloadStatus[keyof typeof DownloadStatus];
+  status: (typeof DownloadStatus)[keyof typeof DownloadStatus];
   fileName: string;
   receivedBytes: number;
   totalBytes: number;

src/downloads/main.ts

@@ -1,11 +1,5 @@
-import {
-  clipboard,
-  DownloadItem,
-  Event,
-  shell,
-  WebContents,
-  webContents,
-} from 'electron';
+import type { DownloadItem, Event, WebContents } from 'electron';
+import { clipboard, shell, webContents } from 'electron';
 import { t } from 'i18next';
 
 import { handle } from '../ipc/main';
@@ -16,7 +10,8 @@ import {
   DOWNLOAD_REMOVED,
   DOWNLOAD_UPDATED,
 } from './actions';
-import { Download, DownloadStatus } from './common';
+import type { Download } from './common';
+import { DownloadStatus } from './common';
 
 const items = new Map<Download['itemId'], DownloadItem>();
 
@@ -221,8 +216,13 @@ export const setupDownloads = (): void => {
       payload: itemId,
     });
 
-    if (webContentsId) {
-      webContents.fromId(webContentsId).downloadURL(download.url);
+    if (webContentsId && webContents !== undefined) {
+      if (webContents.fromId !== undefined) {
+        const webContentsInstance = webContents.fromId(webContentsId);
+        if (webContentsInstance !== undefined) {
+          webContentsInstance.downloadURL(download.url);
+        }
+      }
     }
   });
 

src/downloads/reducers/downloads.ts

@@ -1,12 +1,13 @@
 import { APP_SETTINGS_LOADED } from '../../app/actions';
-import { ActionOf } from '../../store/actions';
+import type { ActionOf } from '../../store/actions';
 import {
   DOWNLOADS_CLEARED,
   DOWNLOAD_CREATED,
   DOWNLOAD_REMOVED,
   DOWNLOAD_UPDATED,
 } from '../actions';
-import { Download, DownloadStatus } from '../common';
+import type { Download } from '../common';
+import { DownloadStatus } from '../common';
 
 type DownloadsAction =
   | ActionOf<typeof APP_SETTINGS_LOADED>

src/i18n/actions.ts

@@ -1,4 +1,4 @@
-import resources from './resources';
+import type resources from './resources';
 
 export const I18N_LNG_REQUESTED = 'i18n/lng-requested';
 export const I18N_LNG_RESPONDED = 'i18n/lng-responded';

src/i18n/common.ts

@@ -1,4 +1,4 @@
-import { InitOptions } from 'i18next';
+import type { InitOptions } from 'i18next';
 
 export const fallbackLng = 'en' as const;
 

src/i18n/main.ts

@@ -1,5 +1,6 @@
 import { app } from 'electron';
-import i18next, { TFunction } from 'i18next';
+import type { TFunction } from 'i18next';
+import i18next from 'i18next';
 
 import { dispatch, Service } from '../store';
 import { hasMeta } from '../store/fsa';

src/i18n/resources.ts

@@ -1,4 +1,4 @@
-import { Resource } from 'i18next';
+import type { Resource } from 'i18next';
 
 export default {
   'de-DE': (): Promise<Resource> => import('./de-DE.i18n.json'),

src/injected.ts

@@ -1,4 +1,4 @@
-import { RocketChatDesktopAPI } from './servers/preload/api';
+import type { RocketChatDesktopAPI } from './servers/preload/api';
 
 declare global {
   interface Window {

src/ipc/channels.ts

@@ -1,9 +1,9 @@
-import { AnyAction } from 'redux';
+import type { AnyAction } from 'redux';
 
-import { Download } from '../downloads/common';
-import { OutlookEventsResponse } from '../outlookCalendar/type';
-import { Server } from '../servers/common';
-import { SystemIdleState } from '../userPresence/common';
+import type { Download } from '../downloads/common';
+import type { OutlookEventsResponse } from '../outlookCalendar/type';
+import type { Server } from '../servers/common';
+import type { SystemIdleState } from '../userPresence/common';
 
 type ChannelToArgsMap = {
   'redux/get-initial-state': () => unknown;

src/ipc/main.ts

@@ -1,6 +1,7 @@
-import { ipcMain, WebContents } from 'electron';
+import type { WebContents } from 'electron';
+import { ipcMain } from 'electron';
 
-import { Handler, Channel } from './channels';
+import type { Handler, Channel } from './channels';
 
 export const invoke = <N extends Channel>(
   webContents: WebContents,

src/ipc/renderer.ts

@@ -1,6 +1,7 @@
-import { ipcRenderer, IpcRendererEvent } from 'electron';
+import type { IpcRendererEvent } from 'electron';
+import { ipcRenderer } from 'electron';
 
-import { Handler, Channel } from './channels';
+import type { Handler, Channel } from './channels';
 
 export const handle = <N extends Channel>(
   channel: N,

src/jitsi/preload.ts

@@ -1,10 +1,10 @@
-import {
+import type {
   SourcesOptions,
   DesktopCapturerSource,
   NativeImage,
-  ipcRenderer,
   DesktopCapturer,
 } from 'electron';
+import { ipcRenderer } from 'electron';
 
 const jitsiDomain = window.location.origin;
 

src/jitsi/reducers.ts

@@ -1,7 +1,7 @@
-import { Reducer } from 'redux';
+import type { Reducer } from 'redux';
 
 import { APP_SETTINGS_LOADED } from '../app/actions';
-import { ActionOf } from '../store/actions';
+import type { ActionOf } from '../store/actions';
 import {
   JITSI_SERVER_CAPTURE_SCREEN_PERMISSIONS_CLEARED,
   JITSI_SERVER_CAPTURE_SCREEN_PERMISSION_UPDATED,

src/navigation/actions.ts

@@ -1,6 +1,6 @@
-import { Certificate } from 'electron';
+import type { Certificate } from 'electron';
 
-import { Server } from '../servers/common';
+import type { Server } from '../servers/common';
 
 export const CERTIFICATES_CLEARED = 'certificates/cleared';
 export const CERTIFICATES_LOADED = 'certificates/loaded';

src/navigation/main.ts

@@ -1,7 +1,8 @@
 import fs from 'fs';
 import path from 'path';
 
-import { app, Certificate } from 'electron';
+import type { Certificate } from 'electron';
+import { app } from 'electron';
 import i18next from 'i18next';
 
 import { request, select, dispatch } from '../store';

src/navigation/reducers.ts

@@ -1,9 +1,9 @@
-import { Certificate } from 'electron';
-import { Reducer } from 'redux';
+import type { Certificate } from 'electron';
+import type { Reducer } from 'redux';
 
 import { APP_SETTINGS_LOADED } from '../app/actions';
-import { Server } from '../servers/common';
-import { ActionOf } from '../store/actions';
+import type { Server } from '../servers/common';
+import type { ActionOf } from '../store/actions';
 import {
   CERTIFICATES_CLIENT_CERTIFICATE_REQUESTED,
   SELECT_CLIENT_CERTIFICATE_DIALOG_CERTIFICATE_SELECTED,

src/notifications/actions.ts

@@ -1,4 +1,4 @@
-import { ExtendedNotificationOptions } from './common';
+import type { ExtendedNotificationOptions } from './common';
 
 export const NOTIFICATIONS_CREATE_REQUESTED = 'notifications/create-requested';
 export const NOTIFICATIONS_CREATE_RESPONDED = 'notifications/create-responded';

src/notifications/main.ts

@@ -1,8 +1,9 @@
-import { Notification, nativeImage, NativeImage } from 'electron';
+import type { NativeImage } from 'electron';
+import { Notification, nativeImage } from 'electron';
 
 import { invoke } from '../ipc/main';
 import { dispatch, dispatchSingle, listen } from '../store';
-import { ActionIPCMeta } from '../store/actions';
+import type { ActionIPCMeta } from '../store/actions';
 import { hasMeta } from '../store/fsa';
 import { getRootWindow } from '../ui/main/rootWindow';
 import {
@@ -15,7 +16,7 @@ import {
   NOTIFICATIONS_NOTIFICATION_ACTIONED,
   NOTIFICATIONS_NOTIFICATION_DISMISSED,
 } from './actions';
-import { ExtendedNotificationOptions } from './common';
+import type { ExtendedNotificationOptions } from './common';
 
 const resolveIcon = async (
   iconUrl: string | undefined

src/outlookCalendar/actions.ts

@@ -1,5 +1,5 @@
-import { Server } from '../servers/common';
-import { OutlookCredentials } from './type';
+import type { Server } from '../servers/common';
+import type { OutlookCredentials } from './type';
 
 export const OUTLOOK_CALENDAR_SET_CREDENTIALS =
   'outlook-calendar/set-credentials';

src/outlookCalendar/getOutlookEvents.ts

@@ -1,11 +1,11 @@
 /* eslint-disable new-cap */
 import { XhrApi } from '@ewsjs/xhr';
+import type { Appointment } from 'ews-javascript-api';
 import {
   FolderId,
   CalendarView,
   DateTime,
   WellKnownFolderName,
-  Appointment,
   BasePropertySet,
   PropertySet,
   ConfigurationApi,

src/outlookCalendar/ipc.ts

@@ -3,7 +3,7 @@ import { safeStorage } from 'electron';
 
 import { selectPersistableValues } from '../app/selectors';
 import { handle } from '../ipc/main';
-import { Server } from '../servers/common';
+import type { Server } from '../servers/common';
 import { dispatch, request, select } from '../store';
 import {
   OUTLOOK_CALENDAR_SET_CREDENTIALS,