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

package/lib/user-config.js

@@ -1,13 +1,18 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const node_crypto_1 = require("node:crypto");
-const path = require("path");
-const deps_1 = require("./deps");
-class UserConfig {
+import { randomUUID } from 'node:crypto';
+import * as path from 'path';
+import deps from './deps.js';
+import debug from 'debug';
+const userConfigDebug = debug('heroku:user_config');
+export default class UserConfig {
+    config;
+    needsSave = false;
+    body;
+    mtime;
+    saving;
+    _init;
     // eslint-disable-next-line no-useless-constructor
     constructor(config) {
         this.config = config;
-        this.needsSave = false;
     }
     get install() {
         return this.body.install || this.genInstall();
@@ -30,7 +35,7 @@ class UserConfig {
         if (this._init)
             return this._init;
         this._init = (async () => {
-            this.debug('init');
+            userConfigDebug('init');
             this.body = (await this.read()) || { schema: 1 };
             if (!this.body.schema) {
                 this.body.schema = 1;
@@ -47,9 +52,6 @@ class UserConfig {
         })();
         return this._init;
     }
-    get debug() {
-        return require('debug')('heroku:user_config');
-    }
     get file() {
         return path.join(this.config.dataDir, 'config.json');
     }
@@ -58,34 +60,34 @@ class UserConfig {
             return;
         this.needsSave = false;
         this.saving = (async () => {
-            this.debug('saving');
+            userConfigDebug('saving');
             if (!await this.canWrite()) {
                 throw new Error('file modified, cannot save');
             }
-            await deps_1.default.file.outputJSON(this.file, this.body);
+            await deps.file.outputJSON(this.file, this.body);
         })();
     }
     async read() {
         await this.migrate();
         try {
             this.mtime = await this.getLastUpdated();
-            const body = await deps_1.default.file.readJSON(this.file);
+            const body = await deps.file.readJSON(this.file);
             return body;
         }
         catch (error) {
             if (error.code !== 'ENOENT')
                 throw error;
-            this.debug('not found');
+            userConfigDebug('not found');
         }
     }
     async migrate() {
-        if (await deps_1.default.file.exists(this.file))
+        if (await deps.file.exists(this.file))
             return;
         const old = path.join(this.config.configDir, 'config.json');
-        if (!await deps_1.default.file.exists(old))
+        if (!await deps.file.exists(old))
             return;
-        this.debug('moving config into new place');
-        await deps_1.default.file.rename(old, this.file);
+        userConfigDebug('moving config into new place');
+        await deps.file.rename(old, this.file);
     }
     async canWrite() {
         if (!this.mtime)
@@ -94,7 +96,7 @@ class UserConfig {
     }
     async getLastUpdated() {
         try {
-            const stat = await deps_1.default.file.stat(this.file);
+            const stat = await deps.file.stat(this.file);
             return stat.mtime.getTime();
         }
         catch (error) {
@@ -103,8 +105,7 @@ class UserConfig {
         }
     }
     genInstall() {
-        this.install = (0, node_crypto_1.randomUUID)();
+        this.install = randomUUID();
         return this.install;
     }
 }
-exports.default = UserConfig;

package/package.json

@@ -1,33 +1,33 @@
 {
   "name": "heroku",
   "description": "CLI to interact with Heroku",
-  "version": "10.13.2-beta.0",
+  "version": "11.0.0-alpha.1",
   "author": "Heroku",
   "bin": "./bin/run",
   "bugs": "https://github.com/heroku/cli/issues",
   "dependencies": {
     "@heroku-cli/color": "2.0.1",
-    "@heroku-cli/command": "^11.8.0",
+    "@heroku-cli/command": "^12.0.2-beta.0",
     "@heroku-cli/notifications": "^1.2.4",
     "@heroku-cli/plugin-ps-exec": "2.6.2",
     "@heroku-cli/schema": "^1.0.25",
     "@heroku/buildpack-registry": "^1.0.1",
     "@heroku/eventsource": "^1.0.7",
-    "@heroku/heroku-cli-util": "^9.0.2",
+    "@heroku/heroku-cli-util": "^10.0.0-beta.1",
     "@heroku/http-call": "^5.5.0",
     "@heroku/mcp-server": "1.0.7-alpha.1",
     "@heroku/plugin-ai": "^1.0.1",
     "@inquirer/prompts": "^5.0.5",
-    "@oclif/core": "^2.16.0",
-    "@oclif/plugin-commands": "2.2.28",
-    "@oclif/plugin-help": "^5",
-    "@oclif/plugin-legacy": "^1.3.0",
-    "@oclif/plugin-not-found": "2.3.16",
-    "@oclif/plugin-plugins": "2.4.3",
-    "@oclif/plugin-update": "3.2.4",
-    "@oclif/plugin-version": "^1.2.1",
-    "@oclif/plugin-warn-if-update-available": "2.0.29",
-    "@oclif/plugin-which": "2.2.8",
+    "@oclif/core": "^4.3.0",
+    "@oclif/plugin-commands": "4.1.25",
+    "@oclif/plugin-help": "^6.2.28",
+    "@oclif/plugin-legacy": "^2.0.24",
+    "@oclif/plugin-not-found": "3.2.52",
+    "@oclif/plugin-plugins": "^5.4.38",
+    "@oclif/plugin-update": "^4.6.41",
+    "@oclif/plugin-version": "^2.2.28",
+    "@oclif/plugin-warn-if-update-available": "^3.1.40",
+    "@oclif/plugin-which": "^3.2.35",
     "@opentelemetry/api": "^1.4.1",
     "@opentelemetry/exporter-trace-otlp-http": "^0.41.1",
     "@opentelemetry/instrumentation": "^0.51.1",
@@ -35,28 +35,28 @@
     "@opentelemetry/sdk-trace-base": "^1.15.1",
     "@opentelemetry/sdk-trace-node": "^1.15.1",
     "@opentelemetry/semantic-conventions": "^1.24.1",
-    "@types/js-yaml": "^3.12.5",
     "@types/tunnel-ssh": "4.1.1",
     "ansi-escapes": "3.2.0",
-    "async-file": "^2.0.2",
     "bytes": "^3.1.2",
-    "chalk": "^2.4.2",
+    "cli-progress": "^3.12.0",
     "commander": "^2.15.1",
     "date-fns": "^2.30.0",
     "debug": "4.3.4",
-    "edit-string": "^1.1.6",
+    "eventsource": "^4.0.0",
     "execa": "5.1.1",
     "filesize": "^10.1.2",
     "foreman": "^3.0.1",
     "fs-extra": "^11.3.0",
-    "github-url-to-object": "^4.0.4",
+    "github-url-to-object": "^4.0.6",
     "glob": "^10.3.10",
-    "got": "^11.8.6",
+    "got": "^13.0.0",
+    "https-proxy-agent": "^7.0.6",
     "inquirer": "^8.2.6",
     "lodash": "^4.17.21",
     "netrc-parser": "3.1.6",
     "node-fetch": "^2.6.7",
-    "open": "^8.4.2",
+    "open": "^10.1.2",
+    "parse-procfile": "^0.0.2",
     "phoenix": "^1.6.14",
     "portfinder": "^1.0.32",
     "printf": "0.6.1",
@@ -64,21 +64,18 @@
     "redis-parser": "^3.0.0",
     "rollbar": "^2.26.2",
     "semver": "7.6.1",
-    "shell-escape": "^0.2.0",
     "shell-quote": "^1.8.1",
-    "smooth-progress": "^1.1.0",
-    "sparkline": "^0.2.0",
     "ssh2": "^1.16.0",
     "stdout-stderr": "^0.1.13",
     "strftime": "^0.10.0",
     "strip-ansi": "^6",
     "term-img": "^4.1.0",
-    "true-myth": "2.2.3",
+    "tmp": "^0.2.3",
+    "true-myth": "4.1.1",
     "tsheredoc": "^1.0.1",
     "tslib": "1.14.1",
     "tunnel-ssh": "4.1.6",
     "urijs": "^1.19.11",
-    "validator": "^13.7.0",
     "word-wrap": "^1.2.5",
     "ws": "^6.2.2",
     "yaml": "^2.0.1",
@@ -94,17 +91,17 @@
     "@types/chai-as-promised": "^7.1.8",
     "@types/debug": "^4.1.2",
     "@types/fs-extra": "^11.0.4",
+    "@types/github-url-to-object": "^4.0.4",
     "@types/glob": "^7.1.1",
     "@types/inquirer": "^8.2.10",
     "@types/lodash": "^4.14.123",
     "@types/mocha": "^10.0.10",
-    "@types/node": "20.14.8",
+    "@types/node": "22.16.5",
     "@types/node-fetch": "^2.6.11",
     "@types/phoenix": "^1.4.0",
     "@types/proxyquire": "^1.3.28",
     "@types/psl": "^1.1.3",
     "@types/redis-parser": "^3.0.3",
-    "@types/shell-escape": "^0.2.0",
     "@types/shell-quote": "^1.7.5",
     "@types/sinon": "^17.0.3",
     "@types/ssh2": "^1.15.4",
@@ -114,41 +111,38 @@
     "@types/tmp": "^0.2.6",
     "@types/urijs": "^1.19.4",
     "@types/uuid": "^8.3.0",
-    "@types/validator": "^10.9.0",
     "@types/write-json-file": "^3.2.1",
     "@types/ws": "^6.0.1",
     "bats": "^1.1.0",
     "chai": "^4.4.1",
     "chai-as-promised": "^7.1.1",
     "globby": "^10.0.2",
-    "lodash": "^4.17.11",
     "lolex": "^3.1.0",
     "mocha": "^10.8.2",
     "nock": "^13.5.1",
     "nyc": "^15.1.0",
-    "oclif": "4.14.36",
+    "oclif": "4.17.46",
     "proxyquire": "^2.1.0",
     "qqjs": "0.3.11",
-    "read-pkg": "^4.0.1",
+    "read-pkg": "^9.0.1",
     "rimraf": "5.0.5",
     "sinon": "^19.0.2",
     "source-map-support": "^0.5.21",
     "std-mocks": "^2.0.0",
     "strip-ansi": "6.0.1",
-    "tmp": "^0.2.3",
     "ts-node": "^10.9.2",
     "typescript": "4.8.4"
   },
   "engines": {
-    "node": "20.x"
+    "node": "20.x, 22.x"
   },
   "files": [
     "/autocomplete-scripts",
     "/bin",
     "/lib",
     "/npm-shrinkwrap.json",
-    "/oclif.manifest.json",
-    "/yarn.lock"
+    "/package-lock.json",
+    "/oclif.manifest.json"
   ],
   "homepage": "https://cli.heroku.com",
   "keywords": [
@@ -157,17 +151,6 @@
   ],
   "license": "ISC",
   "main": "lib/index.js",
-  "mocha": {
-    "require": [
-      "test/helpers/init.js",
-      "ts-node/register",
-      "source-map-support/register"
-    ],
-    "watch-extensions": "ts",
-    "recursive": true,
-    "reporter": "spec",
-    "timeout": 360000
-  },
   "oclif": {
     "repositoryPrefix": "<%- repo %>/blob/v<%- version %>/packages/cli/<%- commandPath %>",
     "additionalHelpFlags": [
@@ -344,7 +327,7 @@
     },
     "update": {
       "node": {
-        "version": "20.19.4"
+        "version": "22.17.1"
       },
       "s3": {
         "xz": true,
@@ -388,17 +371,19 @@
     "coverage:html": "nyc --reporter=html --reporter=text-summary npm run test",
     "coverage:check": "nyc --check-coverage --branches 80 --statements 80 --functions 80 --lines 80 npm run test",
     "postpublish": "rm -f oclif.manifest.json",
-    "prepack": "yarn run build && oclif manifest",
-    "pretest": "tsc -p test --noEmit && cd ../.. && yarn build",
-    "test:acceptance": "yarn pretest && mocha --forbid-only \"test/**/*.acceptance.test.ts\" && node ./bin/bats-test-runner",
-    "test:integration": "yarn pretest && mocha --forbid-only \"test/**/*.integration.test.ts\"",
-    "test:smoke": "yarn pretest && mocha --forbid-only \"test/**/smoke.acceptance.test.ts\"",
+    "manifest": "oclif manifest",
+    "prepack": "npm run build",
+    "pretest": "tsc -p test --noEmit && cd ../.. && npm run build",
+    "test:acceptance": "npm run pretest && mocha --forbid-only \"test/**/*.acceptance.test.ts\" && node ./bin/bats-test-runner",
+    "test:integration": "npm run pretest && mocha --forbid-only \"test/**/*.integration.test.ts\"",
+    "test:smoke": "npm run pretest && mocha --forbid-only \"test/**/smoke.acceptance.test.ts\"",
     "test:unit:justTest:local": "mocha \"test/**/*.unit.test.ts\"",
     "test:unit:justTest:ci": "nyc --reporter=lcov --reporter=text-summary mocha --forbid-only \"test/**/*.unit.test.ts\"",
-    "test": "yarn pretest && yarn test:unit:justTest:ci",
-    "test:local": "yarn pretest && yarn test:unit:justTest:local",
+    "test": "npm run pretest && npm run test:unit:justTest:ci",
+    "test:local": "npm run pretest && npm run test:unit:justTest:local",
     "version": "oclif readme --multi && git add README.md ../../docs"
   },
+  "type": "module",
   "types": "lib/index.d.ts",
-  "gitHead": "9b0be97ff1e81738dd9b1d68c23634d85bd8a764"
+  "gitHead": "39c2f558f1e83331064b6e7c9da8775fb013c553"
 }

package/lib/commands/autocomplete/create.d.ts

@@ -1,29 +0,0 @@
-import { AutocompleteBase } from '../../lib/autocomplete/base';
-export default class Create extends AutocompleteBase {
-    static hidden: boolean;
-    static description: string;
-    private _commands?;
-    run(): Promise<void>;
-    private ensureDirs;
-    private createFiles;
-    private get bashSetupScriptPath();
-    private get bashCommandsListPath();
-    private get zshSetupScriptPath();
-    private get zshCompletionSettersPath();
-    private get skipEllipsis();
-    private get commands();
-    private get bashCommandsList();
-    private get zshCompletionSetters();
-    private get zshCommandsSetter();
-    private get zshCommandsFlagsSetters();
-    private genCmdPublicFlags;
-    private genCmdWithDescription;
-    private genZshCmdFlagsSetter;
-    private genZshAllCmdsListSetter;
-    private get envAnalyticsDir();
-    private get envCommandsPath();
-    private get bashSetupScript();
-    private get zshSetupScript();
-    private get completionDotsFunc();
-    private wantsLocalFiles;
-}

package/lib/commands/autocomplete/create.js

@@ -1,213 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const fs = require("fs-extra");
-const path = require("path");
-const base_1 = require("../../lib/autocomplete/base");
-const debug = require('debug')('autocomplete:create');
-const AC_LIB_PATH = path.resolve(__dirname, '..', '..', '..', 'autocomplete-scripts');
-class Create extends base_1.AutocompleteBase {
-    async run() {
-        this.errorIfWindows();
-        // 1. ensure needed dirs
-        await this.ensureDirs();
-        // 2. save (generated) autocomplete files
-        await this.createFiles();
-    }
-    async ensureDirs() {
-        // ensure autocomplete cache dir
-        await fs.ensureDir(this.autocompleteCacheDir);
-        // ensure autocomplete completions dir
-        await fs.ensureDir(this.completionsCacheDir);
-    }
-    async createFiles() {
-        await fs.writeFile(this.bashSetupScriptPath, this.bashSetupScript);
-        await fs.writeFile(this.zshSetupScriptPath, this.zshSetupScript);
-        await fs.writeFile(this.bashCommandsListPath, this.bashCommandsList);
-        await fs.writeFile(this.zshCompletionSettersPath, this.zshCompletionSetters);
-    }
-    get bashSetupScriptPath() {
-        // <cacheDir>/autocomplete/bash_setup
-        return path.join(this.autocompleteCacheDir, 'bash_setup');
-    }
-    get bashCommandsListPath() {
-        // <cacheDir>/autocomplete/commands
-        return path.join(this.autocompleteCacheDir, 'commands');
-    }
-    get zshSetupScriptPath() {
-        // <cacheDir>/autocomplete/zsh_setup
-        return path.join(this.autocompleteCacheDir, 'zsh_setup');
-    }
-    get zshCompletionSettersPath() {
-        // <cacheDir>/autocomplete/commands_setters
-        return path.join(this.autocompleteCacheDir, 'commands_setters');
-    }
-    get skipEllipsis() {
-        return process.env.HEROKU_AC_ZSH_SKIP_ELLIPSIS === '1';
-    }
-    get commands() {
-        if (this._commands)
-            return this._commands;
-        const plugins = this.config.plugins;
-        const commands = [];
-        plugins.forEach(p => {
-            p.commands.forEach(c => {
-                if (c.hidden)
-                    return;
-                try {
-                    commands.push(c);
-                }
-                catch (error) {
-                    debug(`Error creating completions for command ${c.id}`);
-                    debug(error.message);
-                    this.writeLogFile(error.message);
-                }
-            });
-        });
-        this._commands = commands;
-        return this._commands;
-    }
-    get bashCommandsList() {
-        return this.commands.map(c => {
-            try {
-                const publicFlags = this.genCmdPublicFlags(c).trim();
-                return `${c.id} ${publicFlags}`;
-            }
-            catch (error) {
-                debug(`Error creating bash completion for command ${c.id}, moving on...`);
-                debug(error.message);
-                this.writeLogFile(error.message);
-                return '';
-            }
-        }).join('\n');
-    }
-    get zshCompletionSetters() {
-        const cmdsSetter = this.zshCommandsSetter;
-        const flagSetters = this.zshCommandsFlagsSetters;
-        return `${cmdsSetter}\n${flagSetters}`;
-    }
-    get zshCommandsSetter() {
-        const cmdsWithDescriptions = this.commands.map(c => {
-            try {
-                return this.genCmdWithDescription(c);
-            }
-            catch (error) {
-                debug(`Error creating zsh autocomplete for command ${c.id}, moving on...`);
-                debug(error.message);
-                this.writeLogFile(error.message);
-                return '';
-            }
-        });
-        return this.genZshAllCmdsListSetter(cmdsWithDescriptions);
-    }
-    get zshCommandsFlagsSetters() {
-        return this.commands.map(c => {
-            try {
-                return this.genZshCmdFlagsSetter(c);
-            }
-            catch (error) {
-                debug(`Error creating zsh autocomplete for command ${c.id}, moving on...`);
-                debug(error.message);
-                this.writeLogFile(error.message);
-                return '';
-            }
-        }).join('\n');
-    }
-    genCmdPublicFlags(command) {
-        const Flags = command.flags || {};
-        return Object.keys(Flags)
-            .filter(flag => !Flags[flag].hidden)
-            .map(flag => `--${flag}`)
-            .join(' ');
-    }
-    genCmdWithDescription(command) {
-        let description = '';
-        if (command.description) {
-            const text = command.description.split('\n')[0];
-            description = `:"${text}"`;
-        }
-        return `"${command.id.replace(/:/g, '\\:')}"${description}`;
-    }
-    genZshCmdFlagsSetter(command) {
-        const id = command.id;
-        const flagscompletions = Object.keys(command.flags || {})
-            .filter(flag => command.flags && !command.flags[flag].hidden)
-            .map(flag => {
-            const f = (command.flags && command.flags[flag]) || { description: '' };
-            const isBoolean = f.type === 'boolean';
-            const hasCompletion = 'completion' in f || this.findCompletion(id, flag, f.description);
-            const name = isBoolean ? flag : `${flag}=-`;
-            let cachecompl = '';
-            if (hasCompletion) {
-                cachecompl = ': :_compadd_flag_options';
-            }
-            if (this.wantsLocalFiles(flag)) {
-                cachecompl = ': :_files';
-            }
-            const help = isBoolean ? '(switch) ' : (hasCompletion ? '(autocomplete) ' : '');
-            const completion = `--${name}[${help}${f.description}]${cachecompl}`;
-            return `"${completion}"`;
-        })
-            .join('\n');
-        if (flagscompletions) {
-            return `_set_${id.replace(/:/g, '_')}_flags () {
-_flags=(
-${flagscompletions}
-)
-}
-`;
-        }
-        return `# no flags for ${id}`;
-    }
-    genZshAllCmdsListSetter(cmdsWithDesc) {
-        return `
-_set_all_commands_list () {
-_all_commands_list=(
-${cmdsWithDesc.join('\n')}
-)
-}
-`;
-    }
-    get envAnalyticsDir() {
-        return `HEROKU_AC_ANALYTICS_DIR=${path.join(this.autocompleteCacheDir, 'completion_analytics')};`;
-    }
-    get envCommandsPath() {
-        return `HEROKU_AC_COMMANDS_PATH=${path.join(this.autocompleteCacheDir, 'commands')};`;
-    }
-    get bashSetupScript() {
-        return `${this.envAnalyticsDir}
-${this.envCommandsPath}
-HEROKU_AC_BASH_COMPFUNC_PATH=${path.join(AC_LIB_PATH, 'bash', 'heroku.bash')} && test -f $HEROKU_AC_BASH_COMPFUNC_PATH && source $HEROKU_AC_BASH_COMPFUNC_PATH;
-`;
-    }
-    get zshSetupScript() {
-        return `${this.skipEllipsis ? '' : this.completionDotsFunc}
-${this.envAnalyticsDir}
-${this.envCommandsPath}
-HEROKU_AC_ZSH_SETTERS_PATH=\${HEROKU_AC_COMMANDS_PATH}_setters && test -f $HEROKU_AC_ZSH_SETTERS_PATH && source $HEROKU_AC_ZSH_SETTERS_PATH;
-fpath=(
-${path.join(AC_LIB_PATH, 'zsh')}
-$fpath
-);
-autoload -Uz compinit;
-compinit;
-`;
-    }
-    get completionDotsFunc() {
-        return `expand-or-complete-with-dots() {
-  echo -n "..."
-  zle expand-or-complete
-  zle redisplay
-}
-zle -N expand-or-complete-with-dots
-bindkey "^I" expand-or-complete-with-dots`;
-    }
-    wantsLocalFiles(flag) {
-        return [
-            'file',
-            'procfile',
-        ].includes(flag);
-    }
-}
-exports.default = Create;
-Create.hidden = true;
-Create.description = 'create autocomplete setup scripts and completion functions';

package/lib/commands/autocomplete/doctor.d.ts

@@ -1,12 +0,0 @@
-import { FlagInput } from '@oclif/core/lib/interfaces/parser';
-import { AutocompleteBase } from '../../lib/autocomplete/base';
-export default class Doctor extends AutocompleteBase {
-    static hidden: boolean;
-    static description: string;
-    static args: {
-        shell: import("@oclif/core/lib/interfaces/parser").Arg<string | undefined, Record<string, unknown>>;
-    };
-    static flags: FlagInput;
-    run(): Promise<void>;
-    private printList;
-}