@salesforce/cli 2.13.1 → 2.13.2

package/README.md

@@ -24,7 +24,7 @@ $ npm install -g @salesforce/cli
 $ sf COMMAND
 running command...
 $ sf (--version|-v)
-@salesforce/cli/2.13.1 linux-x64 node-v18.18.0
+@salesforce/cli/2.13.2 linux-x64 node-v18.18.0
 $ sf --help [COMMAND]
 USAGE
   $ sf COMMAND

package/bin/dev.js

@@ -0,0 +1,9 @@
+#!/usr/bin/env ts-node
+
+async function main() {
+  const oclif = await import('@oclif/core');
+  oclif.settings.performanceEnabled = true;
+  await oclif.execute({ development: true, dir: import.meta.url });
+}
+
+await main();

package/bin/run.js

@@ -0,0 +1,32 @@
+#!/usr/bin/env node
+
+// Pre-process/prune flags before creating or running the actual CLI
+(await import('../dist/flags.js')).preprocessCliFlags(process);
+
+const oclif = await import('@oclif/core');
+const { createRequire } = await import('module');
+const pjson = createRequire(import.meta.url)('../package.json');
+
+const cli = await import('../dist/cli.js');
+
+async function main() {
+  // Since the CLI is a single process, we can have a larger amount of max listeners since
+  // the process gets shut down. Don't set it to 0 (no limit) since we should still be aware
+  // of rouge event listeners
+  process.setMaxListeners(parseInt(process.env.SF_MAX_EVENT_LISTENERS, 10) || 1000);
+
+  // Don't let other plugins override the CLI specified max listener count
+  process.setMaxListeners = () => {};
+
+  cli
+    .create({ version: pjson.version, bin: pjson.oclif.bin, channel: 'stable' })
+    .run()
+    .then(async () => {
+      await oclif.flush();
+    })
+    .catch(async (err) => {
+      await oclif.handle(err);
+    });
+}
+
+await main();

package/dist/cli.js

@@ -1,59 +1,55 @@
-"use strict";
 /*
  * Copyright (c) 2022, salesforce.com, inc.
  * All rights reserved.
  * Licensed under the BSD 3-Clause license.
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.create = exports.configureAutoUpdate = exports.configureUpdateSites = exports.UPDATE_DISABLED_DEMO = exports.UPDATE_DISABLED_NPM = exports.UPDATE_DISABLED_INSTALLER = void 0;
-const os = require("os");
-const path = require("path");
-const core_1 = require("@oclif/core");
-const kit_1 = require("@salesforce/kit");
-const ts_types_1 = require("@salesforce/ts-types");
-const Debug = require("debug");
-const env_1 = require("./util/env");
+import { platform, arch, release } from 'node:os';
+import { resolve } from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { Config, run as oclifRun, settings } from '@oclif/core';
+import { set } from '@salesforce/kit';
+import Debug from 'debug';
+import { default as nodeEnv, Env } from './util/env.js';
 const debug = Debug('sf');
 const envVars = [
     ...new Set([
         ...Object.keys(process.env).filter((e) => e.startsWith('SF_') || e.startsWith('SFDX_')),
         'NODE_OPTIONS',
-        env_1.Env.SF_AUTOUPDATE_DISABLE,
+        Env.SF_AUTOUPDATE_DISABLE,
         'SF_BINPATH',
         'SF_COMPILE_CACHE',
-        env_1.Env.SF_DISABLE_AUTOUPDATE,
-        env_1.Env.SF_ENV,
-        env_1.Env.SF_INSTALLER,
-        env_1.Env.SF_NPM_REGISTRY,
+        Env.SF_DISABLE_AUTOUPDATE,
+        Env.SF_ENV,
+        Env.SF_INSTALLER,
+        Env.SF_NPM_REGISTRY,
         'SF_REDIRECTED',
-        env_1.Env.SF_UPDATE_INSTRUCTIONS,
+        Env.SF_UPDATE_INSTRUCTIONS,
     ]),
 ];
-exports.UPDATE_DISABLED_INSTALLER = 'Manual and automatic CLI updates have been disabled by setting "SF_AUTOUPDATE_DISABLE=true". ' +
+export const UPDATE_DISABLED_INSTALLER = 'Manual and automatic CLI updates have been disabled by setting "SF_AUTOUPDATE_DISABLE=true". ' +
     'To check for a new version, unset that environment variable.';
-exports.UPDATE_DISABLED_NPM = 'Use "npm update --global @salesforce/cli" to update npm-based installations.';
-exports.UPDATE_DISABLED_DEMO = 'Manual and automatic CLI updates have been disabled in DEMO mode. ' +
+export const UPDATE_DISABLED_NPM = 'Use "npm update --global @salesforce/cli" to update npm-based installations.';
+export const UPDATE_DISABLED_DEMO = 'Manual and automatic CLI updates have been disabled in DEMO mode. ' +
     'To check for a new version, unset the environment variable SF_ENV.';
-function configureUpdateSites(config, env = env_1.default) {
+export function configureUpdateSites(config, env = nodeEnv) {
     const npmRegistry = env.getNpmRegistryOverride();
     if (npmRegistry) {
         // Override config value if set via envar
-        (0, kit_1.set)(config, 'pjson.oclif.warn-if-update-available.registry', npmRegistry);
+        set(config, 'pjson.oclif.warn-if-update-available.registry', npmRegistry);
     }
 }
-exports.configureUpdateSites = configureUpdateSites;
-function configureAutoUpdate(envars) {
+export function configureAutoUpdate(envars) {
     if (envars.isDemoMode()) {
         // Disable autoupdates in demo mode
         envars.setAutoupdateDisabled(true);
-        envars.setUpdateInstructions(exports.UPDATE_DISABLED_DEMO);
+        envars.setUpdateInstructions(UPDATE_DISABLED_DEMO);
         return;
     }
     if (envars.isInstaller()) {
         envars.normalizeAutoupdateDisabled();
         if (envars.isAutoupdateDisabled()) {
-            envars.setUpdateInstructions(exports.UPDATE_DISABLED_INSTALLER);
+            envars.setUpdateInstructions(UPDATE_DISABLED_INSTALLER);
         }
         return;
     }
@@ -63,10 +59,9 @@ function configureAutoUpdate(envars) {
         envars.setAutoupdateDisabled(true);
     }
     if (envars.isAutoupdateDisabled()) {
-        envars.setUpdateInstructions(exports.UPDATE_DISABLED_NPM);
+        envars.setUpdateInstructions(UPDATE_DISABLED_NPM);
     }
 }
-exports.configureAutoUpdate = configureAutoUpdate;
 function debugCliInfo(version, channel, env, config) {
     function debugSection(section, items) {
         const pad = 25;
@@ -74,9 +69,9 @@ function debugCliInfo(version, channel, env, config) {
         items.forEach(([name, value]) => debug('%s: %s', name.padStart(pad), value));
     }
     debugSection('OS', [
-        ['platform', os.platform()],
-        ['architecture', os.arch()],
-        ['release', os.release()],
+        ['platform', platform()],
+        ['architecture', arch()],
+        ['release', release()],
         ['shell', config.shell],
     ]);
     debugSection('NODE', [['version', process.versions.node]]);
@@ -91,28 +86,26 @@ function debugCliInfo(version, channel, env, config) {
     debugSection('ENV', [...envVars].map((key) => [key, env.getString(key, '<not set>')]));
     debugSection('ARGS', process.argv.map((arg, i) => [i.toString(), arg]));
 }
-function create(version, channel, run, env = env_1.default) {
-    core_1.settings.performanceEnabled = true;
-    const root = path.resolve(__dirname, '..');
-    // eslint-disable-next-line @typescript-eslint/no-var-requires
-    const pjson = require(path.resolve(__dirname, '..', 'package.json'));
+export function create({ version, bin, channel, run, env }) {
+    settings.performanceEnabled = true;
+    const root = resolve(fileURLToPath(import.meta.url), '..');
     const args = process.argv.slice(2);
+    const environment = env ?? nodeEnv;
     return {
         async run() {
-            const config = new core_1.Config({
-                name: (0, ts_types_1.get)(pjson, 'oclif.bin'),
+            const config = new Config({
+                name: bin,
                 root,
                 version,
                 channel,
             });
             await config.load();
-            configureUpdateSites(config, env);
-            configureAutoUpdate(env);
-            debugCliInfo(version, channel, env, config);
+            configureUpdateSites(config, environment);
+            configureAutoUpdate(environment);
+            debugCliInfo(version, channel, environment, config);
             // Example of how run is used in a test https://github.com/salesforcecli/cli/pull/171/files#diff-1deee0a575599b2df117c280da319f7938aaf6fdb0c04bcdbde769dbf464be69R46
-            return run ? run(args, config) : (0, core_1.run)(args, config);
+            return run ? run(args, config) : oclifRun(args, config);
         },
     };
 }
-exports.create = create;
 //# sourceMappingURL=cli.js.map

package/dist/flags.js

@@ -1,13 +1,10 @@
-"use strict";
 /*
  * Copyright (c) 2020, salesforce.com, inc.
  * All rights reserved.
  * Licensed under the BSD 3-Clause license.
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.preprocessCliFlags = void 0;
-function preprocessCliFlags(process) {
+export function preprocessCliFlags(process) {
     process.argv.map((arg) => {
         if (arg === '--dev-debug') {
             let debug = '*';
@@ -25,7 +22,4 @@ function preprocessCliFlags(process) {
         }
     });
 }
-exports.preprocessCliFlags = preprocessCliFlags;
-// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-module.exports.preprocessCliFlags = preprocessCliFlags;
 //# sourceMappingURL=flags.js.map

package/dist/help/sfCommandHelp.js

@@ -1,14 +1,11 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SfCommandHelp = void 0;
 /*
  * Copyright (c) 2022, salesforce.com, inc.
  * All rights reserved.
  * Licensed under the BSD 3-Clause license.
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
-const core_1 = require("@oclif/core");
-class SfCommandHelp extends core_1.CommandHelp {
+import { CommandHelp } from '@oclif/core';
+export class SfCommandHelp extends CommandHelp {
     constructor(command, config, opts) {
         super(command, config, opts);
         this.command = command;
@@ -27,35 +24,25 @@ class SfCommandHelp extends core_1.CommandHelp {
         if (this.shortHelp) {
             return sections.filter(({ header }) => ['USAGE', 'ARGUMENTS', 'FLAGS'].includes(header));
         }
-        const additionaSfSections = [
+        const additionalSfSections = [
             {
                 header: 'CONFIGURATION VARIABLES',
-                generate: ({ cmd }) => {
-                    const sfCommand = cmd;
-                    return sfCommand.configurationVariablesSection;
-                },
+                generate: ({ cmd }) => cmd.configurationVariablesSection,
             },
             {
                 header: 'ENVIRONMENT VARIABLES',
-                generate: ({ cmd }) => {
-                    const sfCommand = cmd;
-                    return sfCommand.envVariablesSection;
-                },
+                generate: ({ cmd }) => cmd.envVariablesSection,
             },
             {
                 header: 'ERROR CODES',
-                generate: ({ cmd }) => {
-                    const sfCommand = cmd;
-                    return sfCommand.errorCodes;
-                },
+                generate: ({ cmd }) => cmd.errorCodes,
             },
         ];
         const flagsIndex = (sections.findIndex((section) => section.header === 'FLAG DESCRIPTIONS') || sections.length - 1) + 1;
-        sections.splice(flagsIndex, 0, additionaSfSections[0]);
-        sections.splice(flagsIndex + 1, 0, additionaSfSections[1]);
-        sections.splice(flagsIndex + 2, 0, additionaSfSections[2]);
+        sections.splice(flagsIndex, 0, additionalSfSections[0]);
+        sections.splice(flagsIndex + 1, 0, additionalSfSections[1]);
+        sections.splice(flagsIndex + 2, 0, additionalSfSections[2]);
         return sections;
     }
 }
-exports.SfCommandHelp = SfCommandHelp;
 //# sourceMappingURL=sfCommandHelp.js.map

package/dist/help/sfHelp.js

@@ -1,18 +1,16 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
 /*
  * Copyright (c) 2022, salesforce.com, inc.
  * All rights reserved.
  * Licensed under the BSD 3-Clause license.
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
-const core_1 = require("@oclif/core");
-const chalk = require("chalk");
-const sfCommandHelp_1 = require("./sfCommandHelp");
-class SfHelp extends core_1.Help {
+import { Help } from '@oclif/core';
+import chalk from 'chalk';
+import { SfCommandHelp } from './sfCommandHelp.js';
+export default class SfHelp extends Help {
     constructor() {
         super(...arguments);
-        this.CommandHelpClass = sfCommandHelp_1.SfCommandHelp;
+        this.CommandHelpClass = SfCommandHelp;
         this.showShortHelp = false;
         this.commands = [];
         this.subCommands = {};
@@ -45,5 +43,4 @@ class SfHelp extends core_1.Help {
         super.log(...formatted);
     }
 }
-exports.default = SfHelp;
 //# sourceMappingURL=sfHelp.js.map

package/dist/hooks/display-release-notes.js

@@ -1,47 +1,22 @@
-"use strict";
 /*
  * Copyright (c) 2021, salesforce.com, inc.
  * All rights reserved.
  * Licensed under the BSD 3-Clause license.
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
-Object.defineProperty(exports, "__esModule", { value: true });
-const path_1 = require("path");
-const child_process_1 = require("child_process");
-const core_1 = require("@oclif/core");
-const logError = (msg) => {
-    core_1.ux.log('NOTE: This error can be ignored in CI and may be silenced in the future');
-    core_1.ux.log('- Set the SF_HIDE_RELEASE_NOTES env var to "true" to skip this script\n');
-    core_1.ux.log(msg.toString());
-};
-/*
- * NOTE: Please read "Notes about the hook scripts" in this PR before making changes:
- * https://github.com/salesforcecli/sfdx-cli/pull/407
- */
-const hook = async () => new Promise((resolve) => {
-    if (process.env.SF_HIDE_RELEASE_NOTES === 'true') {
-        resolve();
+import { ux } from '@oclif/core';
+export const hook = async function ({ config }) {
+    if (process.env.SF_HIDE_RELEASE_NOTES === 'true')
+        return;
+    try {
+        return await config.runCommand('whatsnew', ['--hook']);
     }
-    const executable = process.platform === 'win32' ? 'run.cmd' : 'run';
-    const cmd = (0, child_process_1.spawn)((0, path_1.join)(__dirname, '..', '..', 'bin', executable), ['whatsnew', '--hook'], {
-        stdio: ['ignore', 'inherit', 'pipe'],
-        timeout: 10000,
-    });
-    cmd.stderr.on('data', (error) => {
-        logError(error);
-        resolve();
-    });
-    cmd.on('error', (error) => {
-        logError(error);
-        resolve();
-    });
-    // 'exit' fires whether or not the stream are finished
-    cmd.on('exit', () => {
-        resolve();
-    });
-    cmd.on('close', () => {
-        resolve();
-    });
-});
-exports.default = hook;
+    catch (err) {
+        const error = err;
+        ux.log('NOTE: This error can be ignored in CI and may be silenced in the future');
+        ux.log('- Set the SF_HIDE_RELEASE_NOTES env var to "true" to skip this script\n');
+        ux.log(error.message);
+    }
+};
+export default hook;
 //# sourceMappingURL=display-release-notes.js.map

package/dist/hooks/incomplete.js

@@ -1,16 +1,14 @@
-"use strict";
 /*
  * Copyright (c) 2022, salesforce.com, inc.
  * All rights reserved.
  * Licensed under the BSD 3-Clause license.
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
-Object.defineProperty(exports, "__esModule", { value: true });
-const os = require("os");
-const core_1 = require("@oclif/core");
-const sf_plugins_core_1 = require("@salesforce/sf-plugins-core");
+import * as os from 'os';
+import { toConfiguredId, toStandardizedId, loadHelpClass } from '@oclif/core';
+import { Prompter } from '@salesforce/sf-plugins-core';
 function buildChoices(matches, config) {
-    const configuredIds = matches.map((p) => (0, core_1.toConfiguredId)(p.id, config));
+    const configuredIds = matches.map((p) => toConfiguredId(p.id, config));
     const maxCommandLength = configuredIds.reduce((max, id) => Math.max(max, id.length), 0);
     return matches.map((p, i) => {
         const summary = p.summary ?? p.description?.split(os.EOL)[0] ?? '';
@@ -22,7 +20,7 @@ function buildChoices(matches, config) {
     });
 }
 async function determineCommand(config, matches) {
-    const prompter = new sf_plugins_core_1.Prompter();
+    const prompter = new Prompter();
     const choices = buildChoices(matches, config);
     const { command } = await prompter.timedPrompt([
         {
@@ -37,12 +35,12 @@ async function determineCommand(config, matches) {
 const hook = async function ({ config, matches, argv }) {
     const command = await determineCommand(config, matches);
     if (argv.includes('--help') || argv.includes('-h')) {
-        const Help = await (0, core_1.loadHelpClass)(config);
+        const Help = await loadHelpClass(config);
         // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
         const help = new Help(config, config.pjson.helpOptions);
-        return help.showHelp([(0, core_1.toStandardizedId)(command, config), ...argv]);
+        return help.showHelp([toStandardizedId(command, config), ...argv]);
     }
-    return config.runCommand((0, core_1.toStandardizedId)(command, config), argv);
+    return config.runCommand(toStandardizedId(command, config), argv);
 };
-exports.default = hook;
+export default hook;
 //# sourceMappingURL=incomplete.js.map

package/dist/hooks/pluginsPreinstall.js

@@ -1,18 +1,16 @@
-"use strict";
 /*
  * Copyright (c) 2022, salesforce.com, inc.
  * All rights reserved.
  * Licensed under the BSD 3-Clause license.
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
-Object.defineProperty(exports, "__esModule", { value: true });
-const core_1 = require("@oclif/core");
+import { Errors } from '@oclif/core';
 const hook = async function (options) {
     const verifySignHookResult = await this.config.runHook('plugins:preinstall:verify:signature', options);
     const pluginTrustFailure = verifySignHookResult.failures.find((failure) => failure.plugin.name === '@salesforce/plugin-trust');
     if (pluginTrustFailure !== undefined) {
-        core_1.Errors.handle(pluginTrustFailure.error);
+        await Errors.handle(pluginTrustFailure.error);
     }
 };
-exports.default = hook;
+export default hook;
 //# sourceMappingURL=pluginsPreinstall.js.map

package/dist/hooks/prerun.js

@@ -1,12 +1,10 @@
-"use strict";
 /*
  * Copyright (c) 2023, salesforce.com, inc.
  * All rights reserved.
  * Licensed under the BSD 3-Clause license.
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
-Object.defineProperty(exports, "__esModule", { value: true });
-const core_1 = require("@oclif/core");
+import { ux } from '@oclif/core';
 // eslint-disable-next-line @typescript-eslint/require-await
 const hook = async function ({ Command, config }) {
     if (process.argv.includes('--json'))
@@ -22,8 +20,8 @@ const hook = async function ({ Command, config }) {
     if (!specifiedVersion)
         return;
     if (plugin.version !== specifiedVersion) {
-        core_1.ux.warn(`Plugin ${plugin.name} (${plugin.version}) differs from the version specified by ${config.bin} (${specifiedVersion})`);
+        ux.warn(`Plugin ${plugin.name} (${plugin.version}) differs from the version specified by ${config.bin} (${specifiedVersion})`);
     }
 };
-exports.default = hook;
+export default hook;
 //# sourceMappingURL=prerun.js.map

package/dist/index.js

@@ -1,3 +1,2 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};
 //# sourceMappingURL=index.js.map

package/dist/util/env.js

@@ -1,14 +1,11 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Env = void 0;
 /*
  * Copyright (c) 2022, salesforce.com, inc.
  * All rights reserved.
  * Licensed under the BSD 3-Clause license.
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
-const envVars_1 = require("@salesforce/core/lib/config/envVars");
-class Env extends envVars_1.EnvVars {
+import { EnvVars } from '@salesforce/core/lib/config/envVars.js';
+export class Env extends EnvVars {
     constructor(env = process.env) {
         super(env);
     }
@@ -51,12 +48,11 @@ class Env extends envVars_1.EnvVars {
         }
     }
 }
-exports.Env = Env;
 Env.SF_AUTOUPDATE_DISABLE = 'SF_AUTOUPDATE_DISABLE';
 Env.SF_DISABLE_AUTOUPDATE = 'SF_DISABLE_AUTOUPDATE';
 Env.SF_ENV = 'SF_ENV';
 Env.SF_INSTALLER = 'SF_INSTALLER';
 Env.SF_NPM_REGISTRY = 'SF_NPM_REGISTRY';
 Env.SF_UPDATE_INSTRUCTIONS = 'SF_UPDATE_INSTRUCTIONS';
-exports.default = new Env();
+export default new Env();
 //# sourceMappingURL=env.js.map