diff --git a/.all-contributorsrc b/.all-contributorsrc
index f6534ac9..4d0e36d9 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -701,6 +701,24 @@
"contributions": [
"code"
]
+ },
+ {
+ "login": "Ox0400",
+ "name": "zhipeng",
+ "avatar_url": "https://avatars.githubusercontent.com/u/5310853?v=4",
+ "profile": "http://zhangzhipeng2023.cn/",
+ "contributions": [
+ "code"
+ ]
+ },
+ {
+ "login": "woodmeal",
+ "name": "woodmeal",
+ "avatar_url": "https://avatars.githubusercontent.com/u/104011197?v=4",
+ "profile": "https://github.com/woodmeal",
+ "contributions": [
+ "code"
+ ]
}
],
"contributorsPerLine": 7,
diff --git a/README.it-IT.md b/README.it-IT.md
index 7e1921d4..30d3c2c7 100644
--- a/README.it-IT.md
+++ b/README.it-IT.md
@@ -246,6 +246,10 @@ Grazie a queste persone meravigliose ([emoji key](https://allcontributors.org/do
artu-ole
π» |
Timofey Gribanov
π π |
Christian Bingman
π» |
+ 
zhipeng
π» |
+
+
+ 
woodmeal
π» |
diff --git a/README.ko-KR.md b/README.ko-KR.md
index d88cc1c6..9e8311bc 100644
--- a/README.ko-KR.md
+++ b/README.ko-KR.md
@@ -240,6 +240,10 @@ Pull requests and plugins are welcome!
artu-ole
π» |
Timofey Gribanov
π π |
Christian Bingman
π» |
+
zhipeng
π» |
+
+
+
woodmeal
π» |
diff --git a/README.md b/README.md
index 14b9f9de..82ed78e0 100644
--- a/README.md
+++ b/README.md
@@ -250,6 +250,10 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
artu-ole
π» |
Timofey Gribanov
π π |
Christian Bingman
π» |
+
zhipeng
π» |
+
+
+
woodmeal
π» |
diff --git a/README.ru-RU.md b/README.ru-RU.md
index 835a5701..2bd7e75f 100644
--- a/README.ru-RU.md
+++ b/README.ru-RU.md
@@ -246,6 +246,10 @@ Pull-Π·Π°ΠΏΡΠΎΡΡ ΠΈ ΠΏΠ»Π°Π³ΠΈΠ½Ρ ΠΏΡΠΈΠ²Π΅ΡΡΡΠ²ΡΡΡΡΡ!
artu-ole
π» |
Timofey Gribanov
π π |
Christian Bingman
π» |
+
zhipeng
π» |
+
+
+
woodmeal
π» |
diff --git a/README.zh-CN.md b/README.zh-CN.md
index a953239d..b3ddd2cc 100644
--- a/README.zh-CN.md
+++ b/README.zh-CN.md
@@ -245,6 +245,10 @@
artu-ole
π» |
Timofey Gribanov
π π |
Christian Bingman
π» |
+
zhipeng
π» |
+
+
+
woodmeal
π» |
diff --git a/package.json b/package.json
index 2b59bf85..b27ff70e 100644
--- a/package.json
+++ b/package.json
@@ -81,7 +81,7 @@
"typescript": "^4.3.5",
"utils-decorators": "^1.10.4",
"val-loader": "4.0.0",
- "webpack": "^5.70.0",
+ "webpack": "^5.72.0",
"webpack-bundle-analyzer": "^4.5.0",
"webpack-cli": "^4.9.2",
"yaml-loader": "0.6.0",
diff --git a/scripts/build-native.js b/scripts/build-native.js
index ee704559..ba14f9e1 100755
--- a/scripts/build-native.js
+++ b/scripts/build-native.js
@@ -3,7 +3,11 @@ const rebuild = require('electron-rebuild').default
const path = require('path')
const vars = require('./vars')
-process.env.ARCH = (process.env.ARCH || process.arch) === 'arm' ? 'armv7l' : process.arch
+if (process.platform === 'win32' || process.platform === 'linux') {
+ process.env.ARCH = (process.env.ARCH || process.arch) === 'arm' ? 'armv7l' : process.arch
+} else {
+ process.env.ARCH ??= process.arch
+}
let lifecycles = []
for (let dir of ['app', 'tabby-core', 'tabby-local', 'tabby-ssh', 'tabby-terminal']) {
diff --git a/tabby-electron/src/services/updater.service.ts b/tabby-electron/src/services/updater.service.ts
index 9ff2ae8d..9315d332 100644
--- a/tabby-electron/src/services/updater.service.ts
+++ b/tabby-electron/src/services/updater.service.ts
@@ -54,10 +54,15 @@ export class ElectronUpdaterService extends UpdaterService {
config.ready$.toPromise().then(() => {
if (config.store.enableAutomaticUpdates && this.electronUpdaterAvailable && !process.env.TABBY_DEV) {
this.logger.debug('Checking for updates')
+ let arch = process.arch
+ if (process.platform === 'darwin' && process.arch === 'x64') {
+ arch = 'x86_64'
+ }
try {
this.autoUpdater.setFeedURL({
provider: 's3',
- path: `updates-latest-${process.arch}`,
+ bucket: 'tabby-updates',
+ path: `updates-latest-${arch}`,
})
this.autoUpdater.checkForUpdates()
} catch (e) {
diff --git a/tabby-electron/src/sshImporters.ts b/tabby-electron/src/sshImporters.ts
index eca1c384..bdba4eb9 100644
--- a/tabby-electron/src/sshImporters.ts
+++ b/tabby-electron/src/sshImporters.ts
@@ -26,7 +26,7 @@ export class OpenSSHImporter extends SSHProfileImporter {
if (line.trim().startsWith('#') || !line.trim()) {
continue
}
- if (line.startsWith('Host ')) {
+ if (line.toLowerCase().startsWith('host ')) {
if (currentProfile) {
results.push(currentProfile)
}
diff --git a/tabby-ssh/src/session/ssh.ts b/tabby-ssh/src/session/ssh.ts
index f0da8f13..5174a0d1 100644
--- a/tabby-ssh/src/session/ssh.ts
+++ b/tabby-ssh/src/session/ssh.ts
@@ -306,6 +306,14 @@ export class SSHSession {
this.authUsername = 'root'
}
}
+ if (this.authUsername?.startsWith('$')) {
+ try {
+ const result = process.env[this.authUsername.slice(1)]
+ this.authUsername = result ?? this.authUsername
+ } catch {
+ this.authUsername = 'root'
+ }
+ }
ssh.connect({
host: this.profile.options.host.trim(),
diff --git a/tabby-ssh/tsconfig.typings.json b/tabby-ssh/tsconfig.typings.json
index 891a0f24..5446e796 100644
--- a/tabby-ssh/tsconfig.typings.json
+++ b/tabby-ssh/tsconfig.typings.json
@@ -10,6 +10,7 @@
"paths": {
"tabby-*": ["../../tabby-*"],
"*": ["../../app/node_modules/*"]
- }
+ },
+ "types": ["node"]
}
}
diff --git a/tabby-terminal/src/components/baseTerminalTab.component.pug b/tabby-terminal/src/components/baseTerminalTab.component.pug
index a4fd1e19..f31b7e27 100644
--- a/tabby-terminal/src/components/baseTerminalTab.component.pug
+++ b/tabby-terminal/src/components/baseTerminalTab.component.pug
@@ -3,7 +3,7 @@
search-panel(
*ngIf='showSearchPanel && hasFocus',
@toolbarSlide,
- [@.disabled]='!config.store.accessibility.animations'
+ [@.disabled]='!config.store.accessibility.animations',
[frontend]='frontend',
(close)='showSearchPanel = false; frontend?.cancelSearch()'
)
diff --git a/tabby-terminal/yarn.lock b/tabby-terminal/yarn.lock
index 54ce5b43..2fc87c50 100644
--- a/tabby-terminal/yarn.lock
+++ b/tabby-terminal/yarn.lock
@@ -171,9 +171,9 @@ xterm-addon-ligatures@^0.6.0-beta.14:
font-ligatures "^1.4.1"
xterm-addon-search@^0.9.0-beta.18:
- version "0.9.0-beta.18"
- resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.9.0-beta.18.tgz#5317aed1dc747f468ccb7ecd151fb00d82a8a19d"
- integrity sha512-SAeA3thc2WJNYXwjOEJFLpZ1ZVOs22RLmz9a6WcrzXkvCjLZRvbRGwX25Ms+Dd7dVDQNbKVUzUJohspP/vYr0Q==
+ version "0.9.0-beta.21"
+ resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.9.0-beta.21.tgz#5348fe25676cdd89ce3be52ae62a316b6f266176"
+ integrity sha512-jh6kfRCpWRvZZkV9QghFYesSYHjybaLNEyYAD6uilZYfNHoGLa0zPgUkLOqoECL7K6rhBmSYOkKbc9MG4wNFMQ==
xterm-addon-serialize@^0.7.0-beta.12:
version "0.7.0-beta.12"
@@ -186,9 +186,9 @@ xterm-addon-unicode11@^0.4.0-beta.3:
integrity sha512-FryZAVwbUjKTmwXnm1trch/2XO60F5JsDvOkZhzobV1hm10sFLVuZpFyHXiUx7TFeeFsvNP+S77LAtWoeT5z+Q==
xterm-addon-webgl@^0.12.0-beta.27:
- version "0.12.0-beta.27"
- resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.12.0-beta.27.tgz#afc5bc01d1ef3af9005fb9f6325a4db9c92aa8d9"
- integrity sha512-P948trotU8FMHtaA7C2x97VpLq6QLSjO53kWNvONS0/XwEKQBIYCI7Jfri2wcLgfQg6Cn4OQGLoj2YBK3MMyww==
+ version "0.12.0-beta.28"
+ resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.12.0-beta.28.tgz#252f88fd15816c23789659a0e2545682cf1eec9c"
+ integrity sha512-xpqZRYlyv+aNdDl46W2Hi2fxakNvdJDmWhOwGHPjOmex+kOYdBvVn4rRZmJ7xrKFuQVOfzb3SQCmpZ/njCpBJA==
"xterm@npm:@tabby-gang/xterm@^4.19.0-beta.2":
version "4.19.0-beta.2"
diff --git a/yarn.lock b/yarn.lock
index 31168870..36fc3838 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -890,12 +890,7 @@ acorn@^7.1.1, acorn@^7.4.0:
resolved "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz"
integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
-acorn@^8.0.4, acorn@^8.4.1:
- version "8.4.1"
- resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.4.1.tgz#56c36251fc7cabc7096adc18f05afe814321a28c"
- integrity sha512-asabaBSkEKosYKMITunzX177CXxQ4Q8BSSzMTKD+FefUhipQC70gfW5SiUDhYQ3vk8G+81HqQk7Fv9OXwwn9KA==
-
-acorn@^8.5.0:
+acorn@^8.0.4, acorn@^8.4.1, acorn@^8.5.0:
version "8.7.0"
resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.0.tgz#90951fde0f8f09df93549481e5fc141445b791cf"
integrity sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==
@@ -8736,10 +8731,10 @@ webpack-sources@^3.2.3:
resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde"
integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==
-webpack@^5.70.0:
- version "5.70.0"
- resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.70.0.tgz#3461e6287a72b5e6e2f4872700bc8de0d7500e6d"
- integrity sha512-ZMWWy8CeuTTjCxbeaQI21xSswseF2oNOwc70QSKNePvmxE7XW36i7vpBMYZFAUHPwQiEbNGCEYIOOlyRbdGmxw==
+webpack@^5.72.0:
+ version "5.72.0"
+ resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.72.0.tgz#f8bc40d9c6bb489a4b7a8a685101d6022b8b6e28"
+ integrity sha512-qmSmbspI0Qo5ld49htys8GY9XhS9CGqFoHTsOVAnjBdg0Zn79y135R+k4IR4rKK6+eKaabMhJwiVB7xw0SJu5w==
dependencies:
"@types/eslint-scope" "^3.7.3"
"@types/estree" "^0.0.51"