@forge/cli
13.0.013.1.0-next.4-experimental-9423de1
out/command-line/uninstall-command-helpers.js~
out/command-line/uninstall-command-helpers.jsModified+5−5
Index: package/out/command-line/uninstall-command-helpers.js
===================================================================
--- package/out/command-line/uninstall-command-helpers.js
+++ package/out/command-line/uninstall-command-helpers.js
@@ -81,10 +81,10 @@
}
return context;
};
exports.getInstallationContext = getInstallationContext;
-const performSingleUninstall = async (installId, installationContext, { ui, commands: { uninstallAppCommand } }) => {
- const installation = await ui.displayProgress(() => uninstallAppCommand.execute(installId, installationContext), cli_shared_1.Text.uninstall.cmd.start, (result) => ({
+const performSingleUninstall = async (installId, installationContext, { ui, commands: { uninstallAppCommand } }, appIdOverride) => {
+ const installation = await ui.displayProgress(() => uninstallAppCommand.execute(installId, installationContext, appIdOverride), cli_shared_1.Text.uninstall.cmd.start, (result) => ({
successful: !!result.successful,
message: cli_shared_1.Text.uninstall.cmd.success(false)
}));
const uninstallMessageFormat = installation.successful ? cli_shared_1.Text.uninstall.done : cli_shared_1.Text.uninstall.failed;
@@ -96,18 +96,18 @@
ui.error(new shared_1.UninstallAppError(uninstallMessage));
}
};
exports.performSingleUninstall = performSingleUninstall;
-const performMultipleUninstalls = async (appsToUninstallFirst, appsToUninstallSecond, { ui, commands: { uninstallAppCommand } }, completionMessage) => {
+const performMultipleUninstalls = async (appsToUninstallFirst, appsToUninstallSecond, { ui, commands: { uninstallAppCommand } }, completionMessage, appIdOverride) => {
const filteredInstallations = appsToUninstallFirst.filter(({ product }) => product !== 'identity');
const hasMultipleNonIdentityApps = filteredInstallations.length > 1;
const uninstalledApps = await ui.displayProgress(async () => {
const result = [];
- result.push(...(await uninstallAppCommand.batchExecute([], appsToUninstallFirst)));
+ result.push(...(await uninstallAppCommand.batchExecute([], appsToUninstallFirst, appIdOverride)));
if (result.some(({ successful }) => successful === false)) {
return result;
}
- result.push(...(await uninstallAppCommand.batchExecute([], appsToUninstallSecond)));
+ result.push(...(await uninstallAppCommand.batchExecute([], appsToUninstallSecond, appIdOverride)));
return result;
}, cli_shared_1.Text.uninstall.cmd.start, (result) => {
const isSuccessful = !result.some(({ successful }) => successful === false);
return {