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

package/dist/m365/spfx/commands/project/project-doctor/doctor-1.18.0-beta.1.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const FN001008_DEP_react_1 = require("./rules/FN001008_DEP_react");
+const FN001009_DEP_react_dom_1 = require("./rules/FN001009_DEP_react_dom");
+const FN001035_DEP_fluentui_react_1 = require("./rules/FN001035_DEP_fluentui_react");
+const FN002004_DEVDEP_gulp_1 = require("./rules/FN002004_DEVDEP_gulp");
+const FN002007_DEVDEP_ajv_1 = require("./rules/FN002007_DEVDEP_ajv");
+const FN002013_DEVDEP_types_webpack_env_1 = require("./rules/FN002013_DEVDEP_types_webpack_env");
+const FN002015_DEVDEP_types_react_1 = require("./rules/FN002015_DEVDEP_types_react");
+const FN002016_DEVDEP_types_react_dom_1 = require("./rules/FN002016_DEVDEP_types_react_dom");
+const FN002019_DEVDEP_microsoft_rush_stack_compiler_1 = require("./rules/FN002019_DEVDEP_microsoft_rush_stack_compiler");
+module.exports = [
+    new FN001008_DEP_react_1.FN001008_DEP_react('17'),
+    new FN001009_DEP_react_dom_1.FN001009_DEP_react_dom('17'),
+    new FN001035_DEP_fluentui_react_1.FN001035_DEP_fluentui_react('^8.106.4'),
+    new FN002004_DEVDEP_gulp_1.FN002004_DEVDEP_gulp('4.0.2'),
+    new FN002007_DEVDEP_ajv_1.FN002007_DEVDEP_ajv('^6.12.5'),
+    new FN002013_DEVDEP_types_webpack_env_1.FN002013_DEVDEP_types_webpack_env('~1.15.2'),
+    new FN002015_DEVDEP_types_react_1.FN002015_DEVDEP_types_react('17'),
+    new FN002016_DEVDEP_types_react_dom_1.FN002016_DEVDEP_types_react_dom('17'),
+    new FN002019_DEVDEP_microsoft_rush_stack_compiler_1.FN002019_DEVDEP_microsoft_rush_stack_compiler(['4.5'])
+];
+//# sourceMappingURL=doctor-1.18.0-beta.1.js.map

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

@@ -77,7 +77,8 @@ class SpfxProjectDoctorCommand extends base_project_command_1.BaseProjectCommand
             '1.17.1',
             '1.17.2',
             '1.17.3',
-            '1.17.4'
+            '1.17.4',
+            '1.18.0-beta.1'
         ];
         __classPrivateFieldGet(this, _SpfxProjectDoctorCommand_instances, "m", _SpfxProjectDoctorCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpfxProjectDoctorCommand_instances, "m", _SpfxProjectDoctorCommand_initOptions).call(this);

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/spfx/commands/project/project-upgrade/rules/FN001022_DEP_office_ui_fabric_react.js

@@ -4,8 +4,8 @@ exports.FN001022_DEP_office_ui_fabric_react = void 0;
 const spfx_1 = require("../../../../../../utils/spfx");
 const DependencyRule_1 = require("./DependencyRule");
 class FN001022_DEP_office_ui_fabric_react extends DependencyRule_1.DependencyRule {
-    constructor(packageVersion) {
-        super('office-ui-fabric-react', packageVersion, false, true);
+    constructor(packageVersion, add = true) {
+        super('office-ui-fabric-react', packageVersion, false, add);
     }
     get id() {
         return 'FN001022';

package/dist/m365/spfx/commands/project/project-upgrade/upgrade-1.18.0-beta.1.js

@@ -0,0 +1,61 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const FN001001_DEP_microsoft_sp_core_library_1 = require("./rules/FN001001_DEP_microsoft_sp_core_library");
+const FN001002_DEP_microsoft_sp_lodash_subset_1 = require("./rules/FN001002_DEP_microsoft_sp_lodash_subset");
+const FN001003_DEP_microsoft_sp_office_ui_fabric_core_1 = require("./rules/FN001003_DEP_microsoft_sp_office_ui_fabric_core");
+const FN001004_DEP_microsoft_sp_webpart_base_1 = require("./rules/FN001004_DEP_microsoft_sp_webpart_base");
+const FN001011_DEP_microsoft_sp_dialog_1 = require("./rules/FN001011_DEP_microsoft_sp_dialog");
+const FN001012_DEP_microsoft_sp_application_base_1 = require("./rules/FN001012_DEP_microsoft_sp_application_base");
+const FN001013_DEP_microsoft_decorators_1 = require("./rules/FN001013_DEP_microsoft_decorators");
+const FN001014_DEP_microsoft_sp_listview_extensibility_1 = require("./rules/FN001014_DEP_microsoft_sp_listview_extensibility");
+const FN001021_DEP_microsoft_sp_property_pane_1 = require("./rules/FN001021_DEP_microsoft_sp_property_pane");
+const FN001022_DEP_office_ui_fabric_react_1 = require("./rules/FN001022_DEP_office_ui_fabric_react");
+const FN001023_DEP_microsoft_sp_component_base_1 = require("./rules/FN001023_DEP_microsoft_sp_component_base");
+const FN001024_DEP_microsoft_sp_diagnostics_1 = require("./rules/FN001024_DEP_microsoft_sp_diagnostics");
+const FN001025_DEP_microsoft_sp_dynamic_data_1 = require("./rules/FN001025_DEP_microsoft_sp_dynamic_data");
+const FN001026_DEP_microsoft_sp_extension_base_1 = require("./rules/FN001026_DEP_microsoft_sp_extension_base");
+const FN001027_DEP_microsoft_sp_http_1 = require("./rules/FN001027_DEP_microsoft_sp_http");
+const FN001028_DEP_microsoft_sp_list_subscription_1 = require("./rules/FN001028_DEP_microsoft_sp_list_subscription");
+const FN001029_DEP_microsoft_sp_loader_1 = require("./rules/FN001029_DEP_microsoft_sp_loader");
+const FN001030_DEP_microsoft_sp_module_interfaces_1 = require("./rules/FN001030_DEP_microsoft_sp_module_interfaces");
+const FN001031_DEP_microsoft_sp_odata_types_1 = require("./rules/FN001031_DEP_microsoft_sp_odata_types");
+const FN001032_DEP_microsoft_sp_page_context_1 = require("./rules/FN001032_DEP_microsoft_sp_page_context");
+const FN001034_DEP_microsoft_sp_adaptive_card_extension_base_1 = require("./rules/FN001034_DEP_microsoft_sp_adaptive_card_extension_base");
+const FN001035_DEP_fluentui_react_1 = require("./rules/FN001035_DEP_fluentui_react");
+const FN002001_DEVDEP_microsoft_sp_build_web_1 = require("./rules/FN002001_DEVDEP_microsoft_sp_build_web");
+const FN002002_DEVDEP_microsoft_sp_module_interfaces_1 = require("./rules/FN002002_DEVDEP_microsoft_sp_module_interfaces");
+const FN002022_DEVDEP_microsoft_eslint_plugin_spfx_1 = require("./rules/FN002022_DEVDEP_microsoft_eslint_plugin_spfx");
+const FN002023_DEVDEP_microsoft_eslint_config_spfx_1 = require("./rules/FN002023_DEVDEP_microsoft_eslint_config_spfx");
+const FN010001_YORC_version_1 = require("./rules/FN010001_YORC_version");
+const FN010010_YORC_sdkVersions_teams_js_1 = require("./rules/FN010010_YORC_sdkVersions_teams_js");
+module.exports = [
+    new FN001001_DEP_microsoft_sp_core_library_1.FN001001_DEP_microsoft_sp_core_library('1.18.0-beta.1'),
+    new FN001002_DEP_microsoft_sp_lodash_subset_1.FN001002_DEP_microsoft_sp_lodash_subset('1.18.0-beta.1'),
+    new FN001003_DEP_microsoft_sp_office_ui_fabric_core_1.FN001003_DEP_microsoft_sp_office_ui_fabric_core('1.18.0-beta.1'),
+    new FN001004_DEP_microsoft_sp_webpart_base_1.FN001004_DEP_microsoft_sp_webpart_base('1.18.0-beta.1'),
+    new FN001011_DEP_microsoft_sp_dialog_1.FN001011_DEP_microsoft_sp_dialog('1.18.0-beta.1'),
+    new FN001012_DEP_microsoft_sp_application_base_1.FN001012_DEP_microsoft_sp_application_base('1.18.0-beta.1'),
+    new FN001014_DEP_microsoft_sp_listview_extensibility_1.FN001014_DEP_microsoft_sp_listview_extensibility('1.18.0-beta.1'),
+    new FN001021_DEP_microsoft_sp_property_pane_1.FN001021_DEP_microsoft_sp_property_pane('1.18.0-beta.1'),
+    new FN001022_DEP_office_ui_fabric_react_1.FN001022_DEP_office_ui_fabric_react('', false),
+    new FN001023_DEP_microsoft_sp_component_base_1.FN001023_DEP_microsoft_sp_component_base('1.18.0-beta.1'),
+    new FN001024_DEP_microsoft_sp_diagnostics_1.FN001024_DEP_microsoft_sp_diagnostics('1.18.0-beta.1'),
+    new FN001025_DEP_microsoft_sp_dynamic_data_1.FN001025_DEP_microsoft_sp_dynamic_data('1.18.0-beta.1'),
+    new FN001026_DEP_microsoft_sp_extension_base_1.FN001026_DEP_microsoft_sp_extension_base('1.18.0-beta.1'),
+    new FN001027_DEP_microsoft_sp_http_1.FN001027_DEP_microsoft_sp_http('1.18.0-beta.1'),
+    new FN001028_DEP_microsoft_sp_list_subscription_1.FN001028_DEP_microsoft_sp_list_subscription('1.18.0-beta.1'),
+    new FN001029_DEP_microsoft_sp_loader_1.FN001029_DEP_microsoft_sp_loader('1.18.0-beta.1'),
+    new FN001030_DEP_microsoft_sp_module_interfaces_1.FN001030_DEP_microsoft_sp_module_interfaces('1.18.0-beta.1'),
+    new FN001031_DEP_microsoft_sp_odata_types_1.FN001031_DEP_microsoft_sp_odata_types('1.18.0-beta.1'),
+    new FN001032_DEP_microsoft_sp_page_context_1.FN001032_DEP_microsoft_sp_page_context('1.18.0-beta.1'),
+    new FN001035_DEP_fluentui_react_1.FN001035_DEP_fluentui_react('8.106.4'),
+    new FN001013_DEP_microsoft_decorators_1.FN001013_DEP_microsoft_decorators('1.18.0-beta.1'),
+    new FN001034_DEP_microsoft_sp_adaptive_card_extension_base_1.FN001034_DEP_microsoft_sp_adaptive_card_extension_base('1.18.0-beta.1'),
+    new FN002022_DEVDEP_microsoft_eslint_plugin_spfx_1.FN002022_DEVDEP_microsoft_eslint_plugin_spfx('1.18.0-beta.1'),
+    new FN002023_DEVDEP_microsoft_eslint_config_spfx_1.FN002023_DEVDEP_microsoft_eslint_config_spfx('1.18.0-beta.1'),
+    new FN002001_DEVDEP_microsoft_sp_build_web_1.FN002001_DEVDEP_microsoft_sp_build_web('1.18.0-beta.1'),
+    new FN002002_DEVDEP_microsoft_sp_module_interfaces_1.FN002002_DEVDEP_microsoft_sp_module_interfaces('1.18.0-beta.1'),
+    new FN010001_YORC_version_1.FN010001_YORC_version('1.18.0-beta.1'),
+    new FN010010_YORC_sdkVersions_teams_js_1.FN010010_YORC_sdkVersions_teams_js('2.12.0')
+];
+//# sourceMappingURL=upgrade-1.18.0-beta.1.js.map

package/dist/m365/spfx/commands/project/project-upgrade.js

@@ -18,6 +18,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require("fs");
 const os = require("os");
 const path = require("path");
+// uncomment to support upgrading to preview releases
+const semver_1 = require("semver");
 const Command_1 = require("../../../../Command");
 const fsUtil_1 = require("../../../../utils/fsUtil");
 const packageManager_1 = require("../../../../utils/packageManager");
@@ -79,7 +81,8 @@ class SpfxProjectUpgradeCommand extends base_project_command_1.BaseProjectComman
             '1.17.1',
             '1.17.2',
             '1.17.3',
-            '1.17.4'
+            '1.17.4',
+            '1.18.0-beta.1'
         ];
         __classPrivateFieldGet(this, _SpfxProjectUpgradeCommand_instances, "m", _SpfxProjectUpgradeCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpfxProjectUpgradeCommand_instances, "m", _SpfxProjectUpgradeCommand_initOptions).call(this);
@@ -93,15 +96,15 @@ class SpfxProjectUpgradeCommand extends base_project_command_1.BaseProjectComman
             }
             this.toVersion = args.options.toVersion ? args.options.toVersion : this.supportedVersions[this.supportedVersions.length - 1];
             // uncomment to support upgrading to preview releases
-            // if (!args.options.toVersion &&
-            //   !args.options.preview &&
-            //   prerelease(this.toVersion)) {
-            //   // no version and no preview specified while the current version to
-            //   // upgrade to is a prerelease so let's grab the first non-preview version
-            //   // since we're supporting only one preview version, it's sufficient for
-            //   // us to take second to last version
-            //   this.toVersion = this.supportedVersions[this.supportedVersions.length - 2];
-            // }
+            if (!args.options.toVersion &&
+                !args.options.preview &&
+                (0, semver_1.prerelease)(this.toVersion)) {
+                // no version and no preview specified while the current version to
+                // upgrade to is a prerelease so let's grab the first non-preview version
+                // since we're supporting only one preview version, it's sufficient for
+                // us to take second to last version
+                this.toVersion = this.supportedVersions[this.supportedVersions.length - 2];
+            }
             this.packageManager = args.options.packageManager || 'npm';
             this.shell = args.options.shell || 'bash';
             if (this.supportedVersions.indexOf(this.toVersion) < 0) {
@@ -488,9 +491,9 @@ _SpfxProjectUpgradeCommand_instances = new WeakSet(), _SpfxProjectUpgradeCommand
             preview: args.options.preview
         });
         // uncomment to support upgrading to preview releases
-        // if (prerelease(this.telemetryProperties.toVersion) && !args.options.preview) {
-        //   this.telemetryProperties.toVersion = this.supportedVersions[this.supportedVersions.length - 2];
-        // }
+        if ((0, semver_1.prerelease)(this.telemetryProperties.toVersion) && !args.options.preview) {
+            this.telemetryProperties.toVersion = this.supportedVersions[this.supportedVersions.length - 2];
+        }
     });
 }, _SpfxProjectUpgradeCommand_initOptions = function _SpfxProjectUpgradeCommand_initOptions() {
     this.options.unshift({

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