Update requires to imports, switch to cli-progress from smooth-progress

Author: eablack

packages/cli/package.json

@@ -39,6 +39,7 @@
     "async-file": "^2.0.2",
     "bytes": "^3.1.2",
     "chalk": "^2.4.2",
+    "cli-progress": "^3.12.0",
     "commander": "^2.15.1",
     "date-fns": "^2.30.0",
     "debug": "4.3.4",
@@ -65,7 +66,6 @@
     "semver": "7.6.1",
     "shell-escape": "^0.2.0",
     "shell-quote": "^1.8.1",
-    "smooth-progress": "^1.1.0",
     "sparkline": "^0.2.0",
     "ssh2": "^1.16.0",
     "stdout-stderr": "^0.1.13",

packages/cli/src/file.ts

@@ -3,7 +3,8 @@ import * as path from 'path'
 
 import deps from './deps.js'
 
-const debug = require('debug')('heroku-cli:file')
+import debug from 'debug'
+const fileDebug = debug('heroku-cli:file')
 
 export function exists(f: string): Promise<boolean> {
   return deps.fs.pathExists(f)
@@ -14,13 +15,13 @@ export async function stat(file: string): Promise<FS.Stats> {
 }
 
 export async function rename(from: string, to: string) {
-  debug('rename', from, to)
+  fileDebug('rename', from, to)
   return deps.fs.rename(from, to)
 }
 
 export async function remove(file: string) {
   if (!await exists(file)) return
-  debug('remove', file)
+  fileDebug('remove', file)
   return deps.fs.remove(file)
 }
 
@@ -46,12 +47,12 @@ export async function removeEmptyDirs(dir: string): Promise<void> {
 }
 
 export async function readJSON(file: string) {
-  debug('readJSON', file)
+  fileDebug('readJSON', file)
   return deps.fs.readJSON(file)
 }
 
 export async function outputJSON(file: string, data: any) {
-  debug('outputJSON', file)
+  fileDebug('outputJSON', file)
   return deps.fs.outputJSON(file, data, {spaces: 2})
 }
 

packages/cli/src/lib/git/git.ts

@@ -5,11 +5,12 @@ import * as fs from 'fs'
 import {promisify} from 'util'
 const execFile = promisify(cp.execFile)
 
-const debug = require('debug')('git')
+import debug from 'debug'
+const gitDebug = debug('git')
 
 export default class Git {
   public async exec(args: string[]): Promise<string> {
-    debug('exec: git %o', args)
+    gitDebug('exec: git %o', args)
     try {
       const {stdout, stderr} = await execFile('git', args)
       if (stderr) process.stderr.write(stderr)
@@ -25,7 +26,7 @@ export default class Git {
 
   public spawn(args: string[]) {
     return new Promise((resolve, reject) => {
-      debug('spawn: git %o', args)
+      gitDebug('spawn: git %o', args)
       const s = cp.spawn('git', args, {stdio: [0, 1, 2]})
       s.on('error', (err: Error & {code?: string}) => {
         if (err.code === 'ENOENT') {

packages/cli/src/lib/pg/download.ts

@@ -1,9 +1,7 @@
-
 import * as fs from 'fs-extra'
 import * as Path from 'path'
-const https = require('https')
-const bytes = require('bytes')
-const progress = require('smooth-progress')
+import * as https from 'https'
+import cliProgress from 'cli-progress'
 
 type downloadOptions = {
   progress: boolean
@@ -13,15 +11,19 @@ export default function download(url: string, path: string, opts: downloadOption
   const tty = process.stderr.isTTY && process.env.TERM !== 'dumb'
 
   function showProgress(rsp: any) {
-    const bar = progress({
-      tmpl: `Downloading ${path}... :bar :percent :eta :data`,
-      width: 25,
-      total: Number.parseInt(rsp.headers['content-length'], 10),
+    const bar = new cliProgress.SingleBar({
+      format: `Downloading ${path}... |{bar}| {percentage}% | ETA: {eta}s | {value}/{total} bytes`,
+      barCompleteChar: '\u2588',
+      barIncompleteChar: '\u2591',
     })
+    bar.start(Number.parseInt(rsp.headers['content-length'], 10), 0)
     let total = 0
     rsp.on('data', function (chunk: string) {
       total += chunk.length
-      bar.tick(chunk.length, {data: bytes(total, {decimalPlaces: 2, fixedDecimals: 2})})
+      bar.update(total)
+    })
+    rsp.on('end', () => {
+      bar.stop()
     })
   }
 

packages/cli/src/lib/releases/output.ts

@@ -1,4 +1,4 @@
-const got = require('got')
+import got from 'got'
 
 export const stream = function (url: string) {
   return new Promise(function (resolve, reject) {

packages/cli/src/lib/utils/packageParser.ts

@@ -1,4 +1,12 @@
-const {oclif} = require('../../../package.json')
+import path from 'node:path'
+import * as fs from 'node:fs'
+import {fileURLToPath} from 'node:url'
+
+const __filename = fileURLToPath(import.meta.url)
+const __dirname = path.dirname(__filename)
+const packageJsonPath = path.resolve(__dirname, '../../../package.json')
+const pjson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf-8'))
+const { oclif } = pjson
 
 export function getAllVersionFlags() {
   return [...oclif.additionalVersionFlags, '--version']

packages/cli/src/oldCommands/dashboard.ts

@@ -6,7 +6,7 @@ import {round, flatten, mean, groupBy, map, sum, sumBy, sortBy, zip} from 'lodas
 import img from 'term-img'
 import * as path from 'path'
 import {execSync} from 'child_process'
-const sparkline = require('sparkline')
+import sparkline from 'sparkline'
 import {ago} from '../lib/time.js'
 import {AppErrors} from '../lib/types/app_errors.js'
 import * as process from 'process'

packages/cli/src/user-config.ts

@@ -4,6 +4,9 @@ import * as path from 'path'
 
 import deps from './deps.js'
 
+import debug from 'debug'
+const userConfigDebug = debug('heroku:user_config')
+
 export interface ConfigJSON {
   schema: 1;
   install?: string;
@@ -48,7 +51,7 @@ export default class UserConfig {
     if (this._init) return this._init
 
     this._init = (async () => {
-      this.debug('init')
+      userConfigDebug('init')
       this.body = (await this.read()) || {schema: 1}
 
       if (!this.body.schema) {
@@ -66,10 +69,6 @@ export default class UserConfig {
     return this._init
   }
 
-  private get debug() {
-    return require('debug')('heroku:user_config')
-  }
-
   private get file() {
     return path.join(this.config.dataDir, 'config.json')
   }
@@ -78,7 +77,7 @@ export default class UserConfig {
     if (!this.needsSave) return
     this.needsSave = false
     this.saving = (async () => {
-      this.debug('saving')
+      userConfigDebug('saving')
       if (!await this.canWrite()) {
         throw new Error('file modified, cannot save')
       }
@@ -95,15 +94,15 @@ export default class UserConfig {
       return body
     } catch (error: any) {
       if (error.code !== 'ENOENT') throw error
-      this.debug('not found')
+      userConfigDebug('not found')
     }
   }
 
   private async migrate() {
     if (await deps.file.exists(this.file)) return
     const old = path.join(this.config.configDir, 'config.json')
     if (!await deps.file.exists(old)) return
-    this.debug('moving config into new place')
+    userConfigDebug('moving config into new place')
     await deps.file.rename(old, this.file)
   }
 

yarn.lock

@@ -11136,6 +11136,7 @@ __metadata:
     chai: ^4.4.1
     chai-as-promised: ^7.1.1
     chalk: ^2.4.2
+    cli-progress: ^3.12.0
     commander: ^2.15.1
     date-fns: ^2.30.0
     debug: 4.3.4
@@ -11173,7 +11174,6 @@ __metadata:
     shell-escape: ^0.2.0
     shell-quote: ^1.8.1
     sinon: ^19.0.2
-    smooth-progress: ^1.1.0
     source-map-support: ^0.5.21
     sparkline: ^0.2.0
     ssh2: ^1.16.0
@@ -17272,7 +17272,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"smooth-progress@npm:1.1.0, smooth-progress@npm:^1.1.0":
+"smooth-progress@npm:1.1.0":
   version: 1.1.0
   resolution: "smooth-progress@npm:1.1.0"
   dependencies: