From 7285ddea696bf2dc6da45ed9871bdb3235435832 Mon Sep 17 00:00:00 2001 From: zkochan Date: Tue, 18 Jul 2017 22:08:17 +0300 Subject: [PATCH] refactor: use just `pnpm-logger instead of bole --- package.json | 4 +--- shrinkwrap.yaml | 17 +++++++++-------- src/bin/pnpm.ts | 3 --- src/logging/fileLogger.ts | 2 +- src/logging/streamParser.ts | 15 --------------- src/reporter/index.ts | 9 ++------- tsconfig.json | 1 - 7 files changed, 13 insertions(+), 38 deletions(-) delete mode 100644 src/logging/streamParser.ts diff --git a/package.json b/package.json index 186c1d5765..f41be93fad 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,6 @@ "@types/npm": "^2.0.28", "@types/ramda": "^0.24.1", "@types/update-notifier": "^1.0.0", - "bole": "^3.0.2", "byline": "^5.0.0", "camelcase": "^4.1.0", "common-tags": "^1.4.0", @@ -31,14 +30,13 @@ "is-ci": "^1.0.10", "load-json-file": "^2.0.0", "loud-rejection": "^1.6.0", - "ndjson": "^1.5.0", "nopt": "^4.0.1", "npm": "^5.0.2", "path-name": "^1.0.0", "pnpm-default-reporter": "^0.8.0", "pnpm-file-reporter": "^0.0.1", "pnpm-list": "^1.0.0", - "pnpm-logger": "^0.5.0", + "pnpm-logger": "^0.5.2", "ramda": "^0.24.1", "supi": "^0.2.3", "update-notifier": "^2.1.0" diff --git a/shrinkwrap.yaml b/shrinkwrap.yaml index fe82fb7c46..1172dcb5ad 100644 --- a/shrinkwrap.yaml +++ b/shrinkwrap.yaml @@ -7,7 +7,6 @@ dependencies: '@types/npm': 2.0.28 '@types/ramda': 0.24.4 '@types/update-notifier': 1.0.1 - bole: 3.0.2 byline: 5.0.0 camelcase: 4.1.0 common-tags: 1.4.0 @@ -16,14 +15,13 @@ dependencies: is-ci: 1.0.10 load-json-file: 2.0.0 loud-rejection: 1.6.0 - ndjson: 1.5.0 nopt: 4.0.1 npm: 5.3.0 path-name: 1.0.0 pnpm-default-reporter: 0.8.0 pnpm-file-reporter: 0.0.1 pnpm-list: 1.0.0 - pnpm-logger: 0.5.0 + pnpm-logger: 0.5.2 ramda: 0.24.1 rimraf: 2.6.1 supi: 0.2.3 @@ -74,6 +72,9 @@ packages: /@types/node/8.0.13: resolution: integrity: sha512-Y3EAG7VA7NVNbZek/fjJtILnmTk/ZfpJuWZGDBqDZ1dVIxgJJJ82fXPW7pKnqyV9CD/9bcPOCi7eErUqGMHOrA== + /@types/node/8.0.14: + resolution: + integrity: sha512-lrtgE/5FeTdcuxgsDbLUIFJ33dTp4TkbKkTDZt/ueUMeqmGYqJRQd908q5Yj9EzzWSMonEhMr1q/CQlgVGEt4w== /@types/nopt/3.0.29: resolution: integrity: sha1-8Z3z20yX7hRZonQAKDIKcdcJZM4= @@ -1800,11 +1801,13 @@ packages: bole: 3.0.2 resolution: integrity: sha1-6uzqWgN/BTpkxQvafto8uH9e1mE= - /pnpm-logger/0.5.0: + /pnpm-logger/0.5.2: dependencies: + '@types/node': 8.0.14 bole: 3.0.2 + ndjson: 1.5.0 resolution: - integrity: sha512-J5n4RJ3eW3Yt1yCWB43yUna0j8TYyqh1SGu8ffk9SBjUXS7zIGwi9C2zwNqNZIou4jvaQ1+dAc5RPE/U/eJLoQ== + integrity: sha512-d+tlkQdfp+Y4GWa07gGs3DhgwiFTcCPZ+1edRgZW9zAChgmr3e5dY5r0HqvfImsC7FKzcFrhZb48o+9xAEjpuw== /pnpm-shrinkwrap/3.1.0: dependencies: '@types/node': 7.0.37 @@ -2574,7 +2577,6 @@ specifiers: '@types/ramda': ^0.24.1 '@types/tape': ^4.2.30 '@types/update-notifier': ^1.0.0 - bole: ^3.0.2 byline: ^5.0.0 camelcase: ^4.1.0 commitizen: ^2.8.6 @@ -2587,7 +2589,6 @@ specifiers: is-ci: ^1.0.10 load-json-file: ^2.0.0 loud-rejection: ^1.6.0 - ndjson: ^1.5.0 nopt: ^4.0.1 npm: ^5.0.2 npm-scripts-info: ^0.3.6 @@ -2595,7 +2596,7 @@ specifiers: pnpm-default-reporter: ^0.8.0 pnpm-file-reporter: ^0.0.1 pnpm-list: ^1.0.0 - pnpm-logger: ^0.5.0 + pnpm-logger: ^0.5.2 ramda: ^0.24.1 rimraf: ^2.5.4 supi: ^0.2.3 diff --git a/src/bin/pnpm.ts b/src/bin/pnpm.ts index 7fc7b8c05e..7fd1909d25 100755 --- a/src/bin/pnpm.ts +++ b/src/bin/pnpm.ts @@ -20,13 +20,10 @@ import '../logging/fileLogger' import pkg from '../pnpmPkgJson' import * as pnpmCmds from '../cmd' import runNpm from '../cmd/runNpm' -import bole = require('bole') import initReporter from '../reporter' import pnpmPkgJson from '../pnpmPkgJson' import getCommandFullName from '../getCommandFullName' -bole.setFastTime() - pnpmCmds['install-test'] = pnpmCmds.installTest const supportedCmds = new Set([ diff --git a/src/logging/fileLogger.ts b/src/logging/fileLogger.ts index f3c570480c..8b792e90df 100644 --- a/src/logging/fileLogger.ts +++ b/src/logging/fileLogger.ts @@ -1,4 +1,4 @@ import fileReporter from 'pnpm-file-reporter' -import streamParser from './streamParser' +import {streamParser} from 'pnpm-logger' fileReporter(streamParser) diff --git a/src/logging/streamParser.ts b/src/logging/streamParser.ts deleted file mode 100644 index 3c94f7de26..0000000000 --- a/src/logging/streamParser.ts +++ /dev/null @@ -1,15 +0,0 @@ -import ndjson = require('ndjson') -import bole = require('bole') - -export type StreamParser = { - on: Function, -} - -const streamParser: StreamParser = ndjson.parse() -bole.output([ - { - level: 'debug', stream: streamParser - }, -]) - -export default streamParser diff --git a/src/reporter/index.ts b/src/reporter/index.ts index 14aa958dfb..218626c25c 100644 --- a/src/reporter/index.ts +++ b/src/reporter/index.ts @@ -1,7 +1,6 @@ import defaultReporter from 'pnpm-default-reporter' import silentReporter from './silentReporter' -import streamParser from '../logging/streamParser' -import bole = require('bole') +import {streamParser, writeToConsole} from 'pnpm-logger' export type ReporterType = 'default' | 'ndjson' | 'silent' @@ -11,11 +10,7 @@ export default (reporterType: ReporterType) => { defaultReporter(streamParser) return case 'ndjson': - bole.output([ - { - level: 'debug', stream: process.stdout - }, - ]) + writeToConsole() return case 'silent': silentReporter(streamParser) diff --git a/tsconfig.json b/tsconfig.json index 3949932a10..c8c080ff7a 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -35,7 +35,6 @@ "src/err.ts", "src/errorTypes.ts", "src/logging/fileLogger.ts", - "src/logging/streamParser.ts", "src/pnpmPkgJson.ts", "src/reporter/index.ts", "src/reporter/silentReporter.ts",