@pnp/cli-microsoft365 7.10.0-beta.0d80e6e → 7.10.0-beta.4ffb095

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

@@ -430,33 +430,35 @@ class SpoSiteSetCommand extends SpoCommand {
 _SpoSiteSetCommand_instances = new WeakSet(), _SpoSiteSetCommand_initTelemetry = function _SpoSiteSetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            classification: typeof args.options.classification === 'string',
-            disableFlows: args.options.disableFlows,
-            socialBarOnSitePagesDisabled: args.options.socialBarOnSitePagesDisabled,
-            isPublic: args.options.isPublic,
+            classification: typeof args.options.classification !== 'undefined',
+            disableFlows: !!args.options.disableFlows,
+            socialBarOnSitePagesDisabled: !!args.options.socialBarOnSitePagesDisabled,
+            isPublic: !!args.options.isPublic,
             owners: typeof args.options.owners !== 'undefined',
-            shareByEmailEnabled: args.options.shareByEmailEnabled,
-            title: typeof args.options.title === 'string',
-            description: typeof args.options.description === 'string',
-            siteDesignId: typeof args.options.siteDesignId !== undefined,
-            sharingCapabilities: args.options.sharingCapability,
+            shareByEmailEnabled: !!args.options.shareByEmailEnabled,
+            title: typeof args.options.title !== 'undefined',
+            description: typeof args.options.description !== 'undefined',
+            siteDesignId: typeof args.options.siteDesignId !== 'undefined',
+            sharingCapabilities: typeof args.options.sharingCapability !== 'undefined',
             siteLogoUrl: typeof args.options.siteLogoUrl !== 'undefined',
             siteThumbnailUrl: typeof args.options.siteThumbnailUrl !== 'undefined',
-            resourceQuota: args.options.resourceQuota,
-            resourceQuotaWarningLevel: args.options.resourceQuotaWarningLevel,
-            storageQuota: args.options.storageQuota,
-            storageQuotaWarningLevel: args.options.storageQuotaWarningLevel,
-            allowSelfServiceUpgrade: args.options.allowSelfServiceUpgrade,
-            lockState: args.options.lockState,
-            noScriptSite: args.options.noScriptSite,
-            wait: args.options.wait === true
+            resourceQuota: typeof args.options.resourceQuota !== 'undefined',
+            resourceQuotaWarningLevel: typeof args.options.resourceQuotaWarningLevel !== 'undefined',
+            storageQuota: typeof args.options.storageQuota !== 'undefined',
+            storageQuotaWarningLevel: typeof args.options.storageQuotaWarningLevel !== 'undefined',
+            allowSelfServiceUpgrade: !!args.options.allowSelfServiceUpgrade,
+            lockState: typeof args.options.lockState !== 'undefined',
+            noScriptSite: !!args.options.noScriptSite,
+            wait: !!args.options.wait
         });
     });
 }, _SpoSiteSetCommand_initOptions = function _SpoSiteSetCommand_initOptions() {
     this.options.unshift({
         option: '-u, --url <url>'
     }, {
-        option: '-i, --id [id]'
+        option: '-t, --title [title]'
+    }, {
+        option: '-d, --description [description]'
     }, {
         option: '--classification [classification]'
     }, {
@@ -476,16 +478,12 @@ _SpoSiteSetCommand_instances = new WeakSet(), _SpoSiteSetCommand_initTelemetry =
     }, {
         option: '--siteDesignId [siteDesignId]'
     }, {
-        option: '--title [title]'
-    }, {
-        option: '--description [description]'
+        option: '--sharingCapability [sharingCapability]',
+        autocomplete: this.sharingCapabilities
     }, {
         option: '--siteLogoUrl [siteLogoUrl]'
     }, {
         option: '--siteThumbnailUrl [siteThumbnailUrl]'
-    }, {
-        option: '--sharingCapability [sharingCapability]',
-        autocomplete: this.sharingCapabilities
     }, {
         option: '--resourceQuota [resourceQuota]'
     }, {

package/dist/m365/spo/commands/tenant/tenant-site-archive.js

@@ -0,0 +1,99 @@
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    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 _SpoTenantSiteArchiveCommand_instances, _SpoTenantSiteArchiveCommand_initTelemetry, _SpoTenantSiteArchiveCommand_initOptions, _SpoTenantSiteArchiveCommand_initValidators, _SpoTenantSiteArchiveCommand_initTypes;
+import { cli } from '../../../../cli/cli.js';
+import config from '../../../../config.js';
+import request from '../../../../request.js';
+import { validation } from '../../../../utils/validation.js';
+import { spo } from '../../../../utils/spo.js';
+import SpoCommand from '../../../base/SpoCommand.js';
+import commands from '../../commands.js';
+class SpoTenantSiteArchiveCommand extends SpoCommand {
+    get name() {
+        return commands.TENANT_SITE_ARCHIVE;
+    }
+    get description() {
+        return 'Archives a site collection';
+    }
+    constructor() {
+        super();
+        _SpoTenantSiteArchiveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoTenantSiteArchiveCommand_instances, "m", _SpoTenantSiteArchiveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoTenantSiteArchiveCommand_instances, "m", _SpoTenantSiteArchiveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoTenantSiteArchiveCommand_instances, "m", _SpoTenantSiteArchiveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoTenantSiteArchiveCommand_instances, "m", _SpoTenantSiteArchiveCommand_initTypes).call(this);
+    }
+    async commandAction(logger, args) {
+        const archiveSite = async () => {
+            try {
+                if (this.verbose) {
+                    await logger.logToStderr(`Archiving site ${args.options.url}...`);
+                }
+                const spoAdminUrl = await spo.getSpoAdminUrl(logger, this.verbose);
+                const reqDigest = await spo.getRequestDigest(spoAdminUrl);
+                const requestOptions = {
+                    url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+                    headers: {
+                        'X-RequestDigest': reqDigest.FormDigestValue
+                    },
+                    data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009">
+                  <Actions>
+                    <ObjectPath Id="2" ObjectPathId="1" />
+                    <ObjectPath Id="4" ObjectPathId="3" />
+                    <Query Id="5" ObjectPathId="3">
+                      <Query SelectAllProperties="true">
+                        <Properties />
+                      </Query>
+                    </Query>
+                  </Actions>
+                  <ObjectPaths>
+                    <Constructor Id="1" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" />
+                    <Method Id="3" ParentId="1" Name="ArchiveSiteByUrl">
+                      <Parameters>
+                        <Parameter Type="String">${args.options.url}</Parameter>
+                      </Parameters>
+                    </Method>
+                  </ObjectPaths>
+                  </Request>`
+                };
+                const res = await request.post(requestOptions);
+                const json = JSON.parse(res);
+                const response = json[0];
+                if (response.ErrorInfo) {
+                    throw response.ErrorInfo.ErrorMessage;
+                }
+            }
+            catch (err) {
+                this.handleRejectedPromise(err);
+            }
+        };
+        if (args.options.force) {
+            await archiveSite();
+        }
+        else {
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to archive site '${args.options.url}'?` });
+            if (result) {
+                await archiveSite();
+            }
+        }
+    }
+}
+_SpoTenantSiteArchiveCommand_instances = new WeakSet(), _SpoTenantSiteArchiveCommand_initTelemetry = function _SpoTenantSiteArchiveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            force: !!args.options.force
+        });
+    });
+}, _SpoTenantSiteArchiveCommand_initOptions = function _SpoTenantSiteArchiveCommand_initOptions() {
+    this.options.unshift({ option: '-u, --url <url>' }, { option: '-f, --force' });
+}, _SpoTenantSiteArchiveCommand_initValidators = function _SpoTenantSiteArchiveCommand_initValidators() {
+    this.validators.push(async (args) => validation.isValidSharePointUrl(args.options.url));
+}, _SpoTenantSiteArchiveCommand_initTypes = function _SpoTenantSiteArchiveCommand_initTypes() {
+    this.types.string.push('url');
+    this.types.boolean.push('force');
+};
+export default new SpoTenantSiteArchiveCommand();
+//# sourceMappingURL=tenant-site-archive.js.map

package/dist/m365/spo/commands/tenant/tenant-site-unarchive.js

@@ -0,0 +1,98 @@
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    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 _SpoTenantSiteUnarchiveCommand_instances, _SpoTenantSiteUnarchiveCommand_initTelemetry, _SpoTenantSiteUnarchiveCommand_initOptions, _SpoTenantSiteUnarchiveCommand_initValidators, _SpoTenantSiteUnarchiveCommand_initTypes;
+import { cli } from '../../../../cli/cli.js';
+import config from '../../../../config.js';
+import request from '../../../../request.js';
+import { spo } from '../../../../utils/spo.js';
+import { validation } from '../../../../utils/validation.js';
+import SpoCommand from '../../../base/SpoCommand.js';
+import commands from '../../commands.js';
+class SpoTenantSiteUnarchiveCommand extends SpoCommand {
+    get name() {
+        return commands.TENANT_SITE_UNARCHIVE;
+    }
+    get description() {
+        return 'Unarchives a site collection';
+    }
+    constructor() {
+        super();
+        _SpoTenantSiteUnarchiveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoTenantSiteUnarchiveCommand_instances, "m", _SpoTenantSiteUnarchiveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoTenantSiteUnarchiveCommand_instances, "m", _SpoTenantSiteUnarchiveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoTenantSiteUnarchiveCommand_instances, "m", _SpoTenantSiteUnarchiveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoTenantSiteUnarchiveCommand_instances, "m", _SpoTenantSiteUnarchiveCommand_initTypes).call(this);
+    }
+    async commandAction(logger, args) {
+        if (args.options.force) {
+            await this.unarchiveSite(logger, args.options.url);
+        }
+        else {
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to unarchive site '${args.options.url}'? This may cause additional billing costs.` });
+            if (result) {
+                await this.unarchiveSite(logger, args.options.url);
+            }
+        }
+    }
+    async unarchiveSite(logger, url) {
+        if (this.verbose) {
+            await logger.logToStderr(`Unarchiving site '${url}'...`);
+        }
+        try {
+            const adminCenterUrl = await spo.getSpoAdminUrl(logger, this.verbose);
+            const requestDigest = await spo.getRequestDigest(adminCenterUrl);
+            const requestOptions = {
+                url: `${adminCenterUrl}/_vti_bin/client.svc/ProcessQuery`,
+                headers: {
+                    'X-RequestDigest': requestDigest.FormDigestValue
+                },
+                data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009">
+                <Actions>
+                  <ObjectPath Id="2" ObjectPathId="1" />
+                  <ObjectPath Id="4" ObjectPathId="3" />
+                </Actions>
+                <ObjectPaths>
+                  <Constructor Id="1" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" />
+                  <Method Id="3" ParentId="1" Name="UnarchiveSiteByUrl">
+                    <Parameters>
+                      <Parameter Type="String">${url}</Parameter>
+                    </Parameters>
+                  </Method>
+                </ObjectPaths>
+              </Request>`
+            };
+            const response = await request.post(requestOptions);
+            const json = JSON.parse(response);
+            const responseContent = json[0];
+            if (responseContent.ErrorInfo) {
+                throw responseContent.ErrorInfo.ErrorMessage;
+            }
+        }
+        catch (err) {
+            this.handleRejectedPromise(err);
+        }
+    }
+}
+_SpoTenantSiteUnarchiveCommand_instances = new WeakSet(), _SpoTenantSiteUnarchiveCommand_initTelemetry = function _SpoTenantSiteUnarchiveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            force: !!args.options.force
+        });
+    });
+}, _SpoTenantSiteUnarchiveCommand_initOptions = function _SpoTenantSiteUnarchiveCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --url <url>'
+    }, {
+        option: '-f, --force'
+    });
+}, _SpoTenantSiteUnarchiveCommand_initValidators = function _SpoTenantSiteUnarchiveCommand_initValidators() {
+    this.validators.push(async (args) => validation.isValidSharePointUrl(args.options.url));
+}, _SpoTenantSiteUnarchiveCommand_initTypes = function _SpoTenantSiteUnarchiveCommand_initTypes() {
+    this.types.string.push('url');
+    this.types.boolean.push('force');
+};
+export default new SpoTenantSiteUnarchiveCommand();
+//# sourceMappingURL=tenant-site-unarchive.js.map

package/dist/m365/spo/commands.js

@@ -239,6 +239,7 @@ export default {
     SERVICEPRINCIPAL_SET: `${prefix} serviceprincipal set`,
     SET: `${prefix} set`,
     SITE_ADD: `${prefix} site add`,
+    SITE_ADMIN_LIST: `${prefix} site admin list`,
     SITE_APPCATALOG_ADD: `${prefix} site appcatalog add`,
     SITE_APPCATALOG_LIST: `${prefix} site appcatalog list`,
     SITE_APPCATALOG_REMOVE: `${prefix} site appcatalog remove`,
@@ -312,6 +313,8 @@ export default {
     TENANT_RECYCLEBINITEM_RESTORE: `${prefix} tenant recyclebinitem restore`,
     TENANT_SETTINGS_LIST: `${prefix} tenant settings list`,
     TENANT_SETTINGS_SET: `${prefix} tenant settings set`,
+    TENANT_SITE_ARCHIVE: `${prefix} tenant site archive`,
+    TENANT_SITE_UNARCHIVE: `${prefix} tenant site unarchive`,
     TERM_ADD: `${prefix} term add`,
     TERM_GET: `${prefix} term get`,
     TERM_LIST: `${prefix} term list`,

package/dist/m365/teams/commands/user/user-app-add.js

@@ -26,24 +26,24 @@ class TeamsUserAppAddCommand extends GraphCommand {
         __classPrivateFieldGet(this, _TeamsUserAppAddCommand_instances, "m", _TeamsUserAppAddCommand_initOptionSets).call(this);
     }
     async commandAction(logger, args) {
-        const appId = await this.getAppId(args);
-        const userId = (args.options.userId ?? args.options.userName);
-        const endpoint = `${this.resource}/v1.0`;
-        if (this.verbose) {
-            await logger.logToStderr(`Removing app with ID ${appId} for user ${args.options.userId}`);
-        }
-        const requestOptions = {
-            url: `${endpoint}/users/${formatting.encodeQueryParameter(userId)}/teamwork/installedApps`,
-            headers: {
-                'content-type': 'application/json;odata=nometadata',
-                'accept': 'application/json;odata.metadata=none'
-            },
-            responseType: 'json',
-            data: {
-                'teamsApp@odata.bind': `${endpoint}/appCatalogs/teamsApps/${appId}`
-            }
-        };
         try {
+            const appId = await this.getAppId(args);
+            const userId = (args.options.userId ?? args.options.userName);
+            const endpoint = `${this.resource}/v1.0`;
+            if (this.verbose) {
+                await logger.logToStderr(`Adding app with ID ${appId} for user ${args.options.userId}`);
+            }
+            const requestOptions = {
+                url: `${endpoint}/users/${formatting.encodeQueryParameter(userId)}/teamwork/installedApps`,
+                headers: {
+                    'content-type': 'application/json;odata=nometadata',
+                    'accept': 'application/json;odata.metadata=none'
+                },
+                responseType: 'json',
+                data: {
+                    'teamsApp@odata.bind': `${endpoint}/appCatalogs/teamsApps/${appId}`
+                }
+            };
             await request.post(requestOptions);
         }
         catch (err) {

package/dist/m365/teams/commands/user/user-app-upgrade.js

@@ -0,0 +1,106 @@
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    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 _TeamsUserAppUpgradeCommand_instances, _TeamsUserAppUpgradeCommand_initTelemetry, _TeamsUserAppUpgradeCommand_initOptions, _TeamsUserAppUpgradeCommand_initValidators, _TeamsUserAppUpgradeCommand_initOptionSets, _TeamsUserAppUpgradeCommand_initTypes;
+import { cli } from '../../../../cli/cli.js';
+import request from '../../../../request.js';
+import { formatting } from '../../../../utils/formatting.js';
+import { odata } from '../../../../utils/odata.js';
+import { validation } from '../../../../utils/validation.js';
+import GraphCommand from '../../../base/GraphCommand.js';
+import commands from '../../commands.js';
+class TeamsUserAppUpgradeCommand extends GraphCommand {
+    get name() {
+        return commands.USER_APP_UPGRADE;
+    }
+    get description() {
+        return 'Upgrade an app in the personal scope of the specified user';
+    }
+    constructor() {
+        super();
+        _TeamsUserAppUpgradeCommand_instances.add(this);
+        __classPrivateFieldGet(this, _TeamsUserAppUpgradeCommand_instances, "m", _TeamsUserAppUpgradeCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _TeamsUserAppUpgradeCommand_instances, "m", _TeamsUserAppUpgradeCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _TeamsUserAppUpgradeCommand_instances, "m", _TeamsUserAppUpgradeCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _TeamsUserAppUpgradeCommand_instances, "m", _TeamsUserAppUpgradeCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _TeamsUserAppUpgradeCommand_instances, "m", _TeamsUserAppUpgradeCommand_initTypes).call(this);
+    }
+    async commandAction(logger, args) {
+        try {
+            if (this.verbose) {
+                await logger.logToStderr(`Upgrading app ${args.options.id || args.options.name} for user ${args.options.userId || args.options.userName}`);
+            }
+            const installedAppId = await this.getInstalledAppId(args.options, logger);
+            const requestOptions = {
+                url: `${this.resource}/v1.0/users/${formatting.encodeQueryParameter(args.options.userId || args.options.userName)}/teamwork/installedApps/${installedAppId}/upgrade`,
+                headers: {
+                    'accept': 'application/json;odata.metadata=none'
+                }
+            };
+            await request.post(requestOptions);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+    async getInstalledAppId(options, logger) {
+        if (this.verbose) {
+            await logger.logToStderr(`Retrieving app ID`);
+        }
+        if (options.id) {
+            return options.id;
+        }
+        const installedApps = await odata.getAllItems(`${this.resource}/v1.0/users/${formatting.encodeQueryParameter(options.userId || options.userName)}/teamwork/installedApps?$expand=teamsAppDefinition&$filter=teamsAppDefinition/displayName eq '${formatting.encodeQueryParameter(options.name)}'&$select=id`);
+        if (installedApps.length === 1) {
+            return installedApps[0].id;
+        }
+        if (installedApps.length === 0) {
+            throw `The specified Teams app ${options.name} does not exist or is not installed for the user`;
+        }
+        const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', installedApps);
+        const result = (await cli.handleMultipleResultsFound(`Multiple installed Teams apps with name '${options.name}' found.`, resultAsKeyValuePair));
+        return result.id;
+    }
+}
+_TeamsUserAppUpgradeCommand_instances = new WeakSet(), _TeamsUserAppUpgradeCommand_initTelemetry = function _TeamsUserAppUpgradeCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            id: typeof args.options.id !== 'undefined',
+            name: typeof args.options.name !== 'undefined',
+            userId: typeof args.options.userId !== 'undefined',
+            userName: typeof args.options.userName !== 'undefined'
+        });
+    });
+}, _TeamsUserAppUpgradeCommand_initOptions = function _TeamsUserAppUpgradeCommand_initOptions() {
+    this.options.unshift({
+        option: '--id [id]'
+    }, {
+        option: '--name [name]'
+    }, {
+        option: '--userId [userId]'
+    }, {
+        option: '--userName [userName]'
+    });
+}, _TeamsUserAppUpgradeCommand_initValidators = function _TeamsUserAppUpgradeCommand_initValidators() {
+    this.validators.push(async (args) => {
+        if (args.options.userId && !validation.isValidGuid(args.options.userId)) {
+            return `${args.options.userId} is not a valid GUID`;
+        }
+        if (args.options.userName && !validation.isValidUserPrincipalName(args.options.userName)) {
+            return `${args.options.userName} is not a valid userName`;
+        }
+        return true;
+    });
+}, _TeamsUserAppUpgradeCommand_initOptionSets = function _TeamsUserAppUpgradeCommand_initOptionSets() {
+    this.optionSets.push({
+        options: ['id', 'name']
+    }, {
+        options: ['userId', 'userName']
+    });
+}, _TeamsUserAppUpgradeCommand_initTypes = function _TeamsUserAppUpgradeCommand_initTypes() {
+    this.types.string.push('id', 'name', 'userId', 'userName');
+};
+export default new TeamsUserAppUpgradeCommand();
+//# sourceMappingURL=user-app-upgrade.js.map

package/dist/m365/teams/commands.js

@@ -67,6 +67,7 @@ export default {
     USER_SET: `${prefix} user set`,
     USER_APP_ADD: `${prefix} user app add`,
     USER_APP_LIST: `${prefix} user app list`,
-    USER_APP_REMOVE: `${prefix} user app remove`
+    USER_APP_REMOVE: `${prefix} user app remove`,
+    USER_APP_UPGRADE: `${prefix} user app upgrade`
 };
 //# sourceMappingURL=commands.js.map

package/dist/utils/md.js

@@ -22,7 +22,7 @@ function includeContent(md, rootFolder) {
         { tag: "<CLISettings />", location: "docs/_clisettings.mdx" }
     ];
     mdxImports.forEach(mdxImport => {
-        md = md.replace(mdxImport.tag, () => fs.readFileSync(path.join(rootFolder, mdxImport.location), 'utf8')).replace(/(```\r\n)\r\n(```md definition-list\r\n)/g, "$1$2");
+        md = md.replace(mdxImport.tag, () => fs.readFileSync(path.join(rootFolder, mdxImport.location), 'utf8')).replace(/(```\r?\n)\r?\n(```md definition-list\r?\n)/g, "$1$2");
     });
     return md;
 }
@@ -54,7 +54,7 @@ function convertContentTabs(md) {
         .trim();
 }
 function convertCodeFences(md) {
-    const regex = new RegExp('^```.*?(?:\r\n|\n)(.*?)```(?:\r\n|\n)', 'gms');
+    const regex = new RegExp('^```.*?(?:\r?\n)(.*?)```(?:\r?\n)', 'gms');
     return md.replace(regex, (match, code) => {
         return `${code.replace(/^(.+)$/gm, '  $1')}${EOL}`;
     });

package/docs/docs/cmd/entra/app/app-permission-remove.mdx

@@ -0,0 +1,60 @@
+import Global from '/docs/cmd/_global.mdx';
+
+# entra app permission remove
+
+Removes the specified application and/or delegated permissions from a specified Entra app.
+
+## Usage
+
+```sh
+m365 entra app permission remove [options]
+```
+
+## Options
+
+```md definition-list
+`-i, --appId [appId]`
+: Client ID of the Microsoft Entra app to remove the API permissions from. Specify either `appId`, `appName` or `appObjectId`.
+
+`--appObjectId [appObjectId]`
+: Object ID of the Microsoft Entra app to remove the API permissions from. Specify either `appId`, `appName` or `appObjectId`.
+
+`-n, --appName [appName]`
+: Display name of the Entra app to remove the API permissions from. Specify either `appId`, `appName` or `appObjectId`.
+
+`-a, --applicationPermissions [applicationPermissions]`
+: Space-separated list of application permissions to remove. Specify at least `applicationPermissions` or `delegatedPermissions`.
+
+`-d, --delegatedPermissions [delegatedPermissions]`
+: Space-separated list of delegated permissions to remove. Specify at least `applicationPermissions` or `delegatedPermissions`.
+
+`--revokeAdminConsent`
+: When specified, revokes the admin consent for the specified permissions as well.
+
+`-f, --force`
+: Don't prompt for confirmation to remove the permissions.
+```
+
+<Global />
+
+## Remarks
+
+Removing permissions on App Registrations does not immediately remove consent given by an administrator. Explicitly instruct the CLI to revoke consent by using the `--revokeAdminConsent` flag.
+
+## Examples
+
+Remove multiple delegated API permissions from an Entra app registration
+
+```sh
+m365 entra app permission remove --appId 'f1417aa3-bf0b-4cc5-a845-a0b2cf11f690' --delegatedPermissions 'https://management.azure.com/user_impersonation https://service.flow.microsoft.com/Flows.Read.All https://graph.microsoft.com/Agreement.Read.All'
+```
+
+Remove multiple app-only permissions from an Entra app registration and revoke admin consent
+
+```sh
+m365 entra app permission remove --appId 'f1417aa3-bf0b-4cc5-a845-a0b2cf11f690' --applicationPermissions 'https://graph.microsoft.com/Sites.FullControl.All https://microsoft.sharepoint-df.com/Sites.FullControl.All' --revokeAdminConsent
+```
+
+## Response
+
+The command won't return a response on success.