@pnp/cli-microsoft365 7.0.0-beta.68abdfc → 7.0.0-beta.68fea7b

package/dist/m365/planner/commands/bucket/bucket-remove.js

@@ -105,13 +105,17 @@ class PlannerBucketRemoveCommand extends GraphCommand_1.default {
     }
     getPlanId(args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { planId, planTitle } = args.options;
+            const { planId, planTitle, rosterId } = args.options;
             if (planId) {
                 return planId;
             }
-            const groupId = yield this.getGroupId(args);
-            const plan = yield planner_1.planner.getPlanByTitle(planTitle, groupId);
-            return plan.id;
+            if (planTitle) {
+                const groupId = yield this.getGroupId(args);
+                const plan = yield planner_1.planner.getPlanByTitle(planTitle, groupId);
+                return plan.id;
+            }
+            const plans = yield planner_1.planner.getPlansByRosterId(rosterId);
+            return plans[0].id;
         });
     }
     getGroupId(args) {
@@ -132,6 +136,7 @@ _PlannerBucketRemoveCommand_instances = new WeakSet(), _PlannerBucketRemoveComma
             name: typeof args.options.name !== 'undefined',
             planId: typeof args.options.planId !== 'undefined',
             planTitle: typeof args.options.planTitle !== 'undefined',
+            rosterId: typeof args.options.rosterId !== 'undefined',
             ownerGroupId: typeof args.options.ownerGroupId !== 'undefined',
             ownerGroupName: typeof args.options.ownerGroupName !== 'undefined',
             force: args.options.force || false
@@ -146,6 +151,8 @@ _PlannerBucketRemoveCommand_instances = new WeakSet(), _PlannerBucketRemoveComma
         option: '--planId [planId]'
     }, {
         option: "--planTitle [planTitle]"
+    }, {
+        option: '--rosterId [rosterId]'
     }, {
         option: '--ownerGroupId [ownerGroupId]'
     }, {
@@ -156,38 +163,37 @@ _PlannerBucketRemoveCommand_instances = new WeakSet(), _PlannerBucketRemoveComma
 }, _PlannerBucketRemoveCommand_initValidators = function _PlannerBucketRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.id) {
-            if (args.options.planId || args.options.planTitle || args.options.ownerGroupId || args.options.ownerGroupName) {
-                return 'Don\'t specify planId, planTitle, ownerGroupId or ownerGroupName when using id';
+            if (args.options.planId || args.options.planTitle || args.options.rosterId || args.options.ownerGroupId || args.options.ownerGroupName) {
+                return 'Don\'t specify planId, planTitle, rosterId, ownerGroupId or ownerGroupName when using id';
             }
         }
         else {
-            if (!args.options.planId && !args.options.planTitle) {
-                return 'Specify either planId or planTitle when using name';
-            }
-            if (args.options.planId && args.options.planTitle) {
-                return 'Specify either planId or planTitle when using name but not both';
-            }
             if (args.options.planTitle) {
-                if (!args.options.ownerGroupId && !args.options.ownerGroupName) {
-                    return 'Specify either ownerGroupId or ownerGroupName when using planTitle';
-                }
-                if (args.options.ownerGroupId && args.options.ownerGroupName) {
-                    return 'Specify either ownerGroupId or ownerGroupName when using planTitle but not both';
-                }
                 if (args.options.ownerGroupId && !validation_1.validation.isValidGuid(args.options.ownerGroupId)) {
                     return `${args.options.ownerGroupId} is not a valid GUID`;
                 }
             }
-            else {
+            else if (args.options.planId) {
                 if (args.options.ownerGroupId || args.options.ownerGroupName) {
                     return 'Don\'t specify ownerGroupId or ownerGroupName when using planId';
                 }
             }
+            else {
+                if (args.options.ownerGroupId || args.options.ownerGroupName) {
+                    return 'Don\'t specify ownerGroupId or ownerGroupName when using rosterId';
+                }
+            }
         }
         return true;
     }));
 }, _PlannerBucketRemoveCommand_initOptionSets = function _PlannerBucketRemoveCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'name'] });
+    this.optionSets.push({ options: ['id', 'name'] }, {
+        options: ['planId', 'planTitle', 'rosterId'],
+        runsWhen: (args) => args.options.name !== undefined
+    }, {
+        options: ['ownerGroupId', 'ownerGroupName'],
+        runsWhen: (args) => args.options.planTitle !== undefined
+    });
 };
 module.exports = new PlannerBucketRemoveCommand();
 //# sourceMappingURL=bucket-remove.js.map

package/dist/m365/planner/commands/bucket/bucket-set.js

@@ -96,13 +96,17 @@ class PlannerBucketSetCommand extends GraphCommand_1.default {
     }
     getPlanId(args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { planId, planTitle } = args.options;
+            const { planId, planTitle, rosterId } = args.options;
             if (planId) {
                 return planId;
             }
-            const groupId = yield this.getGroupId(args);
-            const plan = yield planner_1.planner.getPlanByTitle(planTitle, groupId);
-            return plan.id;
+            if (planTitle) {
+                const groupId = yield this.getGroupId(args);
+                const plan = yield planner_1.planner.getPlanByTitle(planTitle, groupId);
+                return plan.id;
+            }
+            const plans = yield planner_1.planner.getPlansByRosterId(rosterId);
+            return plans[0].id;
         });
     }
     getGroupId(args) {
@@ -123,6 +127,7 @@ _PlannerBucketSetCommand_instances = new WeakSet(), _PlannerBucketSetCommand_ini
             name: typeof args.options.name !== 'undefined',
             planId: typeof args.options.planId !== 'undefined',
             planTitle: typeof args.options.planTitle !== 'undefined',
+            rosterId: typeof args.options.rosterId !== 'undefined',
             ownerGroupId: typeof args.options.ownerGroupId !== 'undefined',
             ownerGroupName: typeof args.options.ownerGroupName !== 'undefined',
             newName: typeof args.options.newName !== 'undefined',
@@ -138,6 +143,8 @@ _PlannerBucketSetCommand_instances = new WeakSet(), _PlannerBucketSetCommand_ini
         option: '--planId [planId]'
     }, {
         option: "--planTitle [planTitle]"
+    }, {
+        option: '--rosterId [rosterId]'
     }, {
         option: '--ownerGroupId [ownerGroupId]'
     }, {
@@ -149,33 +156,18 @@ _PlannerBucketSetCommand_instances = new WeakSet(), _PlannerBucketSetCommand_ini
     });
 }, _PlannerBucketSetCommand_initValidators = function _PlannerBucketSetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.id) {
-            if (args.options.planId || args.options.planTitle || args.options.ownerGroupId || args.options.ownerGroupName) {
-                return 'Don\'t specify planId, planTitle, ownerGroupId or ownerGroupName when using id';
-            }
+        if (args.options.id && (args.options.planId || args.options.planTitle || args.options.ownerGroupId || args.options.ownerGroupName || args.options.rosterId)) {
+            return 'Don\'t specify planId, planTitle, ownerGroupId, ownerGroupName or rosterId when using id';
         }
         if (args.options.name) {
-            if (!args.options.planId && !args.options.planTitle) {
-                return 'Specify either planId or planTitle when using name';
+            if (args.options.ownerGroupId && !validation_1.validation.isValidGuid(args.options.ownerGroupId)) {
+                return `${args.options.ownerGroupId} is not a valid GUID`;
             }
-            if (args.options.planId && args.options.planTitle) {
-                return 'Specify either planId or planTitle when using name but not both';
-            }
-            if (args.options.planTitle) {
-                if (!args.options.ownerGroupId && !args.options.ownerGroupName) {
-                    return 'Specify either ownerGroupId or ownerGroupName when using planTitle';
-                }
-                if (args.options.ownerGroupId && args.options.ownerGroupName) {
-                    return 'Specify either ownerGroupId or ownerGroupName when using planTitle but not both';
-                }
-                if (args.options.ownerGroupId && !validation_1.validation.isValidGuid(args.options.ownerGroupId)) {
-                    return `${args.options.ownerGroupId} is not a valid GUID`;
-                }
+            if (args.options.planId && (args.options.ownerGroupId || args.options.ownerGroupName)) {
+                return 'Don\'t specify ownerGroupId or ownerGroupName when using planId';
             }
-            if (args.options.planId) {
-                if (args.options.ownerGroupId || args.options.ownerGroupName) {
-                    return 'Don\'t specify ownerGroupId or ownerGroupName when using planId';
-                }
+            if (args.options.rosterId && (args.options.ownerGroupId || args.options.ownerGroupName)) {
+                return 'Don\'t specify ownerGroupId or ownerGroupName when using rosterId';
             }
         }
         if (!args.options.newName && !args.options.orderHint) {
@@ -184,7 +176,13 @@ _PlannerBucketSetCommand_instances = new WeakSet(), _PlannerBucketSetCommand_ini
         return true;
     }));
 }, _PlannerBucketSetCommand_initOptionSets = function _PlannerBucketSetCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'name'] });
+    this.optionSets.push({ options: ['id', 'name'] }, {
+        options: ['planId', 'planTitle', 'rosterId'],
+        runsWhen: (args) => args.options.name !== undefined
+    }, {
+        options: ['ownerGroupId', 'ownerGroupName'],
+        runsWhen: (args) => args.options.planTitle !== undefined
+    });
 };
 module.exports = new PlannerBucketSetCommand();
 //# sourceMappingURL=bucket-set.js.map

package/dist/m365/purview/commands/retentionevent/retentionevent-remove.js

@@ -36,23 +36,8 @@ class PurviewRetentionEventRemoveCommand extends GraphCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const removeRetentionEvent = () => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    const requestOptions = {
-                        url: `${this.resource}/v1.0/security/triggers/retentionEvents/${args.options.id}`,
-                        headers: {
-                            accept: 'application/json;odata.metadata=none'
-                        },
-                        responseType: 'json'
-                    };
-                    yield request_1.default.delete(requestOptions);
-                }
-                catch (err) {
-                    this.handleRejectedODataJsonPromise(err);
-                }
-            });
             if (args.options.force) {
-                yield removeRetentionEvent();
+                yield this.removeRetentionEvent(args.options);
             }
             else {
                 const result = yield Cli_1.Cli.prompt({
@@ -62,11 +47,28 @@ class PurviewRetentionEventRemoveCommand extends GraphCommand_1.default {
                     message: `Are you sure you want to remove the retention event ${args.options.id}?`
                 });
                 if (result.continue) {
-                    yield removeRetentionEvent();
+                    yield this.removeRetentionEvent(args.options);
                 }
             }
         });
     }
+    removeRetentionEvent(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const requestOptions = {
+                    url: `${this.resource}/beta/security/triggers/retentionEvents/${options.id}`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json'
+                };
+                yield request_1.default.delete(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
 }
 _PurviewRetentionEventRemoveCommand_instances = new WeakSet(), _PurviewRetentionEventRemoveCommand_initTelemetry = function _PurviewRetentionEventRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {

package/dist/m365/purview/commands/retentioneventtype/retentioneventtype-remove.js

@@ -36,23 +36,8 @@ class PurviewRetentionEventTypeRemoveCommand extends GraphCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const removeRetentionEventType = () => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    const requestOptions = {
-                        url: `${this.resource}/v1.0/security/triggerTypes/retentionEventTypes/${args.options.id}`,
-                        headers: {
-                            accept: 'application/json;odata.metadata=none'
-                        },
-                        responseType: 'json'
-                    };
-                    yield request_1.default.delete(requestOptions);
-                }
-                catch (err) {
-                    this.handleRejectedODataJsonPromise(err);
-                }
-            });
             if (args.options.force) {
-                yield removeRetentionEventType();
+                yield this.removeRetentionEventType(args.options);
             }
             else {
                 const result = yield Cli_1.Cli.prompt({
@@ -62,11 +47,28 @@ class PurviewRetentionEventTypeRemoveCommand extends GraphCommand_1.default {
                     message: `Are you sure you want to remove the retention event type with id ${args.options.id}?`
                 });
                 if (result.continue) {
-                    yield removeRetentionEventType();
+                    yield this.removeRetentionEventType(args.options);
                 }
             }
         });
     }
+    removeRetentionEventType(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/security/triggerTypes/retentionEventTypes/${options.id}`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json'
+                };
+                yield request_1.default.delete(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
 }
 _PurviewRetentionEventTypeRemoveCommand_instances = new WeakSet(), _PurviewRetentionEventTypeRemoveCommand_initTelemetry = function _PurviewRetentionEventTypeRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {

package/dist/m365/search/commands/externalconnection/externalconnection-remove.js

@@ -35,48 +35,31 @@ class SearchExternalConnectionRemoveCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _SearchExternalConnectionRemoveCommand_instances, "m", _SearchExternalConnectionRemoveCommand_initOptionSets).call(this);
     }
     getExternalConnectionId(args) {
-        if (args.options.id) {
-            return Promise.resolve(args.options.id);
-        }
-        const requestOptions = {
-            url: `${this.resource}/v1.0/external/connections?$filter=name eq '${formatting_1.formatting.encodeQueryParameter(args.options.name)}'&$select=id`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(requestOptions)
-            .then((res) => {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.id) {
+                return args.options.id;
+            }
+            const requestOptions = {
+                url: `${this.resource}/v1.0/external/connections?$filter=name eq '${formatting_1.formatting.encodeQueryParameter(args.options.name)}'&$select=id`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            const res = yield request_1.default.get(requestOptions);
             if (res.value.length === 1) {
-                return Promise.resolve(res.value[0].id);
+                return res.value[0].id;
             }
             if (res.value.length === 0) {
-                return Promise.reject(`The specified connection does not exist in Microsoft Search`);
+                throw `The specified connection does not exist in Microsoft Search`;
             }
-            return Promise.reject(`Multiple external connections with name ${args.options.name} found. Please disambiguate (IDs): ${res.value.map(x => x.id).join(', ')}`);
+            throw `Multiple external connections with name ${args.options.name} found. Please disambiguate (IDs): ${res.value.map(x => x.id).join(', ')}`;
         });
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const removeExternalConnection = () => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    const externalConnectionId = yield this.getExternalConnectionId(args);
-                    const requestOptions = {
-                        url: `${this.resource}/v1.0/external/connections/${formatting_1.formatting.encodeQueryParameter(externalConnectionId)}`,
-                        headers: {
-                            accept: 'application/json;odata.metadata=none'
-                        },
-                        responseType: 'json'
-                    };
-                    yield request_1.default.delete(requestOptions);
-                }
-                catch (err) {
-                    this.handleRejectedODataJsonPromise(err);
-                }
-            });
             if (args.options.force) {
-                yield removeExternalConnection();
+                yield this.removeExternalConnection(args);
             }
             else {
                 const result = yield Cli_1.Cli.prompt({
@@ -86,11 +69,29 @@ class SearchExternalConnectionRemoveCommand extends GraphCommand_1.default {
                     message: `Are you sure you want to remove the external connection '${args.options.id || args.options.name}'?`
                 });
                 if (result.continue) {
-                    yield removeExternalConnection();
+                    yield this.removeExternalConnection(args);
                 }
             }
         });
     }
+    removeExternalConnection(args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const externalConnectionId = yield this.getExternalConnectionId(args);
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/external/connections/${formatting_1.formatting.encodeQueryParameter(externalConnectionId)}`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json'
+                };
+                yield request_1.default.delete(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
 }
 _SearchExternalConnectionRemoveCommand_instances = new WeakSet(), _SearchExternalConnectionRemoveCommand_initTelemetry = function _SearchExternalConnectionRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {

package/dist/m365/spfx/commands/project/project-externalize/rules/DynamicRule.js

@@ -1,4 +1,13 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DynamicRule = void 0;
 const fs = require("fs");
@@ -12,36 +21,32 @@ class DynamicRule extends BasicDependencyRule_1.BasicDependencyRule {
         this.fileVariationSuffixes = ['.min', '.bundle', '-min', '.bundle.min'];
     }
     visit(project) {
-        if (!project.packageJson ||
-            !project.packageJson.dependencies) {
-            return Promise.resolve({ entries: [], suggestions: [] });
-        }
-        const validPackageNames = Object.getOwnPropertyNames(project.packageJson.dependencies)
-            .filter(x => this.restrictedNamespaces.map(y => x.indexOf(y) === -1).reduce((y, z) => y && z))
-            .filter(x => this.restrictedModules.indexOf(x) === -1);
-        return Promise
-            .all(validPackageNames.map((x) => this.getExternalEntryForPackage(x, project)))
-            .then((res) => {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!project.packageJson || !project.packageJson.dependencies) {
+                return { entries: [], suggestions: [] };
+            }
+            const validPackageNames = Object.getOwnPropertyNames(project.packageJson.dependencies)
+                .filter(x => this.restrictedNamespaces.map(y => x.indexOf(y) === -1).reduce((y, z) => y && z))
+                .filter(x => this.restrictedModules.indexOf(x) === -1);
+            const res = yield Promise.all(validPackageNames.map((x) => this.getExternalEntryForPackage(x, project)));
             return {
-                entries: res
-                    .filter(x => x !== undefined)
-                    .map(x => x),
+                entries: res.filter(x => x !== undefined),
                 suggestions: []
             };
         });
     }
     getExternalEntryForPackage(packageName, project) {
-        const version = project.packageJson.dependencies[packageName];
-        const filesPaths = this.getFilePath(packageName).map(x => this.cleanFilePath(x));
-        if (!version || filesPaths.length === 0) {
-            return Promise.resolve(undefined);
-        }
-        const filesPathsVariations = filesPaths
-            .map(x => this.fileVariationSuffixes.map(y => x.indexOf(y) === -1 ? x.replace('.js', `${y}.js`) : x))
-            .reduce((x, y) => [...x, ...y]);
-        const pathsAndVariations = [...filesPaths, ...filesPathsVariations];
-        return Promise.all(pathsAndVariations.map(x => this.getExternalEntryForFilePath(x, packageName, version)))
-            .then((externalizeEntryCandidates) => {
+        return __awaiter(this, void 0, void 0, function* () {
+            const version = project.packageJson.dependencies[packageName];
+            const filesPaths = this.getFilePath(packageName).map(x => this.cleanFilePath(x));
+            if (!version || filesPaths.length === 0) {
+                return undefined;
+            }
+            const filesPathsVariations = filesPaths
+                .map(x => this.fileVariationSuffixes.map(y => x.indexOf(y) === -1 ? x.replace('.js', `${y}.js`) : x))
+                .reduce((x, y) => [...x, ...y]);
+            const pathsAndVariations = [...filesPaths, ...filesPathsVariations];
+            const externalizeEntryCandidates = yield Promise.all(pathsAndVariations.map(x => this.getExternalEntryForFilePath(x, packageName, version)));
             const dExternalizeEntryCandidates = externalizeEntryCandidates.filter(x => x !== undefined);
             const minifiedModule = dExternalizeEntryCandidates.find(x => !x.globalName && this.pathContainsMinifySuffix(x.path));
             const minifiedNonModule = dExternalizeEntryCandidates.find(x => x.globalName && this.pathContainsMinifySuffix(x.path));
@@ -57,31 +62,29 @@ class DynamicRule extends BasicDependencyRule_1.BasicDependencyRule {
             .filter(y => y > -1).length > 0;
     }
     getExternalEntryForFilePath(filePath, packageName, version) {
-        const url = this.getFileUrl(packageName, version, filePath);
-        return this
-            .testUrl(url)
-            .then((testResult) => {
+        return __awaiter(this, void 0, void 0, function* () {
+            const url = this.getFileUrl(packageName, version, filePath);
+            const testResult = yield this.testUrl(url);
             if (!testResult) {
-                return Promise.resolve(undefined);
+                return undefined;
+            }
+            const moduleInfo = yield this.getModuleType(url);
+            if (moduleInfo.scriptType === 'CommonJs') {
+                return undefined; //browsers don't support those module types without an additional library
+            }
+            else if (moduleInfo.scriptType === 'ES2015' || moduleInfo.scriptType === 'AMD') {
+                return {
+                    key: packageName,
+                    path: url
+                };
+            }
+            else { //TODO for non-module and UMD we should technically add dependencies as well
+                return {
+                    key: packageName,
+                    path: url,
+                    globalName: moduleInfo.exports && moduleInfo.exports.length > 0 ? moduleInfo.exports[0] : packageName // examples where this is not good https://unpkg.com/@pnp/polyfill-ie11@^1.0.2/dist/index.js https://unpkg.com/moment-timezone@^0.5.27/builds/moment-timezone-with-data.js
+                };
             }
-            return this.getModuleType(url).then((moduleInfo) => {
-                if (moduleInfo.scriptType === 'CommonJs') {
-                    return Promise.resolve(undefined); //browsers don't support those module types without an additional library
-                }
-                else if (moduleInfo.scriptType === 'ES2015' || moduleInfo.scriptType === 'AMD') {
-                    return {
-                        key: packageName,
-                        path: url
-                    };
-                }
-                else { //TODO for non-module and UMD we should technically add dependencies as well
-                    return {
-                        key: packageName,
-                        path: url,
-                        globalName: moduleInfo.exports && moduleInfo.exports.length > 0 ? moduleInfo.exports[0] : packageName // examples where this is not good https://unpkg.com/@pnp/polyfill-ie11@^1.0.2/dist/index.js https://unpkg.com/moment-timezone@^0.5.27/builds/moment-timezone-with-data.js
-                    };
-                }
-            });
         });
     }
     getModuleType(url) {
@@ -101,10 +104,15 @@ class DynamicRule extends BasicDependencyRule_1.BasicDependencyRule {
         return `https://unpkg.com/${packageName}@${version}/${filePath}`;
     }
     testUrl(url) {
-        return request_1.default
-            .head({ url: url, headers: { 'x-anonymous': 'true' } })
-            .then(() => true)
-            .catch(() => false);
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                yield request_1.default.head({ url: url, headers: { 'x-anonymous': 'true' } });
+                return true;
+            }
+            catch (_a) {
+                return false;
+            }
+        });
     }
     getFilePath(packageName) {
         const packageJsonFilePath = `node_modules/${packageName}/package.json`;

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

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