heroku 10.13.2 → 11.0.0-alpha.10

package/lib/commands/telemetry/add.js

@@ -1,10 +1,24 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const command_1 = require("@heroku-cli/command");
-const core_1 = require("@oclif/core");
-const tsheredoc_1 = require("tsheredoc");
-const util_1 = require("../../lib/telemetry/util");
-class Add extends command_1.Command {
+import { Command, flags as Flags } from '@heroku-cli/command';
+import { Args, ux } from '@oclif/core';
+import tsheredoc from 'tsheredoc';
+import { validateAndFormatSignals } from '../../lib/telemetry/util.js';
+const heredoc = tsheredoc.default;
+export default class Add extends Command {
+    static description = 'Add and configure a new telemetry drain. Defaults to collecting all telemetry unless otherwise specified.';
+    static flags = {
+        app: Flags.string({ char: 'a', exactlyOne: ['app', 'space'], description: 'app to add a drain to' }),
+        headers: Flags.string({ description: 'custom headers to configure the drain in json format' }),
+        space: Flags.string({ char: 's', description: 'space to add a drain to' }),
+        signals: Flags.string({ default: 'all', description: 'comma-delimited list of signals to collect (traces, metrics, logs). Use "all" to collect all signals.' }),
+        transport: Flags.string({ default: 'http', options: ['http', 'grpc'], description: 'transport protocol for the drain' }),
+    };
+    static args = {
+        endpoint: Args.string({ required: true, description: 'drain url' }),
+    };
+    static example = heredoc(`
+    Add a telemetry drain to an app to collect logs and traces:
+    $ heroku telemetry:add https://my-endpoint.com --app myapp --signals logs,traces --headers '{"x-drain-example-team": "API_KEY", "x-drain-example-dataset": "METRICS_DATASET"}'
+  `);
     async run() {
         const { flags, args } = await this.parse(Add);
         const { app, headers, space, signals, transport } = flags;
@@ -26,7 +40,7 @@ class Add extends command_1.Command {
                 type: app ? 'app' : 'space',
                 id,
             },
-            signals: (0, util_1.validateAndFormatSignals)(signals),
+            signals: validateAndFormatSignals(signals),
             exporter: {
                 endpoint,
                 type: (transport === 'grpc') ? 'otlp' : 'otlphttp',
@@ -39,22 +53,6 @@ class Add extends command_1.Command {
                 Accept: 'application/vnd.heroku+json; version=3.sdk',
             },
         });
-        core_1.ux.log(`successfully added drain ${drain.exporter.endpoint}`);
+        ux.stdout(`successfully added drain ${drain.exporter.endpoint}`);
     }
 }
-exports.default = Add;
-Add.description = 'Add and configure a new telemetry drain. Defaults to collecting all telemetry unless otherwise specified.';
-Add.flags = {
-    app: command_1.flags.string({ char: 'a', exactlyOne: ['app', 'space'], description: 'app to add a drain to' }),
-    headers: command_1.flags.string({ description: 'custom headers to configure the drain in json format' }),
-    space: command_1.flags.string({ char: 's', description: 'space to add a drain to' }),
-    signals: command_1.flags.string({ default: 'all', description: 'comma-delimited list of signals to collect (traces, metrics, logs). Use "all" to collect all signals.' }),
-    transport: command_1.flags.string({ default: 'http', options: ['http', 'grpc'], description: 'transport protocol for the drain' }),
-};
-Add.args = {
-    endpoint: core_1.Args.string({ required: true, description: 'drain url' }),
-};
-Add.example = (0, tsheredoc_1.default)(`
-    Add a telemetry drain to an app to collect logs and traces:
-    $ heroku telemetry:add https://my-endpoint.com --app myapp --signals logs,traces --headers '{"x-drain-example-team": "API_KEY", "x-drain-example-dataset": "METRICS_DATASET"}'
-  `);

package/lib/commands/telemetry/index.d.ts

@@ -1,11 +1,11 @@
 import { Command } from '@heroku-cli/command';
-import { TelemetryDrains } from '../../lib/types/telemetry';
+import { TelemetryDrains } from '../../lib/types/telemetry.js';
 export default class Index extends Command {
     static topic: string;
     static description: string;
     static flags: {
-        space: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        app: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        space: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        app: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
     };
     static example: string;
     run(): Promise<void>;

package/lib/commands/telemetry/index.js

@@ -1,9 +1,14 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const command_1 = require("@heroku-cli/command");
-const core_1 = require("@oclif/core");
-const heroku_cli_util_1 = require("@heroku/heroku-cli-util");
-class Index extends command_1.Command {
+import { Command, flags as Flags } from '@heroku-cli/command';
+import { ux } from '@oclif/core';
+import { hux } from '@heroku/heroku-cli-util';
+export default class Index extends Command {
+    static topic = 'telemetry';
+    static description = 'list telemetry drains';
+    static flags = {
+        space: Flags.string({ char: 's', description: 'filter by space name', exactlyOne: ['app', 'space'] }),
+        app: Flags.string({ char: 'a', description: 'filter by app name' }),
+    };
+    static example = '$ heroku telemetry';
     async run() {
         const { flags } = await this.parse(Index);
         const { app, space } = flags;
@@ -28,11 +33,11 @@ class Index extends command_1.Command {
     }
     display(telemetryDrains, owner) {
         if (telemetryDrains.length === 0) {
-            core_1.ux.log(`There are no telemetry drains in ${owner}`);
+            ux.stdout(`There are no telemetry drains in ${owner}`);
         }
         else {
-            heroku_cli_util_1.hux.styledHeader(`${owner} Telemetry Drains`);
-            heroku_cli_util_1.hux.table(telemetryDrains, {
+            hux.styledHeader(`${owner} Telemetry Drains`);
+            hux.table(telemetryDrains, {
                 ID: { get: telemetryDrain => telemetryDrain.id },
                 Signals: { get: telemetryDrain => telemetryDrain.signals },
                 Endpoint: { get: telemetryDrain => telemetryDrain.exporter.endpoint },
@@ -40,11 +45,3 @@ class Index extends command_1.Command {
         }
     }
 }
-exports.default = Index;
-Index.topic = 'telemetry';
-Index.description = 'list telemetry drains';
-Index.flags = {
-    space: command_1.flags.string({ char: 's', description: 'filter by space name', exactlyOne: ['app', 'space'] }),
-    app: command_1.flags.string({ char: 'a', description: 'filter by app name' }),
-};
-Index.example = '$ heroku telemetry';

package/lib/commands/telemetry/info.d.ts

@@ -3,7 +3,7 @@ export default class Info extends Command {
     static topic: string;
     static description: string;
     static args: {
-        telemetry_drain_id: import("@oclif/core/lib/interfaces/parser").Arg<string, Record<string, unknown>>;
+        telemetry_drain_id: import("@oclif/core/interfaces").Arg<string, Record<string, unknown>>;
     };
     static example: string;
     run(): Promise<void>;

package/lib/commands/telemetry/info.js

@@ -1,9 +1,13 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const command_1 = require("@heroku-cli/command");
-const core_1 = require("@oclif/core");
-const util_1 = require("../../lib/telemetry/util");
-class Info extends command_1.Command {
+import { Command } from '@heroku-cli/command';
+import { Args } from '@oclif/core';
+import { displayTelemetryDrain } from '../../lib/telemetry/util.js';
+export default class Info extends Command {
+    static topic = 'telemetry';
+    static description = 'show a telemetry drain\'s info';
+    static args = {
+        telemetry_drain_id: Args.string({ required: true, description: 'ID of the drain to show info for' }),
+    };
+    static example = '$ heroku telemetry:info 022e2e2e-2e2e-2e2e-2e2e-2e2e2e2e2e2e';
     async run() {
         const { args } = await this.parse(Info);
         const { telemetry_drain_id } = args;
@@ -12,13 +16,6 @@ class Info extends command_1.Command {
                 Accept: 'application/vnd.heroku+json; version=3.sdk',
             },
         });
-        await (0, util_1.displayTelemetryDrain)(telemetryDrain, this.heroku);
+        await displayTelemetryDrain(telemetryDrain, this.heroku);
     }
 }
-exports.default = Info;
-Info.topic = 'telemetry';
-Info.description = 'show a telemetry drain\'s info';
-Info.args = {
-    telemetry_drain_id: core_1.Args.string({ required: true, description: 'ID of the drain to show info for' }),
-};
-Info.example = '$ heroku telemetry:info 022e2e2e-2e2e-2e2e-2e2e-2e2e2e2e2e2e';

package/lib/commands/telemetry/remove.d.ts

@@ -1,14 +1,14 @@
 import { Command } from '@heroku-cli/command';
-import { TelemetryDrain } from '../../lib/types/telemetry';
+import { TelemetryDrain } from '../../lib/types/telemetry.js';
 export default class Remove extends Command {
     static topic: string;
     static description: string;
     static args: {
-        telemetry_drain_id: import("@oclif/core/lib/interfaces/parser").Arg<string | undefined, Record<string, unknown>>;
+        telemetry_drain_id: import("@oclif/core/interfaces").Arg<string | undefined, Record<string, unknown>>;
     };
     static flags: {
-        app: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        space: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        app: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        space: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
     };
     run(): Promise<void>;
     protected removeDrain(telemetry_drain_id: string): Promise<TelemetryDrain>;

package/lib/commands/telemetry/remove.js

@@ -1,25 +1,33 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const command_1 = require("@heroku-cli/command");
-const core_1 = require("@oclif/core");
-const tsheredoc_1 = require("tsheredoc");
-class Remove extends command_1.Command {
+import { flags, Command } from '@heroku-cli/command';
+import { Args, ux } from '@oclif/core';
+import tsheredoc from 'tsheredoc';
+const heredoc = tsheredoc.default;
+export default class Remove extends Command {
+    static topic = 'telemetry';
+    static description = 'remove a telemetry drain';
+    static args = {
+        telemetry_drain_id: Args.string({ description: 'ID of the drain to remove' }),
+    };
+    static flags = {
+        app: flags.app({ description: 'name of the app to remove all drains from' }),
+        space: flags.string({ char: 's', description: 'name of the space to remove all drains from' }),
+    };
     async run() {
         const { args, flags } = await this.parse(Remove);
         const { app, space } = flags;
         const { telemetry_drain_id } = args;
         if (!(app || space || telemetry_drain_id)) {
-            core_1.ux.error((0, tsheredoc_1.default)(`
+            ux.error(heredoc(`
         Requires either --app or --space or a TELEMETRY_DRAIN_ID to be provided.
         See more help with --help
       `));
         }
         if (telemetry_drain_id) {
-            core_1.ux.action.start(`Removing telemetry drain ${telemetry_drain_id}`);
+            ux.action.start(`Removing telemetry drain ${telemetry_drain_id}`);
             await this.removeDrain(telemetry_drain_id);
         }
         else if (app) {
-            core_1.ux.action.start(`Removing all telemetry drains from app ${app}`);
+            ux.action.start(`Removing all telemetry drains from app ${app}`);
             const { body: telemetryDrains } = await this.heroku.get(`/apps/${app}/telemetry-drains`, {
                 headers: {
                     Accept: 'application/vnd.heroku+json; version=3.sdk',
@@ -30,7 +38,7 @@ class Remove extends command_1.Command {
             }
         }
         else if (space) {
-            core_1.ux.action.start(`Removing all telemetry drains from space ${space}`);
+            ux.action.start(`Removing all telemetry drains from space ${space}`);
             const { body: telemetryDrains } = await this.heroku.get(`/spaces/${space}/telemetry-drains`, {
                 headers: {
                     Accept: 'application/vnd.heroku+json; version=3.sdk',
@@ -40,7 +48,7 @@ class Remove extends command_1.Command {
                 await this.removeDrain(telemetryDrain.id);
             }
         }
-        core_1.ux.action.stop();
+        ux.action.stop();
     }
     async removeDrain(telemetry_drain_id) {
         const { body: telemetryDrain } = await this.heroku.delete(`/telemetry-drains/${telemetry_drain_id}`, {
@@ -51,13 +59,3 @@ class Remove extends command_1.Command {
         return telemetryDrain;
     }
 }
-exports.default = Remove;
-Remove.topic = 'telemetry';
-Remove.description = 'remove a telemetry drain';
-Remove.args = {
-    telemetry_drain_id: core_1.Args.string({ description: 'ID of the drain to remove' }),
-};
-Remove.flags = {
-    app: command_1.flags.app({ description: 'name of the app to remove all drains from' }),
-    space: command_1.flags.string({ char: 's', description: 'name of the space to remove all drains from' }),
-};

package/lib/commands/telemetry/update.d.ts

@@ -3,13 +3,13 @@ export default class Update extends Command {
     static topic: string;
     static description: string;
     static args: {
-        telemetry_drain_id: import("@oclif/core/lib/interfaces/parser").Arg<string, Record<string, unknown>>;
+        telemetry_drain_id: import("@oclif/core/interfaces").Arg<string, Record<string, unknown>>;
     };
     static flags: {
-        endpoint: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        headers: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        signals: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        transport: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        endpoint: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        headers: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        signals: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        transport: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
     };
     static example: string;
     run(): Promise<void>;

package/lib/commands/telemetry/update.js

@@ -1,23 +1,36 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const command_1 = require("@heroku-cli/command");
-const core_1 = require("@oclif/core");
-const tsheredoc_1 = require("tsheredoc");
-const util_1 = require("../../lib/telemetry/util");
-class Update extends command_1.Command {
+import { flags as Flags, Command } from '@heroku-cli/command';
+import { Args, ux } from '@oclif/core';
+import tsheredoc from 'tsheredoc';
+import { displayTelemetryDrain, validateAndFormatSignals } from '../../lib/telemetry/util.js';
+const heredoc = tsheredoc.default;
+export default class Update extends Command {
+    static topic = 'telemetry';
+    static description = 'updates a telemetry drain with provided attributes (attributes not provided remain unchanged)';
+    static args = {
+        telemetry_drain_id: Args.string({ required: true, description: 'ID of the drain to update' }),
+    };
+    static flags = {
+        endpoint: Flags.string({ description: 'drain url' }),
+        headers: Flags.string({ description: 'custom headers to configure the drain in json format' }),
+        signals: Flags.string({ description: 'comma-delimited list of signals to collect (traces, metrics, logs). Use "all" to collect all signals.' }),
+        transport: Flags.string({ options: ['http', 'grpc'], description: 'transport protocol for the drain' }),
+    };
+    static example = heredoc(`
+    $ heroku telemetry:update acde070d-8c4c-4f0d-9d8a-162843c10333 --signals logs,metrics --endpoint https://my-new-endpoint.com
+  `);
     async run() {
         const { args, flags } = await this.parse(Update);
         const { telemetry_drain_id } = args;
         const { endpoint, headers, signals, transport } = flags;
         if (!(endpoint || headers || signals || transport)) {
-            core_1.ux.error((0, tsheredoc_1.default)(`
+            ux.error(heredoc(`
         Requires either --signals, --endpoint, --transport or HEADERS to be provided.
         See more help with --help
       `));
         }
         const drainConfig = {};
         if (signals) {
-            drainConfig.signals = (0, util_1.validateAndFormatSignals)(signals);
+            drainConfig.signals = validateAndFormatSignals(signals);
         }
         if (headers || endpoint || transport) {
             const exporter = {};
@@ -32,29 +45,14 @@ class Update extends command_1.Command {
             }
             drainConfig.exporter = exporter;
         }
-        core_1.ux.action.start(`Updating telemetry drain ${telemetry_drain_id}`);
+        ux.action.start(`Updating telemetry drain ${telemetry_drain_id}`);
         const { body: telemetryDrain } = await this.heroku.patch(`/telemetry-drains/${telemetry_drain_id}`, {
             headers: {
                 Accept: 'application/vnd.heroku+json; version=3.sdk',
             },
             body: drainConfig,
         });
-        core_1.ux.action.stop();
-        await (0, util_1.displayTelemetryDrain)(telemetryDrain, this.heroku);
+        ux.action.stop();
+        await displayTelemetryDrain(telemetryDrain, this.heroku);
     }
 }
-exports.default = Update;
-Update.topic = 'telemetry';
-Update.description = 'updates a telemetry drain with provided attributes (attributes not provided remain unchanged)';
-Update.args = {
-    telemetry_drain_id: core_1.Args.string({ required: true, description: 'ID of the drain to update' }),
-};
-Update.flags = {
-    endpoint: command_1.flags.string({ description: 'drain url' }),
-    headers: command_1.flags.string({ description: 'custom headers to configure the drain in json format' }),
-    signals: command_1.flags.string({ description: 'comma-delimited list of signals to collect (traces, metrics, logs). Use "all" to collect all signals.' }),
-    transport: command_1.flags.string({ options: ['http', 'grpc'], description: 'transport protocol for the drain' }),
-};
-Update.example = (0, tsheredoc_1.default)(`
-    $ heroku telemetry:update acde070d-8c4c-4f0d-9d8a-162843c10333 --signals logs,metrics --endpoint https://my-new-endpoint.com
-  `);

package/lib/commands/usage/addons.d.ts

@@ -3,8 +3,8 @@ export default class UsageAddons extends Command {
     static topic: string;
     static description: string;
     static flags: {
-        app: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        team: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        app: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        team: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
     };
     private displayAppUsage;
     private fetchAndDisplayAppUsageData;

package/lib/commands/usage/addons.js

@@ -1,22 +1,26 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const command_1 = require("@heroku-cli/command");
-const core_1 = require("@oclif/core");
-const heroku_cli_util_1 = require("@heroku/heroku-cli-util");
-const color_1 = require("@heroku-cli/color");
-class UsageAddons extends command_1.Command {
+import { Command, flags } from '@heroku-cli/command';
+import { ux } from '@oclif/core';
+import { hux } from '@heroku/heroku-cli-util';
+import { color } from '@heroku-cli/color';
+export default class UsageAddons extends Command {
+    static topic = 'usage';
+    static description = 'list usage for metered add-ons attached to an app or apps within a team';
+    static flags = {
+        app: flags.string({ char: 'a', description: 'app to list metered add-ons usage for' }),
+        team: flags.team({ description: 'team to list metered add-ons usage for' }),
+    };
     displayAppUsage(app, usageAddons, appAddons) {
         const metersArray = usageAddons.flatMap(addon => Object.entries(addon.meters).map(([label, data]) => ({
             label,
             quantity: data.quantity,
             addonId: addon.id,
         })));
-        heroku_cli_util_1.hux.styledHeader(`Usage for ${color_1.default.app(app)}`);
-        heroku_cli_util_1.hux.table(metersArray, {
+        hux.styledHeader(`Usage for ${color.app(app)}`);
+        hux.table(metersArray, {
             'Add-on': {
-                get: row => {
+                get(row) {
                     const matchingAddon = appAddons.find(a => a.id === row.addonId);
-                    return (matchingAddon === null || matchingAddon === void 0 ? void 0 : matchingAddon.name) || row.addonId;
+                    return matchingAddon?.name || row.addonId;
                 },
             },
             Meter: {
@@ -30,7 +34,7 @@ class UsageAddons extends command_1.Command {
     async fetchAndDisplayAppUsageData(app, team) {
         let usageData;
         let appAddons;
-        core_1.ux.action.start('Gathering usage data');
+        ux.action.start('Gathering usage data');
         if (team) {
             [{ body: usageData }, { body: appAddons }] = await Promise.all([
                 this.heroku.get(`/teams/${team}/apps/${app}/usage`, {
@@ -51,17 +55,17 @@ class UsageAddons extends command_1.Command {
                 this.heroku.get(`/apps/${app}/addons`),
             ]);
         }
-        core_1.ux.action.stop();
-        core_1.ux.log();
+        ux.action.stop();
+        ux.stdout();
         const usageAddons = usageData.addons;
         if (usageAddons.length === 0) {
-            core_1.ux.log(`No usage found for app ${color_1.default.app(app)}`);
+            ux.stdout(`No usage found for app ${color.app(app)}`);
             return;
         }
         this.displayAppUsage(app, usageAddons, appAddons);
     }
     async fetchAndDisplayTeamUsageData(team) {
-        core_1.ux.action.start(`Gathering usage data for ${color_1.default.magenta(team)}`);
+        ux.action.start(`Gathering usage data for ${color.magenta(team)}`);
         const [{ body: usageData }, { body: teamAddons }] = await Promise.all([
             this.heroku.get(`/teams/${team}/usage`, {
                 headers: {
@@ -70,18 +74,18 @@ class UsageAddons extends command_1.Command {
             }),
             this.heroku.get(`/teams/${team}/addons`),
         ]);
-        core_1.ux.action.stop();
-        core_1.ux.log();
+        ux.action.stop();
+        ux.stdout();
         if (!usageData.apps || usageData.apps.length === 0) {
-            core_1.ux.log(`No usage found for team ${color_1.default.magenta(team)}`);
+            ux.stdout(`No usage found for team ${color.magenta(team)}`);
             return;
         }
         const appInfoArray = this.getAppInfoFromTeamAddons(teamAddons);
         // Display usage for each app
         usageData.apps.forEach((app) => {
             const appInfo = appInfoArray.find(info => info.id === app.id);
-            this.displayAppUsage((appInfo === null || appInfo === void 0 ? void 0 : appInfo.name) || app.id, app.addons, teamAddons);
-            core_1.ux.log();
+            this.displayAppUsage(appInfo?.name || app.id, app.addons, teamAddons);
+            ux.stdout();
         });
     }
     getAppInfoFromTeamAddons(teamAddons) {
@@ -100,7 +104,7 @@ class UsageAddons extends command_1.Command {
         const { flags } = await this.parse(UsageAddons);
         const { app, team } = flags;
         if (!app && !team) {
-            core_1.ux.error('Specify an app with --app or a team with --team');
+            ux.error('Specify an app with --app or a team with --team');
         }
         if (app) {
             await this.fetchAndDisplayAppUsageData(app, team);
@@ -110,10 +114,3 @@ class UsageAddons extends command_1.Command {
         }
     }
 }
-exports.default = UsageAddons;
-UsageAddons.topic = 'usage';
-UsageAddons.description = 'list usage for metered add-ons attached to an app or apps within a team';
-UsageAddons.flags = {
-    app: command_1.flags.string({ char: 'a', description: 'app to list metered add-ons usage for' }),
-    team: command_1.flags.team({ description: 'team to list metered add-ons usage for' }),
-};

package/lib/deps.d.ts

@@ -1,7 +1,7 @@
 import { HTTP } from '@heroku/http-call';
-import UserConfig from './user-config';
-import FS = require('fs-extra');
-import file = require('./file');
+import UserConfig from './user-config.js';
+import FS from 'fs-extra';
+import * as file from './file.js';
 declare const _default: {
     readonly fs: typeof FS;
     readonly HTTP: typeof HTTP;

package/lib/deps.js

@@ -1,23 +1,18 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const cache = {};
-function fetch(s) {
-    if (!cache[s]) {
-        cache[s] = require(s);
-    }
-    return cache[s];
-}
-exports.default = {
+import { HTTP } from '@heroku/http-call';
+import UserConfig from './user-config.js';
+import FS from 'fs-extra';
+import * as file from './file.js';
+export default {
     get fs() {
-        return fetch('fs-extra');
+        return FS;
     },
     get HTTP() {
-        return fetch('@heroku/http-call').HTTP;
+        return HTTP;
     },
     get file() {
-        return fetch('./file');
+        return file;
     },
     get UserConfig() {
-        return fetch('./user-config').default;
+        return UserConfig;
     },
 };

package/lib/file.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="node" />
+/// <reference types="node" resolution-mode="require"/>
 import * as FS from 'fs-extra';
 export declare function exists(f: string): Promise<boolean>;
 export declare function stat(file: string): Promise<FS.Stats>;

package/lib/file.js

@@ -1,36 +1,29 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.realpathSync = exports.outputJSON = exports.readJSON = exports.removeEmptyDirs = exports.ls = exports.remove = exports.rename = exports.stat = exports.exists = void 0;
-const path = require("path");
-const deps_1 = require("./deps");
-const debug = require('debug')('heroku-cli:file');
-function exists(f) {
-    return deps_1.default.fs.pathExists(f);
+import * as path from 'path';
+import deps from './deps.js';
+import debug from 'debug';
+const fileDebug = debug('heroku-cli:file');
+export function exists(f) {
+    return deps.fs.pathExists(f);
 }
-exports.exists = exists;
-async function stat(file) {
-    return deps_1.default.fs.stat(file);
+export async function stat(file) {
+    return deps.fs.stat(file);
 }
-exports.stat = stat;
-async function rename(from, to) {
-    debug('rename', from, to);
-    return deps_1.default.fs.rename(from, to);
+export async function rename(from, to) {
+    fileDebug('rename', from, to);
+    return deps.fs.rename(from, to);
 }
-exports.rename = rename;
-async function remove(file) {
+export async function remove(file) {
     if (!await exists(file))
         return;
-    debug('remove', file);
-    return deps_1.default.fs.remove(file);
+    fileDebug('remove', file);
+    return deps.fs.remove(file);
 }
-exports.remove = remove;
-async function ls(dir) {
-    const files = await deps_1.default.fs.readdir(dir);
+export async function ls(dir) {
+    const files = await deps.fs.readdir(dir);
     const paths = files.map(f => path.join(dir, f));
-    return Promise.all(paths.map(path => deps_1.default.fs.stat(path).then(stat => ({ path, stat }))));
+    return Promise.all(paths.map(path => deps.fs.stat(path).then(stat => ({ path, stat }))));
 }
-exports.ls = ls;
-async function removeEmptyDirs(dir) {
+export async function removeEmptyDirs(dir) {
     let files;
     try {
         files = await ls(dir);
@@ -47,18 +40,14 @@ async function removeEmptyDirs(dir) {
     if (files.length === 0)
         await remove(dir);
 }
-exports.removeEmptyDirs = removeEmptyDirs;
-async function readJSON(file) {
-    debug('readJSON', file);
-    return deps_1.default.fs.readJSON(file);
+export async function readJSON(file) {
+    fileDebug('readJSON', file);
+    return deps.fs.readJSON(file);
 }
-exports.readJSON = readJSON;
-async function outputJSON(file, data) {
-    debug('outputJSON', file);
-    return deps_1.default.fs.outputJSON(file, data, { spaces: 2 });
+export async function outputJSON(file, data) {
+    fileDebug('outputJSON', file);
+    return deps.fs.outputJSON(file, data, { spaces: 2 });
 }
-exports.outputJSON = outputJSON;
-function realpathSync(p) {
-    return deps_1.default.fs.realpathSync(p);
+export function realpathSync(p) {
+    return deps.fs.realpathSync(p);
 }
-exports.realpathSync = realpathSync;