ask for confirmation before updating (fixes #1386)

Bump deep-equal from 1.0.1 to 1.1.0 in /terminus-terminal

.all-contributorsrc

@@ -162,6 +162,24 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "hammster",
+      "name": "Hans Koch",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/1093709?v=4",
+      "profile": "https://hans-koch.me",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "ThePuzzlemaker",
+      "name": "Dak Smyth",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/12666617?v=4",
+      "profile": "http://thepuzzlemaker.info",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.eslintrc.yml

@@ -31,6 +31,11 @@ rules:
   '@typescript-eslint/promise-function-async': off
   '@typescript-eslint/no-unnecessary-type-assertion': off
   '@typescript-eslint/require-array-sort-compare': off
+  '@typescript-eslint/no-floating-promises': off
+  '@typescript-eslint/prefer-readonly': off
+  '@typescript-eslint/require-await': off
+  '@typescript-eslint/strict-boolean-expressions': off
+  '@typescript-eslint/no-misused-promises': off
   '@typescript-eslint/no-use-before-define':
   - error
   - classes: false

.github/workflows/docs.yml

@@ -0,0 +1,25 @@
+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
+        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/linux.yml

@@ -0,0 +1,66 @@
+name: Linux Build
+on: [push, pull_request]
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v1
+
+    - name: Installing Node
+      uses: actions/setup-node@v1
+      with:
+        version: 10
+
+    - name: Build
+      run: |
+        cd app
+        yarn
+        cd ..
+        rm app/node_modules/.yarn-integrity
+        yarn
+        yarn run lint
+        scripts/build-native.js
+        yarn run build:typings
+        yarn run build
+        scripts/prepackage-plugins.js
+        scripts/build-linux.js
+      env:
+        GH_TOKEN: ${{ secrets.GH_TOKEN }}
+        BT_TOKEN: ${{ secrets.BT_TOKEN }}
+
+    - name: Package artifacts
+      run: |
+        mkdir artifact-deb
+        mv dist/*.deb artifact-deb/
+        mkdir artifact-rpm
+        mv dist/*.rpm artifact-rpm/
+        mkdir artifact-snap
+        mv dist/*.snap artifact-snap/
+        mkdir artifact-tar.gz
+        mv dist/*.tar.gz artifact-tar.gz/
+
+    - 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,52 @@
+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: Build
+      run: |
+        cd app
+        yarn
+        cd ..
+        rm app/node_modules/.yarn-integrity
+        yarn
+        yarn run lint
+        scripts/build-native.js
+        yarn run build:typings
+        yarn run build
+        scripts/prepackage-plugins.js
+        scripts/build-macos.js
+      env:
+        GH_TOKEN: ${{ secrets.GH_TOKEN }}
+        BT_TOKEN: ${{ secrets.BT_TOKEN }}
+        CSC_LINK: ${{ secrets.CSC_LINK }}
+        CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
+
+    - 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,52 @@
+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: |
+        cd app
+        yarn
+        cd ..
+        del app/node_modules/.yarn-integrity
+        yarn
+        node scripts/build-native.js
+        yarn run build:typings
+        yarn run build
+        node scripts/prepackage-plugins.js
+        node scripts/build-windows.js
+      env:
+        GH_TOKEN: ${{ secrets.GH_TOKEN }}
+        BT_TOKEN: ${{ secrets.BT_TOKEN }}
+        WIN_CSC_LINK: ${{ secrets.WIN_CSC_LINK }}
+        WIN_CSC_KEY_PASSWORD: ${{ secrets.WIN_CSC_KEY_PASSWORD }}
+
+    - 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

.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,42 +8,12 @@ stages:
 
 jobs:
   include:
-    - stage: 'Build'
-      if: branch = xxx
-      os: linux
-      before_install:
-        - set -e
-        - rm app/node_modules/.yarn-integrity || true
-        - yarn
-      script:
-        - set -e
-        - python -c "import fcntl; fcntl.fcntl(1, fcntl.F_SETFL, 0)" # https://github.com/travis-ci/travis-ci/issues/8920
-        - scripts/build-native.js
-        - yarn run build:typings
-        - yarn run build
-        - scripts/prepackage-plugins.js
-        - travis_wait scripts/build-linux.js
-
-    - stage: 'Build'
-      os: osx
-      before_install:
-        - set -e
-        - rm app/node_modules/.yarn-integrity || true
-        - yarn
-      script:
-        - set -e
-        - scripts/build-native.js
-        - yarn run build:typings
-        - yarn run build
-        - scripts/prepackage-plugins.js
-        - travis_wait scripts/build-macos.js
-
     - stage: 'Docs'
       os: linux
       if: branch = master
       script:
+        - '[ -z "${encrypted_4e2fb4889ef8_iv}" ] && exit 0 || true'
         - set -e
-        - '[ -z "${encrypted_4e2fb4889ef8_iv}" ] && exit 0'
         - openssl aes-256-cbc -K $encrypted_4e2fb4889ef8_key -iv $encrypted_4e2fb4889ef8_iv -in .travis.ssh.key.enc -out .travis.ssh.key -d
         - eval "$(ssh-agent -s)"
         - chmod 600 .travis.ssh.key
@@ -65,11 +34,3 @@ addons:
     sources:
     - sourceline: 'deb https://dl.yarnpkg.com/debian/ stable main'
       key_url: 'https://dl.yarnpkg.com/debian/pubkey.gpg'
-
-
-cache:
-  directories:
-  - 'terminus-*/node_modules'
-  - $HOME/.cache/yarn
-  - $HOME/.cache/electron
-  - $HOME/.cache/electron-builder

app/lib/app.ts

@@ -58,7 +58,7 @@ export class Application {
         if (!this.hasWindows()) {
             await this.newWindow()
         }
-        this.windows[0].send(event, ...args)
+        this.windows.filter(w => !w.isDestroyed())[0].send(event, ...args)
     }
 
     enableTray () {
@@ -72,7 +72,7 @@ export class Application {
             this.tray = new Tray(`${app.getAppPath()}/assets/tray.png`)
         }
 
-        this.tray.on('click', () => this.focus())
+        this.tray.on('click', () => setTimeout(() => this.focus()));
 
         const contextMenu = Menu.buildFromTemplate([{
             label: 'Show',
@@ -100,7 +100,6 @@ export class Application {
     focus () {
         for (let window of this.windows) {
             window.show()
-            window.focus()
         }
     }
 
@@ -125,7 +124,7 @@ export class Application {
                     { role: 'services', submenu: [] },
                     { type: 'separator' },
                     { role: 'hide' },
-                    { role: 'hideothers' },
+                    { role: 'hideOthers' },
                     { role: 'unhide' },
                     { type: 'separator' },
                     {
@@ -146,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/index.ts

@@ -39,7 +39,7 @@ const argv = parseArgs(process.argv, process.cwd())
 
 if (!app.requestSingleInstanceLock()) {
     app.quit()
-    process.exit(0)
+    app.exit(0)
 }
 
 if (argv.d) {

app/lib/window.ts

@@ -147,6 +147,10 @@ export class Window {
         this.window.webContents.send(event, ...args)
     }
 
+    isDestroyed() {
+        return !this.window || this.window.isDestroyed();
+    }
+
     private setupWindowManagement () {
         this.window.on('show', () => {
             this.visible.next(true)

app/package.json

@@ -22,31 +22,32 @@
     "@angular/platform-browser-dynamic": "7.2.8",
     "@ng-bootstrap/ng-bootstrap": "^4.2.0",
     "devtron": "1.4.0",
-    "fontmanager-redux": "0.3.2",
     "electron-config": "2.0.0",
     "electron-debug": "^3.0.1",
     "electron-is-dev": "1.1.0",
     "electron-updater": "^4.0.6",
+    "fontmanager-redux": "0.3.3",
     "js-yaml": "3.13.1",
-    "keytar": "^4.7.0",
+    "keytar": "^5.0.0-beta.0",
     "mz": "^2.7.0",
-    "ngx-toastr": "^10.0.4",
-    "node-pty": "^0.9.0-beta19",
-    "npm": "~6.9.0",
+    "ngx-toastr": "^10.1.0",
+    "node-pty": "^0.9.0-beta22",
+    "npm": "6.9.0",
     "path": "0.12.7",
     "rxjs": "^6.5.2",
     "rxjs-compat": "^6.5.2",
-    "yargs": "^13.3.0",
+    "yargs": "^14.0.0",
     "zone.js": "^0.8.29"
   },
   "optionalDependencies": {
-    "@terminus-term/windows-process-tree": "^0.2.4",
     "macos-native-processlist": "^1.0.1",
     "windows-blurbehind": "^1.0.1",
     "windows-native-registry": "^1.0.14",
+    "windows-process-tree": "^0.2.4",
     "windows-swca": "^2.0.2"
   },
   "devDependencies": {
-    "@types/mz": "0.0.32"
+    "@types/mz": "0.0.32",
+    "node-abi": "^2.11.0"
   }
 }

app/src/plugins.ts

@@ -176,7 +176,7 @@ export async function loadPlugins (foundPlugins: PluginInfo[], progress: Progres
             pluginModule['bootstrap'] = packageModule.bootstrap
             plugins.push(pluginModule)
             console.timeEnd(label)
-            await (new Promise(x => setTimeout(x, 50)))
+            await new Promise(x => setTimeout(x, 50))
         } catch (error) {
             console.error(`Could not load ${foundPlugin.name}:`, error)
         }

app/yarn.lock

@@ -58,13 +58,6 @@
   dependencies:
     tslib "^1.9.0"
 
-"@terminus-term/windows-process-tree@^0.2.4":
-  version "0.2.4"
-  resolved "https://registry.yarnpkg.com/@terminus-term/windows-process-tree/-/windows-process-tree-0.2.4.tgz#558f33d5afd934b070aec78da2529fc4042cf90d"
-  integrity sha512-FbquNhrFoe9EBwVITV9bqd/wukJLJSVI2pAzvM8dBvPP3/ErTiavZWU0W/J5av61SavJFDMkSiYVYL5NJe30zg==
-  dependencies:
-    nan "^2.13.2"
-
 "@types/mz@0.0.32":
   version "0.0.32"
   resolved "https://registry.yarnpkg.com/@types/mz/-/mz-0.0.32.tgz#e8248b4e41424c052edc1725dd33650c313a3659"
@@ -951,10 +944,10 @@ flush-write-stream@^1.0.0:
     inherits "^2.0.3"
     readable-stream "^2.3.6"
 
-fontmanager-redux@0.3.2:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/fontmanager-redux/-/fontmanager-redux-0.3.2.tgz#e5c8d8dc8fda98629eaef4201a27df9e56a122f4"
-  integrity sha512-NWmTbYfDijrx8qLJ2+O2VgYKhdfsMy/ec+Qf2DGxoLJDZHaRhBKd2Eufh4fFmfJUAwhzrkIgbKJsNT/IYJDbaA==
+fontmanager-redux@0.3.3:
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/fontmanager-redux/-/fontmanager-redux-0.3.3.tgz#39f3493332d1694ef3bd1652ee11d66ae3e4f495"
+  integrity sha512-n7bz3J+8gHn1+bEsIwdNlZ+wYsof3JPijHW/HQ+0oYA/zVTAuryXYgBrIKboNymJmYnabACoLB0p4tv/vMPGMA==
 
 forever-agent@~0.6.1:
   version "0.6.1"
@@ -1474,10 +1467,10 @@ keyboardevents-areequal@^0.2.1:
   resolved "https://registry.yarnpkg.com/keyboardevents-areequal/-/keyboardevents-areequal-0.2.2.tgz#88191ec738ce9f7591c25e9056de928b40277194"
   integrity sha512-Nv+Kr33T0mEjxR500q+I6IWisOQ0lK1GGOncV0kWE6n4KFmpcu7RUX5/2B0EUtX51Cb0HjZ9VJsSY3u4cBa0kw==
 
-keytar@^4.7.0:
-  version "4.11.0"
-  resolved "https://registry.yarnpkg.com/keytar/-/keytar-4.11.0.tgz#891569045b287a0dabe69320e2381e059b02363f"
-  integrity sha512-cGn2xd4NY0yCBrU5zQ/lwIagP1UBOhUEemi6iSJU2gshN1RHkxHekSdLUji9IWNo5B1Va/iwXXWzGD2p8ziqfQ==
+keytar@^5.0.0-beta.0:
+  version "5.0.0-beta.0"
+  resolved "https://registry.yarnpkg.com/keytar/-/keytar-5.0.0-beta.0.tgz#a9537f953c288bbda13d497563fc012f14709f90"
+  integrity sha512-X4OhyPF0Ca6W3JgJ+v+Wq+W/LTW+luD8Nvxoo0sUPST3Cnm+LOyo172iWQFezhtDN9uOUjwXZpAyyAztseezHg==
   dependencies:
     nan "2.14.0"
     prebuild-install "5.3.0"
@@ -1895,7 +1888,7 @@ mz@^2.7.0:
     object-assign "^4.0.1"
     thenify-all "^1.0.0"
 
-nan@2.14.0, nan@^2.13.2:
+nan@2.14.0, nan@^2.13.2, nan@^2.14.0:
   version "2.14.0"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c"
   integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==
@@ -1905,17 +1898,17 @@ napi-build-utils@^1.0.1:
   resolved "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-1.0.1.tgz#1381a0f92c39d66bf19852e7873432fc2123e508"
   integrity sha512-boQj1WFgQH3v4clhu3mTNfP+vOBxorDlE8EKiMjUlLG3C4qAESnn9AxIOkFgTR2c9LtzNjPrjS60cT27ZKBhaA==
 
-ngx-toastr@^10.0.4:
-  version "10.0.4"
-  resolved "https://registry.yarnpkg.com/ngx-toastr/-/ngx-toastr-10.0.4.tgz#cbc61b8d67d748194ea7a28542b01e39bf1fc6c2"
-  integrity sha512-iN+zr2Msae5wV334c1dytRhSYNdUz467jwv1NE91lMmllsMkpUzZlu8VdFCeTFt+/R4TWzz19xBRqhpp+OAuVA==
+ngx-toastr@^10.1.0:
+  version "10.1.0"
+  resolved "https://registry.yarnpkg.com/ngx-toastr/-/ngx-toastr-10.1.0.tgz#df6e578ebac1348e68d24b11d243653a401d17e6"
+  integrity sha512-LXGL8jKIm0SGklkXytNKbR6VrF94all35SaUfgd1gOUzgllTW2ldqORDZlgIaiMB3Dcybaald8p3boEHvfjEIQ==
   dependencies:
     tslib "^1.9.0"
 
-node-abi@^2.7.0:
-  version "2.9.0"
-  resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.9.0.tgz#ae4075b298dab2d92dd1e22c48ccc7ffd7f06200"
-  integrity sha512-jmEOvv0eanWjhX8dX1pmjb7oJl1U1oR4FOh0b2GnvALwSYoOdU7sj+kLDSAyjo4pfC9aj/IxkloxdLJQhSSQBA==
+node-abi@^2.11.0:
+  version "2.11.0"
+  resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.11.0.tgz#b7dce18815057544a049be5ae75cd1fdc2e9ea59"
+  integrity sha512-kuy/aEg75u40v378WRllQ4ZexaXJiCvB68D2scDXclp/I4cRq6togpbOoKhmN07tns9Zldu51NNERo0wehfX9g==
   dependencies:
     semver "^5.4.1"
 
@@ -1963,12 +1956,12 @@ node-gyp@^4.0.0:
     tar "^4.4.8"
     which "1"
 
-node-pty@^0.9.0-beta19:
-  version "0.9.0-beta19"
-  resolved "https://registry.yarnpkg.com/node-pty/-/node-pty-0.9.0-beta19.tgz#0fd381b2006f4665c4c2ee0509219e591842371a"
-  integrity sha512-MkKEvBnauGnzgXNr/oaoWQLVXm1gheIKZs4YQp8883ZiETmbEnpSvD0FU3bELcPXG5VFPRqIGsQJ4KUMBLzkPA==
+node-pty@^0.9.0-beta22:
+  version "0.9.0-beta22"
+  resolved "https://registry.yarnpkg.com/node-pty/-/node-pty-0.9.0-beta22.tgz#5c26bbad8ccebaf887309f9511b40c8e22465459"
+  integrity sha512-ASvZMaSXVT0ntpAw+nEXjjWplgBKwddjkJ4X0+aDNbTsqSjrNxWvArVdrlk8c7dC5D5tKCBzWtxJuM1a2q8baw==
   dependencies:
-    nan "^2.13.2"
+    nan "^2.14.0"
 
 noop-logger@^0.1.1:
   version "0.1.1"
@@ -2104,7 +2097,7 @@ npm-user-validate@~1.0.0:
   resolved "https://registry.yarnpkg.com/npm-user-validate/-/npm-user-validate-1.0.0.tgz#8ceca0f5cea04d4e93519ef72d0557a75122e951"
   integrity sha1-jOyg9c6gTU6TUZ73LQVXp1Ei6VE=
 
-npm@~6.9.0:
+npm@6.9.0:
   version "6.9.0"
   resolved "https://registry.yarnpkg.com/npm/-/npm-6.9.0.tgz#5296720486814a64a7fb082de00c4b5cfd11211f"
   integrity sha512-91V+zB5hDxO+Jyp2sUKS7juHlIM95dGQxTeQtmZI1nAI/7kjWXFipPrtwwKjhyKmV4GsS2LzJhrxRjGWsU9z/w==
@@ -2443,7 +2436,7 @@ prebuild-install@5.3.0:
     minimist "^1.2.0"
     mkdirp "^0.5.1"
     napi-build-utils "^1.0.1"
-    node-abi "^2.7.0"
+    node-abi "^2.11.0"
     noop-logger "^0.1.1"
     npmlog "^4.0.1"
     os-homedir "^1.0.1"
@@ -3396,6 +3389,13 @@ windows-native-registry@^1.0.14:
   dependencies:
     nan "^2.13.2"
 
+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"
+
 windows-swca@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/windows-swca/-/windows-swca-2.0.2.tgz#66807012f73f5d3c0f0cb49bfa61be297aaabb50"
@@ -3504,12 +3504,13 @@ yargs@^11.0.0:
     y18n "^3.2.1"
     yargs-parser "^9.0.2"
 
-yargs@^13.3.0:
-  version "13.3.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.0.tgz#4c657a55e07e5f2cf947f8a366567c04a0dedc83"
-  integrity sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==
+yargs@^14.0.0:
+  version "14.0.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-14.0.0.tgz#ba4cacc802b3c0b3e36a9e791723763d57a85066"
+  integrity sha512-ssa5JuRjMeZEUjg7bEL99AwpitxU/zWGAGpdj0di41pOEmJti8NR6kyUIJBkR78DTYNPZOU08luUo0GTHuB+ow==
   dependencies:
     cliui "^5.0.0"
+    decamelize "^1.2.0"
     find-up "^3.0.0"
     get-caller-file "^2.0.1"
     require-directory "^2.1.1"

azure-pipelines.yml

@@ -1,207 +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: 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)

package.json

@@ -1,32 +1,31 @@
 {
   "devDependencies": {
-    "@fortawesome/fontawesome-free": "^5.9.0",
+    "@fortawesome/fontawesome-free": "^5.10.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/node": "12.7.2",
     "@types/webpack-env": "1.13.9",
-    "@typescript-eslint/eslint-plugin": "^1.12.0",
-    "@typescript-eslint/parser": "^1.12.0",
-    "app-builder-lib": "^21.0.8",
+    "@typescript-eslint/eslint-plugin": "^1.13.0",
+    "@typescript-eslint/parser": "^1.13.0",
     "apply-loader": "2.0.0",
     "awesome-typescript-loader": "^5.0.0",
-    "core-js": "^3.1.4",
+    "core-js": "^3.2.0",
     "cross-env": "5.2.0",
-    "css-loader": "3.0.0",
-    "electron": "^5.0.7",
-    "electron-builder": "^21.0.8",
+    "css-loader": "3.2.0",
+    "electron": "^6.0.5",
+    "electron-builder": "^21.2.0",
     "electron-installer-snap": "^4.0.0",
     "electron-notarize": "^0.1.1",
     "electron-rebuild": "^1.8.5",
     "eslint": "^5.16.0",
-    "file-loader": "^4.0.0",
-    "graceful-fs": "^4.1.15",
+    "file-loader": "^4.1.0",
+    "graceful-fs": "^4.2.2",
     "html-loader": "0.5.5",
     "json-loader": "0.5.7",
-    "node-abi": "^2.9.0",
-    "node-gyp": "^5.0.2",
+    "node-abi": "^2.11.0",
+    "node-gyp": "^5.0.3",
     "node-sass": "^4.12.0",
     "npmlog": "4.1.2",
     "npx": "^10.2.0",
@@ -36,20 +35,20 @@
     "pug-loader": "^2.4.0",
     "pug-static-loader": "2.0.0",
     "raven-js": "3.27.2",
-    "raw-loader": "3.0.0",
-    "sass-loader": "^7.0.1",
+    "raw-loader": "3.1.0",
+    "sass-loader": "^7.3.1",
     "shelljs": "0.8.3",
     "source-code-pro": "^2.30.1",
     "source-sans-pro": "2.45.0",
-    "style-loader": "^0.23.1",
+    "style-loader": "^1.0.0",
     "svg-inline-loader": "^0.8.0",
     "to-string-loader": "1.1.5",
     "tslib": "^1.10.0",
-    "typedoc": "^0.14.2",
+    "typedoc": "^0.15.0",
     "typescript": "^3.5.3",
-    "url-loader": "^2.0.0",
+    "url-loader": "^2.1.0",
     "val-loader": "1.1.1",
-    "webpack": "^4.35.2",
+    "webpack": "^4.39.3",
     "webpack-cli": "^3.3.6",
     "yaml-loader": "0.5.0"
   },
@@ -80,13 +79,13 @@
       "installerIcon": "./build/windows/icon.ico"
     },
     "publish": [
+      {
+        "provider": "github"
+      },
       {
         "provider": "bintray",
         "token": "d993c4faa708a4cba84fa3a8e822457e7298d75c",
         "component": "main"
-      },
-      {
-        "provider": "github"
       }
     ],
     "portable": {
@@ -142,6 +141,6 @@
   },
   "repository": "eugeny/terminus",
   "dependencies": {
-    "eslint-plugin-import": "^2.18.0"
+    "eslint-plugin-import": "^2.18.2"
   }
 }

scripts/build-linux.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-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/webpack.config.js

@@ -1,10 +1,10 @@
 const path = require('path')
-const webpack = require('webpack')
 
 module.exports = {
     target: 'node',
     entry: 'src/index.ts',
     context: __dirname,
+    devtool: 'cheap-module-eval-source-map',
     output: {
         path: path.resolve(__dirname, 'dist'),
         filename: 'index.js',
@@ -48,11 +48,4 @@ module.exports = {
         /^@ng-bootstrap/,
         /^terminus-/,
     ],
-    plugins: [
-        new webpack.optimize.ModuleConcatenationPlugin(),
-        new webpack.SourceMapDevToolPlugin({
-            exclude: [/node_modules/, /vendor/],
-            filename: '[file].map',
-        }),
-    ],
 }

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

@@ -6,9 +6,7 @@ title-bar(
 .content(
     [class.tabs-on-top]='config.store.appearance.tabsLocation == "top"'
 )
-    .tab-bar(
-        *ngIf='!hostApp.isFullScreen',
-    )
+    .tab-bar
         .inset.background(*ngIf='hostApp.platform == Platform.macOS && config.store.appearance.frame == "thin" && config.store.appearance.tabsLocation == "top"')
         .tabs(
             dnd-sortable-container,
@@ -77,7 +75,7 @@ title-bar(
 
             button.btn.btn-secondary.btn-tab-bar.btn-update(
                 *ngIf='updatesAvailable',
-                title='Update available',
+                title='Update available - Click to install',
                 (click)='updateApp()',
                 [innerHTML]='sanitizeIcon(updateIcon)'
             )

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

@@ -128,8 +128,7 @@ export class AppRootComponent {
         })
 
         this.hostApp.windowCloseRequest$.subscribe(async () => {
-            await this.app.closeAllTabs()
-            this.hostApp.closeWindow()
+            await this.app.closeAllTabs() && this.hostApp.closeWindow()
         })
 
         if (window['safeModeReason']) {
@@ -218,8 +217,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 () {

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

@@ -147,13 +147,15 @@ export abstract class BaseTabComponent {
     /**
      * Called before the tab is closed
      */
-    destroy (): void {
+    destroy (skipDestroyedEvent = false): void {
         this.focused.complete()
         this.blurred.complete()
         this.titleChange.complete()
         this.progress.complete()
         this.recoveryStateChangedHint.complete()
-        this.destroyed.next()
+        if (!skipDestroyedEvent) {
+            this.destroyed.next()
+        }
         this.destroyed.complete()
     }
 }

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

@@ -10,7 +10,7 @@ import { AppService } from '../services/app.service'
 import { HostAppService, Platform } from '../services/hostApp.service'
 
 /** @hidden */
-export interface ISortableComponent {
+export interface SortableComponentProxy {
     setDragHandle (_: HTMLElement)
 }
 
@@ -34,7 +34,7 @@ export class TabHeaderComponent {
         private hostApp: HostAppService,
         private ngbModal: NgbModal,
         private hotkeys: HotkeysService,
-        @Inject(SortableComponent) private parentDraggable: ISortableComponent,
+        @Inject(SortableComponent) private parentDraggable: SortableComponentProxy,
         @Optional() @Inject(TabContextMenuItemProvider) protected contextMenuProviders: TabContextMenuItemProvider[],
     ) {
         this.hotkeys.matchedHotkey.subscribe((hotkey) => {

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

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

terminus-core/src/configDefaults.yaml

@@ -14,3 +14,4 @@ enableAnalytics: true
 enableWelcomeTab: true
 electronFlags:
   - ['force_discrete_gpu', '0']
+enableAutomaticUpdates: true

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

@@ -1,8 +1,11 @@
+
 import { Observable, Subject, AsyncSubject } from 'rxjs'
 import { takeUntil } from 'rxjs/operators'
 import { Injectable } from '@angular/core'
+
 import { BaseTabComponent } from '../components/baseTab.component'
 import { SplitTabComponent } from '../components/splitTab.component'
+
 import { ConfigService } from './config.service'
 import { HostAppService } from './hostApp.service'
 import { TabRecoveryService } from './tabRecovery.service'
@@ -67,18 +70,19 @@ export class AppService {
         private tabRecovery: TabRecoveryService,
         private tabsService: TabsService,
     ) {
-        this.tabRecovery.recoverTabs().then(tabs => {
-            for (const tab of tabs) {
-                this.openNewTabRaw(tab.type, tab.options)
-            }
-
-            this.tabsChanged$.subscribe(() => {
-                tabRecovery.saveTabs(this.tabs)
+        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)
+                })
+                setInterval(() => {
+                    tabRecovery.saveTabs(this.tabs)
+                }, 30000)
             })
-            setInterval(() => {
-                tabRecovery.saveTabs(this.tabs)
-            }, 30000)
-        })
+        }
     }
 
     addTabRaw (tab: BaseTabComponent) {
@@ -87,9 +91,11 @@ export class AppService {
         this.tabsChanged.next()
         this.tabOpened.next(tab)
 
-        tab.recoveryStateChangedHint$.subscribe(() => {
-            this.tabRecovery.saveTabs(this.tabs)
-        })
+        if (this.hostApp.getWindow().id === 1) {
+            tab.recoveryStateChangedHint$.subscribe(() => {
+                this.tabRecovery.saveTabs(this.tabs)
+            })
+        }
 
         tab.titleChange$.subscribe(title => {
             if (tab === this._activeTab) {
@@ -206,15 +212,19 @@ export class AppService {
         }
     }
 
-    async closeAllTabs () {
+    /**
+     * Attempts to close all tabs, returns false if one of the tabs blocked closure
+     */
+    async closeAllTabs (): Promise<boolean> {
         for (const tab of this.tabs) {
             if (!await tab.canClose()) {
-                return
+                return false
             }
         }
         for (const tab of this.tabs) {
-            tab.destroy()
+            tab.destroy(true)
         }
+        return true
     }
 
     /** @hidden */

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

@@ -71,8 +71,8 @@ export class ConfigProxy {
         }
     }
 
-    getValue (_key: string): any { }
-    setValue (_key: string, _value: any) { }
+    getValue (_key: string): any { } // eslint-disable-line @typescript-eslint/no-empty-function
+    setValue (_key: string, _value: any) { } // eslint-disable-line @typescript-eslint/no-empty-function
 }
 
 @Injectable({ providedIn: 'root' })

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

@@ -30,8 +30,8 @@ export class DockingService {
         }
 
         const newBounds: Bounds = { x: 0, y: 0, width: 0, height: 0 }
-        
-        const fill = this.config.store.appearance.dockFill <= 1 ? this.config.store.appearance.dockFill : 1;
+
+        const fill = this.config.store.appearance.dockFill <= 1 ? this.config.store.appearance.dockFill : 1
         const [minWidth, minHeight] = this.hostApp.getWindow().getMinimumSize()
 
         if (dockSide === 'left' || dockSide === 'right') {
@@ -64,15 +64,15 @@ export class DockingService {
     }
 
     getScreens () {
-        const primaryDisplayID = this.electron.screen.getPrimaryDisplay().id;
-        return this.electron.screen.getAllDisplays().sort((a,b) => (
+        const primaryDisplayID = this.electron.screen.getPrimaryDisplay().id
+        return this.electron.screen.getAllDisplays().sort((a, b) =>
             a.bounds.x === b.bounds.x ? a.bounds.y - b.bounds.y : a.bounds.x - b.bounds.x
-        )).map((display,index) => {
+        ).map((display,index) => {
             return {
                 id: display.id,
                 name: display.id === primaryDisplayID ? 'Primary Display' : `Display ${index +1}`,
             }
-        });
+        })
     }
 
     private repositionWindow () {

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

@@ -147,6 +147,8 @@ export class HostAppService {
                 this.cliPaste.next(text)
             } else if (op === 'profile') {
                 this.cliOpenProfile.next(argv.profileName)
+            } else if (op === undefined) {
+                this.newWindow()
             } else {
                 this.secondInstance.next()
             }

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

@@ -1,8 +1,13 @@
 import axios from 'axios'
+import * as fs from 'fs'
+import os from 'os'
+
+import { spawn } from 'mz/child_process'
 
 import { Injectable } from '@angular/core'
 import { Logger, LogService } from './log.service'
 import { ElectronService } from './electron.service'
+import { ConfigService } from './config.service'
 
 const UPDATES_URL = 'https://api.github.com/repos/eugeny/terminus/releases/latest'
 
@@ -18,11 +23,14 @@ export class UpdaterService {
     constructor (
         log: LogService,
         private electron: ElectronService,
+        config: ConfigService,
     ) {
         this.logger = log.create('updater')
 
         this.autoUpdater = electron.remote.require('electron-updater').autoUpdater
 
+        this.autoUpdater.autoInstallOnAppQuit = !!config.store.enableAutomaticUpdates
+
         this.autoUpdater.on('update-available', () => {
             this.logger.info('Update available')
         })
@@ -48,7 +56,7 @@ export class UpdaterService {
 
     async check (): Promise<boolean> {
         if (!this.electronUpdaterAvailable) {
-            this.logger.debug('Checking for updates')
+            this.logger.debug('Checking for updates through fallback method.')
             const response = await axios.get(UPDATES_URL)
             const data = response.data
             const version = data.tag_name.substring(1)
@@ -67,8 +75,21 @@ export class UpdaterService {
         if (!this.electronUpdaterAvailable) {
             this.electron.shell.openExternal(this.updateURL)
         } else {
-            await this.downloaded
-            this.autoUpdater.quitAndInstall()
+            if (process.platform === 'win32') {
+                let downloadpath = await this.autoUpdater.downloadUpdate()
+                fs.exists(downloadpath[0], (exists) => {
+                    if (exists) {
+                        fs.copyFile(downloadpath[0], os.tmpdir() + 'terminus-installer-temp.exe', (err) => {
+                            if (!err) {
+                                spawn(os.tmpdir() + 'terminus-installer-temp.exe', ['--force-run'], { detached: true, stdio: 'ignore' })
+                            }
+                        })
+                    }
+                })
+            } else {
+                await this.downloaded
+                this.autoUpdater.quitAndInstall(false, true)
+            }
         }
     }
 }

terminus-core/webpack.config.js

@@ -1,11 +1,10 @@
 const path = require('path')
-const webpack = require('webpack')
 
 module.exports = {
     target: 'node',
     entry: 'src/index.ts',
     context: __dirname,
-    mode: 'development',
+    devtool: 'cheap-module-eval-source-map',
     output: {
         path: path.resolve(__dirname, 'dist'),
         filename: 'index.js',
@@ -58,11 +57,4 @@ module.exports = {
         /^@angular/,
         /^@ng-bootstrap/,
     ],
-    plugins: [
-        new webpack.optimize.ModuleConcatenationPlugin(),
-        new webpack.SourceMapDevToolPlugin({
-            exclude: [/node_modules/, /vendor/],
-            filename: '[file].map',
-        }),
-    ],
 }

terminus-core/yarn.lock

@@ -132,9 +132,9 @@ colorspace@1.1.x:
     text-hex "1.0.x"
 
 core-js@^3.1.2:
-  version "3.1.4"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.1.4.tgz#3a2837fc48e582e1ae25907afcd6cf03b0cc7a07"
-  integrity sha512-YNZN8lt82XIMLnLirj9MhKDFZHalwzzrL9YLt6eb0T5D0EDl4IQ90IGkua8mHbnxNrkj1d8hbdizMc0Qmg1WnQ==
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.2.0.tgz#0a835fdf6aa677fff83a823a7b5276c9e7cebb76"
+  integrity sha512-gybgLzmr7SQRSF6UzGYXducx4eE10ONQlyEnQoqiGPbmbn7zLkb73tPfc4YbZN0lvcTQwoLNPjq4RuCaCumGyQ==
 
 core-util-is@~1.0.0:
   version "1.0.2"

terminus-plugin-manager/webpack.config.js

@@ -1,10 +1,10 @@
 const path = require('path')
-const webpack = require('webpack')
 
 module.exports = {
     target: 'node',
     entry: 'src/index.ts',
     context: __dirname,
+    devtool: 'cheap-module-eval-source-map',
     output: {
         path: path.resolve(__dirname, 'dist'),
         filename: 'index.js',
@@ -53,11 +53,4 @@ module.exports = {
         /^@ng-bootstrap/,
         /^terminus-/,
     ],
-    plugins: [
-        new webpack.optimize.ModuleConcatenationPlugin(),
-        new webpack.SourceMapDevToolPlugin({
-            exclude: [/node_modules/, /vendor/],
-            filename: '[file].map',
-        }),
-    ],
 }

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

@@ -236,6 +236,12 @@ ngb-tabset.vertical(type='pills', [activeId]='activeTab')
                     (ngModelChange)='config.save(); config.requestRestart()',
                 )
 
+            .form-line
+                .header
+                    .title Automatic Updates
+                    .description Enable automatic installation of updates when they become available.
+                toggle([(ngModel)]='config.store.enableAutomaticUpdates', (ngModelChange)='config.save()')
+
             .form-line
                 .header
                     .title Custom CSS

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

@@ -70,12 +70,12 @@ export class SettingsTabComponent extends BaseTabComponent {
         onConfigChange()
 
         const onScreenChange = () => {
-            this.zone.run(() => this.screens = this.docking.getScreens());
+            this.zone.run(() => this.screens = this.docking.getScreens())
         }
 
-        electron.screen.on('display-added', onScreenChange);
-        electron.screen.on('display-removed', onScreenChange);
-        electron.screen.on('display-metrics-changed', onScreenChange);
+        electron.screen.on('display-added', onScreenChange)
+        electron.screen.on('display-removed', onScreenChange)
+        electron.screen.on('display-metrics-changed', onScreenChange)
 
         hotkeys.getHotkeyDescriptions().then(descriptions => {
             this.hotkeyDescriptions = descriptions
@@ -100,7 +100,7 @@ export class SettingsTabComponent extends BaseTabComponent {
     }
 
     async getRecoveryToken (): Promise<any> {
-        return { type: 'app:settings' }
+        return null
     }
 
     ngOnDestroy () {

terminus-settings/webpack.config.js

@@ -1,11 +1,10 @@
 const path = require('path')
-const webpack = require('webpack')
 
 module.exports = {
     target: 'node',
     entry: 'src/index.ts',
     context: __dirname,
-    mode: 'development',
+    devtool: 'cheap-module-eval-source-map',
     output: {
         path: path.resolve(__dirname, 'dist'),
         filename: 'index.js',
@@ -55,11 +54,4 @@ module.exports = {
         /^@ng-bootstrap/,
         /^terminus-/,
     ],
-    plugins: [
-        new webpack.optimize.ModuleConcatenationPlugin(),
-        new webpack.SourceMapDevToolPlugin({
-            exclude: [/node_modules/, /vendor/],
-            filename: '[file].map',
-        }),
-    ],
 }

terminus-ssh/package.json

@@ -32,6 +32,6 @@
     "terminus-terminal": "*"
   },
   "optionalDependencies": {
-    "@terminus-term/windows-process-tree": "^0.2.4"
+    "windows-process-tree": "^0.2.4"
   }
 }

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

@@ -12,7 +12,7 @@ import { PasswordStorageService } from './passwordStorage.service'
 import { SSH2Stream } from 'ssh2-streams'
 
 try {
-    var windowsProcessTreeNative = require('@terminus-term/windows-process-tree/build/Release/windows_process_tree.node') // eslint-disable-line @typescript-eslint/no-var-requires
+    var windowsProcessTreeNative = require('windows-process-tree/build/Release/windows_process_tree.node') // eslint-disable-line @typescript-eslint/no-var-requires
 } catch { }
 
 @Injectable({ providedIn: 'root' })
@@ -132,13 +132,13 @@ export class SSHService {
             })
 
             ssh.on('banner', banner => {
-                log('Banner: ' + banner)
+                log('Banner: \n' + banner)
             })
 
             let agent: string = null
             if (this.hostApp.platform === Platform.Windows) {
                 const pageantRunning = new Promise<boolean>(resolve => {
-                    windowsProcessTreeNative.getProcessList(list => {
+                    windowsProcessTreeNative.getProcessList(list => { // eslint-disable-line block-scoped-var
                         resolve(list.some(x => x.name === 'pageant.exe'))
                     }, 0)
                 })

terminus-ssh/webpack.config.js

@@ -1,10 +1,10 @@
 const path = require('path')
-const webpack = require('webpack')
 
 module.exports = {
     target: 'node',
     entry: 'src/index.ts',
     context: __dirname,
+    devtool: 'cheap-module-eval-source-map',
     output: {
         path: path.resolve(__dirname, 'dist'),
         filename: 'index.js',
@@ -49,17 +49,10 @@ module.exports = {
         'keytar',
         'path',
         'ngx-toastr',
-        '@terminus-term/windows-process-tree/build/Release/windows_process_tree.node',
+        'windows-process-tree/build/Release/windows_process_tree.node',
         /^rxjs/,
         /^@angular/,
         /^@ng-bootstrap/,
         /^terminus-/,
     ],
-    plugins: [
-        new webpack.optimize.ModuleConcatenationPlugin(),
-        new webpack.SourceMapDevToolPlugin({
-            exclude: [/node_modules/, /vendor/],
-            filename: '[file].map',
-        }),
-    ],
 }

terminus-ssh/yarn.lock

@@ -2,13 +2,6 @@
 # yarn lockfile v1
 
 
-"@terminus-term/windows-process-tree@^0.2.4":
-  version "0.2.4"
-  resolved "https://registry.yarnpkg.com/@terminus-term/windows-process-tree/-/windows-process-tree-0.2.4.tgz#558f33d5afd934b070aec78da2529fc4042cf90d"
-  integrity sha512-FbquNhrFoe9EBwVITV9bqd/wukJLJSVI2pAzvM8dBvPP3/ErTiavZWU0W/J5av61SavJFDMkSiYVYL5NJe30zg==
-  dependencies:
-    nan "^2.13.2"
-
 "@types/node@*":
   version "9.3.0"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-9.3.0.tgz#3a129cda7c4e5df2409702626892cb4b96546dd5"
@@ -78,3 +71,10 @@ 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

@@ -21,14 +21,14 @@
     "@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",
     "runes": "^0.4.2",
     "slug": "^1.1.0",
     "uuid": "^3.3.2",
-    "xterm": "3.15.0-beta81",
+    "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",

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

@@ -15,7 +15,7 @@ import { TerminalContextMenuItemProvider } from './contextMenuProvider'
 
 
 /** @hidden */
-export interface IToastrService {
+export interface ToastrServiceProxy {
     info (_: string)
 }
 /**
@@ -80,7 +80,7 @@ export class BaseTerminalTabComponent extends BaseTabComponent implements OnInit
         protected sessions: SessionsService,
         protected electron: ElectronService,
         protected terminalContainersService: TerminalFrontendService,
-        @Inject(ToastrService) protected toastr: IToastrService,
+        @Inject(ToastrService) protected toastr: ToastrServiceProxy,
         protected log: LogService,
         @Optional() @Inject(TerminalDecorator) protected decorators: TerminalDecorator[],
         @Optional() @Inject(TerminalContextMenuItemProvider) protected contextMenuProviders: TerminalContextMenuItemProvider[],

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

@@ -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) {
@@ -101,6 +105,6 @@ export class AppearanceSettingsTabComponent {
     }
 
     getPreviewFontFamily () {
-        return getCSSFontFamily(this.config.store.terminal.font)
+        return getCSSFontFamily(this.config.store)
     }
 }

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

@@ -55,6 +55,16 @@ h3.mb-3 Shell
             button.btn.btn-secondary((click)='pickWorkingDirectory()')
                 i.fas.fa-folder-open
 
+.form-line
+    .header
+        .title Always Use Working Directory
+        .description By default, new terminals will open where the previous terminal was working. Enabling this option will always launch new terminals in the working directory specified above.
+
+    toggle(
+        [(ngModel)]='config.store.terminal.alwaysUseWorkingDirectory',
+        (ngModelChange)='config.save()'
+    )
+
 .form-line.align-items-start
     .header
         .title Environment

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

@@ -97,5 +97,6 @@ export class TerminalTabComponent extends BaseTerminalTabComponent {
     ngOnDestroy () {
         this.homeEndSubscription.unsubscribe()
         super.ngOnDestroy()
+        this.session.destroy()
     }
 }

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,
@@ -27,6 +28,7 @@ export class TerminalConfigProvider extends ConfigProvider {
             copyOnSelect: false,
             scrollOnInput: true,
             workingDirectory: '',
+            alwaysUseWorkingDirectory: false,
             altIsMeta: false,
             colorScheme: {
                 __nonStructural: true,

terminus-terminal/src/contextMenu.ts

@@ -35,7 +35,9 @@ export class NewTabContextMenu extends TerminalContextMenuItemProvider {
                 submenu: profiles.map(profile => ({
                     label: profile.name,
                     click: () => this.zone.run(async () => {
-                        this.terminalService.openTab(profile, await tab.session.getWorkingDirectory())
+                        const workingDirectory = this.config.store.terminal.alwaysUseWorkingDirectory === true ?
+                            this.config.store.terminal.workingDirectory : await tab.session.getWorkingDirectory()
+                        await this.terminalService.openTab(profile, workingDirectory)
                     }),
                 })),
             },

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

terminus-terminal/src/frontends/xtermFrontend.ts

@@ -48,7 +48,7 @@ export class XTermFrontend extends Frontend {
             this.title.next(title)
         })
         this.xterm.onSelectionChange(() => {
-            if (this.copyOnSelect) {
+            if (this.copyOnSelect && this.getSelection()) {
                 this.copySelection()
             }
         })
@@ -86,7 +86,18 @@ export class XTermFrontend extends Frontend {
         this.resizeHandler = () => {
             try {
                 if (this.xtermCore.element && getComputedStyle(this.xtermCore.element).getPropertyValue('height') !== 'auto') {
-                    this.fitAddon.fit()
+                    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
+                    let actualCellWidth = this.xtermCore._renderService.dimensions.actualCellWidth || 9
+                    let actualCellHeight = this.xtermCore._renderService.dimensions.actualCellHeight || 17
+                    let cols = Math.floor(l / actualCellWidth)
+                    let rows = Math.floor(i / actualCellHeight)
+
+                    this.xterm.resize(cols, rows)
                 }
             } catch (e) {
                 // tends to throw when element wasn't shown yet
@@ -186,7 +197,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',
@@ -256,7 +267,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('')
@@ -264,7 +275,7 @@ 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 {
@@ -274,8 +285,8 @@ export class XTermFrontend extends Frontend {
         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

@@ -156,9 +156,17 @@ export default class TerminalModule { // eslint-disable-line @typescript-eslint/
             }
         })
         if (config.store.terminal.autoOpen) {
-            app.ready$.subscribe(() => {
-                terminal.openTab()
-            })
+
+            let argv = require('electron').remote.process.argv
+            if (argv[0].includes('node')) {
+                argv = argv.slice(1)
+            }
+
+            if(require('yargs').parse(argv.slice(1))._[0] !== "open"){
+                app.ready$.subscribe(() => {
+                    terminal.openTab()
+                })
+            }
         }
 
         hotkeys.matchedHotkey.subscribe(async (hotkey) => {

terminus-terminal/src/services/sessions.service.ts

@@ -18,7 +18,7 @@ try {
 } catch { }
 
 try {
-    var windowsProcessTree = require('@terminus-term/windows-process-tree')  // eslint-disable-line @typescript-eslint/no-var-requires
+    var windowsProcessTree = require('windows-process-tree')  // eslint-disable-line @typescript-eslint/no-var-requires
 } catch { }
 
 
@@ -284,7 +284,7 @@ export class Session extends BaseSession {
             } catch (e) {
                 return null
             }
-            let cwd = lines[(lines[1] === 'fcwd') ? 2 : 1].substring(1)
+            let cwd = lines[lines[1] === 'fcwd' ? 2 : 1].substring(1)
             if (cwd.startsWith(catalinaDataVolumePrefix)) {
                 cwd = cwd.substring(catalinaDataVolumePrefix.length)
             }

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

@@ -65,14 +65,16 @@ export class TerminalService {
         }
 
         if (!cwd) {
-            if (this.app.activeTab instanceof TerminalTabComponent && this.app.activeTab.session) {
-                cwd = await this.app.activeTab.session.getWorkingDirectory()
-            }
-            if (this.app.activeTab instanceof SplitTabComponent) {
-                const focusedTab = this.app.activeTab.getFocusedTab()
+            if (!this.config.store.terminal.alwaysUseWorkingDirectory) {
+                if (this.app.activeTab instanceof TerminalTabComponent && this.app.activeTab.session) {
+                    cwd = await this.app.activeTab.session.getWorkingDirectory()
+                }
+                if (this.app.activeTab instanceof SplitTabComponent) {
+                    const focusedTab = this.app.activeTab.getFocusedTab()
 
-                if (focusedTab instanceof TerminalTabComponent && focusedTab.session) {
-                    cwd = await focusedTab.session.getWorkingDirectory()
+                    if (focusedTab instanceof TerminalTabComponent && focusedTab.session) {
+                        cwd = await focusedTab.session.getWorkingDirectory()
+                    }
                 }
             }
             cwd = cwd || this.config.store.terminal.workingDirectory

terminus-terminal/src/utils.ts

@@ -8,8 +8,11 @@ export function isWindowsBuild (build: number): boolean {
     return process.platform === 'win32' && parseFloat(os.release()) >= 10 && parseInt(os.release().split('.')[2]) >= build
 }
 
-export function getCSSFontFamily (fontList: string): string {
-    let fonts = fontList.split(',').map(x => x.trim().replace(/"/g, ''))
+export function getCSSFontFamily (config: any): string {
+    let fonts = config.terminal.font.split(',').map(x => x.trim().replace(/"/g, ''))
+    if (config.terminal.fallbackFont) {
+        fonts.push(config.terminal.fallbackFont)
+    }
     fonts.push('monospace-fallback')
     fonts.push('monospace')
     fonts = fonts.map(x => `"${x}"`)

terminus-terminal/webpack.config.js

@@ -1,10 +1,10 @@
 const path = require('path')
-const webpack = require('webpack')
 
 module.exports = {
     target: 'node',
     entry: 'src/index.ts',
     context: __dirname,
+    devtool: 'cheap-module-eval-source-map',
     output: {
         path: path.resolve(__dirname, 'dist'),
         filename: 'index.js',
@@ -66,7 +66,7 @@ module.exports = {
         'macos-native-processlist',
         'windows-native-registry',
         'node-pty',
-        '@terminus-term/windows-process-tree',
+        'windows-process-tree',
         'os',
         /^rxjs/,
         /^@angular/,
@@ -74,11 +74,4 @@ module.exports = {
         'ngx-toastr',
         /^terminus-/,
     ],
-    plugins: [
-        new webpack.optimize.ModuleConcatenationPlugin(),
-        new webpack.SourceMapDevToolPlugin({
-            exclude: [/node_modules/, /vendor/],
-            filename: '[file].map',
-        }),
-    ],
 }

terminus-terminal/yarn.lock

@@ -39,10 +39,24 @@ dataurl@0.1.0:
   resolved "https://registry.yarnpkg.com/dataurl/-/dataurl-0.1.0.tgz#1f4734feddec05ffe445747978d86759c4b33199"
   integrity sha1-H0c0/t3sBf/kRXR5eNhnWcSzMZk=
 
-deep-equal@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5"
-  integrity sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=
+deep-equal@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.0.tgz#3103cdf8ab6d32cf4a8df7865458f2b8d33f3745"
+  integrity sha512-ZbfWJq/wN1Z273o7mUSjILYqehAktR2NVoSrOukDkU9kg2v/Uv89yU4Cvz8seJeAmtN5oqiefKq8FPuXOboqLw==
+  dependencies:
+    is-arguments "^1.0.4"
+    is-date-object "^1.0.1"
+    is-regex "^1.0.4"
+    object-is "^1.0.1"
+    object-keys "^1.1.1"
+    regexp.prototype.flags "^1.2.0"
+
+define-properties@^1.1.2:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
+  integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==
+  dependencies:
+    object-keys "^1.0.12"
 
 font-finder@^1.0.2, font-finder@^1.0.3:
   version "1.0.4"
@@ -61,16 +75,45 @@ font-ligatures@^1.3.1:
     lru-cache "^4.1.3"
     opentype.js "^0.8.0"
 
+function-bind@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
+  integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
+
 get-system-fonts@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/get-system-fonts/-/get-system-fonts-2.0.0.tgz#a43b9a33f05c0715a60176d2aad5ce6e98f0a3c6"
   integrity sha512-iiM/DavyF2nnLdELzPBSHojzQJVai9WiwrRzn5gp2dutJuerC8qHyBoh4lxfVdKGbnb9eZ4p8Oefbuc3yExB7Q==
 
+has@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
+  integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
+  dependencies:
+    function-bind "^1.1.1"
+
 hterm-umdjs@1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/hterm-umdjs/-/hterm-umdjs-1.4.1.tgz#0cd5352eaf927c70b83c36146cf2c2a281dba957"
   integrity sha512-r5JOmdDK1bZCmp3cKcuGRLVeum33H+pzD119ZxmQou+QUVe6SAVSz03HvKWVhM2Ao1Biv+fkhFDmnsaRPq0tFg==
 
+is-arguments@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.0.4.tgz#3faf966c7cba0ff437fb31f6250082fcf0448cf3"
+  integrity sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==
+
+is-date-object@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"
+  integrity sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=
+
+is-regex@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491"
+  integrity sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=
+  dependencies:
+    has "^1.0.1"
+
 lru-cache@^4.1.3:
   version "4.1.5"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"
@@ -93,6 +136,16 @@ object-assign@^4.0.1:
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
   integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
 
+object-is@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.0.1.tgz#0aa60ec9989a0b3ed795cf4d06f62cf1ad6539b6"
+  integrity sha1-CqYOyZiaCz7Xlc9NBvYs8a1lObY=
+
+object-keys@^1.0.12, object-keys@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
+  integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
+
 opentype.js@^0.8.0:
   version "0.8.0"
   resolved "https://registry.yarnpkg.com/opentype.js/-/opentype.js-0.8.0.tgz#acabcfa1642fbe894a3e4d759e43ba694e02bd35"
@@ -117,6 +170,13 @@ pseudomap@^1.0.2:
   resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
   integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM=
 
+regexp.prototype.flags@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.2.0.tgz#6b30724e306a27833eeb171b66ac8890ba37e41c"
+  integrity sha512-ztaw4M1VqgMwl9HlPpOuiYgItcHlunW0He2fE6eNfT6E/CF2FtYi9ofOYe4mKntstYk0Fyh/rDRBdS3AnxjlrA==
+  dependencies:
+    define-properties "^1.1.2"
+
 runes@^0.4.2:
   version "0.4.3"
   resolved "https://registry.yarnpkg.com/runes/-/runes-0.4.3.tgz#32f7738844bc767b65cc68171528e3373c7bb355"
@@ -179,19 +239,19 @@ xterm-addon-ligatures@^0.1.0-beta-2:
     font-ligatures "^1.3.1"
 
 xterm-addon-search@^0.2.0-beta1:
-  version "0.2.0-beta2"
-  resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.2.0-beta2.tgz#c3173f0a6f207ee9f1848849174ee5d6b6ce8262"
-  integrity sha512-XEcwi2TeFGk2MuIFjiI/OpVXSNO5dGQBvHH3o+9KzqG3ooVqhhDqzwxs092QGNcNCGh8hGn/PWZiczaBBnKm/g==
+  version "0.2.0-beta5"
+  resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.2.0-beta5.tgz#258d7cb1511d9060cd4520f0f82e408000fd4f53"
+  integrity sha512-Tg+d8scch0rYOVmzBbX35Y1GXtq+eu/YlzbXznmTo/yD83j3BQlXOhgECu/Yv8EX5JwFmzbfVRWC+JWnfigwGg==
 
 xterm-addon-webgl@^0.2.0-beta1:
-  version "0.2.0-beta5"
-  resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.2.0-beta5.tgz#79d97c21bb09c34c6aca6f4e72afe8085f8a77dc"
-  integrity sha512-TR6071ZWQ2l0E/P7KedDfsGCW21BWCfemiV/swBF+X/BiRzzsZlJXpZP62jR/XV0/J7r1SMVPSIP5j8TMCoDmw==
+  version "0.2.0-beta6"
+  resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.2.0-beta6.tgz#308464aebc6002f04514673e5233fe237df76d7f"
+  integrity sha512-KPGv5VPzeZWmqHIuR73UOD/eMSLG2mi57qQCrjYUMOQK9PPFfm5KQtYmCfK+DhNUWqrs5dpGbFFLv3lfwVghcg==
 
-xterm@3.15.0-beta81:
-  version "3.15.0-beta81"
-  resolved "https://registry.yarnpkg.com/xterm/-/xterm-3.15.0-beta81.tgz#1a4c01467776753d1cebee8bfafb6c4ee7f9d543"
-  integrity sha512-tyADfzVm55CAxCIXWJzHWMCRPYcJQp8hO/85KLxRuVjCdeuVgRn/9U9VKypNd9DJkZGsf1rONkQMnG6IDZ1DEQ==
+xterm@3.15.0-beta98:
+  version "3.15.0-beta98"
+  resolved "https://registry.yarnpkg.com/xterm/-/xterm-3.15.0-beta98.tgz#37f37c35577422880e7ef673cc37f9d2a45dd40c"
+  integrity sha512-vZbg2LcRvoiJOgr1MyeLFM9mF4uib3BWUWDHyFc+vZ58CTuK0iczOvFXgk/ySo23ZLqwmHQSigLgmWvZ8J5G0Q==
 
 yallist@^2.1.2:
   version "2.1.2"