@pnp/cli-microsoft365 10.0.0-beta.04ac437 → 10.0.0-beta.0b765ef

package/dist/m365/external/commands/item/item-add.js

@@ -45,8 +45,7 @@ class ExternalItemAddCommand extends GraphCommand {
             properties: {}
         };
         // we need to rewrite the @odata properties to the correct format
-        // because . in @odata.type is interpreted by minimist as a child property
-        // we also need to extract multiple values for collections into arrays
+        // to extract multiple values for collections into arrays
         this.rewriteCollectionProperties(args.options);
         this.addUnknownOptionsToPayload(requestBody.properties, args.options);
         const requestOptions = {
@@ -81,11 +80,9 @@ class ExternalItemAddCommand extends GraphCommand {
     }
     rewriteCollectionProperties(options) {
         Object.getOwnPropertyNames(options).forEach(name => {
-            if (!name.endsWith('@odata')) {
+            if (!name.includes('@odata')) {
                 return;
             }
-            options[`${name}.type`] = options[name].type;
-            delete options[name];
             // convert the value of a collection to an array
             const nameWithoutOData = name.substring(0, name.indexOf('@odata'));
             if (options[nameWithoutOData]) {

package/dist/m365/flow/commands/environment/environment-list.js

@@ -23,8 +23,8 @@ class FlowEnvironmentListCommand extends PowerAutomateCommand {
                         e.displayName = e.properties.displayName;
                     });
                 }
-                await logger.log(res);
             }
+            await logger.log(res);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);

package/dist/m365/pa/commands/app/app-list.js

@@ -33,13 +33,8 @@ class PaAppListCommand extends PowerAppsCommand {
                 apps.forEach(a => {
                     a.displayName = a.properties.displayName;
                 });
-                await logger.log(apps);
-            }
-            else {
-                if (this.verbose) {
-                    await logger.logToStderr('No apps found');
-                }
             }
+            await logger.log(apps);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);

package/dist/m365/pa/commands/connector/connector-list.js

@@ -35,13 +35,8 @@ class PaConnectorListCommand extends PowerAppsCommand {
                 connectors.forEach(c => {
                     c.displayName = c.properties.displayName;
                 });
-                await logger.log(connectors);
-            }
-            else {
-                if (this.verbose) {
-                    await logger.logToStderr('No custom connectors found');
-                }
             }
+            await logger.log(connectors);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);

package/dist/m365/pa/commands/environment/environment-list.js

@@ -28,8 +28,8 @@ class PaEnvironmentListCommand extends PowerAppsCommand {
                 res.value.forEach(e => {
                     e.displayName = e.properties.displayName;
                 });
-                await logger.log(res.value);
             }
+            await logger.log(res.value);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);

package/dist/m365/pp/commands/environment/environment-list.js

@@ -47,8 +47,8 @@ class PpEnvironmentListCommand extends PowerPlatformCommand {
                 res.value.forEach(e => {
                     e.displayName = e.properties.displayName;
                 });
-                await logger.log(res.value);
             }
+            await logger.log(res.value);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);

package/dist/m365/spfx/commands/project/project-doctor/{doctor-1.20.0-rc.1.js → doctor-1.20.0.js}

@@ -1,3 +1,4 @@
+import { FN002021_DEVDEP_rushstack_eslint_config } from '../project-upgrade/rules/FN002021_DEVDEP_rushstack_eslint_config.js';
 import { FN001008_DEP_react } from './rules/FN001008_DEP_react.js';
 import { FN001009_DEP_react_dom } from './rules/FN001009_DEP_react_dom.js';
 import { FN001035_DEP_fluentui_react } from './rules/FN001035_DEP_fluentui_react.js';
@@ -19,7 +20,8 @@ export default [
     new FN002015_DEVDEP_types_react('17'),
     new FN002016_DEVDEP_types_react_dom('17'),
     new FN002019_DEVDEP_microsoft_rush_stack_compiler(['4.7']),
+    new FN002021_DEVDEP_rushstack_eslint_config('4.0.1'),
     new FN021001_PKG_spfx_deps_versions_match_project_version(false),
-    new FN021013_PKG_spfx_devdeps_match_version('1.20.1')
+    new FN021013_PKG_spfx_devdeps_match_version('1.20.2')
 ];
-//# sourceMappingURL=doctor-1.20.0-rc.1.js.map
+//# sourceMappingURL=doctor-1.20.0.js.map

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

@@ -0,0 +1,10 @@
+import { DependencyRule } from './DependencyRule.js';
+export class FN002021_DEVDEP_rushstack_eslint_config extends DependencyRule {
+    constructor(supportedRange) {
+        super('@rushstack/eslint-config', supportedRange, true);
+    }
+    get id() {
+        return 'FN002021';
+    }
+}
+//# sourceMappingURL=FN002021_DEVDEP_rushstack_eslint_config.js.map

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

@@ -71,7 +71,7 @@ class SpfxProjectDoctorCommand extends BaseProjectCommand {
             '1.18.1',
             '1.18.2',
             '1.19.0',
-            '1.20.0-rc.1'
+            '1.20.0'
         ];
         __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-upgrade/{upgrade-1.20.0-rc.1.js → upgrade-1.20.0.js}

@@ -20,38 +20,40 @@ import { FN001032_DEP_microsoft_sp_page_context } from './rules/FN001032_DEP_mic
 import { FN001034_DEP_microsoft_sp_adaptive_card_extension_base } from './rules/FN001034_DEP_microsoft_sp_adaptive_card_extension_base.js';
 import { FN002001_DEVDEP_microsoft_sp_build_web } from './rules/FN002001_DEVDEP_microsoft_sp_build_web.js';
 import { FN002002_DEVDEP_microsoft_sp_module_interfaces } from './rules/FN002002_DEVDEP_microsoft_sp_module_interfaces.js';
+import { FN002021_DEVDEP_rushstack_eslint_config } from './rules/FN002021_DEVDEP_rushstack_eslint_config.js';
 import { FN002022_DEVDEP_microsoft_eslint_plugin_spfx } from './rules/FN002022_DEVDEP_microsoft_eslint_plugin_spfx.js';
 import { FN002023_DEVDEP_microsoft_eslint_config_spfx } from './rules/FN002023_DEVDEP_microsoft_eslint_config_spfx.js';
 import { FN002024_DEVDEP_eslint } from './rules/FN002024_DEVDEP_eslint.js';
 import { FN010001_YORC_version } from './rules/FN010001_YORC_version.js';
 import { FN010010_YORC_sdkVersions_teams_js } from './rules/FN010010_YORC_sdkVersions_teams_js.js';
 export default [
-    new FN001001_DEP_microsoft_sp_core_library('1.20.0-rc.1'),
-    new FN001002_DEP_microsoft_sp_lodash_subset('1.20.0-rc.1'),
-    new FN001003_DEP_microsoft_sp_office_ui_fabric_core('1.20.0-rc.1'),
-    new FN001004_DEP_microsoft_sp_webpart_base('1.20.0-rc.1'),
-    new FN001011_DEP_microsoft_sp_dialog('1.20.0-rc.1'),
-    new FN001012_DEP_microsoft_sp_application_base('1.20.0-rc.1'),
-    new FN001014_DEP_microsoft_sp_listview_extensibility('1.20.0-rc.1'),
-    new FN001021_DEP_microsoft_sp_property_pane('1.20.0-rc.1'),
-    new FN001023_DEP_microsoft_sp_component_base('1.20.0-rc.1'),
-    new FN001024_DEP_microsoft_sp_diagnostics('1.20.0-rc.1'),
-    new FN001025_DEP_microsoft_sp_dynamic_data('1.20.0-rc.1'),
-    new FN001026_DEP_microsoft_sp_extension_base('1.20.0-rc.1'),
-    new FN001027_DEP_microsoft_sp_http('1.20.0-rc.1'),
-    new FN001028_DEP_microsoft_sp_list_subscription('1.20.0-rc.1'),
-    new FN001029_DEP_microsoft_sp_loader('1.20.0-rc.1'),
-    new FN001030_DEP_microsoft_sp_module_interfaces('1.20.0-rc.1'),
-    new FN001031_DEP_microsoft_sp_odata_types('1.20.0-rc.1'),
-    new FN001032_DEP_microsoft_sp_page_context('1.20.0-rc.1'),
-    new FN001013_DEP_microsoft_decorators('1.20.0-rc.1'),
-    new FN001034_DEP_microsoft_sp_adaptive_card_extension_base('1.20.0-rc.1'),
-    new FN002001_DEVDEP_microsoft_sp_build_web('1.20.1'),
-    new FN002002_DEVDEP_microsoft_sp_module_interfaces('1.20.1'),
+    new FN001001_DEP_microsoft_sp_core_library('1.20.0'),
+    new FN001002_DEP_microsoft_sp_lodash_subset('1.20.0'),
+    new FN001003_DEP_microsoft_sp_office_ui_fabric_core('1.20.0'),
+    new FN001004_DEP_microsoft_sp_webpart_base('1.20.0'),
+    new FN001011_DEP_microsoft_sp_dialog('1.20.0'),
+    new FN001012_DEP_microsoft_sp_application_base('1.20.0'),
+    new FN001014_DEP_microsoft_sp_listview_extensibility('1.20.0'),
+    new FN001021_DEP_microsoft_sp_property_pane('1.20.0'),
+    new FN001023_DEP_microsoft_sp_component_base('1.20.0'),
+    new FN001024_DEP_microsoft_sp_diagnostics('1.20.0'),
+    new FN001025_DEP_microsoft_sp_dynamic_data('1.20.0'),
+    new FN001026_DEP_microsoft_sp_extension_base('1.20.0'),
+    new FN001027_DEP_microsoft_sp_http('1.20.0'),
+    new FN001028_DEP_microsoft_sp_list_subscription('1.20.0'),
+    new FN001029_DEP_microsoft_sp_loader('1.20.0'),
+    new FN001030_DEP_microsoft_sp_module_interfaces('1.20.0'),
+    new FN001031_DEP_microsoft_sp_odata_types('1.20.0'),
+    new FN001032_DEP_microsoft_sp_page_context('1.20.0'),
+    new FN001013_DEP_microsoft_decorators('1.20.0'),
+    new FN001034_DEP_microsoft_sp_adaptive_card_extension_base('1.20.0'),
+    new FN002001_DEVDEP_microsoft_sp_build_web('1.20.2'),
+    new FN002002_DEVDEP_microsoft_sp_module_interfaces('1.20.2'),
+    new FN002021_DEVDEP_rushstack_eslint_config('4.0.1'),
     new FN002024_DEVDEP_eslint('8.57.0'),
-    new FN002022_DEVDEP_microsoft_eslint_plugin_spfx('1.20.1'),
-    new FN002023_DEVDEP_microsoft_eslint_config_spfx('1.20.1'),
-    new FN010001_YORC_version('1.20.0-rc.1'),
+    new FN002022_DEVDEP_microsoft_eslint_plugin_spfx('1.20.2'),
+    new FN002023_DEVDEP_microsoft_eslint_config_spfx('1.20.2'),
+    new FN010001_YORC_version('1.20.0'),
     new FN010010_YORC_sdkVersions_teams_js('2.24.0')
 ];
-//# sourceMappingURL=upgrade-1.20.0-rc.1.js.map
+//# sourceMappingURL=upgrade-1.20.0.js.map

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

@@ -7,8 +7,6 @@ var _SpfxProjectUpgradeCommand_instances, _a, _SpfxProjectUpgradeCommand_initTel
 import fs from 'fs';
 import os from 'os';
 import path from 'path';
-// uncomment to support upgrading to preview releases
-import { prerelease } from 'semver';
 import { CommandError } from '../../../../Command.js';
 import { fsUtil } from '../../../../utils/fsUtil.js';
 import { packageManager } from '../../../../utils/packageManager.js';
@@ -75,7 +73,7 @@ class SpfxProjectUpgradeCommand extends BaseProjectCommand {
             '1.18.1',
             '1.18.2',
             '1.19.0',
-            '1.20.0-rc.1'
+            '1.20.0'
         ];
         __classPrivateFieldGet(this, _SpfxProjectUpgradeCommand_instances, "m", _SpfxProjectUpgradeCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpfxProjectUpgradeCommand_instances, "m", _SpfxProjectUpgradeCommand_initOptions).call(this);
@@ -88,15 +86,15 @@ class SpfxProjectUpgradeCommand extends BaseProjectCommand {
         }
         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 &&
+        //   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) {
@@ -485,9 +483,9 @@ _a = SpfxProjectUpgradeCommand, _SpfxProjectUpgradeCommand_instances = new WeakS
             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 (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

@@ -576,7 +576,7 @@ class SpfxDoctorCommand extends BaseProjectCommand {
                     fix: 'npm i -g yo@5'
                 }
             },
-            '1.20.0-rc.1': {
+            '1.20.0': {
                 gulpCli: {
                     range: '^1 || ^2 || ^3',
                     fix: 'npm i -g gulp-cli@3'

package/dist/m365/spo/commands/app/app-instance-list.js

@@ -4,7 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _SpoAppInStanceListCommand_instances, _SpoAppInStanceListCommand_initOptions, _SpoAppInStanceListCommand_initValidators;
-import request from '../../../../request.js';
+import { odata } from '../../../../utils/odata.js';
 import { validation } from '../../../../utils/validation.js';
 import commands from '../../commands.js';
 import { SpoAppBaseCommand } from './SpoAppBaseCommand.js';
@@ -28,24 +28,9 @@ class SpoAppInStanceListCommand extends SpoAppBaseCommand {
         if (this.verbose) {
             await logger.logToStderr(`Retrieving installed apps in site at ${args.options.siteUrl}...`);
         }
-        const requestOptions = {
-            url: `${args.options.siteUrl}/_api/web/AppTiles?$filter=AppType eq 3`,
-            method: 'GET',
-            headers: {
-                'accept': 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
         try {
-            const apps = await request.get(requestOptions);
-            if (apps.value && apps.value.length > 0) {
-                await logger.log(apps.value);
-            }
-            else {
-                if (this.verbose) {
-                    await logger.logToStderr('No apps found');
-                }
-            }
+            const apps = await odata.getAllItems(`${args.options.siteUrl}/_api/web/AppTiles?$filter=AppType eq 3`);
+            await logger.log(apps);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);

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

@@ -37,14 +37,7 @@ class SpoAppListCommand extends SpoAppBaseCommand {
                 await logger.logToStderr(`Retrieving apps...`);
             }
             const apps = await odata.getAllItems(`${appCatalogSiteUrl}/_api/web/${scope}appcatalog/AvailableApps`);
-            if (apps && apps.length > 0) {
-                await logger.log(apps);
-            }
-            else {
-                if (this.verbose) {
-                    await logger.logToStderr('No apps found');
-                }
-            }
+            await logger.log(apps);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);

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

@@ -26,14 +26,7 @@ class SpoFeatureListCommand extends SpoCommand {
         const scope = (args.options.scope) ? args.options.scope : 'Web';
         try {
             const features = await odata.getAllItems(`${args.options.webUrl}/_api/${scope}/Features?$select=DisplayName,DefinitionId`);
-            if (features && features.length > 0) {
-                await logger.log(features);
-            }
-            else {
-                if (this.verbose) {
-                    await logger.logToStderr('No activated Features found');
-                }
-            }
+            await logger.log(features);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);

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

@@ -49,13 +49,8 @@ class SpoListWebhookListCommand extends SpoCommand {
                 res.forEach(w => {
                     w.clientState = w.clientState || '';
                 });
-                await logger.log(res);
-            }
-            else {
-                if (this.verbose) {
-                    await logger.logToStderr('No webhooks found');
-                }
             }
+            await logger.log(res);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);

package/dist/m365/spo/commands/listitem/listitem-attachment-list.js

@@ -50,14 +50,7 @@ class SpoListItemAttachmentListCommand extends SpoCommand {
         };
         try {
             const attachmentFiles = await request.get(requestOptions);
-            if (attachmentFiles.AttachmentFiles && attachmentFiles.AttachmentFiles.length > 0) {
-                await logger.log(attachmentFiles.AttachmentFiles);
-            }
-            else {
-                if (this.verbose) {
-                    await logger.logToStderr('No attachments found');
-                }
-            }
+            await logger.log(attachmentFiles.AttachmentFiles);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);

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

@@ -48,8 +48,8 @@ class SpoPageListCommand extends SpoCommand {
                     return p;
                 });
                 pages.filter(p => p.ListItemAllFields).forEach(page => delete page.ListItemAllFields.ID);
-                await logger.log(pages);
             }
+            await logger.log(pages);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);

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

@@ -3,10 +3,10 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _SpoPageRemoveCommand_instances, _SpoPageRemoveCommand_initOptions, _SpoPageRemoveCommand_initValidators;
+var _SpoPageRemoveCommand_instances, _SpoPageRemoveCommand_initTelemetry, _SpoPageRemoveCommand_initOptions, _SpoPageRemoveCommand_initValidators, _SpoPageRemoveCommand_initTypes;
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
-import { spo } from '../../../../utils/spo.js';
+import { formatting } from '../../../../utils/formatting.js';
 import { urlUtil } from '../../../../utils/urlUtil.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
@@ -21,15 +21,17 @@ class SpoPageRemoveCommand extends SpoCommand {
     constructor() {
         super();
         _SpoPageRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoPageRemoveCommand_instances, "m", _SpoPageRemoveCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoPageRemoveCommand_instances, "m", _SpoPageRemoveCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoPageRemoveCommand_instances, "m", _SpoPageRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoPageRemoveCommand_instances, "m", _SpoPageRemoveCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
         if (args.options.force) {
             await this.removePage(logger, args);
         }
         else {
-            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove the page '${args.options.name}'?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove page '${args.options.name}'?` });
             if (result) {
                 await this.removePage(logger, args);
             }
@@ -37,44 +39,63 @@ class SpoPageRemoveCommand extends SpoCommand {
     }
     async removePage(logger, args) {
         try {
-            let requestDigest = '';
-            let pageName = args.options.name;
-            const reqDigest = await spo.getRequestDigest(args.options.webUrl);
-            requestDigest = reqDigest.FormDigestValue;
-            if (!pageName.endsWith('.aspx')) {
+            // Remove leading slashes from the page name (page can be nested in folders)
+            let pageName = urlUtil.removeLeadingSlashes(args.options.name);
+            if (!pageName.toLowerCase().endsWith('.aspx')) {
                 pageName += '.aspx';
             }
             if (this.verbose) {
                 await logger.logToStderr(`Removing page ${pageName}...`);
             }
+            const filePath = `${urlUtil.getServerRelativeSiteUrl(args.options.webUrl)}/SitePages/${pageName}`;
             const requestOptions = {
-                url: `${args.options
-                    .webUrl}/_api/web/GetFileByServerRelativePath(DecodedUrl='${urlUtil.getServerRelativeSiteUrl(args.options.webUrl)}/sitepages/${pageName}')`,
+                url: `${args.options.webUrl}/_api/web/GetFileByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(filePath)}')`,
                 headers: {
-                    'X-RequestDigest': requestDigest,
-                    'X-HTTP-Method': 'DELETE',
-                    'content-type': 'application/json;odata=nometadata',
                     accept: 'application/json;odata=nometadata'
                 },
                 responseType: 'json'
             };
-            await request.post(requestOptions);
+            if (args.options.bypassSharedLock) {
+                requestOptions.headers.Prefer = 'bypass-shared-lock';
+            }
+            if (args.options.recycle) {
+                requestOptions.url += '/Recycle';
+                await request.post(requestOptions);
+            }
+            else {
+                await request.delete(requestOptions);
+            }
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);
         }
     }
 }
-_SpoPageRemoveCommand_instances = new WeakSet(), _SpoPageRemoveCommand_initOptions = function _SpoPageRemoveCommand_initOptions() {
+_SpoPageRemoveCommand_instances = new WeakSet(), _SpoPageRemoveCommand_initTelemetry = function _SpoPageRemoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            force: !!args.options.force,
+            recycle: !!args.options.recycle,
+            bypassSharedLock: !!args.options.bypassSharedLock
+        });
+    });
+}, _SpoPageRemoveCommand_initOptions = function _SpoPageRemoveCommand_initOptions() {
     this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
         option: '-n, --name <name>'
     }, {
-        option: '-u, --webUrl <webUrl>'
+        option: '--recycle'
+    }, {
+        option: '--bypassSharedLock'
     }, {
         option: '-f, --force'
     });
 }, _SpoPageRemoveCommand_initValidators = function _SpoPageRemoveCommand_initValidators() {
     this.validators.push(async (args) => validation.isValidSharePointUrl(args.options.webUrl));
+}, _SpoPageRemoveCommand_initTypes = function _SpoPageRemoveCommand_initTypes() {
+    this.types.string.push('name', 'webUrl');
+    this.types.boolean.push('force', 'bypassSharedLock', 'recycle');
 };
 export default new SpoPageRemoveCommand();
 //# sourceMappingURL=page-remove.js.map

package/dist/m365/spo/commands/page/page-template-list.js

@@ -30,9 +30,7 @@ class SpoPageTemplateListCommand extends SpoCommand {
         }
         try {
             const res = await odata.getAllItems(`${args.options.webUrl}/_api/sitepages/pages/templates`);
-            if (res && res.length > 0) {
-                await logger.log(res);
-            }
+            await logger.log(res);
         }
         catch (err) {
             // The API returns a 404 when no templates are created on the site collection

package/dist/m365/spo/commands/site/site-admin-list.js

@@ -17,6 +17,9 @@ class SpoSiteAdminListCommand extends SpoCommand {
     get description() {
         return 'Lists all administrators of a specific SharePoint site';
     }
+    defaultProperties() {
+        return ['Id', 'LoginName', 'Title', 'PrincipalTypeString'];
+    }
     constructor() {
         super();
         _SpoSiteAdminListCommand_instances.add(this);
@@ -46,20 +49,16 @@ class SpoSiteAdminListCommand extends SpoCommand {
         const requestOptions = {
             url: `${adminUrl}/_api/SPO.Tenant/GetSiteAdministrators?siteId='${siteId}'`,
             headers: {
-                accept: 'application/json;odata=nometadata',
-                'content-type': 'application/json;charset=utf-8'
-            }
+                accept: 'application/json;odata=nometadata'
+            },
+            responseType: 'json'
         };
         const response = await request.post(requestOptions);
-        const responseContent = JSON.parse(response);
         const primaryAdminLoginName = await spo.getPrimaryAdminLoginNameAsAdmin(adminUrl, siteId, logger, this.verbose);
-        const mappedResult = responseContent.value.map((u) => ({
-            Id: null,
+        const mappedResult = response.value.map((u) => ({
             Email: u.email,
             LoginName: u.loginName,
             Title: u.name,
-            PrincipalType: null,
-            PrincipalTypeString: null,
             IsPrimaryAdmin: u.loginName === primaryAdminLoginName
         }));
         await logger.log(mappedResult);
@@ -78,7 +77,6 @@ class SpoSiteAdminListCommand extends SpoCommand {
         }
         const requestOptions = {
             url: `${args.options.siteUrl}/_api/web/siteusers?$filter=IsSiteAdmin eq true`,
-            method: 'GET',
             headers: {
                 'accept': 'application/json;odata=nometadata'
             },
@@ -114,6 +112,7 @@ _SpoSiteAdminListCommand_instances = new WeakSet(), _SpoSiteAdminListCommand_ini
     this.validators.push(async (args) => validation.isValidSharePointUrl(args.options.siteUrl));
 }, _SpoSiteAdminListCommand_initTypes = function _SpoSiteAdminListCommand_initTypes() {
     this.types.string.push('siteUrl');
+    this.types.boolean.push('asAdmin');
 };
 export default new SpoSiteAdminListCommand();
 //# sourceMappingURL=site-admin-list.js.map

package/dist/m365/spo/commands/site/site-admin-remove.js

@@ -77,11 +77,11 @@ class SpoSiteAdminRemoveCommand extends SpoCommand {
             headers: {
                 accept: 'application/json;odata=nometadata',
                 'content-type': 'application/json;charset=utf-8'
-            }
+            },
+            responseType: 'json'
         };
         const response = await request.post(requestOptions);
-        const responseContent = JSON.parse(response);
-        return responseContent.value;
+        return response.value;
     }
     async getCorrectLoginName(options) {
         if (options.userId || options.userName) {
@@ -116,7 +116,8 @@ class SpoSiteAdminRemoveCommand extends SpoCommand {
                     siteId: siteId,
                     secondaryAdministratorLoginNames: admins.map(u => u.loginName)
                 }
-            }
+            },
+            responseType: 'json'
         };
         await request.post(requestOptions);
     }

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

@@ -0,0 +1,68 @@
+import SpoCommand from '../../../base/SpoCommand.js';
+import { globalOptionsZod } from '../../../../Command.js';
+import { z } from 'zod';
+import { zod } from '../../../../utils/zod.js';
+import commands from '../../commands.js';
+import { validation } from '../../../../utils/validation.js';
+import request from '../../../../request.js';
+const options = globalOptionsZod
+    .extend({
+    siteUrl: zod.alias('u', z.string()
+        .refine(url => validation.isValidSharePointUrl(url) === true, url => ({
+        message: `'${url}' is not a valid SharePoint Online site URL.`
+    }))),
+    capability: z.enum(['full', 'limited', 'ownersOnly'])
+})
+    .strict();
+class SpoSiteSharingPermissionSetCommand extends SpoCommand {
+    get name() {
+        return commands.SITE_SHARINGPERMISSION_SET;
+    }
+    get description() {
+        return 'Controls how a site and its components can be shared';
+    }
+    get schema() {
+        return options;
+    }
+    async commandAction(logger, args) {
+        try {
+            if (this.verbose) {
+                await logger.logToStderr(`Updating sharing permissions for site '${args.options.siteUrl}'...`);
+            }
+            const { capability } = args.options;
+            if (this.verbose) {
+                await logger.logToStderr(`Updating site sharing permissions...`);
+            }
+            const requestOptionsWeb = {
+                url: `${args.options.siteUrl}/_api/Web`,
+                headers: {
+                    accept: 'application/json;odata=nometadata'
+                },
+                responseType: 'json',
+                data: {
+                    MembersCanShare: capability === 'full' || capability === 'limited'
+                }
+            };
+            await request.patch(requestOptionsWeb);
+            if (this.verbose) {
+                await logger.logToStderr(`Updating associated member group sharing permissions...`);
+            }
+            const requestOptionsMemberGroup = {
+                url: `${args.options.siteUrl}/_api/Web/AssociatedMemberGroup`,
+                headers: {
+                    accept: 'application/json;odata=nometadata'
+                },
+                responseType: 'json',
+                data: {
+                    AllowMembersEditMembership: capability === 'full'
+                }
+            };
+            await request.patch(requestOptionsMemberGroup);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+}
+export default new SpoSiteSharingPermissionSetCommand();
+//# sourceMappingURL=site-sharingpermission-set.js.map