From 3716d527009e674a1353f54948136691e4787b6d Mon Sep 17 00:00:00 2001 From: Eugene Pankov Date: Sun, 16 May 2021 13:53:13 +0200 Subject: [PATCH] bumped angular and ng-bootstrap --- .github/workflows/docs.yml | 4 +- app/package.json | 18 ++-- app/yarn.lock | 100 +++++++++--------- package.json | 2 +- terminus-ssh/src/api.ts | 2 +- .../src/api/colorSchemeProvider.ts | 2 +- .../src/api/contextMenuProvider.ts | 2 +- terminus-terminal/src/api/shellProvider.ts | 2 +- .../components/shellSettingsTab.component.ts | 2 +- terminus-terminal/src/frontends/frontend.ts | 2 +- .../src/services/sessions.service.ts | 8 +- .../src/services/terminal.service.ts | 2 +- yarn.lock | 8 +- 13 files changed, 78 insertions(+), 76 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 9285ac7b..c16487aa 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -6,7 +6,9 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v1 + uses: actions/checkout@v2.3.4 + with: + fetch-depth: 0 - name: Installing Node uses: actions/setup-node@v2.1.5 diff --git a/app/package.json b/app/package.json index e4c75c5e..5032e2f6 100644 --- a/app/package.json +++ b/app/package.json @@ -14,15 +14,15 @@ "watch": "webpack --progress --color --watch" }, "dependencies": { - "@angular/animations": "^11.1.1", - "@angular/common": "^11.1.1", - "@angular/compiler": "^11.1.1", - "@angular/core": "^11.1.1", - "@angular/forms": "^11.1.1", - "@angular/platform-browser": "^11.1.1", - "@angular/platform-browser-dynamic": "^11.1.1", + "@angular/animations": "^12.0.0", + "@angular/common": "^12.0.0", + "@angular/compiler": "^12.0.0", + "@angular/core": "^12.0.0", + "@angular/forms": "^12.0.0", + "@angular/platform-browser": "^12.0.0", + "@angular/platform-browser-dynamic": "^12.0.0", "@electron/remote": "1.0.4", - "@ng-bootstrap/ng-bootstrap": "^7.0.0", + "@ng-bootstrap/ng-bootstrap": "^9.1.1", "@terminus-term/node-pty": "0.10.0-terminus.3", "any-promise": "^1.3.0", "electron-config": "2.0.0", @@ -37,7 +37,7 @@ "ngx-toastr": "^13.2.1", "npm": "6", "path": "0.12.7", - "rxjs": "^6.6.7", + "rxjs": "^7.0.1", "yargs": "^17.0.1", "zone.js": "^0.11.4" }, diff --git a/app/yarn.lock b/app/yarn.lock index 69a16390..e2c51701 100644 --- a/app/yarn.lock +++ b/app/yarn.lock @@ -2,54 +2,54 @@ # yarn lockfile v1 -"@angular/animations@^11.1.1": - version "11.2.0" - resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-11.2.0.tgz#383438758c61d98f43c5ea1078d8388eb8784387" - integrity sha512-orYrBPNAsF8VpvuOaXTtPltwK2nsje5R8sWJnRC2dh1RCRdyIqHwmRIU0Mi6qLMiEaLNrFPGEMyQ9gB+sC/vYg== +"@angular/animations@^12.0.0": + version "12.0.0" + resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-12.0.0.tgz#5f845b1a58ffb6f3ea6103edf0756ac65320b725" + integrity sha512-BG/Ksk3863I7GKUem73Kty4UeU289oN+iPo/0O0x2dJCzNcpafML0GJpz4lg/RT9l6UddFviI4q9NiopR+eJfw== dependencies: - tslib "^2.0.0" + tslib "^2.1.0" -"@angular/common@^11.1.1": - version "11.2.0" - resolved "https://registry.yarnpkg.com/@angular/common/-/common-11.2.0.tgz#90d602c0e33bb95a4d0c4c597f08255d78ed580f" - integrity sha512-wsWI5F6Y2DNxne2D5uk8e9U/vn95UYZLMNBW+QXI9U/I9kDSXoa8yEvNcn1x0XfNXBMst5pi4iSF5M8mIck1eg== +"@angular/common@^12.0.0": + version "12.0.0" + resolved "https://registry.yarnpkg.com/@angular/common/-/common-12.0.0.tgz#a4b992f3af997e9e957500148100f3f2a90ad3e9" + integrity sha512-d6+WSnCFcxAHBsbCvBC3Rutmk+tB5CEdKhkTBY/vGe0A/MjbayzHR4IDv2i0+UZDLSgMJubqh3iCPUcSglXSEg== dependencies: - tslib "^2.0.0" + tslib "^2.1.0" -"@angular/compiler@^11.1.1": - version "11.2.0" - resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-11.2.0.tgz#130bee57dd1daa1326d37bef4b63c02aa7309cc2" - integrity sha512-EW6LM/kUYhQkuFqGt03c/eRKZAYr0LLEdMOn//j1uIh+wSq9KLffBGpky6b63xdfWxsXi8OucXUOydTQBckNEQ== +"@angular/compiler@^12.0.0": + version "12.0.0" + resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-12.0.0.tgz#bb0d4f464fee4803dbda49d862474f771c31f633" + integrity sha512-7NdZNyxm9KLlRMmmtId6RfV6VbQIUMDxN44R+ax66BoWsuhdYXUDsDO554LwYwrjnnXXGkurDJhv7umeRwaZGw== dependencies: - tslib "^2.0.0" + tslib "^2.1.0" -"@angular/core@^11.1.1": - version "11.2.0" - resolved "https://registry.yarnpkg.com/@angular/core/-/core-11.2.0.tgz#309ae61d55b21fca0b644a6571109741d64b2467" - integrity sha512-jnbnJTW2GwfkRoXG8J4zs5FMcahMZwo6jrZGe9FiXjCYG9cLEuOXy4h99Z1s/o0vc/VXyWgym7SmeEgv+urf8g== +"@angular/core@^12.0.0": + version "12.0.0" + resolved "https://registry.yarnpkg.com/@angular/core/-/core-12.0.0.tgz#d16a217f0919b3b161229118c52b1f703815eb71" + integrity sha512-fwXtF6qP8pr07+El/dg67RmgsI4Ubfi+E5YLjYKQ62gM8MzYyYGmLPakFzFnbzYrOr05zdprrbcVgGtMRHapMA== dependencies: - tslib "^2.0.0" + tslib "^2.1.0" -"@angular/forms@^11.1.1": - version "11.2.0" - resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-11.2.0.tgz#8ba7a98efdd464a4a6b901ba1f220162dd80c1ed" - integrity sha512-FgIG9ou27FbmyFv0n6pF95cQEz412/+iyY9OSlDnezD/7yU4fwk4NNPgP6Z/b1k7ClLYxP/YKC00WVhi1i8HdA== +"@angular/forms@^12.0.0": + version "12.0.0" + resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-12.0.0.tgz#faf5e3e36a8c4f57f42a5b3dd11786f39c94d693" + integrity sha512-/Z2AWd2k/9cs+WwXBlZ8yUqgGsHYcp8g6PUCehZQk1gd/4n4FOKvTIGiypajGUPwO4GOHJDzibfCsGw8MenCpQ== dependencies: - tslib "^2.0.0" + tslib "^2.1.0" -"@angular/platform-browser-dynamic@^11.1.1": - version "11.2.0" - resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-11.2.0.tgz#647fe6d8dfa7651d38564240cbf75f97f11754b7" - integrity sha512-bBCtgtL87mvDT0K3HNBS19UC0BzIJUTGnYKJS9IugyfTEqlldB4juMmh/3FPjk30kxxJ8IB/ydaN2uVhBAxPVQ== +"@angular/platform-browser-dynamic@^12.0.0": + version "12.0.0" + resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-12.0.0.tgz#295036e7b487b6dbe3b13db763a371675d391ee6" + integrity sha512-Rkxr/KVOZGuGSuIYo2XZYbOpyS2t2jpLPS65KUUcOEwktj4hSv5VZ2soZF18tG5ZNbx06C1QDW/j9HwmZjEh5g== dependencies: - tslib "^2.0.0" + tslib "^2.1.0" -"@angular/platform-browser@^11.1.1": - version "11.2.0" - resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-11.2.0.tgz#d1bbafd394ebfb600043060ec2d8543763041403" - integrity sha512-xd3O4svQ95BN/KpzQUFkSWfvwiCURuLJhLlDkxzLA58ElA0qodHOjQmQz/1vRFh/nXQQoWg8z9ixbmcRGzWTow== +"@angular/platform-browser@^12.0.0": + version "12.0.0" + resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-12.0.0.tgz#097805ad9a5db044dc0a74c1294cdfa5122eca4c" + integrity sha512-h+uMMluRh4dqJIor7EpvwNKRjv4xCxpttizJlqbo3vfcoOoLDoc9SvEFiXxd+UVh3S0re8zBsyBIJl+gTVFKWQ== dependencies: - tslib "^2.0.0" + tslib "^2.1.0" "@electron/remote@1.0.4": version "1.0.4" @@ -65,10 +65,10 @@ update-notifier "^2.2.0" yargs "^8.0.2" -"@ng-bootstrap/ng-bootstrap@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@ng-bootstrap/ng-bootstrap/-/ng-bootstrap-7.0.0.tgz#3bfa62eb52fdb891b1ce693ea11c39127e2d1ab7" - integrity sha512-SxUaptGWJmCxM0d2Zy1mx7K7p/YBwGZ69NmmBQVY4BE6p5av0hWrVmv9rzzfBz0rhxU7RPZLor2Jpaoq8Xyl4w== +"@ng-bootstrap/ng-bootstrap@^9.1.1": + version "9.1.1" + resolved "https://registry.yarnpkg.com/@ng-bootstrap/ng-bootstrap/-/ng-bootstrap-9.1.1.tgz#5a629915ea93b4f9b4d61854cb6862d99a7c9ca4" + integrity sha512-m31qKJylYueXm+a3YEoOfnrJYR1lovb7WgaQwvXQz3dDmtaYRX4n8aPeCMp1VrI7hFfFITKWo0GxPaI3JIFk4w== dependencies: tslib "^2.0.0" @@ -3021,12 +3021,12 @@ run-queue@^1.0.0, run-queue@^1.0.3: dependencies: aproba "^1.1.1" -rxjs@^6.6.7: - version "6.6.7" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9" - integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ== +rxjs@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.0.1.tgz#5f41c4f991cea550471fc5d215727390103702c7" + integrity sha512-wViQ4Vgps1xJwqWIBooMNN44usCSthL7wCUl4qWqrVjhGfWyVyXcxlYzfDKkJKACQvZMTOft/jJ3RkbwK1j9QQ== dependencies: - tslib "^1.9.0" + tslib "~2.1.0" safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0: version "5.2.1" @@ -3462,16 +3462,16 @@ tough-cookie@~2.5.0: psl "^1.1.28" punycode "^2.1.1" -tslib@^1.9.0: - version "1.14.1" - resolved "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz" - integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== - -tslib@^2.0.0: +tslib@^2.0.0, tslib@~2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.1.0.tgz#da60860f1c2ecaa5703ab7d39bc05b6bf988b97a" integrity sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A== +tslib@^2.1.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.2.0.tgz#fb2c475977e35e241311ede2693cee1ec6698f5c" + integrity sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w== + tunnel-agent@^0.6.0: version "0.6.0" resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz" diff --git a/package.json b/package.json index d39c3e54..a9f5b38a 100644 --- a/package.json +++ b/package.json @@ -53,7 +53,7 @@ "svg-inline-loader": "^0.8.2", "tslib": "^2.2.0", "typedoc": "^0.20.36", - "typescript": "^3.9.9", + "typescript": "^4.2.4", "url-loader": "^4.1.1", "val-loader": "3.1.0", "webpack": "^5.37.0", diff --git a/terminus-ssh/src/api.ts b/terminus-ssh/src/api.ts index 2b2c462e..774f6533 100644 --- a/terminus-ssh/src/api.ts +++ b/terminus-ssh/src/api.ts @@ -331,7 +331,7 @@ export class SSHSession extends BaseSession { }) } if (fw.type === PortForwardType.Remote) { - await new Promise((resolve, reject) => { + await new Promise((resolve, reject) => { this.ssh.forwardIn(fw.host, fw.port, err => { if (err) { // eslint-disable-next-line @typescript-eslint/no-base-to-string diff --git a/terminus-terminal/src/api/colorSchemeProvider.ts b/terminus-terminal/src/api/colorSchemeProvider.ts index 4e47d103..d28b8fdd 100644 --- a/terminus-terminal/src/api/colorSchemeProvider.ts +++ b/terminus-terminal/src/api/colorSchemeProvider.ts @@ -4,5 +4,5 @@ import { TerminalColorScheme } from './interfaces' * Extend to add more terminal color schemes */ export abstract class TerminalColorSchemeProvider { - abstract async getSchemes (): Promise + abstract getSchemes (): Promise } diff --git a/terminus-terminal/src/api/contextMenuProvider.ts b/terminus-terminal/src/api/contextMenuProvider.ts index 2a4e94ec..f524b2db 100644 --- a/terminus-terminal/src/api/contextMenuProvider.ts +++ b/terminus-terminal/src/api/contextMenuProvider.ts @@ -8,5 +8,5 @@ import { BaseTerminalTabComponent } from './baseTerminalTab.component' export abstract class TerminalContextMenuItemProvider { weight: number - abstract async getItems (tab: BaseTerminalTabComponent): Promise + abstract getItems (tab: BaseTerminalTabComponent): Promise } diff --git a/terminus-terminal/src/api/shellProvider.ts b/terminus-terminal/src/api/shellProvider.ts index 2025ae54..c03df966 100644 --- a/terminus-terminal/src/api/shellProvider.ts +++ b/terminus-terminal/src/api/shellProvider.ts @@ -4,5 +4,5 @@ import { Shell } from './interfaces' * Extend to add support for more shells */ export abstract class ShellProvider { - abstract async provide (): Promise + abstract provide (): Promise } diff --git a/terminus-terminal/src/components/shellSettingsTab.component.ts b/terminus-terminal/src/components/shellSettingsTab.component.ts index 511b8504..8f6bfd7f 100644 --- a/terminus-terminal/src/components/shellSettingsTab.component.ts +++ b/terminus-terminal/src/components/shellSettingsTab.component.ts @@ -36,7 +36,7 @@ export class ShellSettingsTabComponent { } async ngOnInit (): Promise { - this.shells = await this.terminal.shells$.toPromise() + this.shells = (await this.terminal.shells$.toPromise())! } ngOnDestroy (): void { diff --git a/terminus-terminal/src/frontends/frontend.ts b/terminus-terminal/src/frontends/frontend.ts index 06c08a30..712e666d 100644 --- a/terminus-terminal/src/frontends/frontend.ts +++ b/terminus-terminal/src/frontends/frontend.ts @@ -57,7 +57,7 @@ export abstract class Frontend { } } - abstract async attach (host: HTMLElement): Promise + abstract attach (host: HTMLElement): Promise detach (host: HTMLElement): void { } // eslint-disable-line abstract getSelection (): string diff --git a/terminus-terminal/src/services/sessions.service.ts b/terminus-terminal/src/services/sessions.service.ts index dd63cfad..3824df58 100644 --- a/terminus-terminal/src/services/sessions.service.ts +++ b/terminus-terminal/src/services/sessions.service.ts @@ -138,10 +138,10 @@ export abstract class BaseSession { abstract resize (columns: number, rows: number): void abstract write (data: Buffer): void abstract kill (signal?: string): void - abstract async getChildProcesses (): Promise - abstract async gracefullyKillProcess (): Promise + abstract getChildProcesses (): Promise + abstract gracefullyKillProcess (): Promise abstract supportsWorkingDirectory (): boolean - abstract async getWorkingDirectory (): Promise + abstract getWorkingDirectory (): Promise } /** @hidden */ @@ -318,7 +318,7 @@ export class Session extends BaseSession { if (process.platform === 'win32') { this.kill() } else { - await new Promise((resolve) => { + await new Promise((resolve) => { this.kill('SIGTERM') setImmediate(() => { try { diff --git a/terminus-terminal/src/services/terminal.service.ts b/terminus-terminal/src/services/terminal.service.ts index f4e3351f..36f9b11c 100644 --- a/terminus-terminal/src/services/terminal.service.ts +++ b/terminus-terminal/src/services/terminal.service.ts @@ -35,7 +35,7 @@ export class TerminalService { } async getProfiles ({ includeHidden, skipDefault }: { includeHidden?: boolean, skipDefault?: boolean } = {}): Promise { - const shells = await this.shells$.toPromise() + const shells = (await this.shells$.toPromise())! return [ ...this.config.store.terminal.profiles, // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing diff --git a/yarn.lock b/yarn.lock index 91ab2d2c..2722ea54 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8494,10 +8494,10 @@ typedoc@^0.20.36: shiki "^0.9.3" typedoc-default-themes "^0.12.10" -typescript@^3.9.9: - version "3.9.9" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.9.tgz#e69905c54bc0681d0518bd4d587cc6f2d0b1a674" - integrity sha512-kdMjTiekY+z/ubJCATUPlRDl39vXYiMV9iyeMuEuXZh2we6zz80uovNN2WlAxmmdE/Z/YQe+EbOEXB5RHEED3w== +typescript@^4.2.4: + version "4.2.4" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.2.4.tgz#8610b59747de028fda898a8aef0e103f156d0961" + integrity sha512-V+evlYHZnQkaz8TRBuxTA92yZBPotr5H+WhQ7bD3hZUndx5tGOa1fuCgeSjxAzM1RiN5IzvadIXTVefuuwZCRg== uglify-js@^2.6.1: version "2.8.29"