Update webpack.config.js

Bump electron-builder from 21.0.7 to 21.0.8

.all-contributorsrc

@@ -0,0 +1,173 @@
+{
+  "files": [
+    "README.md"
+  ],
+  "imageSize": 100,
+  "commit": false,
+  "contributors": [
+    {
+      "login": "mezner",
+      "name": "Russell Myers",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/184085?v=4",
+      "profile": "http://www.russellmyers.com",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "ehwarren",
+      "name": "Austin Warren",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/3991658?v=4",
+      "profile": "http://www.morwire.com",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Drachenkaetzchen",
+      "name": "Felicia Hummel",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/162974?v=4",
+      "profile": "https://github.com/Drachenkaetzchen",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "mikemaccana",
+      "name": "Mike MacCana",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/172594?v=4",
+      "profile": "https://github.com/mikemaccana",
+      "contributions": [
+        "test",
+        "design"
+      ]
+    },
+    {
+      "login": "yxuko",
+      "name": "Yacine Kanzari",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/1786317?v=4",
+      "profile": "https://github.com/yxuko",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "BBJip",
+      "name": "BBJip",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/32908927?v=4",
+      "profile": "https://github.com/BBJip",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Futagirl",
+      "name": "Futagirl",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/33533958?v=4",
+      "profile": "https://github.com/Futagirl",
+      "contributions": [
+        "design"
+      ]
+    },
+    {
+      "login": "levrik",
+      "name": "Levin Rickert",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/9491603?v=4",
+      "profile": "https://www.levrik.io",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "kwonoj",
+      "name": "OJ Kwon",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/1210596?v=4",
+      "profile": "https://kwonoj.github.io",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Domain",
+      "name": "domain",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/903197?v=4",
+      "profile": "https://github.com/Domain",
+      "contributions": [
+        "plugin",
+        "code"
+      ]
+    },
+    {
+      "login": "kbjr",
+      "name": "James Brumond",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/195127?v=4",
+      "profile": "http://www.jbrumond.me",
+      "contributions": [
+        "plugin"
+      ]
+    },
+    {
+      "login": "Tyriar",
+      "name": "Daniel Imms",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/2193314?v=4",
+      "profile": "http://www.growingwiththeweb.com",
+      "contributions": [
+        "code",
+        "plugin",
+        "test"
+      ]
+    },
+    {
+      "login": "baflo",
+      "name": "Florian Bachmann",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/834350?v=4",
+      "profile": "https://github.com/baflo",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "mischah",
+      "name": "Michael Kühnel",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/441011?v=4",
+      "profile": "http://michael-kuehnel.de",
+      "contributions": [
+        "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,
+  "projectName": "terminus",
+  "projectOwner": "Eugeny",
+  "repoType": "github",
+  "repoHost": "https://github.com",
+  "commitConvention": "none"
+}

.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

.github/FUNDING.yml

@@ -0,0 +1,3 @@
+github: eugeny
+open_collective: terminus
+ko_fi: eugeny

.github/stale.yml

@@ -5,7 +5,7 @@ daysUntilClose: 14
 # Issues with these labels will never be considered stale
 exemptLabels:
   - "T: Enhancement"
-  - "S: Triaged"
+  - "S: Confirmed"
 # Label to use when marking an issue as stale
 staleLabel: "S: Stale"
 # Comment to post when marking an issue as stale. Set to `false` to disable

.gitignore

@@ -6,6 +6,8 @@ node_modules
 build/files.wxs
 dist
 */dist
+*/typings
+*.tsbuildinfo
 
 *.xcworkspacedata
 *.xcuserstate
@@ -21,3 +23,4 @@ yarn-error.log
 
 docs/api
 .travis.ssh.key
+*.code-workspace

.travis.yml

@@ -9,31 +9,40 @@ stages:
 jobs:
   include:
     - stage: 'Build'
+      if: branch = xxx
       os: linux
       before_install:
-        - yarn
+        - set -e
         - 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
         - scripts/prepackage-plugins.js
-        - scripts/build-linux.js
+        - travis_wait scripts/build-linux.js
 
     - stage: 'Build'
       os: osx
       before_install:
+        - set -e
         - rm app/node_modules/.yarn-integrity || true
         - yarn
       script:
+        - set -e
         - scripts/build-native.js
+        - yarn run build:typings
         - yarn run build
         - scripts/prepackage-plugins.js
-        - scripts/build-macos.js
+        - travis_wait scripts/build-macos.js
 
     - 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
         - eval "$(ssh-agent -s)"
         - chmod 600 .travis.ssh.key
@@ -50,6 +59,15 @@ addons:
     packages:
     - rpm
     - yarn
+    - libsecret-1-dev
     sources:
     - sourceline: 'deb https://dl.yarnpkg.com/debian/ stable main'
       key_url: 'https://dl.yarnpkg.com/debian/pubkey.gpg'
+
+
+cache:
+  directories:
+  - '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/dev-app-update.yml

@@ -0,0 +1,4 @@
+owner: eugeny
+repo: terminus
+provider: github
+updaterCacheDirName: terminus-updater

app/lib/app.ts

@@ -19,12 +19,16 @@ 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 () {
-        electron.screen.on('display-metrics-changed', () => this.broadcast('host:display-metrics-changed'))        
+        electron.screen.on('display-metrics-changed', () => this.broadcast('host:display-metrics-changed'))
     }
 
     async newWindow (options?: WindowOptions): Promise<Window> {

app/lib/cli.ts

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

app/lib/index.ts

@@ -1,9 +1,8 @@
 import './lru'
 import { app, ipcMain, Menu } from 'electron'
-import electronDebug = require('electron-debug')
 import { parseArgs } from './cli'
 import { Application } from './app'
-if (process.platform === 'win32' && require('electron-squirrel-startup')) process.exit(0)
+import electronDebug = require('electron-debug')
 
 if (!process.env.TERMINUS_PLUGINS) {
     process.env.TERMINUS_PLUGINS = ''
@@ -44,7 +43,11 @@ if (!app.requestSingleInstanceLock()) {
 }
 
 if (argv.d) {
-    electronDebug({ enabled: true, showDevTools: 'undocked' })
+    electronDebug({
+        isEnabled: true,
+        showDevTools: true,
+        devToolsMode: 'undocked'
+    })
 }
 
 app.on('ready', () => {

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

@@ -20,25 +20,33 @@
     "@angular/forms": "7.2.8",
     "@angular/platform-browser": "7.2.8",
     "@angular/platform-browser-dynamic": "7.2.8",
-    "@ng-bootstrap/ng-bootstrap": "^3.3.1",
+    "@ng-bootstrap/ng-bootstrap": "^4.2.0",
     "devtron": "1.4.0",
-    "electron-config": "0.2.1",
+    "fontmanager-redux": "0.3.2",
-    "electron-debug": "^2.0.0",
+    "electron-config": "2.0.0",
-    "electron-is-dev": "0.1.2",
+    "electron-debug": "^3.0.1",
-    "electron-squirrel-startup": "^1.0.0",
+    "electron-is-dev": "1.1.0",
-    "js-yaml": "3.8.2",
+    "electron-updater": "^4.0.6",
-    "mz": "^2.6.0",
+    "js-yaml": "3.13.1",
-    "ngx-toastr": "^9.1.1",
+    "keytar": "^4.7.0",
+    "mz": "^2.7.0",
+    "ngx-toastr": "^10.0.4",
+    "node-pty": "^0.9.0-beta18",
+    "npm": "~6.9.0",
     "path": "0.12.7",
-    "rxjs": "^6.3.3",
+    "rxjs": "^6.5.2",
-    "yargs": "^12.0.1",
+    "rxjs-compat": "^6.5.2",
-    "zone.js": "^0.8.26"
+    "yargs": "^13.2.4",
+    "zone.js": "^0.8.29"
   },
   "optionalDependencies": {
-    "windows-blurbehind": "^1.0.0",
+    "@terminus-term/windows-process-tree": "^0.2.4",
-    "windows-swca": "^2.0.1"
+    "macos-native-processlist": "^1.0.1",
+    "windows-blurbehind": "^1.0.1",
+    "windows-native-registry": "^1.0.14",
+    "windows-swca": "^2.0.2"
   },
   "devDependencies": {
-    "@types/mz": "0.0.31"
+    "@types/mz": "0.0.32"
   }
 }

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 = [
+    const bootstrap = [
-        ...(plugins.filter(x => x.bootstrap).map(x => x.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

@@ -1,5 +1,5 @@
 import '../lib/lru'
-import 'source-sans-pro'
+import 'source-sans-pro/source-sans-pro.css'
 import 'source-code-pro/source-code-pro.css'
 import '@fortawesome/fontawesome-free/css/solid.css'
 import '@fortawesome/fontawesome-free/css/brands.css'
@@ -16,20 +16,20 @@ Raven.config(
     {
         release: require('electron').remote.app.getVersion(),
         dataCallback: (data: any) => {
-            const normalize = (filename) => {
+            const normalize = (filename: string) => {
-                let splitArray = filename.split('/')
+                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

@@ -1,19 +1,20 @@
 import 'zone.js'
-import 'core-js/es7/reflect'
+import 'core-js/proposals/reflect-metadata'
-import 'core-js/core/delay'
 import 'rxjs'
 
+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
 
@@ -21,20 +22,20 @@ if (process.platform === 'win32') {
     process.env.HOME = process.env.HOMEDRIVE + process.env.HOMEPATH
 }
 
-if (require('electron-is-dev')) {
+if (isDev) {
     console.warn('Running in debug mode')
 } else {
     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) => {
+    const pluginsModules = await loadPlugins(plugins, (current, total) => {
-        (document.querySelector('.progress .bar') as HTMLElement).style.width = 100 * 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,10 +1,8 @@
 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
 
-declare function delay (ms: number): Promise<void>
-
 function normalizePath (path: string): string {
     const cygwinPrefix = '/cygdrive/'
     if (path.startsWith(cygwinPrefix)) {
@@ -14,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()))
@@ -28,6 +26,10 @@ const userPluginsPath = path.join(
     'plugins',
 )
 
+if (!fs.existsSync(userPluginsPath)) {
+    fs.mkdir(userPluginsPath)
+}
+
 Object.assign(window, { builtinPluginsPath, userPluginsPath })
 nodeModule.globalPaths.unshift(builtinPluginsPath)
 nodeModule.globalPaths.unshift(path.join(userPluginsPath, 'node_modules'))
@@ -36,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
@@ -62,6 +64,7 @@ const builtinModules = [
     'ngx-toastr',
     'rxjs',
     'rxjs/operators',
+    'rxjs-compat/Subject',
     'terminus-core',
     'terminus-settings',
     'terminus-terminal',
@@ -70,47 +73,61 @@ const builtinModules = [
 
 const cachedBuiltinModules = {}
 builtinModules.forEach(m => {
+    const label = 'Caching ' + m
+    console.time(label)
     cachedBuiltinModules[m] = nodeRequire(m)
+    console.timeEnd(label)
 })
 
-const originalRequire = nodeRequire('module').prototype.require
+const originalRequire = (global as any).require
-nodeRequire('module').prototype.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[]> {
+const originalModuleRequire = nodeModule.prototype.require
-    let paths = nodeModule.globalPaths
+nodeModule.prototype.require = function (query: string) {
-    let foundPlugins: IPluginInfo[] = []
+    if (cachedBuiltinModules[query]) {
-    let candidateLocations: { pluginDir: string, packageName: string }[] = []
+        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) {
         pluginDir = normalizePath(pluginDir)
         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) {
-            candidateLocations.push({ pluginDir, packageName })
+            if (packageName.startsWith(PREFIX)) {
+                candidateLocations.push({ pluginDir, packageName })
+            }
         }
     }
 
-    for (let { pluginDir, packageName } of candidateLocations) {
+    for (const { pluginDir, packageName } of candidateLocations) {
-        let pluginPath = path.join(pluginDir, packageName)
+        const pluginPath = path.join(pluginDir, packageName)
-        let infoPath = path.join(pluginPath, 'package.json')
+        const infoPath = path.join(pluginPath, 'package.json')
         if (!await fs.exists(infoPath)) {
             continue
         }
 
-        let name = packageName.substring('terminus-'.length)
+        const name = packageName.substring(PREFIX.length)
 
         if (foundPlugins.some(x => x.name === name)) {
             console.info(`Plugin ${packageName} already exists, overriding`)
@@ -118,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
             }
@@ -143,23 +160,26 @@ export async function findPlugins (): Promise<IPluginInfo[]> {
     return foundPlugins
 }
 
-export async function loadPlugins (foundPlugins: IPluginInfo[], progress: ProgressCallback): Promise<any[]> {
+export async function loadPlugins (foundPlugins: PluginInfo[], progress: ProgressCallback): Promise<any[]> {
-    let plugins: 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 {
-            let packageModule = nodeRequire(foundPlugin.path)
+            const label = 'Loading ' + foundPlugin.name
-            let pluginModule = packageModule.default.forRoot ? packageModule.default.forRoot() : packageModule.default
+            console.time(label)
+            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)
         }
-        await delay(1)
         index++
     }
     progress(1, 1)

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

@@ -5,7 +5,7 @@ module.exports = {
   name: 'terminus',
   target: 'node',
   entry: {
-    'index.ignore': 'file-loader?name=index.html!val-loader!pug-html-loader!' + path.resolve(__dirname, './index.pug'),
+    'index.ignore': 'file-loader?name=index.html!pug-html-loader!' + path.resolve(__dirname, './index.pug'),
     preload: path.resolve(__dirname, 'src/entry.preload.ts'),
     bundle: path.resolve(__dirname, 'src/entry.ts'),
   },

app/webpack.main.config.js

@@ -36,7 +36,6 @@ module.exports = {
     electron: 'commonjs electron',
     'electron-config': 'commonjs electron-config',
     'electron-vibrancy': 'commonjs electron-vibrancy',
-    'electron-squirrel-startup': 'commonjs electron-squirrel-startup',
     fs: 'commonjs fs',
     mz: 'commonjs mz',
     path: 'commonjs path',

appveyor.yml

@@ -6,10 +6,6 @@ platform:
 environment:
   nodejs_version: "10"
 
-cache:
-  - "%USERPROFILE%\\.electron"
-  - "%LOCALAPPDATA%\\Yarn"
-
 version: "{build}"
 
 install:
@@ -23,6 +19,10 @@ build_script:
   - node scripts/build-windows.js
 
 artifacts:
-  - path: 'dist\win\*.exe'
-  - path: 'dist\squirrel-windows\*.exe'
   - path: 'dist\*.exe'
+
+cache:
+  - node_modules
+  - "*\\node_modules"
+  - "%USERPROFILE%\\.electron"
+  - "%LOCALAPPDATA%\\Yarn"

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/installer.nsh

@@ -0,0 +1,3 @@
+!macro customInit
+  nsExec::Exec '"$LOCALAPPDATA\terminus\Update.exe" --uninstall -s'
+!macroend

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,66 +1,66 @@
 {
-  "name": "term",
   "devDependencies": {
-    "@fortawesome/fontawesome-free": "^5.6.3",
+    "@fortawesome/fontawesome-free": "^5.9.0",
-    "@types/electron-config": "^0.2.1",
+    "@types/electron-config": "^3.2.2",
-    "@types/electron-debug": "^1.1.0",
+    "@types/electron-debug": "^2.1.0",
-    "@types/fs-promise": "1.0.1",
+    "@types/fs-promise": "1.0.3",
-    "@types/js-yaml": "^3.11.2",
+    "@types/js-yaml": "^3.12.1",
-    "@types/node": "^10.11.5",
+    "@types/node": "^12.0.12",
-    "@types/webpack-env": "1.13.0",
+    "@types/webpack-env": "1.13.9",
-    "app-builder-lib": "^20.28.4",
+    "@typescript-eslint/eslint-plugin": "^1.11.0",
-    "apply-loader": "0.1.0",
+    "@typescript-eslint/parser": "^1.11.0",
+    "app-builder-lib": "^21.0.8",
+    "apply-loader": "2.0.0",
     "awesome-typescript-loader": "^5.0.0",
-    "core-js": "2.4.1",
+    "core-js": "^3.1.4",
-    "cross-env": "4.0.0",
+    "cross-env": "5.2.0",
-    "css-loader": "0.28.0",
+    "css-loader": "3.0.0",
-    "electron": "4.0.5",
+    "electron": "^5.0.5",
-    "electron-builder": "^20.38.4",
+    "electron-builder": "^21.0.8",
-    "electron-builder-squirrel-windows": "^20.28.3",
+    "electron-installer-snap": "^4.0.0",
-    "electron-installer-snap": "^3.0.0",
+    "electron-notarize": "^0.1.1",
-    "electron-rebuild": "^1.8.2",
+    "electron-rebuild": "^1.8.5",
-    "file-loader": "^1.1.11",
+    "eslint": "^5.16.0",
-    "graceful-fs": "^4.1.11",
+    "file-loader": "^4.0.0",
-    "html-loader": "0.4.4",
+    "graceful-fs": "^4.1.15",
-    "json-loader": "0.5.4",
+    "html-loader": "0.5.5",
-    "node-abi": "^2.4.4",
+    "json-loader": "0.5.7",
-    "node-gyp": "^3.8.0",
+    "node-abi": "^2.9.0",
-    "node-sass": "^4.5.3",
+    "node-gyp": "^5.0.2",
-    "npmlog": "4.1.0",
+    "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.0.9",
+    "pug-html-loader": "1.1.5",
-    "pug-lint": "^2.5.0",
+    "pug-lint": "^2.6.0",
     "pug-loader": "^2.4.0",
-    "pug-static-loader": "0.0.1",
+    "pug-static-loader": "2.0.0",
-    "raven-js": "3.16.0",
+    "raven-js": "3.27.2",
-    "raw-loader": "0.5.1",
+    "raw-loader": "3.0.0",
     "sass-loader": "^7.0.1",
-    "shelljs": "0.7.7",
+    "shelljs": "0.8.3",
     "source-code-pro": "^2.30.1",
-    "source-sans-pro": "2.0.10",
+    "source-sans-pro": "2.45.0",
     "style-loader": "^0.23.1",
     "svg-inline-loader": "^0.8.0",
     "to-string-loader": "1.1.5",
-    "tslint": "^5.12.0",
+    "tslib": "^1.10.0",
-    "tslint-config-standard": "^8.0.1",
-    "tslint-eslint-rules": "^5.4.0",
     "typedoc": "^0.14.2",
-    "typescript": "^3.1.3",
+    "typescript": "^3.5.2",
-    "url-loader": "^1.1.1",
+    "url-loader": "^2.0.0",
-    "val-loader": "0.5.0",
+    "val-loader": "1.1.1",
-    "webpack": "^4.27.1",
+    "webpack": "^4.35.2",
-    "webpack-cli": "^3.1.2",
+    "webpack-cli": "^3.3.5",
-    "yaml-loader": "0.4.0",
+    "yaml-loader": "0.5.0"
-    "yarn": "^1.10.1"
   },
   "resolutions": {
-    "*/node-abi": "^2.5.0"
+    "*/node-abi": "^2.8.0"
   },
   "build": {
     "appId": "org.terminus",
     "productName": "Terminus",
     "compression": "normal",
+    "afterSign": "./build/mac/afterSignHook.js",
     "files": [
       "**/*",
       "dist"
@@ -71,16 +71,24 @@
     ],
     "win": {
       "icon": "./build/windows/icon.ico",
-      "publish": [
+      "artifactName": "terminus-${version}-setup.exe",
-        "github"
+      "rfc3161TimeStampServer": "http://sha256timestamp.ws.symantec.com/sha256/timestamp"
-      ],
-      "artifactName": "terminus-${version}-setup.exe"
     },
-    "squirrelWindows": {
+    "nsis": {
-      "iconUrl": "https://github.com/Eugeny/terminus/raw/master/build/windows/icon.ico",
+      "oneClick": false,
-      "loadingGif": "./build/windows/squirrel.gif",
+      "artifactName": "terminus-${version}-setup.${ext}",
-      "artifactName": "terminus-${version}-setup.exe"
+      "installerIcon": "./build/windows/icon.ico"
     },
+    "publish": [
+      {
+        "provider": "bintray",
+        "token": "d993c4faa708a4cba84fa3a8e822457e7298d75c",
+        "component": "main"
+      },
+      {
+        "provider": "github"
+      }
+    ],
     "portable": {
       "artifactName": "terminus-${version}-portable.exe"
     },
@@ -88,34 +96,29 @@
       "category": "public.app-category.video",
       "icon": "./build/mac/icon.icns",
       "artifactName": "terminus-${version}-macos.${ext}",
-      "publish": [
+      "hardenedRuntime": true,
-        "github"
+      "entitlements": "./build/mac/entitlements.plist",
-      ],
       "extendInfo": {
         "NSRequiresAquaSystemAppearance": false
       }
     },
-    "dmg": {
+    "pkg": {
-      "artifactName": "terminus-${version}-macos.dmg"
+      "artifactName": "terminus-${version}-macos.pkg"
     },
     "linux": {
       "category": "Utilities",
       "icon": "./build/icons",
-      "artifactName": "terminus-${version}-linux.${ext}",
+      "artifactName": "terminus-${version}-linux.${ext}"
-      "publish": [
-        "github"
-      ]
     },
     "deb": {
       "depends": [
-        "screen",
         "gconf2",
         "gconf-service",
         "libnotify4",
+        "libsecret-1-0",
         "libappindicator1",
         "libxtst6",
-        "libnss3",
+        "libnss3"
-        "tmux"
       ],
       "afterInstall": "build/linux/after-install.tpl"
     },
@@ -127,13 +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-settings/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 terminus-terminal/src && typedoc --out docs/api/settings terminus-settings/src",
+    "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,
+    dir: true,
-  linux: ['snap', 'deb', 'rpm', 'tar.gz'],
+    linux: ['snap', 'deb', 'rpm', 'tar.gz'],
-  config: {
+    config: {
-    extraMetadata: {
+        extraMetadata: {
-      version: vars.version,
+            version: vars.version,
+        },
     },
-  },
+    publish: isTag ? 'always' : 'onTag',
-  publish: '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,
+    dir: true,
-  mac: ['dmg', 'zip'],
+    mac: ['pkg', 'zip'],
-  config: {
+    config: {
-    extraMetadata: {
+        extraMetadata: {
-      version: vars.version,
+            version: vars.version,
+        },
     },
-  },
+    publish: isTag ? 'always' : 'onTag',
-  publish: 'onTag',
+}).catch(() => process.exit(1))
-})

scripts/build-native.js

@@ -4,12 +4,14 @@ const path = require('path')
 const vars = require('./vars')
 
 lifecycles = []
-for (let dir of ['app', 'terminus-ssh', 'terminus-terminal']) {
+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,
+    dir: true,
-  win: ['squirrel', 'portable'],
+    win: ['nsis', 'portable'],
-  config: {
+    config: {
-    extraMetadata: {
+        extraMetadata: {
-      version: vars.version,
+            version: vars.version,
+        },
     },
-  },
+    publish: isTag ? 'always' : 'onTag',
-  publish: '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,12 +1,12 @@
 {
   "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"
   ],
   "main": "dist/index.js",
-  "typings": "dist/index.d.ts",
+  "typings": "typings/index.d.ts",
   "scripts": {
     "build": "webpack --progress --color",
     "watch": "webpack --progress --color --watch"
@@ -17,13 +17,8 @@
   "author": "Eugene Pankov",
   "license": "MIT",
   "peerDependencies": {
-    "@angular/core": "4.0.1",
+    "@angular/core": "^7",
     "terminus-core": "*",
     "terminus-terminal": "*"
-  },
+  }
-  "devDependencies": {
-    "@types/node": "7.0.12",
-    "@types/webpack-env": "^1.13.0"
-  },
-  "false": {}
 }

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[]> {
+    async getSchemes (): Promise<TerminalColorScheme[]> {
-        let schemes: ITerminalColorScheme[] = []
+        const schemes: TerminalColorScheme[] = []
 
         schemeContents.keys().forEach(schemeFile => {
-            let lines = (schemeContents(schemeFile) 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/tsconfig.json

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

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

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

terminus-community-color-schemes/yarn.lock

@@ -2,12 +2,3 @@
 # yarn lockfile v1
 
 
-"@types/node@7.0.12":
-  version "7.0.12"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.12.tgz#ae5f67a19c15f752148004db07cbbb372e69efc9"
-  integrity sha1-rl9noZwV91IUgATbB8u7Ny5p78k=
-
-"@types/webpack-env@^1.13.0":
-  version "1.13.1"
-  resolved "https://registry.yarnpkg.com/@types/webpack-env/-/webpack-env-1.13.1.tgz#b45c222e24301bd006e3edfc762cc6b51bda236a"
-  integrity sha512-oHyg0NssP2RCpCvE35hhbSqMJRsc5lSW+GFe+Vc65JL+kHII1VMYM+0KeV/z4utFuUqPoQRmq8KMMp7ba0dj6Q==

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,49 +1,45 @@
 {
   "name": "terminus-core",
-  "version": "1.0.73-c4-ga7d62b0",
+  "version": "1.0.83-nightly.4",
   "description": "Terminus core",
   "keywords": [
     "terminus-builtin-plugin"
   ],
   "main": "dist/index.js",
-  "typings": "dist/index.d.ts",
+  "typings": "typings/index.d.ts",
   "scripts": {
     "build": "webpack --progress --color --display-modules",
     "watch": "webpack --progress --color --watch"
   },
   "files": [
-    "dist"
+    "typings"
   ],
   "author": "Eugene Pankov",
   "license": "MIT",
   "devDependencies": {
     "@types/js-yaml": "^3.9.0",
-    "@types/node": "^7.0.37",
+    "@types/shell-escape": "^0.2.0",
-    "@types/webpack-env": "^1.13.0",
     "@types/winston": "^2.3.6",
-    "axios": "^0.18.0",
+    "axios": "^0.19.0",
     "bootstrap": "^4.1.3",
-    "core-js": "^2.4.1",
+    "core-js": "^3.1.2",
-    "electron-updater": "^2.8.9",
+    "deepmerge": "^3.2.0",
+    "electron-updater": "^4.0.6",
+    "js-yaml": "^3.9.0",
+    "mixpanel": "^0.10.2",
     "ng2-dnd": "^5.0.2",
     "ngx-perfect-scrollbar": "^6.0.0",
-    "rage-edit": "^1.2.0",
     "shell-escape": "^0.2.0",
-    "universal-analytics": "^0.4.17"
+    "uuid": "^3.3.2",
+    "winston": "^3.2.1"
   },
   "peerDependencies": {
-    "@angular/animations": "4.0.1",
+    "@angular/animations": "^7",
-    "@angular/common": "4.0.1",
+    "@angular/common": "^7",
-    "@angular/core": "4.0.1",
+    "@angular/core": "^7",
-    "@angular/forms": "4.0.1",
+    "@angular/forms": "^7",
-    "@angular/platform-browser": "4.0.1",
+    "@angular/platform-browser": "^7",
-    "@angular/platform-browser-dynamic": "4.0.1",
+    "@angular/platform-browser-dynamic": "^7",
-    "rxjs": "5.3.0",
+    "rxjs": "^5"
-    "zone.js": "0.8.4"
-  },
-  "dependencies": {
-    "deepmerge": "^1.5.0",
-    "js-yaml": "^3.9.0",
-    "winston": "^2.4.0"
   }
 }

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
 
@@ -23,12 +21,17 @@ export interface IToolbarButton {
 
     weight?: number
 
-    click: () => void
+    click?: () => void
+
+    submenu?: () => Promise<ToolbarButton[]>
+
+    /** @hidden */
+    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

@@ -32,28 +32,54 @@ title-bar(
             )
 
         .btn-group.background
-            button.btn.btn-secondary.btn-tab-bar(
+            .d-flex(
                 *ngFor='let button of leftToolbarButtons',
-                [title]='button.title',
+                ngbDropdown,
-                (click)='button.click()',
+                (openChange)='generateButtonSubmenu(button)',
-                [innerHTML]='button.icon',
             )
+                button.btn.btn-secondary.btn-tab-bar(
+                    [title]='button.title',
+                    (click)='button.click && button.click()',
+                    [innerHTML]='sanitizeIcon(button.icon)',
+                    ngbDropdownToggle,
+                )
+                div(*ngIf='button.submenu', ngbDropdownMenu)
+                    button.dropdown-item.d-flex.align-items-center(
+                        *ngFor='let item of button.submenuItems',
+                        (click)='item.click()',
+                        ngbDropdownItem,
+                    )
+                        .icon-wrapper([innerHTML]='sanitizeIcon(item.icon)')
+                        .ml-3 {{item.title}}
 
         .drag-space.background([class.persistent]='config.store.appearance.frame == "thin" && hostApp.platform != Platform.macOS')
 
         .btn-group.background
-            button.btn.btn-secondary.btn-tab-bar(
+            .d-flex(
                 *ngFor='let button of rightToolbarButtons',
-                [title]='button.title',
+                ngbDropdown,
-                (click)='button.click()',
+                (openChange)='generateButtonSubmenu(button)',
-                [innerHTML]='button.icon',
             )
+                button.btn.btn-secondary.btn-tab-bar(
+                    [title]='button.title',
+                    (click)='button.click && button.click()',
+                    [innerHTML]='sanitizeIcon(button.icon)',
+                    ngbDropdownToggle,
+                )
+                div(*ngIf='button.submenu', ngbDropdownMenu)
+                    button.dropdown-item.d-flex.align-items-center(
+                        *ngFor='let item of button.submenuItems',
+                        (click)='item.click()',
+                        ngbDropdownItem,
+                    )
+                        .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.scss

@@ -48,6 +48,10 @@ $tab-border-radius: 4px;
         color: #aaa;
         border: none;
         border-radius: 0;
+
+        &.dropdown-toggle::after {
+            display: none;
+        }
     }
 
     &>.tabs {
@@ -88,12 +92,20 @@ hotkey-hint {
     max-width: 300px;
 }
 
-::ng-deep .btn-tab-bar svg {
+::ng-deep .btn-tab-bar svg,
+::ng-deep .btn-tab-bar + .dropdown-menu svg {
+    width: 16px;
     height: 16px;
     fill: white;
     fill-opacity: 0.75;
 }
 
+.icon-wrapper {
+    display: flex;
+    width: 16px;
+    height: 17px;
+}
+
 ::ng-deep .btn-update svg {
     fill: cyan;
 }

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() leftToolbarButtons: ToolbarButton[]
-    @Input() rightToolbarButtons: IToolbarButton[]
+    @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,14 +233,24 @@ export class AppRootComponent {
         })
     }
 
-    private getToolbarButtons (aboveZero: boolean): IToolbarButton[] {
+    async generateButtonSubmenu (button: ToolbarButton) {
-        let buttons: IToolbarButton[] = []
+        if (button.submenu) {
+            button.submenuItems = await button.submenu()
+        }
+    }
+
+    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)
+            .filter(button => button.weight > 0 === aboveZero)
-            .sort((a: IToolbarButton, b: IToolbarButton) => (a.weight || 0) - (b.weight || 0))
+            .sort((a: ToolbarButton, b: ToolbarButton) => (a.weight || 0) - (b.weight || 0))
     }
 
     private updateVibrancy () {

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

@@ -91,7 +91,7 @@ export abstract class BaseTabComponent {
             }
             this.progressClearTimeout = setTimeout(() => {
                 this.setProgress(null)
-            }, 5000)
+            }, 5000) as any
         }
     }
 

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 type SplitOrientation = 'v' | 'h' // eslint-disable-line @typescript-eslint/no-type-alias
-export declare type SplitDirection = 'r' | 't' | 'b' | 'l'
+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 = []
+        const children = []
-        for (let child of this.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':
+                case 'split-right':
-                this.splitTab(this.focusedTab, 'r')
+                    this.splitTab(this.focusedTab, 'r')
-                break
+                    break
-            case 'split-bottom':
+                case 'split-bottom':
-                this.splitTab(this.focusedTab, 'b')
+                    this.splitTab(this.focusedTab, 'b')
-                break
+                    break
-            case 'split-top':
+                case 'split-top':
-                this.splitTab(this.focusedTab, 't')
+                    this.splitTab(this.focusedTab, 't')
-                break
+                    break
-            case 'split-left':
+                case 'split-left':
-                this.splitTab(this.focusedTab, 'l')
+                    this.splitTab(this.focusedTab, 'l')
-                break
+                    break
-            case 'pane-nav-left':
+                case 'pane-nav-left':
-                this.navigate('l')
+                    this.navigate('l')
-                break
+                    break
-            case 'pane-nav-right':
+                case 'pane-nav-right':
-                this.navigate('r')
+                    this.navigate('r')
-                break
+                    break
-            case 'pane-nav-up':
+                case 'pane-nav-up':
-                this.navigate('t')
+                    this.navigate('t')
-                break
+                    break
-            case 'pane-nav-down':
+                case 'pane-nav-down':
-                this.navigate('b')
+                    this.navigate('b')
-                break
+                    break
-            case 'close-pane':
+                case 'close-pane':
-                this.removeTab(this.focusedTab)
+                    this.removeTab(this.focusedTab)
-                break
+                    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())
+                if (this.hasFocus) {
-                this.focusAnyIn(this.root)
+                    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 === 'v' && ['l', 'r'].includes(side) ||
-            (target.orientation === 'h' && ['t', 'b'].includes(side))
+            target.orientation === 'h' && ['t', 'b'].includes(side)
         ) {
-            let newContainer = new SplitContainer()
+            const newContainer = new SplitContainer()
-            newContainer.orientation = (target.orientation === 'v') ? 'h' : 'v'
+            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)
+        const parent = this.getParentOf(tab)
-        let index = parent.children.indexOf(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
+        const size = root.orientation === 'v' ? h : w
-        let sizes = root.ratios.map(x => x * size)
+        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)
+            const childX = root.orientation === 'v' ? x : x + offset
-            let childY = (root.orientation === 'v') ? (y + offset) : y
+            const childY = root.orientation === 'v' ? y + offset : y
-            let childW = (root.orientation === 'v') ? w : sizes[i]
+            const childW = root.orientation === 'v' ? w : sizes[i]
-            let childH = (root.orientation === 'v') ? sizes[i] : h
+            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

@@ -1,14 +1,14 @@
 div
     .terminus-logo
     h1.terminus-title Terminus
-        sup α 
+        sup α
 
     .list-group
         a.list-group-item.list-group-item-action.d-flex(
             *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,15 +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))
-            .sort((a: IToolbarButton, b: IToolbarButton) => (a.weight || 0) - (b.weight || 0))
+            .filter(x => !!x.click)
+            .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/components/welcomeTab.component.pug

@@ -0,0 +1,19 @@
+.mb-4
+    .terminus-logo
+    h1.terminus-title Terminus
+        sup α 
+
+.container
+    .text-center.mb-5 Thank you for downloading Terminus!
+
+    .form-line
+        .header
+            .title Enable analytics
+            .description Help us track the number of Terminus installs across the world!
+        toggle(
+            [(ngModel)]='config.store.enableAnalytics',
+            (ngModelChange)='config.save(); config.requestRestart()',
+        )
+
+    .text-center.mt-5
+        button.btn.btn-primary((click)='closeAndDisable()') Close and never show again

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

@@ -0,0 +1,6 @@
+:host {
+    display: flex;
+    flex-direction: column;
+    margin: auto;
+    flex: 0 1 500px;
+}

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

@@ -0,0 +1,26 @@
+import { Component } from '@angular/core'
+import { BaseTabComponent } from './baseTab.component'
+import { ConfigService } from '../services/config.service'
+import { AppService } from '../services/app.service'
+
+/** @hidden */
+@Component({
+    selector: 'welcome-page',
+    template: require('./welcomeTab.component.pug'),
+    styles: [require('./welcomeTab.component.scss')],
+})
+export class WelcomeTabComponent extends BaseTabComponent {
+    constructor (
+        private app: AppService,
+        public config: ConfigService,
+    ) {
+        super()
+        this.setTitle('Welcome')
+    }
+
+    closeAndDisable () {
+        this.config.store.enableWelcomeTab = false
+        this.config.save()
+        this.app.closeTab(this)
+    }
+}

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
@@ -11,3 +11,6 @@ appearance:
   vibrancy: false
   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

@@ -18,6 +18,7 @@ import { WindowControlsComponent } from './components/windowControls.component'
 import { RenameTabModalComponent } from './components/renameTabModal.component'
 import { SplitTabComponent, SplitTabRecoveryProvider } from './components/splitTab.component'
 import { SplitTabSpannerComponent } from './components/splitTabSpanner.component'
+import { WelcomeTabComponent } from './components/welcomeTab.component'
 
 import { AutofocusDirective } from './directives/autofocus.directive'
 
@@ -27,6 +28,9 @@ import { Theme } from './api/theme'
 import { TabContextMenuItemProvider } from './api/tabContextMenuProvider'
 import { TabRecoveryProvider } from './api/tabRecovery'
 
+import { AppService } from './services/app.service'
+import { ConfigService } from './services/config.service'
+
 import { StandardTheme, StandardCompactTheme, PaperTheme } from './theme'
 import { CoreConfigProvider } from './config'
 import { AppHotkeyProvider } from './hotkeys'
@@ -35,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 },
@@ -45,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 */
@@ -59,7 +69,7 @@ const PROVIDERS = [
         DndModule.forRoot(),
     ],
     declarations: [
-        AppRootComponent,
+        AppRootComponent as any,
         CheckboxComponent,
         StartPageComponent,
         TabBodyComponent,
@@ -72,19 +82,29 @@ const PROVIDERS = [
         AutofocusDirective,
         SplitTabComponent,
         SplitTabSpannerComponent,
+        WelcomeTabComponent,
     ],
     entryComponents: [
         RenameTabModalComponent,
         SafeModeModalComponent,
         SplitTabComponent,
+        WelcomeTabComponent,
     ],
     exports: [
         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) {
+                app.openNewTabRaw(WelcomeTabComponent)
+            }
+        })
+    }
+
     static forRoot (): ModuleWithProviders {
         return {
             ngModule: AppModule,
@@ -93,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

@@ -16,12 +16,12 @@ class CompletionObserver {
     private interval: number
 
     constructor (private tab: BaseTabComponent) {
-        this.interval = setInterval(() => this.tick(), 1000)
+        this.interval = setInterval(() => this.tick(), 1000) as any
         this.tab.destroyed$.pipe(takeUntil(this.destroyed$)).subscribe(() => this.stop())
     }
 
     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
+        const splitTab = this.tabsService.create(SplitTabComponent) as SplitTabComponent
-        let tab = this.tabsService.create(type, inputs)
+        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
+    getValue (_key: string): any { }
-    setValue (key: string, value: any) { } // tslint:disable-line
+    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
+            const ngModule = window['rootModule'].ngInjectorDef
-            for (let imp of ngModule.imports) {
+            for (const imp of ngModule.imports) {
-                let module = (imp['ngModule'] || imp)
+                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 }
+        const 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 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: {
+                name: display.id === primaryDisplayID ? 'Primary Display' : `Display ${index +1}`,
-                    0: 'Primary display',
-                    1: 'Secondary display',
-                }[index] || `Display ${index + 1}`
             }
-        })
+        });
     }
 
     private repositionWindow () {
-        let [x, y] = this.hostApp.getWindow().getPosition()
+        const [x, y] = this.hostApp.getWindow().getPosition()
-        for (let screen of this.electron.screen.getAllDisplays()) {
+        for (const screen of this.electron.screen.getAllDisplays()) {
-            let bounds = screen.bounds
+            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
+    app: Electron.App
-    ipcRenderer: any
+    ipcRenderer: Electron.IpcRenderer
-    shell: any
+    shell: Electron.Shell
-    dialog: any
+    dialog: Electron.Dialog
-    clipboard: any
+    clipboard: Electron.Clipboard
-    globalShortcut: any
+    globalShortcut: Electron.GlobalShortcut
-    nativeImage: any
+    nativeImage: typeof NativeImage
-    screen: any
+    screen: Electron.Screen
-    remote: any
+    remote: Electron.Remote
-    autoUpdater: any
+    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,12 +2,13 @@ import * as os from 'os'
 import { Injectable } from '@angular/core'
 import { ElectronService } from './electron.service'
 import { ConfigService } from './config.service'
-import ua = require('universal-analytics')
+import * as mixpanel from 'mixpanel'
-import uuidv4 = require('uuid/v4')
+import * as uuidv4 from 'uuid/v4'
 
 @Injectable({ providedIn: 'root' })
 export class HomeBaseService {
     appVersion: string
+    mixpanel: any
 
     /** @hidden */
     constructor (
@@ -16,7 +17,7 @@ export class HomeBaseService {
     ) {
         this.appVersion = electron.app.getVersion()
 
-        if (this.config.store.enableAnalytics) {
+        if (this.config.store.enableAnalytics && !this.config.store.enableWelcomeTab) {
             this.enableAnalytics()
         }
     }
@@ -28,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}`)
     }
@@ -42,9 +43,20 @@ export class HomeBaseService {
         if (!window.localStorage.analyticsUserID) {
             window.localStorage.analyticsUserID = uuidv4()
         }
-        const session = ua('UA-3278102-20', window.localStorage.analyticsUserID)
+        this.mixpanel = mixpanel.init('bb4638b0860eef14c04d4fbc5eb365fa')
-        session.set('cd1', this.appVersion)
+        if (!window.localStorage.installEventSent) {
-        session.set('cd2', process.platform)
+            this.mixpanel.track('freshInstall', this.getAnalyticsProperties())
-        session.pageview('/').send()
+            window.localStorage.installEventSent = true
+        }
+        this.mixpanel.track('launch', this.getAnalyticsProperties())
+    }
+
+    getAnalyticsProperties () {
+        return {
+            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'
@@ -28,6 +28,7 @@ export class HostAppService {
      */
     shown = new EventEmitter<any>()
     isFullScreen = false
+    isPortable = !!process.env.PORTABLE_EXECUTABLE_FILE
 
     private preferencesMenu = new Subject<void>()
     private secondInstance = new Subject<void>()
@@ -86,8 +87,7 @@ export class HostAppService {
 
     get displayMetricsChanged$ (): Observable<void> { return this.displayMetricsChanged }
 
-    /** @hidden */
+    private constructor (
-    constructor (
         private zone: NgZone,
         private electron: ElectronService,
         log: LogService,
@@ -96,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))
@@ -169,7 +169,7 @@ export class HostAppService {
     }
 
     toggleFullscreen () {
-        let window = this.getWindow()
+        const window = this.getWindow()
         window.setFullScreen(!this.isFullScreen)
     }
 
@@ -251,6 +251,15 @@ export class HostAppService {
         this.electron.ipcRenderer.send('window-close')
     }
 
+    relaunch () {
+        if (this.isPortable) {
+            this.electron.app.relaunch({ execPath: process.env.PORTABLE_EXECUTABLE_FILE })
+        } else {
+            this.electron.app.relaunch()
+        }
+        this.electron.app.exit()
+    }
+
     quit () {
         this.logger.info('Quitting')
         this.electron.app.quit()

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 { HotkeyDescription, HotkeyProvider } from '../api/hotkeyProvider'
-import { NativeKeyEvent, stringifyKeySequence } from './hotkeys.util'
+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 */
+    private constructor (
-    constructor (
         private zone: NgZone,
         private electron: ElectronService,
         private config: ConfigService,
         @Inject(HotkeyProvider) private hotkeyProviders: HotkeyProvider[],
     ) {
-        let events = ['keydown', 'keyup']
+        const events = ['keydown', 'keyup']
-        events.forEach((event) => {
+        events.forEach(event => {
-            document.addEventListener(event, (nativeEvent) => {
+            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) {
+    pushKeystroke (name: string, nativeEvent: KeyboardEvent) {
-        nativeEvent.event = name
+        (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 () {
+    getCurrentFullyMatchedHotkey (): string {
-        this.electron.globalShortcut.unregisterAll()
+        const currentStrokes = this.getCurrentKeystrokes()
-        let value = this.config.store.hotkeys['toggle-window'] || []
+        const config = this.getHotkeysConfig()
-        if (typeof value === 'string') {
+        for (const id in config) {
-            value = [value]
+            for (const sequence of config[id]) {
-        }
-        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]) {
                 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()
+        const currentStrokes = this.getCurrentKeystrokes()
-        let config = this.getHotkeysConfig()
+        const config = this.getHotkeysConfig()
-        let result = []
+        const result = []
-        for (let id in config) {
+        for (const id in config) {
-            for (let sequence of config[id]) {
+            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 {
+export function stringifyKeySequence (events: KeyboardEvent[]): string[] {
-    event?: string
+    const items: string[] = []
-    altKey: boolean
-    ctrlKey: boolean
-    metaKey: boolean
-    shiftKey: boolean
-    key: string
-    keyCode: string
-}
-
-export function stringifyKeySequence (events: NativeKeyEvent[]): string[] {
-    let items: string[] = []
     events = events.slice()
 
     while (events.length > 0) {
-        let event = events.shift()
+        const event = events.shift()
-        if (event.event === 'keydown') {
+        if ((event as any).event === 'keydown') {
-            let itemKeys: string[] = []
+            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')
+            let key = event.code
-            } else if (event.key.length === 1) {
+            key = key.replace('Key', '')
-                itemKeys.push(event.key.toUpperCase())
+            key = key.replace('Arrow', '')
-            } else {
+            key = key.replace('Digit', '')
-                itemKeys.push(event.key)
+            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

@@ -11,25 +11,18 @@ const initializeWinston = (electron: ElectronService) => {
         fs.mkdirSync(logDirectory)
     }
 
-    return new winston.Logger({
+    return winston.createLogger({
         transports: [
             new winston.transports.File({
                 level: 'debug',
                 filename: path.join(logDirectory, 'log.txt'),
+                format: winston.format.simple(),
                 handleExceptions: false,
-                json: false,
                 maxsize: 5242880,
                 maxFiles: 5,
-                colorize: false
             }),
-            new winston.transports.Console({
-                level: 'debug',
-                handleExceptions: false,
-                json: false,
-                colorize: true
-            })
         ],
-        exitOnError: false
+        exitOnError: false,
     })
 }
 
@@ -39,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

@@ -1,11 +1,16 @@
 import * as path from 'path'
 import * as fs from 'mz/fs'
-import { Registry } from 'rage-edit'
 import { exec } from 'mz/child_process'
 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') // eslint-disable-line @typescript-eslint/no-var-requires
+} catch (_) { }
+
 @Injectable({ providedIn: 'root' })
 export class ShellIntegrationService {
     private automatorWorkflows = ['Open Terminus here.workflow', 'Paste path into Terminus.workflow']
@@ -13,12 +18,12 @@ export class ShellIntegrationService {
     private automatorWorkflowsDestination: string
     private registryKeys = [
         {
-            path: 'HKCU\\Software\\Classes\\Directory\\Background\\shell\\Open Terminus here',
+            path: 'Software\\Classes\\Directory\\Background\\shell\\Open Terminus here',
-            command: 'open "%V"'
+            command: 'open "%V"',
         },
         {
-            path: 'HKCU\\Software\\Classes\\*\\shell\\Paste path into Terminus',
+            path: 'Software\\Classes\\*\\shell\\Paste path into Terminus',
-            command: 'paste "%V"'
+            command: 'paste "%V"',
         },
     ]
     constructor (
@@ -37,6 +42,43 @@ export class ShellIntegrationService {
         this.updatePaths()
     }
 
+    async isInstalled (): Promise<boolean> {
+        if (this.hostApp.platform === Platform.macOS) {
+            return fs.exists(path.join(this.automatorWorkflowsDestination, this.automatorWorkflows[0]))
+        } else if (this.hostApp.platform === Platform.Windows) {
+            return !!wnr.getRegistryKey(wnr.HK.CU, this.registryKeys[0].path)
+        }
+        return true
+    }
+
+    async install () {
+        const exe: string = process.env.PORTABLE_EXECUTABLE_FILE || this.electron.app.getPath('exe')
+        if (this.hostApp.platform === Platform.macOS) {
+            for (const wf of this.automatorWorkflows) {
+                await exec(`cp -r "${this.automatorWorkflowsLocation}/${wf}" "${this.automatorWorkflowsDestination}"`)
+            }
+        } else if (this.hostApp.platform === Platform.Windows) {
+            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)
+                wnr.setRegistryValue(wnr.HK.CU, registryKey.path + '\\command', '', wnr.REG.SZ, exe + ' ' + registryKey.command)
+            }
+        }
+    }
+
+    async remove () {
+        if (this.hostApp.platform === Platform.macOS) {
+            for (const wf of this.automatorWorkflows) {
+                await exec(`rm -rf "${this.automatorWorkflowsDestination}/${wf}"`)
+            }
+        } else if (this.hostApp.platform === Platform.Windows) {
+            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) {
@@ -45,26 +87,4 @@ export class ShellIntegrationService {
             }
         }
     }
-
-    async isInstalled (): Promise<boolean> {
-        if (this.hostApp.platform === Platform.macOS) {
-            return fs.exists(path.join(this.automatorWorkflowsDestination, this.automatorWorkflows[0]))
-        } else if (this.hostApp.platform === Platform.Windows) {
-            return Registry.has(this.registryKeys[0].path)
-        }
-        return true
-    }
-
-    async install () {
-        if (this.hostApp.platform === Platform.macOS) {
-            for (let 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) {
-                await Registry.set(registryKey.path, 'Icon', this.electron.app.getPath('exe'))
-                await Registry.set(registryKey.path + '\\command', '', this.electron.app.getPath('exe') + ' ' + registryKey.command)
-            }
-        }
-    }
 }

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[] = []
+            const tabs: RecoveredTab[] = []
-            for (let token of JSON.parse(window.localStorage.tabsRecovery)) {
+            for (const token of JSON.parse(window.localStorage.tabsRecovery)) {
-                let tab = await this.recoverTab(token)
+                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)
+        const componentFactory = this.componentFactoryResolver.resolveComponentFactory(type)
-        let componentRef = componentFactory.create(this.injector)
+        const componentRef = componentFactory.create(this.injector)
-        let tab = componentRef.instance
+        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,12 +4,13 @@ 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' })
 export class TouchbarService {
     private tabsSegmentedControl: TouchBarSegmentedControl
+    private buttonsSegmentedControl: TouchBarSegmentedControl
     private tabSegments: SegmentedControlSegment[] = []
     private nsImageCache: {[id: string]: Electron.NativeImage} = {}
 
@@ -24,53 +25,85 @@ export class TouchbarService {
         if (this.hostApp.platform !== Platform.macOS) {
             return
         }
-        app.tabsChanged$.subscribe(() => this.update())
+        app.tabsChanged$.subscribe(() => this.updateTabs())
-        app.activeTabChange$.subscribe(() => this.update())
+        app.activeTabChange$.subscribe(() => this.updateTabs())
+
+        const activityIconPath = `${electron.app.getAppPath()}/assets/activity.png`
+        const activityIcon = this.electron.nativeImage.createFromPath(activityIconPath)
         app.tabOpened$.subscribe(tab => {
             tab.titleChange$.subscribe(title => {
-                this.tabSegments[app.tabs.indexOf(tab)].label = this.shortenTitle(title)
+                const segment = this.tabSegments[app.tabs.indexOf(tab)]
-                this.tabsSegmentedControl.segments = this.tabSegments
+                if (segment) {
+                    segment.label = this.shortenTitle(title)
+                    this.tabsSegmentedControl.segments = this.tabSegments
+                }
+            })
+            tab.activity$.subscribe(hasActivity => {
+                const showIcon = this.app.activeTab !== tab && hasActivity
+                const segment = this.tabSegments[app.tabs.indexOf(tab)]
+                if (segment) {
+                    segment.icon = showIcon ? activityIcon : null
+                }
             })
         })
     }
 
+    updateTabs () {
+        this.tabSegments = this.app.tabs.map(tab => ({
+            label: this.shortenTitle(tab.title),
+        }))
+        this.tabsSegmentedControl.segments = this.tabSegments
+        this.tabsSegmentedControl.selectedIndex = this.app.tabs.indexOf(this.app.activeTab)
+    }
+
     update () {
         if (this.hostApp.platform !== Platform.macOS) {
             return
         }
 
-        let buttons: IToolbarButton[] = []
+        let buttons: ToolbarButton[] = []
         this.config.enabledServices(this.toolbarButtonProviders).forEach(provider => {
             buttons = buttons.concat(provider.provide())
         })
+        buttons = buttons.filter(x => !!x.touchBarNSImage)
         buttons.sort((a, b) => (a.weight || 0) - (b.weight || 0))
         this.tabSegments = this.app.tabs.map(tab => ({
             label: this.shortenTitle(tab.title),
         }))
+
         this.tabsSegmentedControl = new this.electron.TouchBar.TouchBarSegmentedControl({
             segments: this.tabSegments,
             selectedIndex: this.app.tabs.indexOf(this.app.activeTab),
             change: (selectedIndex) => this.zone.run(() => {
                 this.app.selectTab(this.app.tabs[selectedIndex])
-            })
+            }),
         })
-        let touchBar = new this.electron.TouchBar({
+
+        this.buttonsSegmentedControl = new this.electron.TouchBar.TouchBarSegmentedControl({
+            segments: buttons.map(button => this.getButton(button)),
+            mode: 'buttons',
+            change: (selectedIndex) => this.zone.run(() => {
+                buttons[selectedIndex].click()
+            }),
+        })
+
+        const touchBar = new this.electron.TouchBar({
             items: [
                 this.tabsSegmentedControl,
                 new this.electron.TouchBar.TouchBarSpacer({ size: 'flexible' }),
                 new this.electron.TouchBar.TouchBarSpacer({ size: 'small' }),
-                ...buttons.map(button => this.getButton(button))
+                this.buttonsSegmentedControl,
-            ]
+            ],
         })
         this.hostApp.setTouchBar(touchBar)
     }
 
-    private getButton (button: IToolbarButton): Electron.TouchBarButton {
+    private getButton (button: ToolbarButton): Electron.SegmentedControlSegment {
-        return new this.electron.TouchBar.TouchBarButton({
+        return {
             label: button.touchBarNSImage ? null : this.shortenTitle(button.touchBarTitle || button.title),
             icon: button.touchBarNSImage ? this.getCachedNSImage(button.touchBarNSImage) : null,
-            click: () => this.zone.run(() => button.click()),
+            // click: () => this.zone.run(() => button.click()),
-        })
+        }
     }
 
     private getCachedNSImage (name: string) {

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

@@ -1,5 +1,5 @@
 import axios from 'axios'
-import * as os from 'os'
+
 import { Injectable } from '@angular/core'
 import { Logger, LogService } from './log.service'
 import { ElectronService } from './electron.service'
@@ -11,8 +11,9 @@ const UPDATES_URL = 'https://api.github.com/repos/eugeny/terminus/releases/lates
 export class UpdaterService {
     private logger: Logger
     private downloaded: Promise<boolean>
-    private isSquirrel = true
+    private electronUpdaterAvailable = true
     private updateURL: string
+    private autoUpdater
 
     constructor (
         log: LogService,
@@ -20,42 +21,37 @@ export class UpdaterService {
     ) {
         this.logger = log.create('updater')
 
-        try {
+        this.autoUpdater = electron.remote.require('electron-updater').autoUpdater
-            electron.autoUpdater.setFeedURL(`https://terminus-updates.herokuapp.com/update/${os.platform()}/${electron.app.getVersion()}`)
-        } catch (e) {
-            this.isSquirrel = false
-            this.logger.info('Squirrel updater unavailable, falling back')
-        }
 
-        this.electron.autoUpdater.on('update-available', () => {
+        this.autoUpdater.on('update-available', () => {
             this.logger.info('Update available')
         })
-        this.electron.autoUpdater.once('update-not-available', () => {
+        this.autoUpdater.once('update-not-available', () => {
             this.logger.info('No updates')
         })
 
         this.downloaded = new Promise<boolean>(resolve => {
-            this.electron.autoUpdater.once('update-downloaded', () => resolve(true))
+            this.autoUpdater.once('update-downloaded', () => resolve(true))
         })
 
         this.logger.debug('Checking for updates')
 
-        if (this.isSquirrel) {
+        if (this.electronUpdaterAvailable && !process.env.TERMINUS_DEV) {
             try {
-                this.electron.autoUpdater.checkForUpdates()
+                this.autoUpdater.checkForUpdates()
             } catch (e) {
-                this.isSquirrel = false
+                this.electronUpdaterAvailable = false
-                this.logger.info('Squirrel updater unavailable, falling back')
+                this.logger.info('Electron updater unavailable, falling back', e)
             }
         }
     }
 
     async check (): Promise<boolean> {
-        if (!this.isSquirrel) {
+        if (!this.electronUpdaterAvailable) {
             this.logger.debug('Checking for updates')
-            let response = await axios.get(UPDATES_URL)
+            const response = await axios.get(UPDATES_URL)
-            let data = response.data
+            const data = response.data
-            let version = data.tag_name.substring(1)
+            const version = data.tag_name.substring(1)
             if (this.electron.app.getVersion() !== version) {
                 this.logger.info('Update available')
                 this.updateURL = data.html_url
@@ -68,11 +64,11 @@ export class UpdaterService {
     }
 
     async update () {
-        if (!this.isSquirrel) {
+        if (!this.electronUpdaterAvailable) {
             this.electron.shell.openExternal(this.updateURL)
         } else {
             await this.downloaded
-            this.electron.autoUpdater.quitAndInstall()
+            this.autoUpdater.quitAndInstall()
         }
     }
 }

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/src/theme.scss

@@ -51,13 +51,13 @@ $input-disabled-bg:              #333;
 $input-color:                    $body-color;
 $input-color-placeholder:        #333;
 $input-border-color:             #344;
-$input-border-width: 0;
+$input-border-width: 1px;
 //$input-box-shadow:               inset 0 1px 1px rgba($black,.075);
 $input-border-radius:            0;
 $custom-select-border-radius: 0;
 $input-bg-focus:                 $input-bg;
-//$input-border-focus:             lighten($brand-primary, 25%);
+$input-border-focus:             lighten($blue, 25%);
-//$input-box-shadow-focus:         $input-box-shadow, rgba($input-border-focus, .6);
+$input-focus-box-shadow:         none;
 $input-color-focus:              $input-color;
 $input-group-addon-bg:           $body-bg;
 $input-group-addon-border-color: $input-border-color;
@@ -136,6 +136,10 @@ app-root  {
                 background: transparent;
                 &:hover { background: rgba(0, 0, 0, .25) !important; }
                 &:active { background: rgba(0, 0, 0, .5) !important; }
+
+                &::after {
+                    display: none;
+                }
             }
 
             &>.tabs {

terminus-core/tsconfig.json

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

terminus-core/tsconfig.typings.json

@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig.json",
+  "exclude": ["node_modules", "dist", "typings"],
+  "compilerOptions": {
+    "baseUrl": "src",
+    "emitDeclarationOnly": true,
+    "declaration": true,
+    "declarationDir": "./typings",
+    "paths": {
+      "terminus-*": ["../../terminus-*"],
+      "*": ["../../app/node_modules/*"]
+    }
+  }
+}

terminus-core/webpack.config.js

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

terminus-plugin-manager/package.json

@@ -1,12 +1,12 @@
 {
   "name": "terminus-plugin-manager",
-  "version": "1.0.73-c4-ga7d62b0",
+  "version": "1.0.83-nightly.0",
   "description": "Terminus' plugin manager",
   "keywords": [
     "terminus-builtin-plugin"
   ],
   "main": "dist/index.js",
-  "typings": "dist/index.d.ts",
+  "typings": "typings/index.d.ts",
   "scripts": {
     "build": "webpack --progress --color --display-modules",
     "watch": "webpack --progress --color --watch"
@@ -17,28 +17,21 @@
   "author": "Eugene Pankov",
   "license": "MIT",
   "devDependencies": {
-    "@types/mz": "0.0.31",
+    "@types/mz": "0.0.32",
-    "@types/node": "7.0.12",
+    "@types/semver": "^6.0.0",
-    "@types/semver": "^5.3.32",
+    "axios": "^0.19.0",
-    "@types/webpack-env": "1.13.0",
+    "mz": "^2.6.0",
-    "css-loader": "^0.28.0",
     "ngx-pipes": "^1.6.1",
-    "semver": "^5.3.0"
+    "semver": "^6.1.0"
   },
   "peerDependencies": {
-    "@angular/common": "4.0.1",
+    "@angular/common": "^7",
-    "@angular/core": "4.0.1",
+    "@angular/core": "^7",
-    "@angular/forms": "4.0.1",
+    "@angular/forms": "^7",
-    "@angular/platform-browser": "4.0.1",
+    "@angular/platform-browser": "^7",
-    "@ng-bootstrap/ng-bootstrap": "1.0.0-alpha.22",
+    "@ng-bootstrap/ng-bootstrap": "^1",
-    "rxjs": "5.3.0",
+    "rxjs": "^5",
     "terminus-core": "*",
     "terminus-settings": "*"
-  },
+  }
-  "dependencies": {
-    "axios": "^0.16.2",
-    "mz": "^2.6.0",
-    "npm": "^6.7.0"
-  },
-  "false": {}
 }

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
@@ -40,7 +40,7 @@ export class PluginManagerService {
         if (!this.npm) {
             if (!this.npmReady) {
                 this.npmReady = new Promise(resolve => {
-                    const npm = require('npm')
+                    const npm = (global as any).require('npm')
                     npm.load({
                         prefix: this.userPluginsPath,
                     }, err => {
@@ -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/tsconfig.json

@@ -3,6 +3,5 @@
   "exclude": ["node_modules", "dist"],
   "compilerOptions": {
     "baseUrl": "src",
-    "declarationDir": "dist"
   }
 }