Compare commits

...

353 Commits

Author SHA1 Message Date
Eugene Pankov
0f6855d978 only leave a process running on macOS- fixes #4442 2021-08-19 09:35:42 +02:00
Eugene Pankov
3102f39706 Update yarn.lock 2021-08-18 23:57:58 +02:00
Eugene Pankov
46ac0a6caf Update yarn.lock 2021-08-18 23:56:23 +02:00
Eugene Pankov
68e1db040a bumped node-pty 2021-08-18 23:56:20 +02:00
Eugene Pankov
e34772b8b8 throw build errors in CI 2021-08-18 23:29:35 +02:00
Eugene Pankov
cf6558ec6a lint 2021-08-16 20:11:22 +02:00
Eugene Pankov
f5f88d3d9d fixed touchbar activity indicators 2021-08-16 20:10:34 +02:00
Eugene Pankov
64955bfcd6 fixed macos-release imports 2021-08-16 20:10:30 +02:00
Eugene Pankov
9fa9021a81 fixed xterm cursor blinker leak - fixes #4166 2021-08-16 20:10:22 +02:00
Eugene Pankov
43183401b7 dropped nested corejs dep 2021-08-16 20:10:15 +02:00
dependabot[bot]
880b9ce82b Bump macos-release from 2.5.0 to 3.0.0
Bumps [macos-release](https://github.com/sindresorhus/macos-release) from 2.5.0 to 3.0.0.
- [Release notes](https://github.com/sindresorhus/macos-release/releases)
- [Commits](https://github.com/sindresorhus/macos-release/compare/v2.5.0...v3.0.0)

---
updated-dependencies:
- dependency-name: macos-release
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-08-16 20:10:04 +02:00
Eugene Pankov
3584af524b telnet: added potentially missing WILL responses 2021-08-15 22:31:40 +02:00
Eugene Pankov
af174933d6 telnet: fixed size negotiation order 2021-08-15 19:58:28 +02:00
Eugene Pankov
c4490717c0 lint 2021-08-15 19:42:26 +02:00
Eugene Pankov
70b6be7301 autocomplete profile colors - fixes #4231 2021-08-15 16:16:26 +02:00
Eugene Pankov
8d5b0fe863 macOS: don't exit when the last window is closed - fixes #4263 2021-08-15 14:42:48 +02:00
Eugene Pankov
03045eb952 fixed titlebar not adjusting to macOS fullscreen mode - fixes #4274 2021-08-15 14:40:40 +02:00
Eugene Pankov
f7b0272be5 allow type aliases 2021-08-15 14:23:26 +02:00
Eugene Pankov
4fa16c8a20 fixed split attachment - fixes #4374 2021-08-15 14:13:29 +02:00
Eugene Pankov
855a7bbe14 include platform arch in github issues 2021-08-15 13:47:56 +02:00
Eugene Pankov
2b3694f517 theme tweaks 2021-08-15 13:47:46 +02:00
Eugene Pankov
101177a865 fixed jump hosts using a partial profile - fixes #3294, fixes #4307, fixes #4396 2021-08-15 13:38:11 +02:00
Eugene Pankov
8b33f98c79 reduce hotkey timeout 2021-08-15 13:25:14 +02:00
Eugene Pankov
98e52f50a9 lint 2021-08-14 23:37:42 +02:00
Eugene Pankov
7551201796 fixed recovery of custom tab titles - fixes #4406 2021-08-14 23:36:41 +02:00
Eugene Pankov
3fe2dccb94 fixed instantiating saved layouts - fixes #4413 2021-08-14 23:34:01 +02:00
Eugene Pankov
f53eb31274 theme tweaks 2021-08-14 23:27:13 +02:00
Eugene Pankov
81663f351a show icon colors in profile selector - fixes #4405 2021-08-14 23:14:14 +02:00
Eugeny
bf5d037cff Merge pull request #4385 from Eugeny/dependabot/npm_and_yarn/electron-13.1.9
Bump electron from 13.1.8 to 13.1.9
2021-08-11 10:52:47 +02:00
Eugeny
53d9af3279 Merge pull request #4386 from Eugeny/dependabot/npm_and_yarn/electron-rebuild-3.1.1
Bump electron-rebuild from 2.3.5 to 3.1.1
2021-08-11 10:52:33 +02:00
Eugeny
b7dd354313 Merge pull request #4394 from Eugeny/dependabot/npm_and_yarn/webpack-5.50.0
Bump webpack from 5.48.0 to 5.50.0
2021-08-11 10:52:14 +02:00
dependabot[bot]
d8bc9ce859 Bump webpack from 5.48.0 to 5.50.0
Bumps [webpack](https://github.com/webpack/webpack) from 5.48.0 to 5.50.0.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v5.48.0...v5.50.0)

---
updated-dependencies:
- dependency-name: webpack
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-08-11 04:05:45 +00:00
dependabot[bot]
1bb9358f77 Bump electron-rebuild from 2.3.5 to 3.1.1
Bumps [electron-rebuild](https://github.com/electron/electron-rebuild) from 2.3.5 to 3.1.1.
- [Release notes](https://github.com/electron/electron-rebuild/releases)
- [Changelog](https://github.com/electron/electron-rebuild/blob/master/.releaserc.json)
- [Commits](https://github.com/electron/electron-rebuild/compare/v2.3.5...v3.1.1)

---
updated-dependencies:
- dependency-name: electron-rebuild
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-08-10 04:05:35 +00:00
dependabot[bot]
fa77ff3995 Bump electron from 13.1.8 to 13.1.9
Bumps [electron](https://github.com/electron/electron) from 13.1.8 to 13.1.9.
- [Release notes](https://github.com/electron/electron/releases)
- [Changelog](https://github.com/electron/electron/blob/main/docs/breaking-changes.md)
- [Commits](https://github.com/electron/electron/compare/v13.1.8...v13.1.9)

---
updated-dependencies:
- dependency-name: electron
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-08-10 04:04:55 +00:00
Eugene Pankov
1ae8d9c643 removed hterm - #4295 2021-08-08 22:06:08 +02:00
Eugene Pankov
a560f0c96e Update README.md 2021-08-08 18:04:21 +02:00
Eugene Pankov
434bacf185 fixed hotkey race condition 2021-08-08 17:54:53 +02:00
Eugene Pankov
79de7ec015 selector ui tweaks 2021-08-08 17:54:39 +02:00
Eugene Pankov
dfdb3b051b fixed hotkey IDs for profiles with "." in name - fixes #4367 2021-08-07 19:35:11 +02:00
Eugene Pankov
9fbf9136fc moved touchbar handling into main process 2021-08-07 19:34:37 +02:00
Eugene Pankov
25fdba7104 throttle global hotkey - fixes #4371 2021-08-07 10:25:49 +02:00
Eugeny
c91707e94f Merge pull request #4331 from Eugeny/dependabot/npm_and_yarn/typescript-eslint/eslint-plugin-4.29.0
Bump @typescript-eslint/eslint-plugin from 4.28.5 to 4.29.0
2021-08-06 10:12:53 +02:00
Eugeny
d665eef430 Merge pull request #4349 from Eugeny/dependabot/npm_and_yarn/app/yargs-17.1.0
Bump yargs from 17.0.1 to 17.1.0 in /app
2021-08-06 10:12:42 +02:00
Eugeny
4579e839cd Merge pull request #4350 from Eugeny/dependabot/npm_and_yarn/app/angular/cdk-12.2.0
Bump @angular/cdk from 12.1.2 to 12.2.0 in /app
2021-08-06 10:12:14 +02:00
Eugeny
6e952180ec Merge pull request #4351 from Eugeny/dependabot/npm_and_yarn/fortawesome/fontawesome-free-5.15.4
Bump @fortawesome/fontawesome-free from 5.15.3 to 5.15.4
2021-08-06 10:12:04 +02:00
Eugeny
a947254ca8 Merge pull request #4360 from Eugeny/dependabot/npm_and_yarn/graceful-fs-4.2.8
Bump graceful-fs from 4.2.6 to 4.2.8
2021-08-06 10:11:05 +02:00
Eugeny
1eb4a7fc26 Merge pull request #4361 from Eugeny/dependabot/github_actions/actions/setup-node-2.4.0
Bump actions/setup-node from 2.2.0 to 2.4.0
2021-08-06 10:10:48 +02:00
Eugeny
78f25a7679 Merge pull request #4364 from Eugeny/all-contributors/add-al-wi 2021-08-06 10:09:35 +02:00
allcontributors[bot]
0c4d8b0784 docs: update .all-contributorsrc [skip ci] 2021-08-06 08:09:22 +00:00
Eugeny
e2c8093b97 Merge pull request #4363 from al-wi/profile-filter-terms
Profile filter per search term instead of the entire search input
2021-08-06 10:09:21 +02:00
allcontributors[bot]
c497a71361 docs: update README.md [skip ci] 2021-08-06 08:09:21 +00:00
Alexander Wiedemann
ec2982b1c4 Filter per search term instead of the entire search input 2021-08-06 09:55:15 +02:00
Eugene Pankov
be0aeefdb3 Update baseTerminalTab.component.ts 2021-08-06 09:52:37 +02:00
Eugene Pankov
eadd8d563e more hotkey fixes 2021-08-06 09:52:34 +02:00
Eugene Pankov
08f1ad4c75 hotkey handling fixes 2021-08-06 09:43:54 +02:00
Eugene Pankov
426606ba06 fixed split tab index - fixes #4249 2021-08-06 09:07:38 +02:00
Eugene Pankov
7b59ba4b73 reworked hotkey handling - fixes #4355, fixes #4326, fixes #4340 2021-08-06 09:03:55 +02:00
dependabot[bot]
0471fcec15 Bump actions/setup-node from 2.2.0 to 2.4.0
Bumps [actions/setup-node](https://github.com/actions/setup-node) from 2.2.0 to 2.4.0.
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](https://github.com/actions/setup-node/compare/v2.2.0...v2.4.0)

---
updated-dependencies:
- dependency-name: actions/setup-node
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-08-06 04:19:59 +00:00
dependabot[bot]
4110d09dab Bump graceful-fs from 4.2.6 to 4.2.8
Bumps [graceful-fs](https://github.com/isaacs/node-graceful-fs) from 4.2.6 to 4.2.8.
- [Release notes](https://github.com/isaacs/node-graceful-fs/releases)
- [Commits](https://github.com/isaacs/node-graceful-fs/compare/v4.2.6...v4.2.8)

---
updated-dependencies:
- dependency-name: graceful-fs
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-08-06 04:07:47 +00:00
Eugene Pankov
533837f5b7 another possible fix for profile editing - #4330 2021-08-05 10:44:00 +02:00
dependabot[bot]
144924e579 Bump @fortawesome/fontawesome-free from 5.15.3 to 5.15.4
Bumps [@fortawesome/fontawesome-free](https://github.com/FortAwesome/Font-Awesome) from 5.15.3 to 5.15.4.
- [Release notes](https://github.com/FortAwesome/Font-Awesome/releases)
- [Changelog](https://github.com/FortAwesome/Font-Awesome/blob/master/CHANGELOG.md)
- [Commits](https://github.com/FortAwesome/Font-Awesome/compare/5.15.3...5.15.4)

---
updated-dependencies:
- dependency-name: "@fortawesome/fontawesome-free"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-08-05 04:03:37 +00:00
dependabot[bot]
6902ccdb95 Bump @angular/cdk from 12.1.2 to 12.2.0 in /app
Bumps [@angular/cdk](https://github.com/angular/components) from 12.1.2 to 12.2.0.
- [Release notes](https://github.com/angular/components/releases)
- [Changelog](https://github.com/angular/components/blob/master/CHANGELOG.md)
- [Commits](https://github.com/angular/components/compare/12.1.2...12.2.0)

---
updated-dependencies:
- dependency-name: "@angular/cdk"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-08-05 04:01:54 +00:00
dependabot[bot]
7ed5aff168 Bump yargs from 17.0.1 to 17.1.0 in /app
Bumps [yargs](https://github.com/yargs/yargs) from 17.0.1 to 17.1.0.
- [Release notes](https://github.com/yargs/yargs/releases)
- [Changelog](https://github.com/yargs/yargs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yargs/yargs/compare/v17.0.1...v17.1.0)

---
updated-dependencies:
- dependency-name: yargs
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-08-05 04:01:42 +00:00
Eugene Pankov
3f0db97a68 finally fixed docs 2021-08-04 20:53:42 +02:00
Eugene Pankov
231594d709 fixed docs build 2021-08-04 20:28:22 +02:00
Eugene Pankov
e4ae114c71 removed old ssh2 patch 2021-08-04 20:22:39 +02:00
Eugene Pankov
20000d16f8 fixed build order 2021-08-04 20:21:14 +02:00
Eugene Pankov
5e0a9b2e52 Merge branch 'master' of github.com:Eugeny/tabby 2021-08-04 19:51:11 +02:00
Eugene Pankov
fa70447223 keep "disable dynamic title" while duplicating or restoring a tab - fixes #4334 2021-08-04 19:51:08 +02:00
dependabot[bot]
acf418b52f Bump @typescript-eslint/eslint-plugin from 4.28.5 to 4.29.0
Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 4.28.5 to 4.29.0.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/eslint-plugin/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v4.29.0/packages/eslint-plugin)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/eslint-plugin"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-08-04 17:45:36 +00:00
Eugene Pankov
28b84e38ca fixed profiles not getting saved on Windows - fixes #4330 2021-08-04 19:44:02 +02:00
Eugeny
3c4a078fa5 Merge pull request #4322 from Eugeny/dependabot/npm_and_yarn/typedoc-0.21.5
Bump typedoc from 0.21.4 to 0.21.5
2021-08-04 19:41:21 +02:00
Eugeny
52f4e88420 Merge pull request #4333 from Eugeny/dependabot/npm_and_yarn/webpack-5.48.0 2021-08-04 19:40:47 +02:00
Eugeny
16d9045a80 Merge pull request #4336 from Eugeny/dependabot/npm_and_yarn/electron-13.1.8
Bump electron from 13.1.7 to 13.1.8
2021-08-04 19:39:37 +02:00
Eugeny
07d7d8daba Merge pull request #4321 from Eugeny/dependabot/npm_and_yarn/electron-notarize-1.0.1 2021-08-04 19:39:16 +02:00
Eugeny
b2b9476298 Merge pull request #4320 from Eugeny/dependabot/npm_and_yarn/eslint-7.32.0
Bump eslint from 7.31.0 to 7.32.0
2021-08-04 19:38:48 +02:00
Eugeny
cf7f3dffe3 Merge pull request #4317 from Eugeny/dependabot/npm_and_yarn/ssh2-1.2.0
Bump ssh2 from 1.1.0 to 1.2.0
2021-08-04 19:38:30 +02:00
Eugene Pankov
621005eb27 build order fix 2021-08-04 19:28:41 +02:00
dependabot[bot]
d46e1de8aa Bump electron from 13.1.7 to 13.1.8
Bumps [electron](https://github.com/electron/electron) from 13.1.7 to 13.1.8.
- [Release notes](https://github.com/electron/electron/releases)
- [Changelog](https://github.com/electron/electron/blob/main/docs/breaking-changes.md)
- [Commits](https://github.com/electron/electron/compare/v13.1.7...v13.1.8)

---
updated-dependencies:
- dependency-name: electron
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-08-04 04:03:36 +00:00
Eugene Pankov
c44f3c5f25 lint 2021-08-03 15:13:17 +02:00
dependabot[bot]
b3f9d48609 Bump webpack from 5.47.1 to 5.48.0
Bumps [webpack](https://github.com/webpack/webpack) from 5.47.1 to 5.48.0.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v5.47.1...v5.48.0)

---
updated-dependencies:
- dependency-name: webpack
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-08-03 04:06:40 +00:00
Eugene Pankov
edd7e9c7b7 set default cancel button in message boxes 2021-08-02 21:01:35 +02:00
Eugene Pankov
ab8061ab39 better new profile name handling - fixes #4325 2021-08-02 20:52:39 +02:00
Eugene Pankov
c1a1f53707 added a default name for duplicated profiles - fixes #4325 2021-08-02 20:03:02 +02:00
Eugene Pankov
04097a0ef5 serial: revert default CRLF processing to none - #4325 2021-08-02 20:00:38 +02:00
Eugene Pankov
85be974e64 reworked drop zones to allow more pane drop positions 2021-08-02 17:40:54 +02:00
Eugene Pankov
0df5fb4a34 fixed start page button flickering - fixes #4298 2021-08-02 09:25:05 +02:00
Eugene Pankov
920b2b85b3 Update appRoot.component.pug 2021-08-02 09:22:42 +02:00
Eugene Pankov
4e4788bf57 fixed glitchy window drag in macOS - fixes #4324 2021-08-02 09:17:08 +02:00
dependabot[bot]
9aa60a9d0d Bump typedoc from 0.21.4 to 0.21.5
Bumps [typedoc](https://github.com/TypeStrong/TypeDoc) from 0.21.4 to 0.21.5.
- [Release notes](https://github.com/TypeStrong/TypeDoc/releases)
- [Commits](https://github.com/TypeStrong/TypeDoc/compare/v0.21.4...v0.21.5)

---
updated-dependencies:
- dependency-name: typedoc
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-08-02 04:08:14 +00:00
dependabot[bot]
451ac51520 Bump electron-notarize from 1.0.0 to 1.0.1
Bumps [electron-notarize](https://github.com/electron/electron-notarize) from 1.0.0 to 1.0.1.
- [Release notes](https://github.com/electron/electron-notarize/releases)
- [Changelog](https://github.com/electron/electron-notarize/blob/master/.releaserc.json)
- [Commits](https://github.com/electron/electron-notarize/compare/v1.0.0...v1.0.1)

---
updated-dependencies:
- dependency-name: electron-notarize
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-08-02 04:07:48 +00:00
dependabot[bot]
04084aef33 Bump eslint from 7.31.0 to 7.32.0
Bumps [eslint](https://github.com/eslint/eslint) from 7.31.0 to 7.32.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v7.31.0...v7.32.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-08-02 04:07:29 +00:00
dependabot[bot]
4198ca3fae Bump ssh2 from 1.1.0 to 1.2.0
Bumps [ssh2](https://github.com/mscdex/ssh2) from 1.1.0 to 1.2.0.
- [Release notes](https://github.com/mscdex/ssh2/releases)
- [Commits](https://github.com/mscdex/ssh2/compare/v1.1.0...v1.2.0)

---
updated-dependencies:
- dependency-name: ssh2
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-08-02 04:05:32 +00:00
Eugene Pankov
3b09dfa145 sftp: allow editing remote files locally - fixes #4311 2021-08-01 16:13:11 +02:00
Eugene Pankov
923b559857 bumped plugins 2021-08-01 10:17:53 +02:00
Eugene Pankov
58682b6bf1 serial: disable local echo by default 2021-08-01 10:17:52 +02:00
Eugene Pankov
88c4198145 Merge branch 'master' of github.com:Eugeny/tabby 2021-07-31 19:28:05 +02:00
Eugene Pankov
a6c535414f switched to webpack asset modules 2021-07-31 19:28:01 +02:00
Eugeny
6ebb7723ff Merge pull request #4212 from Eugeny/dependabot/npm_and_yarn/slugify-1.6.0
Bump slugify from 1.5.3 to 1.6.0
2021-07-31 19:17:14 +02:00
Eugeny
07dd6600dc Merge pull request #4300 from Eugeny/dependabot/npm_and_yarn/webpack-5.47.1
Bump webpack from 5.46.0 to 5.47.1
2021-07-31 19:12:05 +02:00
Eugene Pankov
cc6cfec907 added a default color to split tab spanners 2021-07-31 18:59:52 +02:00
Eugene Pankov
4ecfcfda36 ui tweaks 2021-07-31 18:02:39 +02:00
Eugene Pankov
c5681b1376 allow rearranging panes within a tab 2021-07-31 17:57:43 +02:00
Eugene Pankov
1fc57018e3 allow modifier-only hotkeys 2021-07-31 17:18:03 +02:00
Eugene Pankov
8b8bacdf69 fixed config file getting spontaneously erased - fixes #4293 2021-07-31 15:28:10 +02:00
dependabot[bot]
3aaa419f8b Bump webpack from 5.46.0 to 5.47.1
Bumps [webpack](https://github.com/webpack/webpack) from 5.46.0 to 5.47.1.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v5.46.0...v5.47.1)

---
updated-dependencies:
- dependency-name: webpack
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-30 04:05:41 +00:00
Eugene Pankov
94819019ec bumped plugins 2021-07-29 21:20:41 +02:00
Eugene Pankov
7b37035f75 toolbar dropdown ui fix 2021-07-29 21:20:34 +02:00
Eugene Pankov
a5ef3507c3 toolbar ui fix 2021-07-29 21:20:29 +02:00
Eugene Pankov
b9c6d30678 include titles of all panes in a split tab's title 2021-07-29 21:20:25 +02:00
Eugene Pankov
009556f984 possible fix for #4293 2021-07-29 21:07:47 +02:00
Eugene Pankov
87007d5ae3 demo progress report fix 2021-07-29 21:07:31 +02:00
Eugene Pankov
61ea2c77c8 config sync ui updates 2021-07-29 21:07:22 +02:00
Eugene Pankov
c5dbccf807 fixed keepalive timeout 2021-07-28 20:45:32 +02:00
Eugene Pankov
ab4bf45c10 Update README.md 2021-07-27 21:09:39 +02:00
Eugene Pankov
61853428de bumped plugins 2021-07-27 20:46:56 +02:00
Eugene Pankov
ae8c0128cb updated config sync timing 2021-07-27 20:43:00 +02:00
Eugene Pankov
744e731a22 Update theme.scss 2021-07-27 20:41:49 +02:00
Eugene Pankov
bb34e21791 plugins bump 2021-07-27 20:40:28 +02:00
Eugene Pankov
74f91b7cb3 don't remember tabs if recovery is disabled 2021-07-27 20:40:08 +02:00
Eugene Pankov
7bcf3dbabe Update theme.scss 2021-07-27 20:37:18 +02:00
Eugene Pankov
273111fb05 update default sync host 2021-07-27 20:36:39 +02:00
Eugene Pankov
8ba067d90e style tweaks 2021-07-27 20:36:34 +02:00
Eugeny
b68f71ec62 Merge pull request #4211 from Eugeny/dependabot/npm_and_yarn/sentry/cli-1.67.2
Bump @sentry/cli from 1.67.1 to 1.67.2
2021-07-27 20:30:55 +02:00
Eugeny
7100d12818 Merge pull request #4256 from Eugeny/dependabot/npm_and_yarn/npmlog-5.0.0
Bump npmlog from 4.1.2 to 5.0.0
2021-07-27 20:30:28 +02:00
Eugeny
f041f0f07a Merge pull request #4255 from Eugeny/dependabot/npm_and_yarn/webpack-5.46.0
Bump webpack from 5.43.0 to 5.46.0
2021-07-27 20:30:11 +02:00
Eugene Pankov
6deb9ab48a bumped eslint 2021-07-27 20:29:15 +02:00
Eugene Pankov
1e1c05c138 Merge branch 'master' of github.com:Eugeny/tabby 2021-07-27 20:27:45 +02:00
Eugeny
8cfc20a81c Merge pull request #4273 from Eugeny/dependabot/npm_and_yarn/typescript-eslint/parser-4.28.5
Bump @typescript-eslint/parser from 4.28.3 to 4.28.5
2021-07-27 20:27:31 +02:00
Eugene Pankov
c853c96ae9 lint 2021-07-27 20:27:19 +02:00
Eugene Pankov
85fe9eb4ec don't show drop hints when dragging the tab onto itself 2021-07-27 20:27:03 +02:00
Eugeny
cf5af26d6e Merge pull request #4227 from Eugeny/dependabot/npm_and_yarn/eslint-7.31.0
Bump eslint from 7.30.0 to 7.31.0
2021-07-27 20:26:45 +02:00
Eugene Pankov
90e56e7605 added v8-compile-cache 2021-07-27 09:59:35 +02:00
dependabot[bot]
1c4e527db6 Bump @typescript-eslint/parser from 4.28.3 to 4.28.5
Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) from 4.28.3 to 4.28.5.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/parser/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v4.28.5/packages/parser)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/parser"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-27 04:04:35 +00:00
Eugene Pankov
75a0aadce4 build fix 2021-07-24 20:18:52 +02:00
Eugene Pankov
01e3e91e51 Update index.ts 2021-07-24 17:52:32 +02:00
Eugene Pankov
7514fa41a1 Create release.yml 2021-07-24 16:40:25 +02:00
Eugene Pankov
69115fb77a experimental config sync 2021-07-24 16:31:32 +02:00
Eugene Pankov
99ab8dacd4 ui tweaks 2021-07-24 16:31:10 +02:00
Eugene Pankov
e30d2cd85b added CDK polyfills 2021-07-24 16:30:55 +02:00
Eugene Pankov
657915b1fe fixed hotkey removal crashes 2021-07-24 16:03:48 +02:00
Eugene Pankov
90149def0a fixed #4230 - option to limit or disable "recent profiles" 2021-07-24 10:35:24 +02:00
Eugene Pankov
1926eca929 lint 2021-07-24 10:25:29 +02:00
Eugene Pankov
f20ba3e8bc ssh: enable keepalive by default 2021-07-24 10:15:08 +02:00
Eugene Pankov
6f972ab4cc lint 2021-07-24 10:14:07 +02:00
Eugene Pankov
129bc8a9f1 transfer menu UI fix 2021-07-24 10:06:44 +02:00
Eugene Pankov
4673aa498e fixed #4235 - prevent OS from sleeping during transfers 2021-07-24 10:04:14 +02:00
Eugene Pankov
a2e0db2a16 open SFTP panel in the CWD 2021-07-24 09:44:47 +02:00
dependabot[bot]
8def92eb5e Bump npmlog from 4.1.2 to 5.0.0
Bumps [npmlog](https://github.com/npm/npmlog) from 4.1.2 to 5.0.0.
- [Release notes](https://github.com/npm/npmlog/releases)
- [Changelog](https://github.com/npm/npmlog/blob/main/CHANGELOG.md)
- [Commits](https://github.com/npm/npmlog/compare/v4.1.2...v5.0.0)

---
updated-dependencies:
- dependency-name: npmlog
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-23 04:08:10 +00:00
dependabot[bot]
5b7e8f73b5 Bump webpack from 5.43.0 to 5.46.0
Bumps [webpack](https://github.com/webpack/webpack) from 5.43.0 to 5.46.0.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v5.43.0...v5.46.0)

---
updated-dependencies:
- dependency-name: webpack
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-23 04:07:40 +00:00
Eugene Pankov
7fa29b4b37 transfers ui fixes 2021-07-22 21:35:47 +02:00
Eugene Pankov
a859baac97 fixed #4237 sftp: upload into a temp file first 2021-07-22 21:35:39 +02:00
Eugene Pankov
b7a676f668 ng2-dnd cleanup 2021-07-21 23:06:50 +02:00
Eugene Pankov
26d81f10a6 dropped ng2-dnd 2021-07-21 23:05:26 +02:00
Eugene Pankov
be4cc804a2 allow dragging other tabs into existing split tabs - fixes #1347 2021-07-21 22:59:58 +02:00
dependabot[bot]
1b253ccb0a Bump eslint from 7.30.0 to 7.31.0
Bumps [eslint](https://github.com/eslint/eslint) from 7.30.0 to 7.31.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v7.30.0...v7.31.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-19 04:07:10 +00:00
dependabot[bot]
8bfc1dc302 Bump slugify from 1.5.3 to 1.6.0
Bumps [slugify](https://github.com/simov/slugify) from 1.5.3 to 1.6.0.
- [Release notes](https://github.com/simov/slugify/releases)
- [Commits](https://github.com/simov/slugify/compare/v1.5.3...v1.6.0)

---
updated-dependencies:
- dependency-name: slugify
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-18 14:53:38 +00:00
Eugene Pankov
ff49b9e38a settings: added release notes 2021-07-18 16:48:13 +02:00
Eugene Pankov
439e407595 serial: fixed missing port names in builtin profiles 2021-07-18 15:22:46 +02:00
Eugene Pankov
1eed32f8d8 local: UI to support single "command line" in profiles 2021-07-18 15:22:35 +02:00
Eugene Pankov
66098b5c6d Update hostWindow.service.ts 2021-07-18 14:08:20 +02:00
Eugene Pankov
a725d25e46 web: added proper platform detection and hotkey handling 2021-07-17 16:39:08 +02:00
Eugene Pankov
4e42dfd46b plugin version bump 2021-07-17 00:54:38 +02:00
Eugene Pankov
c2657568a6 updated web demo for new profiles 2021-07-17 00:52:16 +02:00
Eugene Pankov
dbe7b8cf56 plugin version bump 2021-07-17 00:52:07 +02:00
Eugene Pankov
a82a65ed46 plugin version bump 2021-07-16 23:59:45 +02:00
Eugene Pankov
893d9a9887 fixed button discoloration 2021-07-16 23:59:12 +02:00
Eugeny
1facd46901 Merge pull request #4216 from Eugeny/all-contributors/add-KingMob 2021-07-16 23:54:00 +02:00
allcontributors[bot]
7af89e1d07 docs: update .all-contributorsrc [skip ci] 2021-07-16 21:53:41 +00:00
Eugeny
50b2040d16 Merge pull request #4215 from KingMob/bugfix/get-shell-names-correctly 2021-07-16 23:53:40 +02:00
allcontributors[bot]
a65505c498 docs: update README.md [skip ci] 2021-07-16 21:53:40 +00:00
Matthew Davidson
7e8c19e97b Correctly name profiles for shells outside /usr
Shells outside /usr get named incorrectly. E.g., if I add /usr/local/bin/fish
to /etc/shells, when Tabby starts up, it think the profile name should be "local".
2021-07-16 16:50:32 -04:00
Eugeny
8ac101cf9c Merge pull request #4213 from Eugeny/dependabot/npm_and_yarn/electron-13.1.7 2021-07-16 11:31:54 +02:00
dependabot[bot]
6297987e4f Bump electron from 13.1.6 to 13.1.7
Bumps [electron](https://github.com/electron/electron) from 13.1.6 to 13.1.7.
- [Release notes](https://github.com/electron/electron/releases)
- [Changelog](https://github.com/electron/electron/blob/main/docs/breaking-changes.md)
- [Commits](https://github.com/electron/electron/compare/v13.1.6...v13.1.7)

---
updated-dependencies:
- dependency-name: electron
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-16 04:07:07 +00:00
dependabot[bot]
8c8c49055b Bump @sentry/cli from 1.67.1 to 1.67.2
Bumps [@sentry/cli](https://github.com/getsentry/sentry-cli) from 1.67.1 to 1.67.2.
- [Release notes](https://github.com/getsentry/sentry-cli/releases)
- [Changelog](https://github.com/getsentry/sentry-cli/blob/master/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-cli/compare/1.67.1...1.67.2)

---
updated-dependencies:
- dependency-name: "@sentry/cli"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-16 04:04:06 +00:00
Eugene Pankov
cbd7c7c02f remove outline buttons 2021-07-14 00:21:23 +02:00
Eugene Pankov
57a198b082 typing cleanup 2021-07-14 00:03:05 +02:00
Eugene Pankov
e245629c5a ui tweak 2021-07-13 23:53:43 +02:00
Eugene Pankov
760311ffa0 lint 2021-07-13 23:50:31 +02:00
Eugene Pankov
2f13f3a401 strongly typed partial profiles wip 2021-07-13 23:44:23 +02:00
Eugene Pankov
5ddf36d4c1 lint 2021-07-13 22:23:46 +02:00
Eugene Pankov
a632a599d3 WSL: fixed multiple distro detection 2021-07-13 22:20:59 +02:00
Eugene Pankov
ca9f11484c move terminal-tab to use .profile 2021-07-13 21:47:06 +02:00
Eugene Pankov
9d224cbce2 Merge branch 'master' of github.com:Eugeny/terminus 2021-07-13 20:37:20 +02:00
Eugeny
7df36b89c3 Merge pull request #4198 from Eugeny/dependabot/npm_and_yarn/typescript-eslint/parser-4.28.3
Bump @typescript-eslint/parser from 4.28.2 to 4.28.3
2021-07-13 20:19:47 +02:00
Eugene Pankov
8b62aa24ea Merge branch 'master' of github.com:Eugeny/terminus 2021-07-13 20:19:31 +02:00
Eugene Pankov
9502240480 reworked login scripts - fixes #1349 2021-07-13 20:19:28 +02:00
dependabot[bot]
31efa2f9c1 Bump @typescript-eslint/parser from 4.28.2 to 4.28.3
Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) from 4.28.2 to 4.28.3.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/parser/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v4.28.3/packages/parser)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/parser"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-13 17:53:20 +00:00
Eugeny
b40192f2ad Merge pull request #4196 from Eugeny/dependabot/npm_and_yarn/style-loader-3.1.0
Bump style-loader from 3.0.0 to 3.1.0
2021-07-13 19:48:29 +02:00
Eugeny
489ea5f891 Merge pull request #4197 from Eugeny/dependabot/npm_and_yarn/typescript-eslint/eslint-plugin-4.28.3 2021-07-13 19:46:30 +02:00
Eugeny
05eb24cd99 Merge pull request #4191 from Eugeny/dependabot/npm_and_yarn/typedoc-0.21.4
Bump typedoc from 0.21.2 to 0.21.4
2021-07-13 19:46:21 +02:00
Eugene Pankov
5053743b1b fixed dynamic port forward listener not getting cleaned up - fixes #4200 2021-07-13 19:27:02 +02:00
Eugene Pankov
6d7f25870e Merge branch 'master' of github.com:Eugeny/terminus 2021-07-13 19:26:21 +02:00
Eugeny
6cdee22164 Delete clink.html 2021-07-13 16:04:26 +02:00
Eugene Pankov
c043d5bc83 delegate getDescription to ProfilesService 2021-07-13 10:28:27 +02:00
Eugene Pankov
d7741f07a1 fixed configproxy 2021-07-13 10:28:08 +02:00
dependabot[bot]
14c0b8891d Bump @typescript-eslint/eslint-plugin from 4.28.2 to 4.28.3
Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 4.28.2 to 4.28.3.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/eslint-plugin/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v4.28.3/packages/eslint-plugin)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/eslint-plugin"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-13 04:04:47 +00:00
dependabot[bot]
ea1d8e95f3 Bump style-loader from 3.0.0 to 3.1.0
Bumps [style-loader](https://github.com/webpack-contrib/style-loader) from 3.0.0 to 3.1.0.
- [Release notes](https://github.com/webpack-contrib/style-loader/releases)
- [Changelog](https://github.com/webpack-contrib/style-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/style-loader/compare/v3.0.0...v3.1.0)

---
updated-dependencies:
- dependency-name: style-loader
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-13 04:04:14 +00:00
Eugene Pankov
50c20f08f8 fixed 'hide dock on blur' 2021-07-12 23:35:42 +02:00
Eugene Pankov
8f55333d23 fixed visual layout of readline prompts 2021-07-12 22:31:17 +02:00
Eugene Pankov
3be98e6244 fixed home/end keys in ssh sessions 2021-07-12 22:23:46 +02:00
Eugene Pankov
5e771534a8 wording 2021-07-12 21:29:38 +02:00
Eugene Pankov
ba33f18af7 fixed ssh connections 2021-07-12 21:29:34 +02:00
Eugene Pankov
82f3b61b5e bump 2021-07-12 21:29:28 +02:00
dependabot[bot]
f587fd279c Bump typedoc from 0.21.2 to 0.21.4
Bumps [typedoc](https://github.com/TypeStrong/TypeDoc) from 0.21.2 to 0.21.4.
- [Release notes](https://github.com/TypeStrong/TypeDoc/releases)
- [Commits](https://github.com/TypeStrong/TypeDoc/compare/v0.21.2...v0.21.4)

---
updated-dependencies:
- dependency-name: typedoc
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-12 04:05:50 +00:00
Eugene Pankov
8d13cb0fe8 bump 2021-07-11 23:04:48 +02:00
Eugene Pankov
d1a6baf858 bump 2021-07-11 23:03:55 +02:00
Eugene Pankov
25034342c3 bumped plugins 2021-07-11 23:02:27 +02:00
Eugene Pankov
379775bcd3 import fix 2021-07-11 23:02:23 +02:00
Eugene Pankov
ff18926bf9 WSA wip 2021-07-11 22:59:39 +02:00
Eugene Pankov
37e564130e web preload progress callback 2021-07-11 16:31:00 +02:00
Eugene Pankov
d8a8d41614 lint 2021-07-11 16:24:04 +02:00
Eugene Pankov
7db3335938 bump, include source maps in releases 2021-07-11 16:12:36 +02:00
Eugene Pankov
c1051379c1 add tabby-web-demo to the repo 2021-07-11 16:00:59 +02:00
Eugeny
f7a0fb488b Merge pull request #4175 from Eugeny/dependabot/npm_and_yarn/tabby-terminal/xterm-addon-ligatures-0.5.1
Bump xterm-addon-ligatures from 0.5.0 to 0.5.1 in /tabby-terminal
2021-07-11 12:39:02 +02:00
Eugene Pankov
2706045cc2 tab context menu option to save split layouts as profiles - fixes #3468 2021-07-11 12:38:35 +02:00
Eugene Pankov
908f90cd52 automatically clean up defaults from the config file 2021-07-11 00:06:52 +02:00
Eugene Pankov
67bbbd7f65 allow renaming and replacing files in the vault - fixes #4110 2021-07-10 21:31:18 +02:00
Eugene Pankov
0008b2f022 preserve file modes for up- and downloads - fixes #4141 2021-07-10 20:39:45 +02:00
Eugene Pankov
3e61630c6a added a way to switch a pane's profile - fixes #1007, fixes #2963, fixes #3082, fixes #4151 2021-07-10 20:05:31 +02:00
Eugene Pankov
6f912dc12b make sure ssh ident goes out in a single packet - #4167 2021-07-10 17:51:37 +02:00
Eugene Pankov
e1f2e176ce actually implement telnet protocol - fixes #4164 2021-07-10 16:09:24 +02:00
Eugene Pankov
f39b4c6dbe Update buttonProvider.ts 2021-07-10 14:47:41 +02:00
Eugene Pankov
c49ff68ed6 avoid duplicate entries in recent profiles - fixes #4179 2021-07-10 14:30:33 +02:00
Eugene Pankov
891cf42338 make ssh the default quick-connect profile - fixes #4181 2021-07-10 14:10:55 +02:00
Eugene Pankov
b9763044ee close streamProcessor in telnet tabs 2021-07-09 10:31:12 +02:00
Eugene Pankov
46e0035327 sort profiles by groups - fixes #4163 2021-07-09 10:02:58 +02:00
Eugene Pankov
6df8707b6d Merge branch 'master' of github.com:Eugeny/terminus 2021-07-09 09:58:35 +02:00
Eugene Pankov
24b7922539 fixed high contrast appearance for theme previews 2021-07-09 09:58:31 +02:00
Eugene Pankov
485665d449 fixed toggle switch appearance in windows high contrast mode - fixes #4165 2021-07-09 09:47:51 +02:00
Eugene Pankov
e09a011c23 hint about ssh connections being moved to profiles 2021-07-09 09:47:09 +02:00
Eugene Pankov
833a348fdb fixed matchedHotkey deprecation - fixes #4153, fixes #4156 2021-07-09 09:46:54 +02:00
Eugene Pankov
26ff6f17e7 fixed toolbar state loading 2021-07-09 09:10:10 +02:00
dependabot[bot]
d026e634e5 Bump xterm-addon-ligatures from 0.5.0 to 0.5.1 in /tabby-terminal
Bumps [xterm-addon-ligatures](https://github.com/xtermjs/xterm.js) from 0.5.0 to 0.5.1.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: xterm-addon-ligatures
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-09 04:25:46 +00:00
Eugeny
356a2f38b6 Merge pull request #4160 from Eugeny/dependabot/npm_and_yarn/sentry/cli-1.67.1 2021-07-08 22:04:39 +02:00
Eugeny
bdb37a9a18 Merge pull request #4169 from Eugeny/all-contributors/add-cypherbits 2021-07-08 22:04:29 +02:00
allcontributors[bot]
22d89041f8 docs: update .all-contributorsrc [skip ci] 2021-07-08 20:04:20 +00:00
allcontributors[bot]
d5285cf268 docs: update README.md [skip ci] 2021-07-08 20:04:19 +00:00
Eugene Pankov
3db98aa421 expose more plugin loader apis 2021-07-08 22:03:41 +02:00
Eugene Pankov
47dba5b52c avoid including all of the util-decorators in the bundle 2021-07-08 22:03:25 +02:00
Eugene Pankov
72874a1e84 Update HACKING.md 2021-07-08 22:03:03 +02:00
Eugene Pankov
fc1deb67e8 Merge branch 'master' of github.com:Eugeny/terminus 2021-07-08 22:01:43 +02:00
Eugeny
d0bb3c731c Merge pull request #4168 from cypherbits/master 2021-07-08 22:01:34 +02:00
cypherbits
13e54a46d7 add Ubuntu 20.04 compile requeriments 2021-07-08 18:46:44 +02:00
Eugene Pankov
55a975bc8b Merge branch 'master' of github.com:Eugeny/terminus 2021-07-08 16:09:09 +02:00
Eugene Pankov
a62752efec bumped package versions 2021-07-08 16:07:45 +02:00
dependabot[bot]
4e97ce5117 Bump @sentry/cli from 1.64.2 to 1.67.1
Bumps [@sentry/cli](https://github.com/getsentry/sentry-cli) from 1.64.2 to 1.67.1.
- [Release notes](https://github.com/getsentry/sentry-cli/releases)
- [Changelog](https://github.com/getsentry/sentry-cli/blob/master/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-cli/compare/1.64.2...1.67.1)

---
updated-dependencies:
- dependency-name: "@sentry/cli"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-08 11:36:24 +00:00
Eugeny
19a5f2dc2d Merge pull request #4161 from Eugeny/dependabot/npm_and_yarn/tabby-ssh/types/node-16.0.1
Bump @types/node from 16.0.0 to 16.0.1 in /tabby-ssh
2021-07-08 13:32:41 +02:00
Eugeny
52433afd13 Merge pull request #4159 from Eugeny/dependabot/npm_and_yarn/types/node-16.0.1
Bump @types/node from 16.0.0 to 16.0.1
2021-07-08 13:32:26 +02:00
Eugeny
e1d9f50426 Merge pull request #4158 from Eugeny/dependabot/npm_and_yarn/sentry/electron-2.5.1
Bump @sentry/electron from 2.5.0 to 2.5.1
2021-07-08 13:32:19 +02:00
Eugeny
5837c61ac4 Merge pull request #4157 from Eugeny/dependabot/npm_and_yarn/app/types/node-16.0.1
Bump @types/node from 16.0.0 to 16.0.1 in /app
2021-07-08 13:32:11 +02:00
dependabot[bot]
8c03e5b1aa Bump @types/node from 16.0.0 to 16.0.1 in /tabby-ssh
Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 16.0.0 to 16.0.1.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-08 04:24:47 +00:00
dependabot[bot]
66074e3eb6 Bump @types/node from 16.0.0 to 16.0.1
Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 16.0.0 to 16.0.1.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-08 04:04:14 +00:00
dependabot[bot]
221746f3e7 Bump @sentry/electron from 2.5.0 to 2.5.1
Bumps [@sentry/electron](https://github.com/getsentry/sentry-electron) from 2.5.0 to 2.5.1.
- [Release notes](https://github.com/getsentry/sentry-electron/releases)
- [Changelog](https://github.com/getsentry/sentry-electron/blob/master/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-electron/compare/2.5.0...2.5.1)

---
updated-dependencies:
- dependency-name: "@sentry/electron"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-08 04:03:47 +00:00
dependabot[bot]
2c59e30c39 Bump @types/node from 16.0.0 to 16.0.1 in /app
Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 16.0.0 to 16.0.1.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-08 04:01:31 +00:00
Eugene Pankov
4e13a601cc tab padding fix 2021-07-07 21:33:35 +02:00
Eugene Pankov
a159890cba lint 2021-07-07 21:33:26 +02:00
Eugene Pankov
4534eefc1d lint 2021-07-07 21:03:55 +02:00
Eugene Pankov
e06c44f973 externals fix 2021-07-07 21:00:40 +02:00
Eugene Pankov
c1616b1a7a bumped eslint 2021-07-07 20:45:47 +02:00
Eugeny
5b34fa9371 Merge pull request #4146 from Eugeny/dependabot/npm_and_yarn/types/fs-extra-9.0.12
Bump @types/fs-extra from 9.0.11 to 9.0.12
2021-07-07 20:41:03 +02:00
Eugeny
956a923ea2 Merge pull request #4124 from Eugeny/dependabot/npm_and_yarn/app/types/node-16.0.0
Bump @types/node from 15.12.5 to 16.0.0 in /app
2021-07-07 20:40:58 +02:00
Eugene Pankov
224abcb2c4 new toolbar design 2021-07-07 20:11:38 +02:00
dependabot[bot]
e8af224f7b Bump @types/fs-extra from 9.0.11 to 9.0.12
Bumps [@types/fs-extra](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/fs-extra) from 9.0.11 to 9.0.12.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/fs-extra)

---
updated-dependencies:
- dependency-name: "@types/fs-extra"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-07 11:34:02 +00:00
dependabot[bot]
a1d39563c3 Bump @types/node from 15.12.5 to 16.0.0 in /app
Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 15.12.5 to 16.0.0.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-07 11:29:45 +00:00
Eugeny
621536a078 Merge pull request #4150 from Eugeny/dependabot/npm_and_yarn/tabby-ssh/types/ssh2-0.5.47
Bump @types/ssh2 from 0.5.46 to 0.5.47 in /tabby-ssh
2021-07-07 13:28:06 +02:00
Eugeny
3cf9353d08 Merge pull request #4149 from Eugeny/dependabot/npm_and_yarn/tabby-core/types/js-yaml-4.0.2
Bump @types/js-yaml from 4.0.1 to 4.0.2 in /tabby-core
2021-07-07 13:27:59 +02:00
dependabot[bot]
6a2fa7efa9 Bump @types/js-yaml from 4.0.1 to 4.0.2 in /tabby-core
Bumps [@types/js-yaml](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/js-yaml) from 4.0.1 to 4.0.2.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/js-yaml)

---
updated-dependencies:
- dependency-name: "@types/js-yaml"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-07 11:27:53 +00:00
Eugeny
6b0fe0e2d1 Merge pull request #4148 from Eugeny/dependabot/npm_and_yarn/tabby-plugin-manager/types/semver-7.3.7
Bump @types/semver from 7.3.6 to 7.3.7 in /tabby-plugin-manager
2021-07-07 13:27:34 +02:00
Eugeny
923876dc23 Merge pull request #4147 from Eugeny/dependabot/npm_and_yarn/webpack-5.43.0
Bump webpack from 5.42.1 to 5.43.0
2021-07-07 13:27:25 +02:00
Eugeny
233ae9cbe6 Merge pull request #4145 from Eugeny/dependabot/npm_and_yarn/types/js-yaml-4.0.2
Bump @types/js-yaml from 4.0.1 to 4.0.2
2021-07-07 13:26:56 +02:00
Eugeny
09daf8102d Merge pull request #4144 from Eugeny/dependabot/npm_and_yarn/app/types/mz-2.7.4
Bump @types/mz from 2.7.3 to 2.7.4 in /app
2021-07-07 13:26:48 +02:00
Eugene Pankov
fd7893e9f8 Update README.md 2021-07-07 10:48:24 +02:00
dependabot[bot]
cf5c3e71f6 Bump @types/ssh2 from 0.5.46 to 0.5.47 in /tabby-ssh
Bumps [@types/ssh2](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/ssh2) from 0.5.46 to 0.5.47.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/ssh2)

---
updated-dependencies:
- dependency-name: "@types/ssh2"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-07 04:27:47 +00:00
dependabot[bot]
5c30bbb7e4 Bump @types/semver from 7.3.6 to 7.3.7 in /tabby-plugin-manager
Bumps [@types/semver](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/semver) from 7.3.6 to 7.3.7.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/semver)

---
updated-dependencies:
- dependency-name: "@types/semver"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-07 04:26:44 +00:00
dependabot[bot]
afce339187 Bump webpack from 5.42.1 to 5.43.0
Bumps [webpack](https://github.com/webpack/webpack) from 5.42.1 to 5.43.0.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v5.42.1...v5.43.0)

---
updated-dependencies:
- dependency-name: webpack
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-07 04:05:44 +00:00
dependabot[bot]
d528d1148b Bump @types/js-yaml from 4.0.1 to 4.0.2
Bumps [@types/js-yaml](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/js-yaml) from 4.0.1 to 4.0.2.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/js-yaml)

---
updated-dependencies:
- dependency-name: "@types/js-yaml"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-07 04:04:32 +00:00
dependabot[bot]
786b31e2a2 Bump @types/mz from 2.7.3 to 2.7.4 in /app
Bumps [@types/mz](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/mz) from 2.7.3 to 2.7.4.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/mz)

---
updated-dependencies:
- dependency-name: "@types/mz"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-07 04:01:47 +00:00
Eugene Pankov
0ad32fa79d moved profile settings view to settings plugin, web entry cleanup 2021-07-07 01:22:50 +02:00
Eugene Pankov
93a89e3c86 lint 2021-07-06 21:56:52 +02:00
Eugene Pankov
4e667edf9f lint 2021-07-06 21:50:40 +02:00
Eugene Pankov
403bafe0a2 lint 2021-07-06 21:47:15 +02:00
Eugene Pankov
40209dc60d bundle built-in modules together 2021-07-06 21:22:57 +02:00
Eugene Pankov
1ccd1df6e1 prevent duplication in available plugins 2021-07-06 21:03:10 +02:00
Eugene Pankov
800c1fa039 don't log cwd check failures as errors 2021-07-06 20:29:11 +02:00
Eugene Pankov
0a67987e3c use eval sourcemaps in dev mode on windows 2021-07-06 20:29:01 +02:00
Eugene Pankov
6c7a8092a4 fixed config reload race condition 2021-07-06 20:28:53 +02:00
Eugene Pankov
9f87886a9b ui tweaks 2021-07-06 19:34:00 +02:00
Eugene Pankov
0aa5df421d added auto detection for vs developer prompt 2021-07-06 19:33:53 +02:00
Eugene Pankov
d3498a6a46 make comspec setting optional - fixes #4143 2021-07-06 19:03:34 +02:00
Eugene Pankov
41a53a3e8e lint 2021-07-06 10:44:30 +02:00
Eugene Pankov
636942ff86 updated rxjs imports 2021-07-06 09:43:16 +02:00
Eugene Pankov
d1b874c191 Merge branch 'master' of github.com:Eugeny/terminus 2021-07-06 09:40:58 +02:00
Eugene Pankov
89f369abe6 es2021 compilation 2021-07-06 09:40:54 +02:00
Eugeny
f7cea92900 Merge pull request #4135 from Eugeny/dependabot/npm_and_yarn/app/rxjs-7.2.0
Bump rxjs from 7.1.0 to 7.2.0 in /app
2021-07-06 09:40:20 +02:00
Eugeny
9a611709d0 Merge pull request #4102 from Eugeny/dependabot/npm_and_yarn/tabby-core/core-js-3.15.2
Bump core-js from 3.14.0 to 3.15.2 in /tabby-core
2021-07-06 08:56:25 +02:00
dependabot[bot]
2094409d23 Bump core-js from 3.14.0 to 3.15.2 in /tabby-core
Bumps [core-js](https://github.com/zloirock/core-js/tree/HEAD/packages/core-js) from 3.14.0 to 3.15.2.
- [Release notes](https://github.com/zloirock/core-js/releases)
- [Changelog](https://github.com/zloirock/core-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/zloirock/core-js/commits/v3.15.2/packages/core-js)

---
updated-dependencies:
- dependency-name: core-js
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-06 06:56:19 +00:00
Eugeny
2b061d3f77 Merge pull request #4129 from Eugeny/dependabot/npm_and_yarn/eslint-7.30.0
Bump eslint from 7.29.0 to 7.30.0
2021-07-06 08:56:16 +02:00
Eugeny
ed06c78a16 Merge pull request #4122 from Eugeny/dependabot/npm_and_yarn/tabby-ssh/types/node-16.0.0 2021-07-06 08:56:03 +02:00
Eugeny
36a6af05c4 Merge pull request #4126 from Eugeny/dependabot/npm_and_yarn/types/node-16.0.0
Bump @types/node from 15.12.5 to 16.0.0
2021-07-06 08:55:57 +02:00
dependabot[bot]
64b4eed9c3 Bump @types/node from 14.14.31 to 16.0.0 in /tabby-ssh
Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 14.14.31 to 16.0.0.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-06 06:55:14 +00:00
Eugeny
afc9270846 Merge pull request #4139 from Eugeny/dependabot/npm_and_yarn/electron-13.1.6
Bump electron from 13.1.5 to 13.1.6
2021-07-06 08:54:21 +02:00
Eugeny
2ea5edc101 Merge pull request #4138 from Eugeny/dependabot/npm_and_yarn/webpack-5.42.1
Bump webpack from 5.42.0 to 5.42.1
2021-07-06 08:54:06 +02:00
dependabot[bot]
869a7e866c Bump electron from 13.1.5 to 13.1.6
Bumps [electron](https://github.com/electron/electron) from 13.1.5 to 13.1.6.
- [Release notes](https://github.com/electron/electron/releases)
- [Changelog](https://github.com/electron/electron/blob/main/docs/breaking-changes.md)
- [Commits](https://github.com/electron/electron/compare/v13.1.5...v13.1.6)

---
updated-dependencies:
- dependency-name: electron
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-06 04:06:39 +00:00
dependabot[bot]
1bd3b5301b Bump webpack from 5.42.0 to 5.42.1
Bumps [webpack](https://github.com/webpack/webpack) from 5.42.0 to 5.42.1.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v5.42.0...v5.42.1)

---
updated-dependencies:
- dependency-name: webpack
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-06 04:05:54 +00:00
dependabot[bot]
4ff66a39d8 Bump rxjs from 7.1.0 to 7.2.0 in /app
Bumps [rxjs](https://github.com/reactivex/rxjs) from 7.1.0 to 7.2.0.
- [Release notes](https://github.com/reactivex/rxjs/releases)
- [Changelog](https://github.com/ReactiveX/rxjs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/reactivex/rxjs/compare/7.1.0...7.2.0)

---
updated-dependencies:
- dependency-name: rxjs
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-06 04:02:49 +00:00
dependabot[bot]
a3857d5dc8 Bump @types/node from 15.12.5 to 16.0.0
Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 15.12.5 to 16.0.0.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-05 22:01:21 +00:00
Eugene Pankov
bf762cc4c7 moved login scripts processing into tabby-terminal 2021-07-05 23:56:38 +02:00
Eugene Pankov
461cd2bec7 deprecated matchedHotkey 2021-07-05 22:52:32 +02:00
Eugene Pankov
da599567f8 cleanup 2021-07-05 22:27:58 +02:00
Eugene Pankov
7f921c4d34 added a profile selector hotkey 2021-07-05 22:27:55 +02:00
Eugene Pankov
0eb006f297 Merge branch 'master' of github.com:Eugeny/terminus 2021-07-05 22:14:45 +02:00
Eugene Pankov
07095f3476 moved spinner intro baseTerminalTab 2021-07-05 22:14:42 +02:00
dependabot[bot]
59b283067b Bump eslint from 7.29.0 to 7.30.0
Bumps [eslint](https://github.com/eslint/eslint) from 7.29.0 to 7.30.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v7.29.0...v7.30.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-05 13:09:45 +00:00
Eugeny
3635eee77d Merge pull request #4106 from Eugeny/dependabot/npm_and_yarn/app/ng-bootstrap/ng-bootstrap-10.0.0
Bump @ng-bootstrap/ng-bootstrap from 9.1.1 to 10.0.0 in /app
2021-07-05 15:01:34 +02:00
Eugeny
64df798dc1 Merge pull request #4130 from Eugeny/dependabot/npm_and_yarn/types/webpack-env-1.16.2
Bump @types/webpack-env from 1.16.0 to 1.16.2
2021-07-05 15:01:07 +02:00
Eugeny
f091206e37 Merge pull request #4104 from Eugeny/dependabot/npm_and_yarn/tabby-terminal/utils-decorators-1.10.0
Bump utils-decorators from 1.8.3 to 1.10.0 in /tabby-terminal
2021-07-05 15:00:46 +02:00
Eugeny
3148927395 Merge pull request #4101 from Eugeny/dependabot/npm_and_yarn/tabby-local/utils-decorators-1.10.0 2021-07-05 15:00:41 +02:00
Eugeny
fb39bfd560 Merge pull request #4103 from Eugeny/dependabot/npm_and_yarn/tabby-settings/utils-decorators-1.10.0
Bump utils-decorators from 1.8.3 to 1.10.0 in /tabby-settings
2021-07-05 15:00:35 +02:00
Eugeny
f8cd9fcea7 Merge pull request #4134 from Eugeny/all-contributors/add-logicmachine123 2021-07-05 15:00:02 +02:00
Eugeny
f1148cc47f Merge pull request #4111 from Eugeny/dependabot/npm_and_yarn/electron-13.1.5
Bump electron from 13.1.4 to 13.1.5
2021-07-05 14:56:15 +02:00
Eugeny
ffcc0d549a Merge pull request #4097 from Eugeny/dependabot/github_actions/actions/setup-node-2.2.0
Bump actions/setup-node from 2.1.5 to 2.2.0
2021-07-05 14:55:51 +02:00
Eugeny
861dd8ef86 Merge pull request #4125 from Eugeny/dependabot/npm_and_yarn/webpack-5.42.0
Bump webpack from 5.41.0 to 5.42.0
2021-07-05 14:55:23 +02:00
Eugeny
1e5e46eae1 Merge pull request #4123 from Eugeny/dependabot/npm_and_yarn/ws-7.5.2
Bump ws from 7.4.4 to 7.5.2
2021-07-05 14:55:08 +02:00
Eugeny
d644eec56e Merge pull request #4092 from Eugeny/dependabot/npm_and_yarn/core-js-3.15.2
Bump core-js from 3.14.0 to 3.15.2
2021-07-05 14:54:51 +02:00
allcontributors[bot]
a656699afd docs: update .all-contributorsrc [skip ci] 2021-07-05 12:53:55 +00:00
allcontributors[bot]
93db8fa046 docs: update README.md [skip ci] 2021-07-05 12:53:54 +00:00
dependabot[bot]
05669046e9 Bump @types/webpack-env from 1.16.0 to 1.16.2
Bumps [@types/webpack-env](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/webpack-env) from 1.16.0 to 1.16.2.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/webpack-env)

---
updated-dependencies:
- dependency-name: "@types/webpack-env"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-05 04:06:00 +00:00
Eugene Pankov
025d2d1748 fixed relative symlink resolution - fixes #4119 2021-07-04 19:35:27 +02:00
Eugene Pankov
e17ba8c351 move createSession() into session 2021-07-04 17:11:21 +02:00
dependabot[bot]
d3dee44475 Bump webpack from 5.41.0 to 5.42.0
Bumps [webpack](https://github.com/webpack/webpack) from 5.41.0 to 5.42.0.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v5.41.0...v5.42.0)

---
updated-dependencies:
- dependency-name: webpack
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-04 14:54:10 +00:00
dependabot[bot]
0f0699d46a Bump @ng-bootstrap/ng-bootstrap from 9.1.1 to 10.0.0 in /app
Bumps [@ng-bootstrap/ng-bootstrap](https://github.com/ng-bootstrap/ng-bootstrap) from 9.1.1 to 10.0.0.
- [Release notes](https://github.com/ng-bootstrap/ng-bootstrap/releases)
- [Changelog](https://github.com/ng-bootstrap/ng-bootstrap/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ng-bootstrap/ng-bootstrap/compare/9.1.1...10.0.0)

---
updated-dependencies:
- dependency-name: "@ng-bootstrap/ng-bootstrap"
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-04 14:51:49 +00:00
dependabot[bot]
b7540e59a8 Bump ws from 7.4.4 to 7.5.2
Bumps [ws](https://github.com/websockets/ws) from 7.4.4 to 7.5.2.
- [Release notes](https://github.com/websockets/ws/releases)
- [Commits](https://github.com/websockets/ws/compare/7.4.4...7.5.2)

---
updated-dependencies:
- dependency-name: ws
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-04 14:50:07 +00:00
Eugene Pankov
827345d899 added a telnet client - fixes #760 2021-07-04 16:48:48 +02:00
Eugene Pankov
59de67ca58 artifact names 2021-07-04 16:19:11 +02:00
Eugene Pankov
ccad826ca9 updated README links 2021-07-04 16:18:30 +02:00
dependabot[bot]
838acc0a23 Bump core-js from 3.14.0 to 3.15.2
Bumps [core-js](https://github.com/zloirock/core-js/tree/HEAD/packages/core-js) from 3.14.0 to 3.15.2.
- [Release notes](https://github.com/zloirock/core-js/releases)
- [Changelog](https://github.com/zloirock/core-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/zloirock/core-js/commits/v3.15.2/packages/core-js)

---
updated-dependencies:
- dependency-name: core-js
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-04 13:15:14 +00:00
dependabot[bot]
804ae44ec8 Bump electron from 13.1.4 to 13.1.5
Bumps [electron](https://github.com/electron/electron) from 13.1.4 to 13.1.5.
- [Release notes](https://github.com/electron/electron/releases)
- [Changelog](https://github.com/electron/electron/blob/main/docs/breaking-changes.md)
- [Commits](https://github.com/electron/electron/compare/v13.1.4...v13.1.5)

---
updated-dependencies:
- dependency-name: electron
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-04 13:13:52 +00:00
dependabot[bot]
5f04c3b74b Bump utils-decorators from 1.8.3 to 1.10.0 in /tabby-terminal
Bumps [utils-decorators](https://github.com/vlio20/utils-decorators) from 1.8.3 to 1.10.0.
- [Release notes](https://github.com/vlio20/utils-decorators/releases)
- [Commits](https://github.com/vlio20/utils-decorators/commits/1.10.0)

---
updated-dependencies:
- dependency-name: utils-decorators
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-04 13:10:28 +00:00
dependabot[bot]
4afd49e38c Bump utils-decorators from 1.8.3 to 1.10.0 in /tabby-local
Bumps [utils-decorators](https://github.com/vlio20/utils-decorators) from 1.8.3 to 1.10.0.
- [Release notes](https://github.com/vlio20/utils-decorators/releases)
- [Commits](https://github.com/vlio20/utils-decorators/commits/1.10.0)

---
updated-dependencies:
- dependency-name: utils-decorators
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-04 13:10:21 +00:00
dependabot[bot]
ba32c69001 Bump utils-decorators from 1.8.3 to 1.10.0 in /tabby-settings
Bumps [utils-decorators](https://github.com/vlio20/utils-decorators) from 1.8.3 to 1.10.0.
- [Release notes](https://github.com/vlio20/utils-decorators/releases)
- [Commits](https://github.com/vlio20/utils-decorators/commits/1.10.0)

---
updated-dependencies:
- dependency-name: utils-decorators
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-04 13:10:04 +00:00
dependabot[bot]
e9a3947488 Bump actions/setup-node from 2.1.5 to 2.2.0
Bumps [actions/setup-node](https://github.com/actions/setup-node) from 2.1.5 to 2.2.0.
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](https://github.com/actions/setup-node/compare/v2.1.5...v2.2.0)

---
updated-dependencies:
- dependency-name: actions/setup-node
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-04 13:09:55 +00:00
Eugene Pankov
b2f4b44123 workflow update 2021-07-04 15:09:34 +02:00
Eugene Pankov
f4eacc1d66 build workflow update 2021-07-04 15:06:27 +02:00
Eugene Pankov
9155104662 moved stream processing into tabby-terminal 2021-07-04 14:05:25 +02:00
Eugene Pankov
cbbd38ca83 lint 2021-07-04 14:05:13 +02:00
Eugene Pankov
e5cf72e79b context menu dep fix 2021-07-04 14:04:40 +02:00
Eugene Pankov
a71d9c0727 fixed default profile names 2021-07-04 13:47:54 +02:00
Eugene Pankov
26e2c60265 option to always ask for baud rate 2021-07-04 13:47:38 +02:00
Eugene Pankov
a5a0546e68 config migration fix 2021-07-04 13:06:00 +02:00
Eugene Pankov
92b34fbc08 new profile system 2021-07-04 12:23:27 +02:00
Eugene Pankov
38b7e44f64 updated plugin links 2021-07-02 00:39:27 +02:00
Eugene Pankov
3aa957a3f5 updated to-string-loader 2021-07-02 00:39:17 +02:00
319 changed files with 10006 additions and 10711 deletions

View File

@@ -406,6 +406,42 @@
"contributions": [
"design"
]
},
{
"login": "logicmachine123",
"name": "Logic Machine",
"avatar_url": "https://avatars.githubusercontent.com/u/63876444?v=4",
"profile": "https://git.io/JnP49",
"contributions": [
"doc"
]
},
{
"login": "cypherbits",
"name": "cypherbits",
"avatar_url": "https://avatars.githubusercontent.com/u/10424900?v=4",
"profile": "https://github.com/cypherbits",
"contributions": [
"doc"
]
},
{
"login": "KingMob",
"name": "Matthew Davidson",
"avatar_url": "https://avatars.githubusercontent.com/u/946421?v=4",
"profile": "https://modulolotus.net",
"contributions": [
"code"
]
},
{
"login": "al-wi",
"name": "Alexander Wiedemann",
"avatar_url": "https://avatars.githubusercontent.com/u/11092199?v=4",
"profile": "https://github.com/al-wi",
"contributions": [
"code"
]
}
],
"contributorsPerLine": 7,

View File

@@ -36,7 +36,9 @@ rules:
'@typescript-eslint/prefer-readonly': off
'@typescript-eslint/require-await': off
'@typescript-eslint/strict-boolean-expressions': off
'@typescript-eslint/no-misused-promises': off
'@typescript-eslint/no-misused-promises':
- error
- checksVoidReturn: false
'@typescript-eslint/typedef': off
'@typescript-eslint/consistent-type-imports': off
'@typescript-eslint/sort-type-union-intersection-members': off
@@ -95,7 +97,9 @@ rules:
- error
- single
- allowTemplateLiterals: true
'@typescript-eslint/no-confusing-void-expression': off
'@typescript-eslint/no-confusing-void-expression':
- error
- ignoreArrowShorthand: true
'@typescript-eslint/no-non-null-assertion': off
'@typescript-eslint/no-unnecessary-condition':
- error
@@ -116,3 +120,9 @@ rules:
'@typescript-eslint/no-var-requires': off
'@typescript-eslint/no-unsafe-argument': off
'@typescript-eslint/restrict-plus-operands': off
'@typescript-eslint/space-infix-ops': off
'@typescript-eslint/no-type-alias':
- error
- allowAliases: in-unions-and-intersections
allowLiterals: always
allowCallbacks: always

300
.github/workflows/build.yml vendored Normal file
View File

@@ -0,0 +1,300 @@
name: Package-Build
on: [push, pull_request]
jobs:
Lint:
runs-on: macos-11.0
steps:
- name: Checkout
uses: actions/checkout@v2.3.4
with:
fetch-depth: 0
- name: Installing Node
uses: actions/setup-node@v2.4.0
with:
node-version: 14
- name: Install deps
run: |
npm i -g yarn@1.19.1
cd app
yarn
cd ..
rm app/node_modules/.yarn-integrity
yarn
- name: Build typings
run: yarn run build:typings
- name: Lint
run: yarn run lint
macOS-Build:
runs-on: macos-11.0
needs: Lint
strategy:
matrix:
include:
- arch: x86_64
- arch: arm64
steps:
- name: Checkout
uses: actions/checkout@v2.3.4
with:
fetch-depth: 0
- name: Installing Node
uses: actions/setup-node@v2.4.0
with:
node-version: 14
- name: Install deps
run: |
sudo npm i -g yarn@1.22.1
cd app
yarn
cd ..
rm app/node_modules/.yarn-integrity
yarn
- name: Build native deps
run: scripts/build-native.js
env:
ARCH: ${{matrix.arch}}
- name: Build native deps
run: |
rm -rf app/node_modules/cpu-features
rm -rf app/node_modules/ssh2/crypto/build
if: ${{ matrix.arch == 'arm64' }}
- name: Webpack
run: yarn run build
- name: Prepackage plugins
run: scripts/prepackage-plugins.js
env:
ARCH: ${{matrix.arch}}
- run: sed -i '' 's/updateInfo = await/\/\/updateInfo = await/g' node_modules/app-builder-lib/out/targets/ArchiveTarget.js
- name: Build and sign packages
run: scripts/build-macos.js
if: github.repository == 'Eugeny/tabby' && github.event_name == 'push' && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags'))
env:
ARCH: ${{matrix.arch}}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
CSC_LINK: ${{ secrets.CSC_LINK }}
CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
APPSTORE_USERNAME: ${{ secrets.APPSTORE_USERNAME }}
APPSTORE_PASSWORD: ${{ secrets.APPSTORE_PASSWORD }}
USE_HARD_LINKS: false
# DEBUG: electron-builder,electron-builder:*
- name: Build packages without signing
run: scripts/build-macos.js
if: "! (github.repository == 'Eugeny/tabby' && github.event_name == 'push' && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags')))"
env:
ARCH: ${{matrix.arch}}
# DEBUG: electron-builder,electron-builder:*
- name: Upload symbols
run: |
sudo npm install -g @sentry/cli --unsafe-perm
./scripts/sentry-upload.js
env:
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
- name: Package artifacts
run: |
mkdir artifact-pkg
mv dist/*.pkg artifact-pkg/
mkdir artifact-zip
mv dist/*.zip artifact-zip/
- uses: actions/upload-artifact@master
name: Upload PKG
with:
name: macOS .pkg (${{matrix.arch}})
path: artifact-pkg
- uses: actions/upload-artifact@master
name: Upload ZIP
with:
name: macOS .zip (${{matrix.arch}})
path: artifact-zip
Linux-Build:
runs-on: ubuntu-18.04
needs: Lint
steps:
- name: Checkout
uses: actions/checkout@v2.3.4
with:
fetch-depth: 0
- name: Install Node
uses: actions/setup-node@v2.4.0
with:
node-version: 14
- name: Install deps
run: |
sudo apt-get update
sudo apt-get install bsdtar zsh
npm i -g yarn@1.19.1
cd app
yarn
cd ..
rm app/node_modules/.yarn-integrity
yarn
npm run patch
- name: Build native deps
run: scripts/build-native.js
- name: Webpack
run: yarn run build
- name: Prepackage plugins
run: scripts/prepackage-plugins.js
- name: Build packages
run: scripts/build-linux.js
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
USE_HARD_LINKS: false
# DEBUG: electron-builder,electron-builder:*
- name: Build web resources
run: zsh -c 'tar czf tabby-web.tar.gz (tabby-*|web)/dist'
- name: Upload symbols
run: |
sudo npm install -g @sentry/cli --unsafe-perm
./scripts/sentry-upload.js
env:
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
- name: Package artifacts
run: |
mkdir artifact-deb
mv dist/*.deb artifact-deb/ || true
mkdir artifact-rpm
mv dist/*.rpm artifact-rpm/ || true
mkdir artifact-pacman
mv dist/*.pacman artifact-pacman/ || true
mkdir artifact-snap
mv dist/*.snap artifact-snap/ || true
mkdir artifact-tar.gz
mv dist/*.tar.gz artifact-tar.gz/ || true
mkdir artifact-web
mv tabby-web.tar.gz artifact-web/ || true
- uses: actions/upload-artifact@master
name: Upload DEB
with:
name: Linux DEB
path: artifact-deb
- uses: actions/upload-artifact@master
name: Upload RPM
with:
name: Linux RPM
path: artifact-rpm
- uses: actions/upload-artifact@master
name: Upload Pacman Package
with:
name: Linux Pacman
path: artifact-pacman
- uses: actions/upload-artifact@master
name: Upload Snap
with:
name: Linux Snap
path: artifact-snap
- uses: actions/upload-artifact@master
name: Upload Linux tarball
with:
name: Linux tarball
path: artifact-tar.gz
- uses: actions/upload-artifact@master
name: Upload web tarball
with:
name: Web tarball
path: artifact-web
Windows-Build:
runs-on: windows-2016
needs: Lint
steps:
- name: Checkout
uses: actions/checkout@v2.3.4
with:
fetch-depth: 0
- name: Installing Node
uses: actions/setup-node@v2.4.0
with:
node-version: 14
- name: Build
shell: powershell
run: |
npm i -g yarn@1.19.1
yarn
node scripts/build-native.js
yarn run build
node scripts/prepackage-plugins.js
- name: Build and sign packages
run: node scripts/build-windows.js
if: github.repository == 'Eugeny/tabby' && github.event_name == 'push' && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags'))
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
WIN_CSC_LINK: ${{ secrets.WIN_CSC_LINK }}
WIN_CSC_KEY_PASSWORD: ${{ secrets.WIN_CSC_KEY_PASSWORD }}
# DEBUG: electron-builder,electron-builder:*
- name: Build packages without signing
run: node scripts/build-windows.js
if: "!(github.repository == 'Eugeny/tabby' && github.event_name == 'push' && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags')))"
- name: Upload symbols
run: |
npm install @sentry/cli
node scripts/sentry-upload.js
env:
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
- name: Package artifacts
run: |
mkdir artifact-setup
mv dist/*-setup.exe artifact-setup/
mkdir artifact-portable
mv dist/*-portable.zip artifact-portable/
- uses: actions/upload-artifact@master
name: Upload installer
with:
name: Windows installer
path: artifact-setup
- uses: actions/upload-artifact@master
name: Upload portable build
with:
name: Windows portable build
path: artifact-portable

View File

@@ -12,7 +12,7 @@ jobs:
fetch-depth: 0
- name: Installing Node
uses: actions/setup-node@v2.1.5
uses: actions/setup-node@v2.4.0
with:
node-version: 14

View File

@@ -1,31 +0,0 @@
name: Lint
on: [push, pull_request]
jobs:
build:
runs-on: macOS-latest
steps:
- name: Checkout
uses: actions/checkout@v2.3.4
with:
fetch-depth: 0
- name: Installing Node
uses: actions/setup-node@v2.1.5
with:
node-version: 14
- name: Install deps
run: |
npm i -g yarn@1.19.1
cd app
yarn
cd ..
rm app/node_modules/.yarn-integrity
yarn
- name: Build typings
run: yarn run build:typings
- name: Lint
run: yarn run lint

View File

@@ -1,107 +0,0 @@
name: Linux Build
on: [push, pull_request]
jobs:
build:
runs-on: ubuntu-18.04
steps:
- name: Checkout
uses: actions/checkout@v2.3.4
with:
fetch-depth: 0
- name: Install Node
uses: actions/setup-node@v2.1.5
with:
node-version: 14
- name: Install deps
run: |
sudo apt-get update
sudo apt-get install bsdtar zsh
npm i -g yarn@1.19.1
cd app
yarn
cd ..
rm app/node_modules/.yarn-integrity
yarn
npm run patch
- name: Build native deps
run: scripts/build-native.js
- name: Webpack
run: yarn run build
- name: Prepackage plugins
run: scripts/prepackage-plugins.js
- name: Build packages
run: scripts/build-linux.js
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
USE_HARD_LINKS: false
# DEBUG: electron-builder,electron-builder:*
- name: Build web resources
run: zsh -c 'tar czf tabby-web.tar.gz (tabby-*|web)/dist'
- name: Upload symbols
run: |
sudo npm install -g @sentry/cli --unsafe-perm
./scripts/sentry-upload.js
env:
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
- name: Package artifacts
run: |
mkdir artifact-deb
mv dist/*.deb artifact-deb/ || true
mkdir artifact-rpm
mv dist/*.rpm artifact-rpm/ || true
mkdir artifact-pacman
mv dist/*.pacman artifact-pacman/ || true
mkdir artifact-snap
mv dist/*.snap artifact-snap/ || true
mkdir artifact-tar.gz
mv dist/*.tar.gz artifact-tar.gz/ || true
mkdir artifact-web
mv tabby-web.tar.gz artifact-web/ || true
- uses: actions/upload-artifact@master
name: Upload DEB
with:
name: Linux DEB
path: artifact-deb
- uses: actions/upload-artifact@master
name: Upload RPM
with:
name: Linux RPM
path: artifact-rpm
- uses: actions/upload-artifact@master
name: Upload Pacman Package
with:
name: Linux Pacman
path: artifact-pacman
- uses: actions/upload-artifact@master
name: Upload Snap
with:
name: Linux Snap
path: artifact-snap
- uses: actions/upload-artifact@master
name: Upload Linux tarball
with:
name: Linux tarball
path: artifact-tar.gz
- uses: actions/upload-artifact@master
name: Upload web tarball
with:
name: Web tarball
path: artifact-web

View File

@@ -1,99 +0,0 @@
name: macOS Build
on: [push, pull_request]
jobs:
build:
runs-on: macos-11.0
strategy:
matrix:
include:
- arch: x86_64
- arch: arm64
steps:
- name: Checkout
uses: actions/checkout@v2.3.4
with:
fetch-depth: 0
- name: Installing Node
uses: actions/setup-node@v2.1.5
with:
node-version: 14
- name: Install deps
run: |
sudo npm i -g yarn@1.22.1
cd app
yarn
cd ..
rm app/node_modules/.yarn-integrity
yarn
- name: Build native deps
run: scripts/build-native.js
env:
ARCH: ${{matrix.arch}}
- name: Build native deps
run: |
rm -rf app/node_modules/cpu-features
rm -rf app/node_modules/ssh2/crypto/build
if: ${{ matrix.arch == 'arm64' }}
- name: Webpack
run: yarn run build
- name: Prepackage plugins
run: scripts/prepackage-plugins.js
env:
ARCH: ${{matrix.arch}}
- run: sed -i '' 's/updateInfo = await/\/\/updateInfo = await/g' node_modules/app-builder-lib/out/targets/ArchiveTarget.js
- name: Build and sign packages
run: scripts/build-macos.js
if: github.repository == 'Eugeny/tabby' && github.event_name == 'push' && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags'))
env:
ARCH: ${{matrix.arch}}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
CSC_LINK: ${{ secrets.CSC_LINK }}
CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
APPSTORE_USERNAME: ${{ secrets.APPSTORE_USERNAME }}
APPSTORE_PASSWORD: ${{ secrets.APPSTORE_PASSWORD }}
USE_HARD_LINKS: false
# DEBUG: electron-builder,electron-builder:*
- name: Build packages without signing
run: scripts/build-macos.js
if: "! (github.repository == 'Eugeny/tabby' && github.event_name == 'push' && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags')))"
env:
ARCH: ${{matrix.arch}}
# DEBUG: electron-builder,electron-builder:*
- name: Upload symbols
run: |
sudo npm install -g @sentry/cli --unsafe-perm
./scripts/sentry-upload.js
env:
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
- name: Package artifacts
run: |
mkdir artifact-pkg
mv dist/*.pkg artifact-pkg/
mkdir artifact-zip
mv dist/*.zip artifact-zip/
- uses: actions/upload-artifact@master
name: Upload PKG
with:
name: macOS .pkg (${{matrix.arch}})
path: artifact-pkg
- uses: actions/upload-artifact@master
name: Upload ZIP
with:
name: macOS .zip (${{matrix.arch}})
path: artifact-zip

19
.github/workflows/release.yml vendored Normal file
View File

@@ -0,0 +1,19 @@
---
name: "tagged-release"
on:
push:
tags:
- "v*"
jobs:
tagged-release:
name: "Tagged Release"
runs-on: "ubuntu-latest"
steps:
- uses: "marvinpinto/action-automatic-releases@latest"
with:
repo_token: "${{ secrets.GITHUB_TOKEN }}"
prerelease: false
draft: true

View File

@@ -1,66 +0,0 @@
name: Windows Build
on: [push, pull_request]
jobs:
build:
runs-on: windows-2016
steps:
- name: Checkout
uses: actions/checkout@v2.3.4
with:
fetch-depth: 0
- name: Installing Node
uses: actions/setup-node@v2.1.5
with:
node-version: 14
- name: Build
shell: powershell
run: |
npm i -g yarn@1.19.1
yarn
node scripts/build-native.js
yarn run build
node scripts/prepackage-plugins.js
- name: Build and sign packages
run: node scripts/build-windows.js
if: github.repository == 'Eugeny/tabby' && github.event_name == 'push' && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags'))
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
WIN_CSC_LINK: ${{ secrets.WIN_CSC_LINK }}
WIN_CSC_KEY_PASSWORD: ${{ secrets.WIN_CSC_KEY_PASSWORD }}
# DEBUG: electron-builder,electron-builder:*
- name: Build packages without signing
run: node scripts/build-windows.js
if: "!(github.repository == 'Eugeny/tabby' && github.event_name == 'push' && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags')))"
- name: Upload symbols
run: |
npm install @sentry/cli
node scripts/sentry-upload.js
env:
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
- name: Package artifacts
run: |
mkdir artifact-setup
mv dist/*-setup.exe artifact-setup/
mkdir artifact-portable
mv dist/*-portable.zip artifact-portable/
- uses: actions/upload-artifact@master
name: Upload installer
with:
name: Installer
path: artifact-setup
- uses: actions/upload-artifact@master
name: Upload portable build
with:
name: Portable build
path: artifact-portable

View File

@@ -15,8 +15,8 @@ yarn
```
```
# Linux (Debian here as an example)
sudo apt install libfontconfig-dev libsecret-1-dev bsdtar libnss3 libatk1.0-0 libatk-bridge2.0-0 libgdk-pixbuf2.0-0 libgtk-3-0 libgbm1
# Linux (Debian/Ubuntu here as an example)
sudo apt install libfontconfig-dev libsecret-1-dev libarchive-tools libnss3 libatk1.0-0 libatk-bridge2.0-0 libgdk-pixbuf2.0-0 libgtk-3-0 libgbm1 cmake
yarn
./scripts/build-native.js
```

View File

@@ -2,17 +2,24 @@
<p align="center">
<a href="https://github.com/Eugeny/tabby/releases/latest"><img alt="GitHub All Releases" src="https://img.shields.io/github/downloads/eugeny/tabby/total.svg?label=RELEASE&logo=github&style=for-the-badge"></a> <a href="https://nightly.link/Eugeny/tabby/workflows/windows/master"><img src="https://shields.io/badge/-Nightly-blue?logo=windows&style=for-the-badge"/></a> <a href="https://nightly.link/Eugeny/tabby/workflows/macos/master"><img src="https://shields.io/badge/-Nightly-black?logo=apple&style=for-the-badge"/></a> <a href="https://nightly.link/Eugeny/tabby/workflows/linux/master"><img src="https://shields.io/badge/-Nightly-orange?logo=linux&style=for-the-badge"/></a> <a href="https://gitter.im/terminus-terminal/community"><img alt="Gitter" src="https://img.shields.io/gitter/room/terminus/community.svg?color=magenta&logo=gitter&style=for-the-badge"></a>
<a href="https://github.com/Eugeny/tabby/releases/latest"><img alt="GitHub All Releases" src="https://img.shields.io/github/downloads/eugeny/tabby/total.svg?label=RELEASE&logo=github&style=for-the-badge"></a> &nbsp; <a href="https://nightly.link/Eugeny/tabby/workflows/build/master"><img src="https://shields.io/badge/-Nightly%20Builds-orange?logo=hackthebox&logoColor=fff&style=for-the-badge"/></a> &nbsp; <a href="https://matrix.to/#/#tabby-general:matrix.org"><img alt="Matrix" src="https://img.shields.io/matrix/tabby-general:matrix.org?logo=matrix&style=for-the-badge&color=magenta"></a>
</p>
<p align="center">
<a href="https://ko-fi.com/J3J8KWTF">
<img src="https://ko-fi.com/img/githubbutton_sm.svg">
<img src="https://cdn.ko-fi.com/cdn/kofi3.png?v=2" width="150">
</a>
</p>
----
### Downloads:
* [Latest release](https://github.com/Eugeny/tabby/releases/latest)
* [Nightly build](https://nightly.link/Eugeny/tabby/workflows/build/master)
----
**Tabby** (formerly **Terminus**) is a highly configurable terminal emulator, SSH and serial client for Windows, macOS and Linux
* Integrated SSH client and connection manager
@@ -95,17 +102,17 @@ Tabby will run as a portable app on Windows, if you create a `data` folder in th
Plugins and themes can be installed directly from the Settings view inside Tabby.
* [clickable-links](https://github.com/Eugeny/terminus-clickable-links) - makes paths and URLs in the terminal clickable
* [clickable-links](https://github.com/Eugeny/tabby-clickable-links) - makes paths and URLs in the terminal clickable
* [docker](https://github.com/Eugeny/tabby-docker) - connect to Docker containers
* [title-control](https://github.com/kbjr/terminus-title-control) - allows modifying the title of the terminal tabs by providing a prefix, suffix, and/or strings to be removed
* [quick-cmds](https://github.com/Domain/terminus-quick-cmds) - quickly send commands to one or all terminal tabs
* [save-output](https://github.com/Eugeny/terminus-save-output) - record terminal output into a file
* [scrollbar](https://github.com/kbjr/terminus-scrollbar) - adds a scrollbar to hterm tabs
* [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
<a name="themes"></a>
# Themes
* [hype](https://github.com/Eugeny/terminus-theme-hype) - a Hyper inspired theme
* [hype](https://github.com/Eugeny/tabby-theme-hype) - a Hyper inspired theme
* [relaxed](https://github.com/Relaxed-Theme/relaxed-terminal-themes#terminus) - the Relaxed theme for Tabby
* [gruvbox](https://github.com/porkloin/terminus-theme-gruvbox)
* [windows10](https://www.npmjs.com/package/terminus-theme-windows10)
@@ -184,6 +191,10 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
<tr>
<td align="center"><a href="https://github.com/ydcool"><img src="https://avatars.githubusercontent.com/u/5668295?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Dominic Yin</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=ydcool" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/bdr99"><img src="https://avatars.githubusercontent.com/u/2292715?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Brandon Rothweiler</b></sub></a><br /><a href="#design-bdr99" title="Design">🎨</a></td>
<td align="center"><a href="https://git.io/JnP49"><img src="https://avatars.githubusercontent.com/u/63876444?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Logic Machine</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=logicmachine123" title="Documentation">📖</a></td>
<td align="center"><a href="https://github.com/cypherbits"><img src="https://avatars.githubusercontent.com/u/10424900?v=4?s=100" width="100px;" alt=""/><br /><sub><b>cypherbits</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=cypherbits" title="Documentation">📖</a></td>
<td align="center"><a href="https://modulolotus.net"><img src="https://avatars.githubusercontent.com/u/946421?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Matthew Davidson</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=KingMob" title="Code">💻</a></td>
<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>
</tr>
</table>
@@ -193,3 +204,5 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
<!-- ALL-CONTRIBUTORS-LIST:END -->
This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome!
<img src="https://ga-beacon.appspot.com/UA-3278102-18/github/readme" width="1"/>

View File

@@ -3,6 +3,7 @@ import * as promiseIpc from 'electron-promise-ipc'
import * as remote from '@electron/remote/main'
import * as path from 'path'
import * as fs from 'fs'
import { Subject, throttleTime } from 'rxjs'
import { loadConfig } from './config'
import { Window, WindowOptions } from './window'
@@ -19,6 +20,7 @@ export class Application {
private tray?: Tray
private ptyManager = new PTYManager()
private windows: Window[] = []
private globalHotkey$ = new Subject<void>()
userPluginsPath: string
constructor () {
@@ -33,12 +35,14 @@ export class Application {
ipcMain.on('app:register-global-hotkey', (_event, specs) => {
globalShortcut.unregisterAll()
for (const spec of specs) {
globalShortcut.register(spec, () => {
this.onGlobalHotkey()
})
globalShortcut.register(spec, () => this.globalHotkey$.next())
}
})
this.globalHotkey$.pipe(throttleTime(100)).subscribe(() => {
this.onGlobalHotkey()
})
;(promiseIpc as any).on('plugin-manager:install', (name, version) => {
return pluginManager.install(this.userPluginsPath, name, version)
})

View File

@@ -16,12 +16,6 @@ export function parseArgs (argv: string[], cwd: string): any {
.command('profile [profileName]', 'open a tab with specified profile', {
profileName: { type: 'string' },
})
.command('connect-ssh [connectionName]', 'open a tab for a saved SSH connection', {
connectionName: { type: 'string' },
})
.command('connect-serial [connectionName]', 'open a tab for a saved serial connection', {
connectionName: { type: 'string' },
})
.command('paste [text]', 'paste stdin into the active tab', yargs => {
return yargs.option('escape', {
alias: 'e',

View File

@@ -1,3 +1,4 @@
import 'v8-compile-cache'
import './portable'
import 'source-map-support/register'
import './sentry'
@@ -26,7 +27,9 @@ app.on('activate', () => {
})
app.on('window-all-closed', () => {
app.quit()
if (process.platform !== 'darwin') {
app.quit()
}
})
process.on('uncaughtException' as any, err => {

View File

@@ -1,4 +1,4 @@
import * as nodePTY from 'node-pty'
import * as nodePTY from '@tabby-gang/node-pty'
import { StringDecoder } from './stringDecoder'
import { v4 as uuidv4 } from 'uuid'
import { ipcMain } from 'electron'

View File

@@ -1,8 +1,7 @@
import * as glasstron from 'glasstron'
import { Subject, Observable } from 'rxjs'
import { debounceTime } from 'rxjs/operators'
import { BrowserWindow, app, ipcMain, Rectangle, Menu, screen, BrowserWindowConstructorOptions } from 'electron'
import { Subject, Observable, debounceTime } from 'rxjs'
import { BrowserWindow, app, ipcMain, Rectangle, Menu, screen, BrowserWindowConstructorOptions, TouchBar, nativeImage } from 'electron'
import ElectronConfig = require('electron-config')
import * as os from 'os'
import * as path from 'path'
@@ -29,6 +28,8 @@ abstract class GlasstronWindow extends BrowserWindow {
const macOSVibrancyType = process.platform === 'darwin' ? compareVersions.compare(macOSRelease().version, '10.14', '>=') ? 'fullscreen-ui' : 'dark' : null
const activityIcon = nativeImage.createFromPath(`${app.getAppPath()}/assets/activity.png`)
export class Window {
ready: Promise<void>
private visible = new Subject<boolean>()
@@ -40,6 +41,7 @@ export class Window {
private lastVibrancy: { enabled: boolean, type?: string } | null = null
private disableVibrancyWhileDragging = false
private configStore: any
private touchBarControl: any
get visible$ (): Observable<boolean> { return this.visible }
get closed$ (): Observable<void> { return this.closed }
@@ -118,7 +120,7 @@ export class Window {
})
this.window.on('blur', () => {
if (this.configStore.appearance?.dock !== 'off' && this.configStore.appearance?.dockHideOnBlur) {
if ((this.configStore.appearance?.dock ?? 'off') !== 'off' && this.configStore.appearance?.dockHideOnBlur) {
this.hide()
}
})
@@ -128,7 +130,15 @@ export class Window {
this.window.webContents.setVisualZoomLevelLimits(1, 1)
this.window.webContents.setZoomFactor(1)
if (process.platform !== 'darwin') {
if (process.platform === 'darwin') {
this.touchBarControl = new TouchBar.TouchBarSegmentedControl({
segments: [],
change: index => this.send('touchbar-selection', index),
})
this.window.setTouchBar(new TouchBar({
items: [this.touchBarControl],
}))
} else {
this.window.setMenu(null)
}
@@ -358,13 +368,21 @@ export class Window {
this.window.close()
})
ipcMain.on('window-set-touch-bar', (_event, segments, selectedIndex) => {
this.touchBarControl.segments = segments.map(s => ({
label: s.label,
icon: s.hasActivity ? activityIcon : undefined,
}))
this.touchBarControl.selectedIndex = selectedIndex
})
this.window.webContents.on('new-window', event => event.preventDefault())
ipcMain.on('window-set-disable-vibrancy-while-dragging', (_event, value) => {
this.disableVibrancyWhileDragging = value
})
let moveEndedTimeout: number|null = null
let moveEndedTimeout: any = null
const onBoundsChange = () => {
if (!this.lastVibrancy?.enabled || !this.disableVibrancyWhileDragging) {
return

View File

@@ -14,15 +14,8 @@
"watch": "webpack --progress --color --watch"
},
"dependencies": {
"@angular/animations": "^12.0.0",
"@angular/common": "^12.0.0",
"@angular/compiler": "^12.0.0",
"@angular/core": "^12.0.0",
"@angular/forms": "^12.0.0",
"@angular/platform-browser": "^12.0.0",
"@angular/platform-browser-dynamic": "^12.0.0",
"@angular/cdk": "^12.2.0",
"@electron/remote": "1.2.0",
"@ng-bootstrap/ng-bootstrap": "^9.1.1",
"any-promise": "^1.3.0",
"electron-config": "2.0.0",
"electron-debug": "^3.2.0",
@@ -33,26 +26,25 @@
"keytar": "^7.7.0",
"mz": "^2.7.0",
"native-process-working-directory": "^1.0.2",
"ngx-toastr": "^14.0.0",
"node-pty": "^0.10.1",
"@tabby-gang/node-pty": "^0.11.0-beta.200",
"npm": "6",
"rxjs": "^7.1.0",
"yargs": "^17.0.1",
"zone.js": "^0.11.4"
"rxjs": "^7.2.0",
"source-map-support": "^0.5.19",
"v8-compile-cache": "^2.3.0",
"yargs": "^17.1.0"
},
"optionalDependencies": {
"macos-native-processlist": "^2.0.0",
"serialport": "^9.2.0",
"windows-blurbehind": "^1.0.1",
"windows-native-registry": "^3.0.0",
"windows-native-registry": "^3.1.0",
"windows-process-tree": "^0.3.0"
},
"devDependencies": {
"@types/mz": "2.7.3",
"@types/node": "15.12.5",
"@types/mz": "2.7.4",
"@types/node": "16.0.1",
"ngx-filesize": "^2.0.16",
"node-abi": "^2.30.0",
"source-map-support": "^0.5.19"
"node-abi": "^2.30.0"
},
"peerDependencies": {
"tabby-community-color-schemes": "*",

View File

@@ -1,3 +1,4 @@
import 'v8-compile-cache'
import '../lib/lru'
import 'source-sans-pro/source-sans-pro.css'
import 'source-code-pro/source-code-pro.css'

View File

@@ -5,13 +5,15 @@ import 'rxjs'
import './global.scss'
import './toastr.scss'
// Importing before @angular/*
import { findPlugins, initModuleLookup, loadPlugins } from './plugins'
import { enableProdMode, NgModuleRef, ApplicationRef } from '@angular/core'
import { enableDebugTools } from '@angular/platform-browser'
import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'
import { ipcRenderer } from 'electron'
import { getRootModule } from './app.module'
import { findPlugins, initModuleLookup, loadPlugins } from './plugins'
import { BootstrapData, BOOTSTRAP_DATA, PluginInfo } from '../../tabby-core/src/api/mainProcess'
// Always land on the start view

View File

@@ -28,7 +28,6 @@ body {
.form-line {
display: flex;
border-top: 1px solid rgba(0, 0, 0, 0.2);
align-items: center;
padding: 10px 0;
margin: 0;
@@ -115,7 +114,8 @@ ngb-typeahead-window {
.hover-reveal-parent:hover &,
*:hover > &,
&:hover {
&:hover,
&.show {
opacity: 1;
}
}
@@ -158,3 +158,31 @@ ngb-typeahead-window {
text-overflow: ellipsis;
overflow: hidden;
}
.list-group-item > button {
margin: -7px 0;
}
// Windows high contrast mode
@media screen and (forced-colors: active) {
.custom-switch .custom-control-label::before {
background: buttonface;
}
.custom-switch .custom-control-label::after {
background: buttontext;
}
.custom-switch .custom-control-input:checked ~ .custom-control-label::before {
background: activetext;
}
.custom-switch .custom-control-input:checked ~ .custom-control-label::after {
background: canvas;
}
color-scheme-preview, terminaltab > .content {
forced-color-adjust: none;
}
}

View File

@@ -18,28 +18,47 @@ function normalizePath (p: string): string {
const builtinPluginsPath = process.env.TABBY_DEV ? path.dirname(remote.app.getAppPath()) : path.join((process as any).resourcesPath, 'builtin-plugins')
const cachedBuiltinModules = {
'@angular/animations': require('@angular/animations'),
'@angular/common': require('@angular/common'),
'@angular/compiler': require('@angular/compiler'),
'@angular/core': require('@angular/core'),
'@angular/forms': require('@angular/forms'),
'@angular/platform-browser': require('@angular/platform-browser'),
'@angular/platform-browser/animations': require('@angular/platform-browser/animations'),
'@angular/platform-browser-dynamic': require('@angular/platform-browser-dynamic'),
'@ng-bootstrap/ng-bootstrap': require('@ng-bootstrap/ng-bootstrap'),
'ngx-toastr': require('ngx-toastr'),
rxjs: require('rxjs'),
'rxjs/operators': require('rxjs/operators'),
'zone.js/dist/zone.js': require('zone.js/dist/zone.js'),
}
const builtinModules = [
'@angular/animations',
'@angular/common',
'@angular/compiler',
'@angular/core',
'@angular/forms',
'@angular/platform-browser',
'@angular/platform-browser-dynamic',
'@ng-bootstrap/ng-bootstrap',
'ngx-toastr',
'rxjs',
'rxjs/operators',
...Object.keys(cachedBuiltinModules),
'tabby-core',
'tabby-local',
'tabby-settings',
'tabby-terminal',
'zone.js/dist/zone.js',
]
export type ProgressCallback = (current: number, total: number) => void // eslint-disable-line @typescript-eslint/no-type-alias
const originalRequire = (global as any).require
;(global as any).require = function (query: string) {
if (cachedBuiltinModules[query]) {
return cachedBuiltinModules[query]
}
return originalRequire.apply(this, [query])
}
const cachedBuiltinModules = {}
const originalModuleRequire = nodeModule.prototype.require
nodeModule.prototype.require = function (query: string) {
if (cachedBuiltinModules[query]) {
return cachedBuiltinModules[query]
}
return originalModuleRequire.call(this, query)
}
export type ProgressCallback = (current: number, total: number) => void
export function initModuleLookup (userPluginsPath: string): void {
global['module'].paths.map((x: string) => nodeModule.globalPaths.push(normalizePath(x)))
@@ -57,24 +76,10 @@ export function initModuleLookup (userPluginsPath: string): void {
}
builtinModules.forEach(m => {
cachedBuiltinModules[m] = nodeRequire(m)
if (!cachedBuiltinModules[m]) {
cachedBuiltinModules[m] = nodeRequire(m)
}
})
const originalRequire = (global as any).require
;(global as any).require = function (query: string) {
if (cachedBuiltinModules[query]) {
return cachedBuiltinModules[query]
}
return originalRequire.apply(this, [query])
}
const originalModuleRequire = nodeModule.prototype.require
nodeModule.prototype.require = function (query: string) {
if (cachedBuiltinModules[query]) {
return cachedBuiltinModules[query]
}
return originalModuleRequire.call(this, query)
}
}
export async function findPlugins (): Promise<PluginInfo[]> {

View File

@@ -31,52 +31,29 @@ module.exports = {
{
test: /\.ts$/,
use: {
loader: 'awesome-typescript-loader',
loader: 'ts-loader',
options: {
configFileName: path.resolve(__dirname, 'tsconfig.json'),
configFile: path.resolve(__dirname, 'tsconfig.json'),
},
},
},
{ test: /\.scss$/, use: ['style-loader', 'css-loader', 'sass-loader'] },
{ test: /\.css$/, use: ['style-loader', 'css-loader', 'sass-loader'] },
{
test: /\.(png|svg)$/,
use: {
loader: 'url-loader',
options: {
limit: 999999,
},
},
},
{
test: /\.(ttf|eot|otf|woff|woff2)(\?v=[0-9]\.[0-9]\.[0-9])?$/,
use: {
loader: 'file-loader',
options: {
name: 'fonts/[name].[ext]',
},
},
test: /\.(png|svg|ttf|eot|otf|woff|woff2)(\?v=[0-9]\.[0-9]\.[0-9])?$/,
type: 'asset',
},
],
},
externals: {
'@angular/core': 'commonjs @angular/core',
'@angular/compiler': 'commonjs @angular/compiler',
'@angular/platform-browser': 'commonjs @angular/platform-browser',
'@angular/platform-browser-dynamic': 'commonjs @angular/platform-browser-dynamic',
'@angular/forms': 'commonjs @angular/forms',
'@angular/common': 'commonjs @angular/common',
'@ng-bootstrap/ng-bootstrap': 'commonjs @ng-bootstrap/ng-bootstrap',
'@electron/remote': 'commonjs @electron/remote',
'v8-compile-cache': 'commonjs v8-compile-cache',
child_process: 'commonjs child_process',
electron: 'commonjs electron',
fs: 'commonjs fs',
'ngx-toastr': 'commonjs ngx-toastr',
module: 'commonjs module',
mz: 'commonjs mz',
path: 'commonjs path',
rxjs: 'commonjs rxjs',
'zone.js': 'commonjs zone.js/dist/zone.js',
},
plugins: [
new webpack.optimize.ModuleConcatenationPlugin(),

View File

@@ -25,29 +25,28 @@ module.exports = {
{
test: /\.ts$/,
use: {
loader: 'awesome-typescript-loader',
loader: 'ts-loader',
options: {
configFileName: path.resolve(__dirname, 'tsconfig.main.json'),
configFile: path.resolve(__dirname, 'tsconfig.main.json'),
},
},
},
],
},
externals: {
'v8-compile-cache': 'commonjs v8-compile-cache',
'any-promise': 'commonjs any-promise',
electron: 'commonjs electron',
'electron-config': 'commonjs electron-config',
'electron-debug': 'commonjs electron-debug',
'electron-promise-ipc': 'commonjs electron-promise-ipc',
'electron-vibrancy': 'commonjs electron-vibrancy',
fs: 'commonjs fs',
glasstron: 'commonjs glasstron',
mz: 'commonjs mz',
npm: 'commonjs npm',
'node-pty': 'commonjs node-pty',
'node:os': 'commonjs os',
'@tabby-gang/node-pty': 'commonjs @tabby-gang/node-pty',
path: 'commonjs path',
rxjs: 'commonjs rxjs',
'rxjs/operators': 'commonjs rxjs/operators',
util: 'commonjs util',
'source-map-support': 'commonjs source-map-support',
'windows-swca': 'commonjs windows-swca',

View File

@@ -2,54 +2,14 @@
# yarn lockfile v1
"@angular/animations@^12.0.0":
version "12.0.0"
resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-12.0.0.tgz#5f845b1a58ffb6f3ea6103edf0756ac65320b725"
integrity sha512-BG/Ksk3863I7GKUem73Kty4UeU289oN+iPo/0O0x2dJCzNcpafML0GJpz4lg/RT9l6UddFviI4q9NiopR+eJfw==
"@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==
dependencies:
tslib "^2.1.0"
"@angular/common@^12.0.0":
version "12.0.0"
resolved "https://registry.yarnpkg.com/@angular/common/-/common-12.0.0.tgz#a4b992f3af997e9e957500148100f3f2a90ad3e9"
integrity sha512-d6+WSnCFcxAHBsbCvBC3Rutmk+tB5CEdKhkTBY/vGe0A/MjbayzHR4IDv2i0+UZDLSgMJubqh3iCPUcSglXSEg==
dependencies:
tslib "^2.1.0"
"@angular/compiler@^12.0.0":
version "12.0.0"
resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-12.0.0.tgz#bb0d4f464fee4803dbda49d862474f771c31f633"
integrity sha512-7NdZNyxm9KLlRMmmtId6RfV6VbQIUMDxN44R+ax66BoWsuhdYXUDsDO554LwYwrjnnXXGkurDJhv7umeRwaZGw==
dependencies:
tslib "^2.1.0"
"@angular/core@^12.0.0":
version "12.0.0"
resolved "https://registry.yarnpkg.com/@angular/core/-/core-12.0.0.tgz#d16a217f0919b3b161229118c52b1f703815eb71"
integrity sha512-fwXtF6qP8pr07+El/dg67RmgsI4Ubfi+E5YLjYKQ62gM8MzYyYGmLPakFzFnbzYrOr05zdprrbcVgGtMRHapMA==
dependencies:
tslib "^2.1.0"
"@angular/forms@^12.0.0":
version "12.0.0"
resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-12.0.0.tgz#faf5e3e36a8c4f57f42a5b3dd11786f39c94d693"
integrity sha512-/Z2AWd2k/9cs+WwXBlZ8yUqgGsHYcp8g6PUCehZQk1gd/4n4FOKvTIGiypajGUPwO4GOHJDzibfCsGw8MenCpQ==
dependencies:
tslib "^2.1.0"
"@angular/platform-browser-dynamic@^12.0.0":
version "12.0.0"
resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-12.0.0.tgz#295036e7b487b6dbe3b13db763a371675d391ee6"
integrity sha512-Rkxr/KVOZGuGSuIYo2XZYbOpyS2t2jpLPS65KUUcOEwktj4hSv5VZ2soZF18tG5ZNbx06C1QDW/j9HwmZjEh5g==
dependencies:
tslib "^2.1.0"
"@angular/platform-browser@^12.0.0":
version "12.0.0"
resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-12.0.0.tgz#097805ad9a5db044dc0a74c1294cdfa5122eca4c"
integrity sha512-h+uMMluRh4dqJIor7EpvwNKRjv4xCxpttizJlqbo3vfcoOoLDoc9SvEFiXxd+UVh3S0re8zBsyBIJl+gTVFKWQ==
dependencies:
tslib "^2.1.0"
tslib "^2.2.0"
optionalDependencies:
parse5 "^5.0.0"
"@electron/remote@1.2.0":
version "1.2.0"
@@ -65,13 +25,6 @@
update-notifier "^2.2.0"
yargs "^8.0.2"
"@ng-bootstrap/ng-bootstrap@^9.1.1":
version "9.1.1"
resolved "https://registry.yarnpkg.com/@ng-bootstrap/ng-bootstrap/-/ng-bootstrap-9.1.1.tgz#5a629915ea93b4f9b4d61854cb6862d99a7c9ca4"
integrity sha512-m31qKJylYueXm+a3YEoOfnrJYR1lovb7WgaQwvXQz3dDmtaYRX4n8aPeCMp1VrI7hFfFITKWo0GxPaI3JIFk4w==
dependencies:
tslib "^2.0.0"
"@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"
@@ -143,17 +96,24 @@
dependencies:
debug "^4.3.1"
"@types/mz@2.7.3":
version "2.7.3"
resolved "https://registry.yarnpkg.com/@types/mz/-/mz-2.7.3.tgz#e42a21e73f5f9340fe4a176981fafb1eb8cc6c12"
integrity sha512-Zp1NUJ4Alh3gaun0a5rkF3DL7b2j1WB6rPPI5h+CJ98sQnxe9qwskClvupz/4bqChGR3L/BRhTjlaOwR+uiZJg==
"@tabby-gang/node-pty@^0.11.0-beta.200":
version "0.11.0-beta.200"
resolved "https://registry.yarnpkg.com/@tabby-gang/node-pty/-/node-pty-0.11.0-beta.200.tgz#485cd6d85a04f4b272b81a9862578d7fc38cdfb5"
integrity sha512-32ANParjnd38SzvICaLYvEBlTZAE2sqsgEZPK6ITgd38FcCsS/yvvsDZcjkclbxApnMM2rJDaYjsZMa0lr9Iyg==
dependencies:
nan "^2.14.0"
"@types/mz@2.7.4":
version "2.7.4"
resolved "https://registry.yarnpkg.com/@types/mz/-/mz-2.7.4.tgz#f9d1535cb5171199b28ae6abd6ec29e856551401"
integrity sha512-Zs0imXxyWT20j3Z2NwKpr0IO2LmLactBblNyLua5Az4UHuqOQ02V3jPTgyKwDkuc33/ahw+C3O1PIZdrhFMuQA==
dependencies:
"@types/node" "*"
"@types/node@*", "@types/node@15.12.5":
version "15.12.5"
resolved "https://registry.yarnpkg.com/@types/node/-/node-15.12.5.tgz#9a78318a45d75c9523d2396131bd3cca54b2d185"
integrity sha512-se3yX7UHv5Bscf8f1ERKvQOD6sTyycH3hdaoozvaLxgUiY5lIGEeH37AD0G0Qi9kPqihPn0HOfd2yaIEN9VwEg==
"@types/node@*", "@types/node@16.0.1":
version "16.0.1"
resolved "https://registry.yarnpkg.com/@types/node/-/node-16.0.1.tgz#70cedfda26af7a2ca073fdcc9beb2fff4aa693f8"
integrity sha512-hBOx4SUlEPKwRi6PrXuTGw1z6lz0fjsibcWCM378YxsSu/6+C30L6CR49zIBKHiwNWCYIcOLjg4OHKZaFeLAug==
JSONStream@^1.3.4, JSONStream@^1.3.5:
version "1.3.5"
@@ -2099,13 +2059,6 @@ ngx-filesize@^2.0.16:
filesize ">= 4.0.0"
tslib "^2.0.0"
ngx-toastr@^14.0.0:
version "14.0.0"
resolved "https://registry.yarnpkg.com/ngx-toastr/-/ngx-toastr-14.0.0.tgz#20e4737ef330b892a453768cd98b980558aeb286"
integrity sha512-dnDzSY73pF6FvNyxdh6ftfvXvUg6SU7MAT3orPUCzA77t3ZcFslro06zk4NCA2g67RF7dBwM0OJ/y0SN6fdGYw==
dependencies:
tslib "^2.1.0"
node-abi@^2.20.0, node-abi@^2.30.0, node-abi@^2.7.0:
version "2.30.0"
resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.30.0.tgz#8be53bf3e7945a34eea10e0fc9a5982776cf550b"
@@ -2149,13 +2102,6 @@ node-gyp@^5.0.2, node-gyp@^5.1.0:
tar "^4.4.12"
which "^1.3.1"
node-pty@^0.10.1:
version "0.10.1"
resolved "https://registry.yarnpkg.com/node-pty/-/node-pty-0.10.1.tgz#cd05d03a2710315ec40221232ec04186f6ac2c6d"
integrity sha512-JTdtUS0Im/yRsWJSx7yiW9rtpfmxqxolrtnyKwPLI+6XqTAPW/O2MjS8FYL4I5TsMbH2lVgDb2VMjp+9LoQGNg==
dependencies:
nan "^2.14.0"
noop-logger@^0.1.1:
version "0.1.1"
resolved "https://registry.npmjs.org/noop-logger/-/noop-logger-0.1.1.tgz"
@@ -2621,6 +2567,11 @@ parse-json@^2.2.0:
dependencies:
error-ex "^1.2.0"
parse5@^5.0.0:
version "5.1.1"
resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.1.1.tgz#f68e4e5ba1852ac2cadc00f4555fff6c2abb6178"
integrity sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==
path-exists@^3.0.0:
version "3.0.0"
resolved "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz"
@@ -3016,10 +2967,10 @@ run-queue@^1.0.0, run-queue@^1.0.3:
dependencies:
aproba "^1.1.1"
rxjs@^7.1.0:
version "7.1.0"
resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.1.0.tgz#94202d27b19305ef7b1a4f330277b2065df7039e"
integrity sha512-gCFO5iHIbRPwznl6hAYuwNFld8W4S2shtSJIqG27ReWXo9IWrCyEICxUA+6vJHwSR/OakoenC4QsDxq50tzYmw==
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==
dependencies:
tslib "~2.1.0"
@@ -3457,10 +3408,10 @@ tough-cookie@~2.5.0:
psl "^1.1.28"
punycode "^2.1.1"
tslib@^2.0.0, tslib@^2.1.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.2.0.tgz#fb2c475977e35e241311ede2693cee1ec6698f5c"
integrity sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w==
tslib@^2.0.0, tslib@^2.2.0:
version "2.3.0"
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.0.tgz#803b8cdab3e12ba581a4ca41c8839bbb0dacb09e"
integrity sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==
tslib@~2.1.0:
version "2.1.0"
@@ -3582,6 +3533,11 @@ uuid@^3.0.1, uuid@^3.3.2, uuid@^3.3.3:
resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
v8-compile-cache@^2.3.0:
version "2.3.0"
resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee"
integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==
validate-npm-package-license@^3.0.1, validate-npm-package-license@^3.0.4:
version "3.0.4"
resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz"
@@ -3649,12 +3605,12 @@ windows-blurbehind@^1.0.1:
resolved "https://registry.yarnpkg.com/windows-blurbehind/-/windows-blurbehind-1.0.1.tgz#ff098713873304e38330b2c54cc41bb369b587b9"
integrity sha512-1HzHfCiM1ayrbACJu5qE9zELV24uX/tINT6kxaZwLY3rtQAoeav6x9z7LFHWoLaGDN/sYbnK+9Vk0cz7fsk5HQ==
windows-native-registry@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/windows-native-registry/-/windows-native-registry-3.0.0.tgz#82e715df7a59d5054c768547d81e0bfc81a59d2e"
integrity sha512-Mz/9a23UivwPc23DsTOL/ZCp/XXogT+6h/khk1psOfDDusXqpomBdxNdsBBE/BvIgOExjGom0XPOfEPiDnHy7A==
windows-native-registry@^3.1.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/windows-native-registry/-/windows-native-registry-3.1.0.tgz#909ef3254519fdec57d2f149ac59a2c9dc84419a"
integrity sha512-WrDysn2V7dH+EYE6cS2RF+7r2P+M0pOYWtU8iBrjV2HaGkCLlUdGUWzOdzT0JPdWwz0BkVu3IOae2xmBajQqBA==
dependencies:
node-addon-api "^3.0.0"
node-addon-api "^3.1.0"
windows-process-tree@^0.3.0:
version "0.3.0"
@@ -3789,10 +3745,10 @@ yargs@^14.2.3:
y18n "^4.0.0"
yargs-parser "^15.0.1"
yargs@^17.0.1:
version "17.0.1"
resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.0.1.tgz#6a1ced4ed5ee0b388010ba9fd67af83b9362e0bb"
integrity sha512-xBBulfCc8Y6gLFcrPvtqKz9hz8SO0l1Ni8GgDekvBX2ro0HRQImDGnikfc33cgzcYUSncapnNcZDjVFIH3f6KQ==
yargs@^17.1.0:
version "17.1.0"
resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.1.0.tgz#0cd9827a0572c9a1795361c4d1530e53ada168cf"
integrity sha512-SQr7qqmQ2sNijjJGHL4u7t8vyDZdZ3Ahkmo4sc1w5xI9TBX0QDdG/g4SFnxtWOsGLjwHQue57eFALfwFCnixgg==
dependencies:
cliui "^7.0.2"
escalade "^3.1.1"
@@ -3820,10 +3776,3 @@ yargs@^8.0.2:
which-module "^2.0.0"
y18n "^3.2.1"
yargs-parser "^7.0.0"
zone.js@^0.11.4:
version "0.11.4"
resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.11.4.tgz#0f70dcf6aba80f698af5735cbb257969396e8025"
integrity sha512-DDh2Ab+A/B+9mJyajPjHFPWfYU1H+pdun4wnnk0OcQTNjem1XQSZ2CDW+rfZEUDjv5M19SBqAkjZi0x5wuB5Qw==
dependencies:
tslib "^2.0.0"

File diff suppressed because it is too large Load Diff

View File

@@ -1,40 +1,52 @@
{
"devDependencies": {
"@fortawesome/fontawesome-free": "^5.15.3",
"@sentry/cli": "^1.64.2",
"@sentry/electron": "^2.5.0",
"@terminus-term/to-string-loader": "1.1.7-beta.1",
"@angular/animations": "^12.0.0",
"@angular/common": "^12.0.0",
"@angular/compiler": "^12.0.0",
"@angular/core": "^12.0.0",
"@angular/forms": "^12.0.0",
"@angular/platform-browser": "^12.0.0",
"@angular/platform-browser-dynamic": "^12.0.0",
"@fortawesome/fontawesome-free": "^5.15.4",
"@ng-bootstrap/ng-bootstrap": "^10.0.0",
"@sentry/cli": "^1.67.2",
"@sentry/electron": "^2.5.1",
"@tabby-gang/to-string-loader": "^1.1.7-beta.2",
"@types/electron-config": "^3.2.2",
"@types/electron-debug": "^2.1.0",
"@types/fs-extra": "^9.0.11",
"@types/js-yaml": "^4.0.1",
"@types/node": "15.12.5",
"@types/webpack-env": "^1.16.0",
"@typescript-eslint/eslint-plugin": "^4.25.0",
"@typescript-eslint/parser": "^4.28.0",
"@types/fs-extra": "^9.0.12",
"@types/js-yaml": "^4.0.2",
"@types/node": "16.0.1",
"@types/sortablejs": "^1.10.7",
"@types/webpack-env": "^1.16.2",
"@typescript-eslint/eslint-plugin": "^4.29.0",
"@typescript-eslint/parser": "^4.28.5",
"apply-loader": "2.0.0",
"awesome-typescript-loader": "^5.2.1",
"axios": "^0.21.1",
"clone-deep": "^4.0.1",
"compare-versions": "^3.6.0",
"core-js": "^3.14.0",
"core-js": "^3.15.2",
"cross-env": "7.0.3",
"css-loader": "5.2.6",
"electron": "13.1.4",
"css-loader": "^6.2.0",
"electron": "13.1.9",
"electron-builder": "22.10.5",
"electron-download": "^4.1.1",
"electron-installer-snap": "^5.1.0",
"electron-notarize": "^1.0.0",
"electron-rebuild": "^2.3.5",
"eslint": "^7.29.0",
"electron-notarize": "^1.0.1",
"electron-rebuild": "^3.1.1",
"eslint": "^7.32.0",
"eslint-plugin-import": "^2.23.4",
"file-loader": "^6.2.0",
"graceful-fs": "^4.2.6",
"graceful-fs": "^4.2.8",
"html-loader": "2.1.2",
"json-loader": "0.5.7",
"lru-cache": "^6.0.0",
"macos-release": "^2.5.0",
"macos-release": "^3.0.0",
"ngx-sortablejs": "^11.1.0",
"ngx-toastr": "^14.0.0",
"node-abi": "^2.30.0",
"node-sass": "^6.0.1",
"npmlog": "4.1.2",
"npmlog": "5.0.0",
"npx": "^10.2.2",
"patch-package": "^6.4.7",
"pug": "^3.0.2",
@@ -44,33 +56,40 @@
"pug-static-loader": "2.0.0",
"raw-loader": "4.0.2",
"sass-loader": "^12.1.0",
"shell-quote": "^1.7.2",
"shelljs": "0.8.4",
"slugify": "^1.6.0",
"sortablejs": "^1.14.0",
"source-code-pro": "^2.38.0",
"source-map-loader": "^3.0.0",
"source-sans-pro": "3.6.0",
"style-loader": "^3.0.0",
"ssh2": "^1.2.0",
"style-loader": "^3.2.1",
"svg-inline-loader": "^0.8.2",
"ts-loader": "^9.2.3",
"tslib": "^2.3.0",
"typedoc": "^0.21.2",
"typescript": "^4.2.4",
"url-loader": "^4.1.1",
"typedoc": "^0.21.5",
"typescript": "^4.3.5",
"val-loader": "4.0.0",
"webpack": "^5.41.0",
"webpack": "^5.50.0",
"webpack-bundle-analyzer": "^4.4.2",
"webpack-cli": "^4.7.0",
"yaml-loader": "0.6.0"
"yaml-loader": "0.6.0",
"zone.js": "^0.11.4"
},
"resolutions": {
"lzma-native": "^8.0.0",
"*/node-abi": "^2.30.0",
"**/graceful-fs": "^4.2.4"
},
"scripts": {
"build": "npm run build:typings && webpack --color --config app/webpack.main.config.js && webpack --color --config app/webpack.config.js && webpack --color --config tabby-core/webpack.config.js && webpack --color --config tabby-settings/webpack.config.js && webpack --color --config tabby-terminal/webpack.config.js && webpack --color --config tabby-local/webpack.config.js && webpack --color --config tabby-plugin-manager/webpack.config.js && webpack --color --config tabby-community-color-schemes/webpack.config.js && webpack --color --config tabby-ssh/webpack.config.js && webpack --color --config tabby-serial/webpack.config.js && webpack --color --config tabby-electron/webpack.config.js && webpack --color --config tabby-web/webpack.config.js && webpack --color --config web/webpack.config.js",
"build": "npm run build:typings && node scripts/build-modules.js",
"build:typings": "node scripts/build-typings.js",
"watch": "cross-env TABBY_DEV=1 webpack --progress --color --watch",
"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 --out docs/api --tsconfig tabby-core/src/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",
"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",
"lint": "eslint --ext ts */src */lib",
"postinstall": "node ./scripts/install-deps.js",
"patch": "patch-package; cd web; patch-package"

View File

@@ -1,13 +1,13 @@
diff --git a/node_modules/app-builder-lib/out/appInfo.js b/node_modules/app-builder-lib/out/appInfo.js
index 25a159e..d8a0262 100644
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'
+ return 'tabby-terminal';
}
get sanitizedName() {

22
scripts/build-modules.js Executable file
View File

@@ -0,0 +1,22 @@
#!/usr/bin/env node
const vars = require('./vars')
const log = require('npmlog')
const webpack = require('webpack')
const { promisify } = require('util')
const configs = [
'../app/webpack.main.config.js',
'../app/webpack.config.js',
...vars.allPackages.map(x => `../${x}/webpack.config.js`),
]
;(async () => {
for (const c of configs) {
log.info('build', c)
const stats = await promisify(webpack)(require(c))
console.log(stats.toString({ colors: true }))
if (stats.hasErrors()) {
process.exit(1)
}
}
})()

View File

@@ -0,0 +1,12 @@
#!/usr/bin/env node
const jsYaml = require('js-yaml')
const fs = require('fs')
const path = require('path')
const metadata = jsYaml.load(fs.readFileSync(path.resolve(__dirname, '../node_modules/@fortawesome/fontawesome-free/metadata/icons.yml')))
let result = {}
for (let key in metadata) {
result[key] = metadata[key].styles.map(x => x[0])
}
fs.writeFileSync(path.resolve(__dirname, '../tabby-core/src/icons.json'), JSON.stringify(result))

View File

@@ -4,8 +4,11 @@ const path = require('path')
const vars = require('./vars')
const log = require('npmlog')
const localBinPath = path.resolve(__dirname, '../node_modules/.bin');
const npx = `${localBinPath}/npx`;
const localBinPath = path.resolve(__dirname, '../node_modules/.bin')
const npx = `${localBinPath}/npx`
log.info('patch')
sh.exec(`${npx} patch-package`)
log.info('deps', 'app')
@@ -17,17 +20,17 @@ sh.cd('web')
sh.exec(`${npx} yarn install --force`)
sh.cd('..')
vars.builtinPlugins.forEach(plugin => {
log.info('deps', plugin)
sh.cd(plugin)
sh.exec(`${npx} yarn install --force`)
sh.cd('..')
vars.allPackages.forEach(plugin => {
log.info('deps', plugin)
sh.cd(plugin)
sh.exec(`${npx} yarn install --force`)
sh.cd('..')
})
if (['darwin', 'linux'].includes(process.platform)) {
sh.cd('node_modules')
for (let x of vars.builtinPlugins) {
sh.ln('-fs', '../' + x, x)
}
sh.cd('..')
sh.cd('node_modules')
for (let x of vars.builtinPlugins) {
sh.ln('-fs', '../' + x, x)
}
sh.cd('..')
}

View File

@@ -3,7 +3,7 @@ const sh = require('shelljs')
const vars = require('./vars')
const log = require('npmlog')
vars.builtinPlugins.forEach(plugin => {
vars.allPackages.forEach(plugin => {
log.info('bump', plugin)
sh.cd(plugin)
sh.exec('npm --no-git-tag-version version ' + vars.version)

View File

@@ -9,7 +9,7 @@ sh.exec(`${sentryCli} releases new ${vars.version}`)
if (process.platform === 'darwin') {
for (const path of [
'app/node_modules/@serialport/bindings/build/Release/bindings.node',
'app/node_modules/node-pty/build/Release/pty.node',
'app/node_modules/@tabby-gang/node-pty/build/Release/pty.node',
'app/node_modules/fontmanager-redux/build/Release/fontmanager.node',
'app/node_modules/macos-native-processlist/build/Release/native.node',
]) {

View File

@@ -5,28 +5,36 @@ const childProcess = require('child_process')
const electronInfo = JSON.parse(fs.readFileSync(path.resolve(__dirname, '../node_modules/electron/package.json')))
exports.version = childProcess.execSync('git describe --tags', {encoding:'utf-8'})
exports.version = childProcess.execSync('git describe --tags', { encoding:'utf-8' })
exports.version = exports.version.substring(1).trim()
exports.version = exports.version.replace('-', '-c')
if (exports.version.includes('-c')) {
exports.version = semver.inc(exports.version, 'prepatch').replace('-0', '-nightly.0')
exports.version = semver.inc(exports.version, 'prepatch').replace('-0', `-nightly.${process.env.REV ?? 0}`)
}
exports.builtinPlugins = [
'tabby-core',
'tabby-settings',
'tabby-terminal',
'tabby-electron',
'tabby-local',
'tabby-web',
'tabby-community-color-schemes',
'tabby-plugin-manager',
'tabby-ssh',
'tabby-serial',
'tabby-core',
'tabby-settings',
'tabby-terminal',
'tabby-web',
'tabby-community-color-schemes',
'tabby-ssh',
'tabby-serial',
'tabby-telnet',
'tabby-electron',
'tabby-local',
'tabby-plugin-manager',
]
exports.allPackages = [
...exports.builtinPlugins,
'web',
'tabby-web-demo',
]
exports.bundledModules = [
'@angular',
'@ng-bootstrap',
'@angular',
'@ng-bootstrap',
]
exports.electronVersion = electronInfo.version

View File

@@ -1 +0,0 @@
dist

View File

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

View File

@@ -1 +0,0 @@
dist

View File

@@ -1,6 +1,6 @@
{
"name": "tabby-core",
"version": "1.0.144",
"version": "1.0.150",
"description": "Tabby core",
"keywords": [
"tabby-builtin-plugin"
@@ -19,14 +19,11 @@
"devDependencies": {
"@types/js-yaml": "^4.0.0",
"bootstrap": "^4.1.3",
"clone-deep": "^4.0.1",
"core-js": "^3.1.2",
"deep-equal": "^2.0.5",
"deepmerge": "^4.1.1",
"electron-updater": "^4.0.6",
"js-yaml": "^4.0.0",
"mixpanel": "^0.13.0",
"ng2-dnd": "^5.0.2",
"ngx-filesize": "^2.0.16",
"ngx-perfect-scrollbar": "^10.1.0",
"readable-stream": "3.6.0",

View File

@@ -2,7 +2,7 @@ export { BaseComponent, SubscriptionContainer } from '../components/base.compone
export { BaseTabComponent, BaseTabProcess } from '../components/baseTab.component'
export { TabHeaderComponent } from '../components/tabHeader.component'
export { SplitTabComponent, SplitContainer } from '../components/splitTab.component'
export { TabRecoveryProvider, RecoveredTab, RecoveryToken } from './tabRecovery'
export { TabRecoveryProvider, RecoveryToken } from './tabRecovery'
export { ToolbarButtonProvider, ToolbarButton } from './toolbarButtonProvider'
export { ConfigProvider } from './configProvider'
export { HotkeyProvider, HotkeyDescription } from './hotkeyProvider'
@@ -16,18 +16,22 @@ export { BootstrapData, PluginInfo, BOOTSTRAP_DATA } from './mainProcess'
export { HostWindowService } from './hostWindow'
export { HostAppService, Platform } from './hostApp'
export { FileProvider } from './fileProvider'
export { ProfileProvider, Profile, PartialProfile, ProfileSettingsComponent } from './profileProvider'
export { PromptModalComponent } from '../components/promptModal.component'
export { AppService } from '../services/app.service'
export { ConfigService } from '../services/config.service'
export { ConfigService, configMerge, ConfigProxy } from '../services/config.service'
export { DockingService, Screen } from '../services/docking.service'
export { Logger, ConsoleLogger, LogService } from '../services/log.service'
export { HomeBaseService } from '../services/homeBase.service'
export { HotkeysService } from '../services/hotkeys.service'
export { KeyEventData, KeyName, Keystroke } from '../services/hotkeys.util'
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 { TabsService } from '../services/tabs.service'
export { TabsService, NewTabParameters, TabComponentType } from '../services/tabs.service'
export { UpdaterService } from '../services/updater.service'
export { VaultService, Vault, VaultSecret, VAULT_SECRET_TYPE_FILE } from '../services/vault.service'
export { VaultService, Vault, VaultSecret, VaultFileSecret, VAULT_SECRET_TYPE_FILE } from '../services/vault.service'
export { FileProvidersService } from '../services/fileProviders.service'
export * from '../utils'

View File

@@ -13,6 +13,7 @@ export interface MessageBoxOptions {
detail?: string
buttons: string[]
defaultId?: number
cancelId?: number
}
export interface MessageBoxResult {
@@ -21,6 +22,7 @@ export interface MessageBoxResult {
export abstract class FileTransfer {
abstract getName (): string
abstract getMode (): number
abstract getSize (): number
abstract close (): void
@@ -95,7 +97,7 @@ export abstract class PlatformService {
abstract loadConfig (): Promise<string>
abstract saveConfig (content: string): Promise<void>
abstract startDownload (name: string, size: number): Promise<FileDownload|null>
abstract startDownload (name: string, mode: number, size: number): Promise<FileDownload|null>
abstract startUpload (options?: FileUploadOptions): Promise<FileUpload[]>
startUploadFromDragEvent (event: DragEvent, multiple = false): FileUpload[] {
@@ -188,6 +190,10 @@ export class HTMLFileUpload extends FileUpload {
return this.file.name
}
getMode (): number {
return 0o644
}
getSize (): number {
return this.file.size
}

View File

@@ -0,0 +1,60 @@
/* eslint-disable @typescript-eslint/no-type-alias */
/* eslint-disable @typescript-eslint/no-unused-vars */
/* eslint-disable @typescript-eslint/no-empty-function */
import { BaseTabComponent } from '../components/baseTab.component'
import { NewTabParameters } from '../services/tabs.service'
export interface Profile {
id: string
type: string
name: string
group?: string
options: any
icon?: string
color?: string
disableDynamicTitle: boolean
weight: number
isBuiltin: boolean
isTemplate: boolean
}
export type PartialProfile<T extends Profile> = Omit<Omit<Omit<{
[K in keyof T]?: T[K]
}, 'options'>, 'type'>, 'name'> & {
type: string
name: string
options?: {
[K in keyof T['options']]?: T['options'][K]
}
}
export interface ProfileSettingsComponent<P extends Profile> {
profile: P
save?: () => void
}
export abstract class ProfileProvider<P extends Profile> {
id: string
name: string
supportsQuickConnect = false
settingsComponent?: new (...args: any[]) => ProfileSettingsComponent<P>
configDefaults = {}
abstract getBuiltinProfiles (): Promise<PartialProfile<P>[]>
abstract getNewTabParameters (profile: PartialProfile<P>): Promise<NewTabParameters<BaseTabComponent>>
getSuggestedName (profile: PartialProfile<P>): string|null {
return null
}
abstract getDescription (profile: PartialProfile<P>): string
quickConnect (query: string): PartialProfile<P>|null {
return null
}
deleteProfile (profile: P): void { }
}

View File

@@ -4,5 +4,6 @@ export interface SelectorOption<T> {
result?: T
icon?: string
freeInputPattern?: string
color?: string
callback?: (string?) => void
}

View File

@@ -1,17 +1,6 @@
import deepClone from 'clone-deep'
import { TabComponentType } from '../services/tabs.service'
export interface RecoveredTab {
/**
* Component type to be instantiated
*/
type: TabComponentType
/**
* Component instance inputs
*/
options?: any
}
import { BaseTabComponent } from '../components/baseTab.component'
import { NewTabParameters } from '../services/tabs.service'
export interface RecoveryToken {
[_: string]: any
@@ -35,19 +24,20 @@ export interface RecoveryToken {
* }
* ```
*/
export abstract class TabRecoveryProvider {
export abstract class TabRecoveryProvider <T extends BaseTabComponent> {
/**
* @param recoveryToken a recovery token found in the saved tabs list
* @returns [[boolean]] whether this [[TabRecoveryProvider]] can recover a tab from this token
*/
abstract applicableTo (recoveryToken: RecoveryToken): Promise<boolean>
/**
* @param recoveryToken a recovery token found in the saved tabs list
* @returns [[RecoveredTab]] descriptor containing tab type and component inputs
* @returns [[NewTabParameters]] descriptor containing tab type and component inputs
* or `null` if this token is from a different tab type or is not supported
*/
abstract recover (recoveryToken: RecoveryToken): Promise<RecoveredTab>
abstract recover (recoveryToken: RecoveryToken): Promise<NewTabParameters<T>>
/**
* @param recoveryToken a recovery token found in the saved tabs list

View File

@@ -0,0 +1,59 @@
/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
import { Injectable } from '@angular/core'
import { ToolbarButton, ToolbarButtonProvider } from './api/toolbarButtonProvider'
import { HostAppService, Platform } from './api/hostApp'
import { PartialProfile, Profile } from './api/profileProvider'
import { ConfigService } from './services/config.service'
import { HotkeysService } from './services/hotkeys.service'
import { ProfilesService } from './services/profiles.service'
/** @hidden */
@Injectable()
export class ButtonProvider extends ToolbarButtonProvider {
constructor (
private hostApp: HostAppService,
private profilesService: ProfilesService,
private config: ConfigService,
hotkeys: HotkeysService,
) {
super()
hotkeys.hotkey$.subscribe(hotkey => {
if (hotkey === 'profile-selector') {
this.activate()
}
})
}
async activate () {
const profile = await this.profilesService.showProfileSelector()
if (profile) {
this.launchProfile(profile)
}
}
async launchProfile (profile: PartialProfile<Profile>) {
await this.profilesService.openNewTabForProfile(profile)
let recentProfiles = this.config.store.recentProfiles
if (this.config.store.terminal.showRecentProfiles > 0) {
recentProfiles = recentProfiles.filter(x => x.group !== profile.group || x.name !== profile.name)
recentProfiles.unshift(profile)
recentProfiles = recentProfiles.slice(0, this.config.store.terminal.showRecentProfiles)
} else {
recentProfiles = []
}
this.config.store.recentProfiles = recentProfiles
this.config.save()
}
provide (): ToolbarButton[] {
return [{
icon: this.hostApp.platform === Platform.Web
? require('./icons/plus.svg')
: require('./icons/profiles.svg'),
title: 'New tab with profile',
click: () => this.activate(),
}]
}
}

View File

@@ -1,6 +1,41 @@
import { Injectable } from '@angular/core'
import { HostAppService } from './api/hostApp'
import { CLIHandler, CLIEvent } from './api/cli'
import { HostWindowService } from './api/hostWindow'
import { ProfilesService } from './services/profiles.service'
@Injectable()
export class ProfileCLIHandler extends CLIHandler {
firstMatchOnly = true
priority = 0
constructor (
private profiles: ProfilesService,
private hostWindow: HostWindowService,
) {
super()
}
async handle (event: CLIEvent): Promise<boolean> {
const op = event.argv._[0]
if (op === 'profile') {
this.handleOpenProfile(event.argv.profileName)
return true
}
return false
}
private async handleOpenProfile (profileName: string) {
const profile = (await this.profiles.getProfiles()).find(x => x.name === profileName)
if (!profile) {
console.error('Requested profile', profileName, 'not found')
return
}
this.profiles.openNewTabForProfile(profile)
this.hostWindow.bringToFront()
}
}
@Injectable()
export class LastCLIHandler extends CLIHandler {

View File

@@ -1,6 +1,6 @@
title-bar(
*ngIf='ready && !hostWindow.isFullScreen && config.store.appearance.frame == "full" && config.store.appearance.dock == "off"',
[class.inset]='hostApp.platform == Platform.macOS && !hostWindow.isFullScreen'
*ngIf='ready && !hostWindow.isFullscreen && config.store.appearance.frame == "full" && config.store.appearance.dock == "off"',
[class.inset]='hostApp.platform == Platform.macOS && !hostWindow.isFullscreen'
)
.content(
@@ -10,19 +10,17 @@ title-bar(
)
.tab-bar
.inset.background(*ngIf='hostApp.platform == Platform.macOS \
&& !hostWindow.isFullScreen \
&& !hostWindow.isFullscreen \
&& config.store.appearance.frame == "thin" \
&& (config.store.appearance.tabsLocation == "top" || config.store.appearance.tabsLocation == "left")')
.tabs(
dnd-sortable-container,
[sortableData]='app.tabs',
cdkDropList,
[cdkDropListOrientation]='(config.store.appearance.tabsLocation == "top" || config.store.appearance.tabsLocation == "bottom") ? "horizontal" : "vertical"',
(cdkDropListDropped)='onTabsReordered($event)',
cdkAutoDropGroup='app-tabs'
)
tab-header(
*ngFor='let tab of app.tabs; let idx = index',
dnd-sortable,
[sortableIndex]='idx',
(onDragStart)='onTabDragStart()',
(onDragEnd)='onTabDragEnd()',
[index]='idx',
[tab]='tab',
[active]='tab == app.activeTab',
@@ -30,7 +28,7 @@ title-bar(
[@.disabled]='hasVerticalTabs()',
(click)='app.selectTab(tab)',
[class.fully-draggable]='hostApp.platform != Platform.macOS',
[class.drag-region]='hostApp.platform == Platform.macOS && !tabsDragging',
[class.drag-region]='hostApp.platform == Platform.macOS && !(app.tabDragActive$|async)',
)
.btn-group.background
@@ -109,6 +107,7 @@ title-bar(
start-page.content-tab.content-tab-active(*ngIf='ready && app.tabs.length == 0')
tab-body.content-tab(
#tabBodies,
*ngFor='let tab of unsortedTabs',
[class.content-tab-active]='tab == app.activeTab',
[active]='tab == app.activeTab',

View File

@@ -132,6 +132,14 @@ $side-tab-width: 200px;
window-controls {
padding-left: 10px;
}
.cdk-drag-animating {
transition: transform 250ms cubic-bezier(0, 0, 0.2, 1);
}
.cdk-drop-list-dragging tab-header:not(.cdk-drag-placeholder) {
transition: transform 250ms cubic-bezier(0, 0, 0.2, 1);
}
}
.content {

View File

@@ -1,7 +1,8 @@
/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
import { Component, Inject, Input, HostListener, HostBinding } from '@angular/core'
import { Component, Inject, Input, HostListener, HostBinding, ViewChildren } from '@angular/core'
import { trigger, style, animate, transition, state } from '@angular/animations'
import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
import { CdkDragDrop, moveItemInArray } from '@angular/cdk/drag-drop'
import { HostAppService, Platform } from '../api/hostApp'
import { HotkeysService } from '../services/hotkeys.service'
@@ -12,6 +13,7 @@ import { UpdaterService } from '../services/updater.service'
import { BaseTabComponent } from './baseTab.component'
import { SafeModeModalComponent } from './safeModeModal.component'
import { TabBodyComponent } from './tabBody.component'
import { AppService, FileTransfer, HostWindowService, PlatformService, ToolbarButton, ToolbarButtonProvider } from '../api'
/** @hidden */
@@ -57,14 +59,14 @@ export class AppRootComponent {
@HostBinding('class.platform-darwin') platformClassMacOS = process.platform === 'darwin'
@HostBinding('class.platform-linux') platformClassLinux = process.platform === 'linux'
@HostBinding('class.no-tabs') noTabs = true
tabsDragging = false
@ViewChildren(TabBodyComponent) tabBodies: TabBodyComponent[]
unsortedTabs: BaseTabComponent[] = []
updatesAvailable = false
activeTransfers: FileTransfer[] = []
activeTransfersDropdownOpen = false
private logger: Logger
private constructor (
constructor (
private hotkeys: HotkeysService,
private updater: UpdaterService,
public hostWindow: HostWindowService,
@@ -80,7 +82,7 @@ export class AppRootComponent {
this.logger = log.create('main')
this.logger.info('v', platform.getAppVersion())
this.hotkeys.matchedHotkey.subscribe((hotkey: string) => {
this.hotkeys.hotkey$.subscribe((hotkey: string) => {
if (hotkey.startsWith('tab-')) {
const index = parseInt(hotkey.split('-')[1])
if (index <= this.app.tabs.length) {
@@ -126,11 +128,18 @@ export class AppRootComponent {
this.app.tabOpened$.subscribe(tab => {
this.unsortedTabs.push(tab)
this.noTabs = false
this.app.emitTabDragEnded()
})
this.app.tabClosed$.subscribe(tab => {
this.app.tabRemoved$.subscribe(tab => {
for (const tabBody of this.tabBodies) {
if (tabBody.tab === tab) {
tabBody.detach()
}
}
this.unsortedTabs = this.unsortedTabs.filter(x => x !== tab)
this.noTabs = app.tabs.length === 0
this.app.emitTabDragEnded()
})
platform.fileTransferStarted$.subscribe(transfer => {
@@ -173,17 +182,6 @@ export class AppRootComponent {
return this.config.store.appearance.tabsLocation === 'left' || this.config.store.appearance.tabsLocation === 'right'
}
onTabDragStart () {
this.tabsDragging = true
}
onTabDragEnd () {
setTimeout(() => {
this.tabsDragging = false
this.app.emitTabsChanged()
})
}
async generateButtonSubmenu (button: ToolbarButton) {
if (button.submenu) {
button.submenuItems = await button.submenu()
@@ -194,6 +192,11 @@ export class AppRootComponent {
return submenuItems.some(x => !!x.icon)
}
onTabsReordered (event: CdkDragDrop<BaseTabComponent[]>) {
moveItemInArray(this.app.tabs, event.previousIndex, event.currentIndex)
this.app.emitTabsChanged()
}
private getToolbarButtons (aboveZero: boolean): ToolbarButton[] {
let buttons: ToolbarButton[] = []
this.config.enabledServices(this.toolbarButtonProviders).forEach(provider => {

View File

@@ -1,5 +1,5 @@
import { Observable, Subject } from 'rxjs'
import { ViewRef } from '@angular/core'
import { EmbeddedViewRef, ViewContainerRef, ViewRef } from '@angular/core'
import { RecoveryToken } from '../api/tabRecovery'
import { BaseComponent } from './base.component'
@@ -52,6 +52,10 @@ export abstract class BaseTabComponent extends BaseComponent {
* your tab state to be saved sooner
*/
protected recoveryStateChangedHint = new Subject<void>()
protected viewContainer?: ViewContainerRef
/* @hidden */
viewContainerEmbeddedRef?: EmbeddedViewRef<any>
private progressClearTimeout: number
private titleChange = new Subject<string>()
@@ -61,6 +65,8 @@ export abstract class BaseTabComponent extends BaseComponent {
private activity = new Subject<boolean>()
private destroyed = new Subject<void>()
private _destroyCalled = false
get focused$ (): Observable<void> { return this.focused }
get blurred$ (): Observable<void> { return this.blurred }
get titleChange$ (): Observable<string> { return this.titleChange }
@@ -152,10 +158,29 @@ export abstract class BaseTabComponent extends BaseComponent {
this.blurred.next()
}
insertIntoContainer (container: ViewContainerRef): EmbeddedViewRef<any> {
this.viewContainerEmbeddedRef = container.insert(this.hostView) as EmbeddedViewRef<any>
this.viewContainer = container
return this.viewContainerEmbeddedRef
}
removeFromContainer (): void {
if (!this.viewContainer || !this.viewContainerEmbeddedRef) {
return
}
this.viewContainer.detach(this.viewContainer.indexOf(this.viewContainerEmbeddedRef))
this.viewContainerEmbeddedRef = undefined
this.viewContainer = undefined
}
/**
* Called before the tab is closed
*/
destroy (skipDestroyedEvent = false): void {
if (this._destroyCalled) {
return
}
this._destroyCalled = true
this.focused.complete()
this.blurred.complete()
this.titleChange.complete()
@@ -166,6 +191,7 @@ export abstract class BaseTabComponent extends BaseComponent {
this.destroyed.next()
}
this.destroyed.complete()
this.hostView.destroy()
}
/** @hidden */

View File

@@ -1,19 +1,19 @@
.modal-body
input.form-control(
[type]='password ? "password" : "text"',
[type]='password ? "password" : "text"',
autofocus,
[(ngModel)]='value',
#input,
[placeholder]='prompt',
[(ngModel)]='value',
#input,
[placeholder]='prompt',
(keyup.enter)='ok()',
(keyup.esc)='cancel()',
)
.d-flex.align-items-start.mt-2
checkbox(
*ngIf='showRememberCheckbox',
[(ngModel)]='remember',
[(ngModel)]='remember',
text='Remember'
)
button.btn.btn-primary.ml-auto(
(click)='ok()',
) Enter
) OK

View File

@@ -2,5 +2,5 @@
input.form-control(type='text', #input, [(ngModel)]='value', (keyup.enter)='save()', autofocus)
.modal-footer
button.btn.btn-outline-primary((click)='save()') Save
button.btn.btn-outline-secondary((click)='close()') Cancel
button.btn.btn-primary((click)='save()') Save
button.btn.btn-secondary((click)='close()') Cancel

View File

@@ -4,4 +4,4 @@
pre {{error}}
.modal-footer
button.btn.btn-outline-primary((click)='close()') Close
button.btn.btn-primary((click)='close()') Close

View File

@@ -1,5 +1,5 @@
.modal-body
input.form-control(
input.form-control.form-control-lg(
type='text',
[(ngModel)]='filter',
autofocus,
@@ -7,7 +7,7 @@
(ngModelChange)='onFilterChange()'
)
.list-group(*ngIf='filteredOptions.length')
.list-group.list-group-light(*ngIf='filteredOptions.length')
a.list-group-item.list-group-item-action.d-flex.align-items-center(
#item,
(click)='selectOption(option)',
@@ -15,12 +15,14 @@
*ngFor='let option of filteredOptions; let i = index'
)
i.icon(
class='fa-fw fas fa-{{option.icon}}',
class='fa-fw {{option.icon}}',
style='color: {{option.color}}',
*ngIf='!iconIsSVG(option.icon)'
)
.icon(
[fastHtmlBind]='option.icon',
style='color: {{option.color}}',
*ngIf='iconIsSVG(option.icon)'
)
.mr-2.title {{getOptionText(option)}}
.text-muted {{option.description}}
.title.mr-2 {{getOptionText(option)}}
.description.no-wrap.text-muted {{option.description}}

View File

@@ -16,9 +16,13 @@
.title {
margin-left: 10px;
flex: none;
}
.description {
flex: 1 1 0;
}
input {
border-bottom-left-radius: 0;
border-bottom-right-radius: 0;
border-radius: 0;
}

View File

@@ -50,8 +50,9 @@ export class SelectorModalComponent<T> {
if (!f) {
this.filteredOptions = this.options.filter(x => !x.freeInputPattern)
} else {
const terms = f.split(' ')
// eslint-disable-next-line @typescript-eslint/restrict-plus-operands
this.filteredOptions = this.options.filter(x => x.freeInputPattern ?? (x.name + (x.description ?? '')).toLowerCase().includes(f))
this.filteredOptions = this.options.filter(x => x.freeInputPattern ?? terms.every(term => (x.name + (x.description ?? '')).toLowerCase().includes(term)))
}
this.selectedIndex = Math.max(0, this.selectedIndex)
this.selectedIndex = Math.min(this.filteredOptions.length - 1, this.selectedIndex)

View File

@@ -0,0 +1,18 @@
import { HostBinding, ElementRef } from '@angular/core'
import { BaseComponent } from './base.component'
export abstract class SelfPositioningComponent extends BaseComponent {
@HostBinding('style.left') cssLeft: string
@HostBinding('style.top') cssTop: string
@HostBinding('style.width') cssWidth: string | null
@HostBinding('style.height') cssHeight: string | null
constructor (protected element: ElementRef) { super() }
protected setDimensions (x: number, y: number, w: number, h: number, unit = '%'): void {
this.cssLeft = `${x}${unit}`
this.cssTop = `${y}${unit}`
this.cssWidth = w ? `${w}${unit}` : null
this.cssHeight = h ? `${h}${unit}` : null
}
}

View File

@@ -1,13 +1,13 @@
import { Observable, Subject } from 'rxjs'
import { Component, Injectable, ViewChild, ViewContainerRef, EmbeddedViewRef, AfterViewInit, OnDestroy } from '@angular/core'
import { BaseTabComponent, BaseTabProcess } from './baseTab.component'
import { TabRecoveryProvider, RecoveredTab, RecoveryToken } from '../api/tabRecovery'
import { TabsService } from '../services/tabs.service'
import { TabRecoveryProvider, RecoveryToken } from '../api/tabRecovery'
import { TabsService, NewTabParameters } from '../services/tabs.service'
import { HotkeysService } from '../services/hotkeys.service'
import { TabRecoveryService } from '../services/tabRecovery.service'
export type SplitOrientation = 'v' | 'h' // eslint-disable-line @typescript-eslint/no-type-alias
export type SplitDirection = 'r' | 't' | 'b' | 'l' // eslint-disable-line @typescript-eslint/no-type-alias
export type SplitOrientation = 'v' | 'h'
export type SplitDirection = 'r' | 't' | 'b' | 'l'
/**
* Describes a horizontal or vertical split row or column
@@ -93,13 +93,13 @@ export class SplitContainer {
return s
}
async serialize (): Promise<RecoveryToken> {
async serialize (tabsRecovery: TabRecoveryService): Promise<RecoveryToken> {
const children: any[] = []
for (const child of this.children) {
if (child instanceof SplitContainer) {
children.push(await child.serialize())
children.push(await child.serialize(tabsRecovery))
} else {
children.push(await child.getRecoveryToken())
children.push(await tabsRecovery.getFullRecoveryToken(child))
}
}
return {
@@ -123,6 +123,25 @@ export interface SplitSpannerInfo {
index: number
}
/**
* Represents a tab drop zone
*/
export type SplitDropZoneInfo = {
x: number
y: number
w: number
h: number
} & ({
type: 'absolute'
container: SplitContainer
position: number
} | {
type: 'relative'
relativeTo?: BaseTabComponent|SplitContainer
side: SplitDirection
})
/**
* Split tab is a tab that contains other tabs and allows further splitting them
* You'll mainly encounter it inside [[AppService]].tabs
@@ -137,6 +156,21 @@ export interface SplitSpannerInfo {
[index]='spanner.index'
(change)='onSpannerAdjusted(spanner)'
></split-tab-spanner>
<split-tab-drop-zone
*ngFor='let dropZone of _dropZones'
[parent]='this'
[dropZone]='dropZone'
(tabDropped)='onTabDropped($event, dropZone)'
>
</split-tab-drop-zone>
<split-tab-pane-label
*ngFor='let tab of getAllTabs()'
cdkDropList
cdkAutoDropGroup='app-tabs'
[tab]='tab'
[parent]='this'
>
</split-tab-pane-label>
`,
styles: [require('./splitTab.component.scss')],
})
@@ -157,6 +191,9 @@ export class SplitTabComponent extends BaseTabComponent implements AfterViewInit
/** @hidden */
_spanners: SplitSpannerInfo[] = []
/** @hidden */
_dropZones: SplitDropZoneInfo[] = []
/** @hidden */
_allFocusMode = false
@@ -166,12 +203,19 @@ export class SplitTabComponent extends BaseTabComponent implements AfterViewInit
private viewRefs: Map<BaseTabComponent, EmbeddedViewRef<any>> = new Map()
private tabAdded = new Subject<BaseTabComponent>()
private tabAdopted = new Subject<BaseTabComponent>()
private tabRemoved = new Subject<BaseTabComponent>()
private splitAdjusted = new Subject<SplitSpannerInfo>()
private focusChanged = new Subject<BaseTabComponent>()
private initialized = new Subject<void>()
get tabAdded$ (): Observable<BaseTabComponent> { return this.tabAdded }
/**
* Fired when an existing top-level tab is dragged into this tab
*/
get tabAdopted$ (): Observable<BaseTabComponent> { return this.tabAdopted }
get tabRemoved$ (): Observable<BaseTabComponent> { return this.tabRemoved }
/**
@@ -209,7 +253,7 @@ export class SplitTabComponent extends BaseTabComponent implements AfterViewInit
})
this.blurred$.subscribe(() => this.getAllTabs().forEach(x => x.emitBlurred()))
this.subscribeUntilDestroyed(this.hotkeys.matchedHotkey, hotkey => {
this.subscribeUntilDestroyed(this.hotkeys.hotkey$, hotkey => {
if (!this.hasFocus || !this.focusedTab) {
return
}
@@ -330,51 +374,77 @@ export class SplitTabComponent extends BaseTabComponent implements AfterViewInit
}
}
addTab (tab: BaseTabComponent, relative: BaseTabComponent|null, side: SplitDirection): Promise<void> {
return this.add(tab, relative, side)
}
/**
* Inserts a new `tab` to the `side` of the `relative` tab
*/
async addTab (tab: BaseTabComponent, relative: BaseTabComponent|null, side: SplitDirection): Promise<void> {
tab.parent = this
async add (thing: BaseTabComponent|SplitContainer, relative: BaseTabComponent|SplitContainer|null, side: SplitDirection): Promise<void> {
if (thing instanceof SplitTabComponent) {
const tab = thing
thing = tab.root
tab.root = new SplitContainer()
for (const child of thing.getAllTabs()) {
child.removeFromContainer()
}
tab.destroy()
}
let target = (relative ? this.getParentOf(relative) : null) ?? this.root
let insertIndex = relative ? target.children.indexOf(relative) : -1
if (thing instanceof BaseTabComponent) {
if (thing.parent instanceof SplitTabComponent) {
thing.parent.removeTab(thing)
}
thing.removeFromContainer()
thing.parent = this
}
let target = relative ? this.getParentOf(relative) : null
if (!target) {
// Rewrap the root container just in case the orientation isn't compatibile
target = new SplitContainer()
target.orientation = ['l', 'r'].includes(side) ? 'h' : 'v'
target.children = [this.root]
target.ratios = [1]
this.root = target
}
let insertIndex = relative
? target.children.indexOf(relative) + ('tl'.includes(side) ? 0 : 1)
: 'tl'.includes(side) ? 0 : -1
if (
target.orientation === 'v' && ['l', 'r'].includes(side) ||
target.orientation === 'h' && ['t', 'b'].includes(side)
) {
// Inserting into a container but the orientation isn't compatible
const newContainer = new SplitContainer()
newContainer.orientation = target.orientation === 'v' ? 'h' : 'v'
newContainer.orientation = ['l', 'r'].includes(side) ? 'h' : 'v'
newContainer.children = relative ? [relative] : []
newContainer.ratios = [1]
target.children[insertIndex] = newContainer
target.children.splice(relative ? target.children.indexOf(relative) : -1, 1, newContainer)
target = newContainer
insertIndex = 0
}
if (insertIndex === -1) {
insertIndex = 0
} else {
insertIndex += side === 'l' || side === 't' ? 0 : 1
insertIndex = 'tl'.includes(side) ? 0 : 1
}
for (let i = 0; i < target.children.length; i++) {
target.ratios[i] *= target.children.length / (target.children.length + 1)
}
if (insertIndex === -1) {
insertIndex = target.ratios.length
}
target.ratios.splice(insertIndex, 0, 1 / (target.children.length + 1))
target.children.splice(insertIndex, 0, tab)
target.children.splice(insertIndex, 0, thing)
this.recoveryStateChangedHint.next()
await this.initialized$.toPromise()
this.attachTabView(tab)
setImmediate(() => {
this.layout()
this.tabAdded.next(tab)
this.focus(tab)
})
for (const tab of thing instanceof SplitContainer ? thing.getAllTabs() : [thing]) {
this.attachTabView(tab)
this.onAfterTabAdded(tab)
}
}
removeTab (tab: BaseTabComponent): void {
@@ -386,8 +456,9 @@ export class SplitTabComponent extends BaseTabComponent implements AfterViewInit
parent.ratios.splice(index, 1)
parent.children.splice(index, 1)
this.detachTabView(tab)
tab.removeFromContainer()
tab.parent = null
this.viewRefs.delete(tab)
this.layout()
@@ -399,6 +470,21 @@ export class SplitTabComponent extends BaseTabComponent implements AfterViewInit
}
}
replaceTab (tab: BaseTabComponent, newTab: BaseTabComponent): void {
const parent = this.getParentOf(tab)
if (!parent) {
return
}
const position = parent.children.indexOf(tab)
parent.children[position] = newTab
tab.removeFromContainer()
this.attachTabView(newTab)
tab.parent = null
newTab.parent = this
this.recoveryStateChangedHint.next()
this.onAfterTabAdded(newTab)
}
/**
* Moves focus in the given direction
*/
@@ -453,7 +539,7 @@ export class SplitTabComponent extends BaseTabComponent implements AfterViewInit
async splitTab (tab: BaseTabComponent, dir: SplitDirection): Promise<BaseTabComponent|null> {
const newTab = await this.tabsService.duplicate(tab)
if (newTab) {
this.addTab(newTab, tab, dir)
await this.addTab(newTab, tab, dir)
}
return newTab
}
@@ -484,7 +570,7 @@ export class SplitTabComponent extends BaseTabComponent implements AfterViewInit
/** @hidden */
async getRecoveryToken (): Promise<any> {
return this.root.serialize()
return this.root.serialize(this.tabRecovery)
}
/** @hidden */
@@ -498,6 +584,20 @@ export class SplitTabComponent extends BaseTabComponent implements AfterViewInit
this.splitAdjusted.next(spanner)
}
/** @hidden */
onTabDropped (tab: BaseTabComponent, zone: SplitDropZoneInfo) { // eslint-disable-line @typescript-eslint/explicit-module-boundary-types
if (tab === this) {
return
}
if (zone.type === 'relative') {
this.add(tab, zone.relativeTo ?? null, zone.side)
} else {
this.add(tab, zone.container.children[zone.position], zone.container.orientation === 'h' ? 'r' : 'b')
}
this.tabAdopted.next(tab)
}
destroy (): void {
super.destroy()
for (const x of this.getAllTabs()) {
@@ -508,20 +608,24 @@ export class SplitTabComponent extends BaseTabComponent implements AfterViewInit
layout (): void {
this.root.normalize()
this._spanners = []
this._dropZones = []
this.layoutInternal(this.root, 0, 0, 100, 100)
}
private attachTabView (tab: BaseTabComponent) {
const ref = this.viewContainer.insert(tab.hostView) as EmbeddedViewRef<any> // eslint-disable-line @typescript-eslint/no-unnecessary-type-assertion
this.viewRefs.set(tab, ref)
private updateTitle (): void {
this.setTitle(this.getAllTabs().map(x => x.title).join(' | '))
}
private attachTabView (tab: BaseTabComponent) {
const ref = tab.insertIntoContainer(this.viewContainer)
this.viewRefs.set(tab, ref)
tab.addEventListenerUntilDestroyed(ref.rootNodes[0], 'click', () => this.focus(tab))
tab.subscribeUntilDestroyed(tab.titleChange$, t => this.setTitle(t))
tab.subscribeUntilDestroyed(tab.titleChange$, () => this.updateTitle())
tab.subscribeUntilDestroyed(tab.activity$, a => a ? this.displayActivity() : this.clearActivity())
tab.subscribeUntilDestroyed(tab.progress$, p => this.setProgress(p))
if (tab.title) {
this.setTitle(tab.title)
this.updateTitle()
}
tab.subscribeUntilDestroyed(tab.recoveryStateChangedHint$, () => {
this.recoveryStateChangedHint.next()
@@ -531,17 +635,53 @@ export class SplitTabComponent extends BaseTabComponent implements AfterViewInit
})
}
private detachTabView (tab: BaseTabComponent) {
const ref = this.viewRefs.get(tab)
if (ref) {
this.viewRefs.delete(tab)
this.viewContainer.remove(this.viewContainer.indexOf(ref))
}
private onAfterTabAdded (tab: BaseTabComponent) {
setImmediate(() => {
this.layout()
this.tabAdded.next(tab)
this.focus(tab)
})
}
private layoutInternal (root: SplitContainer, x: number, y: number, w: number, h: number) {
const size = root.orientation === 'v' ? h : w
const sizes = root.ratios.map(ratio => ratio * size)
const thickness = 10
if (root === this.root) {
this._dropZones.push({
x: x - thickness / 2,
y: y + thickness,
w: thickness,
h: h - thickness * 2,
type: 'relative',
side: 'l',
})
this._dropZones.push({
x,
y: y - thickness / 2,
w,
h: thickness,
type: 'relative',
side: 't',
})
this._dropZones.push({
x: x + w - thickness / 2,
y: y + thickness,
w: thickness,
h: h - thickness * 2,
type: 'relative',
side: 'r',
})
this._dropZones.push({
x,
y: y + h - thickness / 2,
w,
h: thickness,
type: 'relative',
side: 'b',
})
}
root.x = x
root.y = y
@@ -577,8 +717,63 @@ export class SplitTabComponent extends BaseTabComponent implements AfterViewInit
}
}
}
offset += sizes[i]
if (i !== root.ratios.length - 1) {
// Spanner area
this._dropZones.push({
type: 'relative',
relativeTo: root.children[i],
side: root.orientation === 'v' ? 'b': 'r',
x: root.orientation === 'v' ? childX + thickness : childX + offset - thickness / 2,
y: root.orientation === 'v' ? childY + offset - thickness / 2 : childY + thickness,
w: root.orientation === 'v' ? childW - thickness * 2 : thickness,
h: root.orientation === 'v' ? thickness : childH - thickness * 2,
})
}
// Sides
if (root.orientation === 'v') {
this._dropZones.push({
x: childX,
y: childY + thickness,
w: thickness,
h: childH - thickness * 2,
type: 'relative',
relativeTo: child,
side: 'l',
})
this._dropZones.push({
x: childX + w - thickness,
y: childY + thickness,
w: thickness,
h: childH - thickness * 2,
type: 'relative',
relativeTo: child,
side: 'r',
})
} else {
this._dropZones.push({
x: childX + thickness,
y: childY,
w: childW - thickness * 2,
h: thickness,
type: 'relative',
relativeTo: child,
side: 't',
})
this._dropZones.push({
x: childX + thickness,
y: childY + childH - thickness,
w: childW - thickness * 2,
h: thickness,
type: 'relative',
relativeTo: child,
side: 'b',
})
}
if (i !== 0) {
this._spanners.push({
container: root,
@@ -594,6 +789,9 @@ export class SplitTabComponent extends BaseTabComponent implements AfterViewInit
root.ratios = state.ratios
root.children = children
for (const childState of state.children) {
if (!childState) {
continue
}
if (childState.type === 'app:split-tab') {
const child = new SplitContainer()
await this.recoverContainer(child, childState, duplicate)
@@ -601,7 +799,7 @@ export class SplitTabComponent extends BaseTabComponent implements AfterViewInit
} else {
const recovered = await this.tabRecovery.recoverTab(childState, duplicate)
if (recovered) {
const tab = this.tabsService.create(recovered.type, recovered.options)
const tab = this.tabsService.create(recovered)
children.push(tab)
tab.parent = this
this.attachTabView(tab)
@@ -618,16 +816,16 @@ export class SplitTabComponent extends BaseTabComponent implements AfterViewInit
}
/** @hidden */
@Injectable()
export class SplitTabRecoveryProvider extends TabRecoveryProvider {
@Injectable({ providedIn: 'root' })
export class SplitTabRecoveryProvider extends TabRecoveryProvider<SplitTabComponent> {
async applicableTo (recoveryToken: RecoveryToken): Promise<boolean> {
return recoveryToken.type === 'app:split-tab'
}
async recover (recoveryToken: RecoveryToken): Promise<RecoveredTab> {
async recover (recoveryToken: RecoveryToken): Promise<NewTabParameters<SplitTabComponent>> {
return {
type: SplitTabComponent,
options: { _recoveredState: recoveryToken },
inputs: { _recoveredState: recoveryToken },
}
}

View File

@@ -0,0 +1,39 @@
:host {
position: absolute;
display: flex;
z-index: 5;
padding: 15px;
transition: all 125ms cubic-bezier(0, 0, 0.2, 1);
> div {
flex: 1 1 0;
width: 100%;
height: 100%;
opacity: 0;
background: rgba(255, 255, 255, .125);
border-radius: 5px;
border: 1px solid rgba(255, 255, 255, .25);
transition: all 125ms cubic-bezier(0, 0, 0.2, 1);
}
&.highlighted {
padding: 0px;
border-radius: 3px;
> div {
opacity: 1;
background: rgba(255, 255, 255, .5);
}
}
&:not(.active) {
pointer-events: none;
opacity: 0;
}
::ng-deep tab-header {
// placeholders
opacity: 0;
}
}

View File

@@ -0,0 +1,54 @@
/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
import { Component, Input, HostBinding, ElementRef, Output, EventEmitter } from '@angular/core'
import { AppService } from '../services/app.service'
import { BaseTabComponent } from './baseTab.component'
import { SelfPositioningComponent } from './selfPositioning.component'
import { SplitDropZoneInfo } from './splitTab.component'
/** @hidden */
@Component({
selector: 'split-tab-drop-zone',
template: `
<div
cdkDropList
(cdkDropListDropped)="tabDropped.emit($event.item.data); isHighlighted = false"
(cdkDropListEntered)="isHighlighted = true"
(cdkDropListExited)="isHighlighted = false"
cdkAutoDropGroup='app-tabs'
>
</div>
`,
styles: [require('./splitTabDropZone.component.scss')],
})
export class SplitTabDropZoneComponent extends SelfPositioningComponent {
@Input() dropZone: SplitDropZoneInfo
@Input() parent: BaseTabComponent
@Output() tabDropped = new EventEmitter<BaseTabComponent>()
@HostBinding('class.active') isActive = false
@HostBinding('class.highlighted') isHighlighted = false
// eslint-disable-next-line @typescript-eslint/no-useless-constructor
constructor (
element: ElementRef,
app: AppService,
) {
super(element)
this.subscribeUntilDestroyed(app.tabDragActive$, tab => {
this.isActive = !!tab && tab !== this.parent && (this.dropZone.type === 'relative' || tab !== this.dropZone.container.children[this.dropZone.position])
this.layout()
})
}
ngOnChanges () {
this.layout()
}
layout () {
this.setDimensions(
this.dropZone.x,
this.dropZone.y,
this.dropZone.w,
this.dropZone.h,
)
}
}

View File

@@ -0,0 +1,35 @@
:host {
position: absolute;
background: rgba(255, 255, 255, .25);
display: flex;
align-items: center;
justify-content: center;
pointer-events: none;
z-index: 10;
opacity: 0;
transition: .125s opacity cubic-bezier(0.86, 0, 0.07, 1);
}
div {
background: rgba(0, 0, 0, .7);
padding: 20px 30px;
font-size: 18px;
color: #fff;
display: flex;
align-items: center;
border-radius: 5px;
cursor: move;
}
:host.active {
opacity: 1;
> div {
pointer-events: initial;
}
}
label {
margin: 0;
cursor: move;
}

View File

@@ -0,0 +1,80 @@
/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
import { Component, Input, HostBinding, ElementRef } from '@angular/core'
import { HotkeysService } from '../services/hotkeys.service'
import { AppService } from '../services/app.service'
import { BaseTabComponent } from './baseTab.component'
import { SelfPositioningComponent } from './selfPositioning.component'
/** @hidden */
@Component({
selector: 'split-tab-pane-label',
template: `
<div
cdkDrag
[cdkDragData]='tab'
(cdkDragStarted)='onTabDragStart(tab)'
(cdkDragEnded)='onTabDragEnd()'
>
<i class="fa fa-window-maximize mr-3"></i>
<label>{{tab.title}}</label>
</div>
`,
styles: [require('./splitTabPaneLabel.component.scss')],
})
export class SplitTabPaneLabelComponent extends SelfPositioningComponent {
@Input() tab: BaseTabComponent
@Input() parent: BaseTabComponent
@HostBinding('class.active') isActive = false
// eslint-disable-next-line @typescript-eslint/no-useless-constructor
constructor (
element: ElementRef,
hotkeys: HotkeysService,
private app: AppService,
) {
super(element)
this.subscribeUntilDestroyed(hotkeys.hotkey$, hk => {
if (hk === 'rearrange-panes' && this.parent.hasFocus) {
this.isActive = true
this.layout()
}
})
this.subscribeUntilDestroyed(hotkeys.hotkeyOff$, hk => {
if (hk === 'rearrange-panes') {
this.isActive = false
}
})
}
ngOnChanges () {
this.layout()
}
onTabDragStart (tab: BaseTabComponent): void {
this.app.emitTabDragStarted(tab)
}
onTabDragEnd (): void {
setTimeout(() => {
this.app.emitTabDragEnded()
this.app.emitTabsChanged()
})
}
layout () {
const tabElement: HTMLElement|undefined = this.tab.viewContainerEmbeddedRef?.rootNodes[0]
if (!tabElement) {
// being destroyed
return
}
this.setDimensions(
tabElement.offsetLeft,
tabElement.offsetTop,
tabElement.clientWidth,
tabElement.clientHeight,
'px'
)
}
}

View File

@@ -3,6 +3,7 @@
position: absolute;
z-index: 5;
transition: 0.125s background;
background: rgba(0, 0, 0, .2);
&.v {
cursor: ns-resize;

View File

@@ -1,5 +1,6 @@
/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
import { Component, Input, HostBinding, ElementRef, Output, EventEmitter } from '@angular/core'
import { SelfPositioningComponent } from './selfPositioning.component'
import { SplitContainer } from './splitTab.component'
/** @hidden */
@@ -8,20 +9,19 @@ import { SplitContainer } from './splitTab.component'
template: '',
styles: [require('./splitTabSpanner.component.scss')],
})
export class SplitTabSpannerComponent {
export class SplitTabSpannerComponent extends SelfPositioningComponent {
@Input() container: SplitContainer
@Input() index: number
@Output() change = new EventEmitter<void>()
@HostBinding('class.active') isActive = false
@HostBinding('class.h') isHorizontal = false
@HostBinding('class.v') isVertical = true
@HostBinding('style.left') cssLeft: string
@HostBinding('style.top') cssTop: string
@HostBinding('style.width') cssWidth: string | null
@HostBinding('style.height') cssHeight: string | null
private marginOffset = -5
constructor (private element: ElementRef) { }
// eslint-disable-next-line @typescript-eslint/no-useless-constructor
constructor (element: ElementRef) {
super(element)
}
ngAfterViewInit () {
this.element.nativeElement.addEventListener('dblclick', () => {
@@ -92,11 +92,4 @@ export class SplitTabSpannerComponent {
this.container.ratios[this.index] = ratio
this.change.emit()
}
private setDimensions (x: number, y: number, w: number, h: number) {
this.cssLeft = `${x}%`
this.cssTop = `${y}%`
this.cssWidth = w ? `${w}%` : null
this.cssHeight = h ? `${h}%` : null
}
}

View File

@@ -3,9 +3,9 @@ div
h1.tabby-title Tabby
sup α
.list-group
.list-group.list-group-light
a.list-group-item.list-group-item-action.d-flex(
*ngFor='let button of getButtons()',
*ngFor='let button of getButtons(); trackBy: buttonsTrackBy',
(click)='button.click()',
)
.d-flex.align-self-center([innerHTML]='sanitizeIcon(button.icon)')
@@ -13,10 +13,10 @@ div
footer.d-flex.align-items-center
.btn-group.mr-auto
button.btn.btn-secondary((click)='homeBase.openGitHub()')
button.btn.btn-dark((click)='homeBase.openGitHub()')
i.fab.fa-github
span GitHub
button.btn.btn-secondary((click)='homeBase.reportBug()')
button.btn.btn-dark((click)='homeBase.reportBug()')
i.fas.fa-bug
span Report a problem

View File

@@ -13,7 +13,7 @@ import { ToolbarButton, ToolbarButtonProvider } from '../api'
export class StartPageComponent {
version: string
private constructor (
constructor (
private config: ConfigService,
private domSanitizer: DomSanitizer,
public homeBase: HomeBaseService,
@@ -32,4 +32,8 @@ export class StartPageComponent {
sanitizeIcon (icon?: string): any {
return this.domSanitizer.bypassSecurityTrustHtml(icon ?? '')
}
buttonsTrackBy (btn: ToolbarButton): any {
return btn.title + btn.icon
}
}

View File

@@ -6,9 +6,6 @@ import { BaseTabComponent } from '../components/baseTab.component'
@Component({
selector: 'tab-body',
template: `
<!--perfect-scrollbar [config]="{ suppressScrollX: true }" *ngIf="scrollable">
<ng-template #scrollablePlaceholder></ng-template>
</perfect-scrollbar-->
<ng-template #placeholder></ng-template>
`,
styles: [
@@ -19,20 +16,22 @@ import { BaseTabComponent } from '../components/baseTab.component'
export class TabBodyComponent implements OnChanges {
@Input() @HostBinding('class.active') active: boolean
@Input() tab: BaseTabComponent
@ViewChild('placeholder', { read: ViewContainerRef }) placeholder: ViewContainerRef
@ViewChild('placeholder', { read: ViewContainerRef }) placeholder?: ViewContainerRef
ngOnChanges (changes) {
if (changes.tab) {
if (this.placeholder) {
this.placeholder.detach()
}
this.placeholder?.detach()
setImmediate(() => {
this.placeholder.insert(this.tab.hostView)
this.placeholder?.insert(this.tab.hostView)
})
}
}
detach () {
this.placeholder?.detach()
}
ngOnDestroy () {
this.placeholder.detach()
this.placeholder?.detach()
}
}

View File

@@ -2,9 +2,18 @@
.progressbar([style.width]='progress + "%"', *ngIf='progress != null')
.activity-indicator(*ngIf='tab.activity$|async')
.index(*ngIf='!config.store.terminal.hideTabIndex', #handle) {{index + 1}}
.index(*ngIf='!config.store.terminal.hideTabIndex && hostApp.platform === Platform.macOS', cdkDragHandle) {{index + 1}}
.index(*ngIf='!config.store.terminal.hideTabIndex && hostApp.platform !== Platform.macOS') {{index + 1}}
.name(
[title]='tab.customTitle || tab.title',
[class.no-hover]='config.store.terminal.hideCloseButton'
cdkDrag,
cdkDragRootElement='tab-header',
[cdkDragData]='tab',
(cdkDragStarted)='onTabDragStart(tab)',
(cdkDragEnded)='onTabDragEnd()',
) {{tab.customTitle || tab.title}}
button(*ngIf='!config.store.terminal.hideCloseButton',(click)='app.closeTab(tab, true)') &times;
ng-content

View File

@@ -1,6 +1,5 @@
/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
import { Component, Input, Optional, Inject, HostBinding, HostListener, ViewChild, ElementRef, NgZone } from '@angular/core'
import { SortableComponent } from 'ng2-dnd'
import { Component, Input, Optional, Inject, HostBinding, HostListener, NgZone } from '@angular/core'
import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
import { TabContextMenuItemProvider } from '../api/tabContextMenuProvider'
import { BaseTabComponent } from './baseTab.component'
@@ -13,11 +12,6 @@ import { BaseComponent } from './base.component'
import { MenuItemOptions } from '../api/menu'
import { PlatformService } from '../api/platform'
/** @hidden */
export interface SortableComponentProxy {
setDragHandle: (_: HTMLElement) => void
}
/** @hidden */
@Component({
selector: 'tab-header',
@@ -29,21 +23,20 @@ export class TabHeaderComponent extends BaseComponent {
@Input() @HostBinding('class.active') active: boolean
@Input() tab: BaseTabComponent
@Input() progress: number|null
@ViewChild('handle') handle?: ElementRef
Platform = Platform
private constructor (
constructor (
public app: AppService,
public config: ConfigService,
private hostApp: HostAppService,
public hostApp: HostAppService,
private ngbModal: NgbModal,
private hotkeys: HotkeysService,
private platform: PlatformService,
private zone: NgZone,
@Inject(SortableComponent) private parentDraggable: SortableComponentProxy,
@Optional() @Inject(TabContextMenuItemProvider) protected contextMenuProviders: TabContextMenuItemProvider[],
) {
super()
this.subscribeUntilDestroyed(this.hotkeys.matchedHotkey, (hotkey) => {
this.subscribeUntilDestroyed(this.hotkeys.hotkey$, (hotkey) => {
if (this.app.activeTab === this.tab) {
if (hotkey === 'rename-tab') {
this.showRenameTabModal()
@@ -61,18 +54,13 @@ export class TabHeaderComponent extends BaseComponent {
})
}
ngAfterViewInit () {
if (this.handle && this.hostApp.platform === Platform.macOS) {
this.parentDraggable.setDragHandle(this.handle.nativeElement)
}
}
showRenameTabModal (): void {
const modal = this.ngbModal.open(RenameTabModalComponent)
modal.componentInstance.value = this.tab.customTitle || this.tab.title
modal.result.then(result => {
this.tab.setTitle(result)
this.tab.customTitle = result
this.app.emitTabsChanged()
}).catch(() => null)
}
@@ -85,6 +73,17 @@ export class TabHeaderComponent extends BaseComponent {
return items.slice(1)
}
onTabDragStart (tab: BaseTabComponent) {
this.app.emitTabDragStarted(tab)
}
onTabDragEnd () {
setTimeout(() => {
this.app.emitTabDragEnded()
this.app.emitTabsChanged()
})
}
@HostBinding('class.flex-width') get isFlexWidthEnabled (): boolean {
return this.config.store.appearance.flexTabs
}

View File

@@ -5,7 +5,7 @@
.icon(*ngIf='isDownload(transfer)') !{require('../icons/download.svg')}
.icon(*ngIf='!isDownload(transfer)') !{require('../icons/upload.svg')}
.main
label {{transfer.getName()}}
label.no-wrap([title]='transfer.getName()') {{transfer.getName()}}
.status(*ngIf='transfer.isComplete()')
ngb-progressbar(type='success', [value]='100')
.status(*ngIf='transfer.isCancelled()')

View File

@@ -6,6 +6,7 @@
display: flex;
align-items: center;
padding: 5px 0 5px 25px;
width: 100%;
.icon {
padding: 4px 7px;
@@ -16,12 +17,16 @@
}
.main {
width: 100%;
display: flex;
flex-direction: column;
min-width: 0;
margin-right: auto;
margin-bottom: 3px;
width: 100%;
label {
margin: 0;
max-width: 100%;
}
}

View File

@@ -43,6 +43,7 @@ export class TransfersMenuComponent {
message: 'There are active file transfers',
buttons: ['Abort all', 'Do not abort'],
defaultId: 1,
cancelId: 1,
})).response === 1) {
return
}

View File

@@ -19,18 +19,6 @@
.description Toggles the Tabby window visibility
toggle([(ngModel)]='enableGlobalHotkey')
.form-line
.header
.title Enable #[strong SSH] plugin
.description Adds an SSH connection manager UI to Tabby
toggle([(ngModel)]='enableSSH')
.form-line
.header
.title Enable #[strong Serial] plugin
.description Allows attaching Tabby to serial ports
toggle([(ngModel)]='enableSerial')
.text-center.mt-5
button.btn.btn-primary((click)='closeAndDisable()') Close and never show again

View File

@@ -11,8 +11,6 @@ import { HostWindowService } from '../api/hostWindow'
styles: [require('./welcomeTab.component.scss')],
})
export class WelcomeTabComponent extends BaseTabComponent {
enableSSH = false
enableSerial = false
enableGlobalHotkey = true
constructor (
@@ -21,23 +19,15 @@ export class WelcomeTabComponent extends BaseTabComponent {
) {
super()
this.setTitle('Welcome')
this.enableSSH = !config.store.pluginBlacklist.includes('ssh')
this.enableSerial = !config.store.pluginBlacklist.includes('serial')
}
closeAndDisable () {
async closeAndDisable () {
this.config.store.enableWelcomeTab = false
this.config.store.pluginBlacklist = []
if (!this.enableSSH) {
this.config.store.pluginBlacklist.push('ssh')
}
if (!this.enableSerial) {
this.config.store.pluginBlacklist.push('serial')
}
if (!this.enableGlobalHotkey) {
this.config.store.hotkeys['toggle-window'] = []
}
this.config.save()
await this.config.save()
this.hostWindow.reload()
}
}

View File

@@ -10,7 +10,7 @@ import { AppService } from '../services/app.service'
styles: [require('./windowControls.component.scss')],
})
export class WindowControlsComponent {
private constructor (public hostWindow: HostWindowService, public app: AppService) { }
constructor (public hostWindow: HostWindowService, public app: AppService) { }
async closeWindow () {
this.app.closeWindow()

View File

@@ -18,6 +18,8 @@ hotkeys:
- 'Ctrl-Shift-PageUp'
move-tab-right:
- 'Ctrl-Shift-PageDown'
rearrange-panes:
- 'Ctrl-Shift'
tab-1:
- 'Alt-1'
tab-2:
@@ -69,4 +71,8 @@ hotkeys:
pane-maximize:
- 'Ctrl-Alt-Enter'
close-pane: []
switch-profile:
- 'Ctrl-Alt-T'
profile-selector:
- 'Ctrl-Shift-T'
pluginBlacklist: ['ssh']

View File

@@ -16,6 +16,8 @@ hotkeys:
- '⌘-Shift-Left'
move-tab-right:
- '⌘-Shift-Right'
rearrange-panes:
- '⌘-Shift'
tab-1:
- '⌘-1'
tab-2:
@@ -68,4 +70,8 @@ hotkeys:
- '⌘-⌥-Enter'
close-pane:
- '⌘-Shift-W'
profile-selector:
- '⌘-E'
switch-profile:
- '⌘-Shift-E'
pluginBlacklist: ['ssh']

View File

@@ -19,6 +19,8 @@ hotkeys:
- 'Ctrl-Shift-PageUp'
move-tab-right:
- 'Ctrl-Shift-PageDown'
rearrange-panes:
- 'Ctrl-Shift'
tab-1:
- 'Alt-1'
tab-2:
@@ -70,4 +72,8 @@ hotkeys:
pane-maximize:
- 'Ctrl-Alt-Enter'
close-pane: []
switch-profile:
- 'Ctrl-Alt-T'
profile-selector:
- 'Ctrl-Shift-T'
pluginBlacklist: []

View File

@@ -15,7 +15,14 @@ appearance:
vibrancy: true
vibrancyType: 'blur'
terminal:
recoverTabs: true
showBuiltinProfiles: true
showRecentProfiles: 3
hotkeys:
profile:
__nonStructural: true
profiles: []
recentProfiles: []
recoverTabs: true
enableAnalytics: true
enableWelcomeTab: true
electronFlags:
@@ -24,3 +31,4 @@ enableAutomaticUpdates: true
version: 1
vault: null
encrypted: false
enableExperimentalFeatures: false

View File

@@ -0,0 +1,19 @@
import { Directive, ElementRef, AfterViewInit } from '@angular/core'
/** @hidden */
@Directive({
selector: '[alwaysVisibleTypeahead]',
})
export class AlwaysVisibleTypeaheadDirective implements AfterViewInit {
constructor (private el: ElementRef) { }
ngAfterViewInit (): void {
this.el.nativeElement.addEventListener('focus', e => {
e.stopPropagation()
setTimeout(() => {
const inputEvent: Event = new Event('input')
e.target.dispatchEvent(inputEvent)
}, 0)
})
}
}

View File

@@ -0,0 +1,26 @@
import { Directive, Input, OnInit } from '@angular/core'
import { CdkDropList } from '@angular/cdk/drag-drop'
class FakeDropGroup {
_items: Set<CdkDropList> = new Set()
}
/** @hidden */
@Directive({
selector: '[cdkAutoDropGroup]',
})
export class CdkAutoDropGroup implements OnInit {
static groups: Record<string, FakeDropGroup> = {}
@Input('cdkAutoDropGroup') groupName: string
constructor (
private cdkDropList: CdkDropList,
) { }
ngOnInit (): void {
CdkAutoDropGroup.groups[this.groupName] ??= new FakeDropGroup()
CdkAutoDropGroup.groups[this.groupName]._items.add(this.cdkDropList)
this.cdkDropList['_group'] = CdkAutoDropGroup.groups[this.groupName]
}
}

View File

@@ -1,10 +1,16 @@
import { Injectable } from '@angular/core'
import { ProfilesService } from './services/profiles.service'
import { HotkeyDescription, HotkeyProvider } from './api/hotkeyProvider'
import { PartialProfile, Profile } from './api'
/** @hidden */
@Injectable()
export class AppHotkeyProvider extends HotkeyProvider {
hotkeys: HotkeyDescription[] = [
{
id: 'profile-selector',
name: 'Show profile selector',
},
{
id: 'toggle-fullscreen',
name: 'Toggle fullscreen mode',
@@ -41,6 +47,10 @@ export class AppHotkeyProvider extends HotkeyProvider {
id: 'move-tab-right',
name: 'Move tab to the right',
},
{
id: 'rearrange-panes',
name: 'Show pane labels (for rearranging)',
},
{
id: 'tab-1',
name: 'Tab 1',
@@ -165,13 +175,32 @@ export class AppHotkeyProvider extends HotkeyProvider {
id: 'pane-nav-next',
name: 'Focus next pane',
},
{
id: 'switch-profile',
name: 'Switch profile in the active pane',
},
{
id: 'close-pane',
name: 'Close focused pane',
},
]
constructor (
private profilesService: ProfilesService,
) { super() }
async provide (): Promise<HotkeyDescription[]> {
return this.hotkeys
const profiles = await this.profilesService.getProfiles()
return [
...this.hotkeys,
...profiles.map(profile => ({
id: `profile.${AppHotkeyProvider.getProfileHotkeyName(profile)}`,
name: `New tab: ${profile.name}`,
})),
]
}
static getProfileHotkeyName (profile: PartialProfile<Profile>): string {
return profile.id!.replace(/\./g, '-')
}
}

File diff suppressed because one or more lines are too long

View File

@@ -0,0 +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>

After

Width:  |  Height:  |  Size: 449 B

View File

Before

Width:  |  Height:  |  Size: 665 B

After

Width:  |  Height:  |  Size: 665 B

View File

@@ -5,11 +5,13 @@ import { FormsModule } from '@angular/forms'
import { NgbModule } from '@ng-bootstrap/ng-bootstrap'
import { PerfectScrollbarModule, PERFECT_SCROLLBAR_CONFIG } from 'ngx-perfect-scrollbar'
import { NgxFilesizeModule } from 'ngx-filesize'
import { DndModule } from 'ng2-dnd'
import { SortablejsModule } from 'ngx-sortablejs'
import { DragDropModule } from '@angular/cdk/drag-drop'
import { AppRootComponent } from './components/appRoot.component'
import { CheckboxComponent } from './components/checkbox.component'
import { TabBodyComponent } from './components/tabBody.component'
import { PromptModalComponent } from './components/promptModal.component'
import { SafeModeModalComponent } from './components/safeModeModal.component'
import { StartPageComponent } from './components/startPage.component'
import { TabHeaderComponent } from './components/tabHeader.component'
@@ -20,28 +22,34 @@ import { RenameTabModalComponent } from './components/renameTabModal.component'
import { SelectorModalComponent } from './components/selectorModal.component'
import { SplitTabComponent, SplitTabRecoveryProvider } from './components/splitTab.component'
import { SplitTabSpannerComponent } from './components/splitTabSpanner.component'
import { SplitTabDropZoneComponent } from './components/splitTabDropZone.component'
import { SplitTabPaneLabelComponent } from './components/splitTabPaneLabel.component'
import { UnlockVaultModalComponent } from './components/unlockVaultModal.component'
import { WelcomeTabComponent } from './components/welcomeTab.component'
import { TransfersMenuComponent } from './components/transfersMenu.component'
import { AutofocusDirective } from './directives/autofocus.directive'
import { AlwaysVisibleTypeaheadDirective } from './directives/alwaysVisibleTypeahead.directive'
import { FastHtmlBindDirective } from './directives/fastHtmlBind.directive'
import { DropZoneDirective } from './directives/dropZone.directive'
import { CdkAutoDropGroup } from './directives/cdkAutoDropGroup.directive'
import { Theme, CLIHandler, TabContextMenuItemProvider, TabRecoveryProvider, HotkeyProvider, ConfigProvider, PlatformService, FileProvider } from './api'
import { Theme, CLIHandler, TabContextMenuItemProvider, TabRecoveryProvider, HotkeyProvider, ConfigProvider, PlatformService, FileProvider, ToolbarButtonProvider, ProfilesService, ProfileProvider } from './api'
import { AppService } from './services/app.service'
import { ConfigService } from './services/config.service'
import { VaultFileProvider } from './services/vault.service'
import { HotkeysService } from './services/hotkeys.service'
import { StandardTheme, StandardCompactTheme, PaperTheme } from './theme'
import { CoreConfigProvider } from './config'
import { AppHotkeyProvider } from './hotkeys'
import { TaskCompletionContextMenu, CommonOptionsContextMenu, TabManagementContextMenu } from './tabContextMenu'
import { LastCLIHandler } from './cli'
import { TaskCompletionContextMenu, CommonOptionsContextMenu, TabManagementContextMenu, ProfilesContextMenu } from './tabContextMenu'
import { LastCLIHandler, ProfileCLIHandler } from './cli'
import { ButtonProvider } from './buttonProvider'
import { SplitLayoutProfilesService } from './profiles'
import 'perfect-scrollbar/css/perfect-scrollbar.css'
import 'ng2-dnd/bundles/style.css'
const PROVIDERS = [
{ provide: HotkeyProvider, useClass: AppHotkeyProvider, multi: true },
@@ -52,10 +60,14 @@ const PROVIDERS = [
{ provide: TabContextMenuItemProvider, useClass: CommonOptionsContextMenu, multi: true },
{ provide: TabContextMenuItemProvider, useClass: TabManagementContextMenu, multi: true },
{ provide: TabContextMenuItemProvider, useClass: TaskCompletionContextMenu, multi: true },
{ provide: TabRecoveryProvider, useClass: SplitTabRecoveryProvider, multi: true },
{ provide: TabContextMenuItemProvider, useClass: ProfilesContextMenu, multi: true },
{ provide: TabRecoveryProvider, useExisting: SplitTabRecoveryProvider, multi: true },
{ provide: CLIHandler, useClass: ProfileCLIHandler, multi: true },
{ provide: CLIHandler, useClass: LastCLIHandler, multi: true },
{ provide: PERFECT_SCROLLBAR_CONFIG, useValue: { suppressScrollX: true } },
{ provide: FileProvider, useClass: VaultFileProvider, multi: true },
{ provide: ToolbarButtonProvider, useClass: ButtonProvider, multi: true },
{ provide: ProfileProvider, useExisting: SplitLayoutProfilesService, multi: true },
]
/** @hidden */
@@ -67,11 +79,13 @@ const PROVIDERS = [
NgbModule,
NgxFilesizeModule,
PerfectScrollbarModule,
DndModule.forRoot(),
DragDropModule,
SortablejsModule.forRoot({ animation: 150 }),
],
declarations: [
AppRootComponent as any,
AppRootComponent,
CheckboxComponent,
PromptModalComponent,
StartPageComponent,
TabBodyComponent,
TabHeaderComponent,
@@ -82,15 +96,20 @@ const PROVIDERS = [
SafeModeModalComponent,
AutofocusDirective,
FastHtmlBindDirective,
AlwaysVisibleTypeaheadDirective,
SelectorModalComponent,
SplitTabComponent,
SplitTabSpannerComponent,
SplitTabDropZoneComponent,
SplitTabPaneLabelComponent,
UnlockVaultModalComponent,
WelcomeTabComponent,
TransfersMenuComponent,
DropZoneDirective,
CdkAutoDropGroup,
],
entryComponents: [
PromptModalComponent,
RenameTabModalComponent,
SafeModeModalComponent,
SelectorModalComponent,
@@ -101,21 +120,45 @@ const PROVIDERS = [
exports: [
CheckboxComponent,
ToggleComponent,
PromptModalComponent,
AutofocusDirective,
DropZoneDirective,
FastHtmlBindDirective,
AlwaysVisibleTypeaheadDirective,
SortablejsModule,
DragDropModule,
],
})
export default class AppModule { // eslint-disable-line @typescript-eslint/no-extraneous-class
constructor (app: AppService, config: ConfigService, platform: PlatformService) {
constructor (
app: AppService,
config: ConfigService,
platform: PlatformService,
hotkeys: HotkeysService,
profilesService: ProfilesService,
) {
app.ready$.subscribe(() => {
if (config.store.enableWelcomeTab) {
app.openNewTabRaw(WelcomeTabComponent)
}
config.ready$.toPromise().then(() => {
if (config.store.enableWelcomeTab) {
app.openNewTabRaw({ type: WelcomeTabComponent })
}
})
})
platform.setErrorHandler(err => {
console.error('Unhandled exception:', err)
})
hotkeys.hotkey$.subscribe(async (hotkey) => {
if (hotkey.startsWith('profile.')) {
const id = hotkey.substring(hotkey.indexOf('.') + 1)
const profiles = await profilesService.getProfiles()
const profile = profiles.find(x => AppHotkeyProvider.getProfileHotkeyName(x) === id)
if (profile) {
profilesService.openNewTabForProfile(profile)
}
}
})
}
static forRoot (): ModuleWithProviders<AppModule> {

View File

@@ -0,0 +1,57 @@
import slugify from 'slugify'
import { v4 as uuidv4 } from 'uuid'
import { Injectable } from '@angular/core'
import { ConfigService, NewTabParameters, PartialProfile, Profile, ProfileProvider } from './api'
import { SplitTabComponent, SplitTabRecoveryProvider } from './components/splitTab.component'
export interface SplitLayoutProfileOptions {
recoveryToken: any
}
export interface SplitLayoutProfile extends Profile {
options: SplitLayoutProfileOptions
}
@Injectable({ providedIn: 'root' })
export class SplitLayoutProfilesService extends ProfileProvider<SplitLayoutProfile> {
id = 'split-layout'
name = 'Saved layout'
configDefaults = {
options: {
recoveryToken: null,
},
}
constructor (
private splitTabRecoveryProvider: SplitTabRecoveryProvider,
private config: ConfigService,
) {
super()
}
async getBuiltinProfiles (): Promise<PartialProfile<SplitLayoutProfile>[]> {
return []
}
async getNewTabParameters (profile: SplitLayoutProfile): Promise<NewTabParameters<SplitTabComponent>> {
return this.splitTabRecoveryProvider.recover(profile.options.recoveryToken)
}
getDescription (_: SplitLayoutProfile): string {
return ''
}
async createProfile (tab: SplitTabComponent, name: string): Promise<void> {
const token = await tab.getRecoveryToken()
const profile: PartialProfile<SplitLayoutProfile> = {
id: `${this.id}:custom:${slugify(name)}:${uuidv4()}`,
type: this.id,
name,
options: {
recoveryToken: token,
},
}
this.config.store.profiles.push(profile)
await this.config.save()
}
}

View File

@@ -1,6 +1,4 @@
import { Observable, Subject, AsyncSubject } from 'rxjs'
import { takeUntil } from 'rxjs/operators'
import { Observable, Subject, AsyncSubject, takeUntil } from 'rxjs'
import { Injectable, Inject } from '@angular/core'
import { BaseTabComponent } from '../components/baseTab.component'
@@ -13,7 +11,7 @@ import { HostAppService } from '../api/hostApp'
import { ConfigService } from './config.service'
import { TabRecoveryService } from './tabRecovery.service'
import { TabsService, TabComponentType } from './tabs.service'
import { TabsService, NewTabParameters } from './tabs.service'
import { SelectorService } from './selector.service'
class CompletionObserver {
@@ -56,7 +54,9 @@ export class AppService {
private activeTabChange = new Subject<BaseTabComponent|null>()
private tabsChanged = new Subject<void>()
private tabOpened = new Subject<BaseTabComponent>()
private tabRemoved = new Subject<BaseTabComponent>()
private tabClosed = new Subject<BaseTabComponent>()
private tabDragActive = new Subject<BaseTabComponent|null>()
private ready = new AsyncSubject<void>()
private completionObservers = new Map<BaseTabComponent, CompletionObserver>()
@@ -64,7 +64,9 @@ export class AppService {
get activeTabChange$ (): Observable<BaseTabComponent|null> { return this.activeTabChange }
get tabOpened$ (): Observable<BaseTabComponent> { return this.tabOpened }
get tabsChanged$ (): Observable<void> { return this.tabsChanged }
get tabRemoved$ (): Observable<BaseTabComponent> { return this.tabRemoved }
get tabClosed$ (): Observable<BaseTabComponent> { return this.tabClosed }
get tabDragActive$ (): Observable<BaseTabComponent|null> { return this.tabDragActive }
/** Fires once when the app is ready */
get ready$ (): Observable<void> { return this.ready }
@@ -88,10 +90,10 @@ export class AppService {
config.ready$.toPromise().then(async () => {
if (this.bootstrapData.isFirstWindow) {
if (config.store.terminal.recoverTabs) {
if (config.store.recoverTabs) {
const tabs = await this.tabRecovery.recoverTabs()
for (const tab of tabs) {
this.openNewTabRaw(tab.type, tab.options)
this.openNewTabRaw(tab)
}
}
/** Continue to store the tabs even if the setting is currently off */
@@ -133,27 +135,36 @@ export class AppService {
})
tab.destroyed$.subscribe(() => {
const newIndex = Math.max(0, this.tabs.indexOf(tab) - 1)
this.tabs = this.tabs.filter((x) => x !== tab)
if (tab === this._activeTab) {
this.selectTab(this.tabs[newIndex])
}
this.tabsChanged.next()
this.removeTab(tab)
this.tabRemoved.next(tab)
this.tabClosed.next(tab)
})
if (tab instanceof SplitTabComponent) {
tab.tabAdded$.subscribe(() => this.emitTabsChanged())
tab.tabRemoved$.subscribe(() => this.emitTabsChanged())
tab.tabAdopted$.subscribe(t => {
this.removeTab(t)
this.tabRemoved.next(t)
})
}
}
removeTab (tab: BaseTabComponent): void {
const newIndex = Math.max(0, this.tabs.indexOf(tab) - 1)
this.tabs = this.tabs.filter((x) => x !== tab)
if (tab === this._activeTab) {
this.selectTab(this.tabs[newIndex])
}
this.tabsChanged.next()
}
/**
* Adds a new tab **without** wrapping it in a SplitTabComponent
* @param inputs Properties to be assigned on the new tab component instance
*/
openNewTabRaw (type: TabComponentType, inputs?: Record<string, any>): BaseTabComponent {
const tab = this.tabsService.create(type, inputs)
openNewTabRaw <T extends BaseTabComponent> (params: NewTabParameters<T>): T {
const tab = this.tabsService.create(params)
this.addTabRaw(tab)
return tab
}
@@ -162,9 +173,12 @@ export class AppService {
* Adds a new tab while wrapping it in a SplitTabComponent
* @param inputs Properties to be assigned on the new tab component instance
*/
openNewTab (type: TabComponentType, inputs?: Record<string, any>): BaseTabComponent {
const splitTab = this.tabsService.create(SplitTabComponent) as SplitTabComponent
const tab = this.tabsService.create(type, inputs)
openNewTab <T extends BaseTabComponent> (params: NewTabParameters<T>): T {
if (params.type as any === SplitTabComponent) {
return this.openNewTabRaw(params)
}
const splitTab = this.tabsService.create({ type: SplitTabComponent })
const tab = this.tabsService.create(params)
splitTab.addTab(tab, null, 'r')
this.addTabRaw(splitTab)
return tab
@@ -175,7 +189,7 @@ export class AppService {
if (token) {
const recoveredTab = await this.tabRecovery.recoverTab(token)
if (recoveredTab) {
const tab = this.tabsService.create(recoveredTab.type, recoveredTab.options)
const tab = this.tabsService.create(recoveredTab)
if (this.activeTab) {
this.addTabRaw(tab, this.tabs.indexOf(this.activeTab) + 1)
} else {
@@ -346,6 +360,16 @@ export class AppService {
this.hostApp.emitReady()
}
/** @hidden */
emitTabDragStarted (tab: BaseTabComponent): void {
this.tabDragActive.next(tab)
}
/** @hidden */
emitTabDragEnded (): void {
this.tabDragActive.next(null)
}
/**
* Returns an observable that fires once
* the tab's internal "process" (see [[BaseTabProcess]]) completes

View File

@@ -1,5 +1,8 @@
import { Observable, Subject, AsyncSubject } from 'rxjs'
import deepClone from 'clone-deep'
import deepEqual from 'deep-equal'
import { v4 as uuidv4 } from 'uuid'
import * as yaml from 'js-yaml'
import { Observable, Subject, AsyncSubject } from 'rxjs'
import { Injectable, Inject } from '@angular/core'
import { ConfigProvider } from '../api/configProvider'
import { PlatformService } from '../api/platform'
@@ -7,7 +10,8 @@ import { HostAppService } from '../api/hostApp'
import { Vault, VaultService } from './vault.service'
const deepmerge = require('deepmerge')
const configMerge = (a, b) => deepmerge(a, b, { arrayMerge: (_d, s) => s }) // eslint-disable-line @typescript-eslint/no-var-requires
// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
export const configMerge = (a, b) => deepmerge(a, b, { arrayMerge: (_d, s) => s }) // eslint-disable-line @typescript-eslint/no-var-requires
const LATEST_VERSION = 1
@@ -17,7 +21,7 @@ function isStructuralMember (v) {
}
function isNonStructuralObjectMember (v): boolean {
return v instanceof Object && !(v instanceof Array) && v.__nonStructural
return v instanceof Object && (v instanceof Array || v.__nonStructural)
}
/** @hidden */
@@ -45,38 +49,63 @@ export class ConfigProxy {
{
enumerable: true,
configurable: false,
get: () => this.getValue(key),
get: () => this.__getValue(key),
set: (value) => {
this.setValue(key, value)
this.__setValue(key, value)
},
}
)
}
}
this.getValue = (key: string) => { // eslint-disable-line @typescript-eslint/unbound-method
this.__getValue = (key: string) => { // eslint-disable-line @typescript-eslint/unbound-method
if (real[key] !== undefined) {
return real[key]
} else {
if (isNonStructuralObjectMember(defaults[key])) {
real[key] = { ...defaults[key] }
// The object might be modified outside
real[key] = this.__getDefault(key)
delete real[key].__nonStructural
return real[key]
} else {
return defaults[key]
}
return this.__getDefault(key)
}
}
this.setValue = (key: string, value: any) => { // eslint-disable-line @typescript-eslint/unbound-method
real[key] = value
this.__getDefault = (key: string) => { // eslint-disable-line @typescript-eslint/unbound-method
return deepClone(defaults[key])
}
this.__setValue = (key: string, value: any) => { // eslint-disable-line @typescript-eslint/unbound-method
if (deepEqual(value, this.__getDefault(key))) {
// eslint-disable-next-line @typescript-eslint/no-dynamic-delete
delete real[key]
} else {
real[key] = value
}
}
this.__cleanup = () => { // eslint-disable-line @typescript-eslint/unbound-method
// Trigger removal of default values
for (const key in defaults) {
if (isStructuralMember(defaults[key])) {
this[key].__cleanup()
} else {
const v = this.__getValue(key)
this.__setValue(key, v)
}
}
}
}
// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types, @typescript-eslint/no-empty-function
getValue (_key: string): any { }
__getValue (_key: string): any { }
// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types, @typescript-eslint/no-empty-function
setValue (_key: string, _value: any) { }
__setValue (_key: string, _value: any) { }
// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types, @typescript-eslint/no-empty-function
__getDefault (_key: string): any { }
// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types, @typescript-eslint/no-empty-function
__cleanup () { }
}
@Injectable({ providedIn: 'root' })
@@ -165,6 +194,10 @@ export class ConfigService {
}
async save (): Promise<void> {
await this.ready$
if (!this._store) {
throw new Error('Cannot save an empty store')
}
// Scrub undefined values
let cleanStore = JSON.parse(JSON.stringify(this._store))
cleanStore = await this.maybeEncryptConfig(cleanStore)
@@ -183,10 +216,10 @@ export class ConfigService {
/**
* Writes config YAML as string
*/
writeRaw (data: string): void {
async writeRaw (data: string): Promise<void> {
this._store = yaml.load(data)
this.save()
this.load()
await this.save()
await this.load()
this.emitChange()
}
@@ -208,7 +241,7 @@ export class ConfigService {
const module = imp.ngModule || imp
if (module.ɵinj?.providers) {
this.servicesCache[module.pluginName] = module.ɵinj.providers.map(provider => {
return provider.useClass || provider
return provider.useClass ?? provider.useExisting ?? provider
})
}
}
@@ -228,8 +261,8 @@ export class ConfigService {
this.ready.next(true)
this.ready.complete()
this.hostApp.configChangeBroadcast$.subscribe(() => {
this.load()
this.hostApp.configChangeBroadcast$.subscribe(async () => {
await this.load()
this.emitChange()
})
}
@@ -250,6 +283,67 @@ export class ConfigService {
}
config.version = 1
}
if (config.version < 2) {
config.profiles ??= []
if (config.terminal?.recoverTabs !== undefined) {
config.recoverTabs = config.terminal.recoverTabs
delete config.terminal.recoverTabs
}
for (const profile of config.terminal?.profiles ?? []) {
if (profile.sessionOptions) {
profile.options = profile.sessionOptions
delete profile.sessionOptions
}
profile.type = 'local'
profile.id = `local:custom:${uuidv4()}`
}
if (config.terminal?.profiles) {
config.profiles = config.terminal.profiles
delete config.terminal.profiles
delete config.terminal.environment
config.terminal.profile = `local:${config.terminal.profile}`
}
config.version = 2
}
if (config.version < 3) {
delete config.ssh?.recentConnections
for (const c of config.ssh?.connections ?? []) {
const p = {
id: `ssh:${uuidv4()}`,
type: 'ssh',
icon: 'fas fa-desktop',
name: c.name,
group: c.group ?? undefined,
color: c.color,
disableDynamicTitle: c.disableDynamicTitle,
options: c,
}
config.profiles.push(p)
}
for (const p of config.profiles ?? []) {
if (p.type === 'ssh') {
if (p.options.jumpHost) {
p.options.jumpHost = config.profiles.find(x => x.name === p.options.jumpHost)?.id
}
}
}
for (const c of config.serial?.connections ?? []) {
const p = {
id: `serial:${uuidv4()}`,
type: 'serial',
icon: 'fas fa-microchip',
name: c.name,
group: c.group ?? undefined,
color: c.color,
options: c,
}
config.profiles.push(p)
}
delete config.ssh?.connections
delete config.serial?.connections
delete window.localStorage.lastSerialConnection
config.version = 3
}
}
private async maybeDecryptConfig (store) {
@@ -281,6 +375,7 @@ export class ConfigService {
detail: e.toString(),
buttons: ['Erase config', 'Quit'],
defaultId: 1,
cancelId: 1,
})
if (result.response === 1) {
this.platform.quit()
@@ -291,10 +386,12 @@ export class ConfigService {
}
delete decryptedVault.config.vault
delete decryptedVault.config.encrypted
delete decryptedVault.config.configSync
return {
...decryptedVault.config,
vault: store.vault,
encrypted: store.encrypted,
configSync: store.configSync,
}
}
@@ -309,9 +406,11 @@ export class ConfigService {
vault.config = { ...store }
delete vault.config.vault
delete vault.config.encrypted
delete vault.config.configSync
return {
vault: await this.vault.encrypt(vault),
encrypted: true,
configSync: store.configSync,
}
}
}

View File

@@ -2,7 +2,7 @@ import { Injectable, Inject } from '@angular/core'
import * as mixpanel from 'mixpanel'
import { v4 as uuidv4 } from 'uuid'
import { ConfigService } from './config.service'
import { PlatformService, BOOTSTRAP_DATA, BootstrapData } from '../api'
import { PlatformService, BOOTSTRAP_DATA, BootstrapData, HostAppService } from '../api'
@Injectable({ providedIn: 'root' })
export class HomeBaseService {
@@ -13,6 +13,7 @@ export class HomeBaseService {
private constructor (
private config: ConfigService,
private platform: PlatformService,
private hostApp: HostAppService,
@Inject(BOOTSTRAP_DATA) private bootstrapData: BootstrapData,
) {
this.appVersion = platform.getAppVersion()
@@ -28,20 +29,11 @@ export class HomeBaseService {
reportBug (): void {
let body = `Version: ${this.appVersion}\n`
body += `Platform: ${process.platform} ${this.platform.getOSRelease()}\n`
const label = {
aix: 'OS: IBM AIX',
android: 'OS: Android',
darwin: 'OS: macOS',
freebsd: 'OS: FreeBSD',
linux: 'OS: Linux',
openbsd: 'OS: OpenBSD',
sunos: 'OS: Solaris',
win32: 'OS: Windows',
}[process.platform]
body += `Platform: ${this.hostApp.platform} ${process.arch} ${this.platform.getOSRelease()}\n`
const plugins = this.bootstrapData.installedPlugins.filter(x => !x.isBuiltin).map(x => x.name)
body += `Plugins: ${plugins.join(', ') || 'none'}\n\n`
this.platform.openExternal(`https://github.com/Eugeny/tabby/issues/new?body=${encodeURIComponent(body)}&labels=${label}`)
body += `Plugins: ${plugins.join(', ') || 'none'}\n`
body += `Frontend: ${this.config.store.terminal?.frontend}\n\n`
this.platform.openExternal(`https://github.com/Eugeny/tabby/issues/new?body=${encodeURIComponent(body)}`)
}
enableAnalytics (): void {

View File

@@ -1,8 +1,10 @@
import { Injectable, Inject, NgZone, EventEmitter } from '@angular/core'
import { Observable, Subject } from 'rxjs'
import { HotkeyDescription, HotkeyProvider } from '../api/hotkeyProvider'
import { stringifyKeySequence, EventData } from './hotkeys.util'
import { KeyEventData, getKeyName, Keystroke, KeyName, getKeystrokeName, metaKeyName, altKeyName } from './hotkeys.util'
import { ConfigService } from './config.service'
import { HostAppService, Platform } from '../api/hostApp'
import { deprecate } from 'util'
export interface PartialHotkeyMatch {
id: string
@@ -10,14 +12,17 @@ export interface PartialHotkeyMatch {
matchedLength: number
}
const KEY_TIMEOUT = 2000
interface PastKeystroke {
keystroke: Keystroke
time: number
}
@Injectable({ providedIn: 'root' })
export class HotkeysService {
/** @hidden @deprecated */
key = new EventEmitter<KeyboardEvent>()
/** @hidden */
/** @hidden @deprecated */
matchedHotkey = new EventEmitter<string>()
/**
@@ -25,130 +30,212 @@ export class HotkeysService {
*/
get hotkey$ (): Observable<string> { return this._hotkey }
/**
* Fired for once hotkey is released
*/
get hotkeyOff$ (): Observable<string> { return this._hotkeyOff }
/**
* Fired for each singular key
*/
get key$ (): Observable<KeyName> { return this._key }
/**
* Fired for each key event
*/
get keyEvent$ (): Observable<KeyboardEvent> { return this._keyEvent }
/**
* Fired for each singular key combination
*/
get keystroke$ (): Observable<Keystroke> { return this._keystroke }
private _hotkey = new Subject<string>()
private currentKeystrokes: EventData[] = []
private _hotkeyOff = new Subject<string>()
private _keyEvent = new Subject<KeyboardEvent>()
private _key = new Subject<KeyName>()
private _keystroke = new Subject<Keystroke>()
private disabledLevel = 0
private hotkeyDescriptions: HotkeyDescription[] = []
private pressedKeys = new Set<KeyName>()
private pressedKeyTimestamps = new Map<KeyName, number>()
private pressedHotkey: string|null = null
private pressedKeystroke: Keystroke|null = null
private lastKeystrokes: PastKeystroke[] = []
private shouldSaveNextKeystroke = true
private lastEventTimestamp = 0
private constructor (
private zone: NgZone,
private config: ConfigService,
@Inject(HotkeyProvider) private hotkeyProviders: HotkeyProvider[],
hostApp: HostAppService,
) {
const events = ['keydown', 'keyup']
events.forEach(event => {
document.addEventListener(event, (nativeEvent: KeyboardEvent) => {
if (document.querySelectorAll('input:focus').length === 0) {
this.pushKeystroke(event, nativeEvent)
this.processKeystrokes()
this.emitKeyEvent(nativeEvent)
}
})
})
this.config.ready$.toPromise().then(() => {
this.getHotkeyDescriptions().then(hotkeys => {
this.hotkeyDescriptions = hotkeys
this.config.ready$.toPromise().then(async () => {
const hotkeys = await this.getHotkeyDescriptions()
this.hotkeyDescriptions = hotkeys
const events = ['keydown', 'keyup']
events.forEach(eventType => {
document.addEventListener(eventType, (nativeEvent: KeyboardEvent) => {
this._keyEvent.next(nativeEvent)
this.pushKeyEvent(eventType, nativeEvent)
if (hostApp.platform === Platform.Web && this.matchActiveHotkey(true) !== null) {
nativeEvent.preventDefault()
nativeEvent.stopPropagation()
}
})
})
})
// deprecated
this.hotkey$.subscribe(h => this.matchedHotkey.emit(h))
this.matchedHotkey.subscribe = deprecate(s => this.hotkey$.subscribe(s), 'matchedHotkey is deprecated, use hotkey$')
this.keyEvent$.subscribe(h => this.key.next(h))
this.key.subscribe = deprecate(s => this.keyEvent$.subscribe(s), 'key is deprecated, use keyEvent$')
}
/**
* Adds a new key event to the buffer
*
* @param name DOM event name
* @param eventName DOM event name
* @param nativeEvent event object
*/
pushKeystroke (name: string, nativeEvent: KeyboardEvent): void {
(nativeEvent as any).event = name
this.currentKeystrokes.push({
pushKeyEvent (eventName: string, nativeEvent: KeyboardEvent): void {
if (nativeEvent.timeStamp === this.lastEventTimestamp) {
return
}
nativeEvent['event'] = eventName
const eventData = {
ctrlKey: nativeEvent.ctrlKey,
metaKey: nativeEvent.metaKey,
altKey: nativeEvent.altKey,
shiftKey: nativeEvent.shiftKey,
code: nativeEvent.code,
key: nativeEvent.key,
eventName: name,
time: performance.now(),
})
}
/**
* Check the buffer for new complete keystrokes
*/
processKeystrokes (): void {
if (this.isEnabled()) {
this.zone.run(() => {
const matched = this.getCurrentFullyMatchedHotkey()
if (matched) {
console.log('Matched hotkey', matched)
this._hotkey.next(matched)
this.clearCurrentKeystrokes()
}
})
eventName,
time: nativeEvent.timeStamp,
registrationTime: performance.now(),
}
for (const [key, time] of this.pressedKeyTimestamps.entries()) {
if (time < performance.now() - 2000) {
this.removePressedKey(key)
}
}
const keyName = getKeyName(eventData)
if (eventName === 'keydown') {
this.addPressedKey(keyName, eventData)
this.shouldSaveNextKeystroke = true
this.updateModifiers(eventData)
}
if (eventName === 'keyup') {
const keystroke = getKeystrokeName([...this.pressedKeys])
if (this.shouldSaveNextKeystroke) {
this._keystroke.next(keystroke)
this.lastKeystrokes.push({
keystroke,
time: performance.now(),
})
this.shouldSaveNextKeystroke = false
}
this.removePressedKey(keyName)
}
if (this.pressedKeys.size) {
this.pressedKeystroke = getKeystrokeName([...this.pressedKeys])
} else {
this.pressedKeystroke = null
}
const matched = this.matchActiveHotkey()
this.zone.run(() => {
if (matched) {
this.emitHotkeyOn(matched)
} else if (this.pressedHotkey) {
this.emitHotkeyOff(this.pressedHotkey)
}
})
this.zone.run(() => {
this._key.next(getKeyName(eventData))
})
if (process.platform === 'darwin' && eventData.metaKey && eventName === 'keydown' && !['Ctrl', 'Shift', altKeyName, metaKeyName].includes(keyName)) {
// macOS will swallow non-modified keyups if Cmd is held down
this.pushKeyEvent('keyup', nativeEvent)
}
this.lastEventTimestamp = nativeEvent.timeStamp
}
emitKeyEvent (nativeEvent: KeyboardEvent): void {
this.zone.run(() => {
this.key.emit(nativeEvent)
})
getCurrentKeystrokes (): Keystroke[] {
if (!this.pressedKeystroke) {
return []
}
return [...this.lastKeystrokes.map(x => x.keystroke), this.pressedKeystroke]
}
matchActiveHotkey (partial = false): string|null {
if (!this.isEnabled() || !this.pressedKeystroke) {
return null
}
const matches: {
id: string,
sequence: string[],
}[] = []
const currentSequence = this.getCurrentKeystrokes()
const config = this.getHotkeysConfig()
for (const id in config) {
for (const sequence of config[id]) {
if (currentSequence.length < sequence.length) {
continue
}
if (sequence[sequence.length - 1] !== this.pressedKeystroke) {
continue
}
let lastIndex = 0
let matched = true
for (const item of sequence) {
const nextOffset = currentSequence.slice(lastIndex).findIndex(
x => x.toLowerCase() === item.toLowerCase()
)
if (nextOffset === -1) {
matched = false
break
}
lastIndex += nextOffset
}
if (partial ? lastIndex > 0 : matched) {
matches.push({
id,
sequence,
})
}
}
}
matches.sort((a, b) => b.sequence.length - a.sequence.length)
if (!matches.length) {
return null
}
return matches[0].id
}
clearCurrentKeystrokes (): void {
this.currentKeystrokes = []
}
getCurrentKeystrokes (): string[] {
this.currentKeystrokes = this.currentKeystrokes.filter(x => performance.now() - x.time < KEY_TIMEOUT)
return stringifyKeySequence(this.currentKeystrokes)
}
getCurrentFullyMatchedHotkey (): string|null {
const currentStrokes = this.getCurrentKeystrokes()
const config = this.getHotkeysConfig()
for (const id in config) {
for (const sequence of config[id]) {
if (currentStrokes.length < sequence.length) {
continue
}
if (sequence.every(
(x: string, index: number) =>
x.toLowerCase() ===
currentStrokes[currentStrokes.length - sequence.length + index].toLowerCase()
)) {
return id
}
}
}
return null
}
getCurrentPartiallyMatchedHotkeys (): PartialHotkeyMatch[] {
const currentStrokes = this.getCurrentKeystrokes()
const config = this.getHotkeysConfig()
const result: PartialHotkeyMatch[] = []
for (const id in config) {
for (const sequence of config[id]) {
for (let matchLength = Math.min(currentStrokes.length, sequence.length); matchLength > 0; matchLength--) {
if (sequence.slice(0, matchLength).every(
(x: string, index: number) =>
x.toLowerCase() ===
currentStrokes[currentStrokes.length - matchLength + index].toLowerCase()
)) {
result.push({
matchedLength: matchLength,
id,
strokes: sequence,
})
break
}
}
}
}
return result
this.lastKeystrokes = []
this.pressedKeys.clear()
this.pressedKeyTimestamps.clear()
this.pressedKeystroke = null
this.pressedHotkey = null
}
getHotkeyDescription (id: string): HotkeyDescription {
@@ -176,6 +263,42 @@ export class HotkeysService {
).reduce((a, b) => a.concat(b))
}
private updateModifiers (event: KeyEventData) {
for (const [prop, key] of Object.entries({
ctrlKey: 'Ctrl',
metaKey: metaKeyName,
altKey: altKeyName,
shiftKey: 'Shift',
})) {
if (!event[prop] && this.pressedKeys.has(key)) {
this.removePressedKey(key)
}
if (event[prop] && !this.pressedKeys.has(key)) {
this.addPressedKey(key, event)
}
}
}
private emitHotkeyOn (hotkey: string) {
if (this.pressedHotkey) {
if (this.pressedHotkey === hotkey) {
return
}
this.emitHotkeyOff(this.pressedHotkey)
}
if (document.querySelectorAll('input:focus').length === 0) {
console.debug('Matched hotkey', hotkey)
this._hotkey.next(hotkey)
this.pressedHotkey = hotkey
}
}
private emitHotkeyOff (hotkey: string) {
console.debug('Unmatched hotkey', hotkey)
this._hotkeyOff.next(hotkey)
this.pressedHotkey = null
}
private getHotkeysConfig () {
return this.getHotkeysConfigRecursive(this.config.store.hotkeys)
}
@@ -204,4 +327,14 @@ export class HotkeysService {
}
return keys
}
private addPressedKey (keyName: KeyName, eventData: KeyEventData) {
this.pressedKeys.add(keyName)
this.pressedKeyTimestamps.set(keyName, eventData.registrationTime)
}
private removePressedKey (key: KeyName) {
this.pressedKeys.delete(key)
this.pressedKeyTimestamps.delete(key)
}
}

View File

@@ -1,3 +1,4 @@
/* eslint-disable @typescript-eslint/no-type-alias */
export const metaKeyName = {
darwin: '⌘',
win32: 'Win',
@@ -10,72 +11,67 @@ export const altKeyName = {
linux: 'Alt',
}[process.platform]
export interface EventData {
ctrlKey: boolean
metaKey: boolean
altKey: boolean
shiftKey: boolean
export interface KeyEventData {
ctrlKey?: boolean
metaKey?: boolean
altKey?: boolean
shiftKey?: boolean
key: string
code: string
eventName: string
time: number
registrationTime: number
}
const REGEX_LATIN_KEYNAME = /^[A-Za-z]$/
export function stringifyKeySequence (events: EventData[]): string[] {
const items: string[] = []
events = events.slice()
export type KeyName = string
export type Keystroke = string
while (events.length > 0) {
const event = events.shift()!
if (event.eventName === 'keydown') {
const itemKeys: string[] = []
if (event.ctrlKey) {
itemKeys.push('Ctrl')
}
if (event.metaKey) {
itemKeys.push(metaKeyName)
}
if (event.altKey) {
itemKeys.push(altKeyName)
}
if (event.shiftKey) {
itemKeys.push('Shift')
}
if (['Control', 'Shift', 'Alt', 'Meta'].includes(event.key)) {
// TODO make this optional?
continue
}
let key = event.code
if (REGEX_LATIN_KEYNAME.test(event.key)) {
// Handle Dvorak etc via the reported "character" instead of the scancode
key = event.key.toUpperCase()
} else {
key = key.replace('Key', '')
key = key.replace('Arrow', '')
key = key.replace('Digit', '')
key = {
Comma: ',',
Period: '.',
Slash: '/',
Backslash: '\\',
IntlBackslash: '`',
Backquote: '~', // Electron says it's the tilde
Minus: '-',
Equal: '=',
Semicolon: ';',
Quote: '\'',
BracketLeft: '[',
BracketRight: ']',
}[key] ?? key
}
itemKeys.push(key)
items.push(itemKeys.join('-'))
export function getKeyName (event: KeyEventData): KeyName {
// eslint-disable-next-line @typescript-eslint/init-declarations
let key: string
if (event.key === 'Control') {
key = 'Ctrl'
} else if (event.key === 'Meta') {
key = metaKeyName
} else if (event.key === 'Alt') {
key = altKeyName
} else if (event.key === 'Shift') {
key = 'Shift'
} else {
key = event.code
if (REGEX_LATIN_KEYNAME.test(event.key)) {
// Handle Dvorak etc via the reported "character" instead of the scancode
key = event.key.toUpperCase()
} else {
key = key.replace('Key', '')
key = key.replace('Arrow', '')
key = key.replace('Digit', '')
key = {
Comma: ',',
Period: '.',
Slash: '/',
Backslash: '\\',
IntlBackslash: '`',
Backquote: '~', // Electron says it's the tilde
Minus: '-',
Equal: '=',
Semicolon: ';',
Quote: '\'',
BracketLeft: '[',
BracketRight: ']',
}[key] ?? key
}
}
return items
return key
}
export function getKeystrokeName (keys: KeyName[]): Keystroke {
const strictOrdering: KeyName[] = ['Ctrl', metaKeyName, altKeyName, 'Shift']
keys = [
...strictOrdering.map(x => keys.find(k => k === x)).filter(x => !!x) as KeyName[],
...keys.filter(k => !strictOrdering.includes(k)),
]
return keys.join('-')
}

View File

@@ -0,0 +1,187 @@
import { Injectable, Inject } from '@angular/core'
import { NewTabParameters } from './tabs.service'
import { BaseTabComponent } from '../components/baseTab.component'
import { PartialProfile, Profile, ProfileProvider } from '../api/profileProvider'
import { SelectorOption } from '../api/selector'
import { AppService } from './app.service'
import { configMerge, ConfigProxy, ConfigService } from './config.service'
import { NotificationsService } from './notifications.service'
import { SelectorService } from './selector.service'
@Injectable({ providedIn: 'root' })
export class ProfilesService {
private profileDefaults = {
id: '',
type: '',
name: '',
group: '',
options: {},
icon: '',
color: '',
disableDynamicTitle: false,
weight: 0,
isBuiltin: false,
isTemplate: false,
}
constructor (
private app: AppService,
private config: ConfigService,
private notifications: NotificationsService,
private selector: SelectorService,
@Inject(ProfileProvider) private profileProviders: ProfileProvider<Profile>[],
) { }
async openNewTabForProfile <P extends Profile> (profile: PartialProfile<P>): Promise<BaseTabComponent|null> {
const params = await this.newTabParametersForProfile(profile)
if (params) {
const tab = this.app.openNewTab(params)
;(this.app.getParentTab(tab) ?? tab).color = profile.color ?? null
if (profile.name) {
tab.setTitle(profile.name)
}
if (profile.disableDynamicTitle) {
tab['disableDynamicTitle'] = true
}
return tab
}
return null
}
async newTabParametersForProfile <P extends Profile> (profile: PartialProfile<P>): Promise<NewTabParameters<BaseTabComponent>|null> {
const fullProfile = this.getConfigProxyForProfile(profile)
return this.providerForProfile(fullProfile)?.getNewTabParameters(fullProfile) ?? null
}
getProviders (): ProfileProvider<Profile>[] {
return [...this.profileProviders]
}
async getProfiles (): Promise<PartialProfile<Profile>[]> {
const lists = await Promise.all(this.config.enabledServices(this.profileProviders).map(x => x.getBuiltinProfiles()))
let list = lists.reduce((a, b) => a.concat(b), [])
list = [
...this.config.store.profiles ?? [],
...list,
]
const sortKey = p => `${p.group ?? ''} / ${p.name}`
list.sort((a, b) => sortKey(a).localeCompare(sortKey(b)))
list.sort((a, b) => (a.isBuiltin ? 1 : 0) - (b.isBuiltin ? 1 : 0))
return list
}
providerForProfile <T extends Profile> (profile: PartialProfile<T>): ProfileProvider<T>|null {
const provider = this.profileProviders.find(x => x.id === profile.type) ?? null
return provider as unknown as ProfileProvider<T>|null
}
getDescription <P extends Profile> (profile: PartialProfile<P>): string|null {
profile = this.getConfigProxyForProfile(profile)
return this.providerForProfile(profile)?.getDescription(profile) ?? null
}
selectorOptionForProfile <P extends Profile, T> (profile: PartialProfile<P>): SelectorOption<T> {
const fullProfile = this.getConfigProxyForProfile(profile)
return {
name: profile.group ? `${fullProfile.group} / ${fullProfile.name}` : fullProfile.name,
icon: profile.icon,
color: profile.color,
description: this.providerForProfile(fullProfile)?.getDescription(fullProfile),
}
}
showProfileSelector (): Promise<PartialProfile<Profile>|null> {
return new Promise<PartialProfile<Profile>|null>(async (resolve, reject) => {
try {
let recentProfiles: PartialProfile<Profile>[] = this.config.store.recentProfiles
recentProfiles = recentProfiles.slice(0, this.config.store.terminal.showRecentProfiles)
let options: SelectorOption<void>[] = recentProfiles.map(p => ({
...this.selectorOptionForProfile(p),
icon: 'fas fa-history',
color: p.color,
callback: async () => {
if (p.id) {
p = (await this.getProfiles()).find(x => x.id === p.id) ?? p
}
resolve(p)
},
}))
if (recentProfiles.length) {
options.push({
name: 'Clear recent connections',
icon: 'fas fa-eraser',
callback: async () => {
this.config.store.recentProfiles = []
this.config.save()
resolve(null)
},
})
}
let profiles = await this.getProfiles()
if (!this.config.store.terminal.showBuiltinProfiles) {
profiles = profiles.filter(x => !x.isBuiltin)
}
profiles = profiles.filter(x => !x.isTemplate)
options = [...options, ...profiles.map((p): SelectorOption<void> => ({
...this.selectorOptionForProfile(p),
callback: () => resolve(p),
}))]
try {
const { SettingsTabComponent } = window['nodeRequire']('tabby-settings')
options.push({
name: 'Manage profiles',
icon: 'fas fa-window-restore',
callback: () => {
this.app.openNewTabRaw({
type: SettingsTabComponent,
inputs: { activeTab: 'profiles' },
})
resolve(null)
},
})
} catch { }
if (this.getProviders().some(x => x.supportsQuickConnect)) {
options.push({
name: 'Quick connect',
freeInputPattern: 'Connect to "%s"...',
icon: 'fas fa-arrow-right',
callback: query => {
const profile = this.quickConnect(query)
resolve(profile)
},
})
}
await this.selector.show('Select profile or enter an address', options)
} catch (err) {
reject(err)
}
})
}
async quickConnect (query: string): Promise<PartialProfile<Profile>|null> {
for (const provider of this.getProviders()) {
if (provider.supportsQuickConnect) {
const profile = provider.quickConnect(query)
if (profile) {
return profile
}
}
}
this.notifications.error(`Could not parse "${query}"`)
return null
}
getConfigProxyForProfile <T extends Profile> (profile: PartialProfile<T>): T {
const provider = this.providerForProfile(profile)
const defaults = configMerge(this.profileDefaults, provider?.configDefaults ?? {})
return new ConfigProxy(profile, defaults) as unknown as T
}
}

View File

@@ -1,8 +1,9 @@
import { Injectable, Inject } from '@angular/core'
import { TabRecoveryProvider, RecoveredTab, RecoveryToken } from '../api/tabRecovery'
import { TabRecoveryProvider, RecoveryToken } from '../api/tabRecovery'
import { BaseTabComponent } from '../components/baseTab.component'
import { Logger, LogService } from '../services/log.service'
import { ConfigService } from '../services/config.service'
import { Logger, LogService } from './log.service'
import { ConfigService } from './config.service'
import { NewTabParameters } from './tabs.service'
/** @hidden */
@Injectable({ providedIn: 'root' })
@@ -11,7 +12,7 @@ export class TabRecoveryService {
enabled = false
private constructor (
@Inject(TabRecoveryProvider) private tabRecoveryProviders: TabRecoveryProvider[]|null,
@Inject(TabRecoveryProvider) private tabRecoveryProviders: TabRecoveryProvider<BaseTabComponent>[]|null,
private config: ConfigService,
log: LogService
) {
@@ -19,7 +20,7 @@ export class TabRecoveryService {
}
async saveTabs (tabs: BaseTabComponent[]): Promise<void> {
if (!this.enabled) {
if (!this.enabled || !this.config.store.recoverTabs) {
return
}
window.localStorage.tabsRecovery = JSON.stringify(
@@ -33,14 +34,16 @@ export class TabRecoveryService {
const token = await tab.getRecoveryToken()
if (token) {
token.tabTitle = tab.title
token.tabCustomTitle = tab.customTitle
if (tab.color) {
token.tabColor = tab.color
}
token.disableDynamicTitle = tab['disableDynamicTitle']
}
return token
}
async recoverTab (token: RecoveryToken, duplicate = false): Promise<RecoveredTab|null> {
async recoverTab (token: RecoveryToken, duplicate = false): Promise<NewTabParameters<BaseTabComponent>|null> {
for (const provider of this.config.enabledServices(this.tabRecoveryProviders ?? [])) {
try {
if (!await provider.applicableTo(token)) {
@@ -50,9 +53,11 @@ export class TabRecoveryService {
token = provider.duplicate(token)
}
const tab = await provider.recover(token)
tab.options = tab.options || {}
tab.options.color = token.tabColor ?? null
tab.options.title = token.tabTitle || ''
tab.inputs = tab.inputs ?? {}
tab.inputs.color = token.tabColor ?? null
tab.inputs.title = token.tabTitle || ''
tab.inputs.customTitle = token.tabCustomTitle || ''
tab.inputs.disableDynamicTitle = token.disableDynamicTitle
return tab
} catch (error) {
this.logger.warn('Tab recovery crashed:', token, provider, error)
@@ -61,9 +66,9 @@ export class TabRecoveryService {
return null
}
async recoverTabs (): Promise<RecoveredTab[]> {
async recoverTabs (): Promise<NewTabParameters<BaseTabComponent>[]> {
if (window.localStorage.tabsRecovery) {
const tabs: RecoveredTab[] = []
const tabs: NewTabParameters<BaseTabComponent>[] = []
for (const token of JSON.parse(window.localStorage.tabsRecovery)) {
const tab = await this.recoverTab(token)
if (tab) {

View File

@@ -2,8 +2,22 @@ import { Injectable, ComponentFactoryResolver, Injector } from '@angular/core'
import { BaseTabComponent } from '../components/baseTab.component'
import { TabRecoveryService } from './tabRecovery.service'
// eslint-disable-next-line @typescript-eslint/no-type-alias
export type TabComponentType = new (...args: any[]) => BaseTabComponent
export interface TabComponentType<T extends BaseTabComponent> {
// eslint-disable-next-line @typescript-eslint/prefer-function-type
new (...args: any[]): T
}
export interface NewTabParameters<T extends BaseTabComponent> {
/**
* Component type to be instantiated
*/
type: TabComponentType<T>
/**
* Component instance inputs
*/
inputs?: Record<string, any>
}
@Injectable({ providedIn: 'root' })
export class TabsService {
@@ -17,12 +31,12 @@ export class TabsService {
/**
* Instantiates a tab component and assigns given inputs
*/
create (type: TabComponentType, inputs?: Record<string, any>): BaseTabComponent {
const componentFactory = this.componentFactoryResolver.resolveComponentFactory(type)
create <T extends BaseTabComponent> (params: NewTabParameters<T>): T {
const componentFactory = this.componentFactoryResolver.resolveComponentFactory(params.type)
const componentRef = componentFactory.create(this.injector)
const tab = componentRef.instance
tab.hostView = componentRef.hostView
Object.assign(tab, inputs ?? {})
Object.assign(tab, params.inputs ?? {})
return tab
}
@@ -36,7 +50,7 @@ export class TabsService {
}
const dup = await this.tabRecovery.recoverTab(token, true)
if (dup) {
return this.create(dup.type, dup.options)
return this.create(dup)
}
return null
}

View File

@@ -26,15 +26,25 @@ interface StoredVault {
export interface VaultSecret {
type: string
key: Record<string, any>
key: VaultSecretKey
value: string
}
export interface VaultFileSecret extends VaultSecret {
key: {
id: string
description: string
}
}
export interface Vault {
config: any
secrets: VaultSecret[]
}
// eslint-disable-next-line @typescript-eslint/no-empty-interface
export interface VaultSecretKey { }
function migrateVaultContent (content: any): Vault {
return {
config: content.config,
@@ -121,6 +131,10 @@ export class VaultService {
return !!_rememberedPassphrase
}
forgetPassphrase (): void {
_rememberedPassphrase = null
}
async decrypt (storage: StoredVault, passphrase?: string): Promise<Vault> {
if (!passphrase) {
passphrase = await this.getPassphrase()
@@ -128,7 +142,7 @@ export class VaultService {
try {
return await wrapPromise(this.zone, decryptVault(storage, passphrase))
} catch (e) {
_rememberedPassphrase = null
this.forgetPassphrase()
if (e.toString().includes('BAD_DECRYPT')) {
this.notifications.error('Incorrect passphrase')
}
@@ -173,7 +187,7 @@ export class VaultService {
return _rememberedPassphrase!
}
async getSecret (type: string, key: Record<string, any>): Promise<VaultSecret|null> {
async getSecret (type: string, key: VaultSecretKey): Promise<VaultSecret|null> {
await this.ready$.toPromise()
const vault = await this.load()
if (!vault) {
@@ -193,7 +207,21 @@ export class VaultService {
await this.save(vault)
}
async removeSecret (type: string, key: Record<string, any>): Promise<void> {
async updateSecret (secret: VaultSecret, update: VaultSecret): Promise<void> {
await this.ready$.toPromise()
const vault = await this.load()
if (!vault) {
return
}
const target = vault.secrets.find(s => s.type === secret.type && this.keyMatches(secret.key, s))
if (!target) {
return
}
Object.assign(target, update)
await this.save(vault)
}
async removeSecret (type: string, key: VaultSecretKey): Promise<void> {
await this.ready$.toPromise()
const vault = await this.load()
if (!vault) {
@@ -203,7 +231,7 @@ export class VaultService {
await this.save(vault)
}
private keyMatches (key: Record<string, any>, secret: VaultSecret): boolean {
private keyMatches (key: VaultSecretKey, secret: VaultSecret): boolean {
return Object.keys(key).every(k => secret.key[k] === key[k])
}
@@ -242,17 +270,17 @@ export class VaultFileProvider extends FileProvider {
if (!vault) {
throw new Error('Vault is locked')
}
const files = vault.secrets.filter(x => x.type === VAULT_SECRET_TYPE_FILE)
const files = vault.secrets.filter(x => x.type === VAULT_SECRET_TYPE_FILE) as VaultFileSecret[]
if (files.length) {
const result = await this.selector.show<VaultSecret|null>('Select file', [
const result = await this.selector.show<VaultFileSecret|null>('Select file', [
{
name: 'Add a new file',
icon: 'plus',
icon: 'fas fa-plus',
result: null,
},
...files.map(f => ({
name: f.key.description,
icon: 'file',
icon: 'fas fa-file',
result: f,
})),
])
@@ -270,11 +298,11 @@ export class VaultFileProvider extends FileProvider {
}
const transfer = transfers[0]
const id = (await wrapPromise(this.zone, promisify(crypto.randomBytes)(32))).toString('hex')
this.vault.addSecret({
await this.vault.addSecret({
type: VAULT_SECRET_TYPE_FILE,
key: {
id,
description,
description: `${description} (${transfer.getName()})`,
},
value: (await transfer.readAll()).toString('base64'),
})

View File

@@ -1,5 +1,6 @@
/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
import { Injectable } from '@angular/core'
import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
import { Subscription } from 'rxjs'
import { AppService } from './services/app.service'
import { BaseTabComponent } from './components/baseTab.component'
@@ -7,6 +8,12 @@ import { TabHeaderComponent } from './components/tabHeader.component'
import { SplitTabComponent, SplitDirection } from './components/splitTab.component'
import { TabContextMenuItemProvider } from './api/tabContextMenuProvider'
import { MenuItemOptions } from './api/menu'
import { ProfilesService } from './services/profiles.service'
import { TabsService } from './services/tabs.service'
import { HotkeysService } from './services/hotkeys.service'
import { PromptModalComponent } from './components/promptModal.component'
import { SplitLayoutProfilesService } from './profiles'
import { TAB_COLORS } from './utils'
/** @hidden */
@Injectable()
@@ -83,16 +90,6 @@ export class TabManagementContextMenu extends TabContextMenuItemProvider {
}
}
const COLORS = [
{ name: 'No color', value: null },
{ name: 'Blue', value: '#0275d8' },
{ name: 'Green', value: '#5cb85c' },
{ name: 'Orange', value: '#f0ad4e' },
{ name: 'Purple', value: '#613d7c' },
{ name: 'Red', value: '#d9534f' },
{ name: 'Yellow', value: '#ffd500' },
]
/** @hidden */
@Injectable()
export class CommonOptionsContextMenu extends TabContextMenuItemProvider {
@@ -100,6 +97,8 @@ export class CommonOptionsContextMenu extends TabContextMenuItemProvider {
constructor (
private app: AppService,
private ngbModal: NgbModal,
private splitLayoutProfilesService: SplitLayoutProfilesService,
) {
super()
}
@@ -119,8 +118,8 @@ export class CommonOptionsContextMenu extends TabContextMenuItemProvider {
},
{
label: 'Color',
sublabel: COLORS.find(x => x.value === tab.color)?.name,
submenu: COLORS.map(color => ({
sublabel: TAB_COLORS.find(x => x.value === tab.color)?.name,
submenu: TAB_COLORS.map(color => ({
label: color.name,
type: 'radio',
checked: tab.color === color.value,
@@ -130,6 +129,21 @@ export class CommonOptionsContextMenu extends TabContextMenuItemProvider {
})) as MenuItemOptions[],
},
]
if (tab instanceof SplitTabComponent && tab.getAllTabs().length > 1) {
items.push({
label: 'Save layout as profile',
click: async () => {
const modal = this.ngbModal.open(PromptModalComponent)
modal.componentInstance.prompt = 'Profile name'
const name = (await modal.result)?.value
if (!name) {
return
}
this.splitLayoutProfilesService.createProfile(tab, name)
},
})
}
}
return items
}
@@ -203,3 +217,65 @@ export class TaskCompletionContextMenu extends TabContextMenuItemProvider {
return items
}
}
/** @hidden */
@Injectable()
export class ProfilesContextMenu extends TabContextMenuItemProvider {
weight = 10
constructor (
private profilesService: ProfilesService,
private tabsService: TabsService,
private app: AppService,
hotkeys: HotkeysService,
) {
super()
hotkeys.hotkey$.subscribe(hotkey => {
if (hotkey === 'switch-profile') {
let tab = this.app.activeTab
if (tab instanceof SplitTabComponent) {
tab = tab.getFocusedTab()
if (tab) {
this.switchTabProfile(tab)
}
}
}
})
}
async switchTabProfile (tab: BaseTabComponent) {
const profile = await this.profilesService.showProfileSelector()
if (!profile) {
return
}
const params = await this.profilesService.newTabParametersForProfile(profile)
if (!params) {
return
}
if (!await tab.canClose()) {
return
}
const newTab = this.tabsService.create(params)
;(tab.parent as SplitTabComponent).replaceTab(tab, newTab)
tab.destroy()
}
async getItems (tab: BaseTabComponent, tabHeader?: TabHeaderComponent): Promise<MenuItemOptions[]> {
if (!tabHeader && tab.parent instanceof SplitTabComponent && tab.parent.getAllTabs().length > 1) {
return [
{
label: 'Switch profile',
click: () => this.switchTabProfile(tab),
},
]
}
return []
}
}

View File

@@ -90,10 +90,6 @@ $list-group-border-radius: 0;
$pre-bg: $dropdown-bg;
$pre-color: $dropdown-link-color;
$alert-danger-bg: $body-bg;
$alert-danger-text: $red;
$alert-danger-border: $red;
$headings-font-weight: lighter;
$headings-color: $base0;

View File

@@ -132,6 +132,10 @@ app-root {
tab-body {
background: $content-bg;
.terminal-toolbar .btn, .toolbar-pin-button {
font-weight: bold;
}
}
multi-hotkey-input {
@@ -226,25 +230,24 @@ hotkey-input-modal {
}
}
.list-group.list-group-flush .list-group-item:not(.list-group-item-action) {
.list-group.list-group-flush .list-group-item {
background: transparent;
border-color: rgba(0, 0, 0, 0.2);
&:not(:last-child) {
border-bottom: none;
}
}
&.list-group-item-action {
&:hover, &.active {
background: $list-group-hover-bg;
}
}
}
.list-group-light {
.list-group-item {
background: transparent;
border: none;
border-top: 1px solid rgba(255, 255, 255, .1);
&:first-child {
border-top: none;
}
&.list-group-item-action {
&:hover, &.active {
@@ -303,21 +306,6 @@ search-panel {
}
}
.btn.btn-outline-secondary {
@include button-outline-variant(#9badb9, #fff);
&:hover:not([disabled]), &:active:not([disabled]), &.active:not([disabled]) {
background-color: #3f484e;
border-color: darken(#9badb9, 25%);
}
border-color: darken(#9badb9, 25%);
&.disabled,
&:disabled {
color: #9badb9;
}
}
.btn-warning:not(:disabled):not(.disabled) {
&.active, &:active {
color: $gray-900;

View File

@@ -26,8 +26,8 @@ $purple: #613d7c !default;
$content-bg: rgba(39, 49, 60, 0.65); //#1D272D;
$content-bg-solid: #1D272D;
$table-bg: rgba(255,255,255,.05);
$table-bg-hover: rgba(255,255,255,.1);
$table-bg: rgba(255,255,255,.025);
$table-bg-hover: rgba(255,255,255,.05);
$table-border-color: rgba(255,255,255,.1);
$theme-colors: (
@@ -88,7 +88,7 @@ $list-group-item-padding-y: 0.8rem;
$list-group-item-padding-x: 1rem;
$list-group-hover-bg: $table-bg-hover;
$list-group-active-bg: rgba(255,255,255,.2);
$list-group-active-bg: rgba(255,255,255,.05);
$list-group-active-color: $component-active-color;
$list-group-active-border-color: translate;
@@ -193,3 +193,7 @@ $modal-content-border-width: 0;
$progress-bg: $table-bg;
$progress-height: 3px;
$alert-bg-level: 9;
$alert-border-level: 5;
$alert-color-level: -5;

View File

@@ -12,7 +12,7 @@ export function isWindowsBuild (build: number): boolean {
// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
export function getCSSFontFamily (config: any): string {
let fonts: string[] = config.terminal.font.split(',').map(x => x.trim().replace(/"/g, ''))
let fonts: string[] = config.terminal.font.split(',').map(x => x.trim().replaceAll('"', ''))
if (config.terminal.fallbackFont) {
fonts.push(config.terminal.fallbackFont)
}
@@ -31,3 +31,36 @@ export function wrapPromise <T> (zone: NgZone, promise: Promise<T>): Promise<T>
})
})
}
export class ResettableTimeout {
private fn: () => void
private timeout: number
private id: any
constructor (fn: () => void, timeout: number) {
this.fn = fn
this.timeout = timeout
this.id = null
}
set (timeout?: number): void {
this.clear()
this.id = setTimeout(this.fn, timeout ?? this.timeout)
}
clear (): void {
if (this.id) {
clearTimeout(this.id)
}
}
}
export const TAB_COLORS = [
{ name: 'No color', value: null },
{ name: 'Blue', value: '#0275d8' },
{ name: 'Green', value: '#5cb85c' },
{ name: 'Orange', value: '#f0ad4e' },
{ name: 'Purple', value: '#613d7c' },
{ name: 'Red', value: '#d9534f' },
{ name: 'Yellow', value: '#ffd500' },
]

Some files were not shown because too many files have changed in this diff Show More