diff --git a/.all-contributorsrc b/.all-contributorsrc
index fddaacbc..ad6235d8 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -655,6 +655,33 @@
"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"
+ ]
+ },
+ {
+ "login": "ysc3839",
+ "name": "Richard Yu",
+ "avatar_url": "https://avatars.githubusercontent.com/u/12028138?v=4",
+ "profile": "https://blog.ysc3839.com",
+ "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,
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ca0cd543..de03ed1e 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
@@ -199,8 +199,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
@@ -209,31 +207,25 @@ jobs:
- uses: actions/upload-artifact@master
name: Upload DEB
with:
- name: Linux DEB
+ name: Linux DEB (x86_64)
path: artifact-deb
- uses: actions/upload-artifact@master
name: Upload RPM
with:
- name: Linux RPM
+ name: Linux RPM (x86_64)
path: artifact-rpm
- uses: actions/upload-artifact@master
name: Upload Pacman Package
with:
- name: Linux Pacman
+ name: Linux Pacman (x86_64)
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
+ name: Linux tarball (x86_64)
path: artifact-tar.gz
- uses: actions/upload-artifact@master
@@ -242,9 +234,15 @@ jobs:
name: Web tarball
path: artifact-web
+
Windows-Build:
runs-on: windows-2022
needs: Lint
+ strategy:
+ matrix:
+ include:
+ - arch: x86_64
+ - arch: arm64
steps:
- name: Checkout
@@ -270,6 +268,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
@@ -283,6 +283,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: |
@@ -296,18 +298,18 @@ 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
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
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
diff --git a/README.it-IT.md b/README.it-IT.md
index e8808534..d7734555 100644
--- a/README.it-IT.md
+++ b/README.it-IT.md
@@ -241,6 +241,9 @@ Grazie a queste persone meravigliose ([emoji key](https://allcontributors.org/do
Matheus Castello
๐ป |
+ 
Jai A P
๐ฆ |
+ 
Richard Yu
๐ป |
+ 
artu-ole
๐ป |
diff --git a/README.ko-KR.md b/README.ko-KR.md
index 7d0b5647..96538c40 100644
--- a/README.ko-KR.md
+++ b/README.ko-KR.md
@@ -235,6 +235,9 @@ Pull requests and plugins are welcome!
Matheus Castello
๐ป |
+
Jai A P
๐ฆ |
+
Richard Yu
๐ป |
+
artu-ole
๐ป |
diff --git a/README.md b/README.md
index fe7d04fd..a341e0ef 100644
--- a/README.md
+++ b/README.md
@@ -240,6 +240,9 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
Matheus Castello
๐ป |
+
Jai A P
๐ฆ |
+
Richard Yu
๐ป |
+
artu-ole
๐ป |
diff --git a/README.ru-RU.md b/README.ru-RU.md
index 533ca088..9d29ca15 100644
--- a/README.ru-RU.md
+++ b/README.ru-RU.md
@@ -241,6 +241,9 @@ Pull-ะทะฐะฟัะพัั ะธ ะฟะปะฐะณะธะฝั ะฟัะธะฒะตัััะฒััััั!
Matheus Castello
๐ป |
+
Jai A P
๐ฆ |
+
Richard Yu
๐ป |
+
artu-ole
๐ป |
diff --git a/README.zh-CN.md b/README.zh-CN.md
index e459d5fd..2a67611c 100644
--- a/README.zh-CN.md
+++ b/README.zh-CN.md
@@ -240,6 +240,9 @@
Matheus Castello
๐ป |
+
Jai A P
๐ฆ |
+
Richard Yu
๐ป |
+
artu-ole
๐ป |
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')
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"
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:
diff --git a/package.json b/package.json
index aeb0c79c..de76fffe 100644
--- a/package.json
+++ b/package.json
@@ -34,11 +34,11 @@
"cross-env": "7.0.3",
"css-loader": "^6.7.1",
"deep-equal": "2.0.5",
- "electron": "17.1.2",
+ "electron": "17.3.0",
"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",
@@ -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/scripts/build-linux.js b/scripts/build-linux.js
index 6d1f92d6..f8d91d6d 100755
--- a/scripts/build-linux.js
+++ b/scripts/build-linux.js
@@ -4,9 +4,13 @@ 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
+
builder({
dir: true,
linux: ['deb', 'tar.gz', 'rpm', 'pacman'],
+ armv7l: process.env.ARCH === 'armv7l',
+ arm64: process.env.ARCH === 'arm64',
config: {
extraMetadata: {
version: vars.version,
diff --git a/scripts/build-native.js b/scripts/build-native.js
index 8fb295b6..9685efa1 100755
--- a/scripts/build-native.js
+++ b/scripts/build-native.js
@@ -3,12 +3,14 @@ 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
+
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 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,
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"
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,
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" "*"
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"
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"
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"
diff --git a/yarn.lock b/yarn.lock
index ed381e22..2be8c92e 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"
@@ -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.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"
@@ -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"
@@ -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"
@@ -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"