heroku 10.13.2-beta.0 → 11.0.0-alpha.1

package/lib/hooks/recache.js

@@ -1,56 +1,47 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const command_1 = require("@heroku-cli/command");
-const completions_1 = require("@heroku-cli/command/lib/completions");
-const core_1 = require("@oclif/core");
-const fs = require("fs-extra");
-const path = require("path");
-const cache_1 = require("../lib/autocomplete/cache");
-const create_1 = require("../commands/autocomplete/create");
-const completions = async function ({ type, app }) {
-    // autocomplete is now in core, skip windows
-    if (this.config.windows)
-        return;
-    const logInOut = type === 'login' || type === 'logout';
-    const completionsDir = path.join(this.config.cacheDir, 'autocomplete', 'completions');
-    const rm = () => fs.emptyDir(completionsDir);
-    const rmKey = (cacheKey) => fs.remove(path.join(completionsDir, cacheKey));
-    if (type === 'app')
-        return rmKey('app');
-    if (type === 'addon' && app)
-        return rmKey(`${app}_addons`);
-    if (type === 'config' && app)
-        return rmKey(`${app}_config_vars`);
-    if (logInOut)
-        return rm();
-    const update = async (completion, cacheKey) => {
-        const cachePath = path.join(completionsDir, cacheKey);
-        const options = await completion.options({ config: this.config });
-        await (0, cache_1.updateCache)(cachePath, options);
-    };
-    // if user is not logged in, exit
-    try {
-        const heroku = new command_1.APIClient(this.config);
-        if (!heroku.auth)
-            return;
-        await heroku.get('/account', { retryAuth: false });
-    }
-    catch (error) {
-        this.debug(error.message);
-        return;
-    }
-    core_1.ux.action.start('Updating completions');
-    await rm();
-    await create_1.default.run([], this.config);
-    try {
-        await update(completions_1.AppCompletion, 'app');
-        await update(completions_1.PipelineCompletion, 'pipeline');
-        await update(completions_1.SpaceCompletion, 'space');
-        await update(completions_1.TeamCompletion, 'team');
-    }
-    catch (error) {
-        this.debug(error.message);
-    }
-    core_1.ux.action.stop();
-};
-exports.default = completions;
+// import {APIClient} from '@heroku-cli/command'
+// import {AppCompletion, PipelineCompletion, SpaceCompletion, TeamCompletion} from '@heroku-cli/command/lib/completions'
+// import {Interfaces, ux} from '@oclif/core'
+// import * as fs from 'fs-extra'
+// import * as path from 'path'
+export {};
+// import {updateCache} from '../lib/autocomplete/cache'
+// import acCreate from '../commands/autocomplete/create'
+// const completions: Interfaces.Hook<'app' | 'addon' | 'config' | 'login' | 'logout'> = async function ({type, app}) {
+//   // autocomplete is now in core, skip windows
+//   if (this.config.windows) return
+//   const logInOut = type === 'login' || type === 'logout'
+//   const completionsDir = path.join(this.config.cacheDir, 'autocomplete', 'completions')
+//   const rm = () => fs.emptyDir(completionsDir)
+//   const rmKey = (cacheKey: string) => fs.remove(path.join(completionsDir, cacheKey))
+//   if (type === 'app') return rmKey('app')
+//   if (type === 'addon' && app) return rmKey(`${app}_addons`)
+//   if (type === 'config' && app) return rmKey(`${app}_config_vars`)
+//   if (logInOut) return rm()
+//   const update = async (completion: any, cacheKey: string) => {
+//     const cachePath = path.join(completionsDir, cacheKey)
+//     const options = await completion.options({config: this.config})
+//     await updateCache(cachePath, options)
+//   }
+//   // if user is not logged in, exit
+//   try {
+//     const heroku = new APIClient(this.config)
+//     if (!heroku.auth) return
+//     await heroku.get('/account', {retryAuth: false})
+//   } catch (error: any) {
+//     this.debug(error.message)
+//     return
+//   }
+//   ux.action.start('Updating completions')
+//   await rm()
+//   await acCreate.run([], this.config)
+//   try {
+//     await update(AppCompletion, 'app')
+//     await update(PipelineCompletion, 'pipeline')
+//     await update(SpaceCompletion, 'space')
+//     await update(TeamCompletion, 'team')
+//   } catch (error: any) {
+//     this.debug(error.message)
+//   }
+//   ux.action.stop()
+// }
+// export default completions

package/lib/hooks/update/brew.js

@@ -1,12 +1,11 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const child_process_1 = require("child_process");
-const path = require("path");
-const fs = require("../../file");
-const debug = require('debug')('heroku:brewhook');
+import { spawnSync } from 'child_process';
+import * as path from 'path';
+import debug from 'debug';
+import * as fs from '../../file.js';
+const debugLog = debug('heroku:brewhook');
 function brew(args, opts = {}) {
-    debug('brew %o', args);
-    return (0, child_process_1.spawnSync)('brew', args, Object.assign(Object.assign({ stdio: 'inherit' }, opts), { encoding: 'utf8' }));
+    debugLog('brew %o', args);
+    return spawnSync('brew', args, { stdio: 'inherit', ...opts, encoding: 'utf8' });
 }
 const brewHook = async function () {
     if (this.config.platform !== 'darwin')
@@ -38,9 +37,9 @@ const brewHook = async function () {
     };
     if (!await needsMigrate())
         return;
-    debug('migrating from brew');
+    debugLog('migrating from brew');
     // not on private tap, move to it
     brew(['uninstall', 'heroku']);
     brew(['install', 'heroku/brew/heroku']);
 };
-exports.default = brewHook;
+export default brewHook;

package/lib/hooks/update/completions.js

@@ -1,9 +1,7 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
 const doRecache = async function () {
     // autocomplete is now in core, skip windows
     if (this.config.windows)
         return;
     await this.config.runHook('recache', { type: 'update' });
 };
-exports.default = doRecache;
+export default doRecache;

package/lib/hooks/update/plugin-migrate.js

@@ -1,11 +1,7 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const fs = require("fs-extra");
-const path = require("path");
-const exec = (cmd, args) => {
-    const execa = require('execa');
-    return execa(cmd, args, { stdio: 'inherit' });
-};
+import * as fs from 'fs-extra';
+import * as path from 'path';
+import execa from 'execa';
+const exec = (cmd, args) => execa(cmd, args, { stdio: 'inherit' });
 const migrate = async function () {
     if (process.argv[2] && process.argv[2].startsWith('plugins'))
         return;
@@ -55,4 +51,4 @@ const migrate = async function () {
     await removeYarnLockFile();
     await migrateV6Plugins();
 };
-exports.default = migrate;
+export default migrate;

package/lib/hooks/update/tidy.js

@@ -1,15 +1,13 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const path = require("path");
-const deps_1 = require("../../deps");
+import * as path from 'path';
+import deps from '../../deps.js';
 const tidy = async function () {
     const cleanupPlugins = async () => {
         const pluginsDir = path.join(this.config.dataDir, 'plugins');
-        if (await deps_1.default.file.exists(path.join(pluginsDir, 'plugins.json')))
+        if (await deps.file.exists(path.join(pluginsDir, 'plugins.json')))
             return;
         let pjson;
         try {
-            pjson = await deps_1.default.file.readJSON(path.join(pluginsDir, 'package.json'));
+            pjson = await deps.file.readJSON(path.join(pluginsDir, 'package.json'));
         }
         catch (error) {
             if (error.code !== 'ENOENT')
@@ -17,15 +15,15 @@ const tidy = async function () {
             return;
         }
         if (!pjson.dependencies || Object.keys(pjson.dependencies).length === 0) {
-            await deps_1.default.file.remove(path.join(pluginsDir));
+            await deps.file.remove(path.join(pluginsDir));
         }
     };
-    await deps_1.default.file.removeEmptyDirs(path.join(this.config.dataDir, 'tmp'));
+    await deps.file.removeEmptyDirs(path.join(this.config.dataDir, 'tmp'));
     if (this.config.configDir !== this.config.dataDir) {
-        await deps_1.default.file.removeEmptyDirs(this.config.configDir);
+        await deps.file.removeEmptyDirs(this.config.configDir);
     }
     if (this.config.cacheDir !== this.config.dataDir) {
         await cleanupPlugins();
     }
 };
-exports.default = tidy;
+export default tidy;

package/lib/index.js

@@ -1,5 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.run = void 0;
-var core_1 = require("@oclif/core");
-Object.defineProperty(exports, "run", { enumerable: true, get: function () { return core_1.run; } });
+export { run } from '@oclif/core';

package/lib/lib/accounts/accounts.d.ts

@@ -1,6 +1,21 @@
 import * as Heroku from '@heroku-cli/schema';
-export declare function list(): Heroku.Account[] | [];
-export declare function current(): string | null;
-export declare function add(name: string, username: string, password: string): void;
-export declare function remove(name: string): void;
-export declare function set(name: string): void;
+export interface IAccountsWrapper {
+    list(): Heroku.Account[] | [];
+    current(): Promise<string | null>;
+    add(name: string, username: string, password: string): void;
+    remove(name: string): void;
+    set(name: string): Promise<void>;
+}
+export declare class AccountsWrapper implements IAccountsWrapper {
+    private netrc;
+    private initNetrc;
+    private configDir;
+    private account;
+    list(): Heroku.Account[] | [];
+    current(): Promise<string | null>;
+    add(name: string, username: string, password: string): void;
+    remove(name: string): void;
+    set(name: string): Promise<void>;
+}
+declare const _default: AccountsWrapper;
+export default _default;

package/lib/lib/accounts/accounts.js

@@ -1,70 +1,73 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.set = exports.remove = exports.add = exports.current = exports.list = void 0;
-const yaml_1 = require("yaml");
-const fs = require("fs");
-const os = require("node:os");
-const path = require("node:path");
-const netrc_parser_1 = require("netrc-parser");
-function configDir() {
-    const legacyDir = path.join(os.homedir(), '.heroku');
-    if (fs.existsSync(legacyDir)) {
-        return legacyDir;
+import { parse, stringify } from 'yaml';
+import fs from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
+export class AccountsWrapper {
+    netrc;
+    async initNetrc() {
+        if (!this.netrc) {
+            const NetrcModule = await import('netrc-parser');
+            const NetrcClass = NetrcModule.Netrc || NetrcModule.default.constructor;
+            this.netrc = new NetrcClass();
+            await this.netrc.load();
+        }
+        return this.netrc;
     }
-    return path.join(os.homedir(), '.config', 'heroku');
-}
-function account(name) {
-    const basedir = path.join(configDir(), 'accounts');
-    const file = fs.readFileSync(path.join(basedir, name), 'utf8');
-    const account = (0, yaml_1.parse)(file);
-    if (account[':username']) {
-        // convert from ruby symbols
-        account.username = account[':username'];
-        account.password = account[':password'];
-        delete account[':username'];
-        delete account[':password'];
+    configDir() {
+        const legacyDir = path.join(os.homedir(), '.heroku');
+        if (fs.existsSync(legacyDir)) {
+            return legacyDir;
+        }
+        return path.join(os.homedir(), '.config', 'heroku');
     }
-    return account;
-}
-function list() {
-    const basedir = path.join(configDir(), 'accounts');
-    try {
-        return fs.readdirSync(basedir)
-            .map(name => Object.assign(account(name), { name }));
+    account(name) {
+        const basedir = path.join(this.configDir(), 'accounts');
+        const file = fs.readFileSync(path.join(basedir, name), 'utf8');
+        const account = parse(file);
+        if (account[':username']) {
+            // convert from ruby symbols
+            account.username = account[':username'];
+            account.password = account[':password'];
+            delete account[':username'];
+            delete account[':password'];
+        }
+        return account;
     }
-    catch (_a) {
-        return [];
+    list() {
+        const basedir = path.join(this.configDir(), 'accounts');
+        try {
+            return fs.readdirSync(basedir)
+                .map(name => Object.assign(this.account(name), { name }));
+        }
+        catch {
+            return [];
+        }
     }
-}
-exports.list = list;
-function current() {
-    if (netrc_parser_1.default.machines['api.heroku.com']) {
-        const current = list().find(a => a.username === netrc_parser_1.default.machines['api.heroku.com'].login);
-        return current && current.name ? current.name : null;
+    async current() {
+        const netrcInstance = await this.initNetrc();
+        if (netrcInstance.machines['api.heroku.com']) {
+            const current = this.list().find(a => a.username === netrcInstance.machines['api.heroku.com'].login);
+            return current && current.name ? current.name : null;
+        }
+        return null;
+    }
+    add(name, username, password) {
+        const basedir = path.join(this.configDir(), 'accounts');
+        fs.mkdirSync(basedir, { recursive: true });
+        fs.writeFileSync(path.join(basedir, name), stringify({ username, password }), 'utf8');
+        fs.chmodSync(path.join(basedir, name), 0o600);
+    }
+    remove(name) {
+        const basedir = path.join(this.configDir(), 'accounts');
+        fs.unlinkSync(path.join(basedir, name));
+    }
+    async set(name) {
+        const netrcInstance = await this.initNetrc();
+        const current = this.account(name);
+        netrcInstance.machines['git.heroku.com'] = { login: current.username, password: current.password };
+        netrcInstance.machines['api.heroku.com'] = { login: current.username, password: current.password };
+        await netrcInstance.save();
     }
-    return null;
-}
-exports.current = current;
-function add(name, username, password) {
-    const basedir = path.join(configDir(), 'accounts');
-    fs.mkdirSync(basedir, { recursive: true });
-    fs.writeFileSync(path.join(basedir, name), (0, yaml_1.stringify)({ username, password }), 'utf8');
-    fs.chmodSync(path.join(basedir, name), 0o600);
-}
-exports.add = add;
-function remove(name) {
-    const basedir = path.join(configDir(), 'accounts');
-    fs.unlinkSync(path.join(basedir, name));
-}
-exports.remove = remove;
-function set(name) {
-    const current = account(name);
-    netrc_parser_1.default.machines['git.heroku.com'] = {};
-    netrc_parser_1.default.machines['api.heroku.com'] = {};
-    netrc_parser_1.default.machines['git.heroku.com'].login = current.username;
-    netrc_parser_1.default.machines['api.heroku.com'].login = current.username;
-    netrc_parser_1.default.machines['git.heroku.com'].password = current.password;
-    netrc_parser_1.default.machines['api.heroku.com'].password = current.password;
-    netrc_parser_1.default.saveSync();
 }
-exports.set = set;
+// Default export for convenience
+export default new AccountsWrapper();

package/lib/lib/addons/addons_wait.js

@@ -1,35 +1,29 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.waitForAddonDeprovisioning = exports.waitForAddonProvisioning = void 0;
-const core_1 = require("@oclif/core");
-const color_1 = require("@heroku-cli/color");
-const waitForAddonProvisioning = async function (api, addon, interval) {
-    var _a;
-    const app = ((_a = addon.app) === null || _a === void 0 ? void 0 : _a.name) || '';
+import { ux } from '@oclif/core';
+import { color } from '@heroku-cli/color';
+export const waitForAddonProvisioning = async function (api, addon, interval) {
+    const app = addon.app?.name || '';
     const addonName = addon.name;
-    let addonBody = Object.assign({}, addon);
-    core_1.ux.action.start(`Creating ${color_1.default.addon(addonName || '')}`);
+    let addonBody = { ...addon };
+    ux.action.start(`Creating ${color.addon(addonName || '')}`);
     while (addonBody.state === 'provisioning') {
         // eslint-disable-next-line no-promise-executor-return
         await new Promise(resolve => setTimeout(resolve, interval * 1000));
         const addonResponse = await api.get(`/apps/${app}/addons/${addonName}`, {
             headers: { 'Accept-Expansion': 'addon_service,plan' },
         });
-        addonBody = addonResponse === null || addonResponse === void 0 ? void 0 : addonResponse.body;
+        addonBody = addonResponse?.body;
     }
     if (addonBody.state === 'deprovisioned') {
         throw new Error(`The add-on was unable to be created, with status ${addonBody.state}`);
     }
-    core_1.ux.action.stop();
+    ux.action.stop();
     return addonBody;
 };
-exports.waitForAddonProvisioning = waitForAddonProvisioning;
-const waitForAddonDeprovisioning = async function (api, addon, interval) {
-    var _a;
-    const app = ((_a = addon.app) === null || _a === void 0 ? void 0 : _a.name) || '';
+export const waitForAddonDeprovisioning = async function (api, addon, interval) {
+    const app = addon.app?.name || '';
     const addonName = addon.name || '';
-    let addonResponse = Object.assign({}, addon);
-    core_1.ux.action.start(`Destroying ${color_1.default.addon(addonName)}`);
+    let addonResponse = { ...addon };
+    ux.action.start(`Destroying ${color.addon(addonName)}`);
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-ignore
     while (addonResponse.state === 'deprovisioning') {
@@ -38,11 +32,10 @@ const waitForAddonDeprovisioning = async function (api, addon, interval) {
         await api.get(`/apps/${app}/addons/${addonName}`, {
             headers: { 'Accept-Expansion': 'addon_service,plan' },
         }).then(response => {
-            addonResponse = response === null || response === void 0 ? void 0 : response.body;
+            addonResponse = response?.body;
         }).catch(function (error) {
-            var _a;
             // Not ideal, but API deletes the record returning a 404 when deprovisioned.
-            if (error.statusCode === 404 || ((_a = error.http) === null || _a === void 0 ? void 0 : _a.statusCode) === 404) {
+            if (error.statusCode === 404 || error.http?.statusCode === 404) {
                 addonResponse.state = 'deprovisioned';
             }
             else {
@@ -50,7 +43,6 @@ const waitForAddonDeprovisioning = async function (api, addon, interval) {
             }
         });
     }
-    core_1.ux.action.stop();
+    ux.action.stop();
     return addonResponse;
 };
-exports.waitForAddonDeprovisioning = waitForAddonDeprovisioning;

package/lib/lib/addons/create_addon.js

@@ -1,20 +1,17 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const core_1 = require("@oclif/core");
-const color_1 = require("@heroku-cli/color");
-const util = require("./util");
-const addons_wait_1 = require("./addons_wait");
+import { ux } from '@oclif/core';
+import { color } from '@heroku-cli/color';
+import * as util from './util.js';
+import { waitForAddonProvisioning } from './addons_wait.js';
 function formatConfigVarsMessage(addon) {
     const configVars = addon.config_vars || [];
     if (configVars.length > 0) {
-        return `Created ${color_1.default.addon(addon.name || '')} as ${configVars.map((c) => color_1.default.configVar(c)).join(', ')}`;
+        return `Created ${color.addon(addon.name || '')} as ${configVars.map((c) => color.configVar(c)).join(', ')}`;
     }
-    return `Created ${color_1.default.addon(addon.name || '')}`;
+    return `Created ${color.addon(addon.name || '')}`;
 }
 // eslint-disable-next-line max-params
-async function default_1(heroku, app, plan, confirm, wait, options) {
+export default async function (heroku, app, plan, confirm, wait, options) {
     async function createAddonRequest(confirmed) {
-        var _a;
         const body = {
             confirm: confirmed,
             name: options.name,
@@ -22,7 +19,7 @@ async function default_1(heroku, app, plan, confirm, wait, options) {
             plan: { name: plan },
             attachment: { name: options.as },
         };
-        core_1.ux.action.start(`Creating ${plan} on ${color_1.default.app(app)}`);
+        ux.action.start(`Creating ${plan} on ${color.app(app)}`);
         const { body: addon } = await heroku.post(`/apps/${app}/addons`, {
             body,
             headers: {
@@ -30,30 +27,29 @@ async function default_1(heroku, app, plan, confirm, wait, options) {
                 'x-heroku-legacy-provider-messages': 'true',
             },
         });
-        core_1.ux.action.stop(color_1.default.green(util.formatPriceText(((_a = addon.plan) === null || _a === void 0 ? void 0 : _a.price) || '')));
+        ux.action.stop(color.green(util.formatPriceText(addon.plan?.price || '')));
         return addon;
     }
     let addon = await util.trapConfirmationRequired(app, confirm, confirm => (createAddonRequest(confirm)));
     if (addon.provision_message) {
-        core_1.ux.log(addon.provision_message);
+        ux.stdout(addon.provision_message);
     }
     if (addon.state === 'provisioning') {
         if (wait) {
-            core_1.ux.log(`Waiting for ${color_1.default.addon(addon.name || '')}...`);
-            addon = await (0, addons_wait_1.waitForAddonProvisioning)(heroku, addon, 5);
-            core_1.ux.log(formatConfigVarsMessage(addon));
+            ux.stdout(`Waiting for ${color.addon(addon.name || '')}...`);
+            addon = await waitForAddonProvisioning(heroku, addon, 5);
+            ux.stdout(formatConfigVarsMessage(addon));
         }
         else {
-            core_1.ux.log(`${color_1.default.addon(addon.name || '')} is being created in the background. The app will restart when complete...`);
-            core_1.ux.log(`Use ${color_1.default.cmd('heroku addons:info ' + addon.name)} to check creation progress`);
+            ux.stdout(`${color.addon(addon.name || '')} is being created in the background. The app will restart when complete...`);
+            ux.stdout(`Use ${color.cmd('heroku addons:info ' + addon.name)} to check creation progress`);
         }
     }
     else if (addon.state === 'deprovisioned') {
         throw new Error(`The add-on was unable to be created, with status ${addon.state}`);
     }
     else {
-        core_1.ux.log(formatConfigVarsMessage(addon));
+        ux.stdout(formatConfigVarsMessage(addon));
     }
     return addon;
 }
-exports.default = default_1;

package/lib/lib/addons/destroy_addon.js

@@ -1,14 +1,11 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const addons_wait_1 = require("./addons_wait");
-const color_1 = require("@heroku-cli/color");
-const core_1 = require("@oclif/core");
-async function default_1(heroku, addon, force = false, wait = false) {
+import { waitForAddonDeprovisioning } from './addons_wait.js';
+import { color } from '@heroku-cli/color';
+import { ux } from '@oclif/core';
+export default async function (heroku, addon, force = false, wait = false) {
     const addonName = addon.name || '';
     async function destroyAddonRequest() {
-        var _a, _b;
-        core_1.ux.action.start(`Destroying ${color_1.default.addon(addonName)} on ${color_1.default.app(((_a = addon.app) === null || _a === void 0 ? void 0 : _a.name) || '')}`);
-        const { body: addonDelete } = await heroku.delete(`/apps/${(_b = addon.app) === null || _b === void 0 ? void 0 : _b.id}/addons/${addon.id}`, {
+        ux.action.start(`Destroying ${color.addon(addonName)} on ${color.app(addon.app?.name || '')}`);
+        const { body: addonDelete } = await heroku.delete(`/apps/${addon.app?.id}/addons/${addon.id}`, {
             headers: { 'Accept-Expansion': 'plan' },
             body: { force },
         }).catch(error => {
@@ -22,9 +19,9 @@ async function default_1(heroku, addon, force = false, wait = false) {
         // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-ignore
         if (addonDelete.state === 'deprovisioning') {
-            core_1.ux.action.stop(color_1.default.yellow('pending'));
+            ux.action.stop(color.yellow('pending'));
         }
-        core_1.ux.action.stop();
+        ux.action.stop();
         return addonDelete;
     }
     let addonResponse = await destroyAddonRequest();
@@ -32,12 +29,12 @@ async function default_1(heroku, addon, force = false, wait = false) {
     // @ts-ignore
     if (addonResponse.state === 'deprovisioning') {
         if (wait) {
-            core_1.ux.log(`Waiting for ${color_1.default.addon(addonName)}...`);
-            addonResponse = await (0, addons_wait_1.waitForAddonDeprovisioning)(heroku, addonResponse, 5);
+            ux.stdout(`Waiting for ${color.addon(addonName)}...`);
+            addonResponse = await waitForAddonDeprovisioning(heroku, addonResponse, 5);
         }
         else {
-            core_1.ux.log(`${color_1.default.addon(addonName)} is being destroyed in the background. The app will restart when complete...`);
-            core_1.ux.log(`Use ${color_1.default.cmd('heroku addons:info ' + addonName)} to check destruction progress`);
+            ux.stdout(`${color.addon(addonName)} is being destroyed in the background. The app will restart when complete...`);
+            ux.stdout(`Use ${color.cmd('heroku addons:info ' + addonName)} to check destruction progress`);
         }
     }
     else if (addonResponse.state !== 'deprovisioned') {
@@ -45,4 +42,3 @@ async function default_1(heroku, addon, force = false, wait = false) {
     }
     return addonResponse;
 }
-exports.default = default_1;

package/lib/lib/addons/resolve.d.ts

@@ -1,6 +1,6 @@
 import { APIClient } from '@heroku-cli/command';
 import type { AddOnAttachment } from '@heroku-cli/schema';
-import type { AddOnAttachmentWithConfigVarsAndPlan } from '../pg/types';
+import type { AddOnAttachmentWithConfigVarsAndPlan } from '../pg/types.js';
 export declare const appAddon: (heroku: APIClient, app: string, id: string, options?: AddOnAttachment) => Promise<AddOnAttachmentWithConfigVarsAndPlan>;
 export declare const addonResolver: (heroku: APIClient, app: string | undefined, id: string, options?: AddOnAttachment) => Promise<AddOnAttachmentWithConfigVarsAndPlan>;
 export declare const appAttachment: (heroku: APIClient, app: string | undefined, id: string, options?: {