diff --git a/packages/create-bot/package.json b/packages/create-bot/package.json index 84d2fd2c..c315f600 100644 --- a/packages/create-bot/package.json +++ b/packages/create-bot/package.json @@ -14,7 +14,7 @@ "create-bot": "./src/main.js" }, "dependencies": { - "chalk": "5.3.0", + "colorette": "^2.0.20", "cross-spawn": "7.0.3", "glob": "10.2.6", "handlebars": "4.7.8", @@ -22,7 +22,7 @@ "open": "9.1.0" }, "devDependencies": { - "@types/inquirer": "^9.0.6", - "@types/cross-spawn": "^6.0.6" + "@types/cross-spawn": "^6.0.6", + "@types/inquirer": "^9.0.6" } } diff --git a/packages/create-bot/src/cli.ts b/packages/create-bot/src/cli.ts index 78e548d3..2bc8614b 100644 --- a/packages/create-bot/src/cli.ts +++ b/packages/create-bot/src/cli.ts @@ -1,4 +1,4 @@ -import chalk from 'chalk' +import * as colors from 'colorette' import inquirer from 'inquirer' import open from 'open' @@ -47,14 +47,16 @@ export async function askForConfigPersisted(): Promise { setTimeout(() => void open(TELEGRAM_APPS_PAGE), 1000) return [ - chalk.italic(`Opening ${chalk.blue(TELEGRAM_APPS_PAGE)}...`), - `🔒 Log in with your ${chalk.blueBright('Telegram')} account`, + colors.italic(`Opening ${colors.blue(TELEGRAM_APPS_PAGE)}...`), + `🔒 Log in with your ${colors.blueBright('Telegram')} account`, '📝 Fill out the form:', - ` - ${chalk.bold('App title, short name')}: anything you want, can be changed later`, - ` - ${chalk.bold('Platform')}: doesn't matter`, - ` - ${chalk.bold('URL')}: can be left blank`, - `🚀 Click ${chalk.bold('Create application')}`, - `${chalk.bold.red('❗ DO NOT')} share your API hash with anyone, as it can't be revoked`, + ` - ${colors.bold('App title, short name')}: anything you want, can be changed later`, + ` - ${colors.bold('Platform')}: doesn't matter`, + ` - ${colors.bold('URL')}: can be left blank`, + `🚀 Click ${colors.bold('Create application')}`, + `${colors.bold( + colors.red('❗ DO NOT'), + )} share your API hash with anyone, as it can't be revoked`, ].join('\n') } if (!/^\d+$/.test(v)) return 'API ID must be a number' @@ -109,8 +111,8 @@ export async function askForConfig(): Promise { allowEmptyBotToken = true return [ - `You most likely need a bot token. You can obtain one from ${chalk.blue('@BotFather')}`, - ` Press ${chalk.bold('Enter')} again if you want to create a ${chalk.magenta('userbot')}`, + `You most likely need a bot token. You can obtain one from ${colors.blue('@BotFather')}`, + ` Press ${colors.bold('Enter')} again if you want to create a ${colors.magenta('userbot')}`, ].join('\n') } if (!v.match(/^(\d+):[a-z0-9-_]{16,50}$/i)) return 'Invalid bot token' diff --git a/packages/create-bot/src/main.ts b/packages/create-bot/src/main.ts index c836cb55..3b7cb91a 100644 --- a/packages/create-bot/src/main.ts +++ b/packages/create-bot/src/main.ts @@ -1,4 +1,4 @@ -import chalk from 'chalk' +import * as colors from 'colorette' import { join } from 'node:path' import { askForConfig } from './cli.js' @@ -37,7 +37,7 @@ if (config.features.includes(MtcuteFeature.Linters)) { await exec(outDir, 'pnpm', 'exec', 'husky', 'install') } -console.log(`✅ Scaffolded new project at ${chalk.blue(outDir)}`) +console.log(`✅ Scaffolded new project at ${colors.blue(outDir)}`) console.log('🚀 Run it with:') -console.log(` ${chalk.blue('$')} cd ${projectName}`) -console.log(` ${chalk.blue('$')} pnpm start`) +console.log(` ${colors.blue('$')} cd ${projectName}`) +console.log(` ${colors.blue('$')} pnpm start`) diff --git a/packages/create-bot/src/utils.ts b/packages/create-bot/src/utils.ts index 9bb27ada..90a31419 100644 --- a/packages/create-bot/src/utils.ts +++ b/packages/create-bot/src/utils.ts @@ -1,9 +1,9 @@ -import chalk from 'chalk' +import * as colors from 'colorette' import { spawn } from 'cross-spawn' export function exec(cwd: string, ...cmd: string[]) { return new Promise((resolve, reject) => { - console.log(`${chalk.blue('$')} ${cmd.join(' ')}`) + console.log(`${colors.blue('$')} ${cmd.join(' ')}`) const proc = spawn(cmd[0], cmd.slice(1), { stdio: 'inherit', diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 40b17505..acedebb5 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -151,9 +151,9 @@ importers: packages/create-bot: dependencies: - chalk: - specifier: 5.3.0 - version: 5.3.0 + colorette: + specifier: ^2.0.20 + version: 2.0.20 cross-spawn: specifier: 7.0.3 version: 7.0.3 @@ -2039,7 +2039,6 @@ packages: /colorette@2.0.20: resolution: {integrity: sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==} - dev: true /commander@10.0.1: resolution: {integrity: sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==}