From eea4f3f2f0e76fb60189fc580996371a25371927 Mon Sep 17 00:00:00 2001 From: Tadas Krivickas Date: Mon, 25 May 2020 10:04:33 +0300 Subject: [PATCH] Fix type errors See https://github.com/typescript-eslint/typescript-eslint/releases/tag/v3.0.0 https://github.com/typescript-eslint/typescript-eslint/issues/1423 --- src/analytics/analytics-main.ts | 4 ---- src/main/index.tsx | 6 ------ src/typings/globals.d.ts | 21 ++++++++++++++++++++ src/typings/{libraries.ts => libraries.d.ts} | 0 src/ui-kit/toggle/nav-toggle.tsx | 2 +- src/utils/on-process-exit.ts | 2 +- 6 files changed, 23 insertions(+), 12 deletions(-) create mode 100644 src/typings/globals.d.ts rename src/typings/{libraries.ts => libraries.d.ts} (100%) diff --git a/src/analytics/analytics-main.ts b/src/analytics/analytics-main.ts index d9739b21..7f89a2b6 100644 --- a/src/analytics/analytics-main.ts +++ b/src/analytics/analytics-main.ts @@ -5,7 +5,6 @@ * LICENSE file in the root directory of this source tree. */ -/* eslint-disable @typescript-eslint/ban-ts-ignore */ import ua from "universal-analytics" import { App, BrowserWindow, screen } from "electron" import { machineIdSync } from "node-machine-id" @@ -46,11 +45,8 @@ export const initialize = (): void => { } export const setupGlobals = (): void => { - // @ts-ignore global.analyticsSetUserId = analytics.setUserId - // @ts-ignore global.analyticsEvent = analytics.event - // @ts-ignore global.analyticsPageview = analytics.pageview } diff --git a/src/main/index.tsx b/src/main/index.tsx index b3756426..1f64a090 100644 --- a/src/main/index.tsx +++ b/src/main/index.tsx @@ -30,15 +30,11 @@ initializeSentry() const isDevelopment = process.env.NODE_ENV !== "production" -// eslint-disable-next-line @typescript-eslint/ban-ts-ignore -// @ts-ignore global.supervisor = supervisor // global reference to win (necessary to prevent window from being garbage collected) let win: BrowserWindow | null -// eslint-disable-next-line @typescript-eslint/ban-ts-ignore -// @ts-ignore // eslint-disable-next-line @typescript-eslint/no-unused-vars let tray: Tray | null @@ -137,8 +133,6 @@ app.on("activate", async () => { } }) -// eslint-disable-next-line @typescript-eslint/ban-ts-ignore -// @ts-ignore app.on("before-quit", () => (app.quitting = true)) app.on("will-quit", async () => { diff --git a/src/typings/globals.d.ts b/src/typings/globals.d.ts new file mode 100644 index 00000000..1672bcdc --- /dev/null +++ b/src/typings/globals.d.ts @@ -0,0 +1,21 @@ +/** + * Copyright (c) 2020 BlockDev AG + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ +// eslint-disable-next-line @typescript-eslint/no-unused-vars +import type { Supervisor } from "../supervisor/supervisor" +// eslint-disable-next-line no-restricted-imports,@typescript-eslint/no-unused-vars +import type { analytics } from "../analytics/analytics-main" + +declare global { + namespace NodeJS { + interface Global extends NodeJS.Global { + supervisor: Supervisor + analyticsSetUserId: typeof analytics.setUserId + analyticsEvent: typeof analytics.event + analyticsPageview: typeof analytics.pageview + } + } +} diff --git a/src/typings/libraries.ts b/src/typings/libraries.d.ts similarity index 100% rename from src/typings/libraries.ts rename to src/typings/libraries.d.ts diff --git a/src/ui-kit/toggle/nav-toggle.tsx b/src/ui-kit/toggle/nav-toggle.tsx index dcc576ce..d09de49b 100644 --- a/src/ui-kit/toggle/nav-toggle.tsx +++ b/src/ui-kit/toggle/nav-toggle.tsx @@ -11,7 +11,7 @@ export interface ToggleProps { small?: boolean children: React.ReactNode active: boolean - onClick: Function + onClick: () => void } export const NavToggle = styled.div` diff --git a/src/utils/on-process-exit.ts b/src/utils/on-process-exit.ts index 279ac740..861986d5 100644 --- a/src/utils/on-process-exit.ts +++ b/src/utils/on-process-exit.ts @@ -4,7 +4,7 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. */ -export const onProcessExit = (hook: Function): void => { +export const onProcessExit = (hook: () => void): void => { const shutdown = (): void => { console.log("Shutting down...") hook()