@pnp/cli-microsoft365 6.9.0-beta.f6054b4 → 6.10.0-beta.81a81c0

package/dist/m365/spo/commands/listitem/listitem-roleinheritance-break.js

@@ -43,40 +43,8 @@ class SpoListItemRoleInheritanceBreakCommand extends SpoCommand_1.default {
             if (this.verbose) {
                 logger.logToStderr(`Breaking role inheritance of list item in site at ${args.options.webUrl}...`);
             }
-            const breakListItemRoleInheritance = () => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    let requestUrl = `${args.options.webUrl}/_api/web`;
-                    if (args.options.listId) {
-                        requestUrl += `/lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')`;
-                    }
-                    else if (args.options.listTitle) {
-                        requestUrl += `/lists/getbytitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
-                    }
-                    else if (args.options.listUrl) {
-                        const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
-                        requestUrl += `/GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')`;
-                    }
-                    let keepExistingPermissions = true;
-                    if (args.options.clearExistingPermissions) {
-                        keepExistingPermissions = !args.options.clearExistingPermissions;
-                    }
-                    const requestOptions = {
-                        url: `${requestUrl}/items(${args.options.listItemId})/breakroleinheritance(${keepExistingPermissions})`,
-                        method: 'POST',
-                        headers: {
-                            'accept': 'application/json;odata=nometadata',
-                            'content-type': 'application/json'
-                        },
-                        responseType: 'json'
-                    };
-                    yield request_1.default.post(requestOptions);
-                }
-                catch (err) {
-                    this.handleRejectedODataJsonPromise(err);
-                }
-            });
             if (args.options.confirm) {
-                yield breakListItemRoleInheritance();
+                yield this.breakListItemRoleInheritance(args.options);
             }
             else {
                 const result = yield Cli_1.Cli.prompt({
@@ -86,11 +54,45 @@ class SpoListItemRoleInheritanceBreakCommand extends SpoCommand_1.default {
                     message: `Are you sure you want to break the role inheritance of ${args.options.listItemId} in list ${(_a = args.options.listId) !== null && _a !== void 0 ? _a : args.options.listTitle}?`
                 });
                 if (result.continue) {
-                    yield breakListItemRoleInheritance();
+                    yield this.breakListItemRoleInheritance(args.options);
                 }
             }
         });
     }
+    breakListItemRoleInheritance(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                let requestUrl = `${options.webUrl}/_api/web`;
+                if (options.listId) {
+                    requestUrl += `/lists(guid'${formatting_1.formatting.encodeQueryParameter(options.listId)}')`;
+                }
+                else if (options.listTitle) {
+                    requestUrl += `/lists/getbytitle('${formatting_1.formatting.encodeQueryParameter(options.listTitle)}')`;
+                }
+                else if (options.listUrl) {
+                    const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(options.webUrl, options.listUrl);
+                    requestUrl += `/GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')`;
+                }
+                let keepExistingPermissions = true;
+                if (options.clearExistingPermissions) {
+                    keepExistingPermissions = !options.clearExistingPermissions;
+                }
+                const requestOptions = {
+                    url: `${requestUrl}/items(${options.listItemId})/breakroleinheritance(${keepExistingPermissions})`,
+                    method: 'POST',
+                    headers: {
+                        'accept': 'application/json;odata=nometadata',
+                        'content-type': 'application/json'
+                    },
+                    responseType: 'json'
+                };
+                yield request_1.default.post(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
 }
 _SpoListItemRoleInheritanceBreakCommand_instances = new WeakSet(), _SpoListItemRoleInheritanceBreakCommand_initTelemetry = function _SpoListItemRoleInheritanceBreakCommand_initTelemetry() {
     this.telemetry.push((args) => {

package/dist/m365/spo/commands/listitem/listitem-roleinheritance-reset.js

@@ -43,36 +43,8 @@ class SpoListItemRoleInheritanceResetCommand extends SpoCommand_1.default {
             if (this.verbose) {
                 logger.logToStderr(`Restore role inheritance of list item in site at ${args.options.webUrl}...`);
             }
-            const resetListItemRoleInheritance = () => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    let requestUrl = `${args.options.webUrl}/_api/web`;
-                    if (args.options.listId) {
-                        requestUrl += `/lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')`;
-                    }
-                    else if (args.options.listTitle) {
-                        requestUrl += `/lists/getbytitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
-                    }
-                    else if (args.options.listUrl) {
-                        const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
-                        requestUrl += `/GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')`;
-                    }
-                    const requestOptions = {
-                        url: `${requestUrl}/items(${args.options.listItemId})/resetroleinheritance`,
-                        method: 'POST',
-                        headers: {
-                            'accept': 'application/json;odata=nometadata',
-                            'content-type': 'application/json'
-                        },
-                        responseType: 'json'
-                    };
-                    yield request_1.default.post(requestOptions);
-                }
-                catch (err) {
-                    this.handleRejectedODataJsonPromise(err);
-                }
-            });
             if (args.options.confirm) {
-                yield resetListItemRoleInheritance();
+                yield this.resetListItemRoleInheritance(args.options);
             }
             else {
                 const result = yield Cli_1.Cli.prompt({
@@ -82,8 +54,38 @@ class SpoListItemRoleInheritanceResetCommand extends SpoCommand_1.default {
                     message: `Are you sure you want to reset the role inheritance of ${args.options.listItemId} in list ${(_a = args.options.listId) !== null && _a !== void 0 ? _a : args.options.listTitle}?`
                 });
                 if (result.continue) {
-                    yield resetListItemRoleInheritance();
+                    yield this.resetListItemRoleInheritance(args.options);
+                }
+            }
+        });
+    }
+    resetListItemRoleInheritance(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                let requestUrl = `${options.webUrl}/_api/web`;
+                if (options.listId) {
+                    requestUrl += `/lists(guid'${formatting_1.formatting.encodeQueryParameter(options.listId)}')`;
+                }
+                else if (options.listTitle) {
+                    requestUrl += `/lists/getbytitle('${formatting_1.formatting.encodeQueryParameter(options.listTitle)}')`;
                 }
+                else if (options.listUrl) {
+                    const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(options.webUrl, options.listUrl);
+                    requestUrl += `/GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')`;
+                }
+                const requestOptions = {
+                    url: `${requestUrl}/items(${options.listItemId})/resetroleinheritance`,
+                    method: 'POST',
+                    headers: {
+                        'accept': 'application/json;odata=nometadata',
+                        'content-type': 'application/json'
+                    },
+                    responseType: 'json'
+                };
+                yield request_1.default.post(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
         });
     }

package/dist/m365/spo/commands/navigation/navigation-node-remove.js

@@ -37,28 +37,8 @@ class SpoNavigationNodeRemoveCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const removeNode = () => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    const res = yield spo_1.spo.getRequestDigest(args.options.webUrl);
-                    if (this.verbose) {
-                        logger.logToStderr(`Removing navigation node...`);
-                    }
-                    const requestOptions = {
-                        url: `${args.options.webUrl}/_api/web/navigation/${args.options.location.toLowerCase()}/getbyid(${args.options.id})`,
-                        headers: {
-                            accept: 'application/json;odata=nometadata',
-                            'X-RequestDigest': res.FormDigestValue
-                        },
-                        responseType: 'json'
-                    };
-                    yield request_1.default.delete(requestOptions);
-                }
-                catch (err) {
-                    this.handleRejectedODataJsonPromise(err);
-                }
-            });
             if (args.options.confirm) {
-                yield removeNode();
+                yield this.removeNode(logger, args.options);
             }
             else {
                 const result = yield Cli_1.Cli.prompt({
@@ -68,8 +48,30 @@ class SpoNavigationNodeRemoveCommand extends SpoCommand_1.default {
                     message: `Are you sure you want to remove the node ${args.options.id} from the navigation?`
                 });
                 if (result.continue) {
-                    yield removeNode();
+                    yield this.removeNode(logger, args.options);
+                }
+            }
+        });
+    }
+    removeNode(logger, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const res = yield spo_1.spo.getRequestDigest(options.webUrl);
+                if (this.verbose) {
+                    logger.logToStderr(`Removing navigation node...`);
                 }
+                const requestOptions = {
+                    url: `${options.webUrl}/_api/web/navigation/${options.location.toLowerCase()}/getbyid(${options.id})`,
+                    headers: {
+                        accept: 'application/json;odata=nometadata',
+                        'X-RequestDigest': res.FormDigestValue
+                    },
+                    responseType: 'json'
+                };
+                yield request_1.default.delete(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
         });
     }

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

@@ -35,33 +35,8 @@ class SpoOrgAssetsLibraryRemoveCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const removeLibrary = () => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    const spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
-                    const reqDigest = yield spo_1.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_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="9" ObjectPathId="8" /><Method Name="RemoveFromOrgAssets" Id="10" ObjectPathId="8"><Parameters><Parameter Type="String">${args.options.libraryUrl}</Parameter><Parameter Type="Guid">{00000000-0000-0000-0000-000000000000}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="8" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
-                    };
-                    const res = yield request_1.default.post(requestOptions);
-                    const json = JSON.parse(res);
-                    const response = json[0];
-                    if (response.ErrorInfo) {
-                        throw response.ErrorInfo.ErrorMessage;
-                    }
-                    else {
-                        logger.log(json[json.length - 1]);
-                    }
-                }
-                catch (err) {
-                    this.handleRejectedPromise(err);
-                }
-            });
             if (args.options.confirm) {
-                yield removeLibrary();
+                yield this.removeLibrary(logger, args.options.libraryUrl);
             }
             else {
                 const result = yield Cli_1.Cli.prompt({
@@ -71,11 +46,38 @@ class SpoOrgAssetsLibraryRemoveCommand extends SpoCommand_1.default {
                     message: `Are you sure you want to remove the library ${args.options.libraryUrl} as a central location for organization assets?`
                 });
                 if (result.continue) {
-                    yield removeLibrary();
+                    yield this.removeLibrary(logger, args.options.libraryUrl);
                 }
             }
         });
     }
+    removeLibrary(logger, libraryUrl) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
+                const reqDigest = yield spo_1.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_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="9" ObjectPathId="8" /><Method Name="RemoveFromOrgAssets" Id="10" ObjectPathId="8"><Parameters><Parameter Type="String">${libraryUrl}</Parameter><Parameter Type="Guid">{00000000-0000-0000-0000-000000000000}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="8" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
+                };
+                const res = yield request_1.default.post(requestOptions);
+                const json = JSON.parse(res);
+                const response = json[0];
+                if (response.ErrorInfo) {
+                    throw response.ErrorInfo.ErrorMessage;
+                }
+                else {
+                    logger.log(json[json.length - 1]);
+                }
+            }
+            catch (err) {
+                this.handleRejectedPromise(err);
+            }
+        });
+    }
 }
 _SpoOrgAssetsLibraryRemoveCommand_instances = new WeakSet(), _SpoOrgAssetsLibraryRemoveCommand_initOptions = function _SpoOrgAssetsLibraryRemoveCommand_initOptions() {
     this.options.unshift({

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

@@ -39,30 +39,8 @@ class SpoOrgNewsSiteRemoveCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const removeOrgNewsSite = () => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    const spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
-                    const reqDigest = yield spo_1.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_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="64" ObjectPathId="63" /><Method Name="RemoveOrgNewsSite" Id="65" ObjectPathId="63"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.url)}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="63" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
-                    };
-                    const res = yield request_1.default.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.confirm) {
-                yield removeOrgNewsSite();
+                yield this.removeOrgNewsSite(logger, args.options.url);
             }
             else {
                 const result = yield Cli_1.Cli.prompt({
@@ -72,9 +50,33 @@ class SpoOrgNewsSiteRemoveCommand extends SpoCommand_1.default {
                     message: `Are you sure you want to remove ${args.options.url} from the list of organizational news sites?`
                 });
                 if (result.continue) {
-                    yield removeOrgNewsSite();
+                    yield this.removeOrgNewsSite(logger, args.options.url);
+                }
+            }
+        });
+    }
+    removeOrgNewsSite(logger, url) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
+                const reqDigest = yield spo_1.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_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="64" ObjectPathId="63" /><Method Name="RemoveOrgNewsSite" Id="65" ObjectPathId="63"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(url)}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="63" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
+                };
+                const res = yield request_1.default.post(requestOptions);
+                const json = JSON.parse(res);
+                const response = json[0];
+                if (response.ErrorInfo) {
+                    throw response.ErrorInfo.ErrorMessage;
                 }
             }
+            catch (err) {
+                this.handleRejectedPromise(err);
+            }
         });
     }
 }

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

@@ -120,7 +120,7 @@ class SpoPageClientSideWebPartAddCommand extends SpoCommand_1.default {
                 // get section number. if not specified, get the last section
                 const section = args.options.section || zoneIndices.length;
                 if (section > zoneIndices.length) {
-                    return Promise.reject(`Invalid section '${section}'`);
+                    throw `Invalid section '${section}'`;
                 }
                 // zoneIndex that represents the section where the web part should be added
                 const zoneIndex = zoneIndices[section - 1];
@@ -132,7 +132,7 @@ class SpoPageClientSideWebPartAddCommand extends SpoCommand_1.default {
                     c.position.zoneIndex === zoneIndex &&
                     c.position.sectionIndex === column);
                 if (controlIndex === -1) {
-                    return Promise.reject(`Invalid column '${args.options.column}'`);
+                    throw `Invalid column '${args.options.column}'`;
                 }
                 // get the first control that matches section and column
                 // if it's a empty column, it should be replaced with the web part
@@ -235,7 +235,7 @@ class SpoPageClientSideWebPartAddCommand extends SpoCommand_1.default {
         });
     }
     getWebPart(logger, args) {
-        return new Promise((resolve, reject) => {
+        return __awaiter(this, void 0, void 0, function* () {
             const standardWebPart = args.options.standardWebPart;
             const webPartId = standardWebPart
                 ? StandardWebPartTypes_1.StandardWebPartUtils.getWebPartId(standardWebPart)
@@ -251,43 +251,37 @@ class SpoPageClientSideWebPartAddCommand extends SpoCommand_1.default {
                 },
                 responseType: 'json'
             };
-            request_1.default
-                .get(requestOptions)
-                .then((res) => {
-                const webPartDefinition = res.value.filter((c) => c.Id.toLowerCase() === webPartId.toLowerCase() || c.Id.toLowerCase() === `{${webPartId.toLowerCase()}}`);
-                if (webPartDefinition.length === 0) {
-                    reject(new Error(`There is no available WebPart with Id ${webPartId}.`));
-                    return;
-                }
-                if (this.debug) {
-                    logger.logToStderr('WebPart definition:');
-                    logger.logToStderr(webPartDefinition);
-                    logger.logToStderr('');
-                }
-                if (this.verbose) {
-                    logger.logToStderr(`Creating instance from definition of WebPart ${webPartId}...`);
-                }
-                const component = webPartDefinition[0];
-                const id = (0, uuid_1.v4)();
-                const componentId = component.Id.replace(/^\{|\}$/g, "").toLowerCase();
-                const manifest = JSON.parse(component.Manifest);
-                const preconfiguredEntries = manifest.preconfiguredEntries[0];
-                const webPart = {
-                    id,
-                    webPartData: {
-                        dataVersion: "1.0",
-                        description: preconfiguredEntries.description.default,
-                        id: componentId,
-                        instanceId: id,
-                        properties: preconfiguredEntries.properties,
-                        title: preconfiguredEntries.title.default
-                    },
-                    webPartId: componentId
-                };
-                resolve(webPart);
-            }, (error) => {
-                reject(error);
-            });
+            const response = yield request_1.default.get(requestOptions);
+            const webPartDefinition = response.value.filter((c) => c.Id.toLowerCase() === webPartId.toLowerCase() || c.Id.toLowerCase() === `{${webPartId.toLowerCase()}}`);
+            if (webPartDefinition.length === 0) {
+                throw new Error(`There is no available WebPart with Id ${webPartId}.`);
+            }
+            if (this.debug) {
+                logger.logToStderr('WebPart definition:');
+                logger.logToStderr(webPartDefinition);
+                logger.logToStderr('');
+            }
+            if (this.verbose) {
+                logger.logToStderr(`Creating instance from definition of WebPart ${webPartId}...`);
+            }
+            const component = webPartDefinition[0];
+            const id = (0, uuid_1.v4)();
+            const componentId = component.Id.replace(/^\{|\}$/g, "").toLowerCase();
+            const manifest = JSON.parse(component.Manifest);
+            const preconfiguredEntries = manifest.preconfiguredEntries[0];
+            const webPart = {
+                id,
+                webPartData: {
+                    dataVersion: "1.0",
+                    description: preconfiguredEntries.description.default,
+                    id: componentId,
+                    instanceId: id,
+                    properties: preconfiguredEntries.properties,
+                    title: preconfiguredEntries.title.default
+                },
+                webPartId: componentId
+            };
+            return webPart;
         });
     }
     setWebPartProperties(webPart, logger, args) {

package/dist/m365/spo/commands/sitedesign/sitedesign-task-remove.js

@@ -37,27 +37,8 @@ class SpoSiteDesignTaskRemoveCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const removeSiteDesignTask = () => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    const spoUrl = yield spo_1.spo.getSpoUrl(logger, this.debug);
-                    const requestOptions = {
-                        url: `${spoUrl}/_api/Microsoft.Sharepoint.Utilities.WebTemplateExtensions.SiteScriptUtility.RemoveSiteDesignTask`,
-                        headers: {
-                            accept: 'application/json;odata=nometadata'
-                        },
-                        data: {
-                            taskId: args.options.id
-                        },
-                        responseType: 'json'
-                    };
-                    yield request_1.default.post(requestOptions);
-                }
-                catch (err) {
-                    this.handleRejectedODataJsonPromise(err);
-                }
-            });
             if (args.options.confirm) {
-                yield removeSiteDesignTask();
+                yield this.removeSiteDesignTask(logger, args.options.id);
             }
             else {
                 const result = yield Cli_1.Cli.prompt({
@@ -67,11 +48,32 @@ class SpoSiteDesignTaskRemoveCommand extends SpoCommand_1.default {
                     message: `Are you sure you want to remove the site design task ${args.options.id}?`
                 });
                 if (result.continue) {
-                    yield removeSiteDesignTask();
+                    yield this.removeSiteDesignTask(logger, args.options.id);
                 }
             }
         });
     }
+    removeSiteDesignTask(logger, id) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const spoUrl = yield spo_1.spo.getSpoUrl(logger, this.debug);
+                const requestOptions = {
+                    url: `${spoUrl}/_api/Microsoft.Sharepoint.Utilities.WebTemplateExtensions.SiteScriptUtility.RemoveSiteDesignTask`,
+                    headers: {
+                        accept: 'application/json;odata=nometadata'
+                    },
+                    data: {
+                        taskId: id
+                    },
+                    responseType: 'json'
+                };
+                yield request_1.default.post(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
 }
 _SpoSiteDesignTaskRemoveCommand_instances = new WeakSet(), _SpoSiteDesignTaskRemoveCommand_initTelemetry = function _SpoSiteDesignTaskRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {

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

@@ -37,28 +37,8 @@ class SpoSiteScriptRemoveCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const removeSiteScript = () => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    const spoUrl = yield spo_1.spo.getSpoUrl(logger, this.debug);
-                    const formDigest = yield spo_1.spo.getRequestDigest(spoUrl);
-                    const requestOptions = {
-                        url: `${spoUrl}/_api/Microsoft.Sharepoint.Utilities.WebTemplateExtensions.SiteScriptUtility.DeleteSiteScript`,
-                        headers: {
-                            'X-RequestDigest': formDigest.FormDigestValue,
-                            'content-type': 'application/json;charset=utf-8',
-                            accept: 'application/json;odata=nometadata'
-                        },
-                        data: { id: args.options.id },
-                        responseType: 'json'
-                    };
-                    yield request_1.default.post(requestOptions);
-                }
-                catch (err) {
-                    this.handleRejectedODataJsonPromise(err);
-                }
-            });
             if (args.options.confirm) {
-                yield removeSiteScript();
+                yield this.removeSiteScript(logger, args.options.id);
             }
             else {
                 const result = yield Cli_1.Cli.prompt({
@@ -68,11 +48,33 @@ class SpoSiteScriptRemoveCommand extends SpoCommand_1.default {
                     message: `Are you sure you want to remove the site script ${args.options.id}?`
                 });
                 if (result.continue) {
-                    yield removeSiteScript();
+                    yield this.removeSiteScript(logger, args.options.id);
                 }
             }
         });
     }
+    removeSiteScript(logger, id) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const spoUrl = yield spo_1.spo.getSpoUrl(logger, this.debug);
+                const formDigest = yield spo_1.spo.getRequestDigest(spoUrl);
+                const requestOptions = {
+                    url: `${spoUrl}/_api/Microsoft.Sharepoint.Utilities.WebTemplateExtensions.SiteScriptUtility.DeleteSiteScript`,
+                    headers: {
+                        'X-RequestDigest': formDigest.FormDigestValue,
+                        'content-type': 'application/json;charset=utf-8',
+                        accept: 'application/json;odata=nometadata'
+                    },
+                    data: { id: id },
+                    responseType: 'json'
+                };
+                yield request_1.default.post(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
 }
 _SpoSiteScriptRemoveCommand_instances = new WeakSet(), _SpoSiteScriptRemoveCommand_initTelemetry = function _SpoSiteScriptRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {

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

@@ -60,7 +60,7 @@ class SpoSearchCommand extends SpoCommand_1.default {
         });
     }
     executeSearchQuery(logger, args, webUrl, resultSet, startRow) {
-        return (() => {
+        return __awaiter(this, void 0, void 0, function* () {
             const requestUrl = this.getRequestUrl(webUrl, logger, args, startRow);
             const requestOptions = {
                 url: requestUrl,
@@ -69,22 +69,14 @@ class SpoSearchCommand extends SpoCommand_1.default {
                 },
                 responseType: 'json'
             };
-            return request_1.default.get(requestOptions);
-        })()
-            .then((searchResult) => {
+            const searchResult = yield request_1.default.get(requestOptions);
             resultSet.push(searchResult);
-            return searchResult;
-        })
-            .then((searchResult) => {
-            if (args.options.allResults) {
-                if (startRow + searchResult.PrimaryQueryResult.RelevantResults.RowCount < searchResult.PrimaryQueryResult.RelevantResults.TotalRows) {
-                    const nextStartRow = startRow + searchResult.PrimaryQueryResult.RelevantResults.RowCount;
-                    return this.executeSearchQuery(logger, args, webUrl, resultSet, nextStartRow);
-                }
+            if (args.options.allResults && startRow + searchResult.PrimaryQueryResult.RelevantResults.RowCount < searchResult.PrimaryQueryResult.RelevantResults.TotalRows) {
+                const nextStartRow = startRow + searchResult.PrimaryQueryResult.RelevantResults.RowCount;
+                return this.executeSearchQuery(logger, args, webUrl, resultSet, nextStartRow);
             }
-            return new Promise((resolve) => { resolve(resultSet); });
-        })
-            .then(() => resultSet);
+            return resultSet;
+        });
     }
     getRequestUrl(webUrl, logger, args, startRow) {
         // get the list of selected properties