typescript: Switch to ES import/export syntax.

Signed-off-by: Anders Kaseorg <anders@zulipchat.com>

app/main/autoupdater.ts

@@ -3,9 +3,9 @@ import { app, dialog, shell } from 'electron';
 import { autoUpdater } from 'electron-updater';
 import { linuxUpdateNotification } from './linuxupdater';	// Required only in case of linux
 
-import log = require('electron-log');
-import isDev = require('electron-is-dev');
-import ConfigUtil = require('../renderer/js/utils/config-util');
+import log from 'electron-log';
+import isDev from 'electron-is-dev';
+import * as ConfigUtil from '../renderer/js/utils/config-util';
 
 export function appUpdater(updateFromMenu = false): void {
 	// Don't initiate auto-updates in development

app/main/index.ts

@@ -3,17 +3,16 @@ import { sentryInit } from '../renderer/js/utils/sentry-util';
 import { appUpdater } from './autoupdater';
 import { setAutoLaunch } from './startup';
 
-import windowStateKeeper = require('electron-window-state');
-import path = require('path');
-import fs = require('fs');
-import isDev = require('electron-is-dev');
-import electron = require('electron');
-const { app, ipcMain, session, dialog } = electron;
+import windowStateKeeper from 'electron-window-state';
+import path from 'path';
+import fs from 'fs';
+import isDev from 'electron-is-dev';
+import electron, { app, ipcMain, session, dialog } from 'electron';
 
-import AppMenu = require('./menu');
-import BadgeSettings = require('../renderer/js/pages/preference/badge-settings');
-import ConfigUtil = require('../renderer/js/utils/config-util');
-import ProxyUtil = require('../renderer/js/utils/proxy-util');
+import * as AppMenu from './menu';
+import * as BadgeSettings from '../renderer/js/pages/preference/badge-settings';
+import * as ConfigUtil from '../renderer/js/utils/config-util';
+import * as ProxyUtil from '../renderer/js/utils/proxy-util';
 
 interface PatchedGlobal extends NodeJS.Global {
 	mainWindowState: windowStateKeeper.State;

app/main/linuxupdater.ts

@@ -1,11 +1,11 @@
 import { app, Notification } from 'electron';
 
-import request = require('request');
-import semver = require('semver');
-import ConfigUtil = require('../renderer/js/utils/config-util');
-import ProxyUtil = require('../renderer/js/utils/proxy-util');
-import LinuxUpdateUtil = require('../renderer/js/utils/linux-update-util');
-import Logger = require('../renderer/js/utils/logger-util');
+import request from 'request';
+import semver from 'semver';
+import * as ConfigUtil from '../renderer/js/utils/config-util';
+import * as ProxyUtil from '../renderer/js/utils/proxy-util';
+import * as LinuxUpdateUtil from '../renderer/js/utils/linux-update-util';
+import Logger from '../renderer/js/utils/logger-util';
 
 const logger = new Logger({
 	file: 'linux-update-util.log',

app/main/menu.ts

@@ -2,13 +2,13 @@
 import { app, shell, BrowserWindow, Menu, dialog } from 'electron';
 import { appUpdater } from './autoupdater';
 
-import AdmZip = require('adm-zip');
-import fs = require('fs-extra');
-import path = require('path');
-import DNDUtil = require('../renderer/js/utils/dnd-util');
-import Logger = require('../renderer/js/utils/logger-util');
-import ConfigUtil = require('../renderer/js/utils/config-util');
-import t = require('../renderer/js/utils/translation-util');
+import AdmZip from 'adm-zip';
+import fs from 'fs-extra';
+import path from 'path';
+import * as DNDUtil from '../renderer/js/utils/dnd-util';
+import Logger from '../renderer/js/utils/logger-util';
+import * as ConfigUtil from '../renderer/js/utils/config-util';
+import * as t from '../renderer/js/utils/translation-util';
 
 const appName = app.name;
 

app/main/startup.ts

@@ -1,9 +1,9 @@
 'use strict';
 import { app } from 'electron';
 
-import AutoLaunch = require('auto-launch');
-import isDev = require('electron-is-dev');
-import ConfigUtil = require('../renderer/js/utils/config-util');
+import AutoLaunch from 'auto-launch';
+import isDev from 'electron-is-dev';
+import * as ConfigUtil from '../renderer/js/utils/config-util';
 
 export const setAutoLaunch = (AutoLaunchValue: boolean): void => {
 	// Don't run this in development

app/renderer/js/components/base.ts

@@ -1,11 +1,9 @@
 'use strict';
 
-class BaseComponent {
+export default class BaseComponent {
 	generateNodeFromTemplate(template: string): Element | null {
 		const wrapper = document.createElement('div');
 		wrapper.innerHTML = template;
 		return wrapper.firstElementChild;
 	}
 }
-
-export = BaseComponent;

app/renderer/js/components/functional-tab.ts

@@ -1,8 +1,8 @@
 'use strict';
 
-import Tab = require('./tab');
+import Tab from './tab';
 
-class FunctionalTab extends Tab {
+export default class FunctionalTab extends Tab {
 	$closeButton: Element;
 	template(): string {
 		return `<div class="tab functional-tab" data-tab-id="${this.props.tabIndex}">
@@ -47,5 +47,3 @@ class FunctionalTab extends Tab {
 		});
 	}
 }
-
-export = FunctionalTab;

app/renderer/js/components/handle-external-link.ts

@@ -1,15 +1,15 @@
 import { ipcRenderer, remote } from 'electron';
 
-import LinkUtil = require('../utils/link-util');
-import DomainUtil = require('../utils/domain-util');
-import ConfigUtil = require('../utils/config-util');
+import * as LinkUtil from '../utils/link-util';
+import * as DomainUtil from '../utils/domain-util';
+import * as ConfigUtil from '../utils/config-util';
 import type WebView from './webview';
 
 const { shell, app } = remote;
 
 const dingSound = new Audio('../resources/sounds/ding.ogg');
 
-function handleExternalLink(this: WebView, event: Electron.NewWindowEvent): void {
+export default function handleExternalLink(this: WebView, event: Electron.NewWindowEvent): void {
 	const { url } = event;
 	const domainPrefix = DomainUtil.getDomain(this.props.index).url;
 	const downloadPath = ConfigUtil.getConfigItem('downloadsPath', `${app.getPath('downloads')}`);
@@ -89,5 +89,3 @@ function handleExternalLink(this: WebView, event: Electron.NewWindowEvent): void
 		shell.openExternal(url);
 	}
 }
-
-export = handleExternalLink;

app/renderer/js/components/server-tab.ts

@@ -2,10 +2,10 @@
 
 import { ipcRenderer } from 'electron';
 
-import Tab = require('./tab');
-import SystemUtil = require('../utils/system-util');
+import Tab from './tab';
+import * as SystemUtil from '../utils/system-util';
 
-class ServerTab extends Tab {
+export default class ServerTab extends Tab {
 	$badge: Element;
 
 	template(): string {
@@ -64,5 +64,3 @@ class ServerTab extends Tab {
 		return shortcutText;
 	}
 }
-
-export = ServerTab;

app/renderer/js/components/tab.ts

@@ -1,14 +1,14 @@
 'use strict';
 
-import WebView = require('./webview');
-import BaseComponent = require('./base');
+import WebView from './webview';
+import BaseComponent from './base';
 
 // TODO: TypeScript - Type annotate props
 interface TabProps {
 	[key: string]: any;
 }
 
-class Tab extends BaseComponent {
+export default class Tab extends BaseComponent {
 	props: TabProps;
 	webview: WebView;
 	$el: Element;
@@ -44,5 +44,3 @@ class Tab extends BaseComponent {
 		this.webview.$el.parentNode.removeChild(this.webview.$el);
 	}
 }
-
-export = Tab;

app/renderer/js/components/webview.ts

@@ -1,12 +1,12 @@
 'use strict';
 import { remote } from 'electron';
 
-import path = require('path');
-import fs = require('fs');
-import ConfigUtil = require('../utils/config-util');
-import SystemUtil = require('../utils/system-util');
-import BaseComponent = require('../components/base');
-import handleExternalLink = require('../components/handle-external-link');
+import path from 'path';
+import fs from 'fs';
+import * as ConfigUtil from '../utils/config-util';
+import * as SystemUtil from '../utils/system-util';
+import BaseComponent from './base';
+import handleExternalLink from './handle-external-link';
 
 const { app, dialog } = remote;
 
@@ -17,7 +17,7 @@ interface WebViewProps {
 	[key: string]: any;
 }
 
-class WebView extends BaseComponent {
+export default class WebView extends BaseComponent {
 	props: any;
 	zoomFactor: number;
 	badgeCount: number;
@@ -301,5 +301,3 @@ class WebView extends BaseComponent {
 		this.$el.send(channel, ...param);
 	}
 }
-
-export = WebView;

app/renderer/js/feedback.ts

@@ -1,8 +1,8 @@
 import { remote } from 'electron';
 import SendFeedback from '@electron-elements/send-feedback';
 
-import path = require('path');
-import fs = require('fs');
+import path from 'path';
+import fs from 'fs';
 
 const { app } = remote;
 

app/renderer/js/main.ts

@@ -3,26 +3,26 @@
 import { ipcRenderer, remote, clipboard, shell } from 'electron';
 import { feedbackHolder } from './feedback';
 
-import path = require('path');
-import escape = require('escape-html');
-import isDev = require('electron-is-dev');
+import path from 'path';
+import escape from 'escape-html';
+import isDev from 'electron-is-dev';
 const { session, app, Menu, dialog } = remote;
 
 // eslint-disable-next-line import/no-unassigned-import
-require('./tray');
+import './tray';
 
-import DomainUtil = require('./utils/domain-util');
-import WebView = require('./components/webview');
-import ServerTab = require('./components/server-tab');
-import FunctionalTab = require('./components/functional-tab');
-import ConfigUtil = require('./utils/config-util');
-import DNDUtil = require('./utils/dnd-util');
-import ReconnectUtil = require('./utils/reconnect-util');
-import Logger = require('./utils/logger-util');
-import CommonUtil = require('./utils/common-util');
-import EnterpriseUtil = require('./utils/enterprise-util');
-import AuthUtil = require('./utils/auth-util');
-import Messages = require('./../../resources/messages');
+import * as DomainUtil from './utils/domain-util';
+import WebView from './components/webview';
+import ServerTab from './components/server-tab';
+import FunctionalTab from './components/functional-tab';
+import * as ConfigUtil from './utils/config-util';
+import * as DNDUtil from './utils/dnd-util';
+import ReconnectUtil from './utils/reconnect-util';
+import Logger from './utils/logger-util';
+import * as CommonUtil from './utils/common-util';
+import * as EnterpriseUtil from './utils/enterprise-util';
+import * as AuthUtil from './utils/auth-util';
+import * as Messages from '../../resources/messages';
 
 interface FunctionalTabProps {
 	name: string;

app/renderer/js/notification/darwin-notifications.ts

@@ -4,9 +4,9 @@ import {
 	appId, customReply, focusCurrentServer, parseReply, setupReply
 } from './helpers';
 
-import url = require('url');
-import MacNotifier = require('node-mac-notifier');
-import ConfigUtil = require('../utils/config-util');
+import url from 'url';
+import MacNotifier from 'node-mac-notifier';
+import * as ConfigUtil from '../utils/config-util';
 
 type ReplyHandler = (response: string) => void;
 type ClickHandler = () => void;

app/renderer/js/notification/default-notification.ts

@@ -3,10 +3,10 @@
 import { ipcRenderer } from 'electron';
 import { focusCurrentServer } from './helpers';
 
-import ConfigUtil = require('../utils/config-util');
+import * as ConfigUtil from '../utils/config-util';
 
 const NativeNotification = window.Notification;
-class BaseNotification extends NativeNotification {
+export default class BaseNotification extends NativeNotification {
 	constructor(title: string, opts: NotificationOptions) {
 		opts.silent = true;
 		super(title, opts);
@@ -28,5 +28,3 @@ class BaseNotification extends NativeNotification {
 		return ConfigUtil.getConfigItem('showNotification') ? 'granted' : 'denied';
 	}
 }
-
-export = BaseNotification;

app/renderer/js/notification/helpers.ts

@@ -1,6 +1,6 @@
 import { remote } from 'electron';
 
-import Logger = require('../utils/logger-util');
+import Logger from '../utils/logger-util';
 
 const logger = new Logger({
 	file: 'errors.log',

app/renderer/js/notification/index.ts

@@ -4,7 +4,7 @@ import { remote } from 'electron';
 import * as params from '../utils/params-util';
 import { appId, loadBots } from './helpers';
 
-import DefaultNotification = require('./default-notification');
+import DefaultNotification from './default-notification';
 const { app } = remote;
 
 // From https://github.com/felixrieseberg/electron-windows-notifications#appusermodelid

app/renderer/js/pages/preference/add-certificate.ts

@@ -2,15 +2,15 @@
 
 import { remote, OpenDialogOptions } from 'electron';
 
-import path = require('path');
-import BaseComponent = require('../../components/base');
-import CertificateUtil = require('../../utils/certificate-util');
-import DomainUtil = require('../../utils/domain-util');
-import t = require('../../utils/translation-util');
+import path from 'path';
+import BaseComponent from '../../components/base';
+import * as CertificateUtil from '../../utils/certificate-util';
+import * as DomainUtil from '../../utils/domain-util';
+import * as t from '../../utils/translation-util';
 
 const { dialog } = remote;
 
-class AddCertificate extends BaseComponent {
+export default class AddCertificate extends BaseComponent {
 	// TODO: TypeScript - Here props should be object type
 	props: any;
 	_certFile: string;
@@ -93,5 +93,3 @@ class AddCertificate extends BaseComponent {
 		});
 	}
 }
-
-export = AddCertificate;

app/renderer/js/pages/preference/badge-settings.ts

@@ -1,8 +1,7 @@
 'use strict';
-import { app } from 'electron';
+import electron, { app } from 'electron';
 
-import electron = require('electron');
-import ConfigUtil = require('../../utils/config-util');
+import * as ConfigUtil from '../../utils/config-util';
 
 function showBadgeCount(messageCount: number, mainWindow: electron.BrowserWindow): void {
 	if (process.platform === 'win32') {

app/renderer/js/pages/preference/base-section.ts

@@ -2,9 +2,9 @@
 
 import { ipcRenderer } from 'electron';
 
-import BaseComponent = require('../../components/base');
+import BaseComponent from '../../components/base';
 
-class BaseSection extends BaseComponent {
+export default class BaseSection extends BaseComponent {
 	// TODO: TypeScript - Here props should be object type
 	generateSettingOption(props: any): void {
 		const {$element, disabled, value, clickHandler} = props;
@@ -46,5 +46,3 @@ class BaseSection extends BaseComponent {
 		ipcRenderer.send('forward-message', 'reload-viewer');
 	}
 }
-
-export = BaseSection;

app/renderer/js/pages/preference/connected-org-section.ts

@@ -2,14 +2,14 @@
 
 import { ipcRenderer } from 'electron';
 
-import BaseSection = require('./base-section');
-import DomainUtil = require('../../utils/domain-util');
-import ServerInfoForm = require('./server-info-form');
-import AddCertificate = require('./add-certificate');
-import FindAccounts = require('./find-accounts');
-import t = require('../../utils/translation-util');
+import BaseSection from './base-section';
+import * as DomainUtil from '../../utils/domain-util';
+import ServerInfoForm from './server-info-form';
+import AddCertificate from './add-certificate';
+import FindAccounts from './find-accounts';
+import * as t from '../../utils/translation-util';
 
-class ConnectedOrgSection extends BaseSection {
+export default class ConnectedOrgSection extends BaseSection {
 	// TODO: TypeScript - Here props should be object type
 	props: any;
 	$serverInfoContainer: Element | null;
@@ -86,5 +86,3 @@ class ConnectedOrgSection extends BaseSection {
 		}).init();
 	}
 }
-
-export = ConnectedOrgSection;

app/renderer/js/pages/preference/find-accounts.ts

@@ -2,10 +2,10 @@
 
 import { shell } from 'electron';
 
-import BaseComponent = require('../../components/base');
-import t = require('../../utils/translation-util');
+import BaseComponent from '../../components/base';
+import * as t from '../../utils/translation-util';
 
-class FindAccounts extends BaseComponent {
+export default class FindAccounts extends BaseComponent {
 	// TODO: TypeScript - Here props should be object type
 	props: any;
 	$findAccounts: Element | null;
@@ -74,5 +74,3 @@ class FindAccounts extends BaseComponent {
 		});
 	}
 }
-
-export = FindAccounts;

app/renderer/js/pages/preference/general-section.ts

@@ -1,18 +1,18 @@
 'use strict';
 import { ipcRenderer, remote, OpenDialogOptions } from 'electron';
 
-import path = require('path');
-import fs = require('fs-extra');
+import path from 'path';
+import fs from 'fs-extra';
 
 const { app, dialog } = remote;
 const currentBrowserWindow = remote.getCurrentWindow();
 
-import BaseSection = require('./base-section');
-import ConfigUtil = require('../../utils/config-util');
-import EnterpriseUtil = require('./../../utils/enterprise-util');
-import t = require('../../utils/translation-util');
+import BaseSection from './base-section';
+import * as ConfigUtil from '../../utils/config-util';
+import * as EnterpriseUtil from '../../utils/enterprise-util';
+import * as t from '../../utils/translation-util';
 
-class GeneralSection extends BaseSection {
+export default class GeneralSection extends BaseSection {
 	// TODO: TypeScript - Here props should be object type
 	props: any;
 	constructor(props: any) {
@@ -498,5 +498,3 @@ class GeneralSection extends BaseSection {
 		});
 	}
 }
-
-export = GeneralSection;

app/renderer/js/pages/preference/nav.ts

@@ -1,9 +1,9 @@
 'use strict';
 
-import BaseComponent = require('../../components/base');
-import t = require('../../utils/translation-util');
+import BaseComponent from '../../components/base';
+import * as t from '../../utils/translation-util';
 
-class PreferenceNav extends BaseComponent {
+export default class PreferenceNav extends BaseComponent {
 	// TODO: TypeScript - Here props should be object type
 	props: any;
 	navItems: string[];
@@ -64,5 +64,3 @@ class PreferenceNav extends BaseComponent {
 		$item.classList.remove('active');
 	}
 }
-
-export = PreferenceNav;

app/renderer/js/pages/preference/network-section.ts

@@ -2,11 +2,11 @@
 
 import { ipcRenderer } from 'electron';
 
-import BaseSection = require('./base-section');
-import ConfigUtil = require('../../utils/config-util');
-import t = require('../../utils/translation-util');
+import BaseSection from './base-section';
+import * as ConfigUtil from '../../utils/config-util';
+import * as t from '../../utils/translation-util';
 
-class NetworkSection extends BaseSection {
+export default class NetworkSection extends BaseSection {
 	// TODO: TypeScript - Here props should be object type
 	props: any;
 	$proxyPAC: HTMLInputElement;
@@ -132,5 +132,3 @@ class NetworkSection extends BaseSection {
 		});
 	}
 }
-
-export = NetworkSection;

app/renderer/js/pages/preference/new-server-form.ts

@@ -2,11 +2,11 @@
 
 import { shell, ipcRenderer } from 'electron';
 
-import BaseComponent = require('../../components/base');
-import DomainUtil = require('../../utils/domain-util');
-import t = require('../../utils/translation-util');
+import BaseComponent from '../../components/base';
+import * as DomainUtil from '../../utils/domain-util';
+import * as t from '../../utils/translation-util';
 
-class NewServerForm extends BaseComponent {
+export default class NewServerForm extends BaseComponent {
 	// TODO: TypeScript - Here props should be object type
 	props: any;
 	$newServerForm: Element;
@@ -99,5 +99,3 @@ class NewServerForm extends BaseComponent {
 		this.networkSettingsLink();
 	}
 }
-
-export = NewServerForm;

app/renderer/js/pages/preference/preference.ts

@@ -2,17 +2,17 @@
 
 import { ipcRenderer } from 'electron';
 
-import BaseComponent = require('../../components/base');
-import Nav = require('./nav');
-import ServersSection = require('./servers-section');
-import GeneralSection = require('./general-section');
-import NetworkSection = require('./network-section');
-import ConnectedOrgSection = require('./connected-org-section');
-import ShortcutsSection = require('./shortcuts-section');
+import BaseComponent from '../../components/base';
+import Nav from './nav';
+import ServersSection from './servers-section';
+import GeneralSection from './general-section';
+import NetworkSection from './network-section';
+import ConnectedOrgSection from './connected-org-section';
+import ShortcutsSection from './shortcuts-section';
 
 type Section = ServersSection | GeneralSection | NetworkSection | ConnectedOrgSection | ShortcutsSection;
 
-class PreferenceView extends BaseComponent {
+export default class PreferenceView extends BaseComponent {
 	$sidebarContainer: Element;
 	$settingsContainer: Element;
 	nav: Nav;
@@ -122,5 +122,3 @@ window.addEventListener('load', () => {
 	const preferenceView = new PreferenceView();
 	preferenceView.init();
 });
-
-export = PreferenceView;

app/renderer/js/pages/preference/server-info-form.ts

@@ -2,14 +2,14 @@
 
 import { remote, ipcRenderer } from 'electron';
 
-import BaseComponent = require('../../components/base');
-import DomainUtil = require('../../utils/domain-util');
-import Messages = require('./../../../../resources/messages');
-import t = require('../../utils/translation-util');
+import BaseComponent from '../../components/base';
+import * as DomainUtil from '../../utils/domain-util';
+import * as Messages from '../../../../resources/messages';
+import * as t from '../../utils/translation-util';
 
 const { dialog } = remote;
 
-class ServerInfoForm extends BaseComponent {
+export default class ServerInfoForm extends BaseComponent {
 	// TODO: TypeScript - Here props should be object type
 	props: any;
 	$serverInfoForm: Element;
@@ -91,5 +91,3 @@ class ServerInfoForm extends BaseComponent {
 		});
 	}
 }
-
-export = ServerInfoForm;

app/renderer/js/pages/preference/servers-section.ts

@@ -1,10 +1,10 @@
 'use strict';
 
-import BaseSection = require('./base-section');
-import NewServerForm = require('./new-server-form');
-import t = require('../../utils/translation-util');
+import BaseSection from './base-section';
+import NewServerForm from './new-server-form';
+import * as t from '../../utils/translation-util';
 
-class ServersSection extends BaseSection {
+export default class ServersSection extends BaseSection {
 	// TODO: TypeScript - Here props should be object type
 	props: any;
 	$newServerContainer: Element;
@@ -46,5 +46,3 @@ class ServersSection extends BaseSection {
 		}).init();
 	}
 }
-
-export = ServersSection;

app/renderer/js/pages/preference/shortcuts-section.ts

@@ -2,10 +2,10 @@
 
 import { shell } from 'electron';
 
-import BaseSection = require('./base-section');
-import t = require('../../utils/translation-util');
+import BaseSection from './base-section';
+import * as t from '../../utils/translation-util';
 
-class ShortcutsSection extends BaseSection {
+export default class ShortcutsSection extends BaseSection {
 	// TODO: TypeScript - Here props should be object type
 	props: any;
 	constructor(props: any) {
@@ -341,5 +341,3 @@ class ShortcutsSection extends BaseSection {
 		this.openHotkeysExternalLink();
 	}
 }
-
-export = ShortcutsSection;

app/renderer/js/preload.ts

@@ -3,13 +3,13 @@
 import { ipcRenderer, shell } from 'electron';
 import * as SetupSpellChecker from './spellchecker';
 
-import isDev = require('electron-is-dev');
-import LinkUtil = require('./utils/link-util');
-import params = require('./utils/params-util');
-import AuthUtil = require('./utils/auth-util');
-import ConfigUtil = require('./utils/config-util');
+import isDev from 'electron-is-dev';
+import * as LinkUtil from './utils/link-util';
+import * as params from './utils/params-util';
+import * as AuthUtil from './utils/auth-util';
+import * as ConfigUtil from './utils/config-util';
 
-import NetworkError = require('./pages/network');
+import * as NetworkError from './pages/network';
 
 interface PatchedGlobal extends NodeJS.Global {
 	logout: () => void;
@@ -20,14 +20,16 @@ interface PatchedGlobal extends NodeJS.Global {
 const globalPatched = global as PatchedGlobal;
 
 // eslint-disable-next-line import/no-unassigned-import
-require('./notification');
+import './notification';
 
 // Prevent drag and drop event in main process which prevents remote code executaion
-require(__dirname + '/shared/preventdrag.js');
+// eslint-disable-next-line import/no-unassigned-import
+import './shared/preventdrag';
 
 declare let window: ZulipWebWindow;
 
-window.electron_bridge = require('./electron-bridge');
+import electron_bridge from './electron-bridge';
+window.electron_bridge = electron_bridge;
 
 const logout = (): void => {
 	// Create the menu for the below

app/renderer/js/shared/preventdrag.ts

@@ -1,5 +1,3 @@
-'use strict';
-
 // This is a security fix. Following function prevents drag and drop event in the app
 // so that attackers can't execute any remote code within the app
 // It doesn't affect the compose box so that users can still
@@ -15,3 +13,5 @@ const preventDragAndDrop = (): void => {
 };
 
 preventDragAndDrop();
+
+export {};

app/renderer/js/spellchecker.ts

@@ -3,8 +3,8 @@
 import type { Subject } from 'rxjs';
 import { SpellCheckHandler, ContextMenuListener, ContextMenuBuilder } from 'electron-spellchecker';
 
-import ConfigUtil = require('./utils/config-util');
-import Logger = require('./utils/logger-util');
+import * as ConfigUtil from './utils/config-util';
+import Logger from './utils/logger-util';
 
 declare module 'electron-spellchecker' {
 	interface SpellCheckHandler {

app/renderer/js/tray.ts

@@ -1,8 +1,8 @@
 'use strict';
 import { ipcRenderer, remote, WebviewTag, NativeImage } from 'electron';
 
-import path = require('path');
-import ConfigUtil = require('./utils/config-util.js');
+import path from 'path';
+import * as ConfigUtil from './utils/config-util';
 
 const { Tray, Menu, nativeImage, BrowserWindow, systemPreferences } = remote;
 
@@ -214,3 +214,5 @@ ipcRenderer.on('toggletray', toggleTray);
 if (ConfigUtil.getConfigItem('trayIcon', true)) {
 	createTray();
 }
+
+export {};

app/renderer/js/utils/auth-util.ts

@@ -1,7 +1,7 @@
 import { remote } from 'electron';
 
-import cryptoRandomString = require('crypto-random-string');
-import ConfigUtil = require('./config-util');
+import cryptoRandomString from 'crypto-random-string';
+import * as ConfigUtil from './config-util';
 
 const { shell } = remote;
 

app/renderer/js/utils/certificate-util.ts

@@ -4,9 +4,9 @@ import { remote } from 'electron';
 import { JsonDB } from 'node-json-db';
 import { initSetUp } from './default-util';
 
-import fs = require('fs');
-import path = require('path');
-import Logger = require('./logger-util');
+import fs from 'fs';
+import path from 'path';
+import Logger from './logger-util';
 
 const { app, dialog } = remote;
 

app/renderer/js/utils/config-util.ts

@@ -1,11 +1,11 @@
 'use strict';
 import { JsonDB } from 'node-json-db';
 
-import fs = require('fs');
-import path = require('path');
-import electron = require('electron');
-import Logger = require('./logger-util');
-import EnterpriseUtil = require('./enterprise-util');
+import fs from 'fs';
+import path from 'path';
+import electron from 'electron';
+import Logger from './logger-util';
+import * as EnterpriseUtil from './enterprise-util';
 
 const logger = new Logger({
 	file: 'config-util.log',

app/renderer/js/utils/default-util.ts

@@ -1,11 +1,12 @@
-import fs = require('fs');
+import electron from 'electron';
+import fs from 'fs';
 
 let app: Electron.App = null;
 let setupCompleted = false;
 if (process.type === 'renderer') {
-	app = require('electron').remote.app;
+	app = electron.remote.app;
 } else {
-	app = require('electron').app;
+	app = electron.app;
 }
 
 const zulipDir = app.getPath('userData');

app/renderer/js/utils/dnd-util.ts

@@ -1,6 +1,6 @@
 'use strict';
 
-import ConfigUtil = require('./config-util');
+import * as ConfigUtil from './config-util';
 
 // TODO: TypeScript - add to Setting interface
 // the list of settings since we have fixed amount of them

app/renderer/js/utils/domain-util.ts

@@ -1,19 +1,18 @@
 'use strict';
 import { JsonDB } from 'node-json-db';
 
-import escape = require('escape-html');
-import request = require('request');
-import fs = require('fs');
-import path = require('path');
-import Logger = require('./logger-util');
-import electron = require('electron');
+import escape from 'escape-html';
+import request from 'request';
+import fs from 'fs';
+import path from 'path';
+import Logger from './logger-util';
+import { ipcRenderer, remote } from 'electron';
 
-import RequestUtil = require('./request-util');
-import EnterpriseUtil = require('./enterprise-util');
-import Messages = require('../../../resources/messages');
+import * as RequestUtil from './request-util';
+import * as EnterpriseUtil from './enterprise-util';
+import * as Messages from '../../../resources/messages';
 
-const { ipcRenderer } = electron;
-const { app, dialog } = electron.remote;
+const { app, dialog } = remote;
 
 interface ServerConf {
 	url: string;

app/renderer/js/utils/enterprise-util.ts

@@ -1,7 +1,7 @@
-import fs = require('fs');
-import path = require('path');
+import fs from 'fs';
+import path from 'path';
 
-import Logger = require('./logger-util');
+import Logger from './logger-util';
 
 const logger = new Logger({
 	file: 'enterprise-util.log',

app/renderer/js/utils/link-util.ts

@@ -1,7 +1,7 @@
 'use strict';
 
 // TODO: TypeScript - Add @types/
-import wurl = require('wurl');
+import wurl from 'wurl';
 
 interface IsInternalResponse {
 	isInternalUrl: boolean;

app/renderer/js/utils/linux-update-util.ts

@@ -1,10 +1,10 @@
 'use strict';
 import { JsonDB } from 'node-json-db';
 
-import fs = require('fs');
-import path = require('path');
-import electron = require('electron');
-import Logger = require('./logger-util');
+import fs from 'fs';
+import path from 'path';
+import electron from 'electron';
+import Logger from './logger-util';
 
 const remote =
 	process.type === 'renderer' ? electron.remote : electron;

app/renderer/js/utils/logger-util.ts

@@ -2,10 +2,10 @@ import { Console as NodeConsole } from 'console'; // eslint-disable-line node/pr
 import { initSetUp } from './default-util';
 import { sentryInit, captureException } from './sentry-util';
 
-import fs = require('fs');
-import os = require('os');
-import isDev = require('electron-is-dev');
-import electron = require('electron');
+import fs from 'fs';
+import os from 'os';
+import isDev from 'electron-is-dev';
+import electron from 'electron';
 // this interface adds [key: string]: any so
 // we can do console[type] later on in the code
 interface PatchedConsole extends Console {
@@ -44,7 +44,7 @@ if (process.type === 'renderer') {
 const browserConsole: PatchedConsole = console;
 const logDir = `${app.getPath('userData')}/Logs`;
 
-class Logger {
+export default class Logger {
 	nodeConsole: PatchedConsole;
 	timestamp?: () => string;
 	level: boolean;
@@ -151,5 +151,3 @@ class Logger {
 		});
 	}
 }
-
-export = Logger;

app/renderer/js/utils/proxy-util.ts

@@ -1,8 +1,8 @@
 'use strict';
 
-import url = require('url');
+import url from 'url';
 
-import ConfigUtil = require('./config-util');
+import * as ConfigUtil from './config-util';
 
 export interface ProxyRule {
 	hostname?: string;

app/renderer/js/utils/reconnect-util.ts

@@ -1,18 +1,18 @@
 import { ipcRenderer } from 'electron';
 
 import type WebView from '../components/webview';
-import backoff = require('backoff');
-import request = require('request');
-import Logger = require('./logger-util');
-import RequestUtil = require('./request-util');
-import DomainUtil = require('./domain-util');
+import backoff from 'backoff';
+import request from 'request';
+import Logger from './logger-util';
+import * as RequestUtil from './request-util';
+import * as DomainUtil from './domain-util';
 
 const logger = new Logger({
 	file: 'domain-util.log',
 	timestamp: true
 });
 
-class ReconnectUtil {
+export default class ReconnectUtil {
 	webview: WebView;
 	url: string;
 	alreadyReloaded: boolean;
@@ -86,5 +86,3 @@ class ReconnectUtil {
 		return false;
 	}
 }
-
-export = ReconnectUtil;

app/renderer/js/utils/request-util.ts

@@ -1,12 +1,12 @@
 import { remote } from 'electron';
 
-import fs = require('fs');
-import path = require('path');
-import ConfigUtil = require('./config-util');
-import Logger = require('./logger-util');
-import ProxyUtil = require('./proxy-util');
-import CertificateUtil = require('./certificate-util');
-import SystemUtil = require('./system-util');
+import fs from 'fs';
+import path from 'path';
+import * as ConfigUtil from './config-util';
+import Logger from './logger-util';
+import * as ProxyUtil from './proxy-util';
+import * as CertificateUtil from './certificate-util';
+import * as SystemUtil from './system-util';
 
 const { app } = remote;
 

app/renderer/js/utils/sentry-util.ts

@@ -1,6 +1,6 @@
 import { init } from '@sentry/electron';
 
-import isDev = require('electron-is-dev');
+import isDev from 'electron-is-dev';
 
 export const sentryInit = (): void => {
 	if (!isDev) {

app/renderer/js/utils/system-util.ts

@@ -1,8 +1,8 @@
 'use strict';
 import { remote } from 'electron';
 
-import os = require('os');
-import ConfigUtil = require('./config-util');
+import os from 'os';
+import * as ConfigUtil from './config-util';
 
 const { app } = remote;
 

app/renderer/js/utils/translation-util.ts

@@ -1,8 +1,8 @@
 'use strict';
 
-import path = require('path');
-import electron = require('electron');
-import i18n = require('i18n');
+import path from 'path';
+import electron from 'electron';
+import i18n from 'i18n';
 
 let app: Electron.App = null;