Upgrade many oclif and misc packages (#91)

* Upgrade many oclif and misc packages

* Upgrade versions based on new package.json specs

Author: eablack

package.json

@@ -5,31 +5,31 @@
   "author": "Heroku",
   "bugs": "https://github.com/heroku/heroku-cli-addons-admin/issues",
   "dependencies": {
-    "@heroku-cli/color": "^1.1.5",
-    "@heroku-cli/command": "^8.1.26",
+    "@heroku-cli/color": "^2.0.4",
+    "@heroku-cli/command": "^8.5.0",
     "@heroku-cli/schema": "^1.0.3",
-    "@oclif/command": "^1.5.4",
-    "@oclif/config": "^1.8.8",
-    "@types/fs-extra": "^5.0.4",
-    "cli-ux": "^4.7.3",
+    "@oclif/command": "^1.8.36",
+    "@oclif/config": "^1.18.17",
+    "@oclif/plugin-help": "^3.3.1",
+    "cli-ux": "^5.2.1",
     "diff": "^3.5.0",
-    "fs-extra": "^7.0.0",
-    "inquirer": "^6.5.2",
+    "fs-extra": "^9.1.0",
+    "http-call": "5.3.0",
+    "inquirer": "^8.2.6",
     "jsdiff": "^1.1.1",
-    "lodash": "^4.17.11",
+    "lodash": "^4.17.21",
     "randomstring": "^1.3.0",
-    "tslib": "^1"
+    "tslib": "2.6.3"
   },
   "devDependencies": {
-    "@oclif/config": "^1.8.8",
-    "@oclif/dev-cli": "^1",
-    "@oclif/plugin-help": "^1",
-    "@oclif/test": "^1.1.0",
+    "@heroku-cli/dev-cli": "^1.26.13",
+    "@oclif/test": "^2.5.6",
     "@types/chai": "^4",
     "@types/diff": "^3.5.1",
     "@types/execa": "^0.9.0",
-    "@types/glob": "^7.2.0",
-    "@types/inquirer": "^6.0.2",
+    "@types/fs-extra": "^9.0.13",
+    "@types/glob": "8.1.0",
+    "@types/inquirer": "^8.2.10",
     "@types/mocha": "^10.0.7",
     "@types/nock": "^9.3.0",
     "@types/node": "^10.9.4",
@@ -44,9 +44,9 @@
     "mocha": "^10.7.3",
     "nock": "^13.5.4",
     "nyc": "^15.1.0",
-    "sinon": "^16.1.3",
-    "ts-node": "^7.0.1",
-    "tsutils": "2.27.2",
+    "sinon": "^18.0.0",
+    "ts-node": "^10.9.2",
+    "tsheredoc": "^1.0.1",
     "typescript": "4.9.5"
   },
   "engines": {

src/addon-client.ts

@@ -1,7 +1,7 @@
 import {APIClient} from '@heroku-cli/command'
 import cli from 'cli-ux'
-import * as _ from 'lodash'
 import * as url from 'url'
+import {HTTPError} from 'http-call'
 
 export default class AddonClient {
   private readonly client: APIClient
@@ -23,39 +23,35 @@ export default class AddonClient {
   }
 
   async get(path: string): Promise<any> {
-    try {
-      const response = await this.client.get(path, this.options)
-      return response.body
-    } catch (error) {
-      const errorBody = _.get(error, 'body.error')
+    const response = await this.client.get(path, this.options).catch((error: HTTPError) => {
+      const errorBody = error?.body?.error
       if (errorBody) {
         cli.error(errorBody)
       }
 
       throw error
-    }
+    })
+    return response.body
   }
 
-  async post(path: string, requestBody: any): Promise<any> {
-    try {
-      const opts = {
-        ...this.options,
-        body: requestBody,
-      }
-      const response = await this.client.post(path, opts)
-      return response.body
-    } catch (error) {
-      const baseErrors = _.get(error, 'body.error.base')
+  async post(path: string, requestBody: unknown): Promise<any> {
+    const opts = {
+      ...this.options,
+      body: requestBody,
+    }
+    const response = await this.client.post(path, opts).catch((error: HTTPError) => {
+      const baseErrors = error?.body?.error?.base
       if (baseErrors) {
         cli.error(baseErrors.join(', '))
       }
 
-      const errorBody = _.get(error, 'body.error')
+      const errorBody = error?.body?.error
       if (errorBody) {
         cli.error(errorBody)
       }
 
       throw error
-    }
+    })
+    return response.body
   }
 }

src/addon.ts

@@ -2,7 +2,7 @@ import cli from 'cli-ux'
 
 import color from '@heroku-cli/color'
 import {IConfig} from '@oclif/config'
-import * as _ from 'lodash'
+import {HTTPError} from 'http-call'
 
 import AddonClient from './addon-client'
 import {ManifestInterface, ManifestLocal, ManifestRemote} from './manifest'
@@ -44,21 +44,19 @@ export default class Addon {
   }
 
   async manifests(): Promise<ManifestInterface[]> {
-    try {
-      const slug = await this.slug()
-      cli.action.start(`Fetching add-on manifests for ${color.addon(slug)}`)
-      const body = await this._client.get(`/api/v3/addons/${encodeURIComponent(slug)}/manifests`)
-      cli.action.stop()
-
-      return body
-    } catch (error) {
-      const errorBody = _.get(error, 'body.error')
+    const slug = await this.slug()
+    cli.action.start(`Fetching add-on manifests for ${color.addon(slug)}`)
+    const body = await this._client.get(`/api/v3/addons/${encodeURIComponent(slug)}/manifests`).catch((error: HTTPError) => {
+      const errorBody = error?.body?.error
       if (errorBody) {
         cli.error(errorBody)
       }
 
       throw error
-    }
+    })
+
+    cli.action.stop()
+    return body
   }
 
   async manifest(uuid: string): Promise<ManifestInterface> {

src/commands/addons/admin/manifests.ts

@@ -16,11 +16,14 @@ export default class AddonsAdminManifests extends Command {
 
     const body = await addon.manifests()
 
-    const columns = [
-      {label: 'Manifest', key: 'id'},
-      {label: 'Created At', key: 'created_at'},
-    ]
-
-    cli.table(_.orderBy(body, 'created_at', 'desc'), {columns})
+    const manifests = _.orderBy(body, 'created_at', 'desc')
+    cli.table(manifests, {
+      Manifest: {
+        get: (row: any) => row.id,
+      },
+      'Created At': {
+        get: (row: any) => row.created_at,
+      },
+    })
   }
 }

test/commands/addons/admin/manifests.test.ts

@@ -1,5 +1,5 @@
 import {expect} from '@oclif/test'
-
+import heredoc from 'tsheredoc'
 import test from '../../../utils/test'
 
 const host = process.env.HEROKU_ADDONS_HOST || 'https://addons.heroku.com'
@@ -30,13 +30,11 @@ describe('addons:admin:manifests', () => {
     .stdout()
     .command(['addons:admin:manifests'])
     .it('prints a list of manifests', ctx => {
-      expect(ctx.stdout).to.equal(
-      // eslint-disable-next-line indent
-`Manifest                              Created At
-────────────────────────────────────  ────────────────────────
-80d90dfb-049f-436b-9543-24cc7b691352  2017-07-19T21:47:25.894Z
-1a2e3c33-c949-4599-97d9-4ed684c35c2f  2017-07-18T21:47:25.894Z
-`)
+      expect(ctx.stdout.trim()).to.eq(heredoc(`
+        Manifest                             Created at               
+         ──────────────────────────────────── ──────────────────────── 
+         80d90dfb-049f-436b-9543-24cc7b691352 2017-07-19T21:47:25.894Z 
+         1a2e3c33-c949-4599-97d9-4ed684c35c2f 2017-07-18T21:47:25.894Z`))
     })
 
   test
@@ -47,12 +45,10 @@ describe('addons:admin:manifests', () => {
     .stdout()
     .command(['addons:admin:manifests', 'arg-slug'])
     .it('prints a list of manifests', ctx => {
-      expect(ctx.stdout).to.equal(
-      // eslint-disable-next-line indent
-`Manifest                              Created At
-────────────────────────────────────  ────────────────────────
-80d90dfb-049f-436b-9543-24cc7b691352  2017-07-19T21:47:25.894Z
-1a2e3c33-c949-4599-97d9-4ed684c35c2f  2017-07-18T21:47:25.894Z
-`)
+      expect(ctx.stdout.trim()).to.eq(heredoc(`
+        Manifest                             Created at               
+         ──────────────────────────────────── ──────────────────────── 
+         80d90dfb-049f-436b-9543-24cc7b691352 2017-07-19T21:47:25.894Z 
+         1a2e3c33-c949-4599-97d9-4ed684c35c2f 2017-07-18T21:47:25.894Z`))
     })
 })