diff --git a/.gitignore b/.gitignore index 14739d332b..ec763505a4 100644 --- a/.gitignore +++ b/.gitignore @@ -62,3 +62,6 @@ packages/**/dist/ # Random peers_backup.json + +#Webstorm/Intellij +.idea diff --git a/packages/core-logger-winston/src/index.ts b/packages/core-logger-winston/src/index.ts index ab01d88242..2d15095230 100644 --- a/packages/core-logger-winston/src/index.ts +++ b/packages/core-logger-winston/src/index.ts @@ -1,3 +1,4 @@ +import { LogManager } from "@arkecosystem/core-logger"; import { defaults } from "./defaults"; import { Logger } from "./driver"; @@ -7,8 +8,7 @@ export const plugin = { alias: "logger", extends: "@arkecosystem/core-logger", async register(container, options) { - const logManager = container.resolvePlugin("logManager"); - // @ts-ignore + const logManager: LogManager = container.resolvePlugin("logManager"); await logManager.makeDriver(new Logger(options)); return logManager.driver(); diff --git a/packages/core-logger/__tests__/__stubs__/logger.ts b/packages/core-logger/__tests__/__stubs__/logger.ts index 1add724d83..879e494684 100644 --- a/packages/core-logger/__tests__/__stubs__/logger.ts +++ b/packages/core-logger/__tests__/__stubs__/logger.ts @@ -1,4 +1,4 @@ -import { AbstractLogger } from "../../src/logger"; +import { AbstractLogger } from "../../src"; export class Logger extends AbstractLogger { public make(): any { diff --git a/packages/core-logger/__tests__/manager.test.ts b/packages/core-logger/__tests__/manager.test.ts index 15e56473d1..eca1bec3ca 100644 --- a/packages/core-logger/__tests__/manager.test.ts +++ b/packages/core-logger/__tests__/manager.test.ts @@ -1,6 +1,5 @@ import "jest-extended"; -import { AbstractLogger } from "../src/logger"; -import { LogManager } from "../src/manager"; +import { AbstractLogger, LogManager } from "../src"; import { Logger } from "./__stubs__/logger"; const manager = new LogManager(); diff --git a/packages/core-logger/package.json b/packages/core-logger/package.json index 9f5cc810c8..a5c7e22917 100644 --- a/packages/core-logger/package.json +++ b/packages/core-logger/package.json @@ -6,7 +6,8 @@ "Brian Faust " ], "license": "MIT", - "main": "dist/index.js", + "main": "dist/index", + "types": "dist/index", "files": [ "dist" ], diff --git a/packages/core-logger/src/index.ts b/packages/core-logger/src/index.ts index 6fbbbde4ff..5ea9d983cb 100644 --- a/packages/core-logger/src/index.ts +++ b/packages/core-logger/src/index.ts @@ -1,12 +1,3 @@ -import { AbstractLogger } from "./logger"; -import { LogManager } from "./manager"; - -const plugin = { - pkg: require("../package.json"), - alias: "logManager", - async register() { - return new LogManager(); - }, -}; - -export { plugin, AbstractLogger }; +export * from "./manager"; +export * from "./logger"; +export * from "./plugin"; diff --git a/packages/core-logger/src/plugin.ts b/packages/core-logger/src/plugin.ts new file mode 100644 index 0000000000..c7d7eb8ebd --- /dev/null +++ b/packages/core-logger/src/plugin.ts @@ -0,0 +1,9 @@ +import { LogManager } from "./manager"; + +export const plugin = { + pkg: require("../package.json"), + alias: "logManager", + async register() { + return new LogManager(); + }, +};