Merge branch 'master' of github.com:Eugeny/terminus

Bump xterm-addon-unicode11 from 0.2.0-beta.5 to 0.2.0 in /terminus-terminal

.all-contributorsrc

@@ -0,0 +1,283 @@
+{
+  "files": [
+    "README.md"
+  ],
+  "imageSize": 100,
+  "commit": false,
+  "contributors": [
+    {
+      "login": "mezner",
+      "name": "Russell Myers",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/184085?v=4",
+      "profile": "http://www.russellmyers.com",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "ehwarren",
+      "name": "Austin Warren",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/3991658?v=4",
+      "profile": "http://www.morwire.com",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Drachenkaetzchen",
+      "name": "Felicia Hummel",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/162974?v=4",
+      "profile": "https://github.com/Drachenkaetzchen",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "mikemaccana",
+      "name": "Mike MacCana",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/172594?v=4",
+      "profile": "https://github.com/mikemaccana",
+      "contributions": [
+        "test",
+        "design"
+      ]
+    },
+    {
+      "login": "yxuko",
+      "name": "Yacine Kanzari",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/1786317?v=4",
+      "profile": "https://github.com/yxuko",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "BBJip",
+      "name": "BBJip",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/32908927?v=4",
+      "profile": "https://github.com/BBJip",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Futagirl",
+      "name": "Futagirl",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/33533958?v=4",
+      "profile": "https://github.com/Futagirl",
+      "contributions": [
+        "design"
+      ]
+    },
+    {
+      "login": "levrik",
+      "name": "Levin Rickert",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/9491603?v=4",
+      "profile": "https://www.levrik.io",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "kwonoj",
+      "name": "OJ Kwon",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/1210596?v=4",
+      "profile": "https://kwonoj.github.io",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Domain",
+      "name": "domain",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/903197?v=4",
+      "profile": "https://github.com/Domain",
+      "contributions": [
+        "plugin",
+        "code"
+      ]
+    },
+    {
+      "login": "kbjr",
+      "name": "James Brumond",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/195127?v=4",
+      "profile": "http://www.jbrumond.me",
+      "contributions": [
+        "plugin"
+      ]
+    },
+    {
+      "login": "Tyriar",
+      "name": "Daniel Imms",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/2193314?v=4",
+      "profile": "http://www.growingwiththeweb.com",
+      "contributions": [
+        "code",
+        "plugin",
+        "test"
+      ]
+    },
+    {
+      "login": "baflo",
+      "name": "Florian Bachmann",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/834350?v=4",
+      "profile": "https://github.com/baflo",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "mischah",
+      "name": "Michael Kühnel",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/441011?v=4",
+      "profile": "http://michael-kuehnel.de",
+      "contributions": [
+        "code",
+        "design"
+      ]
+    },
+    {
+      "login": "NieLeben",
+      "name": "Tilmann Meyer",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/47182955?v=4",
+      "profile": "https://github.com/NieLeben",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "PMExtra",
+      "name": "PM Extra",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/11289158?v=4",
+      "profile": "http://www.jubeat.net",
+      "contributions": [
+        "bug"
+      ]
+    },
+    {
+      "login": "IgnusG",
+      "name": "Jonathan",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/6438760?v=4",
+      "profile": "https://jjuhas.keybase.pub//",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "hammster",
+      "name": "Hans Koch",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/1093709?v=4",
+      "profile": "https://hans-koch.me",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "ThePuzzlemaker",
+      "name": "Dak Smyth",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/12666617?v=4",
+      "profile": "http://thepuzzlemaker.info",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "yfwz100",
+      "name": "Wang Zhi",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/983211?v=4",
+      "profile": "http://yfwz100.github.io",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "jack1142",
+      "name": "jack1142",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/6032823?v=4",
+      "profile": "https://github.com/jack1142",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "hdougie",
+      "name": "Howie Douglas",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/450799?v=4",
+      "profile": "https://github.com/hdougie",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "ckaczor",
+      "name": "Chris Kaczor",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/180906?v=4",
+      "profile": "https://chriskaczor.com",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "boxmein",
+      "name": "Johannes Kadak",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/358714?v=4",
+      "profile": "https://www.boxmein.net",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "LeSeulArtichaut",
+      "name": "LeSeulArtichaut",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/38361244?v=4",
+      "profile": "https://github.com/LeSeulArtichaut",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "CyrilTaylor",
+      "name": "Cyril Taylor",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/12631466?v=4",
+      "profile": "https://github.com/CyrilTaylor",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "nstefanou",
+      "name": "nstefanou",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/51129173?v=4",
+      "profile": "https://github.com/nstefanou",
+      "contributions": [
+        "code",
+        "plugin"
+      ]
+    },
+    {
+      "login": "orin220444",
+      "name": "orin220444",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/30747229?v=4",
+      "profile": "https://github.com/orin220444",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Goobles",
+      "name": "Gobius Dolhain",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/8776771?v=4",
+      "profile": "https://github.com/Goobles",
+      "contributions": [
+        "code"
+      ]
+    }
+  ],
+  "contributorsPerLine": 7,
+  "projectName": "terminus",
+  "projectOwner": "Eugeny",
+  "repoType": "github",
+  "repoHost": "https://github.com",
+  "commitConvention": "none",
+  "skipCi": true
+}

.eslintrc.yml

@@ -0,0 +1,106 @@
+parser: '@typescript-eslint/parser'
+parserOptions:
+  project: tsconfig.json
+extends:
+  - 'plugin:@typescript-eslint/all'
+plugins:
+  - '@typescript-eslint'
+env:
+  browser: true
+  es6: true
+  node: true
+  commonjs: true
+rules:
+  '@typescript-eslint/semi':
+  - error
+  - never
+  '@typescript-eslint/indent':
+  - error
+  - 4
+  '@typescript-eslint/explicit-member-accessibility':
+  - error
+  - accessibility: no-public
+    overrides:
+      parameterProperties: explicit
+  '@typescript-eslint/no-require-imports': off
+  '@typescript-eslint/no-parameter-properties': off
+  '@typescript-eslint/explicit-function-return-type': off
+  '@typescript-eslint/no-explicit-any': off
+  '@typescript-eslint/no-magic-numbers': off
+  '@typescript-eslint/member-delimiter-style': off
+  '@typescript-eslint/promise-function-async': off
+  '@typescript-eslint/no-unnecessary-type-assertion': off
+  '@typescript-eslint/require-array-sort-compare': off
+  '@typescript-eslint/no-floating-promises': off
+  '@typescript-eslint/prefer-readonly': off
+  '@typescript-eslint/require-await': off
+  '@typescript-eslint/strict-boolean-expressions': off
+  '@typescript-eslint/no-misused-promises': off
+  '@typescript-eslint/typedef': off
+  '@typescript-eslint/no-use-before-define':
+  - error
+  - classes: false
+  no-duplicate-imports: error
+  array-bracket-spacing:
+  - error
+  - never
+  block-scoped-var: error
+  brace-style: off
+  '@typescript-eslint/brace-style':
+  - error
+  - 1tbs
+  - allowSingleLine: true
+  computed-property-spacing:
+  - error
+  - never
+  comma-dangle:
+  - error
+  - always-multiline
+  curly: error
+  eol-last: error
+  eqeqeq:
+  - error
+  - smart
+  linebreak-style:
+  - error
+  - unix
+  max-depth:
+  - 1
+  - 5
+  max-statements:
+  - 1
+  - 80
+  no-multiple-empty-lines: error
+  no-mixed-spaces-and-tabs: error
+  no-trailing-spaces: error
+  '@typescript-eslint/no-unused-vars':
+    - error
+    - vars: all
+      args: after-used
+      argsIgnorePattern: ^_
+  no-undef: error
+  no-var: error
+  object-curly-spacing:
+  - error
+  - always
+  quote-props:
+  - warn
+  - as-needed
+  - keywords: true
+    numbers: true
+  quotes: off
+  '@typescript-eslint/quotes':
+  - error
+  - single
+  - allowTemplateLiterals: true
+  '@typescript-eslint/no-non-null-assertion': off
+  '@typescript-eslint/no-unnecessary-condition': off
+  '@typescript-eslint/no-untyped-public-signature': off # bugs out on constructors
+  '@typescript-eslint/restrict-template-expressions': off
+  '@typescript-eslint/no-dynamic-delete': off
+  '@typescript-eslint/prefer-nullish-coalescing': off
+  '@typescript-eslint/prefer-readonly-parameter-types': off
+  '@typescript-eslint/no-unsafe-member-access': off
+  '@typescript-eslint/no-unsafe-call': off
+  '@typescript-eslint/no-unsafe-return': off
+  '@typescript-eslint/no-base-to-string': off # broken in typescript-eslint

.github/FUNDING.yml

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

.github/stale.yml

@@ -1,11 +1,11 @@
 # 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"
-  - "S: Triaged"
+  - "S: Confirmed"
 # Label to use when marking an issue as stale
 staleLabel: "S: Stale"
 # Comment to post when marking an issue as stale. Set to `false` to disable

.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:
+        node-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:
+        node-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,73 @@
+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:
+        node-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: 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,70 @@
+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:
+        node-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: Webpack
+      run: yarn run build
+
+    - name: Prepackage plugins
+      run: scripts/prepackage-plugins.js
+
+    - run: sed -i '' 's/updateInfo = await/\/\/updateInfo = await/g' node_modules/app-builder-lib/out/targets/ArchiveTarget.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 }}
+        APPSTORE_USERNAME: ${{ secrets.APPSTORE_USERNAME }}
+        APPSTORE_PASSWORD: ${{ secrets.APPSTORE_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:
+        node-version: 10
+
+    - name: Build
+      shell: powershell
+      run: |
+        npm i -g yarn@1.19.1
+        yarn
+        node scripts/build-native.js
+        yarn run build
+        node scripts/prepackage-plugins.js
+
+    - name: Build and sign packages
+      run: node scripts/build-windows.js
+      if: github.repository == 'Eugeny/terminus' && github.event_name == 'push'
+      env:
+        GH_TOKEN: ${{ secrets.GH_TOKEN }}
+        WIN_CSC_LINK: ${{ secrets.WIN_CSC_LINK }}
+        WIN_CSC_KEY_PASSWORD: ${{ secrets.WIN_CSC_KEY_PASSWORD }}
+
+    - name: Build packages without signing
+      run: node scripts/build-windows.js
+      if: github.repository != 'Eugeny/terminus' || github.event_name != 'push'
+
+    - name: Package artifacts
+      run: |
+        mkdir artifact-setup
+        mv dist/*-setup.exe artifact-setup/
+        mkdir artifact-portable
+        mv dist/*-portable.zip artifact-portable/
+
+    - uses: actions/upload-artifact@master
+      name: Upload installer
+      with:
+        name: Installer
+        path: artifact-setup
+
+    - uses: actions/upload-artifact@master
+      name: Upload portable build
+      with:
+        name: Portable build
+        path: artifact-portable

.gitignore

@@ -5,6 +5,9 @@ node_modules
 
 build/files.wxs
 dist
+*/dist
+*/typings
+*.tsbuildinfo
 
 *.xcworkspacedata
 *.xcuserstate
@@ -17,3 +20,11 @@ npm-debug.log
 builtin-plugins
 package-lock.json
 yarn-error.log
+
+docs/api
+.travis.ssh.key
+*.code-workspace
+
+.electron-symbols
+sentry.properties
+sentry-symbols.js

.mergify.yml

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

.travis.yml

@@ -1,29 +1,28 @@
-matrix:
-  include:
-  - os: linux
-    env: BUILD_FOR=linux
-  - os: osx
-    env: BUILD_FOR=macos
-
 language: node_js
-node_js: 8
+node_js: 11
 
-cache:
+stages:
-  directories:
+  - Build
-    - node_modules
+  - name: Docs
-    - app/node_modules
+    if: branch = master
 
-before_install:
+jobs:
-    - yarn install
+  include:
-    - scripts/install-deps.js
+    - stage: 'Docs'
+      os: linux
+      if: branch = master
+      script:
+        - '[ -z "${encrypted_4e2fb4889ef8_iv}" ] && exit 0 || true'
+        - set -e
+        - openssl aes-256-cbc -K $encrypted_4e2fb4889ef8_key -iv $encrypted_4e2fb4889ef8_iv -in .travis.ssh.key.enc -out .travis.ssh.key -d
+        - eval "$(ssh-agent -s)"
+        - chmod 600 .travis.ssh.key
+        - ssh-add .travis.ssh.key
+        - yarn
+        - yarn run docs
+        - rsync -e "ssh -o StrictHostKeyChecking=no" -arv docs/api/ root@ajenti.org:/srv/terminus-docs/
 
-script:
+dist: xenial
-    - scripts/build-native.js
-    - yarn run build
-    - scripts/prepackage-plugins.js
-    - scripts/build-$BUILD_FOR.js
-
-dist: trusty
 sudo: false
 
 addons:
@@ -31,6 +30,7 @@ addons:
     packages:
     - rpm
     - yarn
+    - libsecret-1-dev
     sources:
     - sourceline: 'deb https://dl.yarnpkg.com/debian/ stable main'
       key_url: 'https://dl.yarnpkg.com/debian/pubkey.gpg'

HACKING.md

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

README.md

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

app/assets/logo.svg

@@ -1,91 +1,55 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<!-- Generator: Adobe Illustrator 23.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-<svg
+	 viewBox="0 0 1024 1024" style="enable-background:new 0 0 1024 1024;" xml:space="preserve">
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
+<style type="text/css">
-   xmlns:cc="http://creativecommons.org/ns#"
+	.st0{fill:url(#SVGID_1_);}
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+	.st1{opacity:0.16;fill:url(#SVGID_2_);}
-   xmlns:svg="http://www.w3.org/2000/svg"
+	.st2{fill:url(#SVGID_3_);}
-   xmlns="http://www.w3.org/2000/svg"
+	.st3{opacity:0.16;fill:url(#SVGID_4_);}
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+	.st4{fill:url(#SVGID_5_);}
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+	.st5{opacity:0.15;fill:url(#SVGID_6_);}
-   width="150mm"
+	.st6{fill:url(#SVGID_7_);}
-   height="150mm"
+</style>
-   viewBox="0 0 150 150"
+<g>
-   version="1.1"
+	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="260.9675" y1="871.1813" x2="919.1845" y2="491.1596">
-   id="svg8"
+		<stop  offset="0" style="stop-color:#669ABD"/>
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+		<stop  offset="1" style="stop-color:#77DBDB"/>
-   sodipodi:docname="logo.svg"
+	</linearGradient>
-   inkscape:export-filename="/home/eugene/Work/term/build/icons/512x512.png"
+	<polygon class="st0" points="297.54,934.52 882.6,596.72 882.61,427.82 297.54,765.65 	"/>
-   inkscape:export-xdpi="86.699997"
+	<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="553.5051" y1="617.8278" x2="626.647" y2="744.5132">
-   inkscape:export-ydpi="86.699997">
+		<stop  offset="0.5588" style="stop-color:#000000;stop-opacity:0"/>
-  <defs
+		<stop  offset="1" style="stop-color:#000000"/>
-     id="defs2" />
+	</linearGradient>
-  <sodipodi:namedview
+	<polygon class="st1" points="297.54,934.52 882.6,596.72 882.61,427.82 297.54,765.65 	"/>
-     id="base"
+</g>
-     pagecolor="#ffffff"
+<g>
-     bordercolor="#666666"
+	<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="114.6631" y1="744.5275" x2="334.0905" y2="871.2141">
-     borderopacity="1.0"
+		<stop  offset="0" style="stop-color:#6A8FAD"/>
-     inkscape:pageopacity="0.0"
+		<stop  offset="1" style="stop-color:#669ABD"/>
-     inkscape:pageshadow="2"
+	</linearGradient>
-     inkscape:zoom="0.49497475"
+	<polygon class="st2" points="151.23,681.18 151.22,850.09 297.54,934.52 297.54,765.65 	"/>
-     inkscape:cx="85.897128"
+	<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="260.9478" y1="744.5281" x2="187.8059" y2="871.2135">
-     inkscape:cy="375.72042"
+		<stop  offset="0.5588" style="stop-color:#000000;stop-opacity:0"/>
-     inkscape:document-units="mm"
+		<stop  offset="1" style="stop-color:#000000"/>
-     inkscape:current-layer="layer1"
+	</linearGradient>
-     showgrid="false"
+	<polygon class="st3" points="151.23,681.18 151.22,850.09 297.54,934.52 297.54,765.65 	"/>
-     inkscape:snap-bbox="true"
+</g>
-     inkscape:window-width="1366"
+<g>
-     inkscape:window-height="692"
+	<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="114.663" y1="237.793" x2="553.5026" y2="491.1571">
-     inkscape:window-x="0"
+		<stop  offset="0" style="stop-color:#6A8FAD"/>
-     inkscape:window-y="0"
+		<stop  offset="1" style="stop-color:#669ABD"/>
-     inkscape:window-maximized="1"
+	</linearGradient>
-     fit-margin-top="0"
+	<polygon class="st4" points="151.23,174.45 151.21,343.36 443.79,512.27 590.08,427.81 	"/>
-     fit-margin-left="0"
+	<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="370.6562" y1="301.1281" x2="297.5094" y2="427.8221">
-     fit-margin-right="0"
+		<stop  offset="0.5588" style="stop-color:#000000;stop-opacity:0"/>
-     fit-margin-bottom="0"
+		<stop  offset="1" style="stop-color:#000000"/>
-     inkscape:snap-intersection-paths="true"
+	</linearGradient>
-     inkscape:object-paths="true" />
+	<polygon class="st5" points="151.23,174.45 151.21,343.36 443.79,512.27 590.08,427.81 	"/>
-  <metadata
+</g>
-     id="metadata5">
+<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="78.0912" y1="554.4979" x2="736.3375" y2="174.4593">
-    <rdf:RDF>
+	<stop  offset="0" style="stop-color:#CCECFF"/>
-      <cc:Work
+	<stop  offset="1" style="stop-color:#9FECED"/>
-         rdf:about="">
+</linearGradient>
-        <dc:format>image/svg+xml</dc:format>
+<polygon class="st6" points="297.51,765.64 151.23,681.18 590.08,427.81 151.23,174.45 297.5,90 882.61,427.82 "/>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-10.356544,-82.309525)">
-    <path
-       inkscape:connector-curvature="0"
-       id="path138"
-       style="opacity:0.9;fill:#bfd9f1;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.12037313px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
-       d="M 33.048081,103.66303 101.30357,143.02426 80.80219,154.86063 33.048089,125.73315 Z"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path116"
-       style="opacity:0.9;fill:#6666af;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.12037313px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
-       d="m 141.59934,143.95811 0.051,23.16109 -87.420905,49.42651 -0.0034,-22.16232 z"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path118"
-       style="opacity:0.9;fill:#bfd9f1;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.12037313px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
-       d="m 33.233182,182.28294 20.992812,12.1202 0.0034,22.16208 -20.996251,-12.19239 z"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="opacity:0.9;fill:#9dbef0;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.12649226px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
-       d="m 52.236336,92.196079 -19.484508,11.249681 68.551742,39.5785 -68.366041,39.4708 21.107487,12.18633 68.366044,-39.4708 19.48451,-11.24968 z"
-       id="path134"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccc" />
-  </g>
 </svg>

app/dev-app-update.yml

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

app/index.pug

@@ -8,17 +8,15 @@ html
             window.nodeRequire = require
         script(src='./preload.js')
         script(src='./bundle.js', defer)
-        style#custom-css
         style.
             body { transition: 0.5s background; }
     body
+        style#custom-css
         app-root
             .preload-logo
                 div
                     .terminus-logo
                     h1.terminus-title Terminus
-                        sup α 
+                        sup α
                     .progress
                         .bar(style='width: 0%')
-
-                    

app/lib/app.ts

@@ -1,4 +1,6 @@
-import { app, ipcMain, Menu, Tray, shell } from 'electron'
+import { app, ipcMain, Menu, Tray, shell, globalShortcut } from 'electron'
+// eslint-disable-next-line no-duplicate-imports
+import * as electron from 'electron'
 import { loadConfig } from './config'
 import { Window, WindowOptions } from './window'
 
@@ -7,17 +9,39 @@ export class Application {
     private windows: Window[] = []
 
     constructor () {
-        ipcMain.on('app:config-change', () => {
+        ipcMain.on('app:config-change', (_event, config) => {
-            this.broadcast('host:config-change')
+            this.broadcast('host:config-change', config)
+        })
+
+        ipcMain.on('app:register-global-hotkey', (_event, specs) => {
+            globalShortcut.unregisterAll()
+            for (let spec of specs) {
+                globalShortcut.register(spec, () => {
+                    this.onGlobalHotkey()
+                })
+            }
         })
 
         const configData = loadConfig()
-        if (process.platform === 'linux' && ((configData.appearance || {}).opacity || 1) !== 1) {
+        if (process.platform === 'linux') {
-            app.commandLine.appendSwitch('enable-transparent-visuals')
+            app.commandLine.appendSwitch('no-sandbox')
-            app.disableHardwareAcceleration()
+            if (((configData.appearance || {}).opacity || 1) !== 1) {
+                app.commandLine.appendSwitch('enable-transparent-visuals')
+                app.disableHardwareAcceleration()
+            }
         }
 
         app.commandLine.appendSwitch('disable-http-cache')
+        app.commandLine.appendSwitch('lang', 'EN')
+        app.allowRendererProcessReuse = false
+
+        for (const flag of configData.flags || [['force_discrete_gpu', '0']]) {
+            app.commandLine.appendSwitch(flag[0], flag[1])
+        }
+    }
+
+    init (): void {
+        electron.screen.on('display-metrics-changed', () => this.broadcast('host:display-metrics-changed'))
     }
 
     async newWindow (options?: WindowOptions): Promise<Window> {
@@ -30,6 +54,9 @@ export class Application {
                 this.enableTray()
             }
         })
+        window.closed$.subscribe(() => {
+            this.windows = this.windows.filter(x => x !== window)
+        })
         if (process.platform === 'darwin') {
             this.setupMenu()
         }
@@ -37,20 +64,38 @@ export class Application {
         return window
     }
 
-    broadcast (event, ...args) {
+    onGlobalHotkey (): void {
+        if (this.windows.some(x => x.isFocused())) {
+            for (let window of this.windows) {
+                window.hide()
+            }
+        } else {
+            for (let window of this.windows) {
+                window.present()
+            }
+        }
+    }
+
+    presentAllWindows (): void {
         for (let window of this.windows) {
+            window.present()
+        }
+    }
+
+    broadcast (event: string, ...args): void {
+        for (const window of this.windows) {
             window.send(event, ...args)
         }
     }
 
-    async send (event, ...args) {
+    async send (event: string, ...args): Promise<void> {
         if (!this.hasWindows()) {
             await this.newWindow()
         }
-        this.windows[0].send(event, ...args)
+        this.windows.filter(w => !w.isDestroyed())[0].send(event, ...args)
     }
 
-    enableTray () {
+    enableTray (): void {
         if (this.tray) {
             return
         }
@@ -61,7 +106,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',
@@ -75,21 +120,27 @@ export class Application {
         this.tray.setToolTip(`Terminus ${app.getVersion()}`)
     }
 
-    disableTray () {
+    disableTray (): void {
         if (this.tray) {
             this.tray.destroy()
             this.tray = null
         }
     }
 
-    hasWindows () {
+    hasWindows (): boolean {
         return !!this.windows.length
     }
 
-    focus () {
+    focus (): void {
         for (let window of this.windows) {
             window.show()
-            window.focus()
+        }
+    }
+
+    handleSecondInstance (argv: string[], cwd: string): void {
+        this.presentAllWindows()
+        for (let window of this.windows) {
+            window.handleSecondInstance(argv, cwd)
         }
     }
 
@@ -103,7 +154,7 @@ export class Application {
                     {
                         label: 'Preferences',
                         accelerator: 'Cmd+,',
-                        async click () {
+                        click: async () => {
                             if (!this.hasWindows()) {
                                 await this.newWindow()
                             }
@@ -114,7 +165,7 @@ export class Application {
                     { role: 'services', submenu: [] },
                     { type: 'separator' },
                     { role: 'hide' },
-                    { role: 'hideothers' },
+                    { role: 'hideOthers' },
                     { role: 'unhide' },
                     { type: 'separator' },
                     {
@@ -135,21 +186,21 @@ export class Application {
                     { role: 'cut' },
                     { role: 'copy' },
                     { role: 'paste' },
-                    { role: 'pasteandmatchstyle' },
+                    { role: 'pasteAndMatchStyle' },
                     { role: 'delete' },
-                    { role: 'selectall' },
+                    { role: 'selectAll' },
                 ],
             },
             {
                 label: 'View',
                 submenu: [
                     { role: 'reload' },
-                    { role: 'forcereload' },
+                    { role: 'forceReload' },
-                    { role: 'toggledevtools' },
+                    { role: 'toggleDevTools' },
                     { type: 'separator' },
-                    { role: 'resetzoom' },
+                    { role: 'resetZoom' },
-                    { role: 'zoomin' },
+                    { role: 'zoomIn' },
-                    { role: 'zoomout' },
+                    { role: 'zoomOut' },
                     { type: 'separator' },
                     { role: 'togglefullscreen' },
                 ],
@@ -173,7 +224,7 @@ export class Application {
                         },
                     },
                 ],
-            }
+            },
         ]
 
         Menu.setApplicationMenu(Menu.buildFromTemplate(template))

app/lib/cli.ts

@@ -1,6 +1,6 @@
 import { app } from 'electron'
 
-export function parseArgs (argv, cwd) {
+export function parseArgs (argv: string[], cwd: string): any {
     if (argv[0].includes('node')) {
         argv = argv.slice(1)
     }
@@ -13,31 +13,33 @@ export function parseArgs (argv, cwd) {
         .command('run [command...]', 'run a command in the terminal', {
             command: { type: 'string' },
         })
+        .command('profile [profileName]', 'open a tab with specified profile', {
+            profileName: { type: 'string' },
+        })
         .command('paste [text]', 'paste stdin into the active tab', yargs => {
             return yargs.option('escape', {
                 alias: 'e',
                 type: 'boolean',
-                describe: 'Perform shell escaping'
+                describe: 'Perform shell escaping',
             }).positional('text', {
-                type: 'string'
+                type: 'string',
             })
         })
         .version('version', '', app.getVersion())
         .option('debug', {
             alias: 'd',
             describe: 'Show DevTools on start',
-            type: 'boolean'
+            type: 'boolean',
         })
         .option('hidden', {
             describe: 'Start minimized',
-            type: 'boolean'
+            type: 'boolean',
         })
         .option('version', {
             alias: 'v',
             describe: 'Show version and exit',
-            type: 'boolean'
+            type: 'boolean',
         })
         .help('help')
-        .strict()
         .parse(argv.slice(1))
 }

app/lib/index.ts

@@ -1,9 +1,10 @@
+import './portable'
+import './sentry'
 import './lru'
 import { app, ipcMain, Menu } from 'electron'
-import electronDebug = require('electron-debug')
 import { parseArgs } from './cli'
 import { Application } from './app'
-if (process.platform === 'win32' && require('electron-squirrel-startup')) process.exit(0)
+import electronDebug = require('electron-debug')
 
 if (!process.env.TERMINUS_PLUGINS) {
     process.env.TERMINUS_PLUGINS = ''
@@ -12,7 +13,6 @@ if (!process.env.TERMINUS_PLUGINS) {
 const application = new Application()
 
 ipcMain.on('app:new-window', () => {
-    console.log('new-window')
     application.newWindow()
 })
 
@@ -34,18 +34,22 @@ process.on('uncaughtException' as any, err => {
 })
 
 app.on('second-instance', (_event, argv, cwd) => {
-    application.send('host:second-instance', parseArgs(argv, cwd), cwd)
+    application.handleSecondInstance(argv, cwd)
 })
 
 const argv = parseArgs(process.argv, process.cwd())
 
 if (!app.requestSingleInstanceLock()) {
     app.quit()
-    process.exit(0)
+    app.exit(0)
 }
 
 if (argv.d) {
-    electronDebug({ enabled: true, showDevTools: 'undocked' })
+    electronDebug({
+        isEnabled: true,
+        showDevTools: true,
+        devToolsMode: 'undocked',
+    })
 }
 
 app.on('ready', () => {
@@ -55,9 +59,10 @@ app.on('ready', () => {
                 label: 'New window',
                 click () {
                     this.app.newWindow()
-                }
+                },
-            }
+            },
         ]))
     }
+    application.init()
     application.newWindow({ hidden: argv.hidden })
 })

app/lib/lru.ts

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

app/lib/portable.ts

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

app/lib/sentry.ts

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

app/lib/window.ts

@@ -1,8 +1,11 @@
 import { Subject, Observable } from 'rxjs'
-import { BrowserWindow, app, ipcMain, Rectangle } from 'electron'
+import { debounceTime } from 'rxjs/operators'
+import { BrowserWindow, app, ipcMain, Rectangle, Menu, screen } from 'electron'
 import ElectronConfig = require('electron-config')
 import * as os from 'os'
+import * as path from 'path'
 
+import { parseArgs } from './cli'
 import { loadConfig } from './config'
 
 let SetWindowCompositionAttribute: any
@@ -10,7 +13,7 @@ let AccentState: any
 let DwmEnableBlurBehindWindow: any
 if (process.platform === 'win32') {
     SetWindowCompositionAttribute = require('windows-swca').SetWindowCompositionAttribute
-    AccentState = require('windows-swca').AccentState
+    AccentState = require('windows-swca').ACCENT_STATE
     DwmEnableBlurBehindWindow = require('windows-blurbehind').DwmEnableBlurBehindWindow
 }
 
@@ -21,15 +24,20 @@ export interface WindowOptions {
 export class Window {
     ready: Promise<void>
     private visible = new Subject<boolean>()
+    private closed = new Subject<void>()
     private window: BrowserWindow
     private windowConfig: ElectronConfig
     private windowBounds: Rectangle
     private closing = false
+    private lastVibrancy: {enabled: boolean, type?: string} | null = null
+    private disableVibrancyWhileDragging = false
+    private configStore: any
 
     get visible$ (): Observable<boolean> { return this.visible }
+    get closed$ (): Observable<void> { return this.closed }
 
     constructor (options?: WindowOptions) {
-        let configData = loadConfig()
+        this.configStore = loadConfig()
 
         options = options || {}
 
@@ -43,14 +51,30 @@ export class Window {
             title: 'Terminus',
             minWidth: 400,
             minHeight: 300,
-            webPreferences: { webSecurity: false },
+            webPreferences: {
+                nodeIntegration: true,
+                preload: path.join(__dirname, 'sentry.js'),
+                backgroundThrottling: false,
+            },
             frame: false,
             show: false,
-            backgroundColor: '#00000000'
+            backgroundColor: '#00000000',
         }
-        Object.assign(bwOptions, this.windowBounds)
 
-        if ((configData.appearance || {}).frame === 'native') {
+        if (this.windowBounds) {
+            Object.assign(bwOptions, this.windowBounds)
+            const closestDisplay = screen.getDisplayNearestPoint( { x: this.windowBounds.x, y: this.windowBounds.y } )
+
+            const [left1, top1, right1, bottom1] = [this.windowBounds.x, this.windowBounds.y, this.windowBounds.x + this.windowBounds.width, this.windowBounds.y + this.windowBounds.height]
+            const [left2, top2, right2, bottom2] = [closestDisplay.bounds.x, closestDisplay.bounds.y, closestDisplay.bounds.x + closestDisplay.bounds.width, closestDisplay.bounds.y + closestDisplay.bounds.height]
+
+            if ((left2 > right1 || right2 < left1 || top2 > bottom1 || bottom2 < top1) && !maximized) {
+                bwOptions.x = closestDisplay.bounds.width / 2 - bwOptions.width / 2
+                bwOptions.y = closestDisplay.bounds.height / 2 - bwOptions.height / 2
+            }
+        }
+
+        if ((this.configStore.appearance || {}).frame === 'native') {
             bwOptions.frame = true
         } else {
             if (process.platform === 'darwin') {
@@ -65,8 +89,8 @@ 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) {
+            } else if (process.platform === 'win32' && (this.configStore.appearance || {}).vibrancy) {
                 this.setVibrancy(true)
             }
 
@@ -77,8 +101,16 @@ export class Window {
                     this.window.show()
                 }
                 this.window.focus()
+                this.window.moveTop()
             }
         })
+
+        this.window.on('blur', () => {
+            if (this.configStore.appearance?.dockHideOnBlur) {
+                this.hide()
+            }
+        })
+
         this.window.loadURL(`file://${app.getAppPath()}/dist/index.html?${this.window.id}`, { extraHeaders: 'pragma: no-cache\n' })
 
         if (process.platform !== 'darwin') {
@@ -90,7 +122,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()
                 }
             }
@@ -98,58 +130,122 @@ export class Window {
         })
     }
 
-    setVibrancy (enabled: boolean, type?: string) {
+    setVibrancy (enabled: boolean, type?: string): void {
+        this.lastVibrancy = { enabled, type }
         if (process.platform === 'win32') {
             if (parseFloat(os.release()) >= 10) {
                 let attribValue = AccentState.ACCENT_DISABLED
-                let color = 0x00000000
                 if (enabled) {
-                    if (parseInt(os.release().split('.')[2]) >= 17063 && type === 'fluent') {
+                    if (type === 'fluent') {
-                        attribValue = AccentState.ACCENT_ENABLE_FLUENT
+                        attribValue = AccentState.ACCENT_ENABLE_ACRYLICBLURBEHIND
-                        color = 0x01000000 // using a small alpha because acrylic bugs out at full transparency.
                     } else {
                         attribValue = AccentState.ACCENT_ENABLE_BLURBEHIND
                     }
                 }
-                SetWindowCompositionAttribute(this.window, attribValue, color)
+                SetWindowCompositionAttribute(this.window.getNativeWindowHandle(), attribValue, 0x00000000)
             } else {
                 DwmEnableBlurBehindWindow(this.window, enabled)
             }
+        } else {
+            this.window.setVibrancy(enabled ? 'dark' : null as any) // electron issue 20269
         }
     }
 
-    show () {
+    show (): void {
         this.window.show()
+        this.window.moveTop()
     }
 
-    focus () {
+    focus (): void {
         this.window.focus()
     }
 
-    send (event, ...args) {
+    send (event: string, ...args): void {
         if (!this.window) {
             return
         }
         this.window.webContents.send(event, ...args)
+        if (event === 'host:config-change') {
+            this.configStore = args[0]
+        }
+    }
+
+    isDestroyed (): boolean {
+        return !this.window || this.window.isDestroyed()
+    }
+
+    isFocused (): boolean {
+        return this.window.isFocused()
+    }
+
+    hide (): void {
+        if (process.platform === 'darwin') {
+            // Lose focus
+            Menu.sendActionToFirstResponder('hide:')
+        }
+        this.window.blur()
+        if (process.platform !== 'darwin') {
+            this.window.hide()
+        }
+    }
+
+    present (): void {
+        if (!this.window.isVisible()) {
+            // unfocused, invisible
+            this.window.show()
+            this.window.focus()
+        } else {
+            if (!this.configStore.appearance?.dock || this.configStore.appearance?.dock === 'off') {
+                // not docked, visible
+                setTimeout(() => {
+                    this.window.show()
+                    this.window.focus()
+                })
+            } else {
+                if (this.configStore.appearance?.dockAlwaysOnTop) {
+                    // docked, visible, on top
+                    this.window.hide()
+                } else {
+                    // docked, visible, not on top
+                    this.window.focus()
+                }
+            }
+        }
+    }
+
+    handleSecondInstance (argv: string[], cwd: string): void {
+        if (!this.configStore.appearance?.dock) {
+            this.send('host:second-instance', parseArgs(argv, cwd), cwd)
+        }
     }
 
     private setupWindowManagement () {
         this.window.on('show', () => {
             this.visible.next(true)
-            this.window.webContents.send('host:window-shown')
+            this.send('host:window-shown')
         })
 
         this.window.on('hide', () => {
             this.visible.next(false)
         })
 
-        this.window.on('enter-full-screen', () => this.window.webContents.send('host:window-enter-full-screen'))
+        let moveSubscription = new Observable<void>(observer => {
-        this.window.on('leave-full-screen', () => this.window.webContents.send('host:window-leave-full-screen'))
+            this.window.on('move', () => observer.next())
+        }).pipe(debounceTime(250)).subscribe(() => {
+            this.send('host:window-moved')
+        })
+
+        this.window.on('closed', () => {
+            moveSubscription.unsubscribe()
+        })
+
+        this.window.on('enter-full-screen', () => this.send('host:window-enter-full-screen'))
+        this.window.on('leave-full-screen', () => this.send('host:window-leave-full-screen'))
 
         this.window.on('close', event => {
             if (!this.closing) {
                 event.preventDefault()
-                this.window.webContents.send('host:window-close-request')
+                this.send('host:window-close-request')
                 return
             }
             this.windowConfig.set('windowBoundaries', this.windowBounds)
@@ -172,29 +268,33 @@ export class Window {
             }
         })
 
+        this.window.on('focus', () => {
+            this.send('host:window-focused')
+        })
+
         ipcMain.on('window-focus', event => {
-            if (event.sender !== this.window.webContents) {
+            if (!this.window || event.sender !== this.window.webContents) {
                 return
             }
             this.window.focus()
         })
 
         ipcMain.on('window-maximize', event => {
-            if (event.sender !== this.window.webContents) {
+            if (!this.window || event.sender !== this.window.webContents) {
                 return
             }
             this.window.maximize()
         })
 
         ipcMain.on('window-unmaximize', event => {
-            if (event.sender !== this.window.webContents) {
+            if (!this.window || event.sender !== this.window.webContents) {
                 return
             }
             this.window.unmaximize()
         })
 
         ipcMain.on('window-toggle-maximize', event => {
-            if (event.sender !== this.window.webContents) {
+            if (!this.window || event.sender !== this.window.webContents) {
                 return
             }
             if (this.window.isMaximized()) {
@@ -205,42 +305,42 @@ export class Window {
         })
 
         ipcMain.on('window-minimize', event => {
-            if (event.sender !== this.window.webContents) {
+            if (!this.window || event.sender !== this.window.webContents) {
                 return
             }
             this.window.minimize()
         })
 
         ipcMain.on('window-set-bounds', (event, bounds) => {
-            if (event.sender !== this.window.webContents) {
+            if (!this.window || event.sender !== this.window.webContents) {
                 return
             }
             this.window.setBounds(bounds)
         })
 
         ipcMain.on('window-set-always-on-top', (event, flag) => {
-            if (event.sender !== this.window.webContents) {
+            if (!this.window || event.sender !== this.window.webContents) {
                 return
             }
             this.window.setAlwaysOnTop(flag)
         })
 
         ipcMain.on('window-set-vibrancy', (event, enabled, type) => {
-            if (event.sender !== this.window.webContents) {
+            if (!this.window || event.sender !== this.window.webContents) {
                 return
             }
             this.setVibrancy(enabled, type)
         })
 
         ipcMain.on('window-set-title', (event, title) => {
-            if (event.sender !== this.window.webContents) {
+            if (!this.window || event.sender !== this.window.webContents) {
                 return
             }
             this.window.setTitle(title)
         })
 
         ipcMain.on('window-bring-to-front', event => {
-            if (event.sender !== this.window.webContents) {
+            if (!this.window || event.sender !== this.window.webContents) {
                 return
             }
             if (this.window.isMinimized()) {
@@ -250,16 +350,44 @@ export class Window {
             this.window.moveTop()
         })
 
-        ipcMain.on('window-close', () => {
+        ipcMain.on('window-close', event => {
+            if (!this.window || event.sender !== this.window.webContents) {
+                return
+            }
             this.closing = true
             this.window.close()
         })
 
         this.window.webContents.on('new-window', event => event.preventDefault())
+
+        ipcMain.on('window-set-disable-vibrancy-while-dragging', (_event, value) => {
+            this.disableVibrancyWhileDragging = value
+        })
+
+        this.window.on('will-move', () => {
+            if (!this.lastVibrancy?.enabled || !this.disableVibrancyWhileDragging) {
+                return
+            }
+            let timeout: number|null = null
+            const oldVibrancy = this.lastVibrancy
+            this.setVibrancy(false)
+            const onMove = () => {
+                if (timeout) {
+                    clearTimeout(timeout)
+                }
+                timeout = setTimeout(() => {
+                    this.window.off('move', onMove)
+                    this.setVibrancy(oldVibrancy.enabled, oldVibrancy.type)
+                }, 500)
+            }
+            this.window.on('move', onMove)
+        })
     }
 
     private destroy () {
         this.window = null
+        this.closed.next()
         this.visible.complete()
+        this.closed.complete()
     }
 }

app/package.json

@@ -13,32 +13,43 @@
     "watch": "webpack --progress --color --watch"
   },
   "dependencies": {
-    "@angular/animations": "7.0.0",
+    "@angular/animations": "9.1.9",
-    "@angular/common": "7.0.0",
+    "@angular/common": "9.1.9",
-    "@angular/compiler": "7.0.0",
+    "@angular/compiler": "9.1.9",
-    "@angular/core": "7.0.0",
+    "@angular/core": "9.1.9",
-    "@angular/forms": "7.0.0",
+    "@angular/forms": "9.1.9",
-    "@angular/platform-browser": "7.0.0",
+    "@angular/platform-browser": "9.1.9",
-    "@angular/platform-browser-dynamic": "7.0.0",
+    "@angular/platform-browser-dynamic": "9.1.9",
-    "@ng-bootstrap/ng-bootstrap": "^3.3.1",
+    "@ng-bootstrap/ng-bootstrap": "^6.1.0",
     "devtron": "1.4.0",
-    "electron-config": "0.2.1",
+    "electron-config": "2.0.0",
-    "electron-debug": "^2.0.0",
+    "electron-debug": "^3.0.1",
-    "electron-is-dev": "0.1.2",
+    "electron-is-dev": "1.1.0",
-    "electron-squirrel-startup": "^1.0.0",
+    "electron-updater": "^4.3.1",
-    "js-yaml": "3.8.2",
+    "fontmanager-redux": "0.4.0",
-    "mz": "^2.6.0",
+    "js-yaml": "3.14.0",
-    "ngx-toastr": "^9.1.1",
+    "keytar": "^5.6.0",
+    "mz": "^2.7.0",
+    "ngx-toastr": "^12.0.1",
+    "node-pty": "^0.10.0-beta9",
+    "npm": "6.9.0",
     "path": "0.12.7",
-    "rxjs": "^6.3.3",
+    "rxjs": "^6.5.5",
-    "yargs": "^12.0.1",
+    "rxjs-compat": "^6.5.5",
-    "zone.js": "^0.8.26"
+    "yargs": "^15.3.1",
+    "zone.js": "^0.10.3"
   },
   "optionalDependencies": {
-    "windows-blurbehind": "^1.0.0",
+    "macos-native-processlist": "^1.0.2",
-    "windows-swca": "^1.1.1"
+    "serialport": "^9.0.0",
+    "windows-blurbehind": "^1.0.1",
+    "windows-native-registry": "^1.0.17",
+    "windows-process-tree": "^0.2.4",
+    "windows-swca": "^2.0.2"
   },
   "devDependencies": {
-    "@types/mz": "0.0.31"
+    "@types/mz": "0.0.32",
+    "@types/node": "12.7.12",
+    "node-abi": "^2.17.0"
   }
 }

app/src/app.module.ts

@@ -1,21 +1,23 @@
+/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 import { NgModule } from '@angular/core'
 import { BrowserModule } from '@angular/platform-browser'
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap'
 import { ToastrModule } from 'ngx-toastr'
 
 export function getRootModule (plugins: any[]) {
-    let imports = [
+    const imports = [
         BrowserModule,
         ...plugins,
-        NgbModule.forRoot(),
+        NgbModule,
         ToastrModule.forRoot({
             positionClass: 'toast-bottom-center',
+            toastClass: 'toast',
             preventDuplicates: true,
             extendedTimeOut: 5000,
         }),
     ]
-    let bootstrap = [
+    const bootstrap = [
-        ...(plugins.filter(x => x.bootstrap).map(x => x.bootstrap)),
+        ...plugins.filter(x => x.bootstrap).map(x => x.bootstrap),
     ]
 
     if (bootstrap.length === 0) {
@@ -25,7 +27,7 @@ export function getRootModule (plugins: any[]) {
     @NgModule({
         imports,
         bootstrap,
-    }) class RootModule { }
+    }) class RootModule { } // eslint-disable-line @typescript-eslint/no-extraneous-class
 
     return RootModule
 }

app/src/entry.preload.ts

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

app/src/entry.ts

@@ -1,40 +1,51 @@
 import 'zone.js'
-import 'core-js/es7/reflect'
+import 'core-js/proposals/reflect-metadata'
-import 'core-js/core/delay'
 import 'rxjs'
 
+import * as isDev from 'electron-is-dev'
+
 import './global.scss'
 import './toastr.scss'
 
-// Always land on the start view
+import { enableProdMode, NgModuleRef, ApplicationRef } from '@angular/core'
-location.hash = ''
+import { enableDebugTools } from '@angular/platform-browser'
-
-import { enableProdMode, NgModuleRef } from '@angular/core'
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'
 
 import { getRootModule } from './app.module'
-import { findPlugins, loadPlugins, IPluginInfo } from './plugins'
+import { findPlugins, loadPlugins, PluginInfo } from './plugins'
 
-if (process.platform === 'win32') {
+// Always land on the start view
-    process.env.HOME = process.env.HOMEDRIVE + process.env.HOMEPATH
+location.hash = ''
+
+;(process as any).enablePromiseAPI = true
+
+if (process.platform === 'win32' && !('HOME' in process.env)) {
+    process.env.HOME = `${process.env.HOMEDRIVE}${process.env.HOMEPATH}`
 }
 
-if (require('electron-is-dev')) {
+if (isDev) {
     console.warn('Running in debug mode')
 } else {
     enableProdMode()
 }
 
-async function bootstrap (plugins: IPluginInfo[], safeMode = false): Promise<NgModuleRef<any>> {
+async function bootstrap (plugins: PluginInfo[], safeMode = false): Promise<NgModuleRef<any>> {
     if (safeMode) {
         plugins = plugins.filter(x => x.isBuiltin)
     }
-    let pluginsModules = await loadPlugins(plugins, (current, total) => {
+    const pluginsModules = await loadPlugins(plugins, (current, total) => {
-        (document.querySelector('.progress .bar') as HTMLElement).style.width = 100 * current / total + '%'
+        (document.querySelector('.progress .bar') as HTMLElement).style.width = `${100 * current / total}%` // eslint-disable-line
     })
-    let module = getRootModule(pluginsModules)
+    const module = getRootModule(pluginsModules)
     window['rootModule'] = module
-    return await platformBrowserDynamic().bootstrapModule(module)
+    return platformBrowserDynamic().bootstrapModule(module).then(moduleRef => {
+        if (isDev) {
+            const applicationRef = moduleRef.injector.get(ApplicationRef)
+            const componentRef = applicationRef.components[0]
+            enableDebugTools(componentRef)
+        }
+        return moduleRef
+    })
 }
 
 findPlugins().then(async plugins => {

app/src/global.scss

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

app/src/plugins.ts

@@ -1,10 +1,8 @@
 import * as fs from 'mz/fs'
 import * as path from 'path'
-const nodeModule = require('module')
+const nodeModule = require('module') // eslint-disable-line @typescript-eslint/no-var-requires
 const nodeRequire = (global as any).require
 
-declare function delay (ms: number): Promise<void>
-
 function normalizePath (path: string): string {
     const cygwinPrefix = '/cygdrive/'
     if (path.startsWith(cygwinPrefix)) {
@@ -14,20 +12,23 @@ function normalizePath (path: string): string {
     return path
 }
 
-nodeRequire.main.paths.map(x => nodeModule.globalPaths.push(normalizePath(x)))
+global['module'].paths.map((x: string) => nodeModule.globalPaths.push(normalizePath(x)))
 
-if (process.env.DEV) {
+if (process.env.TERMINUS_DEV) {
     nodeModule.globalPaths.unshift(path.dirname(require('electron').remote.app.getAppPath()))
 }
 
-const builtinPluginsPath = process.env.DEV ? path.dirname(require('electron').remote.app.getAppPath()) : path.join((process as any).resourcesPath, 'builtin-plugins')
+const builtinPluginsPath = process.env.TERMINUS_DEV ? path.dirname(require('electron').remote.app.getAppPath()) : path.join((process as any).resourcesPath, 'builtin-plugins')
 
 const userPluginsPath = path.join(
-    require('electron').remote.app.getPath('appData'),
+    require('electron').remote.app.getPath('userData'),
-    'terminus',
     'plugins',
 )
 
+if (!fs.existsSync(userPluginsPath)) {
+    fs.mkdir(userPluginsPath)
+}
+
 Object.assign(window, { builtinPluginsPath, userPluginsPath })
 nodeModule.globalPaths.unshift(builtinPluginsPath)
 nodeModule.globalPaths.unshift(path.join(userPluginsPath, 'node_modules'))
@@ -36,9 +37,9 @@ if (process.env.TERMINUS_PLUGINS) {
     process.env.TERMINUS_PLUGINS.split(':').map(x => nodeModule.globalPaths.push(normalizePath(x)))
 }
 
-export declare type ProgressCallback = (current, total) => void
+export type ProgressCallback = (current: number, total: number) => void // eslint-disable-line @typescript-eslint/no-type-alias
 
-export interface IPluginInfo {
+export interface PluginInfo {
     name: string
     description: string
     packageName: string
@@ -62,6 +63,7 @@ const builtinModules = [
     'ngx-toastr',
     'rxjs',
     'rxjs/operators',
+    'rxjs-compat/Subject',
     'terminus-core',
     'terminus-settings',
     'terminus-terminal',
@@ -70,47 +72,61 @@ const builtinModules = [
 
 const cachedBuiltinModules = {}
 builtinModules.forEach(m => {
+    const label = 'Caching ' + m
+    console.time(label)
     cachedBuiltinModules[m] = nodeRequire(m)
+    console.timeEnd(label)
 })
 
-const originalRequire = nodeRequire('module').prototype.require
+const originalRequire = (global as any).require
-nodeRequire('module').prototype.require = function (query) {
+;(global as any).require = function (query: string) {
     if (cachedBuiltinModules[query]) {
         return cachedBuiltinModules[query]
     }
     return originalRequire.apply(this, arguments)
 }
 
-export async function findPlugins (): Promise<IPluginInfo[]> {
+const originalModuleRequire = nodeModule.prototype.require
-    let paths = nodeModule.globalPaths
+nodeModule.prototype.require = function (query: string) {
-    let foundPlugins: IPluginInfo[] = []
+    if (cachedBuiltinModules[query]) {
-    let candidateLocations: { pluginDir: string, packageName: string }[] = []
+        return cachedBuiltinModules[query]
+    }
+    return originalModuleRequire.call(this, query)
+}
+
+export async function findPlugins (): Promise<PluginInfo[]> {
+    const paths = nodeModule.globalPaths
+    let foundPlugins: PluginInfo[] = []
+    const candidateLocations: { pluginDir: string, packageName: string }[] = []
+    const PREFIX = 'terminus-'
 
     for (let pluginDir of paths) {
         pluginDir = normalizePath(pluginDir)
         if (!await fs.exists(pluginDir)) {
             continue
         }
-        let pluginNames = await fs.readdir(pluginDir)
+        const pluginNames = await fs.readdir(pluginDir)
         if (await fs.exists(path.join(pluginDir, 'package.json'))) {
             candidateLocations.push({
                 pluginDir: path.dirname(pluginDir),
-                packageName: path.basename(pluginDir)
+                packageName: path.basename(pluginDir),
             })
         }
-        for (let packageName of pluginNames) {
+        for (const packageName of pluginNames) {
-            candidateLocations.push({ pluginDir, packageName })
+            if (packageName.startsWith(PREFIX)) {
+                candidateLocations.push({ pluginDir, packageName })
+            }
         }
     }
 
-    for (let { pluginDir, packageName } of candidateLocations) {
+    for (const { pluginDir, packageName } of candidateLocations) {
-        let pluginPath = path.join(pluginDir, packageName)
+        const pluginPath = path.join(pluginDir, packageName)
-        let infoPath = path.join(pluginPath, 'package.json')
+        const infoPath = path.join(pluginPath, 'package.json')
         if (!await fs.exists(infoPath)) {
             continue
         }
 
-        let name = packageName.substring('terminus-'.length)
+        const name = packageName.substring(PREFIX.length)
 
         if (foundPlugins.some(x => x.name === name)) {
             console.info(`Plugin ${packageName} already exists, overriding`)
@@ -118,7 +134,7 @@ export async function findPlugins (): Promise<IPluginInfo[]> {
         }
 
         try {
-            let info = JSON.parse(await fs.readFile(infoPath, {encoding: 'utf-8'}))
+            const info = JSON.parse(await fs.readFile(infoPath, { encoding: 'utf-8' }))
             if (!info.keywords || !(info.keywords.includes('terminus-plugin') || info.keywords.includes('terminus-builtin-plugin'))) {
                 continue
             }
@@ -139,27 +155,32 @@ export async function findPlugins (): Promise<IPluginInfo[]> {
         }
     }
 
-    (window as any).installedPlugins = foundPlugins
+    foundPlugins.sort((a, b) => a.name > b.name ? 1 : -1)
+
+    ;(window as any).installedPlugins = foundPlugins
     return foundPlugins
 }
 
-export async function loadPlugins (foundPlugins: IPluginInfo[], progress: ProgressCallback): Promise<any[]> {
+export async function loadPlugins (foundPlugins: PluginInfo[], progress: ProgressCallback): Promise<any[]> {
-    let plugins: any[] = []
+    const plugins: any[] = []
     progress(0, 1)
     let index = 0
-    for (let foundPlugin of foundPlugins) {
+    for (const foundPlugin of foundPlugins) {
         console.info(`Loading ${foundPlugin.name}: ${nodeRequire.resolve(foundPlugin.path)}`)
         progress(index, foundPlugins.length)
         try {
-            let packageModule = nodeRequire(foundPlugin.path)
+            const label = 'Loading ' + foundPlugin.name
-            let pluginModule = packageModule.default.forRoot ? packageModule.default.forRoot() : packageModule.default
+            console.time(label)
+            const packageModule = nodeRequire(foundPlugin.path)
+            const pluginModule = packageModule.default.forRoot ? packageModule.default.forRoot() : packageModule.default
             pluginModule['pluginName'] = foundPlugin.name
             pluginModule['bootstrap'] = packageModule.bootstrap
             plugins.push(pluginModule)
+            console.timeEnd(label)
+            await new Promise(x => setTimeout(x, 50))
         } catch (error) {
             console.error(`Could not load ${foundPlugin.name}:`, error)
         }
-        await delay(1)
         index++
     }
     progress(1, 1)

app/src/root.component.ts

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

app/src/toastr.scss

@@ -2,6 +2,7 @@
   display: flex;
   flex-direction: column;
   align-items: center;
+  padding: 20px;
 
   .toast {
     box-shadow: 0 1px 0 rgba(0,0,0,.25);
@@ -9,6 +10,10 @@
     background-image: none;
     width: auto;
 
+    &.toast-error {
+      background-color: #BD362F;
+    }
+
     &.toast-info {
       background-color: #555;
     }

app/tsconfig.json

@@ -9,7 +9,6 @@
         "emitDecoratorMetadata": true,
         "experimentalDecorators": true,
         "sourceMap": true,
-        "noUnusedParameters": true,
         "noImplicitReturns": true,
         "noFallthroughCasesInSwitch": true,
         "noUnusedParameters": true,

app/webpack.config.js

@@ -5,11 +5,12 @@ module.exports = {
   name: 'terminus',
   target: 'node',
   entry: {
-    'index.ignore': 'file-loader?name=index.html!val-loader!pug-html-loader!' + path.resolve(__dirname, './index.pug'),
+    'index.ignore': 'file-loader?name=index.html!pug-html-loader!' + path.resolve(__dirname, './index.pug'),
+    sentry: path.resolve(__dirname, 'lib/sentry.ts'),
     preload: path.resolve(__dirname, 'src/entry.preload.ts'),
     bundle: path.resolve(__dirname, 'src/entry.ts'),
   },
-  mode: process.env.DEV ? 'development' : 'production',
+  mode: process.env.TERMINUS_DEV ? 'development' : 'production',
   optimization:{
      minimize: false,
   },
@@ -78,5 +79,8 @@ module.exports = {
   },
   plugins: [
     new webpack.optimize.ModuleConcatenationPlugin(),
+    new webpack.DefinePlugin({
+      'process.type': '"renderer"'
+    }),
   ],
 }

app/webpack.main.config.js

@@ -7,7 +7,7 @@ module.exports = {
   entry: {
     main: path.resolve(__dirname, 'lib/index.ts'),
   },
-  mode: process.env.DEV ? 'development' : 'production',
+  mode: process.env.TERMINUS_DEV ? 'development' : 'production',
   context: __dirname,
   devtool: 'source-map',
   output: {
@@ -36,7 +36,6 @@ module.exports = {
     electron: 'commonjs electron',
     'electron-config': 'commonjs electron-config',
     'electron-vibrancy': 'commonjs electron-vibrancy',
-    'electron-squirrel-startup': 'commonjs electron-squirrel-startup',
     fs: 'commonjs fs',
     mz: 'commonjs mz',
     path: 'commonjs path',
@@ -46,5 +45,8 @@ module.exports = {
   },
   plugins: [
     new webpack.optimize.ModuleConcatenationPlugin(),
+    new webpack.DefinePlugin({
+      'process.type': '"main"',
+    }),
   ],
 }

appveyor.yml

@@ -6,23 +6,23 @@ platform:
 environment:
   nodejs_version: "10"
 
-cache:
-  - '%USERPROFILE%\.electron'
-
 version: "{build}"
 
 install:
   - ps: Install-Product node $env:nodejs_version $env:platform
-  - npm install
+  - yarn
-  - node scripts/install-deps.js
   - node scripts/build-native.js
 
 build_script:
-  - npm run build
+  - yarn run build
   - node scripts/prepackage-plugins.js
   - node scripts/build-windows.js
 
 artifacts:
-  - path: 'dist\win\*.exe'
-  - path: 'dist\squirrel-windows\*.exe'
   - path: 'dist\*.exe'
+
+cache:
+  - node_modules
+  - "*\\node_modules"
+  - "%USERPROFILE%\\.electron"
+  - "%LOCALAPPDATA%\\Yarn"

build/icons/icon.svg

@@ -1,124 +1,57 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<!-- Generator: Adobe Illustrator 23.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-<svg
+	 viewBox="0 0 1024 1024" style="enable-background:new 0 0 1024 1024;" xml:space="preserve">
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
+<style type="text/css">
-   xmlns:cc="http://creativecommons.org/ns#"
+	.st0{opacity:0.8;fill:#00232E;}
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+	.st1{fill:url(#SVGID_1_);}
-   xmlns:svg="http://www.w3.org/2000/svg"
+	.st2{opacity:0.16;fill:url(#SVGID_2_);}
-   xmlns="http://www.w3.org/2000/svg"
+	.st3{fill:url(#SVGID_3_);}
-   xmlns:xlink="http://www.w3.org/1999/xlink"
+	.st4{opacity:0.16;fill:url(#SVGID_4_);}
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+	.st5{fill:url(#SVGID_5_);}
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+	.st6{opacity:0.15;fill:url(#SVGID_6_);}
-   width="150mm"
+	.st7{fill:url(#SVGID_7_);}
-   height="150mm"
+</style>
-   viewBox="0 0 150 150"
+<polygon class="st0" points="449.5,645.47 407.51,621.23 533.47,548.5 407.51,475.77 449.5,451.53 617.45,548.5 "/>
-   version="1.1"
+<g>
-   id="svg8"
+	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="439.0065" y1="603.0394" x2="627.9464" y2="493.9549">
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+		<stop  offset="0" style="stop-color:#669ABD"/>
-   sodipodi:docname="icon.svg"
+		<stop  offset="1" style="stop-color:#77DBDB"/>
-   inkscape:export-filename="/home/eugene/Work/term/build/icons/512x512.png"
+	</linearGradient>
-   inkscape:export-xdpi="86.699997"
+	<polygon class="st1" points="449.5,621.22 617.45,524.25 617.45,475.77 449.5,572.75 	"/>
-   inkscape:export-ydpi="86.699997">
+	<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="522.9788" y1="530.3148" x2="543.9741" y2="566.6795">
-  <defs
+		<stop  offset="0.5588" style="stop-color:#000000;stop-opacity:0"/>
-     id="defs2">
+		<stop  offset="1" style="stop-color:#000000"/>
-    <linearGradient
+	</linearGradient>
-       inkscape:collect="always"
+	<polygon class="st2" points="449.5,621.22 617.45,524.25 617.45,475.77 449.5,572.75 	"/>
-       id="linearGradient4649">
+</g>
-      <stop
+<g>
-         style="stop-color:#000316;stop-opacity:1"
+	<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="397.0101" y1="566.6837" x2="459.9963" y2="603.0487">
-         offset="0"
+		<stop  offset="0" style="stop-color:#6A8FAD"/>
-         id="stop4645" />
+		<stop  offset="1" style="stop-color:#669ABD"/>
-      <stop
+	</linearGradient>
-         style="stop-color:#190065;stop-opacity:1"
+	<polygon class="st3" points="407.51,548.5 407.5,596.99 449.5,621.22 449.5,572.75 	"/>
-         offset="1"
+	<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="439.0009" y1="566.6838" x2="418.0056" y2="603.0486">
-         id="stop4647" />
+		<stop  offset="0.5588" style="stop-color:#000000;stop-opacity:0"/>
-    </linearGradient>
+		<stop  offset="1" style="stop-color:#000000"/>
-    <linearGradient
+	</linearGradient>
-       inkscape:collect="always"
+	<polygon class="st4" points="407.51,548.5 407.5,596.99 449.5,621.22 449.5,572.75 	"/>
-       xlink:href="#linearGradient4649"
+</g>
-       id="linearGradient4651"
+<g>
-       x1="89.26284"
+	<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="397.0101" y1="421.2265" x2="522.9781" y2="493.9542">
-       y1="85.146751"
+		<stop  offset="0" style="stop-color:#6A8FAD"/>
-       x2="89.26284"
+		<stop  offset="1" style="stop-color:#669ABD"/>
-       y2="229.47229"
+	</linearGradient>
-       gradientUnits="userSpaceOnUse"
+	<polygon class="st5" points="407.51,403.04 407.5,451.53 491.49,500.01 533.48,475.77 	"/>
-       gradientTransform="matrix(0.82182032,0,0,0.82182032,15.208802,28.029361)" />
+	<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="470.4924" y1="439.4067" x2="449.4958" y2="475.774">
-  </defs>
+		<stop  offset="0.5588" style="stop-color:#000000;stop-opacity:0"/>
-  <sodipodi:namedview
+		<stop  offset="1" style="stop-color:#000000"/>
-     id="base"
+	</linearGradient>
-     pagecolor="#ffffff"
+	<polygon class="st6" points="407.51,403.04 407.5,451.53 491.49,500.01 533.48,475.77 	"/>
-     bordercolor="#666666"
+</g>
-     borderopacity="1.0"
+<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="386.5123" y1="512.136" x2="575.4605" y2="403.0467">
-     inkscape:pageopacity="0.0"
+	<stop  offset="0" style="stop-color:#CCECFF"/>
-     inkscape:pageshadow="2"
+	<stop  offset="1" style="stop-color:#9FECED"/>
-     inkscape:zoom="0.49497475"
+</linearGradient>
-     inkscape:cx="85.897128"
+<polygon class="st7" points="449.5,572.74 407.51,548.5 533.48,475.77 407.51,403.04 449.49,378.8 617.45,475.77 "/>
-     inkscape:cy="375.72042"
-     inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:snap-bbox="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="692"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:snap-intersection-paths="true"
-     inkscape:object-paths="true" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-10.356544,-82.309525)">
-    <rect
-       id="rect168"
-       width="123.27305"
-       height="123.27305"
-       x="23.72002"
-       y="95.673004"
-       style="fill:url(#linearGradient4651);fill-opacity:1;stroke-width:0.21743995"
-       rx="8.2182035"
-       ry="8.2182035" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path138"
-       style="opacity:0.9;fill:#bfd9f1;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.82182032px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
-       d="m 47.511243,117.17807 50.067023,28.8724 -15.038249,8.68226 -35.028768,-21.3657 z"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path116"
-       style="opacity:0.9;fill:#6666af;fill-rule:evenodd;stroke:none;stroke-width:0.82182032px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;fill-opacity:1"
-       d="m 127.13617,146.73547 0.0374,16.98921 -64.125308,36.25552 -0.0025,-16.25659 z"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path118"
-       style="opacity:0.9;fill:#bfd9f1;fill-rule:evenodd;stroke:none;stroke-width:0.82182032px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;fill-opacity:1"
-       d="m 47.647019,174.84764 15.398727,8.89046 0.0025,16.25641 -15.401249,-8.94341 z"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="opacity:0.9;fill:#9dbef0;fill-rule:evenodd;stroke:none;stroke-width:0.82630885px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;fill-opacity:1"
-       d="m 61.586284,108.76679 -14.292349,8.25191 50.284331,29.03177 -50.148115,28.95277 15.482843,8.93896 50.148116,-28.95277 14.29235,-8.25191 z"
-       id="path134"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccc" />
-  </g>
 </svg>

build/installer.nsh

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

build/linux/after-install.tpl

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

build/mac/afterBuildHook.js

@@ -0,0 +1,16 @@
+const fs = require('fs')
+const signHook = require('./afterSignHook')
+
+module.exports = async function (params) {
+    // notarize the app on Mac OS only.
+    if (process.platform !== 'darwin' || !process.env.GITHUB_REF || !process.env.GITHUB_REF.startsWith('refs/tags/')) {
+        return
+    }
+    console.log('afterBuild hook triggered')
+
+    let pkgName = fs.readdirSync('dist').find(x => x.endsWith('.pkg'))
+    signHook({
+        appOutDir: 'dist',
+        _pathOverride: pkgName,
+    })
+}

build/mac/afterSignHook.js

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

build/mac/entitlements.plist

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

build/windows/icon.svg

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="100%" height="100%" viewBox="0 0 426 426" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41421;">
-    <g id="Layer-1" serif:id="Layer 1" transform="matrix(1,0,0,1,-29.3571,-233.318)">
-        <g>
-            <path id="path138" d="M93.68,293.848L287.16,405.423L229.046,438.975L93.68,356.409L93.68,293.848Z" style="fill:url(#_Linear1);"/>
-            <path id="path118" d="M94.204,516.708L153.711,551.064L153.721,613.886L94.204,579.325L94.204,516.708Z" style="fill:url(#_Linear2);"/>
-        </g>
-        <path id="path116" d="M401.384,408.07L401.529,473.724L153.721,613.83L153.712,551.008L401.384,408.07Z" style="fill:rgb(0,94,167);fill-opacity:0.9;"/>
-        <path id="path134" d="M148.072,261.343L92.84,293.232L287.16,405.423L93.366,517.309L153.198,551.853L346.992,439.967L402.224,408.078L148.072,261.343Z" style="fill:rgb(7,147,255);fill-opacity:0.9;"/>
-    </g>
-    <defs>
-        <linearGradient id="_Linear1" x1="0" y1="0" x2="1" y2="0" gradientUnits="userSpaceOnUse" gradientTransform="matrix(193.48,0,0,320.038,93.6796,453.867)"><stop offset="0" style="stop-color:rgb(0,121,215);stop-opacity:0.9"/><stop offset="1" style="stop-color:rgb(40,97,156);stop-opacity:0.9"/></linearGradient>
-        <linearGradient id="_Linear2" x1="0" y1="0" x2="1" y2="0" gradientUnits="userSpaceOnUse" gradientTransform="matrix(193.48,0,0,320.038,93.6796,453.867)"><stop offset="0" style="stop-color:rgb(0,121,215);stop-opacity:0.9"/><stop offset="1" style="stop-color:rgb(40,97,156);stop-opacity:0.9"/></linearGradient>
-    </defs>
-</svg>

docs/index.html

@@ -1,9 +0,0 @@
-<!DOCTYPE html><html><head><base href="dist/"><meta name="viewport" content="initial-scale=1, minimal-ui, shrink-to-fit=no"><link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400" rel="stylesheet"><script src="bundle.js"></script><title>Terminus</title></head><body><div class="mt-5 mb-5" id="header"><div class="text-center"><h1>Terminus</h1><div class="subtitle mb-3">A terminal for a more modern age</div><a class="btn btn-lg btn-outline-dark mt-4" href="https://github.com/Eugeny/terminus/releases/latest" target="_blank"><strong>DOWNLOAD</strong></a><a class="btn btn-lg btn-outline-secondary mt-4 ml-3" href="https://github.com/Eugeny/terminus" target="_blank"><strong>GITHUB</strong></a></div></div><div class="background-stripe"><div class="overlay overlay1"></div><div class="overlay overlay2"></div><div class="terminal"></div></div><div class="container mt-5 mb-5"><div class="d-flex flex-wrap flex-md-nowrap"><div class="w-100"><div class="feature">windows</div><div class="feature">linux</div><div class="feature">macos</div><br><div class="feature">powershell</div><div class="feature">wsl</div><div class="feature">cygwin</div><div class="feature">git-bash</div><div class="feature">cmder</div><div class="feature">clink</div></div><div class="w-100"><div class="feature">full unicode</div><div class="feature">global hotkey</div><div class="feature">plugins</div><div class="feature">tab recovery</div><div class="feature">custom css</div><div class="feature">themes</div><div class="feature">font ligatures</div><div class="feature">clickable paths</div><div class="feature">tabs on top/bottom</div><div class="feature">vibrancy</div><div class="feature">bracketed paste</div></div></div></div><div class="container mt-5 mb-5"><div class="text-center mt-5"><div class="mb-4 mt-5"><script type="text/javascript" src="https://ko-fi.com/widgets/widget_2.js"></script><script type="text/javascript">kofiwidget2.init('Buy me a coffee', '#46b798', 'J3J8KWTF')
-kofiwidget2.draw()
-</script></div><a class="btn btn-lg btn-outline-secondary mt-3" href="/terminus/#header"><strong>BEAM ME UP</strong></a></div></div><div class="background-stripe2"><div class="overlay overlay1"></div></div><script>(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-
-ga('create', 'UA-3278102-18', 'auto');
-ga('send', 'pageview');</script></body></html>

docs/index.js

@@ -1 +0,0 @@
-import './styles.scss'

docs/index.pug

@@ -1,75 +0,0 @@
-doctype html
-html
-    head
-        base(href='dist/')
-        meta(name='viewport', content='initial-scale=1, minimal-ui, shrink-to-fit=no')
-        link(href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400", rel="stylesheet")
-        script(src='bundle.js')
-        title Terminus
-    body
-        .mt-5.mb-5#header
-            .text-center
-                h1 Terminus
-                .subtitle.mb-3 A terminal for a more modern age
-                
-                a.btn.btn-lg.btn-outline-dark.mt-4(href='https://github.com/Eugeny/terminus/releases/latest', target='_blank')
-                    strong DOWNLOAD
-
-                a.btn.btn-lg.btn-outline-secondary.mt-4.ml-3(href='https://github.com/Eugeny/terminus', target='_blank')
-                    strong GITHUB
-                    
-                
-        .background-stripe
-            .overlay.overlay1
-            .overlay.overlay2
-            .terminal
-
-        .container.mt-5.mb-5
-            .d-flex.flex-wrap.flex-md-nowrap
-                .w-100
-                    .feature windows
-                    .feature linux
-                    .feature macos
-                    br
-                    .feature powershell
-                    .feature wsl
-                    .feature cygwin
-                    .feature git-bash
-                    .feature cmder
-                    .feature clink
-                    
-                .w-100
-                    .feature full unicode
-                    .feature global hotkey
-                    .feature plugins
-                    .feature tab recovery
-                    .feature custom css
-                    .feature themes
-                    .feature font ligatures
-                    .feature clickable paths
-                    .feature tabs on top/bottom
-                    .feature vibrancy
-                    .feature bracketed paste
-                    
-        .container.mt-5.mb-5
-            .text-center.mt-5
-                .mb-4.mt-5
-                    script(type='text/javascript', src='https://ko-fi.com/widgets/widget_2.js')
-                    script(type='text/javascript').
-                        kofiwidget2.init('Buy me a coffee', '#46b798', 'J3J8KWTF')
-                        kofiwidget2.draw()
-                
-                a.btn.btn-lg.btn-outline-secondary.mt-3(href='/terminus/#header')
-                    strong BEAM ME UP
-
-        .background-stripe2
-            .overlay.overlay1
-                                        
-        script.
-          (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-          (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-          m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-          })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-
-          ga('create', 'UA-3278102-18', 'auto');
-          ga('send', 'pageview');

docs/package.json

@@ -1,24 +0,0 @@
-{
-  "name": "docs",
-  "version": "1.0.0",
-  "main": "index.js",
-  "scripts": {
-    "build": "webpack --progress",
-    "watch": "webpack --progress --watch"
-  },
-  "private": true,
-  "devDependencies": {
-    "bootstrap": "^4.1.3",
-    "css-loader": "^1.0.0",
-    "file-loader": "^1.1.11",
-    "node-sass": "^4.9.3",
-    "pug": "^2.0.3",
-    "pug-cli": "^1.0.0-alpha6",
-    "pug-html-loader": "^1.1.5",
-    "sass-loader": "^7.1.0",
-    "style-loader": "^0.22.1",
-    "val-loader": "^1.1.1",
-    "webpack": "^4.16.5",
-    "webpack-cli": "^3.1.0"
-  }
-}

docs/styles.scss

@@ -1,141 +0,0 @@
-$font-family-sans-serif: "Source Sans Pro";
-$border-radius-lg: 0;
-$btn-border-width: 3px;
-
-@import "node_modules/bootstrap/scss/bootstrap";
-
-
-h1 {
-    font-size: 10vw;
-    font-weight: 200;
-    margin: 0;
-}
-
-body {
-    overflow-x: hidden;
-}
-
-.subtitle {
-    font-style: italic;
-    color: #999;
-    font-size: 5vw;
-    font-weight: 300;
-}
-
-.background-stripe {
-    width: 100vw;
-    background-image: url('./background.jpeg');
-    background-size: cover;
-    height: 30vw;
-    margin: 200px 0 150px;
-    min-height: 1000px;
-    position: relative;
-
-    .overlay {
-        position: absolute;
-        width: 100vw;
-        width: 1px;
-        height: 1px;
-
-        &.overlay1 {
-            top: -1px;
-            left: 0;
-            border-top: 10vw solid white;
-            border-right: 100vw solid transparent;
-        }
-
-        &.overlay2 {
-            bottom: -1px;
-            right: 0;
-            border-bottom: 10vw solid white;
-            border-left: 100vw solid transparent;
-        }
-    }
-
-    .terminal {
-        position: absolute;
-        left: 50%;
-        top: 5vw;
-
-        width: 1304px;
-        margin-left: -652px;
-        height: 972px;
-        border-radius: 9px;
-
-        box-shadow: 0 0 100px black;
-        background: url('./terminal.png');
-        background-size: cover;
-
-        animation: slideIn ease-out 1s;
-        opacity: .95;
-    }
-
-    @media(max-width: 1500px) {
-        min-height: 500px;
-        margin: 200px 0 100px;
-
-        .terminal {
-            width: 652px;
-            top: -100px;
-            margin-left: -326px;
-            height: 486px;
-            border-radius: 5px;
-        }
-    }
-
-    @media(max-width: 750px) {
-        min-height: 250px;
-        margin: 100px 0 50px;
-
-        .terminal {
-            width: 326px;
-            top: -50px;
-            margin-left: -163px;
-            height: 243px;
-            border-radius: 3px;
-        }
-    }
-
-}
-
-.feature {
-    font-size: 45px;
-    line-height: 40px;
-    opacity: .5;
-    font-style: italic;
-}
-
-@keyframes slideIn {
-    from {
-        opacity: 0;
-        margin-top: 200px;
-    }
-    to {
-        opacity: .95;
-        margin-top: 0px;
-    }
-}
-
-
-.background-stripe2 {
-    width: 100vw;
-    background-image: url('./background.jpeg');
-    background-size: cover;
-    height: 30vw;
-    margin: 100px 0 0;
-    position: relative;
-
-    .overlay {
-        position: absolute;
-        width: 100vw;
-        width: 1px;
-        height: 1px;
-
-        &.overlay1 {
-            top: -1px;
-            right: 0;
-            border-top: 10vw solid white;
-            border-left: 100vw solid transparent;
-        }
-    }
-}

docs/webpack.config.js

@@ -1,27 +0,0 @@
-const path = require('path')
-
-module.exports = {
-  entry: {
-    'index.ignore': 'file-loader?name=../index.html!pug-html-loader!' + path.resolve(__dirname, './index.pug'),
-    'bundle': path.resolve(__dirname, 'index.js'),
-  },
-  context: __dirname,
-  output: {
-    path: path.join(__dirname, 'dist'),
-    filename: '[name].js'
-  },
-  module: {
-    rules: [
-      { test: /\.scss$/, use: ['style-loader', 'css-loader', 'sass-loader'] },
-      {
-        test: /\.(jpeg|png)?$/,
-        use: {
-          loader: 'file-loader',
-          options: {
-            name: 'assets/[name].[ext]'
-          }
-        }
-      }
-    ]
-  },
-}

electron-builder.yml

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

package.json

@@ -1,134 +1,73 @@
 {
-  "name": "term",
   "devDependencies": {
-    "@types/electron-config": "^0.2.1",
+    "@fortawesome/fontawesome-free": "^5.13.0",
-    "@types/electron-debug": "^1.1.0",
+    "@sentry/cli": "^1.52.3",
-    "@types/fs-promise": "1.0.1",
+    "@sentry/electron": "^1.2.1",
-    "@types/js-yaml": "^3.11.2",
+    "@types/electron-config": "^3.2.2",
-    "@types/node": "^10.11.5",
+    "@types/electron-debug": "^2.1.0",
-    "@types/webpack-env": "1.13.0",
+    "@types/js-yaml": "^3.12.4",
-    "app-builder-lib": "^20.28.4",
+    "@types/node": "12.7.12",
-    "apply-loader": "0.1.0",
+    "@types/webpack-env": "^1.15.2",
+    "@typescript-eslint/eslint-plugin": "^2.26.0",
+    "@typescript-eslint/parser": "^2.34.0",
+    "apply-loader": "2.0.0",
     "awesome-typescript-loader": "^5.0.0",
-    "core-js": "2.4.1",
+    "core-js": "^3.6.5",
-    "cross-env": "4.0.0",
+    "cross-env": "7.0.2",
-    "css-loader": "0.28.0",
+    "css-loader": "3.4.2",
-    "electron": "3.0.8",
+    "electron": "^8.2.5",
-    "electron-builder": "^20.27.1",
+    "electron-builder": "22.6.1",
-    "electron-builder-squirrel-windows": "^20.28.3",
+    "electron-download": "^4.1.1",
-    "electron-installer-snap": "^3.0.0",
+    "electron-installer-snap": "^5.0.0",
-    "electron-rebuild": "^1.8.2",
+    "electron-notarize": "^0.1.1",
-    "file-loader": "^1.1.11",
+    "electron-rebuild": "^1.10.1",
-    "font-awesome": "4.7.0",
+    "eslint": "^6.8.0",
-    "graceful-fs": "^4.1.11",
+    "eslint-plugin-import": "^2.20.2",
-    "html-loader": "0.4.4",
+    "file-loader": "^5.0.2",
-    "json-loader": "0.5.4",
+    "graceful-fs": "^4.2.4",
-    "less": "2.7.1",
+    "html-loader": "0.5.5",
-    "less-loader": "2.2.3",
+    "json-loader": "0.5.7",
-    "node-abi": "^2.4.4",
+    "node-abi": "^2.16.0",
-    "node-gyp": "^3.6.2",
+    "node-gyp": "^6.1.0",
-    "node-sass": "^4.5.3",
+    "node-sass": "^4.14.1",
-    "npmlog": "4.1.0",
+    "npmlog": "4.1.2",
     "npx": "^10.2.0",
-    "pug": "^2.0.3",
+    "pug": "^2.0.4",
-    "pug-html-loader": "1.0.9",
+    "pug-html-loader": "1.1.5",
-    "pug-lint": "^2.5.0",
+    "pug-lint": "^2.6.0",
     "pug-loader": "^2.4.0",
-    "pug-static-loader": "0.0.1",
+    "pug-static-loader": "2.0.0",
-    "raven-js": "3.16.0",
+    "raw-loader": "4.0.1",
-    "raw-loader": "0.5.1",
+    "sass-loader": "^8.0.0",
-    "sass-loader": "^7.0.1",
+    "shelljs": "0.8.4",
-    "shelljs": "0.7.7",
+    "source-code-pro": "^2.30.2",
-    "source-code-pro": "^2.30.1",
+    "source-sans-pro": "3.6.0",
-    "source-sans-pro": "2.0.10",
+    "style-loader": "^1.1.4",
-    "style-loader": "0.13.1",
     "svg-inline-loader": "^0.8.0",
-    "to-string-loader": "1.1.5",
+    "to-string-loader": "1.1.6",
-    "tslint": "5.1.0",
+    "tslib": "^2.0.0",
-    "tslint-config-standard": "5.0.2",
+    "typedoc": "^0.17.6",
-    "tslint-eslint-rules": "4.0.0",
+    "typescript": "^3.9.3",
-    "typescript": "^3.1.3",
+    "url-loader": "^3.0.0",
-    "url-loader": "^1.1.1",
+    "val-loader": "2.1.1",
-    "val-loader": "0.5.0",
+    "webpack": "^5.0.0-beta.16",
-    "webpack": "^4.22.0",
+    "webpack-cli": "^3.3.10",
-    "webpack-cli": "^3.1.2",
+    "yaml-loader": "0.6.0"
-    "yaml-loader": "0.4.0",
-    "yarn": "^1.10.1"
   },
-  "build": {
+  "resolutions": {
-    "appId": "org.terminus",
+    "*/node-abi": "^2.14.0"
-    "productName": "Terminus",
-    "compression": "normal",
-    "files": [
-      "**/*",
-      "dist"
-    ],
-    "extraResources": [
-      "builtin-plugins",
-      "extras"
-    ],
-    "win": {
-      "icon": "./build/windows/icon.ico",
-      "publish": [
-        "github"
-      ],
-      "artifactName": "terminus-${version}-setup.exe"
-    },
-    "squirrelWindows": {
-      "iconUrl": "https://github.com/Eugeny/terminus/raw/master/build/windows/icon.ico",
-      "artifactName": "terminus-${version}-setup.exe"
-    },
-    "portable": {
-      "artifactName": "terminus-${version}-portable.exe"
-    },
-    "mac": {
-      "category": "public.app-category.video",
-      "icon": "./build/mac/icon.icns",
-      "publish": [
-        "github"
-      ],
-      "extendInfo": {
-        "NSRequiresAquaSystemAppearance": false
-      }
-    },
-    "dmg": {
-      "artifactName": "terminus-${version}-macos.dmg"
-    },
-    "linux": {
-      "category": "Utilities",
-      "icon": "./build/icons",
-      "artifactName": "terminus-${version}-linux.${ext}",
-      "publish": [
-        "github"
-      ]
-    },
-    "deb": {
-      "depends": [
-        "screen",
-        "gconf2",
-        "gconf-service",
-        "libnotify4",
-        "libappindicator1",
-        "libxtst6",
-        "libnss3",
-        "tmux"
-      ],
-      "afterInstall": "build/linux/after-install.tpl"
-    },
-    "rpm": {
-      "depends": [
-        "screen",
-        "gnome-python2-gnomekeyring"
-      ]
-    }
   },
   "scripts": {
-    "build": "webpack --color --config app/webpack.main.config.js && webpack --color --config app/webpack.config.js && webpack --color --config terminus-core/webpack.config.js && webpack --color --config terminus-settings/webpack.config.js && webpack --color --config terminus-terminal/webpack.config.js && webpack --color --config terminus-settings/webpack.config.js && webpack --color --config terminus-plugin-manager/webpack.config.js && webpack --color --config terminus-community-color-schemes/webpack.config.js && webpack --color --config terminus-ssh/webpack.config.js",
+    "build": "npm run build:typings && webpack --color --config app/webpack.main.config.js && webpack --color --config app/webpack.config.js && webpack --color --config terminus-core/webpack.config.js && webpack --color --config terminus-settings/webpack.config.js && webpack --color --config terminus-terminal/webpack.config.js && webpack --color --config terminus-plugin-manager/webpack.config.js && webpack --color --config terminus-community-color-schemes/webpack.config.js && webpack --color --config terminus-ssh/webpack.config.js && webpack --color --config terminus-serial/webpack.config.js",
-    "watch": "cross-env DEV=1 webpack --progress --color --watch",
+    "build:typings": "node scripts/build-typings.js",
-    "start": "cross-env DEV=1 electron app --debug",
+    "watch": "cross-env TERMINUS_DEV=1 webpack --progress --color --watch",
-    "prod": "cross-env DEV=1 electron app",
+    "start": "cross-env TERMINUS_DEV=1 electron app --debug",
-    "lint": "tslint -c tslint.json -t stylish terminus-*/src/**/*.ts terminus-*/src/*.ts app/src/*.ts",
+    "prod": "cross-env TERMINUS_DEV=1 electron app",
-    "postinstall": "install-app-deps"
+    "docs": "typedoc --out docs/api terminus-core/src && typedoc --out docs/api/terminal --tsconfig terminus-terminal/tsconfig.typings.json terminus-terminal/src && typedoc --out docs/api/settings --tsconfig terminus-settings/tsconfig.typings.json terminus-settings/src",
+    "lint": "eslint --ext ts */src */lib",
+    "postinstall": "node ./scripts/install-deps.js"
   },
-  "repository": "eugeny/terminus"
+  "repository": "eugeny/terminus",
+  "author": "Eugene Pankov",
+  "license": "MIT"
 }

scripts/build-linux.js

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

scripts/build-macos.js

@@ -1,14 +1,21 @@
 #!/usr/bin/env node
 const builder = require('electron-builder').build
 const vars = require('./vars')
+const fs = require('fs')
+const signHook = require('../build/mac/afterSignHook')
+
+const isTag = (process.env.GITHUB_REF || '').startsWith('refs/tags/')
 
 builder({
-  dir: true,
+    dir: true,
-  mac: ['dmg', 'zip'],
+    mac: ['pkg', 'zip'],
-  config: {
+    config: {
-    extraMetadata: {
+        extraMetadata: {
-      version: vars.version,
+            version: vars.version,
+        },
     },
-  },
+    publish: isTag ? 'always' : 'onTag',
-  publish: 'onTag',
+}).catch(e => {
+    console.error(e)
+    process.exit(1)
 })

scripts/build-native.js

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

scripts/build-typings.js

@@ -0,0 +1,9 @@
+#!/usr/bin/env node
+const sh = require('shelljs')
+const vars = require('./vars')
+const log = require('npmlog')
+
+vars.builtinPlugins.forEach(plugin => {
+    log.info('typings', plugin)
+    sh.exec(`npx tsc --project ${plugin}/tsconfig.typings.json`)
+})

scripts/build-windows.js

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

scripts/install-deps.js

@@ -8,7 +8,6 @@ const localBinPath = path.resolve(__dirname, '../node_modules/.bin');
 const npx = `${localBinPath}/npx`;
 
 log.info('deps', 'app')
-sh.exec(`${npx} yarn install`)
 
 sh.cd('app')
 sh.exec(`${npx} yarn install`)
@@ -26,8 +25,5 @@ if (['darwin', 'linux'].includes(process.platform)) {
   for (let x of vars.builtinPlugins) {
     sh.ln('-fs', '../' + x, x)
   }
-  for (let x of vars.bundledModules) {
-    sh.ln('-fs', '../app/node_modules/' + x, x)
-  }
   sh.cd('..')
 }

scripts/vars.js

@@ -1,12 +1,18 @@
 const path = require('path')
 const fs = require('fs')
+const semver = require('semver')
 const childProcess = require('child_process')
 
 const appInfo = JSON.parse(fs.readFileSync(path.resolve(__dirname, '../app/package.json')))
-const pkgInfo = JSON.parse(fs.readFileSync(path.resolve(__dirname, '../package.json')))
+const electronInfo = JSON.parse(fs.readFileSync(path.resolve(__dirname, '../node_modules/electron/package.json')))
 
 exports.version = childProcess.execSync('git describe --tags', {encoding:'utf-8'})
-exports.version = exports.version.substring(1, exports.version.length - 1)
+exports.version = exports.version.substring(1).trim()
+exports.version = exports.version.replace('-', '-c')
+
+if (exports.version.includes('-c')) {
+  exports.version = semver.inc(exports.version, 'prepatch').replace('-0', '-nightly.0')
+}
 
 exports.builtinPlugins = [
   'terminus-core',
@@ -15,9 +21,10 @@ exports.builtinPlugins = [
   'terminus-community-color-schemes',
   'terminus-plugin-manager',
   'terminus-ssh',
+  'terminus-serial',
 ]
 exports.bundledModules = [
   '@angular',
   '@ng-bootstrap',
 ]
-exports.electronVersion = pkgInfo.devDependencies.electron
+exports.electronVersion = electronInfo.version

snap/snapcraft.yaml

@@ -0,0 +1,26 @@
+name: terminus
+version: '1.0.0'
+summary: A terminal for a modern age
+description: |
+  Terminus is a terminal heavily inspired by Hyper. It is, however, designed for people who need to get things done.
+
+grade: devel 
+confinement: devmode
+
+apps:
+  terminus:
+    command: opt/terminus/terminus
+    
+parts:
+  app:
+    plugin: nodejs
+    source: .
+    build-packages: 
+      - libfontconfig-dev
+    override-build: |
+      yarn
+      ./scripts/build-native.js
+      yarn run build
+      ./scripts/build-linux.js
+      mkdir -p $SNAPCRAFT_PART_INSTALL/opt/terminus || true
+      cp -ar dist/linux-unpacked/* $SNAPCRAFT_PART_INSTALL/opt/terminus/

terminus-community-color-schemes/package.json

@@ -1,12 +1,12 @@
 {
   "name": "terminus-community-color-schemes",
-  "version": "1.0.0-alpha.55",
+  "version": "1.0.104-nightly.0",
   "description": "Community color schemes for Terminus",
   "keywords": [
     "terminus-builtin-plugin"
   ],
   "main": "dist/index.js",
-  "typings": "dist/index.d.ts",
+  "typings": "typings/index.d.ts",
   "scripts": {
     "build": "webpack --progress --color",
     "watch": "webpack --progress --color --watch"
@@ -17,13 +17,8 @@
   "author": "Eugene Pankov",
   "license": "MIT",
   "peerDependencies": {
-    "@angular/core": "4.0.1",
+    "@angular/core": "^7",
     "terminus-core": "*",
     "terminus-terminal": "*"
-  },
+  }
-  "devDependencies": {
-    "@types/node": "7.0.12",
-    "@types/webpack-env": "^1.13.0"
-  },
-  "false": {}
 }

terminus-community-color-schemes/schemes/Relaxed

@@ -0,0 +1,36 @@
+! special
+*.foreground:   #d8d8d8
+*.background:   #343a43
+*.cursorColor:  #d8d8d8
+
+! black
+*.color0:       #2c3037
+*.color8:       #626262
+
+! red
+*.color1:       #bb5653
+*.color9:       #c35956
+
+! green
+*.color2:       #909d62
+*.color10:      #9fab76
+
+! yellow
+*.color3:       #eac179
+*.color11:      #ecc179
+
+! blue
+*.color4:       #698698
+*.color12:      #7da9c7
+
+! magenta
+*.color5:       #b06597
+*.color13:      #ba6ca0
+
+! cyan
+*.color6:       #c9dfff
+*.color14:      #abbacf
+
+! white
+*.color7:       #d8d8d8
+*.color15:      #f7f7f7

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

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

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

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

terminus-community-color-schemes/tsconfig.json

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

terminus-community-color-schemes/tsconfig.typings.json

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

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

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

terminus-community-color-schemes/yarn.lock

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

terminus-core/README.md

@@ -0,0 +1,31 @@
+Terminus Core Plugin
+--------------------
+
+See also: [Settings plugin API](./settings/), [Terminal plugin API](./terminal/)
+
+* tabbed interface services
+* toolbar UI
+* config file management
+* hotkeys
+* tab recovery
+* logging
+* theming
+
+Using the API:
+
+```ts
+import { AppService, TabContextMenuItemProvider } from 'terminus-core'
+```
+
+Exporting your subclasses:
+
+```ts
+@NgModule({
+  ...
+  providers: [
+    ...
+    { provide: TabContextMenuItemProvider, useClass: MyContextMenu, multi: true },
+    ...
+  ]
+})
+```

terminus-core/package.json

@@ -1,49 +1,45 @@
 {
   "name": "terminus-core",
-  "version": "1.0.0-alpha.55",
+  "version": "1.0.104-nightly.0",
   "description": "Terminus core",
   "keywords": [
     "terminus-builtin-plugin"
   ],
   "main": "dist/index.js",
-  "typings": "dist/index.d.ts",
+  "typings": "typings/index.d.ts",
   "scripts": {
-    "build": "rm -rf dist && webpack --progress --color --display-modules",
+    "build": "webpack --progress --color --display-modules",
-    "watch": "rm -rf dist && webpack --progress --color --watch"
+    "watch": "webpack --progress --color --watch"
   },
   "files": [
-    "dist"
+    "typings"
   ],
   "author": "Eugene Pankov",
   "license": "MIT",
   "devDependencies": {
     "@types/js-yaml": "^3.9.0",
-    "@types/node": "^7.0.37",
+    "@types/shell-escape": "^0.2.0",
-    "@types/webpack-env": "^1.13.0",
     "@types/winston": "^2.3.6",
+    "axios": "^0.19.0",
     "bootstrap": "^4.1.3",
-    "core-js": "^2.4.1",
+    "core-js": "^3.1.2",
-    "electron-updater": "^2.8.9",
+    "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",
-    "rage-edit-tmp": "^1.1.0",
     "shell-escape": "^0.2.0",
-    "universal-analytics": "^0.4.17"
+    "uuid": "^8.0.0",
+    "winston": "^3.2.1"
   },
   "peerDependencies": {
-    "@angular/animations": "4.0.1",
+    "@angular/animations": "^7",
-    "@angular/common": "4.0.1",
+    "@angular/common": "^7",
-    "@angular/core": "4.0.1",
+    "@angular/core": "^7",
-    "@angular/forms": "4.0.1",
+    "@angular/forms": "^7",
-    "@angular/platform-browser": "4.0.1",
+    "@angular/platform-browser": "^7",
-    "@angular/platform-browser-dynamic": "4.0.1",
+    "@angular/platform-browser-dynamic": "^7",
-    "rxjs": "5.3.0",
+    "rxjs": "^5"
-    "zone.js": "0.8.4"
+  }
-  },
-  "dependencies": {
-    "deepmerge": "^1.5.0",
-    "js-yaml": "^3.9.0",
-    "winston": "^2.4.0"
-  },
-  "false": {}
 }

terminus-core/src/api/configProvider.ts

@@ -1,4 +1,37 @@
+/**
+ * Extend to add your own config options
+ */
 export abstract class ConfigProvider {
+    /**
+     * Default values, e.g.
+     *
+     * ```ts
+     * defaults = {
+     *   myPlugin: {
+     *     foo: 1
+     *   }
+     * }
+     * ```
+     */
     defaults: any = {}
-    platformDefaults: any = {}
+
+    /**
+     * [[Platform]] specific defaults, e.g.
+     *
+     * ```ts
+     * platformDefaults = {
+     *   [Platform.Windows]: {
+     *     myPlugin: {
+     *       bar: true
+     *     }
+     *   },
+     *   [Platform.macOS]: {
+     *     myPlugin: {
+     *       bar: false
+     *     }
+     *   },
+     * }
+     * ```
+     */
+    platformDefaults: {[platform: string]: any} = {}
 }

terminus-core/src/api/hotkeyProvider.ts

@@ -1,10 +1,14 @@
-export interface IHotkeyDescription {
+export interface HotkeyDescription {
-    id: string,
+    id: string
-    name: string,
+    name: string
 }
 
+/**
+ * Extend to provide your own hotkeys. A corresponding [[ConfigProvider]]
+ * must also provide the `hotkeys.foo` config options with the default values
+ */
 export abstract class HotkeyProvider {
-    hotkeys: IHotkeyDescription[] = []
+    hotkeys: HotkeyDescription[] = []
 
-    abstract provide (): Promise<IHotkeyDescription[]>
+    abstract provide (): Promise<HotkeyDescription[]>
 }

terminus-core/src/api/index.ts

@@ -1,9 +1,13 @@
 export { BaseTabComponent, BaseTabProcess } from '../components/baseTab.component'
-export { TabRecoveryProvider, RecoveredTab } from './tabRecovery'
+export { TabHeaderComponent } from '../components/tabHeader.component'
-export { ToolbarButtonProvider, IToolbarButton } from './toolbarButtonProvider'
+export { SplitTabComponent, SplitContainer } from '../components/splitTab.component'
+export { TabRecoveryProvider, RecoveredTab, RecoveryToken } from './tabRecovery'
+export { ToolbarButtonProvider, ToolbarButton } from './toolbarButtonProvider'
 export { ConfigProvider } from './configProvider'
-export { HotkeyProvider, IHotkeyDescription } from './hotkeyProvider'
+export { HotkeyProvider, HotkeyDescription } from './hotkeyProvider'
 export { Theme } from './theme'
+export { TabContextMenuItemProvider } from './tabContextMenuProvider'
+export { SelectorOption } from './selector'
 
 export { AppService } from '../services/app.service'
 export { ConfigService } from '../services/config.service'
@@ -15,3 +19,5 @@ export { HotkeysService } from '../services/hotkeys.service'
 export { HostAppService, Platform } from '../services/hostApp.service'
 export { ShellIntegrationService } from '../services/shellIntegration.service'
 export { ThemesService } from '../services/themes.service'
+export { TabsService } from '../services/tabs.service'
+export * from '../utils'

terminus-core/src/api/selector.ts

@@ -0,0 +1,8 @@
+export interface SelectorOption<T> {
+    name: string
+    description?: string
+    result?: T
+    icon?: string
+    freeInputPattern?: string
+    callback?: (string?) => void
+}

terminus-core/src/api/tabContextMenuProvider.ts

@@ -0,0 +1,11 @@
+import { BaseTabComponent } from '../components/baseTab.component'
+import { TabHeaderComponent } from '../components/tabHeader.component'
+
+/**
+ * Extend to add items to the tab header's context menu
+ */
+export abstract class TabContextMenuItemProvider {
+    weight = 0
+
+    abstract async getItems (tab: BaseTabComponent, tabHeader?: TabHeaderComponent): Promise<Electron.MenuItemConstructorOptions[]>
+}

terminus-core/src/api/tabRecovery.ts

@@ -1,10 +1,44 @@
-import { TabComponentType } from '../services/app.service'
+import { TabComponentType } from '../services/tabs.service'
 
 export interface RecoveredTab {
-    type: TabComponentType,
+    /**
-    options?: any,
+     * Component type to be instantiated
+     */
+    type: TabComponentType
+
+    /**
+     * Component instance inputs
+     */
+    options?: any
 }
 
-export abstract class TabRecoveryProvider {
+export interface RecoveryToken {
-    abstract async recover (recoveryToken: any): Promise<RecoveredTab|null>
+    [_: string]: any
+    type: string
+    tabColor?: string|null
+}
+
+/**
+ * Extend to enable recovery for your custom tab.
+ * This works in conjunction with [[getRecoveryToken()]]
+ *
+ * Terminus will try to find any [[TabRecoveryProvider]] that is able to process
+ * the recovery token previously returned by [[getRecoveryToken]].
+ *
+ * Recommended token format:
+ *
+ * ```json
+ * {
+ *   type: 'my-tab-type',
+ *   foo: 'bar',
+ * }
+ * ```
+ */
+export abstract class TabRecoveryProvider {
+    /**
+     * @param recoveryToken a recovery token found in the saved tabs list
+     * @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: RecoveryToken): Promise<RecoveredTab|null>
 }

terminus-core/src/api/theme.ts

@@ -1,5 +1,13 @@
+/**
+ * Extend to add a custom CSS theme
+ */
 export abstract class Theme {
     name: string
+
+    /**
+     * Complete CSS stylesheet
+     */
     css: string
+
     terminalBackground: string
 }

terminus-core/src/api/toolbarButtonProvider.ts

@@ -1,14 +1,37 @@
-import { SafeHtml } from '@angular/platform-browser'
+/**
+ * See [[ToolbarButtonProvider]]
+ */
+export interface ToolbarButton {
+    /**
+     * Raw SVG icon code
+     */
+    icon?: string
 
-export interface IToolbarButton {
-    icon: SafeHtml
-    touchBarNSImage?: string
     title: string
+
+    /**
+     * Optional Touch Bar icon ID
+     */
+    touchBarNSImage?: string
+
+    /**
+     * Optional Touch Bar button label
+     */
     touchBarTitle?: string
+
     weight?: number
-    click: () => void
+
+    click?: () => void
+
+    submenu?: () => Promise<ToolbarButton[]>
+
+    /** @hidden */
+    submenuItems?: ToolbarButton[]
 }
 
+/**
+ * Extend to add buttons to the toolbar
+ */
 export abstract class ToolbarButtonProvider {
-    abstract provide (): IToolbarButton[]
+    abstract provide (): ToolbarButton[]
 }

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

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

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

@@ -18,6 +18,7 @@ $tab-border-radius: 4px;
 
 
 .content {
+    height: 100%;
     flex: auto;
     display: flex;
     flex-direction: column-reverse;
@@ -48,6 +49,10 @@ $tab-border-radius: 4px;
         color: #aaa;
         border: none;
         border-radius: 0;
+
+        &.dropdown-toggle::after {
+            display: none;
+        }
     }
 
     &>.tabs {
@@ -59,6 +64,7 @@ $tab-border-radius: 4px;
     &>.drag-space {
         min-width: 1px;
         flex: 1 0 1%;
+        margin-top: 2px; // for window resizing
         -webkit-app-region: drag;
 
         &.persistent {
@@ -88,12 +94,20 @@ hotkey-hint {
     max-width: 300px;
 }
 
-::ng-deep .btn-tab-bar svg {
+::ng-deep .btn-tab-bar svg,
+::ng-deep .btn-tab-bar + .dropdown-menu svg {
+    width: 16px;
     height: 16px;
     fill: white;
     fill-opacity: 0.75;
 }
 
+.icon-wrapper {
+    display: flex;
+    width: 16px;
+    height: 17px;
+}
+
 ::ng-deep .btn-update svg {
     fill: cyan;
 }