diff --git a/.eslintrc.yml b/.eslintrc.yml index d98d45a19b7fc2c598d8e173b9988dd714c66437..77718fe32f168a3b7fa8ef00f7e9419860af4365 100644 --- a/.eslintrc.yml +++ b/.eslintrc.yml @@ -94,3 +94,6 @@ rules: - allowTemplateLiterals: true '@typescript-eslint/no-non-null-assertion': off '@typescript-eslint/no-unnecessary-condition': off + '@typescript-eslint/no-untyped-public-signature': off # bugs out on constructors + '@typescript-eslint/restrict-template-expressions': off + '@typescript-eslint/no-dynamic-delete': off diff --git a/package.json b/package.json index 77b9f2662649afc83fced02aa794c60c24ba3c69..bcbf255402fdbd31da03ad5a54dfd7a8f345a533 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "@types/node": "12.7.12", "@types/webpack-env": "1.14.1", "@typescript-eslint/eslint-plugin": "^2.8.0", - "@typescript-eslint/parser": "^2.5.0", + "@typescript-eslint/parser": "^2.8.0", "apply-loader": "2.0.0", "awesome-typescript-loader": "^5.0.0", "core-js": "^3.4.2", diff --git a/terminus-core/src/components/appRoot.component.ts b/terminus-core/src/components/appRoot.component.ts index 3aa03de3f6f6b9f58a161675f73dc542a77d17f0..58ae6fdb08a01fdd654a618a4f2889062e135c80 100644 --- a/terminus-core/src/components/appRoot.component.ts +++ b/terminus-core/src/components/appRoot.component.ts @@ -128,7 +128,9 @@ export class AppRootComponent { }) this.hostApp.windowCloseRequest$.subscribe(async () => { - await this.app.closeAllTabs() && this.hostApp.closeWindow() + if (await this.app.closeAllTabs()) { + this.hostApp.closeWindow() + } }) if (window['safeModeReason']) { diff --git a/terminus-core/src/services/app.service.ts b/terminus-core/src/services/app.service.ts index 57722fce10a5099104bfb8ae2141c036810c5de4..3d05a0450eec471a32ab3f3c9669021434638018 100644 --- a/terminus-core/src/services/app.service.ts +++ b/terminus-core/src/services/app.service.ts @@ -85,7 +85,7 @@ export class AppService { } } - startTabStorage() { + startTabStorage () { this.tabsChanged$.subscribe(() => { this.tabRecovery.saveTabs(this.tabs) }) diff --git a/terminus-terminal/src/utils.ts b/terminus-terminal/src/utils.ts index be385f06b323513e16a2f2be0a83c65087c0e55f..fbd9c501b85b3ea3629eab102553c2cc494067b9 100644 --- a/terminus-terminal/src/utils.ts +++ b/terminus-terminal/src/utils.ts @@ -9,7 +9,7 @@ export function isWindowsBuild (build: number): boolean { } export function getCSSFontFamily (config: any): string { - let fonts = config.terminal.font.split(',').map(x => x.trim().replace(/"/g, '')) + let fonts: string[] = config.terminal.font.split(',').map(x => x.trim().replace(/"/g, '')) if (config.terminal.fallbackFont) { fonts.push(config.terminal.fallbackFont) } diff --git a/yarn.lock b/yarn.lock index 02f01a59a2c168dcf0eba3727cccfa59d0d2daf4..0a6b823efe5e81f81e3b8cd5f35f045ebbdb6e81 100644 --- a/yarn.lock +++ b/yarn.lock @@ -142,15 +142,6 @@ regexpp "^3.0.0" tsutils "^3.17.1" -"@typescript-eslint/experimental-utils@2.5.0": - version "2.5.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.5.0.tgz#383a97ded9a7940e5053449f6d73995e782b8fb1" - integrity sha512-UgcQGE0GKJVChyRuN1CWqDW8Pnu7+mVst0aWrhiyuUD1J9c+h8woBdT4XddCvhcXDodTDVIfE3DzGHVjp7tUeQ== - dependencies: - "@types/json-schema" "^7.0.3" - "@typescript-eslint/typescript-estree" "2.5.0" - eslint-scope "^5.0.0" - "@typescript-eslint/experimental-utils@2.8.0": version "2.8.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.8.0.tgz#208b4164d175587e9b03ce6fea97d55f19c30ca9" @@ -160,27 +151,16 @@ "@typescript-eslint/typescript-estree" "2.8.0" eslint-scope "^5.0.0" -"@typescript-eslint/parser@^2.5.0": - version "2.5.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.5.0.tgz#858030ddd808fbbe88e03f42e5971efaccb8218a" - integrity sha512-9UBMiAwIDWSl79UyogaBdj3hidzv6exjKUx60OuZuFnJf56tq/UMpdPcX09YmGqE8f4AnAueYtBxV8IcAT3jdQ== +"@typescript-eslint/parser@^2.8.0": + version "2.8.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.8.0.tgz#e10f7c40c8cf2fb19920c879311e6c46ad17bacb" + integrity sha512-NseXWzhkucq+JM2HgqAAoKEzGQMb5LuTRjFPLQzGIdLthXMNUfuiskbl7QSykvWW6mvzCtYbw1fYWGa2EIaekw== dependencies: "@types/eslint-visitor-keys" "^1.0.0" - "@typescript-eslint/experimental-utils" "2.5.0" - "@typescript-eslint/typescript-estree" "2.5.0" + "@typescript-eslint/experimental-utils" "2.8.0" + "@typescript-eslint/typescript-estree" "2.8.0" eslint-visitor-keys "^1.1.0" -"@typescript-eslint/typescript-estree@2.5.0": - version "2.5.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.5.0.tgz#40ada624d6217ef092a3a79ed30d947ad4f212ce" - integrity sha512-AXURyF8NcA3IsnbjNX1v9qbwa0dDoY9YPcKYR2utvMHoUcu3636zrz0gRWtVAyxbPCkhyKuGg6WZIyi2Fc79CA== - dependencies: - debug "^4.1.1" - glob "^7.1.4" - is-glob "^4.0.1" - lodash.unescape "4.0.1" - semver "^6.3.0" - "@typescript-eslint/typescript-estree@2.8.0": version "2.8.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.8.0.tgz#fcc3fe6532840085d29b75432c8a59895876aeca"