@pnp/cli-microsoft365 6.10.0-beta.a85ab2d → 7.0.0-beta.2756488

package/dist/m365/spo/commands/listitem/listitem-roleinheritance-break.js

@@ -43,7 +43,7 @@ class SpoListItemRoleInheritanceBreakCommand extends SpoCommand_1.default {
             if (this.verbose) {
                 logger.logToStderr(`Breaking role inheritance of list item in site at ${args.options.webUrl}...`);
             }
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield this.breakListItemRoleInheritance(args.options);
             }
             else {
@@ -101,7 +101,7 @@ _SpoListItemRoleInheritanceBreakCommand_instances = new WeakSet(), _SpoListItemR
             listTitle: typeof args.options.listTitle !== 'undefined',
             listUrl: typeof args.options.listUrl !== 'undefined',
             clearExistingPermissions: args.options.clearExistingPermissions === true,
-            confirm: (!(!args.options.confirm)).toString()
+            force: (!(!args.options.force)).toString()
         });
     });
 }, _SpoListItemRoleInheritanceBreakCommand_initOptions = function _SpoListItemRoleInheritanceBreakCommand_initOptions() {
@@ -118,7 +118,7 @@ _SpoListItemRoleInheritanceBreakCommand_instances = new WeakSet(), _SpoListItemR
     }, {
         option: '-c, --clearExistingPermissions'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _SpoListItemRoleInheritanceBreakCommand_initValidators = function _SpoListItemRoleInheritanceBreakCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

package/dist/m365/spo/commands/listitem/listitem-roleinheritance-reset.js

@@ -43,7 +43,7 @@ class SpoListItemRoleInheritanceResetCommand extends SpoCommand_1.default {
             if (this.verbose) {
                 logger.logToStderr(`Restore role inheritance of list item in site at ${args.options.webUrl}...`);
             }
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield this.resetListItemRoleInheritance(args.options);
             }
             else {
@@ -96,7 +96,7 @@ _SpoListItemRoleInheritanceResetCommand_instances = new WeakSet(), _SpoListItemR
             listId: typeof args.options.listId !== 'undefined',
             listTitle: typeof args.options.listTitle !== 'undefined',
             listUrl: typeof args.options.listUrl !== 'undefined',
-            confirm: (!(!args.options.confirm)).toString()
+            force: (!(!args.options.force)).toString()
         });
     });
 }, _SpoListItemRoleInheritanceResetCommand_initOptions = function _SpoListItemRoleInheritanceResetCommand_initOptions() {
@@ -111,7 +111,7 @@ _SpoListItemRoleInheritanceResetCommand_instances = new WeakSet(), _SpoListItemR
     }, {
         option: '--listUrl [listUrl]'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _SpoListItemRoleInheritanceResetCommand_initValidators = function _SpoListItemRoleInheritanceResetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

package/dist/m365/spo/commands/navigation/navigation-node-remove.js

@@ -37,7 +37,7 @@ class SpoNavigationNodeRemoveCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield this.removeNode(logger, args.options);
             }
             else {
@@ -80,7 +80,7 @@ _SpoNavigationNodeRemoveCommand_instances = new WeakSet(), _SpoNavigationNodeRem
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             location: args.options.location,
-            confirm: typeof args.options.confirm !== 'undefined'
+            force: typeof args.options.force !== 'undefined'
         });
     });
 }, _SpoNavigationNodeRemoveCommand_initOptions = function _SpoNavigationNodeRemoveCommand_initOptions() {
@@ -92,7 +92,7 @@ _SpoNavigationNodeRemoveCommand_instances = new WeakSet(), _SpoNavigationNodeRem
     }, {
         option: '-i, --id <id>'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _SpoNavigationNodeRemoveCommand_initValidators = function _SpoNavigationNodeRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

package/dist/m365/spo/commands/orgassetslibrary/orgassetslibrary-remove.js

@@ -35,7 +35,7 @@ class SpoOrgAssetsLibraryRemoveCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield this.removeLibrary(logger, args.options.libraryUrl);
             }
             else {
@@ -83,7 +83,7 @@ _SpoOrgAssetsLibraryRemoveCommand_instances = new WeakSet(), _SpoOrgAssetsLibrar
     this.options.unshift({
         option: '--libraryUrl <libraryUrl>'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 };
 module.exports = new SpoOrgAssetsLibraryRemoveCommand();

package/dist/m365/spo/commands/orgnewssite/orgnewssite-remove.js

@@ -39,7 +39,7 @@ class SpoOrgNewsSiteRemoveCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield this.removeOrgNewsSite(logger, args.options.url);
             }
             else {
@@ -83,14 +83,14 @@ class SpoOrgNewsSiteRemoveCommand extends SpoCommand_1.default {
 _SpoOrgNewsSiteRemoveCommand_instances = new WeakSet(), _SpoOrgNewsSiteRemoveCommand_initTelemetry = function _SpoOrgNewsSiteRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            confirm: (!(!args.options.confirm)).toString()
+            force: (!(!args.options.force)).toString()
         });
     });
 }, _SpoOrgNewsSiteRemoveCommand_initOptions = function _SpoOrgNewsSiteRemoveCommand_initOptions() {
     this.options.unshift({
         option: '-u, --url <url>'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _SpoOrgNewsSiteRemoveCommand_initValidators = function _SpoOrgNewsSiteRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.url); }));

package/dist/m365/spo/commands/page/page-remove.js

@@ -66,7 +66,7 @@ class SpoPageRemoveCommand extends SpoCommand_1.default {
                     this.handleRejectedODataJsonPromise(err);
                 }
             });
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield removePage();
             }
             else {
@@ -89,7 +89,7 @@ _SpoPageRemoveCommand_instances = new WeakSet(), _SpoPageRemoveCommand_initOptio
     }, {
         option: '-u, --webUrl <webUrl>'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _SpoPageRemoveCommand_initValidators = function _SpoPageRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.webUrl); }));

package/dist/m365/spo/commands/propertybag/propertybag-get.js

@@ -86,7 +86,7 @@ _SpoPropertyBagGetCommand_instances = new WeakSet(), _SpoPropertyBagGetCommand_i
     }, {
         option: '-k, --key <key>'
     }, {
-        option: '-f, --folder [folder]'
+        option: '--folder [folder]'
     });
 }, _SpoPropertyBagGetCommand_initValidators = function _SpoPropertyBagGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.webUrl); }));

package/dist/m365/spo/commands/propertybag/propertybag-list.js

@@ -84,7 +84,7 @@ _SpoPropertyBagListCommand_instances = new WeakSet(), _SpoPropertyBagListCommand
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-f, --folder [folder]'
+        option: '--folder [folder]'
     });
 }, _SpoPropertyBagListCommand_initValidators = function _SpoPropertyBagListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.webUrl); }));

package/dist/m365/spo/commands/propertybag/propertybag-remove.js

@@ -55,7 +55,7 @@ class SpoPropertyBagRemoveCommand extends propertybag_base_1.SpoPropertyBagBaseC
                     this.handleRejectedPromise(err);
                 }
             });
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield removeProperty();
             }
             else {
@@ -101,7 +101,7 @@ _SpoPropertyBagRemoveCommand_instances = new WeakSet(), _SpoPropertyBagRemoveCom
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             folder: (!(!args.options.folder)).toString(),
-            confirm: args.options.confirm === true
+            force: args.options.force === true
         });
     });
 }, _SpoPropertyBagRemoveCommand_initOptions = function _SpoPropertyBagRemoveCommand_initOptions() {
@@ -110,9 +110,9 @@ _SpoPropertyBagRemoveCommand_instances = new WeakSet(), _SpoPropertyBagRemoveCom
     }, {
         option: '-k, --key <key>'
     }, {
-        option: '-f, --folder [folder]'
+        option: '--folder [folder]'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _SpoPropertyBagRemoveCommand_initValidators = function _SpoPropertyBagRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.webUrl); }));

package/dist/m365/spo/commands/propertybag/propertybag-set.js

@@ -79,7 +79,7 @@ _SpoPropertyBagSetCommand_instances = new WeakSet(), _SpoPropertyBagSetCommand_i
     }, {
         option: '-v, --value <value>'
     }, {
-        option: '-f, --folder [folder]'
+        option: '--folder [folder]'
     });
 }, _SpoPropertyBagSetCommand_initValidators = function _SpoPropertyBagSetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.webUrl); }));

package/dist/m365/spo/commands/roledefinition/roledefinition-remove.js

@@ -57,7 +57,7 @@ class SpoRoleDefinitionRemoveCommand extends SpoCommand_1.default {
                     this.handleRejectedODataJsonPromise(err);
                 }
             });
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield removeRoleDefinition();
             }
             else {
@@ -77,7 +77,7 @@ class SpoRoleDefinitionRemoveCommand extends SpoCommand_1.default {
 _SpoRoleDefinitionRemoveCommand_instances = new WeakSet(), _SpoRoleDefinitionRemoveCommand_initTelemetry = function _SpoRoleDefinitionRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            confirm: (!(!args.options.confirm)).toString()
+            force: (!(!args.options.force)).toString()
         });
     });
 }, _SpoRoleDefinitionRemoveCommand_initOptions = function _SpoRoleDefinitionRemoveCommand_initOptions() {
@@ -86,7 +86,7 @@ _SpoRoleDefinitionRemoveCommand_instances = new WeakSet(), _SpoRoleDefinitionRem
     }, {
         option: '-i, --id <id>'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _SpoRoleDefinitionRemoveCommand_initValidators = function _SpoRoleDefinitionRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

package/dist/m365/spo/commands/serviceprincipal/serviceprincipal-set.js

@@ -70,7 +70,7 @@ class SpoServicePrincipalSetCommand extends SpoCommand_1.default {
                     this.handleRejectedPromise(err);
                 }
             });
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield toggleServicePrincipal();
             }
             else {
@@ -98,7 +98,7 @@ _SpoServicePrincipalSetCommand_instances = new WeakSet(), _SpoServicePrincipalSe
         option: '-e, --enabled <enabled>',
         autocomplete: ['true', 'false']
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _SpoServicePrincipalSetCommand_initTypes = function _SpoServicePrincipalSetCommand_initTypes() {
     this.types.boolean.push('enabled');

package/dist/m365/spo/commands/site/site-apppermission-remove.js

@@ -99,7 +99,7 @@ class SpoSiteAppPermissionRemoveCommand extends GraphCommand_1.default {
                     this.handleRejectedODataJsonPromise(err);
                 }
             });
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield removeSiteAppPermission();
             }
             else {
@@ -122,7 +122,7 @@ _SpoSiteAppPermissionRemoveCommand_instances = new WeakSet(), _SpoSiteAppPermiss
             appId: typeof args.options.appId !== 'undefined',
             appDisplayName: typeof args.options.appDisplayName !== 'undefined',
             id: typeof args.options.id !== 'undefined',
-            confirm: (!!args.options.confirm).toString()
+            force: (!!args.options.force).toString()
         });
     });
 }, _SpoSiteAppPermissionRemoveCommand_initOptions = function _SpoSiteAppPermissionRemoveCommand_initOptions() {
@@ -135,7 +135,7 @@ _SpoSiteAppPermissionRemoveCommand_instances = new WeakSet(), _SpoSiteAppPermiss
     }, {
         option: '-n, --appDisplayName [appDisplayName]'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _SpoSiteAppPermissionRemoveCommand_initValidators = function _SpoSiteAppPermissionRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

package/dist/m365/spo/commands/site/site-hubsite-disconnect.js

@@ -57,7 +57,7 @@ class SpoSiteHubSiteDisconnectCommand extends SpoCommand_1.default {
                     this.handleRejectedODataJsonPromise(err);
                 }
             });
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield disconnectHubSite();
             }
             else {
@@ -77,14 +77,14 @@ class SpoSiteHubSiteDisconnectCommand extends SpoCommand_1.default {
 _SpoSiteHubSiteDisconnectCommand_instances = new WeakSet(), _SpoSiteHubSiteDisconnectCommand_initTelemetry = function _SpoSiteHubSiteDisconnectCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            confirm: args.options.confirm || false
+            force: args.options.force || false
         });
     });
 }, _SpoSiteHubSiteDisconnectCommand_initOptions = function _SpoSiteHubSiteDisconnectCommand_initOptions() {
     this.options.unshift({
         option: '-u, --siteUrl <siteUrl>'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _SpoSiteHubSiteDisconnectCommand_initValidators = function _SpoSiteHubSiteDisconnectCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.siteUrl); }));

package/dist/m365/spo/commands/site/site-list.js

@@ -131,7 +131,7 @@ _SpoSiteListCommand_instances = new WeakSet(), _SpoSiteListCommand_initTelemetry
     }, {
         option: '--webTemplate [webTemplate]'
     }, {
-        option: '-f, --filter [filter]'
+        option: '--filter [filter]'
     }, {
         option: '--includeOneDriveSites'
     }, {

package/dist/m365/spo/commands/site/site-recyclebinitem-clear.js

@@ -36,7 +36,7 @@ class SpoSiteRecycleBinItemClearCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield this.clearRecycleBin(args, logger);
             }
             else {
@@ -91,7 +91,7 @@ _SpoSiteRecycleBinItemClearCommand_instances = new WeakSet(), _SpoSiteRecycleBin
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             secondary: !!args.options.secondary,
-            confirm: !!args.options.confirm
+            force: !!args.options.force
         });
     });
 }, _SpoSiteRecycleBinItemClearCommand_initOptions = function _SpoSiteRecycleBinItemClearCommand_initOptions() {
@@ -100,7 +100,7 @@ _SpoSiteRecycleBinItemClearCommand_instances = new WeakSet(), _SpoSiteRecycleBin
     }, {
         option: '--secondary'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _SpoSiteRecycleBinItemClearCommand_initValidators = function _SpoSiteRecycleBinItemClearCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

package/dist/m365/spo/commands/site/site-recyclebinitem-move.js

@@ -37,7 +37,7 @@ class SpoSiteRecycleBinItemMoveCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield this.moveRecycleBinItem(args, logger);
             }
             else {
@@ -88,7 +88,7 @@ _SpoSiteRecycleBinItemMoveCommand_instances = new WeakSet(), _SpoSiteRecycleBinI
         Object.assign(this.telemetryProperties, {
             ids: typeof args.options.ids !== 'undefined',
             all: !!args.options.all,
-            confirm: !!args.options.confirm
+            force: !!args.options.force
         });
     });
 }, _SpoSiteRecycleBinItemMoveCommand_initOptions = function _SpoSiteRecycleBinItemMoveCommand_initOptions() {
@@ -99,7 +99,7 @@ _SpoSiteRecycleBinItemMoveCommand_instances = new WeakSet(), _SpoSiteRecycleBinI
     }, {
         option: '--all'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _SpoSiteRecycleBinItemMoveCommand_initOptionSets = function _SpoSiteRecycleBinItemMoveCommand_initOptionSets() {
     this.optionSets.push({ options: ['ids', 'all'] });

package/dist/m365/spo/commands/site/site-recyclebinitem-remove.js

@@ -36,7 +36,7 @@ class SpoSiteRecycleBinItemRemoveCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield this.removeRecycleBinItem(args, logger);
             }
             else {
@@ -79,7 +79,7 @@ class SpoSiteRecycleBinItemRemoveCommand extends SpoCommand_1.default {
 _SpoSiteRecycleBinItemRemoveCommand_instances = new WeakSet(), _SpoSiteRecycleBinItemRemoveCommand_initTelemetry = function _SpoSiteRecycleBinItemRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            confirm: !!args.options.confirm
+            force: !!args.options.force
         });
     });
 }, _SpoSiteRecycleBinItemRemoveCommand_initOptions = function _SpoSiteRecycleBinItemRemoveCommand_initOptions() {
@@ -88,7 +88,7 @@ _SpoSiteRecycleBinItemRemoveCommand_instances = new WeakSet(), _SpoSiteRecycleBi
     }, {
         option: '-i, --ids <ids>'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _SpoSiteRecycleBinItemRemoveCommand_initValidators = function _SpoSiteRecycleBinItemRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

package/dist/m365/spo/commands/site/site-remove.js

@@ -91,7 +91,7 @@ class SpoSiteRemoveCommand extends SpoCommand_1.default {
                     this.handleRejectedPromise(err);
                 }
             });
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield removeSite();
             }
             else {
@@ -306,7 +306,7 @@ _SpoSiteRemoveCommand_instances = new WeakSet(), _SpoSiteRemoveCommand_initTelem
             skipRecycleBin: (!(!args.options.skipRecycleBin)).toString(),
             fromRecycleBin: (!(!args.options.fromRecycleBin)).toString(),
             wait: args.options.wait,
-            confirm: (!(!args.options.confirm)).toString()
+            force: (!(!args.options.force)).toString()
         });
     });
 }, _SpoSiteRemoveCommand_initOptions = function _SpoSiteRemoveCommand_initOptions() {
@@ -319,7 +319,7 @@ _SpoSiteRemoveCommand_instances = new WeakSet(), _SpoSiteRemoveCommand_initTelem
     }, {
         option: '--wait'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _SpoSiteRemoveCommand_initValidators = function _SpoSiteRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.url); }));

package/dist/m365/spo/commands/sitedesign/sitedesign-remove.js

@@ -57,7 +57,7 @@ class SpoSiteDesignRemoveCommand extends SpoCommand_1.default {
                     this.handleRejectedODataJsonPromise(err);
                 }
             });
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield removeSiteDesign();
             }
             else {
@@ -77,14 +77,14 @@ class SpoSiteDesignRemoveCommand extends SpoCommand_1.default {
 _SpoSiteDesignRemoveCommand_instances = new WeakSet(), _SpoSiteDesignRemoveCommand_initTelemetry = function _SpoSiteDesignRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            confirm: args.options.confirm || false
+            force: args.options.force || false
         });
     });
 }, _SpoSiteDesignRemoveCommand_initOptions = function _SpoSiteDesignRemoveCommand_initOptions() {
     this.options.unshift({
         option: '-i, --id <id>'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _SpoSiteDesignRemoveCommand_initValidators = function _SpoSiteDesignRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

package/dist/m365/spo/commands/sitedesign/sitedesign-rights-revoke.js

@@ -60,7 +60,7 @@ class SpoSiteDesignRightsRevokeCommand extends SpoCommand_1.default {
                     this.handleRejectedODataJsonPromise(err);
                 }
             });
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield revokePermissions();
             }
             else {
@@ -80,7 +80,7 @@ class SpoSiteDesignRightsRevokeCommand extends SpoCommand_1.default {
 _SpoSiteDesignRightsRevokeCommand_instances = new WeakSet(), _SpoSiteDesignRightsRevokeCommand_initTelemetry = function _SpoSiteDesignRightsRevokeCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            confirm: args.options.confirm || false
+            force: args.options.force || false
         });
     });
 }, _SpoSiteDesignRightsRevokeCommand_initOptions = function _SpoSiteDesignRightsRevokeCommand_initOptions() {
@@ -89,7 +89,7 @@ _SpoSiteDesignRightsRevokeCommand_instances = new WeakSet(), _SpoSiteDesignRight
     }, {
         option: '-p, --principals <principals>'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _SpoSiteDesignRightsRevokeCommand_initValidators = function _SpoSiteDesignRightsRevokeCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

package/dist/m365/spo/commands/sitedesign/sitedesign-task-remove.js

@@ -37,7 +37,7 @@ class SpoSiteDesignTaskRemoveCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield this.removeSiteDesignTask(logger, args.options.id);
             }
             else {
@@ -78,14 +78,14 @@ class SpoSiteDesignTaskRemoveCommand extends SpoCommand_1.default {
 _SpoSiteDesignTaskRemoveCommand_instances = new WeakSet(), _SpoSiteDesignTaskRemoveCommand_initTelemetry = function _SpoSiteDesignTaskRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            confirm: args.options.confirm || false
+            force: args.options.force || false
         });
     });
 }, _SpoSiteDesignTaskRemoveCommand_initOptions = function _SpoSiteDesignTaskRemoveCommand_initOptions() {
     this.options.unshift({
         option: '-i, --id <id>'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _SpoSiteDesignTaskRemoveCommand_initValidators = function _SpoSiteDesignTaskRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

package/dist/m365/spo/commands/sitescript/sitescript-remove.js

@@ -37,7 +37,7 @@ class SpoSiteScriptRemoveCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield this.removeSiteScript(logger, args.options.id);
             }
             else {
@@ -79,14 +79,14 @@ class SpoSiteScriptRemoveCommand extends SpoCommand_1.default {
 _SpoSiteScriptRemoveCommand_instances = new WeakSet(), _SpoSiteScriptRemoveCommand_initTelemetry = function _SpoSiteScriptRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            confirm: args.options.confirm || false
+            force: args.options.force || false
         });
     });
 }, _SpoSiteScriptRemoveCommand_initOptions = function _SpoSiteScriptRemoveCommand_initOptions() {
     this.options.unshift({
         option: '-i, --id <id>'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _SpoSiteScriptRemoveCommand_initValidators = function _SpoSiteScriptRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

package/dist/m365/spo/commands/storageentity/storageentity-remove.js

@@ -39,7 +39,7 @@ class SpoStorageEntityRemoveCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield this.removeTenantProperty(logger, args);
             }
             else {
@@ -86,7 +86,7 @@ class SpoStorageEntityRemoveCommand extends SpoCommand_1.default {
 _SpoStorageEntityRemoveCommand_instances = new WeakSet(), _SpoStorageEntityRemoveCommand_initTelemetry = function _SpoStorageEntityRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            confirm: (!(!args.options.confirm)).toString()
+            force: (!(!args.options.force)).toString()
         });
     });
 }, _SpoStorageEntityRemoveCommand_initOptions = function _SpoStorageEntityRemoveCommand_initOptions() {
@@ -95,7 +95,7 @@ _SpoStorageEntityRemoveCommand_instances = new WeakSet(), _SpoStorageEntityRemov
     }, {
         option: '-k, --key <key>'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _SpoStorageEntityRemoveCommand_initValidators = function _SpoStorageEntityRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.appCatalogUrl); }));

package/dist/m365/spo/commands/tenant/tenant-appcatalog-add.js

@@ -62,7 +62,8 @@ class SpoTenantAppCatalogAddCommand extends SpoCommand_1.default {
         });
     }
     ensureNoExistingSite(url, force, logger) {
-        return new Promise((resolve, reject) => {
+        var _a, _b;
+        return __awaiter(this, void 0, void 0, function* () {
             if (this.verbose) {
                 logger.logToStderr(`Checking if site ${url} exists...`);
             }
@@ -74,14 +75,13 @@ class SpoTenantAppCatalogAddCommand extends SpoCommand_1.default {
                     _: []
                 }
             };
-            Cli_1.Cli
-                .executeCommandWithOutput(spoSiteGetCommand, siteGetOptions)
-                .then(() => {
+            try {
+                yield Cli_1.Cli.executeCommandWithOutput(spoSiteGetCommand, siteGetOptions);
                 if (this.verbose) {
                     logger.logToStderr(`Found site ${url}`);
                 }
                 if (!force) {
-                    return reject(new Command_1.CommandError(`Another site exists at ${url}`));
+                    throw new Command_1.CommandError(`Another site exists at ${url}`);
                 }
                 if (this.verbose) {
                     logger.logToStderr(`Deleting site ${url}...`);
@@ -94,20 +94,17 @@ class SpoTenantAppCatalogAddCommand extends SpoCommand_1.default {
                     verbose: this.verbose,
                     debug: this.debug
                 };
-                Cli_1.Cli
-                    .executeCommand(spoSiteRemoveCommand, { options: Object.assign(Object.assign({}, siteRemoveOptions), { _: [] }) })
-                    .then(() => resolve(), (err) => reject(err));
-            }, (err) => {
-                if (err.error.message !== 'File Not Found.' && err.error.message !== '404 FILE NOT FOUND') {
-                    // some other error occurred
-                    return reject(err.error);
+                yield Cli_1.Cli.executeCommand(spoSiteRemoveCommand, { options: Object.assign(Object.assign({}, siteRemoveOptions), { _: [] }) });
+            }
+            catch (err) {
+                if (((_a = err.error) === null || _a === void 0 ? void 0 : _a.message) !== 'File not Found' && ((_b = err.error) === null || _b === void 0 ? void 0 : _b.message) !== '404 FILE NOT FOUND') {
+                    throw err.error || err;
                 }
                 if (this.verbose) {
                     logger.logToStderr(`No site found at ${url}`);
                 }
-                // site not found. continue
-                resolve();
-            });
+                // Site not found. Continue
+            }
         });
     }
     createAppCatalog(options, logger) {