@pnp/cli-microsoft365 7.0.0-beta.31d0077 → 7.0.0-beta.602a03f

package/dist/m365/spfx/commands/spfx-doctor.js

@@ -534,6 +534,21 @@ class SpfxDoctorCommand extends base_project_command_1.BaseProjectCommand {
                     range: '^4',
                     fix: 'npm i -g yo@4'
                 }
+            },
+            '1.18.0-beta.1': {
+                gulpCli: {
+                    range: '^1 || ^2',
+                    fix: 'npm i -g gulp-cli@2'
+                },
+                node: {
+                    range: '>=16.13.0 <17.0.0',
+                    fix: 'Install Node.js >=16.13.0 <17.0.0'
+                },
+                sp: SharePointVersion.SPO,
+                yo: {
+                    range: '^4',
+                    fix: 'npm i -g yo@4'
+                }
             }
         };
         __classPrivateFieldGet(this, _SpfxDoctorCommand_instances, "m", _SpfxDoctorCommand_initTelemetry).call(this);

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

@@ -58,7 +58,7 @@ class SpoAppRemoveCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
                     this.handleRejectedODataPromise(err);
                 }
             });
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield removeApp();
             }
             else {
@@ -79,7 +79,7 @@ _SpoAppRemoveCommand_instances = new WeakSet(), _SpoAppRemoveCommand_initTelemet
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             appCatalogUrl: (!(!args.options.appCatalogUrl)).toString(),
-            confirm: (!(!args.options.confirm)).toString(),
+            force: (!(!args.options.force)).toString(),
             appCatalogScope: args.options.appCatalogScope || 'tenant'
         });
     });
@@ -92,7 +92,7 @@ _SpoAppRemoveCommand_instances = new WeakSet(), _SpoAppRemoveCommand_initTelemet
         option: '-s, --appCatalogScope [appCatalogScope]',
         autocomplete: ['tenant', 'sitecollection']
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _SpoAppRemoveCommand_initValidators = function _SpoAppRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

package/dist/m365/spo/commands/app/app-retract.js

@@ -58,7 +58,7 @@ class SpoAppRetractCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
                     this.handleRejectedODataPromise(err);
                 }
             });
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield retractApp();
             }
             else {
@@ -79,7 +79,7 @@ _SpoAppRetractCommand_instances = new WeakSet(), _SpoAppRetractCommand_initTelem
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             appCatalogUrl: (!(!args.options.appCatalogUrl)).toString(),
-            confirm: (!(!args.options.confirm)).toString(),
+            force: (!(!args.options.force)).toString(),
             appCatalogScope: args.options.appCatalogScope || 'tenant'
         });
     });
@@ -92,7 +92,7 @@ _SpoAppRetractCommand_instances = new WeakSet(), _SpoAppRetractCommand_initTelem
         option: '-s, --appCatalogScope [appCatalogScope]',
         autocomplete: ['tenant', 'sitecollection']
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _SpoAppRetractCommand_initValidators = function _SpoAppRetractCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

package/dist/m365/spo/commands/app/app-uninstall.js

@@ -55,7 +55,7 @@ class SpoAppUninstallCommand extends SpoCommand_1.default {
                     this.handleRejectedODataPromise(err);
                 }
             });
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield uninstallApp();
             }
             else {
@@ -75,7 +75,7 @@ class SpoAppUninstallCommand extends SpoCommand_1.default {
 _SpoAppUninstallCommand_instances = new WeakSet(), _SpoAppUninstallCommand_initTelemetry = function _SpoAppUninstallCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            confirm: (!(!args.options.confirm)).toString(),
+            force: (!(!args.options.force)).toString(),
             appCatalogScope: args.options.appCatalogScope || 'tenant'
         });
     });
@@ -88,7 +88,7 @@ _SpoAppUninstallCommand_instances = new WeakSet(), _SpoAppUninstallCommand_initT
         option: '--appCatalogScope [appCatalogScope]',
         autocomplete: ['tenant', 'sitecollection']
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _SpoAppUninstallCommand_initValidators = function _SpoAppUninstallCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

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

@@ -42,7 +42,7 @@ class SpoApplicationCustomizerRemoveCommand extends SpoCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                if (args.options.confirm) {
+                if (args.options.force) {
                     return yield this.removeApplicationCustomizer(logger, args.options);
                 }
                 const result = yield Cli_1.Cli.prompt({
@@ -114,7 +114,7 @@ _SpoApplicationCustomizerRemoveCommand_instances = new WeakSet(), _SpoApplicatio
     }, {
         option: '-s, --scope [scope]', autocomplete: this.allowedScopes
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _SpoApplicationCustomizerRemoveCommand_initTelemetry = function _SpoApplicationCustomizerRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
@@ -123,7 +123,7 @@ _SpoApplicationCustomizerRemoveCommand_instances = new WeakSet(), _SpoApplicatio
             id: typeof args.options.id !== 'undefined',
             clientSideComponentId: typeof args.options.clientSideComponentId !== 'undefined',
             scope: typeof args.options.scope !== 'undefined',
-            confirm: !!args.options.confirm
+            force: !!args.options.force
         });
     });
 }, _SpoApplicationCustomizerRemoveCommand_initValidators = function _SpoApplicationCustomizerRemoveCommand_initValidators() {

package/dist/m365/spo/commands/cdn/cdn-origin-remove.js

@@ -66,7 +66,7 @@ class SpoCdnOriginRemoveCommand extends SpoCommand_1.default {
                     this.handleRejectedPromise(err);
                 }
             });
-            if (args.options.confirm) {
+            if (args.options.force) {
                 if (this.debug) {
                     logger.logToStderr('Confirmation suppressed through the confirm option. Removing CDN origin...');
                 }
@@ -90,7 +90,7 @@ _SpoCdnOriginRemoveCommand_instances = new WeakSet(), _SpoCdnOriginRemoveCommand
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             cdnType: args.options.type || 'Public',
-            confirm: (!(!args.options.confirm)).toString()
+            force: (!(!args.options.force)).toString()
         });
     });
 }, _SpoCdnOriginRemoveCommand_initOptions = function _SpoCdnOriginRemoveCommand_initOptions() {
@@ -100,7 +100,7 @@ _SpoCdnOriginRemoveCommand_instances = new WeakSet(), _SpoCdnOriginRemoveCommand
     }, {
         option: '-r, --origin <origin>'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _SpoCdnOriginRemoveCommand_initValidators = function _SpoCdnOriginRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

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

@@ -42,7 +42,7 @@ class SpoCommandSetRemoveCommand extends SpoCommand_1.default {
             if (this.verbose) {
                 logger.logToStderr(`Removing ListView Command Set ${args.options.clientSideComponentId || args.options.title || args.options.id} to site '${args.options.webUrl}'...`);
             }
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield this.deleteCommandset(args);
             }
             else {
@@ -111,7 +111,7 @@ _SpoCommandSetRemoveCommand_instances = new WeakSet(), _SpoCommandSetRemoveComma
             id: typeof args.options.id !== 'undefined',
             clientSideComponentId: typeof args.options.clientSideComponentId !== 'undefined',
             scope: typeof args.options.scope !== 'undefined',
-            confirm: !!args.options.confirm
+            force: !!args.options.force
         });
     });
 }, _SpoCommandSetRemoveCommand_initOptions = function _SpoCommandSetRemoveCommand_initOptions() {
@@ -126,7 +126,7 @@ _SpoCommandSetRemoveCommand_instances = new WeakSet(), _SpoCommandSetRemoveComma
     }, {
         option: '-s, --scope [scope]', autocomplete: SpoCommandSetRemoveCommand.scopes
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _SpoCommandSetRemoveCommand_initValidators = function _SpoCommandSetRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

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

@@ -118,7 +118,7 @@ class SpoContentTypeFieldRemoveCommand extends SpoCommand_1.default {
                     this.handleRejectedODataJsonPromise(err);
                 }
             });
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield removeFieldLink();
             }
             else {
@@ -169,7 +169,7 @@ _SpoContentTypeFieldRemoveCommand_instances = new WeakSet(), _SpoContentTypeFiel
             listId: typeof args.options.listId !== 'undefined',
             listUrl: typeof args.options.listUrl !== 'undefined',
             updateChildContentTypes: !!args.options.updateChildContentTypes,
-            confirm: !!args.options.confirm
+            force: !!args.options.force
         });
     });
 }, _SpoContentTypeFieldRemoveCommand_initOptions = function _SpoContentTypeFieldRemoveCommand_initOptions() {
@@ -184,11 +184,11 @@ _SpoContentTypeFieldRemoveCommand_instances = new WeakSet(), _SpoContentTypeFiel
     }, {
         option: '-i, --contentTypeId <contentTypeId>'
     }, {
-        option: '-f, --fieldLinkId <fieldLinkId>'
+        option: '--fieldLinkId <fieldLinkId>'
     }, {
         option: '-c, --updateChildContentTypes'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _SpoContentTypeFieldRemoveCommand_initValidators = function _SpoContentTypeFieldRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

package/dist/m365/spo/commands/contenttype/contenttype-field-set.js

@@ -286,7 +286,7 @@ _SpoContentTypeFieldSetCommand_instances = new WeakSet(), _SpoContentTypeFieldSe
     }, {
         option: '-c, --contentTypeId <contentTypeId>'
     }, {
-        option: '-f, --id <id>'
+        option: '--id <id>'
     }, {
         option: '-r, --required [required]',
         autocomplete: ['true', 'false']

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

@@ -93,7 +93,7 @@ class SpoContentTypeRemoveCommand extends SpoCommand_1.default {
                     this.handleRejectedODataJsonPromise(err);
                 }
             });
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield removeContentType();
             }
             else {
@@ -110,7 +110,7 @@ _SpoContentTypeRemoveCommand_instances = new WeakSet(), _SpoContentTypeRemoveCom
         Object.assign(this.telemetryProperties, {
             id: typeof args.options.id !== 'undefined',
             name: typeof args.options.name !== 'undefined',
-            confirm: (!(!args.options.confirm)).toString()
+            force: (!(!args.options.force)).toString()
         });
     });
 }, _SpoContentTypeRemoveCommand_initOptions = function _SpoContentTypeRemoveCommand_initOptions() {
@@ -121,7 +121,7 @@ _SpoContentTypeRemoveCommand_instances = new WeakSet(), _SpoContentTypeRemoveCom
     }, {
         option: '-n, --name [name]'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _SpoContentTypeRemoveCommand_initValidators = function _SpoContentTypeRemoveCommand_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/customaction/customaction-clear.js

@@ -50,7 +50,7 @@ class SpoCustomActionClearCommand extends SpoCommand_1.default {
                     this.handleRejectedPromise(err);
                 }
             });
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield clearCustomActions();
             }
             else {
@@ -93,7 +93,7 @@ _SpoCustomActionClearCommand_instances = new WeakSet(), _SpoCustomActionClearCom
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             scope: args.options.scope || 'All',
-            confirm: (!(!args.options.confirm)).toString()
+            force: (!(!args.options.force)).toString()
         });
     });
 }, _SpoCustomActionClearCommand_initOptions = function _SpoCustomActionClearCommand_initOptions() {
@@ -103,7 +103,7 @@ _SpoCustomActionClearCommand_instances = new WeakSet(), _SpoCustomActionClearCom
         option: '-s, --scope [scope]',
         autocomplete: ['Site', 'Web', 'All']
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _SpoCustomActionClearCommand_initValidators = function _SpoCustomActionClearCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

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

@@ -58,7 +58,7 @@ class SpoCustomActionRemoveCommand extends SpoCommand_1.default {
                     this.handleRejectedPromise(err);
                 }
             });
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield removeCustomAction();
             }
             else {
@@ -125,7 +125,7 @@ _SpoCustomActionRemoveCommand_instances = new WeakSet(), _SpoCustomActionRemoveC
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             scope: args.options.scope || 'All',
-            confirm: (!(!args.options.confirm)).toString()
+            force: (!(!args.options.force)).toString()
         });
     });
 }, _SpoCustomActionRemoveCommand_initOptions = function _SpoCustomActionRemoveCommand_initOptions() {
@@ -139,7 +139,7 @@ _SpoCustomActionRemoveCommand_instances = new WeakSet(), _SpoCustomActionRemoveC
         option: '-s, --scope [scope]',
         autocomplete: ['Site', 'Web', 'All']
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _SpoCustomActionRemoveCommand_initValidators = function _SpoCustomActionRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

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

@@ -13,7 +13,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _SpoFileListCommand_instances, _SpoFileListCommand_initTelemetry, _SpoFileListCommand_initOptions, _SpoFileListCommand_initValidators, _SpoFileListCommand_initOptionSets;
+var _SpoFileListCommand_instances, _SpoFileListCommand_initTelemetry, _SpoFileListCommand_initOptions, _SpoFileListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
@@ -34,18 +34,13 @@ class SpoFileListCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoFileListCommand_instances, "m", _SpoFileListCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoFileListCommand_instances, "m", _SpoFileListCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoFileListCommand_instances, "m", _SpoFileListCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoFileListCommand_instances, "m", _SpoFileListCommand_initOptionSets).call(this);
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.verbose) {
-                logger.logToStderr(`Retrieving all files in folder '${args.options.folder}' at site '${args.options.webUrl}'${args.options.recursive ? ' (recursive)' : ''}...`);
+                logger.logToStderr(`Retrieving all files in folder '${args.options.folderUrl}' at site '${args.options.webUrl}'${args.options.recursive ? ' (recursive)' : ''}...`);
             }
             try {
-                if (args.options.folder) {
-                    args.options.folderUrl = args.options.folder;
-                    this.warn(logger, `Option 'folder' is deprecated. Please use 'folderUrl' instead`);
-                }
                 const fieldProperties = this.formatSelectProperties(args.options.fields, args.options.output);
                 const allFiles = [];
                 const allFolders = args.options.recursive
@@ -157,8 +152,6 @@ class SpoFileListCommand extends SpoCommand_1.default {
 _SpoFileListCommand_instances = new WeakSet(), _SpoFileListCommand_initTelemetry = function _SpoFileListCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            folder: typeof args.options.folder !== 'undefined',
-            folderUrl: typeof args.options.folderUrl !== 'undefined',
             recursive: args.options.recursive,
             fields: typeof args.options.fields !== 'undefined',
             filter: typeof args.options.filter !== 'undefined'
@@ -168,9 +161,7 @@ _SpoFileListCommand_instances = new WeakSet(), _SpoFileListCommand_initTelemetry
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-f, --folder [folder]'
-    }, {
-        option: '-f, --folderUrl [folderUrl]'
+        option: '-f, --folderUrl <folderUrl>'
     }, {
         option: '--fields [fields]'
     }, {
@@ -180,8 +171,6 @@ _SpoFileListCommand_instances = new WeakSet(), _SpoFileListCommand_initTelemetry
     });
 }, _SpoFileListCommand_initValidators = function _SpoFileListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.webUrl); }));
-}, _SpoFileListCommand_initOptionSets = function _SpoFileListCommand_initOptionSets() {
-    this.optionSets.push({ options: ['folder', 'folderUrl'] });
 };
 SpoFileListCommand.pageSize = 5000;
 module.exports = new SpoFileListCommand();

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* () {