@pnp/cli-microsoft365 7.0.0-beta.a9cf617 → 7.0.0-beta.b7ec1d3

package/dist/m365/purview/commands/retentionevent/retentionevent-remove.js

@@ -36,23 +36,8 @@ class PurviewRetentionEventRemoveCommand extends GraphCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const removeRetentionEvent = () => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    const requestOptions = {
-                        url: `${this.resource}/v1.0/security/triggers/retentionEvents/${args.options.id}`,
-                        headers: {
-                            accept: 'application/json;odata.metadata=none'
-                        },
-                        responseType: 'json'
-                    };
-                    yield request_1.default.delete(requestOptions);
-                }
-                catch (err) {
-                    this.handleRejectedODataJsonPromise(err);
-                }
-            });
-            if (args.options.confirm) {
-                yield removeRetentionEvent();
+            if (args.options.force) {
+                yield this.removeRetentionEvent(args.options);
             }
             else {
                 const result = yield Cli_1.Cli.prompt({
@@ -62,23 +47,40 @@ class PurviewRetentionEventRemoveCommand extends GraphCommand_1.default {
                     message: `Are you sure you want to remove the retention event ${args.options.id}?`
                 });
                 if (result.continue) {
-                    yield removeRetentionEvent();
+                    yield this.removeRetentionEvent(args.options);
                 }
             }
         });
     }
+    removeRetentionEvent(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const requestOptions = {
+                    url: `${this.resource}/beta/security/triggers/retentionEvents/${options.id}`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json'
+                };
+                yield request_1.default.delete(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
 }
 _PurviewRetentionEventRemoveCommand_instances = new WeakSet(), _PurviewRetentionEventRemoveCommand_initTelemetry = function _PurviewRetentionEventRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            confirm: !!args.options.confirm
+            force: !!args.options.force
         });
     });
 }, _PurviewRetentionEventRemoveCommand_initOptions = function _PurviewRetentionEventRemoveCommand_initOptions() {
     this.options.unshift({
         option: '-i, --id <id>'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _PurviewRetentionEventRemoveCommand_initValidators = function _PurviewRetentionEventRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

package/dist/m365/purview/commands/retentioneventtype/retentioneventtype-remove.js

@@ -36,23 +36,8 @@ class PurviewRetentionEventTypeRemoveCommand extends GraphCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const removeRetentionEventType = () => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    const requestOptions = {
-                        url: `${this.resource}/v1.0/security/triggerTypes/retentionEventTypes/${args.options.id}`,
-                        headers: {
-                            accept: 'application/json;odata.metadata=none'
-                        },
-                        responseType: 'json'
-                    };
-                    yield request_1.default.delete(requestOptions);
-                }
-                catch (err) {
-                    this.handleRejectedODataJsonPromise(err);
-                }
-            });
-            if (args.options.confirm) {
-                yield removeRetentionEventType();
+            if (args.options.force) {
+                yield this.removeRetentionEventType(args.options);
             }
             else {
                 const result = yield Cli_1.Cli.prompt({
@@ -62,23 +47,40 @@ class PurviewRetentionEventTypeRemoveCommand extends GraphCommand_1.default {
                     message: `Are you sure you want to remove the retention event type with id ${args.options.id}?`
                 });
                 if (result.continue) {
-                    yield removeRetentionEventType();
+                    yield this.removeRetentionEventType(args.options);
                 }
             }
         });
     }
+    removeRetentionEventType(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/security/triggerTypes/retentionEventTypes/${options.id}`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json'
+                };
+                yield request_1.default.delete(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
 }
 _PurviewRetentionEventTypeRemoveCommand_instances = new WeakSet(), _PurviewRetentionEventTypeRemoveCommand_initTelemetry = function _PurviewRetentionEventTypeRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            confirm: !!args.options.confirm
+            force: !!args.options.force
         });
     });
 }, _PurviewRetentionEventTypeRemoveCommand_initOptions = function _PurviewRetentionEventTypeRemoveCommand_initOptions() {
     this.options.unshift({
         option: '-i, --id <id>'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _PurviewRetentionEventTypeRemoveCommand_initValidators = function _PurviewRetentionEventTypeRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

package/dist/m365/purview/commands/retentionlabel/retentionlabel-remove.js

@@ -36,7 +36,7 @@ class PurviewRetentionLabelRemoveCommand extends GraphCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield this.removeRetentionLabel(args);
             }
             else {
@@ -73,14 +73,14 @@ class PurviewRetentionLabelRemoveCommand extends GraphCommand_1.default {
 _PurviewRetentionLabelRemoveCommand_instances = new WeakSet(), _PurviewRetentionLabelRemoveCommand_initTelemetry = function _PurviewRetentionLabelRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            confirm: !!args.options.confirm
+            force: !!args.options.force
         });
     });
 }, _PurviewRetentionLabelRemoveCommand_initOptions = function _PurviewRetentionLabelRemoveCommand_initOptions() {
     this.options.unshift({
         option: '-i, --id <id>'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _PurviewRetentionLabelRemoveCommand_initValidators = function _PurviewRetentionLabelRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

package/dist/m365/search/commands/externalconnection/externalconnection-remove.js

@@ -35,48 +35,31 @@ class SearchExternalConnectionRemoveCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _SearchExternalConnectionRemoveCommand_instances, "m", _SearchExternalConnectionRemoveCommand_initOptionSets).call(this);
     }
     getExternalConnectionId(args) {
-        if (args.options.id) {
-            return Promise.resolve(args.options.id);
-        }
-        const requestOptions = {
-            url: `${this.resource}/v1.0/external/connections?$filter=name eq '${formatting_1.formatting.encodeQueryParameter(args.options.name)}'&$select=id`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(requestOptions)
-            .then((res) => {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.id) {
+                return args.options.id;
+            }
+            const requestOptions = {
+                url: `${this.resource}/v1.0/external/connections?$filter=name eq '${formatting_1.formatting.encodeQueryParameter(args.options.name)}'&$select=id`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            const res = yield request_1.default.get(requestOptions);
             if (res.value.length === 1) {
-                return Promise.resolve(res.value[0].id);
+                return res.value[0].id;
             }
             if (res.value.length === 0) {
-                return Promise.reject(`The specified connection does not exist in Microsoft Search`);
+                throw `The specified connection does not exist in Microsoft Search`;
             }
-            return Promise.reject(`Multiple external connections with name ${args.options.name} found. Please disambiguate (IDs): ${res.value.map(x => x.id).join(', ')}`);
+            throw `Multiple external connections with name ${args.options.name} found. Please disambiguate (IDs): ${res.value.map(x => x.id).join(', ')}`;
         });
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const removeExternalConnection = () => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    const externalConnectionId = yield this.getExternalConnectionId(args);
-                    const requestOptions = {
-                        url: `${this.resource}/v1.0/external/connections/${formatting_1.formatting.encodeQueryParameter(externalConnectionId)}`,
-                        headers: {
-                            accept: 'application/json;odata.metadata=none'
-                        },
-                        responseType: 'json'
-                    };
-                    yield request_1.default.delete(requestOptions);
-                }
-                catch (err) {
-                    this.handleRejectedODataJsonPromise(err);
-                }
-            });
-            if (args.options.confirm) {
-                yield removeExternalConnection();
+            if (args.options.force) {
+                yield this.removeExternalConnection(args);
             }
             else {
                 const result = yield Cli_1.Cli.prompt({
@@ -86,22 +69,40 @@ class SearchExternalConnectionRemoveCommand extends GraphCommand_1.default {
                     message: `Are you sure you want to remove the external connection '${args.options.id || args.options.name}'?`
                 });
                 if (result.continue) {
-                    yield removeExternalConnection();
+                    yield this.removeExternalConnection(args);
                 }
             }
         });
     }
+    removeExternalConnection(args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const externalConnectionId = yield this.getExternalConnectionId(args);
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/external/connections/${formatting_1.formatting.encodeQueryParameter(externalConnectionId)}`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json'
+                };
+                yield request_1.default.delete(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
 }
 _SearchExternalConnectionRemoveCommand_instances = new WeakSet(), _SearchExternalConnectionRemoveCommand_initTelemetry = function _SearchExternalConnectionRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
         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()
         });
     });
 }, _SearchExternalConnectionRemoveCommand_initOptions = function _SearchExternalConnectionRemoveCommand_initOptions() {
-    this.options.unshift({ option: '--id [id]' }, { option: '--name [name]' }, { option: '--confirm' });
+    this.options.unshift({ option: '--id [id]' }, { option: '--name [name]' }, { option: '-f, --force' });
 }, _SearchExternalConnectionRemoveCommand_initOptionSets = function _SearchExternalConnectionRemoveCommand_initOptionSets() {
     this.optionSets.push({ options: ['id', 'name'] });
 };

package/dist/m365/spfx/commands/project/project-externalize/rules/DynamicRule.js

@@ -1,4 +1,13 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DynamicRule = void 0;
 const fs = require("fs");
@@ -12,36 +21,32 @@ class DynamicRule extends BasicDependencyRule_1.BasicDependencyRule {
         this.fileVariationSuffixes = ['.min', '.bundle', '-min', '.bundle.min'];
     }
     visit(project) {
-        if (!project.packageJson ||
-            !project.packageJson.dependencies) {
-            return Promise.resolve({ entries: [], suggestions: [] });
-        }
-        const validPackageNames = Object.getOwnPropertyNames(project.packageJson.dependencies)
-            .filter(x => this.restrictedNamespaces.map(y => x.indexOf(y) === -1).reduce((y, z) => y && z))
-            .filter(x => this.restrictedModules.indexOf(x) === -1);
-        return Promise
-            .all(validPackageNames.map((x) => this.getExternalEntryForPackage(x, project)))
-            .then((res) => {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!project.packageJson || !project.packageJson.dependencies) {
+                return { entries: [], suggestions: [] };
+            }
+            const validPackageNames = Object.getOwnPropertyNames(project.packageJson.dependencies)
+                .filter(x => this.restrictedNamespaces.map(y => x.indexOf(y) === -1).reduce((y, z) => y && z))
+                .filter(x => this.restrictedModules.indexOf(x) === -1);
+            const res = yield Promise.all(validPackageNames.map((x) => this.getExternalEntryForPackage(x, project)));
             return {
-                entries: res
-                    .filter(x => x !== undefined)
-                    .map(x => x),
+                entries: res.filter(x => x !== undefined),
                 suggestions: []
             };
         });
     }
     getExternalEntryForPackage(packageName, project) {
-        const version = project.packageJson.dependencies[packageName];
-        const filesPaths = this.getFilePath(packageName).map(x => this.cleanFilePath(x));
-        if (!version || filesPaths.length === 0) {
-            return Promise.resolve(undefined);
-        }
-        const filesPathsVariations = filesPaths
-            .map(x => this.fileVariationSuffixes.map(y => x.indexOf(y) === -1 ? x.replace('.js', `${y}.js`) : x))
-            .reduce((x, y) => [...x, ...y]);
-        const pathsAndVariations = [...filesPaths, ...filesPathsVariations];
-        return Promise.all(pathsAndVariations.map(x => this.getExternalEntryForFilePath(x, packageName, version)))
-            .then((externalizeEntryCandidates) => {
+        return __awaiter(this, void 0, void 0, function* () {
+            const version = project.packageJson.dependencies[packageName];
+            const filesPaths = this.getFilePath(packageName).map(x => this.cleanFilePath(x));
+            if (!version || filesPaths.length === 0) {
+                return undefined;
+            }
+            const filesPathsVariations = filesPaths
+                .map(x => this.fileVariationSuffixes.map(y => x.indexOf(y) === -1 ? x.replace('.js', `${y}.js`) : x))
+                .reduce((x, y) => [...x, ...y]);
+            const pathsAndVariations = [...filesPaths, ...filesPathsVariations];
+            const externalizeEntryCandidates = yield Promise.all(pathsAndVariations.map(x => this.getExternalEntryForFilePath(x, packageName, version)));
             const dExternalizeEntryCandidates = externalizeEntryCandidates.filter(x => x !== undefined);
             const minifiedModule = dExternalizeEntryCandidates.find(x => !x.globalName && this.pathContainsMinifySuffix(x.path));
             const minifiedNonModule = dExternalizeEntryCandidates.find(x => x.globalName && this.pathContainsMinifySuffix(x.path));
@@ -57,31 +62,29 @@ class DynamicRule extends BasicDependencyRule_1.BasicDependencyRule {
             .filter(y => y > -1).length > 0;
     }
     getExternalEntryForFilePath(filePath, packageName, version) {
-        const url = this.getFileUrl(packageName, version, filePath);
-        return this
-            .testUrl(url)
-            .then((testResult) => {
+        return __awaiter(this, void 0, void 0, function* () {
+            const url = this.getFileUrl(packageName, version, filePath);
+            const testResult = yield this.testUrl(url);
             if (!testResult) {
-                return Promise.resolve(undefined);
+                return undefined;
+            }
+            const moduleInfo = yield this.getModuleType(url);
+            if (moduleInfo.scriptType === 'CommonJs') {
+                return undefined; //browsers don't support those module types without an additional library
+            }
+            else if (moduleInfo.scriptType === 'ES2015' || moduleInfo.scriptType === 'AMD') {
+                return {
+                    key: packageName,
+                    path: url
+                };
+            }
+            else { //TODO for non-module and UMD we should technically add dependencies as well
+                return {
+                    key: packageName,
+                    path: url,
+                    globalName: moduleInfo.exports && moduleInfo.exports.length > 0 ? moduleInfo.exports[0] : packageName // examples where this is not good https://unpkg.com/@pnp/polyfill-ie11@^1.0.2/dist/index.js https://unpkg.com/moment-timezone@^0.5.27/builds/moment-timezone-with-data.js
+                };
             }
-            return this.getModuleType(url).then((moduleInfo) => {
-                if (moduleInfo.scriptType === 'CommonJs') {
-                    return Promise.resolve(undefined); //browsers don't support those module types without an additional library
-                }
-                else if (moduleInfo.scriptType === 'ES2015' || moduleInfo.scriptType === 'AMD') {
-                    return {
-                        key: packageName,
-                        path: url
-                    };
-                }
-                else { //TODO for non-module and UMD we should technically add dependencies as well
-                    return {
-                        key: packageName,
-                        path: url,
-                        globalName: moduleInfo.exports && moduleInfo.exports.length > 0 ? moduleInfo.exports[0] : packageName // examples where this is not good https://unpkg.com/@pnp/polyfill-ie11@^1.0.2/dist/index.js https://unpkg.com/moment-timezone@^0.5.27/builds/moment-timezone-with-data.js
-                    };
-                }
-            });
         });
     }
     getModuleType(url) {
@@ -101,10 +104,15 @@ class DynamicRule extends BasicDependencyRule_1.BasicDependencyRule {
         return `https://unpkg.com/${packageName}@${version}/${filePath}`;
     }
     testUrl(url) {
-        return request_1.default
-            .head({ url: url, headers: { 'x-anonymous': 'true' } })
-            .then(() => true)
-            .catch(() => false);
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                yield request_1.default.head({ url: url, headers: { 'x-anonymous': 'true' } });
+                return true;
+            }
+            catch (_a) {
+                return false;
+            }
+        });
     }
     getFilePath(packageName) {
         const packageJsonFilePath = `node_modules/${packageName}/package.json`;

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']