Merge pull request #4929 from Eugeny/all-contributors/add-composer404

Bump @sentry/cli from 1.67.2 to 1.71.0

.all-contributorsrc

@@ -451,6 +451,33 @@
       "contributions": [
         "doc"
       ]
+    },
+    {
+      "login": "Me1onRind",
+      "name": "zZ",
+      "avatar_url": "https://avatars.githubusercontent.com/u/19531270?v=4",
+      "profile": "https://github.com/Me1onRind",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "tainoNZ",
+      "name": "Aaron Davison",
+      "avatar_url": "https://avatars.githubusercontent.com/u/49261322?v=4",
+      "profile": "https://github.com/tainoNZ",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "composer404",
+      "name": "Przemyslaw Kozik",
+      "avatar_url": "https://avatars.githubusercontent.com/u/58251560?v=4",
+      "profile": "https://github.com/composer404",
+      "contributions": [
+        "design"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.github/workflows/build.yml

@@ -129,7 +129,7 @@ jobs:
         path: artifact-zip
 
   Linux-Build:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     needs: Lint
 
     steps:
@@ -146,7 +146,7 @@ jobs:
     - name: Install deps
       run: |
         sudo apt-get update
-        sudo apt-get install bsdtar zsh
+        sudo apt-get install libarchive-tools zsh
         npm i -g yarn@1.19.1
         cd app
         yarn

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,70 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ master ]
+  schedule:
+    - cron: '26 7 * * 4'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'javascript' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Learn more about CodeQL language support at https://git.io/codeql-language-support
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

.github/workflows/docs.yml

@@ -2,7 +2,7 @@ name: Docs
 on: push
 jobs:
   build:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     if: ${{ github.actor != 'dependabot[bot]' }}
 
     steps:
@@ -18,8 +18,6 @@ jobs:
 
     - name: Build
       run: |
-        eval $(ssh-agent -s)
-        ssh-add <(echo "$DOCS_PRIVATE_KEY")
         yarn cache clean
         cd app
         yarn
@@ -28,7 +26,13 @@ jobs:
         yarn
         yarn run build:typings
         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 }}
+
+    - uses: FirebaseExtended/action-hosting-deploy@v0
+      with:
+        repoToken: '${{ secrets.GITHUB_TOKEN }}'
+        firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_TABBY_DOCS }}'
+        channelId: live
+        projectId: tabby-docs

README.ko-KR.md

@@ -38,14 +38,14 @@
 
 # 목차 <!-- omit in toc -->
 
-- [Tabby는 무엇인가](#about)
-- [터미널 기능](#terminal)
-- [SSH 클라이언트](#ssh)
-- [시리얼 터미널](#serial)
-- [포터블](#portable)
-- [플러그인](#plugins)
-- [테마](#themes)
-- [기여](#contributing)
+- [Tabby는 무엇인가](#tabby는-무엇인가)
+- [터미널 기능](#터미널-기능)
+- [SSH 클라이언트](#ssh-클라이언트)
+- [시리얼 터미널](#시리얼-터미널)
+- [포터블](#포터블)
+- [플러그인](#플러그인)
+- [테마](#테마)
+- [기여](#기여)
 
 <a name="about"></a>
 
@@ -109,6 +109,8 @@
 * [save-output](https://github.com/Eugeny/tabby-save-output) - 터미널 출력을 파일에 기록
 * [sync-config](https://github.com/starxg/terminus-sync-config) - 구성을 Gist 또는 Gitee에 동기화
 * [clippy](https://github.com/Eugeny/tabby-clippy) - 항상 당신을 귀찮게 하는 예제 플러그인
+* [workspace-manager](https://github.com/composer404/tabby-workspace-manager) - 주어진 구성을 기반으로 사용자 정의 작업 공간 프로필을 생성할 수 있습니다
+* [search-in-browser](https://github.com/composer404/tabby-search-in-browser) - Tabby의 탭에서 선택한 텍스트로 기본 시스템 브라우저를 엽니다
 
 <a name="themes"></a>
 # 테마
@@ -130,7 +132,7 @@
 
 Pull requests and plugins are welcome!
 
-프로젝트 배치 방법에 대한 자세한 내용과 매우 간단한 플러그인 개발 튜토리얼은 [HACKING.md](https://github.com/Eugeny/tabby/blob/master/HACKING.md) 및 [API docs](http://ajenti.org/terminus-docs/)를 참조하십시오.
+프로젝트 배치 방법에 대한 자세한 내용과 매우 간단한 플러그인 개발 튜토리얼은 [HACKING.md](https://github.com/Eugeny/tabby/blob/master/HACKING.md) 및 [API docs](https://docs.tabby.sh/)를 참조하십시오.
 
 ---
 <a name="contributors"></a>

README.md

@@ -40,6 +40,7 @@ This README is also available in: <a href="./README.ko-KR.md">Korean</a>
 * Doesn't choke on fast-flowing outputs
 * Proper shell experience on Windows including tab completion (via Clink)
 * Integrated encrypted container for SSH secrets and configuration
+* SSH, SFTP and Telnet client available as a [web app](https://tabby.sh/app) (also [self-hosted](https://github.com/Eugeny/tabby-web)).
 
 # Contents <!-- omit in toc -->
 
@@ -114,6 +115,8 @@ Plugins and themes can be installed directly from the Settings view inside Tabby
 * [save-output](https://github.com/Eugeny/tabby-save-output) - record terminal output into a file
 * [sync-config](https://github.com/starxg/terminus-sync-config) - sync the config to Gist or Gitee
 * [clippy](https://github.com/Eugeny/tabby-clippy) - an example plugin which annoys you all the time
+* [workspace-manager](https://github.com/composer404/tabby-workspace-manager) - allows creating custom workspace profiles based on the given config
+* [search-in-browser](https://github.com/composer404/tabby-search-in-browser) - opens default system browser with a text selected from the Tabby's tab
 
 <a name="themes"></a>
 # Themes
@@ -135,7 +138,7 @@ Plugins and themes can be installed directly from the Settings view inside Tabby
 
 Pull requests and plugins are welcome!
 
-See [HACKING.md](https://github.com/Eugeny/tabby/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.
+See [HACKING.md](https://github.com/Eugeny/tabby/blob/master/HACKING.md) and [API docs](https://docs.tabby.sh/) for information of how the project is laid out, and a very brief plugin development tutorial.
 
 ---
 <a name="contributors"></a>
@@ -209,6 +212,11 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     <td align="center"><a href="https://github.com/al-wi"><img src="https://avatars.githubusercontent.com/u/11092199?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Alexander Wiedemann</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=al-wi" title="Code">💻</a></td>
     <td align="center"><a href="https://www.notion.so/3d45c6bd2cbd4f938873a4bd12e23375"><img src="https://avatars.githubusercontent.com/u/59506394?v=4?s=100" width="100px;" alt=""/><br /><sub><b>장보연</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=BoYeonJang" title="Documentation">📖</a></td>
   </tr>
+  <tr>
+    <td align="center"><a href="https://github.com/Me1onRind"><img src="https://avatars.githubusercontent.com/u/19531270?v=4?s=100" width="100px;" alt=""/><br /><sub><b>zZ</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=Me1onRind" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/tainoNZ"><img src="https://avatars.githubusercontent.com/u/49261322?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Aaron Davison</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=tainoNZ" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/composer404"><img src="https://avatars.githubusercontent.com/u/58251560?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Przemyslaw Kozik</b></sub></a><br /><a href="#design-composer404" title="Design">🎨</a></td>
+  </tr>
 </table>
 
 <!-- markdownlint-restore -->

app/lib/app.ts

@@ -54,7 +54,11 @@ export class Application {
         })
 
         ;(promiseIpc as any).on('get-default-mac-shell', async () => {
-            return (await exec(`/usr/bin/dscl . -read /Users/${process.env.LOGNAME} UserShell`))[0].toString().split(' ')[1].trim()
+            try {
+                return (await exec(`/usr/bin/dscl . -read /Users/${process.env.LOGNAME} UserShell`))[0].toString().split(' ')[1].trim()
+            } catch {
+                return '/bin/bash'
+            }
         })
 
         const configData = loadConfig()
@@ -257,7 +261,6 @@ export class Application {
             {
                 label: 'View',
                 submenu: [
-                    { role: 'reload' },
                     { role: 'toggleDevTools' },
                     { type: 'separator' },
                     { role: 'togglefullscreen' },
@@ -285,6 +288,10 @@ export class Application {
             },
         ]
 
+        if (process.env.TABBY_DEV) {
+            template[2].submenu['unshift']({ role: 'reload' })
+        }
+
         Menu.setApplicationMenu(Menu.buildFromTemplate(template))
     }
 }

app/lib/window.ts

@@ -398,6 +398,18 @@ export class Window {
         }
         this.window.on('move', onBoundsChange)
         this.window.on('resize', onBoundsChange)
+
+        ipcMain.on('window-set-traffic-light-position', (_event, x, y) => {
+            this.window.setTrafficLightPosition({ x, y })
+        })
+
+        ipcMain.on('window-set-opacity', (_event, opacity) => {
+            this.window.setOpacity(opacity)
+        })
+
+        ipcMain.on('window-set-progress-bar', (_event, value) => {
+            this.window.setProgressBar(value, { mode: value < 0 ? 'none' : 'normal' })
+        })
     }
 
     private destroy () {

app/package.json

@@ -14,7 +14,7 @@
     "watch": "webpack --progress --color --watch"
   },
   "dependencies": {
-    "@angular/cdk": "^12.2.0",
+    "@angular/cdk": "^12.2.9",
     "@electron/remote": "1.2.0",
     "@tabby-gang/node-pty": "^0.11.0-beta.200",
     "any-promise": "^1.3.0",
@@ -29,23 +29,23 @@
     "mz": "^2.7.0",
     "native-process-working-directory": "^1.0.2",
     "npm": "6",
-    "rxjs": "^7.2.0",
+    "rxjs": "^7.4.0",
     "source-map-support": "^0.5.20",
     "v8-compile-cache": "^2.3.0",
-    "yargs": "^17.1.0"
+    "yargs": "^17.2.1"
   },
   "optionalDependencies": {
     "macos-native-processlist": "^2.0.0",
-    "serialport": "^9.2.1",
+    "serialport": "^9.2.5",
     "windows-blurbehind": "^1.0.1",
     "windows-native-registry": "^3.1.0",
-    "windows-process-tree": "^0.3.0"
+    "windows-process-tree": "^0.3.2"
   },
   "devDependencies": {
     "@types/mz": "2.7.4",
     "@types/node": "16.0.1",
     "ngx-filesize": "^2.0.16",
-    "node-abi": "^3.1.0"
+    "node-abi": "^3.3.0"
   },
   "peerDependencies": {
     "tabby-community-color-schemes": "*",

app/src/global.scss

@@ -16,13 +16,17 @@ body {
     display: none;
 }
 
-.btn {
-    display: inline-flex;
-    align-items: center;
-    flex-wrap: nowrap;
+a, button {
+    &.btn {
+        display: inline-flex;
+        align-items: center;
+        flex-wrap: nowrap;
 
-    & > svg {
-        pointer-events: none;
+        & > svg {
+            pointer-events: none;
+            width: 16px;
+            height: 16px;
+        }
     }
 }
 
@@ -163,6 +167,10 @@ ngb-typeahead-window {
     margin: -7px 0;
 }
 
+.content-box {
+    max-width: 600px;
+}
+
 
 // Windows high contrast mode
 @media screen and (forced-colors: active) {

app/yarn.lock

@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@angular/cdk@^12.2.0":
-  version "12.2.0"
-  resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-12.2.0.tgz#7c6de53522ef7cf911d86e187f3df2a90e8fee49"
-  integrity sha512-Dts+KIMz6EdzQxaWBFcNwgWAHVPkI5pnOGMidKKVOmjezSUN6mhfBKq8emgsddJMRAqz/1VHMAEaRkp0VoBKiA==
+"@angular/cdk@^12.2.9":
+  version "12.2.9"
+  resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-12.2.9.tgz#f39e4d7cdb3568ad8e1d412e3500772e2d4c605c"
+  integrity sha512-9Wgj69iGAZ4teQqW/zPbVg2RGna+m9i3v0zkWGx/+Uo95rikJCUZBQM4bfeOe+bSJrS77jV5EisBWG7ayNUSzQ==
   dependencies:
     tslib "^2.2.0"
   optionalDependencies:
@@ -25,76 +25,76 @@
     update-notifier "^2.2.0"
     yargs "^8.0.2"
 
-"@serialport/binding-abstract@^9.0.7":
-  version "9.0.7"
-  resolved "https://registry.yarnpkg.com/@serialport/binding-abstract/-/binding-abstract-9.0.7.tgz#d2c7ecea0f100bdf20187bfc0d34ba90f5504e1e"
-  integrity sha512-g1ncCMIG9rMsxo/28ObYmXZcHThlvtZygsCANmyMUuFS7SwXY4+PhcEnt2+ZcMkEDNRiOklT+ngtIVx5GGpt/A==
+"@serialport/binding-abstract@9.2.3":
+  version "9.2.3"
+  resolved "https://registry.yarnpkg.com/@serialport/binding-abstract/-/binding-abstract-9.2.3.tgz#e7dd273357b6a698af7ad58db6f57f62443a0acb"
+  integrity sha512-cQs9tbIlG3P0IrOWyVirqlhWuJ7Ms2Zh9m2108z6Y5UW/iVj6wEOiW8EmK9QX9jmJXYllE7wgGgvVozP5oCj3w==
   dependencies:
-    debug "^4.3.1"
+    debug "^4.3.2"
 
-"@serialport/binding-mock@9.0.7":
-  version "9.0.7"
-  resolved "https://registry.yarnpkg.com/@serialport/binding-mock/-/binding-mock-9.0.7.tgz#2fda427adc113320461f33f7426dfca73e8ad1de"
-  integrity sha512-aR8H+htZwwZZkVb1MdbnNvGWw8eXVRqQ2qPhkbKyx0N/LY5aVIgCgT98Kt1YylLsG7SzNG+Jbhd4wzwEuPVT5Q==
+"@serialport/binding-mock@9.2.4":
+  version "9.2.4"
+  resolved "https://registry.yarnpkg.com/@serialport/binding-mock/-/binding-mock-9.2.4.tgz#8adf34742abcee80919e19f1266423ce1c9407e2"
+  integrity sha512-dpEhACCs44oQhh6ajJfJdvQdK38Vq0N4W6iD/gdplglDCK7qXRQCMUjJIeKdS/HSEiWkC3bwumUhUufdsOyT4g==
   dependencies:
-    "@serialport/binding-abstract" "^9.0.7"
-    debug "^4.3.1"
+    "@serialport/binding-abstract" "9.2.3"
+    debug "^4.3.2"
 
-"@serialport/bindings@9.2.1":
-  version "9.2.1"
-  resolved "https://registry.yarnpkg.com/@serialport/bindings/-/bindings-9.2.1.tgz#5e6b83222821f9b849512abdc8637386a6675355"
-  integrity sha512-e1CvbvkuMptSjCKc/YwIGjEsSod7kGRpS5TciACQMOi2QQTD8XwVPim0izqVCBZko4n4b0dC6sG3EBkTkQIwnw==
+"@serialport/bindings@9.2.5":
+  version "9.2.5"
+  resolved "https://registry.yarnpkg.com/@serialport/bindings/-/bindings-9.2.5.tgz#d49f6e74d780340558c4dc33546a190befd5476b"
+  integrity sha512-fyabNg56gWbOMuYJc5c45z94sANC/WzTnGeML7Nr1IYVk0SJ1uksN4ETI8Nea9ZAtr4DhNiIMQ3/IOkyof6Tqg==
   dependencies:
-    "@serialport/binding-abstract" "^9.0.7"
-    "@serialport/parser-readline" "^9.0.7"
+    "@serialport/binding-abstract" "9.2.3"
+    "@serialport/parser-readline" "9.2.4"
     bindings "^1.5.0"
-    debug "^4.3.1"
-    nan "^2.14.2"
-    prebuild-install "^6.0.1"
+    debug "^4.3.2"
+    nan "^2.15.0"
+    prebuild-install "^6.1.4"
 
-"@serialport/parser-byte-length@9.0.7":
-  version "9.0.7"
-  resolved "https://registry.yarnpkg.com/@serialport/parser-byte-length/-/parser-byte-length-9.0.7.tgz#9e362bba70eeffcd2eb0804afeca4bb1dee59d5f"
-  integrity sha512-evf7oOOSBMBn2AZZbgBFMRIyEzlsyQkhqaPm7IBCPTxMDXRf4tKkFYJHYZB0/6d1W4eI0meH079UqmSsh/uoDA==
+"@serialport/parser-byte-length@9.2.4":
+  version "9.2.4"
+  resolved "https://registry.yarnpkg.com/@serialport/parser-byte-length/-/parser-byte-length-9.2.4.tgz#cccdf3a95018d838cee9e7aa86ab3b5ad9e6c00f"
+  integrity sha512-sQD/iw4ZMU3xW9PLi0/GlvU6Y623jGeWecbMkO7izUo/6P7gtfv1c9ikd5h0kwL8AoAOpQA1lxdHIKox+umBUg==
 
-"@serialport/parser-cctalk@9.0.7":
-  version "9.0.7"
-  resolved "https://registry.yarnpkg.com/@serialport/parser-cctalk/-/parser-cctalk-9.0.7.tgz#fa0e1539f067aced22a5ef7d64fdac14f1a6a4d3"
-  integrity sha512-ert5jhMkeiTfr44TkbdySC09J8UwAsf/RxBucVN5Mz5enG509RggnkfFi4mfj3UCG2vZ7qsmM6gtZ62DshY02Q==
+"@serialport/parser-cctalk@9.2.4":
+  version "9.2.4"
+  resolved "https://registry.yarnpkg.com/@serialport/parser-cctalk/-/parser-cctalk-9.2.4.tgz#441533e6afc789e8cc5a017697632217bb33a861"
+  integrity sha512-T4TU5vQMwmo9AB3gQLFDWbfJXlW5jd9guEsB/nqKjFHTv0FXPdZ7DQ2TpSp8RnHWxU3GX6kYTaDO20BKzc8GPQ==
 
-"@serialport/parser-delimiter@9.0.7", "@serialport/parser-delimiter@^9.0.7":
-  version "9.0.7"
-  resolved "https://registry.yarnpkg.com/@serialport/parser-delimiter/-/parser-delimiter-9.0.7.tgz#7bef2447d4282dd00dc659719b310edeb30ff294"
-  integrity sha512-Vb2NPeXPZ/28M4m5x4OAHFd8jRAeddNCgvL+Q+H/hqFPY1w47JcMLchC7pigRW8Cnt1fklmzfwdNQ8Fb+kMkxQ==
+"@serialport/parser-delimiter@9.2.4":
+  version "9.2.4"
+  resolved "https://registry.yarnpkg.com/@serialport/parser-delimiter/-/parser-delimiter-9.2.4.tgz#7906162ab5601b52abe7bb011678248f0b50f6c0"
+  integrity sha512-4nvTAoYAgkxFiXrkI+3CA49Yd43CODjeszh89EK+I9c8wOZ+etZduRCzINYPiy26g7zO+GRAb9FoPCsY+sYcbQ==
 
-"@serialport/parser-inter-byte-timeout@9.0.7":
-  version "9.0.7"
-  resolved "https://registry.yarnpkg.com/@serialport/parser-inter-byte-timeout/-/parser-inter-byte-timeout-9.0.7.tgz#55b315b49d8ad37f981ba69bb9443f25c96aec17"
-  integrity sha512-lUZ3cwgUluBvJ1jf+0LQsqoiPYAokDO6+fRCw9HCfnrF/OS60Gm4rxuyo2uQIueqZkJ7NIFP+ibKsULrA47AEA==
+"@serialport/parser-inter-byte-timeout@9.2.4":
+  version "9.2.4"
+  resolved "https://registry.yarnpkg.com/@serialport/parser-inter-byte-timeout/-/parser-inter-byte-timeout-9.2.4.tgz#0ffb7f1449636f6363e894127d1f819b38e91c3c"
+  integrity sha512-SOAdvr0oBQIOCXX198hiTlxs4JTKg9j5piapw5tNq52fwDOWdbYrFneT/wN04UTMKaDrJuEvXq6T4rv4j7nJ5A==
 
-"@serialport/parser-readline@9.0.7", "@serialport/parser-readline@^9.0.7":
-  version "9.0.7"
-  resolved "https://registry.yarnpkg.com/@serialport/parser-readline/-/parser-readline-9.0.7.tgz#8b096028170fb2644bcf0f997d534a344cfd00e6"
-  integrity sha512-ydoLbgVQQPxWrwbe3Fhh4XnZexbkEQAC6M/qgRTzjnKvTjrD61CJNxLc3vyDaAPI9bJIhTiI7eTX3JB5jJv8Hg==
+"@serialport/parser-readline@9.2.4":
+  version "9.2.4"
+  resolved "https://registry.yarnpkg.com/@serialport/parser-readline/-/parser-readline-9.2.4.tgz#15a4ec7e86ddc33ac84faac7bffd4560e4544ccb"
+  integrity sha512-Z1/qrZTQUVhNSJP1hd9YfDvq0o7d87rNwAjjRKbVpa7Qi51tG5BnKt43IV3NFMyBlVcRe0rnIb3tJu57E0SOwg==
   dependencies:
-    "@serialport/parser-delimiter" "^9.0.7"
+    "@serialport/parser-delimiter" "9.2.4"
 
-"@serialport/parser-ready@9.0.7":
-  version "9.0.7"
-  resolved "https://registry.yarnpkg.com/@serialport/parser-ready/-/parser-ready-9.0.7.tgz#d9eb9801c6003fdb1450c557f3e256a188a9f3be"
-  integrity sha512-3qYhI4cNUPAYqVYvdwV57Y+PVRl4dJf1fPBtMoWtwDgwopsAXTR93WCs49WuUq9JCyNW+8Hrfqv8x8eNAD5Dqg==
+"@serialport/parser-ready@9.2.4":
+  version "9.2.4"
+  resolved "https://registry.yarnpkg.com/@serialport/parser-ready/-/parser-ready-9.2.4.tgz#e1fc93b9e3057972104db3f9311263397f420f25"
+  integrity sha512-Pyi94Itjl6qAURwIZr/gmZpMAyTmKXThm6vL5DoAWGQjcRHWB0gwv2TY2v7N+mQLJYUKU3cMnvnATXxHm7xjxw==
 
-"@serialport/parser-regex@9.0.7":
-  version "9.0.7"
-  resolved "https://registry.yarnpkg.com/@serialport/parser-regex/-/parser-regex-9.0.7.tgz#d8a02e3a169faa2f6604e8293832cc676b865f48"
-  integrity sha512-5XF+FXbhqQ/5bVKM4NaGs1m+E9KjfmeCx/obwsKaUZognQF67jwoTfjJJWNP/21jKfxdl8XoCYjZjASl3XKRAw==
+"@serialport/parser-regex@9.2.4":
+  version "9.2.4"
+  resolved "https://registry.yarnpkg.com/@serialport/parser-regex/-/parser-regex-9.2.4.tgz#e232a84e00f3e8c366fc65ce20f8f4ac14960448"
+  integrity sha512-sI/cVvPOYz+Dbv4ZdnW16qAwvXiFf/1pGASQdbveRTlgJDdz7sRNlCBifzfTN2xljwvCTZYqiudKvDdC1TepRQ==
 
-"@serialport/stream@9.0.7":
-  version "9.0.7"
-  resolved "https://registry.yarnpkg.com/@serialport/stream/-/stream-9.0.7.tgz#0bf023eb0233a714fcc5a86de09e381e466d9882"
-  integrity sha512-c/h7HPAeFiryD9iTGlaSvPqHFHSZ0NMQHxC4rcmKS2Vu3qJuEtkBdTLABwsMp7iWEiSnI4KC3s7bHapaXP06FQ==
+"@serialport/stream@9.2.4":
+  version "9.2.4"
+  resolved "https://registry.yarnpkg.com/@serialport/stream/-/stream-9.2.4.tgz#9fce093d0b46ed4599953b4fae81718e050d2b33"
+  integrity sha512-bLye8Ub4vUFQGmkh8qEqehr7SE7EJs2yDs0h9jzuL5oKi+F34CFmWkEErO8GAOQ8YNn7p6b3GxUgs+0BrHHDZQ==
   dependencies:
-    debug "^4.3.1"
+    debug "^4.3.2"
 
 "@tabby-gang/node-pty@^0.11.0-beta.200":
   version "0.11.0-beta.200"
@@ -699,7 +699,7 @@ debug@^3.1.0:
   dependencies:
     ms "^2.1.1"
 
-debug@^4.0.1, debug@^4.3.1, debug@^4.3.2:
+debug@^4.0.1, debug@^4.3.2:
   version "4.3.2"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b"
   integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==
@@ -1112,7 +1112,7 @@ fs-extra@^10.0.0:
     jsonfile "^6.0.1"
     universalify "^2.0.0"
 
-fs-minipass@^1.2.5:
+fs-minipass@^1.2.7:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7"
   integrity sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==
@@ -2022,7 +2022,7 @@ minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5:
   resolved "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz"
   integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
 
-minipass@^2.3.5, minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0:
+minipass@^2.3.5, minipass@^2.6.0, minipass@^2.9.0:
   version "2.9.0"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6"
   integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==
@@ -2030,7 +2030,7 @@ minipass@^2.3.5, minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0:
     safe-buffer "^5.1.2"
     yallist "^3.0.0"
 
-minizlib@^1.2.1:
+minizlib@^1.3.3:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d"
   integrity sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==
@@ -2058,7 +2058,7 @@ mkdirp-classic@^0.5.2, mkdirp-classic@^0.5.3:
   resolved "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz"
   integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==
 
-mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.5, mkdirp@~0.5.0:
+mkdirp@^0.5.1, mkdirp@^0.5.5, mkdirp@~0.5.0:
   version "0.5.5"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
   integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
@@ -2106,11 +2106,16 @@ mz@^2.7.0:
     object-assign "^4.0.1"
     thenify-all "^1.0.0"
 
-nan@^2.13.2, nan@^2.14.0, nan@^2.14.2:
+nan@^2.13.2, nan@^2.14.0:
   version "2.14.2"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.2.tgz#f5376400695168f4cc694ac9393d0c9585eeea19"
   integrity sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==
 
+nan@^2.15.0:
+  version "2.15.0"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.15.0.tgz#3f34a473ff18e15c1b5626b62903b5ad6e665fee"
+  integrity sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ==
+
 napi-build-utils@^1.0.1:
   version "1.0.2"
   resolved "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.2.tgz"
@@ -2131,17 +2136,17 @@ ngx-filesize@^2.0.16:
     filesize ">= 4.0.0"
     tslib "^2.0.0"
 
-node-abi@^2.20.0, node-abi@^2.7.0:
-  version "2.30.0"
-  resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.30.0.tgz#8be53bf3e7945a34eea10e0fc9a5982776cf550b"
-  integrity sha512-g6bZh3YCKQRdwuO/tSZZYJAw622SjsRfJ2X0Iy4sSOHZ34/sPPdVBn8fev2tj7njzLwuqPw9uMtGsGkO5kIQvg==
+node-abi@^2.20.0, node-abi@^2.21.0, node-abi@^2.7.0:
+  version "2.30.1"
+  resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.30.1.tgz#c437d4b1fe0e285aaf290d45b45d4d7afedac4cf"
+  integrity sha512-/2D0wOQPgaUWzVSVgRMx+trKJRC2UG4SUc4oCJoXx9Uxjtp0Vy3/kt7zcbxHF8+Z/pK3UloLWzBISg72brfy1w==
   dependencies:
     semver "^5.4.1"
 
-node-abi@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.1.0.tgz#9560f38fbe2309e87c61f4f103c9d95e0f961c32"
-  integrity sha512-kVF+eIDzPPwPcJdoVhWboJvdCe+YF1+rkd7+LeYmA95179T0sVB5kKG8VADM/3sBnGWeAUBR8FzH+whlksJTrQ==
+node-abi@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.3.0.tgz#62cc0d9c7976bd415889aba622ab8f5562082028"
+  integrity sha512-/+2sCVPXmj07GY/l0ggRr7+trqzX7F9d4QVfSArqIVYmRzc/LkXKr5FlRO6U8uZ/gVVclDDaBxBNITj1z1Z/Zw==
   dependencies:
     semver "^7.3.5"
 
@@ -2705,7 +2710,7 @@ pkg-up@^2.0.0:
   dependencies:
     find-up "^2.1.0"
 
-prebuild-install@^6.0.0, prebuild-install@^6.0.1:
+prebuild-install@^6.0.0:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-6.0.1.tgz#5902172f7a40eb67305b96c2a695db32636ee26d"
   integrity sha512-7GOJrLuow8yeiyv75rmvZyeMGzl8mdEX5gY69d6a6bHWmiPevwqFw+tQavhK0EYMaSg3/KD24cWqeQv1EWsqDQ==
@@ -2726,6 +2731,25 @@ prebuild-install@^6.0.0, prebuild-install@^6.0.1:
     tunnel-agent "^0.6.0"
     which-pm-runs "^1.0.0"
 
+prebuild-install@^6.1.4:
+  version "6.1.4"
+  resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-6.1.4.tgz#ae3c0142ad611d58570b89af4986088a4937e00f"
+  integrity sha512-Z4vpywnK1lBg+zdPCVCsKq0xO66eEV9rWo2zrROGGiRS4JtueBOdlB1FnY8lcy7JsUud/Q3ijUxyWN26Ika0vQ==
+  dependencies:
+    detect-libc "^1.0.3"
+    expand-template "^2.0.3"
+    github-from-package "0.0.0"
+    minimist "^1.2.3"
+    mkdirp-classic "^0.5.3"
+    napi-build-utils "^1.0.1"
+    node-abi "^2.21.0"
+    npmlog "^4.0.1"
+    pump "^3.0.0"
+    rc "^1.2.7"
+    simple-get "^3.0.3"
+    tar-fs "^2.0.0"
+    tunnel-agent "^0.6.0"
+
 prepend-http@^1.0.1:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
@@ -3046,14 +3070,14 @@ run-queue@^1.0.0, run-queue@^1.0.3:
   dependencies:
     aproba "^1.1.1"
 
-rxjs@^7.2.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.2.0.tgz#5cd12409639e9514a71c9f5f9192b2c4ae94de31"
-  integrity sha512-aX8w9OpKrQmiPKfT1bqETtUr9JygIz6GZ+gql8v7CijClsP0laoFUdKzxFAoWuRdSlOdU2+crss+cMf+cqMTnw==
+rxjs@^7.4.0:
+  version "7.4.0"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.4.0.tgz#a12a44d7eebf016f5ff2441b87f28c9a51cebc68"
+  integrity sha512-7SQDi7xeTMCJpqViXh8gL/lebcwlp3d831F05+9B44A4B0WfsEwUQHR64gsH1kvJ+Ep/J9K2+n1hVl1CsGN23w==
   dependencies:
     tslib "~2.1.0"
 
-safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0:
+safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@^5.2.1:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
@@ -3099,22 +3123,22 @@ serialize-error@^5.0.0:
   dependencies:
     type-fest "^0.8.0"
 
-serialport@^9.2.1:
-  version "9.2.1"
-  resolved "https://registry.yarnpkg.com/serialport/-/serialport-9.2.1.tgz#9da02f6657ee9e2c8bd7642ff6c5c59a6a65d17e"
-  integrity sha512-zX18SVSNRZvMrkxNvSnhqqag46MLQH517EaLSVv8PKSVnTFMzemRCfBdXbOY2XhtUqzpQq6ep2mR1t+AMhJssg==
+serialport@^9.2.5:
+  version "9.2.5"
+  resolved "https://registry.yarnpkg.com/serialport/-/serialport-9.2.5.tgz#23e81588336e844e8d7071742a00f501eec9f2b1"
+  integrity sha512-nsDsD2GN/43T2a8jQYr1HH76gmDZ575Ts8FOdcBRUY8ecaI16BPbXa612cPPkQjOfg28+KL5qtQL9c0vvTaidg==
   dependencies:
-    "@serialport/binding-mock" "9.0.7"
-    "@serialport/bindings" "9.2.1"
-    "@serialport/parser-byte-length" "9.0.7"
-    "@serialport/parser-cctalk" "9.0.7"
-    "@serialport/parser-delimiter" "9.0.7"
-    "@serialport/parser-inter-byte-timeout" "9.0.7"
-    "@serialport/parser-readline" "9.0.7"
-    "@serialport/parser-ready" "9.0.7"
-    "@serialport/parser-regex" "9.0.7"
-    "@serialport/stream" "9.0.7"
-    debug "^4.3.1"
+    "@serialport/binding-mock" "9.2.4"
+    "@serialport/bindings" "9.2.5"
+    "@serialport/parser-byte-length" "9.2.4"
+    "@serialport/parser-cctalk" "9.2.4"
+    "@serialport/parser-delimiter" "9.2.4"
+    "@serialport/parser-inter-byte-timeout" "9.2.4"
+    "@serialport/parser-readline" "9.2.4"
+    "@serialport/parser-ready" "9.2.4"
+    "@serialport/parser-regex" "9.2.4"
+    "@serialport/stream" "9.2.4"
+    debug "^4.3.2"
 
 set-blocking@^2.0.0, set-blocking@~2.0.0:
   version "2.0.0"
@@ -3430,17 +3454,17 @@ tar-stream@^2.1.4:
     readable-stream "^3.1.1"
 
 tar@^4.4.10, tar@^4.4.12, tar@^4.4.13:
-  version "4.4.13"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525"
-  integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==
+  version "4.4.19"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.19.tgz#2e4d7263df26f2b914dee10c825ab132123742f3"
+  integrity sha512-a20gEsvHnWe0ygBY8JbxoM4w3SJdhc7ZAuxkLqh+nvNQN2IOt0B5lLgM490X5Hl8FF0dl0tOf2ewFYAlIFgzVA==
   dependencies:
-    chownr "^1.1.1"
-    fs-minipass "^1.2.5"
-    minipass "^2.8.6"
-    minizlib "^1.2.1"
-    mkdirp "^0.5.0"
-    safe-buffer "^5.1.2"
-    yallist "^3.0.3"
+    chownr "^1.1.4"
+    fs-minipass "^1.2.7"
+    minipass "^2.9.0"
+    minizlib "^1.3.3"
+    mkdirp "^0.5.5"
+    safe-buffer "^5.2.1"
+    yallist "^3.1.1"
 
 term-size@^1.2.0:
   version "1.2.0"
@@ -3708,10 +3732,10 @@ windows-native-registry@^3.1.0:
   dependencies:
     node-addon-api "^3.1.0"
 
-windows-process-tree@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/windows-process-tree/-/windows-process-tree-0.3.0.tgz#cf0d9291b22fba2a7f5a687c8272866e28fbcafd"
-  integrity sha512-0bKI4gcd5MOsOpn2TdStCSlnjThtH6BdHrocekY9qCgTqgEtdaUs0B5BaqyzF9jXoTSwz38NMdE1F55o4fgv9Q==
+windows-process-tree@^0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/windows-process-tree/-/windows-process-tree-0.3.2.tgz#8c39f39e7707e09fd74638a7ef644b5f389096d3"
+  integrity sha512-x8Y4KOV8tUhhPiO0TH7wOMTZ677rw7VEwq+dTuHHiLTClkrNXWSY3XzP6ez3fs2Cab4FajrtmiqRs0jTMZHfyw==
   dependencies:
     nan "^2.13.2"
 
@@ -3799,7 +3823,7 @@ yallist@^2.1.2:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
   integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
 
-yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3:
+yallist@^3.0.0, yallist@^3.0.2, yallist@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
   integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==
@@ -3846,10 +3870,10 @@ yargs@^14.2.3:
     y18n "^4.0.0"
     yargs-parser "^15.0.1"
 
-yargs@^17.1.0:
-  version "17.1.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.1.0.tgz#0cd9827a0572c9a1795361c4d1530e53ada168cf"
-  integrity sha512-SQr7qqmQ2sNijjJGHL4u7t8vyDZdZ3Ahkmo4sc1w5xI9TBX0QDdG/g4SFnxtWOsGLjwHQue57eFALfwFCnixgg==
+yargs@^17.2.1:
+  version "17.2.1"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.2.1.tgz#e2c95b9796a0e1f7f3bf4427863b42e0418191ea"
+  integrity sha512-XfR8du6ua4K6uLGm5S6fA+FIJom/MdJcFNVY8geLlp2v8GYbOXD4EB1tPNZsRn4vBzKGMgb5DRZMeWuFc2GO8Q==
   dependencies:
     cliui "^7.0.2"
     escalade "^3.1.1"

firebase.json

@@ -0,0 +1,10 @@
+{
+  "hosting": {
+    "public": "docs/api",
+    "ignore": [
+      "firebase.json",
+      "**/.*",
+      "**/node_modules/**"
+    ]
+  }
+}

package.json

@@ -7,32 +7,31 @@
     "@angular/forms": "^12.0.0",
     "@angular/platform-browser": "^12.0.0",
     "@angular/platform-browser-dynamic": "^12.0.0",
-    "@fortawesome/fontawesome-free": "^5.15.4",
+    "@fortawesome/fontawesome-free": "^6.0.0-beta.2",
     "@ng-bootstrap/ng-bootstrap": "^10.0.0",
-    "@sentry/cli": "^1.67.2",
+    "@sentry/cli": "^1.71.0",
     "@sentry/electron": "^2.5.4",
     "@tabby-gang/to-string-loader": "^1.1.7-beta.2",
-    "@types/electron-config": "^3.2.2",
     "@types/deep-equal": "1.0.1",
-    "deep-equal": "2.0.5",
+    "@types/electron-config": "^3.2.2",
     "@types/electron-debug": "^2.1.0",
     "@types/fs-extra": "^9.0.12",
-    "utils-decorators": "^1.8.3",
-    "@types/js-yaml": "^4.0.2",
+    "@types/js-yaml": "^4.0.4",
     "@types/node": "16.0.1",
     "@types/sortablejs": "^1.10.7",
     "@types/webpack-env": "^1.16.2",
-    "@typescript-eslint/eslint-plugin": "^4.31.1",
-    "@typescript-eslint/parser": "^4.28.5",
+    "@typescript-eslint/eslint-plugin": "^4.33.0",
+    "@typescript-eslint/parser": "^4.33.0",
     "apply-loader": "2.0.0",
     "axios": "^0.21.1",
     "clone-deep": "^4.0.1",
     "compare-versions": "^3.6.0",
-    "core-js": "^3.15.2",
+    "core-js": "^3.18.2",
     "cross-env": "7.0.3",
-    "css-loader": "^6.2.0",
-    "electron": "13.2.2",
-    "electron-builder": "22.10.5",
+    "css-loader": "^6.5.1",
+    "deep-equal": "2.0.5",
+    "electron": "13.5.1",
+    "electron-builder": "^22.11.7",
     "electron-download": "^4.1.1",
     "electron-installer-snap": "^5.1.0",
     "electron-notarize": "^1.1.1",
@@ -46,9 +45,9 @@
     "macos-release": "^3.0.1",
     "ngx-sortablejs": "^11.1.0",
     "ngx-toastr": "^14.0.0",
-    "node-abi": "^3.1.0",
+    "node-abi": "^3.2.0",
     "node-sass": "^6.0.1",
-    "npmlog": "5.0.0",
+    "npmlog": "5.0.1",
     "npx": "^10.2.2",
     "patch-package": "^6.4.7",
     "pug": "^3.0.2",
@@ -57,25 +56,26 @@
     "pug-loader": "^2.4.0",
     "pug-static-loader": "2.0.0",
     "raw-loader": "4.0.2",
-    "sass-loader": "^12.1.0",
+    "sass-loader": "^12.3.0",
     "shell-quote": "^1.7.2",
     "shelljs": "0.8.4",
-    "slugify": "^1.6.0",
+    "slugify": "^1.6.1",
     "sortablejs": "^1.14.0",
     "source-code-pro": "^2.38.0",
     "source-map-loader": "^3.0.0",
     "source-sans-pro": "3.6.0",
-    "ssh2": "^1.4.0",
+    "ssh2": "^1.5.0",
     "style-loader": "^3.2.1",
     "svg-inline-loader": "^0.8.2",
     "ts-loader": "^9.2.3",
     "tslib": "^2.3.1",
-    "typedoc": "^0.22.3",
+    "typedoc": "^0.22.7",
     "typescript": "^4.3.5",
+    "utils-decorators": "^1.10.4",
     "val-loader": "4.0.0",
-    "webpack": "^5.52.1",
-    "webpack-bundle-analyzer": "^4.4.2",
-    "webpack-cli": "^4.8.0",
+    "webpack": "^5.61.0",
+    "webpack-bundle-analyzer": "^4.5.0",
+    "webpack-cli": "^4.9.1",
     "yaml-loader": "0.6.0",
     "zone.js": "^0.11.4"
   },
@@ -91,7 +91,7 @@
     "start": "cross-env TABBY_DEV=1 electron app --debug --inspect",
     "start:prod": "electron app --debug",
     "prod": "cross-env TABBY_DEV=1 electron app",
-    "docs": "typedoc --emit --out docs/api --tsconfig tabby-core/src/tsconfig.typings.json tabby-core/src/index.ts && typedoc --emit --out docs/api/terminal --tsconfig tabby-terminal/tsconfig.typings.json tabby-terminal/src/index.ts && typedoc --emit --out docs/api/local --tsconfig tabby-local/tsconfig.typings.json tabby-local/src/index.ts && typedoc --emit --out docs/api/settings --tsconfig tabby-settings/tsconfig.typings.json tabby-settings/src/index.ts",
+    "docs": "typedoc --out docs/api --tsconfig tabby-core/tsconfig.typings.json tabby-core/src/index.ts && typedoc --out docs/api/terminal --tsconfig tabby-terminal/tsconfig.typings.json tabby-terminal/src/index.ts && typedoc --out docs/api/local --tsconfig tabby-local/tsconfig.typings.json tabby-local/src/index.ts && typedoc --out docs/api/settings --tsconfig tabby-settings/tsconfig.typings.json tabby-settings/src/index.ts",
     "lint": "eslint --ext ts */src */lib",
     "postinstall": "node ./scripts/install-deps.js",
     "patch": "patch-package; cd web; patch-package"

patches/app-builder-lib+22.10.5.patch

@@ -1,13 +0,0 @@
-diff --git a/node_modules/app-builder-lib/out/appInfo.js b/node_modules/app-builder-lib/out/appInfo.js
-index 25a159e..bfe0590 100644
---- a/node_modules/app-builder-lib/out/appInfo.js
-+++ b/node_modules/app-builder-lib/out/appInfo.js
-@@ -165,7 +165,7 @@ class AppInfo {
-   get linuxPackageName() {
-     const name = this.name; // https://github.com/electron-userland/electron-builder/issues/2963
- 
--    return name.startsWith("@") ? this.sanitizedProductName : name;
-+    return 'tabby-terminal';
-   }
- 
-   get sanitizedName() {

patches/app-builder-lib+22.11.7.patch

@@ -0,0 +1,15 @@
+diff --git a/node_modules/app-builder-lib/out/appInfo.js b/node_modules/app-builder-lib/out/appInfo.js
+index f241acc..2bddb7f 100644
+--- a/node_modules/app-builder-lib/out/appInfo.js
++++ b/node_modules/app-builder-lib/out/appInfo.js
+@@ -100,9 +100,7 @@ class AppInfo {
+         return this.info.metadata.name;
+     }
+     get linuxPackageName() {
+-        const name = this.name;
+-        // https://github.com/electron-userland/electron-builder/issues/2963
+-        return name.startsWith("@") ? this.sanitizedProductName : name;
++        return 'tabby-terminal'
+     }
+     get sanitizedName() {
+         return sanitizeFileName_1.sanitizeFileName(this.name);

scripts/install-deps.js

@@ -18,6 +18,7 @@ sh.cd('..')
 
 sh.cd('web')
 sh.exec(`${npx} yarn install --force`)
+sh.exec(`${npx} patch-package`)
 sh.cd('..')
 
 vars.allPackages.forEach(plugin => {

tabby-community-color-schemes/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tabby-community-color-schemes",
-  "version": "1.0.156",
+  "version": "1.0.163",
   "description": "Community color schemes for Tabby",
   "keywords": [
     "tabby-builtin-plugin"

tabby-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tabby-core",
-  "version": "1.0.156",
+  "version": "1.0.163",
   "description": "Tabby core",
   "keywords": [
     "tabby-builtin-plugin"
@@ -17,7 +17,6 @@
   "author": "Eugene Pankov",
   "license": "MIT",
   "devDependencies": {
-    "@types/js-yaml": "^4.0.0",
     "bootstrap": "^4.1.3",
     "deepmerge": "^4.1.1",
     "electron-updater": "^4.0.6",

tabby-core/src/api/index.ts

@@ -1,7 +1,7 @@
 export { BaseComponent, SubscriptionContainer } from '../components/base.component'
 export { BaseTabComponent, BaseTabProcess } from '../components/baseTab.component'
 export { TabHeaderComponent } from '../components/tabHeader.component'
-export { SplitTabComponent, SplitContainer } from '../components/splitTab.component'
+export { SplitTabComponent, SplitContainer, SplitDirection, SplitOrientation } from '../components/splitTab.component'
 export { TabRecoveryProvider, RecoveryToken } from './tabRecovery'
 export { ToolbarButtonProvider, ToolbarButton } from './toolbarButtonProvider'
 export { ConfigProvider } from './configProvider'
@@ -30,8 +30,9 @@ export { NotificationsService } from '../services/notifications.service'
 export { ThemesService } from '../services/themes.service'
 export { ProfilesService } from '../services/profiles.service'
 export { SelectorService } from '../services/selector.service'
+export { TabRecoveryService } from '../services/tabRecovery.service'
 export { TabsService, NewTabParameters, TabComponentType } from '../services/tabs.service'
 export { UpdaterService } from '../services/updater.service'
-export { VaultService, Vault, VaultSecret, VaultFileSecret, VAULT_SECRET_TYPE_FILE } from '../services/vault.service'
+export { VaultService, Vault, VaultSecret, VaultFileSecret, VAULT_SECRET_TYPE_FILE, StoredVault, VaultSecretKey } from '../services/vault.service'
 export { FileProvidersService } from '../services/fileProviders.service'
 export * from '../utils'

tabby-core/src/api/platform.ts

@@ -48,6 +48,9 @@ export abstract class FileTransfer {
     }
 
     protected increaseProgress (bytes: number): void {
+        if (!bytes) {
+            return
+        }
         this.completedBytes += bytes
         this.lastChunkSpeed = bytes * 1000 / (Date.now() - this.lastChunkStartTime)
         this.lastChunkStartTime = Date.now()

tabby-core/src/buttonProvider.ts

@@ -35,7 +35,7 @@ export class ButtonProvider extends ToolbarButtonProvider {
                 icon: this.hostApp.platform === Platform.Web
                     ? require('./icons/plus.svg')
                     : require('./icons/profiles.svg'),
-                title: 'New tab with profile',
+                title: 'Profiles and connections',
                 click: () => this.activate(),
             },
             ...this.profilesService.getRecentProfiles().map(profile => ({

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

@@ -1,5 +1,6 @@
 title-bar(
   *ngIf='ready && !hostWindow.isFullscreen && config.store.appearance.frame == "full" && config.store.appearance.dock == "off"',
+  (dblclick)='hostWindow.toggleMaximize()',
   [class.inset]='hostApp.platform == Platform.macOS && !hostWindow.isFullscreen'
 )
 
@@ -8,7 +9,7 @@ title-bar(
     [class.tabs-on-top]='config.store.appearance.tabsLocation == "top" || config.store.appearance.tabsLocation == "left"',
     [class.tabs-on-side]='hasVerticalTabs()',
 )
-    .tab-bar
+    .tab-bar((dblclick)='hostWindow.toggleMaximize()')
         .inset.background(*ngIf='hostApp.platform == Platform.macOS \
         && !hostWindow.isFullscreen \
         && config.store.appearance.frame == "thin" \
@@ -56,15 +57,20 @@ title-bar(
                         div([class.ml-3]='hasIcons(button.submenuItems)') {{item.title}}
 
             .d-flex(
-                *ngIf='activeTransfers.length > 0',
                 ngbDropdown,
-                [(open)]='activeTransfersDropdownOpen'
+                container='body',
+                #activeTransfersDropdown='ngbDropdown'
             )
                 button.btn.btn-secondary.btn-tab-bar(
+                    *ngIf='activeTransfers.length > 0',
                     title='File transfers',
                     ngbDropdownToggle
-                ) !{require('../icons/download-solid.svg')}
-                transfers-menu(ngbDropdownMenu, [(transfers)]='activeTransfers')
+                ) !{require('../icons/transfers.svg')}
+                transfers-menu(
+                    ngbDropdownMenu,
+                    [(transfers)]='activeTransfers',
+                    (transfersChange)='onTransfersChange()'
+                )
 
         .drag-space.background([class.persistent]='config.store.appearance.frame == "thin" && hostApp.platform != Platform.macOS')
 

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

@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
-import { Component, Inject, Input, HostListener, HostBinding, ViewChildren } from '@angular/core'
+import { Component, Inject, Input, HostListener, HostBinding, ViewChildren, ViewChild } from '@angular/core'
 import { trigger, style, animate, transition, state } from '@angular/animations'
-import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
+import { NgbDropdown, NgbModal } from '@ng-bootstrap/ng-bootstrap'
 import { CdkDragDrop, moveItemInArray } from '@angular/cdk/drag-drop'
 
 import { HostAppService, Platform } from '../api/hostApp'
@@ -60,10 +60,10 @@ export class AppRootComponent {
     @HostBinding('class.platform-linux') platformClassLinux = process.platform === 'linux'
     @HostBinding('class.no-tabs') noTabs = true
     @ViewChildren(TabBodyComponent) tabBodies: TabBodyComponent[]
+    @ViewChild('activeTransfersDropdown') activeTransfersDropdown: NgbDropdown
     unsortedTabs: BaseTabComponent[] = []
     updatesAvailable = false
     activeTransfers: FileTransfer[] = []
-    activeTransfersDropdownOpen = false
     private logger: Logger
 
     constructor (
@@ -111,6 +111,9 @@ export class AppRootComponent {
                 if (hotkey === 'reopen-tab') {
                     this.app.reopenLastTab()
                 }
+                if (hotkey === 'duplicate-tab') {
+                    this.app.duplicateTab(this.app.activeTab)
+                }
             }
             if (hotkey === 'toggle-fullscreen') {
                 hostWindow.toggleFullscreen()
@@ -144,7 +147,7 @@ export class AppRootComponent {
 
         platform.fileTransferStarted$.subscribe(transfer => {
             this.activeTransfers.push(transfer)
-            this.activeTransfersDropdownOpen = true
+            this.activeTransfersDropdown.open()
         })
 
         config.ready$.toPromise().then(() => {
@@ -197,6 +200,12 @@ export class AppRootComponent {
         this.app.emitTabsChanged()
     }
 
+    onTransfersChange () {
+        if (this.activeTransfers.length === 0) {
+            this.activeTransfersDropdown.close()
+        }
+    }
+
     private getToolbarButtons (aboveZero: boolean): ToolbarButton[] {
         let buttons: ToolbarButton[] = []
         this.config.enabledServices(this.toolbarButtonProviders).forEach(provider => {

tabby-core/src/components/selectorModal.component.ts

@@ -29,9 +29,11 @@ export class SelectorModalComponent<T> {
     @HostListener('keyup', ['$event']) onKeyUp (event: KeyboardEvent): void {
         if (event.key === 'ArrowUp') {
             this.selectedIndex--
+            event.preventDefault()
         }
         if (event.key === 'ArrowDown') {
             this.selectedIndex++
+            event.preventDefault()
         }
         if (event.key === 'Enter') {
             this.selectOption(this.filteredOptions[this.selectedIndex])

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

@@ -88,8 +88,9 @@ export class TabHeaderComponent extends BaseComponent {
         return this.config.store.appearance.flexTabs
     }
 
-    @HostListener('dblclick') onDoubleClick (): void {
+    @HostListener('dblclick', ['$event']) onDoubleClick ($event: MouseEvent): void {
         this.showRenameTabModal()
+        $event.stopPropagation()
     }
 
     @HostListener('mousedown', ['$event']) async onMouseDown ($event: MouseEvent) {

tabby-core/src/components/transfersMenu.component.scss

@@ -51,3 +51,7 @@
 button {
     flex: none;
 }
+
+svg {
+    height: 14px;
+}

tabby-core/src/components/unlockVaultModal.component.pug

@@ -3,7 +3,7 @@
         h3.m-0 Vault is locked
         .ml-auto(ngbDropdown, placement='bottom-right')
             button.btn.btn-link(ngbDropdownToggle, (click)='$event.stopPropagation()')
-                span(*ngIf='rememberFor') Remember for {{rememberFor}} min
+                span(*ngIf='rememberFor') Remember for {{getRememberForDisplay(rememberFor)}}
                 span(*ngIf='!rememberFor') Do not remember
             div(ngbDropdownMenu)
                 button.dropdown-item(
@@ -12,7 +12,7 @@
                 button.dropdown-item(
                     *ngFor='let x of rememberOptions',
                     (click)='rememberFor = x',
-                ) {{x}} min
+                ) {{getRememberForDisplay(x)}}
 
     .input-group
         input.form-control.form-control-lg(

tabby-core/src/components/unlockVaultModal.component.ts

@@ -8,7 +8,7 @@ import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'
 export class UnlockVaultModalComponent {
     passphrase: string
     rememberFor = 1
-    rememberOptions = [1, 5, 15, 60]
+    rememberOptions = [1, 5, 15, 60, 1440, 10080]
     @ViewChild('input') input: ElementRef
 
     constructor (
@@ -33,4 +33,14 @@ export class UnlockVaultModalComponent {
     cancel (): void {
         this.modalInstance.close(null)
     }
+
+    getRememberForDisplay (rememberOption: number): string {
+        if (rememberOption >= 1440) {
+            return `${Math.round(rememberOption/1440*10)/10} day`
+        } else if (rememberOption >= 60) {
+            return `${Math.round(rememberOption/60*10)/10} hour`
+        } else {
+            return `${rememberOption} min`
+        }
+    }
 }

tabby-core/src/components/windowControls.component.scss

@@ -13,6 +13,7 @@ button {
     line-height: 0;
     text-align: center;
     align-items: center;
+    justify-content: center;
     
     &:not(:hover):not(:active) {
         background: transparent;
@@ -21,4 +22,9 @@ button {
     &:focus {
         box-shadow: none;
     }
+
+    svg {
+        width: 10px;
+        height: 10px;
+    }
 }

tabby-core/src/configDefaults.linux.yaml

@@ -20,6 +20,7 @@ hotkeys:
     - 'Ctrl-Shift-PageDown'
   rearrange-panes:
     - 'Ctrl-Shift'
+  duplicate-tab: []
   tab-1:
     - 'Alt-1'
   tab-2:

tabby-core/src/configDefaults.macos.yaml

@@ -38,6 +38,7 @@ hotkeys:
     - '⌘-9'
   tab-10:
     - '⌘-0'
+  duplicate-tab: []
   tab-11: []
   tab-12: []
   tab-13: []

tabby-core/src/configDefaults.windows.yaml

@@ -21,6 +21,7 @@ hotkeys:
     - 'Ctrl-Shift-PageDown'
   rearrange-panes:
     - 'Ctrl-Shift'
+  duplicate-tab: []
   tab-1:
     - 'Alt-1'
   tab-2:

tabby-core/src/hotkeys.ts

@@ -51,6 +51,10 @@ export class AppHotkeyProvider extends HotkeyProvider {
             id: 'rearrange-panes',
             name: 'Show pane labels (for rearranging)',
         },
+        {
+            id: 'duplicate-tab',
+            name: 'Duplicate tab',
+        },
         {
             id: 'tab-1',
             name: 'Tab 1',

tabby-core/src/icons/download-solid.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M216 0h80c13.3 0 24 10.7 24 24v168h87.7c17.8 0 26.7 21.5 14.1 34.1L269.7 378.3c-7.5 7.5-19.8 7.5-27.3 0L90.1 226.1c-12.6-12.6-3.7-34.1 14.1-34.1H192V24c0-13.3 10.7-24 24-24zm296 376v112c0 13.3-10.7 24-24 24H24c-13.3 0-24-10.7-24-24V376c0-13.3 10.7-24 24-24h146.7l49 49c20.1 20.1 52.5 20.1 72.6 0l49-49H488c13.3 0 24 10.7 24 24zm-124 88c0-11-9-20-20-20s-20 9-20 20 9 20 20 20 20-9 20-20zm64 0c0-11-9-20-20-20s-20 9-20 20 9 20 20 20 20-9 20-20z"></path></svg>

tabby-core/src/icons/download.svg

@@ -1 +1 @@
-<svg aria-hidden="true" focusable="false" data-prefix="fad" data-icon="download" class="svg-inline--fa fa-download fa-w-16" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><g class="fa-group"><path class="fa-secondary" fill="currentColor" d="M320 24v168h87.7c17.8 0 26.7 21.5 14.1 34.1L269.7 378.3a19.37 19.37 0 0 1-27.3 0L90.1 226.1c-12.6-12.6-3.7-34.1 14.1-34.1H192V24a23.94 23.94 0 0 1 24-24h80a23.94 23.94 0 0 1 24 24z" opacity="0.4"></path><path class="fa-primary" fill="currentColor" d="M488 352H341.3l-49 49a51.24 51.24 0 0 1-72.6 0l-49-49H24a23.94 23.94 0 0 0-24 24v112a23.94 23.94 0 0 0 24 24h464a23.94 23.94 0 0 0 24-24V376a23.94 23.94 0 0 0-24-24zm-120 96a16 16 0 1 1 16-16 16 16 0 0 1-16 16zm64 0a16 16 0 1 1 16-16 16 16 0 0 1-16 16z"></path></g></svg>
+<svg aria-hidden="true" focusable="false" data-prefix="fal" data-icon="arrow-down-to-square" class="svg-inline--fa fa-arrow-down-to-square" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path fill="currentColor" d="M432 128h-64C359.2 128 352 135.2 352 144S359.2 160 368 160h64C440.8 160 448 167.2 448 176v288c0 8.812-7.188 16-16 16h-352C71.19 480 64 472.8 64 464v-288C64 167.2 71.19 160 80 160h64C152.8 160 160 152.8 160 144S152.8 128 144 128h-64C53.53 128 32 149.5 32 176v288C32 490.5 53.53 512 80 512h352c26.47 0 48-21.53 48-48v-288C480 149.5 458.5 128 432 128zM148.7 260.7c-6.25 6.25-6.25 16.38 0 22.62l96 96C247.8 382.4 251.9 384 256 384s8.188-1.562 11.31-4.688l96-96c6.25-6.25 6.25-16.38 0-22.62s-16.38-6.25-22.62 0L272 329.4V16C272 7.156 264.8 0 256 0S240 7.156 240 16v313.4L171.3 260.7C165.1 254.4 154.9 254.4 148.7 260.7z"></path></svg>

tabby-core/src/icons/history.svg

@@ -1 +1 @@
-<svg aria-hidden="true" focusable="false" data-prefix="far" data-icon="history" class="svg-inline--fa fa-history fa-w-16" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path fill="#fff" d="M504 255.532c.252 136.64-111.182 248.372-247.822 248.468-64.014.045-122.373-24.163-166.394-63.942-5.097-4.606-5.3-12.543-.443-17.4l16.96-16.96c4.529-4.529 11.776-4.659 16.555-.395C158.208 436.843 204.848 456 256 456c110.549 0 200-89.468 200-200 0-110.549-89.468-200-200-200-55.52 0-105.708 22.574-141.923 59.043l49.091 48.413c7.641 7.535 2.305 20.544-8.426 20.544H26.412c-6.627 0-12-5.373-12-12V45.443c0-10.651 12.843-16.023 20.426-8.544l45.097 44.474C124.866 36.067 187.15 8 256 8c136.811 0 247.747 110.781 248 247.532zm-167.058 90.173l14.116-19.409c3.898-5.36 2.713-12.865-2.647-16.763L280 259.778V116c0-6.627-5.373-12-12-12h-24c-6.627 0-12 5.373-12 12v168.222l88.179 64.13c5.36 3.897 12.865 2.712 16.763-2.647z"></path></svg>
+<svg aria-hidden="true" focusable="false" data-prefix="fal" data-icon="clock-rotate-left" class="svg-inline--fa fa-clock-rotate-left" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path fill="currentColor" d="M256 0C397.4 0 512 114.6 512 256C512 397.4 397.4 512 256 512C172.2 512 97.87 471.8 51.19 409.6C45.88 402.5 47.31 392.5 54.37 387.2C61.44 381.9 71.47 383.3 76.78 390.4C117.7 444.8 182.7 480 256 480C379.7 480 480 379.7 480 256C480 132.3 379.7 32 256 32C166.7 32 89.51 84.3 53.55 160H144C152.8 160 160 167.2 160 176C160 184.8 152.8 192 144 192H16C7.164 192 0 184.8 0 176V48C0 39.16 7.164 32 16 32C24.84 32 32 39.16 32 48V131.1C75.66 53.29 159.6 0 256 0zM256 128C264.8 128 272 135.2 272 144V249.4L347.3 324.7C353.6 330.9 353.6 341.1 347.3 347.3C341.1 353.6 330.9 353.6 324.7 347.3L244.7 267.3C241.7 264.3 239.1 260.2 239.1 256V144C239.1 135.2 247.2 128 255.1 128H256z"></path></svg>

tabby-core/src/icons/plus.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" class="svg-inline--fa fa-plus fa-w-12 fa-3x" data-icon="plus" data-prefix="fal" focusable="false" role="img" viewBox="0 0 384 512"><path fill="#fff" stroke="none" stroke-width="1" d="M376 232H216V72c0-4.42-3.58-8-8-8h-32c-4.42 0-8 3.58-8 8v160H8c-4.42 0-8 3.58-8 8v32c0 4.42 3.58 8 8 8h160v160c0 4.42 3.58 8 8 8h32c4.42 0 8-3.58 8-8V280h160c4.42 0 8-3.58 8-8v-32c0-4.42-3.58-8-8-8z"/></svg>
+<svg aria-hidden="true" focusable="false" data-prefix="fal" data-icon="plus" class="svg-inline--fa fa-plus" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path fill="currentColor" d="M432 256C432 264.8 424.8 272 416 272h-176V448c0 8.844-7.156 16.01-16 16.01S208 456.8 208 448V272H32c-8.844 0-16-7.15-16-15.99C16 247.2 23.16 240 32 240h176V64c0-8.844 7.156-15.99 16-15.99S240 55.16 240 64v176H416C424.8 240 432 247.2 432 256z"></path></svg>

tabby-core/src/icons/profiles.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" class="svg-inline--fa fa-window-restore fa-w-16 fa-3x" data-icon="window-restore" data-prefix="fal" focusable="false" role="img" viewBox="0 0 512 512"><path fill="#fff" stroke="none" stroke-width="1" d="M464 0H144c-26.5 0-48 21.5-48 48v48H48c-26.5 0-48 21.5-48 48v320c0 26.5 21.5 48 48 48h320c26.5 0 48-21.5 48-48v-48h48c26.5 0 48-21.5 48-48V48c0-26.5-21.5-48-48-48zM32 144c0-8.8 7.2-16 16-16h320c8.8 0 16 7.2 16 16v80H32v-80zm352 320c0 8.8-7.2 16-16 16H48c-8.8 0-16-7.2-16-16V256h352v208zm96-96c0 8.8-7.2 16-16 16h-48V144c0-26.5-21.5-48-48-48H128V48c0-8.8 7.2-16 16-16h320c8.8 0 16 7.2 16 16v320z"/></svg>
+<svg aria-hidden="true" focusable="false" data-prefix="fal" data-icon="browsers" class="svg-inline--fa fa-browsers" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512"><path fill="currentColor" d="M464 480H96c-35.35 0-64-28.65-64-64V112C32 103.2 24.84 96 16 96S0 103.2 0 112V416c0 53.02 42.98 96 96 96h368c8.836 0 16-7.164 16-16S472.8 480 464 480zM512 0H160C124.7 0 96 28.65 96 64v288c0 35.35 28.65 64 64 64h352c35.35 0 64-28.65 64-64V64C576 28.65 547.3 0 512 0zM128 64c0-17.67 14.33-32 32-32h64v64H128V64zM544 352c0 17.67-14.33 32-32 32H160c-17.67 0-32-14.33-32-32V128h416V352zM544 96H256V32h256c17.67 0 32 14.33 32 32V96z"></path></svg>

tabby-core/src/icons/transfers.svg

@@ -0,0 +1 @@
+<svg aria-hidden="true" focusable="false" data-prefix="fal" data-icon="down-to-dotted-line" class="svg-inline--fa fa-down-to-dotted-line" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path fill="currentColor" d="M364.1 246.6L253.9 370.6C237.1 388.5 210 388.5 194.1 370.6L83.92 246.6C60.99 220.8 79.3 180 113.8 180H160V76.04C160 53.95 177.9 36.04 200 36.04H248C270.1 36.04 288 53.95 288 76.04V180H334.2C368.7 180 387 220.8 364.1 246.6zM113.8 212C106.9 212 103.3 220.2 107.8 225.4L218 349.3C221.2 352.9 226.8 352.9 229.1 349.3L340.2 225.4C344.8 220.2 341.1 212 334.2 212H256V76.04C256 71.62 252.4 68.04 248 68.04H200C195.6 68.04 192 71.62 192 76.04V212H113.8zM392 448C392 434.8 402.7 424 416 424C429.3 424 440 434.8 440 448C440 461.3 429.3 472 416 472C402.7 472 392 461.3 392 448zM56 448C56 461.3 45.25 472 32 472C18.75 472 8 461.3 8 448C8 434.7 18.75 424 32 424C45.25 424 56 434.7 56 448zM104 448C104 434.7 114.7 424 128 424C141.3 424 152 434.7 152 448C152 461.3 141.3 472 128 472C114.7 472 104 461.3 104 448zM248 448C248 461.3 237.3 472 224 472C210.7 472 200 461.3 200 448C200 434.7 210.7 424 224 424C237.3 424 248 434.7 248 448zM296 448C296 434.7 306.7 424 320 424C333.3 424 344 434.7 344 448C344 461.3 333.3 472 320 472C306.7 472 296 461.3 296 448z"></path></svg>

tabby-core/src/icons/upload.svg

@@ -1 +1 @@
-<svg aria-hidden="true" focusable="false" data-prefix="fad" data-icon="upload" class="svg-inline--fa fa-upload fa-w-16" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><g class="fa-group"><path class="fa-secondary" fill="currentColor" d="M488 351.92H352v8a56 56 0 0 1-56 56h-80a56 56 0 0 1-56-56v-8H24a23.94 23.94 0 0 0-24 24v112a23.94 23.94 0 0 0 24 24h464a23.94 23.94 0 0 0 24-24v-112a23.94 23.94 0 0 0-24-24zm-120 132a20 20 0 1 1 20-20 20.06 20.06 0 0 1-20 20zm64 0a20 20 0 1 1 20-20 20.06 20.06 0 0 1-20 20z" opacity="0.4"></path><path class="fa-primary" fill="currentColor" d="M192 359.93v-168h-87.7c-17.8 0-26.7-21.5-14.1-34.11L242.3 5.62a19.37 19.37 0 0 1 27.3 0l152.2 152.2c12.6 12.61 3.7 34.11-14.1 34.11H320v168a23.94 23.94 0 0 1-24 24h-80a23.94 23.94 0 0 1-24-24z"></path></g></svg>
+<svg aria-hidden="true" focusable="false" data-prefix="far" data-icon="arrow-up-from-square" class="svg-inline--fa fa-arrow-up-from-square" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path fill="currentColor" d="M416 159.9l-8-.1648c-13.25 0-24 10.75-24 24.02c0 13.26 10.75 24.02 24 24.02H416c8.836 0 16 7.169 16 16.01v224.2c0 8.842-7.164 16.01-16 16.01H96c-8.836 0-16-7.169-16-16.01V223.8c0-8.842 7.164-16.01 16-16.01h8c13.25 0 24-10.75 24-24.02c0-13.27-10.75-24.02-24-24.02L96 159.9c-35.35 0-64 28.51-64 63.88v224.2C32 483.3 60.65 512 96 512h320c35.35 0 64-28.68 64-64.04V223.8C480 188.4 451.3 159.9 416 159.9zM160 151.8c6.47 0 12.91-2.614 17.62-7.752L232 85.08v234.8c0 13.26 10.75 24.02 24 24.02s24-10.76 24-24.02V85.08l54.38 58.95C339.1 149.2 345.5 151.7 352 151.7c13.23 0 24-10.77 24-24.05c0-5.83-2.108-11.64-6.376-16.26l-96-104.1C269.1 2.455 262.5-.0002 256-.0002S242.9 2.455 238.4 7.365l-96 104.1C138.1 116.1 135.1 121.9 135.1 127.7C135.1 141.1 146.9 151.8 160 151.8z"></path></svg>

tabby-core/src/services/vault.service.ts

@@ -3,7 +3,7 @@ import { promisify } from 'util'
 import { Injectable, NgZone } from '@angular/core'
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
 import { AsyncSubject, Subject, Observable } from 'rxjs'
-import { wrapPromise } from '../utils'
+import { wrapPromise, serializeFunction } from '../utils'
 import { UnlockVaultModalComponent } from '../components/unlockVaultModal.component'
 import { NotificationsService } from './notifications.service'
 import { SelectorService } from './selector.service'
@@ -17,7 +17,7 @@ const CRYPT_ALG = 'aes-256-cbc'
 const CRYPT_KEY_LENGTH = 256 / 8
 const CRYPT_IV_LENGTH = 128 / 8
 
-interface StoredVault {
+export interface StoredVault {
     version: number
     contents: string
     keySalt: string
@@ -114,7 +114,9 @@ export class VaultService {
         private zone: NgZone,
         private notifications: NotificationsService,
         private ngbModal: NgbModal,
-    ) { }
+    ) {
+        this.getPassphrase = serializeFunction(this.getPassphrase.bind(this))
+    }
 
     async setEnabled (enabled: boolean, passphrase?: string): Promise<void> {
         if (enabled) {

tabby-core/src/theme.scss

@@ -291,7 +291,7 @@ checkbox i.on {
 }
 
 search-panel {
-    background: rgba(39, 49, 60, 0.95) !important;
+    background: #131d27 !important;
 }
 
 

tabby-core/src/utils.ts

@@ -64,3 +64,12 @@ export const TAB_COLORS = [
     { name: 'Red', value: '#d9534f' },
     { name: 'Yellow', value: '#ffd500' },
 ]
+
+export function serializeFunction <T extends () => Promise<any>> (fn: T): T {
+    let queue = Promise.resolve()
+    return ((...args) => {
+        const res = queue.then(() => fn(...args))
+        queue = res.catch(() => null)
+        return res
+    }) as T
+}

tabby-core/yarn.lock

@@ -2,11 +2,6 @@
 # yarn lockfile v1
 
 
-"@types/js-yaml@^4.0.0":
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/@types/js-yaml/-/js-yaml-4.0.2.tgz#4117a7a378593a218e9d6f0ef44ce6d5d9edf7fa"
-  integrity sha512-KbeHS/Y4R+k+5sWXEYzAZKuB1yQlZtEghuhRxrVRLaqhtoG5+26JwQsa4HyS3AWX8v1Uwukma5HheduUDskasA==
-
 "@types/semver@^7.3.5":
   version "7.3.5"
   resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.5.tgz#74deebbbcb1e86634dbf10a5b5e8798626f5a597"

tabby-electron/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tabby-electron",
-  "version": "1.0.156",
+  "version": "1.0.163",
   "description": "Electron-specific bindings",
   "keywords": [
     "tabby-builtin-plugin"

tabby-electron/src/index.ts

@@ -59,10 +59,10 @@ export default class ElectronModule {
 
         themeService.themeChanged$.subscribe(theme => {
             if (hostApp.platform === Platform.macOS) {
-                hostWindow.getWindow().setTrafficLightPosition({
-                    x: theme.macOSWindowButtonsInsetX ?? 14,
-                    y: theme.macOSWindowButtonsInsetY ?? 11,
-                })
+                hostWindow.setTrafficLightPosition(
+                    theme.macOSWindowButtonsInsetX ?? 14,
+                    theme.macOSWindowButtonsInsetY ?? 11,
+                )
             }
         })
 
@@ -73,9 +73,9 @@ export default class ElectronModule {
                     return
                 }
                 if (progress !== null) {
-                    hostWindow.getWindow().setProgressBar(progress / 100.0, { mode: 'normal' })
+                    hostWindow.setProgressBar(progress / 100.0)
                 } else {
-                    hostWindow.getWindow().setProgressBar(-1, { mode: 'none' })
+                    hostWindow.setProgressBar(-1)
                 }
                 lastProgress = progress
             })
@@ -116,7 +116,7 @@ export default class ElectronModule {
         document.body.classList.toggle('vibrant', this.config.store.appearance.vibrancy)
         this.electron.ipcRenderer.send('window-set-vibrancy', this.config.store.appearance.vibrancy, vibrancyType)
 
-        this.hostWindow.getWindow().setOpacity(this.config.store.appearance.opacity)
+        this.hostWindow.setOpacity(this.config.store.appearance.opacity)
     }
 }
 

tabby-electron/src/services/hostWindow.service.ts

@@ -97,6 +97,18 @@ export class ElectronHostWindow extends HostWindowService {
         this.getWindow().setTouchBar(touchBar)
     }
 
+    setTrafficLightPosition (x: number, y: number): void {
+        this.electron.ipcRenderer.send('window-set-traffic-light-position', x, y)
+    }
+
+    setOpacity (opacity: number): void {
+        this.electron.ipcRenderer.send('window-set-opacity', opacity)
+    }
+
+    setProgressBar (value: number): void {
+        this.electron.ipcRenderer.send('window-set-progress-bar', value)
+    }
+
     bringToFront (): void {
         this.electron.ipcRenderer.send('window-bring-to-front')
     }

tabby-electron/src/services/updater.service.ts

@@ -30,6 +30,8 @@ export class ElectronUpdaterService extends UpdaterService {
         }
 
         this.autoUpdater = electron.remote.require('electron-updater').autoUpdater
+        this.autoUpdater.autoDownload = false
+        this.autoUpdater.autoInstallOnAppQuit = false
 
         this.autoUpdater.on('update-available', () => {
             this.logger.info('Update available')

tabby-local/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tabby-local",
-  "version": "1.0.156",
+  "version": "1.0.163",
   "description": "Tabby's local shell plugin",
   "keywords": [
     "tabby-builtin-plugin"
@@ -16,9 +16,6 @@
   ],
   "author": "Eugene Pankov",
   "license": "MIT",
-  "dependencies": {
-    "opentype.js": "^1.3.3"
-  },
   "devDependencies": {
     "ansi-colors": "^4.1.1",
     "dataurl": "0.1.0",

tabby-local/src/components/commandLineEditor.component.pug

@@ -3,7 +3,11 @@ ng-container(*ngIf='!argvMode')
         label Command line
         .input-group
             .input-group-prepend
-                button.btn.btn-secondary((click)='switchToArgv()', title='Switch to split arguments')
+                a.input-group-text(
+                    (click)='switchToArgv()',
+                    ngbTooltip='Split into unescaped arguments',
+                    href='#'
+                )
                     i.fas.fa-fw.fa-caret-right
             input.form-control.text-monospace(
                 [(ngModel)]='command',
@@ -15,7 +19,11 @@ ng-container(*ngIf='argvMode')
         label Program
         .input-group
             .input-group-prepend
-                button.btn.btn-secondary((click)='switchToCommand()', title='Switch to a single-line command')
+                a.input-group-text(
+                    (click)='switchToCommand()',
+                    ngbTooltip='Combine into a single escaped command',
+                    href='#'
+                )
                     i.fas.fa-fw.fa-caret-down
             input.form-control.text-monospace(
                 type='text',

tabby-local/src/components/environmentEditor.component.pug

@@ -8,6 +8,13 @@
             button.btn.btn-secondary((click)='removeEnvironmentVar(pair.key)')
                 i.fas.fa-fw.fa-trash
 
-button.btn.btn-secondary((click)='addEnvironmentVar()')
-    i.fas.fa-plus.mr-2
-    span Add
+.d-flex
+    button.btn.btn-secondary((click)='addEnvironmentVar()')
+        i.fas.fa-plus.mr-2
+        span Add
+
+    .ml-auto
+    .text-muted Substitutions allowed.
+    .d-flex.ml-1(*ngIf='shouldShowExample()')
+        .text-muted Example:
+        a.ml-1((click)='addExample()', href='#') extend PATH

tabby-local/src/components/environmentEditor.component.ts

@@ -44,4 +44,13 @@ export class EnvironmentEditorComponent {
         this.emitUpdate()
     }
 
+    shouldShowExample (): boolean {
+        return !this.vars.find(v => v.key.toLowerCase() === 'path')
+    }
+
+    addExample (): void {
+        const value = process.platform === 'win32' ? 'C:\\Program Files\\Custom:%PATH%' : '/opt/custom:$PATH'
+        this.vars.push({ key: 'PATH', value })
+        this.emitUpdate()
+    }
 }

tabby-local/src/components/shellSettingsTab.component.ts

@@ -1,4 +1,4 @@
-import { Component } from '@angular/core'
+import { Component, HostBinding } from '@angular/core'
 import { WIN_BUILD_CONPTY_SUPPORTED, WIN_BUILD_CONPTY_STABLE, isWindowsBuild, ConfigService } from 'tabby-core'
 
 /** @hidden */
@@ -9,6 +9,8 @@ export class ShellSettingsTabComponent {
     isConPTYAvailable: boolean
     isConPTYStable: boolean
 
+    @HostBinding('class.content-box') true
+
     constructor (
         public config: ConfigService,
     ) {

tabby-local/src/components/terminalTab.component.ts

@@ -58,7 +58,10 @@ export class TerminalTabComponent extends BaseTerminalTabComponent {
 
     initializeSession (columns: number, rows: number): void {
         if (this.profile.options.runAsAdministrator && this.uac.isAvailable) {
-            this.profile.options = this.uac.patchSessionOptionsForUAC(this.profile.options)
+            this.profile = {
+                ...this.profile,
+                options: this.uac.patchSessionOptionsForUAC(this.profile.options),
+            }
         }
 
         this.session!.start({

tabby-local/src/icons/plus.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" class="svg-inline--fa fa-plus fa-w-12 fa-3x" data-icon="plus" data-prefix="fal" focusable="false" role="img" viewBox="0 0 384 512"><path fill="#fff" stroke="none" stroke-width="1" d="M376 232H216V72c0-4.42-3.58-8-8-8h-32c-4.42 0-8 3.58-8 8v160H8c-4.42 0-8 3.58-8 8v32c0 4.42 3.58 8 8 8h160v160c0 4.42 3.58 8 8 8h32c4.42 0 8-3.58 8-8V280h160c4.42 0 8-3.58 8-8v-32c0-4.42-3.58-8-8-8z"/></svg>
+<svg aria-hidden="true" focusable="false" data-prefix="fal" data-icon="plus" class="svg-inline--fa fa-plus" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path fill="currentColor" d="M432 256C432 264.8 424.8 272 416 272h-176V448c0 8.844-7.156 16.01-16 16.01S208 456.8 208 448V272H32c-8.844 0-16-7.15-16-15.99C16 247.2 23.16 240 32 240h176V64c0-8.844 7.156-15.99 16-15.99S240 55.16 240 64v176H416C424.8 240 432 247.2 432 256z"></path></svg>

tabby-local/src/session.ts

@@ -81,6 +81,35 @@ export class PTYProxy {
     }
 }
 
+function mergeEnv (...envs) {
+    const result = {}
+    const keyMap = {}
+    for (const env of envs) {
+        for (const [key, value] of Object.entries(env)) {
+            // const lookup = process.platform === 'win32' ? key.toLowerCase() : key
+            const lookup = key.toLowerCase()
+            keyMap[lookup] ??= key
+            result[keyMap[lookup]] = value
+        }
+    }
+    return result
+}
+
+function substituteEnv (env: Record<string, string>) {
+    env = { ...env }
+    const pattern = process.platform === 'win32' ? /%(\w+)%/g : /\$(\w+)\b/g
+    for (const [key, value] of Object.entries(env)) {
+        env[key] = value.replace(pattern, function (substring, p1) {
+            if (process.platform === 'win32') {
+                return Object.entries(process.env).find(x => x[0].toLowerCase() === p1.toLowerCase())?.[1] ?? ''
+            } else {
+                return process.env[p1] ?? ''
+            }
+        })
+    }
+    return env
+}
+
 /** @hidden */
 export class Session extends BaseSession {
     private pty: PTYProxy|null = null
@@ -108,22 +137,18 @@ export class Session extends BaseSession {
         }
 
         if (!pty) {
-            const env = {
-                ...process.env,
-                TERM: 'xterm-256color',
-                TERM_PROGRAM: 'Tabby',
-                ...options.env,
-                ...this.config.store.terminal.environment || {},
-            }
+            let env = mergeEnv(
+                process.env,
+                {
+                    TERM: 'xterm-256color',
+                    TERM_PROGRAM: 'Tabby',
+                },
+                substituteEnv(options.env ?? {}),
+                this.config.store.terminal.environment || {},
+            )
 
             if (this.hostApp.platform === Platform.Windows && this.config.store.terminal.setComSpec) {
-                for (const k of Object.keys(env)) {
-                    if (k.toUpperCase() === 'COMSPEC') {
-                        // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
-                        delete env[k]
-                    }
-                }
-                env.COMSPEC = this.bootstrapData.executable
+                env = mergeEnv(env, { COMSPEC: this.bootstrapData.executable })
             }
 
             delete env['']

tabby-local/yarn.lock

@@ -29,14 +29,6 @@ hasbin@^1.2.3:
   dependencies:
     async "~1.5"
 
-opentype.js@^1.3.3:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/opentype.js/-/opentype.js-1.3.3.tgz#65b8645b090a1ad444065b784d442fa19d1061f6"
-  integrity sha512-/qIY/+WnKGlPIIPhbeNjynfD2PO15G9lA/xqlX2bDH+4lc3Xz5GCQ68mqxj3DdUv6AJqCeaPvuAoH8mVL0zcuA==
-  dependencies:
-    string.prototype.codepointat "^0.2.1"
-    tiny-inflate "^1.0.3"
-
 ps-node@^0.1.6:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/ps-node/-/ps-node-0.1.6.tgz#9af67a99d7b1d0132e51a503099d38a8d2ace2c3"
@@ -49,19 +41,9 @@ runes@^0.4.2:
   resolved "https://registry.yarnpkg.com/runes/-/runes-0.4.3.tgz#32f7738844bc767b65cc68171528e3373c7bb355"
   integrity sha512-K6p9y4ZyL9wPzA+PMDloNQPfoDGTiFYDvdlXznyGKgD10BJpcAosvATKrExRKOrNLgD8E7Um7WGW0lxsnOuNLg==
 
-string.prototype.codepointat@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/string.prototype.codepointat/-/string.prototype.codepointat-0.2.1.tgz#004ad44c8afc727527b108cd462b4d971cd469bc"
-  integrity sha512-2cBVCj6I4IOvEnjgO/hWqXjqBGsY+zwPmHl12Srk9IXSZ56Jwwmy+66XO5Iut/oQVR7t5ihYdLB0GMa4alEUcg==
-
 table-parser@^0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/table-parser/-/table-parser-0.1.3.tgz#0441cfce16a59481684c27d1b5a67ff15a43c7b0"
   integrity sha1-BEHPzhallIFoTCfRtaZ/8VpDx7A=
   dependencies:
     connected-domain "^1.0.0"
-
-tiny-inflate@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/tiny-inflate/-/tiny-inflate-1.0.3.tgz#122715494913a1805166aaf7c93467933eea26c4"
-  integrity sha512-pkY1fj1cKHb2seWDy0B16HeWyczlJA9/WW3u3c4z/NiWDsO3DOU5D7nhTLE9CF0yXv/QZFY7sEJmj24dK+Rrqw==

tabby-plugin-manager/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tabby-plugin-manager",
-  "version": "1.0.156",
+  "version": "1.0.163",
   "description": "Tabby's plugin manager",
   "keywords": [
     "tabby-builtin-plugin"

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

@@ -1,78 +1,125 @@
-.alert.alert-danger(*ngIf='errorMessage')
-    strong Error in {{erroredPlugin}}:
-    pre {{errorMessage}}
-
-.d-flex
-    h3.mb-1 Installed
+.d-flex.mb-3
+    h3 Plugins
     button.btn.btn-secondary.btn-sm.ml-auto((click)='openPluginsFolder()')
         i.fas.fa-folder
         span Plugins folder
 
-.list-group.list-group-flush.mt-2
-    .list-group-item.d-flex.align-items-center(*ngFor='let plugin of pluginManager.installedPlugins')
-        toggle(
-            [ngModel]='isPluginEnabled(plugin)',
-            (ngModelChange)='togglePlugin(plugin)',
-            [disabled]='!canDisablePlugin(plugin)'
-        )
+.alert.alert-danger(*ngIf='errorMessage')
+    strong Error in {{erroredPlugin}}:
+    pre {{errorMessage}}
 
-        .mr-auto.d-flex.flex-column
-            div
-                strong {{plugin.name}}
-                small.text-muted.ml-1(*ngIf='!plugin.isBuiltin') {{plugin.version}} / {{plugin.author}}
-                small.text-muted.ml-1(*ngIf='plugin.isBuiltin') Built-in
-                small.text-warning.ml-1(*ngIf='!isPluginEnabled(plugin)') Disabled
-            a.text-muted.mb-0((click)='showPluginInfo(plugin)')
-                small {{plugin.description}}
-
-        button.btn.btn-primary.ml-2(
-            *ngIf='knownUpgrades[plugin.name]',
-            (click)='upgradePlugin(plugin)',
-            [disabled]='busy.has(plugin.name)'
-        )
-            i.fas.fa-fw.fa-arrow-up(*ngIf='busy.get(plugin.name) != BusyState.Installing')
-            i.fas.fa-fw.fa-circle-notch.fa-spin(*ngIf='busy.get(plugin.name) == BusyState.Installing')
-            span Upgrade ({{knownUpgrades[plugin.name].version}})
-
-        button.btn.btn-link.text-danger.ml-2(
-            (click)='uninstallPlugin(plugin)',
-            *ngIf='!plugin.isBuiltin',
-            [disabled]='busy.has(plugin.name)'
-        )
-            i.fas.fa-fw.fa-trash(*ngIf='busy.get(plugin.name) != BusyState.Uninstalling')
-            i.fas.fa-fw.fa-circle-notch.fa-spin(*ngIf='busy.get(plugin.name) == BusyState.Uninstalling')
-
-div
-    h3.mt-4 Available
-
-    .input-group.mb-3
-        .input-group-prepend
-            .input-group-text
-                i.fas.fa-fw.fa-circle-notch.fa-spin(*ngIf='!availablePluginsReady')
-                i.fas.fa-fw.fa-search(*ngIf='availablePluginsReady')
-        input.form-control(
-            type='text',
-            [(ngModel)]='_1',
-            (ngModelChange)='searchAvailable(_1)',
-            placeholder='Search plugins'
-        )
-
-    .list-group.list-group-flush.mb-4(*ngIf='availablePlugins$')
-        ng-container(*ngFor='let plugin of (availablePlugins$|async)')
-            .list-group-item.d-flex.align-items-center(*ngIf='!isAlreadyInstalled(plugin)')
-                button.btn.btn-primary.mr-3(
-                    (click)='installPlugin(plugin)',
-                    [disabled]='busy.has(plugin.name)'
+ul.nav-tabs.mb-2(ngbNav, #nav='ngbNav')
+    li(ngbNavItem)
+        a(ngbNavLink) Available
+        ng-template(ngbNavContent)
+            .input-group.mb-3.mt-3
+                .input-group-prepend
+                    .input-group-text
+                        i.fas.fa-fw.fa-circle-notch.fa-spin(*ngIf='!availablePluginsReady')
+                        i.fas.fa-fw.fa-search(*ngIf='availablePluginsReady')
+                input.form-control(
+                    type='text',
+                    [(ngModel)]='_1',
+                    (ngModelChange)='searchAvailable(_1)',
+                    placeholder='Search plugins'
                 )
-                    i.fas.fa-fw.fa-download(*ngIf='busy.get(plugin.name) != BusyState.Installing')
-                    i.fas.fa-fw.fa-circle-notch.fa-spin(*ngIf='busy.get(plugin.name) == BusyState.Installing')
 
-                div((click)='showPluginInfo(plugin)')
-                    div
-                        strong {{plugin.name}}
-                        small.text-muted.ml-1 {{plugin.version}}
-                        small.text-muted.ml-1(*ngIf='!plugin.isOfficial') by {{plugin.author}}
-                        small.text-success.ml-1(*ngIf='plugin.isOfficial')
-                            i.fas.fa-check
-                            span.ml-1 Official
-                    small.text-muted {{plugin.description}}
+            ngb-accordion.mb-4(*ngIf='availablePlugins$', type='dark', [closeOthers]='true')
+                ng-container(*ngFor='let plugin of (availablePlugins$|async)')
+                    ngb-panel(*ngIf='!isAlreadyInstalled(plugin)', cardClass='bg-dark')
+                        ng-template(ngbPanelTitle)
+                            .text-left
+                                strong.d-block {{plugin.name}}
+                                small.d-block.text-muted {{plugin.description}}
+                        ng-template(ngbPanelContent)
+                            .row
+                                .col-4
+                                    button.btn.btn-primary.btn-block.justify-content-center(
+                                        (click)='installPlugin(plugin)',
+                                        [disabled]='busy.has(plugin.name)'
+                                    )
+                                        i.fas.fa-fw.fa-cloud-download(*ngIf='busy.get(plugin.name) != BusyState.Installing')
+                                        i.fas.fa-fw.fa-circle-notch.fa-spin(*ngIf='busy.get(plugin.name) == BusyState.Installing')
+                                        span.ml-2 Get
+
+                                    button.btn.btn-secondary.btn-block.justify-content-center(
+                                        *ngIf='plugin.homepage',
+                                        (click)='showPluginHomepage(plugin)'
+                                    )
+                                        i.fas.fa-fw.fa-external-link-alt
+                                        span.ml-2 Homepage
+
+                                .col-8
+                                    ng-container(*ngTemplateOutlet='pluginInfo; context: { plugin }')
+
+                            .mt-2 {{plugin.description}}
+
+    li(ngbNavItem)
+        a(ngbNavLink) Installed
+        ng-template(ngbNavContent)
+            ngb-accordion.mb-4(type='dark', [closeOthers]='true')
+                ng-container(*ngFor='let plugin of pluginManager.installedPlugins')
+                    ngb-panel(cardClass='bg-dark')
+                        ng-template(ngbPanelTitle)
+                            .text-left.mr-auto
+                                div
+                                    strong {{plugin.name}}
+                                    small.text-muted.ml-2(*ngIf='plugin.isBuiltin') Built-in
+                                    small.text-warning.ml-2(*ngIf='!isPluginEnabled(plugin)') Disabled
+                                small.d-block.text-muted {{plugin.description}}
+
+                            button.btn.btn-primary.ml-2(
+                                *ngIf='knownUpgrades[plugin.name]',
+                                (click)='upgradePlugin(plugin)',
+                                [disabled]='busy.has(plugin.name)'
+                            )
+                                i.fas.fa-fw.fa-arrow-up(*ngIf='busy.get(plugin.name) != BusyState.Installing')
+                                i.fas.fa-fw.fa-circle-notch.fa-spin(*ngIf='busy.get(plugin.name) == BusyState.Installing')
+                                span Upgrade to {{knownUpgrades[plugin.name].version}}
+
+                        ng-template(ngbPanelContent)
+                            .row
+                                .col-4
+                                    button.btn.btn-warning.btn-block.justify-content-center(
+                                        (click)='togglePlugin(plugin)',
+                                        *ngIf='isPluginEnabled(plugin)',
+                                        [disabled]='!canDisablePlugin(plugin)'
+                                    ) Disable
+
+                                    button.btn.btn-success.btn-block.justify-content-center(
+                                        (click)='togglePlugin(plugin)',
+                                        *ngIf='canDisablePlugin(plugin) && !isPluginEnabled(plugin)'
+                                    ) Enable
+
+                                    button.btn.btn-danger.btn-block.justify-content-center(
+                                        (click)='uninstallPlugin(plugin)',
+                                        *ngIf='!plugin.isBuiltin',
+                                        [disabled]='busy.has(plugin.name)'
+                                    )
+                                        i.fas.fa-fw.fa-trash(*ngIf='busy.get(plugin.name) != BusyState.Uninstalling')
+                                        i.fas.fa-fw.fa-circle-notch.fa-spin(*ngIf='busy.get(plugin.name) == BusyState.Uninstalling')
+                                        span Uninstall
+                                .col-8
+                                    ng-container(*ngTemplateOutlet='pluginInfo; context: { plugin }')
+
+
+                            .mt-2 {{plugin.description}}
+
+ng-template(#pluginInfo, let-plugin='plugin')
+    .row.align-items-center
+        .col-4
+            strong Version
+        .col-8
+            span {{plugin.version}}
+    .row.align-items-center
+        .col-4
+            strong Author
+        .col-8
+            .badge.badge-success(*ngIf='plugin.isOfficial')
+                i.fas.fa-check
+                span.ml-1 Official
+            a.btn.btn-link.px-0.w-auto((click)='showPluginInfo(plugin)', *ngIf='!plugin.isOfficial')
+                span {{plugin.author}}
+                i.fas.fa-fw.fa-external-link-alt.ml-2
+
+.mb-4([ngbNavOutlet]='nav')

tabby-plugin-manager/src/components/pluginsSettingsTab.component.scss

@@ -1,8 +1,7 @@
-.appearance-preview {
-    padding: 10px 20px;
-    margin: 0 0 10px;
-    overflow: hidden;
-    span {
-        white-space: pre;
+::ng-deep .card-header {
+    padding: 0;
+
+    > button {
+        width: 100%;
     }
 }

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

@@ -2,7 +2,7 @@
 import { BehaviorSubject, Observable, debounceTime, distinctUntilChanged, first, tap, flatMap, map } from 'rxjs'
 import semverGt from 'semver/functions/gt'
 
-import { Component, Input } from '@angular/core'
+import { Component, HostBinding, Input } from '@angular/core'
 import { ConfigService, PlatformService, PluginInfo } from 'tabby-core'
 import { PluginManagerService } from '../services/pluginManager.service'
 
@@ -25,6 +25,8 @@ export class PluginsSettingsTabComponent {
     @Input() erroredPlugin: string
     @Input() errorMessage: string
 
+    @HostBinding('class.content-box') true
+
     constructor (
         private config: ConfigService,
         private platform: PlatformService,
@@ -103,6 +105,10 @@ export class PluginsSettingsTabComponent {
         this.platform.openExternal('https://www.npmjs.com/package/' + plugin.packageName)
     }
 
+    showPluginHomepage (plugin: PluginInfo) {
+        this.platform.openExternal(plugin.homepage ?? '')
+    }
+
     isPluginEnabled (plugin: PluginInfo) {
         return !this.config.store.pluginBlacklist.includes(plugin.name)
     }

tabby-plugin-manager/src/services/pluginManager.service.ts

@@ -8,6 +8,7 @@ const OFFICIAL_NPM_ACCOUNT = 'eugenepankov'
 
 const BLACKLIST = [
     'terminus-shell-selector', // superseded by profiles
+    'terminus-scrollbar', // now useless
 ]
 
 @Injectable({ providedIn: 'root' })
@@ -31,7 +32,20 @@ export class PluginManagerService {
         return forkJoin(
             this._listAvailableInternal('tabby-', 'tabby-plugin', query),
             this._listAvailableInternal('terminus-', 'terminus-plugin', query),
-        ).pipe(map(x => x.reduce((a, b) => a.concat(b), [])))
+        ).pipe(
+            map(x => x.reduce((a, b) => a.concat(b), [])),
+            map(x => {
+                const names = new Set<string>()
+                return x.filter(item => {
+                    if (names.has(item.name)) {
+                        return false
+                    }
+                    names.add(item.name)
+                    return true
+                })
+            }),
+            map(x => x.sort((a, b) => a.name.localeCompare(b.name))),
+        )
     }
 
     _listAvailableInternal (namePrefix: string, keyword: string, query?: string): Observable<PluginInfo[]> {

tabby-plugin-manager/yarn.lock

@@ -3,9 +3,9 @@
 
 
 "@types/semver@^7.1.0":
-  version "7.3.7"
-  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.7.tgz#b9eb89d7dfa70d5d1ce525bc1411a35347f533a3"
-  integrity sha512-4g1jrL98mdOIwSOUh6LTlB0Cs9I0dQPwINUhBg7C6pN4HLr8GS8xsksJxilW6S6dQHVi2K/o+lQuQcg7LroCnw==
+  version "7.3.9"
+  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.9.tgz#152c6c20a7688c30b967ec1841d31ace569863fc"
+  integrity sha512-L/TMpyURfBkf+o/526Zb6kd/tchUP3iBDEPjqjb+U2MAJhVRxxrmr2fwpe08E7QsV7YLcpq0tUaQ9O9x97ZIxQ==
 
 lru-cache@^6.0.0:
   version "6.0.0"

tabby-serial/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tabby-serial",
-  "version": "1.0.156",
+  "version": "1.0.163",
   "description": "Serial connections for Tabby",
   "keywords": [
     "tabby-builtin-plugin"

tabby-settings/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tabby-settings",
-  "version": "1.0.156",
+  "version": "1.0.163",
   "description": "Tabby terminal settings page",
   "keywords": [
     "tabby-builtin-plugin"

tabby-settings/src/api.ts

@@ -5,6 +5,8 @@ export abstract class SettingsTabProvider {
     id: string
     icon: string
     title: string
+    weight = 0
+    prioritized = false
 
     getComponentType (): any {
         return null

tabby-settings/src/components/configSyncSettingsTab.component.ts

@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
-import { Component } from '@angular/core'
+import { Component, HostBinding } from '@angular/core'
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
 import { BaseComponent, ConfigService, PromptModalComponent, HostAppService, PlatformService, NotificationsService } from 'tabby-core'
 import { Config, ConfigSyncService } from '../services/configSync.service'
@@ -15,6 +15,8 @@ export class ConfigSyncSettingsTabComponent extends BaseComponent {
     connectionError: Error|null = null
     configs: Config[]|null = null
 
+    @HostBinding('class.content-box') true
+
     constructor (
         public config: ConfigService,
         public platform: PlatformService,

tabby-settings/src/components/profilesSettingsTab.component.ts

@@ -1,7 +1,7 @@
 import { v4 as uuidv4 } from 'uuid'
 import slugify from 'slugify'
 import deepClone from 'clone-deep'
-import { Component, Inject } from '@angular/core'
+import { Component, HostBinding, Inject } from '@angular/core'
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
 import { ConfigService, HostAppService, Profile, SelectorService, ProfilesService, PromptModalComponent, PlatformService, BaseComponent, PartialProfile, ProfileProvider } from 'tabby-core'
 import { EditProfileModalComponent } from './editProfileModal.component'
@@ -25,6 +25,8 @@ export class ProfilesSettingsTabComponent extends BaseComponent {
     profileGroups: ProfileGroup[]
     filter = ''
 
+    @HostBinding('class.content-box') true
+
     constructor (
         public config: ConfigService,
         public hostApp: HostAppService,

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

@@ -1,5 +1,3 @@
-button.btn.btn-warning.btn-block(*ngIf='config.restartRequested', '(click)'='restartApp()') Restart the app to apply changes
-
 .content
     ul.nav-pills(ngbNav, #nav='ngbNav', [activeId]='activeTab', orientation='vertical')
         li(ngbNavItem='application')
@@ -7,80 +5,92 @@ button.btn.btn-warning.btn-block(*ngIf='config.restartRequested', '(click)'='res
                 i.fas.fa-fw.fa-window-maximize.mr-2
                 | Application
             ng-template(ngbNavContent)
-                .tabby-logo.mt-3
-                h1.tabby-title Tabby
-                    sup α
+                .content-box
+                    .tabby-logo.mt-3
+                    h1.tabby-title Tabby
+                        sup α
 
-                .text-center
-                    .text-muted {{homeBase.appVersion}}
+                    .text-center
+                        .text-muted {{homeBase.appVersion}}
 
-                    .mb-5.mt-3
-                        button.btn.btn-secondary.mr-3.mb-2((click)='homeBase.openGitHub()')
-                            i.fab.fa-github
-                            span GitHub
+                        .mb-5.mt-3
+                            button.btn.btn-secondary.mr-3.mb-2((click)='homeBase.openGitHub()')
+                                i.fab.fa-github
+                                span GitHub
 
-                        button.btn.btn-secondary.mr-3.mb-2((click)='homeBase.reportBug()')
-                            i.fas.fa-bug
-                            span Report a problem
+                            button.btn.btn-secondary.mr-3.mb-2((click)='homeBase.reportBug()')
+                                i.fas.fa-bug
+                                span Report a problem
 
-                        button.btn.btn-secondary.mr-3.mb-2(
-                            (click)='showReleaseNotes()',
-                        )
-                            i.fas.fa-book
-                            span What's new
-
-                        button.btn.btn-secondary.mr-3.mb-2(
-                            *ngIf='!updateAvailable && hostApp.platform !== Platform.Web',
-                            (click)='checkForUpdates()',
-                            [disabled]='checkingForUpdate'
-                        )
-                            i.fas.fa-sync(
-                                [class.fa-spin]='checkingForUpdate'
+                            button.btn.btn-secondary.mr-3.mb-2(
+                                (click)='showReleaseNotes()',
                             )
-                            span Check for updates
+                                i.fas.fa-book
+                                span What's new
 
-                        button.btn.btn-info.mr-3.mb-2(
-                            *ngIf='updateAvailable',
-                            (click)='updater.update()',
+                            button.btn.btn-secondary.mr-3.mb-2(
+                                *ngIf='!updateAvailable && hostApp.platform !== Platform.Web',
+                                (click)='checkForUpdates()',
+                                [disabled]='checkingForUpdate'
+                            )
+                                i.fas.fa-sync(
+                                    [class.fa-spin]='checkingForUpdate'
+                                )
+                                span Check for updates
+
+                            button.btn.btn-info.mr-3.mb-2(
+                                *ngIf='updateAvailable',
+                                (click)='updater.update()',
+                            )
+                                i.fas.fa-sync
+                                span Update
+
+                    .form-line(*ngIf='platform.isShellIntegrationSupported()')
+                        .header
+                            .title Shell integration
+                            .description Allows quickly opening a terminal in the selected folder
+                        toggle([ngModel]='isShellIntegrationInstalled', (ngModelChange)='toggleShellIntegration()')
+
+                    .form-line(*ngIf='hostApp.platform !== Platform.Web')
+                        .header
+                            .title Enable analytics
+                            .description We're only tracking your Tabby and OS versions.
+                        toggle(
+                            [(ngModel)]='config.store.enableAnalytics',
+                            (ngModelChange)='saveConfiguration(true)',
                         )
-                            i.fas.fa-sync
-                            span Update
 
-                .form-line(*ngIf='platform.isShellIntegrationSupported()')
-                    .header
-                        .title Shell integration
-                        .description Allows quickly opening a terminal in the selected folder
-                    toggle([ngModel]='isShellIntegrationInstalled', (ngModelChange)='toggleShellIntegration()')
+                    .form-line(*ngIf='hostApp.platform !== Platform.Web')
+                        .header
+                            .title Automatic Updates
+                            .description Enable automatic installation of updates when they become available.
+                        toggle([(ngModel)]='config.store.enableAutomaticUpdates', (ngModelChange)='saveConfiguration()')
 
-                .form-line(*ngIf='hostApp.platform !== Platform.Web')
-                    .header
-                        .title Enable analytics
-                        .description We're only tracking your Tabby and OS versions.
-                    toggle(
-                        [(ngModel)]='config.store.enableAnalytics',
-                        (ngModelChange)='saveConfiguration(true)',
-                    )
+                    .form-line(*ngIf='hostApp.platform !== Platform.Web')
+                        .header
+                            .title Debugging
 
-                .form-line(*ngIf='hostApp.platform !== Platform.Web')
-                    .header
-                        .title Automatic Updates
-                        .description Enable automatic installation of updates when they become available.
-                    toggle([(ngModel)]='config.store.enableAutomaticUpdates', (ngModelChange)='saveConfiguration()')
+                        button.btn.btn-secondary((click)='hostWindow.openDevTools()')
+                            i.fas.fa-bug
+                            span Open DevTools
 
-                .form-line(*ngIf='hostApp.platform !== Platform.Web')
-                    .header
-                        .title Debugging
+        ng-container(*ngFor='let provider of settingsProviders')
+            li(*ngIf='provider.prioritized', [ngbNavItem]='provider.id')
+                a(ngbNavLink)
+                    i(class='fas fa-fw mr-2 fa-{{provider.icon}}')
+                    | {{provider.title}}
+                ng-template(ngbNavContent)
+                    settings-tab-body([provider]='provider')
 
-                    button.btn.btn-secondary((click)='hostWindow.openDevTools()')
-                        i.fas.fa-bug
-                        span Open DevTools
+        .mb-3
 
-        li(*ngFor='let provider of settingsProviders', [ngbNavItem]='provider.id')
-            a(ngbNavLink)
-                i(class='fas fa-fw mr-2 fa-{{provider.icon || "puzzle-piece"}}')
-                | {{provider.title}}
-            ng-template(ngbNavContent)
-                settings-tab-body([provider]='provider')
+        ng-container(*ngFor='let provider of settingsProviders')
+            li(*ngIf='!provider.prioritized', [ngbNavItem]='provider.id')
+                a(ngbNavLink)
+                    i(class='fas fa-fw mr-2 fa-{{provider.icon || "puzzle-piece"}}')
+                    | {{provider.title}}
+                ng-template(ngbNavContent)
+                    settings-tab-body([provider]='provider')
 
         li(ngbNavItem='config-file')
             a(ngbNavLink)
@@ -118,3 +128,5 @@ button.btn.btn-warning.btn-block(*ngIf='config.restartRequested', '(click)'='res
                             | Show config file
 
     div([ngbNavOutlet]='nav')
+
+button.btn.btn-warning.btn-block(*ngIf='config.restartRequested', '(click)'='restartApp()') Restart the app to apply changes

tabby-settings/src/components/settingsTab.component.scss

@@ -16,7 +16,7 @@
 
         > .nav {
             padding: 20px 10px;
-            width: 190px;
+            width: 212px;
             flex: none;
             overflow-y: auto;
             flex-wrap: nowrap;
@@ -29,6 +29,10 @@
 
             > ::ng-deep .tab-pane {
                 height: 100%;
+
+                > settings-tab-body > * {
+                    display: block;
+                }
             }
         }
     }

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

@@ -51,7 +51,7 @@ export class SettingsTabComponent extends BaseTabComponent {
         this.setTitle('Settings')
         this.settingsProviders = config.enabledServices(this.settingsProviders)
         this.settingsProviders = this.settingsProviders.filter(x => !!x.getComponentType())
-        this.settingsProviders.sort((a, b) => a.title.localeCompare(b.title))
+        this.settingsProviders.sort((a, b) => a.weight - b.weight + a.title.localeCompare(b.title))
 
         this.configDefaults = yaml.dump(config.getDefaults())
 

tabby-settings/src/components/vaultSettingsTab.component.ts

@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
-import { Component } from '@angular/core'
+import { Component, HostBinding } from '@angular/core'
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
 import { BaseComponent, VaultService, VaultSecret, Vault, PlatformService, ConfigService, VAULT_SECRET_TYPE_FILE, PromptModalComponent, VaultFileSecret } from 'tabby-core'
 import { SetVaultPassphraseModalComponent } from './setVaultPassphraseModal.component'
@@ -14,6 +14,8 @@ export class VaultSettingsTabComponent extends BaseComponent {
     vaultContents: Vault|null = null
     VAULT_SECRET_TYPE_FILE = VAULT_SECRET_TYPE_FILE
 
+    @HostBinding('class.content-box') true
+
     constructor (
         public vault: VaultService,
         public config: ConfigService,

tabby-settings/src/components/windowSettingsTab.component.ts

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 import { debounce } from 'utils-decorators/dist/esm/debounce/debounce'
-import { Component, Inject, NgZone, Optional } from '@angular/core'
+import { Component, HostBinding, Inject, NgZone, Optional } from '@angular/core'
 import {
     DockingService,
     ConfigService,
@@ -25,6 +25,8 @@ export class WindowSettingsTabComponent extends BaseComponent {
     Platform = Platform
     isFluentVibrancySupported = false
 
+    @HostBinding('class.content-box') true
+
     constructor (
         public config: ConfigService,
         public hostApp: HostAppService,

tabby-settings/src/icons/cog.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path fill="#fff" d="M487.4 315.7l-42.6-24.6c4.3-23.2 4.3-47 0-70.2l42.6-24.6c4.9-2.8 7.1-8.6 5.5-14-11.1-35.6-30-67.8-54.7-94.6-3.8-4.1-10-5.1-14.8-2.3L380.8 110c-17.9-15.4-38.5-27.3-60.8-35.1V25.8c0-5.6-3.9-10.5-9.4-11.7-36.7-8.2-74.3-7.8-109.2 0-5.5 1.2-9.4 6.1-9.4 11.7V75c-22.2 7.9-42.8 19.8-60.8 35.1L88.7 85.5c-4.9-2.8-11-1.9-14.8 2.3-24.7 26.7-43.6 58.9-54.7 94.6-1.7 5.4.6 11.2 5.5 14L67.3 221c-4.3 23.2-4.3 47 0 70.2l-42.6 24.6c-4.9 2.8-7.1 8.6-5.5 14 11.1 35.6 30 67.8 54.7 94.6 3.8 4.1 10 5.1 14.8 2.3l42.6-24.6c17.9 15.4 38.5 27.3 60.8 35.1v49.2c0 5.6 3.9 10.5 9.4 11.7 36.7 8.2 74.3 7.8 109.2 0 5.5-1.2 9.4-6.1 9.4-11.7v-49.2c22.2-7.9 42.8-19.8 60.8-35.1l42.6 24.6c4.9 2.8 11 1.9 14.8-2.3 24.7-26.7 43.6-58.9 54.7-94.6 1.5-5.5-.7-11.3-5.6-14.1zM256 336c-44.1 0-80-35.9-80-80s35.9-80 80-80 80 35.9 80 80-35.9 80-80 80z"></path></svg>
+<svg aria-hidden="true" focusable="false" data-prefix="fal" data-icon="gear" class="svg-inline--fa fa-gear" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path fill="currentColor" d="M255.1 512c-56.05 0-75.99-11.33-75.99-35.94V436.5c-15.17-6.375-29.35-14.53-42.36-24.41l-34.3 19.78c-4.621 2.703-9.976 4.013-15.36 4.013c-36.71 0-76.25-92.87-76.25-108.6c0-10.85 5.806-21.34 15.71-27.07l34.17-19.72C60.52 272.1 59.99 264 59.99 255.1s.5313-16.13 1.625-24.47L27.42 211.8C17.53 206.1 11.73 195.6 11.73 184.7c0-12.58 37.98-108.7 76.2-108.7c5.417 0 10.82 1.338 15.52 4.111L137.6 99.88C150.6 90.01 164.8 81.85 179.1 75.47V35.91C179.1 4.335 215.7 0 256 0c39.71 0 75.1 4.083 75.1 35.91v39.56c15.17 6.375 29.35 14.53 42.36 24.41l34.3-19.78c4.621-2.703 9.981-4.013 15.37-4.013c36.47 0 76.24 92.55 76.24 108.6c0 10.85-5.806 21.34-15.71 27.07l-34.17 19.72c1.094 8.344 1.625 16.44 1.625 24.47s-.5313 16.13-1.625 24.47l34.19 19.75c9.895 5.703 15.7 16.19 15.7 27.05c0 12.59-37.98 108.7-76.21 108.7c-5.42 0-10.83-1.338-15.51-4.111l-34.19-19.72c-13.02 9.876-27.19 18.03-42.36 24.41v39.56C332 500.6 312.1 512 255.1 512zM140.9 373.2c35.92 30.82 52.34 34.36 71.05 41v61.85c14.11 2.344 28.82 3.727 43.76 3.727c14.95 0 30.13-1.383 45.19-4.571l-.9532-61c16.07-5.702 35.18-10.22 71.05-41l53.61 30.97c18.78-22.06 33.77-47.97 43.39-76.57l-52.94-30.56c2.745-14.99 4.859-25.43 4.859-39.07c0-10.95-1.364-23.97-4.859-43.06l53.46-30.85c-9.829-27.75-24.92-53.97-45.1-76.72l-52.43 31.41c-35.92-30.82-52.34-34.36-71.05-41V35.91c-14.11-2.344-28.82-3.727-43.76-3.727c-14.95 0-30.13 1.383-45.19 4.571l.9532 61C195.9 103.5 176.8 107.1 140.9 138.8L87.33 107.8c-18.99 22.31-34.08 48.53-43.69 77.47l53.24 29.66C94.14 229.9 92.02 240.4 92.02 253.1c0 10.95 1.364 23.97 4.859 43.06l-53.46 30.85c9.829 27.75 24.92 53.97 45.1 76.72L140.9 373.2zM256 351.1c-52.94 0-96-43.06-96-96S203.1 159.1 256 159.1s96 43.06 96 96S308.9 351.1 256 351.1zM256 191.1c-35.3 0-64 28.72-64 64S220.7 319.1 256 319.1s64-28.72 64-64S291.3 191.1 256 191.1z"></path></svg>

tabby-settings/src/settings.ts

@@ -5,7 +5,6 @@ import { WindowSettingsTabComponent } from './components/windowSettingsTab.compo
 import { VaultSettingsTabComponent } from './components/vaultSettingsTab.component'
 import { ConfigSyncSettingsTabComponent } from './components/configSyncSettingsTab.component'
 import { ProfilesSettingsTabComponent } from './components/profilesSettingsTab.component'
-import { ConfigSyncService } from './services/configSync.service'
 
 /** @hidden */
 @Injectable()
@@ -51,7 +50,8 @@ export class VaultSettingsTabProvider extends SettingsTabProvider {
 export class ProfilesSettingsTabProvider extends SettingsTabProvider {
     id = 'profiles'
     icon = 'window-restore'
-    title = 'Profiles'
+    title = 'Profiles & connections'
+    prioritized = true
 
     getComponentType (): any {
         return ProfilesSettingsTabComponent
@@ -65,14 +65,7 @@ export class ConfigSyncSettingsTabProvider extends SettingsTabProvider {
     icon = 'cloud'
     title = 'Config sync'
 
-    constructor (
-        private configSync: ConfigSyncService,
-    ) { super() }
-
     getComponentType (): any {
-        if (!this.configSync.isAvailable()) {
-            return null
-        }
         return ConfigSyncSettingsTabComponent
     }
 }

tabby-ssh/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tabby-ssh",
-  "version": "1.0.156",
+  "version": "1.0.163",
   "description": "SSH connections for Tabby",
   "keywords": [
     "tabby-builtin-plugin"

tabby-ssh/src/algorithms.ts

@@ -1,6 +1,12 @@
 import * as ALGORITHMS from 'ssh2/lib/protocol/constants'
 import { ALGORITHM_BLACKLIST, SSHAlgorithmType } from './api'
 
+// Counteracts https://github.com/mscdex/ssh2/commit/f1b5ac3c81734c194740016eab79a699efae83d8
+ALGORITHMS.DEFAULT_CIPHER.push('aes128-gcm')
+ALGORITHMS.DEFAULT_CIPHER.push('aes256-gcm')
+ALGORITHMS.SUPPORTED_CIPHER.push('aes128-gcm')
+ALGORITHMS.SUPPORTED_CIPHER.push('aes256-gcm')
+
 export const supportedAlgorithms: Record<string, string> = {}
 
 for (const k of Object.values(SSHAlgorithmType)) {

tabby-ssh/src/components/sshSettingsTab.component.pug

@@ -42,4 +42,15 @@ h3 SSH
         (ngModelChange)='config.save()',
     )
 
-.alert.alert-info SSH connection management is now done through the Profiles tab
+.form-line
+    .header
+        .title Override X11 display
+        .description Path or address of the local X11 socket
+    input.form-control(
+        type='text',
+        [placeholder]='defaultX11Display',
+        [(ngModel)]='config.store.ssh.x11Display',
+        (ngModelChange)='config.save()'
+    )
+
+.alert.alert-info SSH connection management is now done through the #[strong Profiles & connections] tab

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

@@ -1,4 +1,5 @@
-import { Component } from '@angular/core'
+import { Component, HostBinding } from '@angular/core'
+import { X11Socket } from '../session/x11'
 import { ConfigService, HostAppService, Platform } from 'tabby-core'
 
 /** @hidden */
@@ -7,9 +8,19 @@ import { ConfigService, HostAppService, Platform } from 'tabby-core'
 })
 export class SSHSettingsTabComponent {
     Platform = Platform
+    defaultX11Display: string
+
+    @HostBinding('class.content-box') true
 
     constructor (
         public config: ConfigService,
         public hostApp: HostAppService,
-    ) { }
+    ) {
+        const spec = X11Socket.resolveDisplaySpec()
+        if ('path' in spec) {
+            this.defaultX11Display = spec.path
+        } else {
+            this.defaultX11Display = `${spec.host}:${spec.port}`
+        }
+    }
 }

tabby-ssh/src/config.ts

@@ -8,6 +8,7 @@ export class SSHConfigProvider extends ConfigProvider {
             winSCPPath: null,
             agentType: 'auto',
             agentPath: null,
+            x11Display: null,
         },
         hotkeys: {
             'restart-ssh-session': [],

tabby-ssh/src/profiles.ts

@@ -6,7 +6,6 @@ import { SSHTabComponent } from './components/sshTab.component'
 import { PasswordStorageService } from './services/passwordStorage.service'
 import { ALGORITHM_BLACKLIST, SSHAlgorithmType, SSHProfile } from './api'
 
-
 @Injectable({ providedIn: 'root' })
 export class SSHProfilesService extends ProfileProvider<SSHProfile> {
     id = 'ssh'
@@ -94,7 +93,7 @@ export class SSHProfilesService extends ProfileProvider<SSHProfile> {
     }
 
     quickConnect (query: string): PartialProfile<SSHProfile> {
-        let user = 'root'
+        let user: string|undefined = undefined
         let host = query
         let port = 22
         if (host.includes('@')) {

tabby-ssh/src/session/ssh.ts

@@ -9,7 +9,7 @@ import { Injector, NgZone } from '@angular/core'
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
 import { ConfigService, FileProvidersService, HostAppService, NotificationsService, Platform, PlatformService, wrapPromise, PromptModalComponent, LogService } from 'tabby-core'
 import { BaseSession } from 'tabby-terminal'
-import { Socket, createConnection } from 'net'
+import { Socket } from 'net'
 import { Client, ClientChannel, SFTPWrapper } from 'ssh2'
 import { Subject, Observable } from 'rxjs'
 import { ProxyCommandStream } from '../services/ssh.service'
@@ -18,6 +18,7 @@ import { promisify } from 'util'
 import { SFTPSession } from './sftp'
 import { ALGORITHM_BLACKLIST, SSHAlgorithmType, PortForwardType, SSHProfile } from '../api'
 import { ForwardedPort } from './forwards'
+import { X11Socket } from './x11'
 
 const WINDOWS_OPENSSH_AGENT_PIPE = '\\\\.\\pipe\\openssh-ssh-agent'
 
@@ -250,8 +251,12 @@ export class SSHSession extends BaseSession {
             if (!this.authUsername) {
                 const modal = this.ngbModal.open(PromptModalComponent)
                 modal.componentInstance.prompt = `Username for ${this.profile.options.host}`
-                const result = await modal.result
-                this.authUsername = result?.value ?? null
+                try {
+                    const result = await modal.result
+                    this.authUsername = result?.value ?? null
+                } catch {
+                    this.authUsername = 'root'
+                }
             }
 
             ssh.connect({
@@ -355,41 +360,35 @@ export class SSHSession extends BaseSession {
             })
         })
 
-        this.ssh.on('x11', (details, accept, reject) => {
+        this.ssh.on('x11', async (details, accept, reject) => {
             this.logger.info(`Incoming X11 connection from ${details.srcIP}:${details.srcPort}`)
-            const displaySpec = process.env.DISPLAY ?? ':0'
+            const displaySpec = process.env.DISPLAY ?? 'localhost:0'
             this.logger.debug(`Trying display ${displaySpec}`)
-            const xHost = displaySpec.split(':')[0]
-            const xDisplay = parseInt(displaySpec.split(':')[1].split('.')[0] || '0')
-            const xPort = xDisplay < 100 ? xDisplay + 6000 : xDisplay
 
-            const socket = displaySpec.startsWith('/') ? createConnection(displaySpec) : new Socket()
-            if (!displaySpec.startsWith('/')) {
-                socket.connect(xPort, xHost)
-            }
-            socket.on('error', e => {
+            const socket = new X11Socket()
+            try {
+                const x11Stream = await socket.connect(displaySpec)
+                this.logger.info('Connection forwarded')
+                const stream = accept()
+                stream.pipe(x11Stream)
+                x11Stream.pipe(stream)
+                stream.on('close', () => {
+                    socket.destroy()
+                })
+                x11Stream.on('close', () => {
+                    stream.close()
+                })
+            } catch (e) {
                 // eslint-disable-next-line @typescript-eslint/no-base-to-string
                 this.emitServiceMessage(colors.bgRed.black(' X ') + ` Could not connect to the X server: ${e}`)
-                this.emitServiceMessage(`    Tabby tried to connect to ${xHost}:${xPort} based on the DISPLAY environment var (${displaySpec})`)
+                this.emitServiceMessage(`    Tabby tried to connect to ${JSON.stringify(X11Socket.resolveDisplaySpec(displaySpec))} based on the DISPLAY environment var (${displaySpec})`)
                 if (process.platform === 'win32') {
                     this.emitServiceMessage('    To use X forwarding, you need a local X server, e.g.:')
                     this.emitServiceMessage('    * VcXsrv: https://sourceforge.net/projects/vcxsrv/')
                     this.emitServiceMessage('    * Xming: https://sourceforge.net/projects/xming/')
                 }
                 reject()
-            })
-            socket.on('connect', () => {
-                this.logger.info('Connection forwarded')
-                const stream = accept()
-                stream.pipe(socket)
-                socket.pipe(stream)
-                stream.on('close', () => {
-                    socket.destroy()
-                })
-                socket.on('close', () => {
-                    stream.close()
-                })
-            })
+            }
         })
     }
 

tabby-ssh/src/session/x11.ts

@@ -0,0 +1,57 @@
+import { Socket, SocketConnectOpts } from 'net'
+import { Subject } from 'rxjs'
+
+export class X11Socket {
+    error$ = new Subject<Error>()
+    private socket: Socket | null = null
+
+    static resolveDisplaySpec (spec?: string|null): SocketConnectOpts {
+        // eslint-disable-next-line prefer-const
+        let [xHost, xDisplay] = /^(.+):(\d+)(?:.(\d+))$/.exec(spec ?? process.env.DISPLAY ?? 'localhost:0') ?? []
+        if (process.platform === 'win32') {
+            xHost ??= 'localhost'
+        } else {
+            xHost ??= 'unix'
+        }
+
+        if (spec?.startsWith('/')) {
+            xHost = spec
+        }
+
+        const display = parseInt(xDisplay || '0')
+        const port = display < 100 ? display + 6000 : display
+
+        if (xHost === 'unix') {
+            xHost = `/tmp/.X11-unix/X${display}`
+        }
+
+        if (xHost.startsWith('/')) {
+            return {
+                path: xHost,
+            }
+        } else {
+            return {
+                host: xHost,
+                port: port,
+            }
+        }
+    }
+
+    connect (spec: string): Promise<Socket> {
+        this.socket = new Socket()
+        return new Promise((resolve, reject) => {
+            this.socket!.on('connect', () => {
+                resolve(this.socket!)
+            })
+            this.socket!.on('error', e => {
+                this.error$.next(e)
+                reject(e)
+            })
+            this.socket!.connect(X11Socket.resolveDisplaySpec(spec))
+        })
+    }
+
+    destroy (): void {
+        this.socket?.destroy()
+    }
+}

tabby-ssh/yarn.lock

@@ -28,9 +28,9 @@ ansi-colors@^4.1.1:
   integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==
 
 ansi-regex@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.0.0.tgz#ecc7f5933cbe5ac7b33e209a5ff409ab1669c6b2"
-  integrity sha512-tAaOSrWCHF+1Ear1Z4wnJCXA9GGox4K6Ic85a5qalES2aeEwQGr7UC93mwef49536PkCYjzkp0zIxfFvexJ6zQ==
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.0.1.tgz#3183e38fae9a65d7cb5e53945cd5897d0260a06a"
+  integrity sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==
 
 asn1@~0.2.3:
   version "0.2.4"

tabby-telnet/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tabby-telnet",
-  "version": "1.0.156",
+  "version": "1.0.163",
   "description": "Telnet/socket connections for Tabby",
   "keywords": [
     "tabby-builtin-plugin"

tabby-terminal/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tabby-terminal",
-  "version": "1.0.156",
+  "version": "1.0.163",
   "description": "Tabby's terminal emulation core",
   "keywords": [
     "tabby-builtin-plugin"
@@ -16,9 +16,6 @@
   ],
   "author": "Eugene Pankov",
   "license": "MIT",
-  "dependencies": {
-    "opentype.js": "^1.3.3"
-  },
   "devDependencies": {
     "ansi-colors": "^4.1.1",
     "binstring": "^0.2.1",
@@ -28,15 +25,18 @@
     "hexer": "^1.5.0",
     "ps-node": "^0.1.6",
     "runes": "^0.4.2",
-    "xterm": "npm:@tabby-gang/xterm@4.14.0",
+    "xterm": "npm:@tabby-gang/xterm@^4.15.1-beta.1",
     "xterm-addon-fit": "^0.5.0",
     "xterm-addon-ligatures": "^0.5.0",
     "xterm-addon-search": "^0.8.1",
-    "xterm-addon-serialize": "^0.6.0",
+    "xterm-addon-serialize": "^0.6.1",
     "xterm-addon-unicode11": "^0.3.0",
-    "xterm-addon-webgl": "^0.11.2",
+    "xterm-addon-webgl": "^0.11.3",
     "zmodem.js": "^0.1.9"
   },
+  "resolutions": {
+    "**/opentype.js": "^1.3.4"
+  },
   "peerDependencies": {
     "@angular/animations": "^9.1.9",
     "@angular/common": "^9.1.11",

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

@@ -565,13 +565,27 @@ export class BaseTerminalTabComponent extends BaseTabComponent implements OnInit
         this.termContainerSubscriptions.cancelAll()
     }
 
-    protected async handleRightClick (event: MouseEvent): Promise<void> {
+    private rightMouseDownTime = 0
+
+    protected async handleRightMouseDown (event: MouseEvent): Promise<void> {
         event.preventDefault()
         event.stopPropagation()
+        this.rightMouseDownTime = Date.now()
         if (this.config.store.terminal.rightClick === 'menu') {
             this.platform.popupContextMenu(await this.buildContextMenu(), event)
-        } else if (this.config.store.terminal.rightClick === 'paste') {
-            this.paste()
+        }
+    }
+
+    protected async handleRightMouseUp (event: MouseEvent): Promise<void> {
+        event.preventDefault()
+        event.stopPropagation()
+        if (this.config.store.terminal.rightClick === 'paste') {
+            const duration = Date.now() - this.rightMouseDownTime
+            if (duration < 250) {
+                this.paste()
+            } else {
+                this.platform.popupContextMenu(await this.buildContextMenu(), event)
+            }
         }
     }
 
@@ -611,7 +625,13 @@ export class BaseTerminalTabComponent extends BaseTabComponent implements OnInit
                     return
                 }
                 if (event.which === 3 || event.which === 1 && event.ctrlKey) {
-                    this.handleRightClick(event)
+                    this.handleRightMouseDown(event)
+                    return
+                }
+            }
+            if (event.type === 'mouseup') {
+                if (event.which === 3 || event.which === 1 && event.ctrlKey) {
+                    this.handleRightMouseUp(event)
                     return
                 }
             }

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

@@ -27,94 +27,92 @@ h3.mb-3 Appearance
                 (ngModelChange)='config.save()',
             )
 
-        .alert.alert-info.d-flex.align-items-center(*ngIf='config.store.terminal.ligatures && config.store.terminal.frontend == "xterm-webgl"') Ligatures are not supported by the WebGL frontend
-
-
     .col-12.col-md-6
         color-scheme-preview([scheme]='config.store.terminal.colorScheme', [fontPreview]='true')
 
-.form-line
-    .header
-        .title Terminal background
+.content-box
+    .form-line
+        .header
+            .title Terminal background
 
-    .btn-group(
-        [(ngModel)]='config.store.terminal.background',
-        (ngModelChange)='config.save()',
-        ngbRadioGroup
+        .btn-group(
+            [(ngModel)]='config.store.terminal.background',
+            (ngModelChange)='config.save()',
+            ngbRadioGroup
+        )
+            label.btn.btn-secondary(ngbButtonLabel)
+                input(
+                    type='radio',
+                    ngbButton,
+                    [value]='"theme"'
+                )
+                | From theme
+            label.btn.btn-secondary(ngbButtonLabel)
+                input(
+                    type='radio',
+                    ngbButton,
+                    [value]='"colorScheme"'
+                )
+                | From color scheme
+
+    .form-line
+        .header
+            .title Cursor shape
+
+        .btn-group(
+            [(ngModel)]='config.store.terminal.cursor',
+            (ngModelChange)='config.save()',
+            ngbRadioGroup
+        )
+            label.btn.btn-secondary(ngbButtonLabel)
+                input(
+                    type='radio',
+                    ngbButton,
+                    [value]='"block"'
+                )
+                | █
+            label.btn.btn-secondary(ngbButtonLabel)
+                input(
+                    type='radio',
+                    ngbButton,
+                    [value]='"beam"'
+                )
+                | |
+            label.btn.btn-secondary(ngbButtonLabel)
+                input(
+                    type='radio',
+                    ngbButton,
+                    [value]='"underline"'
+                )
+                | ▁
+
+    .form-line
+        .header
+            .title Blink cursor
+
+        toggle(
+            [(ngModel)]='config.store.terminal.cursorBlink',
+            (ngModelChange)='config.save()',
+        )
+
+    .form-line
+        .header
+            .title Fallback font
+            .description A second font family used to display characters missing in the main font
+
+        input.form-control(
+            type='text',
+            [ngbTypeahead]='fontAutocomplete',
+            [(ngModel)]='config.store.terminal.fallbackFont',
+            (ngModelChange)='config.save()'
+        )
+
+
+    .form-line
+        .header
+            .title Custom CSS
+
+    textarea.form-control.mb-5(
+        [(ngModel)]='config.store.appearance.css',
+        (ngModelChange)='saveConfiguration()',
     )
-        label.btn.btn-secondary(ngbButtonLabel)
-            input(
-                type='radio',
-                ngbButton,
-                [value]='"theme"'
-            )
-            | From theme
-        label.btn.btn-secondary(ngbButtonLabel)
-            input(
-                type='radio',
-                ngbButton,
-                [value]='"colorScheme"'
-            )
-            | From color scheme
-
-.form-line
-    .header
-        .title Cursor shape
-
-    .btn-group(
-        [(ngModel)]='config.store.terminal.cursor',
-        (ngModelChange)='config.save()',
-        ngbRadioGroup
-    )
-        label.btn.btn-secondary(ngbButtonLabel)
-            input(
-                type='radio',
-                ngbButton,
-                [value]='"block"'
-            )
-            | █
-        label.btn.btn-secondary(ngbButtonLabel)
-            input(
-                type='radio',
-                ngbButton,
-                [value]='"beam"'
-            )
-            | |
-        label.btn.btn-secondary(ngbButtonLabel)
-            input(
-                type='radio',
-                ngbButton,
-                [value]='"underline"'
-            )
-            | ▁
-
-.form-line
-    .header
-        .title Blink cursor
-
-    toggle(
-        [(ngModel)]='config.store.terminal.cursorBlink',
-        (ngModelChange)='config.save()',
-    )
-
-.form-line
-    .header
-        .title Fallback font
-        .description A second font family used to display characters missing in the main font
-
-    input.form-control(
-        type='text',
-        [ngbTypeahead]='fontAutocomplete',
-        [(ngModel)]='config.store.terminal.fallbackFont',
-        (ngModelChange)='config.save()'
-    )
-
-
-.form-line
-    .header
-        .title Custom CSS
-
-textarea.form-control.mb-5(
-    [(ngModel)]='config.store.appearance.css',
-    (ngModelChange)='saveConfiguration()',
-)

tabby-terminal/src/components/baseTerminalTab.component.pug

@@ -1,7 +1,7 @@
 .terminal-toolbar-spacer
 .content(#content, [style.opacity]='frontendIsReady ? 1 : 0')
 search-panel(
-    *ngIf='showSearchPanel',
+    *ngIf='showSearchPanel && hasFocus',
     @toolbarSlide,
     [frontend]='frontend',
     (close)='showSearchPanel = false'

tabby-terminal/src/components/colorSchemeSettingsTab.component.ts

@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 import deepEqual from 'deep-equal'
 
-import { Component, Inject, Input, ChangeDetectionStrategy, ChangeDetectorRef } from '@angular/core'
+import { Component, Inject, Input, ChangeDetectionStrategy, ChangeDetectorRef, HostBinding } from '@angular/core'
 import { ConfigService, PlatformService } from 'tabby-core'
 import { TerminalColorSchemeProvider } from '../api/colorSchemeProvider'
 import { TerminalColorScheme } from '../api/interfaces'
@@ -23,6 +23,8 @@ export class ColorSchemeSettingsTabComponent {
     currentStockScheme: TerminalColorScheme|null = null
     currentCustomScheme: TerminalColorScheme|null = null
 
+    @HostBinding('class.content-box') true
+
     constructor (
         @Inject(TerminalColorSchemeProvider) private colorSchemeProviders: TerminalColorSchemeProvider[],
         private changeDetector: ChangeDetectorRef,

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

@@ -12,16 +12,16 @@ input.search-input.form-control(
 button.btn.btn-link(
     (click)='findPrevious()',
     ngbTooltip='Search up',
-    placement='bottom'
+    placement='bottom',
+    [fastHtmlBind]='icons.arrowUp'
 )
-    i.fa.fa-fw.fa-arrow-up
 
 button.btn.btn-link(
     (click)='findNext()',
     ngbTooltip='Search down',
-    placement='bottom'
+    placement='bottom',
+    [fastHtmlBind]='icons.arrowDown'
 )
-    i.fa.fa-fw.fa-arrow-down
 
 .mr-2
 
@@ -29,26 +29,29 @@ button.btn.btn-link(
     (click)='options.caseSensitive = !options.caseSensitive; saveSearchOptions()',
     [class.active]='options.caseSensitive',
     ngbTooltip='Case sensitivity',
-    placement='bottom'
+    placement='bottom',
+    [fastHtmlBind]='icons.case'
 )
-    i.fa.fa-fw.fa-font
 
 button.btn.btn-link(
     (click)='options.regex = !options.regex; saveSearchOptions()',
     [class.active]='options.regex',
     ngbTooltip='Regular expression',
-    placement='bottom'
+    placement='bottom',
+    [fastHtmlBind]='icons.regexp'
 )
-    i.fa.fa-fw.fa-asterisk
+
 button.btn.btn-link(
     (click)='options.wholeWord = !options.wholeWord; saveSearchOptions()',
     [class.active]='options.wholeWord',
     ngbTooltip='Whole word',
-    placement='bottom'
+    placement='bottom',
+    [fastHtmlBind]='icons.wholeWord'
 )
-    i.fa.fa-fw.fa-text-width
 
 .mr-2
 
-button.btn.btn-link((click)='close.emit()')
-    i.fa.fa-fw.fa-times
+button.btn.btn-link(
+    (click)='close.emit()',
+    [fastHtmlBind]='icons.close'
+)

tabby-terminal/src/components/searchPanel.component.scss

@@ -1,10 +1,9 @@
 :host {
     position: fixed;
     width: 400px;
-    right: 50px;
+    right: 40px;
     z-index: 5;
-    padding: 10px;
-    border-radius: 0 0 3px 3px;
+    border-radius: 0 0 5px 5px;
     background: rgba(0, 0, 0, .95);
     border: 1px solid rgba(0, 0, 0, .5);
     border-top: 0;
@@ -12,6 +11,7 @@
 
     button {
         padding: 0 6px;
+        margin: 4px 2px;
         flex-shrink: 0;
     }
 }

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

@@ -18,6 +18,15 @@ export class SearchPanelComponent {
 
     @Output() close = new EventEmitter()
 
+    icons = {
+        'case': require('../icons/case.svg'),
+        regexp: require('../icons/regexp.svg'),
+        wholeWord: require('../icons/whole-word.svg'),
+        arrowUp: require('../icons/arrow-up.svg'),
+        arrowDown: require('../icons/arrow-down.svg'),
+        close: require('../icons/close.svg'),
+    }
+
     constructor (
         private notifications: NotificationsService,
         public config: ConfigService,

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

@@ -49,6 +49,7 @@ h3.mb-3 Terminal
 .form-line
     .header
         .title Right click
+        .description(*ngIf='config.store.terminal.rightClick == "paste"') Long-click for context menu
     .btn-group(
         [(ngModel)]='config.store.terminal.rightClick',
         (ngModelChange)='config.save()',

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

@@ -1,4 +1,4 @@
-import { Component } from '@angular/core'
+import { Component, HostBinding } from '@angular/core'
 import { ConfigService, HostAppService, Platform, PlatformService } from 'tabby-core'
 
 /** @hidden */
@@ -8,6 +8,8 @@ import { ConfigService, HostAppService, Platform, PlatformService } from 'tabby-
 export class TerminalSettingsTabComponent {
     Platform = Platform
 
+    @HostBinding('class.content-box') true
+
     constructor (
         public config: ConfigService,
         public hostApp: HostAppService,

tabby-terminal/src/frontends/frontend.ts

@@ -24,6 +24,7 @@ export abstract class Frontend {
     protected resize = new ReplaySubject<ResizeEvent>(1)
     protected dragOver = new Subject<DragEvent>()
     protected drop = new Subject<DragEvent>()
+    protected destroyed = new Subject<void>()
 
     get ready$ (): Observable<void> { return this.ready }
     get title$ (): Observable<string> { return this.title }
@@ -35,10 +36,12 @@ export abstract class Frontend {
     get resize$ (): Observable<ResizeEvent> { return this.resize }
     get dragOver$ (): Observable<DragEvent> { return this.dragOver }
     get drop$ (): Observable<DragEvent> { return this.drop }
+    get destroyed$ (): Observable<void> { return this.destroyed }
 
     constructor (protected injector: Injector) { }
 
     destroy (): void {
+        this.destroyed.next()
         for (const o of [
             this.ready,
             this.title,
@@ -50,6 +53,7 @@ export abstract class Frontend {
             this.resize,
             this.dragOver,
             this.drop,
+            this.destroyed,
         ]) {
             o.complete()
         }

tabby-terminal/src/frontends/xtermFrontend.ts

@@ -1,6 +1,7 @@
 import { Injector } from '@angular/core'
 import { ConfigService, getCSSFontFamily, HostAppService, HotkeysService, Platform, PlatformService } from 'tabby-core'
 import { Frontend, SearchOptions } from './frontend'
+import { takeUntil } from 'rxjs'
 import { Terminal, ITheme } from 'xterm'
 import { FitAddon } from 'xterm-addon-fit'
 import { LigaturesAddon } from 'xterm-addon-ligatures'
@@ -118,20 +119,8 @@ export class XTermFrontend extends Frontend {
         this.resizeHandler = () => {
             try {
                 if (this.xterm.element && getComputedStyle(this.xterm.element).getPropertyValue('height') !== 'auto') {
-                    const t = window.getComputedStyle(this.xterm.element.parentElement!)
-                    const r = parseInt(t.getPropertyValue('height'))
-                    const n = Math.max(0, parseInt(t.getPropertyValue('width')))
-                    const o = window.getComputedStyle(this.xterm.element)
-                    const i = r - (parseInt(o.getPropertyValue('padding-top')) + parseInt(o.getPropertyValue('padding-bottom')))
-                    const l = n - (parseInt(o.getPropertyValue('padding-right')) + parseInt(o.getPropertyValue('padding-left'))) - this.xtermCore.viewport.scrollBarWidth
-                    const actualCellWidth = this.xtermCore._renderService.dimensions.actualCellWidth || 9
-                    const actualCellHeight = this.xtermCore._renderService.dimensions.actualCellHeight || 17
-                    const cols = Math.floor(l / actualCellWidth)
-                    const rows = Math.floor(i / actualCellHeight)
-
-                    if (!isNaN(cols) && !isNaN(rows)) {
-                        this.xterm.resize(cols, rows)
-                    }
+                    this.fitAddon.fit()
+                    this.xtermCore.viewport._refresh()
                 }
             } catch (e) {
                 // tends to throw when element wasn't shown yet
@@ -163,6 +152,11 @@ export class XTermFrontend extends Frontend {
         if (this.enableWebGL) {
             this.webGLAddon = new WebglAddon()
             this.xterm.loadAddon(this.webGLAddon)
+            this.platformService.displayMetricsChanged$.pipe(
+                takeUntil(this.destroyed$),
+            ).subscribe(() => {
+                this.webGLAddon?.clearTextureAtlas()
+            })
         }
 
         this.ready.next()
@@ -269,15 +263,15 @@ export class XTermFrontend extends Frontend {
             }
         })
 
-        this.xterm.setOption('fontFamily', getCSSFontFamily(config))
-        this.xterm.setOption('bellStyle', config.terminal.bell)
-        this.xterm.setOption('cursorStyle', {
+        this.xterm.options.fontFamily = getCSSFontFamily(config)
+        this.xterm.options.bellStyle = config.terminal.bell
+        this.xterm.options.cursorStyle = {
             beam: 'bar',
-        }[config.terminal.cursor] || config.terminal.cursor)
-        this.xterm.setOption('cursorBlink', config.terminal.cursorBlink)
-        this.xterm.setOption('macOptionIsMeta', config.terminal.altIsMeta)
-        this.xterm.setOption('scrollback', config.terminal.scrollbackLines)
-        this.xterm.setOption('wordSeparator', config.terminal.wordSeparator)
+        }[config.terminal.cursor] || config.terminal.cursor
+        this.xterm.options.cursorBlink = config.terminal.cursorBlink
+        this.xterm.options.macOptionIsMeta = config.terminal.altIsMeta
+        this.xterm.options.scrollback = config.terminal.scrollbackLines
+        this.xterm.options.wordSeparator = config.terminal.wordSeparator
         this.configuredFontSize = config.terminal.fontSize
         this.configuredLinePadding = config.terminal.linePadding
         this.setFontSize()
@@ -297,7 +291,7 @@ export class XTermFrontend extends Frontend {
         }
 
         if (this.xtermCore._colorManager && !deepEqual(this.configuredTheme, theme)) {
-            this.xterm.setOption('theme', theme)
+            this.xterm.options.theme = theme
             this.configuredTheme = theme
         }
 
@@ -321,7 +315,11 @@ export class XTermFrontend extends Frontend {
     }
 
     saveState (): any {
-        return this.serializeAddon.serialize(1000)
+        return this.serializeAddon.serialize({
+            excludeAltBuffer: true,
+            excludeModes: true,
+            scrollback: 1000,
+        })
     }
 
     restoreState (state: string): void {
@@ -334,9 +332,9 @@ export class XTermFrontend extends Frontend {
 
     private setFontSize () {
         const scale = Math.pow(1.1, this.zoom)
-        this.xterm.setOption('fontSize', this.configuredFontSize * scale)
+        this.xterm.options.fontSize = this.configuredFontSize * scale
         // eslint-disable-next-line @typescript-eslint/restrict-plus-operands
-        this.xterm.setOption('lineHeight', (this.configuredFontSize + this.configuredLinePadding * 2) / this.configuredFontSize)
+        this.xterm.options.lineHeight = (this.configuredFontSize + this.configuredLinePadding * 2) / this.configuredFontSize * scale
         this.resizeHandler()
     }
 

tabby-terminal/src/icons/arrow-down.svg

@@ -0,0 +1 @@
+<svg aria-hidden="true" focusable="false" data-prefix="fal" data-icon="arrow-down" class="svg-inline--fa fa-arrow-down" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 384 512"><path fill="currentColor" d="M378.8 309.8l-176 165.9C199.7 478.6 195.9 480 192 480s-7.719-1.426-10.77-4.31l-176-165.9C-1.297 303.6-1.781 293.1 4.156 286.3c5.953-6.838 16.09-7.259 22.61-1.134L176 425.9V48.59c0-9.171 7.156-16.59 15.1-16.59S208 39.42 208 48.59v377.3l149.2-140.7c6.516-6.125 16.66-5.704 22.61 1.134C385.8 293.1 385.3 303.6 378.8 309.8z"></path></svg>

tabby-terminal/src/icons/arrow-up.svg

@@ -0,0 +1 @@
+<svg aria-hidden="true" focusable="false" data-prefix="fal" data-icon="arrow-up" class="svg-inline--fa fa-arrow-up" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 384 512"><path fill="currentColor" d="M379.8 225.7C376.7 229.3 372.3 231.1 368 231.1c-3.844 0-7.703-1.426-10.77-4.31L208 86.12v377.3c0 9.171-7.156 16.59-15.1 16.59S176 472.6 176 463.4V86.12l-149.2 140.7C20.25 232.1 10.14 232.5 4.156 225.7C-1.781 218.9-1.297 208.4 5.234 202.2l176-165.9c6.094-5.768 15.44-5.768 21.53 0l176 165.9C385.3 208.4 385.8 218.9 379.8 225.7z"></path></svg>