feat: Migrate TSLint to ESLint (#3345)

.eslintrc.json

@@ -3,10 +3,23 @@
     "jasmine": true
   },
   "extends": "@wireapp/eslint-config",
+  "overrides": [
+    {
+      "files": ["*.ts", "*.tsx"],
+      "rules": {
+        "@typescript-eslint/member-ordering": "off",
+        "@typescript-eslint/typedef": "off",
+        "no-unused-vars": "off"
+      }
+    }
+  ],
+  "parserOptions": {
+    "project": ["./tsconfig.json", "./tsconfig.bin.json", "./tsconfig.mocha.json"]
+  },
   "plugins": ["jasmine"],
   "rules": {
-    "handle-callback-err": 2,
-    "import/no-default-export": 0,
-    "no-undef": 0
+    "import/no-default-export": "off",
+    "no-magic-numbers": "off",
+    "no-undef": "off"
   }
 }

bin/bin-utils.ts

@@ -51,7 +51,7 @@ export async function restoreFiles({originalPaths, backupPaths, tempDir}: Backup
 }
 
 export const getLogger = (namespace: string, name: string) =>
-  LogFactory.getLogger(name, {namespace: `@wireapp/${namespace}`, forceEnable: true, separator: '/'});
+  LogFactory.getLogger(name, {forceEnable: true, namespace: `@wireapp/${namespace}`, separator: '/'});
 
 export function checkCommanderOptions(
   commanderInstance: typeof commander,

bin/build-tools/build-cli.ts

@@ -35,7 +35,7 @@ interface CommanderData {
 }
 
 const toolName = path.basename(__filename).replace('.ts', '');
-const logger = LogFactory.getLogger(toolName, {namespace: '@wireapp/build-tools', forceEnable: true});
+const logger = LogFactory.getLogger(toolName, {forceEnable: true, namespace: '@wireapp/build-tools'});
 const appSource = path.join(__dirname, '../../');
 
 commander

bin/build-tools/lib/build-windows-installer.ts

@@ -17,7 +17,7 @@
  *
  */
 
-import {Options as electronWinstallerOptions, createWindowsInstaller} from 'electron-winstaller';
+import {createWindowsInstaller, Options as electronWinstallerOptions} from 'electron-winstaller';
 import fs from 'fs-extra';
 import path from 'path';
 
@@ -77,7 +77,7 @@ export async function buildWindowsInstallerConfig(
 
   commonConfig.updateUrl = windowsConfig.updateUrl;
 
-  return {windowsConfig, wInstallerOptions};
+  return {wInstallerOptions, windowsConfig};
 }
 
 export async function buildWindowsInstaller(

bin/deploy-tools/hockey-cli.ts

@@ -21,7 +21,7 @@ import fs from 'fs-extra';
 import path from 'path';
 
 import {checkCommanderOptions, getLogger} from '../bin-utils';
-import {FindResult, find, zip} from './lib/deploy-utils';
+import {find, FindResult, zip} from './lib/deploy-utils';
 import {HockeyDeployer} from './lib/HockeyDeployer';
 
 const toolName = path.basename(__filename).replace('.ts', '');
@@ -52,9 +52,8 @@ function getUploadFile(platform: string, basePath: string): Promise<FindResult>
     return find('*-Setup.exe', {cwd: basePath});
   } else if (platform.includes('macos')) {
     return find('*.pkg', {cwd: basePath});
-  } else {
-    throw new Error(`Invalid platform "${platform}"`);
   }
+  throw new Error(`Invalid platform "${platform}"`);
 }
 
 (async () => {

bin/deploy-tools/lib/GitHubDraftDeployer.test.ts

@@ -43,7 +43,7 @@ describe('GitHubDraftDeployer', () => {
         repoSlug: 'wireapp/wire-desktop',
       });
 
-      await gitHubDraftDeployer.uploadAsset({draftId: 0, filePath: __filename, fileName: path.basename(__filename)});
+      await gitHubDraftDeployer.uploadAsset({draftId: 0, fileName: path.basename(__filename), filePath: __filename});
     });
   });
 });

bin/deploy-tools/lib/GitHubDraftDeployer.ts

@@ -20,7 +20,7 @@ import axios from 'axios';
 import fs from 'fs-extra';
 import logdown from 'logdown';
 
-import {TWO_HUNDRED_MB_IN_BYTES, logDry} from './deploy-utils';
+import {logDry, TWO_HUNDRED_MB_IN_BYTES} from './deploy-utils';
 
 /** @see https://developer.github.com/v3/repos/releases/#create-a-release */
 export interface GitHubAPIDraftData {
@@ -125,7 +125,7 @@ export class GitHubDraftDeployer {
     };
 
     if (this.options.dryRun) {
-      logDry('createDraft', {url: draftUrl, draftData});
+      logDry('createDraft', {draftData, url: draftUrl});
       return {id: 0};
     }
 
@@ -159,7 +159,7 @@ export class GitHubDraftDeployer {
     const url = `${uploadUrl}?name=${fileName}`;
 
     if (this.options.dryRun) {
-      logDry('uploadAsset', {url, file, headers, maxContentLength: TWO_HUNDRED_MB_IN_BYTES});
+      logDry('uploadAsset', {file, headers, maxContentLength: TWO_HUNDRED_MB_IN_BYTES, url});
       return;
     }
 

bin/deploy-tools/lib/HockeyDeployer.ts

@@ -22,7 +22,7 @@ import fs from 'fs-extra';
 import logdown from 'logdown';
 import path from 'path';
 
-import {TWO_HUNDRED_MB_IN_BYTES, logDry} from './deploy-utils';
+import {logDry, TWO_HUNDRED_MB_IN_BYTES} from './deploy-utils';
 
 const HOCKEY_API_URL = 'https://rink.hockeyapp.net/api/2/apps';
 

bin/deploy-tools/lib/S3Deployer.ts

@@ -20,7 +20,7 @@ import S3 from 'aws-sdk/clients/s3';
 import fs from 'fs-extra';
 import path from 'path';
 
-import {FindResult, find, logDry} from './deploy-utils';
+import {find, FindResult, logDry} from './deploy-utils';
 
 export interface S3DeployerOptions {
   accessKeyId: string;
@@ -96,9 +96,8 @@ export class S3Deployer {
     } else if (platform.includes('macos')) {
       const setupPkg = await find('*.pkg', {cwd: basePath});
       return [setupPkg];
-    } else {
-      throw new Error(`Invalid platform "${platform}"`);
     }
+    throw new Error(`Invalid platform "${platform}"`);
   }
 
   async uploadToS3(uploadOptions: S3UploadOptions): Promise<void> {

electron/renderer/src/lib/locale.js

@@ -20,4 +20,4 @@
 window.locStrings = window.locStrings || {};
 window.locStringsDefault = window.locStringsDefault || {};
 
-export const getText = id => locStrings[id] || locStringsDefault[id] || id;
+export const getText = id => window.locStrings[id] || window.locStringsDefault[id] || id;

electron/src/after.test.ts

@@ -29,7 +29,7 @@ declare global {
 }
 
 const writeCoverageReport = (coverage: Object) => {
-  const outputFile = path.join(process.cwd(), `.nyc_output/coverage.${process['type']}.json`);
+  const outputFile = path.join(process.cwd(), `.nyc_output/coverage.${process.type}.json`);
   fs.outputJsonSync(outputFile, coverage);
 };
 

electron/src/lib/CertificateVerifyProcManager.ts

@@ -18,7 +18,7 @@
  */
 
 import * as certificateUtils from '@wireapp/certificate-check';
-import {BrowserWindow, Certificate, ProcRequest, dialog} from 'electron';
+import {BrowserWindow, Certificate, dialog, ProcRequest} from 'electron';
 import * as fs from 'fs-extra';
 import * as path from 'path';
 

electron/src/lib/LocalAccountDeletion.ts

@@ -18,7 +18,7 @@
  */
 
 import {ValidationUtil} from '@wireapp/commons';
-import {Session, app, webContents} from 'electron';
+import {app, Session, webContents} from 'electron';
 import * as fs from 'fs-extra';
 import * as path from 'path';
 

electron/src/lib/download.ts

@@ -17,7 +17,7 @@
  *
  */
 
-import {SaveDialogOptions, dialog} from 'electron';
+import {dialog, SaveDialogOptions} from 'electron';
 import * as fs from 'fs-extra';
 import imageType from 'image-type';
 import * as moment from 'moment';

electron/src/lib/openGraph.test.main.ts

@@ -28,7 +28,7 @@ const defaultMessageUtf8 = [72, 101, 108, 108, 111, 32, 102, 114, 111, 109, 32,
 
 const russianMessage = 'Привет из нока!';
 const russianMessageKoi8r = [240, 210, 201, 215, 197, 212, 32, 201, 218, 32, 206, 207, 203, 193, 33];
-/* tslint:disable-next-line */
+// eslint-disable-next-line
 const russianMessageUtf8 = [208, 159, 209, 128, 208, 184, 208, 178, 208, 181, 209, 130, 32, 208, 184, 208, 183, 32, 208, 189, 208, 190, 208, 186, 208, 176, 33];
 
 const contentLimitRequest = (contentType: string, contentArray: number[]) => {

electron/src/lib/openGraph.ts

@@ -18,7 +18,7 @@
  */
 
 import axios, {AxiosRequestConfig, AxiosResponse} from 'axios';
-import {ParsedMediaType, parse as parseContentType} from 'content-type';
+import {parse as parseContentType, ParsedMediaType} from 'content-type';
 import {IncomingMessage} from 'http';
 import {decode as iconvDecode} from 'iconv-lite';
 import {Data as OpenGraphResult, parse as openGraphParse} from 'open-graph';
@@ -205,8 +205,7 @@ export const getOpenGraphDataAsync = async (url: string): Promise<OpenGraphResul
 
     const uri = await fetchImageAsBase64(imageUrl);
     return updateMetaDataWithImage(metadata, uri);
-  } else {
-    delete metadata.image;
-    return metadata;
   }
+  delete metadata.image;
+  return metadata;
 };

electron/src/locale/locale.ts

@@ -19,12 +19,11 @@
 
 import * as Electron from 'electron';
 
+import {i18nLanguageIdentifier, Supportedi18nLanguage, Supportedi18nLanguageObject} from '../interfaces/';
 import {config} from '../settings/config';
 import {settings} from '../settings/ConfigurationPersistence';
 import {SettingsType} from '../settings/SettingsType';
 
-import {Supportedi18nLanguage, Supportedi18nLanguageObject, i18nLanguageIdentifier} from '../interfaces/';
-
 const cs_CZ = require('../../locale/cs-CZ');
 const da_DK = require('../../locale/da-DK');
 const de_DE = require('../../locale/de-DE');
@@ -75,7 +74,7 @@ export const LANGUAGES: Supportedi18nLanguageObject = {
   uk: uk_UA,
 };
 
-/* tslint:disable:object-literal-sort-keys */
+/* eslint-disable */
 export const SUPPORTED_LANGUAGES = {
   en: 'English',
   cs: 'Čeština',
@@ -100,7 +99,7 @@ export const SUPPORTED_LANGUAGES = {
   tr: 'Türkçe',
   uk: 'Українська',
 };
-/* tslint:enable:object-literal-sort-keys */
+/* eslint-enable */
 
 let current: Supportedi18nLanguage | undefined;
 

electron/src/logging/loggerUtils.ts

@@ -25,7 +25,7 @@ import * as path from 'path';
 export const logDir = path.join(app.getPath('userData'), 'logs');
 
 export function getLogFiles(base: string = logDir, absolute: boolean = false): string[] {
-  return globby.sync('**/*.{log,old}', {cwd: base, followSymbolicLinks: false, onlyFiles: true, absolute});
+  return globby.sync('**/*.{log,old}', {absolute, cwd: base, followSymbolicLinks: false, onlyFiles: true});
 }
 
 export async function gatherLogs(): Promise<string> {

electron/src/main.ts

@@ -19,17 +19,17 @@
 
 import {LogFactory, ValidationUtil} from '@wireapp/commons';
 import {
+  app,
   BrowserWindow,
   BrowserWindowConstructorOptions,
   Event as ElectronEvent,
   Filter,
   HeadersReceivedResponse,
+  ipcMain,
   Menu,
   OnHeadersReceivedListenerDetails,
-  WebContents,
-  app,
-  ipcMain,
   shell,
+  WebContents,
 } from 'electron';
 import WindowStateKeeper = require('electron-window-state');
 import fileUrl = require('file-url');
@@ -92,7 +92,7 @@ const BASE_URL = EnvironmentUtil.web.getWebappUrl(argv.env);
 const logger = getLogger(path.basename(__filename));
 
 if (argv.version) {
-  console.log(config.version);
+  console.info(config.version);
   process.exit();
 }
 
@@ -209,7 +209,9 @@ const showMainWindow = async (mainWindowState: WindowStateKeeper.State) => {
       webviewTag: true,
     },
     width: mainWindowState.width,
+    // eslint-disable-next-line
     x: mainWindowState.x,
+    // eslint-disable-next-line
     y: mainWindowState.y,
   };
 

electron/src/menu/TrayHandler.ts

@@ -17,7 +17,7 @@
  *
  */
 
-import {BrowserWindow, Menu, Tray, app, nativeImage} from 'electron';
+import {app, BrowserWindow, Menu, nativeImage, Tray} from 'electron';
 import * as path from 'path';
 
 import * as locale from '../locale/locale';

electron/src/menu/developer.ts

@@ -17,7 +17,7 @@
  *
  */
 
-import {MenuItem, MenuItemConstructorOptions, app, dialog} from 'electron';
+import {app, dialog, MenuItem, MenuItemConstructorOptions} from 'electron';
 import * as openExternal from 'open';
 import * as path from 'path';
 

electron/src/menu/system.ts

@@ -18,21 +18,20 @@
  */
 
 import autoLaunch = require('auto-launch');
-import {Menu, MenuItemConstructorOptions, dialog, globalShortcut, ipcMain, shell} from 'electron';
+import {dialog, globalShortcut, ipcMain, Menu, MenuItemConstructorOptions, shell} from 'electron';
 import * as path from 'path';
 
+import {Supportedi18nLanguage} from '../interfaces/';
 import {EVENT_TYPE} from '../lib/eventType';
 import * as locale from '../locale/locale';
 import {getLogger} from '../logging/getLogger';
+import * as EnvironmentUtil from '../runtime/EnvironmentUtil';
 import * as lifecycle from '../runtime/lifecycle';
 import {config} from '../settings/config';
 import {settings} from '../settings/ConfigurationPersistence';
 import {SettingsType} from '../settings/SettingsType';
 import {WindowManager} from '../window/WindowManager';
 
-import {Supportedi18nLanguage} from '../interfaces/';
-import * as EnvironmentUtil from '../runtime/EnvironmentUtil';
-
 const launchCmd = process.env.APPIMAGE || process.execPath;
 
 const logger = getLogger(path.basename(__filename));
@@ -413,7 +412,7 @@ export const createMenu = (isFullScreen: boolean): Menu => {
       visible: false,
     };
 
-    const switchShortcuts: MenuItemConstructorOptions[] = Array.from({length: config.maximumAccounts}, (_, index) => {
+    const switchShortcuts: MenuItemConstructorOptions[] = Array.from({length: config.maximumAccounts}, (key, index) => {
       const switchAccelerator = `Ctrl+${index + 1}`;
 
       return {
@@ -472,7 +471,7 @@ export const registerGlobalShortcuts = (): void => {
       WindowManager.sendActionToPrimaryWindow(EVENT_TYPE.UI.SYSTEM_MENU, EVENT_TYPE.CONVERSATION.TOGGLE_MUTE),
     );
 
-    Array.from({length: config.maximumAccounts}, (_, index) => {
+    Array.from({length: config.maximumAccounts}, (key, index) => {
       const switchAccelerator = `CmdOrCtrl+${index + 1}`;
       logger.info(`Registering global account switching shortcut "${switchAccelerator}" ...`);
 

electron/src/renderer/menu/context.ts

@@ -17,7 +17,7 @@
  *
  */
 
-import {Menu as ElectronMenu, MenuItemConstructorOptions, clipboard, ipcRenderer, remote} from 'electron';
+import {clipboard, ipcRenderer, Menu as ElectronMenu, MenuItemConstructorOptions, remote} from 'electron';
 const Menu = remote.Menu;
 
 import {EVENT_TYPE} from '../../lib/eventType';
@@ -92,7 +92,7 @@ window.addEventListener(
       const parentElement = element.closest('.message-body') as HTMLDivElement;
       const timeElement = parentElement.getElementsByTagName('time')[0];
       if (timeElement) {
-        const imageTimestamp = timeElement.dataset['timestamp'];
+        const imageTimestamp = timeElement.dataset.timestamp;
         imageMenu.timestamp = imageTimestamp;
       }
       imageMenu.image = elementSource;