From 5f68b4d08c06d485135a8f46c3af067037cba1ce Mon Sep 17 00:00:00 2001 From: richard-loafle <44828666+richard-loafle@users.noreply.github.com> Date: Mon, 6 Apr 2020 14:07:22 +0900 Subject: [PATCH] bug fixed --- package-lock.json | 80 ++----------------- package.json | 4 +- projects/logger/package.json | 2 +- .../logger/src/lib/config/module-config.ts | 8 -- projects/logger/src/lib/logger.module.ts | 3 +- .../logger/src/lib/services/log.service.ts | 5 +- 6 files changed, 15 insertions(+), 87 deletions(-) delete mode 100644 projects/logger/src/lib/config/module-config.ts diff --git a/package-lock.json b/package-lock.json index e01f998..2884615 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2173,14 +2173,10 @@ "dev": true }, "@ucap/logger": { - "version": "0.0.2", - "resolved": "http://10.81.13.221:8081/nexus/repository/npm-all/@ucap/logger/-/logger-0.0.2.tgz", - "integrity": "sha512-yocIem0zrSuJ5HYGCh62puOoydK1WVBbe9u5AwjW1buP/JVtumnZ45sBel0rU0kdR/WAGegnLaNkLvAcfXdTsA==", - "dev": true, - "requires": { - "pino": "^6.0.0", - "rxjs": "^6.5.4" - } + "version": "0.0.10", + "resolved": "http://10.81.13.221:8081/nexus/repository/npm-all/@ucap/logger/-/logger-0.0.10.tgz", + "integrity": "sha512-M8mV+y4QjItSz6mntbLt23n87CiwyOAPiiUThhzY2WGnNM7PD4PDyjVzXIw8pABr6VYak+LPZCBMRkVhMvqsFA==", + "dev": true }, "@ucap/native": { "version": "0.0.2", @@ -2273,9 +2269,8 @@ "dev": true }, "@ucap/ng-logger": { - "version": "file:pack/ucap-ng-logger-0.0.1.tgz", - "integrity": "sha512-fvD4KOnpVZiVxGQg6MT7dSP78nNFy4O2gOJKmpp+aMDFjwXBmlx5+kDqoPXgPBJoYMfP+w67kMLewKInGcqc3Q==", - "dev": true + "version": "file:pack/ucap-ng-logger-0.0.2.tgz", + "integrity": "sha512-eyqeTzVVQ25F4GmSoQ8fo2QVNFiw1RpeYbUHqjI7qZursq16f2w9tH2EtRqty2tziK7d9VYRH3XjIjR8pCofTw==" }, "@ucap/ng-native": { "version": "file:pack/ucap-ng-native-0.0.1.tgz", @@ -2414,7 +2409,8 @@ }, "@ucap/ng-web-storage": { "version": "file:pack/ucap-ng-web-storage-0.0.3.tgz", - "integrity": "sha512-ndPfCfmdARbeSnbFvagzKsIsjVmo1l0q6vSjFm9seUkZ7GkGyEdzD53XGmrfsO3WosC9uiL6z5etUcmkwJ0EaA==" + "integrity": "sha512-ndPfCfmdARbeSnbFvagzKsIsjVmo1l0q6vSjFm9seUkZ7GkGyEdzD53XGmrfsO3WosC9uiL6z5etUcmkwJ0EaA==", + "dev": true }, "@ucap/pi": { "version": "0.0.5", @@ -3132,12 +3128,6 @@ "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==", "dev": true }, - "atomic-sleep": { - "version": "1.0.0", - "resolved": "http://10.81.13.221:8081/nexus/repository/npm-all/atomic-sleep/-/atomic-sleep-1.0.0.tgz", - "integrity": "sha512-kNOjDqAh7px0XWNI+4QbzoiR/nTkHAWNud2uvnJquD1/x5a7EQZMJT0AczqK0Qn67oY/TTQ1LbUKajZpp3I9tQ==", - "dev": true - }, "autolinker": { "version": "3.13.0", "resolved": "http://10.81.13.221:8081/nexus/repository/npm-all/autolinker/-/autolinker-3.13.0.tgz", @@ -6293,18 +6283,6 @@ "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=", "dev": true }, - "fast-redact": { - "version": "2.0.0", - "resolved": "http://10.81.13.221:8081/nexus/repository/npm-all/fast-redact/-/fast-redact-2.0.0.tgz", - "integrity": "sha512-zxpkULI9W9MNTK2sJ3BpPQrTEXFNESd2X6O1tXMFpK/XM0G5c5Rll2EVYZH2TqI3xRGK/VaJ+eEOt7pnENJpeA==", - "dev": true - }, - "fast-safe-stringify": { - "version": "2.0.7", - "resolved": "http://10.81.13.221:8081/nexus/repository/npm-all/fast-safe-stringify/-/fast-safe-stringify-2.0.7.tgz", - "integrity": "sha512-Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA==", - "dev": true - }, "fastparse": { "version": "1.1.2", "resolved": "http://10.81.13.221:8081/nexus/repository/npm-all/fastparse/-/fastparse-1.1.2.tgz", @@ -6539,12 +6517,6 @@ "locate-path": "^2.0.0" } }, - "flatstr": { - "version": "1.0.12", - "resolved": "http://10.81.13.221:8081/nexus/repository/npm-all/flatstr/-/flatstr-1.0.12.tgz", - "integrity": "sha512-4zPxDyhCyiN2wIAtSLI6gc82/EjqZc1onI4Mz/l0pWrAlsSfYH/2ZIcU+e3oA2wDwbzIWNKwa23F8rh6+DRWkw==", - "dev": true - }, "flatted": { "version": "2.0.2", "resolved": "http://10.81.13.221:8081/nexus/repository/npm-all/flatted/-/flatted-2.0.2.tgz", @@ -10485,26 +10457,6 @@ "pinkie": "^2.0.0" } }, - "pino": { - "version": "6.0.0", - "resolved": "http://10.81.13.221:8081/nexus/repository/npm-all/pino/-/pino-6.0.0.tgz", - "integrity": "sha512-3RfX2L76o7v230FP1fZ3Fo/WX7Su+P1Ld+pvBm2j+MyUjtA/KqDYxMkzBqzcX3R00zbC7Gf/HqIzyuu3tgvi9Q==", - "dev": true, - "requires": { - "fast-redact": "^2.0.0", - "fast-safe-stringify": "^2.0.7", - "flatstr": "^1.0.12", - "pino-std-serializers": "^2.4.2", - "quick-format-unescaped": "^4.0.1", - "sonic-boom": "^1.0.0" - } - }, - "pino-std-serializers": { - "version": "2.4.2", - "resolved": "http://10.81.13.221:8081/nexus/repository/npm-all/pino-std-serializers/-/pino-std-serializers-2.4.2.tgz", - "integrity": "sha512-WaL504dO8eGs+vrK+j4BuQQq6GLKeCCcHaMB2ItygzVURcL1CycwNEUHTD/lHFHs/NL5qAz2UKrjYWXKSf4aMQ==", - "dev": true - }, "pkg-dir": { "version": "3.0.0", "resolved": "http://10.81.13.221:8081/nexus/repository/npm-all/pkg-dir/-/pkg-dir-3.0.0.tgz", @@ -11565,12 +11517,6 @@ "integrity": "sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA==", "dev": true }, - "quick-format-unescaped": { - "version": "4.0.1", - "resolved": "http://10.81.13.221:8081/nexus/repository/npm-all/quick-format-unescaped/-/quick-format-unescaped-4.0.1.tgz", - "integrity": "sha512-RyYpQ6Q5/drsJyOhrWHYMWTedvjTIat+FTwv0K4yoUxzvekw2aRHMQJLlnvt8UantkZg2++bEzD9EdxXqkWf4A==", - "dev": true - }, "quick-lru": { "version": "1.1.0", "resolved": "http://10.81.13.221:8081/nexus/repository/npm-all/quick-lru/-/quick-lru-1.1.0.tgz", @@ -13035,16 +12981,6 @@ "socks": "^2.3.3" } }, - "sonic-boom": { - "version": "1.0.1", - "resolved": "http://10.81.13.221:8081/nexus/repository/npm-all/sonic-boom/-/sonic-boom-1.0.1.tgz", - "integrity": "sha512-o9tx+bonVEXSaPtptyXQXpP8l6UV9Bi3im2geZskvWw2a/o/hrbWI7EBbbv+rOx6Hubnzun9GgH4WfbgEA3MFQ==", - "dev": true, - "requires": { - "atomic-sleep": "^1.0.0", - "flatstr": "^1.0.12" - } - }, "sort-keys": { "version": "1.1.2", "resolved": "http://10.81.13.221:8081/nexus/repository/npm-all/sort-keys/-/sort-keys-1.1.2.tgz", diff --git a/package.json b/package.json index 367c6ce..6047a4a 100644 --- a/package.json +++ b/package.json @@ -135,7 +135,7 @@ "@ucap/api-prompt": "~0.0.1", "@ucap/api-public": "~0.0.1", "@ucap/core": "~0.0.6", - "@ucap/logger": "~0.0.2", + "@ucap/logger": "~0.0.10", "@ucap/native": "~0.0.1", "@ucap/native-browser": "~0.0.1", "@ucap/ng-api-common": "file:pack/ucap-ng-api-common-0.0.1.tgz", @@ -145,7 +145,7 @@ "@ucap/ng-api-public": "file:pack/ucap-ng-api-public-0.0.1.tgz", "@ucap/ng-core": "file:pack/ucap-ng-core-0.0.1.tgz", "@ucap/ng-i18n": "file:pack/ucap-ng-i18n-0.0.6.tgz", - "@ucap/ng-logger": "file:pack/ucap-ng-logger-0.0.1.tgz", + "@ucap/ng-logger": "file:pack/ucap-ng-logger-0.0.2.tgz", "@ucap/ng-native": "file:pack/ucap-ng-native-0.0.1.tgz", "@ucap/ng-native-browser": "file:pack/ucap-ng-native-browser-0.0.1.tgz", "@ucap/ng-pi": "file:pack/ucap-ng-pi-0.0.1.tgz", diff --git a/projects/logger/package.json b/projects/logger/package.json index 7ba6971..1874627 100644 --- a/projects/logger/package.json +++ b/projects/logger/package.json @@ -1,6 +1,6 @@ { "name": "@ucap/ng-logger", - "version": "0.0.1", + "version": "0.0.2", "publishConfig": { "registry": "http://10.81.13.221:8081/nexus/repository/npm-ucap/" }, diff --git a/projects/logger/src/lib/config/module-config.ts b/projects/logger/src/lib/config/module-config.ts deleted file mode 100644 index d9b1b04..0000000 --- a/projects/logger/src/lib/config/module-config.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { ModuleConfig as CoreModuleConfig } from '@ucap/core'; - -import { LoggerOptions, DestinationStream } from '@ucap/logger'; - -// tslint:disable-next-line: no-empty-interface -export interface ModuleConfig extends CoreModuleConfig { - optionsOrStream?: LoggerOptions | DestinationStream; -} diff --git a/projects/logger/src/lib/logger.module.ts b/projects/logger/src/lib/logger.module.ts index d2bbae5..73310c8 100644 --- a/projects/logger/src/lib/logger.module.ts +++ b/projects/logger/src/lib/logger.module.ts @@ -1,7 +1,8 @@ import { NgModule, ModuleWithProviders } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { ModuleConfig } from './config/module-config'; +import { ModuleConfig } from '@ucap/logger'; + import { _MODULE_CONFIG } from './config/token'; import { LogService } from './services/log.service'; diff --git a/projects/logger/src/lib/services/log.service.ts b/projects/logger/src/lib/services/log.service.ts index 3e82cd2..f6385c3 100644 --- a/projects/logger/src/lib/services/log.service.ts +++ b/projects/logger/src/lib/services/log.service.ts @@ -1,15 +1,14 @@ import { Injectable, Inject } from '@angular/core'; -import { LogService as UCAPLogService } from '@ucap/logger'; +import { ModuleConfig, LogService as UCAPLogService } from '@ucap/logger'; import { _MODULE_CONFIG } from '../config/token'; -import { ModuleConfig } from '../config/module-config'; @Injectable({ providedIn: 'root' }) export class LogService extends UCAPLogService { constructor(@Inject(_MODULE_CONFIG) moduleConfig: ModuleConfig) { - super(moduleConfig.optionsOrStream); + super(moduleConfig); } }