From 6b8d40a95f2278ef137c6d7f255df9bf0975b5a9 Mon Sep 17 00:00:00 2001 From: Nathan Shively-Sanders <293473+sandersn@users.noreply.github.com> Date: Fri, 3 Jan 2020 14:31:03 -0800 Subject: [PATCH] Break slack-winston dependency on winston (#41386) slack-winston is nearly unused and seems abandoned, but has a dependency on the deprecated @types/winston. This is causing problems for DT automation, so I just inlined all the winston types that slack-winston uses. Since this package is unlikely to change, I don't think this is a problem. --- types/slack-winston/index.d.ts | 37 ++++++++++++++++++++++++++++---- types/slack-winston/package.json | 6 ------ 2 files changed, 33 insertions(+), 10 deletions(-) delete mode 100644 types/slack-winston/package.json diff --git a/types/slack-winston/index.d.ts b/types/slack-winston/index.d.ts index 91d3e4c5ce..eef4312287 100644 --- a/types/slack-winston/index.d.ts +++ b/types/slack-winston/index.d.ts @@ -4,9 +4,7 @@ // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped // TypeScript Version: 2.3 -import Transport = require("winston-transport"); - -export interface SlackTransportOptions extends Transport.TransportStreamOptions { +export interface SlackTransportOptions { domain: string; token: string; webhook_url: string; @@ -16,8 +14,39 @@ export interface SlackTransportOptions extends Transport.TransportStreamOptions icon_emoji?: string; message?: string; queueDelay?: number; + + // from winston-transport TransportStreamOptions + format?: Format; + level?: string; + silent?: boolean; + handleExceptions?: boolean; + + log?(info: any, next: () => void): any; + logv?(info: any, next: () => void): any; + close?(): void; } -export class Slack extends Transport { +export class Slack { constructor(options?: SlackTransportOptions); + format?: Format; + level?: string; + silent?: boolean; + handleExceptions?: boolean; + + log?(info: any, next: () => void): any; + logv?(info: any, next: () => void): any; + close?(): void; +} + +export class Format { + constructor(opts?: object); + + options?: object; + transform: (info: TransformableInfo, opts?: any) => TransformableInfo | boolean; +} + +export interface TransformableInfo { + level: string; + message: string; + [key: string]: any; } diff --git a/types/slack-winston/package.json b/types/slack-winston/package.json deleted file mode 100644 index 33e1a4f018..0000000000 --- a/types/slack-winston/package.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "private": true, - "dependencies": { - "@types/winston": "^2.3.9" - } -}