@pnp/cli-microsoft365 6.9.0 → 6.10.0-beta.1d7c557

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/folder/folder-remove.js

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

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

@@ -15,16 +15,13 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoListRoleAssignmentAddCommand_instances, _SpoListRoleAssignmentAddCommand_initTelemetry, _SpoListRoleAssignmentAddCommand_initOptions, _SpoListRoleAssignmentAddCommand_initValidators, _SpoListRoleAssignmentAddCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
-const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
 const urlUtil_1 = require("../../../../utils/urlUtil");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
-const SpoUserGetCommand = require("../user/user-get");
-const SpoGroupGetCommand = require("../group/group-get");
-const SpoRoleDefinitionListCommand = require("../roledefinition/roledefinition-list");
+const spo_1 = require("../../../../utils/spo");
 class SpoListRoleAssignmentAddCommand extends SpoCommand_1.default {
     get name() {
         return commands_1.default.LIST_ROLEASSIGNMENT_ADD;
@@ -57,13 +54,15 @@ class SpoListRoleAssignmentAddCommand extends SpoCommand_1.default {
                     const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
                     requestUrl += `GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')/`;
                 }
-                args.options.roleDefinitionId = yield this.getRoleDefinitionId(args.options);
+                args.options.roleDefinitionId = yield this.getRoleDefinitionId(args.options, logger);
                 if (args.options.upn) {
-                    args.options.principalId = yield this.getUserPrincipalId(args.options);
+                    const user = yield spo_1.spo.getUserByEmail(args.options.webUrl, args.options.upn, logger, this.verbose);
+                    args.options.principalId = user.Id;
                     yield this.addRoleAssignment(requestUrl, logger, args.options);
                 }
                 else if (args.options.groupName) {
-                    args.options.principalId = yield this.getGroupPrincipalId(args.options);
+                    const group = yield spo_1.spo.getGroupByName(args.options.webUrl, args.options.groupName, logger, this.verbose);
+                    args.options.principalId = group.Id;
                     yield this.addRoleAssignment(requestUrl, logger, args.options);
                 }
                 else {
@@ -89,50 +88,13 @@ class SpoListRoleAssignmentAddCommand extends SpoCommand_1.default {
             return request_1.default.post(requestOptions);
         });
     }
-    getRoleDefinitionId(options) {
+    getRoleDefinitionId(options, logger) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!options.roleDefinitionName) {
                 return options.roleDefinitionId;
             }
-            const roleDefinitionListCommandOptions = {
-                webUrl: options.webUrl,
-                output: 'json',
-                debug: this.debug,
-                verbose: this.verbose
-            };
-            const output = yield Cli_1.Cli.executeCommandWithOutput(SpoRoleDefinitionListCommand, { options: Object.assign(Object.assign({}, roleDefinitionListCommandOptions), { _: [] }) });
-            const getRoleDefinitionListOutput = JSON.parse(output.stdout);
-            const roleDefinitionId = getRoleDefinitionListOutput.find((role) => role.Name === options.roleDefinitionName).Id;
-            return roleDefinitionId;
-        });
-    }
-    getGroupPrincipalId(options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const groupGetCommandOptions = {
-                webUrl: options.webUrl,
-                name: options.groupName,
-                output: 'json',
-                debug: this.debug,
-                verbose: this.verbose
-            };
-            const output = yield Cli_1.Cli.executeCommandWithOutput(SpoGroupGetCommand, { options: Object.assign(Object.assign({}, groupGetCommandOptions), { _: [] }) });
-            const getGroupOutput = JSON.parse(output.stdout);
-            return getGroupOutput.Id;
-        });
-    }
-    getUserPrincipalId(options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const userGetCommandOptions = {
-                webUrl: options.webUrl,
-                email: options.upn,
-                id: undefined,
-                output: 'json',
-                debug: this.debug,
-                verbose: this.verbose
-            };
-            const output = yield Cli_1.Cli.executeCommandWithOutput(SpoUserGetCommand, { options: Object.assign(Object.assign({}, userGetCommandOptions), { _: [] }) });
-            const getUserOutput = JSON.parse(output.stdout);
-            return getUserOutput.Id;
+            const roleDefinition = yield spo_1.spo.getRoleDefinitionByName(options.webUrl, options.roleDefinitionName, logger, this.verbose);
+            return roleDefinition.Id;
         });
     }
 }

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

@@ -37,37 +37,8 @@ class SpoPageRemoveCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            let requestDigest = '';
-            let pageName = args.options.name;
-            const removePage = () => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    const reqDigest = yield spo_1.spo.getRequestDigest(args.options.webUrl);
-                    requestDigest = reqDigest.FormDigestValue;
-                    if (!pageName.endsWith('.aspx')) {
-                        pageName += '.aspx';
-                    }
-                    if (this.verbose) {
-                        logger.logToStderr(`Removing page ${pageName}...`);
-                    }
-                    const requestOptions = {
-                        url: `${args.options
-                            .webUrl}/_api/web/getfilebyserverrelativeurl('${urlUtil_1.urlUtil.getServerRelativeSiteUrl(args.options.webUrl)}/sitepages/${pageName}')`,
-                        headers: {
-                            'X-RequestDigest': requestDigest,
-                            'X-HTTP-Method': 'DELETE',
-                            'content-type': 'application/json;odata=nometadata',
-                            accept: 'application/json;odata=nometadata'
-                        },
-                        responseType: 'json'
-                    };
-                    yield request_1.default.post(requestOptions);
-                }
-                catch (err) {
-                    this.handleRejectedODataJsonPromise(err);
-                }
-            });
             if (args.options.confirm) {
-                yield removePage();
+                yield this.removePage(logger, args);
             }
             else {
                 const result = yield Cli_1.Cli.prompt({
@@ -77,11 +48,42 @@ class SpoPageRemoveCommand extends SpoCommand_1.default {
                     message: `Are you sure you want to remove the page '${args.options.name}'?`
                 });
                 if (result.continue) {
-                    yield removePage();
+                    yield this.removePage(logger, args);
                 }
             }
         });
     }
+    removePage(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                let requestDigest = '';
+                let pageName = args.options.name;
+                const reqDigest = yield spo_1.spo.getRequestDigest(args.options.webUrl);
+                requestDigest = reqDigest.FormDigestValue;
+                if (!pageName.endsWith('.aspx')) {
+                    pageName += '.aspx';
+                }
+                if (this.verbose) {
+                    logger.logToStderr(`Removing page ${pageName}...`);
+                }
+                const requestOptions = {
+                    url: `${args.options
+                        .webUrl}/_api/web/getfilebyserverrelativeurl('${urlUtil_1.urlUtil.getServerRelativeSiteUrl(args.options.webUrl)}/sitepages/${pageName}')`,
+                    headers: {
+                        'X-RequestDigest': requestDigest,
+                        'X-HTTP-Method': 'DELETE',
+                        'content-type': 'application/json;odata=nometadata',
+                        accept: 'application/json;odata=nometadata'
+                    },
+                    responseType: 'json'
+                };
+                yield request_1.default.post(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
 }
 _SpoPageRemoveCommand_instances = new WeakSet(), _SpoPageRemoveCommand_initOptions = function _SpoPageRemoveCommand_initOptions() {
     this.options.unshift({

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

@@ -36,29 +36,8 @@ class SpoRoleDefinitionRemoveCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const removeRoleDefinition = () => __awaiter(this, void 0, void 0, function* () {
-                if (this.verbose) {
-                    logger.logToStderr(`Removing role definition from site ${args.options.webUrl}...`);
-                }
-                const requestOptions = {
-                    url: `${args.options.webUrl}/_api/web/roledefinitions(${args.options.id})`,
-                    method: 'delete',
-                    headers: {
-                        'X-HTTP-Method': 'DELETE',
-                        'If-Match': '*',
-                        'accept': 'application/json;odata=nometadata'
-                    },
-                    responseType: 'json'
-                };
-                try {
-                    yield request_1.default.delete(requestOptions);
-                }
-                catch (err) {
-                    this.handleRejectedODataJsonPromise(err);
-                }
-            });
             if (args.options.confirm) {
-                yield removeRoleDefinition();
+                yield this.removeRoleDefinition(logger, args);
             }
             else {
                 const result = yield Cli_1.Cli.prompt({
@@ -68,11 +47,34 @@ class SpoRoleDefinitionRemoveCommand extends SpoCommand_1.default {
                     message: `Are you sure you want to remove the role definition with id ${args.options.id} from site ${args.options.webUrl}?`
                 });
                 if (result.continue) {
-                    yield removeRoleDefinition();
+                    yield this.removeRoleDefinition(logger, args);
                 }
             }
         });
     }
+    removeRoleDefinition(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Removing role definition from site ${args.options.webUrl}...`);
+            }
+            const requestOptions = {
+                url: `${args.options.webUrl}/_api/web/roledefinitions(${args.options.id})`,
+                method: 'delete',
+                headers: {
+                    'X-HTTP-Method': 'DELETE',
+                    'If-Match': '*',
+                    'accept': 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            try {
+                yield request_1.default.delete(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
 }
 _SpoRoleDefinitionRemoveCommand_instances = new WeakSet(), _SpoRoleDefinitionRemoveCommand_initTelemetry = function _SpoRoleDefinitionRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {

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

@@ -47,10 +47,10 @@ class SpoSiteAppPermissionAddCommand extends GraphCommand_1.default {
         }
         let endpoint = "";
         if (args.options.appId) {
-            endpoint = `${this.resource}/v1.0/myorganization/applications?$filter=appId eq '${formatting_1.formatting.encodeQueryParameter(args.options.appId)}'`;
+            endpoint = `${this.resource}/v1.0/myorganization/servicePrincipals?$select=appId,displayName&$filter=appId eq '${formatting_1.formatting.encodeQueryParameter(args.options.appId)}'`;
         }
         else {
-            endpoint = `${this.resource}/v1.0/myorganization/applications?$filter=displayName eq '${formatting_1.formatting.encodeQueryParameter(args.options.appDisplayName)}'`;
+            endpoint = `${this.resource}/v1.0/myorganization/servicePrincipals?$select=appId,displayName&$filter=displayName eq '${formatting_1.formatting.encodeQueryParameter(args.options.appDisplayName)}'`;
         }
         const appRequestOptions = {
             url: endpoint,
@@ -168,7 +168,7 @@ _SpoSiteAppPermissionAddCommand_instances = new WeakSet(), _SpoSiteAppPermission
         return validation_1.validation.isValidSharePointUrl(args.options.siteUrl);
     }));
 }, _SpoSiteAppPermissionAddCommand_initOptionSets = function _SpoSiteAppPermissionAddCommand_initOptionSets() {
-    this.optionSets.push({ options: ['appId', 'appDisplayName'] });
+    this.optionSets.push({ options: ['appId', 'appDisplayName'], runsWhen: (args) => !args.options.appId && !args.options.appDisplayName });
 };
 module.exports = new SpoSiteAppPermissionAddCommand();
 //# sourceMappingURL=site-apppermission-add.js.map

package/dist/m365/spo/commands/site/site-commsite-enable.js

@@ -15,10 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoSiteCommSiteEnableCommand_instances, _SpoSiteCommSiteEnableCommand_initTelemetry, _SpoSiteCommSiteEnableCommand_initOptions, _SpoSiteCommSiteEnableCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
-const formatting_1 = require("../../../../utils/formatting");
-const spo_1 = require("../../../../utils/spo");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -38,26 +35,20 @@ class SpoSiteCommSiteEnableCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const designPackageId = args.options.designPackageId || '{d604dac3-50d3-405e-9ab9-d4713cda74ef}';
+            const designPackageId = args.options.designPackageId || '96c933ac-3698-44c7-9f4a-5fd17d71af9e';
+            if (this.verbose) {
+                logger.logToStderr(`Enabling communication site at ${args.options.url}...`);
+            }
             try {
-                const spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
-                if (this.debug) {
-                    logger.logToStderr(`Retrieving request digest...`);
-                }
-                const ctxInfo = yield spo_1.spo.getRequestDigest(spoAdminUrl);
                 const requestOptions = {
-                    url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+                    url: `${args.options.url}/_api/sitepages/communicationsite/enable`,
                     headers: {
-                        'X-RequestDigest': ctxInfo.FormDigestValue
+                        'accept': 'application/json;odata=nometadata'
                     },
-                    data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="4" ObjectPathId="3" /><Method Name="EnableCommSite" Id="5" ObjectPathId="3"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.url)}</Parameter><Parameter Type="Guid">${formatting_1.formatting.escapeXml(designPackageId)}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="3" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
+                    data: { designPackageId },
+                    responseType: 'json'
                 };
-                const res = yield request_1.default.post(requestOptions);
-                const json = JSON.parse(res);
-                const response = json[0];
-                if (response.ErrorInfo) {
-                    throw response.ErrorInfo.ErrorMessage;
-                }
+                yield request_1.default.post(requestOptions);
             }
             catch (err) {
                 this.handleRejectedODataJsonPromise(err);

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

@@ -311,7 +311,7 @@ class SpoSiteSetCommand extends SpoCommand_1.default {
     }
     updateSiteProperties(logger, args) {
         const isGroupConnectedSite = this.isGroupConnectedSite();
-        const sharedProperties = ['classification', 'disableFlows', 'shareByEmailEnabled', 'sharingCapability', 'noScriptSite'];
+        const sharedProperties = ['classification', 'disableFlows', 'socialBarOnSitePagesDisabled', 'shareByEmailEnabled', 'sharingCapability', 'noScriptSite'];
         const siteProperties = ['title', 'resourceQuota', 'resourceQuotaWarningLevel', 'storageQuota', 'storageQuotaWarningLevel', 'allowSelfServiceUpgrade'];
         let properties = sharedProperties;
         properties = properties;
@@ -363,6 +363,9 @@ class SpoSiteSetCommand extends SpoCommand_1.default {
             if (typeof args.options.disableFlows !== 'undefined') {
                 payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="DisableFlows"><Parameter Type="Boolean">${args.options.disableFlows}</Parameter></SetProperty>`);
             }
+            if (typeof args.options.socialBarOnSitePagesDisabled !== 'undefined') {
+                payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="SocialBarOnSitePagesDisabled"><Parameter Type="Boolean">${args.options.socialBarOnSitePagesDisabled}</Parameter></SetProperty>`);
+            }
             if (typeof args.options.shareByEmailEnabled !== 'undefined') {
                 payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="ShareByEmailEnabled"><Parameter Type="Boolean">${args.options.shareByEmailEnabled}</Parameter></SetProperty>`);
             }
@@ -442,6 +445,7 @@ _SpoSiteSetCommand_instances = new WeakSet(), _SpoSiteSetCommand_initTelemetry =
         Object.assign(this.telemetryProperties, {
             classification: typeof args.options.classification === 'string',
             disableFlows: args.options.disableFlows,
+            socialBarOnSitePagesDisabled: args.options.socialBarOnSitePagesDisabled,
             isPublic: args.options.isPublic,
             owners: typeof args.options.owners !== 'undefined',
             shareByEmailEnabled: args.options.shareByEmailEnabled,
@@ -470,6 +474,9 @@ _SpoSiteSetCommand_instances = new WeakSet(), _SpoSiteSetCommand_initTelemetry =
     }, {
         option: '--disableFlows [disableFlows]',
         autocomplete: ['true', 'false']
+    }, {
+        option: '--socialBarOnSitePagesDisabled [socialBarOnSitePagesDisabled]',
+        autocomplete: ['true', 'false']
     }, {
         option: '--isPublic [isPublic]',
         autocomplete: ['true', 'false']
@@ -517,6 +524,7 @@ _SpoSiteSetCommand_instances = new WeakSet(), _SpoSiteSetCommand_initTelemetry =
         }
         if (typeof args.options.classification === 'undefined' &&
             typeof args.options.disableFlows === 'undefined' &&
+            typeof args.options.socialBarOnSitePagesDisabled === 'undefined' &&
             typeof args.options.title === 'undefined' &&
             typeof args.options.description === 'undefined' &&
             typeof args.options.isPublic === 'undefined' &&
@@ -580,7 +588,7 @@ _SpoSiteSetCommand_instances = new WeakSet(), _SpoSiteSetCommand_initTelemetry =
     }));
 }, _SpoSiteSetCommand_initTypes = function _SpoSiteSetCommand_initTypes() {
     this.types.string.push('classification');
-    this.types.boolean.push('isPublic', 'disableFlows', 'shareByEmailEnabled', 'allowSelfServiceUpgrade', 'noScriptSite');
+    this.types.boolean.push('isPublic', 'disableFlows', 'socialBarOnSitePagesDisabled', 'shareByEmailEnabled', 'allowSelfServiceUpgrade', 'noScriptSite');
 };
 module.exports = new SpoSiteSetCommand();
 //# sourceMappingURL=site-set.js.map

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

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