@pnp/cli-microsoft365 11.5.0 → 11.6.0-beta.358a4f1

package/dist/m365/spo/commands/page/clientsidepages.js

@@ -158,8 +158,8 @@ function getBoundedDivMarkup(html, boundaryStartPattern, collector) {
         // we have one open div counting from the one found above using boundaryStartPattern so we need to ensure we find it's close
         let openCounter = 1;
         let searchIndex = startIndex + 1;
-        let nextDivOpen = -1;
-        let nextCloseDiv = -1;
+        let nextDivOpen;
+        let nextCloseDiv;
         // this loop finds the </div> tag that matches the opening of the control
         while (true) {
             // find both the next opening and closing div tags from our current searching index
@@ -299,7 +299,7 @@ export class ClientSidePage {
             const ct = /controlType&quot;&#58;(\d*?)(,|&)/i.exec(markup);
             // if no control type is present this is a column which we give type 0 to let us process it
             const controlType = ct === null || ct.length < 0 ? -1 : parseInt(ct[1], 10);
-            let control = null;
+            let control;
             switch (controlType) {
                 case -1:
                     // empty canvas column
@@ -371,8 +371,8 @@ export class ClientSidePage {
      * @param control The control to merge
      */
     mergePartToTree(control) {
-        let section = null;
-        let column = null;
+        let section;
+        let column;
         let sectionFactor = 12;
         let sectionIndex = 0;
         let zoneIndex = 0;
@@ -417,7 +417,7 @@ export class ClientSidePage {
      */
     mergeColumnToTree(column) {
         const order = column?.controlData?.position.zoneIndex || 0;
-        let section = null;
+        let section;
         const sections = this.sections.filter(s => s.order === order && s.layoutIndex === (column?.controlData?.position.layoutIndex ?? 1));
         if (sections.length < 1) {
             section = new CanvasSection(this, order, [], column.controlData);

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

@@ -27,8 +27,6 @@ class SpoPageAddCommand extends SpoCommand {
         __classPrivateFieldGet(this, _SpoPageAddCommand_instances, "m", _SpoPageAddCommand_initValidators).call(this);
     }
     async commandAction(logger, args) {
-        let requestDigest = '';
-        let itemId = '';
         let pageName = args.options.name;
         const fileNameWithoutExtension = pageName.replace('.aspx', '');
         let bannerImageUrl = '';
@@ -44,7 +42,7 @@ class SpoPageAddCommand extends SpoCommand {
         const serverRelativeFileUrl = `${listServerRelativeUrl}/${pageName}`;
         try {
             const reqDigest = await spo.getRequestDigest(args.options.webUrl);
-            requestDigest = reqDigest.FormDigestValue;
+            const requestDigest = reqDigest.FormDigestValue;
             let requestOptions = {
                 url: `${args.options.webUrl}/_api/sitepages/pages`,
                 responseType: 'json',
@@ -60,7 +58,7 @@ class SpoPageAddCommand extends SpoCommand {
                 }
             };
             const template = await request.post(requestOptions);
-            itemId = template.UniqueId;
+            const itemId = template.UniqueId;
             const file = await spo.getFileAsListItemByUrl(args.options.webUrl, serverRelativeFileUrl, logger, this.verbose);
             const listItemId = file.Id;
             const pageProps = await Page.checkout(pageName, args.options.webUrl, logger, this.verbose);

package/dist/m365/spo/commands/page/page-header-set.js

@@ -119,7 +119,6 @@ class SpoPageHeaderSetCommand extends SpoCommand {
                 translateY: 0
             }
         };
-        let header = defaultPageHeader;
         let pageFullName = args.options.pageName.toLowerCase();
         if (!pageFullName.endsWith('.aspx')) {
             pageFullName += '.aspx';
@@ -127,7 +126,6 @@ class SpoPageHeaderSetCommand extends SpoCommand {
         let canvasContent = "";
         let bannerImageUrl = "";
         let description = "";
-        let title = "";
         let authorByline = args.options.authors ? args.options.authors.split(',').map(a => a.trim()) : [];
         let topicHeader = args.options.topicHeader || "";
         if (this.verbose) {
@@ -142,7 +140,7 @@ class SpoPageHeaderSetCommand extends SpoCommand {
                 responseType: 'json'
             };
             const page = await request.get(requestOptions);
-            title = page.Title;
+            let title = page.Title;
             let pageData;
             if (page.IsPageCheckedOutToCurrentUser) {
                 const requestOptions = {
@@ -157,18 +155,18 @@ class SpoPageHeaderSetCommand extends SpoCommand {
             else {
                 pageData = await Page.checkout(pageFullName, args.options.webUrl, logger, this.verbose);
             }
+            let header;
             switch (args.options.type) {
                 case 'None':
                     header = noPageHeader;
                     break;
-                case 'Default':
-                    header = defaultPageHeader;
-                    break;
                 case 'Custom':
                     header = customPageHeader;
                     break;
+                case 'Default':
                 default:
                     header = defaultPageHeader;
+                    break;
             }
             if (pageData) {
                 canvasContent = pageData.CanvasContent1;

package/dist/m365/spo/commands/page/page-section-add.js

@@ -128,34 +128,34 @@ class SpoPageSectionAddCommand extends SpoCommand {
         let sectionIndex = 1;
         switch (args.options.sectionTemplate) {
             case 'OneColumnFullWidth':
-                columns.push(this.getColumn(zoneIndex, sectionIndex++, 0, args, zoneId));
+                columns.push(this.getColumn(zoneIndex, sectionIndex, 0, args, zoneId));
                 break;
             case 'TwoColumn':
                 columns.push(this.getColumn(zoneIndex, sectionIndex++, 6, args, zoneId));
-                columns.push(this.getColumn(zoneIndex, sectionIndex++, 6, args, zoneId));
+                columns.push(this.getColumn(zoneIndex, sectionIndex, 6, args, zoneId));
                 break;
             case 'ThreeColumn':
                 columns.push(this.getColumn(zoneIndex, sectionIndex++, 4, args, zoneId));
                 columns.push(this.getColumn(zoneIndex, sectionIndex++, 4, args, zoneId));
-                columns.push(this.getColumn(zoneIndex, sectionIndex++, 4, args, zoneId));
+                columns.push(this.getColumn(zoneIndex, sectionIndex, 4, args, zoneId));
                 break;
             case 'TwoColumnLeft':
                 columns.push(this.getColumn(zoneIndex, sectionIndex++, 8, args, zoneId));
-                columns.push(this.getColumn(zoneIndex, sectionIndex++, 4, args, zoneId));
+                columns.push(this.getColumn(zoneIndex, sectionIndex, 4, args, zoneId));
                 break;
             case 'TwoColumnRight':
                 columns.push(this.getColumn(zoneIndex, sectionIndex++, 4, args, zoneId));
-                columns.push(this.getColumn(zoneIndex, sectionIndex++, 8, args, zoneId));
+                columns.push(this.getColumn(zoneIndex, sectionIndex, 8, args, zoneId));
                 break;
             case 'Vertical':
                 columns.push(this.getVerticalColumn(args, zoneId));
                 break;
             case 'Flexible':
-                columns.push(this.getFlexibleColumn(zoneIndex, sectionIndex++, args, zoneId));
+                columns.push(this.getFlexibleColumn(zoneIndex, sectionIndex, args, zoneId));
                 break;
             case 'OneColumn':
             default:
-                columns.push(this.getColumn(zoneIndex, sectionIndex++, 12, args, zoneId));
+                columns.push(this.getColumn(zoneIndex, sectionIndex, 12, args, zoneId));
                 break;
         }
         return columns;

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

@@ -32,14 +32,8 @@ class SpoPageSetCommand extends SpoCommand {
         const resource = Auth.getResourceFromUrl(args.options.webUrl);
         let pageName = args.options.name;
         const fileNameWithoutExtension = pageName.replace('.aspx', '');
-        let bannerImageUrl = '';
-        let canvasContent1 = '';
-        let layoutWebpartsContent = '';
         let pageTitle = args.options.title || "";
-        let pageId = null;
         let pageDescription = args.options.description || "";
-        let topicHeader = "";
-        let authorByline = [];
         const pageData = {};
         if (!pageName.endsWith('.aspx')) {
             pageName += '.aspx';
@@ -54,13 +48,13 @@ class SpoPageSetCommand extends SpoCommand {
             const requestDigest = requestDigestResult.FormDigestValue;
             const page = await Page.checkout(args.options.name, args.options.webUrl, logger, this.verbose);
             pageTitle = pageTitle || page.Title;
-            pageId = page.Id;
-            bannerImageUrl = page.BannerImageUrl;
-            canvasContent1 = args.options.content || page.CanvasContent1;
-            layoutWebpartsContent = page.LayoutWebpartsContent;
+            let pageId = page.Id;
+            const bannerImageUrl = page.BannerImageUrl;
+            const canvasContent1 = args.options.content || page.CanvasContent1;
+            const layoutWebpartsContent = page.LayoutWebpartsContent;
             pageDescription = pageDescription || page.Description;
-            topicHeader = page.TopicHeader;
-            authorByline = page.AuthorByline;
+            const topicHeader = page.TopicHeader;
+            const authorByline = page.AuthorByline;
             if (args.options.layoutType) {
                 const listItemSetOptions = {
                     PageLayoutType: args.options.layoutType

package/dist/m365/spo/commands/page/page-text-add.js

@@ -27,7 +27,6 @@ class SpoPageTextAddCommand extends SpoCommand {
         __classPrivateFieldGet(this, _SpoPageTextAddCommand_instances, "m", _SpoPageTextAddCommand_initValidators).call(this);
     }
     async commandAction(logger, args) {
-        let requestDigest = '';
         let pageName = args.options.pageName;
         if (args.options.pageName.indexOf('.aspx') < 0) {
             pageName += '.aspx';
@@ -38,7 +37,7 @@ class SpoPageTextAddCommand extends SpoCommand {
         try {
             const reqDigest = await spo.getRequestDigest(args.options.webUrl);
             // Keep the reference of request digest for subsequent requests
-            requestDigest = reqDigest.FormDigestValue;
+            const requestDigest = reqDigest.FormDigestValue;
             if (this.verbose) {
                 await logger.logToStderr(`Retrieving modern page ${pageName}...`);
             }

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

@@ -34,7 +34,7 @@ class SpoSiteAppPermissionAddCommand extends GraphCommand {
                 displayName: args.options.appDisplayName
             };
         }
-        let endpoint = "";
+        let endpoint;
         if (args.options.appId) {
             endpoint = `${this.resource}/v1.0/myorganization/servicePrincipals?$select=appId,displayName&$filter=appId eq '${formatting.encodeQueryParameter(args.options.appId)}'`;
         }

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

@@ -340,7 +340,7 @@ class SpoSiteSetCommand extends SpoCommand {
         }
         if (args.options.noScriptSite !== undefined) {
             const noScriptSite = args.options.noScriptSite ? 2 : 1;
-            payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="DenyAddAndCustomizePages"><Parameter Type="Enum">${noScriptSite}</Parameter></SetProperty>`);
+            payload.push(`<SetProperty Id="${propertyId}" ObjectPathId="5" Name="DenyAddAndCustomizePages"><Parameter Type="Enum">${noScriptSite}</Parameter></SetProperty>`);
         }
         let response;
         let sitePropertiesResponse;

package/dist/m365/spo/commands/spo-search.js

@@ -26,7 +26,7 @@ class SpoSearchCommand extends SpoCommand {
         __classPrivateFieldGet(this, _SpoSearchCommand_instances, "m", _SpoSearchCommand_initValidators).call(this);
     }
     async commandAction(logger, args) {
-        let webUrl = '';
+        let webUrl;
         try {
             if (args.options.webUrl) {
                 webUrl = args.options.webUrl;

package/dist/m365/spo/commands/tenant/tenant-commandset-remove.js

@@ -70,7 +70,7 @@ class SpoTenantCommandSetRemoveCommand extends SpoCommand {
         if (this.verbose) {
             await logger.logToStderr(`Getting the tenant command set ${args.options.id || args.options.title || args.options.clientSideComponentId}`);
         }
-        let filter = '';
+        let filter;
         if (args.options.title) {
             filter = `Title eq '${args.options.title}'`;
         }

package/dist/m365/spo/commands/term/term-group-add.js

@@ -27,12 +27,11 @@ class SpoTermGroupAddCommand extends SpoCommand {
         __classPrivateFieldGet(this, _SpoTermGroupAddCommand_instances, "m", _SpoTermGroupAddCommand_initValidators).call(this);
     }
     async commandAction(logger, args) {
-        let formDigest = '';
         let termGroup;
         try {
             const webUrl = args.options.webUrl || await spo.getSpoAdminUrl(logger, this.debug);
             const res = await spo.getRequestDigest(webUrl);
-            formDigest = res.FormDigestValue;
+            const formDigest = res.FormDigestValue;
             if (this.verbose) {
                 await logger.logToStderr(`Getting taxonomy term store...`);
             }

package/dist/m365/spo/commands/term/term-set-add.js

@@ -28,12 +28,11 @@ class SpoTermSetAddCommand extends SpoCommand {
         __classPrivateFieldGet(this, _SpoTermSetAddCommand_instances, "m", _SpoTermSetAddCommand_initOptionSets).call(this);
     }
     async commandAction(logger, args) {
-        let formDigest = '';
         let termSet;
         try {
             const spoWebUrl = args.options.webUrl ? args.options.webUrl : await spo.getSpoAdminUrl(logger, this.debug);
             const res = await spo.getRequestDigest(spoWebUrl);
-            formDigest = res.FormDigestValue;
+            const formDigest = res.FormDigestValue;
             if (this.verbose) {
                 await logger.logToStderr(`Adding taxonomy term set...`);
             }

package/dist/m365/spo/commands/theme/theme-apply.js

@@ -93,7 +93,7 @@ class SpoThemeApplyCommand extends SpoCommand {
         }
     }
     getSharePointTheme(themeName) {
-        let palette = "";
+        let palette;
         switch (themeName) {
             case SharePointThemes.Blue:
                 palette = "\"themePrimary\":{\"R\":0,\"G\":120,\"B\":212,\"A\":255},\"themeLighterAlt\":{\"R\":239,\"G\":246,\"B\":252,\"A\":255},\"themeLighter\":{\"R\":222,\"G\":236,\"B\":249,\"A\":255},\"themeLight\":{\"R\":199,\"G\":224,\"B\":244,\"A\":255},\"themeTertiary\":{\"R\":113,\"G\":175,\"B\":229,\"A\":255},\"themeSecondary\":{\"R\":43,\"G\":136,\"B\":216,\"A\":255},\"themeDarkAlt\":{\"R\":16,\"G\":110,\"B\":190,\"A\":255},\"themeDark\":{\"R\":0,\"G\":90,\"B\":158,\"A\":255},\"themeDarker\":{\"R\":0,\"G\":69,\"B\":120,\"A\":255},\"accent\":{\"R\":135,\"G\":100,\"B\":184,\"A\":255},\"neutralLighterAlt\":{\"R\":248,\"G\":248,\"B\":248,\"A\":255},\"neutralLighter\":{\"R\":244,\"G\":244,\"B\":244,\"A\":255},\"neutralLight\":{\"R\":234,\"G\":234,\"B\":234,\"A\":255},\"neutralQuaternaryAlt\":{\"R\":218,\"G\":218,\"B\":218,\"A\":255},\"neutralQuaternary\":{\"R\":208,\"G\":208,\"B\":208,\"A\":255},\"neutralTertiaryAlt\":{\"R\":200,\"G\":200,\"B\":200,\"A\":255},\"neutralTertiary\":{\"R\":166,\"G\":166,\"B\":166,\"A\":255},\"neutralSecondary\":{\"R\":102,\"G\":102,\"B\":102,\"A\":255},\"neutralPrimaryAlt\":{\"R\":60,\"G\":60,\"B\":60,\"A\":255},\"neutralPrimary\":{\"R\":51,\"G\":51,\"B\":51,\"A\":255},\"neutralDark\":{\"R\":33,\"G\":33,\"B\":33,\"A\":255},\"black\":{\"R\":0,\"G\":0,\"B\":0,\"A\":255},\"white\":{\"R\":255,\"G\":255,\"B\":255,\"A\":255},\"primaryBackground\":{\"R\":255,\"G\":255,\"B\":255,\"A\":255},\"primaryText\":{\"R\":51,\"G\":51,\"B\":51,\"A\":255}";

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

@@ -28,10 +28,8 @@ class SpoUserListCommand extends SpoCommand {
         if (this.verbose) {
             await logger.logToStderr(`Retrieving users from web ${args.options.webUrl}...`);
         }
-        let requestUrl = '';
-        requestUrl = `${args.options.webUrl}/_api/web/siteusers`;
         const requestOptions = {
-            url: requestUrl,
+            url: `${args.options.webUrl}/_api/web/siteusers`,
             method: 'GET',
             headers: {
                 'accept': 'application/json;odata=nometadata'

package/dist/m365/spo/commands/web/web-add.js

@@ -30,8 +30,6 @@ class SpoWebAddCommand extends SpoCommand {
         return ['url'];
     }
     async commandAction(logger, args) {
-        let siteInfo = null;
-        let subsiteFullUrl = '';
         try {
             const res = await spo.getRequestDigest(args.options.parentWebUrl);
             const requestOptionsPost = {
@@ -56,12 +54,12 @@ class SpoWebAddCommand extends SpoCommand {
             if (this.verbose) {
                 await logger.logToStderr(`Creating subsite ${args.options.parentWebUrl}/${args.options.webUrl}...`);
             }
-            siteInfo = await request.post(requestOptionsPost);
+            const siteInfo = await request.post(requestOptionsPost);
             if (args.options.inheritNavigation) {
                 if (this.verbose) {
                     await logger.logToStderr("Setting inheriting navigation from the parent site...");
                 }
-                subsiteFullUrl = `${args.options.parentWebUrl}/${formatting.encodeQueryParameter(args.options.url)}`;
+                const subsiteFullUrl = `${args.options.parentWebUrl}/${formatting.encodeQueryParameter(args.options.url)}`;
                 const requestOptionsPer = {
                     url: `${subsiteFullUrl}/_api/web/effectivebasepermissions`,
                     headers: {

package/dist/m365/spo/commands/web/web-reindex.js

@@ -24,11 +24,10 @@ class SpoWebReindexCommand extends SpoCommand {
         __classPrivateFieldGet(this, _SpoWebReindexCommand_instances, "m", _SpoWebReindexCommand_initValidators).call(this);
     }
     async commandAction(logger, args) {
-        let requestDigest = '';
         let webIdentityResp;
         try {
             const res = await spo.getRequestDigest(args.options.url);
-            requestDigest = res.FormDigestValue;
+            const requestDigest = res.FormDigestValue;
             if (this.debug) {
                 await logger.logToStderr(`Retrieved request digest. Retrieving web identity...`);
             }

package/dist/m365/spp/commands/autofillcolumn/autofillcolumn-set.js

@@ -110,7 +110,7 @@ class SppAutofillColumnSetCommand extends SpoCommand {
         return request.get(requestOptions);
     }
     getColumn(siteUrl, options, listId) {
-        let fieldRestUrl = '';
+        let fieldRestUrl;
         if (options.columnId) {
             fieldRestUrl = `/getbyid('${formatting.encodeQueryParameter(options.columnId)}')`;
         }

package/dist/m365/viva/commands/engage/engage-role-member-remove.js

@@ -0,0 +1,83 @@
+import { z } from 'zod';
+import { cli } from '../../../../cli/cli.js';
+import { globalOptionsZod } from '../../../../Command.js';
+import GraphCommand from '../../../base/GraphCommand.js';
+import commands from '../../commands.js';
+import { vivaEngage } from '../../../../utils/vivaEngage.js';
+import { entraUser } from '../../../../utils/entraUser.js';
+import request from '../../../../request.js';
+import { validation } from '../../../../utils/validation.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    roleId: z.uuid().optional(),
+    roleName: z.string().optional(),
+    userId: z.uuid().optional(),
+    userName: z.string().refine(upn => validation.isValidUserPrincipalName(upn), {
+        error: e => `'${e.input}' is not a valid UPN.`
+    }).optional(),
+    force: z.boolean().optional().alias('f')
+});
+class VivaEngageRoleMemberRemoveCommand extends GraphCommand {
+    get name() {
+        return commands.ENGAGE_ROLE_MEMBER_REMOVE;
+    }
+    get description() {
+        return 'Removes a user from a Viva Engage role';
+    }
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => [options.roleId, options.roleName].filter(x => x !== undefined).length === 1, {
+            error: 'Specify either roleId, or roleName, but not both.'
+        })
+            .refine(options => [options.userId, options.userName].filter(x => x !== undefined).length === 1, {
+            error: 'Specify either userId, or userName, but not both.'
+        });
+    }
+    async commandAction(logger, args) {
+        const removeMember = async () => {
+            try {
+                let roleId = args.options.roleId;
+                let userId = args.options.userId;
+                if (args.options.roleName) {
+                    if (this.verbose) {
+                        await logger.logToStderr(`Retrieving Viva Engage role ID for role name '${args.options.roleName}'...`);
+                    }
+                    roleId = await vivaEngage.getRoleIdByName(args.options.roleName);
+                }
+                if (args.options.userName) {
+                    if (this.verbose) {
+                        await logger.logToStderr(`Retrieving Viva Engage user ID for user name '${args.options.userName}'...`);
+                    }
+                    userId = await entraUser.getUserIdByUpn(args.options.userName);
+                }
+                if (this.verbose) {
+                    await logger.logToStderr(`Removing user ${userId} from a Viva Engage role ${roleId}...`);
+                }
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/employeeExperience/roles/${roleId}/members/${userId}`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    }
+                };
+                await request.delete(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        };
+        if (args.options.force) {
+            await removeMember();
+        }
+        else {
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove user '${args.options.userId || args.options.userName}' from role '${args.options.roleId || args.options.roleName}'?` });
+            if (result) {
+                await removeMember();
+            }
+        }
+    }
+}
+export default new VivaEngageRoleMemberRemoveCommand();
+//# sourceMappingURL=engage-role-member-remove.js.map

package/dist/m365/viva/commands/engage/engage-search.js

@@ -85,7 +85,7 @@ class VivaEngageSearchCommand extends VivaEngageCommand {
             resultGroups.length === 20 ||
             resultTopics.length === 20;
         if (continueProcessing) {
-            await this.getAllItems(logger, args, ++page);
+            await this.getAllItems(logger, args, page + 1);
         }
     }
     async commandAction(logger, args) {

package/dist/m365/viva/commands.js

@@ -26,6 +26,7 @@ export default {
     ENGAGE_REPORT_GROUPSACTIVITYGROUPCOUNTS: `${prefix} engage report groupsactivitygroupcounts`,
     ENGAGE_ROLE_LIST: `${prefix} engage role list`,
     ENGAGE_ROLE_MEMBER_LIST: `${prefix} engage role member list`,
+    ENGAGE_ROLE_MEMBER_REMOVE: `${prefix} engage role member remove`,
     ENGAGE_SEARCH: `${prefix} engage search`,
     ENGAGE_USER_GET: `${prefix} engage user get`,
     ENGAGE_USER_LIST: `${prefix} engage user list`

package/dist/utils/odata.js

@@ -2,7 +2,6 @@ import request from "../request.js";
 /* eslint-enable no-redeclare */
 // eslint-disable-next-line no-redeclare
 async function getAllItems(param1, metadata) {
-    let items = [];
     const requestOptions = typeof param1 !== 'string' ? param1 : {
         url: param1,
         headers: {
@@ -12,7 +11,7 @@ async function getAllItems(param1, metadata) {
         responseType: 'json'
     };
     const res = await request.get(requestOptions);
-    items = res.value;
+    let items = res.value;
     const nextLink = res['@odata.nextLink'] ?? res.nextLink;
     if (nextLink) {
         const nextPageItems = await odata.getAllItems({ ...requestOptions, url: nextLink });

package/dist/utils/powerPlatform.js

@@ -5,7 +5,7 @@ import { odata } from "./odata.js";
 const powerPlatformResource = 'https://api.bap.microsoft.com';
 export const powerPlatform = {
     async getDynamicsInstanceApiUrl(environment, asAdmin) {
-        let url = '';
+        let url;
         if (asAdmin) {
             url = `${powerPlatformResource}/providers/Microsoft.BusinessAppPlatform/scopes/admin/environments/${formatting.encodeQueryParameter(environment)}`;
         }

package/dist/utils/spo.js

@@ -718,7 +718,7 @@ export const spo = {
             if (verbose) {
                 await logger.logToStderr(`Creating new site...`);
             }
-            let requestOptions = {};
+            let requestOptions;
             if (isTeamSite) {
                 requestOptions = {
                     url: `${spoUrl}/_api/GroupSiteManager/CreateGroupEx`,
@@ -1038,7 +1038,7 @@ export const spo = {
             }
             if (sharingCapability) {
                 const sharingCapabilityOption = SharingCapabilities[sharingCapability];
-                payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="SharingCapability"><Parameter Type="Enum">${sharingCapabilityOption}</Parameter></SetProperty>`);
+                payload.push(`<SetProperty Id="${propertyId}" ObjectPathId="5" Name="SharingCapability"><Parameter Type="Enum">${sharingCapabilityOption}</Parameter></SetProperty>`);
             }
             const pos = tenantId.indexOf('|') + 1;
             const requestOptionsUpdateProperties = {

package/dist/utils/urlUtil.js

@@ -85,23 +85,13 @@ export const urlUtil = {
      */
     getWebRelativePath(webUrl, folderUrl) {
         let webRelativePath = this.getUrlRelativePath(webUrl);
-        let folderWebRelativePath = '';
+        let folderWebRelativePath;
         // will be used to remove relative path from the folderRelativePath
         // in case the web relative url is included
         let relativePathToRemove = webRelativePath;
-        // add '/' at 0
-        if (webRelativePath[0] !== '/') {
-            webRelativePath = `/${webRelativePath}`;
-        }
-        else {
+        if (webRelativePath[0] === '/') {
             relativePathToRemove = webRelativePath.substring(1);
         }
-        // remove last '/' of webRelativePath
-        const webPathLastCharPos = webRelativePath.length - 1;
-        if (webRelativePath.length > 1 &&
-            webRelativePath[webPathLastCharPos] === '/') {
-            webRelativePath = webRelativePath.substring(0, webPathLastCharPos);
-        }
         // remove the web relative path if it is contained in the folder relative path
         const relativePathToRemoveIdx = folderUrl.toLowerCase().indexOf(relativePathToRemove.toLowerCase());
         if (relativePathToRemoveIdx > -1) {

package/docs/docs/cmd/adaptivecard/adaptivecard-send.mdx

@@ -1,4 +1,4 @@
-import Global from '/docs/cmd/_global.mdx';
+import Global from '../_global.mdx';
 
 # adaptivecard send
 

package/docs/docs/cmd/app/app-get.mdx

@@ -1,4 +1,4 @@
-import Global from '/docs/cmd/_global.mdx';
+import Global from '../_global.mdx';
 import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 

package/docs/docs/cmd/app/app-open.mdx

@@ -1,4 +1,4 @@
-import Global from '/docs/cmd/_global.mdx';
+import Global from '../_global.mdx';
 import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 

package/docs/docs/cmd/app/permission/permission-add.mdx

@@ -1,4 +1,4 @@
-import Global from '/docs/cmd/_global.mdx';
+import Global from '../../_global.mdx';
 
 # app permission add
 

package/docs/docs/cmd/app/permission/permission-list.mdx

@@ -1,4 +1,4 @@
-import Global from '/docs/cmd/_global.mdx';
+import Global from '../../_global.mdx';
 import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 

package/docs/docs/cmd/booking/business/business-get.mdx

@@ -1,4 +1,4 @@
-import Global from '/docs/cmd/_global.mdx';
+import Global from '../../_global.mdx';
 import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 

package/docs/docs/cmd/booking/business/business-list.mdx

@@ -1,4 +1,4 @@
-import Global from '/docs/cmd/_global.mdx';
+import Global from '../../_global.mdx';
 import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 

package/docs/docs/cmd/cli/app/app-add.mdx

@@ -1,4 +1,4 @@
-import Global from '/docs/cmd/_global.mdx';
+import Global from '../../_global.mdx';
 
 # cli app add
 

package/docs/docs/cmd/cli/app/app-reconsent.mdx

@@ -1,4 +1,4 @@
-import Global from '/docs/cmd/_global.mdx';
+import Global from '../../_global.mdx';
 import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 

package/docs/docs/cmd/cli/cli-consent.mdx

@@ -1,4 +1,4 @@
-import Global from '/docs/cmd/_global.mdx';
+import Global from '../_global.mdx';
 import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 

package/docs/docs/cmd/cli/cli-doctor.mdx

@@ -1,4 +1,4 @@
-import Global from '/docs/cmd/_global.mdx';
+import Global from '../_global.mdx';
 import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 

package/docs/docs/cmd/cli/cli-issue.mdx

@@ -1,4 +1,4 @@
-import Global from '/docs/cmd/_global.mdx';
+import Global from '../_global.mdx';
 import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 

package/docs/docs/cmd/cli/completion/completion-clink-update.mdx

@@ -1,4 +1,4 @@
-import Global from '/docs/cmd/_global.mdx';
+import Global from '../../_global.mdx';
 
 # cli completion clink update
 

package/docs/docs/cmd/cli/completion/completion-pwsh-setup.mdx

@@ -1,4 +1,4 @@
-import Global from '/docs/cmd/_global.mdx';
+import Global from '../../_global.mdx';
 
 # cli completion pwsh setup