From ed58b78e6156b19197b2b11df257f9cf6eb5fec4 Mon Sep 17 00:00:00 2001 From: bubkoo Date: Thu, 1 Dec 2022 15:05:22 +0800 Subject: [PATCH] refactor: replace text badge with figures --- packages/core/package.json | 1 + packages/core/src/logger.ts | 43 +++++++++++++++++++++++++++++++------ pnpm-lock.yaml | 41 +++++++++++++++++++++++++++++------ 3 files changed, 72 insertions(+), 13 deletions(-) diff --git a/packages/core/package.json b/packages/core/package.json index 5cbf2c4..7411f8b 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -39,6 +39,7 @@ "detect-newline": "^4.0.0", "dotenv": "^16.0.3", "execa": "^6.1.0", + "figures": "^5.0.0", "fs-extra": "^11.1.0", "get-stream": "^6.0.1", "git-log-parser": "^1.2.0", diff --git a/packages/core/src/logger.ts b/packages/core/src/logger.ts index a113e23..a4a8659 100644 --- a/packages/core/src/logger.ts +++ b/packages/core/src/logger.ts @@ -1,4 +1,5 @@ import signale from 'signale' +import figures from 'figures' export function getLogger({ stdout, @@ -12,12 +13,42 @@ export function getLogger({ scope: 'srm', stream: stdout, types: { - info: { color: 'magenta', label: '', badge: 'ℹ', stream: [stdout] }, - error: { color: 'red', label: '', badge: '✖', stream: [stderr] }, - log: { color: 'magenta', label: '', badge: '•', stream: [stdout] }, - success: { color: 'green', label: '', badge: '✔', stream: [stdout] }, - complete: { color: 'red', label: '', badge: '❤', stream: [stdout] }, - start: { color: 'cyan', label: '', badge: '✈', stream: [stdout] }, + info: { + color: 'magenta', + label: '', + badge: figures.info, + stream: [stdout], + }, + error: { + color: 'red', + label: '', + badge: figures.cross, + stream: [stderr], + }, + log: { + color: 'magenta', + label: '', + badge: figures.bullet, + stream: [stdout], + }, + success: { + color: 'green', + label: '', + badge: figures.tick, + stream: [stdout], + }, + complete: { + color: 'red', + label: '', + badge: figures.heart, + stream: [stdout], + }, + start: { + color: 'cyan', + label: '', + badge: figures.home, + stream: [stdout], + }, }, }) } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b221673..92474c4 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -71,6 +71,7 @@ importers: detect-newline: ^4.0.0 dotenv: ^16.0.3 execa: ^6.1.0 + figures: ^5.0.0 fs-extra: ^11.1.0 get-stream: ^6.0.1 git-log-parser: ^1.2.0 @@ -94,6 +95,7 @@ importers: detect-newline: 4.0.0 dotenv: 16.0.3 execa: 6.1.0 + figures: registry.npmmirror.com/figures/5.0.0 fs-extra: registry.npmmirror.com/fs-extra/11.1.0 get-stream: 6.0.1 git-log-parser: 1.2.0 @@ -2089,12 +2091,6 @@ packages: dependencies: reusify: 1.0.4 - /figures/2.0.0: - resolution: {integrity: sha512-Oa2M9atig69ZkfwiApY8F2Yy+tzMbazyvqv21R0NsSC8floSOC09BbT1ITWAdoMGQvJ/aZnR1KMwdx9tvHnTNA==} - engines: {node: '>=4'} - dependencies: - escape-string-regexp: 1.0.5 - /figures/3.2.0: resolution: {integrity: sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==} engines: {node: '>=8'} @@ -3799,7 +3795,7 @@ packages: engines: {node: '>=6'} dependencies: chalk: 2.4.2 - figures: 2.0.0 + figures: registry.npmmirror.com/figures/2.0.0 pkg-conf: 2.1.0 /slash/3.0.0: @@ -4607,6 +4603,12 @@ packages: name: escape-string-regexp version: 1.0.5 engines: {node: '>=0.8.0'} + + registry.npmmirror.com/escape-string-regexp/5.0.0: + resolution: {integrity: sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz} + name: escape-string-regexp + version: 5.0.0 + engines: {node: '>=12'} dev: false registry.npmmirror.com/execa/5.1.1: @@ -4626,6 +4628,24 @@ packages: strip-final-newline: registry.npmmirror.com/strip-final-newline/2.0.0 dev: true + registry.npmmirror.com/figures/2.0.0: + resolution: {integrity: sha512-Oa2M9atig69ZkfwiApY8F2Yy+tzMbazyvqv21R0NsSC8floSOC09BbT1ITWAdoMGQvJ/aZnR1KMwdx9tvHnTNA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/figures/-/figures-2.0.0.tgz} + name: figures + version: 2.0.0 + engines: {node: '>=4'} + dependencies: + escape-string-regexp: registry.npmmirror.com/escape-string-regexp/1.0.5 + + registry.npmmirror.com/figures/5.0.0: + resolution: {integrity: sha512-ej8ksPF4x6e5wvK9yevct0UCXh8TTFlWGVLlgjZuoBH1HwjIfKE/IdL5mq89sFA7zELi1VhKpmtDnrs7zWyeyg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/figures/-/figures-5.0.0.tgz} + name: figures + version: 5.0.0 + engines: {node: '>=14'} + dependencies: + escape-string-regexp: registry.npmmirror.com/escape-string-regexp/5.0.0 + is-unicode-supported: registry.npmmirror.com/is-unicode-supported/1.3.0 + dev: false + registry.npmmirror.com/fill-range/7.0.1: resolution: {integrity: sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/fill-range/-/fill-range-7.0.1.tgz} name: fill-range @@ -4734,6 +4754,13 @@ packages: engines: {node: '>=8'} dev: true + registry.npmmirror.com/is-unicode-supported/1.3.0: + resolution: {integrity: sha512-43r2mRvz+8JRIKnWJ+3j8JtjRKZ6GmjzfaE/qiBJnikNnYv/6bagRJ1kUhNk8R5EX/GkobD+r+sfxCPJsiKBLQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/is-unicode-supported/-/is-unicode-supported-1.3.0.tgz} + name: is-unicode-supported + version: 1.3.0 + engines: {node: '>=12'} + dev: false + registry.npmmirror.com/isexe/2.0.0: resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/isexe/-/isexe-2.0.0.tgz} name: isexe