ci fixes

Bump node-gyp from 5.0.0 to 5.0.2

.all-contributorsrc

@@ -135,6 +135,33 @@
         "code",
         "design"
       ]
+    },
+    {
+      "login": "NieLeben",
+      "name": "Tilmann Meyer",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/47182955?v=4",
+      "profile": "https://github.com/NieLeben",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "PMExtra",
+      "name": "PM Extra",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/11289158?v=4",
+      "profile": "http://www.jubeat.net",
+      "contributions": [
+        "bug"
+      ]
+    },
+    {
+      "login": "IgnusG",
+      "name": "Jonathan",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/6438760?v=4",
+      "profile": "https://jjuhas.keybase.pub//",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.eslintrc.yml

@@ -0,0 +1,82 @@
+parser: '@typescript-eslint/parser'
+parserOptions:
+  project: tsconfig.json
+extends:
+  - 'plugin:@typescript-eslint/all'
+plugins:
+  - '@typescript-eslint'
+env:
+  browser: true
+  es6: true
+  node: true
+  commonjs: true
+rules:
+  '@typescript-eslint/semi':
+  - error
+  - never
+  '@typescript-eslint/indent':
+  - error
+  - 4
+  '@typescript-eslint/explicit-member-accessibility':
+  - error
+  - accessibility: no-public
+    overrides:
+      parameterProperties: explicit
+  '@typescript-eslint/no-require-imports': off
+  '@typescript-eslint/no-parameter-properties': off
+  '@typescript-eslint/explicit-function-return-type': off
+  '@typescript-eslint/no-explicit-any': off
+  '@typescript-eslint/no-magic-numbers': off
+  '@typescript-eslint/member-delimiter-style': off
+  '@typescript-eslint/promise-function-async': off
+  '@typescript-eslint/no-unnecessary-type-assertion': off
+  '@typescript-eslint/require-array-sort-compare': off
+  '@typescript-eslint/no-use-before-define':
+  - error
+  - classes: false
+  no-duplicate-imports: error
+  array-bracket-spacing:
+  - error
+  - never
+  block-scoped-var: error
+  brace-style:
+  - error
+  - 1tbs
+  - allowSingleLine: true
+  computed-property-spacing:
+  - error
+  - never
+  comma-dangle:
+  - error
+  - always-multiline
+  curly: error
+  eol-last: error
+  eqeqeq:
+  - error
+  - smart
+  linebreak-style:
+  - error
+  - unix
+  max-depth:
+  - 1
+  - 5
+  max-statements:
+  - 1
+  - 80
+  no-multiple-empty-lines: error
+  no-mixed-spaces-and-tabs: error
+  no-trailing-spaces: error
+  '@typescript-eslint/no-unused-vars':
+    - error
+    - vars: all
+      args: after-used
+      argsIgnorePattern: ^_
+  no-undef: error
+  object-curly-spacing:
+  - error
+  - always
+  quote-props:
+  - warn
+  - as-needed
+  - keywords: true
+    numbers: true

.gitignore

@@ -23,3 +23,4 @@ yarn-error.log
 
 docs/api
 .travis.ssh.key
+*.code-workspace

.travis.yml

@@ -9,14 +9,15 @@ stages:
 jobs:
   include:
     - stage: 'Build'
+      if: branch = xxx
       os: linux
       before_install:
         - set -e
-        - yarn
         - rm app/node_modules/.yarn-integrity || true
-        - scripts/install-deps.js
+        - yarn
       script:
         - set -e
+        - python -c "import fcntl; fcntl.fcntl(1, fcntl.F_SETFL, 0)" # https://github.com/travis-ci/travis-ci/issues/8920
         - scripts/build-native.js
         - yarn run build:typings
         - yarn run build
@@ -39,6 +40,7 @@ jobs:
 
     - stage: 'Docs'
       os: linux
+      if: branch = master
       script:
         - set -e
         - openssl aes-256-cbc -K $encrypted_4e2fb4889ef8_key -iv $encrypted_4e2fb4889ef8_iv -in .travis.ssh.key.enc -out .travis.ssh.key -d
@@ -65,8 +67,7 @@ addons:
 
 cache:
   directories:
-  - node_modules
-  - '*/node_modules'
+  - 'terminus-*/node_modules'
   - $HOME/.cache/yarn
   - $HOME/.cache/electron
   - $HOME/.cache/electron-builder

HACKING.md

@@ -92,11 +92,11 @@ Plugins provide functionality by exporting singular or multi providers:
 
 ```javascript
 import { NgModule, Injectable } from '@angular/core'
-import { ToolbarButtonProvider, IToolbarButton } from 'terminus-core'
+import { ToolbarButtonProvider, ToolbarButton } from 'terminus-core'
 
 @Injectable()
 export class MyButtonProvider extends ToolbarButtonProvider {
-    provide (): IToolbarButton[] {
+    provide (): ToolbarButton[] {
         return [{
             icon: 'star',
             title: 'Foobar',

app/lib/app.ts

@@ -19,8 +19,12 @@ export class Application {
         }
 
         app.commandLine.appendSwitch('disable-http-cache')
-        app.commandLine.appendSwitch('force_discrete_gpu', '0')
         app.commandLine.appendSwitch('lang', 'EN')
+
+        for (const flag of configData.flags || [['force_discrete_gpu', '0']]) {
+            console.log('Setting Electron flag:', flag.join('='))
+            app.commandLine.appendSwitch(flag[0], flag[1])
+        }
     }
 
     init () {

app/lib/cli.ts

@@ -41,6 +41,5 @@ export function parseArgs (argv, cwd) {
             type: 'boolean'
         })
         .help('help')
-        .strict()
         .parse(argv.slice(1))
 }

app/lib/window.ts

@@ -1,6 +1,6 @@
 import { Subject, Observable } from 'rxjs'
 import { debounceTime } from 'rxjs/operators'
-import { BrowserWindow, app, ipcMain, Rectangle } from 'electron'
+import { BrowserWindow, app, ipcMain, Rectangle, screen } from 'electron'
 import ElectronConfig = require('electron-config')
 import * as os from 'os'
 
@@ -51,7 +51,19 @@ export class Window {
             show: false,
             backgroundColor: '#00000000'
         }
-        Object.assign(bwOptions, this.windowBounds)
+
+        if (this.windowBounds) {
+            Object.assign(bwOptions, this.windowBounds)
+            const closestDisplay = screen.getDisplayNearestPoint( {x: this.windowBounds.x, y: this.windowBounds.y} )
+
+            const [left1, top1, right1, bottom1] = [this.windowBounds.x, this.windowBounds.y, this.windowBounds.x + this.windowBounds.width, this.windowBounds.y + this.windowBounds.height];
+            const [left2, top2, right2, bottom2] = [closestDisplay.bounds.x, closestDisplay.bounds.y, closestDisplay.bounds.x + closestDisplay.bounds.width, closestDisplay.bounds.y + closestDisplay.bounds.height];
+
+            if ((left2 > right1 || right2 < left1 || top2 > bottom1 || bottom2 < top1) && !maximized) {
+                bwOptions.x = closestDisplay.bounds.width / 2 - bwOptions.width / 2;
+                bwOptions.y = closestDisplay.bounds.height / 2 - bwOptions.height / 2;
+            }
+        }
 
         if ((configData.appearance || {}).frame === 'native') {
             bwOptions.frame = true
@@ -82,6 +94,7 @@ export class Window {
                 this.window.focus()
             }
         })
+
         this.window.loadURL(`file://${app.getAppPath()}/dist/index.html?${this.window.id}`, { extraHeaders: 'pragma: no-cache\n' })
 
         if (process.platform !== 'darwin') {

app/package.json

@@ -22,13 +22,16 @@
     "@angular/platform-browser-dynamic": "7.2.8",
     "@ng-bootstrap/ng-bootstrap": "^4.2.0",
     "devtron": "1.4.0",
+    "fontmanager-redux": "0.3.2",
     "electron-config": "2.0.0",
-    "electron-debug": "^3.0.0",
+    "electron-debug": "^3.0.1",
     "electron-is-dev": "1.1.0",
     "electron-updater": "^4.0.6",
     "js-yaml": "3.13.1",
+    "keytar": "^4.7.0",
     "mz": "^2.7.0",
-    "ngx-toastr": "^9.1.1",
+    "ngx-toastr": "^10.0.4",
+    "node-pty": "^0.9.0-beta18",
     "npm": "~6.9.0",
     "path": "0.12.7",
     "rxjs": "^6.5.2",
@@ -37,7 +40,10 @@
     "zone.js": "^0.8.29"
   },
   "optionalDependencies": {
+    "@terminus-term/windows-process-tree": "^0.2.4",
+    "macos-native-processlist": "^1.0.1",
     "windows-blurbehind": "^1.0.1",
+    "windows-native-registry": "^1.0.14",
     "windows-swca": "^2.0.2"
   },
   "devDependencies": {

app/src/app.module.ts

@@ -4,18 +4,19 @@ import { NgbModule } from '@ng-bootstrap/ng-bootstrap'
 import { ToastrModule } from 'ngx-toastr'
 
 export function getRootModule (plugins: any[]) {
-    let imports = [
+    const imports = [
         BrowserModule,
         ...plugins,
         NgbModule.forRoot(),
         ToastrModule.forRoot({
             positionClass: 'toast-bottom-center',
+            toastClass: 'toast',
             preventDuplicates: true,
             extendedTimeOut: 5000,
         }),
     ]
-    let bootstrap = [
-        ...(plugins.filter(x => x.bootstrap).map(x => x.bootstrap)),
+    const bootstrap = [
+        ...plugins.filter(x => x.bootstrap).map(x => x.bootstrap),
     ]
 
     if (bootstrap.length === 0) {
@@ -25,7 +26,7 @@ export function getRootModule (plugins: any[]) {
     @NgModule({
         imports,
         bootstrap,
-    }) class RootModule { }
+    }) class RootModule { } // eslint-disable-line @typescript-eslint/no-extraneous-class
 
     return RootModule
 }

app/src/entry.preload.ts

@@ -16,20 +16,20 @@ Raven.config(
     {
         release: require('electron').remote.app.getVersion(),
         dataCallback: (data: any) => {
-            const normalize = (filename) => {
-                let splitArray = filename.split('/')
+            const normalize = (filename: string) => {
+                const splitArray = filename.split('/')
                 return splitArray[splitArray.length - 1]
             }
 
-            data.exception.values[0].stacktrace.frames.forEach(frame => {
+            data.exception.values[0].stacktrace.frames.forEach((frame: any) => {
                 frame.filename = normalize(frame.filename)
             })
 
             data.culprit = data.exception.values[0].stacktrace.frames[0].filename
 
             return data
-        }
-    }
+        },
+    },
 )
 
 process.on('uncaughtException' as any, (err) => {

app/src/entry.ts

@@ -2,19 +2,19 @@ import 'zone.js'
 import 'core-js/proposals/reflect-metadata'
 import 'rxjs'
 
-import isDev = require('electron-is-dev')
+import * as isDev from 'electron-is-dev'
 
 import './global.scss'
 import './toastr.scss'
 
-// Always land on the start view
-location.hash = ''
-
 import { enableProdMode, NgModuleRef } from '@angular/core'
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'
 
 import { getRootModule } from './app.module'
-import { findPlugins, loadPlugins, IPluginInfo } from './plugins'
+import { findPlugins, loadPlugins, PluginInfo } from './plugins'
+
+// Always land on the start view
+location.hash = ''
 
 ;(process as any).enablePromiseAPI = true
 
@@ -28,14 +28,14 @@ if (isDev) {
     enableProdMode()
 }
 
-async function bootstrap (plugins: IPluginInfo[], safeMode = false): Promise<NgModuleRef<any>> {
+async function bootstrap (plugins: PluginInfo[], safeMode = false): Promise<NgModuleRef<any>> {
     if (safeMode) {
         plugins = plugins.filter(x => x.isBuiltin)
     }
-    let pluginsModules = await loadPlugins(plugins, (current, total) => {
-        (document.querySelector('.progress .bar') as HTMLElement).style.width = 100 * current / total + '%'
+    const pluginsModules = await loadPlugins(plugins, (current, total) => {
+        (document.querySelector('.progress .bar') as HTMLElement).style.width = `${100 * current / total}%` // eslint-disable-line
     })
-    let module = getRootModule(pluginsModules)
+    const module = getRootModule(pluginsModules)
     window['rootModule'] = module
     return platformBrowserDynamic().bootstrapModule(module)
 }

app/src/plugins.ts

@@ -1,6 +1,6 @@
 import * as fs from 'mz/fs'
 import * as path from 'path'
-const nodeModule = require('module')
+const nodeModule = require('module') // eslint-disable-line @typescript-eslint/no-var-requires
 const nodeRequire = (global as any).require
 
 function normalizePath (path: string): string {
@@ -12,7 +12,7 @@ function normalizePath (path: string): string {
     return path
 }
 
-nodeRequire.main.paths.map(x => nodeModule.globalPaths.push(normalizePath(x)))
+nodeRequire.main.paths.map((x: string) => nodeModule.globalPaths.push(normalizePath(x)))
 
 if (process.env.TERMINUS_DEV) {
     nodeModule.globalPaths.unshift(path.dirname(require('electron').remote.app.getAppPath()))
@@ -38,9 +38,9 @@ if (process.env.TERMINUS_PLUGINS) {
     process.env.TERMINUS_PLUGINS.split(':').map(x => nodeModule.globalPaths.push(normalizePath(x)))
 }
 
-export declare type ProgressCallback = (current, total) => void
+export type ProgressCallback = (current: number, total: number) => void // eslint-disable-line @typescript-eslint/no-type-alias
 
-export interface IPluginInfo {
+export interface PluginInfo {
     name: string
     description: string
     packageName: string
@@ -80,17 +80,25 @@ builtinModules.forEach(m => {
 })
 
 const originalRequire = (global as any).require
-;(global as any).require = function (query) {
+;(global as any).require = function (query: string) {
     if (cachedBuiltinModules[query]) {
         return cachedBuiltinModules[query]
     }
     return originalRequire.apply(this, arguments)
 }
 
-export async function findPlugins (): Promise<IPluginInfo[]> {
-    let paths = nodeModule.globalPaths
-    let foundPlugins: IPluginInfo[] = []
-    let candidateLocations: { pluginDir: string, packageName: string }[] = []
+const originalModuleRequire = nodeModule.prototype.require
+nodeModule.prototype.require = function (query: string) {
+    if (cachedBuiltinModules[query]) {
+        return cachedBuiltinModules[query]
+    }
+    return originalModuleRequire.call(this, query)
+}
+
+export async function findPlugins (): Promise<PluginInfo[]> {
+    const paths = nodeModule.globalPaths
+    let foundPlugins: PluginInfo[] = []
+    const candidateLocations: { pluginDir: string, packageName: string }[] = []
     const PREFIX = 'terminus-'
 
     for (let pluginDir of paths) {
@@ -98,28 +106,28 @@ export async function findPlugins (): Promise<IPluginInfo[]> {
         if (!await fs.exists(pluginDir)) {
             continue
         }
-        let pluginNames = await fs.readdir(pluginDir)
+        const pluginNames = await fs.readdir(pluginDir)
         if (await fs.exists(path.join(pluginDir, 'package.json'))) {
             candidateLocations.push({
                 pluginDir: path.dirname(pluginDir),
-                packageName: path.basename(pluginDir)
+                packageName: path.basename(pluginDir),
             })
         }
-        for (let packageName of pluginNames) {
+        for (const packageName of pluginNames) {
             if (packageName.startsWith(PREFIX)) {
                 candidateLocations.push({ pluginDir, packageName })
             }
         }
     }
 
-    for (let { pluginDir, packageName } of candidateLocations) {
-        let pluginPath = path.join(pluginDir, packageName)
-        let infoPath = path.join(pluginPath, 'package.json')
+    for (const { pluginDir, packageName } of candidateLocations) {
+        const pluginPath = path.join(pluginDir, packageName)
+        const infoPath = path.join(pluginPath, 'package.json')
         if (!await fs.exists(infoPath)) {
             continue
         }
 
-        let name = packageName.substring(PREFIX.length)
+        const name = packageName.substring(PREFIX.length)
 
         if (foundPlugins.some(x => x.name === name)) {
             console.info(`Plugin ${packageName} already exists, overriding`)
@@ -127,7 +135,7 @@ export async function findPlugins (): Promise<IPluginInfo[]> {
         }
 
         try {
-            let info = JSON.parse(await fs.readFile(infoPath, { encoding: 'utf-8' }))
+            const info = JSON.parse(await fs.readFile(infoPath, { encoding: 'utf-8' }))
             if (!info.keywords || !(info.keywords.includes('terminus-plugin') || info.keywords.includes('terminus-builtin-plugin'))) {
                 continue
             }
@@ -152,22 +160,23 @@ export async function findPlugins (): Promise<IPluginInfo[]> {
     return foundPlugins
 }
 
-export async function loadPlugins (foundPlugins: IPluginInfo[], progress: ProgressCallback): Promise<any[]> {
-    let plugins: any[] = []
+export async function loadPlugins (foundPlugins: PluginInfo[], progress: ProgressCallback): Promise<any[]> {
+    const plugins: any[] = []
     progress(0, 1)
     let index = 0
-    for (let foundPlugin of foundPlugins) {
+    for (const foundPlugin of foundPlugins) {
         console.info(`Loading ${foundPlugin.name}: ${nodeRequire.resolve(foundPlugin.path)}`)
         progress(index, foundPlugins.length)
         try {
             const label = 'Loading ' + foundPlugin.name
             console.time(label)
-            let packageModule = nodeRequire(foundPlugin.path)
-            let pluginModule = packageModule.default.forRoot ? packageModule.default.forRoot() : packageModule.default
+            const packageModule = nodeRequire(foundPlugin.path)
+            const pluginModule = packageModule.default.forRoot ? packageModule.default.forRoot() : packageModule.default
             pluginModule['pluginName'] = foundPlugin.name
             pluginModule['bootstrap'] = packageModule.bootstrap
             plugins.push(pluginModule)
             console.timeEnd(label)
+            await (new Promise(x => setTimeout(x, 50)))
         } catch (error) {
             console.error(`Could not load ${foundPlugin.name}:`, error)
         }

app/src/root.component.ts

@@ -1,6 +1,6 @@
 import { Component } from '@angular/core'
 
 @Component({
-    template: '<app-root></app-root>'
+    template: '<app-root></app-root>',
 })
-export class RootComponent { }
+export class RootComponent { } // eslint-disable-line @typescript-eslint/no-extraneous-class

app/src/toastr.scss

@@ -2,6 +2,7 @@
   display: flex;
   flex-direction: column;
   align-items: center;
+  padding: 20px;
 
   .toast {
     box-shadow: 0 1px 0 rgba(0,0,0,.25);

app/webpack.config.js

@@ -14,7 +14,7 @@ module.exports = {
      minimize: false,
   },
   context: __dirname,
-  devtool: 'eval-source-map',
+  devtool: 'source-map',
   output: {
     path: path.join(__dirname, 'dist'),
     pathinfo: true,

app/webpack.main.config.js

@@ -9,7 +9,7 @@ module.exports = {
   },
   mode: process.env.TERMINUS_DEV ? 'development' : 'production',
   context: __dirname,
-  devtool: 'eval-source-map',
+  devtool: 'source-map',
   output: {
     path: path.join(__dirname, 'dist'),
     pathinfo: true,

app/yarn.lock

@@ -58,6 +58,13 @@
   dependencies:
     tslib "^1.9.0"
 
+"@terminus-term/windows-process-tree@^0.2.4":
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/@terminus-term/windows-process-tree/-/windows-process-tree-0.2.4.tgz#558f33d5afd934b070aec78da2529fc4042cf90d"
+  integrity sha512-FbquNhrFoe9EBwVITV9bqd/wukJLJSVI2pAzvM8dBvPP3/ErTiavZWU0W/J5av61SavJFDMkSiYVYL5NJe30zg==
+  dependencies:
+    nan "^2.13.2"
+
 "@types/mz@0.0.32":
   version "0.0.32"
   resolved "https://registry.yarnpkg.com/@types/mz/-/mz-0.0.32.tgz#e8248b4e41424c052edc1725dd33650c313a3659"
@@ -248,6 +255,14 @@ bin-links@^1.1.2:
     graceful-fs "^4.1.11"
     write-file-atomic "^2.3.0"
 
+bl@^1.0.0:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/bl/-/bl-1.2.2.tgz#a160911717103c07410cef63ef51b397c025af9c"
+  integrity sha512-e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA==
+  dependencies:
+    readable-stream "^2.3.5"
+    safe-buffer "^5.1.1"
+
 block-stream@*:
   version "0.0.9"
   resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a"
@@ -293,6 +308,24 @@ brace-expansion@^1.1.7:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
+buffer-alloc-unsafe@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0"
+  integrity sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==
+
+buffer-alloc@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz#890dd90d923a873e08e10e5fd51a57e5b7cce0ec"
+  integrity sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==
+  dependencies:
+    buffer-alloc-unsafe "^1.1.0"
+    buffer-fill "^1.0.0"
+
+buffer-fill@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c"
+  integrity sha1-+PeLdniYiO858gXNY39o5wISKyw=
+
 buffer-from@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
@@ -377,7 +410,7 @@ chalk@^2.0.1:
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
-chownr@^1.1.1:
+chownr@^1.0.1, chownr@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.1.tgz#54726b8b8fff4df053c42187e801fb4412df1494"
   integrity sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==
@@ -630,7 +663,7 @@ debug@^4.1.1:
   dependencies:
     ms "^2.1.1"
 
-debuglog@*, debuglog@^1.0.1:
+debuglog@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
   integrity sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI=
@@ -645,6 +678,13 @@ decode-uri-component@^0.2.0:
   resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
   integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
 
+decompress-response@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3"
+  integrity sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=
+  dependencies:
+    mimic-response "^1.0.0"
+
 deep-extend@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
@@ -672,6 +712,11 @@ detect-indent@~5.0.0:
   resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-5.0.0.tgz#3871cc0a6a002e8c3e5b3cf7f336264675f06b9d"
   integrity sha1-OHHMCmoALow+Wzz38zYmRnXwa50=
 
+detect-libc@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
+  integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
+
 detect-newline@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz#f41f1c10be4b00e87b5f13da680759f2c5bfd3e2"
@@ -741,10 +786,10 @@ electron-config@2.0.0:
   dependencies:
     conf "^1.0.0"
 
-electron-debug@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/electron-debug/-/electron-debug-3.0.0.tgz#55b7895df7f371558d0595d14dc2f8a738a41c81"
-  integrity sha512-rLrnn7L2soeIqwB6FIzn4+pj6RwT66XhUxadcrS3okjB3ezAv8LsolqrFrO2UrTrvchZgTCcEapV4J0UxlYWIw==
+electron-debug@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/electron-debug/-/electron-debug-3.0.1.tgz#95b43b968ec7dbe96300034143e58b803a1e82dc"
+  integrity sha512-fo3mtDM4Bxxm3DW1I+XcJKfQlUlns4QGWyWGs8OrXK1bBZ2X9HeqYMntYBx78MYRcGY5S/ualuG4GhCnPlaZEA==
   dependencies:
     electron-is-dev "^1.1.0"
     electron-localshortcut "^3.1.0"
@@ -868,6 +913,11 @@ execa@^1.0.0:
     signal-exit "^3.0.0"
     strip-eof "^1.0.0"
 
+expand-template@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/expand-template/-/expand-template-2.0.3.tgz#6e14b3fcee0f3a6340ecb57d2e8918692052a47c"
+  integrity sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==
+
 extend@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
@@ -925,6 +975,11 @@ flush-write-stream@^1.0.0:
     inherits "^2.0.3"
     readable-stream "^2.3.6"
 
+fontmanager-redux@0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/fontmanager-redux/-/fontmanager-redux-0.3.2.tgz#e5c8d8dc8fda98629eaef4201a27df9e56a122f4"
+  integrity sha512-NWmTbYfDijrx8qLJ2+O2VgYKhdfsMy/ec+Qf2DGxoLJDZHaRhBKd2Eufh4fFmfJUAwhzrkIgbKJsNT/IYJDbaA==
+
 forever-agent@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
@@ -955,6 +1010,11 @@ from2@^2.1.0:
     inherits "^2.0.1"
     readable-stream "^2.0.0"
 
+fs-constants@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
+  integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==
+
 fs-extra-p@^7.0.0:
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/fs-extra-p/-/fs-extra-p-7.0.1.tgz#4eec0b6dfa150fa90f6ddd773b4fb1d55cad54e3"
@@ -1075,6 +1135,11 @@ getpass@^0.1.1:
   dependencies:
     assert-plus "^1.0.0"
 
+github-from-package@0.0.0:
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce"
+  integrity sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4=
+
 glob@^7.0.3, glob@^7.1.1, glob@^7.1.3:
   version "7.1.4"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz#aa608a2f6c577ad357e1ae5a5c26d9a8d1969255"
@@ -1220,7 +1285,7 @@ import-lazy@^2.1.0:
   resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43"
   integrity sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM=
 
-imurmurhash@*, imurmurhash@^0.1.4:
+imurmurhash@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
   integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
@@ -1438,6 +1503,14 @@ keyboardevents-areequal@^0.2.1:
   resolved "https://registry.yarnpkg.com/keyboardevents-areequal/-/keyboardevents-areequal-0.2.2.tgz#88191ec738ce9f7591c25e9056de928b40277194"
   integrity sha512-Nv+Kr33T0mEjxR500q+I6IWisOQ0lK1GGOncV0kWE6n4KFmpcu7RUX5/2B0EUtX51Cb0HjZ9VJsSY3u4cBa0kw==
 
+keytar@^4.7.0:
+  version "4.11.0"
+  resolved "https://registry.yarnpkg.com/keytar/-/keytar-4.11.0.tgz#891569045b287a0dabe69320e2381e059b02363f"
+  integrity sha512-cGn2xd4NY0yCBrU5zQ/lwIagP1UBOhUEemi6iSJU2gshN1RHkxHekSdLUji9IWNo5B1Va/iwXXWzGD2p8ziqfQ==
+  dependencies:
+    nan "2.14.0"
+    prebuild-install "5.3.0"
+
 latest-version@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-3.1.0.tgz#a205383fea322b33b5ae3b18abee0dc2f356ee15"
@@ -1516,7 +1589,7 @@ libnpm@^2.0.1:
     read-package-json "^2.0.13"
     stringify-package "^1.0.0"
 
-libnpmaccess@*, libnpmaccess@^3.0.1:
+libnpmaccess@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/libnpmaccess/-/libnpmaccess-3.0.1.tgz#5b3a9de621f293d425191aa2e779102f84167fa8"
   integrity sha512-RlZ7PNarCBt+XbnP7R6PoVgOq9t+kou5rvhaInoNibhPO7eMlRfS0B8yjatgn2yaHIwWNyoJDolC/6Lc5L/IQA==
@@ -1545,7 +1618,7 @@ libnpmhook@^5.0.2:
     get-stream "^4.0.0"
     npm-registry-fetch "^3.8.0"
 
-libnpmorg@*, libnpmorg@^1.0.0:
+libnpmorg@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/libnpmorg/-/libnpmorg-1.0.0.tgz#979b868c48ba28c5820e3bb9d9e73c883c16a232"
   integrity sha512-o+4eVJBoDGMgRwh2lJY0a8pRV2c/tQM/SxlqXezjcAg26Qe9jigYVs+Xk0vvlYDWCDhP0g74J8UwWeAgsB7gGw==
@@ -1570,7 +1643,7 @@ libnpmpublish@^1.1.0:
     semver "^5.5.1"
     ssri "^6.0.1"
 
-libnpmsearch@*, libnpmsearch@^2.0.0:
+libnpmsearch@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/libnpmsearch/-/libnpmsearch-2.0.0.tgz#de05af47ada81554a5f64276a69599070d4a5685"
   integrity sha512-vd+JWbTGzOSfiOc+72MU6y7WqmBXn49egCCrIXp27iE/88bX8EpG64ST1blWQI1bSMUr9l1AKPMVsqa2tS5KWA==
@@ -1579,7 +1652,7 @@ libnpmsearch@*, libnpmsearch@^2.0.0:
     get-stream "^4.0.0"
     npm-registry-fetch "^3.8.0"
 
-libnpmteam@*, libnpmteam@^1.0.1:
+libnpmteam@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/libnpmteam/-/libnpmteam-1.0.1.tgz#ff704b1b6c06ea674b3b1101ac3e305f5114f213"
   integrity sha512-gDdrflKFCX7TNwOMX1snWojCoDE5LoRWcfOC0C/fqF7mBq8Uz9zWAX4B2RllYETNO7pBupBaSyBDkTAC15cAMg==
@@ -1634,11 +1707,6 @@ lockfile@^1.0.4:
   dependencies:
     signal-exit "^3.0.2"
 
-lodash._baseindexof@*:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/lodash._baseindexof/-/lodash._baseindexof-3.1.0.tgz#fe52b53a1c6761e42618d654e4a25789ed61822c"
-  integrity sha1-/lK1OhxnYeQmGNZU5KJXie1hgiw=
-
 lodash._baseuniq@~4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash._baseuniq/-/lodash._baseuniq-4.6.0.tgz#0ebb44e456814af7905c6212fa2c9b2d51b841e8"
@@ -1647,33 +1715,11 @@ lodash._baseuniq@~4.6.0:
     lodash._createset "~4.0.0"
     lodash._root "~3.0.0"
 
-lodash._bindcallback@*:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz#e531c27644cf8b57a99e17ed95b35c748789392e"
-  integrity sha1-5THCdkTPi1epnhftlbNcdIeJOS4=
-
-lodash._cacheindexof@*:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/lodash._cacheindexof/-/lodash._cacheindexof-3.0.2.tgz#3dc69ac82498d2ee5e3ce56091bafd2adc7bde92"
-  integrity sha1-PcaayCSY0u5ePOVgkbr9Ktx73pI=
-
-lodash._createcache@*:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/lodash._createcache/-/lodash._createcache-3.1.2.tgz#56d6a064017625e79ebca6b8018e17440bdcf093"
-  integrity sha1-VtagZAF2JeeevKa4AY4XRAvc8JM=
-  dependencies:
-    lodash._getnative "^3.0.0"
-
 lodash._createset@~4.0.0:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/lodash._createset/-/lodash._createset-4.0.3.tgz#0f4659fbb09d75194fa9e2b88a6644d363c9fe26"
   integrity sha1-D0ZZ+7CddRlPqeK4imZE02PJ/iY=
 
-lodash._getnative@*, lodash._getnative@^3.0.0:
-  version "3.9.1"
-  resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5"
-  integrity sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=
-
 lodash._root@~3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/lodash._root/-/lodash._root-3.0.1.tgz#fba1c4524c19ee9a5f8136b4609f017cf4ded692"
@@ -1689,11 +1735,6 @@ lodash.isequal@^4.5.0:
   resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
   integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA=
 
-lodash.restparam@*:
-  version "3.6.1"
-  resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805"
-  integrity sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=
-
 lodash.union@~4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash.union/-/lodash.union-4.6.0.tgz#48bb5088409f16f1821666641c44dd1aaae3cd88"
@@ -1729,6 +1770,13 @@ lru-cache@^5.1.1:
   dependencies:
     yallist "^3.0.2"
 
+macos-native-processlist@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/macos-native-processlist/-/macos-native-processlist-1.0.1.tgz#df48bbd114554bd69e7c2c76f976836ef8270ca8"
+  integrity sha512-Kn8EUW8xOM+06GFMp8I2fxIK8iSaR/fraAU5ddfnKVRn6/+dmQ5VGBSG4k6ce3u/EOQxd/7paBCAz17nXqH0cg==
+  dependencies:
+    nan "^2.13.2"
+
 make-dir@^1.0.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c"
@@ -1803,6 +1851,11 @@ mimic-fn@^2.0.0:
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
   integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
 
+mimic-response@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b"
+  integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==
+
 minimatch@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
@@ -1899,10 +1952,20 @@ mz@^2.7.0:
     object-assign "^4.0.1"
     thenify-all "^1.0.0"
 
-ngx-toastr@^9.1.1:
-  version "9.1.1"
-  resolved "https://registry.yarnpkg.com/ngx-toastr/-/ngx-toastr-9.1.1.tgz#c7ec0284d13951422ccf47439a387372ddccc768"
-  integrity sha512-v43BmIXPmwMRx9Uv0ru2UaPQLA14gTsqWgXrO1DKC8RXnBGGoQEE48cVCaDX1GhaGM5GSzVO2s0o+nb688zsFw==
+nan@2.14.0, nan@^2.13.2:
+  version "2.14.0"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c"
+  integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==
+
+napi-build-utils@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-1.0.1.tgz#1381a0f92c39d66bf19852e7873432fc2123e508"
+  integrity sha512-boQj1WFgQH3v4clhu3mTNfP+vOBxorDlE8EKiMjUlLG3C4qAESnn9AxIOkFgTR2c9LtzNjPrjS60cT27ZKBhaA==
+
+ngx-toastr@^10.0.4:
+  version "10.0.4"
+  resolved "https://registry.yarnpkg.com/ngx-toastr/-/ngx-toastr-10.0.4.tgz#cbc61b8d67d748194ea7a28542b01e39bf1fc6c2"
+  integrity sha512-iN+zr2Msae5wV334c1dytRhSYNdUz467jwv1NE91lMmllsMkpUzZlu8VdFCeTFt+/R4TWzz19xBRqhpp+OAuVA==
   dependencies:
     tslib "^1.9.0"
 
@@ -1911,6 +1974,13 @@ nice-try@^1.0.4:
   resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
   integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
 
+node-abi@^2.7.0:
+  version "2.9.0"
+  resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.9.0.tgz#ae4075b298dab2d92dd1e22c48ccc7ffd7f06200"
+  integrity sha512-jmEOvv0eanWjhX8dX1pmjb7oJl1U1oR4FOh0b2GnvALwSYoOdU7sj+kLDSAyjo4pfC9aj/IxkloxdLJQhSSQBA==
+  dependencies:
+    semver "^5.4.1"
+
 node-fetch-npm@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/node-fetch-npm/-/node-fetch-npm-2.0.2.tgz#7258c9046182dca345b4208eda918daf33697ff7"
@@ -1955,6 +2025,18 @@ node-gyp@^4.0.0:
     tar "^4.4.8"
     which "1"
 
+node-pty@^0.9.0-beta18:
+  version "0.9.0-beta18"
+  resolved "https://registry.yarnpkg.com/node-pty/-/node-pty-0.9.0-beta18.tgz#d81c1ed96ee2727043abd5ac6666250149c1b606"
+  integrity sha512-j4E8RYda9cqm+2cGxaAxDlpEmPpuS0dfCuZII8VPRTw6p5gRJRwPJo9oL//YKdtaasRFfRy0/mUaNj8ft3FQVg==
+  dependencies:
+    nan "^2.13.2"
+
+noop-logger@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/noop-logger/-/noop-logger-0.1.1.tgz#94a2b1633c4f1317553007d8966fd0e841b6a4c2"
+  integrity sha1-lKKxYzxPExdVMAfYlm/Q6EG2pMI=
+
 "nopt@2 || 3":
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
@@ -2051,7 +2133,7 @@ npm-pick-manifest@^2.2.3:
     npm-package-arg "^6.0.0"
     semver "^5.4.1"
 
-npm-profile@*, npm-profile@^4.0.1:
+npm-profile@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/npm-profile/-/npm-profile-4.0.1.tgz#d350f7a5e6b60691c7168fbb8392c3603583f5aa"
   integrity sha512-NQ1I/1Q7YRtHZXkcuU1/IyHeLy6pd+ScKg4+DQHdfsm769TGq6HPrkbuNJVJS4zwE+0mvvmeULzQdWn2L2EsVA==
@@ -2084,7 +2166,7 @@ npm-user-validate@~1.0.0:
   resolved "https://registry.yarnpkg.com/npm-user-validate/-/npm-user-validate-1.0.0.tgz#8ceca0f5cea04d4e93519ef72d0557a75122e951"
   integrity sha1-jOyg9c6gTU6TUZ73LQVXp1Ei6VE=
 
-npm@6:
+npm@~6.9.0:
   version "6.9.0"
   resolved "https://registry.yarnpkg.com/npm/-/npm-6.9.0.tgz#5296720486814a64a7fb082de00c4b5cfd11211f"
   integrity sha512-91V+zB5hDxO+Jyp2sUKS7juHlIM95dGQxTeQtmZI1nAI/7kjWXFipPrtwwKjhyKmV4GsS2LzJhrxRjGWsU9z/w==
@@ -2198,7 +2280,7 @@ npm@6:
     worker-farm "^1.6.0"
     write-file-atomic "^2.4.2"
 
-"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.1.2, npmlog@~4.1.2:
+"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.1, npmlog@^4.1.2, npmlog@~4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
   integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
@@ -2235,7 +2317,7 @@ opener@^1.5.1:
   resolved "https://registry.yarnpkg.com/opener/-/opener-1.5.1.tgz#6d2f0e77f1a0af0032aca716c2c1fbb8e7e8abed"
   integrity sha512-goYSy5c2UXE4Ra1xixabeVh1guIX/ZV/YokJksb6q2lubWu6UbvPQ20p542/sFIll1nl8JnCyK9oBaOcCWXwvA==
 
-os-homedir@^1.0.0:
+os-homedir@^1.0.0, os-homedir@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
   integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
@@ -2431,6 +2513,28 @@ pkg-up@^2.0.0:
   dependencies:
     find-up "^2.1.0"
 
+prebuild-install@5.3.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-5.3.0.tgz#58b4d8344e03590990931ee088dd5401b03004c8"
+  integrity sha512-aaLVANlj4HgZweKttFNUVNRxDukytuIuxeK2boIMHjagNJCiVKWFsKF4tCE3ql3GbrD2tExPQ7/pwtEJcHNZeg==
+  dependencies:
+    detect-libc "^1.0.3"
+    expand-template "^2.0.3"
+    github-from-package "0.0.0"
+    minimist "^1.2.0"
+    mkdirp "^0.5.1"
+    napi-build-utils "^1.0.1"
+    node-abi "^2.7.0"
+    noop-logger "^0.1.1"
+    npmlog "^4.0.1"
+    os-homedir "^1.0.1"
+    pump "^2.0.1"
+    rc "^1.2.7"
+    simple-get "^2.7.0"
+    tar-fs "^1.13.0"
+    tunnel-agent "^0.6.0"
+    which-pm-runs "^1.0.0"
+
 prepend-http@^1.0.1:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
@@ -2493,7 +2597,15 @@ psl@^1.1.24:
   resolved "https://registry.yarnpkg.com/psl/-/psl-1.1.32.tgz#3f132717cf2f9c169724b2b6caf373cf694198db"
   integrity sha512-MHACAkHpihU/REGGPLj4sEfc/XKW2bheigvHO1dUqjaKigMp1C8+WLQYRGgeKFMsw5PMfegZcaN8IDXK/cD0+g==
 
-pump@^2.0.0:
+pump@^1.0.0:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/pump/-/pump-1.0.3.tgz#5dfe8311c33bbf6fc18261f9f34702c47c08a954"
+  integrity sha512-8k0JupWme55+9tCVE+FS5ULT3K6AbgqrGa58lTT49RpyfwwcGedHqaC5LlQNdEAumn/wFsu6aPwkuPMioy8kqw==
+  dependencies:
+    end-of-stream "^1.1.0"
+    once "^1.3.1"
+
+pump@^2.0.0, pump@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909"
   integrity sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==
@@ -2552,7 +2664,7 @@ qw@~1.0.1:
   resolved "https://registry.yarnpkg.com/qw/-/qw-1.0.1.tgz#efbfdc740f9ad054304426acb183412cc8b996d4"
   integrity sha1-77/cdA+a0FQwRCassYNBLMi5ltQ=
 
-rc@^1.0.1, rc@^1.1.6:
+rc@^1.0.1, rc@^1.1.6, rc@^1.2.7:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
   integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
@@ -2613,7 +2725,7 @@ read@1, read@~1.0.1, read@~1.0.7:
   dependencies:
     mute-stream "~0.0.4"
 
-"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.6, readable-stream@~2.3.6:
+"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.0, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.6:
   version "2.3.6"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
   integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==
@@ -2645,7 +2757,7 @@ readable-stream@~1.1.10:
     isarray "0.0.1"
     string_decoder "~0.10.x"
 
-readdir-scoped-modules@*, readdir-scoped-modules@^1.0.0:
+readdir-scoped-modules@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.0.2.tgz#9fafa37d286be5d92cbaebdee030dc9b5f406747"
   integrity sha1-n6+jfShr5dksuuve4DDcm19AZ0c=
@@ -2821,6 +2933,20 @@ signal-exit@^3.0.0, signal-exit@^3.0.2:
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
   integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=
 
+simple-concat@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.0.tgz#7344cbb8b6e26fb27d66b2fc86f9f6d5997521c6"
+  integrity sha1-c0TLuLbib7J9ZrL8hvn21Zl1IcY=
+
+simple-get@^2.7.0:
+  version "2.8.1"
+  resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-2.8.1.tgz#0e22e91d4575d87620620bc91308d57a77f44b5d"
+  integrity sha512-lSSHRSw3mQNUGPAYRqo7xy9dhKmxFXIjLjp4KHpf99GEH2VH7C3AM+Qfx6du6jhfUi6Vm7XnbEVEf7Wb6N8jRw==
+  dependencies:
+    decompress-response "^3.3.0"
+    once "^1.3.1"
+    simple-concat "^1.0.0"
+
 slash@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
@@ -3050,6 +3176,29 @@ supports-color@^5.3.0:
   dependencies:
     has-flag "^3.0.0"
 
+tar-fs@^1.13.0:
+  version "1.16.3"
+  resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-1.16.3.tgz#966a628841da2c4010406a82167cbd5e0c72d509"
+  integrity sha512-NvCeXpYx7OsmOh8zIOP/ebG55zZmxLE0etfWRbWok+q2Qo8x/vOR/IJT1taADXPe+jsiu9axDb3X4B+iIgNlKw==
+  dependencies:
+    chownr "^1.0.1"
+    mkdirp "^0.5.1"
+    pump "^1.0.0"
+    tar-stream "^1.1.2"
+
+tar-stream@^1.1.2:
+  version "1.6.2"
+  resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-1.6.2.tgz#8ea55dab37972253d9a9af90fdcd559ae435c555"
+  integrity sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A==
+  dependencies:
+    bl "^1.0.0"
+    buffer-alloc "^1.2.0"
+    end-of-stream "^1.0.0"
+    fs-constants "^1.0.0"
+    readable-stream "^2.3.0"
+    to-buffer "^1.1.1"
+    xtend "^4.0.0"
+
 tar@^2.0.0:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.2.tgz#0ca8848562c7299b8b446ff6a4d60cdbb23edc40"
@@ -3121,6 +3270,11 @@ tiny-relative-date@^1.3.0:
   resolved "https://registry.yarnpkg.com/tiny-relative-date/-/tiny-relative-date-1.3.0.tgz#fa08aad501ed730f31cc043181d995c39a935e07"
   integrity sha512-MOQHpzllWxDCHHaDno30hhLfbouoYlOI8YlMNtvKe1zXbjEVhbcEovQxvZrPvtiYW630GQDoMMarCnjfyfHA+A==
 
+to-buffer@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/to-buffer/-/to-buffer-1.1.1.tgz#493bd48f62d7c43fcded313a03dcadb2e1213a80"
+  integrity sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg==
+
 tough-cookie@~2.4.3:
   version "2.4.3"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781"
@@ -3285,6 +3439,11 @@ which-module@^2.0.0:
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
   integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
 
+which-pm-runs@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/which-pm-runs/-/which-pm-runs-1.0.0.tgz#670b3afbc552e0b55df6b7780ca74615f23ad1cb"
+  integrity sha1-Zws6+8VS4LVd9rd4DKdGFfI60cs=
+
 which@1, which@^1.2.9, which@^1.3.0, which@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
@@ -3311,6 +3470,13 @@ windows-blurbehind@^1.0.1:
   resolved "https://registry.yarnpkg.com/windows-blurbehind/-/windows-blurbehind-1.0.1.tgz#ff098713873304e38330b2c54cc41bb369b587b9"
   integrity sha512-1HzHfCiM1ayrbACJu5qE9zELV24uX/tINT6kxaZwLY3rtQAoeav6x9z7LFHWoLaGDN/sYbnK+9Vk0cz7fsk5HQ==
 
+windows-native-registry@^1.0.14:
+  version "1.0.14"
+  resolved "https://registry.yarnpkg.com/windows-native-registry/-/windows-native-registry-1.0.14.tgz#35c742b1278473127cbfb3b76e0db3d1ef626872"
+  integrity sha512-C2UgyZYJYcPFjkhfNuy09CUa6wXAti4x/tLPgzudDDrqpTyczcgnBEpiablmE6j7E7ownouWTqgVcHW8HJyqhw==
+  dependencies:
+    nan "^2.13.2"
+
 windows-swca@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/windows-swca/-/windows-swca-2.0.2.tgz#66807012f73f5d3c0f0cb49bfa61be297aaabb50"
@@ -3361,7 +3527,7 @@ xdg-basedir@^3.0.0:
   resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-3.0.0.tgz#496b2cc109eca8dbacfe2dc72b603c17c5870ad4"
   integrity sha1-SWsswQnsqNus/i3HK2A8F8WHCtQ=
 
-xtend@~4.0.1:
+xtend@^4.0.0, xtend@~4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
   integrity sha1-pcbVMr5lbiPbgg77lDofBJmNY68=

appveyor.yml

@@ -14,7 +14,6 @@ install:
   - node scripts/build-native.js
 
 build_script:
-  - yarn run build:typings
   - yarn run build
   - node scripts/prepackage-plugins.js
   - node scripts/build-windows.js

azure-pipelines.yml

@@ -0,0 +1,207 @@
+trigger:
+  tags:
+    include:
+    - v*
+  branches:
+    include:
+    - master
+
+variables:
+- group: Vars
+
+jobs:
+- job: Windows
+  pool:
+    vmImage: 'vs2017-win2016'
+
+  steps:
+  - task: NodeTool@0
+    inputs:
+      versionSpec: '10.x'
+    displayName: 'Install Node.js'
+
+  - script: yarn --network-timeout 100000
+    displayName: 'Install dependencies'
+
+  - script: node scripts/build-native.js
+    displayName: 'Rebuild native dependencies'
+
+  - script: yarn run build
+    displayName: 'Build'
+
+  - script: node scripts/prepackage-plugins.js
+    displayName: 'Prepackage plugins'
+
+  - script: node scripts/build-windows.js
+    displayName: 'Package'
+    env:
+      WIN_CSC_LINK: $(WIN_CSC_LINK)
+      WIN_CSC_KEY_PASSWORD: $(WIN_CSC_KEY_PASSWORD)
+      BT_TOKEN: $(BT_TOKEN)
+      GH_TOKEN: $(GH_TOKEN)
+      DEBUG: electron-builder
+
+  - task: CopyFiles@2
+    inputs:
+      contents: 'dist\\*-setup.exe'
+      targetFolder: $(Build.ArtifactStagingDirectory)
+      flattenFolders: true
+      cleanTargetFolder: true
+
+  - task: PublishBuildArtifacts@1
+    inputs:
+      pathtoPublish: $(Build.ArtifactStagingDirectory)
+      artifactName: Windows - Installer
+      condition: eq(variables['Build.SourceBranch'], 'refs/heads/master')
+
+  - task: CopyFiles@2
+    inputs:
+      contents: 'dist\\*-portable.exe'
+      targetFolder: $(Build.ArtifactStagingDirectory)
+      flattenFolders: true
+      cleanTargetFolder: true
+
+  - task: PublishBuildArtifacts@1
+    inputs:
+      pathtoPublish: $(Build.ArtifactStagingDirectory)
+      artifactName: Windows - Portable build
+      condition: eq(variables['Build.SourceBranch'], 'refs/heads/master')
+
+- job: Linux
+  pool:
+    vmImage: 'ubuntu-16.04'
+
+  steps:
+  - task: NodeTool@0
+    inputs:
+      versionSpec: '10.x'
+    displayName: 'Install Node.js'
+
+  - script: yarn
+    displayName: 'Install dependencies'
+
+  - script: node scripts/build-native.js
+    displayName: 'Rebuild native dependencies'
+
+  - script: yarn run build
+    displayName: 'Build'
+
+  - script: node scripts/prepackage-plugins.js
+    displayName: 'Prepackage plugins'
+
+  - script: node scripts/build-linux.js
+    displayName: 'Package'
+    env:
+      BT_TOKEN: $(BT_TOKEN)
+      GH_TOKEN: $(GH_TOKEN)
+
+  - task: CopyFiles@2
+    inputs:
+      contents: 'dist/*.deb'
+      targetFolder: $(Build.ArtifactStagingDirectory)
+      flattenFolders: true
+      cleanTargetFolder: true
+
+  - task: PublishBuildArtifacts@1
+    inputs:
+      pathtoPublish: $(Build.ArtifactStagingDirectory)
+      artifactName: Linux - DEB
+      condition: eq(variables['Build.SourceBranch'], 'refs/heads/master')
+
+  - task: CopyFiles@2
+    inputs:
+      contents: 'dist/*.rpm'
+      targetFolder: $(Build.ArtifactStagingDirectory)
+      flattenFolders: true
+      cleanTargetFolder: true
+
+  - task: PublishBuildArtifacts@1
+    inputs:
+      pathtoPublish: $(Build.ArtifactStagingDirectory)
+      artifactName: Linux - RPM
+      condition: eq(variables['Build.SourceBranch'], 'refs/heads/master')
+
+  - task: CopyFiles@2
+    inputs:
+      contents: 'dist/*.snap'
+      targetFolder: $(Build.ArtifactStagingDirectory)
+      flattenFolders: true
+      cleanTargetFolder: true
+
+  - task: PublishBuildArtifacts@1
+    inputs:
+      pathtoPublish: $(Build.ArtifactStagingDirectory)
+      artifactName: Linux - Snap
+      condition: eq(variables['Build.SourceBranch'], 'refs/heads/master')
+
+  - task: CopyFiles@2
+    inputs:
+      contents: 'dist/*.tar.gz'
+      targetFolder: $(Build.ArtifactStagingDirectory)
+      flattenFolders: true
+      cleanTargetFolder: true
+
+  - task: PublishBuildArtifacts@1
+    inputs:
+      pathtoPublish: $(Build.ArtifactStagingDirectory)
+      artifactName: Linux - tar.gz
+      condition: eq(variables['Build.SourceBranch'], 'refs/heads/master')
+
+- job: macOS
+  pool:
+    vmImage: 'macOS-10.14'
+
+  steps:
+  - task: NodeTool@0
+    inputs:
+      versionSpec: '10.x'
+    displayName: 'Install Node.js'
+
+  - script: yarn
+    displayName: 'Install dependencies'
+
+  - script: node scripts/build-native.js
+    displayName: 'Rebuild native dependencies'
+
+  - script: yarn run build
+    displayName: 'Build'
+
+  - script: node scripts/prepackage-plugins.js
+    displayName: 'Prepackage plugins'
+
+  - script: node scripts/build-macos.js
+    displayName: 'Package'
+    env:
+      CSC_LINK: $(CSC_LINK)
+      CSC_KEY_PASSWORD: $(CSC_KEY_PASSWORD)
+      BT_TOKEN: $(BT_TOKEN)
+      GH_TOKEN: $(GH_TOKEN)
+      APPSTORE_USERNAME: $(APPSTORE_USERNAME)
+      APPSTORE_PASSWORD: $(APPSTORE_PASSWORD)
+      DEBUG: electron-builder
+
+  - task: CopyFiles@2
+    inputs:
+      contents: 'dist/*.dmg'
+      targetFolder: $(Build.ArtifactStagingDirectory)
+      flattenFolders: true
+      cleanTargetFolder: true
+
+  - task: PublishBuildArtifacts@1
+    inputs:
+      pathtoPublish: $(Build.ArtifactStagingDirectory)
+      artifactName: macOS - DMG
+      condition: eq(variables['Build.SourceBranch'], 'refs/heads/master')
+
+  - task: CopyFiles@2
+    inputs:
+      contents: 'dist/*.zip'
+      targetFolder: $(Build.ArtifactStagingDirectory)
+      flattenFolders: true
+      cleanTargetFolder: true
+
+  - task: PublishBuildArtifacts@1
+    inputs:
+      pathtoPublish: $(Build.ArtifactStagingDirectory)
+      artifactName: macOS - app.zip
+      condition: eq(variables['Build.SourceBranch'], 'refs/heads/master')

build/mac/afterSignHook.js

@@ -0,0 +1,36 @@
+// See: https://medium.com/@TwitterArchiveEraser/notarize-electron-apps-7a5f988406db
+
+const fs = require('fs')
+const path = require('path')
+const notarizer = require('electron-notarize')
+
+module.exports = async function (params) {
+    console.log('env: ', process.env)
+    // notarize the app on Mac OS only.
+    if (process.platform !== 'darwin' || process.env.BUILD_SOURCEBRANCH !== 'refs/heads/master' || process.env.TRAVIS_BRANCH && !process.env.TRAVIS_PULL_REQUEST_BRANCH) {
+        return
+    }
+    console.log('afterSign hook triggered', params)
+
+    let appId = 'org.terminus'
+
+    let appPath = path.join(params.appOutDir, `${params.packager.appInfo.productFilename}.app`)
+    if (!fs.existsSync(appPath)) {
+        throw new Error(`Cannot find application at: ${appPath}`)
+    }
+
+    console.log(`Notarizing ${appId} found at ${appPath}`)
+
+    try {
+        await notarizer.notarize({
+            appBundleId: appId,
+            appPath: appPath,
+            appleId: process.env.APPSTORE_USERNAME,
+            appleIdPassword: process.env.APPSTORE_PASSWORD,
+        })
+    } catch (error) {
+        console.error(error)
+    }
+
+    console.log(`Done notarizing ${appId}`)
+}

build/mac/entitlements.plist

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+  <dict>
+    <key>com.apple.security.cs.allow-jit</key>
+    <true/>
+    <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
+    <true/>
+    <key>com.apple.security.cs.allow-dyld-environment-variables</key>
+    <true/>
+  </dict>
+</plist>

package.json

@@ -1,35 +1,38 @@
 {
-  "name": "term",
   "devDependencies": {
     "@fortawesome/fontawesome-free": "^5.9.0",
     "@types/electron-config": "^3.2.2",
     "@types/electron-debug": "^2.1.0",
     "@types/fs-promise": "1.0.3",
     "@types/js-yaml": "^3.12.1",
-    "@types/node": "^12.0.7",
+    "@types/node": "^12.0.10",
     "@types/webpack-env": "1.13.9",
-    "app-builder-lib": "^20.43.0",
+    "@typescript-eslint/eslint-plugin": "^1.11.0",
+    "@typescript-eslint/parser": "^1.11.0",
+    "app-builder-lib": "^21.0.6",
     "apply-loader": "2.0.0",
     "awesome-typescript-loader": "^5.0.0",
-    "core-js": "^3.1.3",
+    "core-js": "^3.1.4",
     "cross-env": "5.2.0",
-    "css-loader": "2.1.1",
-    "electron": "^5.0.2",
-    "electron-builder": "^20.43.0",
-    "electron-installer-snap": "^3.2.0",
+    "css-loader": "3.0.0",
+    "electron": "^5.0.5",
+    "electron-builder": "^21.0.7",
+    "electron-installer-snap": "^4.0.0",
+    "electron-notarize": "^0.1.1",
     "electron-rebuild": "^1.8.5",
+    "eslint": "^5.16.0",
     "file-loader": "^4.0.0",
     "graceful-fs": "^4.1.15",
     "html-loader": "0.5.5",
     "json-loader": "0.5.7",
-    "node-abi": "^2.8.0",
-    "node-gyp": "^4.0.0",
+    "node-abi": "^2.9.0",
+    "node-gyp": "^5.0.2",
     "node-sass": "^4.12.0",
     "npmlog": "4.1.2",
     "npx": "^10.2.0",
-    "pug": "^2.0.3",
+    "pug": "^2.0.4",
     "pug-html-loader": "1.1.5",
-    "pug-lint": "^2.5.0",
+    "pug-lint": "^2.6.0",
     "pug-loader": "^2.4.0",
     "pug-static-loader": "2.0.0",
     "raven-js": "3.27.2",
@@ -41,15 +44,13 @@
     "style-loader": "^0.23.1",
     "svg-inline-loader": "^0.8.0",
     "to-string-loader": "1.1.5",
-    "tslint": "^5.17.0",
-    "tslint-config-standard": "^8.0.1",
-    "tslint-eslint-rules": "^5.4.0",
+    "tslib": "^1.10.0",
     "typedoc": "^0.14.2",
-    "typescript": "^3.5.1",
-    "url-loader": "^1.1.1",
+    "typescript": "^3.5.2",
+    "url-loader": "^2.0.0",
     "val-loader": "1.1.1",
-    "webpack": "^4.33.0",
-    "webpack-cli": "^3.3.2",
+    "webpack": "^4.35.2",
+    "webpack-cli": "^3.3.5",
     "yaml-loader": "0.5.0"
   },
   "resolutions": {
@@ -59,6 +60,7 @@
     "appId": "org.terminus",
     "productName": "Terminus",
     "compression": "normal",
+    "afterSign": "./build/mac/afterSignHook.js",
     "files": [
       "**/*",
       "dist"
@@ -94,12 +96,14 @@
       "category": "public.app-category.video",
       "icon": "./build/mac/icon.icns",
       "artifactName": "terminus-${version}-macos.${ext}",
+      "hardenedRuntime": true,
+      "entitlements": "./build/mac/entitlements.plist",
       "extendInfo": {
         "NSRequiresAquaSystemAppearance": false
       }
     },
-    "dmg": {
-      "artifactName": "terminus-${version}-macos.dmg"
+    "pkg": {
+      "artifactName": "terminus-${version}-macos.pkg"
     },
     "linux": {
       "category": "Utilities",
@@ -126,14 +130,17 @@
     }
   },
   "scripts": {
-    "build": "webpack --color --config app/webpack.main.config.js && webpack --color --config app/webpack.config.js && webpack --color --config terminus-core/webpack.config.js && webpack --color --config terminus-settings/webpack.config.js && webpack --color --config terminus-terminal/webpack.config.js && webpack --color --config terminus-plugin-manager/webpack.config.js && webpack --color --config terminus-community-color-schemes/webpack.config.js && webpack --color --config terminus-ssh/webpack.config.js",
+    "build": "npm run build:typings && webpack --color --config app/webpack.main.config.js && webpack --color --config app/webpack.config.js && webpack --color --config terminus-core/webpack.config.js && webpack --color --config terminus-settings/webpack.config.js && webpack --color --config terminus-terminal/webpack.config.js && webpack --color --config terminus-plugin-manager/webpack.config.js && webpack --color --config terminus-community-color-schemes/webpack.config.js && webpack --color --config terminus-ssh/webpack.config.js",
     "build:typings": "tsc --project terminus-core/tsconfig.typings.json && tsc --project terminus-settings/tsconfig.typings.json && tsc --project terminus-terminal/tsconfig.typings.json && tsc --project terminus-plugin-manager/tsconfig.typings.json && tsc --project terminus-ssh/tsconfig.typings.json",
     "watch": "cross-env TERMINUS_DEV=1 webpack --progress --color --watch",
     "start": "cross-env TERMINUS_DEV=1 electron app --debug",
     "prod": "cross-env TERMINUS_DEV=1 electron app",
     "docs": "typedoc --out docs/api terminus-core/src && typedoc --out docs/api/terminal --tsconfig terminus-terminal/tsconfig.typings.json terminus-terminal/src && typedoc --out docs/api/settings --tsconfig terminus-settings/tsconfig.typings.json terminus-settings/src",
-    "lint": "tslint -c tslint.json -t stylish terminus-*/src/**/*.ts terminus-*/src/*.ts app/src/*.ts",
+    "lint": "eslint --ext ts */src",
     "postinstall": "node ./scripts/install-deps.js"
   },
-  "repository": "eugeny/terminus"
+  "repository": "eugeny/terminus",
+  "dependencies": {
+    "eslint-plugin-import": "^2.18.0"
+  }
 }

scripts/build-linux.js

@@ -2,13 +2,15 @@
 const builder = require('electron-builder').build
 const vars = require('./vars')
 
+const isTag = (process.env.BUILD_SOURCEBRANCH || '').startsWith('refs/tags/')
+
 builder({
-  dir: true,
-  linux: ['snap', 'deb', 'rpm', 'tar.gz'],
-  config: {
-    extraMetadata: {
-      version: vars.version,
+    dir: true,
+    linux: ['snap', 'deb', 'rpm', 'tar.gz'],
+    config: {
+        extraMetadata: {
+            version: vars.version,
+        },
     },
-  },
-  publish: 'onTag',
-})
+    publish: isTag ? 'always' : 'onTag',
+}).catch(() => process.exit(1))

scripts/build-macos.js

@@ -2,13 +2,15 @@
 const builder = require('electron-builder').build
 const vars = require('./vars')
 
+const isTag = (process.env.BUILD_SOURCEBRANCH || '').startsWith('refs/tags/')
+
 builder({
-  dir: true,
-  mac: ['dmg', 'zip'],
-  config: {
-    extraMetadata: {
-      version: vars.version,
+    dir: true,
+    mac: ['pkg', 'zip'],
+    config: {
+        extraMetadata: {
+            version: vars.version,
+        },
     },
-  },
-  publish: 'onTag',
-})
+    publish: isTag ? 'always' : 'onTag',
+}).catch(() => process.exit(1))

scripts/build-native.js

@@ -5,11 +5,13 @@ const vars = require('./vars')
 
 lifecycles = []
 for (let dir of ['app', 'terminus-core', 'terminus-ssh', 'terminus-terminal']) {
-  lifecycles.push([rebuild({
+  build = rebuild({
     buildPath: path.resolve(__dirname, '../' + dir),
     electronVersion: vars.electronVersion,
     force: true,
-  }).lifecycle, dir])
+  })
+  build.catch(() => process.exit(1))
+  lifecycles.push([build.lifecycle, dir])
 }
 
 console.info('Building against Electron', vars.electronVersion)

scripts/build-windows.js

@@ -2,13 +2,15 @@
 const builder = require('electron-builder').build
 const vars = require('./vars')
 
+const isTag = (process.env.BUILD_SOURCEBRANCH || '').startsWith('refs/tags/')
+
 builder({
-  dir: true,
-  win: ['nsis', 'portable'],
-  config: {
-    extraMetadata: {
-      version: vars.version,
+    dir: true,
+    win: ['nsis', 'portable'],
+    config: {
+        extraMetadata: {
+            version: vars.version,
+        },
     },
-  },
-  publish: 'onTag',
-})
+    publish: isTag ? 'always' : 'onTag',
+}).catch(() => process.exit(1))

scripts/vars.js

@@ -1,5 +1,6 @@
 const path = require('path')
 const fs = require('fs')
+const semver = require('semver')
 const childProcess = require('child_process')
 
 const appInfo = JSON.parse(fs.readFileSync(path.resolve(__dirname, '../app/package.json')))
@@ -9,6 +10,10 @@ exports.version = childProcess.execSync('git describe --tags', {encoding:'utf-8'
 exports.version = exports.version.substring(1).trim()
 exports.version = exports.version.replace('-', '-c')
 
+if (exports.version.includes('-c')) {
+  exports.version = semver.inc(exports.version, 'prepatch').replace('-0', '-nightly.0')
+}
+
 exports.builtinPlugins = [
   'terminus-core',
   'terminus-settings',

terminus-community-color-schemes/package.json

@@ -1,6 +1,6 @@
 {
   "name": "terminus-community-color-schemes",
-  "version": "1.0.73-c4-ga7d62b0",
+  "version": "1.0.83-nightly.0",
   "description": "Community color schemes for Terminus",
   "keywords": [
     "terminus-builtin-plugin"
@@ -17,12 +17,8 @@
   "author": "Eugene Pankov",
   "license": "MIT",
   "peerDependencies": {
-    "@angular/core": "4.0.1",
+    "@angular/core": "^7",
     "terminus-core": "*",
     "terminus-terminal": "*"
-  },
-  "devDependencies": {
-    "@types/node": "12.0.7",
-    "@types/webpack-env": "^1.13.0"
   }
 }

terminus-community-color-schemes/src/colorSchemes.ts

@@ -1,26 +1,26 @@
 import { Injectable } from '@angular/core'
-import { TerminalColorSchemeProvider, ITerminalColorScheme } from 'terminus-terminal'
+import { TerminalColorSchemeProvider, TerminalColorScheme } from 'terminus-terminal'
 
 const schemeContents = require.context('../schemes/', true, /.*/)
 
 @Injectable()
 export class ColorSchemes extends TerminalColorSchemeProvider {
-    async getSchemes (): Promise<ITerminalColorScheme[]> {
-        let schemes: ITerminalColorScheme[] = []
+    async getSchemes (): Promise<TerminalColorScheme[]> {
+        const schemes: TerminalColorScheme[] = []
 
         schemeContents.keys().forEach(schemeFile => {
-            let lines = (schemeContents(schemeFile).default as string).split('\n')
+            const lines = (schemeContents(schemeFile).default as string).split('\n')
 
             // process #define variables
-            let variables: any = {}
+            const variables: any = {}
             lines
                 .filter(x => x.startsWith('#define'))
                 .map(x => x.split(' ').map(v => v.trim()))
-                .forEach(([ignore, variableName, variableValue]) => {
+                .forEach(([_, variableName, variableValue]) => {
                     variables[variableName] = variableValue
                 })
 
-            let values: any = {}
+            const values: any = {}
             lines
                 .filter(x => x.startsWith('*.'))
                 .map(x => x.substring(2))
@@ -29,7 +29,7 @@ export class ColorSchemes extends TerminalColorSchemeProvider {
                     values[key] = variables[value] ? variables[value] : value
                 })
 
-            let colors: string[] = []
+            const colors: string[] = []
             let colorIndex = 0
             while (values[`color${colorIndex}`]) {
                 colors.push(values[`color${colorIndex}`])

terminus-community-color-schemes/src/index.ts

@@ -8,4 +8,4 @@ import { ColorSchemes } from './colorSchemes'
         { provide: TerminalColorSchemeProvider, useClass: ColorSchemes, multi: true },
     ],
 })
-export default class PopularThemesModule { }
+export default class PopularThemesModule { } // eslint-disable-line @typescript-eslint/no-extraneous-class

terminus-community-color-schemes/webpack.config.js

@@ -2,51 +2,54 @@ const path = require('path')
 const webpack = require('webpack')
 
 module.exports = {
-  target: 'node',
-  entry: 'src/index.ts',
-  devtool: 'eval-source-map',
-  context: __dirname,
-  output: {
-    path: path.resolve(__dirname, 'dist'),
-    filename: 'index.js',
-    pathinfo: true,
-    libraryTarget: 'umd',
-    devtoolModuleFilenameTemplate: 'webpack-terminus-community-color-schemes:///[resource-path]',
-  },
-  mode: process.env.TERMINUS_DEV ? 'development' : 'production',
-  optimization:{
-     minimize: false,
-  },
-  resolve: {
-    modules: ['.', 'src', 'node_modules', '../app/node_modules'].map(x => path.join(__dirname, x)),
-    extensions: ['.ts', '.js'],
-  },
-  module: {
-    rules: [
-      {
-        test: /\.ts$/,
-        use: {
-          loader: 'awesome-typescript-loader',
-          options: {
-            configFileName: path.resolve(__dirname, 'tsconfig.json'),
-            typeRoots: [path.resolve(__dirname, 'node_modules/@types')],
-            paths: {
-              "terminus-*": [path.resolve(__dirname, '../terminus-*')],
-              "*": [path.resolve(__dirname, '../app/node_modules/*')],
-            }
-          }
-        }
-      },
-      { test: /[\\\/]schemes[\\\/]/, use: "raw-loader" },
-    ]
-  },
-  externals: [
-    /^rxjs/,
-    /^@angular/,
-    /^@ng-bootstrap/,
-    /^terminus-/,
-  ],
-  plugins: [
-    new webpack.optimize.ModuleConcatenationPlugin(),
-  ],
+    target: 'node',
+    entry: 'src/index.ts',
+    devtool: 'source-map',
+    context: __dirname,
+    output: {
+        path: path.resolve(__dirname, 'dist'),
+        filename: 'index.js',
+        pathinfo: true,
+        libraryTarget: 'umd',
+        devtoolModuleFilenameTemplate: 'webpack-terminus-community-color-schemes:///[resource-path]',
+    },
+    mode: process.env.TERMINUS_DEV ? 'development' : 'production',
+    optimization:{
+        minimize: false,
+    },
+    resolve: {
+        modules: ['.', 'src', 'node_modules', '../app/node_modules'].map(x => path.join(__dirname, x)),
+        extensions: ['.ts', '.js'],
+    },
+    module: {
+        rules: [
+            {
+                test: /\.ts$/,
+                use: {
+                    loader: 'awesome-typescript-loader',
+                    options: {
+                        configFileName: path.resolve(__dirname, 'tsconfig.json'),
+                        typeRoots: [
+                            path.resolve(__dirname, 'node_modules/@types'),
+                            path.resolve(__dirname, '../node_modules/@types'),
+                        ],
+                        paths: {
+                            "terminus-*": [path.resolve(__dirname, '../terminus-*')],
+                            "*": [path.resolve(__dirname, '../app/node_modules/*')],
+                        },
+                    },
+                },
+            },
+            { test: /[\\\/]schemes[\\\/]/, use: "raw-loader" },
+        ],
+    },
+    externals: [
+        /^rxjs/,
+        /^@angular/,
+        /^@ng-bootstrap/,
+        /^terminus-/,
+    ],
+    plugins: [
+        new webpack.optimize.ModuleConcatenationPlugin(),
+    ],
 }

terminus-community-color-schemes/yarn.lock

@@ -2,12 +2,3 @@
 # yarn lockfile v1
 
 
-"@types/node@12.0.7":
-  version "12.0.7"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.0.7.tgz#4f2563bad652b2acb1722d7e7aae2b0ff62d192c"
-  integrity sha512-1YKeT4JitGgE4SOzyB9eMwO0nGVNkNEsm9qlIt1Lqm/tG2QEiSMTD4kS3aO6L+w5SClLVxALmIBESK6Mk5wX0A==
-
-"@types/webpack-env@^1.13.0":
-  version "1.13.9"
-  resolved "https://registry.yarnpkg.com/@types/webpack-env/-/webpack-env-1.13.9.tgz#a67287861c928ebf4159a908d1fb1a2a34d4097a"
-  integrity sha512-p8zp5xqkly3g4cCmo2mKOHI9+Z/kObmDj0BmjbDDJQlgDTiEGTbm17MEwTAusV6XceCy+bNw9q/ZHXHyKo3zkg==

terminus-core/README.md

@@ -1,7 +1,7 @@
 Terminus Core Plugin
 --------------------
 
-See also: [Settings plugin API](./settings/), [Terminal plugin API](./settings/)
+See also: [Settings plugin API](./settings/), [Terminal plugin API](./terminal/)
 
 * tabbed interface services
 * toolbar UI

terminus-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "terminus-core",
-  "version": "1.0.73-c4-ga7d62b0",
+  "version": "1.0.83-nightly.4",
   "description": "Terminus core",
   "keywords": [
     "terminus-builtin-plugin"
@@ -12,14 +12,13 @@
     "watch": "webpack --progress --color --watch"
   },
   "files": [
-    "dist"
+    "typings"
   ],
   "author": "Eugene Pankov",
   "license": "MIT",
   "devDependencies": {
     "@types/js-yaml": "^3.9.0",
-    "@types/node": "^12.0.2",
-    "@types/webpack-env": "^1.13.0",
+    "@types/shell-escape": "^0.2.0",
     "@types/winston": "^2.3.6",
     "axios": "^0.19.0",
     "bootstrap": "^4.1.3",
@@ -34,17 +33,13 @@
     "uuid": "^3.3.2",
     "winston": "^3.2.1"
   },
-  "optionalDependencies": {
-    "windows-native-registry": "^1.0.14"
-  },
   "peerDependencies": {
-    "@angular/animations": "4.0.1",
-    "@angular/common": "4.0.1",
-    "@angular/core": "4.0.1",
-    "@angular/forms": "4.0.1",
-    "@angular/platform-browser": "4.0.1",
-    "@angular/platform-browser-dynamic": "4.0.1",
-    "rxjs": "5.3.0",
-    "zone.js": "0.8.4"
+    "@angular/animations": "^7",
+    "@angular/common": "^7",
+    "@angular/core": "^7",
+    "@angular/forms": "^7",
+    "@angular/platform-browser": "^7",
+    "@angular/platform-browser-dynamic": "^7",
+    "rxjs": "^5"
   }
 }

terminus-core/src/api/hotkeyProvider.ts

@@ -1,4 +1,4 @@
-export interface IHotkeyDescription {
+export interface HotkeyDescription {
     id: string
     name: string
 }
@@ -8,7 +8,7 @@ export interface IHotkeyDescription {
  * must also provide the `hotkeys.foo` config options with the default values
  */
 export abstract class HotkeyProvider {
-    hotkeys: IHotkeyDescription[] = []
+    hotkeys: HotkeyDescription[] = []
 
-    abstract provide (): Promise<IHotkeyDescription[]>
+    abstract provide (): Promise<HotkeyDescription[]>
 }

terminus-core/src/api/index.ts

@@ -1,9 +1,9 @@
 export { BaseTabComponent, BaseTabProcess } from '../components/baseTab.component'
 export { SplitTabComponent, SplitContainer } from '../components/splitTab.component'
 export { TabRecoveryProvider, RecoveredTab } from './tabRecovery'
-export { ToolbarButtonProvider, IToolbarButton } from './toolbarButtonProvider'
+export { ToolbarButtonProvider, ToolbarButton } from './toolbarButtonProvider'
 export { ConfigProvider } from './configProvider'
-export { HotkeyProvider, IHotkeyDescription } from './hotkeyProvider'
+export { HotkeyProvider, HotkeyDescription } from './hotkeyProvider'
 export { Theme } from './theme'
 export { TabContextMenuItemProvider } from './tabContextMenuProvider'
 

terminus-core/src/api/toolbarButtonProvider.ts

@@ -1,13 +1,11 @@
-import { SafeHtml } from '@angular/platform-browser'
-
 /**
  * See [[ToolbarButtonProvider]]
  */
-export interface IToolbarButton {
+export interface ToolbarButton {
     /**
      * Raw SVG icon code
      */
-    icon: SafeHtml
+    icon: string
 
     title: string
 
@@ -25,15 +23,15 @@ export interface IToolbarButton {
 
     click?: () => void
 
-    submenu?: () => Promise<IToolbarButton[]>
+    submenu?: () => Promise<ToolbarButton[]>
 
     /** @hidden */
-    submenuItems?: IToolbarButton[]
+    submenuItems?: ToolbarButton[]
 }
 
 /**
  * Extend to add buttons to the toolbar
  */
 export abstract class ToolbarButtonProvider {
-    abstract provide (): IToolbarButton[]
+    abstract provide (): ToolbarButton[]
 }

terminus-core/src/components/appRoot.component.pug

@@ -40,7 +40,7 @@ title-bar(
                 button.btn.btn-secondary.btn-tab-bar(
                     [title]='button.title',
                     (click)='button.click && button.click()',
-                    [innerHTML]='button.icon',
+                    [innerHTML]='sanitizeIcon(button.icon)',
                     ngbDropdownToggle,
                 )
                 div(*ngIf='button.submenu', ngbDropdownMenu)
@@ -49,7 +49,7 @@ title-bar(
                         (click)='item.click()',
                         ngbDropdownItem,
                     )
-                        .icon-wrapper([innerHTML]='item.icon')
+                        .icon-wrapper([innerHTML]='sanitizeIcon(item.icon)')
                         .ml-3 {{item.title}}
 
         .drag-space.background([class.persistent]='config.store.appearance.frame == "thin" && hostApp.platform != Platform.macOS')
@@ -63,7 +63,7 @@ title-bar(
                 button.btn.btn-secondary.btn-tab-bar(
                     [title]='button.title',
                     (click)='button.click && button.click()',
-                    [innerHTML]='button.icon',
+                    [innerHTML]='sanitizeIcon(button.icon)',
                     ngbDropdownToggle,
                 )
                 div(*ngIf='button.submenu', ngbDropdownMenu)
@@ -72,14 +72,14 @@ title-bar(
                         (click)='item.click()',
                         ngbDropdownItem,
                     )
-                        .icon-wrapper([innerHTML]='item.icon')
+                        .icon-wrapper([innerHTML]='sanitizeIcon(item.icon)')
                         .ml-3 {{item.title}}
 
             button.btn.btn-secondary.btn-tab-bar.btn-update(
                 *ngIf='updatesAvailable',
                 title='Update available',
                 (click)='updateApp()',
-                [innerHTML]='updateIcon'
+                [innerHTML]='sanitizeIcon(updateIcon)'
             )
 
         window-controls.background(

terminus-core/src/components/appRoot.component.ts

@@ -1,6 +1,6 @@
 import { Component, Inject, Input, HostListener, HostBinding } from '@angular/core'
 import { trigger, style, animate, transition, state } from '@angular/animations'
-import { DomSanitizer, SafeHtml } from '@angular/platform-browser'
+import { DomSanitizer } from '@angular/platform-browser'
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
 
 import { ElectronService } from '../services/electron.service'
@@ -15,7 +15,7 @@ import { TouchbarService } from '../services/touchbar.service'
 
 import { BaseTabComponent } from './baseTab.component'
 import { SafeModeModalComponent } from './safeModeModal.component'
-import { AppService, IToolbarButton, ToolbarButtonProvider } from '../api'
+import { AppService, ToolbarButton, ToolbarButtonProvider } from '../api'
 
 /** @hidden */
 @Component({
@@ -26,47 +26,47 @@ import { AppService, IToolbarButton, ToolbarButtonProvider } from '../api'
         trigger('animateTab', [
             state('in', style({
                 'flex-basis': '200px',
-                'width': '200px',
+                width: '200px',
             })),
             transition(':enter', [
                 style({
                     'flex-basis': '1px',
-                    'width': '1px',
+                    width: '1px',
                 }),
                 animate('250ms ease-in-out', style({
                     'flex-basis': '200px',
-                    'width': '200px',
-                }))
+                    width: '200px',
+                })),
             ]),
             transition(':leave', [
                 style({
                     'flex-basis': '200px',
-                    'width': '200px',
+                    width: '200px',
                 }),
                 animate('250ms ease-in-out', style({
                     'flex-basis': '1px',
-                    'width': '1px',
-                }))
-            ])
-        ])
-    ]
+                    width: '1px',
+                })),
+            ]),
+        ]),
+    ],
 })
 export class AppRootComponent {
     Platform = Platform
     @Input() ready = false
-    @Input() leftToolbarButtons: IToolbarButton[]
-    @Input() rightToolbarButtons: IToolbarButton[]
+    @Input() leftToolbarButtons: ToolbarButton[]
+    @Input() rightToolbarButtons: ToolbarButton[]
     @HostBinding('class.platform-win32') platformClassWindows = process.platform === 'win32'
     @HostBinding('class.platform-darwin') platformClassMacOS = process.platform === 'darwin'
     @HostBinding('class.platform-linux') platformClassLinux = process.platform === 'linux'
     @HostBinding('class.no-tabs') noTabs = true
     tabsDragging = false
     unsortedTabs: BaseTabComponent[] = []
-    updateIcon: SafeHtml
+    updateIcon: string
     updatesAvailable = false
     private logger: Logger
 
-    constructor (
+    private constructor (
         private docking: DockingService,
         private electron: ElectronService,
         private hotkeys: HotkeysService,
@@ -75,10 +75,10 @@ export class AppRootComponent {
         public hostApp: HostAppService,
         public config: ConfigService,
         public app: AppService,
+        private domSanitizer: DomSanitizer,
         @Inject(ToolbarButtonProvider) private toolbarButtonProviders: ToolbarButtonProvider[],
         log: LogService,
         ngbModal: NgbModal,
-        domSanitizer: DomSanitizer,
         _themes: ThemesService,
     ) {
         this.logger = log.create('main')
@@ -87,11 +87,11 @@ export class AppRootComponent {
         this.leftToolbarButtons = this.getToolbarButtons(false)
         this.rightToolbarButtons = this.getToolbarButtons(true)
 
-        this.updateIcon = domSanitizer.bypassSecurityTrustHtml(require('../icons/gift.svg')),
+        this.updateIcon = require('../icons/gift.svg')
 
-        this.hotkeys.matchedHotkey.subscribe((hotkey) => {
+        this.hotkeys.matchedHotkey.subscribe((hotkey: string) => {
             if (hotkey.startsWith('tab-')) {
-                let index = parseInt(hotkey.split('-')[1])
+                const index = parseInt(hotkey.split('-')[1])
                 if (index <= this.app.tabs.length) {
                     this.app.selectTab(this.app.tabs[index - 1])
                 }
@@ -233,20 +233,24 @@ export class AppRootComponent {
         })
     }
 
-    async generateButtonSubmenu (button: IToolbarButton) {
+    async generateButtonSubmenu (button: ToolbarButton) {
         if (button.submenu) {
             button.submenuItems = await button.submenu()
         }
     }
 
-    private getToolbarButtons (aboveZero: boolean): IToolbarButton[] {
-        let buttons: IToolbarButton[] = []
+    sanitizeIcon (icon: string): any {
+        return this.domSanitizer.bypassSecurityTrustHtml(icon || '')
+    }
+
+    private getToolbarButtons (aboveZero: boolean): ToolbarButton[] {
+        let buttons: ToolbarButton[] = []
         this.config.enabledServices(this.toolbarButtonProviders).forEach(provider => {
             buttons = buttons.concat(provider.provide())
         })
         return buttons
-            .filter((button) => (button.weight > 0) === aboveZero)
-            .sort((a: IToolbarButton, b: IToolbarButton) => (a.weight || 0) - (b.weight || 0))
+            .filter(button => button.weight > 0 === aboveZero)
+            .sort((a: ToolbarButton, b: ToolbarButton) => (a.weight || 0) - (b.weight || 0))
     }
 
     private updateVibrancy () {

terminus-core/src/components/checkbox.component.ts

@@ -8,7 +8,7 @@ import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'
     styles: [require('./checkbox.component.scss')],
     providers: [
         { provide: NG_VALUE_ACCESSOR, useExisting: CheckboxComponent, multi: true },
-    ]
+    ],
 })
 export class CheckboxComponent implements ControlValueAccessor {
     @HostBinding('class.active') @Input() model: boolean
@@ -23,7 +23,7 @@ export class CheckboxComponent implements ControlValueAccessor {
         }
 
         this.model = !this.model
-        for (let fx of this.changed) {
+        for (const fx of this.changed) {
             fx(this.model)
         }
     }

terminus-core/src/components/splitTab.component.ts

@@ -6,8 +6,8 @@ import { TabsService } from '../services/tabs.service'
 import { HotkeysService } from '../services/hotkeys.service'
 import { TabRecoveryService } from '../services/tabRecovery.service'
 
-export declare type SplitOrientation = 'v' | 'h'
-export declare type SplitDirection = 'r' | 't' | 'b' | 'l'
+export type SplitOrientation = 'v' | 'h' // eslint-disable-line @typescript-eslint/no-type-alias
+export type SplitDirection = 'r' | 't' | 'b' | 'l' // eslint-disable-line @typescript-eslint/no-type-alias
 
 /**
  * Describes a horizontal or vertical split row or column
@@ -35,7 +35,7 @@ export class SplitContainer {
      */
     getAllTabs () {
         let r = []
-        for (let child of this.children) {
+        for (const child of this.children) {
             if (child instanceof SplitContainer) {
                 r = r.concat(child.getAllTabs())
             } else {
@@ -50,7 +50,7 @@ export class SplitContainer {
      */
     normalize () {
         for (let i = 0; i < this.children.length; i++) {
-            let child = this.children[i]
+            const child = this.children[i]
 
             if (child instanceof SplitContainer) {
                 child.normalize()
@@ -63,7 +63,7 @@ export class SplitContainer {
                 } else if (child.children.length === 1) {
                     this.children[i] = child.children[0]
                 } else if (child.orientation === this.orientation) {
-                    let ratio = this.ratios[i]
+                    const ratio = this.ratios[i]
                     this.children.splice(i, 1)
                     this.ratios.splice(i, 1)
                     for (let j = 0; j < child.children.length; j++) {
@@ -76,7 +76,7 @@ export class SplitContainer {
         }
 
         let s = 0
-        for (let x of this.ratios) {
+        for (const x of this.ratios) {
             s += x
         }
         this.ratios = this.ratios.map(x => x / s)
@@ -94,8 +94,8 @@ export class SplitContainer {
     }
 
     async serialize () {
-        let children = []
-        for (let child of this.children) {
+        const children = []
+        for (const child of this.children) {
             if (child instanceof SplitContainer) {
                 children.push(await child.serialize())
             } else {
@@ -189,7 +189,11 @@ export class SplitTabComponent extends BaseTabComponent implements OnInit, OnDes
 
         this.focused$.subscribe(() => {
             this.getAllTabs().forEach(x => x.emitFocused())
-            this.focus(this.focusedTab)
+            if (this.focusedTab) {
+                this.focus(this.focusedTab)
+            } else {
+                this.focusAnyIn(this.root)
+            }
         })
         this.blurred$.subscribe(() => this.getAllTabs().forEach(x => x.emitBlurred()))
 
@@ -198,33 +202,33 @@ export class SplitTabComponent extends BaseTabComponent implements OnInit, OnDes
                 return
             }
             switch (hotkey) {
-            case 'split-right':
-                this.splitTab(this.focusedTab, 'r')
-                break
-            case 'split-bottom':
-                this.splitTab(this.focusedTab, 'b')
-                break
-            case 'split-top':
-                this.splitTab(this.focusedTab, 't')
-                break
-            case 'split-left':
-                this.splitTab(this.focusedTab, 'l')
-                break
-            case 'pane-nav-left':
-                this.navigate('l')
-                break
-            case 'pane-nav-right':
-                this.navigate('r')
-                break
-            case 'pane-nav-up':
-                this.navigate('t')
-                break
-            case 'pane-nav-down':
-                this.navigate('b')
-                break
-            case 'close-pane':
-                this.removeTab(this.focusedTab)
-                break
+                case 'split-right':
+                    this.splitTab(this.focusedTab, 'r')
+                    break
+                case 'split-bottom':
+                    this.splitTab(this.focusedTab, 'b')
+                    break
+                case 'split-top':
+                    this.splitTab(this.focusedTab, 't')
+                    break
+                case 'split-left':
+                    this.splitTab(this.focusedTab, 'l')
+                    break
+                case 'pane-nav-left':
+                    this.navigate('l')
+                    break
+                case 'pane-nav-right':
+                    this.navigate('r')
+                    break
+                case 'pane-nav-up':
+                    this.navigate('t')
+                    break
+                case 'pane-nav-down':
+                    this.navigate('b')
+                    break
+                case 'close-pane':
+                    this.removeTab(this.focusedTab)
+                    break
             }
         })
     }
@@ -235,8 +239,10 @@ export class SplitTabComponent extends BaseTabComponent implements OnInit, OnDes
             await this.recoverContainer(this.root, this._recoveredState)
             this.layout()
             setImmediate(() => {
-                this.getAllTabs().forEach(x => x.emitFocused())
-                this.focusAnyIn(this.root)
+                if (this.hasFocus) {
+                    this.getAllTabs().forEach(x => x.emitFocused())
+                    this.focusAnyIn(this.root)
+                }
             })
         }
     }
@@ -257,7 +263,7 @@ export class SplitTabComponent extends BaseTabComponent implements OnInit, OnDes
 
     focus (tab: BaseTabComponent) {
         this.focusedTab = tab
-        for (let x of this.getAllTabs()) {
+        for (const x of this.getAllTabs()) {
             if (x !== tab) {
                 x.emitBlurred()
             }
@@ -291,11 +297,11 @@ export class SplitTabComponent extends BaseTabComponent implements OnInit, OnDes
         let insertIndex = target.children.indexOf(relative)
 
         if (
-            (target.orientation === 'v' && ['l', 'r'].includes(side)) ||
-            (target.orientation === 'h' && ['t', 'b'].includes(side))
+            target.orientation === 'v' && ['l', 'r'].includes(side) ||
+            target.orientation === 'h' && ['t', 'b'].includes(side)
         ) {
-            let newContainer = new SplitContainer()
-            newContainer.orientation = (target.orientation === 'v') ? 'h' : 'v'
+            const newContainer = new SplitContainer()
+            newContainer.orientation = target.orientation === 'v' ? 'h' : 'v'
             newContainer.children = [relative]
             newContainer.ratios = [1]
             target.children[insertIndex] = newContainer
@@ -306,7 +312,7 @@ export class SplitTabComponent extends BaseTabComponent implements OnInit, OnDes
         if (insertIndex === -1) {
             insertIndex = 0
         } else {
-            insertIndex += (side === 'l' || side === 't') ? 0 : 1
+            insertIndex += side === 'l' || side === 't' ? 0 : 1
         }
 
         for (let i = 0; i < target.children.length; i++) {
@@ -326,8 +332,8 @@ export class SplitTabComponent extends BaseTabComponent implements OnInit, OnDes
     }
 
     removeTab (tab: BaseTabComponent) {
-        let parent = this.getParentOf(tab)
-        let index = parent.children.indexOf(tab)
+        const parent = this.getParentOf(tab)
+        const index = parent.children.indexOf(tab)
         parent.ratios.splice(index, 1)
         parent.children.splice(index, 1)
 
@@ -350,7 +356,7 @@ export class SplitTabComponent extends BaseTabComponent implements OnInit, OnDes
     navigate (dir: SplitDirection) {
         let rel: BaseTabComponent | SplitContainer = this.focusedTab
         let parent = this.getParentOf(rel)
-        let orientation = ['l', 'r'].includes(dir) ? 'h' : 'v'
+        const orientation = ['l', 'r'].includes(dir) ? 'h' : 'v'
 
         while (parent !== this.root && parent.orientation !== orientation) {
             rel = parent
@@ -361,7 +367,7 @@ export class SplitTabComponent extends BaseTabComponent implements OnInit, OnDes
             return
         }
 
-        let index = parent.children.indexOf(rel)
+        const index = parent.children.indexOf(rel)
         if (['l', 't'].includes(dir)) {
             if (index > 0) {
                 this.focusAnyIn(parent.children[index - 1])
@@ -374,7 +380,7 @@ export class SplitTabComponent extends BaseTabComponent implements OnInit, OnDes
     }
 
     async splitTab (tab: BaseTabComponent, dir: SplitDirection) {
-        let newTab = await this.tabsService.duplicate(tab)
+        const newTab = await this.tabsService.duplicate(tab)
         this.addTab(newTab, tab, dir)
     }
 
@@ -383,9 +389,9 @@ export class SplitTabComponent extends BaseTabComponent implements OnInit, OnDes
      */
     getParentOf (tab: BaseTabComponent | SplitContainer, root?: SplitContainer): SplitContainer {
         root = root || this.root
-        for (let child of root.children) {
+        for (const child of root.children) {
             if (child instanceof SplitContainer) {
-                let r = this.getParentOf(tab, child)
+                const r = this.getParentOf(tab, child)
                 if (r) {
                     return r
                 }
@@ -419,7 +425,7 @@ export class SplitTabComponent extends BaseTabComponent implements OnInit, OnDes
     }
 
     private attachTabView (tab: BaseTabComponent) {
-        let ref = this.viewContainer.insert(tab.hostView) as EmbeddedViewRef<any>
+        const ref = this.viewContainer.insert(tab.hostView) as EmbeddedViewRef<any> // eslint-disable-line @typescript-eslint/no-unnecessary-type-assertion
         this.viewRefs.set(tab, ref)
 
         ref.rootNodes[0].addEventListener('click', () => this.focus(tab))
@@ -436,7 +442,7 @@ export class SplitTabComponent extends BaseTabComponent implements OnInit, OnDes
     }
 
     private detachTabView (tab: BaseTabComponent) {
-        let ref = this.viewRefs.get(tab)
+        const ref = this.viewRefs.get(tab)
         this.viewRefs.delete(tab)
         this.viewContainer.remove(this.viewContainer.indexOf(ref))
     }
@@ -448,8 +454,8 @@ export class SplitTabComponent extends BaseTabComponent implements OnInit, OnDes
     }
 
     private layoutInternal (root: SplitContainer, x: number, y: number, w: number, h: number) {
-        let size = (root.orientation === 'v') ? h : w
-        let sizes = root.ratios.map(x => x * size)
+        const size = root.orientation === 'v' ? h : w
+        const sizes = root.ratios.map(x => x * size)
 
         root.x = x
         root.y = y
@@ -458,21 +464,21 @@ export class SplitTabComponent extends BaseTabComponent implements OnInit, OnDes
 
         let offset = 0
         root.children.forEach((child, i) => {
-            let childX = (root.orientation === 'v') ? x : (x + offset)
-            let childY = (root.orientation === 'v') ? (y + offset) : y
-            let childW = (root.orientation === 'v') ? w : sizes[i]
-            let childH = (root.orientation === 'v') ? sizes[i] : h
+            const childX = root.orientation === 'v' ? x : x + offset
+            const childY = root.orientation === 'v' ? y + offset : y
+            const childW = root.orientation === 'v' ? w : sizes[i]
+            const childH = root.orientation === 'v' ? sizes[i] : h
             if (child instanceof SplitContainer) {
                 this.layoutInternal(child, childX, childY, childW, childH)
             } else {
-                let element = this.viewRefs.get(child).rootNodes[0]
+                const element = this.viewRefs.get(child).rootNodes[0]
                 element.style.position = 'absolute'
                 element.style.left = `${childX}%`
                 element.style.top = `${childY}%`
                 element.style.width = `${childW}%`
                 element.style.height = `${childH}%`
 
-                element.style.opacity = (child === this.focusedTab) ? 1 : 0.75
+                element.style.opacity = child === this.focusedTab ? 1 : 0.75
             }
             offset += sizes[i]
 
@@ -486,19 +492,19 @@ export class SplitTabComponent extends BaseTabComponent implements OnInit, OnDes
     }
 
     private async recoverContainer (root: SplitContainer, state: any) {
-        let children: (SplitContainer | BaseTabComponent)[] = []
+        const children: (SplitContainer | BaseTabComponent)[] = []
         root.orientation = state.orientation
         root.ratios = state.ratios
         root.children = children
-        for (let childState of state.children) {
+        for (const childState of state.children) {
             if (childState.type === 'app:split-tab') {
-                let child = new SplitContainer()
+                const child = new SplitContainer()
                 await this.recoverContainer(child, childState)
                 children.push(child)
             } else {
-                let recovered = await this.tabRecovery.recoverTab(childState)
+                const recovered = await this.tabRecovery.recoverTab(childState)
                 if (recovered) {
-                    let tab = this.tabsService.create(recovered.type, recovered.options)
+                    const tab = this.tabsService.create(recovered.type, recovered.options)
                     children.push(tab)
                     this.attachTabView(tab)
                 } else {

terminus-core/src/components/splitTabSpanner.component.ts

@@ -23,15 +23,15 @@ export class SplitTabSpannerComponent {
     constructor (private element: ElementRef) { }
 
     ngAfterViewInit () {
-        this.element.nativeElement.addEventListener('mousedown', e => {
+        this.element.nativeElement.addEventListener('mousedown', (e: MouseEvent) => {
             this.isActive = true
-            let start = this.isVertical ? e.pageY : e.pageX
+            const start = this.isVertical ? e.pageY : e.pageX
             let current = start
-            let oldPosition = this.isVertical ? this.element.nativeElement.offsetTop : this.element.nativeElement.offsetLeft
+            const oldPosition: number = this.isVertical ? this.element.nativeElement.offsetTop : this.element.nativeElement.offsetLeft
 
-            const dragHandler = e => {
+            const dragHandler = (e: MouseEvent) => {
                 current = this.isVertical ? e.pageY : e.pageX
-                let newPosition = oldPosition + (current - start)
+                const newPosition = oldPosition + (current - start)
                 if (this.isVertical) {
                     this.element.nativeElement.style.top = `${newPosition - this.marginOffset}px`
                 } else {

terminus-core/src/components/startPage.component.pug

@@ -8,7 +8,7 @@ div
             *ngFor='let button of getButtons()',
             (click)='button.click()',
         )
-            .d-flex.align-self-center([innerHTML]='button.icon')
+            .d-flex.align-self-center([innerHTML]='sanitizeIcon(button.icon)')
             span {{button.title}}
 
 footer.d-flex.align-items-center

terminus-core/src/components/startPage.component.scss

@@ -2,7 +2,6 @@
     display: flex;
     flex-direction: column;
     flex: auto;
-    -webkit-app-region: drag;
     overflow-y: auto;
 }
 
@@ -25,10 +24,6 @@ footer {
     background: rgba(0,0,0,.5);
 }
 
-a, button {
-    -webkit-app-region: no-drag;
-}
-
 .list-group-item ::ng-deep svg {
     width: 16px;
     height: 16px;

terminus-core/src/components/startPage.component.ts

@@ -1,7 +1,8 @@
 import { Component, Inject } from '@angular/core'
+import { DomSanitizer } from '@angular/platform-browser'
 import { ConfigService } from '../services/config.service'
 import { HomeBaseService } from '../services/homeBase.service'
-import { IToolbarButton, ToolbarButtonProvider } from '../api'
+import { ToolbarButton, ToolbarButtonProvider } from '../api'
 
 /** @hidden */
 @Component({
@@ -14,16 +15,21 @@ export class StartPageComponent {
 
     constructor (
         private config: ConfigService,
+        private domSanitizer: DomSanitizer,
         public homeBase: HomeBaseService,
         @Inject(ToolbarButtonProvider) private toolbarButtonProviders: ToolbarButtonProvider[],
     ) {
     }
 
-    getButtons (): IToolbarButton[] {
+    getButtons (): ToolbarButton[] {
         return this.config.enabledServices(this.toolbarButtonProviders)
             .map(provider => provider.provide())
             .reduce((a, b) => a.concat(b))
             .filter(x => !!x.click)
-            .sort((a: IToolbarButton, b: IToolbarButton) => (a.weight || 0) - (b.weight || 0))
+            .sort((a: ToolbarButton, b: ToolbarButton) => (a.weight || 0) - (b.weight || 0))
+    }
+
+    sanitizeIcon (icon: string): any {
+        return this.domSanitizer.bypassSecurityTrustHtml(icon || '')
     }
 }

terminus-core/src/components/tabHeader.component.ts

@@ -9,6 +9,11 @@ import { ElectronService } from '../services/electron.service'
 import { AppService } from '../services/app.service'
 import { HostAppService, Platform } from '../services/hostApp.service'
 
+/** @hidden */
+export interface ISortableComponent {
+    setDragHandle (_: HTMLElement)
+}
+
 /** @hidden */
 @Component({
     selector: 'tab-header',
@@ -23,13 +28,13 @@ export class TabHeaderComponent {
     @Input() progress: number
     @ViewChild('handle') handle: ElementRef
 
-    constructor (
+    private constructor (
         public app: AppService,
         private electron: ElectronService,
         private hostApp: HostAppService,
         private ngbModal: NgbModal,
         private hotkeys: HotkeysService,
-        private parentDraggable: SortableComponent,
+        @Inject(SortableComponent) private parentDraggable: ISortableComponent,
         @Optional() @Inject(TabContextMenuItemProvider) protected contextMenuProviders: TabContextMenuItemProvider[],
     ) {
         this.hotkeys.matchedHotkey.subscribe((hotkey) => {
@@ -52,7 +57,7 @@ export class TabHeaderComponent {
     }
 
     showRenameTabModal (): void {
-        let modal = this.ngbModal.open(RenameTabModalComponent)
+        const modal = this.ngbModal.open(RenameTabModalComponent)
         modal.componentInstance.value = this.tab.customTitle || this.tab.title
         modal.result.then(result => {
             this.tab.setTitle(result)
@@ -62,7 +67,7 @@ export class TabHeaderComponent {
 
     async buildContextMenu (): Promise<Electron.MenuItemConstructorOptions[]> {
         let items: Electron.MenuItemConstructorOptions[] = []
-        for (let section of await Promise.all(this.contextMenuProviders.map(x => x.getItems(this.tab, this)))) {
+        for (const section of await Promise.all(this.contextMenuProviders.map(x => x.getItems(this.tab, this)))) {
             items.push({ type: 'separator' })
             items = items.concat(section)
         }
@@ -85,7 +90,6 @@ export class TabHeaderComponent {
             contextMenu.popup({
                 x: $event.pageX,
                 y: $event.pageY,
-                async: true,
             })
         }
     }

terminus-core/src/components/titleBar.component.ts

@@ -6,4 +6,4 @@ import { Component } from '@angular/core'
     template: require('./titleBar.component.pug'),
     styles: [require('./titleBar.component.scss')],
 })
-export class TitleBarComponent { }
+export class TitleBarComponent { } // eslint-disable-line @typescript-eslint/no-extraneous-class

terminus-core/src/components/toggle.component.ts

@@ -17,7 +17,7 @@ import { CheckboxComponent } from './checkbox.component'
     styles: [require('./toggle.component.scss')],
     providers: [
         { provide: NG_VALUE_ACCESSOR, useExisting: ToggleComponent, multi: true },
-    ]
+    ],
 })
 export class ToggleComponent extends CheckboxComponent {
 }

terminus-core/src/configDefaults.linux.yaml

@@ -11,10 +11,10 @@ hotkeys:
   rename-tab:
     - 'Ctrl-Shift-R'
   next-tab:
-    - 'Ctrl-Shift-ArrowRight'
+    - 'Ctrl-Shift-Right'
     - 'Ctrl-Tab'
   previous-tab:
-    - 'Ctrl-Shift-ArrowLeft'
+    - 'Ctrl-Shift-Left'
     - 'Ctrl-Shift-Tab'
   tab-1:
     - 'Alt-1'
@@ -43,12 +43,12 @@ hotkeys:
   split-left: []
   split-top: []
   pane-nav-right:
-    - 'Ctrl-Alt-ArrowRight'
+    - 'Ctrl-Alt-Right'
   pane-nav-down:
-    - 'Ctrl-Alt-ArrowDown'
+    - 'Ctrl-Alt-Down'
   pane-nav-up:
-    - 'Ctrl-Alt-ArrowUp'
+    - 'Ctrl-Alt-Up'
   pane-nav-left:
-    - 'Ctrl-Alt-ArrowLeft'
+    - 'Ctrl-Alt-Left'
   close-pane: []
 pluginBlacklist: ['ssh']

terminus-core/src/configDefaults.macos.yaml

@@ -41,13 +41,13 @@ hotkeys:
   split-left: []
   split-top: []
   pane-nav-right:
-    - '⌘-⌥-ArrowRight'
+    - '⌘-⌥-Right'
   pane-nav-down:
-    - '⌘-⌥-ArrowDown'
+    - '⌘-⌥-Down'
   pane-nav-up:
-    - '⌘-⌥-ArrowUp'
+    - '⌘-⌥-Up'
   pane-nav-left:
-    - '⌘-⌥-ArrowLeft'
+    - '⌘-⌥-Left'
   close-pane:
     - '⌘-Shift-W'
 pluginBlacklist: ['ssh']

terminus-core/src/configDefaults.windows.yaml

@@ -11,10 +11,10 @@ hotkeys:
   rename-tab:
     - 'Ctrl-Shift-R'
   next-tab:
-    - 'Ctrl-Shift-ArrowRight'
+    - 'Ctrl-Shift-Right'
     - 'Ctrl-Tab'
   previous-tab:
-    - 'Ctrl-Shift-ArrowLeft'
+    - 'Ctrl-Shift-Left'
     - 'Ctrl-Shift-Tab'
   tab-1:
     - 'Alt-1'
@@ -43,12 +43,12 @@ hotkeys:
   split-left: []
   split-top: []
   pane-nav-right:
-    - 'Ctrl-Alt-ArrowRight'
+    - 'Ctrl-Alt-Right'
   pane-nav-down:
-    - 'Ctrl-Alt-ArrowDown'
+    - 'Ctrl-Alt-Down'
   pane-nav-up:
-    - 'Ctrl-Alt-ArrowUp'
+    - 'Ctrl-Alt-Up'
   pane-nav-left:
-    - 'Ctrl-Alt-ArrowLeft'
+    - 'Ctrl-Alt-Left'
   close-pane: []
 pluginBlacklist: []

terminus-core/src/configDefaults.yaml

@@ -1,7 +1,7 @@
 appearance:
   dock: off
   dockScreen: current
-  dockFill: 50
+  dockFill: 0.5
   tabsLocation: top
   cycleTabs: true
   theme: Standard
@@ -12,3 +12,5 @@ appearance:
   vibrancyType: 'blur'
 enableAnalytics: true
 enableWelcomeTab: true
+electronFlags:
+  - ['force_discrete_gpu', '0']

terminus-core/src/directives/autofocus.directive.ts

@@ -2,7 +2,7 @@ import { Directive, AfterViewInit, ElementRef } from '@angular/core'
 
 /** @hidden */
 @Directive({
-    selector: '[autofocus]'
+    selector: '[autofocus]',
 })
 export class AutofocusDirective implements AfterViewInit {
     constructor (private el: ElementRef) { }

terminus-core/src/hotkeys.ts

@@ -1,10 +1,10 @@
 import { Injectable } from '@angular/core'
-import { IHotkeyDescription, HotkeyProvider } from './api/hotkeyProvider'
+import { HotkeyDescription, HotkeyProvider } from './api/hotkeyProvider'
 
 /** @hidden */
 @Injectable()
 export class AppHotkeyProvider extends HotkeyProvider {
-    hotkeys: IHotkeyDescription[] = [
+    hotkeys: HotkeyDescription[] = [
         {
             id: 'new-window',
             name: 'New window',
@@ -115,7 +115,7 @@ export class AppHotkeyProvider extends HotkeyProvider {
         },
     ]
 
-    async provide (): Promise<IHotkeyDescription[]> {
+    async provide (): Promise<HotkeyDescription[]> {
         return this.hotkeys
     }
 }

terminus-core/src/index.ts

@@ -39,6 +39,12 @@ import { TaskCompletionContextMenu, CommonOptionsContextMenu, CloseContextMenu }
 import 'perfect-scrollbar/css/perfect-scrollbar.css'
 import 'ng2-dnd/bundles/style.css'
 
+// PerfectScrollbar fix
+import { fromEvent } from 'rxjs/internal/observable/fromEvent'
+import { merge } from 'rxjs/internal/observable/merge'
+require('rxjs').fromEvent = fromEvent
+require('rxjs').merge = merge
+
 const PROVIDERS = [
     { provide: HotkeyProvider, useClass: AppHotkeyProvider, multi: true },
     { provide: Theme, useClass: StandardTheme, multi: true },
@@ -49,7 +55,7 @@ const PROVIDERS = [
     { provide: TabContextMenuItemProvider, useClass: CloseContextMenu, multi: true },
     { provide: TabContextMenuItemProvider, useClass: TaskCompletionContextMenu, multi: true },
     { provide: TabRecoveryProvider, useClass: SplitTabRecoveryProvider, multi: true },
-    { provide: PERFECT_SCROLLBAR_CONFIG, useValue: { suppressScrollX: true } }
+    { provide: PERFECT_SCROLLBAR_CONFIG, useValue: { suppressScrollX: true } },
 ]
 
 /** @hidden */
@@ -63,7 +69,7 @@ const PROVIDERS = [
         DndModule.forRoot(),
     ],
     declarations: [
-        AppRootComponent,
+        AppRootComponent as any,
         CheckboxComponent,
         StartPageComponent,
         TabBodyComponent,
@@ -88,9 +94,9 @@ const PROVIDERS = [
         CheckboxComponent,
         ToggleComponent,
         AutofocusDirective,
-    ]
+    ],
 })
-export default class AppModule {
+export default class AppModule { // eslint-disable-line @typescript-eslint/no-extraneous-class
     constructor (app: AppService, config: ConfigService) {
         app.ready$.subscribe(() => {
             if (config.store.enableWelcomeTab) {
@@ -107,11 +113,9 @@ export default class AppModule {
     }
 }
 
-// PerfectScrollbar fix
-import { fromEvent } from 'rxjs/internal/observable/fromEvent'
-import { merge } from 'rxjs/internal/observable/merge'
-require('rxjs').fromEvent = fromEvent
-require('rxjs').merge = merge
-
 export { AppRootComponent as bootstrap }
 export * from './api'
+
+// Deprecations
+export { ToolbarButton as IToolbarButton } from './api'
+export { HotkeyDescription as IHotkeyDescription } from './api'

terminus-core/src/services/app.service.ts

@@ -21,7 +21,7 @@ class CompletionObserver {
     }
 
     async tick () {
-        if (!(await this.tab.getCurrentProcess())) {
+        if (!await this.tab.getCurrentProcess()) {
             this.done.next(null)
             this.stop()
         }
@@ -68,7 +68,7 @@ export class AppService {
         private tabsService: TabsService,
     ) {
         this.tabRecovery.recoverTabs().then(tabs => {
-            for (let tab of tabs) {
+            for (const tab of tabs) {
                 this.openNewTabRaw(tab.type, tab.options)
             }
 
@@ -81,7 +81,7 @@ export class AppService {
         })
     }
 
-    private addTabRaw (tab: BaseTabComponent) {
+    addTabRaw (tab: BaseTabComponent) {
         this.tabs.push(tab)
         this.selectTab(tab)
         this.tabsChanged.next()
@@ -98,7 +98,7 @@ export class AppService {
         })
 
         tab.destroyed$.subscribe(() => {
-            let newIndex = Math.max(0, this.tabs.indexOf(tab) - 1)
+            const newIndex = Math.max(0, this.tabs.indexOf(tab) - 1)
             this.tabs = this.tabs.filter((x) => x !== tab)
             if (tab === this._activeTab) {
                 this.selectTab(this.tabs[newIndex])
@@ -113,7 +113,7 @@ export class AppService {
      * @param inputs  Properties to be assigned on the new tab component instance
      */
     openNewTabRaw (type: TabComponentType, inputs?: any): BaseTabComponent {
-        let tab = this.tabsService.create(type, inputs)
+        const tab = this.tabsService.create(type, inputs)
         this.addTabRaw(tab)
         return tab
     }
@@ -123,8 +123,8 @@ export class AppService {
      * @param inputs  Properties to be assigned on the new tab component instance
      */
     openNewTab (type: TabComponentType, inputs?: any): BaseTabComponent {
-        let splitTab = this.tabsService.create(SplitTabComponent) as SplitTabComponent
-        let tab = this.tabsService.create(type, inputs)
+        const splitTab = this.tabsService.create(SplitTabComponent) as SplitTabComponent
+        const tab = this.tabsService.create(type, inputs)
         splitTab.addTab(tab, null, 'r')
         this.addTabRaw(splitTab)
         return tab
@@ -164,7 +164,7 @@ export class AppService {
 
     nextTab () {
         if (this.tabs.length > 1) {
-            let tabIndex = this.tabs.indexOf(this._activeTab)
+            const tabIndex = this.tabs.indexOf(this._activeTab)
             if (tabIndex < this.tabs.length - 1) {
                 this.selectTab(this.tabs[tabIndex + 1])
             } else if (this.config.store.appearance.cycleTabs) {
@@ -175,7 +175,7 @@ export class AppService {
 
     previousTab () {
         if (this.tabs.length > 1) {
-            let tabIndex = this.tabs.indexOf(this._activeTab)
+            const tabIndex = this.tabs.indexOf(this._activeTab)
             if (tabIndex > 0) {
                 this.selectTab(this.tabs[tabIndex - 1])
             } else if (this.config.store.appearance.cycleTabs) {
@@ -200,19 +200,19 @@ export class AppService {
     }
 
     async duplicateTab (tab: BaseTabComponent) {
-        let dup = await this.tabsService.duplicate(tab)
+        const dup = await this.tabsService.duplicate(tab)
         if (dup) {
             this.addTabRaw(dup)
         }
     }
 
     async closeAllTabs () {
-        for (let tab of this.tabs) {
+        for (const tab of this.tabs) {
             if (!await tab.canClose()) {
                 return
             }
         }
-        for (let tab of this.tabs) {
+        for (const tab of this.tabs) {
             tab.destroy()
         }
     }
@@ -230,7 +230,7 @@ export class AppService {
      */
     observeTabCompletion (tab: BaseTabComponent): Observable<void> {
         if (!this.completionObservers.has(tab)) {
-            let observer = new CompletionObserver(tab)
+            const observer = new CompletionObserver(tab)
             observer.destroyed$.subscribe(() => {
                 this.stopObservingTabCompletion(tab)
             })

terminus-core/src/services/config.service.ts

@@ -14,19 +14,19 @@ function isStructuralMember (v) {
         Object.keys(v).length > 0 && !v.__nonStructural
 }
 
-function isNonStructuralObjectMember (v) {
+function isNonStructuralObjectMember (v): boolean {
     return v instanceof Object && !(v instanceof Array) && v.__nonStructural
 }
 
 /** @hidden */
 export class ConfigProxy {
     constructor (real: any, defaults: any) {
-        for (let key in defaults) {
+        for (const key in defaults) {
             if (isStructuralMember(defaults[key])) {
                 if (!real[key]) {
                     real[key] = {}
                 }
-                let proxy = new ConfigProxy(real[key], defaults[key])
+                const proxy = new ConfigProxy(real[key], defaults[key])
                 Object.defineProperty(
                     this,
                     key,
@@ -46,13 +46,13 @@ export class ConfigProxy {
                         get: () => this.getValue(key),
                         set: (value) => {
                             this.setValue(key, value)
-                        }
+                        },
                     }
                 )
             }
         }
 
-        this.getValue = (key: string) => {
+        this.getValue = (key: string) => { // eslint-disable-line @typescript-eslint/unbound-method
             if (real[key] !== undefined) {
                 return real[key]
             } else {
@@ -66,13 +66,13 @@ export class ConfigProxy {
             }
         }
 
-        this.setValue = (key: string, value: any) => {
+        this.setValue = (key: string, value: any) => { // eslint-disable-line @typescript-eslint/unbound-method
             real[key] = value
         }
     }
 
-    getValue (key: string): any { } // tslint:disable-line
-    setValue (key: string, value: any) { } // tslint:disable-line
+    getValue (_key: string): any { }
+    setValue (_key: string, _value: any) { }
 }
 
 @Injectable({ providedIn: 'root' })
@@ -160,10 +160,6 @@ export class ConfigService {
         this.emitChange()
     }
 
-    private emitChange (): void {
-        this.changed.next()
-    }
-
     requestRestart (): void {
         this.restartRequested = true
     }
@@ -177,9 +173,9 @@ export class ConfigService {
     enabledServices<T> (services: T[]): T[] {
         if (!this.servicesCache) {
             this.servicesCache = {}
-            let ngModule = window['rootModule'].ngInjectorDef
-            for (let imp of ngModule.imports) {
-                let module = (imp['ngModule'] || imp)
+            const ngModule = window['rootModule'].ngInjectorDef
+            for (const imp of ngModule.imports) {
+                const module = imp['ngModule'] || imp
                 if (module.ngInjectorDef && module.ngInjectorDef.providers) {
                     this.servicesCache[module['pluginName']] = module.ngInjectorDef.providers.map(provider => {
                         return provider['useClass'] || provider
@@ -188,7 +184,7 @@ export class ConfigService {
             }
         }
         return services.filter(service => {
-            for (let pluginName in this.servicesCache) {
+            for (const pluginName in this.servicesCache) {
                 if (this.servicesCache[pluginName].includes(service.constructor)) {
                     return !this.store.pluginBlacklist.includes(pluginName)
                 }
@@ -196,4 +192,8 @@ export class ConfigService {
             return true
         })
     }
+
+    private emitChange (): void {
+        this.changed.next()
+    }
 }

terminus-core/src/services/docking.service.ts

@@ -3,11 +3,6 @@ import { ConfigService } from '../services/config.service'
 import { ElectronService } from '../services/electron.service'
 import { HostAppService, Bounds } from '../services/hostApp.service'
 
-export interface IScreen {
-    id: string
-    name: string
-}
-
 @Injectable({ providedIn: 'root' })
 export class DockingService {
     /** @hidden */
@@ -21,7 +16,7 @@ export class DockingService {
     }
 
     dock () {
-        let dockSide = this.config.store.appearance.dock
+        const dockSide = this.config.store.appearance.dock
 
         if (dockSide === 'off') {
             this.hostApp.setAlwaysOnTop(false)
@@ -29,14 +24,15 @@ export class DockingService {
         }
 
         let display = this.electron.screen.getAllDisplays()
-            .filter((x) => x.id === this.config.store.appearance.dockScreen)[0]
+            .filter(x => x.id === this.config.store.appearance.dockScreen)[0]
         if (!display) {
             display = this.getCurrentScreen()
         }
 
-        let newBounds: Bounds = { x: 0, y: 0, width: 0, height: 0 }
-        let fill = this.config.store.appearance.dockFill
-        let [minWidth, minHeight] = this.hostApp.getWindow().getMinimumSize()
+        const newBounds: Bounds = { x: 0, y: 0, width: 0, height: 0 }
+        
+        const fill = this.config.store.appearance.dockFill <= 1 ? this.config.store.appearance.dockFill : 1;
+        const [minWidth, minHeight] = this.hostApp.getWindow().getMinimumSize()
 
         if (dockSide === 'left' || dockSide === 'right') {
             newBounds.width = Math.max(minWidth, Math.round(fill * display.bounds.width))
@@ -68,26 +64,26 @@ export class DockingService {
     }
 
     getScreens () {
-        return this.electron.screen.getAllDisplays().map((display, index) => {
+        const primaryDisplayID = this.electron.screen.getPrimaryDisplay().id;
+        return this.electron.screen.getAllDisplays().sort((a,b) => (
+            a.bounds.x === b.bounds.x ? a.bounds.y - b.bounds.y : a.bounds.x - b.bounds.x
+        )).map((display,index) => {
             return {
                 id: display.id,
-                name: {
-                    0: 'Primary display',
-                    1: 'Secondary display',
-                }[index] || `Display ${index + 1}`
+                name: display.id === primaryDisplayID ? 'Primary Display' : `Display ${index +1}`,
             }
-        })
+        });
     }
 
     private repositionWindow () {
-        let [x, y] = this.hostApp.getWindow().getPosition()
-        for (let screen of this.electron.screen.getAllDisplays()) {
-            let bounds = screen.bounds
+        const [x, y] = this.hostApp.getWindow().getPosition()
+        for (const screen of this.electron.screen.getAllDisplays()) {
+            const bounds = screen.bounds
             if (x >= bounds.x && x <= bounds.x + bounds.width && y >= bounds.y && y <= bounds.y + bounds.height) {
                 return
             }
         }
-        let screen = this.electron.screen.getPrimaryDisplay()
+        const screen = this.electron.screen.getPrimaryDisplay()
         this.hostApp.getWindow().setPosition(screen.bounds.x, screen.bounds.y)
     }
 }

terminus-core/src/services/electron.service.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core'
-import { TouchBar, BrowserWindow, Menu, MenuItem } from 'electron'
+import { TouchBar, BrowserWindow, Menu, MenuItem, NativeImage } from 'electron'
 
 export interface MessageBoxResponse {
     response: number
@@ -8,16 +8,16 @@ export interface MessageBoxResponse {
 
 @Injectable({ providedIn: 'root' })
 export class ElectronService {
-    app: any
-    ipcRenderer: any
-    shell: any
-    dialog: any
-    clipboard: any
-    globalShortcut: any
-    nativeImage: any
-    screen: any
-    remote: any
-    autoUpdater: any
+    app: Electron.App
+    ipcRenderer: Electron.IpcRenderer
+    shell: Electron.Shell
+    dialog: Electron.Dialog
+    clipboard: Electron.Clipboard
+    globalShortcut: Electron.GlobalShortcut
+    nativeImage: typeof NativeImage
+    screen: Electron.Screen
+    remote: Electron.Remote
+    autoUpdater: Electron.AutoUpdater
     TouchBar: typeof TouchBar
     BrowserWindow: typeof BrowserWindow
     Menu: typeof Menu
@@ -52,7 +52,7 @@ export class ElectronService {
         }
     }
 
-    showMessageBox (
+    async showMessageBox (
         browserWindow: Electron.BrowserWindow,
         options: Electron.MessageBoxOptions
     ): Promise<MessageBoxResponse> {

terminus-core/src/services/homeBase.service.ts

@@ -2,8 +2,8 @@ import * as os from 'os'
 import { Injectable } from '@angular/core'
 import { ElectronService } from './electron.service'
 import { ConfigService } from './config.service'
-import mixpanel = require('mixpanel')
-import uuidv4 = require('uuid/v4')
+import * as mixpanel from 'mixpanel'
+import * as uuidv4 from 'uuid/v4'
 
 @Injectable({ providedIn: 'root' })
 export class HomeBaseService {
@@ -29,12 +29,12 @@ export class HomeBaseService {
     reportBug () {
         let body = `Version: ${this.appVersion}\n`
         body += `Platform: ${os.platform()} ${os.release()}\n`
-        let label = {
+        const label = {
             darwin: 'OS: macOS',
             windows: 'OS: Windows',
             linux: 'OS: Linux',
         }[os.platform()]
-        let plugins = (window as any).installedPlugins.filter(x => !x.isBuiltin).map(x => x.name)
+        const plugins = (window as any).installedPlugins.filter(x => !x.isBuiltin).map(x => x.name)
         body += `Plugins: ${plugins.join(', ') || 'none'}\n\n`
         this.electron.shell.openExternal(`https://github.com/eugeny/terminus/issues/new?body=${encodeURIComponent(body)}&labels=${label}`)
     }
@@ -53,7 +53,7 @@ export class HomeBaseService {
 
     getAnalyticsProperties () {
         return {
-            distinct_id: window.localStorage.analyticsUserID,
+            distinct_id: window.localStorage.analyticsUserID, // eslint-disable-line @typescript-eslint/camelcase
             platform: process.platform,
             os: os.release(),
             version: this.appVersion,

terminus-core/src/services/hostApp.service.ts

@@ -1,5 +1,5 @@
 import * as path from 'path'
-import shellEscape = require('shell-escape')
+import shellEscape from 'shell-escape'
 import { Observable, Subject } from 'rxjs'
 import { Injectable, NgZone, EventEmitter } from '@angular/core'
 import { ElectronService } from './electron.service'
@@ -87,8 +87,7 @@ export class HostAppService {
 
     get displayMetricsChanged$ (): Observable<void> { return this.displayMetricsChanged }
 
-    /** @hidden */
-    constructor (
+    private constructor (
         private zone: NgZone,
         private electron: ElectronService,
         log: LogService,
@@ -97,7 +96,7 @@ export class HostAppService {
         this.platform = {
             win32: Platform.Windows,
             darwin: Platform.macOS,
-            linux: Platform.Linux
+            linux: Platform.Linux,
         }[process.platform]
 
         this.windowId = parseInt(location.search.substring(1))
@@ -170,7 +169,7 @@ export class HostAppService {
     }
 
     toggleFullscreen () {
-        let window = this.getWindow()
+        const window = this.getWindow()
         window.setFullScreen(!this.isFullScreen)
     }
 

terminus-core/src/services/hotkeys.service.ts

@@ -1,6 +1,6 @@
 import { Injectable, Inject, NgZone, EventEmitter } from '@angular/core'
-import { IHotkeyDescription, HotkeyProvider } from '../api/hotkeyProvider'
-import { NativeKeyEvent, stringifyKeySequence } from './hotkeys.util'
+import { HotkeyDescription, HotkeyProvider } from '../api/hotkeyProvider'
+import { stringifyKeySequence } from './hotkeys.util'
 import { ConfigService } from '../services/config.service'
 import { ElectronService } from '../services/electron.service'
 
@@ -13,29 +13,28 @@ export interface PartialHotkeyMatch {
 const KEY_TIMEOUT = 2000
 
 interface EventBufferEntry {
-    event: NativeKeyEvent
+    event: KeyboardEvent
     time: number
 }
 
 @Injectable({ providedIn: 'root' })
 export class HotkeysService {
-    key = new EventEmitter<NativeKeyEvent>()
+    key = new EventEmitter<KeyboardEvent>()
     matchedHotkey = new EventEmitter<string>()
-    globalHotkey = new EventEmitter()
+    globalHotkey = new EventEmitter<void>()
     private currentKeystrokes: EventBufferEntry[] = []
     private disabledLevel = 0
-    private hotkeyDescriptions: IHotkeyDescription[] = []
+    private hotkeyDescriptions: HotkeyDescription[] = []
 
-    /** @hidden */
-    constructor (
+    private constructor (
         private zone: NgZone,
         private electron: ElectronService,
         private config: ConfigService,
         @Inject(HotkeyProvider) private hotkeyProviders: HotkeyProvider[],
     ) {
-        let events = ['keydown', 'keyup']
-        events.forEach((event) => {
-            document.addEventListener(event, (nativeEvent) => {
+        const events = ['keydown', 'keyup']
+        events.forEach(event => {
+            document.addEventListener(event, (nativeEvent: KeyboardEvent) => {
                 if (document.querySelectorAll('input:focus').length === 0) {
                     this.pushKeystroke(event, nativeEvent)
                     this.processKeystrokes()
@@ -58,8 +57,8 @@ export class HotkeysService {
      * @param name DOM event name
      * @param nativeEvent event object
      */
-    pushKeystroke (name, nativeEvent) {
-        nativeEvent.event = name
+    pushKeystroke (name: string, nativeEvent: KeyboardEvent) {
+        (nativeEvent as any).event = name
         this.currentKeystrokes.push({ event: nativeEvent, time: performance.now() })
     }
 
@@ -69,7 +68,7 @@ export class HotkeysService {
     processKeystrokes () {
         if (this.isEnabled()) {
             this.zone.run(() => {
-                let matched = this.getCurrentFullyMatchedHotkey()
+                const matched = this.getCurrentFullyMatchedHotkey()
                 if (matched) {
                     console.log('Matched hotkey', matched)
                     this.matchedHotkey.emit(matched)
@@ -79,7 +78,7 @@ export class HotkeysService {
         }
     }
 
-    emitKeyEvent (nativeEvent) {
+    emitKeyEvent (nativeEvent: KeyboardEvent) {
         this.zone.run(() => {
             this.key.emit(nativeEvent)
         })
@@ -94,61 +93,16 @@ export class HotkeysService {
         return stringifyKeySequence(this.currentKeystrokes.map(x => x.event))
     }
 
-    private registerGlobalHotkey () {
-        this.electron.globalShortcut.unregisterAll()
-        let value = this.config.store.hotkeys['toggle-window'] || []
-        if (typeof value === 'string') {
-            value = [value]
-        }
-        value.forEach(item => {
-            item = (typeof item === 'string') ? [item] : item
-
-            try {
-                this.electron.globalShortcut.register(item[0].replace(/-/g, '+'), () => {
-                    this.globalHotkey.emit()
-                })
-            } catch (err) {
-                console.error('Could not register the global hotkey:', err)
-            }
-        })
-    }
-
-    private getHotkeysConfig () {
-        return this.getHotkeysConfigRecursive(this.config.store.hotkeys)
-    }
-
-    private getHotkeysConfigRecursive (branch) {
-        let keys = {}
-        for (let key in branch) {
-            let value = branch[key]
-            if (value instanceof Object && !(value instanceof Array)) {
-                let subkeys = this.getHotkeysConfigRecursive(value)
-                for (let subkey in subkeys) {
-                    keys[key + '.' + subkey] = subkeys[subkey]
-                }
-            } else {
-                if (typeof value === 'string') {
-                    value = [value]
-                }
-                if (value) {
-                    value = value.map((item) => (typeof item === 'string') ? [item] : item)
-                    keys[key] = value
-                }
-            }
-        }
-        return keys
-    }
-
-    private getCurrentFullyMatchedHotkey (): string {
-        let currentStrokes = this.getCurrentKeystrokes()
-        let config = this.getHotkeysConfig()
-        for (let id in config) {
-            for (let sequence of config[id]) {
+    getCurrentFullyMatchedHotkey (): string {
+        const currentStrokes = this.getCurrentKeystrokes()
+        const config = this.getHotkeysConfig()
+        for (const id in config) {
+            for (const sequence of config[id]) {
                 if (currentStrokes.length < sequence.length) {
                     continue
                 }
                 if (sequence.every(
-                    (x, index) =>
+                    (x: string, index: number) =>
                         x.toLowerCase() ===
                             currentStrokes[currentStrokes.length - sequence.length + index].toLowerCase()
                 )) {
@@ -160,21 +114,21 @@ export class HotkeysService {
     }
 
     getCurrentPartiallyMatchedHotkeys (): PartialHotkeyMatch[] {
-        let currentStrokes = this.getCurrentKeystrokes()
-        let config = this.getHotkeysConfig()
-        let result = []
-        for (let id in config) {
-            for (let sequence of config[id]) {
+        const currentStrokes = this.getCurrentKeystrokes()
+        const config = this.getHotkeysConfig()
+        const result = []
+        for (const id in config) {
+            for (const sequence of config[id]) {
                 for (let matchLength = Math.min(currentStrokes.length, sequence.length); matchLength > 0; matchLength--) {
                     if (sequence.slice(0, matchLength).every(
-                        (x, index) =>
+                        (x: string, index: number) =>
                             x.toLowerCase() ===
                                 currentStrokes[currentStrokes.length - matchLength + index].toLowerCase()
                     )) {
                         result.push({
                             matchedLength: matchLength,
                             id,
-                            strokes: sequence
+                            strokes: sequence,
                         })
                         break
                     }
@@ -184,7 +138,7 @@ export class HotkeysService {
         return result
     }
 
-    getHotkeyDescription (id: string): IHotkeyDescription {
+    getHotkeyDescription (id: string): HotkeyDescription {
         return this.hotkeyDescriptions.filter((x) => x.id === id)[0]
     }
 
@@ -200,7 +154,7 @@ export class HotkeysService {
         return this.disabledLevel === 0
     }
 
-    async getHotkeyDescriptions (): Promise<IHotkeyDescription[]> {
+    async getHotkeyDescriptions (): Promise<HotkeyDescription[]> {
         return (
             await Promise.all(
                 this.config.enabledServices(this.hotkeyProviders)
@@ -208,4 +162,53 @@ export class HotkeysService {
             )
         ).reduce((a, b) => a.concat(b))
     }
+
+    private registerGlobalHotkey () {
+        this.electron.globalShortcut.unregisterAll()
+        let value = this.config.store.hotkeys['toggle-window'] || []
+        if (typeof value === 'string') {
+            value = [value]
+        }
+        value.forEach((item: string | string[]) => {
+            item = typeof item === 'string' ? [item] : item
+
+            try {
+                let electronKeySpec = item[0]
+                electronKeySpec = electronKeySpec.replace('⌘', 'Command')
+                electronKeySpec = electronKeySpec.replace('⌥', 'Alt')
+                electronKeySpec = electronKeySpec.replace(/-/g, '+')
+                this.electron.globalShortcut.register(electronKeySpec, () => {
+                    this.globalHotkey.emit()
+                })
+            } catch (err) {
+                console.error('Could not register the global hotkey:', err)
+            }
+        })
+    }
+
+    private getHotkeysConfig () {
+        return this.getHotkeysConfigRecursive(this.config.store.hotkeys)
+    }
+
+    private getHotkeysConfigRecursive (branch: any) {
+        const keys = {}
+        for (const key in branch) {
+            let value = branch[key]
+            if (value instanceof Object && !(value instanceof Array)) {
+                const subkeys = this.getHotkeysConfigRecursive(value)
+                for (const subkey in subkeys) {
+                    keys[key + '.' + subkey] = subkeys[subkey]
+                }
+            } else {
+                if (typeof value === 'string') {
+                    value = [value]
+                }
+                if (value) {
+                    value = value.map((item: string | string[]) => typeof item === 'string' ? [item] : item)
+                    keys[key] = value
+                }
+            }
+        }
+        return keys
+    }
 }

terminus-core/src/services/hotkeys.util.ts

@@ -10,24 +10,14 @@ export const altKeyName = {
     linux: 'Alt',
 }[process.platform]
 
-export interface NativeKeyEvent {
-    event?: string
-    altKey: boolean
-    ctrlKey: boolean
-    metaKey: boolean
-    shiftKey: boolean
-    key: string
-    keyCode: string
-}
-
-export function stringifyKeySequence (events: NativeKeyEvent[]): string[] {
-    let items: string[] = []
+export function stringifyKeySequence (events: KeyboardEvent[]): string[] {
+    const items: string[] = []
     events = events.slice()
 
     while (events.length > 0) {
-        let event = events.shift()
-        if (event.event === 'keydown') {
-            let itemKeys: string[] = []
+        const event = events.shift()
+        if ((event as any).event === 'keydown') {
+            const itemKeys: string[] = []
             if (event.ctrlKey) {
                 itemKeys.push('Ctrl')
             }
@@ -45,13 +35,26 @@ export function stringifyKeySequence (events: NativeKeyEvent[]): string[] {
                 // TODO make this optional?
                 continue
             }
-            if (event.key === ' ') {
-                itemKeys.push('Space')
-            } else if (event.key.length === 1) {
-                itemKeys.push(event.key.toUpperCase())
-            } else {
-                itemKeys.push(event.key)
-            }
+
+            let key = event.code
+            key = key.replace('Key', '')
+            key = key.replace('Arrow', '')
+            key = key.replace('Digit', '')
+            key = {
+                Comma: ',',
+                Period: '.',
+                Slash: '/',
+                Backslash: '\\',
+                IntlBackslash: '\\',
+                Backquote: '`',
+                Minus: '-',
+                Equal: '=',
+                Semicolon: ';',
+                Quote: '\'',
+                BracketLeft: '[',
+                BracketRight: ']',
+            }[key] || key
+            itemKeys.push(key)
             items.push(itemKeys.join('-'))
         }
     }

terminus-core/src/services/log.service.ts

@@ -20,9 +20,9 @@ const initializeWinston = (electron: ElectronService) => {
                 handleExceptions: false,
                 maxsize: 5242880,
                 maxFiles: 5,
-            })
+            }),
         ],
-        exitOnError: false
+        exitOnError: false,
     })
 }
 
@@ -32,18 +32,32 @@ export class Logger {
         private name: string,
     ) {}
 
+    debug (...args: any[]) {
+        this.doLog('debug', ...args)
+    }
+
+    info (...args: any[]) {
+        this.doLog('info', ...args)
+    }
+
+    warn (...args: any[]) {
+        this.doLog('warn', ...args)
+    }
+
+    error (...args: any[]) {
+        this.doLog('error', ...args)
+    }
+
+    log (...args: any[]) {
+        this.doLog('log', ...args)
+    }
+
     private doLog (level: string, ...args: any[]) {
         console[level](`%c[${this.name}]`, 'color: #aaa', ...args)
         if (this.winstonLogger) {
             this.winstonLogger[level](...args)
         }
     }
-
-    debug (...args: any[]) { this.doLog('debug', ...args) }
-    info (...args: any[]) { this.doLog('info', ...args) }
-    warn (...args: any[]) { this.doLog('warn', ...args) }
-    error (...args: any[]) { this.doLog('error', ...args) }
-    log (...args: any[]) { this.doLog('log', ...args) }
 }
 
 @Injectable({ providedIn: 'root' })

terminus-core/src/services/shellIntegration.service.ts

@@ -5,9 +5,11 @@ import { Injectable } from '@angular/core'
 import { ElectronService } from './electron.service'
 import { HostAppService, Platform } from './hostApp.service'
 
+/* eslint-disable block-scoped-var */
+
 try {
-    var wnr = require('windows-native-registry') // tslint:disable-line
-} catch (_) { } // tslint:disable-line
+    var wnr = require('windows-native-registry') // eslint-disable-line @typescript-eslint/no-var-requires
+} catch (_) { }
 
 @Injectable({ providedIn: 'root' })
 export class ShellIntegrationService {
@@ -17,11 +19,11 @@ export class ShellIntegrationService {
     private registryKeys = [
         {
             path: 'Software\\Classes\\Directory\\Background\\shell\\Open Terminus here',
-            command: 'open "%V"'
+            command: 'open "%V"',
         },
         {
             path: 'Software\\Classes\\*\\shell\\Paste path into Terminus',
-            command: 'paste "%V"'
+            command: 'paste "%V"',
         },
     ]
     constructor (
@@ -40,15 +42,6 @@ export class ShellIntegrationService {
         this.updatePaths()
     }
 
-    private async updatePaths (): Promise<void> {
-        // Update paths in case of an update
-        if (this.hostApp.platform === Platform.Windows) {
-            if (await this.isInstalled()) {
-                await this.install()
-            }
-        }
-    }
-
     async isInstalled (): Promise<boolean> {
         if (this.hostApp.platform === Platform.macOS) {
             return fs.exists(path.join(this.automatorWorkflowsDestination, this.automatorWorkflows[0]))
@@ -59,13 +52,13 @@ export class ShellIntegrationService {
     }
 
     async install () {
-        const exe = process.env.PORTABLE_EXECUTABLE_FILE || this.electron.app.getPath('exe')
+        const exe: string = process.env.PORTABLE_EXECUTABLE_FILE || this.electron.app.getPath('exe')
         if (this.hostApp.platform === Platform.macOS) {
-            for (let wf of this.automatorWorkflows) {
+            for (const wf of this.automatorWorkflows) {
                 await exec(`cp -r "${this.automatorWorkflowsLocation}/${wf}" "${this.automatorWorkflowsDestination}"`)
             }
         } else if (this.hostApp.platform === Platform.Windows) {
-            for (let registryKey of this.registryKeys) {
+            for (const registryKey of this.registryKeys) {
                 wnr.createRegistryKey(wnr.HK.CU, registryKey.path)
                 wnr.createRegistryKey(wnr.HK.CU, registryKey.path + '\\command')
                 wnr.setRegistryValue(wnr.HK.CU, registryKey.path, 'Icon', wnr.REG.SZ, exe)
@@ -76,13 +69,22 @@ export class ShellIntegrationService {
 
     async remove () {
         if (this.hostApp.platform === Platform.macOS) {
-            for (let wf of this.automatorWorkflows) {
+            for (const wf of this.automatorWorkflows) {
                 await exec(`rm -rf "${this.automatorWorkflowsDestination}/${wf}"`)
             }
         } else if (this.hostApp.platform === Platform.Windows) {
-            for (let registryKey of this.registryKeys) {
+            for (const registryKey of this.registryKeys) {
                 wnr.deleteRegistryKey(wnr.HK.CU, registryKey.path)
             }
         }
     }
+
+    private async updatePaths (): Promise<void> {
+        // Update paths in case of an update
+        if (this.hostApp.platform === Platform.Windows) {
+            if (await this.isInstalled()) {
+                await this.install()
+            }
+        }
+    }
 }

terminus-core/src/services/tabRecovery.service.ts

@@ -28,9 +28,9 @@ export class TabRecoveryService {
     }
 
     async recoverTab (token: any): Promise<RecoveredTab> {
-        for (let provider of this.config.enabledServices(this.tabRecoveryProviders)) {
+        for (const provider of this.config.enabledServices(this.tabRecoveryProviders)) {
             try {
-                let tab = await provider.recover(token)
+                const tab = await provider.recover(token)
                 if (tab) {
                     return tab
                 }
@@ -43,9 +43,9 @@ export class TabRecoveryService {
 
     async recoverTabs (): Promise<RecoveredTab[]> {
         if (window.localStorage.tabsRecovery) {
-            let tabs: RecoveredTab[] = []
-            for (let token of JSON.parse(window.localStorage.tabsRecovery)) {
-                let tab = await this.recoverTab(token)
+            const tabs: RecoveredTab[] = []
+            for (const token of JSON.parse(window.localStorage.tabsRecovery)) {
+                const tab = await this.recoverTab(token)
                 if (tab) {
                     tabs.push(tab)
                 }
@@ -54,5 +54,4 @@ export class TabRecoveryService {
         }
         return []
     }
-
 }

terminus-core/src/services/tabs.service.ts

@@ -2,7 +2,8 @@ import { Injectable, ComponentFactoryResolver, Injector } from '@angular/core'
 import { BaseTabComponent } from '../components/baseTab.component'
 import { TabRecoveryService } from './tabRecovery.service'
 
-export declare type TabComponentType = new (...args: any[]) => BaseTabComponent
+// eslint-disable-next-line @typescript-eslint/no-type-alias
+export type TabComponentType = new (...args: any[]) => BaseTabComponent
 
 @Injectable({ providedIn: 'root' })
 export class TabsService {
@@ -17,9 +18,9 @@ export class TabsService {
      * Instantiates a tab component and assigns given inputs
      */
     create (type: TabComponentType, inputs?: any): BaseTabComponent {
-        let componentFactory = this.componentFactoryResolver.resolveComponentFactory(type)
-        let componentRef = componentFactory.create(this.injector)
-        let tab = componentRef.instance
+        const componentFactory = this.componentFactoryResolver.resolveComponentFactory(type)
+        const componentRef = componentFactory.create(this.injector)
+        const tab = componentRef.instance
         tab.hostView = componentRef.hostView
         Object.assign(tab, inputs || {})
         return tab
@@ -29,11 +30,11 @@ export class TabsService {
      * Duplicates an existing tab instance (using the tab recovery system)
      */
     async duplicate (tab: BaseTabComponent): Promise<BaseTabComponent> {
-        let token = await tab.getRecoveryToken()
+        const token = await tab.getRecoveryToken()
         if (!token) {
             return null
         }
-        let dup = await this.tabRecovery.recoverTab(token)
+        const dup = await this.tabRecovery.recoverTab(token)
         if (dup) {
             return this.create(dup.type, dup.options)
         }

terminus-core/src/services/touchbar.service.ts

@@ -4,7 +4,7 @@ import { AppService } from './app.service'
 import { ConfigService } from './config.service'
 import { ElectronService } from './electron.service'
 import { HostAppService, Platform } from './hostApp.service'
-import { IToolbarButton, ToolbarButtonProvider } from '../api'
+import { ToolbarButton, ToolbarButtonProvider } from '../api'
 
 /** @hidden */
 @Injectable({ providedIn: 'root' })
@@ -28,19 +28,19 @@ export class TouchbarService {
         app.tabsChanged$.subscribe(() => this.updateTabs())
         app.activeTabChange$.subscribe(() => this.updateTabs())
 
-        let activityIconPath = `${electron.app.getAppPath()}/assets/activity.png`
-        let activityIcon = this.electron.nativeImage.createFromPath(activityIconPath)
+        const activityIconPath = `${electron.app.getAppPath()}/assets/activity.png`
+        const activityIcon = this.electron.nativeImage.createFromPath(activityIconPath)
         app.tabOpened$.subscribe(tab => {
             tab.titleChange$.subscribe(title => {
-                let segment = this.tabSegments[app.tabs.indexOf(tab)]
+                const segment = this.tabSegments[app.tabs.indexOf(tab)]
                 if (segment) {
                     segment.label = this.shortenTitle(title)
                     this.tabsSegmentedControl.segments = this.tabSegments
                 }
             })
             tab.activity$.subscribe(hasActivity => {
-                let showIcon = this.app.activeTab !== tab && hasActivity
-                let segment = this.tabSegments[app.tabs.indexOf(tab)]
+                const showIcon = this.app.activeTab !== tab && hasActivity
+                const segment = this.tabSegments[app.tabs.indexOf(tab)]
                 if (segment) {
                     segment.icon = showIcon ? activityIcon : null
                 }
@@ -61,7 +61,7 @@ export class TouchbarService {
             return
         }
 
-        let buttons: IToolbarButton[] = []
+        let buttons: ToolbarButton[] = []
         this.config.enabledServices(this.toolbarButtonProviders).forEach(provider => {
             buttons = buttons.concat(provider.provide())
         })
@@ -76,7 +76,7 @@ export class TouchbarService {
             selectedIndex: this.app.tabs.indexOf(this.app.activeTab),
             change: (selectedIndex) => this.zone.run(() => {
                 this.app.selectTab(this.app.tabs[selectedIndex])
-            })
+            }),
         })
 
         this.buttonsSegmentedControl = new this.electron.TouchBar.TouchBarSegmentedControl({
@@ -84,21 +84,21 @@ export class TouchbarService {
             mode: 'buttons',
             change: (selectedIndex) => this.zone.run(() => {
                 buttons[selectedIndex].click()
-            })
+            }),
         })
 
-        let touchBar = new this.electron.TouchBar({
+        const touchBar = new this.electron.TouchBar({
             items: [
                 this.tabsSegmentedControl,
                 new this.electron.TouchBar.TouchBarSpacer({ size: 'flexible' }),
                 new this.electron.TouchBar.TouchBarSpacer({ size: 'small' }),
                 this.buttonsSegmentedControl,
-            ]
+            ],
         })
         this.hostApp.setTouchBar(touchBar)
     }
 
-    private getButton (button: IToolbarButton): Electron.SegmentedControlSegment {
+    private getButton (button: ToolbarButton): Electron.SegmentedControlSegment {
         return {
             label: button.touchBarNSImage ? null : this.shortenTitle(button.touchBarTitle || button.title),
             icon: button.touchBarNSImage ? this.getCachedNSImage(button.touchBarNSImage) : null,

terminus-core/src/services/updater.service.ts

@@ -49,9 +49,9 @@ export class UpdaterService {
     async check (): Promise<boolean> {
         if (!this.electronUpdaterAvailable) {
             this.logger.debug('Checking for updates')
-            let response = await axios.get(UPDATES_URL)
-            let data = response.data
-            let version = data.tag_name.substring(1)
+            const response = await axios.get(UPDATES_URL)
+            const data = response.data
+            const version = data.tag_name.substring(1)
             if (this.electron.app.getVersion() !== version) {
                 this.logger.info('Update available')
                 this.updateURL = data.html_url

terminus-core/src/tabContextMenu.ts

@@ -22,31 +22,31 @@ export class CloseContextMenu extends TabContextMenuItemProvider {
                 label: 'Close',
                 click: () => this.zone.run(() => {
                     this.app.closeTab(tab, true)
-                })
+                }),
             },
             {
                 label: 'Close other tabs',
                 click: () => this.zone.run(() => {
-                    for (let t of this.app.tabs.filter(x => x !== tab)) {
+                    for (const t of this.app.tabs.filter(x => x !== tab)) {
                         this.app.closeTab(t, true)
                     }
-                })
+                }),
             },
             {
                 label: 'Close tabs to the right',
                 click: () => this.zone.run(() => {
-                    for (let t of this.app.tabs.slice(this.app.tabs.indexOf(tab) + 1)) {
+                    for (const t of this.app.tabs.slice(this.app.tabs.indexOf(tab) + 1)) {
                         this.app.closeTab(t, true)
                     }
-                })
+                }),
             },
             {
                 label: 'Close tabs to the left',
                 click: () => this.zone.run(() => {
-                    for (let t of this.app.tabs.slice(0, this.app.tabs.indexOf(tab))) {
+                    for (const t of this.app.tabs.slice(0, this.app.tabs.indexOf(tab))) {
                         this.app.closeTab(t, true)
                     }
-                })
+                }),
             },
         ]
     }
@@ -78,11 +78,11 @@ export class CommonOptionsContextMenu extends TabContextMenuItemProvider {
         return [
             {
                 label: 'Rename',
-                click: () => this.zone.run(() => tabHeader.showRenameTabModal())
+                click: () => this.zone.run(() => tabHeader.showRenameTabModal()),
             },
             {
                 label: 'Duplicate',
-                click: () => this.zone.run(() => this.app.duplicateTab(tab))
+                click: () => this.zone.run(() => this.app.duplicateTab(tab)),
             },
             {
                 label: 'Color',
@@ -95,7 +95,7 @@ export class CommonOptionsContextMenu extends TabContextMenuItemProvider {
                         tab.color = color.value
                     }),
                 })) as Electron.MenuItemConstructorOptions[],
-            }
+            },
         ]
     }
 }
@@ -111,7 +111,7 @@ export class TaskCompletionContextMenu extends TabContextMenuItemProvider {
     }
 
     async getItems (tab: BaseTabComponent): Promise<Electron.MenuItemConstructorOptions[]> {
-        let process = await tab.getCurrentProcess()
+        const process = await tab.getCurrentProcess()
         if (process) {
             return [
                 {
@@ -138,7 +138,7 @@ export class TaskCompletionContextMenu extends TabContextMenuItemProvider {
                         } else {
                             this.app.stopObservingTabCompletion(tab)
                         }
-                    })
+                    }),
                 },
             ]
         }

terminus-core/tsconfig.json

@@ -2,6 +2,6 @@
   "extends": "../tsconfig.json",
   "exclude": ["node_modules", "dist"],
   "compilerOptions": {
-    "baseUrl": "src",
+    "baseUrl": "src"
   }
 }

terminus-core/webpack.config.js

@@ -2,61 +2,64 @@ const path = require('path')
 const webpack = require('webpack')
 
 module.exports = {
-  target: 'node',
-  entry: 'src/index.ts',
-  devtool: 'eval-source-map',
-  context: __dirname,
-  mode: 'development',
-  output: {
-    path: path.resolve(__dirname, 'dist'),
-    filename: 'index.js',
-    pathinfo: true,
-    libraryTarget: 'umd',
-    devtoolModuleFilenameTemplate: 'webpack-terminus-core:///[resource-path]',
-  },
-  mode: process.env.TERMINUS_DEV ? 'development' : 'production',
-  optimization:{
-     minimize: false,
-  },
-  resolve: {
-    modules: ['.', 'src', 'node_modules', '../app/node_modules'].map(x => path.join(__dirname, x)),
-    extensions: ['.ts', '.js'],
-  },
-  module: {
-    rules: [
-      {
-        test: /\.ts$/,
-        use: {
-          loader: 'awesome-typescript-loader',
-          options: {
-            configFileName: path.resolve(__dirname, 'tsconfig.json'),
-            typeRoots: [path.resolve(__dirname, 'node_modules/@types')],
-            paths: {
-              "terminus-*": [path.resolve(__dirname, '../terminus-*')],
-              "*": [path.resolve(__dirname, '../app/node_modules/*')],
-            }
-          }
-        }
-      },
-      { test: /\.pug$/, use: ['apply-loader', 'pug-loader'] },
-      { test: /\.scss$/, use: ['to-string-loader', 'css-loader', 'sass-loader'] },
-      { test: /\.css$/, use: ['to-string-loader', 'css-loader'], include: /component\.css/ },
-      { test: /\.css$/, use: ['style-loader', 'css-loader'], exclude: /component\.css/ },
-      { test: /\.yaml$/, use: ['json-loader', 'yaml-loader'] },
-      { test: /\.svg/, use: ['svg-inline-loader'] },
-    ]
-  },
-  externals: [
-    'electron',
-    'fs',
-    'os',
-    'path',
-    'windows-native-registry',
-    /^rxjs/,
-    /^@angular/,
-    /^@ng-bootstrap/,
-  ],
-  plugins: [
-    new webpack.optimize.ModuleConcatenationPlugin(),
-  ],
+    target: 'node',
+    entry: 'src/index.ts',
+    devtool: 'source-map',
+    context: __dirname,
+    mode: 'development',
+    output: {
+        path: path.resolve(__dirname, 'dist'),
+        filename: 'index.js',
+        pathinfo: true,
+        libraryTarget: 'umd',
+        devtoolModuleFilenameTemplate: 'webpack-terminus-core:///[resource-path]',
+    },
+    mode: process.env.TERMINUS_DEV ? 'development' : 'production',
+    optimization:{
+        minimize: false,
+    },
+    resolve: {
+        modules: ['.', 'src', 'node_modules', '../app/node_modules'].map(x => path.join(__dirname, x)),
+        extensions: ['.ts', '.js'],
+    },
+    module: {
+        rules: [
+            {
+                test: /\.ts$/,
+                use: {
+                    loader: 'awesome-typescript-loader',
+                    options: {
+                        configFileName: path.resolve(__dirname, 'tsconfig.json'),
+                        typeRoots: [
+                            path.resolve(__dirname, 'node_modules/@types'),
+                            path.resolve(__dirname, '../node_modules/@types'),
+                        ],
+                        paths: {
+                            "terminus-*": [path.resolve(__dirname, '../terminus-*')],
+                            "*": [path.resolve(__dirname, '../app/node_modules/*')],
+                        },
+                    },
+                },
+            },
+            { test: /\.pug$/, use: ['apply-loader', 'pug-loader'] },
+            { test: /\.scss$/, use: ['to-string-loader', 'css-loader', 'sass-loader'] },
+            { test: /\.css$/, use: ['to-string-loader', 'css-loader'], include: /component\.css/ },
+            { test: /\.css$/, use: ['style-loader', 'css-loader'], exclude: /component\.css/ },
+            { test: /\.yaml$/, use: ['json-loader', 'yaml-loader'] },
+            { test: /\.svg/, use: ['svg-inline-loader'] },
+        ],
+    },
+    externals: [
+        'electron',
+        'fs',
+        'os',
+        'path',
+        'windows-native-registry',
+        /^rxjs/,
+        /^@angular/,
+        /^@ng-bootstrap/,
+    ],
+    plugins: [
+        new webpack.optimize.ModuleConcatenationPlugin(),
+    ],
 }

terminus-core/yarn.lock

@@ -7,15 +7,10 @@
   resolved "https://registry.yarnpkg.com/@types/js-yaml/-/js-yaml-3.12.1.tgz#5c6f4a1eabca84792fbd916f0cb40847f123c656"
   integrity sha512-SGGAhXLHDx+PK4YLNcNGa6goPf9XRWQNAUUbffkwVGGXIxmDKWyGGL4inzq2sPmExu431Ekb9aEMn9BkPqEYFA==
 
-"@types/node@^12.0.2":
-  version "12.0.7"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.0.7.tgz#4f2563bad652b2acb1722d7e7aae2b0ff62d192c"
-  integrity sha512-1YKeT4JitGgE4SOzyB9eMwO0nGVNkNEsm9qlIt1Lqm/tG2QEiSMTD4kS3aO6L+w5SClLVxALmIBESK6Mk5wX0A==
-
-"@types/webpack-env@^1.13.0":
-  version "1.13.9"
-  resolved "https://registry.yarnpkg.com/@types/webpack-env/-/webpack-env-1.13.9.tgz#a67287861c928ebf4159a908d1fb1a2a34d4097a"
-  integrity sha512-p8zp5xqkly3g4cCmo2mKOHI9+Z/kObmDj0BmjbDDJQlgDTiEGTbm17MEwTAusV6XceCy+bNw9q/ZHXHyKo3zkg==
+"@types/shell-escape@^0.2.0":
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/@types/shell-escape/-/shell-escape-0.2.0.tgz#cd2f0df814388599dd07196dcc510de2669d1ed2"
+  integrity sha512-7kUdtJtUylvyISJbe9FMcvMTjRdP0EvNDO1WbT0lT22k/IPBiPRTpmWaKu5HTWLCGLQRWVHrzVHZktTDvvR23g==
 
 "@types/winston@^2.3.6":
   version "2.4.4"
@@ -137,9 +132,9 @@ colorspace@1.1.x:
     text-hex "1.0.x"
 
 core-js@^3.1.2:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.1.3.tgz#95700bca5f248f5f78c0ec63e784eca663ec4138"
-  integrity sha512-PWZ+ZfuaKf178BIAg+CRsljwjIMRV8MY00CbZczkR6Zk5LfkSkjGoaab3+bqRQWVITNZxQB7TFYz+CFcyuamvA==
+  version "3.1.4"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.1.4.tgz#3a2837fc48e582e1ae25907afcd6cf03b0cc7a07"
+  integrity sha512-YNZN8lt82XIMLnLirj9MhKDFZHalwzzrL9YLt6eb0T5D0EDl4IQ90IGkua8mHbnxNrkj1d8hbdizMc0Qmg1WnQ==
 
 core-util-is@~1.0.0:
   version "1.0.2"
@@ -168,9 +163,9 @@ debug@^4.1.1:
     ms "^2.1.1"
 
 deepmerge@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-3.2.0.tgz#58ef463a57c08d376547f8869fdc5bcee957f44e"
-  integrity sha512-6+LuZGU7QCNUnAJyX8cIrlzoEgggTM6B7mm+znKOX4t5ltluT9KLjN6g61ECMS0LTsLW7yDpNoxhix5FZcrIow==
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-3.2.1.tgz#76a1f47854bcfcd66ee9a948d110540a8e12b261"
+  integrity sha512-+hbDSzTqEW0fWgnlKksg7XAOtT+ddZS5lHZJ6f6MdixRs9wQy+50fm1uUCVb1IkvjLUYX/SfFO021ZNwriURTw==
 
 diagnostics@^1.1.1:
   version "1.1.1"
@@ -362,11 +357,6 @@ ms@^2.1.1:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
   integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
 
-nan@^2.13.2:
-  version "2.14.0"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c"
-  integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==
-
 ng2-dnd@^5.0.2:
   version "5.0.2"
   resolved "https://registry.yarnpkg.com/ng2-dnd/-/ng2-dnd-5.0.2.tgz#862278ac7dedfa14f5783bbf34014d5d73dfefb4"
@@ -516,13 +506,6 @@ uuid@^3.3.2:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
   integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==
 
-windows-native-registry@^1.0.14:
-  version "1.0.14"
-  resolved "https://registry.yarnpkg.com/windows-native-registry/-/windows-native-registry-1.0.14.tgz#35c742b1278473127cbfb3b76e0db3d1ef626872"
-  integrity sha512-C2UgyZYJYcPFjkhfNuy09CUa6wXAti4x/tLPgzudDDrqpTyczcgnBEpiablmE6j7E7ownouWTqgVcHW8HJyqhw==
-  dependencies:
-    nan "^2.13.2"
-
 winston-transport@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/winston-transport/-/winston-transport-4.3.0.tgz#df68c0c202482c448d9b47313c07304c2d7c2c66"

terminus-plugin-manager/package.json

@@ -1,6 +1,6 @@
 {
   "name": "terminus-plugin-manager",
-  "version": "1.0.73-c4-ga7d62b0",
+  "version": "1.0.83-nightly.0",
   "description": "Terminus' plugin manager",
   "keywords": [
     "terminus-builtin-plugin"
@@ -18,22 +18,19 @@
   "license": "MIT",
   "devDependencies": {
     "@types/mz": "0.0.32",
-    "@types/node": "12.0.7",
     "@types/semver": "^6.0.0",
-    "@types/webpack-env": "1.13.9",
     "axios": "^0.19.0",
-    "css-loader": "^0.28.0",
     "mz": "^2.6.0",
     "ngx-pipes": "^1.6.1",
     "semver": "^6.1.0"
   },
   "peerDependencies": {
-    "@angular/common": "4.0.1",
-    "@angular/core": "4.0.1",
-    "@angular/forms": "4.0.1",
-    "@angular/platform-browser": "4.0.1",
-    "@ng-bootstrap/ng-bootstrap": "1.0.0-alpha.22",
-    "rxjs": "5.3.0",
+    "@angular/common": "^7",
+    "@angular/core": "^7",
+    "@angular/forms": "^7",
+    "@angular/platform-browser": "^7",
+    "@ng-bootstrap/ng-bootstrap": "^1",
+    "rxjs": "^5",
     "terminus-core": "*",
     "terminus-settings": "*"
   }

terminus-plugin-manager/src/components/pluginsSettingsTab.component.ts

@@ -4,7 +4,7 @@ import * as semver from 'semver'
 
 import { Component, Input } from '@angular/core'
 import { ConfigService, ElectronService } from 'terminus-core'
-import { IPluginInfo, PluginManagerService } from '../services/pluginManager.service'
+import { PluginInfo, PluginManagerService } from '../services/pluginManager.service'
 
 enum BusyState { Installing, Uninstalling }
 
@@ -15,10 +15,10 @@ enum BusyState { Installing, Uninstalling }
 })
 export class PluginsSettingsTabComponent {
     BusyState = BusyState
-    @Input() availablePlugins$: Observable<IPluginInfo[]>
+    @Input() availablePlugins$: Observable<PluginInfo[]>
     @Input() availablePluginsQuery$ = new BehaviorSubject<string>('')
     @Input() availablePluginsReady = false
-    @Input() knownUpgrades: {[id: string]: IPluginInfo} = {}
+    @Input() knownUpgrades: {[id: string]: PluginInfo} = {}
     @Input() busy: {[id: string]: BusyState} = {}
     @Input() erroredPlugin: string
     @Input() errorMessage: string
@@ -44,7 +44,7 @@ export class PluginsSettingsTabComponent {
                 })
             )
         this.availablePlugins$.pipe(first()).subscribe(available => {
-            for (let plugin of this.pluginManager.installedPlugins) {
+            for (const plugin of this.pluginManager.installedPlugins) {
                 this.knownUpgrades[plugin.name] = available.find(x => x.name === plugin.name && semver.gt(x.version, plugin.version))
             }
         })
@@ -58,11 +58,11 @@ export class PluginsSettingsTabComponent {
         this.availablePluginsQuery$.next(query)
     }
 
-    isAlreadyInstalled (plugin: IPluginInfo): boolean {
+    isAlreadyInstalled (plugin: PluginInfo): boolean {
         return this.pluginManager.installedPlugins.some(x => x.name === plugin.name)
     }
 
-    async installPlugin (plugin: IPluginInfo): Promise<void> {
+    async installPlugin (plugin: PluginInfo): Promise<void> {
         this.busy[plugin.name] = BusyState.Installing
         try {
             await this.pluginManager.installPlugin(plugin)
@@ -76,7 +76,7 @@ export class PluginsSettingsTabComponent {
         }
     }
 
-    async uninstallPlugin (plugin: IPluginInfo): Promise<void> {
+    async uninstallPlugin (plugin: PluginInfo): Promise<void> {
         this.busy[plugin.name] = BusyState.Uninstalling
         try {
             await this.pluginManager.uninstallPlugin(plugin)
@@ -90,21 +90,21 @@ export class PluginsSettingsTabComponent {
         }
     }
 
-    async upgradePlugin (plugin: IPluginInfo): Promise<void> {
+    async upgradePlugin (plugin: PluginInfo): Promise<void> {
         return this.installPlugin(this.knownUpgrades[plugin.name])
     }
 
-    showPluginInfo (plugin: IPluginInfo) {
+    showPluginInfo (plugin: PluginInfo) {
         this.electron.shell.openExternal('https://www.npmjs.com/package/' + plugin.packageName)
     }
 
-    enablePlugin (plugin: IPluginInfo) {
+    enablePlugin (plugin: PluginInfo) {
         this.config.store.pluginBlacklist = this.config.store.pluginBlacklist.filter(x => x !== plugin.name)
         this.config.save()
         this.config.requestRestart()
     }
 
-    disablePlugin (plugin: IPluginInfo) {
+    disablePlugin (plugin: PluginInfo) {
         this.config.store.pluginBlacklist = [...this.config.store.pluginBlacklist, plugin.name]
         this.config.save()
         this.config.requestRestart()

terminus-plugin-manager/src/index.ts

@@ -27,6 +27,6 @@ import { PluginsSettingsTabProvider } from './settings'
         PluginsSettingsTabComponent,
     ],
 })
-export default class PluginManagerModule { }
+export default class PluginManagerModule { } // eslint-disable-line @typescript-eslint/no-extraneous-class
 
 export { PluginManagerService }

terminus-plugin-manager/src/services/pluginManager.service.ts

@@ -8,7 +8,7 @@ const NAME_PREFIX = 'terminus-'
 const KEYWORD = 'terminus-plugin'
 const OFFICIAL_NPM_ACCOUNT = 'eugenepankov'
 
-export interface IPluginInfo {
+export interface PluginInfo {
     name: string
     description: string
     packageName: string
@@ -25,7 +25,7 @@ export class PluginManagerService {
     logger: Logger
     builtinPluginsPath: string = (window as any).builtinPluginsPath
     userPluginsPath: string = (window as any).userPluginsPath
-    installedPlugins: IPluginInfo[] = (window as any).installedPlugins
+    installedPlugins: PluginInfo[] = (window as any).installedPlugins
 
     private npmReady: Promise<void>
     private npm: any
@@ -57,12 +57,12 @@ export class PluginManagerService {
         return this.npm
     }
 
-    listAvailable (query?: string): Observable<IPluginInfo[]> {
+    listAvailable (query?: string): Observable<PluginInfo[]> {
         return from(
             axios.get(`https://www.npmjs.com/search?q=keywords%3A${KEYWORD}+${encodeURIComponent(query || '')}&from=0&size=1000`, {
                 headers: {
                     'x-spiferack': '1',
-                }
+                },
             })
         ).pipe(
             map(response => response.data.objects.map(item => ({
@@ -78,7 +78,7 @@ export class PluginManagerService {
         )
     }
 
-    async installPlugin (plugin: IPluginInfo) {
+    async installPlugin (plugin: PluginInfo) {
         (await this.getNPM()).commands.install([`${plugin.packageName}@${plugin.version}`], err => {
             if (err) {
                 this.logger.error(err)
@@ -88,7 +88,7 @@ export class PluginManagerService {
         })
     }
 
-    async uninstallPlugin (plugin: IPluginInfo) {
+    async uninstallPlugin (plugin: PluginInfo) {
         (await this.getNPM()).commands.remove([plugin.packageName], err => {
             if (err) {
                 this.logger.error(err)

terminus-plugin-manager/webpack.config.js

@@ -2,56 +2,59 @@ const path = require('path')
 const webpack = require('webpack')
 
 module.exports = {
-  target: 'node',
-  entry: 'src/index.ts',
-  devtool: 'eval-source-map',
-  context: __dirname,
-  output: {
-    path: path.resolve(__dirname, 'dist'),
-    filename: 'index.js',
-    pathinfo: true,
-    libraryTarget: 'umd',
-    devtoolModuleFilenameTemplate: 'webpack-terminus-plugin-manager:///[resource-path]',
-  },
-  mode: process.env.TERMINUS_DEV ? 'development' : 'production',
-  optimization:{
-     minimize: false,
-  },
-  resolve: {
-    modules: ['.', 'src', 'node_modules', '../app/node_modules'].map(x => path.join(__dirname, x)),
-    extensions: ['.ts', '.js'],
-  },
-  module: {
-    rules: [
-      {
-        test: /\.ts$/,
-        use: {
-          loader: 'awesome-typescript-loader',
-          query: {
-            configFileName: path.resolve(__dirname, 'tsconfig.json'),
-            typeRoots: [path.resolve(__dirname, 'node_modules/@types')],
-            paths: {
-              "terminus-*": [path.resolve(__dirname, '../terminus-*')],
-              "*": [path.resolve(__dirname, '../app/node_modules/*')],
-            }
-          }
-        }
-      },
-      { test: /\.pug$/, use: ['apply-loader', 'pug-loader'] },
-      { test: /\.scss$/, use: ['to-string-loader', 'css-loader', 'sass-loader'] },
-    ]
-  },
-  externals: [
-    'fs',
-    'net',
-    'npm',
-    'path',
-    /^rxjs/,
-    /^@angular/,
-    /^@ng-bootstrap/,
-    /^terminus-/,
-  ],
-  plugins: [
-    new webpack.optimize.ModuleConcatenationPlugin(),
-  ],
+    target: 'node',
+    entry: 'src/index.ts',
+    devtool: 'source-map',
+    context: __dirname,
+    output: {
+        path: path.resolve(__dirname, 'dist'),
+        filename: 'index.js',
+        pathinfo: true,
+        libraryTarget: 'umd',
+        devtoolModuleFilenameTemplate: 'webpack-terminus-plugin-manager:///[resource-path]',
+    },
+    mode: process.env.TERMINUS_DEV ? 'development' : 'production',
+    optimization:{
+        minimize: false,
+    },
+    resolve: {
+        modules: ['.', 'src', 'node_modules', '../app/node_modules'].map(x => path.join(__dirname, x)),
+        extensions: ['.ts', '.js'],
+    },
+    module: {
+        rules: [
+            {
+                test: /\.ts$/,
+                use: {
+                    loader: 'awesome-typescript-loader',
+                    query: {
+                        configFileName: path.resolve(__dirname, 'tsconfig.json'),
+                        typeRoots: [
+                            path.resolve(__dirname, 'node_modules/@types'),
+                            path.resolve(__dirname, '../node_modules/@types'),
+                        ],
+                        paths: {
+                            "terminus-*": [path.resolve(__dirname, '../terminus-*')],
+                            "*": [path.resolve(__dirname, '../app/node_modules/*')],
+                        },
+                    },
+                },
+            },
+            { test: /\.pug$/, use: ['apply-loader', 'pug-loader'] },
+            { test: /\.scss$/, use: ['to-string-loader', 'css-loader', 'sass-loader'] },
+        ],
+    },
+    externals: [
+        'fs',
+        'net',
+        'npm',
+        'path',
+        /^rxjs/,
+        /^@angular/,
+        /^@ng-bootstrap/,
+        /^terminus-/,
+    ],
+    plugins: [
+        new webpack.optimize.ModuleConcatenationPlugin(),
+    ],
 }

terminus-plugin-manager/yarn.lock

@@ -9,67 +9,21 @@
   dependencies:
     "@types/node" "*"
 
-"@types/node@*", "@types/node@12.0.7":
-  version "12.0.7"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.0.7.tgz#4f2563bad652b2acb1722d7e7aae2b0ff62d192c"
-  integrity sha512-1YKeT4JitGgE4SOzyB9eMwO0nGVNkNEsm9qlIt1Lqm/tG2QEiSMTD4kS3aO6L+w5SClLVxALmIBESK6Mk5wX0A==
+"@types/node@*":
+  version "12.0.10"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.0.10.tgz#51babf9c7deadd5343620055fc8aff7995c8b031"
+  integrity sha512-LcsGbPomWsad6wmMNv7nBLw7YYYyfdYcz6xryKYQhx89c3XXan+8Q6AJ43G5XDIaklaVkK3mE4fCb0SBvMiPSQ==
 
 "@types/semver@^6.0.0":
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-6.0.0.tgz#86ba89f02a414e39c68d02b351872e4ed31bd773"
-  integrity sha512-OO0srjOGH99a4LUN2its3+r6CBYcplhJ466yLqs+zvAWgphCpS8hYZEZ797tRDP/QKcqTdb/YCN6ifASoAWkrQ==
-
-"@types/webpack-env@1.13.9":
-  version "1.13.9"
-  resolved "https://registry.yarnpkg.com/@types/webpack-env/-/webpack-env-1.13.9.tgz#a67287861c928ebf4159a908d1fb1a2a34d4097a"
-  integrity sha512-p8zp5xqkly3g4cCmo2mKOHI9+Z/kObmDj0BmjbDDJQlgDTiEGTbm17MEwTAusV6XceCy+bNw9q/ZHXHyKo3zkg==
-
-alphanum-sort@^1.0.1, alphanum-sort@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3"
-  integrity sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=
-
-ansi-regex@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
-  integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8=
-
-ansi-styles@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
-  integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=
-
-ansi-styles@^3.1.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.0.tgz#c159b8d5be0f9e5a6f346dab94f16ce022161b88"
-  integrity sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==
-  dependencies:
-    color-convert "^1.9.0"
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-6.0.1.tgz#a984b405c702fa5a7ec6abc56b37f2ba35ef5af6"
+  integrity sha512-ffCdcrEE5h8DqVxinQjo+2d1q+FV5z7iNtPofw3JsrltSoSVlOGaW0rY8XxtO9XukdTn8TaCGWmk2VFGhI70mg==
 
 any-promise@^1.0.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f"
   integrity sha1-q8av7tzqUugJzcA3au0845Y10X8=
 
-argparse@^1.0.7:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.9.tgz#73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86"
-  integrity sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY=
-  dependencies:
-    sprintf-js "~1.0.2"
-
-autoprefixer@^6.3.1:
-  version "6.7.7"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-6.7.7.tgz#1dbd1c835658e35ce3f9984099db00585c782014"
-  integrity sha1-Hb0cg1ZY41zj+ZhAmdsAWFx4IBQ=
-  dependencies:
-    browserslist "^1.7.6"
-    caniuse-db "^1.0.30000634"
-    normalize-range "^0.1.2"
-    num2fraction "^1.2.2"
-    postcss "^5.2.16"
-    postcss-value-parser "^3.2.3"
-
 axios@^0.19.0:
   version "0.19.0"
   resolved "https://registry.yarnpkg.com/axios/-/axios-0.19.0.tgz#8e09bff3d9122e133f7b8101c8fbdd00ed3d2ab8"
@@ -78,214 +32,6 @@ axios@^0.19.0:
     follow-redirects "1.5.10"
     is-buffer "^2.0.2"
 
-babel-code-frame@^6.26.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
-  integrity sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=
-  dependencies:
-    chalk "^1.1.3"
-    esutils "^2.0.2"
-    js-tokens "^3.0.2"
-
-balanced-match@^0.4.2:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.4.2.tgz#cb3f3e3c732dc0f01ee70b403f302e61d7709838"
-  integrity sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=
-
-big.js@^3.1.3:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.1.3.tgz#4cada2193652eb3ca9ec8e55c9015669c9806978"
-  integrity sha1-TK2iGTZS6zyp7I5VyQFWacmAaXg=
-
-browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6:
-  version "1.7.7"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-1.7.7.tgz#0bd76704258be829b2398bb50e4b62d1a166b0b9"
-  integrity sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=
-  dependencies:
-    caniuse-db "^1.0.30000639"
-    electron-to-chromium "^1.2.7"
-
-caniuse-api@^1.5.2:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-1.6.1.tgz#b534e7c734c4f81ec5fbe8aca2ad24354b962c6c"
-  integrity sha1-tTTnxzTE+B7F++isoq0kNUuWLGw=
-  dependencies:
-    browserslist "^1.3.6"
-    caniuse-db "^1.0.30000529"
-    lodash.memoize "^4.1.2"
-    lodash.uniq "^4.5.0"
-
-caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639:
-  version "1.0.30000726"
-  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000726.tgz#9bb742f8d026a62df873bc03c06843d2255b60d7"
-  integrity sha1-m7dC+NAmpi34c7wDwGhD0iVbYNc=
-
-chalk@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
-  integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=
-  dependencies:
-    ansi-styles "^2.2.1"
-    escape-string-regexp "^1.0.2"
-    has-ansi "^2.0.0"
-    strip-ansi "^3.0.0"
-    supports-color "^2.0.0"
-
-chalk@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.1.0.tgz#ac5becf14fa21b99c6c92ca7a7d7cfd5b17e743e"
-  integrity sha512-LUHGS/dge4ujbXMJrnihYMcL4AoOweGnw9Tp3kQuqy1Kx5c1qKjqvMJZ6nVJPMWJtKCTN72ZogH3oeSO9g9rXQ==
-  dependencies:
-    ansi-styles "^3.1.0"
-    escape-string-regexp "^1.0.5"
-    supports-color "^4.0.0"
-
-clap@^1.0.9:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/clap/-/clap-1.2.0.tgz#59c90fe3e137104746ff19469a27a634ff68c857"
-  integrity sha1-WckP4+E3EEdG/xlGmiemNP9oyFc=
-  dependencies:
-    chalk "^1.1.3"
-
-clone@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.2.tgz#260b7a99ebb1edfe247538175f783243cb19d149"
-  integrity sha1-Jgt6meux7f4kdTgXX3gyQ8sZ0Uk=
-
-coa@~1.0.1:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/coa/-/coa-1.0.4.tgz#a9ef153660d6a86a8bdec0289a5c684d217432fd"
-  integrity sha1-qe8VNmDWqGqL3sAomlxoTSF0Mv0=
-  dependencies:
-    q "^1.1.2"
-
-color-convert@^1.3.0, color-convert@^1.9.0:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.0.tgz#1accf97dd739b983bf994d56fec8f95853641b7a"
-  integrity sha1-Gsz5fdc5uYO/mU1W/sj5WFNkG3o=
-  dependencies:
-    color-name "^1.1.1"
-
-color-name@^1.0.0, color-name@^1.1.1:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
-  integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
-
-color-string@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/color-string/-/color-string-0.3.0.tgz#27d46fb67025c5c2fa25993bfbf579e47841b991"
-  integrity sha1-J9RvtnAlxcL6JZk7+/V55HhBuZE=
-  dependencies:
-    color-name "^1.0.0"
-
-color@^0.11.0:
-  version "0.11.4"
-  resolved "https://registry.yarnpkg.com/color/-/color-0.11.4.tgz#6d7b5c74fb65e841cd48792ad1ed5e07b904d764"
-  integrity sha1-bXtcdPtl6EHNSHkq0e1eB7kE12Q=
-  dependencies:
-    clone "^1.0.2"
-    color-convert "^1.3.0"
-    color-string "^0.3.0"
-
-colormin@^1.0.5:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/colormin/-/colormin-1.1.2.tgz#ea2f7420a72b96881a38aae59ec124a6f7298133"
-  integrity sha1-6i90IKcrlogaOKrlnsEkpvcpgTM=
-  dependencies:
-    color "^0.11.0"
-    css-color-names "0.0.4"
-    has "^1.0.1"
-
-colors@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
-  integrity sha1-FopHAXVran9RoSzgyXv6KMCE7WM=
-
-css-color-names@0.0.4:
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0"
-  integrity sha1-gIrcLnnPhHOAabZGyyDsJ762KeA=
-
-css-loader@^0.28.0:
-  version "0.28.11"
-  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-0.28.11.tgz#c3f9864a700be2711bb5a2462b2389b1a392dab7"
-  integrity sha512-wovHgjAx8ZIMGSL8pTys7edA1ClmzxHeY6n/d97gg5odgsxEgKjULPR0viqyC+FWMCL9sfqoC/QCUBo62tLvPg==
-  dependencies:
-    babel-code-frame "^6.26.0"
-    css-selector-tokenizer "^0.7.0"
-    cssnano "^3.10.0"
-    icss-utils "^2.1.0"
-    loader-utils "^1.0.2"
-    lodash.camelcase "^4.3.0"
-    object-assign "^4.1.1"
-    postcss "^5.0.6"
-    postcss-modules-extract-imports "^1.2.0"
-    postcss-modules-local-by-default "^1.2.0"
-    postcss-modules-scope "^1.1.0"
-    postcss-modules-values "^1.3.0"
-    postcss-value-parser "^3.3.0"
-    source-list-map "^2.0.0"
-
-css-selector-tokenizer@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.7.0.tgz#e6988474ae8c953477bf5e7efecfceccd9cf4c86"
-  integrity sha1-5piEdK6MlTR3v15+/s/OzNnPTIY=
-  dependencies:
-    cssesc "^0.1.0"
-    fastparse "^1.1.1"
-    regexpu-core "^1.0.0"
-
-cssesc@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-0.1.0.tgz#c814903e45623371a0477b40109aaafbeeaddbb4"
-  integrity sha1-yBSQPkViM3GgR3tAEJqq++6t27Q=
-
-cssnano@^3.10.0:
-  version "3.10.0"
-  resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-3.10.0.tgz#4f38f6cea2b9b17fa01490f23f1dc68ea65c1c38"
-  integrity sha1-Tzj2zqK5sX+gFJDyPx3GjqZcHDg=
-  dependencies:
-    autoprefixer "^6.3.1"
-    decamelize "^1.1.2"
-    defined "^1.0.0"
-    has "^1.0.1"
-    object-assign "^4.0.1"
-    postcss "^5.0.14"
-    postcss-calc "^5.2.0"
-    postcss-colormin "^2.1.8"
-    postcss-convert-values "^2.3.4"
-    postcss-discard-comments "^2.0.4"
-    postcss-discard-duplicates "^2.0.1"
-    postcss-discard-empty "^2.0.1"
-    postcss-discard-overridden "^0.1.1"
-    postcss-discard-unused "^2.2.1"
-    postcss-filter-plugins "^2.0.0"
-    postcss-merge-idents "^2.1.5"
-    postcss-merge-longhand "^2.0.1"
-    postcss-merge-rules "^2.0.3"
-    postcss-minify-font-values "^1.0.2"
-    postcss-minify-gradients "^1.0.1"
-    postcss-minify-params "^1.0.4"
-    postcss-minify-selectors "^2.0.4"
-    postcss-normalize-charset "^1.1.0"
-    postcss-normalize-url "^3.0.7"
-    postcss-ordered-values "^2.1.0"
-    postcss-reduce-idents "^2.2.2"
-    postcss-reduce-initial "^1.0.0"
-    postcss-reduce-transforms "^1.0.3"
-    postcss-svgo "^2.1.1"
-    postcss-unique-selectors "^2.0.2"
-    postcss-value-parser "^3.2.3"
-    postcss-zindex "^2.0.1"
-
-csso@~2.3.1:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/csso/-/csso-2.3.2.tgz#ddd52c587033f49e94b71fc55569f252e8ff5f85"
-  integrity sha1-3dUsWHAz9J6Utx/FVWnyUuj/X4U=
-  dependencies:
-    clap "^1.0.9"
-    source-map "^0.5.3"
-
 debug@=3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
@@ -293,51 +39,6 @@ debug@=3.1.0:
   dependencies:
     ms "2.0.0"
 
-decamelize@^1.1.2:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
-  integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
-
-defined@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693"
-  integrity sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM=
-
-electron-to-chromium@^1.2.7:
-  version "1.3.21"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.21.tgz#a967ebdcfe8ed0083fc244d1894022a8e8113ea2"
-  integrity sha1-qWfr3P6O0Ag/wkTRiUAiqOgRPqI=
-
-emojis-list@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
-  integrity sha1-TapNnbAPmBmIDHn6RXrlsJof04k=
-
-escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
-  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
-
-esprima@^2.6.0:
-  version "2.7.3"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581"
-  integrity sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=
-
-esutils@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
-  integrity sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=
-
-fastparse@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.1.tgz#d1e2643b38a94d7583b479060e6c4affc94071f8"
-  integrity sha1-0eJkOzipTXWDtHkGDmxK/8lAcfg=
-
-flatten@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782"
-  integrity sha1-2uRqnXj74lKSJYzB54CkHZXAN4I=
-
 follow-redirects@1.5.10:
   version "1.5.10"
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.10.tgz#7b7a9f9aea2fdff36786a94ff643ed07f4ff5e2a"
@@ -345,153 +46,11 @@ follow-redirects@1.5.10:
   dependencies:
     debug "=3.1.0"
 
-function-bind@^1.0.2:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
-  integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
-
-has-ansi@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
-  integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=
-  dependencies:
-    ansi-regex "^2.0.0"
-
-has-flag@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa"
-  integrity sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=
-
-has-flag@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51"
-  integrity sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=
-
-has@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/has/-/has-1.0.1.tgz#8461733f538b0837c9361e39a9ab9e9704dc2f28"
-  integrity sha1-hGFzP1OLCDfJNh45qauelwTcLyg=
-  dependencies:
-    function-bind "^1.0.2"
-
-html-comment-regex@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/html-comment-regex/-/html-comment-regex-1.1.1.tgz#668b93776eaae55ebde8f3ad464b307a4963625e"
-  integrity sha1-ZouTd26q5V696POtRkswekljYl4=
-
-icss-replace-symbols@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz#06ea6f83679a7749e386cfe1fe812ae5db223ded"
-  integrity sha1-Bupvg2ead0njhs/h/oEq5dsiPe0=
-
-icss-utils@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-2.1.0.tgz#83f0a0ec378bf3246178b6c2ad9136f135b1c962"
-  integrity sha1-g/Cg7DeL8yRheLbCrZE28TWxyWI=
-  dependencies:
-    postcss "^6.0.1"
-
-indexes-of@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607"
-  integrity sha1-8w9xbI4r00bHtn0985FVZqfAVgc=
-
-is-absolute-url@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-2.1.0.tgz#50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6"
-  integrity sha1-UFMN+4T8yap9vnhS6Do3uTufKqY=
-
 is-buffer@^2.0.2:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.3.tgz#4ecf3fcf749cbd1e472689e109ac66261a25e725"
   integrity sha512-U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw==
 
-is-plain-obj@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
-  integrity sha1-caUMhCnfync8kqOQpKA7OfzVHT4=
-
-is-svg@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-svg/-/is-svg-2.1.0.tgz#cf61090da0d9efbcab8722deba6f032208dbb0e9"
-  integrity sha1-z2EJDaDZ77yrhyLeum8DIgjbsOk=
-  dependencies:
-    html-comment-regex "^1.1.0"
-
-js-base64@^2.1.9:
-  version "2.1.9"
-  resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.1.9.tgz#f0e80ae039a4bd654b5f281fc93f04a914a7fcce"
-  integrity sha1-8OgK4DmkvWVLXygfyT8EqRSn/M4=
-
-js-tokens@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
-  integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls=
-
-js-yaml@~3.7.0:
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.7.0.tgz#5c967ddd837a9bfdca5f2de84253abe8a1c03b80"
-  integrity sha1-XJZ93YN6m/3KXy3oQlOr6KHAO4A=
-  dependencies:
-    argparse "^1.0.7"
-    esprima "^2.6.0"
-
-jsesc@~0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
-  integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=
-
-json5@^0.5.0:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
-  integrity sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=
-
-loader-utils@^1.0.2:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.1.0.tgz#c98aef488bcceda2ffb5e2de646d6a754429f5cd"
-  integrity sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0=
-  dependencies:
-    big.js "^3.1.3"
-    emojis-list "^2.0.0"
-    json5 "^0.5.0"
-
-lodash.camelcase@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
-  integrity sha1-soqmKIorn8ZRA1x3EfZathkDMaY=
-
-lodash.memoize@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
-  integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=
-
-lodash.uniq@^4.5.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
-  integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
-
-macaddress@^0.2.8:
-  version "0.2.9"
-  resolved "https://registry.yarnpkg.com/macaddress/-/macaddress-0.2.9.tgz#3579b8b9acd5b96b4553abf0f394185a86813cb3"
-  integrity sha512-k4F1JUof6cQXxNFzx3thLby4oJzXTXQueAOOts944Vqizn+Rjc2QNFenT9FJSLU1CH3PmrHRSyZs2E+Cqw+P2w==
-
-math-expression-evaluator@^1.2.14:
-  version "1.2.17"
-  resolved "https://registry.yarnpkg.com/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz#de819fdbcd84dccd8fae59c6aeb79615b9d266ac"
-  integrity sha1-3oGf282E3M2PrlnGrreWFbnSZqw=
-
-minimist@0.0.8:
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
-  integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
-
-mkdirp@~0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
-  integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
-  dependencies:
-    minimist "0.0.8"
-
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
@@ -511,446 +70,15 @@ ngx-pipes@^1.6.1:
   resolved "https://registry.yarnpkg.com/ngx-pipes/-/ngx-pipes-1.6.6.tgz#32bb80906c220f1e84d5cce7d6dae002cffead4b"
   integrity sha512-mRV0xOZDd6/Jlvti4W0pDepZRIHLHd3kZ6ZzdqyGCU0dxbKVWWLTR1jlNlxN1ruMk8eO0Y8lNh6a1bEW7dJP1w==
 
-normalize-range@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
-  integrity sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=
-
-normalize-url@^1.4.0:
-  version "1.9.1"
-  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-1.9.1.tgz#2cc0d66b31ea23036458436e3620d85954c66c3c"
-  integrity sha1-LMDWazHqIwNkWENuNiDYWVTGbDw=
-  dependencies:
-    object-assign "^4.0.1"
-    prepend-http "^1.0.0"
-    query-string "^4.1.0"
-    sort-keys "^1.0.0"
-
-num2fraction@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"
-  integrity sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=
-
-object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
+object-assign@^4.0.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
   integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
 
-postcss-calc@^5.2.0:
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-5.3.1.tgz#77bae7ca928ad85716e2fda42f261bf7c1d65b5e"
-  integrity sha1-d7rnypKK2FcW4v2kLyYb98HWW14=
-  dependencies:
-    postcss "^5.0.2"
-    postcss-message-helpers "^2.0.0"
-    reduce-css-calc "^1.2.6"
-
-postcss-colormin@^2.1.8:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-2.2.2.tgz#6631417d5f0e909a3d7ec26b24c8a8d1e4f96e4b"
-  integrity sha1-ZjFBfV8OkJo9fsJrJMio0eT5bks=
-  dependencies:
-    colormin "^1.0.5"
-    postcss "^5.0.13"
-    postcss-value-parser "^3.2.3"
-
-postcss-convert-values@^2.3.4:
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-2.6.1.tgz#bbd8593c5c1fd2e3d1c322bb925dcae8dae4d62d"
-  integrity sha1-u9hZPFwf0uPRwyK7kl3K6Nrk1i0=
-  dependencies:
-    postcss "^5.0.11"
-    postcss-value-parser "^3.1.2"
-
-postcss-discard-comments@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-2.0.4.tgz#befe89fafd5b3dace5ccce51b76b81514be00e3d"
-  integrity sha1-vv6J+v1bPazlzM5Rt2uBUUvgDj0=
-  dependencies:
-    postcss "^5.0.14"
-
-postcss-discard-duplicates@^2.0.1:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-2.1.0.tgz#b9abf27b88ac188158a5eb12abcae20263b91932"
-  integrity sha1-uavye4isGIFYpesSq8riAmO5GTI=
-  dependencies:
-    postcss "^5.0.4"
-
-postcss-discard-empty@^2.0.1:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-2.1.0.tgz#d2b4bd9d5ced5ebd8dcade7640c7d7cd7f4f92b5"
-  integrity sha1-0rS9nVztXr2Nyt52QMfXzX9PkrU=
-  dependencies:
-    postcss "^5.0.14"
-
-postcss-discard-overridden@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-0.1.1.tgz#8b1eaf554f686fb288cd874c55667b0aa3668d58"
-  integrity sha1-ix6vVU9ob7KIzYdMVWZ7CqNmjVg=
-  dependencies:
-    postcss "^5.0.16"
-
-postcss-discard-unused@^2.2.1:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/postcss-discard-unused/-/postcss-discard-unused-2.2.3.tgz#bce30b2cc591ffc634322b5fb3464b6d934f4433"
-  integrity sha1-vOMLLMWR/8Y0Mitfs0ZLbZNPRDM=
-  dependencies:
-    postcss "^5.0.14"
-    uniqs "^2.0.0"
-
-postcss-filter-plugins@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-filter-plugins/-/postcss-filter-plugins-2.0.2.tgz#6d85862534d735ac420e4a85806e1f5d4286d84c"
-  integrity sha1-bYWGJTTXNaxCDkqFgG4fXUKG2Ew=
-  dependencies:
-    postcss "^5.0.4"
-    uniqid "^4.0.0"
-
-postcss-merge-idents@^2.1.5:
-  version "2.1.7"
-  resolved "https://registry.yarnpkg.com/postcss-merge-idents/-/postcss-merge-idents-2.1.7.tgz#4c5530313c08e1d5b3bbf3d2bbc747e278eea270"
-  integrity sha1-TFUwMTwI4dWzu/PSu8dH4njuonA=
-  dependencies:
-    has "^1.0.1"
-    postcss "^5.0.10"
-    postcss-value-parser "^3.1.1"
-
-postcss-merge-longhand@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-2.0.2.tgz#23d90cd127b0a77994915332739034a1a4f3d658"
-  integrity sha1-I9kM0Sewp3mUkVMyc5A0oaTz1lg=
-  dependencies:
-    postcss "^5.0.4"
-
-postcss-merge-rules@^2.0.3:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-2.1.2.tgz#d1df5dfaa7b1acc3be553f0e9e10e87c61b5f721"
-  integrity sha1-0d9d+qexrMO+VT8OnhDofGG19yE=
-  dependencies:
-    browserslist "^1.5.2"
-    caniuse-api "^1.5.2"
-    postcss "^5.0.4"
-    postcss-selector-parser "^2.2.2"
-    vendors "^1.0.0"
-
-postcss-message-helpers@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-message-helpers/-/postcss-message-helpers-2.0.0.tgz#a4f2f4fab6e4fe002f0aed000478cdf52f9ba60e"
-  integrity sha1-pPL0+rbk/gAvCu0ABHjN9S+bpg4=
-
-postcss-minify-font-values@^1.0.2:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-1.0.5.tgz#4b58edb56641eba7c8474ab3526cafd7bbdecb69"
-  integrity sha1-S1jttWZB66fIR0qzUmyv17vey2k=
-  dependencies:
-    object-assign "^4.0.1"
-    postcss "^5.0.4"
-    postcss-value-parser "^3.0.2"
-
-postcss-minify-gradients@^1.0.1:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-1.0.5.tgz#5dbda11373703f83cfb4a3ea3881d8d75ff5e6e1"
-  integrity sha1-Xb2hE3NwP4PPtKPqOIHY11/15uE=
-  dependencies:
-    postcss "^5.0.12"
-    postcss-value-parser "^3.3.0"
-
-postcss-minify-params@^1.0.4:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-1.2.2.tgz#ad2ce071373b943b3d930a3fa59a358c28d6f1f3"
-  integrity sha1-rSzgcTc7lDs9kwo/pZo1jCjW8fM=
-  dependencies:
-    alphanum-sort "^1.0.1"
-    postcss "^5.0.2"
-    postcss-value-parser "^3.0.2"
-    uniqs "^2.0.0"
-
-postcss-minify-selectors@^2.0.4:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-2.1.1.tgz#b2c6a98c0072cf91b932d1a496508114311735bf"
-  integrity sha1-ssapjAByz5G5MtGkllCBFDEXNb8=
-  dependencies:
-    alphanum-sort "^1.0.2"
-    has "^1.0.1"
-    postcss "^5.0.14"
-    postcss-selector-parser "^2.0.0"
-
-postcss-modules-extract-imports@^1.2.0:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.2.1.tgz#dc87e34148ec7eab5f791f7cd5849833375b741a"
-  integrity sha512-6jt9XZwUhwmRUhb/CkyJY020PYaPJsCyt3UjbaWo6XEbH/94Hmv6MP7fG2C5NDU/BcHzyGYxNtHvM+LTf9HrYw==
-  dependencies:
-    postcss "^6.0.1"
-
-postcss-modules-local-by-default@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz#f7d80c398c5a393fa7964466bd19500a7d61c069"
-  integrity sha1-99gMOYxaOT+nlkRmvRlQCn1hwGk=
-  dependencies:
-    css-selector-tokenizer "^0.7.0"
-    postcss "^6.0.1"
-
-postcss-modules-scope@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz#d6ea64994c79f97b62a72b426fbe6056a194bb90"
-  integrity sha1-1upkmUx5+XtipytCb75gVqGUu5A=
-  dependencies:
-    css-selector-tokenizer "^0.7.0"
-    postcss "^6.0.1"
-
-postcss-modules-values@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz#ecffa9d7e192518389f42ad0e83f72aec456ea20"
-  integrity sha1-7P+p1+GSUYOJ9CrQ6D9yrsRW6iA=
-  dependencies:
-    icss-replace-symbols "^1.1.0"
-    postcss "^6.0.1"
-
-postcss-normalize-charset@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-1.1.1.tgz#ef9ee71212d7fe759c78ed162f61ed62b5cb93f1"
-  integrity sha1-757nEhLX/nWceO0WL2HtYrXLk/E=
-  dependencies:
-    postcss "^5.0.5"
-
-postcss-normalize-url@^3.0.7:
-  version "3.0.8"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-3.0.8.tgz#108f74b3f2fcdaf891a2ffa3ea4592279fc78222"
-  integrity sha1-EI90s/L82viRov+j6kWSJ5/HgiI=
-  dependencies:
-    is-absolute-url "^2.0.0"
-    normalize-url "^1.4.0"
-    postcss "^5.0.14"
-    postcss-value-parser "^3.2.3"
-
-postcss-ordered-values@^2.1.0:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-2.2.3.tgz#eec6c2a67b6c412a8db2042e77fe8da43f95c11d"
-  integrity sha1-7sbCpntsQSqNsgQud/6NpD+VwR0=
-  dependencies:
-    postcss "^5.0.4"
-    postcss-value-parser "^3.0.1"
-
-postcss-reduce-idents@^2.2.2:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/postcss-reduce-idents/-/postcss-reduce-idents-2.4.0.tgz#c2c6d20cc958284f6abfbe63f7609bf409059ad3"
-  integrity sha1-wsbSDMlYKE9qv75j92Cb9AkFmtM=
-  dependencies:
-    postcss "^5.0.4"
-    postcss-value-parser "^3.0.2"
-
-postcss-reduce-initial@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-1.0.1.tgz#68f80695f045d08263a879ad240df8dd64f644ea"
-  integrity sha1-aPgGlfBF0IJjqHmtJA343WT2ROo=
-  dependencies:
-    postcss "^5.0.4"
-
-postcss-reduce-transforms@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-1.0.4.tgz#ff76f4d8212437b31c298a42d2e1444025771ae1"
-  integrity sha1-/3b02CEkN7McKYpC0uFEQCV3GuE=
-  dependencies:
-    has "^1.0.1"
-    postcss "^5.0.8"
-    postcss-value-parser "^3.0.1"
-
-postcss-selector-parser@^2.0.0, postcss-selector-parser@^2.2.2:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz#f9437788606c3c9acee16ffe8d8b16297f27bb90"
-  integrity sha1-+UN3iGBsPJrO4W/+jYsWKX8nu5A=
-  dependencies:
-    flatten "^1.0.2"
-    indexes-of "^1.0.1"
-    uniq "^1.0.1"
-
-postcss-svgo@^2.1.1:
-  version "2.1.6"
-  resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-2.1.6.tgz#b6df18aa613b666e133f08adb5219c2684ac108d"
-  integrity sha1-tt8YqmE7Zm4TPwittSGcJoSsEI0=
-  dependencies:
-    is-svg "^2.0.0"
-    postcss "^5.0.14"
-    postcss-value-parser "^3.2.3"
-    svgo "^0.7.0"
-
-postcss-unique-selectors@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-2.0.2.tgz#981d57d29ddcb33e7b1dfe1fd43b8649f933ca1d"
-  integrity sha1-mB1X0p3csz57Hf4f1DuGSfkzyh0=
-  dependencies:
-    alphanum-sort "^1.0.1"
-    postcss "^5.0.4"
-    uniqs "^2.0.0"
-
-postcss-value-parser@^3.0.1, postcss-value-parser@^3.0.2, postcss-value-parser@^3.1.1, postcss-value-parser@^3.1.2, postcss-value-parser@^3.2.3, postcss-value-parser@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz#87f38f9f18f774a4ab4c8a232f5c5ce8872a9d15"
-  integrity sha1-h/OPnxj3dKSrTIojL1xc6IcqnRU=
-
-postcss-zindex@^2.0.1:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/postcss-zindex/-/postcss-zindex-2.2.0.tgz#d2109ddc055b91af67fc4cb3b025946639d2af22"
-  integrity sha1-0hCd3AVbka9n/EyzsCWUZjnSryI=
-  dependencies:
-    has "^1.0.1"
-    postcss "^5.0.4"
-    uniqs "^2.0.0"
-
-postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0.14, postcss@^5.0.16, postcss@^5.0.2, postcss@^5.0.4, postcss@^5.0.5, postcss@^5.0.6, postcss@^5.0.8, postcss@^5.2.16:
-  version "5.2.17"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.2.17.tgz#cf4f597b864d65c8a492b2eabe9d706c879c388b"
-  integrity sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=
-  dependencies:
-    chalk "^1.1.3"
-    js-base64 "^2.1.9"
-    source-map "^0.5.6"
-    supports-color "^3.2.3"
-
-postcss@^6.0.1:
-  version "6.0.11"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.11.tgz#f48db210b1d37a7f7ab6499b7a54982997ab6f72"
-  integrity sha512-DsnIzznNRQprsGTALpkC0xjDygo+QcOd+qVjP9+RjyzrPiyYOXBGOwoJ4rAiiE4lu6JggQ/jW4niY24WLxuncg==
-  dependencies:
-    chalk "^2.1.0"
-    source-map "^0.5.7"
-    supports-color "^4.4.0"
-
-prepend-http@^1.0.0:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
-  integrity sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=
-
-q@^1.1.2:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/q/-/q-1.5.0.tgz#dd01bac9d06d30e6f219aecb8253ee9ebdc308f1"
-  integrity sha1-3QG6ydBtMObyGa7LglPunr3DCPE=
-
-query-string@^4.1.0:
-  version "4.3.4"
-  resolved "https://registry.yarnpkg.com/query-string/-/query-string-4.3.4.tgz#bbb693b9ca915c232515b228b1a02b609043dbeb"
-  integrity sha1-u7aTucqRXCMlFbIosaArYJBD2+s=
-  dependencies:
-    object-assign "^4.1.0"
-    strict-uri-encode "^1.0.0"
-
-reduce-css-calc@^1.2.6:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz#747c914e049614a4c9cfbba629871ad1d2927716"
-  integrity sha1-dHyRTgSWFKTJz7umKYca0dKSdxY=
-  dependencies:
-    balanced-match "^0.4.2"
-    math-expression-evaluator "^1.2.14"
-    reduce-function-call "^1.0.1"
-
-reduce-function-call@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/reduce-function-call/-/reduce-function-call-1.0.2.tgz#5a200bf92e0e37751752fe45b0ab330fd4b6be99"
-  integrity sha1-WiAL+S4ON3UXUv5FsKszD9S2vpk=
-  dependencies:
-    balanced-match "^0.4.2"
-
-regenerate@^1.2.1:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.3.2.tgz#d1941c67bad437e1be76433add5b385f95b19260"
-  integrity sha1-0ZQcZ7rUN+G+dkM63Vs4X5WxkmA=
-
-regexpu-core@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-1.0.0.tgz#86a763f58ee4d7c2f6b102e4764050de7ed90c6b"
-  integrity sha1-hqdj9Y7k18L2sQLkdkBQ3n7ZDGs=
-  dependencies:
-    regenerate "^1.2.1"
-    regjsgen "^0.2.0"
-    regjsparser "^0.1.4"
-
-regjsgen@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.2.0.tgz#6c016adeac554f75823fe37ac05b92d5a4edb1f7"
-  integrity sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=
-
-regjsparser@^0.1.4:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.1.5.tgz#7ee8f84dc6fa792d3fd0ae228d24bd949ead205c"
-  integrity sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=
-  dependencies:
-    jsesc "~0.5.0"
-
-sax@~1.2.1:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
-  integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
-
 semver@^6.1.0:
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-6.1.1.tgz#53f53da9b30b2103cd4f15eab3a18ecbcb210c9b"
-  integrity sha512-rWYq2e5iYW+fFe/oPPtYJxYgjBm8sC4rmoGdUOgBB7VnwKt6HrL793l2voH1UlsyYZpJ4g0wfjnTEO1s1NP2eQ==
-
-sort-keys@^1.0.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz#441b6d4d346798f1b4e49e8920adfba0e543f9ad"
-  integrity sha1-RBttTTRnmPG05J6JIK37oOVD+a0=
-  dependencies:
-    is-plain-obj "^1.0.0"
-
-source-list-map@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.0.tgz#aaa47403f7b245a92fbc97ea08f250d6087ed085"
-  integrity sha512-I2UmuJSRr/T8jisiROLU3A3ltr+swpniSmNPI4Ml3ZCX6tVnDsuZzK7F2hl5jTqbZBWCEKlj5HRQiPExXLgE8A==
-
-source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7:
-  version "0.5.7"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
-  integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
-
-sprintf-js@~1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
-  integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
-
-strict-uri-encode@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
-  integrity sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=
-
-strip-ansi@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
-  integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=
-  dependencies:
-    ansi-regex "^2.0.0"
-
-supports-color@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
-  integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=
-
-supports-color@^3.2.3:
-  version "3.2.3"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"
-  integrity sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=
-  dependencies:
-    has-flag "^1.0.0"
-
-supports-color@^4.0.0, supports-color@^4.4.0:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.4.0.tgz#883f7ddabc165142b2a61427f3352ded195d1a3e"
-  integrity sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==
-  dependencies:
-    has-flag "^2.0.0"
-
-svgo@^0.7.0:
-  version "0.7.2"
-  resolved "https://registry.yarnpkg.com/svgo/-/svgo-0.7.2.tgz#9f5772413952135c6fefbf40afe6a4faa88b4bb5"
-  integrity sha1-n1dyQTlSE1xv779Ar+ak+qiLS7U=
-  dependencies:
-    coa "~1.0.1"
-    colors "~1.1.2"
-    csso "~2.3.1"
-    js-yaml "~3.7.0"
-    mkdirp "~0.5.1"
-    sax "~1.2.1"
-    whet.extend "~0.9.9"
+  version "6.1.2"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.1.2.tgz#079960381376a3db62eb2edc8a3bfb10c7cfe318"
+  integrity sha512-z4PqiCpomGtWj8633oeAdXm1Kn1W++3T8epkZYnwiVgIYIJ0QHszhInYSJTYxebByQH7KVCEAn8R9duzZW2PhQ==
 
 thenify-all@^1.0.0:
   version "1.6.0"
@@ -965,30 +93,3 @@ thenify-all@^1.0.0:
   integrity sha1-5p44obq+lpsBCCB5eLn2K4hgSDk=
   dependencies:
     any-promise "^1.0.0"
-
-uniq@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff"
-  integrity sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=
-
-uniqid@^4.0.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/uniqid/-/uniqid-4.1.1.tgz#89220ddf6b751ae52b5f72484863528596bb84c1"
-  integrity sha1-iSIN32t1GuUrX3JISGNShZa7hME=
-  dependencies:
-    macaddress "^0.2.8"
-
-uniqs@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/uniqs/-/uniqs-2.0.0.tgz#ffede4b36b25290696e6e165d4a59edb998e6b02"
-  integrity sha1-/+3ks2slKQaW5uFl1KWe25mOawI=
-
-vendors@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.1.tgz#37ad73c8ee417fb3d580e785312307d274847f22"
-  integrity sha1-N61zyO5Bf7PVgOeFMSMH0nSEfyI=
-
-whet.extend@~0.9.9:
-  version "0.9.9"
-  resolved "https://registry.yarnpkg.com/whet.extend/-/whet.extend-0.9.9.tgz#f877d5bf648c97e5aa542fadc16d6a259b9c11a1"
-  integrity sha1-+HfVv2SMl+WqVC+twW1qJZucEaE=

terminus-settings/package.json

@@ -1,6 +1,6 @@
 {
   "name": "terminus-settings",
-  "version": "1.0.73-c4-ga7d62b0",
+  "version": "1.0.83-nightly.4",
   "description": "Terminus terminal settings page",
   "keywords": [
     "terminus-builtin-plugin"
@@ -12,23 +12,21 @@
     "watch": "webpack --progress --color --watch"
   },
   "files": [
-    "dist"
+    "typings"
   ],
   "author": "Eugene Pankov",
   "license": "MIT",
   "devDependencies": {
     "@types/deep-equal": "1.0.1",
-    "@types/node": "12.0.7",
-    "@types/webpack-env": "1.13.9",
     "ngx-pipes": "^1.6.1"
   },
   "peerDependencies": {
-    "@angular/common": "4.0.1",
-    "@angular/core": "4.0.1",
-    "@angular/forms": "4.0.1",
-    "@angular/platform-browser": "4.0.1",
-    "@ng-bootstrap/ng-bootstrap": "1.0.0-alpha.22",
+    "@angular/common": "^7",
+    "@angular/core": "^7",
+    "@angular/forms": "^7",
+    "@angular/platform-browser": "^7",
+    "@ng-bootstrap/ng-bootstrap": "^1",
     "terminus-core": "*",
-    "rxjs": "5.3.0"
+    "rxjs": "^5"
   }
 }

terminus-settings/src/buttonProvider.ts

@@ -1,6 +1,5 @@
 import { Injectable } from '@angular/core'
-import { DomSanitizer } from '@angular/platform-browser'
-import { ToolbarButtonProvider, IToolbarButton, AppService, HostAppService, HotkeysService } from 'terminus-core'
+import { ToolbarButtonProvider, ToolbarButton, AppService, HostAppService, HotkeysService } from 'terminus-core'
 
 import { SettingsTabComponent } from './components/settingsTab.component'
 
@@ -11,7 +10,6 @@ export class ButtonProvider extends ToolbarButtonProvider {
         hostApp: HostAppService,
         hotkeys: HotkeysService,
         private app: AppService,
-        private domSanitizer: DomSanitizer,
     ) {
         super()
         hostApp.preferencesMenu$.subscribe(() => this.open())
@@ -23,9 +21,9 @@ export class ButtonProvider extends ToolbarButtonProvider {
         })
     }
 
-    provide (): IToolbarButton[] {
+    provide (): ToolbarButton[] {
         return [{
-            icon: this.domSanitizer.bypassSecurityTrustHtml(require('./icons/cog.svg')),
+            icon: require('./icons/cog.svg'),
             title: 'Settings',
             touchBarNSImage: 'NSTouchBarComposeTemplate',
             weight: 10,
@@ -34,7 +32,7 @@ export class ButtonProvider extends ToolbarButtonProvider {
     }
 
     open (): void {
-        let settingsTab = this.app.tabs.find(tab => tab instanceof SettingsTabComponent)
+        const settingsTab = this.app.tabs.find(tab => tab instanceof SettingsTabComponent)
         if (settingsTab) {
             this.app.selectTab(settingsTab)
         } else {

terminus-settings/src/components/hotkeyInputModal.component.ts

@@ -21,7 +21,7 @@ const INPUT_TIMEOUT = 1000
                 animate('250ms ease-out', style({
                     transform: 'translateX(0)',
                     opacity: '1',
-                }))
+                })),
             ]),
             transition(':leave', [
                 style({
@@ -31,10 +31,10 @@ const INPUT_TIMEOUT = 1000
                 animate('250ms ease-in', style({
                     transform: 'translateX(25px)',
                     opacity: '0',
-                }))
-            ])
-        ])
-    ]
+                })),
+            ]),
+        ]),
+    ],
 })
 export class HotkeyInputModalComponent {
     @Input() value: string[] = []

terminus-settings/src/components/multiHotkeyInput.component.ts

@@ -24,7 +24,7 @@ export class MultiHotkeyInputComponent {
         if (typeof this.model === 'string') {
             this.model = [this.model]
         }
-        this.model = this.model.map(item => (typeof item === 'string') ? [item] : item)
+        this.model = this.model.map(item => typeof item === 'string' ? [item] : item)
     }
 
     editItem (item) {

terminus-settings/src/components/settingsTab.component.scss

@@ -2,8 +2,6 @@
     display: flex;
     flex-direction: column;
     flex: auto;
-    overflow: auto;
-    height: 100%;
 
     >.btn-block {
         margin: 20px;

terminus-settings/src/components/settingsTab.component.ts

@@ -1,19 +1,19 @@
 import * as yaml from 'js-yaml'
 import * as os from 'os'
 import { Subscription } from 'rxjs'
-import { Component, Inject, Input, HostBinding } from '@angular/core'
+import { Component, Inject, Input, HostBinding, NgZone } from '@angular/core'
 import {
     ElectronService,
     DockingService,
     ConfigService,
-    IHotkeyDescription,
+    HotkeyDescription,
     HotkeysService,
     BaseTabComponent,
     Theme,
     HostAppService,
     Platform,
     HomeBaseService,
-    ShellIntegrationService
+    ShellIntegrationService,
 } from 'terminus-core'
 
 import { SettingsTabProvider } from '../api'
@@ -30,7 +30,7 @@ import { SettingsTabProvider } from '../api'
 export class SettingsTabComponent extends BaseTabComponent {
     @Input() activeTab: string
     hotkeyFilter = ''
-    hotkeyDescriptions: IHotkeyDescription[]
+    hotkeyDescriptions: HotkeyDescription[]
     screens: any[]
     Platform = Platform
     configDefaults: any
@@ -47,6 +47,7 @@ export class SettingsTabComponent extends BaseTabComponent {
         public hostApp: HostAppService,
         public homeBase: HomeBaseService,
         public shellIntegration: ShellIntegrationService,
+        public zone: NgZone,
         hotkeys: HotkeysService,
         @Inject(SettingsTabProvider) public settingsProviders: SettingsTabProvider[],
         @Inject(Theme) public themes: Theme[],
@@ -68,6 +69,14 @@ export class SettingsTabComponent extends BaseTabComponent {
         this.configSubscription = config.changed$.subscribe(onConfigChange)
         onConfigChange()
 
+        const onScreenChange = () => {
+            this.zone.run(() => this.screens = this.docking.getScreens());
+        }
+
+        electron.screen.on('display-added', onScreenChange);
+        electron.screen.on('display-removed', onScreenChange);
+        electron.screen.on('display-metrics-changed', onScreenChange);
+
         hotkeys.getHotkeyDescriptions().then(descriptions => {
             this.hotkeyDescriptions = descriptions
         })
@@ -124,7 +133,7 @@ export class SettingsTabComponent extends BaseTabComponent {
 
     getHotkey (id: string) {
         let ptr = this.config.store.hotkeys
-        for (let token of id.split(/\./g)) {
+        for (const token of id.split(/\./g)) {
             ptr = ptr[token]
         }
         return ptr
@@ -133,7 +142,7 @@ export class SettingsTabComponent extends BaseTabComponent {
     setHotkey (id: string, value) {
         let ptr = this.config.store
         let prop = 'hotkeys'
-        for (let token of id.split(/\./g)) {
+        for (const token of id.split(/\./g)) {
             ptr = ptr[prop]
             prop = token
         }

terminus-settings/src/components/settingsTab.deep.component.css

@@ -13,6 +13,7 @@
     padding: 15px 30px;
     margin: 0;
     overflow-y: auto;
+    height: 100%;
     flex: auto;
     display: flex;
     position: relative;

terminus-settings/src/config.ts

@@ -7,17 +7,17 @@ export class SettingsConfigProvider extends ConfigProvider {
         [Platform.macOS]: {
             hotkeys: {
                 settings: ['⌘-,'],
-            }
+            },
         },
         [Platform.Windows]: {
             hotkeys: {
-                settings: ['Ctrl-,']
-            }
+                settings: ['Ctrl-,'],
+            },
         },
         [Platform.Linux]: {
             hotkeys: {
-                settings: ['Ctrl-,']
-            }
+                settings: ['Ctrl-,'],
+            },
         },
     }
 }

terminus-settings/src/hotkeys.ts

@@ -1,17 +1,17 @@
 import { Injectable } from '@angular/core'
-import { IHotkeyDescription, HotkeyProvider } from 'terminus-core'
+import { HotkeyDescription, HotkeyProvider } from 'terminus-core'
 
 /** @hidden */
 @Injectable()
 export class SettingsHotkeyProvider extends HotkeyProvider {
-    hotkeys: IHotkeyDescription[] = [
+    hotkeys: HotkeyDescription[] = [
         {
             id: 'settings',
             name: 'Open Settings',
         },
     ]
 
-    async provide (): Promise<IHotkeyDescription[]> {
+    async provide (): Promise<HotkeyDescription[]> {
         return this.hotkeys
     }
 }

terminus-settings/src/index.ts

@@ -42,7 +42,7 @@ import { SettingsConfigProvider } from './config'
         SettingsTabBodyComponent,
     ],
 })
-export default class SettingsModule { }
+export default class SettingsModule { } // eslint-disable-line @typescript-eslint/no-extraneous-class
 
 export * from './api'
 export { SettingsTabComponent }

terminus-settings/webpack.config.js

@@ -2,58 +2,61 @@ const path = require('path')
 const webpack = require('webpack')
 
 module.exports = {
-  target: 'node',
-  entry: 'src/index.ts',
-  devtool: 'eval-source-map',
-  context: __dirname,
-  mode: 'development',
-  output: {
-    path: path.resolve(__dirname, 'dist'),
-    filename: 'index.js',
-    pathinfo: true,
-    libraryTarget: 'umd',
-    devtoolModuleFilenameTemplate: 'webpack-terminus-settings:///[resource-path]',
-  },
-  mode: process.env.TERMINUS_DEV ? 'development' : 'production',
-  optimization:{
-     minimize: false,
-  },
-  resolve: {
-    modules: ['.', 'src', 'node_modules', '../app/node_modules'].map(x => path.join(__dirname, x)),
-    extensions: ['.ts', '.js'],
-  },
-  module: {
-    rules: [
-      {
-        test: /\.ts$/,
-        use: {
-          loader: 'awesome-typescript-loader',
-          options: {
-            configFileName: path.resolve(__dirname, 'tsconfig.json'),
-            typeRoots: [path.resolve(__dirname, 'node_modules/@types')],
-            paths: {
-              "terminus-*": [path.resolve(__dirname, '../terminus-*')],
-              "*": [path.resolve(__dirname, '../app/node_modules/*')],
-            }
-          }
-        }
-      },
-      { test: /\.pug$/, use: ['apply-loader', 'pug-loader'] },
-      { test: /\.scss$/, use: ['to-string-loader', 'css-loader', 'sass-loader'] },
-      { test: /\.css$/, use: ['to-string-loader', 'css-loader', 'sass-loader'] },
-      { test: /\.svg/, use: ['svg-inline-loader'] },
-    ]
-  },
-  externals: [
-    'fs',
-    'path',
-    'os',
-    /^rxjs/,
-    /^@angular/,
-    /^@ng-bootstrap/,
-    /^terminus-/,
-  ],
-  plugins: [
-    new webpack.optimize.ModuleConcatenationPlugin(),
-  ],
+    target: 'node',
+    entry: 'src/index.ts',
+    devtool: 'source-map',
+    context: __dirname,
+    mode: 'development',
+    output: {
+        path: path.resolve(__dirname, 'dist'),
+        filename: 'index.js',
+        pathinfo: true,
+        libraryTarget: 'umd',
+        devtoolModuleFilenameTemplate: 'webpack-terminus-settings:///[resource-path]',
+    },
+    mode: process.env.TERMINUS_DEV ? 'development' : 'production',
+    optimization:{
+        minimize: false,
+    },
+    resolve: {
+        modules: ['.', 'src', 'node_modules', '../app/node_modules'].map(x => path.join(__dirname, x)),
+        extensions: ['.ts', '.js'],
+    },
+    module: {
+        rules: [
+            {
+                test: /\.ts$/,
+                use: {
+                    loader: 'awesome-typescript-loader',
+                    options: {
+                        configFileName: path.resolve(__dirname, 'tsconfig.json'),
+                        typeRoots: [
+                            path.resolve(__dirname, 'node_modules/@types'),
+                            path.resolve(__dirname, '../node_modules/@types'),
+                        ],
+                        paths: {
+                            "terminus-*": [path.resolve(__dirname, '../terminus-*')],
+                            "*": [path.resolve(__dirname, '../app/node_modules/*')],
+                        },
+                    },
+                },
+            },
+            { test: /\.pug$/, use: ['apply-loader', 'pug-loader'] },
+            { test: /\.scss$/, use: ['to-string-loader', 'css-loader', 'sass-loader'] },
+            { test: /\.css$/, use: ['to-string-loader', 'css-loader', 'sass-loader'] },
+            { test: /\.svg/, use: ['svg-inline-loader'] },
+        ],
+    },
+    externals: [
+        'fs',
+        'path',
+        'os',
+        /^rxjs/,
+        /^@angular/,
+        /^@ng-bootstrap/,
+        /^terminus-/,
+    ],
+    plugins: [
+        new webpack.optimize.ModuleConcatenationPlugin(),
+    ],
 }

terminus-settings/yarn.lock

@@ -7,16 +7,6 @@
   resolved "https://registry.yarnpkg.com/@types/deep-equal/-/deep-equal-1.0.1.tgz#71cfabb247c22bcc16d536111f50c0ed12476b03"
   integrity sha512-mMUu4nWHLBlHtxXY17Fg6+ucS/MnndyOWyOe7MmwkoMYxvfQU2ajtRaEvqSUv+aVkMqH/C0NCI8UoVfRNQ10yg==
 
-"@types/node@12.0.7":
-  version "12.0.7"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.0.7.tgz#4f2563bad652b2acb1722d7e7aae2b0ff62d192c"
-  integrity sha512-1YKeT4JitGgE4SOzyB9eMwO0nGVNkNEsm9qlIt1Lqm/tG2QEiSMTD4kS3aO6L+w5SClLVxALmIBESK6Mk5wX0A==
-
-"@types/webpack-env@1.13.9":
-  version "1.13.9"
-  resolved "https://registry.yarnpkg.com/@types/webpack-env/-/webpack-env-1.13.9.tgz#a67287861c928ebf4159a908d1fb1a2a34d4097a"
-  integrity sha512-p8zp5xqkly3g4cCmo2mKOHI9+Z/kObmDj0BmjbDDJQlgDTiEGTbm17MEwTAusV6XceCy+bNw9q/ZHXHyKo3zkg==
-
 ngx-pipes@^1.6.1:
   version "1.6.6"
   resolved "https://registry.yarnpkg.com/ngx-pipes/-/ngx-pipes-1.6.6.tgz#32bb80906c220f1e84d5cce7d6dae002cffead4b"

terminus-ssh/package.json

@@ -1,6 +1,6 @@
 {
   "name": "terminus-ssh",
-  "version": "1.0.73-c4-ga7d62b0",
+  "version": "1.0.83-nightly.0",
   "description": "SSH connection manager for Terminus",
   "keywords": [
     "terminus-builtin-plugin"
@@ -18,25 +18,17 @@
   "license": "MIT",
   "devDependencies": {
     "@types/ssh2": "^0.5.35",
-    "@types/webpack-env": "^1.13.0",
-    "ngx-toastr": "^8.0.0",
     "ssh2": "^0.8.2",
     "ssh2-streams": "^0.4.2"
   },
   "peerDependencies": {
-    "@angular/common": "^4.1.3",
-    "@angular/core": "^4.1.3",
-    "@angular/forms": "^4.1.3",
-    "@ng-bootstrap/ng-bootstrap": "^1.0.0-alpha.29",
-    "rxjs": "^5.4.0",
+    "@angular/common": "^7",
+    "@angular/core": "^7",
+    "@angular/forms": "^7",
+    "@ng-bootstrap/ng-bootstrap": "^1",
+    "rxjs": "^5",
     "terminus-core": "*",
     "terminus-settings": "*",
     "terminus-terminal": "*"
-  },
-  "optionalDependencies": {
-    "windows-process-tree": "^0.2.3"
-  },
-  "dependencies": {
-    "keytar": "^4.7.0"
   }
 }

terminus-ssh/src/api.ts

@@ -43,16 +43,16 @@ export class SSHSession extends BaseSession {
         this.open = true
 
         this.shell.on('data', data => {
-            let dataString = data.toString()
+            const dataString = data.toString()
             this.emitOutput(dataString)
 
             if (this.scripts) {
                 let found = false
-                for (let script of this.scripts) {
+                for (const script of this.scripts) {
                     let match = false
                     let cmd = ''
                     if (script.isRegex) {
-                        let re = new RegExp(script.expect, 'g')
+                        const re = new RegExp(script.expect, 'g')
                         if (dataString.match(re)) {
                             cmd = dataString.replace(re, script.send)
                             match = true
@@ -128,7 +128,7 @@ export class SSHSession extends BaseSession {
 
     private executeUnconditionalScripts () {
         if (this.scripts) {
-            for (let script of this.scripts) {
+            for (const script of this.scripts) {
                 if (!script.expect) {
                     console.log('Executing script:', script.send)
                     this.shell.write(script.send + '\n')
@@ -141,7 +141,7 @@ export class SSHSession extends BaseSession {
     }
 }
 
-export interface ISSHConnectionGroup {
+export interface SSHConnectionGroup {
     name: string
     connections: SSHConnection[]
 }

terminus-ssh/src/buttonProvider.ts

@@ -1,7 +1,6 @@
 import { Injectable } from '@angular/core'
-import { DomSanitizer } from '@angular/platform-browser'
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
-import { HotkeysService, ToolbarButtonProvider, IToolbarButton } from 'terminus-core'
+import { HotkeysService, ToolbarButtonProvider, ToolbarButton } from 'terminus-core'
 import { SSHModalComponent } from './components/sshModal.component'
 
 /** @hidden */
@@ -9,11 +8,10 @@ import { SSHModalComponent } from './components/sshModal.component'
 export class ButtonProvider extends ToolbarButtonProvider {
     constructor (
         private ngbModal: NgbModal,
-        private domSanitizer: DomSanitizer,
         hotkeys: HotkeysService,
     ) {
         super()
-        hotkeys.matchedHotkey.subscribe(async (hotkey) => {
+        hotkeys.matchedHotkey.subscribe(async (hotkey: string) => {
             if (hotkey === 'ssh') {
                 this.activate()
             }
@@ -24,15 +22,15 @@ export class ButtonProvider extends ToolbarButtonProvider {
         this.ngbModal.open(SSHModalComponent)
     }
 
-    provide (): IToolbarButton[] {
+    provide (): ToolbarButton[] {
         return [{
-            icon: this.domSanitizer.bypassSecurityTrustHtml(require('./icons/globe.svg')),
+            icon: require('./icons/globe.svg'),
             weight: 5,
             title: 'SSH connections',
             touchBarNSImage: 'NSTouchBarOpenInBrowserTemplate',
             click: async () => {
                 this.activate()
-            }
+            },
         }]
     }
 }

terminus-ssh/src/components/editConnectionModal.component.pug

@@ -1,8 +1,7 @@
 .modal-body
     ngb-tabset(type='pills', [activeId]='basic')
         ngb-tab(id='basic')
-            ng-template(ngbTabTitle)
-                | Basic Setting
+            ng-template(ngbTabTitle) General
             ng-template(ngbTabContent)
                 .form-group
                     label Name
@@ -42,12 +41,22 @@
                         [(ngModel)]='connection.user', 
                     )
                     
-                .alert.alert-info.d-flex.bg-transparent.text-white.align-items-center(*ngIf='hasSavedPassword')
-                    .mr-auto There is a saved password for this connection
-                    button.btn.btn-danger.ml-4((click)='clearSavedPassword()') Forget
+                .form-line
+                    .header
+                        .title Password
+                        .description(*ngIf='!hasSavedPassword') Save a password in the keychain
+                        .description(*ngIf='hasSavedPassword') There is a saved password for this connection
+                    button.btn.btn-outline-success.ml-4(*ngIf='!hasSavedPassword', (click)='setPassword()') 
+                        i.fas.fa-key 
+                        span Set password
+                    button.btn.btn-danger.ml-4(*ngIf='hasSavedPassword', (click)='clearSavedPassword()') 
+                        i.fas.fa-trash-alt
+                        span Forget
                     
-                .form-group
-                    label Private key 
+                .form-line
+                    .header
+                        .title Private key 
+                        .description Path to the private key file
                     .input-group
                         input.form-control(
                             type='text', 
@@ -59,8 +68,7 @@
                                 i.fas.fa-folder-open
 
         ngb-tab(id='advanced')
-            ng-template(ngbTabTitle)
-                | Advanced Setting
+            ng-template(ngbTabTitle) Advanced
             ng-template(ngbTabContent)
                 .form-group
                     label Keep Alive Interval (Milliseconds)
@@ -108,18 +116,17 @@
 
 
         ngb-tab(id='scripts')
-            ng-template(ngbTabTitle)
-                | Login Scripts
+            ng-template(ngbTabTitle) Login scripts
             ng-template(ngbTabContent)
-                table
+                table(*ngIf='connection.scripts.length > 0')
                     tr
                         th String to expect
                         th String to be sent
-                        th Regex
-                        th Optional
-                        th Actions
+                        th.pl-2 Regex
+                        th.pl-2 Optional
+                        th.pl-2 Actions
                     tr(*ngFor='let script of connection.scripts')
-                        td
+                        td.pr-2
                             input.form-control(
                                 type='text', 
                                 [(ngModel)]='script.expect'
@@ -129,15 +136,15 @@
                                 type='text', 
                                 [(ngModel)]='script.send'
                             )
-                        td
-                            toggle(
+                        td.pl-2
+                            checkbox(
                                 [(ngModel)]='script.isRegex',
                             )
-                        td
-                            toggle(
+                        td.pl-2
+                            checkbox(
                                 [(ngModel)]='script.optional',
                             )
-                        td
+                        td.pl-2
                             .input-group.flex-nowrap
                                 button.btn.btn-outline-info.ml-0((click)='moveScriptUp(script)')
                                     i.fas.fa-arrow-up
@@ -145,33 +152,10 @@
                                     i.fas.fa-arrow-down
                                 button.btn.btn-outline-danger.ml-0((click)='deleteScript(script)')
                                     i.fas.fa-trash
-                    tr
-                        td
-                            input.form-control(
-                                type='text', 
-                                placeholder='Enter a string to expect', 
-                                [(ngModel)]='newScript.expect'
-                            )
-                        td
-                            input.form-control(
-                                type='text', 
-                                placeholder='Enter a string to be sent', 
-                                [(ngModel)]='newScript.send'
-                            )
-                        td
-                            toggle(
-                                [(ngModel)]='newScript.isRegex',
-                            )
-                        td
-                            toggle(
-                                [(ngModel)]='newScript.optional',
-                            )
-                        td
-                            .input-group.flex-nowrap
-                                button.btn.btn-outline-info.ml-0((click)='addScript()')
-                                    i.fas.fa-check
-                                button.btn.btn-outline-danger.ml-0((click)='clearScript()')
-                                    i.fas.fa-trash
+                
+                button.btn.btn-outline-info.mt-2((click)='addScript()')
+                    i.fas.fa-plus
+                    span New item
     
 .modal-footer
     button.btn.btn-outline-primary((click)='save()') Save

terminus-ssh/src/components/editConnectionModal.component.ts

@@ -1,8 +1,9 @@
 import { Component } from '@angular/core'
-import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'
+import { NgbModal, NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'
 import { ElectronService, HostAppService } from 'terminus-core'
 import { PasswordStorageService } from '../services/passwordStorage.service'
 import { SSHConnection, LoginScript, SSHAlgorithmType } from '../api'
+import { PromptModalComponent } from './promptModal.component'
 import { ALGORITHMS } from 'ssh2-streams/lib/constants'
 
 /** @hidden */
@@ -11,7 +12,6 @@ import { ALGORITHMS } from 'ssh2-streams/lib/constants'
 })
 export class EditConnectionModalComponent {
     connection: SSHConnection
-    newScript: LoginScript
     hasSavedPassword: boolean
 
     supportedAlgorithms: {[id: string]: string[]} = {}
@@ -23,47 +23,63 @@ export class EditConnectionModalComponent {
         private electron: ElectronService,
         private hostApp: HostAppService,
         private passwordStorage: PasswordStorageService,
+        private ngbModal: NgbModal,
     ) {
-        this.newScript = { expect: '', send: '' }
-
-        for (let k of Object.values(SSHAlgorithmType)) {
-            this.supportedAlgorithms[k] = ALGORITHMS[{
+        for (const k of Object.values(SSHAlgorithmType)) {
+            const supportedAlg = {
                 [SSHAlgorithmType.KEX]: 'SUPPORTED_KEX',
                 [SSHAlgorithmType.HOSTKEY]: 'SUPPORTED_SERVER_HOST_KEY',
                 [SSHAlgorithmType.CIPHER]: 'SUPPORTED_CIPHER',
                 [SSHAlgorithmType.HMAC]: 'SUPPORTED_HMAC',
-            }[k]]
-            this.defaultAlgorithms[k] = ALGORITHMS[{
+            }[k]
+            const defaultAlg = {
                 [SSHAlgorithmType.KEX]: 'KEX',
                 [SSHAlgorithmType.HOSTKEY]: 'SERVER_HOST_KEY',
                 [SSHAlgorithmType.CIPHER]: 'CIPHER',
                 [SSHAlgorithmType.HMAC]: 'HMAC',
-            }[k]]
+            }[k]
+            this.supportedAlgorithms[k] = ALGORITHMS[supportedAlg]
+            this.defaultAlgorithms[k] = ALGORITHMS[defaultAlg]
         }
     }
 
     async ngOnInit () {
-        this.hasSavedPassword = !!(await this.passwordStorage.loadPassword(this.connection))
+        this.hasSavedPassword = !!await this.passwordStorage.loadPassword(this.connection)
         this.connection.algorithms = this.connection.algorithms || {}
-        for (let k of Object.values(SSHAlgorithmType)) {
+        this.connection.scripts = this.connection.scripts || []
+
+        for (const k of Object.values(SSHAlgorithmType)) {
             if (!this.connection.algorithms[k]) {
                 this.connection.algorithms[k] = this.defaultAlgorithms[k]
             }
 
             this.algorithms[k] = {}
-            for (let alg of this.connection.algorithms[k]) {
+            for (const alg of this.connection.algorithms[k]) {
                 this.algorithms[k][alg] = true
             }
         }
     }
 
+    async setPassword () {
+        const modal = this.ngbModal.open(PromptModalComponent)
+        modal.componentInstance.prompt = `Password for ${this.connection.user}@${this.connection.host}`
+        modal.componentInstance.password = true
+        try {
+            const result = await modal.result
+            if (result && result.value) {
+                this.passwordStorage.savePassword(this.connection, result.value)
+                this.hasSavedPassword = true
+            }
+        } catch { }
+    }
+
     clearSavedPassword () {
         this.hasSavedPassword = false
         this.passwordStorage.deletePassword(this.connection)
     }
 
     selectPrivateKey () {
-        let path = this.electron.dialog.showOpenDialog(
+        const path = this.electron.dialog.showOpenDialog(
             this.hostApp.getWindow(),
             {
                 title: 'Select private key',
@@ -75,10 +91,10 @@ export class EditConnectionModalComponent {
     }
 
     save () {
-        for (let k of Object.values(SSHAlgorithmType)) {
+        for (const k of Object.values(SSHAlgorithmType)) {
             this.connection.algorithms[k] = Object.entries(this.algorithms[k])
-                .filter(([k, v]) => !!v)
-                .map(([k, v]) => k)
+                .filter(([_k, v]) => !!v)
+                .map(([k, _v]) => k)
         }
         this.modalInstance.close(this.connection)
     }
@@ -88,7 +104,7 @@ export class EditConnectionModalComponent {
     }
 
     moveScriptUp (script: LoginScript) {
-        let index = this.connection.scripts.indexOf(script)
+        const index = this.connection.scripts.indexOf(script)
         if (index > 0) {
             this.connection.scripts.splice(index, 1)
             this.connection.scripts.splice(index - 1, 0, script)
@@ -96,7 +112,7 @@ export class EditConnectionModalComponent {
     }
 
     moveScriptDown (script: LoginScript) {
-        let index = this.connection.scripts.indexOf(script)
+        const index = this.connection.scripts.indexOf(script)
         if (index >= 0 && index < this.connection.scripts.length - 1) {
             this.connection.scripts.splice(index, 1)
             this.connection.scripts.splice(index + 1, 0, script)
@@ -119,17 +135,6 @@ export class EditConnectionModalComponent {
     }
 
     addScript () {
-        if (!this.connection.scripts) {
-            this.connection.scripts = []
-        }
-        this.connection.scripts.push({ ...this.newScript })
-        this.clearScript()
-    }
-
-    clearScript () {
-        this.newScript.expect = ''
-        this.newScript.send = ''
-        this.newScript.isRegex = false
-        this.newScript.optional = false
+        this.connection.scripts.push({ expect: '', send: '' })
     }
 }

terminus-ssh/src/components/promptModal.component.pug

@@ -8,3 +8,12 @@
         (keyup.enter)='ok()',
         (keyup.esc)='cancel()',
     )
+    .d-flex.align-items-start.mt-2
+        checkbox(
+            *ngIf='showRememberCheckbox',
+            [(ngModel)]='remember', 
+            text='Remember'
+        )
+        button.btn.btn-primary.ml-auto(
+            (click)='ok()',
+        ) Enter

terminus-ssh/src/components/promptModal.component.ts

@@ -8,6 +8,8 @@ import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'
 export class PromptModalComponent {
     @Input() value: string
     @Input() password: boolean
+    @Input() remember: boolean
+    @Input() showRememberCheckbox: boolean
     @ViewChild('input') input: ElementRef
 
     constructor (
@@ -21,10 +23,13 @@ export class PromptModalComponent {
     }
 
     ok () {
-        this.modalInstance.close(this.value)
+        this.modalInstance.close({
+            value: this.value,
+            remember: this.remember,
+        })
     }
 
     cancel () {
-        this.modalInstance.close('')
+        this.modalInstance.close(null)
     }
 }