fixed wsl crash when default distro is not available (fixes #2130)

Bump @types/ssh2 from 0.5.39 to 0.5.40 in /terminus-ssh

.all-contributorsrc

@@ -0,0 +1,255 @@
+{
+  "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"
+      ]
+    },
+    {
+      "login": "hammster",
+      "name": "Hans Koch",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/1093709?v=4",
+      "profile": "https://hans-koch.me",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "ThePuzzlemaker",
+      "name": "Dak Smyth",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/12666617?v=4",
+      "profile": "http://thepuzzlemaker.info",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "yfwz100",
+      "name": "Wang Zhi",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/983211?v=4",
+      "profile": "http://yfwz100.github.io",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "jack1142",
+      "name": "jack1142",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/6032823?v=4",
+      "profile": "https://github.com/jack1142",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "hdougie",
+      "name": "Howie Douglas",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/450799?v=4",
+      "profile": "https://github.com/hdougie",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "ckaczor",
+      "name": "Chris Kaczor",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/180906?v=4",
+      "profile": "https://chriskaczor.com",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "boxmein",
+      "name": "Johannes Kadak",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/358714?v=4",
+      "profile": "https://www.boxmein.net",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "LeSeulArtichaut",
+      "name": "LeSeulArtichaut",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/38361244?v=4",
+      "profile": "https://github.com/LeSeulArtichaut",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "CyrilTaylor",
+      "name": "Cyril Taylor",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/12631466?v=4",
+      "profile": "https://github.com/CyrilTaylor",
+      "contributions": [
+        "code"
+      ]
+    }
+  ],
+  "contributorsPerLine": 7,
+  "projectName": "terminus",
+  "projectOwner": "Eugeny",
+  "repoType": "github",
+  "repoHost": "https://github.com",
+  "commitConvention": "none",
+  "skipCi": true
+}

.eslintrc.yml

@@ -0,0 +1,101 @@
+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-floating-promises': off
+  '@typescript-eslint/prefer-readonly': off
+  '@typescript-eslint/require-await': off
+  '@typescript-eslint/strict-boolean-expressions': off
+  '@typescript-eslint/no-misused-promises': off
+  '@typescript-eslint/typedef': 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: off
+  '@typescript-eslint/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
+  no-var: error
+  object-curly-spacing:
+  - error
+  - always
+  quote-props:
+  - warn
+  - as-needed
+  - keywords: true
+    numbers: true
+  quotes: off
+  '@typescript-eslint/quotes':
+  - error
+  - single
+  - allowTemplateLiterals: true
+  '@typescript-eslint/no-non-null-assertion': off
+  '@typescript-eslint/no-unnecessary-condition': off
+  '@typescript-eslint/no-untyped-public-signature': off # bugs out on constructors
+  '@typescript-eslint/restrict-template-expressions': off
+  '@typescript-eslint/no-dynamic-delete': off
+  '@typescript-eslint/prefer-nullish-coalescing': off

.github/stale.yml

@@ -1,7 +1,7 @@
 # Number of days of inactivity before an issue becomes stale
-daysUntilStale: 60
+daysUntilStale: 180
 # Number of days of inactivity before a stale issue is closed
-daysUntilClose: 14
+daysUntilClose: 90
 # Issues with these labels will never be considered stale
 exemptLabels:
   - "T: Enhancement"

.github/workflows/docs.yml

@@ -0,0 +1,30 @@
+name: Docs
+on: push
+jobs:
+  build:
+    runs-on: ubuntu-18.04
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v1
+
+    - name: Installing Node
+      uses: actions/setup-node@v1
+      with:
+        version: 10
+
+    - name: Build
+      run: |
+        eval $(ssh-agent -s)
+        ssh-add <(echo "$DOCS_PRIVATE_KEY")
+        yarn cache clean
+        cd app
+        yarn
+        cd ..
+        rm app/node_modules/.yarn-integrity
+        yarn
+        yarn run docs
+        rsync -e "ssh -o StrictHostKeyChecking=no" -arv docs/api/ root@ajenti.org:/srv/terminus-docs/
+
+      env:
+        DOCS_PRIVATE_KEY: ${{ secrets.DOCS_PRIVATE_KEY }}

.github/workflows/lint.yml

@@ -0,0 +1,26 @@
+name: Lint
+on: [push, pull_request]
+jobs:
+  build:
+    runs-on: macOS-latest
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v1
+
+    - name: Installing Node
+      uses: actions/setup-node@v1
+      with:
+        version: 10
+
+    - name: Install deps
+      run: |
+        npm i -g yarn@1.19.1
+        cd app
+        yarn
+        cd ..
+        rm app/node_modules/.yarn-integrity
+        yarn
+
+    - name: Lint
+      run: yarn run lint

.github/workflows/linux.yml

@@ -0,0 +1,76 @@
+name: Linux Build
+on: [push, pull_request]
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v1
+
+    - name: Install Node
+      uses: actions/setup-node@v1
+      with:
+        version: 10
+
+    - name: Install deps
+      run: |
+        npm i -g yarn@1.19.1
+        cd app
+        yarn
+        cd ..
+        rm app/node_modules/.yarn-integrity
+        yarn
+
+    - name: Build native deps
+      run: scripts/build-native.js
+
+    - name: Build typings
+      run: yarn run build:typings
+
+    - name: Webpack
+      run: yarn run build
+
+    - name: Prepackage plugins
+      run: scripts/prepackage-plugins.js
+
+    - name: Build packages
+      run: scripts/build-linux.js
+      env:
+        DEBUG: electron-builder,electron-builder:*
+        GH_TOKEN: ${{ secrets.GH_TOKEN }}
+
+    - name: Package artifacts
+      run: |
+        mkdir artifact-deb
+        mv dist/*.deb artifact-deb/ || true
+        mkdir artifact-rpm
+        mv dist/*.rpm artifact-rpm/ || true
+        mkdir artifact-snap
+        mv dist/*.snap artifact-snap/ || true
+        mkdir artifact-tar.gz
+        mv dist/*.tar.gz artifact-tar.gz/ || true
+
+    - uses: actions/upload-artifact@master
+      name: Upload DEB
+      with:
+        name: Linux .deb
+        path: artifact-deb
+
+    - uses: actions/upload-artifact@master
+      name: Upload RPM
+      with:
+        name: Linux .rpm
+        path: artifact-rpm
+
+    - uses: actions/upload-artifact@master
+      name: Upload Snap
+      with:
+        name: Linux .snap
+        path: artifact-snap
+
+    - uses: actions/upload-artifact@master
+      name: Upload tarball
+      with:
+        name: Linux tarball
+        path: artifact-tar.gz

.github/workflows/macos.yml

@@ -0,0 +1,69 @@
+name: macOS Build
+on: [push, pull_request]
+jobs:
+  build:
+    runs-on: macOS-latest
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v1
+
+    - name: Installing Node
+      uses: actions/setup-node@v1
+      with:
+        version: 10
+
+    - name: Install deps
+      run: |
+        sudo npm i -g yarn@1.19.1
+        cd app
+        yarn
+        cd ..
+        rm app/node_modules/.yarn-integrity
+        yarn
+
+    - name: Build native deps
+      run: scripts/build-native.js
+
+    - name: Build typings
+      run: yarn run build:typings
+
+    - name: Webpack
+      run: yarn run build
+
+    - name: Prepackage plugins
+      run: scripts/prepackage-plugins.js
+
+    - name: Build and sign packages
+      run: scripts/build-macos.js
+      if: github.repository == 'Eugeny/terminus' && github.event_name == 'push'
+      env:
+        #DEBUG: electron-builder,electron-builder:*
+        GH_TOKEN: ${{ secrets.GH_TOKEN }}
+        CSC_LINK: ${{ secrets.CSC_LINK }}
+        CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
+
+    - name: Build packages without signing
+      run: scripts/build-macos.js
+      if: github.repository != 'Eugeny/terminus' || github.event_name != 'push'
+      env:
+        DEBUG: electron-builder,electron-builder:*
+
+    - name: Package artifacts
+      run: |
+        mkdir artifact-pkg
+        mv dist/*.pkg artifact-pkg/
+        mkdir artifact-zip
+        mv dist/*.zip artifact-zip/
+
+    - uses: actions/upload-artifact@master
+      name: Upload PKG
+      with:
+        name: macOS .pkg
+        path: artifact-pkg
+
+    - uses: actions/upload-artifact@master
+      name: Upload ZIP
+      with:
+        name: macOS .zip
+        path: artifact-zip

.github/workflows/windows.yml

@@ -0,0 +1,54 @@
+name: Windows Build
+on: [push, pull_request]
+jobs:
+  build:
+    runs-on: windows-2016
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v1
+
+    - name: Installing Node
+      uses: actions/setup-node@v1
+      with:
+        version: 10
+
+    - name: Build
+      shell: powershell
+      run: |
+        npm i -g yarn@1.19.1
+        yarn
+        node scripts/build-native.js
+        yarn run build
+        node scripts/prepackage-plugins.js
+
+    - name: Build and sign packages
+      run: node scripts/build-windows.js
+      if: github.repository == 'Eugeny/terminus' && github.event_name == 'push'
+      env:
+        GH_TOKEN: ${{ secrets.GH_TOKEN }}
+        WIN_CSC_LINK: ${{ secrets.WIN_CSC_LINK }}
+        WIN_CSC_KEY_PASSWORD: ${{ secrets.WIN_CSC_KEY_PASSWORD }}
+
+    - name: Build packages without signing
+      run: node scripts/build-windows.js
+      if: github.repository != 'Eugeny/terminus' || github.event_name != 'push'
+
+    - name: Package artifacts
+      run: |
+        mkdir artifact-setup
+        mv dist/*-setup.exe artifact-setup/
+        mkdir artifact-portable
+        mv dist/*-portable.zip artifact-portable/
+
+    - uses: actions/upload-artifact@master
+      name: Upload installer
+      with:
+        name: Installer
+        path: artifact-setup
+
+    - uses: actions/upload-artifact@master
+      name: Upload portable build
+      with:
+        name: Portable build
+        path: artifact-portable

.gitignore

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

.mergify.yml

@@ -0,0 +1,14 @@
+pull_request_rules:
+  - name: automatic merge on CI success and review
+    conditions:
+    - "status-success=Windows Build / Build"
+    - "status-success=macOS Build / Build"
+    - "status-success=Linux Build / Build"
+    - "status-success=continuous-integration/appveyor/pr"
+    - "#approved-reviews-by>=1"
+    - "#changes-requested-reviews-by=0"
+    - base=master
+    actions:
+      merge:
+        method: merge
+        strict: true

.travis.ssh.key.pub

@@ -1 +0,0 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDDFM4nHSbET5V7EYNgjA8NeVfOxV0wVMdZ2YvsDzD+qPJ4+MYbvsL7ZPaSxQSn7n6ATkLHjKje5RpF/Rl9K3kucGs0P6cqJVeE0qryEteQ3Q+fYAk+bD2J9ZQ/hv/0NtLl8T+7lJUZ3WUxFH73sgph77Sw0z+kMpPaK7U2vqMBQD/7+6iJgya31wP0qW0XKDz1BjKeXgwTg10Pm4vcGsR4c2q7YIzSzBHffcyo0vJyFvOX/ZKHlZRcq/wnQMeOl/hPgf1xCENjQZmFVReQlYSw5cNNDT9HZPKekOAZFFez7/AbPiTIo/bnBYIv0mdUjr3nw8nXF505q8LiD3z/ksaaWDqe9CCLM4W0Bh7/dhP7IGPdfX0fVHLhOnYIOsG21D8rWJjMPkVRSLyEvWNAnVuObJNHoQu8VATnOxfPNnMun72IHyyFWVoADk5JcsMbzcP7gZB+5oJO7U1qpcdndtBOA3ZlF0Uz2jVZnqavoEBWT39tl3vs69hAA3aTPGclg7HMuAJOl4HsKmaUgDxqV2wCX/S4pDqmKMbmumDLX+MM0xl0gXj/zpVJp9BzdnrArkC40ivmC6TSA4wrdN0tNBlqApkH5/jxGWrcu2AXVn9PGF3+QrjW0iu+QMZCaKWDhLIQC835uFwzhnNGlx41B7uxMLuNFxKXdQ3f/cC9QMG8ew== TravisCIDeployKey

.travis.yml

@@ -8,32 +8,12 @@ stages:
 
 jobs:
   include:
-    - stage: 'Build'
-      os: linux
-      before_install:
-        - yarn
-        - rm app/node_modules/.yarn-integrity || true
-        - scripts/install-deps.js
-      script:
-        - scripts/build-native.js
-        - yarn run build
-        - scripts/prepackage-plugins.js
-        - scripts/build-linux.js
-
-    - stage: 'Build'
-      os: osx
-      before_install:
-        - rm app/node_modules/.yarn-integrity || true
-        - yarn
-      script:
-        - scripts/build-native.js
-        - yarn run build
-        - scripts/prepackage-plugins.js
-        - scripts/build-macos.js
-
     - stage: 'Docs'
       os: linux
+      if: branch = master
       script:
+        - '[ -z "${encrypted_4e2fb4889ef8_iv}" ] && exit 0 || true'
+        - 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

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',

README.md

@@ -1,24 +1,25 @@
 ![](https://github.com/Eugeny/terminus/raw/master/docs/readme.png)
 
+
 <p align="center">
-  <a href="https://raw.githubusercontent.com/Eugeny/terminus/master/LICENSE"><img alt="GitHub" src="https://img.shields.io/github/license/eugeny/terminus.svg?label=License&style=flat-square"></a> <a href="https://travis-ci.org/Eugeny/terminus"><img alt="Travis (.org)" src="https://img.shields.io/travis/Eugeny/terminus.svg?label=CI&logo=travis&logoColor=white&style=flat-square"></a>
+  <a href="https://raw.githubusercontent.com/Eugeny/terminus/master/LICENSE"><img alt="GitHub" src="https://img.shields.io/github/license/eugeny/terminus.svg?label=License&style=flat-square"></a> <a href="https://ci.appveyor.com/project/Eugeny/terminus"><img alt="AppVeyor" src="https://img.shields.io/appveyor/ci/eugeny/terminus.svg?label=CI&logo=appveyor&logoColor=white&style=flat-square"></a>
-  <a href="https://ci.appveyor.com/project/Eugeny/terminus"><img alt="AppVeyor" src="https://img.shields.io/appveyor/ci/eugeny/terminus.svg?label=CI&logo=appveyor&logoColor=white&style=flat-square"></a>
 </p>
 
 <p align="center">
-  <a href="https://github.com/Eugeny/terminus/releases/latest"><img alt="GitHub All Releases" src="https://img.shields.io/github/downloads/eugeny/terminus/total.svg?label=DOWNLOAD&logo=github&style=for-the-badge"></a> <a href="https://ci.appveyor.com/project/Eugeny/terminus/build/artifacts"><img src="https://img.shields.io/badge/download-nightly%20build-magenta.svg?logo=appveyor&style=for-the-badge"/></a> <a href="https://gitter.im/terminus-terminal/community"><img alt="Gitter" src="https://img.shields.io/gitter/room/terminus/community.svg?color=blue&logo=gitter&style=for-the-badge"></a> 
+  <a href="https://github.com/Eugeny/terminus/releases/latest"><img alt="GitHub All Releases" src="https://img.shields.io/github/downloads/eugeny/terminus/total.svg?label=DOWNLOAD&logo=github&style=for-the-badge"></a> <a href="https://ci.appveyor.com/project/Eugeny/terminus/build/artifacts"><img src="https://img.shields.io/badge/download-nightly%20build-magenta.svg?logo=appveyor&style=for-the-badge"/></a> <a href="https://gitter.im/terminus-terminal/community"><img alt="Gitter" src="https://img.shields.io/gitter/room/terminus/community.svg?color=blue&logo=gitter&style=for-the-badge"></a>
 </p>
 
 ----
 
 **Terminus** is a highly configurable terminal emulator for Windows, macOS and Linux
 
+  * Integrated SSH client and connection manager
   * Theming and color schemes
   * Fully configurable shortcuts
   * Split panes
   * Remembers your tabs
   * PowerShell (and PS Core), WSL, Git-Bash, Cygwin, Cmder and CMD support
-  * Integrated SSH client and connection manager
+  * Direct file transfer from/to SSH sessions via Zmodem
   * Full Unicode support including double-width characters
   * Doesn't choke on fast-flowing outputs
   * Proper shell experience on Windows including tab completion (via Clink)
@@ -30,16 +31,19 @@
 
 * **Terminus is** an alternative to Windows' standard terminal (conhost), PowerShell ISE, PuTTY or iTerm
 
-* **Terminus is not** a new shell or a MinGW or Cygwin replacement. Neither is it lightweight - if RAM usage is of importance, consider [Conemu](https://conemu.github.io) or [Alacritty](https://github.com/jwilm/alacritty) 
+* **Terminus is not** a new shell or a MinGW or Cygwin replacement. Neither is it lightweight - if RAM usage is of importance, consider [Conemu](https://conemu.github.io) or [Alacritty](https://github.com/jwilm/alacritty)
 
 ---
 
+# Portable
+
+For portable in windows, user can create folder `data` at the same directory as `Terminal.exe` to save the settings.
+
 # Plugins
 
 Plugins and themes can be installed directly from the Settings view inside Terminus.
 
   * [clickable-links](https://github.com/Eugeny/terminus-clickable-links) - makes paths and URLs in the terminal clickable
-  * [shell-selector](https://github.com/Eugeny/terminus-shell-selector) - a quick shell selector pane
   * [title-control](https://github.com/kbjr/terminus-title-control) - allows modifying the title of the terminal tabs by providing a prefix, suffix, and/or strings to be removed
   * [quick-cmds](https://github.com/Domain/terminus-quick-cmds) - quickly send commands to one or all terminal tabs
   * [save-output](https://github.com/Eugeny/terminus-save-output) - record terminal output into a file
@@ -52,7 +56,7 @@ Plugins and themes can be installed directly from the Settings view inside Termi
   * [gruvbox](https://github.com/porkloin/terminus-theme-gruvbox)
   * [windows10](https://www.npmjs.com/package/terminus-theme-windows10)
   * [altair](https://github.com/yxuko/terminus-altair)
-  
+
 ---
 
 # Contributing
@@ -61,5 +65,52 @@ Pull requests and plugins are welcome!
 
 See [HACKING.md](https://github.com/Eugeny/terminus/blob/master/HACKING.md) and [API docs](http://ajenti.org/terminus-docs/) for information of how the project is laid out, and a very brief plugin development tutorial.
 
-## License
+---
-[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bhttps%3A%2F%2Fgithub.com%2FEugeny%2Fterminus.svg?type=large)](https://app.fossa.io/projects/git%2Bhttps%3A%2F%2Fgithub.com%2FEugeny%2Fterminus?ref=badge_large)
+
+Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)):
+
+<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
+<!-- prettier-ignore-start -->
+<!-- markdownlint-disable -->
+<table>
+  <tr>
+    <td align="center"><a href="http://www.russellmyers.com"><img src="https://avatars2.githubusercontent.com/u/184085?v=4" width="100px;" alt=""/><br /><sub><b>Russell Myers</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=mezner" title="Code">💻</a></td>
+    <td align="center"><a href="http://www.morwire.com"><img src="https://avatars1.githubusercontent.com/u/3991658?v=4" width="100px;" alt=""/><br /><sub><b>Austin Warren</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=ehwarren" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/Drachenkaetzchen"><img src="https://avatars1.githubusercontent.com/u/162974?v=4" width="100px;" alt=""/><br /><sub><b>Felicia Hummel</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=Drachenkaetzchen" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/mikemaccana"><img src="https://avatars2.githubusercontent.com/u/172594?v=4" width="100px;" alt=""/><br /><sub><b>Mike MacCana</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=mikemaccana" title="Tests">⚠️</a> <a href="#design-mikemaccana" title="Design">🎨</a></td>
+    <td align="center"><a href="https://github.com/yxuko"><img src="https://avatars1.githubusercontent.com/u/1786317?v=4" width="100px;" alt=""/><br /><sub><b>Yacine Kanzari</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=yxuko" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/BBJip"><img src="https://avatars2.githubusercontent.com/u/32908927?v=4" width="100px;" alt=""/><br /><sub><b>BBJip</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=BBJip" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/Futagirl"><img src="https://avatars2.githubusercontent.com/u/33533958?v=4" width="100px;" alt=""/><br /><sub><b>Futagirl</b></sub></a><br /><a href="#design-Futagirl" title="Design">🎨</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://www.levrik.io"><img src="https://avatars3.githubusercontent.com/u/9491603?v=4" width="100px;" alt=""/><br /><sub><b>Levin Rickert</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=levrik" title="Code">💻</a></td>
+    <td align="center"><a href="https://kwonoj.github.io"><img src="https://avatars2.githubusercontent.com/u/1210596?v=4" width="100px;" alt=""/><br /><sub><b>OJ Kwon</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=kwonoj" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/Domain"><img src="https://avatars2.githubusercontent.com/u/903197?v=4" width="100px;" alt=""/><br /><sub><b>domain</b></sub></a><br /><a href="#plugin-Domain" title="Plugin/utility libraries">🔌</a> <a href="https://github.com/Eugeny/terminus/commits?author=Domain" title="Code">💻</a></td>
+    <td align="center"><a href="http://www.jbrumond.me"><img src="https://avatars1.githubusercontent.com/u/195127?v=4" width="100px;" alt=""/><br /><sub><b>James Brumond</b></sub></a><br /><a href="#plugin-kbjr" title="Plugin/utility libraries">🔌</a></td>
+    <td align="center"><a href="http://www.growingwiththeweb.com"><img src="https://avatars0.githubusercontent.com/u/2193314?v=4" width="100px;" alt=""/><br /><sub><b>Daniel Imms</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=Tyriar" title="Code">💻</a> <a href="#plugin-Tyriar" title="Plugin/utility libraries">🔌</a> <a href="https://github.com/Eugeny/terminus/commits?author=Tyriar" title="Tests">⚠️</a></td>
+    <td align="center"><a href="https://github.com/baflo"><img src="https://avatars2.githubusercontent.com/u/834350?v=4" width="100px;" alt=""/><br /><sub><b>Florian Bachmann</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=baflo" title="Code">💻</a></td>
+    <td align="center"><a href="http://michael-kuehnel.de"><img src="https://avatars2.githubusercontent.com/u/441011?v=4" width="100px;" alt=""/><br /><sub><b>Michael Kühnel</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=mischah" title="Code">💻</a> <a href="#design-mischah" title="Design">🎨</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://github.com/NieLeben"><img src="https://avatars3.githubusercontent.com/u/47182955?v=4" width="100px;" alt=""/><br /><sub><b>Tilmann Meyer</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=NieLeben" title="Code">💻</a></td>
+    <td align="center"><a href="http://www.jubeat.net"><img src="https://avatars3.githubusercontent.com/u/11289158?v=4" width="100px;" alt=""/><br /><sub><b>PM Extra</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/issues?q=author%3APMExtra" title="Bug reports">🐛</a></td>
+    <td align="center"><a href="https://jjuhas.keybase.pub//"><img src="https://avatars1.githubusercontent.com/u/6438760?v=4" width="100px;" alt=""/><br /><sub><b>Jonathan</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=IgnusG" title="Code">💻</a></td>
+    <td align="center"><a href="https://hans-koch.me"><img src="https://avatars0.githubusercontent.com/u/1093709?v=4" width="100px;" alt=""/><br /><sub><b>Hans Koch</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=hammster" title="Code">💻</a></td>
+    <td align="center"><a href="http://thepuzzlemaker.info"><img src="https://avatars3.githubusercontent.com/u/12666617?v=4" width="100px;" alt=""/><br /><sub><b>Dak Smyth</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=ThePuzzlemaker" title="Code">💻</a></td>
+    <td align="center"><a href="http://yfwz100.github.io"><img src="https://avatars2.githubusercontent.com/u/983211?v=4" width="100px;" alt=""/><br /><sub><b>Wang Zhi</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=yfwz100" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/jack1142"><img src="https://avatars0.githubusercontent.com/u/6032823?v=4" width="100px;" alt=""/><br /><sub><b>jack1142</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=jack1142" title="Code">💻</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://github.com/hdougie"><img src="https://avatars1.githubusercontent.com/u/450799?v=4" width="100px;" alt=""/><br /><sub><b>Howie Douglas</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=hdougie" title="Code">💻</a></td>
+    <td align="center"><a href="https://chriskaczor.com"><img src="https://avatars2.githubusercontent.com/u/180906?v=4" width="100px;" alt=""/><br /><sub><b>Chris Kaczor</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=ckaczor" title="Code">💻</a></td>
+    <td align="center"><a href="https://www.boxmein.net"><img src="https://avatars1.githubusercontent.com/u/358714?v=4" width="100px;" alt=""/><br /><sub><b>Johannes Kadak</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=boxmein" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/LeSeulArtichaut"><img src="https://avatars1.githubusercontent.com/u/38361244?v=4" width="100px;" alt=""/><br /><sub><b>LeSeulArtichaut</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=LeSeulArtichaut" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/CyrilTaylor"><img src="https://avatars0.githubusercontent.com/u/12631466?v=4" width="100px;" alt=""/><br /><sub><b>Cyril Taylor</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=CyrilTaylor" title="Code">💻</a></td>
+  </tr>
+</table>
+
+<!-- markdownlint-enable -->
+<!-- prettier-ignore-end -->
+<!-- ALL-CONTRIBUTORS-LIST:END -->
+
+This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome!

app/lib/app.ts

@@ -1,4 +1,5 @@
 import { app, ipcMain, Menu, Tray, shell } from 'electron'
+// eslint-disable-next-line no-duplicate-imports
 import * as electron from 'electron'
 import { loadConfig } from './config'
 import { Window, WindowOptions } from './window'
@@ -13,18 +14,25 @@ export class Application {
         })
 
         const configData = loadConfig()
-        if (process.platform === 'linux' && ((configData.appearance || {}).opacity || 1) !== 1) {
+        if (process.platform === 'linux') {
-            app.commandLine.appendSwitch('enable-transparent-visuals')
+            app.commandLine.appendSwitch('no-sandbox')
-            app.disableHardwareAcceleration()
+            if (((configData.appearance || {}).opacity || 1) !== 1) {
+                app.commandLine.appendSwitch('enable-transparent-visuals')
+                app.disableHardwareAcceleration()
+            }
         }
 
         app.commandLine.appendSwitch('disable-http-cache')
-        app.commandLine.appendSwitch('force_discrete_gpu', '0')
         app.commandLine.appendSwitch('lang', 'EN')
+        app.allowRendererProcessReuse = false
+
+        for (const flag of configData.flags || [['force_discrete_gpu', '0']]) {
+            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> {
@@ -54,7 +62,7 @@ export class Application {
         if (!this.hasWindows()) {
             await this.newWindow()
         }
-        this.windows[0].send(event, ...args)
+        this.windows.filter(w => !w.isDestroyed())[0].send(event, ...args)
     }
 
     enableTray () {
@@ -68,7 +76,7 @@ export class Application {
             this.tray = new Tray(`${app.getAppPath()}/assets/tray.png`)
         }
 
-        this.tray.on('click', () => this.focus())
+        this.tray.on('click', () => setTimeout(() => this.focus()))
 
         const contextMenu = Menu.buildFromTemplate([{
             label: 'Show',
@@ -96,7 +104,6 @@ export class Application {
     focus () {
         for (let window of this.windows) {
             window.show()
-            window.focus()
         }
     }
 
@@ -121,7 +128,7 @@ export class Application {
                     { role: 'services', submenu: [] },
                     { type: 'separator' },
                     { role: 'hide' },
-                    { role: 'hideothers' },
+                    { role: 'hideOthers' },
                     { role: 'unhide' },
                     { type: 'separator' },
                     {
@@ -142,21 +149,21 @@ export class Application {
                     { role: 'cut' },
                     { role: 'copy' },
                     { role: 'paste' },
-                    { role: 'pasteandmatchstyle' },
+                    { role: 'pasteAndMatchStyle' },
                     { role: 'delete' },
-                    { role: 'selectall' },
+                    { role: 'selectAll' },
                 ],
             },
             {
                 label: 'View',
                 submenu: [
                     { role: 'reload' },
-                    { role: 'forcereload' },
+                    { role: 'forceReload' },
-                    { role: 'toggledevtools' },
+                    { role: 'toggleDevTools' },
                     { type: 'separator' },
-                    { role: 'resetzoom' },
+                    { role: 'resetZoom' },
-                    { role: 'zoomin' },
+                    { role: 'zoomIn' },
-                    { role: 'zoomout' },
+                    { role: 'zoomOut' },
                     { type: 'separator' },
                     { role: 'togglefullscreen' },
                 ],
@@ -180,7 +187,7 @@ export class Application {
                         },
                     },
                 ],
-            }
+            },
         ]
 
         Menu.setApplicationMenu(Menu.buildFromTemplate(template))

app/lib/cli.ts

@@ -20,27 +20,26 @@ export function parseArgs (argv, cwd) {
             return yargs.option('escape', {
                 alias: 'e',
                 type: 'boolean',
-                describe: 'Perform shell escaping'
+                describe: 'Perform shell escaping',
             }).positional('text', {
-                type: 'string'
+                type: 'string',
             })
         })
         .version('version', '', app.getVersion())
         .option('debug', {
             alias: 'd',
             describe: 'Show DevTools on start',
-            type: 'boolean'
+            type: 'boolean',
         })
         .option('hidden', {
             describe: 'Start minimized',
-            type: 'boolean'
+            type: 'boolean',
         })
         .option('version', {
             alias: 'v',
             describe: 'Show version and exit',
-            type: 'boolean'
+            type: 'boolean',
         })
         .help('help')
-        .strict()
         .parse(argv.slice(1))
 }

app/lib/index.ts

@@ -1,3 +1,5 @@
+import './portable'
+import './sentry'
 import './lru'
 import { app, ipcMain, Menu } from 'electron'
 import { parseArgs } from './cli'
@@ -39,14 +41,14 @@ const argv = parseArgs(process.argv, process.cwd())
 
 if (!app.requestSingleInstanceLock()) {
     app.quit()
-    process.exit(0)
+    app.exit(0)
 }
 
 if (argv.d) {
     electronDebug({
         isEnabled: true,
         showDevTools: true,
-        devToolsMode: 'undocked'
+        devToolsMode: 'undocked',
     })
 }
 
@@ -57,8 +59,8 @@ app.on('ready', () => {
                 label: 'New window',
                 click () {
                     this.app.newWindow()
-                }
+                },
-            }
+            },
         ]))
     }
     application.init()

app/lib/lru.ts

@@ -1,13 +1,15 @@
-let lru = require('lru-cache')({ max: 256, maxAge: 250 })
+import * as createLRU from 'lru-cache'
-
+import * as fs from 'fs'
-let fs = require('fs')
+const lru = createLRU({ max: 256, maxAge: 250 })
-let origLstat = fs.realpathSync.bind(fs)
+const origLstat = fs.realpathSync.bind(fs)
 
 // NB: The biggest offender of thrashing realpathSync is the node module system
 // itself, which we can't get into via any sane means.
 require('fs').realpathSync = function (p) {
     let r = lru.get(p)
-    if (r) return r
+    if (r) {
+        return r
+    }
 
     r = origLstat(p)
     lru.set(p, r)

app/lib/portable.ts

@@ -0,0 +1,24 @@
+import * as path from 'path'
+import * as fs from 'fs'
+
+let appPath: string | null = null
+try {
+    appPath = path.dirname(require('electron').app.getPath('exe'))
+} catch {
+    appPath = path.dirname(require('electron').remote.app.getPath('exe'))
+}
+
+if (null != appPath) {
+    if(fs.existsSync(path.join(appPath, 'terminus-data'))) {
+        fs.renameSync(path.join(appPath, 'terminus-data'), path.join(appPath, 'data'))
+    }
+    const portableData = path.join(appPath, 'data')
+    if (fs.existsSync(portableData)) {
+        console.log('reset user data to ' + portableData)
+        try {
+            require('electron').app.setPath('userData', portableData)
+        } catch {
+            require('electron').remote.app.setPath('userData', portableData)
+        }
+    }
+}

app/lib/sentry.ts

@@ -0,0 +1,21 @@
+const { init } = process.type === 'main' ? require('@sentry/electron/dist/main') : require('@sentry/electron/dist/renderer')
+import * as isDev from 'electron-is-dev'
+
+
+const SENTRY_DSN = 'https://4717a0a7ee0b4429bd3a0f06c3d7eec3@sentry.io/181876'
+let release
+try {
+    release = require('electron').app.getVersion()
+} catch {
+    release = require('electron').remote.app.getVersion()
+}
+
+if (!isDev) {
+    init({
+        dsn: SENTRY_DSN,
+        release,
+        integrations (integrations) {
+            return integrations.filter(integration => integration.name !== 'Breadcrumbs')
+        },
+    })
+}

app/lib/window.ts

@@ -1,8 +1,9 @@
 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'
+import * as path from 'path'
 
 import { loadConfig } from './config'
 
@@ -26,6 +27,8 @@ export class Window {
     private windowConfig: ElectronConfig
     private windowBounds: Rectangle
     private closing = false
+    private lastVibrancy: {enabled: boolean, type?: string} | null = null
+    private disableVibrancyWhileDragging = false
 
     get visible$ (): Observable<boolean> { return this.visible }
 
@@ -46,12 +49,26 @@ export class Window {
             minHeight: 300,
             webPreferences: {
                 nodeIntegration: true,
+                preload: path.join(__dirname, 'sentry.js'),
+                backgroundThrottling: false,
             },
             frame: false,
             show: false,
-            backgroundColor: '#00000000'
+            backgroundColor: '#00000000',
+        }
+
+        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
+            }
         }
-        Object.assign(bwOptions, this.windowBounds)
 
         if ((configData.appearance || {}).frame === 'native') {
             bwOptions.frame = true
@@ -68,7 +85,7 @@ export class Window {
         this.window = new BrowserWindow(bwOptions)
         this.window.once('ready-to-show', () => {
             if (process.platform === 'darwin') {
-                this.window.setVibrancy('dark')
+                this.window.setVibrancy('window')
             } else if (process.platform === 'win32' && (configData.appearance || {}).vibrancy) {
                 this.setVibrancy(true)
             }
@@ -82,6 +99,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') {
@@ -93,7 +111,7 @@ export class Window {
         this.ready = new Promise(resolve => {
             const listener = event => {
                 if (event.sender === this.window.webContents) {
-                    ipcMain.removeListener('app:ready', listener)
+                    ipcMain.removeListener('app:ready', listener as any)
                     resolve()
                 }
             }
@@ -102,11 +120,12 @@ export class Window {
     }
 
     setVibrancy (enabled: boolean, type?: string) {
+        this.lastVibrancy = { enabled, type }
         if (process.platform === 'win32') {
             if (parseFloat(os.release()) >= 10) {
                 let attribValue = AccentState.ACCENT_DISABLED
                 if (enabled) {
-                    if (parseInt(os.release().split('.')[2]) >= 17063 && type === 'fluent') {
+                    if (type === 'fluent') {
                         attribValue = AccentState.ACCENT_ENABLE_ACRYLICBLURBEHIND
                     } else {
                         attribValue = AccentState.ACCENT_ENABLE_BLURBEHIND
@@ -116,6 +135,8 @@ export class Window {
             } else {
                 DwmEnableBlurBehindWindow(this.window, enabled)
             }
+        } else {
+            this.window.setVibrancy(enabled ? 'dark' : null as any) // electron issue 20269
         }
     }
 
@@ -134,10 +155,14 @@ export class Window {
         this.window.webContents.send(event, ...args)
     }
 
+    isDestroyed () {
+        return !this.window || this.window.isDestroyed()
+    }
+
     private setupWindowManagement () {
         this.window.on('show', () => {
             this.visible.next(true)
-            this.window.webContents.send('host:window-shown')
+            this.send('host:window-shown')
         })
 
         this.window.on('hide', () => {
@@ -147,20 +172,20 @@ export class Window {
         let moveSubscription = new Observable<void>(observer => {
             this.window.on('move', () => observer.next())
         }).pipe(debounceTime(250)).subscribe(() => {
-            this.window.webContents.send('host:window-moved')
+            this.send('host:window-moved')
         })
 
         this.window.on('closed', () => {
             moveSubscription.unsubscribe()
         })
 
-        this.window.on('enter-full-screen', () => this.window.webContents.send('host:window-enter-full-screen'))
+        this.window.on('enter-full-screen', () => this.send('host:window-enter-full-screen'))
-        this.window.on('leave-full-screen', () => this.window.webContents.send('host:window-leave-full-screen'))
+        this.window.on('leave-full-screen', () => this.send('host:window-leave-full-screen'))
 
         this.window.on('close', event => {
             if (!this.closing) {
                 event.preventDefault()
-                this.window.webContents.send('host:window-close-request')
+                this.send('host:window-close-request')
                 return
             }
             this.windowConfig.set('windowBoundaries', this.windowBounds)
@@ -183,6 +208,10 @@ export class Window {
             }
         })
 
+        this.window.on('focus', () => {
+            this.send('host:window-focused')
+        })
+
         ipcMain.on('window-focus', event => {
             if (!this.window || event.sender !== this.window.webContents) {
                 return
@@ -270,6 +299,29 @@ export class Window {
         })
 
         this.window.webContents.on('new-window', event => event.preventDefault())
+
+        ipcMain.on('window-set-disable-vibrancy-while-dragging', (_event, value) => {
+            this.disableVibrancyWhileDragging = value
+        })
+
+        this.window.on('will-move', () => {
+            if (!this.lastVibrancy?.enabled || !this.disableVibrancyWhileDragging) {
+                return
+            }
+            let timeout: number|null = null
+            const oldVibrancy = this.lastVibrancy
+            this.setVibrancy(false)
+            const onMove = () => {
+                if (timeout) {
+                    clearTimeout(timeout)
+                }
+                timeout = setTimeout(() => {
+                    this.window.off('move', onMove)
+                    this.setVibrancy(oldVibrancy.enabled, oldVibrancy.type)
+                }, 500)
+            }
+            this.window.on('move', onMove)
+        })
     }
 
     private destroy () {

app/package.json

@@ -20,25 +20,35 @@
     "@angular/forms": "7.2.8",
     "@angular/platform-browser": "7.2.8",
     "@angular/platform-browser-dynamic": "7.2.8",
-    "@ng-bootstrap/ng-bootstrap": "^4.1.3",
+    "@ng-bootstrap/ng-bootstrap": "^4.2.2",
     "devtron": "1.4.0",
     "electron-config": "2.0.0",
-    "electron-debug": "^3.0.0",
+    "electron-debug": "^3.0.1",
     "electron-is-dev": "1.1.0",
-    "electron-updater": "^4.0.6",
+    "electron-updater": "^4.2.0",
+    "fontmanager-redux": "0.4.0",
     "js-yaml": "3.13.1",
+    "keytar": "^5.2.0",
     "mz": "^2.7.0",
-    "ngx-toastr": "^9.1.1",
+    "ngx-toastr": "^10.2.0",
+    "node-pty": "^0.10.0-beta2",
+    "npm": "6.9.0",
     "path": "0.12.7",
-    "rxjs": "^6.5.2",
+    "rxjs": "^6.5.4",
-    "yargs": "^13.2.4",
+    "rxjs-compat": "^6.5.4",
+    "yargs": "^15.1.0",
     "zone.js": "^0.8.29"
   },
   "optionalDependencies": {
+    "macos-native-processlist": "^1.0.2",
     "windows-blurbehind": "^1.0.1",
+    "windows-native-registry": "^1.0.17",
+    "windows-process-tree": "^0.2.4",
     "windows-swca": "^2.0.2"
   },
   "devDependencies": {
-    "@types/mz": "0.0.32"
+    "@types/mz": "0.0.32",
+    "@types/node": "12.7.12",
+    "node-abi": "^2.15.0"
   }
 }

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

@@ -6,33 +6,3 @@ import '@fortawesome/fontawesome-free/css/brands.css'
 import '@fortawesome/fontawesome-free/css/fontawesome.css'
 import 'ngx-toastr/toastr.css'
 import './preload.scss'
-
-import * as Raven from 'raven-js'
-
-const SENTRY_DSN = 'https://4717a0a7ee0b4429bd3a0f06c3d7eec3@sentry.io/181876'
-
-Raven.config(
-    SENTRY_DSN,
-    {
-        release: require('electron').remote.app.getVersion(),
-        dataCallback: (data: any) => {
-            const normalize = (filename) => {
-                let splitArray = filename.split('/')
-                return splitArray[splitArray.length - 1]
-            }
-
-            data.exception.values[0].stacktrace.frames.forEach(frame => {
-                frame.filename = normalize(frame.filename)
-            })
-
-            data.culprit = data.exception.values[0].stacktrace.frames[0].filename
-
-            return data
-        }
-    }
-)
-
-process.on('uncaughtException' as any, (err) => {
-    Raven.captureException(err as any)
-    console.error(err)
-})

app/src/entry.ts

@@ -2,24 +2,25 @@ import 'zone.js'
 import 'core-js/proposals/reflect-metadata'
 import 'rxjs'
 
-import isDev = require('electron-is-dev')
+import * as isDev from 'electron-is-dev'
 
 import './global.scss'
 import './toastr.scss'
 
-// Always land on the start view
+import { enableProdMode, NgModuleRef, ApplicationRef } from '@angular/core'
-location.hash = ''
+import { enableDebugTools } from '@angular/platform-browser'
-
-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
 
-if (process.platform === 'win32') {
+if (process.platform === 'win32' && !('HOME' in process.env)) {
-    process.env.HOME = process.env.HOMEDRIVE + process.env.HOMEPATH
+    process.env.HOME = `${process.env.HOMEDRIVE}${process.env.HOMEPATH}`
 }
 
 if (isDev) {
@@ -28,16 +29,23 @@ if (isDev) {
     enableProdMode()
 }
 
-async function bootstrap (plugins: IPluginInfo[], safeMode = false): Promise<NgModuleRef<any>> {
+async function bootstrap (plugins: PluginInfo[], safeMode = false): Promise<NgModuleRef<any>> {
     if (safeMode) {
         plugins = plugins.filter(x => x.isBuiltin)
     }
-    let pluginsModules = await loadPlugins(plugins, (current, total) => {
+    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)
+    return platformBrowserDynamic().bootstrapModule(module).then(moduleRef => {
+        if (isDev) {
+            const applicationRef = moduleRef.injector.get(ApplicationRef)
+            const componentRef = applicationRef.components[0]
+            enableDebugTools(componentRef)
+        }
+        return moduleRef
+    })
 }
 
 findPlugins().then(async plugins => {

app/src/global.scss

@@ -16,6 +16,12 @@ body {
     display: none;
 }
 
+.btn {
+    & > svg {
+        pointer-events: none;
+    }
+}
+
 .form-line {
     display: flex;
     border-top: 1px solid rgba(0, 0, 0, 0.2);

app/src/plugins.ts

@@ -1,6 +1,6 @@
 import * as fs from 'mz/fs'
 import * as path from 'path'
-const nodeModule = require('module')
+const nodeModule = require('module') // eslint-disable-line @typescript-eslint/no-var-requires
 const nodeRequire = (global as any).require
 
 function normalizePath (path: string): string {
@@ -12,7 +12,7 @@ function normalizePath (path: string): string {
     return path
 }
 
-nodeRequire.main.paths.map(x => nodeModule.globalPaths.push(normalizePath(x)))
+global['module'].paths.map((x: string) => nodeModule.globalPaths.push(normalizePath(x)))
 
 if (process.env.TERMINUS_DEV) {
     nodeModule.globalPaths.unshift(path.dirname(require('electron').remote.app.getAppPath()))
@@ -21,8 +21,7 @@ if (process.env.TERMINUS_DEV) {
 const builtinPluginsPath = process.env.TERMINUS_DEV ? path.dirname(require('electron').remote.app.getAppPath()) : path.join((process as any).resourcesPath, 'builtin-plugins')
 
 const userPluginsPath = path.join(
-    require('electron').remote.app.getPath('appData'),
+    require('electron').remote.app.getPath('userData'),
-    'terminus',
     'plugins',
 )
 
@@ -38,9 +37,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
@@ -64,6 +63,7 @@ const builtinModules = [
     'ngx-toastr',
     'rxjs',
     'rxjs/operators',
+    'rxjs-compat/Subject',
     'terminus-core',
     'terminus-settings',
     'terminus-terminal',
@@ -72,47 +72,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`)
@@ -120,7 +134,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
             }
@@ -141,23 +155,29 @@ export async function findPlugins (): Promise<IPluginInfo[]> {
         }
     }
 
-    (window as any).installedPlugins = foundPlugins
+    foundPlugins.sort((a, b) => a.name > b.name ? 1 : -1)
+
+    ;(window as any).installedPlugins = foundPlugins
     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)
         }

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);
@@ -9,6 +10,10 @@
     background-image: none;
     width: auto;
 
+    &.toast-error {
+      background-color: #BD362F;
+    }
+
     &.toast-info {
       background-color: #555;
     }

app/webpack.config.js

@@ -6,6 +6,7 @@ module.exports = {
   target: 'node',
   entry: {
     'index.ignore': 'file-loader?name=index.html!pug-html-loader!' + path.resolve(__dirname, './index.pug'),
+    sentry: path.resolve(__dirname, 'lib/sentry.ts'),
     preload: path.resolve(__dirname, 'src/entry.preload.ts'),
     bundle: path.resolve(__dirname, 'src/entry.ts'),
   },
@@ -14,7 +15,7 @@ module.exports = {
      minimize: false,
   },
   context: __dirname,
-  devtool: 'eval-source-map',
+  devtool: 'source-map',
   output: {
     path: path.join(__dirname, 'dist'),
     pathinfo: true,
@@ -78,5 +79,8 @@ module.exports = {
   },
   plugins: [
     new webpack.optimize.ModuleConcatenationPlugin(),
+    new webpack.DefinePlugin({
+      'process.type': '"renderer"'
+    }),
   ],
 }

app/webpack.main.config.js

@@ -9,7 +9,7 @@ module.exports = {
   },
   mode: process.env.TERMINUS_DEV ? 'development' : 'production',
   context: __dirname,
-  devtool: 'eval-source-map',
+  devtool: 'source-map',
   output: {
     path: path.join(__dirname, 'dist'),
     pathinfo: true,
@@ -45,5 +45,8 @@ module.exports = {
   },
   plugins: [
     new webpack.optimize.ModuleConcatenationPlugin(),
+    new webpack.DefinePlugin({
+      'process.type': '"main"',
+    }),
   ],
 }

appveyor.yml

@@ -6,10 +6,6 @@ platform:
 environment:
   nodejs_version: "10"
 
-cache:
-  - "%USERPROFILE%\\.electron"
-  - "%LOCALAPPDATA%\\Yarn"
-
 version: "{build}"
 
 install:
@@ -24,3 +20,9 @@ build_script:
 
 artifacts:
   - path: 'dist\*.exe'
+
+cache:
+  - node_modules
+  - "*\\node_modules"
+  - "%USERPROFILE%\\.electron"
+  - "%LOCALAPPDATA%\\Yarn"

build/linux/after-install.tpl

@@ -1,4 +1,7 @@
 #!/bin/bash
+cat > '/usr/bin/${executable}' << END
+#!/bin/sh
+'/opt/${productFilename}/${executable}' --no-sandbox $@
+END
 
-# Link to the binary
+chmod +x '/usr/bin/${executable}'
-ln -sf '/opt/${productFilename}/${executable}' '/usr/bin/${executable}'

build/mac/afterSignHook.js

@@ -0,0 +1,35 @@
+// 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) {
+    // notarize the app on Mac OS only.
+    if (process.platform !== 'darwin' || process.env.GITHUB_REF !== 'refs/heads/master' || process.env.GITHUB_REF && !process.env.GITHUB_REF.startsWith('refs/tags/')) {
+        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,14 @@
+<?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/>
+    <key>com.apple.security.cs.disable-library-validation</key>
+    <true/>
+  </dict>
+</plist>

electron-builder.yml

@@ -0,0 +1,60 @@
+---
+appId: org.terminus
+productName: Terminus
+compression: normal
+afterSign: "./build/mac/afterSignHook.js"
+files:
+- "**/*"
+- dist
+extraResources:
+- builtin-plugins
+- extras
+publish:
+- provider: github
+
+win:
+  icon: "./build/windows/icon.ico"
+  artifactName: terminus-${version}-portable.${ext}
+  rfc3161TimeStampServer: http://sha256timestamp.ws.symantec.com/sha256/timestamp
+nsis:
+  oneClick: false
+  artifactName: terminus-${version}-setup.${ext}
+  installerIcon: "./build/windows/icon.ico"
+
+mac:
+  category: public.app-category.video
+  icon: "./build/mac/icon.icns"
+  artifactName: terminus-${version}-macos.${ext}
+  hardenedRuntime: true
+  entitlements: "./build/mac/entitlements.plist"
+  entitlementsInherit: "./build/mac/entitlements.plist"
+  extendInfo:
+    NSRequiresAquaSystemAppearance: false
+pkg:
+  artifactName: terminus-${version}-macos.pkg
+
+linux:
+  category: Utilities
+  icon: "./build/icons"
+  artifactName: terminus-${version}-linux.${ext}
+  executableArgs:
+  - "--no-sandbox"
+snap:
+  plugs:
+  - default
+  - system-files
+  - system-observe
+deb:
+  depends:
+  - gconf2
+  - gconf-service
+  - libnotify4
+  - libsecret-1-0
+  - libappindicator1
+  - libxtst6
+  - libnss3
+  afterInstall: build/linux/after-install.tpl
+rpm:
+  depends:
+  - screen
+  - gnome-python2-gnomekeyring

package.json

@@ -1,137 +1,70 @@
 {
-  "name": "term",
   "devDependencies": {
-    "@fortawesome/fontawesome-free": "^5.8.2",
+    "@fortawesome/fontawesome-free": "^5.12.1",
+    "@sentry/cli": "^1.49.0",
+    "@sentry/electron": "^1.0.0",
     "@types/electron-config": "^3.2.2",
     "@types/electron-debug": "^2.1.0",
-    "@types/fs-promise": "1.0.3",
     "@types/js-yaml": "^3.12.1",
-    "@types/node": "^12.0.2",
+    "@types/node": "12.7.12",
-    "@types/webpack-env": "1.13.9",
+    "@types/webpack-env": "1.15.0",
-    "app-builder-lib": "^20.42.0",
+    "@typescript-eslint/eslint-plugin": "^2.13.0",
+    "@typescript-eslint/parser": "^2.19.2",
     "apply-loader": "2.0.0",
     "awesome-typescript-loader": "^5.0.0",
-    "core-js": "^3.1.2",
+    "core-js": "^3.6.4",
-    "cross-env": "5.2.0",
+    "cross-env": "7.0.0",
-    "css-loader": "2.1.1",
+    "css-loader": "3.4.2",
-    "electron": "^5.0.2",
+    "electron": "^8.0.0",
-    "electron-builder": "^20.41.0",
+    "electron-builder": "22.3.2",
-    "electron-installer-snap": "^3.2.0",
+    "electron-download": "^4.1.1",
-    "electron-rebuild": "^1.8.5",
+    "electron-installer-snap": "^5.0.0",
-    "file-loader": "^3.0.1",
+    "electron-notarize": "^0.1.1",
-    "graceful-fs": "^4.1.15",
+    "electron-rebuild": "^1.9.0",
+    "eslint": "^6.8.0",
+    "eslint-plugin-import": "^2.20.0",
+    "file-loader": "^5.0.2",
+    "graceful-fs": "^4.2.2",
     "html-loader": "0.5.5",
     "json-loader": "0.5.7",
-    "node-abi": "^2.8.0",
+    "node-abi": "^2.15.0",
-    "node-gyp": "^4.0.0",
+    "node-gyp": "^6.1.0",
-    "node-sass": "^4.12.0",
+    "node-sass": "^4.13.0",
     "npmlog": "4.1.2",
     "npx": "^10.2.0",
-    "pug": "^2.0.3",
+    "pug": "^2.0.4",
     "pug-html-loader": "1.1.5",
-    "pug-lint": "^2.5.0",
+    "pug-lint": "^2.6.0",
     "pug-loader": "^2.4.0",
     "pug-static-loader": "2.0.0",
-    "raven-js": "3.27.1",
+    "raw-loader": "4.0.0",
-    "raw-loader": "2.0.0",
+    "sass-loader": "^8.0.0",
-    "sass-loader": "^7.0.1",
     "shelljs": "0.8.3",
-    "source-code-pro": "^2.30.1",
+    "source-code-pro": "^2.30.2",
-    "source-sans-pro": "2.45.0",
+    "source-sans-pro": "3.6.0",
-    "style-loader": "^0.23.1",
+    "style-loader": "^1.1.3",
     "svg-inline-loader": "^0.8.0",
-    "to-string-loader": "1.1.5",
+    "to-string-loader": "1.1.6",
-    "tslint": "^5.16.0",
+    "tslib": "^1.10.0",
-    "tslint-config-standard": "^8.0.1",
+    "typedoc": "^0.16.7",
-    "tslint-eslint-rules": "^5.4.0",
+    "typescript": "^3.7.5",
-    "typedoc": "^0.14.2",
+    "url-loader": "^3.0.0",
-    "typescript": "^3.4.5",
+    "val-loader": "2.1.0",
-    "url-loader": "^1.1.1",
+    "webpack": "^5.0.0-beta.12",
-    "val-loader": "1.1.1",
+    "webpack-cli": "^3.3.10",
-    "webpack": "^4.32.2",
-    "webpack-cli": "^3.3.2",
     "yaml-loader": "0.5.0"
   },
   "resolutions": {
-    "*/node-abi": "^2.8.0"
+    "*/node-abi": "^2.14.0"
-  },
-  "build": {
-    "appId": "org.terminus",
-    "productName": "Terminus",
-    "compression": "normal",
-    "files": [
-      "**/*",
-      "dist"
-    ],
-    "extraResources": [
-      "builtin-plugins",
-      "extras"
-    ],
-    "win": {
-      "icon": "./build/windows/icon.ico",
-      "artifactName": "terminus-${version}-setup.exe"
-    },
-    "nsis": {
-      "oneClick": false,
-      "artifactName": "terminus-${version}-setup.${ext}",
-      "installerIcon": "./build/windows/icon.ico"
-    },
-    "publish": [
-      {
-        "provider": "bintray",
-        "token": "d993c4faa708a4cba84fa3a8e822457e7298d75c"
-      },
-      {
-        "provider": "github"
-      }
-    ],
-    "portable": {
-      "artifactName": "terminus-${version}-portable.exe"
-    },
-    "mac": {
-      "category": "public.app-category.video",
-      "icon": "./build/mac/icon.icns",
-      "artifactName": "terminus-${version}-macos.${ext}",
-      "extendInfo": {
-        "NSRequiresAquaSystemAppearance": false
-      }
-    },
-    "dmg": {
-      "artifactName": "terminus-${version}-macos.dmg"
-    },
-    "linux": {
-      "category": "Utilities",
-      "icon": "./build/icons",
-      "artifactName": "terminus-${version}-linux.${ext}"
-    },
-    "deb": {
-      "depends": [
-        "screen",
-        "gconf2",
-        "gconf-service",
-        "libnotify4",
-        "libsecret-1-0",
-        "libappindicator1",
-        "libxtst6",
-        "libnss3",
-        "tmux"
-      ],
-      "afterInstall": "build/linux/after-install.tpl"
-    },
-    "rpm": {
-      "depends": [
-        "screen",
-        "gnome-python2-gnomekeyring"
-      ]
-    }
   },
   "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 */lib",
     "postinstall": "node ./scripts/install-deps.js"
   },
   "repository": "eugeny/terminus"

scripts/build-linux.js

@@ -2,13 +2,16 @@
 const builder = require('electron-builder').build
 const vars = require('./vars')
 
+const isTag = (process.env.GITHUB_REF || '').startsWith('refs/tags/')
+const isCI = !!process.env.GITHUB_REF
+
 builder({
-  dir: true,
+    dir: true,
-  linux: ['snap', 'deb', 'rpm', 'tar.gz'],
+    linux: ['deb', 'tar.gz', 'rpm'],
-  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,16 @@
 const builder = require('electron-builder').build
 const vars = require('./vars')
 
+const isTag = (process.env.GITHUB_REF || '').startsWith('refs/tags/')
+const isCI = !!process.env.GITHUB_REF
+
 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

@@ -3,19 +3,24 @@ const rebuild = require('electron-rebuild').default
 const path = require('path')
 const vars = require('./vars')
 
-lifecycles = []
+let lifecycles = []
 for (let dir of ['app', 'terminus-core', 'terminus-ssh', 'terminus-terminal']) {
-  lifecycles.push([rebuild({
+    const build = rebuild({
-    buildPath: path.resolve(__dirname, '../' + dir),
+        buildPath: path.resolve(__dirname, '../' + dir),
-    electronVersion: vars.electronVersion,
+        electronVersion: vars.electronVersion,
-    force: true,
+        force: true,
-  }).lifecycle, dir])
+    })
+    build.catch(e => {
+        console.error(e)
+        process.exit(1)
+    })
+    lifecycles.push([build.lifecycle, dir])
 }
 
 console.info('Building against Electron', vars.electronVersion)
 
 for (let [lc, dir] of lifecycles) {
-  lc.on('module-found', name => {
+    lc.on('module-found', name => {
-    console.info('Rebuilding', dir + '/' + name)
+        console.info('Rebuilding', dir + '/' + name)
-  })
+    })
 }

scripts/build-windows.js

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

scripts/install-deps.js

@@ -25,8 +25,5 @@ if (['darwin', 'linux'].includes(process.platform)) {
   for (let x of vars.builtinPlugins) {
     sh.ln('-fs', '../' + x, x)
   }
-  for (let x of vars.bundledModules) {
-    sh.ln('-fs', '../app/node_modules/' + x, x)
-  }
   sh.cd('..')
 }

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.99-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": "12.0.2",
-    "@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

@@ -1,52 +1,51 @@
 const path = require('path')
-const webpack = require('webpack')
 
 module.exports = {
-  target: 'node',
+    target: 'node',
-  entry: 'src/index.ts',
+    entry: 'src/index.ts',
-  devtool: 'eval-source-map',
+    context: __dirname,
-  context: __dirname,
+    devtool: 'eval-cheap-module-source-map',
-  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-/,
-  ],
+    ],
 }

terminus-community-color-schemes/yarn.lock

@@ -2,12 +2,3 @@
 # yarn lockfile v1
 
 
-"@types/node@12.0.2":
-  version "12.0.2"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.0.2.tgz#3452a24edf9fea138b48fad4a0a028a683da1e40"
-  integrity sha512-5tabW/i+9mhrfEOUcLDu2xBPsHJ+X5Orqy9FKpale3SjDA17j5AEpYq5vfy3oAeAHGcvANRCO3NV3d2D6q3NiA==
-
-"@types/webpack-env@^1.13.0":
-  version "1.13.9"
-  resolved "https://registry.yarnpkg.com/@types/webpack-env/-/webpack-env-1.13.9.tgz#a67287861c928ebf4159a908d1fb1a2a34d4097a"
-  integrity sha512-p8zp5xqkly3g4cCmo2mKOHI9+Z/kObmDj0BmjbDDJQlgDTiEGTbm17MEwTAusV6XceCy+bNw9q/ZHXHyKo3zkg==

terminus-core/README.md

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

terminus-core/package.json

@@ -1,51 +1,45 @@
 {
   "name": "terminus-core",
-  "version": "1.0.73-c4-ga7d62b0",
+  "version": "1.0.99-nightly.0",
   "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": "^12.0.2",
+    "@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": "^3.1.2",
+    "deepmerge": "^4.1.1",
     "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",
+    "ngx-perfect-scrollbar": "^8.0.0",
     "shell-escape": "^0.2.0",
-    "universal-analytics": "^0.4.17"
+    "uuid": "^3.3.2",
-  },
+    "winston": "^3.2.1"
-  "optionalDependencies": {
-    "windows-native-registry": "^1.0.14"
   },
   "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": "^3.2.0",
-    "js-yaml": "^3.9.0",
-    "winston": "^3.2.1"
   }
 }

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,10 @@
 export { BaseTabComponent, BaseTabProcess } from '../components/baseTab.component'
+export { TabHeaderComponent } from '../components/tabHeader.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'
 
@@ -18,3 +19,4 @@ export { HostAppService, Platform } from '../services/hostApp.service'
 export { ShellIntegrationService } from '../services/shellIntegration.service'
 export { ThemesService } from '../services/themes.service'
 export { TabsService } from '../services/tabs.service'
+export * from '../utils'

terminus-core/src/api/tabRecovery.ts

@@ -34,5 +34,5 @@ export abstract class TabRecoveryProvider {
      * @returns [[RecoveredTab]] descriptor containing tab type and component inputs
      *          or `null` if this token is from a different tab type or is not supported
      */
-    abstract async recover (recoveryToken: any): Promise<RecoveredTab | null>
+    abstract async recover (recoveryToken: any): Promise<RecoveredTab|null>
 }

terminus-core/src/api/toolbarButtonProvider.ts

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

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

@@ -6,9 +6,7 @@ title-bar(
 .content(
     [class.tabs-on-top]='config.store.appearance.tabsLocation == "top"'
 )
-    .tab-bar(
+    .tab-bar
-        *ngIf='!hostApp.isFullScreen',
-    )
         .inset.background(*ngIf='hostApp.platform == Platform.macOS && config.store.appearance.frame == "thin" && config.store.appearance.tabsLocation == "top"')
         .tabs(
             dnd-sortable-container,
@@ -33,53 +31,59 @@ title-bar(
 
         .btn-group.background
             .d-flex(
-                *ngFor='let button of leftToolbarButtons', 
+                *ngFor='let button of leftToolbarButtons',
                 ngbDropdown,
                 (openChange)='generateButtonSubmenu(button)',
             )
                 button.btn.btn-secondary.btn-tab-bar(
                     [title]='button.title',
                     (click)='button.click && button.click()',
-                    [innerHTML]='button.icon',
+                    [fastHtmlBind]='button.icon',
                     ngbDropdownToggle,
                 )
                 div(*ngIf='button.submenu', ngbDropdownMenu)
                     button.dropdown-item.d-flex.align-items-center(
-                        *ngFor='let item of button.submenuItems', 
+                        *ngFor='let item of button.submenuItems',
                         (click)='item.click()',
                         ngbDropdownItem,
-                    ) 
+                    )
-                        .icon-wrapper([innerHTML]='item.icon')
+                        .icon-wrapper(
-                        .ml-3 {{item.title}}
+                            *ngIf='hasIcons(button.submenuItems)',
+                            [fastHtmlBind]='item.icon'
+                        )
+                        div([class.ml-3]='hasIcons(button.submenuItems)') {{item.title}}
 
         .drag-space.background([class.persistent]='config.store.appearance.frame == "thin" && hostApp.platform != Platform.macOS')
 
         .btn-group.background
             .d-flex(
-                *ngFor='let button of rightToolbarButtons', 
+                *ngFor='let button of rightToolbarButtons',
                 ngbDropdown,
                 (openChange)='generateButtonSubmenu(button)',
             )
                 button.btn.btn-secondary.btn-tab-bar(
                     [title]='button.title',
                     (click)='button.click && button.click()',
-                    [innerHTML]='button.icon',
+                    [fastHtmlBind]='button.icon',
                     ngbDropdownToggle,
                 )
                 div(*ngIf='button.submenu', ngbDropdownMenu)
                     button.dropdown-item.d-flex.align-items-center(
-                        *ngFor='let item of button.submenuItems', 
+                        *ngFor='let item of button.submenuItems',
                         (click)='item.click()',
                         ngbDropdownItem,
-                    ) 
+                    )
-                        .icon-wrapper([innerHTML]='item.icon')
+                        .icon-wrapper(
-                        .ml-3 {{item.title}}
+                            *ngIf='hasIcons(button.submenuItems)',
+                            [fastHtmlBind]='item.icon'
+                        )
+                        div([class.ml-3]='hasIcons(button.submenuItems)') {{item.title}}
 
             button.btn.btn-secondary.btn-tab-bar.btn-update(
                 *ngIf='updatesAvailable',
-                title='Update available',
+                title='Update available - Click to install',
                 (click)='updateApp()',
-                [innerHTML]='updateIcon'
+                [fastHtmlBind]='updateIcon'
             )
 
         window-controls.background(

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

@@ -18,6 +18,7 @@ $tab-border-radius: 4px;
 
 
 .content {
+    height: 100%;
     flex: auto;
     display: flex;
     flex-direction: column-reverse;
@@ -48,6 +49,10 @@ $tab-border-radius: 4px;
         color: #aaa;
         border: none;
         border-radius: 0;
+
+        &.dropdown-toggle::after {
+            display: none;
+        }
     }
 
     &>.tabs {
@@ -59,6 +64,7 @@ $tab-border-radius: 4px;
     &>.drag-space {
         min-width: 1px;
         flex: 1 0 1%;
+        margin-top: 2px; // for window resizing
         -webkit-app-region: drag;
 
         &.persistent {

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

@@ -1,6 +1,5 @@
 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 { NgbModal } from '@ng-bootstrap/ng-bootstrap'
 
 import { ElectronService } from '../services/electron.service'
@@ -15,7 +14,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 +25,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,
@@ -78,7 +77,6 @@ export class AppRootComponent {
         @Inject(ToolbarButtonProvider) private toolbarButtonProviders: ToolbarButtonProvider[],
         log: LogService,
         ngbModal: NgbModal,
-        domSanitizer: DomSanitizer,
         _themes: ThemesService,
     ) {
         this.logger = log.create('main')
@@ -87,11 +85,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])
                 }
@@ -109,6 +107,12 @@ export class AppRootComponent {
                 if (hotkey === 'previous-tab') {
                     this.app.previousTab()
                 }
+                if (hotkey === 'move-tab-left') {
+                    this.app.moveSelectedTabLeft()
+                }
+                if (hotkey === 'move-tab-right') {
+                    this.app.moveSelectedTabRight()
+                }
             }
             if (hotkey === 'toggle-fullscreen') {
                 this.hostApp.toggleFullscreen()
@@ -128,8 +132,9 @@ export class AppRootComponent {
         })
 
         this.hostApp.windowCloseRequest$.subscribe(async () => {
-            await this.app.closeAllTabs()
+            if (await this.app.closeAllTabs()) {
-            this.hostApp.closeWindow()
+                this.hostApp.closeWindow()
+            }
         })
 
         if (window['safeModeReason']) {
@@ -145,7 +150,7 @@ export class AppRootComponent {
         config.changed$.subscribe(() => this.updateVibrancy())
         this.updateVibrancy()
 
-        let lastProgress = null
+        let lastProgress: number|null = null
         this.app.tabOpened$.subscribe(tab => {
             this.unsortedTabs.push(tab)
             tab.progress$.subscribe(progress => {
@@ -185,6 +190,7 @@ export class AppRootComponent {
             if (this.config.store.appearance.dock === 'off') {
                 // not docked, visible
                 setTimeout(() => {
+                    this.hostApp.getWindow().show()
                     this.hostApp.getWindow().focus()
                 })
             } else {
@@ -218,8 +224,18 @@ export class AppRootComponent {
         return false
     }
 
-    updateApp () {
+    async updateApp () {
-        this.updater.update()
+        if ((await this.electron.showMessageBox(
+            this.hostApp.getWindow(),
+            {
+                type: 'warning',
+                message: 'Installing the update will close all tabs and restart Terminus.',
+                buttons: ['Cancel', 'Update'],
+                defaultId: 1,
+            }
+        )).response === 1) {
+            this.updater.update()
+        }
     }
 
     onTabDragStart () {
@@ -233,20 +249,24 @@ export class AppRootComponent {
         })
     }
 
-    async generateButtonSubmenu (button: IToolbarButton) {
+    async generateButtonSubmenu (button: ToolbarButton) {
         if (button.submenu) {
             button.submenuItems = await button.submenu()
         }
     }
 
-    private getToolbarButtons (aboveZero: boolean): IToolbarButton[] {
+    hasIcons (submenuItems: ToolbarButton[]): boolean {
-        let buttons: IToolbarButton[] = []
+        return submenuItems.some(x => !!x.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) > 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

@@ -36,9 +36,9 @@ export abstract class BaseTabComponent {
     /**
      * CSS color override for the tab's header
      */
-    color: string = null
+    color: string|null = null
 
-    protected hasFocus = false
+    hasFocus = false
 
     /**
      * Ping this if your recovery state has been changed and you want
@@ -50,14 +50,14 @@ export abstract class BaseTabComponent {
     private titleChange = new Subject<string>()
     private focused = new Subject<void>()
     private blurred = new Subject<void>()
-    private progress = new Subject<number>()
+    private progress = new Subject<number|null>()
     private activity = new Subject<boolean>()
     private destroyed = new Subject<void>()
 
     get focused$ (): Observable<void> { return this.focused }
     get blurred$ (): Observable<void> { return this.blurred }
     get titleChange$ (): Observable<string> { return this.titleChange }
-    get progress$ (): Observable<number> { return this.progress }
+    get progress$ (): Observable<number|null> { return this.progress }
     get activity$ (): Observable<boolean> { return this.activity }
     get destroyed$ (): Observable<void> { return this.destroyed }
     get recoveryStateChangedHint$ (): Observable<void> { return this.recoveryStateChangedHint }
@@ -83,7 +83,7 @@ export abstract class BaseTabComponent {
      *
      * @param  {type} progress: value between 0 and 1, or `null` to remove
      */
-    setProgress (progress: number) {
+    setProgress (progress: number|null) {
         this.progress.next(progress)
         if (progress) {
             if (this.progressClearTimeout) {
@@ -91,7 +91,7 @@ export abstract class BaseTabComponent {
             }
             this.progressClearTimeout = setTimeout(() => {
                 this.setProgress(null)
-            }, 5000)
+            }, 5000) as any
         }
     }
 
@@ -125,7 +125,7 @@ export abstract class BaseTabComponent {
     /**
      * Override this to enable task completion notifications for the tab
      */
-    async getCurrentProcess (): Promise<BaseTabProcess> {
+    async getCurrentProcess (): Promise<BaseTabProcess|null> {
         return null
     }
 
@@ -147,13 +147,15 @@ export abstract class BaseTabComponent {
     /**
      * Called before the tab is closed
      */
-    destroy (): void {
+    destroy (skipDestroyedEvent = false): void {
         this.focused.complete()
         this.blurred.complete()
         this.titleChange.complete()
         this.progress.complete()
         this.recoveryStateChangedHint.complete()
-        this.destroyed.next()
+        if (!skipDestroyedEvent) {
+            this.destroyed.next()
+        }
         this.destroyed.complete()
     }
 }

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

@@ -1,4 +0,0 @@
-.icon(tabindex='0', [class.active]='model', (keyup.space)='click()')
-    i.fas.fa-square.off
-    i.fas.fa-check-square.on
-.text {{text}}

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

@@ -1,55 +0,0 @@
-:host {
-    cursor: pointer;
-    margin: 5px 0;
-
-    &:focus {
-        background: rgba(255,255,255,.05);
-        border-radius: 5px;
-    }
-
-    &:active {
-        background: rgba(255,255,255,.1);
-        border-radius: 3px;
-    }
-
-    &[disabled] {
-        opacity: 0.5;
-    }
-
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-
-    .off {
-        color: rgba(0, 0, 0, .5);
-    }
-
-    .icon {
-        position: relative;
-        flex: none;
-        width: 14px;
-        height: 14px;
-
-        i {
-            position: absolute;
-            left: 0;
-            top: -2px;
-            transition: 0.25s opacity;
-            display: block;
-            font-size: 18px;
-        }
-
-        i.on, &.active i.off {
-            opacity: 0;
-        }
-
-        i.off, &.active i.on {
-            opacity: 1;
-        }
-    }
-
-    .text {
-        flex: auto;
-        margin-left: 8px;
-    }
-}

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

@@ -4,11 +4,15 @@ import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'
 /** @hidden */
 @Component({
     selector: 'checkbox',
-    template: require('./checkbox.component.pug'),
+    template: `
-    styles: [require('./checkbox.component.scss')],
+        <div class="custom-control custom-checkbox">
+            <input type="checkbox" class="custom-control-input" [(ngModel)]='model'>
+            <label class="custom-control-label">{{text}}</label>
+        </div>
+    `,
     providers: [
         { provide: NG_VALUE_ACCESSOR, useExisting: CheckboxComponent, multi: true },
-    ]
+    ],
 })
 export class CheckboxComponent implements ControlValueAccessor {
     @HostBinding('class.active') @Input() model: boolean
@@ -23,7 +27,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.scss

@@ -3,3 +3,24 @@
     position: relative;
     flex: auto;
 }
+
+::ng-deep split-tab > .child {
+    position: absolute;
+    transition: 0.125s all;
+    opacity: .75;
+
+    &.focused {
+        opacity: 1;
+    }
+
+    &.minimized {
+        opacity: .1;
+    }
+
+    &.maximized {
+        z-index: 2;
+        box-shadow: rgba(0, 0, 0, 0.25) 0px 0px 30px;
+        backdrop-filter: blur(10px);
+        border-radius: 10px;
+    }
+}

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
@@ -33,9 +33,9 @@ export class SplitContainer {
     /**
      * @return Flat list of all tabs inside this container
      */
-    getAllTabs () {
+    getAllTabs (): BaseTabComponent[] {
-        let r = []
+        let r: BaseTabComponent[] = []
-        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: any[] = []
-        for (let child of this.children) {
+        for (const child of this.children) {
             if (child instanceof SplitContainer) {
                 children.push(await child.serialize())
             } else {
@@ -141,6 +141,8 @@ export interface SplitSpannerInfo {
     styles: [require('./splitTab.component.scss')],
 })
 export class SplitTabComponent extends BaseTabComponent implements OnInit, OnDestroy {
+    static DIRECTIONS: SplitDirection[] = ['t', 'r', 'b', 'l']
+
     /** @hidden */
     @ViewChild('vc', { read: ViewContainerRef }) viewContainer: ViewContainerRef
 
@@ -156,6 +158,7 @@ export class SplitTabComponent extends BaseTabComponent implements OnInit, OnDes
     _spanners: SplitSpannerInfo[] = []
 
     private focusedTab: BaseTabComponent
+    private maximizedTab: BaseTabComponent|null = null
     private hotkeysSubscription: Subscription
     private viewRefs: Map<BaseTabComponent, EmbeddedViewRef<any>> = new Map()
 
@@ -189,7 +192,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 +205,40 @@ 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 'pane-maximize':
-                this.removeTab(this.focusedTab)
+                    if (this.maximizedTab) {
-                break
+                        this.maximize(null)
+                    } else if (this.getAllTabs().length > 1) {
+                        this.maximize(this.focusedTab)
+                    }
+                    break
+                case 'close-pane':
+                    this.removeTab(this.focusedTab)
+                    break
             }
         })
     }
@@ -235,8 +249,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)
+                }
             })
         }
     }
@@ -255,9 +271,13 @@ export class SplitTabComponent extends BaseTabComponent implements OnInit, OnDes
         return this.focusedTab
     }
 
+    getMaximizedTab (): BaseTabComponent|null {
+        return this.maximizedTab
+    }
+
     focus (tab: BaseTabComponent) {
         this.focusedTab = tab
-        for (let x of this.getAllTabs()) {
+        for (const x of this.getAllTabs()) {
             if (x !== tab) {
                 x.emitBlurred()
             }
@@ -266,6 +286,15 @@ export class SplitTabComponent extends BaseTabComponent implements OnInit, OnDes
             tab.emitFocused()
             this.focusChanged.next(tab)
         }
+
+        if (this.maximizedTab !== tab) {
+            this.maximizedTab = null
+        }
+        this.layout()
+    }
+
+    maximize (tab: BaseTabComponent|null) {
+        this.maximizedTab = tab
         this.layout()
     }
 
@@ -286,17 +315,17 @@ export class SplitTabComponent extends BaseTabComponent implements OnInit, OnDes
     /**
      * Inserts a new `tab` to the `side` of the `relative` tab
      */
-    addTab (tab: BaseTabComponent, relative: BaseTabComponent, side: SplitDirection) {
+    addTab (tab: BaseTabComponent, relative: BaseTabComponent|null, side: SplitDirection) {
-        let target = this.getParentOf(relative) || this.root
+        let target = (relative ? this.getParentOf(relative) : null) || this.root
-        let insertIndex = target.children.indexOf(relative)
+        let insertIndex = relative ? target.children.indexOf(relative) : -1
 
         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.children = relative ? [relative] : []
             newContainer.ratios = [1]
             target.children[insertIndex] = newContainer
             target = newContainer
@@ -306,7 +335,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 +355,11 @@ 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)
+        if (!parent) {
+            return
+        }
+        const index = parent.children.indexOf(tab)
         parent.ratios.splice(index, 1)
         parent.children.splice(index, 1)
 
@@ -350,18 +382,25 @@ 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'
+        if (!parent) {
+            return
+        }
+
+        const orientation = ['l', 'r'].includes(dir) ? 'h' : 'v'
 
         while (parent !== this.root && parent.orientation !== orientation) {
             rel = parent
             parent = this.getParentOf(rel)
+            if (!parent) {
+                return
+            }
         }
 
         if (parent.orientation !== orientation) {
             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,18 +413,20 @@ 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)
+        if (newTab) {
+            this.addTab(newTab, tab, dir)
+        }
     }
 
     /**
      * @returns the immediate parent of `tab`
      */
-    getParentOf (tab: BaseTabComponent | SplitContainer, root?: SplitContainer): SplitContainer {
+    getParentOf (tab: BaseTabComponent | SplitContainer, root?: SplitContainer): SplitContainer|null {
         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
                 }
@@ -408,8 +449,8 @@ export class SplitTabComponent extends BaseTabComponent implements OnInit, OnDes
     }
 
     /** @hidden */
-    async getCurrentProcess (): Promise<BaseTabProcess> {
+    async getCurrentProcess (): Promise<BaseTabProcess|null> {
-        return (await Promise.all(this.getAllTabs().map(x => x.getCurrentProcess()))).find(x => !!x)
+        return (await Promise.all(this.getAllTabs().map(x => x.getCurrentProcess()))).find(x => !!x) || null
     }
 
     /** @hidden */
@@ -418,8 +459,15 @@ export class SplitTabComponent extends BaseTabComponent implements OnInit, OnDes
         this.splitAdjusted.next(spanner)
     }
 
+    destroy () {
+        super.destroy()
+        for (const x of this.getAllTabs()) {
+            x.destroy()
+        }
+    }
+
     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,9 +484,11 @@ 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)
+        if (ref) {
-        this.viewContainer.remove(this.viewContainer.indexOf(ref))
+            this.viewRefs.delete(tab)
+            this.viewContainer.remove(this.viewContainer.indexOf(ref))
+        }
     }
 
     private layout () {
@@ -448,8 +498,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 +508,29 @@ 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.classList.toggle('child', true)
+                element.classList.toggle('maximized', child === this.maximizedTab)
+                element.classList.toggle('minimized', this.maximizedTab && child !== this.maximizedTab)
+                element.classList.toggle('focused', child === this.focusedTab)
                 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
+                if (child === this.maximizedTab) {
+                    element.style.left = '5%'
+                    element.style.top = '5%'
+                    element.style.width = '90%'
+                    element.style.height = '90%'
+                }
             }
             offset += sizes[i]
 
@@ -486,19 +544,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 {
@@ -506,13 +564,17 @@ export class SplitTabComponent extends BaseTabComponent implements OnInit, OnDes
                 }
             }
         }
+        while (root.ratios.length < root.children.length) {
+            root.ratios.push(1)
+        }
+        root.normalize()
     }
 }
 
 /** @hidden */
 @Injectable()
 export class SplitTabRecoveryProvider extends TabRecoveryProvider {
-    async recover (recoveryToken: any): Promise<RecoveredTab> {
+    async recover (recoveryToken: any): Promise<RecoveredTab|null> {
         if (recoveryToken && recoveryToken.type === 'app:split-tab') {
             return {
                 type: SplitTabComponent,

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

@@ -16,22 +16,26 @@ export class SplitTabSpannerComponent {
     @HostBinding('class.v') isVertical = true
     @HostBinding('style.left') cssLeft: string
     @HostBinding('style.top') cssTop: string
-    @HostBinding('style.width') cssWidth: string
+    @HostBinding('style.width') cssWidth: string | null
-    @HostBinding('style.height') cssHeight: string
+    @HostBinding('style.height') cssHeight: string | null
     private marginOffset = -5
 
     constructor (private element: ElementRef) { }
 
     ngAfterViewInit () {
-        this.element.nativeElement.addEventListener('mousedown', e => {
+        this.element.nativeElement.addEventListener('dblclick', () => {
-            this.isActive = true
+            this.reset()
-            let start = this.isVertical ? e.pageY : e.pageX
+        })
-            let current = start
-            let oldPosition = this.isVertical ? this.element.nativeElement.offsetTop : this.element.nativeElement.offsetLeft
 
-            const dragHandler = e => {
+        this.element.nativeElement.addEventListener('mousedown', (e: MouseEvent) => {
+            this.isActive = true
+            const start = this.isVertical ? e.pageY : e.pageX
+            let current = start
+            const oldPosition: number = this.isVertical ? this.element.nativeElement.offsetTop : this.element.nativeElement.offsetLeft
+
+            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 {
@@ -49,14 +53,16 @@ export class SplitTabSpannerComponent {
                 diff = Math.max(diff, -this.container.ratios[this.index - 1] + 0.1)
                 diff = Math.min(diff, this.container.ratios[this.index] - 0.1)
 
-                this.container.ratios[this.index - 1] += diff
+                if (diff) {
-                this.container.ratios[this.index] -= diff
+                    this.container.ratios[this.index - 1] += diff
-                this.change.emit()
+                    this.container.ratios[this.index] -= diff
+                    this.change.emit()
+                }
             }
 
-            document.addEventListener('mouseup', offHandler)
+            document.addEventListener('mouseup', offHandler, { passive: true })
             this.element.nativeElement.parentElement.addEventListener('mousemove', dragHandler)
-        })
+        }, { passive: true })
     }
 
     ngOnChanges () {
@@ -67,18 +73,25 @@ export class SplitTabSpannerComponent {
                 this.container.x,
                 this.container.y + this.container.h * this.container.getOffsetRatio(this.index),
                 this.container.w,
-                null
+                0
             )
         } else {
             this.setDimensions(
                 this.container.x + this.container.w * this.container.getOffsetRatio(this.index),
                 this.container.y,
-                null,
+                0,
                 this.container.h
             )
         }
     }
 
+    reset () {
+        const ratio = (this.container.ratios[this.index - 1] + this.container.ratios[this.index]) / 2
+        this.container.ratios[this.index - 1] = ratio
+        this.container.ratios[this.index] = ratio
+        this.change.emit()
+    }
+
     private setDimensions (x: number, y: number, w: number, h: number) {
         this.cssLeft = `${x}%`
         this.cssTop = `${y}%`

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,16 +15,21 @@ export class StartPageComponent {
 
     constructor (
         private config: ConfigService,
+        private domSanitizer: DomSanitizer,
         public homeBase: HomeBaseService,
         @Inject(ToolbarButtonProvider) private toolbarButtonProviders: ToolbarButtonProvider[],
     ) {
     }
 
-    getButtons (): IToolbarButton[] {
+    getButtons (): ToolbarButton[] {
         return this.config.enabledServices(this.toolbarButtonProviders)
             .map(provider => provider.provide())
             .reduce((a, b) => a.concat(b))
             .filter(x => !!x.click)
-            .sort((a: IToolbarButton, b: IToolbarButton) => (a.weight || 0) - (b.weight || 0))
+            .sort((a: ToolbarButton, b: ToolbarButton) => (a.weight || 0) - (b.weight || 0))
+    }
+
+    sanitizeIcon (icon: string): any {
+        return this.domSanitizer.bypassSecurityTrustHtml(icon || '')
     }
 }

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

@@ -20,7 +20,7 @@ $tabs-height: 38px;
         cursor: -webkit-grab;
 
         margin-left: 10px;
-        width: 20px;
+        width: 22px;
         border-radius: 10px;
         text-align: center;
         transition: 0.25s all;
@@ -48,7 +48,7 @@ $tabs-height: 38px;
         width: $button-size;
         height: $button-size;
         border-radius: $button-size / 2;
-        line-height: $button-size * 0.9;
+        line-height: $button-size;
         align-self: center;
         margin-right: 10px;
 

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 SortableComponentProxy {
+    setDragHandle (_: HTMLElement)
+}
+
 /** @hidden */
 @Component({
     selector: 'tab-header',
@@ -20,16 +25,16 @@ export class TabHeaderComponent {
     @Input() @HostBinding('class.active') active: boolean
     @Input() @HostBinding('class.has-activity') hasActivity: boolean
     @Input() tab: BaseTabComponent
-    @Input() progress: number
+    @Input() progress: number|null
     @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: SortableComponentProxy,
         @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)
         }
@@ -73,19 +78,27 @@ export class TabHeaderComponent {
         this.showRenameTabModal()
     }
 
-    @HostListener('auxclick', ['$event']) async onAuxClick ($event: MouseEvent) {
+    @HostListener('mousedown', ['$event']) async onMouseDown ($event: MouseEvent) {
+        if ($event.which === 2) {
+            $event.preventDefault()
+        }
+    }
+
+    @HostListener('mouseup', ['$event']) async onMouseUp ($event: MouseEvent) {
         if ($event.which === 2) {
             this.app.closeTab(this.tab, true)
         }
+    }
+
+    @HostListener('auxclick', ['$event']) async onAuxClick ($event: MouseEvent) {
         if ($event.which === 3) {
-            event.preventDefault()
+            $event.preventDefault()
 
             const contextMenu = this.electron.remote.Menu.buildFromTemplate(await this.buildContextMenu())
 
             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.scss

@@ -16,55 +16,8 @@
     padding-left: 10px;
     margin-left: -10px;
 
-    &:focus {
-        background: rgba(255,255,255,.05);
-        border-radius: 5px;
-    }
-
     &[disabled] {
         opacity: 0.5;
     }
 
-    .body {
-        $border-width: 2px;
-        border-radius: 5px;
-        border: $border-width solid rgba(255, 255, 255, .2);
-        padding: $padding;
-        height: $toggle-size + $border-width * 2 + $padding * 2;
-        width: $toggle-size * 2 + $border-width * 2 + $padding * 2;
-
-        position: relative;
-
-        .toggle {
-            position: absolute;
-            border-radius: 2px;
-            width: $toggle-size;
-            height: $toggle-size;
-            background: #475158;
-            top: $padding;
-            left: $padding;
-            transition: 0.25s left;
-            line-height: 19px;
-            text-align: center;
-            font-size: 10px;
-
-            i {
-                opacity: 0;
-                transition: 0.25s opacity;
-            }
-        }
-    }
-
-    &.active .body .toggle {
-        left: $toggle-size + $padding;
-
-        i {
-            color: white;
-            opacity: 1;
-        }
-    }
-
-    &:active {
-        background: rgba(255,255,255,.1);
-    }
 }

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

@@ -6,18 +6,15 @@ import { CheckboxComponent } from './checkbox.component'
 @Component({
     selector: 'toggle',
     template: `
-      <div class="switch">
+    <div class="custom-control custom-switch">
-        <div class="body">
+      <input type="checkbox" class="custom-control-input" [(ngModel)]='model'>
-          <div class="toggle" [class.bg-primary]='model'>
+      <label class="custom-control-label"></label>
-            <i class="fa fa-check"></i>
+    </div>
-          </div>
-        </div>
-      </div>
     `,
     styles: [require('./toggle.component.scss')],
     providers: [
         { provide: NG_VALUE_ACCESSOR, useExisting: ToggleComponent, multi: true },
-    ]
+    ],
 })
 export class ToggleComponent extends CheckboxComponent {
 }

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

@@ -12,7 +12,8 @@ export class WindowControlsComponent {
     constructor (public hostApp: HostAppService, public app: AppService) { }
 
     async closeWindow () {
-        await this.app.closeAllTabs()
+        if (await this.app.closeAllTabs()) {
-        this.hostApp.closeWindow()
+            this.hostApp.closeWindow()
+        }
     }
 }

terminus-core/src/configDefaults.linux.yaml

@@ -11,11 +11,15 @@ 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'
+  move-tab-left:
+    - 'Ctrl-Shift-PageUp'
+  move-tab-right:
+    - 'Ctrl-Shift-PageDown'
   tab-1:
     - 'Alt-1'
   tab-2:
@@ -43,12 +47,14 @@ 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'
+  pane-maximize:
+    - 'Ctrl-Alt-Enter'
   close-pane: []
 pluginBlacklist: ['ssh']

terminus-core/src/configDefaults.macos.yaml

@@ -14,6 +14,10 @@ hotkeys:
     - 'Ctrl-Tab'
   previous-tab:
     - 'Ctrl-Shift-Tab'
+  move-tab-left:
+    - '⌘-Shift-Left'
+  move-tab-right:
+    - '⌘-Shift-Right'
   tab-1:
     - '⌘-1'
   tab-2:
@@ -41,13 +45,15 @@ 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'
+  pane-maximize:
+    - '⌘-⌥-Enter'
   close-pane:
     - '⌘-Shift-W'
 pluginBlacklist: ['ssh']

terminus-core/src/configDefaults.windows.yaml

@@ -5,17 +5,22 @@ hotkeys:
     - 'Ctrl+Space'
   toggle-fullscreen:
     - 'F11'
+    - 'Alt-Enter'
   close-tab:
     - 'Ctrl-Shift-W'
   toggle-last-tab: []
   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'
+  move-tab-left:
+    - 'Ctrl-Shift-PageUp'
+  move-tab-right:
+    - 'Ctrl-Shift-PageDown'
   tab-1:
     - 'Alt-1'
   tab-2:
@@ -43,12 +48,14 @@ 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'
+  pane-maximize:
+    - 'Ctrl-Alt-Enter'
   close-pane: []
 pluginBlacklist: []

terminus-core/src/configDefaults.yaml

@@ -1,14 +1,17 @@
 appearance:
   dock: off
   dockScreen: current
-  dockFill: 50
+  dockFill: 0.5
   tabsLocation: top
   cycleTabs: true
   theme: Standard
   frame: thin
   css: '/* * { color: blue !important; } */'
   opacity: 1.0
-  vibrancy: false
+  vibrancy: true
   vibrancyType: 'blur'
 enableAnalytics: true
 enableWelcomeTab: true
+electronFlags:
+  - ['force_discrete_gpu', '0']
+enableAutomaticUpdates: true

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/directives/fastHtmlBind.directive.ts

@@ -0,0 +1,14 @@
+import { Directive, Input, ElementRef, OnChanges } from '@angular/core'
+
+/** @hidden */
+@Directive({
+    selector: '[fastHtmlBind]',
+})
+export class FastHtmlBindDirective implements OnChanges {
+    @Input() fastHtmlBind: string
+    constructor (private el: ElementRef) { }
+
+    ngOnChanges () {
+        this.el.nativeElement.innerHTML = this.fastHtmlBind || ''
+    }
+}

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',
@@ -37,6 +37,14 @@ export class AppHotkeyProvider extends HotkeyProvider {
             id: 'previous-tab',
             name: 'Previous tab',
         },
+        {
+            id: 'move-tab-left',
+            name: 'Move tab to the left',
+        },
+        {
+            id: 'move-tab-right',
+            name: 'Move tab to the right',
+        },
         {
             id: 'tab-1',
             name: 'Tab 1',
@@ -93,6 +101,10 @@ export class AppHotkeyProvider extends HotkeyProvider {
             id: 'split-top',
             name: 'Split to the top',
         },
+        {
+            id: 'pane-maximize',
+            name: 'Maximize the active pane',
+        },
         {
             id: 'pane-nav-up',
             name: 'Focus the pane above',
@@ -115,7 +127,7 @@ export class AppHotkeyProvider extends HotkeyProvider {
         },
     ]
 
-    async provide (): Promise<IHotkeyDescription[]> {
+    async provide (): Promise<HotkeyDescription[]> {
         return this.hotkeys
     }
 }

terminus-core/src/index.ts

@@ -21,6 +21,7 @@ import { SplitTabSpannerComponent } from './components/splitTabSpanner.component
 import { WelcomeTabComponent } from './components/welcomeTab.component'
 
 import { AutofocusDirective } from './directives/autofocus.directive'
+import { FastHtmlBindDirective } from './directives/fastHtmlBind.directive'
 
 import { HotkeyProvider } from './api/hotkeyProvider'
 import { ConfigProvider } from './api/configProvider'
@@ -39,6 +40,12 @@ import { TaskCompletionContextMenu, CommonOptionsContextMenu, CloseContextMenu }
 import 'perfect-scrollbar/css/perfect-scrollbar.css'
 import 'ng2-dnd/bundles/style.css'
 
+// PerfectScrollbar fix
+import { fromEvent } from 'rxjs/internal/observable/fromEvent'
+import { merge } from 'rxjs/internal/observable/merge'
+require('rxjs').fromEvent = fromEvent
+require('rxjs').merge = merge
+
 const PROVIDERS = [
     { provide: HotkeyProvider, useClass: AppHotkeyProvider, multi: true },
     { provide: Theme, useClass: StandardTheme, multi: true },
@@ -49,7 +56,7 @@ const PROVIDERS = [
     { provide: TabContextMenuItemProvider, useClass: CloseContextMenu, multi: true },
     { provide: TabContextMenuItemProvider, useClass: TaskCompletionContextMenu, multi: true },
     { provide: TabRecoveryProvider, useClass: SplitTabRecoveryProvider, multi: true },
-    { provide: PERFECT_SCROLLBAR_CONFIG, useValue: { suppressScrollX: true } }
+    { provide: PERFECT_SCROLLBAR_CONFIG, useValue: { suppressScrollX: true } },
 ]
 
 /** @hidden */
@@ -63,7 +70,7 @@ const PROVIDERS = [
         DndModule.forRoot(),
     ],
     declarations: [
-        AppRootComponent,
+        AppRootComponent as any,
         CheckboxComponent,
         StartPageComponent,
         TabBodyComponent,
@@ -74,6 +81,7 @@ const PROVIDERS = [
         RenameTabModalComponent,
         SafeModeModalComponent,
         AutofocusDirective,
+        FastHtmlBindDirective,
         SplitTabComponent,
         SplitTabSpannerComponent,
         WelcomeTabComponent,
@@ -88,9 +96,9 @@ const PROVIDERS = [
         CheckboxComponent,
         ToggleComponent,
         AutofocusDirective,
-    ]
+    ],
 })
-export default class AppModule {
+export default class AppModule { // eslint-disable-line @typescript-eslint/no-extraneous-class
     constructor (app: AppService, config: ConfigService) {
         app.ready$.subscribe(() => {
             if (config.store.enableWelcomeTab) {
@@ -107,11 +115,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

@@ -1,8 +1,11 @@
+
 import { Observable, Subject, AsyncSubject } from 'rxjs'
 import { takeUntil } from 'rxjs/operators'
 import { Injectable } from '@angular/core'
+
 import { BaseTabComponent } from '../components/baseTab.component'
 import { SplitTabComponent } from '../components/splitTab.component'
+
 import { ConfigService } from './config.service'
 import { HostAppService } from './hostApp.service'
 import { TabRecoveryService } from './tabRecovery.service'
@@ -16,20 +19,20 @@ 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.done.next()
             this.stop()
         }
     }
 
     stop () {
         clearInterval(this.interval)
-        this.destroyed.next(null)
+        this.destroyed.next()
         this.destroyed.complete()
         this.done.complete()
     }
@@ -67,29 +70,50 @@ export class AppService {
         private tabRecovery: TabRecoveryService,
         private tabsService: TabsService,
     ) {
-        this.tabRecovery.recoverTabs().then(tabs => {
+        if (hostApp.getWindow().id === 1) {
-            for (let tab of tabs) {
+            if (config.store.terminal.recoverTabs) {
-                this.openNewTabRaw(tab.type, tab.options)
+                this.tabRecovery.recoverTabs().then(tabs => {
+                    for (const tab of tabs) {
+                        this.openNewTabRaw(tab.type, tab.options)
+                    }
+                    this.startTabStorage()
+                })
+            } else {
+                /** Continue to store the tabs even if the setting is currently off */
+                this.startTabStorage()
             }
+        }
 
-            this.tabsChanged$.subscribe(() => {
+        hostApp.windowFocused$.subscribe(() => {
-                tabRecovery.saveTabs(this.tabs)
+            this._activeTab?.emitFocused()
-            })
-            setInterval(() => {
-                tabRecovery.saveTabs(this.tabs)
-            }, 30000)
         })
     }
 
-    private addTabRaw (tab: BaseTabComponent) {
+    startTabStorage () {
-        this.tabs.push(tab)
+        this.tabsChanged$.subscribe(() => {
+            this.tabRecovery.saveTabs(this.tabs)
+        })
+        setInterval(() => {
+            this.tabRecovery.saveTabs(this.tabs)
+        }, 30000)
+    }
+
+    addTabRaw (tab: BaseTabComponent, index: number|null = null) {
+        if (index !== null) {
+            this.tabs.splice(index, 0, tab)
+        } else {
+            this.tabs.push(tab)
+        }
+
         this.selectTab(tab)
         this.tabsChanged.next()
         this.tabOpened.next(tab)
 
-        tab.recoveryStateChangedHint$.subscribe(() => {
+        if (this.hostApp.getWindow().id === 1) {
-            this.tabRecovery.saveTabs(this.tabs)
+            tab.recoveryStateChangedHint$.subscribe(() => {
-        })
+                this.tabRecovery.saveTabs(this.tabs)
+            })
+        }
 
         tab.titleChange$.subscribe(title => {
             if (tab === this._activeTab) {
@@ -98,7 +122,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])
@@ -106,6 +130,11 @@ export class AppService {
             this.tabsChanged.next()
             this.tabClosed.next(tab)
         })
+
+        if (tab instanceof SplitTabComponent) {
+            tab.tabAdded$.subscribe(() => this.emitTabsChanged())
+            tab.tabRemoved$.subscribe(() => this.emitTabsChanged())
+        }
     }
 
     /**
@@ -113,7 +142,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 +152,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
@@ -138,7 +167,7 @@ export class AppService {
         if (this.tabs.includes(this._activeTab)) {
             this.lastTabIndex = this.tabs.indexOf(this._activeTab)
         } else {
-            this.lastTabIndex = null
+            this.lastTabIndex = 0
         }
         if (this._activeTab) {
             this._activeTab.clearActivity()
@@ -154,6 +183,17 @@ export class AppService {
         }
     }
 
+    getParentTab (tab: BaseTabComponent): SplitTabComponent|null {
+        for (const topLevelTab of this.tabs) {
+            if (topLevelTab instanceof SplitTabComponent) {
+                if (topLevelTab.getAllTabs().includes(tab)) {
+                    return topLevelTab
+                }
+            }
+        }
+        return null
+    }
+
     /** Switches between the current tab and the previously active one */
     toggleLastTab () {
         if (!this.lastTabIndex || this.lastTabIndex >= this.tabs.length) {
@@ -164,7 +204,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 +215,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) {
@@ -184,6 +224,35 @@ export class AppService {
         }
     }
 
+    moveSelectedTabLeft () {
+        if (this.tabs.length > 1) {
+            const tabIndex = this.tabs.indexOf(this._activeTab)
+            if (tabIndex > 0) {
+                this.swapTabs(this._activeTab, this.tabs[tabIndex - 1])
+            } else if (this.config.store.appearance.cycleTabs) {
+                this.swapTabs(this._activeTab, this.tabs[this.tabs.length - 1])
+            }
+        }
+    }
+
+    moveSelectedTabRight () {
+        if (this.tabs.length > 1) {
+            const tabIndex = this.tabs.indexOf(this._activeTab)
+            if (tabIndex < this.tabs.length - 1) {
+                this.swapTabs(this._activeTab, this.tabs[tabIndex + 1])
+            } else if (this.config.store.appearance.cycleTabs) {
+                this.swapTabs(this._activeTab, this.tabs[0])
+            }
+        }
+    }
+
+    swapTabs (a: BaseTabComponent, b: BaseTabComponent) {
+        const i1 = this.tabs.indexOf(a)
+        const i2 = this.tabs.indexOf(b)
+        this.tabs[i1] = b
+        this.tabs[i2] = a
+    }
+
     /** @hidden */
     emitTabsChanged () {
         this.tabsChanged.next()
@@ -200,26 +269,30 @@ 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)
+            this.addTabRaw(dup, this.tabs.indexOf(tab) + 1)
         }
     }
 
-    async closeAllTabs () {
+    /**
-        for (let tab of this.tabs) {
+     * Attempts to close all tabs, returns false if one of the tabs blocked closure
+     */
+    async closeAllTabs (): Promise<boolean> {
+        for (const tab of this.tabs) {
             if (!await tab.canClose()) {
-                return
+                return false
             }
         }
-        for (let tab of this.tabs) {
+        for (const tab of this.tabs) {
-            tab.destroy()
+            tab.destroy(true)
         }
+        return true
     }
 
     /** @hidden */
     emitReady () {
-        this.ready.next(null)
+        this.ready.next()
         this.ready.complete()
         this.hostApp.emitReady()
     }
@@ -230,13 +303,13 @@ 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)
             })
             this.completionObservers.set(tab, observer)
         }
-        return this.completionObservers.get(tab).done$
+        return this.completionObservers.get(tab)!.done$
     }
 
     stopObservingTabCompletion (tab: BaseTabComponent) {

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

@@ -7,26 +7,26 @@ import { ConfigProvider } from '../api/configProvider'
 import { ElectronService } from './electron.service'
 import { HostAppService } from './hostApp.service'
 
-const configMerge = (a, b) => require('deepmerge')(a, b, { arrayMerge: (_d, s) => s })
+const configMerge = (a, b) => require('deepmerge')(a, b, { arrayMerge: (_d, s) => s }) // eslint-disable-line @typescript-eslint/no-var-requires
 
 function isStructuralMember (v) {
     return v instanceof Object && !(v instanceof Array) &&
         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 { } // eslint-disable-line @typescript-eslint/no-empty-function
-    setValue (key: string, value: any) { } // tslint:disable-line
+    setValue (_key: string, _value: any) { } // eslint-disable-line @typescript-eslint/no-empty-function
 }
 
 @Injectable({ providedIn: 'root' })
@@ -95,7 +95,7 @@ export class ConfigService {
     private changed = new Subject<void>()
     private _store: any
     private defaults: any
-    private servicesCache: { [id: string]: Function[] } = null
+    private servicesCache: { [id: string]: Function[] }|null = null
 
     get changed$ (): Observable<void> { return this.changed }
 
@@ -125,7 +125,22 @@ export class ConfigService {
     }
 
     getDefaults () {
-        return this.defaults
+        const cleanup = o => {
+            if (o instanceof Array) {
+                return o.map(cleanup)
+            } else if (o instanceof Object) {
+                const r = {}
+                for (const k of Object.keys(o)) {
+                    if (k !== '__nonStructural') {
+                        r[k] = cleanup(o[k])
+                    }
+                }
+                return r
+            } else {
+                return o
+            }
+        }
+        return cleanup(this.defaults)
     }
 
     load (): void {
@@ -160,10 +175,6 @@ export class ConfigService {
         this.emitChange()
     }
 
-    private emitChange (): void {
-        this.changed.next()
-    }
-
     requestRestart (): void {
         this.restartRequested = true
     }
@@ -174,12 +185,12 @@ export class ConfigService {
      *
      * @typeparam T Base provider type
      */
-    enabledServices<T> (services: T[]): T[] {
+    enabledServices<T extends object> (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 +199,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 +207,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,14 +52,10 @@ export class ElectronService {
         }
     }
 
-    showMessageBox (
+    async showMessageBox (
         browserWindow: Electron.BrowserWindow,
         options: Electron.MessageBoxOptions
     ): Promise<MessageBoxResponse> {
-        return new Promise(resolve => {
+        return this.dialog.showMessageBox(browserWindow, options)
-            this.dialog.showMessageBox(browserWindow, options, (response, checkboxChecked) => {
-                resolve({ response, checkboxChecked })
-            })
-        })
     }
 }

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 (
@@ -28,12 +29,17 @@ export class HomeBaseService {
     reportBug () {
         let body = `Version: ${this.appVersion}\n`
         body += `Platform: ${os.platform()} ${os.release()}\n`
-        let label = {
+        const label = {
+            aix: 'OS: IBM AIX',
+            android: 'OS: Android',
             darwin: 'OS: macOS',
-            windows: 'OS: Windows',
+            freebsd: 'OS: FreeBSD',
             linux: 'OS: Linux',
+            openbsd: 'OS: OpenBSD',
+            sunos: 'OS: Solaris',
+            win32: 'OS: Windows',
         }[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 +48,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,9 +1,10 @@
 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'
 import { Logger, LogService } from './log.service'
+import { isWindowsBuild, WIN_BUILD_FLUENT_BG_MOVE_BUG_FIXED, WIN_BUILD_FLUENT_BG_SUPPORTED } from '../utils'
 
 export enum Platform {
     Linux, macOS, Windows,
@@ -39,6 +40,7 @@ export class HostAppService {
     private configChangeBroadcast = new Subject<void>()
     private windowCloseRequest = new Subject<void>()
     private windowMoved = new Subject<void>()
+    private windowFocused = new Subject<void>()
     private displayMetricsChanged = new Subject<void>()
     private logger: Logger
     private windowId: number
@@ -85,10 +87,11 @@ export class HostAppService {
 
     get windowMoved$ (): Observable<void> { return this.windowMoved }
 
+    get windowFocused$ (): Observable<void> { return this.windowFocused }
+
     get displayMetricsChanged$ (): Observable<void> { return this.displayMetricsChanged }
 
-    /** @hidden */
+    private constructor (
-    constructor (
         private zone: NgZone,
         private electron: ElectronService,
         log: LogService,
@@ -97,7 +100,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))
@@ -129,6 +132,10 @@ export class HostAppService {
             this.zone.run(() => this.windowMoved.next())
         })
 
+        electron.ipcRenderer.on('host:window-focused', () => {
+            this.zone.run(() => this.windowFocused.next())
+        })
+
         electron.ipcRenderer.on('host:display-metrics-changed', () => {
             this.zone.run(() => this.displayMetricsChanged.next())
         })
@@ -148,6 +155,8 @@ export class HostAppService {
                 this.cliPaste.next(text)
             } else if (op === 'profile') {
                 this.cliOpenProfile.next(argv.profileName)
+            } else if (op === undefined) {
+                this.newWindow()
             } else {
                 this.secondInstance.next()
             }
@@ -156,6 +165,14 @@ export class HostAppService {
         electron.ipcRenderer.on('host:config-change', () => this.zone.run(() => {
             this.configChangeBroadcast.next()
         }))
+
+
+        if (
+            isWindowsBuild(WIN_BUILD_FLUENT_BG_SUPPORTED) &&
+            !isWindowsBuild(WIN_BUILD_FLUENT_BG_MOVE_BUG_FIXED)
+        ) {
+            electron.ipcRenderer.send('window-set-disable-vibrancy-while-dragging', true)
+        }
     }
 
     /**
@@ -170,7 +187,7 @@ export class HostAppService {
     }
 
     toggleFullscreen () {
-        let window = this.getWindow()
+        const window = this.getWindow()
         window.setFullScreen(!this.isFullScreen)
     }
 
@@ -211,14 +228,12 @@ export class HostAppService {
      *
      * @param type `null`, or `fluent` when supported (Windowd only)
      */
-    setVibrancy (enable: boolean, type: string) {
+    setVibrancy (enable: boolean, type: string|null) {
+        if (!isWindowsBuild(WIN_BUILD_FLUENT_BG_SUPPORTED)) {
+            type = null
+        }
         document.body.classList.toggle('vibrant', enable)
-        if (this.platform === Platform.macOS) {
+        this.electron.ipcRenderer.send('window-set-vibrancy', enable, type)
-            this.getWindow().setVibrancy(enable ? 'dark' : null)
-        }
-        if (this.platform === Platform.Windows) {
-            this.electron.ipcRenderer.send('window-set-vibrancy', enable, type)
-        }
     }
 
     setTitle (title: string) {

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

@@ -1,6 +1,7 @@
 import { Injectable, Inject, NgZone, EventEmitter } from '@angular/core'
-import { IHotkeyDescription, HotkeyProvider } from '../api/hotkeyProvider'
+import { Observable, Subject } from 'rxjs'
-import { NativeKeyEvent, stringifyKeySequence } from './hotkeys.util'
+import { HotkeyDescription, HotkeyProvider } from '../api/hotkeyProvider'
+import { stringifyKeySequence } from './hotkeys.util'
 import { ConfigService } from '../services/config.service'
 import { ElectronService } from '../services/electron.service'
 
@@ -13,29 +14,37 @@ 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()
-    private currentKeystrokes: EventBufferEntry[] = []
-    private disabledLevel = 0
-    private hotkeyDescriptions: IHotkeyDescription[] = []
 
     /** @hidden */
-    constructor (
+    matchedHotkey = new EventEmitter<string>()
+
+    /**
+     * Fired for each recognized hotkey
+     */
+    get hotkey$ (): Observable<string> { return this._hotkey }
+
+    globalHotkey = new EventEmitter<void>()
+    private _hotkey = new Subject<string>()
+    private currentKeystrokes: EventBufferEntry[] = []
+    private disabledLevel = 0
+    private hotkeyDescriptions: HotkeyDescription[] = []
+
+    private 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()
@@ -50,6 +59,9 @@ export class HotkeysService {
         this.getHotkeyDescriptions().then(hotkeys => {
             this.hotkeyDescriptions = hotkeys
         })
+
+        // deprecated
+        this.hotkey$.subscribe(h => this.matchedHotkey.emit(h))
     }
 
     /**
@@ -58,8 +70,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,17 +81,17 @@ 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)
+                    this._hotkey.next(matched)
                     this.clearCurrentKeystrokes()
                 }
             })
         }
     }
 
-    emitKeyEvent (nativeEvent) {
+    emitKeyEvent (nativeEvent: KeyboardEvent) {
         this.zone.run(() => {
             this.key.emit(nativeEvent)
         })
@@ -94,61 +106,16 @@ export class HotkeysService {
         return stringifyKeySequence(this.currentKeystrokes.map(x => x.event))
     }
 
-    private registerGlobalHotkey () {
+    getCurrentFullyMatchedHotkey (): string|null {
-        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 +127,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: PartialHotkeyMatch[] = []
-        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 +151,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 +167,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 +175,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

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

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

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

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

@@ -21,17 +21,30 @@ export class TabRecoveryService {
         window.localStorage.tabsRecovery = JSON.stringify(
             await Promise.all(
                 tabs
-                    .map(tab => tab.getRecoveryToken())
+                    .map(tab => {
+                        let token = tab.getRecoveryToken()
+                        if (token) {
+                            token = token.then(r => {
+                                if (r) {
+                                    r.tabColor = tab.color
+                                }
+                                return r
+                            })
+                        }
+                        return token
+                    })
                     .filter(token => !!token)
             )
         )
     }
 
-    async recoverTab (token: any): Promise<RecoveredTab> {
+    async recoverTab (token: any): Promise<RecoveredTab|null> {
-        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) {
+                if (tab !== null) {
+                    tab.options = tab.options || {}
+                    tab.options.color = token.tabColor || null
                     return tab
                 }
             } catch (error) {
@@ -43,9 +56,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 +67,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
@@ -28,12 +29,12 @@ export class TabsService {
     /**
      * Duplicates an existing tab instance (using the tab recovery system)
      */
-    async duplicate (tab: BaseTabComponent): Promise<BaseTabComponent> {
+    async duplicate (tab: BaseTabComponent): Promise<BaseTabComponent|null> {
-        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/themes.service.ts

@@ -4,7 +4,7 @@ import { Theme } from '../api/theme'
 
 @Injectable({ providedIn: 'root' })
 export class ThemesService {
-    private styleElement: HTMLElement = null
+    private styleElement: HTMLElement|null = null
 
     /** @hidden */
     constructor (
@@ -17,22 +17,22 @@ export class ThemesService {
         })
     }
 
-    findTheme (name: string): Theme {
+    findTheme (name: string): Theme|null {
-        return this.config.enabledServices(this.themes).find(x => x.name === name)
+        return this.config.enabledServices(this.themes).find(x => x.name === name) || null
     }
 
     findCurrentTheme (): Theme {
-        return this.findTheme(this.config.store.appearance.theme) || this.findTheme('Standard')
+        return this.findTheme(this.config.store.appearance.theme) || this.findTheme('Standard')!
     }
 
     applyTheme (theme: Theme): void {
         if (!this.styleElement) {
             this.styleElement = document.createElement('style')
             this.styleElement.setAttribute('id', 'theme')
-            document.querySelector('head').appendChild(this.styleElement)
+            document.querySelector('head')!.appendChild(this.styleElement)
         }
         this.styleElement.textContent = theme.css
-        document.querySelector('style#custom-css').innerHTML = this.config.store.appearance.css
+        document.querySelector('style#custom-css')!.innerHTML = this.config.store.appearance.css
     }
 
     private applyCurrentTheme (): void {

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

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

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

@@ -1,8 +1,14 @@
 import axios from 'axios'
+import * as fs from 'fs'
+import os from 'os'
+
+import { spawn } from 'mz/child_process'
 
 import { Injectable } from '@angular/core'
 import { Logger, LogService } from './log.service'
 import { ElectronService } from './electron.service'
+import { ConfigService } from './config.service'
+import { AppUpdater } from 'electron-updater'
 
 const UPDATES_URL = 'https://api.github.com/repos/eugeny/terminus/releases/latest'
 
@@ -13,18 +19,27 @@ export class UpdaterService {
     private downloaded: Promise<boolean>
     private electronUpdaterAvailable = true
     private updateURL: string
-    private autoUpdater
+    private autoUpdater: AppUpdater
 
     constructor (
         log: LogService,
         private electron: ElectronService,
+        private config: ConfigService,
     ) {
         this.logger = log.create('updater')
 
+        if (process.platform === 'linux') {
+            this.electronUpdaterAvailable = false
+            return
+        }
+
         this.autoUpdater = electron.remote.require('electron-updater').autoUpdater
 
+        this.autoUpdater.autoInstallOnAppQuit = !!config.store.enableAutomaticUpdates
+
         this.autoUpdater.on('update-available', () => {
             this.logger.info('Update available')
+            this.autoUpdater.downloadUpdate()
         })
         this.autoUpdater.once('update-not-available', () => {
             this.logger.info('No updates')
@@ -34,9 +49,8 @@ export class UpdaterService {
             this.autoUpdater.once('update-downloaded', () => resolve(true))
         })
 
-        this.logger.debug('Checking for updates')
+        if (config.store.enableAutomaticUpdates && this.electronUpdaterAvailable && !process.env.TERMINUS_DEV) {
-
+            this.logger.debug('Checking for updates')
-        if (this.electronUpdaterAvailable) {
             try {
                 this.autoUpdater.checkForUpdates()
             } catch (e) {
@@ -47,11 +61,14 @@ export class UpdaterService {
     }
 
     async check (): Promise<boolean> {
+        if (!this.config.store.enableAutomaticUpdates) {
+            return false
+        }
         if (!this.electronUpdaterAvailable) {
-            this.logger.debug('Checking for updates')
+            this.logger.debug('Checking for updates through fallback method.')
-            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
@@ -67,8 +84,21 @@ export class UpdaterService {
         if (!this.electronUpdaterAvailable) {
             this.electron.shell.openExternal(this.updateURL)
         } else {
-            await this.downloaded
+            if (process.platform === 'win32') {
-            this.autoUpdater.quitAndInstall()
+                let downloadpath = await this.autoUpdater.downloadUpdate()
+                fs.exists(downloadpath[0], (exists) => {
+                    if (exists) {
+                        fs.copyFile(downloadpath[0], os.tmpdir() + 'terminus-installer-temp.exe', (err) => {
+                            if (!err) {
+                                spawn(os.tmpdir() + 'terminus-installer-temp.exe', ['--force-run'], { detached: true, stdio: 'ignore' })
+                            }
+                        })
+                    }
+                })
+            } else {
+                await this.downloaded
+                this.autoUpdater.quitAndInstall(false, true)
+            }
         }
     }
 }

terminus-core/src/tabContextMenu.ts

@@ -1,4 +1,5 @@
 import { Injectable, NgZone } from '@angular/core'
+import { Subscription } from 'rxjs'
 import { AppService } from './services/app.service'
 import { BaseTabComponent } from './components/baseTab.component'
 import { TabHeaderComponent } from './components/tabHeader.component'
@@ -16,39 +17,49 @@ export class CloseContextMenu extends TabContextMenuItemProvider {
         super()
     }
 
-    async getItems (tab: BaseTabComponent): Promise<Electron.MenuItemConstructorOptions[]> {
+    async getItems (tab: BaseTabComponent, tabHeader?: TabHeaderComponent): Promise<Electron.MenuItemConstructorOptions[]> {
-        return [
+        let items = [
             {
                 label: 'Close',
                 click: () => this.zone.run(() => {
-                    this.app.closeTab(tab, true)
+                    if (this.app.tabs.includes(tab)) {
-                })
+                        this.app.closeTab(tab, true)
-            },
+                    } else {
-            {
+                        tab.destroy()
-                label: 'Close other tabs',
-                click: () => this.zone.run(() => {
-                    for (let 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)) {
-                        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))) {
-                        this.app.closeTab(t, true)
-                    }
-                })
             },
         ]
+        if (tabHeader) {
+            items = [
+                ...items,
+                {
+                    label: 'Close other tabs',
+                    click: () => this.zone.run(() => {
+                        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 (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 (const t of this.app.tabs.slice(0, this.app.tabs.indexOf(tab))) {
+                            this.app.closeTab(t, true)
+                        }
+                    }),
+                },
+            ]
+        }
+        return items
     }
 }
 
@@ -75,28 +86,31 @@ export class CommonOptionsContextMenu extends TabContextMenuItemProvider {
     }
 
     async getItems (tab: BaseTabComponent, tabHeader?: TabHeaderComponent): Promise<Electron.MenuItemConstructorOptions[]> {
-        return [
+        if (tabHeader) {
-            {
+            return [
-                label: 'Rename',
+                {
-                click: () => this.zone.run(() => tabHeader.showRenameTabModal())
+                    label: 'Rename',
-            },
+                    click: () => this.zone.run(() => tabHeader?.showRenameTabModal()),
-            {
+                },
-                label: 'Duplicate',
+                {
-                click: () => this.zone.run(() => this.app.duplicateTab(tab))
+                    label: 'Duplicate',
-            },
+                    click: () => this.zone.run(() => this.app.duplicateTab(tab)),
-            {
+                },
-                label: 'Color',
+                {
-                sublabel: COLORS.find(x => x.value === tab.color).name,
+                    label: 'Color',
-                submenu: COLORS.map(color => ({
+                    sublabel: COLORS.find(x => x.value === tab.color)!.name,
-                    label: color.name,
+                    submenu: COLORS.map(color => ({
-                    type: 'radio',
+                        label: color.name,
-                    checked: tab.color === color.value,
+                        type: 'radio',
-                    click: () => this.zone.run(() => {
+                        checked: tab.color === color.value,
-                        tab.color = color.value
+                        click: () => this.zone.run(() => {
-                    }),
+                            tab.color = color.value
-                })) as Electron.MenuItemConstructorOptions[],
+                        }),
-            }
+                    })) as Electron.MenuItemConstructorOptions[],
-        ]
+                },
+            ]
+        }
+        return []
     }
 }
 
@@ -111,37 +125,62 @@ export class TaskCompletionContextMenu extends TabContextMenuItemProvider {
     }
 
     async getItems (tab: BaseTabComponent): Promise<Electron.MenuItemConstructorOptions[]> {
-        let process = await tab.getCurrentProcess()
+        const process = await tab.getCurrentProcess()
-        if (process) {
+        let items: Electron.MenuItemConstructorOptions[] = []
-            return [
-                {
-                    id: 'process-name',
-                    enabled: false,
-                    label: 'Current process: ' + process.name,
-                },
-                {
-                    label: 'Notify when done',
-                    type: 'checkbox',
-                    checked: (tab as any).__completionNotificationEnabled,
-                    click: () => this.zone.run(() => {
-                        (tab as any).__completionNotificationEnabled = !(tab as any).__completionNotificationEnabled
 
-                        if ((tab as any).__completionNotificationEnabled) {
+        const extTab: (BaseTabComponent & { __completionNotificationEnabled?: boolean, __outputNotificationSubscription?: Subscription|null }) = tab
-                            this.app.observeTabCompletion(tab).subscribe(() => {
+
-                                new Notification('Process completed', {
+        if (process) {
-                                    body: process.name,
+            items.push({
-                                }).addEventListener('click', () => {
+                id: 'process-name',
-                                    this.app.selectTab(tab)
+                enabled: false,
-                                })
+                label: 'Current process: ' + process.name,
-                                ;(tab as any).__completionNotificationEnabled = false
+            })
+            items.push({
+                label: 'Notify when done',
+                type: 'checkbox',
+                checked: extTab.__completionNotificationEnabled,
+                click: () => this.zone.run(() => {
+                    extTab.__completionNotificationEnabled = !extTab.__completionNotificationEnabled
+
+                    if (extTab.__completionNotificationEnabled) {
+                        this.app.observeTabCompletion(tab).subscribe(() => {
+                            new Notification('Process completed', {
+                                body: process.name,
+                            }).addEventListener('click', () => {
+                                this.app.selectTab(tab)
+                            })
+                            extTab.__completionNotificationEnabled = false
+                        })
+                    } else {
+                        this.app.stopObservingTabCompletion(tab)
+                    }
+                }),
+            })
+        }
+        items.push({
+            label: 'Notify on activity',
+            type: 'checkbox',
+            checked: !!extTab.__outputNotificationSubscription,
+            click: () => this.zone.run(() => {
+                if (extTab.__outputNotificationSubscription) {
+                    extTab.__outputNotificationSubscription.unsubscribe()
+                    extTab.__outputNotificationSubscription = null
+                } else {
+                    extTab.__outputNotificationSubscription = tab.activity$.subscribe(active => {
+                        if (extTab.__outputNotificationSubscription && active) {
+                            extTab.__outputNotificationSubscription.unsubscribe()
+                            extTab.__outputNotificationSubscription = null
+                            new Notification('Tab activity', {
+                                body: tab.title,
+                            }).addEventListener('click', () => {
+                                this.app.selectTab(tab)
                             })
-                        } else {
-                            this.app.stopObservingTabCompletion(tab)
                         }
                     })
-                },
+                }
-            ]
+            }),
-        }
+        })
-        return []
+        return items
     }
 }