Bump yargs from 14.2.0 to 15.0.2 in /app (#1783)

Bump yargs from 14.2.0 to 15.0.2 in /app

.all-contributorsrc

@@ -180,6 +180,51 @@
       "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"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.circleci/config.yml

@@ -1,20 +0,0 @@
-version: 2
-jobs:
-  build:
-    macos:
-      xcode: "11.0.0"
-
-    steps:
-      - checkout
-
-      - run:
-          name: Build
-          command: ./build/travis.sh
-
-      - store_artifacts:
-          path: dist/*.dmg
-          destination: DMG
-
-      - store_artifacts:
-          path: dist/*.pkg
-          destination: PKG

.eslintrc.yml

@@ -36,6 +36,7 @@ rules:
   '@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
@@ -44,7 +45,8 @@ rules:
   - error
   - never
   block-scoped-var: error
-  brace-style:
+  brace-style: off
+  '@typescript-eslint/brace-style':
   - error
   - 1tbs
   - allowSingleLine: true
@@ -85,3 +87,13 @@ rules:
   - 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

.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.exe 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

.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

@@ -1,6 +1,5 @@
 language: node_js
 node_js: 11
-osx_image: xcode11
 
 stages:
   - Build
@@ -9,10 +8,6 @@ stages:
 
 jobs:
   include:
-    - stage: 'Build'
-      os: osx
-      script: travis_wait ./build/travis.sh
-
     - stage: 'Docs'
       os: linux
       if: branch = master
@@ -39,9 +34,3 @@ addons:
     sources:
     - sourceline: 'deb https://dl.yarnpkg.com/debian/ stable main'
       key_url: 'https://dl.yarnpkg.com/debian/pubkey.gpg'
-
-
-cache:
-  directories:
-  - $HOME/.cache/electron
-  - $HOME/.cache/electron-builder

README.md

@@ -2,8 +2,7 @@
 
 
 <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://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://dev.azure.com/epankov/Terminus/_build?definitionId=1"><img alt="Azure Pipelines" src="https://img.shields.io/azure-devops/build/epankov/Terminus/1.svg?label=CI&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>
 </p>
 
 <p align="center">
@@ -93,6 +92,13 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     <td align="center"><a href="https://jjuhas.keybase.pub//"><img src="https://avatars1.githubusercontent.com/u/6438760?v=4" width="100px;" alt="Jonathan"/><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="Hans Koch"/><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="Dak Smyth"/><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="Wang Zhi"/><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="jack1142"/><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="Howie Douglas"/><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="Chris Kaczor"/><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="Johannes Kadak"/><br /><sub><b>Johannes Kadak</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=boxmein" title="Code">💻</a></td>
   </tr>
 </table>
 

app/lib/app.ts

@@ -124,7 +124,7 @@ export class Application {
                     { role: 'services', submenu: [] },
                     { type: 'separator' },
                     { role: 'hide' },
-                    { role: 'hideothers' },
+                    { role: 'hideOthers' },
                     { role: 'unhide' },
                     { type: 'separator' },
                     {
@@ -145,21 +145,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: 'toggledevtools' },
+                    { role: 'forceReload' },
+                    { role: 'toggleDevTools' },
                     { type: 'separator' },
-                    { role: 'resetzoom' },
-                    { role: 'zoomin' },
-                    { role: 'zoomout' },
+                    { role: 'resetZoom' },
+                    { role: 'zoomIn' },
+                    { role: 'zoomOut' },
                     { type: 'separator' },
                     { role: 'togglefullscreen' },
                 ],

app/lib/window.ts

@@ -49,7 +49,7 @@ export class Window {
             },
             frame: false,
             show: false,
-            backgroundColor: '#00000000'
+            backgroundColor: '#00000000',
         }
 
         if (this.windowBounds) {
@@ -80,7 +80,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)
             }
@@ -106,7 +106,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()
                 }
             }

app/package.json

@@ -20,33 +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.2.0",
+    "@ng-bootstrap/ng-bootstrap": "^4.2.2",
     "devtron": "1.4.0",
-    "fontmanager-redux": "0.3.2",
     "electron-config": "2.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": "^4.13.0",
+    "keytar": "^5.0.0",
     "mz": "^2.7.0",
-    "ngx-toastr": "^10.0.4",
-    "node-pty": "^0.9.0-beta22",
+    "ngx-toastr": "^10.2.0",
+    "node-pty": "^0.10.0-beta2",
     "npm": "6.9.0",
     "path": "0.12.7",
-    "rxjs": "^6.5.2",
-    "rxjs-compat": "^6.5.2",
-    "yargs": "^13.3.0",
+    "rxjs": "^6.5.3",
+    "rxjs-compat": "^6.5.3",
+    "yargs": "^15.0.2",
     "zone.js": "^0.8.29"
   },
   "optionalDependencies": {
-    "macos-native-processlist": "^1.0.1",
+    "macos-native-processlist": "^1.0.2",
     "windows-blurbehind": "^1.0.1",
-    "windows-native-registry": "^1.0.14",
+    "windows-native-registry": "^1.0.15",
     "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.12.0"
   }
 }

app/src/entry.ts

@@ -18,8 +18,8 @@ location.hash = ''
 
 ;(process as any).enablePromiseAPI = true
 
-if (process.platform === 'win32') {
-    process.env.HOME = process.env.HOMEDRIVE + process.env.HOMEPATH
+if (process.platform === 'win32' && !('HOME' in process.env)) {
+    process.env.HOME = `${process.env.HOMEDRIVE}${process.env.HOMEPATH}`
 }
 
 if (isDev) {

app/src/plugins.ts

@@ -12,7 +12,7 @@ function normalizePath (path: string): string {
     return path
 }
 
-nodeRequire.main.paths.map((x: string) => 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()))
@@ -156,7 +156,9 @@ export async function findPlugins (): Promise<PluginInfo[]> {
         }
     }
 
-    (window as any).installedPlugins = foundPlugins
+    foundPlugins.sort((a, b) => a.name > b.name ? 1 : -1)
+
+    ;(window as any).installedPlugins = foundPlugins
     return foundPlugins
 }
 

azure-pipelines.yml

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

build/mac/afterSignHook.js

@@ -5,9 +5,8 @@ const path = require('path')
 const notarizer = require('electron-notarize')
 
 module.exports = async function (params) {
-    console.log('env: ', process.env)
     // notarize the app on Mac OS only.
-    if (process.platform !== 'darwin' || process.env.BUILD_SOURCEBRANCH !== 'refs/heads/master' || process.env.TRAVIS_BRANCH && !process.env.TRAVIS_PULL_REQUEST_BRANCH) {
+    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)

build/travis.sh

@@ -1,12 +0,0 @@
-#!/bin/bash
-set -e
-cd app
-yarn
-cd ..
-rm app/node_modules/.yarn-integrity
-yarn
-scripts/build-native.js
-yarn run build:typings
-yarn run build
-scripts/prepackage-plugins.js
-scripts/build-macos.js

package.json

@@ -1,33 +1,31 @@
 {
   "devDependencies": {
-    "@fortawesome/fontawesome-free": "^5.10.1",
+    "@fortawesome/fontawesome-free": "^5.11.2",
     "@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.6.2",
-    "@types/webpack-env": "1.13.9",
-    "@typescript-eslint/eslint-plugin": "^1.13.0",
-    "@typescript-eslint/parser": "^1.13.0",
-    "app-builder-lib": "^21.0.8",
+    "@types/node": "12.7.12",
+    "@types/webpack-env": "1.14.1",
+    "@typescript-eslint/eslint-plugin": "^2.8.0",
+    "@typescript-eslint/parser": "^2.8.0",
     "apply-loader": "2.0.0",
     "awesome-typescript-loader": "^5.0.0",
-    "core-js": "^3.2.0",
-    "cross-env": "5.2.0",
+    "core-js": "^3.4.2",
+    "cross-env": "6.0.3",
     "css-loader": "3.2.0",
-    "electron": "^5.0.7",
-    "electron-builder": "^21.0.8",
-    "electron-installer-snap": "^4.0.0",
+    "electron": "^7.1.2",
+    "electron-builder": "22.1.0",
+    "electron-installer-snap": "^4.1.0",
     "electron-notarize": "^0.1.1",
     "electron-rebuild": "^1.8.5",
-    "eslint": "^5.16.0",
-    "file-loader": "^4.1.0",
-    "graceful-fs": "^4.2.1",
+    "eslint": "^6.7.1",
+    "file-loader": "^4.3.0",
+    "graceful-fs": "^4.2.2",
     "html-loader": "0.5.5",
     "json-loader": "0.5.7",
-    "node-abi": "^2.10.0",
-    "node-gyp": "^5.0.3",
-    "node-sass": "^4.12.0",
+    "node-abi": "^2.12.0",
+    "node-gyp": "^6.0.1",
+    "node-sass": "^4.13.0",
     "npmlog": "4.1.2",
     "npx": "^10.2.0",
     "pug": "^2.0.4",
@@ -37,20 +35,20 @@
     "pug-static-loader": "2.0.0",
     "raven-js": "3.27.2",
     "raw-loader": "3.1.0",
-    "sass-loader": "^7.2.0",
+    "sass-loader": "^8.0.0",
     "shelljs": "0.8.3",
-    "source-code-pro": "^2.30.1",
-    "source-sans-pro": "2.45.0",
+    "source-code-pro": "^2.30.2",
+    "source-sans-pro": "3.6.0",
     "style-loader": "^1.0.0",
     "svg-inline-loader": "^0.8.0",
-    "to-string-loader": "1.1.5",
+    "to-string-loader": "1.1.6",
     "tslib": "^1.10.0",
-    "typedoc": "^0.15.0",
-    "typescript": "^3.5.3",
-    "url-loader": "^2.1.0",
-    "val-loader": "1.1.1",
-    "webpack": "^4.39.1",
-    "webpack-cli": "^3.3.6",
+    "typedoc": "^0.15.3",
+    "typescript": "^3.6.4",
+    "url-loader": "^2.3.0",
+    "val-loader": "2.0.1",
+    "webpack": "^5.0.0-beta.7",
+    "webpack-cli": "^3.3.10",
     "yaml-loader": "0.5.0"
   },
   "resolutions": {
@@ -80,11 +78,6 @@
       "installerIcon": "./build/windows/icon.ico"
     },
     "publish": [
-      {
-        "provider": "bintray",
-        "token": "d993c4faa708a4cba84fa3a8e822457e7298d75c",
-        "component": "main"
-      },
       {
         "provider": "github"
       }

scripts/build-linux.js

@@ -2,11 +2,12 @@
 const builder = require('electron-builder').build
 const vars = require('./vars')
 
-const isTag = (process.env.BUILD_SOURCEBRANCH || '').startsWith('refs/tags/')
+const isTag = (process.env.GITHUB_REF || '').startsWith('refs/tags/')
+const isCI = !!process.env.GITHUB_REF
 
 builder({
     dir: true,
-    linux: ['snap', 'deb', 'rpm', 'tar.gz'],
+    linux: ['deb', 'tar.gz', 'rpm'],
     config: {
         extraMetadata: {
             version: vars.version,

scripts/build-macos.js

@@ -2,7 +2,8 @@
 const builder = require('electron-builder').build
 const vars = require('./vars')
 
-const isTag = (process.env.BUILD_SOURCEBRANCH || '').startsWith('refs/tags/')
+const isTag = (process.env.GITHUB_REF || '').startsWith('refs/tags/')
+const isCI = !!process.env.GITHUB_REF
 
 builder({
     dir: true,

scripts/build-native.js

@@ -3,21 +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']) {
-  build = rebuild({
-    buildPath: path.resolve(__dirname, '../' + dir),
-    electronVersion: vars.electronVersion,
-    force: true,
-  })
-  build.catch(() => process.exit(1))
-  lifecycles.push([build.lifecycle, dir])
+    const build = rebuild({
+        buildPath: path.resolve(__dirname, '../' + dir),
+        electronVersion: vars.electronVersion,
+        force: true,
+    })
+    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 => {
-    console.info('Rebuilding', dir + '/' + name)
-  })
+    lc.on('module-found', name => {
+        console.info('Rebuilding', dir + '/' + name)
+    })
 }

scripts/build-windows.js

@@ -2,7 +2,8 @@
 const builder = require('electron-builder').build
 const vars = require('./vars')
 
-const isTag = (process.env.BUILD_SOURCEBRANCH || '').startsWith('refs/tags/')
+const isTag = (process.env.GITHUB_REF || process.env.BUILD_SOURCEBRANCH || '').startsWith('refs/tags/')
+const isCI = !!process.env.GITHUB_REF
 
 builder({
     dir: true,

terminus-community-color-schemes/package.json

@@ -1,6 +1,6 @@
 {
   "name": "terminus-community-color-schemes",
-  "version": "1.0.83-nightly.0",
+  "version": "1.0.93-nightly.0",
   "description": "Community color schemes for Terminus",
   "keywords": [
     "terminus-builtin-plugin"

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

@@ -4,7 +4,7 @@ module.exports = {
     target: 'node',
     entry: 'src/index.ts',
     context: __dirname,
-    devtool: 'cheap-module-eval-source-map',
+    devtool: 'eval-cheap-module-source-map',
     output: {
         path: path.resolve(__dirname, 'dist'),
         filename: 'index.js',

terminus-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "terminus-core",
-  "version": "1.0.83-nightly.4",
+  "version": "1.0.93-nightly.0",
   "description": "Terminus core",
   "keywords": [
     "terminus-builtin-plugin"
@@ -23,12 +23,12 @@
     "axios": "^0.19.0",
     "bootstrap": "^4.1.3",
     "core-js": "^3.1.2",
-    "deepmerge": "^3.2.0",
+    "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",
     "uuid": "^3.3.2",
     "winston": "^3.2.1"

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

@@ -5,7 +5,7 @@ export interface ToolbarButton {
     /**
      * Raw SVG icon code
      */
-    icon: string
+    icon?: string
 
     title: string
 

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;

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

@@ -128,7 +128,9 @@ export class AppRootComponent {
         })
 
         this.hostApp.windowCloseRequest$.subscribe(async () => {
-            await this.app.closeAllTabs() && this.hostApp.closeWindow()
+            if (await this.app.closeAllTabs()) {
+                this.hostApp.closeWindow()
+            }
         })
 
         if (window['safeModeReason']) {
@@ -144,7 +146,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 => {
@@ -217,8 +219,18 @@ export class AppRootComponent {
         return false
     }
 
-    updateApp () {
-        this.updater.update()
+    async updateApp () {
+        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 () {
@@ -248,7 +260,7 @@ export class AppRootComponent {
             buttons = buttons.concat(provider.provide())
         })
         return buttons
-            .filter(button => button.weight > 0 === aboveZero)
+            .filter(button => (button.weight || 0) > 0 === aboveZero)
             .sort((a: ToolbarButton, b: ToolbarButton) => (a.weight || 0) - (b.weight || 0))
     }
 

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

@@ -36,7 +36,7 @@ export abstract class BaseTabComponent {
     /**
      * CSS color override for the tab's header
      */
-    color: string = null
+    color: string|null = null
 
     protected hasFocus = false
 
@@ -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) {
@@ -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
     }
 

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

@@ -33,8 +33,8 @@ export class SplitContainer {
     /**
      * @return Flat list of all tabs inside this container
      */
-    getAllTabs () {
-        let r = []
+    getAllTabs (): BaseTabComponent[] {
+        let r: BaseTabComponent[] = []
         for (const child of this.children) {
             if (child instanceof SplitContainer) {
                 r = r.concat(child.getAllTabs())
@@ -94,7 +94,7 @@ export class SplitContainer {
     }
 
     async serialize () {
-        const children = []
+        const children: any[] = []
         for (const child of this.children) {
             if (child instanceof SplitContainer) {
                 children.push(await child.serialize())
@@ -292,9 +292,9 @@ 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) {
-        let target = this.getParentOf(relative) || this.root
-        let insertIndex = target.children.indexOf(relative)
+    addTab (tab: BaseTabComponent, relative: BaseTabComponent|null, side: SplitDirection) {
+        let target = (relative ? this.getParentOf(relative) : null) || this.root
+        let insertIndex = relative ? target.children.indexOf(relative) : -1
 
         if (
             target.orientation === 'v' && ['l', 'r'].includes(side) ||
@@ -302,7 +302,7 @@ export class SplitTabComponent extends BaseTabComponent implements OnInit, OnDes
         ) {
             const newContainer = new SplitContainer()
             newContainer.orientation = target.orientation === 'v' ? 'h' : 'v'
-            newContainer.children = [relative]
+            newContainer.children = relative ? [relative] : []
             newContainer.ratios = [1]
             target.children[insertIndex] = newContainer
             target = newContainer
@@ -333,6 +333,9 @@ export class SplitTabComponent extends BaseTabComponent implements OnInit, OnDes
 
     removeTab (tab: BaseTabComponent) {
         const parent = this.getParentOf(tab)
+        if (!parent) {
+            return
+        }
         const index = parent.children.indexOf(tab)
         parent.ratios.splice(index, 1)
         parent.children.splice(index, 1)
@@ -356,11 +359,18 @@ export class SplitTabComponent extends BaseTabComponent implements OnInit, OnDes
     navigate (dir: SplitDirection) {
         let rel: BaseTabComponent | SplitContainer = this.focusedTab
         let parent = this.getParentOf(rel)
+        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) {
@@ -381,13 +391,15 @@ export class SplitTabComponent extends BaseTabComponent implements OnInit, OnDes
 
     async splitTab (tab: BaseTabComponent, dir: SplitDirection) {
         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 (const child of root.children) {
             if (child instanceof SplitContainer) {
@@ -414,8 +426,8 @@ export class SplitTabComponent extends BaseTabComponent implements OnInit, OnDes
     }
 
     /** @hidden */
-    async getCurrentProcess (): Promise<BaseTabProcess> {
-        return (await Promise.all(this.getAllTabs().map(x => x.getCurrentProcess()))).find(x => !!x)
+    async getCurrentProcess (): Promise<BaseTabProcess|null> {
+        return (await Promise.all(this.getAllTabs().map(x => x.getCurrentProcess()))).find(x => !!x) || null
     }
 
     /** @hidden */
@@ -443,8 +455,10 @@ export class SplitTabComponent extends BaseTabComponent implements OnInit, OnDes
 
     private detachTabView (tab: BaseTabComponent) {
         const ref = this.viewRefs.get(tab)
-        this.viewRefs.delete(tab)
-        this.viewContainer.remove(this.viewContainer.indexOf(ref))
+        if (ref) {
+            this.viewRefs.delete(tab)
+            this.viewContainer.remove(this.viewContainer.indexOf(ref))
+        }
     }
 
     private layout () {
@@ -471,7 +485,7 @@ export class SplitTabComponent extends BaseTabComponent implements OnInit, OnDes
             if (child instanceof SplitContainer) {
                 this.layoutInternal(child, childX, childY, childW, childH)
             } else {
-                const element = this.viewRefs.get(child).rootNodes[0]
+                const element = this.viewRefs.get(child)!.rootNodes[0]
                 element.style.position = 'absolute'
                 element.style.left = `${childX}%`
                 element.style.top = `${childY}%`
@@ -518,7 +532,7 @@ export class SplitTabComponent extends BaseTabComponent implements OnInit, OnDes
 /** @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

@@ -67,13 +67,13 @@ 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
             )
         }
@@ -82,7 +82,7 @@ export class SplitTabSpannerComponent {
     private setDimensions (x: number, y: number, w: number, h: number) {
         this.cssLeft = `${x}%`
         this.cssTop = `${y}%`
-        this.cssWidth = w ? `${w}%` : null
-        this.cssHeight = h ? `${h}%` : null
+        this.cssWidth = w ? `${w}%` : 'initial'
+        this.cssHeight = h ? `${h}%` : 'initial'
     }
 }

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

@@ -25,7 +25,7 @@ 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
 
     private constructor (
@@ -78,12 +78,21 @@ 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())
 

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

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

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

@@ -25,14 +25,14 @@ class CompletionObserver {
 
     async tick () {
         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()
     }
@@ -71,20 +71,29 @@ export class AppService {
         private tabsService: TabsService,
     ) {
         if (hostApp.getWindow().id === 1) {
-            this.tabRecovery.recoverTabs().then(tabs => {
-                for (const tab of tabs) {
-                    this.openNewTabRaw(tab.type, tab.options)
-                }
-                this.tabsChanged$.subscribe(() => {
-                    tabRecovery.saveTabs(this.tabs)
+            if (config.store.terminal.recoverTabs) {
+                this.tabRecovery.recoverTabs().then(tabs => {
+                    for (const tab of tabs) {
+                        this.openNewTabRaw(tab.type, tab.options)
+                    }
+                    this.startTabStorage()
                 })
-                setInterval(() => {
-                    tabRecovery.saveTabs(this.tabs)
-                }, 30000)
-            })
+            } else {
+                /** Continue to store the tabs even if the setting is currently off */
+                this.startTabStorage()
+            }
         }
     }
 
+    startTabStorage () {
+        this.tabsChanged$.subscribe(() => {
+            this.tabRecovery.saveTabs(this.tabs)
+        })
+        setInterval(() => {
+            this.tabRecovery.saveTabs(this.tabs)
+        }, 30000)
+    }
+
     addTabRaw (tab: BaseTabComponent) {
         this.tabs.push(tab)
         this.selectTab(tab)
@@ -144,7 +153,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()
@@ -229,7 +238,7 @@ export class AppService {
 
     /** @hidden */
     emitReady () {
-        this.ready.next(null)
+        this.ready.next()
         this.ready.complete()
         this.hostApp.emitReady()
     }
@@ -246,7 +255,7 @@ export class AppService {
             })
             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,7 +7,7 @@ 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) &&
@@ -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 }
 
@@ -170,7 +170,7 @@ 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 = {}
             const ngModule = window['rootModule'].ngInjectorDef

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

@@ -56,10 +56,6 @@ export class ElectronService {
         browserWindow: Electron.BrowserWindow,
         options: Electron.MessageBoxOptions
     ): Promise<MessageBoxResponse> {
-        return new Promise(resolve => {
-            this.dialog.showMessageBox(browserWindow, options, (response, checkboxChecked) => {
-                resolve({ response, checkboxChecked })
-            })
-        })
+        return this.dialog.showMessageBox(browserWindow, options)
     }
 }

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

@@ -215,7 +215,7 @@ export class HostAppService {
     setVibrancy (enable: boolean, type: string) {
         document.body.classList.toggle('vibrant', enable)
         if (this.platform === Platform.macOS) {
-            this.getWindow().setVibrancy(enable ? 'dark' : null)
+            this.getWindow().setVibrancy(enable ? 'dark' : null as any) // electron issue 20269
         }
         if (this.platform === Platform.Windows) {
             this.electron.ipcRenderer.send('window-set-vibrancy', enable, type)

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

@@ -93,7 +93,7 @@ export class HotkeysService {
         return stringifyKeySequence(this.currentKeystrokes.map(x => x.event))
     }
 
-    getCurrentFullyMatchedHotkey (): string {
+    getCurrentFullyMatchedHotkey (): string|null {
         const currentStrokes = this.getCurrentKeystrokes()
         const config = this.getHotkeysConfig()
         for (const id in config) {
@@ -116,7 +116,7 @@ export class HotkeysService {
     getCurrentPartiallyMatchedHotkeys (): PartialHotkeyMatch[] {
         const currentStrokes = this.getCurrentKeystrokes()
         const config = this.getHotkeysConfig()
-        const result = []
+        const result: PartialHotkeyMatch[] = []
         for (const id in config) {
             for (const sequence of config[id]) {
                 for (let matchLength = Math.min(currentStrokes.length, sequence.length); matchLength > 0; matchLength--) {

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

@@ -15,7 +15,7 @@ export function stringifyKeySequence (events: KeyboardEvent[]): string[] {
     events = events.slice()
 
     while (events.length > 0) {
-        const event = events.shift()
+        const event = events.shift()!
         if ((event as any).event === 'keydown') {
             const itemKeys: string[] = []
             if (event.ctrlKey) {

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

@@ -37,7 +37,7 @@ 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()
     }

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

@@ -27,7 +27,7 @@ export class TabRecoveryService {
         )
     }
 
-    async recoverTab (token: any): Promise<RecoveredTab> {
+    async recoverTab (token: any): Promise<RecoveredTab|null> {
         for (const provider of this.config.enabledServices(this.tabRecoveryProviders)) {
             try {
                 const tab = await provider.recover(token)

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

@@ -29,7 +29,7 @@ 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> {
         const token = await tab.getRecoveryToken()
         if (!token) {
             return null

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 {
-        return this.config.enabledServices(this.themes).find(x => x.name === name)
+    findTheme (name: string): Theme|null {
+        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

@@ -42,7 +42,7 @@ export class TouchbarService {
                 const showIcon = this.app.activeTab !== tab && hasActivity
                 const segment = this.tabSegments[app.tabs.indexOf(tab)]
                 if (segment) {
-                    segment.icon = showIcon ? activityIcon : null
+                    segment.icon = showIcon ? activityIcon : undefined
                 }
             })
         })
@@ -83,7 +83,9 @@ export class TouchbarService {
             segments: buttons.map(button => this.getButton(button)),
             mode: 'buttons',
             change: (selectedIndex) => this.zone.run(() => {
-                buttons[selectedIndex].click()
+                if (buttons[selectedIndex].click) {
+                    buttons[selectedIndex].click!()
+                }
             }),
         })
 
@@ -100,8 +102,8 @@ export class TouchbarService {
 
     private getButton (button: ToolbarButton): Electron.SegmentedControlSegment {
         return {
-            label: button.touchBarNSImage ? null : this.shortenTitle(button.touchBarTitle || button.title),
-            icon: button.touchBarNSImage ? this.getCachedNSImage(button.touchBarNSImage) : null,
+            label: button.touchBarNSImage ? undefined : this.shortenTitle(button.touchBarTitle || button.title),
+            icon: button.touchBarNSImage ? this.getCachedNSImage(button.touchBarNSImage) : undefined,
             // click: () => this.zone.run(() => button.click()),
         }
     }

terminus-core/src/tabContextMenu.ts

@@ -78,7 +78,7 @@ export class CommonOptionsContextMenu extends TabContextMenuItemProvider {
         return [
             {
                 label: 'Rename',
-                click: () => this.zone.run(() => tabHeader.showRenameTabModal()),
+                click: () => this.zone.run(() => tabHeader && tabHeader.showRenameTabModal()),
             },
             {
                 label: 'Duplicate',
@@ -86,7 +86,7 @@ export class CommonOptionsContextMenu extends TabContextMenuItemProvider {
             },
             {
                 label: 'Color',
-                sublabel: COLORS.find(x => x.value === tab.color).name,
+                sublabel: COLORS.find(x => x.value === tab.color)!.name,
                 submenu: COLORS.map(color => ({
                     label: color.name,
                     type: 'radio',

terminus-core/src/theme.paper.scss

@@ -138,7 +138,7 @@ app-root  {
                 background: transparent;
                 line-height: 42px;
 
-                svg {
+                svg, path {
                     fill: $black;
                     fill-opacity: 0.75;
                 }

terminus-core/src/theme.scss

@@ -230,6 +230,7 @@ settings-tab > ngb-tabset {
 
     & > .nav {
         background: rgba(0, 0, 0, 0.25);
+        flex-shrink: 0;
 
         & > .nav-item > .nav-link {
             border: none;

terminus-core/webpack.config.js

@@ -4,7 +4,7 @@ module.exports = {
     target: 'node',
     entry: 'src/index.ts',
     context: __dirname,
-    devtool: 'cheap-module-eval-source-map',
+    devtool: 'eval-cheap-module-source-map',
     output: {
         path: path.resolve(__dirname, 'dist'),
         filename: 'index.js',

terminus-core/yarn.lock

@@ -7,6 +7,11 @@
   resolved "https://registry.yarnpkg.com/@types/js-yaml/-/js-yaml-3.12.1.tgz#5c6f4a1eabca84792fbd916f0cb40847f123c656"
   integrity sha512-SGGAhXLHDx+PK4YLNcNGa6goPf9XRWQNAUUbffkwVGGXIxmDKWyGGL4inzq2sPmExu431Ekb9aEMn9BkPqEYFA==
 
+"@types/semver@^6.0.2":
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-6.2.0.tgz#d688d574400d96c5b0114968705366f431831e1a"
+  integrity sha512-1OzrNb4RuAzIT7wHSsgZRlMBlNsJl+do6UblR7JMW4oB7bbR+uBEYtUh7gEc/jM84GGilh68lSOokyM/zNUlBA==
+
 "@types/shell-escape@^0.2.0":
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/@types/shell-escape/-/shell-escape-0.2.0.tgz#cd2f0df814388599dd07196dcc510de2669d1ed2"
@@ -19,17 +24,17 @@
   dependencies:
     winston "*"
 
-agent-base@^4.1.0:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.2.1.tgz#d89e5999f797875674c07d87f260fc41e83e8ca9"
-  integrity sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==
+agent-base@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz#8165f01c436009bccad0b1d122f05ed770efc6ee"
+  integrity sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==
   dependencies:
     es6-promisify "^5.0.0"
 
 argparse@^1.0.7:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.9.tgz#73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86"
-  integrity sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY=
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
+  integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
   dependencies:
     sprintf-js "~1.0.2"
 
@@ -48,36 +53,17 @@ axios@^0.19.0:
     follow-redirects "1.5.10"
     is-buffer "^2.0.2"
 
-bluebird-lst@^1.0.6, bluebird-lst@^1.0.7:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/bluebird-lst/-/bluebird-lst-1.0.8.tgz#61b572e8b3eb57e0fff676a0e54566d93597e6a4"
-  integrity sha512-InUDOaBaIjIobOa3O4YRAbFgff907uTJZXW0m0rhk3zhVZ4GvsmdCLEAKC1CTWTtUWCM8iWTTfFX9N/xQR/etw==
-  dependencies:
-    bluebird "^3.5.4"
-
-bluebird@^3.5.4:
-  version "3.5.5"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.5.tgz#a8d0afd73251effbbd5fe384a77d73003c17a71f"
-  integrity sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w==
-
 bootstrap@^4.1.3:
   version "4.3.1"
   resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.3.1.tgz#280ca8f610504d99d7b6b4bfc4b68cec601704ac"
   integrity sha512-rXqOmH1VilAt2DyPzluTi2blhk17bO7ef+zLLPlWvG494pDxcM234pJ8wTc/6R40UWizAIIMgxjvxZg5kmsbag==
 
-buffer-from@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
-  integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
-
-builder-util-runtime@~8.1.0:
-  version "8.1.1"
-  resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.1.1.tgz#f2f6fc43e33d26892bd491667fc746ad69bccc50"
-  integrity sha512-+ieS4PMB33vVE2S3ZNWBEQJ1zKmAs/agrBdh7XadE1lKLjrH4aXYuOh9OOGdxqIRldhlhNBaF+yKMMEFOdNVig==
+builder-util-runtime@8.4.0:
+  version "8.4.0"
+  resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.4.0.tgz#3163fffc078e6b8f3dd5b6eb12a8345573590682"
+  integrity sha512-CJB/eKfPf2vHrkmirF5eicVnbDCkMBbwd5tRYlTlgud16zFeqD7QmrVUAOEXdnsrcNkiLg9dbuUsQKtl/AwsYQ==
   dependencies:
-    bluebird-lst "^1.0.6"
     debug "^4.1.1"
-    fs-extra-p "^7.0.0"
     sax "^1.2.4"
 
 color-convert@^1.9.1:
@@ -132,9 +118,9 @@ colorspace@1.1.x:
     text-hex "1.0.x"
 
 core-js@^3.1.2:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.2.0.tgz#0a835fdf6aa677fff83a823a7b5276c9e7cebb76"
-  integrity sha512-gybgLzmr7SQRSF6UzGYXducx4eE10ONQlyEnQoqiGPbmbn7zLkb73tPfc4YbZN0lvcTQwoLNPjq4RuCaCumGyQ==
+  version "3.4.2"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.4.2.tgz#ee2b1a60b50388d8ddcda8cdb44a92c7a9ea76df"
+  integrity sha512-bUTfqFWtNKWp73oNIfRkqwYZJeNT3lstzZcAkhhiuvDraRSgOH1/+F9ZklbpR4zpdKuo4cpXN8tKP7s61yjX+g==
 
 core-util-is@~1.0.0:
   version "1.0.2"
@@ -162,10 +148,10 @@ debug@^4.1.1:
   dependencies:
     ms "^2.1.1"
 
-deepmerge@^3.2.0:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-3.2.1.tgz#76a1f47854bcfcd66ee9a948d110540a8e12b261"
-  integrity sha512-+hbDSzTqEW0fWgnlKksg7XAOtT+ddZS5lHZJ6f6MdixRs9wQy+50fm1uUCVb1IkvjLUYX/SfFO021ZNwriURTw==
+deepmerge@^4.1.1:
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955"
+  integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==
 
 diagnostics@^1.1.1:
   version "1.1.1"
@@ -177,19 +163,18 @@ diagnostics@^1.1.1:
     kuler "1.0.x"
 
 electron-updater@^4.0.6:
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-4.0.6.tgz#9c4f495ae0e80bf4425e3e1b801c5ed2ab933c2d"
-  integrity sha512-JPGLME6fxJcHG8hX7HWFl6Aew6iVm0DkcrENreKa5SUJCHG+uUaAhxDGDt+YGcNkyx1uJ6eBGMvFxDTLUv67pg==
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-4.2.0.tgz#f9ecfc657f65ead737d42b9efecf628d3756b550"
+  integrity sha512-GuS3g7HDh17x/SaFjxjswlWUaKHczksYkV2Xc5CKj/bZH0YCvTSHtOmnBAdAmCk99u/71p3zP8f0jIqDfGcjww==
   dependencies:
-    bluebird-lst "^1.0.6"
-    builder-util-runtime "~8.1.0"
-    fs-extra-p "^7.0.0"
-    js-yaml "^3.12.0"
-    lazy-val "^1.0.3"
+    "@types/semver" "^6.0.2"
+    builder-util-runtime "8.4.0"
+    fs-extra "^8.1.0"
+    js-yaml "^3.13.1"
+    lazy-val "^1.0.4"
     lodash.isequal "^4.5.0"
-    pako "^1.0.7"
-    semver "^5.6.0"
-    source-map-support "^0.5.9"
+    pako "^1.0.10"
+    semver "^6.3.0"
 
 enabled@1.0.x:
   version "1.0.2"
@@ -216,9 +201,9 @@ es6-promisify@^5.0.0:
     es6-promise "^4.0.3"
 
 esprima@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.0.tgz#4499eddcd1110e0b218bacf2fa7f7f59f55ca804"
-  integrity sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw==
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
+  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
 
 fast-safe-stringify@^2.0.4:
   version "2.0.6"
@@ -237,34 +222,26 @@ follow-redirects@1.5.10:
   dependencies:
     debug "=3.1.0"
 
-fs-extra-p@^7.0.0:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/fs-extra-p/-/fs-extra-p-7.0.1.tgz#4eec0b6dfa150fa90f6ddd773b4fb1d55cad54e3"
-  integrity sha512-yhd2OV0HnHt2oitlp+X9hl2ReX4X/7kQeL7/72qzPHTZj5eUPGzAKOvEglU02Fa1OeG2rSy/aKB4WGVaLiF8tw==
+fs-extra@^8.1.0:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"
+  integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==
   dependencies:
-    bluebird-lst "^1.0.7"
-    fs-extra "^7.0.1"
-
-fs-extra@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9"
-  integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==
-  dependencies:
-    graceful-fs "^4.1.2"
+    graceful-fs "^4.2.0"
     jsonfile "^4.0.0"
     universalify "^0.1.0"
 
-graceful-fs@^4.1.2, graceful-fs@^4.1.6:
-  version "4.1.11"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
-  integrity sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=
+graceful-fs@^4.1.6, graceful-fs@^4.2.0:
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.2.tgz#6f0952605d0140c1cfdb138ed005775b92d67b02"
+  integrity sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==
 
-https-proxy-agent@2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.1.tgz#51552970fa04d723e04c56d04178c3f92592bbc0"
-  integrity sha512-HPCTS1LW51bcyMYbxUIOO4HEOlQ1/1qRaFWcyxvwaqUS9TY88aoEuHUY33kuAh1YhVVaDQhLZsnPd+XNARWZlQ==
+https-proxy-agent@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-3.0.0.tgz#0106efa5d63d6d6f3ab87c999fa4877a3fd1ff97"
+  integrity sha512-y4jAxNEihqvBI5F3SaO2rtsjIOnnNA8sEbuiP+UhJZJHeM2NRm6c09ax2tgqme+SgUUvjao2fJXF4h3D6Cb2HQ==
   dependencies:
-    agent-base "^4.1.0"
+    agent-base "^4.3.0"
     debug "^3.1.0"
 
 inherits@^2.0.3, inherits@~2.0.3:
@@ -292,7 +269,7 @@ isarray@~1.0.0:
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
   integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
 
-js-yaml@^3.12.0, js-yaml@^3.9.0:
+js-yaml@^3.13.1, js-yaml@^3.9.0:
   version "3.13.1"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
   integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
@@ -314,7 +291,7 @@ kuler@1.0.x:
   dependencies:
     colornames "^1.1.1"
 
-lazy-val@^1.0.3:
+lazy-val@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.4.tgz#882636a7245c2cfe6e0a4e3ba6c5d68a137e5c65"
   integrity sha512-u93kb2fPbIrfzBuLjZE+w+fJbUUMhNDXxNmMfaqNgpfQf1CO5ZSe2LfsnBqVAk7i/2NF48OSoRj+Xe2VT+lE8Q==
@@ -341,11 +318,11 @@ logform@^2.1.1:
     triple-beam "^1.3.0"
 
 mixpanel@^0.10.2:
-  version "0.10.2"
-  resolved "https://registry.yarnpkg.com/mixpanel/-/mixpanel-0.10.2.tgz#10ff6cd76034b262d469094ad3d8c99039345376"
-  integrity sha512-+zbBQGd/Q5LLRooqJ2iyEDzKz2/ly4TipH5tE9te0BDMJpROxUMGffPulyHbh4FtMcbJuPmIUSIfy//JhhnlnA==
+  version "0.10.3"
+  resolved "https://registry.yarnpkg.com/mixpanel/-/mixpanel-0.10.3.tgz#2dff3bc0e17b57d6365547d315cbbf3ecfdb8a00"
+  integrity sha512-wIYr5o+1XSzJ80o3QED35K/yfPAKi5FigZXTSfcs4vltfeKbilIjNgwxdno7LrqzhjoSjmIyDWkI7D3lr7TwDw==
   dependencies:
-    https-proxy-agent "2.2.1"
+    https-proxy-agent "3.0.0"
 
 ms@2.0.0:
   version "2.0.0"
@@ -353,37 +330,37 @@ ms@2.0.0:
   integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
 
 ms@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
-  integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
+  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
 ng2-dnd@^5.0.2:
   version "5.0.2"
   resolved "https://registry.yarnpkg.com/ng2-dnd/-/ng2-dnd-5.0.2.tgz#862278ac7dedfa14f5783bbf34014d5d73dfefb4"
   integrity sha512-5mWWBePwvEPsNd/HkdbD543Q9mPyJofL6zkNydl8/Ah3qrrvZT2DaEPbknY08OgkXpI2qUGksc01OzzVlRQ9dQ==
 
-ngx-perfect-scrollbar@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/ngx-perfect-scrollbar/-/ngx-perfect-scrollbar-6.0.0.tgz#92b51957c04ed6a6d416beca2707bab005667b68"
-  integrity sha512-x4bzfI7AmeZubUN+tJJ99GYniSgHLJbTAg3ecbWd8dG6z59efgx4yxUjN1sDh7UYgimtg3w857qXEZJW/USAhA==
+ngx-perfect-scrollbar@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/ngx-perfect-scrollbar/-/ngx-perfect-scrollbar-8.0.0.tgz#19c1bbf9b1a36d89b00a68f7834e39427d29182f"
+  integrity sha512-IXoFbULQnxyJj0gdCcKCLE/6OW9HCP9KARzMCKS1kNxTuzG4DghjM2AaCBRM5/sFwdbn6rqOKMCINtHA8W8YCA==
   dependencies:
-    perfect-scrollbar "^1.3.0"
-    resize-observer-polyfill "^1.4.0"
+    perfect-scrollbar "^1.4.0"
+    resize-observer-polyfill "^1.5.0"
 
 one-time@0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/one-time/-/one-time-0.0.4.tgz#f8cdf77884826fe4dff93e3a9cc37b1e4480742e"
   integrity sha1-+M33eISCb+Tf+T46nMN7HkSAdC4=
 
-pako@^1.0.7:
+pako@^1.0.10:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.10.tgz#4328badb5086a426aa90f541977d4955da5c9732"
   integrity sha512-0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw==
 
-perfect-scrollbar@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/perfect-scrollbar/-/perfect-scrollbar-1.3.0.tgz#61da56f94b58870d8e0a617bce649cee17d1e3b2"
-  integrity sha512-7Ub8YOvZB5k+pTy0K3LYUDnH9Xl3qvHcclJyIX+AV5UxHxll146iVGq4rtc+848nTDBQq89J7QxKKMA++cTXzQ==
+perfect-scrollbar@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/perfect-scrollbar/-/perfect-scrollbar-1.4.0.tgz#5d014ef9775e1f43058a1dbae9ed1daf0e7091f1"
+  integrity sha512-/2Sk/khljhdrsamjJYS5NjrH+GKEHEwh7zFSiYyxROyYKagkE4kSn2zDQDRTOMo8mpT2jikxx6yI1dG7lNP/hw==
 
 process-nextick-args@~2.0.0:
   version "2.0.0"
@@ -412,10 +389,10 @@ readable-stream@^3.1.1:
     string_decoder "^1.1.1"
     util-deprecate "^1.0.1"
 
-resize-observer-polyfill@^1.4.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.0.tgz#660ff1d9712a2382baa2cad450a4716209f9ca69"
-  integrity sha512-M2AelyJDVR/oLnToJLtuDJRBBWUGUvvGigj1411hXhAdyFWqMaqHp7TixW3FpiLuVaikIcR1QL+zqoJoZlOgpg==
+resize-observer-polyfill@^1.5.0:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz#0e9020dd3d21024458d4ebd27e23e40269810464"
+  integrity sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==
 
 safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
@@ -427,10 +404,10 @@ sax@^1.2.4:
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
   integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
 
-semver@^5.6.0:
-  version "5.7.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b"
-  integrity sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==
+semver@^6.3.0:
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
+  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
 shell-escape@^0.2.0:
   version "0.2.0"
@@ -444,19 +421,6 @@ simple-swizzle@^0.2.2:
   dependencies:
     is-arrayish "^0.3.1"
 
-source-map-support@^0.5.9:
-  version "0.5.12"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.12.tgz#b4f3b10d51857a5af0138d3ce8003b201613d599"
-  integrity sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==
-  dependencies:
-    buffer-from "^1.0.0"
-    source-map "^0.6.0"
-
-source-map@^0.6.0:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
-  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
-
 sprintf-js@~1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
@@ -492,9 +456,9 @@ triple-beam@^1.2.0, triple-beam@^1.3.0:
   integrity sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw==
 
 universalify@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.1.tgz#fa71badd4437af4c148841e3b3b165f9e9e590b7"
-  integrity sha1-+nG63UQ3r0wUiEHjs7Fl+enlkLc=
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
+  integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
 
 util-deprecate@^1.0.1, util-deprecate@~1.0.1:
   version "1.0.2"
@@ -502,9 +466,9 @@ util-deprecate@^1.0.1, util-deprecate@~1.0.1:
   integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
 
 uuid@^3.3.2:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
-  integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==
+  version "3.3.3"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.3.tgz#4568f0216e78760ee1dbf3a4d2cf53e224112866"
+  integrity sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ==
 
 winston-transport@^4.3.0:
   version "4.3.0"

terminus-plugin-manager/package.json

@@ -1,6 +1,6 @@
 {
   "name": "terminus-plugin-manager",
-  "version": "1.0.83-nightly.0",
+  "version": "1.0.93-nightly.0",
   "description": "Terminus' plugin manager",
   "keywords": [
     "terminus-builtin-plugin"
@@ -17,11 +17,9 @@
   "author": "Eugene Pankov",
   "license": "MIT",
   "devDependencies": {
-    "@types/mz": "0.0.32",
     "@types/semver": "^6.0.0",
     "axios": "^0.19.0",
     "mz": "^2.6.0",
-    "ngx-pipes": "^1.6.1",
     "semver": "^6.1.0"
   },
   "peerDependencies": {

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

@@ -8,9 +8,9 @@
     button.btn.btn-outline-info.btn-sm.ml-auto((click)='openPluginsFolder()')
         i.fas.fa-folder
         span Plugins folder
-    
+
 .list-group.list-group-flush.mt-2
-    .list-group-item.d-flex.align-items-center(*ngFor='let plugin of pluginManager.installedPlugins|orderBy:"name"')
+    .list-group-item.d-flex.align-items-center(*ngFor='let plugin of pluginManager.installedPlugins')
         .mr-auto.d-flex.flex-column
             div
                 strong {{plugin.name}}
@@ -33,15 +33,15 @@
             (click)='enablePlugin(plugin)'
         )
             i.fas.fa-fw.fa-play
-                
+
         button.btn.btn-secondary.ml-2(
             *ngIf='!config.store.pluginBlacklist.includes(plugin.name)',
             (click)='disablePlugin(plugin)'
         )
             i.fas.fa-fw.fa-pause
-            
+
         button.btn.btn-danger.ml-2(
-            (click)='uninstallPlugin(plugin)', 
+            (click)='uninstallPlugin(plugin)',
             *ngIf='!plugin.isBuiltin',
             [disabled]='busy[plugin.name] != undefined'
         )
@@ -65,7 +65,7 @@ div
 
 
     .list-group.list-group-flush.mb-4(*ngIf='availablePlugins$')
-        ng-container(*ngFor='let plugin of (availablePlugins$|async|orderBy:"name")')
+        ng-container(*ngFor='let plugin of (availablePlugins$|async)')
             .list-group-item.d-flex.align-items-center(*ngIf='!isAlreadyInstalled(plugin)')
                 button.btn.btn-primary.mr-3(
                     (click)='installPlugin(plugin)',
@@ -73,7 +73,7 @@ div
                 )
                     i.fas.fa-fw.fa-download(*ngIf='busy[plugin.name] != BusyState.Installing')
                     i.fas.fa-fw.fa-circle-notch.fa-spin(*ngIf='busy[plugin.name] == BusyState.Installing')
-                
+
                 div((click)='showPluginInfo(plugin)')
                     div
                         strong {{plugin.name}}

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

@@ -1,5 +1,5 @@
 import { BehaviorSubject, Observable } from 'rxjs'
-import { debounceTime, distinctUntilChanged, first, tap, flatMap } from 'rxjs/operators'
+import { debounceTime, distinctUntilChanged, first, tap, flatMap, map } from 'rxjs/operators'
 import * as semver from 'semver'
 
 import { Component, Input } from '@angular/core'
@@ -18,7 +18,7 @@ export class PluginsSettingsTabComponent {
     @Input() availablePlugins$: Observable<PluginInfo[]>
     @Input() availablePluginsQuery$ = new BehaviorSubject<string>('')
     @Input() availablePluginsReady = false
-    @Input() knownUpgrades: {[id: string]: PluginInfo} = {}
+    @Input() knownUpgrades: {[id: string]: PluginInfo|null} = {}
     @Input() busy: {[id: string]: BusyState} = {}
     @Input() erroredPlugin: string
     @Input() errorMessage: string
@@ -43,9 +43,12 @@ export class PluginsSettingsTabComponent {
                     }))
                 })
             )
-        this.availablePlugins$.pipe(first()).subscribe(available => {
+        this.availablePlugins$.pipe(first(), map((plugins: PluginInfo[]) => {
+            plugins.sort((a, b) => a.name > b.name ? 1 : -1)
+            return plugins
+        })).subscribe(available => {
             for (const plugin of this.pluginManager.installedPlugins) {
-                this.knownUpgrades[plugin.name] = available.find(x => x.name === plugin.name && semver.gt(x.version, plugin.version))
+                this.knownUpgrades[plugin.name] = available.find(x => x.name === plugin.name && semver.gt(x.version, plugin.version)) || null
             }
         })
     }
@@ -91,7 +94,7 @@ export class PluginsSettingsTabComponent {
     }
 
     async upgradePlugin (plugin: PluginInfo): Promise<void> {
-        return this.installPlugin(this.knownUpgrades[plugin.name])
+        return this.installPlugin(this.knownUpgrades[plugin.name]!)
     }
 
     showPluginInfo (plugin: PluginInfo) {

terminus-plugin-manager/src/index.ts

@@ -1,7 +1,6 @@
 import { NgModule } from '@angular/core'
 import { BrowserModule } from '@angular/platform-browser'
 import { FormsModule } from '@angular/forms'
-import { NgPipesModule } from 'ngx-pipes'
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap'
 
 import { SettingsTabProvider } from 'terminus-settings'
@@ -15,7 +14,6 @@ import { PluginsSettingsTabProvider } from './settings'
         BrowserModule,
         FormsModule,
         NgbModule,
-        NgPipesModule,
     ],
     providers: [
         { provide: SettingsTabProvider, useClass: PluginsSettingsTabProvider, multi: true },

terminus-plugin-manager/webpack.config.js

@@ -4,7 +4,7 @@ module.exports = {
     target: 'node',
     entry: 'src/index.ts',
     context: __dirname,
-    devtool: 'cheap-module-eval-source-map',
+    devtool: 'eval-cheap-module-source-map',
     output: {
         path: path.resolve(__dirname, 'dist'),
         filename: 'index.js',
@@ -26,7 +26,7 @@ module.exports = {
                 test: /\.ts$/,
                 use: {
                     loader: 'awesome-typescript-loader',
-                    query: {
+                    options: {
                         configFileName: path.resolve(__dirname, 'tsconfig.json'),
                         typeRoots: [
                             path.resolve(__dirname, 'node_modules/@types'),

terminus-plugin-manager/yarn.lock

@@ -2,22 +2,10 @@
 # yarn lockfile v1
 
 
-"@types/mz@0.0.32":
-  version "0.0.32"
-  resolved "https://registry.yarnpkg.com/@types/mz/-/mz-0.0.32.tgz#e8248b4e41424c052edc1725dd33650c313a3659"
-  integrity sha512-cy3yebKhrHuOcrJGkfwNHhpTXQLgmXSv1BX+4p32j+VUQ6aP2eJ5cL7OvGcAQx75fCTFaAIIAKewvqL+iwSd4g==
-  dependencies:
-    "@types/node" "*"
-
-"@types/node@*":
-  version "12.0.10"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.0.10.tgz#51babf9c7deadd5343620055fc8aff7995c8b031"
-  integrity sha512-LcsGbPomWsad6wmMNv7nBLw7YYYyfdYcz6xryKYQhx89c3XXan+8Q6AJ43G5XDIaklaVkK3mE4fCb0SBvMiPSQ==
-
 "@types/semver@^6.0.0":
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-6.0.1.tgz#a984b405c702fa5a7ec6abc56b37f2ba35ef5af6"
-  integrity sha512-ffCdcrEE5h8DqVxinQjo+2d1q+FV5z7iNtPofw3JsrltSoSVlOGaW0rY8XxtO9XukdTn8TaCGWmk2VFGhI70mg==
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-6.2.0.tgz#d688d574400d96c5b0114968705366f431831e1a"
+  integrity sha512-1OzrNb4RuAzIT7wHSsgZRlMBlNsJl+do6UblR7JMW4oB7bbR+uBEYtUh7gEc/jM84GGilh68lSOokyM/zNUlBA==
 
 any-promise@^1.0.0:
   version "1.3.0"
@@ -65,20 +53,15 @@ mz@^2.6.0:
     object-assign "^4.0.1"
     thenify-all "^1.0.0"
 
-ngx-pipes@^1.6.1:
-  version "1.6.6"
-  resolved "https://registry.yarnpkg.com/ngx-pipes/-/ngx-pipes-1.6.6.tgz#32bb80906c220f1e84d5cce7d6dae002cffead4b"
-  integrity sha512-mRV0xOZDd6/Jlvti4W0pDepZRIHLHd3kZ6ZzdqyGCU0dxbKVWWLTR1jlNlxN1ruMk8eO0Y8lNh6a1bEW7dJP1w==
-
 object-assign@^4.0.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
   integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
 
 semver@^6.1.0:
-  version "6.1.2"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-6.1.2.tgz#079960381376a3db62eb2edc8a3bfb10c7cfe318"
-  integrity sha512-z4PqiCpomGtWj8633oeAdXm1Kn1W++3T8epkZYnwiVgIYIJ0QHszhInYSJTYxebByQH7KVCEAn8R9duzZW2PhQ==
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
+  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
 thenify-all@^1.0.0:
   version "1.6.0"

terminus-settings/package.json

@@ -1,6 +1,6 @@
 {
   "name": "terminus-settings",
-  "version": "1.0.83-nightly.4",
+  "version": "1.0.93-nightly.0",
   "description": "Terminus terminal settings page",
   "keywords": [
     "terminus-builtin-plugin"
@@ -17,8 +17,7 @@
   "author": "Eugene Pankov",
   "license": "MIT",
   "devDependencies": {
-    "@types/deep-equal": "1.0.1",
-    "ngx-pipes": "^1.6.1"
+    "@types/deep-equal": "1.0.1"
   },
   "peerDependencies": {
     "@angular/common": "^7",
@@ -26,7 +25,7 @@
     "@angular/forms": "^7",
     "@angular/platform-browser": "^7",
     "@ng-bootstrap/ng-bootstrap": "^1",
-    "terminus-core": "*",
-    "rxjs": "^5"
+    "rxjs": "^5",
+    "terminus-core": "*"
   }
 }

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

@@ -41,8 +41,8 @@ export class HotkeyInputModalComponent {
     @Input() timeoutProgress = 0
 
     private keySubscription: Subscription
-    private lastKeyEvent: number
-    private keyTimeoutInterval: number = null
+    private lastKeyEvent: number|null = null
+    private keyTimeoutInterval: number|null = null
 
     constructor (
         private modalInstance: NgbActiveModal,
@@ -78,7 +78,7 @@ export class HotkeyInputModalComponent {
         this.keySubscription.unsubscribe()
         this.hotkeys.clearCurrentKeystrokes()
         this.hotkeys.enable()
-        clearInterval(this.keyTimeoutInterval)
+        clearInterval(this.keyTimeoutInterval!)
     }
 
     close () {

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

@@ -8,14 +8,14 @@ ngb-tabset.vertical(type='pills', [activeId]='activeTab')
         ng-template(ngbTabContent)
             .d-flex.align-items-center.mb-4
                 h1.terminus-title.mb-2.mr-2 Terminus
-                    sup α 
-                
+                    sup α
+
                 .text-muted.mr-auto {{homeBase.appVersion}}
-                            
+
                 button.btn.btn-secondary.mr-3((click)='homeBase.openGitHub()')
                     i.fab.fa-github
                     span GitHub
-                    
+
                 button.btn.btn-secondary((click)='homeBase.reportBug()')
                     i.fas.fa-bug
                     span Report a problem
@@ -57,7 +57,7 @@ ngb-tabset.vertical(type='pills', [activeId]='activeTab')
                     .title(*ngIf='hostApp.platform === Platform.Windows') Acrylic background
                     .title(*ngIf='hostApp.platform === Platform.macOS') Vibrancy
                     .description Gives the window a blurred transparent background
-                    
+
                 toggle(
                     [(ngModel)]='config.store.appearance.vibrancy',
                     (ngModelChange)='config.save()'
@@ -85,7 +85,7 @@ ngb-tabset.vertical(type='pills', [activeId]='activeTab')
                             [value]='"fluent"'
                         )
                         | Fluent
-                    
+
             .form-line
                 .header
                     .title Transparency
@@ -256,27 +256,28 @@ ngb-tabset.vertical(type='pills', [activeId]='activeTab')
             | Hotkeys
         ng-template(ngbTabContent)
             h3.mb-3 Hotkeys
-            
+
             .input-group.mb-4
                 .input-group-prepend
                     .input-group-text
                         i.fas.fa-fw.fa-search
                 input.form-control(type='search', placeholder='Search hotkeys', [(ngModel)]='hotkeyFilter')
-                            
+
             .form-group
                 table.hotkeys-table
                     tr
                         th Name
                         th ID
                         th Hotkey
-                    tr(*ngFor='let hotkey of hotkeyDescriptions|filterBy:["name"]:hotkeyFilter')
-                        td {{hotkey.name}}
-                        td {{hotkey.id}}
-                        td.pr-5
-                            multi-hotkey-input(
-                                [model]='getHotkey(hotkey.id)',
-                                (modelChange)='setHotkey(hotkey.id, $event); config.save(); docking.dock()'
-                            )
+                    ng-container(*ngFor='let hotkey of hotkeyDescriptions')
+                        tr(*ngIf='!hotkeyFilter || hotkey.name.toLowerCase().includes(hotkeyFilter.toLowerCase())')
+                            td {{hotkey.name}}
+                            td {{hotkey.id}}
+                            td.pr-5
+                                multi-hotkey-input(
+                                    [model]='getHotkey(hotkey.id)',
+                                    (modelChange)='setHotkey(hotkey.id, $event); config.save(); docking.dock()'
+                                )
 
     ngb-tab(*ngFor='let provider of settingsProviders', [id]='provider.id')
         ng-template(ngbTabTitle)
@@ -285,7 +286,7 @@ ngb-tabset.vertical(type='pills', [activeId]='activeTab')
         ng-template(ngbTabContent)
             settings-tab-body([provider]='provider')
 
-                
+
     ngb-tab(id='config-file')
         ng-template(ngbTabTitle)
             i.fas.fa-fw.fa-code.mr-2
@@ -303,7 +304,7 @@ ngb-tabset.vertical(type='pills', [activeId]='activeTab')
                         textarea.form-control.h-100(
                             [(ngModel)]='configDefaults',
                             readonly
-                        )   
+                        )
                 .mt-2.mb-2.d-flex
                     button.btn.btn-primary((click)='saveConfigFile()', *ngIf='isConfigFileValid()')
                         i.fas.fa-check.mr-2

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

@@ -1,12 +1,12 @@
 :host /deep/ ngb-tabset {
     flex: auto;
     display: flex;
+    height: 100%;
 }
 
 :host /deep/ ngb-tabset > .nav {
-    display: flex;
-    flex-direction: column;
-    flex: none;
+    display: block;
+    overflow-y: auto;
 }
 
 :host /deep/ ngb-tabset > .tab-content {

terminus-settings/src/index.ts

@@ -2,7 +2,6 @@ import { NgModule } from '@angular/core'
 import { BrowserModule } from '@angular/platform-browser'
 import { FormsModule } from '@angular/forms'
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap'
-import { NgPipesModule } from 'ngx-pipes'
 
 import TerminusCorePlugin, { ToolbarButtonProvider, TabRecoveryProvider, HotkeyProvider, ConfigProvider } from 'terminus-core'
 
@@ -22,7 +21,6 @@ import { SettingsConfigProvider } from './config'
         BrowserModule,
         FormsModule,
         NgbModule,
-        NgPipesModule,
         TerminusCorePlugin,
     ],
     providers: [

terminus-settings/src/recoveryProvider.ts

@@ -6,7 +6,7 @@ import { SettingsTabComponent } from './components/settingsTab.component'
 /** @hidden */
 @Injectable()
 export class RecoveryProvider extends TabRecoveryProvider {
-    async recover (recoveryToken: any): Promise<RecoveredTab> {
+    async recover (recoveryToken: any): Promise<RecoveredTab|null> {
         if (recoveryToken && recoveryToken.type === 'app:settings') {
             return { type: SettingsTabComponent }
         }

terminus-settings/webpack.config.js

@@ -4,7 +4,7 @@ module.exports = {
     target: 'node',
     entry: 'src/index.ts',
     context: __dirname,
-    devtool: 'cheap-module-eval-source-map',
+    devtool: 'eval-cheap-module-source-map',
     output: {
         path: path.resolve(__dirname, 'dist'),
         filename: 'index.js',

terminus-settings/yarn.lock

@@ -6,8 +6,3 @@
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@types/deep-equal/-/deep-equal-1.0.1.tgz#71cfabb247c22bcc16d536111f50c0ed12476b03"
   integrity sha512-mMUu4nWHLBlHtxXY17Fg6+ucS/MnndyOWyOe7MmwkoMYxvfQU2ajtRaEvqSUv+aVkMqH/C0NCI8UoVfRNQ10yg==
-
-ngx-pipes@^1.6.1:
-  version "1.6.6"
-  resolved "https://registry.yarnpkg.com/ngx-pipes/-/ngx-pipes-1.6.6.tgz#32bb80906c220f1e84d5cce7d6dae002cffead4b"
-  integrity sha512-mRV0xOZDd6/Jlvti4W0pDepZRIHLHd3kZ6ZzdqyGCU0dxbKVWWLTR1jlNlxN1ruMk8eO0Y8lNh6a1bEW7dJP1w==

terminus-ssh/package.json

@@ -1,6 +1,6 @@
 {
   "name": "terminus-ssh",
-  "version": "1.0.83-nightly.0",
+  "version": "1.0.93-nightly.0",
   "description": "SSH connection manager for Terminus",
   "keywords": [
     "terminus-builtin-plugin"
@@ -17,6 +17,7 @@
   "author": "Eugene Pankov",
   "license": "MIT",
   "devDependencies": {
+    "@types/node": "12.7.3",
     "@types/ssh2": "^0.5.35",
     "ssh2": "^0.8.2",
     "ssh2-streams": "^0.4.2"
@@ -30,8 +31,5 @@
     "terminus-core": "*",
     "terminus-settings": "*",
     "terminus-terminal": "*"
-  },
-  "optionalDependencies": {
-    "windows-process-tree": "^0.2.4"
   }
 }

terminus-ssh/src/api.ts

@@ -1,7 +1,7 @@
 import { BaseSession } from 'terminus-terminal'
 
 export interface LoginScript {
-    expect?: string
+    expect: string
     send: string
     isRegex?: boolean
     optional?: boolean
@@ -15,7 +15,7 @@ export enum SSHAlgorithmType {
 }
 
 export interface SSHConnection {
-    name?: string
+    name: string
     host: string
     port: number
     user: string
@@ -122,7 +122,7 @@ export class SSHSession extends BaseSession {
         this.kill('TERM')
     }
 
-    async getWorkingDirectory (): Promise<string> {
+    async getWorkingDirectory (): Promise<string|null> {
         return null
     }
 

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

@@ -79,20 +79,21 @@ export class EditConnectionModalComponent {
     }
 
     selectPrivateKey () {
-        const path = this.electron.dialog.showOpenDialog(
+        this.electron.dialog.showOpenDialog(
             this.hostApp.getWindow(),
             {
                 title: 'Select private key',
             }
-        )
-        if (path) {
-            this.connection.privateKey = path[0]
-        }
+        ).then(result => {
+            if (result.filePaths) {
+                this.connection.privateKey = result.filePaths[0]
+            }
+        })
     }
 
     save () {
         for (const k of Object.values(SSHAlgorithmType)) {
-            this.connection.algorithms[k] = Object.entries(this.algorithms[k])
+            this.connection.algorithms![k] = Object.entries(this.algorithms[k])
                 .filter(([_k, v]) => !!v)
                 .map(([k, _v]) => k)
         }
@@ -104,6 +105,9 @@ export class EditConnectionModalComponent {
     }
 
     moveScriptUp (script: LoginScript) {
+        if (!this.connection.scripts) {
+            this.connection.scripts = []
+        }
         const index = this.connection.scripts.indexOf(script)
         if (index > 0) {
             this.connection.scripts.splice(index, 1)
@@ -112,6 +116,9 @@ export class EditConnectionModalComponent {
     }
 
     moveScriptDown (script: LoginScript) {
+        if (!this.connection.scripts) {
+            this.connection.scripts = []
+        }
         const index = this.connection.scripts.indexOf(script)
         if (index >= 0 && index < this.connection.scripts.length - 1) {
             this.connection.scripts.splice(index, 1)
@@ -120,7 +127,7 @@ export class EditConnectionModalComponent {
     }
 
     async deleteScript (script: LoginScript) {
-        if ((await this.electron.showMessageBox(
+        if (this.connection.scripts && (await this.electron.showMessageBox(
             this.hostApp.getWindow(),
             {
                 type: 'warning',
@@ -135,6 +142,9 @@ export class EditConnectionModalComponent {
     }
 
     addScript () {
+        if (!this.connection.scripts) {
+            this.connection.scripts = []
+        }
         this.connection.scripts.push({ expect: '', send: '' })
     }
 }

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

@@ -15,7 +15,7 @@ export class SSHModalComponent {
     connections: SSHConnection[]
     childFolders: SSHConnectionGroup[]
     quickTarget: string
-    lastConnection: SSHConnection
+    lastConnection: SSHConnection|null = null
     childGroups: SSHConnectionGroup[]
     groupCollapsed: {[id: string]: boolean} = {}
 
@@ -87,18 +87,18 @@ export class SSHModalComponent {
 
         let connections = this.connections
         if (this.quickTarget) {
-            connections = connections.filter(connection => (connection.name + connection.group).toLowerCase().includes(this.quickTarget))
+            connections = connections.filter((connection: SSHConnection) => (connection.name + connection.group!).toLowerCase().includes(this.quickTarget))
         }
 
         for (const connection of connections) {
-            connection.group = connection.group || null
+            connection.group = connection.group || undefined
             let group = this.childGroups.find(x => x.name === connection.group)
             if (!group) {
                 group = {
-                    name: connection.group,
+                    name: connection.group!,
                     connections: [],
                 }
-                this.childGroups.push(group)
+                this.childGroups.push(group!)
             }
             group.connections.push(connection)
         }

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

@@ -97,7 +97,7 @@ export class SSHSettingsTabComponent {
             }
         )).response === 1) {
             for (const connection of this.connections.filter(x => x.group === group.name)) {
-                connection.group = null
+                connection.group = undefined
             }
             this.config.save()
             this.refresh()
@@ -109,14 +109,14 @@ export class SSHSettingsTabComponent {
         this.childGroups = []
 
         for (const connection of this.connections) {
-            connection.group = connection.group || null
+            connection.group = connection.group || undefined
             let group = this.childGroups.find(x => x.name === connection.group)
             if (!group) {
                 group = {
-                    name: connection.group,
+                    name: connection.group!,
                     connections: [],
                 }
-                this.childGroups.push(group)
+                this.childGroups.push(group!)
             }
             group.connections.push(connection)
         }

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

@@ -6,13 +6,7 @@ import { SSHConnection, SSHSession } from '../api'
 
 /** @hidden */
 @Component({
-    template: `
-        <div
-            #content
-            class="content"
-            [style.opacity]='frontendIsReady ? 1 : 0'
-        ></div>
-    `,
+    template: BaseTerminalTabComponent.template,
     styles: [require('./sshTab.component.scss'), ...BaseTerminalTabComponent.styles],
     animations: BaseTerminalTabComponent.animations,
 })
@@ -46,7 +40,7 @@ export class SSHTabComponent extends BaseTerminalTabComponent {
         this.write(`Connecting to ${this.connection.host}`)
         const interval = setInterval(() => this.write('.'), 500)
         try {
-            await this.ssh.connectSession(this.session, message => {
+            await this.ssh.connectSession(this.session, (message: string) => {
                 this.write('\r\n' + message)
             })
         } catch (e) {

terminus-ssh/src/index.ts

@@ -5,6 +5,7 @@ import { NgbModule } from '@ng-bootstrap/ng-bootstrap'
 import { ToastrModule } from 'ngx-toastr'
 import TerminusCoreModule, { ToolbarButtonProvider, ConfigProvider, TabRecoveryProvider, HotkeyProvider } from 'terminus-core'
 import { SettingsTabProvider } from 'terminus-settings'
+import TerminusTerminalModule from 'terminus-terminal'
 
 import { EditConnectionModalComponent } from './components/editConnectionModal.component'
 import { SSHModalComponent } from './components/sshModal.component'
@@ -26,6 +27,7 @@ import { SSHHotkeyProvider } from './hotkeys'
         FormsModule,
         ToastrModule,
         TerminusCoreModule,
+        TerminusTerminalModule,
     ],
     providers: [
         { provide: ToolbarButtonProvider, useClass: ButtonProvider, multi: true },

terminus-ssh/src/recoveryProvider.ts

@@ -6,7 +6,7 @@ import { SSHTabComponent } from './components/sshTab.component'
 /** @hidden */
 @Injectable()
 export class RecoveryProvider extends TabRecoveryProvider {
-    async recover (recoveryToken: any): Promise<RecoveredTab> {
+    async recover (recoveryToken: any): Promise<RecoveredTab|null> {
         if (recoveryToken && recoveryToken.type === 'app:ssh-tab') {
             return {
                 type: SSHTabComponent,

terminus-ssh/src/services/passwordStorage.service.ts

@@ -12,7 +12,7 @@ export class PasswordStorageService {
         await keytar.deletePassword(`ssh@${connection.host}`, connection.user)
     }
 
-    async loadPassword (connection: SSHConnection): Promise<string> {
+    async loadPassword (connection: SSHConnection): Promise<string|null> {
         return keytar.getPassword(`ssh@${connection.host}`, connection.user)
     }
 }

terminus-ssh/src/services/ssh.service.ts

@@ -38,9 +38,9 @@ export class SSHService {
         ) as SSHTabComponent)
     }
 
-    async connectSession (session: SSHSession, logCallback?: (s: string) => void): Promise<void> {
-        let privateKey: string = null
-        let privateKeyPassphrase: string = null
+    async connectSession (session: SSHSession, logCallback?: (s: any) => void): Promise<void> {
+        let privateKey: string|null = null
+        let privateKeyPassphrase: string|null = null
         let privateKeyPath = session.connection.privateKey
 
         if (!logCallback) {
@@ -48,12 +48,12 @@ export class SSHService {
         }
 
         const log = (s: any) => {
-            logCallback(s)
+            logCallback!(s)
             this.logger.info(s)
         }
 
         if (!privateKeyPath) {
-            const userKeyPath = path.join(process.env.HOME, '.ssh', 'id_rsa')
+            const userKeyPath = path.join(process.env.HOME as string, '.ssh', 'id_rsa')
             if (await fs.exists(userKeyPath)) {
                 log(`Using user's default private key: ${userKeyPath}`)
                 privateKeyPath = userKeyPath
@@ -92,7 +92,7 @@ export class SSHService {
 
         const ssh = new Client()
         let connected = false
-        let savedPassword: string = null
+        let savedPassword: string|null = null
         await new Promise(async (resolve, reject) => {
             ssh.on('ready', () => {
                 connected = true
@@ -116,7 +116,7 @@ export class SSHService {
             ssh.on('keyboard-interactive', (name, instructions, instructionsLang, prompts, finish) => this.zone.run(async () => {
                 log(`Keyboard-interactive auth requested: ${name}`)
                 this.logger.info('Keyboard-interactive auth:', name, instructions, instructionsLang)
-                const results = []
+                const results: string[] = []
                 for (const prompt of prompts) {
                     const modal = this.ngbModal.open(PromptModalComponent)
                     modal.componentInstance.prompt = prompt.prompt
@@ -135,7 +135,7 @@ export class SSHService {
                 log('Banner: \n' + banner)
             })
 
-            let agent: string = null
+            let agent: string|null = null
             if (this.hostApp.platform === Platform.Windows) {
                 const pageantRunning = new Promise<boolean>(resolve => {
                     windowsProcessTreeNative.getProcessList(list => { // eslint-disable-line block-scoped-var
@@ -146,7 +146,7 @@ export class SSHService {
                     agent = 'pageant'
                 }
             } else {
-                agent = process.env.SSH_AUTH_SOCK
+                agent = process.env.SSH_AUTH_SOCK as string
             }
 
             try {
@@ -155,10 +155,10 @@ export class SSHService {
                     port: session.connection.port || 22,
                     username: session.connection.user,
                     password: session.connection.privateKey ? undefined : '',
-                    privateKey,
-                    passphrase: privateKeyPassphrase,
+                    privateKey: privateKey || undefined,
+                    passphrase: privateKeyPassphrase || undefined,
                     tryKeyboard: true,
-                    agent,
+                    agent: agent || undefined,
                     agentForward: !!agent,
                     keepaliveInterval: session.connection.keepaliveInterval,
                     keepaliveCountMax: session.connection.keepaliveCountMax,

terminus-ssh/webpack.config.js

@@ -4,7 +4,7 @@ module.exports = {
     target: 'node',
     entry: 'src/index.ts',
     context: __dirname,
-    devtool: 'cheap-module-eval-source-map',
+    devtool: 'eval-cheap-module-source-map',
     output: {
         path: path.resolve(__dirname, 'dist'),
         filename: 'index.js',

terminus-ssh/yarn.lock

@@ -3,9 +3,14 @@
 
 
 "@types/node@*":
-  version "9.3.0"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-9.3.0.tgz#3a129cda7c4e5df2409702626892cb4b96546dd5"
-  integrity sha512-wNBfvNjzsJl4tswIZKXCFQY0lss9nKUyJnG6T94X/eqjRgI2jHZ4evdjhQYBSan/vGtF6XVXPApOmNH2rf0KKw==
+  version "12.7.12"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.7.12.tgz#7c6c571cc2f3f3ac4a59a5f2bd48f5bdbc8653cc"
+  integrity sha512-KPYGmfD0/b1eXurQ59fXD1GBzhSQfz6/lKBxkaHX9dKTzjXbK68Zt7yGUxUsCS1jeTy/8aL+d9JEr+S54mpkWQ==
+
+"@types/node@12.7.3":
+  version "12.7.3"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.7.3.tgz#27b3f40addaf2f580459fdb405222685542f907a"
+  integrity sha512-3SiLAIBkDWDg6vFo0+5YJyHPWU9uwu40Qe+v+0MH8wRKYBimHvvAOyk3EzMrD/TrIlLYfXrqDqrg913PynrMJQ==
 
 "@types/ssh2-streams@*":
   version "0.1.2"
@@ -15,9 +20,9 @@
     "@types/node" "*"
 
 "@types/ssh2@^0.5.35":
-  version "0.5.38"
-  resolved "https://registry.yarnpkg.com/@types/ssh2/-/ssh2-0.5.38.tgz#71f7c8f1d0636663158561af103c385ad439c7bc"
-  integrity sha512-rMnCnd0VIEUpCD1O5V50L1I8asHMBHZUYBnG6wlim1SdUrKUn60yiNpW5BnnT6QkTExaUXVrM8N883ZPPEPtsg==
+  version "0.5.39"
+  resolved "https://registry.yarnpkg.com/@types/ssh2/-/ssh2-0.5.39.tgz#e39ab7e38fc01337f66237ed6c42237ef3e58e3b"
+  integrity sha512-MtX4tr6Jtdn/JPVsQytjB/NBeOd7JfCyf/l79KOdkUYL+r4GXUXcySX1n8W4O61fnQdljTBXEPJJ2dhnGhi2xg==
   dependencies:
     "@types/node" "*"
     "@types/ssh2-streams" "*"
@@ -36,31 +41,26 @@ bcrypt-pbkdf@^1.0.2:
   dependencies:
     tweetnacl "^0.14.3"
 
-nan@^2.13.2:
-  version "2.14.0"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c"
-  integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==
-
 safer-buffer@~2.1.0:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
-ssh2-streams@^0.4.2, ssh2-streams@~0.4.4:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/ssh2-streams/-/ssh2-streams-0.4.4.tgz#7f07464c4b19ee93324995ec7164f110c5a13658"
-  integrity sha512-yNfPZgJO/N69TvYkpDHZBkXAXQzTpfzRkOphQu3PeUpZnrjp9VNa8RKDZkZDpjsWItay+I4NMAbZZ7DqHRt0AQ==
+ssh2-streams@^0.4.2, ssh2-streams@~0.4.7:
+  version "0.4.7"
+  resolved "https://registry.yarnpkg.com/ssh2-streams/-/ssh2-streams-0.4.7.tgz#093b89069de9cf5f06feff0601a5301471b01611"
+  integrity sha512-JhF8BNfeguOqVHOLhXjzLlRKlUP8roAEhiT/y+NcBQCqpRUupLNrRf2M+549OPNVGx21KgKktug4P3MY/IvTig==
   dependencies:
     asn1 "~0.2.0"
     bcrypt-pbkdf "^1.0.2"
     streamsearch "~0.1.2"
 
 ssh2@^0.8.2:
-  version "0.8.5"
-  resolved "https://registry.yarnpkg.com/ssh2/-/ssh2-0.8.5.tgz#9144cdd6c104aa81b2b16ce647c109f4bd138b57"
-  integrity sha512-TkvzxSYYUSQ8jb//HbHnJVui4fVEW7yu/zwBxwro/QaK2EGYtwB+8gdEChwHHuj142c5+250poMC74aJiwApPw==
+  version "0.8.6"
+  resolved "https://registry.yarnpkg.com/ssh2/-/ssh2-0.8.6.tgz#dcc62e1d3b9e58a21f711f5186f043e4e792e6da"
+  integrity sha512-T0cPmEtmtC8WxSupicFDjx3vVUdNXO8xu2a/D5bjt8ixOUCe387AgvxU3mJgEHpu7+Sq1ZYx4d3P2pl/yxMH+w==
   dependencies:
-    ssh2-streams "~0.4.4"
+    ssh2-streams "~0.4.7"
 
 streamsearch@~0.1.2:
   version "0.1.2"
@@ -71,10 +71,3 @@ tweetnacl@^0.14.3:
   version "0.14.5"
   resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
   integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=
-
-windows-process-tree@^0.2.4:
-  version "0.2.4"
-  resolved "https://registry.yarnpkg.com/windows-process-tree/-/windows-process-tree-0.2.4.tgz#747af587b54cc6c996f2be0836cc8a8fd0dc038f"
-  integrity sha512-9gag9AHm3Iin/4YC1EwoIfZlqW/rG2eV7rJZ4Fy5NnAMGdewmnwsie5Rz+CJo2vSolqzzfw7hPeu3oOdniNejg==
-  dependencies:
-    nan "^2.13.2"

terminus-terminal/package.json

@@ -1,6 +1,6 @@
 {
   "name": "terminus-terminal",
-  "version": "1.0.83-nightly.4",
+  "version": "1.0.93-nightly.0",
   "description": "Terminus' terminal emulation core",
   "keywords": [
     "terminus-builtin-plugin"
@@ -18,10 +18,9 @@
   "license": "MIT",
   "devDependencies": {
     "@types/deep-equal": "^1.0.0",
-    "@types/mz": "0.0.32",
     "@types/slug": "^0.9.1",
     "dataurl": "0.1.0",
-    "deep-equal": "1.0.1",
+    "deep-equal": "1.1.0",
     "hterm-umdjs": "1.4.1",
     "mz": "^2.6.0",
     "ps-node": "^0.1.6",
@@ -29,10 +28,10 @@
     "slug": "^1.1.0",
     "uuid": "^3.3.2",
     "xterm": "3.15.0-beta98",
-    "xterm-addon-fit": "^0.1.0-beta3",
-    "xterm-addon-ligatures": "^0.1.0-beta-2",
-    "xterm-addon-search": "^0.2.0-beta1",
-    "xterm-addon-webgl": "^0.2.0-beta1"
+    "xterm-addon-fit": "^0.4.0-beta1",
+    "xterm-addon-ligatures": "^0.2.0",
+    "xterm-addon-search": "^0.4.0-beta3",
+    "xterm-addon-webgl": "^0.4.0-beta1"
   },
   "peerDependencies": {
     "@angular/animations": "^7",

terminus-terminal/src/api/baseTerminalTab.component.ts

@@ -43,7 +43,7 @@ export class BaseTerminalTabComponent extends BaseTabComponent implements OnInit
     @ViewChild('content') content
 
     /** @hidden */
-    @HostBinding('style.background-color') backgroundColor: string
+    @HostBinding('style.background-color') backgroundColor: string|null = null
 
     /** @hidden */
     @HostBinding('class.top-padded') topPadded: boolean

terminus-terminal/src/buttonProvider.ts

@@ -18,7 +18,7 @@ export class ButtonProvider extends ToolbarButtonProvider {
                 for (const arg of argv.slice(1).concat([electron.remote.process.argv0])) {
                     if (await fs.exists(arg)) {
                         if ((await fs.stat(arg)).isDirectory()) {
-                            this.terminal.openTab(null, arg)
+                            this.terminal.openTab(undefined, arg)
                         }
                     }
                 }

terminus-terminal/src/colorSchemes.ts

@@ -8,7 +8,7 @@ import { TerminalColorScheme } from './api/interfaces'
 @Injectable()
 export class HyperColorSchemes extends TerminalColorSchemeProvider {
     async getSchemes (): Promise<TerminalColorScheme[]> {
-        const pluginsPath = path.join(process.env.HOME, '.hyper_plugins', 'node_modules')
+        const pluginsPath = path.join(process.env.HOME as string, '.hyper_plugins', 'node_modules')
         if (!await fs.exists(pluginsPath)) {
             return []
         }

terminus-terminal/src/components/appearanceSettingsTab.component.pug

@@ -13,7 +13,7 @@ h3.mb-3 Appearance
                 option(value='hterm') hterm
                 option(value='xterm') xterm
                 option(value='xterm-webgl') xterm (WebGL)
-                        
+
         .form-line
             .header
                 .title Font
@@ -36,7 +36,7 @@ h3.mb-3 Appearance
             .header
                 .title Enable font ligatures
             toggle(
-                [(ngModel)]='config.store.terminal.ligatures', 
+                [(ngModel)]='config.store.terminal.ligatures',
                 (ngModelChange)='config.save()',
             )
 
@@ -160,13 +160,13 @@ h3.mb-3 Appearance
                     span([style.color]='config.store.terminal.colorScheme.colors[1]') $
                     span  ls -l
                 div
-                    span drwxr-xr-x  1 root 
-                    span([style.color]='config.store.terminal.colorScheme.colors[4]') directory
+                    span drwxr-xr-x  1 root
+                    span([style.color]='config.store.terminal.colorScheme.colors[4]')  directory 📁
                 div
-                    span -rw-r--r--  1 root file
+                    span -rw-r--r--  1 root файл
                 div
                     span -rwxr-xr-x  1 root
-                    span([style.color]='config.store.terminal.colorScheme.colors[2]')  executable
+                    span([style.color]='config.store.terminal.colorScheme.colors[2]')  実行可能ファイル
                 div
                     span -rwxr-xr-x  1 root
                     span([style.color]='config.store.terminal.colorScheme.colors[6]')  sym
@@ -203,7 +203,7 @@ h3.mb-3 Appearance
                 [value]='"colorScheme"'
             )
             | From color scheme
-            
+
 .form-line
     .header
         .title Cursor shape
@@ -234,7 +234,7 @@ h3.mb-3 Appearance
                 [value]='"underline"'
             )
             | ▁
-    
+
 .form-line
     .header
         .title Blink cursor
@@ -243,3 +243,15 @@ h3.mb-3 Appearance
         [(ngModel)]='config.store.terminal.cursorBlink',
         (ngModelChange)='config.save()',
     )
+
+.form-line
+    .header
+        .title Fallback font
+        .description A second font family used to display characters missing in the main font
+
+    input.form-control(
+        type='text',
+        [ngbTypeahead]='fontAutocomplete',
+        [(ngModel)]='config.store.terminal.fallbackFont',
+        (ngModelChange)='config.save()'
+    )

terminus-terminal/src/components/appearanceSettingsTab.component.ts

@@ -19,7 +19,7 @@ export class AppearanceSettingsTabComponent {
     fonts: string[] = []
     colorSchemes: TerminalColorScheme[] = []
     equalComparator = deepEqual
-    editingColorScheme: TerminalColorScheme
+    editingColorScheme: TerminalColorScheme|null = null
     schemeChanged = false
 
     constructor (
@@ -32,7 +32,11 @@ export class AppearanceSettingsTabComponent {
     async ngOnInit () {
         if (this.hostApp.platform === Platform.Windows || this.hostApp.platform === Platform.macOS) {
             const fonts = await new Promise<any[]>((resolve) => fontManager.findFonts({ monospace: true }, resolve))
-            this.fonts = fonts.map(x => `${x.family} ${x.style}`.trim())
+            if (this.hostApp.platform === Platform.Windows) {
+                this.fonts = fonts.map(x => `${x.family} ${x.style}`.trim())
+            } else {
+                this.fonts = fonts.map(x => x.family.trim())
+            }
             this.fonts.sort()
         }
         if (this.hostApp.platform === Platform.Linux) {
@@ -64,7 +68,7 @@ export class AppearanceSettingsTabComponent {
 
     saveScheme () {
         let schemes = this.config.store.terminal.customColorSchemes
-        schemes = schemes.filter(x => x !== this.editingColorScheme && x.name !== this.editingColorScheme.name)
+        schemes = schemes.filter(x => x !== this.editingColorScheme && x.name !== this.editingColorScheme!.name)
         schemes.push(this.editingColorScheme)
         this.config.store.terminal.customColorSchemes = schemes
         this.config.save()
@@ -101,6 +105,6 @@ export class AppearanceSettingsTabComponent {
     }
 
     getPreviewFontFamily () {
-        return getCSSFontFamily(this.config.store.terminal.font)
+        return getCSSFontFamily(this.config.store)
     }
 }

terminus-terminal/src/components/searchPanel.component.pug

@@ -32,3 +32,9 @@
                 placement='bottom'
             )
                 i.fa.fa-fw.fa-text-width
+            button.btn.btn-outline(
+                (click)='close.emit()',
+                ngbTooltip='Close',
+                placement='bottom'
+            )
+                i.fa.fa-fw.fa-times

terminus-terminal/src/components/searchPanel.component.ts

@@ -8,11 +8,10 @@ import { Frontend, SearchOptions } from '../frontends/frontend'
     styles: [require('./searchPanel.component.scss')],
 })
 export class SearchPanelComponent {
-    static globalOptions: SearchOptions = {}
     @Input() query: string
     @Input() frontend: Frontend
     notFound = false
-    options: SearchOptions = SearchPanelComponent.globalOptions
+    options: SearchOptions = {}
 
     @Output() close = new EventEmitter()
 

terminus-terminal/src/components/shellSettingsTab.component.ts

@@ -52,6 +52,9 @@ export class ShellSettingsTabComponent {
 
     pickWorkingDirectory () {
         const shell = this.shells.find(x => x.id === this.config.store.terminal.shell)
+        if (!shell) {
+            return
+        }
         const paths = this.electron.dialog.showOpenDialog(
             this.hostApp.getWindow(),
             {
@@ -66,7 +69,7 @@ export class ShellSettingsTabComponent {
 
     newProfile (shell: Shell) {
         const profile: Profile = {
-            name: shell.name,
+            name: shell.name || '',
             sessionOptions: this.terminalService.optionsFromShell(shell),
         }
         this.config.store.terminal.profiles = [profile, ...this.config.store.terminal.profiles]

terminus-terminal/src/components/terminalSettingsTab.component.pug

@@ -66,6 +66,15 @@ h3.mb-3 Terminal
         (ngModelChange)='config.save()',
     )
 
+.form-line
+    .header
+        .title Restore terminal tabs on app start
+            
+    toggle(
+        [(ngModel)]='config.store.terminal.recoverTabs',
+        (ngModelChange)='config.save()',
+    )
+
 .form-line
     .header
         .title Bracketed paste (requires shell support)

terminus-terminal/src/components/terminalSettingsTab.component.ts

@@ -16,7 +16,7 @@ export class TerminalSettingsTabComponent {
     openWSLVolumeMixer () {
         this.electron.shell.openItem('sndvol.exe')
         this.terminal.openTab({
-            name: null,
+            name: '',
             sessionOptions: {
                 command: 'wsl.exe',
                 args: ['tput', 'bel'],

terminus-terminal/src/components/terminalTab.component.ts

@@ -68,7 +68,7 @@ export class TerminalTabComponent extends BaseTerminalTabComponent {
         }
     }
 
-    async getCurrentProcess (): Promise<BaseTabProcess> {
+    async getCurrentProcess (): Promise<BaseTabProcess|null> {
         const children = await this.session.getChildProcesses()
         if (!children.length) {
             return null

terminus-terminal/src/config.ts

@@ -15,6 +15,7 @@ export class TerminalConfigProvider extends ConfigProvider {
             frontend: 'xterm',
             autoOpen: false,
             fontSize: 14,
+            fallbackFont: null,
             linePadding: 0,
             bell: 'off',
             bracketedPaste: false,
@@ -58,6 +59,7 @@ export class TerminalConfigProvider extends ConfigProvider {
             environment: {},
             profiles: [],
             useConPTY: true,
+            recoverTabs: true,
         },
     }
 
@@ -121,9 +123,7 @@ export class TerminalConfigProvider extends ConfigProvider {
                 paste: [
                     'Ctrl-Shift-V',
                 ],
-                clear: [
-                    'Ctrl-L',
-                ],
+                clear: [],
                 'zoom-in': [
                     'Ctrl-=',
                     'Ctrl-Shift-=',
@@ -163,9 +163,7 @@ export class TerminalConfigProvider extends ConfigProvider {
                 paste: [
                     'Ctrl-Shift-V',
                 ],
-                clear: [
-                    'Ctrl-L',
-                ],
+                clear: [],
                 'zoom-in': [
                     'Ctrl-=',
                     'Ctrl-Shift-=',

terminus-terminal/src/frontends/hterm.ts

@@ -78,11 +78,11 @@ hterm.hterm.VT.CSI[' q'] = function (parseState) {
 }
 
 hterm.hterm.VT.OSC['4'] = function (parseState) {
-    const args = parseState.args[0].split(';')
+    const args: string[] = parseState.args[0].split(';')
 
     const pairCount = args.length / 2
     const colorPalette = this.terminal.getTextAttributes().colorPalette
-    const responseArray = []
+    const responseArray: string[] = []
 
     for (let pairNumber = 0; pairNumber < pairCount; ++pairNumber) {
         const colorIndex = parseInt(args[pairNumber * 2])
@@ -95,7 +95,7 @@ hterm.hterm.VT.OSC['4'] = function (parseState) {
         if (colorValue === '?') {
             colorValue = hterm.lib.colors.rgbToX11(colorPalette[colorIndex])
             if (colorValue) {
-                responseArray.push(colorIndex + ';' + colorValue)
+                responseArray.push(colorIndex.toString() + ';' + colorValue)
             }
             continue
         }

terminus-terminal/src/frontends/htermFrontend.ts

@@ -60,7 +60,7 @@ export class HTermFrontend extends Frontend {
         this.configuredLinePadding = config.terminal.linePadding
         this.setFontSize()
 
-        preferenceManager.set('font-family', getCSSFontFamily(config.terminal.font))
+        preferenceManager.set('font-family', getCSSFontFamily(config))
         preferenceManager.set('enable-bold', true)
         // preferenceManager.set('audible-bell-sound', '')
         preferenceManager.set('desktop-notification-bell', config.terminal.bell === 'notification')
@@ -186,7 +186,7 @@ export class HTermFrontend extends Frontend {
             this.io.onTerminalResize = (columns, rows) => {
                 this.resize.next({ columns, rows })
             }
-            this.ready.next(null)
+            this.ready.next()
             this.ready.complete()
 
             this.term.scrollPort_.document_.addEventListener('dragOver', event => {

terminus-terminal/src/frontends/xtermFrontend.ts

@@ -2,7 +2,7 @@ import { Frontend, SearchOptions } from './frontend'
 import { Terminal, ITheme } from 'xterm'
 import { getCSSFontFamily } from '../utils'
 import { FitAddon } from 'xterm-addon-fit'
-import { enableLigatures } from 'xterm-addon-ligatures'
+import { LigaturesAddon } from 'xterm-addon-ligatures'
 import { SearchAddon } from 'xterm-addon-search'
 import { WebglAddon } from 'xterm-addon-webgl'
 import './xterm.css'
@@ -29,6 +29,7 @@ export class XTermFrontend extends Frontend {
     private copyOnSelect = false
     private search = new SearchAddon()
     private fitAddon = new FitAddon()
+    private ligaturesAddon: LigaturesAddon
     private opened = false
 
     constructor () {
@@ -85,13 +86,13 @@ export class XTermFrontend extends Frontend {
 
         this.resizeHandler = () => {
             try {
-                if (this.xtermCore.element && getComputedStyle(this.xtermCore.element).getPropertyValue('height') !== 'auto') {
-                    let t = window.getComputedStyle(this.xtermCore.element.parentElement)
-                    let r = parseInt(t.getPropertyValue("height"))
-                    let n = Math.max(0, parseInt(t.getPropertyValue("width")))
-                    let o = window.getComputedStyle(this.xtermCore.element)
-                    let i = r - (parseInt(o.getPropertyValue("padding-top")) + parseInt(o.getPropertyValue("padding-bottom")))
-                    let l = n - (parseInt(o.getPropertyValue("padding-right")) + parseInt(o.getPropertyValue("padding-left"))) - this.xtermCore.viewport.scrollBarWidth
+                if (this.xterm.element && getComputedStyle(this.xterm.element).getPropertyValue('height') !== 'auto') {
+                    let t = window.getComputedStyle(this.xterm.element.parentElement!)
+                    let r = parseInt(t.getPropertyValue('height'))
+                    let n = Math.max(0, parseInt(t.getPropertyValue('width')))
+                    let o = window.getComputedStyle(this.xterm.element)
+                    let i = r - (parseInt(o.getPropertyValue('padding-top')) + parseInt(o.getPropertyValue('padding-bottom')))
+                    let l = n - (parseInt(o.getPropertyValue('padding-right')) + parseInt(o.getPropertyValue('padding-left'))) - this.xtermCore.viewport.scrollBarWidth
                     let actualCellWidth = this.xtermCore._renderService.dimensions.actualCellWidth || 9
                     let actualCellHeight = this.xtermCore._renderService.dimensions.actualCellHeight || 17
                     let cols = Math.floor(l / actualCellWidth)
@@ -119,11 +120,7 @@ export class XTermFrontend extends Frontend {
             this.xterm.loadAddon(new WebglAddon())
         }
 
-        if (this.configService.store.terminal.ligatures) {
-            enableLigatures(this.xterm)
-        }
-
-        this.ready.next(null)
+        this.ready.next()
         this.ready.complete()
 
         this.xterm.loadAddon(this.search)
@@ -197,7 +194,7 @@ export class XTermFrontend extends Frontend {
             }
         })
 
-        this.xterm.setOption('fontFamily', getCSSFontFamily(config.terminal.font))
+        this.xterm.setOption('fontFamily', getCSSFontFamily(config))
         this.xterm.setOption('bellStyle', config.terminal.bell)
         this.xterm.setOption('cursorStyle', {
             beam: 'bar',
@@ -225,8 +222,9 @@ export class XTermFrontend extends Frontend {
             this.configuredTheme = theme
         }
 
-        if (this.opened && config.terminal.ligatures) {
-            enableLigatures(this.xterm)
+        if (this.opened && config.terminal.ligatures && !this.ligaturesAddon) {
+            this.ligaturesAddon = new LigaturesAddon()
+            this.xterm.loadAddon(this.ligaturesAddon)
         }
     }
 
@@ -252,13 +250,13 @@ export class XTermFrontend extends Frontend {
         let html = `<div style="font-family: '${this.configService.store.terminal.font}', monospace; white-space: pre">`
         const selection = this.xterm.getSelectionPosition()
         if (!selection) {
-            return null
+            return ''
         }
         if (selection.startRow === selection.endRow) {
             html += this.getLineAsHTML(selection.startRow, selection.startColumn, selection.endColumn)
         } else {
             html += this.getLineAsHTML(selection.startRow, selection.startColumn, this.xterm.cols)
-            for (let y = selection.startRow + 1; y < selection.endRow; y++) {
+            for (let y = selection.startRow! + 1; y < selection.endRow; y++) {
                 html += this.getLineAsHTML(y, 0, this.xterm.cols)
             }
             html += this.getLineAsHTML(selection.endRow, 0, selection.endColumn)
@@ -267,7 +265,7 @@ export class XTermFrontend extends Frontend {
         return html
     }
 
-    private getHexColor (mode: number, color: number): string {
+    private getHexColor (mode: number, color: number, def: string): string {
         if (mode === Attributes.CM_RGB) {
             const rgb = AttributeData.toColorRGB(color)
             return rgb.map(x => x.toString(16).padStart(2, '0')).join('')
@@ -275,18 +273,18 @@ export class XTermFrontend extends Frontend {
         if (mode === Attributes.CM_P16 || mode === Attributes.CM_P256) {
             return this.configService.store.terminal.colorScheme.colors[color]
         }
-        return 'transparent'
+        return def
     }
 
     private getLineAsHTML (y: number, start: number, end: number): string {
         let html = '<div>'
-        let lastStyle = null
+        let lastStyle: string|null = null
         const line = (this.xterm.buffer.getLine(y) as any)._line
         const cell = new CellData()
         for (let i = start; i < end; i++) {
             line.loadCell(i, cell)
-            const fg = this.getHexColor(cell.getFgColorMode(), cell.getFgColor())
-            const bg = this.getHexColor(cell.getBgColorMode(), cell.getBgColor())
+            const fg = this.getHexColor(cell.getFgColorMode(), cell.getFgColor(), this.configService.store.terminal.colorScheme.foreground)
+            const bg = this.getHexColor(cell.getBgColorMode(), cell.getBgColor(), this.configService.store.terminal.colorScheme.background)
             const style = `color: ${fg}; background: ${bg}; font-weight: ${cell.isBold() ? 'bold' : 'normal'}; font-style: ${cell.isItalic() ? 'italic' : 'normal'}; text-decoration: ${cell.isUnderline() ? 'underline' : 'none'}`
             if (style !== lastStyle) {
                 if (lastStyle !== null) {

terminus-terminal/src/index.ts

@@ -120,6 +120,7 @@ import { XTermFrontend, XTermWebGLFrontend } from './frontends/xtermFrontend'
     exports: [
         ColorPickerComponent,
         EnvironmentEditorComponent,
+        SearchPanelComponent,
     ],
 })
 export default class TerminalModule { // eslint-disable-line @typescript-eslint/no-extraneous-class
@@ -162,7 +163,7 @@ export default class TerminalModule { // eslint-disable-line @typescript-eslint/
                 argv = argv.slice(1)
             }
 
-            if(require('yargs').parse(argv.slice(1))._[0] !== "open"){
+            if(require('yargs').parse(argv.slice(1))._[0] !== 'open'){
                 app.ready$.subscribe(() => {
                     terminal.openTab()
                 })
@@ -188,7 +189,7 @@ export default class TerminalModule { // eslint-disable-line @typescript-eslint/
         hostApp.cliOpenDirectory$.subscribe(async directory => {
             if (await fs.exists(directory)) {
                 if ((await fs.stat(directory)).isDirectory()) {
-                    terminal.openTab(null, directory)
+                    terminal.openTab(undefined, directory)
                     hostApp.bringToFront()
                 }
             }

terminus-terminal/src/pathDrop.ts

@@ -15,7 +15,7 @@ export class PathDropDecorator extends TerminalDecorator {
                     event.preventDefault()
                 }),
                 terminal.frontend.drop$.subscribe(event => {
-                    for (const file of event.dataTransfer.files as any) {
+                    for (const file of event.dataTransfer!.files as any) {
                         this.injectPath(terminal, file.path)
                     }
                     event.preventDefault()