diff --git a/package.json b/package.json index 02d9a177..d82f6332 100644 --- a/package.json +++ b/package.json @@ -30,8 +30,8 @@ "cross-env": "7.0.3", "css-loader": "^6.2.0", "deep-equal": "2.0.5", - "electron": "13.2.2", - "electron-builder": "22.11.7", + "electron-builder": "^22.11.7", + "electron": "13.4.0", "electron-download": "^4.1.1", "electron-installer-snap": "^5.1.0", "electron-notarize": "^1.1.1", diff --git a/patches/app-builder-lib+22.10.5.patch b/patches/app-builder-lib+22.10.5.patch deleted file mode 100644 index a7c9a0c8..00000000 --- a/patches/app-builder-lib+22.10.5.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/node_modules/app-builder-lib/out/appInfo.js b/node_modules/app-builder-lib/out/appInfo.js -index 25a159e..bfe0590 100644 ---- a/node_modules/app-builder-lib/out/appInfo.js -+++ b/node_modules/app-builder-lib/out/appInfo.js -@@ -165,7 +165,7 @@ class AppInfo { - get linuxPackageName() { - const name = this.name; // https://github.com/electron-userland/electron-builder/issues/2963 - -- return name.startsWith("@") ? this.sanitizedProductName : name; -+ return 'tabby-terminal'; - } - - get sanitizedName() { diff --git a/patches/app-builder-lib+22.11.7.patch b/patches/app-builder-lib+22.11.7.patch new file mode 100644 index 00000000..2ff35dfc --- /dev/null +++ b/patches/app-builder-lib+22.11.7.patch @@ -0,0 +1,15 @@ +diff --git a/node_modules/app-builder-lib/out/appInfo.js b/node_modules/app-builder-lib/out/appInfo.js +index f241acc..2bddb7f 100644 +--- a/node_modules/app-builder-lib/out/appInfo.js ++++ b/node_modules/app-builder-lib/out/appInfo.js +@@ -100,9 +100,7 @@ class AppInfo { + return this.info.metadata.name; + } + get linuxPackageName() { +- const name = this.name; +- // https://github.com/electron-userland/electron-builder/issues/2963 +- return name.startsWith("@") ? this.sanitizedProductName : name; ++ return 'tabby-terminal' + } + get sanitizedName() { + return sanitizeFileName_1.sanitizeFileName(this.name); diff --git a/tabby-core/src/components/selectorModal.component.ts b/tabby-core/src/components/selectorModal.component.ts index 4012e6b1..02da460a 100644 --- a/tabby-core/src/components/selectorModal.component.ts +++ b/tabby-core/src/components/selectorModal.component.ts @@ -29,9 +29,11 @@ export class SelectorModalComponent { @HostListener('keyup', ['$event']) onKeyUp (event: KeyboardEvent): void { if (event.key === 'ArrowUp') { this.selectedIndex-- + event.preventDefault() } if (event.key === 'ArrowDown') { this.selectedIndex++ + event.preventDefault() } if (event.key === 'Enter') { this.selectOption(this.filteredOptions[this.selectedIndex]) diff --git a/tabby-local/src/components/terminalTab.component.ts b/tabby-local/src/components/terminalTab.component.ts index 4f566c8f..1348979a 100644 --- a/tabby-local/src/components/terminalTab.component.ts +++ b/tabby-local/src/components/terminalTab.component.ts @@ -58,7 +58,10 @@ export class TerminalTabComponent extends BaseTerminalTabComponent { initializeSession (columns: number, rows: number): void { if (this.profile.options.runAsAdministrator && this.uac.isAvailable) { - this.profile.options = this.uac.patchSessionOptionsForUAC(this.profile.options) + this.profile = { + ...this.profile, + options: this.uac.patchSessionOptionsForUAC(this.profile.options), + } } this.session!.start({ diff --git a/yarn.lock b/yarn.lock index 77bde7a8..e44f52f2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2517,7 +2517,7 @@ ejs@^3.1.6: dependencies: jake "^10.6.1" -electron-builder@22.11.7: +electron-builder@^22.11.7: version "22.11.7" resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.11.7.tgz#cd97a0d9f6e6d388112e66b4376de431cca4d596" integrity sha512-yQExSLt7Hbz/P8lLkZDdE/OnJJ7NCX+uiQcV+XIH0TeEZcD87ZnSqBBzGUN5akySU4BXXlrVZKeUsXACWrm5Kw== @@ -2663,10 +2663,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@13.2.2: - version "13.2.2" - resolved "https://registry.yarnpkg.com/electron/-/electron-13.2.2.tgz#332d91891d0db4f9a1d22d4d0bc3b500e59dc051" - integrity sha512-thGq2YaZqQWK1HexRghxdb26a8hA7ZSebukUSHlnHrY9+Sx9rW7e3uEHbibk/seRXVoXO76HndjKdHyObP9/Kw== +electron@13.4.0: + version "13.4.0" + resolved "https://registry.yarnpkg.com/electron/-/electron-13.4.0.tgz#f9f9e518d8c6bf23bfa8b69580447eea3ca0f880" + integrity sha512-KJGWS2qa0xZXIMPMDUNkRVO8/JxRd4+M0ejYYOzu2LIQ5ijecPzNuNR9nvDkml9XyyRBzu975FkhJcwD17ietQ== dependencies: "@electron/get" "^1.0.1" "@types/node" "^14.6.2"