From a874a5e4d5dca134906707e96ad752e3a1524dd7 Mon Sep 17 00:00:00 2001 From: Jai-JAP Date: Tue, 8 Mar 2022 20:59:59 +0530 Subject: [PATCH 01/66] Add Linux armv7l and arm64 support --- .github/workflows/build.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ca0cd543..b14b5a73 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -131,6 +131,12 @@ jobs: Linux-Build: runs-on: ubuntu-18.04 # build against an older glibc for compatibility needs: Lint + strategy: + matrix: + include: + - arch: x86_64 + - arch: armv7l + - arch: arm64 steps: - name: Checkout @@ -156,22 +162,34 @@ jobs: - 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}} - name: Build packages run: scripts/build-linux.js env: + ARCH: ${{matrix.arch}} 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' + if: ${{ matrix.arch == x86_64 }} - name: Upload symbols run: | @@ -181,6 +199,7 @@ jobs: SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }} SENTRY_ORG: ${{ secrets.SENTRY_ORG }} SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }} + if: ${{ matrix.arch == x86_64 }} - name: Upload packages to packagecloud.io uses: Eugeny/packagecloud-action@main From 90bd8b424f0ea526d9bcb4ec0ea175dcdf1f47c1 Mon Sep 17 00:00:00 2001 From: Jai-JAP Date: Tue, 8 Mar 2022 21:11:08 +0530 Subject: [PATCH 02/66] Manual run --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b14b5a73..42e1bc54 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,5 +1,5 @@ name: Package-Build -on: [push, pull_request] +on: [push, pull_request, workflow_dispatch] jobs: Lint: runs-on: macos-11 From ea3894390565d3099badbc25c4084cadc648cb9f Mon Sep 17 00:00:00 2001 From: Jai-JAP Date: Tue, 8 Mar 2022 21:14:19 +0530 Subject: [PATCH 03/66] Fixes --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 42e1bc54..9bfcd8f9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -189,7 +189,7 @@ jobs: - name: Build web resources run: zsh -c 'tar czf tabby-web.tar.gz (tabby-*|web)/dist' - if: ${{ matrix.arch == x86_64 }} + if: ${{ matrix.arch == 'x86_64' }} - name: Upload symbols run: | @@ -199,7 +199,7 @@ jobs: SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }} SENTRY_ORG: ${{ secrets.SENTRY_ORG }} SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }} - if: ${{ matrix.arch == x86_64 }} + if: ${{ matrix.arch == 'x86_64' }} - name: Upload packages to packagecloud.io uses: Eugeny/packagecloud-action@main From d8bec496ee4bd838400ce5199d50825144e0a19e Mon Sep 17 00:00:00 2001 From: Jai-JAP Date: Tue, 8 Mar 2022 21:43:09 +0530 Subject: [PATCH 04/66] Fix Linux pacman uploads --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9bfcd8f9..6ba53ce8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -242,6 +242,7 @@ jobs: with: name: Linux Pacman path: artifact-pacman + if: ${{ matrix.arch == 'x86_64' }} - uses: actions/upload-artifact@master name: Upload Snap From 690a632f96d50404a933e25daef13c4897d24793 Mon Sep 17 00:00:00 2001 From: Jai-JAP Date: Tue, 8 Mar 2022 21:53:59 +0530 Subject: [PATCH 05/66] Add windows arm64 --- .github/workflows/build.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6ba53ce8..57fdde34 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -265,6 +265,11 @@ jobs: Windows-Build: runs-on: windows-2022 needs: Lint + strategy: + matrix: + include: + - arch: x86_64 + - arch: arm64 steps: - name: Checkout @@ -290,6 +295,8 @@ jobs: node scripts/build-native.js yarn run build node scripts/prepackage-plugins.js + env: + ARCH: ${{matrix.arch}} - name: Build and sign packages run: node scripts/build-windows.js @@ -303,6 +310,8 @@ jobs: - 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')))" + env: + ARCH: ${{matrix.arch}} - name: Upload symbols run: | From c533e6c8fdc9bb302dd1e027f3d58702e8080055 Mon Sep 17 00:00:00 2001 From: Jai A P <78354625+Jai-JAP@users.noreply.github.com> Date: Tue, 8 Mar 2022 22:31:13 +0530 Subject: [PATCH 06/66] Update electron-builder.yml --- electron-builder.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/electron-builder.yml b/electron-builder.yml index e0b1af12..512ce8c6 100644 --- a/electron-builder.yml +++ b/electron-builder.yml @@ -39,11 +39,11 @@ publish: win: icon: "./build/windows/icon.ico" - artifactName: tabby-${version}-portable.${ext} + artifactName: tabby-${version}-portable-${env.ARCH}.${ext} rfc3161TimeStampServer: http://timestamp.sectigo.com nsis: oneClick: false - artifactName: tabby-${version}-setup.${ext} + artifactName: tabby-${version}-setup-${env.ARCH}.${ext} installerIcon: "./build/windows/icon.ico" allowToChangeInstallationDirectory: true shortcutName: Tabby Terminal @@ -68,7 +68,7 @@ mac: linux: category: "Utility;TerminalEmulator;System" icon: "./build/icons" - artifactName: tabby-${version}-linux.${ext} + artifactName: tabby-${version}-linux-${env.ARCH}.${ext} executableArgs: - "--no-sandbox" desktop: From d35c03d083d3ab2d416107ae0c0be30351424c2e Mon Sep 17 00:00:00 2001 From: Jai A P <78354625+Jai-JAP@users.noreply.github.com> Date: Tue, 8 Mar 2022 22:35:56 +0530 Subject: [PATCH 07/66] Update build.yml --- .github/workflows/build.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 57fdde34..43282916 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -228,32 +228,32 @@ jobs: - uses: actions/upload-artifact@master name: Upload DEB with: - name: Linux DEB + name: Linux DEB (${{matrix.arch}}) path: artifact-deb - uses: actions/upload-artifact@master name: Upload RPM with: - name: Linux RPM + name: Linux RPM (${{matrix.arch}}) path: artifact-rpm - uses: actions/upload-artifact@master name: Upload Pacman Package with: - name: Linux Pacman + name: Linux Pacman (${{matrix.arch}}) path: artifact-pacman if: ${{ matrix.arch == 'x86_64' }} - uses: actions/upload-artifact@master name: Upload Snap with: - name: Linux Snap + name: Linux Snap (${{matrix.arch}}) path: artifact-snap - uses: actions/upload-artifact@master name: Upload Linux tarball with: - name: Linux tarball + name: Linux tarball (${{matrix.arch}}) path: artifact-tar.gz - uses: actions/upload-artifact@master @@ -261,6 +261,8 @@ jobs: with: name: Web tarball path: artifact-web + if: ${{ matrix.arch == 'x86_64' }} + Windows-Build: runs-on: windows-2022 From e2d4ef58c4aea806a29e0df2557972486ce596c9 Mon Sep 17 00:00:00 2001 From: Jai A P <78354625+Jai-JAP@users.noreply.github.com> Date: Tue, 8 Mar 2022 22:45:46 +0530 Subject: [PATCH 08/66] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 43282916..335cb979 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -242,7 +242,7 @@ jobs: with: name: Linux Pacman (${{matrix.arch}}) path: artifact-pacman - if: ${{ matrix.arch == 'x86_64' }} + # if: ${{ matrix.arch == 'x86_64' }} - uses: actions/upload-artifact@master name: Upload Snap From b70a193dbd4a8a232f2d7fe7c0ed8aecffd5a37e Mon Sep 17 00:00:00 2001 From: Jai A P <78354625+Jai-JAP@users.noreply.github.com> Date: Tue, 8 Mar 2022 22:58:11 +0530 Subject: [PATCH 09/66] Update build.yml --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 335cb979..b97c40ac 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -327,9 +327,9 @@ jobs: - name: Package artifacts run: | mkdir artifact-setup - mv dist/*-setup.exe artifact-setup/ + mv dist/*-setup-*.exe artifact-setup/ mkdir artifact-portable - mv dist/*-portable.zip artifact-portable/ + mv dist/*-portable-*.zip artifact-portable/ - uses: actions/upload-artifact@master name: Upload installer From 5c325a347caa13751561fe0d8396a2bb9e19dc18 Mon Sep 17 00:00:00 2001 From: Jai A P <78354625+Jai-JAP@users.noreply.github.com> Date: Tue, 8 Mar 2022 23:15:58 +0530 Subject: [PATCH 10/66] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b97c40ac..93653e5d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,5 +1,5 @@ name: Package-Build -on: [push, pull_request, workflow_dispatch] +on: [push, pull_request] jobs: Lint: runs-on: macos-11 From b5506cff6110e88c03aa62bd86c93458b4ddc7a4 Mon Sep 17 00:00:00 2001 From: Jai A P <78354625+Jai-JAP@users.noreply.github.com> Date: Wed, 9 Mar 2022 10:35:37 +0530 Subject: [PATCH 11/66] Update build-linux.js --- scripts/build-linux.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/build-linux.js b/scripts/build-linux.js index 6d1f92d6..7ac7f97b 100755 --- a/scripts/build-linux.js +++ b/scripts/build-linux.js @@ -4,13 +4,18 @@ const vars = require('./vars') const isTag = (process.env.GITHUB_REF || '').startsWith('refs/tags/') +process.env.ARCH = process.env.ARCH || process.arch + builder({ dir: true, linux: ['deb', 'tar.gz', 'rpm', 'pacman'], + armv7l: process.env.ARCH === 'armv7l', + arm64: process.env.ARCH === 'arm64', config: { extraMetadata: { version: vars.version, }, + npmRebuild: (process.env.ARCH !== 'arm64' && process.env.ARCH !== 'armv7l'), }, publish: isTag ? 'always' : 'onTag', }).catch(() => process.exit(1)) From 1b31187201448482494794298a94c8734c6cdabc Mon Sep 17 00:00:00 2001 From: Jai A P <78354625+Jai-JAP@users.noreply.github.com> Date: Wed, 9 Mar 2022 11:17:02 +0530 Subject: [PATCH 12/66] Update build.yml --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 93653e5d..f53e806c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -334,11 +334,11 @@ jobs: - uses: actions/upload-artifact@master name: Upload installer with: - name: Windows installer + name: Windows installer (${{matrix.arch}}) path: artifact-setup - uses: actions/upload-artifact@master name: Upload portable build with: - name: Windows portable build + name: Windows portable build (${{matrix.arch}}) path: artifact-portable From 725edd53cbd481c905ca2c532cf34916bcea0846 Mon Sep 17 00:00:00 2001 From: Jai A P <78354625+Jai-JAP@users.noreply.github.com> Date: Wed, 9 Mar 2022 11:19:04 +0530 Subject: [PATCH 13/66] Update build-windows.js --- scripts/build-windows.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/build-windows.js b/scripts/build-windows.js index 998bfd9d..74e2d99e 100755 --- a/scripts/build-windows.js +++ b/scripts/build-windows.js @@ -5,9 +5,12 @@ const vars = require('./vars') const isTag = (process.env.GITHUB_REF || process.env.BUILD_SOURCEBRANCH || '').startsWith('refs/tags/') const isCI = !!process.env.GITHUB_REF +process.env.ARCH = process.env.ARCH || process.arch + builder({ dir: true, win: ['nsis', 'zip'], + arm64: process.env.ARCH === 'arm64', config: { extraMetadata: { version: vars.version, From c3e4031aabdf7096ff54bf025099b3ef388b37f8 Mon Sep 17 00:00:00 2001 From: Jai A P <78354625+Jai-JAP@users.noreply.github.com> Date: Wed, 9 Mar 2022 12:36:10 +0530 Subject: [PATCH 14/66] Update build-linux.js --- scripts/build-linux.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build-linux.js b/scripts/build-linux.js index 7ac7f97b..536e3af7 100755 --- a/scripts/build-linux.js +++ b/scripts/build-linux.js @@ -15,7 +15,7 @@ builder({ extraMetadata: { version: vars.version, }, - npmRebuild: (process.env.ARCH !== 'arm64' && process.env.ARCH !== 'armv7l'), + npmRebuild: (process.env.ARCH !== 'arm64' || process.env.ARCH !== 'armv7l'), }, publish: isTag ? 'always' : 'onTag', }).catch(() => process.exit(1)) From b27f5c2145e5c64d002b5c4b4ffc0e7104d6c320 Mon Sep 17 00:00:00 2001 From: Jai A P <78354625+Jai-JAP@users.noreply.github.com> Date: Wed, 9 Mar 2022 12:37:16 +0530 Subject: [PATCH 15/66] Revert last change --- scripts/build-linux.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build-linux.js b/scripts/build-linux.js index 536e3af7..7ac7f97b 100755 --- a/scripts/build-linux.js +++ b/scripts/build-linux.js @@ -15,7 +15,7 @@ builder({ extraMetadata: { version: vars.version, }, - npmRebuild: (process.env.ARCH !== 'arm64' || process.env.ARCH !== 'armv7l'), + npmRebuild: (process.env.ARCH !== 'arm64' && process.env.ARCH !== 'armv7l'), }, publish: isTag ? 'always' : 'onTag', }).catch(() => process.exit(1)) From 38f8a7cfef07dd1649bb5c83791bf31eb80e05fa Mon Sep 17 00:00:00 2001 From: Jai A P <78354625+Jai-JAP@users.noreply.github.com> Date: Wed, 9 Mar 2022 17:18:07 +0530 Subject: [PATCH 16/66] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f53e806c..f10dcfcd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -169,7 +169,7 @@ jobs: run: | rm -rf app/node_modules/cpu-features rm -rf app/node_modules/ssh2/crypto/build - if: ${{ matrix.arch == 'arm64' }} + if: ${{ matrix.arch == 'arm64' || matrix.arch == 'armv7l' }} - name: Webpack run: yarn run build From d6bcdbde78aa98bfe656111b35b6afb98540ba3e Mon Sep 17 00:00:00 2001 From: Jai A P <78354625+Jai-JAP@users.noreply.github.com> Date: Wed, 9 Mar 2022 21:27:29 +0530 Subject: [PATCH 17/66] Fixes --- .github/workflows/build.yml | 9 --------- scripts/build-linux.js | 2 +- scripts/build-native.js | 5 ++++- scripts/build-windows.js | 1 + 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f10dcfcd..142e0274 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -218,8 +218,6 @@ jobs: 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 @@ -242,13 +240,6 @@ jobs: with: name: Linux Pacman (${{matrix.arch}}) path: artifact-pacman - # if: ${{ matrix.arch == 'x86_64' }} - - - uses: actions/upload-artifact@master - name: Upload Snap - with: - name: Linux Snap (${{matrix.arch}}) - path: artifact-snap - uses: actions/upload-artifact@master name: Upload Linux tarball diff --git a/scripts/build-linux.js b/scripts/build-linux.js index 7ac7f97b..94b4adef 100755 --- a/scripts/build-linux.js +++ b/scripts/build-linux.js @@ -15,7 +15,7 @@ builder({ extraMetadata: { version: vars.version, }, - npmRebuild: (process.env.ARCH !== 'arm64' && process.env.ARCH !== 'armv7l'), + npmRebuild: process.env.ARCH !== 'arm*', }, publish: isTag ? 'always' : 'onTag', }).catch(() => process.exit(1)) diff --git a/scripts/build-native.js b/scripts/build-native.js index 8fb295b6..a939e591 100755 --- a/scripts/build-native.js +++ b/scripts/build-native.js @@ -3,12 +3,15 @@ const rebuild = require('electron-rebuild').default const path = require('path') const vars = require('./vars') +process.env.ARCH = process.env.ARCH || process.arch +if ( process.env.ARCH === 'arm' ) process.env.ARCH = 'armv7l' ; + let lifecycles = [] for (let dir of ['app', 'tabby-core', 'tabby-local', 'tabby-ssh', 'tabby-terminal']) { const build = rebuild({ buildPath: path.resolve(__dirname, '../' + dir), electronVersion: vars.electronVersion, - arch: process.env.ARCH ?? process.arch, + arch: process.env.ARCH, force: true, }) build.catch(e => { diff --git a/scripts/build-windows.js b/scripts/build-windows.js index 74e2d99e..d2150b14 100755 --- a/scripts/build-windows.js +++ b/scripts/build-windows.js @@ -15,6 +15,7 @@ builder({ extraMetadata: { version: vars.version, }, + npmRebuild: process.env.ARCH !== 'arm64', }, publish: isTag ? 'always' : 'onTag', }).catch(() => process.exit(1)) From 39fbf467dec2a10b51b6f4536f2cae06355af184 Mon Sep 17 00:00:00 2001 From: Jai A P <78354625+Jai-JAP@users.noreply.github.com> Date: Wed, 9 Mar 2022 21:32:28 +0530 Subject: [PATCH 18/66] Update build.yml --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 142e0274..4a5478b5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -64,7 +64,7 @@ jobs: env: ARCH: ${{matrix.arch}} - - name: Build native deps + - name: Fix cross build run: | rm -rf app/node_modules/cpu-features rm -rf app/node_modules/ssh2/crypto/build @@ -165,7 +165,7 @@ jobs: env: ARCH: ${{matrix.arch}} - - name: Build native deps + - name: Fix cross build run: | rm -rf app/node_modules/cpu-features rm -rf app/node_modules/ssh2/crypto/build From f2f0953b2430f63decaa6fe1d56a84bef36bdbb9 Mon Sep 17 00:00:00 2001 From: Jai A P <78354625+Jai-JAP@users.noreply.github.com> Date: Wed, 9 Mar 2022 22:04:29 +0530 Subject: [PATCH 19/66] Fix windows --- scripts/build-windows.js | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/build-windows.js b/scripts/build-windows.js index d2150b14..74e2d99e 100755 --- a/scripts/build-windows.js +++ b/scripts/build-windows.js @@ -15,7 +15,6 @@ builder({ extraMetadata: { version: vars.version, }, - npmRebuild: process.env.ARCH !== 'arm64', }, publish: isTag ? 'always' : 'onTag', }).catch(() => process.exit(1)) From 237cb5b26c3b8b8c8cba7a27eb3fad6ba977faab Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Mar 2022 04:04:56 +0000 Subject: [PATCH 20/66] Bump sortablejs from 1.14.0 to 1.15.0 Bumps [sortablejs](https://github.com/SortableJS/Sortable) from 1.14.0 to 1.15.0. - [Release notes](https://github.com/SortableJS/Sortable/releases) - [Commits](https://github.com/SortableJS/Sortable/compare/1.14.0...1.15.0) --- updated-dependencies: - dependency-name: sortablejs dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index aeb0c79c..b50bbff8 100644 --- a/package.json +++ b/package.json @@ -68,7 +68,7 @@ "shell-quote": "^1.7.3", "shelljs": "0.8.5", "slugify": "^1.6.5", - "sortablejs": "^1.14.0", + "sortablejs": "^1.15.0", "source-code-pro": "^2.38.0", "source-map-loader": "^3.0.1", "source-sans-pro": "3.6.0", diff --git a/yarn.lock b/yarn.lock index ed381e22..3572544e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7615,10 +7615,10 @@ socks@^2.6.1: ip "^1.1.5" smart-buffer "^4.1.0" -sortablejs@^1.14.0: - version "1.14.0" - resolved "https://registry.yarnpkg.com/sortablejs/-/sortablejs-1.14.0.tgz#6d2e17ccbdb25f464734df621d4f35d4ab35b3d8" - integrity sha512-pBXvQCs5/33fdN1/39pPL0NZF20LeRbLQ5jtnheIPN9JQAaufGjKdWduZn4U7wCtVuzKhmRkI0DFYHYRbB2H1w== +sortablejs@^1.15.0: + version "1.15.0" + resolved "https://registry.yarnpkg.com/sortablejs/-/sortablejs-1.15.0.tgz#53230b8aa3502bb77a29e2005808ffdb4a5f7e2a" + integrity sha512-bv9qgVMjUMf89wAvM6AxVvS/4MX3sPeN0+agqShejLU5z5GX4C75ow1O2e5k4L6XItUyAK3gH6AxSbXrOM5e8w== sorted-object@~2.0.1: version "2.0.1" From 26f93f7ac5fbdecf7d9e5a8652a418bec3ca81ed Mon Sep 17 00:00:00 2001 From: Jai A P <78354625+Jai-JAP@users.noreply.github.com> Date: Mon, 21 Mar 2022 12:08:52 +0530 Subject: [PATCH 21/66] Update build-linux.js --- scripts/build-linux.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/build-linux.js b/scripts/build-linux.js index 94b4adef..0b302fa7 100755 --- a/scripts/build-linux.js +++ b/scripts/build-linux.js @@ -9,13 +9,12 @@ process.env.ARCH = process.env.ARCH || process.arch builder({ dir: true, linux: ['deb', 'tar.gz', 'rpm', 'pacman'], - armv7l: process.env.ARCH === 'armv7l', arm64: process.env.ARCH === 'arm64', config: { extraMetadata: { version: vars.version, }, - npmRebuild: process.env.ARCH !== 'arm*', + npmRebuild: process.env.ARCH == 'arm64', }, publish: isTag ? 'always' : 'onTag', }).catch(() => process.exit(1)) From 4aca0fdf09a7d0d0f91a3832de1c60eda50ecbe5 Mon Sep 17 00:00:00 2001 From: Jai A P <78354625+Jai-JAP@users.noreply.github.com> Date: Mon, 21 Mar 2022 12:09:24 +0530 Subject: [PATCH 22/66] Update build-native.js --- scripts/build-native.js | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/build-native.js b/scripts/build-native.js index a939e591..94a81601 100755 --- a/scripts/build-native.js +++ b/scripts/build-native.js @@ -4,7 +4,6 @@ const path = require('path') const vars = require('./vars') process.env.ARCH = process.env.ARCH || process.arch -if ( process.env.ARCH === 'arm' ) process.env.ARCH = 'armv7l' ; let lifecycles = [] for (let dir of ['app', 'tabby-core', 'tabby-local', 'tabby-ssh', 'tabby-terminal']) { From 332c5c0b5e2f242c83159e3314d02a50a8fef9d0 Mon Sep 17 00:00:00 2001 From: Jai A P <78354625+Jai-JAP@users.noreply.github.com> Date: Mon, 21 Mar 2022 15:33:13 +0530 Subject: [PATCH 23/66] Delete build.yml --- .github/workflows/build.yml | 335 ------------------------------------ 1 file changed, 335 deletions(-) delete mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml deleted file mode 100644 index 4a5478b5..00000000 --- a/.github/workflows/build.yml +++ /dev/null @@ -1,335 +0,0 @@ -name: Package-Build -on: [push, pull_request] -jobs: - Lint: - runs-on: macos-11 - - steps: - - name: Checkout - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - - name: Installing Node - uses: actions/setup-node@v3.0.0 - with: - node-version: 16 - - - 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 - needs: Lint - strategy: - matrix: - include: - - arch: x86_64 - - arch: arm64 - - steps: - - name: Checkout - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - - name: Installing Node - uses: actions/setup-node@v3.0.0 - with: - node-version: 16 - - - name: Install deps - run: | - sudo npm i -g yarn@1.22.1 - cd app - yarn --network-timeout 1000000 - cd .. - rm app/node_modules/.yarn-integrity - yarn --network-timeout 1000000 - - - name: Build native deps - run: scripts/build-native.js - env: - ARCH: ${{matrix.arch}} - - - name: Fix cross build - 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 # build against an older glibc for compatibility - needs: Lint - strategy: - matrix: - include: - - arch: x86_64 - - arch: armv7l - - arch: arm64 - - steps: - - name: Checkout - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - - name: Install Node - uses: actions/setup-node@v3.0.0 - with: - node-version: 16 - - - name: Install deps - run: | - sudo apt-get update - sudo apt-get install libarchive-tools zsh - npm i -g yarn@1.19.1 - cd app - yarn --network-timeout 1000000 - cd .. - rm app/node_modules/.yarn-integrity - yarn --network-timeout 1000000 - - - name: Build native deps - run: scripts/build-native.js - env: - ARCH: ${{matrix.arch}} - - - name: Fix cross build - run: | - rm -rf app/node_modules/cpu-features - rm -rf app/node_modules/ssh2/crypto/build - if: ${{ matrix.arch == 'arm64' || matrix.arch == 'armv7l' }} - - - name: Webpack - run: yarn run build - - - name: Prepackage plugins - run: scripts/prepackage-plugins.js - env: - ARCH: ${{matrix.arch}} - - - name: Build packages - run: scripts/build-linux.js - env: - ARCH: ${{matrix.arch}} - 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' - if: ${{ matrix.arch == 'x86_64' }} - - - 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 }} - if: ${{ matrix.arch == 'x86_64' }} - - - name: Upload packages to packagecloud.io - uses: Eugeny/packagecloud-action@main - if: github.repository == 'Eugeny/tabby' && github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') - env: - PACKAGECLOUD_TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }} - with: - repo: 'eugeny/tabby' - dir: 'dist' - - - 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-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 (${{matrix.arch}}) - path: artifact-deb - - - uses: actions/upload-artifact@master - name: Upload RPM - with: - name: Linux RPM (${{matrix.arch}}) - path: artifact-rpm - - - uses: actions/upload-artifact@master - name: Upload Pacman Package - with: - name: Linux Pacman (${{matrix.arch}}) - path: artifact-pacman - - - uses: actions/upload-artifact@master - name: Upload Linux tarball - with: - name: Linux tarball (${{matrix.arch}}) - path: artifact-tar.gz - - - uses: actions/upload-artifact@master - name: Upload web tarball - with: - name: Web tarball - path: artifact-web - if: ${{ matrix.arch == 'x86_64' }} - - - Windows-Build: - runs-on: windows-2022 - needs: Lint - strategy: - matrix: - include: - - arch: x86_64 - - arch: arm64 - - steps: - - name: Checkout - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - - name: Installing Node - uses: actions/setup-node@v3.0.0 - with: - node-version: 16 - - - name: Update node-gyp - run: | - npm install --global node-gyp@8.4.1 - npm prefix -g | % {npm config set node_gyp "$_\node_modules\node-gyp\bin\node-gyp.js"} - - - name: Build - shell: powershell - run: | - npm i -g yarn@1.19.1 - yarn --network-timeout 1000000 - node scripts/build-native.js - yarn run build - node scripts/prepackage-plugins.js - env: - ARCH: ${{matrix.arch}} - - - 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')))" - env: - ARCH: ${{matrix.arch}} - - - 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 (${{matrix.arch}}) - path: artifact-setup - - - uses: actions/upload-artifact@master - name: Upload portable build - with: - name: Windows portable build (${{matrix.arch}}) - path: artifact-portable From f18c1f6d3aed932ef43116651c73e09863afabf0 Mon Sep 17 00:00:00 2001 From: Jai A P <78354625+Jai-JAP@users.noreply.github.com> Date: Mon, 21 Mar 2022 15:33:23 +0530 Subject: [PATCH 24/66] Delete docs.yml --- .github/workflows/docs.yml | 38 -------------------------------------- 1 file changed, 38 deletions(-) delete mode 100644 .github/workflows/docs.yml diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml deleted file mode 100644 index 14712dfe..00000000 --- a/.github/workflows/docs.yml +++ /dev/null @@ -1,38 +0,0 @@ -name: Docs -on: push -jobs: - build: - runs-on: ubuntu-latest - if: ${{ github.actor != 'dependabot[bot]' }} - - steps: - - name: Checkout - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - - name: Installing Node - uses: actions/setup-node@v3.0.0 - with: - node-version: 14 - - - name: Build - run: | - yarn cache clean - cd app - yarn - cd .. - rm app/node_modules/.yarn-integrity - yarn - yarn run build:typings - yarn run docs - - env: - DOCS_PRIVATE_KEY: ${{ secrets.DOCS_PRIVATE_KEY }} - - - uses: FirebaseExtended/action-hosting-deploy@v0 - with: - repoToken: '${{ secrets.GITHUB_TOKEN }}' - firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_TABBY_DOCS }}' - channelId: live - projectId: tabby-docs From 8c0d681345789dd835fa315dc878613564fbba0e Mon Sep 17 00:00:00 2001 From: jai-jap Date: Mon, 21 Mar 2022 15:50:14 +0530 Subject: [PATCH 25/66] Revert "Delete docs.yml" This reverts commit f18c1f6d3aed932ef43116651c73e09863afabf0. --- .github/workflows/docs.yml | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 .github/workflows/docs.yml diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml new file mode 100644 index 00000000..14712dfe --- /dev/null +++ b/.github/workflows/docs.yml @@ -0,0 +1,38 @@ +name: Docs +on: push +jobs: + build: + runs-on: ubuntu-latest + if: ${{ github.actor != 'dependabot[bot]' }} + + steps: + - name: Checkout + uses: actions/checkout@v3 + with: + fetch-depth: 0 + + - name: Installing Node + uses: actions/setup-node@v3.0.0 + with: + node-version: 14 + + - name: Build + run: | + yarn cache clean + cd app + yarn + cd .. + rm app/node_modules/.yarn-integrity + yarn + yarn run build:typings + yarn run docs + + env: + DOCS_PRIVATE_KEY: ${{ secrets.DOCS_PRIVATE_KEY }} + + - uses: FirebaseExtended/action-hosting-deploy@v0 + with: + repoToken: '${{ secrets.GITHUB_TOKEN }}' + firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_TABBY_DOCS }}' + channelId: live + projectId: tabby-docs From 2229d54b337aed1b76f43bb11388b9f45c42bbac Mon Sep 17 00:00:00 2001 From: jai-jap Date: Mon, 21 Mar 2022 15:50:26 +0530 Subject: [PATCH 26/66] Revert "Delete build.yml" This reverts commit 332c5c0b5e2f242c83159e3314d02a50a8fef9d0. --- .github/workflows/build.yml | 335 ++++++++++++++++++++++++++++++++++++ 1 file changed, 335 insertions(+) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 00000000..4a5478b5 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,335 @@ +name: Package-Build +on: [push, pull_request] +jobs: + Lint: + runs-on: macos-11 + + steps: + - name: Checkout + uses: actions/checkout@v3 + with: + fetch-depth: 0 + + - name: Installing Node + uses: actions/setup-node@v3.0.0 + with: + node-version: 16 + + - 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 + needs: Lint + strategy: + matrix: + include: + - arch: x86_64 + - arch: arm64 + + steps: + - name: Checkout + uses: actions/checkout@v3 + with: + fetch-depth: 0 + + - name: Installing Node + uses: actions/setup-node@v3.0.0 + with: + node-version: 16 + + - name: Install deps + run: | + sudo npm i -g yarn@1.22.1 + cd app + yarn --network-timeout 1000000 + cd .. + rm app/node_modules/.yarn-integrity + yarn --network-timeout 1000000 + + - name: Build native deps + run: scripts/build-native.js + env: + ARCH: ${{matrix.arch}} + + - name: Fix cross build + 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 # build against an older glibc for compatibility + needs: Lint + strategy: + matrix: + include: + - arch: x86_64 + - arch: armv7l + - arch: arm64 + + steps: + - name: Checkout + uses: actions/checkout@v3 + with: + fetch-depth: 0 + + - name: Install Node + uses: actions/setup-node@v3.0.0 + with: + node-version: 16 + + - name: Install deps + run: | + sudo apt-get update + sudo apt-get install libarchive-tools zsh + npm i -g yarn@1.19.1 + cd app + yarn --network-timeout 1000000 + cd .. + rm app/node_modules/.yarn-integrity + yarn --network-timeout 1000000 + + - name: Build native deps + run: scripts/build-native.js + env: + ARCH: ${{matrix.arch}} + + - name: Fix cross build + run: | + rm -rf app/node_modules/cpu-features + rm -rf app/node_modules/ssh2/crypto/build + if: ${{ matrix.arch == 'arm64' || matrix.arch == 'armv7l' }} + + - name: Webpack + run: yarn run build + + - name: Prepackage plugins + run: scripts/prepackage-plugins.js + env: + ARCH: ${{matrix.arch}} + + - name: Build packages + run: scripts/build-linux.js + env: + ARCH: ${{matrix.arch}} + 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' + if: ${{ matrix.arch == 'x86_64' }} + + - 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 }} + if: ${{ matrix.arch == 'x86_64' }} + + - name: Upload packages to packagecloud.io + uses: Eugeny/packagecloud-action@main + if: github.repository == 'Eugeny/tabby' && github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') + env: + PACKAGECLOUD_TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }} + with: + repo: 'eugeny/tabby' + dir: 'dist' + + - 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-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 (${{matrix.arch}}) + path: artifact-deb + + - uses: actions/upload-artifact@master + name: Upload RPM + with: + name: Linux RPM (${{matrix.arch}}) + path: artifact-rpm + + - uses: actions/upload-artifact@master + name: Upload Pacman Package + with: + name: Linux Pacman (${{matrix.arch}}) + path: artifact-pacman + + - uses: actions/upload-artifact@master + name: Upload Linux tarball + with: + name: Linux tarball (${{matrix.arch}}) + path: artifact-tar.gz + + - uses: actions/upload-artifact@master + name: Upload web tarball + with: + name: Web tarball + path: artifact-web + if: ${{ matrix.arch == 'x86_64' }} + + + Windows-Build: + runs-on: windows-2022 + needs: Lint + strategy: + matrix: + include: + - arch: x86_64 + - arch: arm64 + + steps: + - name: Checkout + uses: actions/checkout@v3 + with: + fetch-depth: 0 + + - name: Installing Node + uses: actions/setup-node@v3.0.0 + with: + node-version: 16 + + - name: Update node-gyp + run: | + npm install --global node-gyp@8.4.1 + npm prefix -g | % {npm config set node_gyp "$_\node_modules\node-gyp\bin\node-gyp.js"} + + - name: Build + shell: powershell + run: | + npm i -g yarn@1.19.1 + yarn --network-timeout 1000000 + node scripts/build-native.js + yarn run build + node scripts/prepackage-plugins.js + env: + ARCH: ${{matrix.arch}} + + - 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')))" + env: + ARCH: ${{matrix.arch}} + + - 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 (${{matrix.arch}}) + path: artifact-setup + + - uses: actions/upload-artifact@master + name: Upload portable build + with: + name: Windows portable build (${{matrix.arch}}) + path: artifact-portable From 9ac7a67d74fe27df3498055ef7ea38dae1498040 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 24 Mar 2022 04:11:22 +0000 Subject: [PATCH 27/66] Bump electron from 17.1.2 to 17.2.0 Bumps [electron](https://github.com/electron/electron) from 17.1.2 to 17.2.0. - [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/v17.1.2...v17.2.0) --- updated-dependencies: - dependency-name: electron dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index aeb0c79c..a174f8d5 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "cross-env": "7.0.3", "css-loader": "^6.7.1", "deep-equal": "2.0.5", - "electron": "17.1.2", + "electron": "17.2.0", "electron-builder": "^22.14.13", "electron-download": "^4.1.1", "electron-installer-snap": "^5.1.0", diff --git a/yarn.lock b/yarn.lock index ed381e22..fe6c227c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2750,10 +2750,10 @@ electron-to-chromium@^1.3.723: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.736.tgz#f632d900a1f788dab22fec9c62ec5c9c8f0c4052" integrity sha512-DY8dA7gR51MSo66DqitEQoUMQ0Z+A2DSXFi7tK304bdTVqczCAfUuyQw6Wdg8hIoo5zIxkU1L24RQtUce1Ioig== -electron@17.1.2: - version "17.1.2" - resolved "https://registry.yarnpkg.com/electron/-/electron-17.1.2.tgz#b4e4a0df883d9a9854cf865efa2bb00b12d55b1d" - integrity sha512-hqKQaUIRWX5Y2eAD8FZINWD/e5TKdpkbBYbkcZmJS4Bd1PKQsaDVc9h5xoA8zZQkPymE9rss+swjRpAFurOPGQ== +electron@17.2.0: + version "17.2.0" + resolved "https://registry.yarnpkg.com/electron/-/electron-17.2.0.tgz#a5c42c16352ea968fcb5d1ce256bec51e7d140fe" + integrity sha512-eNXhPVEUofkgAeqRFvTizzYecoCMyS0Rar08WZHSAw9wjfZXawYMvTpjjjk9GiX9W/+Cjxua4YtGn5bOTabc0A== dependencies: "@electron/get" "^1.13.0" "@types/node" "^14.6.2" From 98f19e1ada389f2bcbfe75aa01c88a290d2c5282 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 25 Mar 2022 04:05:49 +0000 Subject: [PATCH 28/66] Bump electron-notarize from 1.1.1 to 1.2.1 Bumps [electron-notarize](https://github.com/electron/electron-notarize) from 1.1.1 to 1.2.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.1.1...v1.2.1) --- updated-dependencies: - dependency-name: electron-notarize dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index aeb0c79c..74ed7626 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "electron-builder": "^22.14.13", "electron-download": "^4.1.1", "electron-installer-snap": "^5.1.0", - "electron-notarize": "^1.1.1", + "electron-notarize": "^1.2.1", "electron-rebuild": "^3.2.7", "eslint": "^7.32.0", "file-loader": "^6.2.0", diff --git a/yarn.lock b/yarn.lock index ed381e22..7adee49e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2692,10 +2692,10 @@ electron-localshortcut@^3.1.0: keyboardevent-from-electron-accelerator "^2.0.0" keyboardevents-areequal "^0.2.1" -electron-notarize@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/electron-notarize/-/electron-notarize-1.1.1.tgz#3ed274b36158c1beb1dbef14e7faf5927e028629" - integrity sha512-kufsnqh86CTX89AYNG3NCPoboqnku/+32RxeJ2+7A4Rbm4bbOx0Nc7XTy3/gAlBfpj9xPAxHfhZLOHgfi6cJVw== +electron-notarize@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/electron-notarize/-/electron-notarize-1.2.1.tgz#347c18eca8e29dddadadee511b870c13d4008baf" + integrity sha512-u/ECWhIrhkSQpZM4cJzVZ5TsmkaqrRo5LDC/KMbGF0sPkm53Ng59+M0zp8QVaql0obfJy9vlVT+4iOkAi2UDlA== dependencies: debug "^4.1.1" fs-extra "^9.0.1" From 0f35b3bcfae8c0ed8df75fb487c018fce5c1061e Mon Sep 17 00:00:00 2001 From: Jai A P <78354625+Jai-JAP@users.noreply.github.com> Date: Fri, 25 Mar 2022 16:16:57 +0530 Subject: [PATCH 29/66] Update build.yml --- .github/workflows/build.yml | 26 ++++---------------------- 1 file changed, 4 insertions(+), 22 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4a5478b5..d9d3104e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -131,12 +131,6 @@ jobs: Linux-Build: runs-on: ubuntu-18.04 # build against an older glibc for compatibility needs: Lint - strategy: - matrix: - include: - - arch: x86_64 - - arch: armv7l - - arch: arm64 steps: - name: Checkout @@ -162,27 +156,16 @@ jobs: - name: Build native deps run: scripts/build-native.js - env: - ARCH: ${{matrix.arch}} - - - name: Fix cross build - run: | - rm -rf app/node_modules/cpu-features - rm -rf app/node_modules/ssh2/crypto/build - if: ${{ matrix.arch == 'arm64' || matrix.arch == 'armv7l' }} - name: Webpack run: yarn run build - name: Prepackage plugins run: scripts/prepackage-plugins.js - env: - ARCH: ${{matrix.arch}} - name: Build packages run: scripts/build-linux.js env: - ARCH: ${{matrix.arch}} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} USE_HARD_LINKS: false # DEBUG: electron-builder,electron-builder:* @@ -226,25 +209,25 @@ jobs: - uses: actions/upload-artifact@master name: Upload DEB with: - name: Linux DEB (${{matrix.arch}}) + name: Linux DEB (x86_64) path: artifact-deb - uses: actions/upload-artifact@master name: Upload RPM with: - name: Linux RPM (${{matrix.arch}}) + name: Linux RPM (x86_64) path: artifact-rpm - uses: actions/upload-artifact@master name: Upload Pacman Package with: - name: Linux Pacman (${{matrix.arch}}) + name: Linux Pacman (x86_64) path: artifact-pacman - uses: actions/upload-artifact@master name: Upload Linux tarball with: - name: Linux tarball (${{matrix.arch}}) + name: Linux tarball (x86_64) path: artifact-tar.gz - uses: actions/upload-artifact@master @@ -252,7 +235,6 @@ jobs: with: name: Web tarball path: artifact-web - if: ${{ matrix.arch == 'x86_64' }} Windows-Build: From eb6bf288cc7e41724bad8571df0057955cdc0b11 Mon Sep 17 00:00:00 2001 From: Jai A P <78354625+Jai-JAP@users.noreply.github.com> Date: Fri, 25 Mar 2022 16:19:20 +0530 Subject: [PATCH 30/66] Update build.yml --- .github/workflows/build.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d9d3104e..de03ed1e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -172,7 +172,6 @@ jobs: - name: Build web resources run: zsh -c 'tar czf tabby-web.tar.gz (tabby-*|web)/dist' - if: ${{ matrix.arch == 'x86_64' }} - name: Upload symbols run: | @@ -182,7 +181,6 @@ jobs: SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }} SENTRY_ORG: ${{ secrets.SENTRY_ORG }} SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }} - if: ${{ matrix.arch == 'x86_64' }} - name: Upload packages to packagecloud.io uses: Eugeny/packagecloud-action@main From b2c611f9a6ea1c8df9b44338ff05c0d499406863 Mon Sep 17 00:00:00 2001 From: Jai A P <78354625+Jai-JAP@users.noreply.github.com> Date: Fri, 25 Mar 2022 16:21:58 +0530 Subject: [PATCH 31/66] Update build-native.js --- scripts/build-native.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build-native.js b/scripts/build-native.js index 94a81601..6cd9b8f4 100755 --- a/scripts/build-native.js +++ b/scripts/build-native.js @@ -3,7 +3,7 @@ const rebuild = require('electron-rebuild').default const path = require('path') const vars = require('./vars') -process.env.ARCH = process.env.ARCH || process.arch +process.env.ARCH = process.arch === 'arm' ? armv7l let lifecycles = [] for (let dir of ['app', 'tabby-core', 'tabby-local', 'tabby-ssh', 'tabby-terminal']) { From 37ba06b65ce78160882216d65d163831bb5b5e63 Mon Sep 17 00:00:00 2001 From: Jai A P <78354625+Jai-JAP@users.noreply.github.com> Date: Fri, 25 Mar 2022 16:25:06 +0530 Subject: [PATCH 32/66] Update build-linux.js --- scripts/build-linux.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/build-linux.js b/scripts/build-linux.js index 0b302fa7..b055e424 100755 --- a/scripts/build-linux.js +++ b/scripts/build-linux.js @@ -4,17 +4,17 @@ const vars = require('./vars') const isTag = (process.env.GITHUB_REF || '').startsWith('refs/tags/') -process.env.ARCH = process.env.ARCH || process.arch +process.env.ARCH = process.env.ARCH || process.arch === 'arm' ? armv7l : process.arch builder({ dir: true, linux: ['deb', 'tar.gz', 'rpm', 'pacman'], + armv7l: process.env.ARCH === 'armv7l', arm64: process.env.ARCH === 'arm64', config: { extraMetadata: { version: vars.version, }, - npmRebuild: process.env.ARCH == 'arm64', }, publish: isTag ? 'always' : 'onTag', }).catch(() => process.exit(1)) From ead2dbc208ca2d6d7e666c6b59c00db2071e0dac Mon Sep 17 00:00:00 2001 From: Jai A P <78354625+Jai-JAP@users.noreply.github.com> Date: Fri, 25 Mar 2022 16:25:39 +0530 Subject: [PATCH 33/66] Update build-native.js --- scripts/build-native.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build-native.js b/scripts/build-native.js index 6cd9b8f4..02402c85 100755 --- a/scripts/build-native.js +++ b/scripts/build-native.js @@ -3,7 +3,7 @@ const rebuild = require('electron-rebuild').default const path = require('path') const vars = require('./vars') -process.env.ARCH = process.arch === 'arm' ? armv7l +process.env.ARCH = process.arch === 'arm' ? armv7l : process.arch let lifecycles = [] for (let dir of ['app', 'tabby-core', 'tabby-local', 'tabby-ssh', 'tabby-terminal']) { From 5a66a64f8793eeef8fdcc1e710dc37c1d0e06ef3 Mon Sep 17 00:00:00 2001 From: Jai A P <78354625+Jai-JAP@users.noreply.github.com> Date: Fri, 25 Mar 2022 16:26:37 +0530 Subject: [PATCH 34/66] Update build-native.js --- scripts/build-native.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build-native.js b/scripts/build-native.js index 02402c85..d93559ed 100755 --- a/scripts/build-native.js +++ b/scripts/build-native.js @@ -3,7 +3,7 @@ const rebuild = require('electron-rebuild').default const path = require('path') const vars = require('./vars') -process.env.ARCH = process.arch === 'arm' ? armv7l : process.arch +process.env.ARCH = process.env.ARCH || process.arch === 'arm' ? armv7l : process.arch let lifecycles = [] for (let dir of ['app', 'tabby-core', 'tabby-local', 'tabby-ssh', 'tabby-terminal']) { From 579c0e9aa5e7887b73a656c4b36afd12345004b7 Mon Sep 17 00:00:00 2001 From: Jai A P <78354625+Jai-JAP@users.noreply.github.com> Date: Fri, 25 Mar 2022 17:05:54 +0530 Subject: [PATCH 35/66] Update HACKING.md --- HACKING.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/HACKING.md b/HACKING.md index 844ff1bb..065ad94f 100644 --- a/HACKING.md +++ b/HACKING.md @@ -14,6 +14,8 @@ yarn ./scripts/build-native.js ``` +**Note: For compiling for Linux armv7l, you need to downgrade electron to 17.0.0 in package.json present in root directory of tabby source** + ``` # 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 From 360b75693b9734bc79bafc97e460cbc5c47d40da Mon Sep 17 00:00:00 2001 From: Jai A P <78354625+Jai-JAP@users.noreply.github.com> Date: Fri, 25 Mar 2022 19:27:36 +0530 Subject: [PATCH 36/66] Update build-native.js --- scripts/build-native.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build-native.js b/scripts/build-native.js index d93559ed..9685efa1 100755 --- a/scripts/build-native.js +++ b/scripts/build-native.js @@ -3,7 +3,7 @@ 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 +process.env.ARCH = process.env.ARCH || process.arch === 'arm' ? 'armv7l' : process.arch let lifecycles = [] for (let dir of ['app', 'tabby-core', 'tabby-local', 'tabby-ssh', 'tabby-terminal']) { From 48c06fc26eb95b6090fe153a58bc6f961e1ece86 Mon Sep 17 00:00:00 2001 From: Jai A P <78354625+Jai-JAP@users.noreply.github.com> Date: Fri, 25 Mar 2022 19:28:02 +0530 Subject: [PATCH 37/66] Update build-linux.js --- scripts/build-linux.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build-linux.js b/scripts/build-linux.js index b055e424..f8d91d6d 100755 --- a/scripts/build-linux.js +++ b/scripts/build-linux.js @@ -4,7 +4,7 @@ const vars = require('./vars') const isTag = (process.env.GITHUB_REF || '').startsWith('refs/tags/') -process.env.ARCH = process.env.ARCH || process.arch === 'arm' ? armv7l : process.arch +process.env.ARCH = process.env.ARCH || process.arch === 'arm' ? 'armv7l' : process.arch builder({ dir: true, From f447658c627b8c953b058756dc9ea88e1addcbaa Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Sat, 26 Mar 2022 10:47:47 +0000 Subject: [PATCH 38/66] docs: update README.md [skip ci] --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index fe7d04fd..ee0f3750 100644 --- a/README.md +++ b/README.md @@ -240,6 +240,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
Matheus Castello
💻 +
Jai A P
📦 From 9b07ab053a91d2b3e28b6fb082624d4214f6a4c4 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Sat, 26 Mar 2022 10:47:48 +0000 Subject: [PATCH 39/66] docs: update README.zh-CN.md [skip ci] --- README.zh-CN.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.zh-CN.md b/README.zh-CN.md index e459d5fd..def95fea 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -240,6 +240,7 @@
Matheus Castello
💻 +
Jai A P
📦 From 0c8c2d3e95bd6568d4827fe139348278064f4180 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Sat, 26 Mar 2022 10:47:49 +0000 Subject: [PATCH 40/66] docs: update README.ru-RU.md [skip ci] --- README.ru-RU.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.ru-RU.md b/README.ru-RU.md index 533ca088..c260177b 100644 --- a/README.ru-RU.md +++ b/README.ru-RU.md @@ -241,6 +241,7 @@ Pull-запросы и плагины приветствуются!
Matheus Castello
💻 +
Jai A P
📦 From add55d014ec27d45d510dac02ee8319c4b61ebee Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Sat, 26 Mar 2022 10:47:50 +0000 Subject: [PATCH 41/66] docs: update README.ko-KR.md [skip ci] --- README.ko-KR.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.ko-KR.md b/README.ko-KR.md index 7d0b5647..7cffd2db 100644 --- a/README.ko-KR.md +++ b/README.ko-KR.md @@ -235,6 +235,7 @@ Pull requests and plugins are welcome!
Matheus Castello
💻 +
Jai A P
📦 From 2d7398c623f54384c5116e9838092e33823bb752 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Sat, 26 Mar 2022 10:47:51 +0000 Subject: [PATCH 42/66] docs: update README.it-IT.md [skip ci] --- README.it-IT.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.it-IT.md b/README.it-IT.md index e8808534..00093845 100644 --- a/README.it-IT.md +++ b/README.it-IT.md @@ -241,6 +241,7 @@ Grazie a queste persone meravigliose ([emoji key](https://allcontributors.org/do
Matheus Castello
💻 +
Jai A P
📦 From 296be13b404d258d6d029e1ccfb3de975aba7a07 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Sat, 26 Mar 2022 10:47:52 +0000 Subject: [PATCH 43/66] docs: update .all-contributorsrc [skip ci] --- .all-contributorsrc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index fddaacbc..123871cd 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -655,6 +655,15 @@ "contributions": [ "code" ] + }, + { + "login": "Jai-JAP", + "name": "Jai A P", + "avatar_url": "https://avatars.githubusercontent.com/u/78354625?v=4", + "profile": "https://github.com/Jai-JAP", + "contributions": [ + "platform" + ] } ], "contributorsPerLine": 7, From 3e7f4dd6dcdaeba99ed01b22343696d5f4329f2a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 26 Mar 2022 10:48:00 +0000 Subject: [PATCH 44/66] Bump minimist from 1.2.5 to 1.2.6 in /tabby-web-demo Bumps [minimist](https://github.com/substack/minimist) from 1.2.5 to 1.2.6. - [Release notes](https://github.com/substack/minimist/releases) - [Commits](https://github.com/substack/minimist/compare/1.2.5...1.2.6) --- updated-dependencies: - dependency-name: minimist dependency-type: indirect ... Signed-off-by: dependabot[bot] --- tabby-web-demo/yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tabby-web-demo/yarn.lock b/tabby-web-demo/yarn.lock index 667eef28..a721e755 100644 --- a/tabby-web-demo/yarn.lock +++ b/tabby-web-demo/yarn.lock @@ -34,9 +34,9 @@ loader-utils@^1.1.0: json5 "^1.0.1" minimist@^1.2.0: - version "1.2.5" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" - integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== + version "1.2.6" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44" + integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q== object-assign@^4.0.1: version "4.1.1" From fab5feb29d2567686ca83b4c83070f896f8dbfb6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 26 Mar 2022 10:48:01 +0000 Subject: [PATCH 45/66] Bump minimist from 1.2.5 to 1.2.6 in /web Bumps [minimist](https://github.com/substack/minimist) from 1.2.5 to 1.2.6. - [Release notes](https://github.com/substack/minimist/releases) - [Commits](https://github.com/substack/minimist/compare/1.2.5...1.2.6) --- updated-dependencies: - dependency-name: minimist dependency-type: indirect ... Signed-off-by: dependabot[bot] --- web/yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/web/yarn.lock b/web/yarn.lock index ac9f1f78..f0f8ecec 100644 --- a/web/yarn.lock +++ b/web/yarn.lock @@ -644,9 +644,9 @@ minimatch@^3.0.4: brace-expansion "^1.1.7" minimist@^1.2.0: - version "1.2.5" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" - integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== + version "1.2.6" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44" + integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q== nice-try@^1.0.4: version "1.0.5" From ac3662739262a8e9c364a4bd01970825062b0038 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 26 Mar 2022 10:48:03 +0000 Subject: [PATCH 46/66] Bump minimist from 1.2.5 to 1.2.6 in /tabby-core Bumps [minimist](https://github.com/substack/minimist) from 1.2.5 to 1.2.6. - [Release notes](https://github.com/substack/minimist/releases) - [Commits](https://github.com/substack/minimist/compare/1.2.5...1.2.6) --- updated-dependencies: - dependency-name: minimist dependency-type: indirect ... Signed-off-by: dependabot[bot] --- tabby-core/yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tabby-core/yarn.lock b/tabby-core/yarn.lock index 89251ae3..43d3d3da 100644 --- a/tabby-core/yarn.lock +++ b/tabby-core/yarn.lock @@ -90,9 +90,9 @@ messageformat@^2.3.0: messageformat-parser "^4.1.2" minimist@^1.2.0: - version "1.2.5" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" - integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== + version "1.2.6" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44" + integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q== mixpanel@^0.13.0: version "0.13.0" From 2f0ebf9a61fad37a8b2cadf19da83508bf6375b2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 26 Mar 2022 10:48:04 +0000 Subject: [PATCH 47/66] Bump minimist from 1.2.5 to 1.2.6 in /tabby-terminal Bumps [minimist](https://github.com/substack/minimist) from 1.2.5 to 1.2.6. - [Release notes](https://github.com/substack/minimist/releases) - [Commits](https://github.com/substack/minimist/compare/1.2.5...1.2.6) --- updated-dependencies: - dependency-name: minimist dependency-type: indirect ... Signed-off-by: dependabot[bot] --- tabby-terminal/yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tabby-terminal/yarn.lock b/tabby-terminal/yarn.lock index 10e7b98b..de7ea5f1 100644 --- a/tabby-terminal/yarn.lock +++ b/tabby-terminal/yarn.lock @@ -90,9 +90,9 @@ lru-cache@^6.0.0: yallist "^4.0.0" minimist@^1.1.0: - version "1.2.5" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" - integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== + version "1.2.6" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44" + integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q== ngx-colors@^3.0.4: version "3.0.4" From d1e85dc870c4cdd8fe6525979819bd8550116281 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 26 Mar 2022 10:48:09 +0000 Subject: [PATCH 48/66] Bump minimist from 1.2.5 to 1.2.6 Bumps [minimist](https://github.com/substack/minimist) from 1.2.5 to 1.2.6. - [Release notes](https://github.com/substack/minimist/releases) - [Commits](https://github.com/substack/minimist/compare/1.2.5...1.2.6) --- updated-dependencies: - dependency-name: minimist dependency-type: indirect ... Signed-off-by: dependabot[bot] --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index ed381e22..6da888ab 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5328,9 +5328,9 @@ minimist-options@4.1.0: kind-of "^6.0.3" minimist@^1.1.0, minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.5: - version "1.2.5" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" - integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== + version "1.2.6" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44" + integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q== minipass-collect@^1.0.2: version "1.0.2" From b9abe4f2ca263298ca4ea73b15948bb58d8c7f05 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 26 Mar 2022 10:48:12 +0000 Subject: [PATCH 49/66] Bump plist from 3.0.4 to 3.0.5 Bumps [plist](https://github.com/TooTallNate/node-plist) from 3.0.4 to 3.0.5. - [Release notes](https://github.com/TooTallNate/node-plist/releases) - [Changelog](https://github.com/TooTallNate/plist.js/blob/master/History.md) - [Commits](https://github.com/TooTallNate/node-plist/commits) --- updated-dependencies: - dependency-name: plist dependency-type: indirect ... Signed-off-by: dependabot[bot] --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index ed381e22..9d441301 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6400,9 +6400,9 @@ pkg-up@^2.0.0: find-up "^2.1.0" plist@^3.0.1: - version "3.0.4" - resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.4.tgz#a62df837e3aed2bb3b735899d510c4f186019cbe" - integrity sha512-ksrr8y9+nXOxQB2osVNqrgvX/XQPOXaU4BQMKjYq8PvaY1U18mo+fKgBSwzK+luSyinOuPae956lSVcBwxlAMg== + version "3.0.5" + resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.5.tgz#2cbeb52d10e3cdccccf0c11a63a85d830970a987" + integrity sha512-83vX4eYdQp3vP9SxuYgEM/G/pJQqLUz/V/xzPrzruLs7fz7jxGQ1msZ/mg1nwZxUSuOp4sb+/bEIbRrbzZRxDA== dependencies: base64-js "^1.5.1" xmlbuilder "^9.0.7" From aedad13f48c36c132cc4ced2a9d7a1d7d5d680ff Mon Sep 17 00:00:00 2001 From: Richard Yu Date: Sun, 27 Mar 2022 04:19:22 +0800 Subject: [PATCH 50/66] fix crash on Windows 7 --- app/lib/window.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/lib/window.ts b/app/lib/window.ts index 8e2e3307..2f2136a8 100644 --- a/app/lib/window.ts +++ b/app/lib/window.ts @@ -182,7 +182,7 @@ export class Window { console.error('Failed to set window blur', error) } } else { - DwmEnableBlurBehindWindow(this.window, enabled) + DwmEnableBlurBehindWindow(this.window.getNativeWindowHandle(), enabled) } } else if (process.platform === 'linux') { this.window.setBackgroundColor(enabled ? '#00000000' : '#131d27') From 116c144576059992a36870aca70ba4df7579fd80 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Sat, 26 Mar 2022 22:07:51 +0000 Subject: [PATCH 51/66] docs: update README.md [skip ci] --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index ee0f3750..ba2efb24 100644 --- a/README.md +++ b/README.md @@ -241,6 +241,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
Matheus Castello
💻
Jai A P
📦 +
Richard Yu
💻 From 47a837b109d226d98f0b384e09b6e7f914296c8d Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Sat, 26 Mar 2022 22:07:52 +0000 Subject: [PATCH 52/66] docs: update README.zh-CN.md [skip ci] --- README.zh-CN.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.zh-CN.md b/README.zh-CN.md index def95fea..c460e2cf 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -241,6 +241,7 @@
Matheus Castello
💻
Jai A P
📦 +
Richard Yu
💻 From a9d6a968d5e74828227fe178c87f18e5fe51bb06 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Sat, 26 Mar 2022 22:07:53 +0000 Subject: [PATCH 53/66] docs: update README.ru-RU.md [skip ci] --- README.ru-RU.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.ru-RU.md b/README.ru-RU.md index c260177b..5ed27cf0 100644 --- a/README.ru-RU.md +++ b/README.ru-RU.md @@ -242,6 +242,7 @@ Pull-запросы и плагины приветствуются!
Matheus Castello
💻
Jai A P
📦 +
Richard Yu
💻 From 88c8a4667a4e8a685d40c9850bffc59d0bb94122 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Sat, 26 Mar 2022 22:07:54 +0000 Subject: [PATCH 54/66] docs: update README.ko-KR.md [skip ci] --- README.ko-KR.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.ko-KR.md b/README.ko-KR.md index 7cffd2db..9e3f9ef9 100644 --- a/README.ko-KR.md +++ b/README.ko-KR.md @@ -236,6 +236,7 @@ Pull requests and plugins are welcome!
Matheus Castello
💻
Jai A P
📦 +
Richard Yu
💻 From a32ec15d30745f6e622d1e30b28e79b35a72f7b2 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Sat, 26 Mar 2022 22:07:55 +0000 Subject: [PATCH 55/66] docs: update README.it-IT.md [skip ci] --- README.it-IT.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.it-IT.md b/README.it-IT.md index 00093845..b84d32d2 100644 --- a/README.it-IT.md +++ b/README.it-IT.md @@ -242,6 +242,7 @@ Grazie a queste persone meravigliose ([emoji key](https://allcontributors.org/do
Matheus Castello
💻
Jai A P
📦 +
Richard Yu
💻 From 7744b28561fad58124b39def85461458f31628da Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Sat, 26 Mar 2022 22:07:56 +0000 Subject: [PATCH 56/66] docs: update .all-contributorsrc [skip ci] --- .all-contributorsrc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index 123871cd..7e0e6a56 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -664,6 +664,15 @@ "contributions": [ "platform" ] + }, + { + "login": "ysc3839", + "name": "Richard Yu", + "avatar_url": "https://avatars.githubusercontent.com/u/12028138?v=4", + "profile": "https://blog.ysc3839.com", + "contributions": [ + "code" + ] } ], "contributorsPerLine": 7, From b2333d5c7c78f3f167e5a895cd197a431ae87f55 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 29 Mar 2022 04:04:11 +0000 Subject: [PATCH 57/66] Bump electron from 17.2.0 to 17.3.0 Bumps [electron](https://github.com/electron/electron) from 17.2.0 to 17.3.0. - [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/v17.2.0...v17.3.0) --- updated-dependencies: - dependency-name: electron dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 8e7e4f3e..0c65aebf 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "cross-env": "7.0.3", "css-loader": "^6.7.1", "deep-equal": "2.0.5", - "electron": "17.2.0", + "electron": "17.3.0", "electron-builder": "^22.14.13", "electron-download": "^4.1.1", "electron-installer-snap": "^5.1.0", diff --git a/yarn.lock b/yarn.lock index 7364398e..20846f99 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2750,10 +2750,10 @@ electron-to-chromium@^1.3.723: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.736.tgz#f632d900a1f788dab22fec9c62ec5c9c8f0c4052" integrity sha512-DY8dA7gR51MSo66DqitEQoUMQ0Z+A2DSXFi7tK304bdTVqczCAfUuyQw6Wdg8hIoo5zIxkU1L24RQtUce1Ioig== -electron@17.2.0: - version "17.2.0" - resolved "https://registry.yarnpkg.com/electron/-/electron-17.2.0.tgz#a5c42c16352ea968fcb5d1ce256bec51e7d140fe" - integrity sha512-eNXhPVEUofkgAeqRFvTizzYecoCMyS0Rar08WZHSAw9wjfZXawYMvTpjjjk9GiX9W/+Cjxua4YtGn5bOTabc0A== +electron@17.3.0: + version "17.3.0" + resolved "https://registry.yarnpkg.com/electron/-/electron-17.3.0.tgz#cdcc46a7a3cd0b6f2a1757fbeb807f6b2fce847e" + integrity sha512-KuYHCOw1a+CE9thZlWRqTScf6M81KLd6n5qpdBGb0rl62+50RUuau9CnYpBb3EJxrjsXLaiQCBBSdPsozf/XUg== dependencies: "@electron/get" "^1.13.0" "@types/node" "^14.6.2" From 591f0eb445766f03d9c2251202de78d4cae43f73 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 29 Mar 2022 04:18:53 +0000 Subject: [PATCH 58/66] Bump @types/ssh2 from 0.5.51 to 0.5.52 in /tabby-ssh Bumps [@types/ssh2](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/ssh2) from 0.5.51 to 0.5.52. - [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] --- tabby-ssh/yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tabby-ssh/yarn.lock b/tabby-ssh/yarn.lock index 234ce514..b7dee38d 100644 --- a/tabby-ssh/yarn.lock +++ b/tabby-ssh/yarn.lock @@ -22,9 +22,9 @@ "@types/node" "*" "@types/ssh2@^0.5.46": - version "0.5.51" - resolved "https://registry.yarnpkg.com/@types/ssh2/-/ssh2-0.5.51.tgz#8fd9f9d7d3e8973b5227878f8f1e2b4eda1716b3" - integrity sha512-aIq7ownezauW/+VWYaeXwd5J1Evnn4EXyeKi7bT3H6ZLBLoqsmhdvkHYPLpnZPM6unKKKsxTHIyQAVOZnPiJBw== + version "0.5.52" + resolved "https://registry.yarnpkg.com/@types/ssh2/-/ssh2-0.5.52.tgz#9dbd8084e2a976e551d5e5e70b978ed8b5965741" + integrity sha512-lbLLlXxdCZOSJMCInKH2+9V/77ET2J6NPQHpFI0kda61Dd1KglJs+fPQBchizmzYSOJBgdTajhPqBO1xxLywvg== dependencies: "@types/node" "*" "@types/ssh2-streams" "*" From 418df22da44228e6a50cb5f83226a441ca035b4a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 29 Mar 2022 12:00:13 +0000 Subject: [PATCH 59/66] Bump minimist from 1.2.5 to 1.2.6 in /app Bumps [minimist](https://github.com/substack/minimist) from 1.2.5 to 1.2.6. - [Release notes](https://github.com/substack/minimist/releases) - [Commits](https://github.com/substack/minimist/compare/1.2.5...1.2.6) --- updated-dependencies: - dependency-name: minimist dependency-type: indirect ... Signed-off-by: dependabot[bot] --- app/yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/yarn.lock b/app/yarn.lock index 98206a14..9a24a90a 100644 --- a/app/yarn.lock +++ b/app/yarn.lock @@ -2133,9 +2133,9 @@ minimatch@^3.0.4: brace-expansion "^1.1.7" minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5: - version "1.2.5" - resolved "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz" - integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== + version "1.2.6" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44" + integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q== minipass@^2.3.5, minipass@^2.6.0, minipass@^2.9.0: version "2.9.0" From 6e09931952cadad693b51861fd4ae2c291993bf0 Mon Sep 17 00:00:00 2001 From: Artur Date: Tue, 29 Mar 2022 15:24:40 +0300 Subject: [PATCH 60/66] Preserve profile groups collapse state. use local storage rather than config store Remove config save and toggleGroupCollapse not to be async --- .../components/profilesSettingsTab.component.pug | 2 +- .../components/profilesSettingsTab.component.ts | 16 +++++++++++++--- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/tabby-settings/src/components/profilesSettingsTab.component.pug b/tabby-settings/src/components/profilesSettingsTab.component.pug index 6062a050..29199c5e 100644 --- a/tabby-settings/src/components/profilesSettingsTab.component.pug +++ b/tabby-settings/src/components/profilesSettingsTab.component.pug @@ -36,7 +36,7 @@ ul.nav-tabs(ngbNav, #nav='ngbNav') ng-container(*ngFor='let group of profileGroups') ng-container(*ngIf='isGroupVisible(group)') .list-group-item.list-group-item-action.d-flex.align-items-center( - (click)='group.collapsed = !group.collapsed' + (click)='toggleGroupCollapse(group)' ) .fa.fa-fw.fa-chevron-right(*ngIf='group.collapsed') .fa.fa-fw.fa-chevron-down(*ngIf='!group.collapsed') diff --git a/tabby-settings/src/components/profilesSettingsTab.component.ts b/tabby-settings/src/components/profilesSettingsTab.component.ts index 33405328..a910a831 100644 --- a/tabby-settings/src/components/profilesSettingsTab.component.ts +++ b/tabby-settings/src/components/profilesSettingsTab.component.ts @@ -143,6 +143,7 @@ export class ProfilesSettingsTabComponent extends BaseComponent { refresh (): void { this.profiles = this.config.store.profiles this.profileGroups = [] + const profileGroupCollapsed = JSON.parse(window.localStorage.profileGroupCollapsed ?? '{}') for (const profile of this.profiles) { let group = this.profileGroups.find(x => x.name === profile.group) @@ -151,7 +152,7 @@ export class ProfilesSettingsTabComponent extends BaseComponent { name: profile.group, profiles: [], editable: true, - collapsed: false, + collapsed: profileGroupCollapsed[profile.group ?? ''] ?? false, } this.profileGroups.push(group) } @@ -160,12 +161,14 @@ export class ProfilesSettingsTabComponent extends BaseComponent { this.profileGroups.sort((a, b) => a.name?.localeCompare(b.name ?? '') ?? -1) - this.profileGroups.push({ + const builtIn = { name: this.translate.instant('Built-in'), profiles: this.builtinProfiles, editable: false, collapsed: false, - }) + } + builtIn.collapsed = profileGroupCollapsed[builtIn.name ?? ''] ?? false + this.profileGroups.push(builtIn) } async editGroup (group: ProfileGroup): Promise { @@ -246,6 +249,13 @@ export class ProfilesSettingsTabComponent extends BaseComponent { }[this.profilesService.providerForProfile(profile)?.id ?? ''] ?? 'warning' } + toggleGroupCollapse (group: ProfileGroup): void { + group.collapsed = !group.collapsed + const profileGroupCollapsed = JSON.parse(window.localStorage.profileGroupCollapsed ?? '{}') + profileGroupCollapsed[group.name ?? ''] = group.collapsed + window.localStorage.profileGroupCollapsed = JSON.stringify(profileGroupCollapsed) + } + async editDefaults (provider: ProfileProvider): Promise { const modal = this.ngbModal.open( EditProfileModalComponent, From edc9656fd2524dde7d6dd4c7d2d002c19aa15fd7 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 29 Mar 2022 14:35:38 +0000 Subject: [PATCH 61/66] docs: update README.md [skip ci] --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index ba2efb24..a341e0ef 100644 --- a/README.md +++ b/README.md @@ -242,6 +242,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
Matheus Castello
💻
Jai A P
📦
Richard Yu
💻 +
artu-ole
💻 From ed2d1a1606e4039207c6aa7b25cc8fade66084bd Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 29 Mar 2022 14:35:39 +0000 Subject: [PATCH 62/66] docs: update README.zh-CN.md [skip ci] --- README.zh-CN.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.zh-CN.md b/README.zh-CN.md index c460e2cf..2a67611c 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -242,6 +242,7 @@
Matheus Castello
💻
Jai A P
📦
Richard Yu
💻 +
artu-ole
💻 From e71ac85ec33d79233c0be3f4f0e9ad22920f6cf7 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 29 Mar 2022 14:35:40 +0000 Subject: [PATCH 63/66] docs: update README.ru-RU.md [skip ci] --- README.ru-RU.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.ru-RU.md b/README.ru-RU.md index 5ed27cf0..9d29ca15 100644 --- a/README.ru-RU.md +++ b/README.ru-RU.md @@ -243,6 +243,7 @@ Pull-запросы и плагины приветствуются!
Matheus Castello
💻
Jai A P
📦
Richard Yu
💻 +
artu-ole
💻 From 004a04640d300aba208d17ff4d501f207a2dfe65 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 29 Mar 2022 14:35:41 +0000 Subject: [PATCH 64/66] docs: update README.ko-KR.md [skip ci] --- README.ko-KR.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.ko-KR.md b/README.ko-KR.md index 9e3f9ef9..96538c40 100644 --- a/README.ko-KR.md +++ b/README.ko-KR.md @@ -237,6 +237,7 @@ Pull requests and plugins are welcome!
Matheus Castello
💻
Jai A P
📦
Richard Yu
💻 +
artu-ole
💻 From c9e8e54fe30fa80431157e87cbc6b5a30a868ed9 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 29 Mar 2022 14:35:42 +0000 Subject: [PATCH 65/66] docs: update README.it-IT.md [skip ci] --- README.it-IT.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.it-IT.md b/README.it-IT.md index b84d32d2..d7734555 100644 --- a/README.it-IT.md +++ b/README.it-IT.md @@ -243,6 +243,7 @@ Grazie a queste persone meravigliose ([emoji key](https://allcontributors.org/do
Matheus Castello
💻
Jai A P
📦
Richard Yu
💻 +
artu-ole
💻 From 9b8ae6d6be13f1d00e766dbb3e2662a9624915ac Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 29 Mar 2022 14:35:43 +0000 Subject: [PATCH 66/66] docs: update .all-contributorsrc [skip ci] --- .all-contributorsrc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index 7e0e6a56..ad6235d8 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -673,6 +673,15 @@ "contributions": [ "code" ] + }, + { + "login": "artu-ole", + "name": "artu-ole", + "avatar_url": "https://avatars.githubusercontent.com/u/15938416?v=4", + "profile": "https://github.com/artu-ole", + "contributions": [ + "code" + ] } ], "contributorsPerLine": 7,