From 6c04c36979e85afd8232fe62c0f425d95810c3c2 Mon Sep 17 00:00:00 2001
From: ddiu8081 <ddiu8081@gmail.com>
Date: Tue, 25 Oct 2022 00:55:40 +0800
Subject: [PATCH] refactor(live-mini): use ansis

---
 packages/bilicli/bin/bilicli.js              |  2 +-
 packages/bilicli/package.json                |  4 ++--
 packages/live-mini/package.json              |  9 +++++++--
 packages/live-mini/src/component/roomInfo.ts |  6 +++---
 packages/live-mini/src/component/username.ts | 10 +++++-----
 packages/live-mini/tsup.config.ts            |  2 +-
 pnpm-lock.yaml                               | 14 +++++++-------
 7 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/packages/bilicli/bin/bilicli.js b/packages/bilicli/bin/bilicli.js
index 8beca1f..9823d85 100755
--- a/packages/bilicli/bin/bilicli.js
+++ b/packages/bilicli/bin/bilicli.js
@@ -1,2 +1,2 @@
 #!/usr/bin/env node
-require('../dist/main.js')
\ No newline at end of file
+import '../dist/index.js'
\ No newline at end of file
diff --git a/packages/bilicli/package.json b/packages/bilicli/package.json
index 682ab08..0950400 100644
--- a/packages/bilicli/package.json
+++ b/packages/bilicli/package.json
@@ -15,8 +15,8 @@
     "bilicli": "bin/bilicli.js"
   },
   "type": "module",
-  "main": "dist/main.js",
-  "exports": "./dist/main.js",
+  "main": "dist/index.js",
+  "exports": "./dist/index.js",
   "files": [
     "bin",
     "dist"
diff --git a/packages/live-mini/package.json b/packages/live-mini/package.json
index 1e31afa..debde85 100644
--- a/packages/live-mini/package.json
+++ b/packages/live-mini/package.json
@@ -4,7 +4,12 @@
   "description": "Bili-Live danmu client, lite version",
   "type": "module",
   "main": "dist/index.js",
-  "exports": "./dist/index.js",
+  "exports": {
+    ".": {
+      "require": "./dist/index.cjs",
+      "import": "./dist/index.js"
+    }
+  },
   "types": "dist/index.d.ts",
   "scripts": {
     "dev": "tsup --watch",
@@ -25,8 +30,8 @@
   "author": "ddiu8081 <ddiu8081@gmail.com>",
   "license": "MIT",
   "dependencies": {
+    "ansis": "^1.5.5",
     "blive-message-listener": "^0.3.1",
-    "chalk": "^5.1.2",
     "ohmyfetch": "^0.4.20"
   }
 }
diff --git a/packages/live-mini/src/component/roomInfo.ts b/packages/live-mini/src/component/roomInfo.ts
index ceb7853..a0b0043 100644
--- a/packages/live-mini/src/component/roomInfo.ts
+++ b/packages/live-mini/src/component/roomInfo.ts
@@ -1,10 +1,10 @@
-import chalk from 'chalk'
+import ansis from 'ansis'
 import type { RoomInfo } from '../utils/getInfo'
 
 export const roomInfoCom = (roomInfo: RoomInfo) => {
   const components = [
-    chalk.bold(chalk.green(roomInfo.room_id)),
-    chalk.green(`(${roomInfo.parent_area_name}·${roomInfo.area_name})`),
+    ansis.bold.green(`${roomInfo.room_id}`),
+    ansis.green(`(${roomInfo.parent_area_name}·${roomInfo.area_name})`),
     roomInfo.title
   ]
   return components.join(' ')
diff --git a/packages/live-mini/src/component/username.ts b/packages/live-mini/src/component/username.ts
index 34cf9f3..443e59b 100644
--- a/packages/live-mini/src/component/username.ts
+++ b/packages/live-mini/src/component/username.ts
@@ -1,4 +1,4 @@
-import chalk from 'chalk'
+import ansis from 'ansis'
 import type { User } from 'blive-message-listener'
 import { getGuardColor } from '../utils/parse'
 
@@ -6,15 +6,15 @@ export const usernameCom = (user: User) => {
   let badge, rank, admin
   if (user.badge) {
     const badgeColor = user.badge.anchor.is_same_room ? user.badge.color : '#999999'
-    badge = chalk.bgHex(badgeColor)(` ${user.badge.name} `) + chalk.bgHex('#ffffff').hex(badgeColor)(` ${user.badge.level} `)
+    badge = ansis.bgHex(badgeColor)(` ${user.badge.name} `) + ansis.bgHex('#ffffff').hex(badgeColor)(` ${user.badge.level} `)
   }
   if (user.identity?.rank) {
-    rank = chalk.bgBlue(` 榜${user.identity.rank} `)
+    rank = ansis.bgBlue(` 榜${user.identity.rank} `)
   }
   if (user.identity?.room_admin) {
-    admin = chalk.bgRed(` 房 `)
+    admin = ansis.bgRed(` 房 `)
   }
-  const uname = chalk.hex(getGuardColor(user.identity?.guard_level))(user.uname)
+  const uname = ansis.hex(getGuardColor(user.identity?.guard_level))(user.uname)
   const components = [
     badge,
     rank,
diff --git a/packages/live-mini/tsup.config.ts b/packages/live-mini/tsup.config.ts
index 812d763..c86eeb3 100644
--- a/packages/live-mini/tsup.config.ts
+++ b/packages/live-mini/tsup.config.ts
@@ -1,7 +1,7 @@
 import { defineConfig } from 'tsup'
 
 export default defineConfig({
-  format: ['esm'],
+  format: ['esm', 'cjs'],
   entry: [
     'src/index.ts',
   ],
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index ad4deb9..aeb5388 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -45,12 +45,12 @@ importers:
 
   packages/live-mini:
     specifiers:
+      ansis: ^1.5.5
       blive-message-listener: ^0.3.1
-      chalk: ^5.1.2
       ohmyfetch: ^0.4.20
     dependencies:
+      ansis: 1.5.5
       blive-message-listener: 0.3.1
-      chalk: 5.1.2
       ohmyfetch: 0.4.20
 
 packages:
@@ -679,6 +679,11 @@ packages:
     engines: {node: '>=10'}
     dev: false
 
+  /ansis/1.5.5:
+    resolution: {integrity: sha512-DNctovTacxs/NfZpGo6bIGWgLd2oZsDO7RJbiYX6Ttj40LPZM1XKv9WtesH13ieOEm1GajjD+Vik2n9YnSTPdA==}
+    engines: {node: '>=12.13'}
+    dev: false
+
   /any-promise/1.3.0:
     resolution: {integrity: sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==}
     dev: true
@@ -796,11 +801,6 @@ packages:
       supports-color: 7.2.0
     dev: false
 
-  /chalk/5.1.2:
-    resolution: {integrity: sha512-E5CkT4jWURs1Vy5qGJye+XwCkNj7Od3Af7CP6SujMetSMkLs8Do2RWJK5yx1wamHV/op8Rz+9rltjaTQWDnEFQ==}
-    engines: {node: ^12.17.0 || ^14.13 || >=16.0.0}
-    dev: false
-
   /chokidar/3.5.3:
     resolution: {integrity: sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==}
     engines: {node: '>= 8.10.0'}