Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Package up core-logger types #1833

Merged
merged 5 commits into from
Dec 19, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -62,3 +62,6 @@ packages/**/dist/

# Random
peers_backup.json

#Webstorm/Intellij
.idea
4 changes: 2 additions & 2 deletions packages/core-logger-winston/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { LogManager } from "@arkecosystem/core-logger";
import { defaults } from "./defaults";
import { Logger } from "./driver";

Expand All @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion packages/core-logger/__tests__/__stubs__/logger.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { AbstractLogger } from "../../src/logger";
import { AbstractLogger } from "../../src";

export class Logger extends AbstractLogger {
public make(): any {
Expand Down
3 changes: 1 addition & 2 deletions packages/core-logger/__tests__/manager.test.ts
Original file line number Diff line number Diff line change
@@ -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();
Expand Down
3 changes: 2 additions & 1 deletion packages/core-logger/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
"Brian Faust <brian@ark.io>"
],
"license": "MIT",
"main": "dist/index.js",
"main": "dist/index",
"types": "dist/index",
paroxysm marked this conversation as resolved.
Show resolved Hide resolved
"files": [
"dist"
],
Expand Down
15 changes: 3 additions & 12 deletions packages/core-logger/src/index.ts
Original file line number Diff line number Diff line change
@@ -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";
9 changes: 9 additions & 0 deletions packages/core-logger/src/plugin.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import { LogManager } from "./manager";

export const plugin = {
pkg: require("../package.json"),
alias: "logManager",
async register() {
return new LogManager();
},
};