heroku 10.13.2 → 11.0.0-alpha.10

package/lib/lib/git/git.js

@@ -1,15 +1,14 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const command_1 = require("@heroku-cli/command");
-const cp = require("child_process");
-const core_1 = require("@oclif/core");
-const fs = require("fs");
-const util_1 = require("util");
-const execFile = (0, util_1.promisify)(cp.execFile);
-const debug = require('debug')('git');
-class Git {
+import { vars } from '@heroku-cli/command';
+import cp from 'node:child_process';
+import { ux } from '@oclif/core';
+import fs from 'fs';
+import { promisify } from 'node:util';
+const execFile = promisify(cp.execFile);
+import debug from 'debug';
+const gitDebug = debug('git');
+export default class Git {
     async exec(args) {
-        debug('exec: git %o', args);
+        gitDebug('exec: git %o', args);
         try {
             const { stdout, stderr } = await execFile('git', args);
             if (stderr)
@@ -18,18 +17,18 @@ class Git {
         }
         catch (error) {
             if (error.code === 'ENOENT') {
-                core_1.ux.error('Git must be installed to use the Heroku CLI.  See instructions here: https://git-scm.com');
+                ux.error('Git must be installed to use the Heroku CLI.  See instructions here: https://git-scm.com');
             }
             throw error;
         }
     }
     spawn(args) {
         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) => {
                 if (err.code === 'ENOENT') {
-                    core_1.ux.error('Git must be installed to use the Heroku CLI.  See instructions here: https://git-scm.com');
+                    ux.error('Git must be installed to use the Heroku CLI.  See instructions here: https://git-scm.com');
                 }
                 else
                     reject(err);
@@ -41,14 +40,14 @@ class Git {
         return this.exec(['config', 'heroku.remote']).catch(() => { });
     }
     httpGitUrl(app) {
-        return `https://${command_1.vars.httpGitHost}/${app}.git`;
+        return `https://${vars.httpGitHost}/${app}.git`;
     }
     async remoteUrl(name) {
-        var _a, _b, _c;
         const remotes = await this.exec(['remote', '-v']);
-        return (_c = (_b = (_a = remotes.split('\n')
+        return remotes.split('\n')
             .map(r => r.split('\t'))
-            .find(r => r[0] === name)) === null || _a === void 0 ? void 0 : _a[1]) === null || _b === void 0 ? void 0 : _b.split(' ')[0]) !== null && _c !== void 0 ? _c : '';
+            .find(r => r[0] === name)?.[1]
+            ?.split(' ')[0] ?? '';
     }
     url(app) {
         return this.httpGitUrl(app);
@@ -66,11 +65,11 @@ class Git {
         const branch = await this.getBranch('HEAD');
         const ref = await this.getRef(commit);
         const message = await this.getCommitTitle(ref);
-        return Promise.resolve({
-            branch: branch,
-            ref: ref,
-            message: message,
-        });
+        return {
+            branch,
+            message,
+            ref,
+        };
     }
     inGitRepo() {
         try {
@@ -84,11 +83,11 @@ class Git {
     }
     hasGitRemote(remote) {
         return this.remoteUrl(remote)
+            // eslint-disable-next-line unicorn/prefer-native-coercion-functions
             .then((remote) => Boolean(remote));
     }
     createRemote(remote, url) {
         return this.hasGitRemote(remote)
-            .then(exists => !exists ? this.exec(['remote', 'add', remote, url]) : null);
+            .then(exists => exists ? null : this.exec(['remote', 'add', remote, url]));
     }
 }
-exports.default = Git;

package/lib/lib/git/push.js

@@ -1,6 +1,3 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-function push(remote) {
+export default function push(remote) {
     return `git push ${remote || 'heroku'} main`;
 }
-exports.default = push;

package/lib/lib/local/env-file-validator.d.ts

@@ -0,0 +1 @@
+export declare function validateEnvFile(envFile: string | undefined, warn: (message: string) => void): string;

package/lib/lib/local/env-file-validator.js

@@ -0,0 +1,10 @@
+import * as fs from 'fs';
+import { color } from '@heroku-cli/color';
+export function validateEnvFile(envFile, warn) {
+    const resolvedEnvFile = envFile || '.env';
+    if (fs.existsSync(resolvedEnvFile) && !fs.statSync(resolvedEnvFile).isFile()) {
+        warn(`The specified location for the env file, ${color.bold(resolvedEnvFile)}, is not a file, ignoring.`);
+        return '';
+    }
+    return resolvedEnvFile;
+}

package/lib/lib/local/fork-foreman.js

@@ -1,16 +1,20 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.fork = void 0;
-const child_process_1 = require("child_process");
-const fs = require("fs");
-const path = require("path");
+import { fork as forkChildProcess } from 'child_process';
+import * as fs from 'fs';
+import * as path from 'path';
+import { fileURLToPath } from 'url';
 // depending if this is being ran before or after compilation
 // we need to check for `.ts` and `.js` extensions and use
 // the appropriate one.
 function getForemanScriptPath() {
     const file = 'run-foreman';
+    const __filename = fileURLToPath(import.meta.url);
+    const __dirname = path.dirname(__filename);
+    const withCjsExtension = path.join(__dirname, file + '.cjs');
     const withJsExtension = path.join(__dirname, file + '.js');
     const withTsExtension = path.join(__dirname, file + '.ts');
+    if (fs.existsSync(withCjsExtension)) {
+        return withCjsExtension;
+    }
     if (fs.existsSync(withJsExtension)) {
         return withJsExtension;
     }
@@ -19,9 +23,9 @@ function getForemanScriptPath() {
     }
     throw new Error(`Path to ${file} not found`);
 }
-function fork(argv) {
+export function fork(argv) {
     const script = getForemanScriptPath();
-    const nf = (0, child_process_1.fork)(script, argv, { stdio: 'inherit' });
+    const nf = forkChildProcess(script, argv, { stdio: 'inherit' });
     return new Promise(resolve => {
         nf.on('exit', function (code) {
             if (code !== 0)
@@ -30,4 +34,3 @@ function fork(argv) {
         });
     });
 }
-exports.fork = fork;

package/lib/lib/local/load-foreman-procfile.d.ts

@@ -0,0 +1 @@
+export declare const loadProc: (procfilePath: string) => any;

package/lib/lib/local/load-foreman-procfile.js

@@ -1,2 +1,7 @@
-"use strict";
-module.exports = require('foreman/lib/procfile');
+// @ts-expect-error - parse-procfile lacks TypeScript definitions
+import parseProcfile from 'parse-procfile';
+import fs from 'fs';
+export const loadProc = (procfilePath) => {
+    const content = fs.readFileSync(procfilePath, 'utf8');
+    return parseProcfile(content);
+};

package/lib/lib/local/{run-foreman.js → run-foreman.cjs}

@@ -3,6 +3,7 @@
 // Node module: foreman
 // This file is licensed under the MIT License.
 // License text available at https://opensource.org/licenses/MIT
+Object.defineProperty(exports, "__esModule", { value: true });
 // This file is copied from the Node Foreman package. It was copied in order to fix
 // a bug related to the use of port 5000 as a default. It is not meant to be a
 // long-term solution, we plan to eventually remove our dependency on Node Foreman.
@@ -197,7 +198,12 @@ program
             // eslint-disable-next-line unicorn/no-array-push-push
             envl.push({ key: 'FOREMAN_WORKER_NAME', value: conf.process + '.' + conf.number });
             conf.envs = envl;
-            const conf = Object.assign(Object.assign({}, c), { number: i, port, envs: envl });
+            const conf = {
+                ...c,
+                number: i,
+                port,
+                envs: envl,
+            };
             // Write the APP-PROCESS-N.conf File
             writeout.foreman_app_n(conf, this.out);
             baseport_i++;

package/lib/lib/members/team-invite-utils.d.ts

@@ -0,0 +1,14 @@
+import { APIClient } from '@heroku-cli/command';
+import * as Heroku from '@heroku-cli/schema';
+/**
+ * Standard role description for consistent usage across commands
+ */
+export declare const ROLE_DESCRIPTION = "member role (admin, collaborator, member, owner)";
+/**
+ * Check if team invite acceptance feature is enabled for a team
+ */
+export declare function isTeamInviteFeatureEnabled(team: string, heroku: APIClient): Promise<boolean>;
+/**
+ * Get team invitations with proper headers
+ */
+export declare function getTeamInvites(team: string, heroku: APIClient): Promise<Heroku.TeamInvitation[]>;

package/lib/lib/members/team-invite-utils.js

@@ -0,0 +1,26 @@
+/**
+ * Standard role description for consistent usage across commands
+ */
+export const ROLE_DESCRIPTION = 'member role (admin, collaborator, member, owner)';
+/**
+ * Check if team invite acceptance feature is enabled for a team
+ */
+export async function isTeamInviteFeatureEnabled(team, heroku) {
+    const { body: teamInfo } = await heroku.get(`/teams/${team}`);
+    if (teamInfo.type !== 'team') {
+        return false;
+    }
+    const { body: teamFeatures } = await heroku.get(`/teams/${team}/features`);
+    return teamFeatures.some(feature => feature.name === 'team-invite-acceptance' && feature.enabled);
+}
+/**
+ * Get team invitations with proper headers
+ */
+export async function getTeamInvites(team, heroku) {
+    const { body: teamInvites } = await heroku.get(`/teams/${team}/invitations`, {
+        headers: {
+            Accept: 'application/vnd.heroku+json; version=3.team-invitations',
+        },
+    });
+    return teamInvites;
+}

package/lib/lib/members/util.js

@@ -1,25 +1,20 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.addMemberToTeam = exports.inviteMemberToTeam = void 0;
-const core_1 = require("@oclif/core");
-const color_1 = require("@heroku-cli/color");
-const inviteMemberToTeam = async function (email, role, team, heroku) {
-    core_1.ux.action.start(`Inviting ${color_1.default.cyan(email)} to ${color_1.default.magenta(team)} as ${color_1.default.green(role)}`);
+import { ux } from '@oclif/core';
+import { color } from '@heroku-cli/color';
+export const inviteMemberToTeam = async function (email, role, team, heroku) {
+    ux.action.start(`Inviting ${color.cyan(email)} to ${color.magenta(team)} as ${color.green(role)}`);
     await heroku.request(`/teams/${team}/invitations`, {
         headers: {
             Accept: 'application/vnd.heroku+json; version=3.team-invitations',
         }, method: 'PUT',
         body: { email, role },
     });
-    core_1.ux.action.stop();
+    ux.action.stop();
 };
-exports.inviteMemberToTeam = inviteMemberToTeam;
-const addMemberToTeam = async function (email, role, groupName, heroku, method = 'PUT') {
-    core_1.ux.action.start(`Adding ${color_1.default.cyan(email)} to ${color_1.default.magenta(groupName)} as ${color_1.default.green(role)}`);
+export const addMemberToTeam = async function (email, role, groupName, heroku, method = 'PUT') {
+    ux.action.start(`Adding ${color.cyan(email)} to ${color.magenta(groupName)} as ${color.green(role)}`);
     await heroku.request(`/teams/${groupName}/members`, {
         method: method,
         body: { email, role },
     });
-    core_1.ux.action.stop();
+    ux.action.stop();
 };
-exports.addMemberToTeam = addMemberToTeam;

package/lib/lib/notify.js

@@ -1,12 +1,13 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const path = require("path");
-const notifications_1 = require("@heroku-cli/notifications");
-const core_1 = require("@oclif/core");
-function default_1(subtitle, message, success = true) {
+import * as path from 'path';
+import { notify } from '@heroku-cli/notifications';
+import { ux } from '@oclif/core';
+import { fileURLToPath } from 'url';
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+export default function (subtitle, message, success = true) {
     const contentImage = path.join(__dirname, `../assets/${success ? 'success' : 'error'}.png`);
     try {
-        (0, notifications_1.notify)({
+        notify({
             // eslint-disable-next-line @typescript-eslint/ban-ts-comment
             // @ts-ignore
             title: 'heroku cli',
@@ -17,7 +18,6 @@ function default_1(subtitle, message, success = true) {
         });
     }
     catch (error) {
-        core_1.ux.warn(error);
+        ux.warn(error);
     }
 }
-exports.default = default_1;

package/lib/lib/orgs/utils.js

@@ -1,25 +1,20 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.printGroupsJSON = exports.printGroups = void 0;
-const core_1 = require("@oclif/core");
-const heroku_cli_util_1 = require("@heroku/heroku-cli-util");
-const _ = require("lodash");
-const color_1 = require("@heroku-cli/color");
-const printGroups = function (teams, type) {
-    const typeLabel = type.label ? type.label : 'Team';
-    teams = _.sortBy(teams, 'name');
-    heroku_cli_util_1.hux.table(teams, {
+import { ux } from '@oclif/core';
+import { hux } from '@heroku/heroku-cli-util';
+import { color } from '@heroku-cli/color';
+export const printGroups = function (teams, type) {
+    const typeLabel = type.label ?? 'Team';
+    teams = teams.sort((a, b) => (a.name || '').localeCompare(b.name || ''));
+    hux.table(teams, {
         name: {
+            get: ({ name }) => color.green(name),
             header: typeLabel,
-            get: ({ name }) => color_1.default.green(name),
         },
         role: {
             get: ({ role }) => role,
+            header: 'Role',
         },
     });
 };
-exports.printGroups = printGroups;
-const printGroupsJSON = function (teams) {
-    core_1.ux.log(JSON.stringify(teams, null, 2));
+export const printGroupsJSON = function (teams) {
+    ux.stdout(JSON.stringify(teams, null, 2));
 };
-exports.printGroupsJSON = printGroupsJSON;

package/lib/lib/pg/backups.d.ts

@@ -1,17 +1 @@
-import { APIClient } from '@heroku-cli/command';
-import type { BackupTransfer } from './types';
-declare class Backups {
-    protected app: string;
-    protected heroku: APIClient;
-    protected logsAlreadyShown: Set<string>;
-    constructor(app: string, heroku: APIClient);
-    filesize(size: number, opts?: {}): string;
-    status: (transfer: BackupTransfer) => string;
-    num: (name: string) => Promise<number | undefined>;
-    name: (transfer: BackupTransfer) => string;
-    wait: (action: string, transferID: string, interval: number, verbose: boolean, app: string) => Promise<void>;
-    protected displayLogs(logs: BackupTransfer['logs']): void;
-    protected poll(transferID: string, interval: number, verbose: boolean, appId: string): AsyncGenerator<unknown, void, unknown>;
-}
-declare function factory(app: string, heroku: APIClient): Backups;
-export default factory;
+export {};