heroku 11.0.0-alpha.11 → 11.0.0-alpha.12

package/lib/commands/labs/disable.js

@@ -1,7 +1,6 @@
-import { color } from '@heroku-cli/color';
+import { color, hux } from '@heroku/heroku-cli-util';
 import { Command, flags } from '@heroku-cli/command';
 import { Args, ux } from '@oclif/core';
-import { hux } from '@heroku/heroku-cli-util';
 const SecurityExceptionFeatures = {
     'spaces-strict-tls': {
         async prompt(app) {
@@ -13,15 +12,20 @@ To proceed, type ${app} or re-run this command with --confirm ${app}`);
     },
 };
 export default class LabsDisable extends Command {
-    static description = 'disables an experimental feature';
     static args = {
-        feature: Args.string({ required: true, description: 'unique identifier or name of the account feature' }),
+        feature: Args.string({ description: 'unique identifier or name of the account feature', required: true }),
     };
+    static description = 'disables an experimental feature';
     static flags = {
         app: flags.app(),
-        remote: flags.remote(),
         confirm: flags.string({ required: false }),
+        remote: flags.remote(),
     };
+    disableFeature(feature, app) {
+        return this.heroku.patch(app ? `/apps/${app}/features/${feature}` : `/account/features/${feature}`, {
+            body: { enabled: false },
+        });
+    }
     async run() {
         const { args, flags } = await this.parse(LabsDisable);
         const { feature } = args;
@@ -39,7 +43,8 @@ export default class LabsDisable extends Command {
         try {
             await this.heroku.get(`/account/features/${feature}`);
             request = this.disableFeature(feature);
-            target = (await this.heroku.get('/account')).body.email;
+            const targetResponse = await this.heroku.get('/account');
+            target = color.user(targetResponse.body.email || '');
         }
         catch (error) {
             if (error.http.statusCode !== 404)
@@ -49,15 +54,10 @@ export default class LabsDisable extends Command {
                 throw error;
             await this.heroku.get(`/apps/${flags.app}/features/${feature}`);
             request = this.disableFeature(feature, flags.app);
-            target = flags.app;
+            target = color.app(flags.app);
         }
-        ux.action.start(`Disabling ${color.green(feature)} for ${color.cyan(target)}`);
+        ux.action.start(`Disabling ${color.name(feature)} for ${target}`);
         await request;
         ux.action.stop();
     }
-    disableFeature(feature, app) {
-        return this.heroku.patch(app ? `/apps/${app}/features/${feature}` : `/account/features/${feature}`, {
-            body: { enabled: false },
-        });
-    }
 }

package/lib/commands/labs/enable.d.ts

@@ -1,13 +1,13 @@
 import { Command } from '@heroku-cli/command';
 export default class LabsEnable extends Command {
+    static args: {
+        feature: import("@oclif/core/interfaces").Arg<string, Record<string, unknown>>;
+    };
     static description: string;
-    static topic: string;
     static flags: {
         app: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         remote: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
     };
-    static args: {
-        feature: import("@oclif/core/interfaces").Arg<string, Record<string, unknown>>;
-    };
+    static topic: string;
     run(): Promise<void>;
 }

package/lib/commands/labs/enable.js

@@ -1,5 +1,5 @@
-import { color } from '@heroku-cli/color';
-import { flags, Command } from '@heroku-cli/command';
+import { color } from '@heroku/heroku-cli-util';
+import { Command, flags } from '@heroku-cli/command';
 import { Args, ux } from '@oclif/core';
 async function enableFeature(heroku, feature, app) {
     return heroku.patch(app ? `/apps/${app}/features/${feature}` : `/account/features/${feature}`, {
@@ -7,25 +7,25 @@ async function enableFeature(heroku, feature, app) {
     });
 }
 export default class LabsEnable extends Command {
+    static args = {
+        feature: Args.string({ description: 'unique identifier or name of the account feature', required: true }),
+    };
     static description = 'enables an experimental feature';
-    static topic = 'labs';
     static flags = {
         app: flags.app({ required: false }),
         remote: flags.remote(),
     };
-    static args = {
-        feature: Args.string({ required: true, description: 'unique identifier or name of the account feature' }),
-    };
+    static topic = 'labs';
     async run() {
-        const { flags, args } = await this.parse(LabsEnable);
+        const { args, flags } = await this.parse(LabsEnable);
         const { feature } = args;
-        let target = null;
+        let target;
         let request;
         try {
             await this.heroku.get(`/account/features/${feature}`);
             request = enableFeature(this.heroku, feature);
             const targetResponse = await this.heroku.get('/account');
-            target = targetResponse.body.email;
+            target = color.user(targetResponse.body.email || '');
         }
         catch (error) {
             if (error.http.statusCode !== 404)
@@ -35,9 +35,9 @@ export default class LabsEnable extends Command {
                 throw error;
             await this.heroku.get(`/apps/${flags.app}/features/${feature}`);
             request = enableFeature(this.heroku, feature, flags.app);
-            target = flags.app;
+            target = color.app(flags.app);
         }
-        ux.action.start(`Enabling ${color.green(feature)} for ${color.cyan(target)}`);
+        ux.action.start(`Enabling ${color.name(feature)} for ${target}`);
         await request;
         ux.action.stop();
     }

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

@@ -1,11 +1,11 @@
 import { Command } from '@heroku-cli/command';
 export default class LabsIndex extends Command {
     static description: string;
-    static topic: string;
     static flags: {
         app: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
-        remote: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         json: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        remote: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
     };
+    static topic: string;
     run(): Promise<void>;
 }

package/lib/commands/labs/index.js

@@ -1,7 +1,6 @@
-import { color } from '@heroku-cli/color';
+import { color, hux } from '@heroku/heroku-cli-util';
 import { Command, flags } from '@heroku-cli/command';
 import { ux } from '@oclif/core';
-import { hux } from '@heroku/heroku-cli-util';
 function printJSON(features) {
     ux.stdout(JSON.stringify(features, null, 2));
 }
@@ -11,19 +10,19 @@ function printFeatures(features) {
     for (const f of groupedFeatures) {
         let line = `${f.enabled ? '[+]' : '[ ]'} ${f.name?.padEnd(longest) ?? ''}`;
         if (f.enabled)
-            line = color.green(line);
+            line = color.success(line);
         line = `${line}  ${f.description}`;
         ux.stdout(line);
     }
 }
 export default class LabsIndex extends Command {
     static description = 'list experimental features';
-    static topic = 'labs';
     static flags = {
         app: flags.app({ required: false }),
-        remote: flags.remote(),
         json: flags.boolean({ description: 'display as json', required: false }),
+        remote: flags.remote(),
     };
+    static topic = 'labs';
     async run() {
         const { flags } = await this.parse(LabsIndex);
         const [currentUserResponse, userResponse, appResponse] = await Promise.all([
@@ -39,7 +38,7 @@ export default class LabsIndex extends Command {
             user,
         };
         // makes sure app isn't added to json object if null
-        // eslint-disable-next-line unicorn/no-negated-condition
+        // eslint-disable-next-line unicorn/no-negated-condition, no-negated-condition
         if (appResponse !== null) {
             app = appResponse?.body;
             features.app = app;
@@ -55,7 +54,7 @@ export default class LabsIndex extends Command {
             printJSON({ app, user });
         }
         else {
-            hux.styledHeader(`User Features ${color.cyan(features.currentUser.email)}`);
+            hux.styledHeader(`User Features ${color.user(features.currentUser.email)}`);
             printFeatures(features.user);
             if (features.app) {
                 ux.stdout();

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

@@ -1,14 +1,14 @@
 import { Command } from '@heroku-cli/command';
 export default class LabsInfo extends Command {
-    static description: string;
-    static topic: string;
     static args: {
         feature: import("@oclif/core/interfaces").Arg<string, Record<string, unknown>>;
     };
+    static description: string;
     static flags: {
         app: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
-        remote: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         json: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        remote: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
     };
+    static topic: string;
     run(): Promise<void>;
 }

package/lib/commands/labs/info.js

@@ -1,26 +1,27 @@
-import { color } from '@heroku-cli/color';
+import { color, hux } from '@heroku/heroku-cli-util';
 import { Command, flags } from '@heroku-cli/command';
 import { Args } from '@oclif/core';
-import { hux } from '@heroku/heroku-cli-util';
 function print(feature) {
     hux.styledHeader(feature.name);
+    /* eslint-disable perfectionist/sort-objects */
     hux.styledObject({
         Description: feature.description,
-        Enabled: feature.enabled ? color.green(feature.enabled) : color.red(feature.enabled),
+        Enabled: feature.enabled ? color.success('true') : color.failure('false'),
         Docs: feature.doc_url,
     });
+    /* eslint-enable perfectionist/sort-objects */
 }
 export default class LabsInfo extends Command {
-    static description = 'show feature info';
-    static topic = 'labs';
     static args = {
-        feature: Args.string({ required: true, description: 'unique identifier or name of the account feature' }),
+        feature: Args.string({ description: 'unique identifier or name of the account feature', required: true }),
     };
+    static description = 'show feature info';
     static flags = {
         app: flags.app({ required: false }),
-        remote: flags.remote(),
         json: flags.boolean({ description: 'display as json', required: false }),
+        remote: flags.remote(),
     };
+    static topic = 'labs';
     async run() {
         const { args, flags } = await this.parse(LabsInfo);
         let feature;

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

@@ -1,19 +1,19 @@
 import { Command } from '@oclif/core';
 export default class Index extends Command {
-    static description: string;
     static aliases: string[];
     static args: {
         processname: import("@oclif/core/interfaces").Arg<string | undefined, Record<string, unknown>>;
     };
+    static description: string;
     static examples: string[];
     static flags: {
-        procfile: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        concurrency: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         env: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         port: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        procfile: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         restart: import("@oclif/core/interfaces").BooleanFlag<boolean>;
-        concurrency: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
     };
+    loadProcfile(procfilePath: string): Record<string, string>;
     run(): Promise<void>;
     runForeman(execArgv: string[]): Promise<void>;
-    loadProcfile(procfilePath: string): Record<string, string>;
 }

package/lib/commands/local/index.js

@@ -1,25 +1,26 @@
+import { color } from '@heroku/heroku-cli-util';
 import { Args, Command, Flags } from '@oclif/core';
+import { validateEnvFile } from '../../lib/local/env-file-validator.js';
 import { fork as foreman } from '../../lib/local/fork-foreman.js';
 import { loadProc } from '../../lib/local/load-foreman-procfile.js';
-import { validateEnvFile } from '../../lib/local/env-file-validator.js';
 export default class Index extends Command {
-    // \n splits the description between the title shown in the help
-    // and the DESCRIPTION section shown in the help
-    static description = 'run heroku app locally\nStart the application specified by a Procfile (defaults to ./Procfile)';
     static aliases = ['local:start'];
     static args = {
-        processname: Args.string({ required: false, description: 'name of the process' }),
+        processname: Args.string({ description: 'name of the process', required: false }),
     };
+    static description = `run heroku app locally
+Start the application specified by a Procfile (defaults to ./Procfile)`;
     static examples = [
-        `$ heroku local
-$ heroku local web
-$ heroku local web=2
-$ heroku local web=1,worker=2`,
+        color.command('heroku local'),
+        color.command('heroku local web'),
+        color.command('heroku local web=2'),
+        color.command('heroku local web=1,worker=2'),
     ];
     static flags = {
-        procfile: Flags.string({
-            char: 'f',
-            description: 'use a different Procfile',
+        concurrency: Flags.string({
+            char: 'c',
+            description: 'number of processes to start',
+            hidden: true,
         }),
         env: Flags.string({
             char: 'e',
@@ -29,17 +30,20 @@ $ heroku local web=1,worker=2`,
             char: 'p',
             description: 'port to listen on',
         }),
+        procfile: Flags.string({
+            char: 'f',
+            description: 'use a different Procfile',
+        }),
         restart: Flags.boolean({
             char: 'r',
             description: 'restart process if it dies',
             hidden: true,
         }),
-        concurrency: Flags.string({
-            char: 'c',
-            description: 'number of processes to start',
-            hidden: true,
-        }),
     };
+    // Proxy method to make procfile loading testable
+    loadProcfile(procfilePath) {
+        return loadProc(procfilePath);
+    }
     async run() {
         const execArgv = ['start'];
         const { args, flags } = await this.parse(Index);
@@ -70,8 +74,4 @@ $ heroku local web=1,worker=2`,
     async runForeman(execArgv) {
         return foreman(execArgv);
     }
-    // Proxy method to make procfile loading testable
-    loadProcfile(procfilePath) {
-        return loadProc(procfilePath);
-    }
 }

package/lib/commands/local/run.d.ts

@@ -2,10 +2,10 @@ import { Command } from '@oclif/core';
 export default class Run extends Command {
     static description: string;
     static examples: string[];
-    static strict: boolean;
     static flags: {
         env: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         port: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
     };
+    static strict: boolean;
     run(): Promise<void>;
 }

package/lib/commands/local/run.js

@@ -1,13 +1,13 @@
+import { color } from '@heroku/heroku-cli-util';
 import { Command, Flags } from '@oclif/core';
+import { validateEnvFile } from '../../lib/local/env-file-validator.js';
 import { fork as foreman } from '../../lib/local/fork-foreman.js';
 import { revertSortedArgs } from '../../lib/run/helpers.js';
-import { validateEnvFile } from '../../lib/local/env-file-validator.js';
 export default class Run extends Command {
     static description = 'run a one-off command';
     static examples = [
-        '$ heroku local:run bin/migrate',
+        color.command('heroku local:run bin/migrate'),
     ];
-    static strict = false;
     static flags = {
         env: Flags.string({
             char: 'e',
@@ -18,6 +18,7 @@ export default class Run extends Command {
             description: 'port to listen on',
         }),
     };
+    static strict = false;
     async run() {
         const execArgv = ['run'];
         const { argv, flags } = await this.parse(Run);

package/lib/commands/logs.d.ts

@@ -8,11 +8,11 @@ export default class Logs extends Command {
         'force-colors': import("@oclif/core/interfaces").BooleanFlag<boolean>;
         'no-color': import("@oclif/core/interfaces").BooleanFlag<boolean>;
         num: import("@oclif/core/interfaces").OptionFlag<number | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        'process-type': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         ps: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         remote: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         source: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         tail: import("@oclif/core/interfaces").BooleanFlag<boolean>;
-        'process-type': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
     };
     run(): Promise<void>;
 }

package/lib/commands/logs.js

@@ -1,6 +1,7 @@
-import { color } from '@heroku-cli/color';
+import { color } from '@heroku/heroku-cli-util';
 import { Command, flags } from '@heroku-cli/command';
 import { ProcessTypeCompletion } from '@heroku-cli/command/lib/completions.js';
+import { ux } from '@oclif/core';
 import tsheredoc from 'tsheredoc';
 import { LogDisplayer } from '../lib/run/log-displayer.js';
 const heredoc = tsheredoc.default;
@@ -10,11 +11,11 @@ export default class Logs extends Command {
     disable colors with --no-color, HEROKU_LOGS_COLOR=0, or HEROKU_COLOR=0
   `;
     static examples = [
-        'heroku logs --app=my-app',
-        'heroku logs --num=50 --app=my-app',
-        'heroku logs --dyno-name=web-123-456 --app=my-app',
-        'heroku logs --process-type=web --app=my-app',
-        'heroku logs --app=my-app --tail',
+        `${color.command('heroku logs --app=my-app')}`,
+        `${color.command('heroku logs --num=50 --app=my-app')}`,
+        `${color.command('heroku logs --dyno-name=web-123-456 --app=my-app')}`,
+        `${color.command('heroku logs --process-type=web --app=my-app')}`,
+        `${color.command('heroku logs --app=my-app --tail')}`,
     ];
     static flags = {
         app: flags.app({ required: true }),
@@ -24,7 +25,7 @@ export default class Logs extends Command {
             description: 'only show output from this dyno (such as "web-123-456" or "worker.2")',
         }),
         'force-colors': flags.boolean({
-            description: 'force use of colors (even on non-tty output)',
+            deprecated: true,
         }),
         // supports-color NPM package will parse ARGV looking for flag `--no-color`, but
         // we need to define it here for OClif not to error out on an inexistent flag.
@@ -32,21 +33,29 @@ export default class Logs extends Command {
             default: false,
             hidden: true,
             relationships: [
-                { type: 'none', flags: ['force-colors'] },
+                { flags: ['force-colors'], type: 'none' },
             ],
         }),
         num: flags.integer({
             char: 'n',
             description: 'number of lines to display (ignored for Fir generation apps)',
         }),
+        'process-type': flags.string({
+            char: 'p',
+            completion: ProcessTypeCompletion,
+            description: 'only show output from this process type (such as "web" or "worker")',
+            relationships: [
+                { flags: ['dyno-name', 'ps'], type: 'none' },
+            ],
+        }),
         ps: flags.string({
             char: 'p',
-            hidden: true,
+            completion: ProcessTypeCompletion,
             description: 'hidden alias for type',
+            hidden: true,
             relationships: [
-                { type: 'none', flags: ['dyno-name'] },
+                { flags: ['dyno-name'], type: 'none' },
             ],
-            completion: ProcessTypeCompletion,
         }),
         remote: flags.remote(),
         source: flags.string({
@@ -58,20 +67,12 @@ export default class Logs extends Command {
             default: false,
             description: 'continually stream logs (always enabled for Fir-generation apps)',
         }),
-        'process-type': flags.string({
-            char: 'p',
-            description: 'only show output from this process type (such as "web" or "worker")',
-            relationships: [
-                { type: 'none', flags: ['dyno-name', 'ps'] },
-            ],
-            completion: ProcessTypeCompletion,
-        }),
     };
     async run() {
         const { flags } = await this.parse(Logs);
-        const { app, 'dyno-name': dyno, 'force-colors': forceColors, num, ps, source, tail, 'process-type': type } = flags;
+        const { app, 'dyno-name': dyno, 'force-colors': forceColors, num, 'process-type': type, ps, source, tail } = flags;
         if (forceColors)
-            color.enabled = true;
+            ux.warn('The --force-colors flag is deprecated. Use FORCE_COLORS=true to force colors.');
         const options = {
             app,
             dyno,

package/lib/commands/maintenance/off.d.ts

@@ -1,10 +1,10 @@
 import { Command } from '@heroku-cli/command';
 export default class MaintenanceOff extends Command {
     static description: string;
-    static topic: string;
     static flags: {
         app: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
         remote: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
     };
+    static topic: string;
     run(): Promise<void>;
 }

package/lib/commands/maintenance/off.js

@@ -1,13 +1,13 @@
+import { color } from '@heroku/heroku-cli-util';
 import { Command, flags } from '@heroku-cli/command';
-import { color } from '@heroku-cli/color';
 import { ux } from '@oclif/core';
 export default class MaintenanceOff extends Command {
     static description = 'take the app out of maintenance mode';
-    static topic = 'maintenance';
     static flags = {
         app: flags.app({ required: true }),
         remote: flags.remote(),
     };
+    static topic = 'maintenance';
     async run() {
         const { flags } = await this.parse(MaintenanceOff);
         ux.action.start(`Disabling maintenance mode for ${color.app(flags.app)}`);

package/lib/commands/maintenance/on.d.ts

@@ -1,10 +1,10 @@
 import { Command } from '@heroku-cli/command';
 export default class MaintenanceOn extends Command {
     static description: string;
-    static topic: string;
     static flags: {
         app: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
         remote: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
     };
+    static topic: string;
     run(): Promise<void>;
 }

package/lib/commands/maintenance/on.js

@@ -1,13 +1,13 @@
+import { color } from '@heroku/heroku-cli-util';
 import { Command, flags } from '@heroku-cli/command';
-import { color } from '@heroku-cli/color';
 import { ux } from '@oclif/core';
 export default class MaintenanceOn extends Command {
     static description = 'put the app into maintenance mode';
-    static topic = 'maintenance';
     static flags = {
         app: flags.app({ required: true }),
         remote: flags.remote(),
     };
+    static topic = 'maintenance';
     async run() {
         const { flags } = await this.parse(MaintenanceOn);
         ux.action.start(`Enabling maintenance mode for ${color.app(flags.app)}`);

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

@@ -1,12 +1,12 @@
 import { Command } from '@heroku-cli/command';
 export default class MembersIndex extends Command {
-    static topic: string;
     static description: string;
     static flags: {
-        role: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
-        pending: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         json: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        pending: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        role: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         team: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
     };
+    static topic: string;
     run(): Promise<void>;
 }