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

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

@@ -40,7 +40,7 @@ class SpoEventreceiverRemoveCommand 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.removeEventReceiver(args.options);
             }
             else {
@@ -117,7 +117,7 @@ _SpoEventreceiverRemoveCommand_instances = new WeakSet(), _SpoEventreceiverRemov
             scope: args.options.scope || 'web',
             id: typeof args.options.id !== 'undefined',
             name: typeof args.options.name !== 'undefined',
-            confirm: !!args.options.confirm
+            force: !!args.options.force
         });
     });
 }, _SpoEventreceiverRemoveCommand_initOptions = function _SpoEventreceiverRemoveCommand_initOptions() {
@@ -137,7 +137,7 @@ _SpoEventreceiverRemoveCommand_instances = new WeakSet(), _SpoEventreceiverRemov
         option: '-s, --scope [scope]',
         autocomplete: ['web', 'site']
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _SpoEventreceiverRemoveCommand_initValidators = function _SpoEventreceiverRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

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

@@ -103,7 +103,7 @@ _SpoExternalUserListCommand_instances = new WeakSet(), _SpoExternalUserListComma
     });
 }, _SpoExternalUserListCommand_initOptions = function _SpoExternalUserListCommand_initOptions() {
     this.options.unshift({
-        option: '-f, --filter [filter]'
+        option: '--filter [filter]'
     }, {
         option: '-p, --pageSize [pageSize]'
     }, {

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

@@ -118,7 +118,7 @@ class SpoFieldRemoveCommand extends SpoCommand_1.default {
                     }
                 }
             });
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield prepareRemoval();
             }
             else {
@@ -145,7 +145,7 @@ _SpoFieldRemoveCommand_instances = new WeakSet(), _SpoFieldRemoveCommand_initTel
             id: typeof args.options.id !== 'undefined',
             group: typeof args.options.group !== 'undefined',
             title: typeof args.options.title !== 'undefined',
-            confirm: (!(!args.options.confirm)).toString()
+            force: (!(!args.options.force)).toString()
         });
     });
 }, _SpoFieldRemoveCommand_initOptions = function _SpoFieldRemoveCommand_initOptions() {
@@ -164,7 +164,7 @@ _SpoFieldRemoveCommand_instances = new WeakSet(), _SpoFieldRemoveCommand_initTel
     }, {
         option: '-g, --group [group]'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _SpoFieldRemoveCommand_initValidators = function _SpoFieldRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

package/dist/m365/spo/commands/file/file-add.js

@@ -460,7 +460,7 @@ _SpoFileAddCommand_instances = new WeakSet(), _SpoFileAddCommand_initTelemetry =
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-f, --folder <folder>'
+        option: '--folder <folder>'
     }, {
         option: '-p, --path <path>'
     }, {

package/dist/m365/spo/commands/file/file-checkin.js

@@ -98,7 +98,7 @@ _SpoFileCheckinCommand_instances = new WeakSet(), _SpoFileCheckinCommand_initTel
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-f, --url [url]'
+        option: '--url [url]'
     }, {
         option: '-i, --id [id]'
     }, {

package/dist/m365/spo/commands/file/file-checkout-undo.js

@@ -66,7 +66,7 @@ class SpoFileCheckoutUndoCommand extends SpoCommand_1.default {
                     this.handleRejectedODataJsonPromise(err);
                 }
             });
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield undoCheckout();
             }
             else {
@@ -88,18 +88,18 @@ _SpoFileCheckoutUndoCommand_instances = new WeakSet(), _SpoFileCheckoutUndoComma
         Object.assign(this.telemetryProperties, {
             fileId: typeof args.options.fileId !== 'undefined',
             fileUrl: typeof args.options.fileUrl !== 'undefined',
-            confirm: !!args.options.confirm
+            force: !!args.options.force
         });
     });
 }, _SpoFileCheckoutUndoCommand_initOptions = function _SpoFileCheckoutUndoCommand_initOptions() {
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-f, --fileUrl [fileUrl]'
+        option: '--fileUrl [fileUrl]'
     }, {
         option: '-i, --fileId [fileId]'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _SpoFileCheckoutUndoCommand_initValidators = function _SpoFileCheckoutUndoCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

package/dist/m365/spo/commands/file/file-checkout.js

@@ -76,7 +76,7 @@ _SpoFileCheckoutCommand_instances = new WeakSet(), _SpoFileCheckoutCommand_initT
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-f, --url [url]'
+        option: '--url [url]'
     }, {
         option: '-i, --id [id]'
     });

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

@@ -168,9 +168,9 @@ _SpoFileListCommand_instances = new WeakSet(), _SpoFileListCommand_initTelemetry
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-f, --folder [folder]'
+        option: '--folder [folder]'
     }, {
-        option: '-f, --folderUrl [folderUrl]'
+        option: '--folderUrl [folderUrl]'
     }, {
         option: '--fields [fields]'
     }, {

package/dist/m365/spo/commands/file/file-move.js

@@ -138,7 +138,7 @@ class SpoFileMoveCommand extends SpoCommand_1.default {
                 webUrl: contextResponse.WebFullUrl,
                 url: targetFileServerRelativeUrl,
                 recycle: true,
-                confirm: true,
+                force: true,
                 debug: this.debug,
                 verbose: this.verbose
             };

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

@@ -77,7 +77,7 @@ class SpoFileRemoveCommand extends SpoCommand_1.default {
                     this.handleRejectedODataJsonPromise(err);
                 }
             });
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield removeFile();
             }
             else {
@@ -100,7 +100,7 @@ _SpoFileRemoveCommand_instances = new WeakSet(), _SpoFileRemoveCommand_initTelem
             id: (!(!args.options.id)).toString(),
             url: (!(!args.options.url)).toString(),
             recycle: (!(!args.options.recycle)).toString(),
-            confirm: (!(!args.options.confirm)).toString()
+            force: (!(!args.options.force)).toString()
         });
     });
 }, _SpoFileRemoveCommand_initOptions = function _SpoFileRemoveCommand_initOptions() {
@@ -113,7 +113,7 @@ _SpoFileRemoveCommand_instances = new WeakSet(), _SpoFileRemoveCommand_initTelem
     }, {
         option: '--recycle'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _SpoFileRemoveCommand_initValidators = function _SpoFileRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

package/dist/m365/spo/commands/file/file-rename.js

@@ -88,7 +88,7 @@ class SpoFileRenameCommand extends SpoCommand_1.default {
                 webUrl: webUrl,
                 url: targetFileServerRelativeUrl,
                 recycle: true,
-                confirm: true,
+                force: true,
                 debug: this.debug,
                 verbose: this.verbose
             };

package/dist/m365/spo/commands/file/file-retentionlabel-remove.js

@@ -40,7 +40,7 @@ class SpoFileRetentionLabelRemoveCommand 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.removeFileRetentionLabel(logger, args);
             }
             else {
@@ -67,7 +67,7 @@ class SpoFileRetentionLabelRemoveCommand extends SpoCommand_1.default {
                     webUrl: args.options.webUrl,
                     listId: fileProperties.listId,
                     listItemId: fileProperties.id,
-                    confirm: true,
+                    force: true,
                     output: 'json',
                     debug: this.debug,
                     verbose: this.verbose
@@ -109,7 +109,7 @@ _SpoFileRetentionLabelRemoveCommand_instances = new WeakSet(), _SpoFileRetention
         Object.assign(this.telemetryProperties, {
             fileUrl: typeof args.options.fileUrl !== 'undefined',
             fileId: typeof args.options.fileId !== 'undefined',
-            confirm: !!args.options.confirm
+            force: !!args.options.force
         });
     });
 }, _SpoFileRetentionLabelRemoveCommand_initOptions = function _SpoFileRetentionLabelRemoveCommand_initOptions() {
@@ -120,7 +120,7 @@ _SpoFileRetentionLabelRemoveCommand_instances = new WeakSet(), _SpoFileRetention
     }, {
         option: '-i, --fileId [fileId]'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _SpoFileRetentionLabelRemoveCommand_initValidators = function _SpoFileRetentionLabelRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

package/dist/m365/spo/commands/file/file-roleassignment-remove.js

@@ -72,7 +72,7 @@ class SpoFileRoleAssignmentRemoveCommand extends SpoCommand_1.default {
                     this.handleRejectedODataJsonPromise(err);
                 }
             });
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield removeRoleAssignment();
             }
             else {
@@ -143,7 +143,7 @@ _SpoFileRoleAssignmentRemoveCommand_instances = new WeakSet(), _SpoFileRoleAssig
             principalId: typeof args.options.principalId !== 'undefined',
             upn: typeof args.options.upn !== 'undefined',
             groupName: typeof args.options.groupName !== 'undefined',
-            confirm: !!args.options.confirm
+            force: !!args.options.force
         });
     });
 }, _SpoFileRoleAssignmentRemoveCommand_initOptions = function _SpoFileRoleAssignmentRemoveCommand_initOptions() {
@@ -160,7 +160,7 @@ _SpoFileRoleAssignmentRemoveCommand_instances = new WeakSet(), _SpoFileRoleAssig
     }, {
         option: '--groupName [groupName]'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _SpoFileRoleAssignmentRemoveCommand_initValidators = function _SpoFileRoleAssignmentRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

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

@@ -60,7 +60,7 @@ class SpoFileRoleInheritanceBreakCommand extends SpoCommand_1.default {
                     this.handleRejectedODataJsonPromise(err);
                 }
             });
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield breakFileRoleInheritance();
             }
             else {
@@ -100,7 +100,7 @@ _SpoFileRoleInheritanceBreakCommand_instances = new WeakSet(), _SpoFileRoleInher
             fileUrl: typeof args.options.fileUrl !== 'undefined',
             fileId: typeof args.options.fileId !== 'undefined',
             clearExistingPermissions: !!args.options.clearExistingPermissions,
-            confirm: !!args.options.confirm
+            force: !!args.options.force
         });
     });
 }, _SpoFileRoleInheritanceBreakCommand_initOptions = function _SpoFileRoleInheritanceBreakCommand_initOptions() {
@@ -113,7 +113,7 @@ _SpoFileRoleInheritanceBreakCommand_instances = new WeakSet(), _SpoFileRoleInher
     }, {
         option: '-c, --clearExistingPermissions'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _SpoFileRoleInheritanceBreakCommand_initValidators = function _SpoFileRoleInheritanceBreakCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

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

@@ -59,7 +59,7 @@ class SpoFileRoleInheritanceResetCommand extends SpoCommand_1.default {
                     this.handleRejectedODataJsonPromise(err);
                 }
             });
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield resetFileRoleInheritance();
             }
             else {
@@ -98,7 +98,7 @@ _SpoFileRoleInheritanceResetCommand_instances = new WeakSet(), _SpoFileRoleInher
         Object.assign(this.telemetryProperties, {
             fileUrl: typeof args.options.fileUrl !== 'undefined',
             fileId: typeof args.options.fileId !== 'undefined',
-            confirm: !!args.options.confirm
+            force: !!args.options.force
         });
     });
 }, _SpoFileRoleInheritanceResetCommand_initOptions = function _SpoFileRoleInheritanceResetCommand_initOptions() {
@@ -109,7 +109,7 @@ _SpoFileRoleInheritanceResetCommand_instances = new WeakSet(), _SpoFileRoleInher
     }, {
         option: 'i, --fileId [fileId]'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _SpoFileRoleInheritanceResetCommand_initValidators = function _SpoFileRoleInheritanceResetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

package/dist/m365/spo/commands/file/file-sharinginfo-get.js

@@ -131,7 +131,7 @@ _SpoFileSharingInfoGetCommand_instances = new WeakSet(), _SpoFileSharingInfoGetC
     }, {
         option: '-i, --fileId [fileId]'
     }, {
-        option: '-f, --fileUrl [fileUrl]'
+        option: '--fileUrl [fileUrl]'
     });
 }, _SpoFileSharingInfoGetCommand_initValidators = function _SpoFileSharingInfoGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

package/dist/m365/spo/commands/file/file-sharinglink-clear.js

@@ -62,7 +62,7 @@ class SpoFileSharingLinkClearCommand extends SpoCommand_1.default {
                     this.handleRejectedODataJsonPromise(err);
                 }
             });
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield clearSharingLinks();
             }
             else {
@@ -100,7 +100,7 @@ _SpoFileSharingLinkClearCommand_instances = new WeakSet(), _SpoFileSharingLinkCl
             fileUrl: typeof args.options.fileUrl !== 'undefined',
             fileId: typeof args.options.fileId !== 'undefined',
             scope: typeof args.options.scope !== 'undefined',
-            confirm: !!args.options.confirm
+            force: !!args.options.force
         });
     });
 }, _SpoFileSharingLinkClearCommand_initOptions = function _SpoFileSharingLinkClearCommand_initOptions() {
@@ -114,7 +114,7 @@ _SpoFileSharingLinkClearCommand_instances = new WeakSet(), _SpoFileSharingLinkCl
         option: '-s, --scope [scope]',
         autocomplete: this.allowedScopes
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _SpoFileSharingLinkClearCommand_initValidators = function _SpoFileSharingLinkClearCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

package/dist/m365/spo/commands/file/file-sharinglink-remove.js

@@ -57,7 +57,7 @@ class SpoFileSharingLinkRemoveCommand extends SpoCommand_1.default {
                     this.handleRejectedODataJsonPromise(err);
                 }
             });
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield removeSharingLink();
             }
             else {
@@ -79,7 +79,7 @@ _SpoFileSharingLinkRemoveCommand_instances = new WeakSet(), _SpoFileSharingLinkR
         Object.assign(this.telemetryProperties, {
             fileUrl: typeof args.options.fileUrl !== 'undefined',
             fileId: typeof args.options.fileId !== 'undefined',
-            confirm: !!args.options.confirm
+            force: !!args.options.force
         });
     });
 }, _SpoFileSharingLinkRemoveCommand_initOptions = function _SpoFileSharingLinkRemoveCommand_initOptions() {
@@ -92,7 +92,7 @@ _SpoFileSharingLinkRemoveCommand_instances = new WeakSet(), _SpoFileSharingLinkR
     }, {
         option: '-i, --id <id>'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _SpoFileSharingLinkRemoveCommand_initValidators = function _SpoFileSharingLinkRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

package/dist/m365/spo/commands/file/file-version-clear.js

@@ -43,7 +43,7 @@ class SpoFileVersionClearCommand extends SpoCommand_1.default {
                 logger.logToStderr(`Deletes all version history of the file ${args.options.fileUrl || args.options.fileId} at site ${args.options.webUrl}...`);
             }
             try {
-                if (args.options.confirm) {
+                if (args.options.force) {
                     yield this.clearVersions(args);
                 }
                 else {
@@ -89,7 +89,7 @@ _SpoFileVersionClearCommand_instances = new WeakSet(), _SpoFileVersionClearComma
         Object.assign(this.telemetryProperties, {
             fileUrl: args.options.fileUrl,
             fileId: args.options.fileId,
-            confirm: (!!args.options.confirm).toString()
+            force: (!!args.options.force).toString()
         });
     });
 }, _SpoFileVersionClearCommand_initOptions = function _SpoFileVersionClearCommand_initOptions() {
@@ -100,7 +100,7 @@ _SpoFileVersionClearCommand_instances = new WeakSet(), _SpoFileVersionClearComma
     }, {
         option: '-i, --fileId [fileId]'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _SpoFileVersionClearCommand_initValidators = function _SpoFileVersionClearCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

package/dist/m365/spo/commands/file/file-version-remove.js

@@ -44,7 +44,7 @@ class SpoFileVersionRemoveCommand extends SpoCommand_1.default {
                 logger.logToStderr(`Removes version ${args.options.label} of the file ${args.options.fileUrl || args.options.fileId} at site ${args.options.webUrl}...`);
             }
             try {
-                if (args.options.confirm) {
+                if (args.options.force) {
                     yield this.removeVersion(args);
                 }
                 else {
@@ -90,7 +90,7 @@ _SpoFileVersionRemoveCommand_instances = new WeakSet(), _SpoFileVersionRemoveCom
         Object.assign(this.telemetryProperties, {
             fileUrl: args.options.fileUrl,
             fileId: args.options.fileId,
-            confirm: (!!args.options.confirm).toString()
+            force: (!!args.options.force).toString()
         });
     });
 }, _SpoFileVersionRemoveCommand_initOptions = function _SpoFileVersionRemoveCommand_initOptions() {
@@ -103,7 +103,7 @@ _SpoFileVersionRemoveCommand_instances = new WeakSet(), _SpoFileVersionRemoveCom
     }, {
         option: '-i, --fileId [fileId]'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _SpoFileVersionRemoveCommand_initValidators = function _SpoFileVersionRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

package/dist/m365/spo/commands/file/file-version-restore.js

@@ -44,7 +44,7 @@ class SpoFileVersionRestoreCommand extends SpoCommand_1.default {
                 logger.logToStderr(`Restores version ${args.options.label} of the file ${args.options.fileUrl || args.options.fileId} at site ${args.options.webUrl}...`);
             }
             try {
-                if (args.options.confirm) {
+                if (args.options.force) {
                     yield this.restoreVersion(args);
                 }
                 else {
@@ -90,7 +90,7 @@ _SpoFileVersionRestoreCommand_instances = new WeakSet(), _SpoFileVersionRestoreC
         Object.assign(this.telemetryProperties, {
             fileUrl: args.options.fileUrl,
             fileId: args.options.fileId,
-            confirm: (!!args.options.confirm).toString()
+            force: (!!args.options.force).toString()
         });
     });
 }, _SpoFileVersionRestoreCommand_initOptions = function _SpoFileVersionRestoreCommand_initOptions() {
@@ -103,7 +103,7 @@ _SpoFileVersionRestoreCommand_instances = new WeakSet(), _SpoFileVersionRestoreC
     }, {
         option: '-i, --fileId [fileId]'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _SpoFileVersionRestoreCommand_initValidators = function _SpoFileVersionRestoreCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

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

@@ -99,7 +99,7 @@ _SpoFolderGetCommand_instances = new WeakSet(), _SpoFolderGetCommand_initTelemet
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-f, --url [url]'
+        option: '--url [url]'
     }, {
         option: '-i, --id [id]'
     }, {

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

@@ -132,7 +132,7 @@ _SpoFolderListCommand_instances = new WeakSet(), _SpoFolderListCommand_initTelem
     }, {
         option: '-p, --parentFolderUrl <parentFolderUrl>'
     }, {
-        option: '-f, --fields [fields]'
+        option: '--fields [fields]'
     }, {
         option: '--filter [filter]'
     }, {

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

@@ -38,34 +38,8 @@ class SpoFolderRemoveCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const removeFolder = () => __awaiter(this, void 0, void 0, function* () {
-                if (this.verbose) {
-                    logger.logToStderr(`Removing folder in site at ${args.options.webUrl}...`);
-                }
-                const serverRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.url);
-                let requestUrl = `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(serverRelativeUrl)}')`;
-                if (args.options.recycle) {
-                    requestUrl += `/recycle()`;
-                }
-                const requestOptions = {
-                    url: requestUrl,
-                    method: 'POST',
-                    headers: {
-                        'X-HTTP-Method': 'DELETE',
-                        'If-Match': '*',
-                        'accept': 'application/json;odata=nometadata'
-                    },
-                    responseType: 'json'
-                };
-                try {
-                    yield request_1.default.post(requestOptions);
-                }
-                catch (err) {
-                    this.handleRejectedODataJsonPromise(err);
-                }
-            });
-            if (args.options.confirm) {
-                yield removeFolder();
+            if (args.options.force) {
+                yield this.removeFolder(logger, args.options);
             }
             else {
                 const result = yield Cli_1.Cli.prompt({
@@ -75,28 +49,56 @@ class SpoFolderRemoveCommand extends SpoCommand_1.default {
                     message: `Are you sure you want to ${args.options.recycle ? "recycle" : "remove"} the folder ${args.options.url} located in site ${args.options.webUrl}?`
                 });
                 if (result.continue) {
-                    yield removeFolder();
+                    yield this.removeFolder(logger, args.options);
                 }
             }
         });
     }
+    removeFolder(logger, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Removing folder in site at ${options.webUrl}...`);
+            }
+            const serverRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(options.webUrl, options.url);
+            let requestUrl = `${options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(serverRelativeUrl)}')`;
+            if (options.recycle) {
+                requestUrl += `/recycle()`;
+            }
+            const requestOptions = {
+                url: requestUrl,
+                method: 'POST',
+                headers: {
+                    'X-HTTP-Method': 'DELETE',
+                    'If-Match': '*',
+                    'accept': 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            try {
+                yield request_1.default.post(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
 }
 _SpoFolderRemoveCommand_instances = new WeakSet(), _SpoFolderRemoveCommand_initTelemetry = function _SpoFolderRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             recycle: (!(!args.options.recycle)).toString(),
-            confirm: (!(!args.options.confirm)).toString()
+            force: (!(!args.options.force)).toString()
         });
     });
 }, _SpoFolderRemoveCommand_initOptions = function _SpoFolderRemoveCommand_initOptions() {
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-f, --url <url>'
+        option: '--url <url>'
     }, {
         option: '--recycle'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _SpoFolderRemoveCommand_initValidators = function _SpoFolderRemoveCommand_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/folder/folder-rename.js

@@ -75,7 +75,7 @@ _SpoFolderRenameCommand_instances = new WeakSet(), _SpoFolderRenameCommand_initO
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-f, --url <url>'
+        option: '--url <url>'
     }, {
         option: '-n, --name <name>'
     });

package/dist/m365/spo/commands/folder/folder-retentionlabel-remove.js

@@ -41,7 +41,7 @@ class SpoFolderRetentionLabelRemoveCommand 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.removeFolderRetentionLabel(logger, args);
             }
             else {
@@ -66,7 +66,7 @@ class SpoFolderRetentionLabelRemoveCommand extends SpoCommand_1.default {
                         webUrl: args.options.webUrl,
                         listId: folderProperties.ListItemAllFields.ParentList.Id,
                         listItemId: folderProperties.ListItemAllFields.Id,
-                        confirm: true,
+                        force: true,
                         output: 'json',
                         debug: this.debug,
                         verbose: this.verbose
@@ -80,7 +80,7 @@ class SpoFolderRetentionLabelRemoveCommand extends SpoCommand_1.default {
                     const options = {
                         webUrl: args.options.webUrl,
                         listUrl: folderProperties.ServerRelativeUrl,
-                        confirm: true,
+                        force: true,
                         output: 'json',
                         debug: this.debug,
                         verbose: this.verbose
@@ -125,7 +125,7 @@ _SpoFolderRetentionLabelRemoveCommand_instances = new WeakSet(), _SpoFolderReten
         Object.assign(this.telemetryProperties, {
             folderUrl: typeof args.options.folderUrl !== 'undefined',
             folderId: typeof args.options.folderId !== 'undefined',
-            confirm: !!args.options.confirm
+            force: !!args.options.force
         });
     });
 }, _SpoFolderRetentionLabelRemoveCommand_initOptions = function _SpoFolderRetentionLabelRemoveCommand_initOptions() {
@@ -136,7 +136,7 @@ _SpoFolderRetentionLabelRemoveCommand_instances = new WeakSet(), _SpoFolderReten
     }, {
         option: '-i, --folderId [folderId]'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _SpoFolderRetentionLabelRemoveCommand_initValidators = function _SpoFolderRetentionLabelRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

package/dist/m365/spo/commands/folder/folder-roleassignment-add.js

@@ -170,7 +170,7 @@ _SpoFolderRoleAssignmentAddCommand_instances = new WeakSet(), _SpoFolderRoleAssi
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-f, --folderUrl <folderUrl>'
+        option: '--folderUrl <folderUrl>'
     }, {
         option: '--principalId [principalId]'
     }, {