@pnp/cli-microsoft365 4.3.0-beta.014ebf5 → 4.3.0-beta.a75b394

package/dist/m365/planner/commands/task/task-add.js

@@ -0,0 +1,288 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const request_1 = require("../../../../request");
+const Utils_1 = require("../../../../Utils");
+const GraphCommand_1 = require("../../../base/GraphCommand");
+const commands_1 = require("../../commands");
+class PlannerTaskAddCommand extends GraphCommand_1.default {
+    get name() {
+        return commands_1.default.TASK_ADD;
+    }
+    get description() {
+        return 'Adds a new Microsoft Planner Task';
+    }
+    getTelemetryProperties(args) {
+        const telemetryProps = super.getTelemetryProperties(args);
+        telemetryProps.planId = typeof args.options.planId !== 'undefined';
+        telemetryProps.planName = typeof args.options.planName !== 'undefined';
+        telemetryProps.ownerGroupId = typeof args.options.ownerGroupId !== 'undefined';
+        telemetryProps.ownerGroupName = typeof args.options.ownerGroupName !== 'undefined';
+        telemetryProps.bucketId = typeof args.options.bucketId !== 'undefined';
+        telemetryProps.bucketName = typeof args.options.bucketName !== 'undefined';
+        telemetryProps.startDateTime = typeof args.options.startDateTime !== 'undefined';
+        telemetryProps.dueDateTime = typeof args.options.dueDateTime !== 'undefined';
+        telemetryProps.percentComplete = typeof args.options.percentComplete !== 'undefined';
+        telemetryProps.assignedToUserIds = typeof args.options.assignedToUserIds !== 'undefined';
+        telemetryProps.assignedToUserNames = typeof args.options.assignedToUserNames !== 'undefined';
+        telemetryProps.description = typeof args.options.description !== 'undefined';
+        telemetryProps.orderHint = typeof args.options.orderHint !== 'undefined';
+        return telemetryProps;
+    }
+    commandAction(logger, args, cb) {
+        this
+            .getPlanId(args)
+            .then(planId => {
+            this.planId = planId;
+            return this.getBucketId(args, planId);
+        })
+            .then(bucketId => {
+            this.bucketId = bucketId;
+            return this.generateUserAssignments(args);
+        })
+            .then(assignments => {
+            const requestOptions = {
+                url: `${this.resource}/v1.0/planner/tasks`,
+                headers: {
+                    'accept': 'application/json;odata.metadata=none'
+                },
+                responseType: 'json',
+                data: {
+                    planId: this.planId,
+                    bucketId: this.bucketId,
+                    title: args.options.title,
+                    startDateTime: args.options.startDateTime,
+                    dueDateTime: args.options.dueDateTime,
+                    percentComplete: args.options.percentComplete,
+                    assignments: assignments,
+                    orderHint: args.options.orderHint
+                }
+            };
+            return request_1.default.post(requestOptions);
+        })
+            .then(newTask => this.updateTaskDetails(args.options, newTask))
+            .then((res) => {
+            logger.log(res);
+            cb();
+        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    }
+    getTaskDetailsEtag(taskId) {
+        const requestOptions = {
+            url: `${this.resource}/v1.0/planner/tasks/${encodeURIComponent(taskId)}/details`,
+            headers: {
+                accept: 'application/json'
+            },
+            responseType: 'json'
+        };
+        return request_1.default
+            .get(requestOptions)
+            .then((response) => {
+            const etag = response ? response['@odata.etag'] : undefined;
+            if (!etag) {
+                return Promise.reject(`Error fetching task details`);
+            }
+            return Promise.resolve(etag);
+        });
+    }
+    updateTaskDetails(options, newTask) {
+        const taskId = newTask.id;
+        if (!options.description) {
+            return Promise.resolve(newTask);
+        }
+        return this
+            .getTaskDetailsEtag(taskId)
+            .then(etag => {
+            const requestOptionsTaskDetails = {
+                url: `${this.resource}/v1.0/planner/tasks/${taskId}/details`,
+                headers: {
+                    'accept': 'application/json;odata.metadata=none',
+                    'If-Match': etag,
+                    'Prefer': 'return=representation'
+                },
+                responseType: 'json',
+                data: {
+                    description: options.description
+                }
+            };
+            return request_1.default.patch(requestOptionsTaskDetails);
+        })
+            .then(taskDetails => {
+            return Object.assign(Object.assign({}, newTask), taskDetails);
+        });
+    }
+    generateUserAssignments(args) {
+        const assignments = {};
+        if (!args.options.assignedToUserIds && !args.options.assignedToUserNames) {
+            return Promise.resolve(assignments);
+        }
+        return this
+            .getUserIds(args.options)
+            .then((userIds) => {
+            userIds.map(x => assignments[x] = {
+                '@odata.type': '#microsoft.graph.plannerAssignment',
+                orderHint: ' !'
+            });
+            return Promise.resolve(assignments);
+        });
+    }
+    getBucketId(args, planId) {
+        if (args.options.bucketId) {
+            return Promise.resolve(args.options.bucketId);
+        }
+        const requestOptions = {
+            url: `${this.resource}/v1.0/planner/plans/${planId}/buckets`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        return request_1.default
+            .get(requestOptions)
+            .then((response) => {
+            const bucket = response.value.find(val => val.name === args.options.bucketName);
+            if (!bucket) {
+                return Promise.reject(`The specified bucket does not exist`);
+            }
+            return Promise.resolve(bucket.id);
+        });
+    }
+    getPlanId(args) {
+        if (args.options.planId) {
+            return Promise.resolve(args.options.planId);
+        }
+        return this
+            .getGroupId(args)
+            .then((groupId) => {
+            const requestOptions = {
+                url: `${this.resource}/v1.0/planner/plans?$filter=(owner eq '${groupId}')`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            return request_1.default.get(requestOptions);
+        }).then((response) => {
+            const plan = response.value.find(val => val.title === args.options.planName);
+            if (!plan) {
+                return Promise.reject(`The specified plan does not exist`);
+            }
+            return Promise.resolve(plan.id);
+        });
+    }
+    getGroupId(args) {
+        if (args.options.ownerGroupId) {
+            return Promise.resolve(args.options.ownerGroupId);
+        }
+        const requestOptions = {
+            url: `${this.resource}/v1.0/groups?$filter=displayName eq '${encodeURIComponent(args.options.ownerGroupName)}'`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        return request_1.default
+            .get(requestOptions)
+            .then(response => {
+            const group = response.value[0];
+            if (!group) {
+                return Promise.reject(`The specified owner group does not exist`);
+            }
+            return Promise.resolve(group.id);
+        });
+    }
+    getUserIds(options) {
+        if (options.assignedToUserIds) {
+            return Promise.resolve(options.assignedToUserIds.split(','));
+        }
+        // Hitting this section means assignedToUserNames won't be undefined
+        const userNames = options.assignedToUserNames;
+        const userArr = userNames.split(',').map(o => o.trim());
+        let userIds = [];
+        const promises = userArr.map(user => {
+            const requestOptions = {
+                url: `${this.resource}/v1.0/users?$filter=userPrincipalName eq '${Utils_1.default.encodeQueryParameter(user)}'&$select=id,userPrincipalName`,
+                headers: {
+                    'content-type': 'application/json'
+                },
+                responseType: 'json'
+            };
+            return request_1.default.get(requestOptions);
+        });
+        return Promise
+            .all(promises)
+            .then((usersRes) => {
+            let userUpns = [];
+            userUpns = usersRes.map(res => { var _a; return (_a = res.value[0]) === null || _a === void 0 ? void 0 : _a.userPrincipalName; });
+            userIds = usersRes.map(res => { var _a; return (_a = res.value[0]) === null || _a === void 0 ? void 0 : _a.id; });
+            // Find the members where no graph response was found
+            const invalidUsers = userArr.filter(user => !userUpns.some((upn) => (upn === null || upn === void 0 ? void 0 : upn.toLowerCase()) === user.toLowerCase()));
+            if (invalidUsers && invalidUsers.length > 0) {
+                return Promise.reject(`Cannot proceed with planner task creation. The following users provided are invalid : ${invalidUsers.join(',')}`);
+            }
+            return Promise.resolve(userIds);
+        });
+    }
+    options() {
+        const options = [
+            { option: '-t, --title <title>' },
+            { option: '--planId [planId]' },
+            { option: '--planName [planName]' },
+            { option: '--ownerGroupId [ownerGroupId]' },
+            { option: '--ownerGroupName [ownerGroupName]' },
+            { option: '--bucketId [bucketId]' },
+            { option: '--bucketName [bucketName]' },
+            { option: '--startDateTime [startDateTime]' },
+            { option: '--dueDateTime [dueDateTime]' },
+            { option: '--percentComplete [percentComplete]' },
+            { option: '--assignedToUserIds [assignedToUserIds]' },
+            { option: '--assignedToUserNames [assignedToUserNames]' },
+            { option: '--description [description]' },
+            { option: '--orderHint [orderHint]' }
+        ];
+        const parentOptions = super.options();
+        return options.concat(parentOptions);
+    }
+    validate(args) {
+        if (!args.options.planId && !args.options.planName) {
+            return 'Specify either planId or planName';
+        }
+        if (args.options.planId && args.options.planName) {
+            return 'Specify either planId or planName but not both';
+        }
+        if (args.options.planName && !args.options.ownerGroupId && !args.options.ownerGroupName) {
+            return 'Specify either ownerGroupId or ownerGroupName when using planName';
+        }
+        if (args.options.planName && args.options.ownerGroupId && args.options.ownerGroupName) {
+            return 'Specify either ownerGroupId or ownerGroupName when using planName but not both';
+        }
+        if (args.options.ownerGroupId && !Utils_1.default.isValidGuid(args.options.ownerGroupId)) {
+            return `${args.options.ownerGroupId} is not a valid GUID`;
+        }
+        if (!args.options.bucketId && !args.options.bucketName) {
+            return 'Specify either bucketId or bucketName';
+        }
+        if (args.options.bucketId && args.options.bucketName) {
+            return 'Specify either bucketId or bucketName but not both';
+        }
+        if (args.options.startDateTime && !Utils_1.default.isValidISODateTime(args.options.startDateTime)) {
+            return 'The startDateTime is not a valid ISO date string';
+        }
+        if (args.options.dueDateTime && !Utils_1.default.isValidISODateTime(args.options.dueDateTime)) {
+            return 'The dueDateTime is not a valid ISO date string';
+        }
+        if (args.options.percentComplete && isNaN(args.options.percentComplete)) {
+            return `percentComplete is not a number`;
+        }
+        if (args.options.percentComplete && (args.options.percentComplete < 0 || args.options.percentComplete > 100)) {
+            return `percentComplete should be between 0 and 100 `;
+        }
+        if (args.options.assignedToUserIds && !Utils_1.default.isValidGuidArray(args.options.assignedToUserIds.split(','))) {
+            return 'assignedToUserIds contains invalid GUID';
+        }
+        if (args.options.assignedToUserIds && args.options.assignedToUserNames) {
+            return 'Specify either assignedToUserIds or assignedToUserNames but not both';
+        }
+        return true;
+    }
+}
+module.exports = new PlannerTaskAddCommand();
+//# sourceMappingURL=task-add.js.map

package/dist/m365/planner/commands.js

@@ -7,6 +7,7 @@ exports.default = {
     PLAN_ADD: `${prefix} plan add`,
     PLAN_GET: `${prefix} plan get`,
     PLAN_LIST: `${prefix} plan list`,
+    TASK_ADD: `${prefix} task add`,
     TASK_LIST: `${prefix} task list`
 };
 //# sourceMappingURL=commands.js.map

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

@@ -0,0 +1,63 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FN006005_CFG_PS_metadata = void 0;
+const JsonRule_1 = require("./JsonRule");
+class FN006005_CFG_PS_metadata extends JsonRule_1.JsonRule {
+    constructor() {
+        super();
+    }
+    get id() {
+        return 'FN006005';
+    }
+    get title() {
+        return 'package-solution.json metadata';
+    }
+    get description() {
+        return `In package-solution.json add metadata section`;
+    }
+    get resolution() {
+        return '';
+    }
+    get resolutionType() {
+        return 'json';
+    }
+    get severity() {
+        return 'Required';
+    }
+    get file() {
+        return './config/package-solution.json';
+    }
+    visit(project, findings) {
+        var _a;
+        if (!project.packageSolutionJson ||
+            !project.packageSolutionJson.solution) {
+            return;
+        }
+        if (!project.packageSolutionJson.solution.metadata) {
+            const solutionDescription = `${(_a = project.packageJson) === null || _a === void 0 ? void 0 : _a.name} description`;
+            const resolution = {
+                solution: {
+                    metadata: {
+                        shortDescription: {
+                            default: solutionDescription
+                        },
+                        longDescription: {
+                            default: solutionDescription
+                        },
+                        screenshotPaths: [],
+                        videoUrl: '',
+                        categories: []
+                    }
+                }
+            };
+            const node = this.getAstNodeFromFile(project.packageSolutionJson, 'solution');
+            this.addFindingWithOccurrences([{
+                    file: this.file,
+                    resolution: JSON.stringify(resolution, null, 2),
+                    position: this.getPositionFromNode(node)
+                }], findings);
+        }
+    }
+}
+exports.FN006005_CFG_PS_metadata = FN006005_CFG_PS_metadata;
+//# sourceMappingURL=FN006005_CFG_PS_metadata.js.map

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

@@ -0,0 +1,60 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FN006006_CFG_PS_features = void 0;
+const JsonRule_1 = require("./JsonRule");
+const uuid_1 = require("uuid");
+class FN006006_CFG_PS_features extends JsonRule_1.JsonRule {
+    constructor() {
+        super();
+    }
+    get id() {
+        return 'FN006006';
+    }
+    get title() {
+        return 'package-solution.json features';
+    }
+    get description() {
+        return `In package-solution.json add features section`;
+    }
+    get resolution() {
+        return '';
+    }
+    get resolutionType() {
+        return 'json';
+    }
+    get severity() {
+        return 'Required';
+    }
+    get file() {
+        return './config/package-solution.json';
+    }
+    visit(project, findings) {
+        var _a, _b;
+        if (!project.packageSolutionJson ||
+            !project.packageSolutionJson.solution) {
+            return;
+        }
+        if (!project.packageSolutionJson.solution.features) {
+            const resolution = {
+                solution: {
+                    features: [
+                        {
+                            title: `${(_a = project.packageJson) === null || _a === void 0 ? void 0 : _a.name} Feature`,
+                            description: `The feature that activates elements of the ${(_b = project.packageJson) === null || _b === void 0 ? void 0 : _b.name} solution.`,
+                            id: (0, uuid_1.v4)(),
+                            version: project.packageSolutionJson.solution.version
+                        }
+                    ]
+                }
+            };
+            const node = this.getAstNodeFromFile(project.packageSolutionJson, 'solution');
+            this.addFindingWithOccurrences([{
+                    file: this.file,
+                    resolution: JSON.stringify(resolution, null, 2),
+                    position: this.getPositionFromNode(node)
+                }], findings);
+        }
+    }
+}
+exports.FN006006_CFG_PS_features = FN006006_CFG_PS_features;
+//# sourceMappingURL=FN006006_CFG_PS_features.js.map

package/dist/m365/spfx/commands/project/project-upgrade/upgrade-1.14.0-beta.4.js

@@ -0,0 +1,57 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const FN001001_DEP_microsoft_sp_core_library_1 = require("./rules/FN001001_DEP_microsoft_sp_core_library");
+const FN001002_DEP_microsoft_sp_lodash_subset_1 = require("./rules/FN001002_DEP_microsoft_sp_lodash_subset");
+const FN001003_DEP_microsoft_sp_office_ui_fabric_core_1 = require("./rules/FN001003_DEP_microsoft_sp_office_ui_fabric_core");
+const FN001004_DEP_microsoft_sp_webpart_base_1 = require("./rules/FN001004_DEP_microsoft_sp_webpart_base");
+const FN001011_DEP_microsoft_sp_dialog_1 = require("./rules/FN001011_DEP_microsoft_sp_dialog");
+const FN001012_DEP_microsoft_sp_application_base_1 = require("./rules/FN001012_DEP_microsoft_sp_application_base");
+const FN001013_DEP_microsoft_decorators_1 = require("./rules/FN001013_DEP_microsoft_decorators");
+const FN001014_DEP_microsoft_sp_listview_extensibility_1 = require("./rules/FN001014_DEP_microsoft_sp_listview_extensibility");
+const FN001021_DEP_microsoft_sp_property_pane_1 = require("./rules/FN001021_DEP_microsoft_sp_property_pane");
+const FN001023_DEP_microsoft_sp_component_base_1 = require("./rules/FN001023_DEP_microsoft_sp_component_base");
+const FN001024_DEP_microsoft_sp_diagnostics_1 = require("./rules/FN001024_DEP_microsoft_sp_diagnostics");
+const FN001025_DEP_microsoft_sp_dynamic_data_1 = require("./rules/FN001025_DEP_microsoft_sp_dynamic_data");
+const FN001026_DEP_microsoft_sp_extension_base_1 = require("./rules/FN001026_DEP_microsoft_sp_extension_base");
+const FN001027_DEP_microsoft_sp_http_1 = require("./rules/FN001027_DEP_microsoft_sp_http");
+const FN001028_DEP_microsoft_sp_list_subscription_1 = require("./rules/FN001028_DEP_microsoft_sp_list_subscription");
+const FN001029_DEP_microsoft_sp_loader_1 = require("./rules/FN001029_DEP_microsoft_sp_loader");
+const FN001030_DEP_microsoft_sp_module_interfaces_1 = require("./rules/FN001030_DEP_microsoft_sp_module_interfaces");
+const FN001031_DEP_microsoft_sp_odata_types_1 = require("./rules/FN001031_DEP_microsoft_sp_odata_types");
+const FN001032_DEP_microsoft_sp_page_context_1 = require("./rules/FN001032_DEP_microsoft_sp_page_context");
+const FN002001_DEVDEP_microsoft_sp_build_web_1 = require("./rules/FN002001_DEVDEP_microsoft_sp_build_web");
+const FN002002_DEVDEP_microsoft_sp_module_interfaces_1 = require("./rules/FN002002_DEVDEP_microsoft_sp_module_interfaces");
+const FN002009_DEVDEP_microsoft_sp_tslint_rules_1 = require("./rules/FN002009_DEVDEP_microsoft_sp_tslint_rules");
+const FN006004_CFG_PS_developer_1 = require("./rules/FN006004_CFG_PS_developer");
+const FN006005_CFG_PS_metadata_1 = require("./rules/FN006005_CFG_PS_metadata");
+const FN006006_CFG_PS_features_1 = require("./rules/FN006006_CFG_PS_features");
+const FN010001_YORC_version_1 = require("./rules/FN010001_YORC_version");
+module.exports = [
+    new FN001001_DEP_microsoft_sp_core_library_1.FN001001_DEP_microsoft_sp_core_library('1.14.0-beta.4'),
+    new FN001002_DEP_microsoft_sp_lodash_subset_1.FN001002_DEP_microsoft_sp_lodash_subset('1.14.0-beta.4'),
+    new FN001003_DEP_microsoft_sp_office_ui_fabric_core_1.FN001003_DEP_microsoft_sp_office_ui_fabric_core('1.14.0-beta.4'),
+    new FN001004_DEP_microsoft_sp_webpart_base_1.FN001004_DEP_microsoft_sp_webpart_base('1.14.0-beta.4'),
+    new FN001011_DEP_microsoft_sp_dialog_1.FN001011_DEP_microsoft_sp_dialog('1.14.0-beta.4'),
+    new FN001012_DEP_microsoft_sp_application_base_1.FN001012_DEP_microsoft_sp_application_base('1.14.0-beta.4'),
+    new FN001013_DEP_microsoft_decorators_1.FN001013_DEP_microsoft_decorators('1.14.0-beta.4'),
+    new FN001014_DEP_microsoft_sp_listview_extensibility_1.FN001014_DEP_microsoft_sp_listview_extensibility('1.14.0-beta.4'),
+    new FN001021_DEP_microsoft_sp_property_pane_1.FN001021_DEP_microsoft_sp_property_pane('1.14.0-beta.4'),
+    new FN001023_DEP_microsoft_sp_component_base_1.FN001023_DEP_microsoft_sp_component_base('1.14.0-beta.4'),
+    new FN001024_DEP_microsoft_sp_diagnostics_1.FN001024_DEP_microsoft_sp_diagnostics('1.14.0-beta.4'),
+    new FN001025_DEP_microsoft_sp_dynamic_data_1.FN001025_DEP_microsoft_sp_dynamic_data('1.14.0-beta.4'),
+    new FN001026_DEP_microsoft_sp_extension_base_1.FN001026_DEP_microsoft_sp_extension_base('1.14.0-beta.4'),
+    new FN001027_DEP_microsoft_sp_http_1.FN001027_DEP_microsoft_sp_http('1.14.0-beta.4'),
+    new FN001028_DEP_microsoft_sp_list_subscription_1.FN001028_DEP_microsoft_sp_list_subscription('1.14.0-beta.4'),
+    new FN001029_DEP_microsoft_sp_loader_1.FN001029_DEP_microsoft_sp_loader('1.14.0-beta.4'),
+    new FN001030_DEP_microsoft_sp_module_interfaces_1.FN001030_DEP_microsoft_sp_module_interfaces('1.14.0-beta.4'),
+    new FN001031_DEP_microsoft_sp_odata_types_1.FN001031_DEP_microsoft_sp_odata_types('1.14.0-beta.4'),
+    new FN001032_DEP_microsoft_sp_page_context_1.FN001032_DEP_microsoft_sp_page_context('1.14.0-beta.4'),
+    new FN002001_DEVDEP_microsoft_sp_build_web_1.FN002001_DEVDEP_microsoft_sp_build_web('1.14.0-beta.4'),
+    new FN002002_DEVDEP_microsoft_sp_module_interfaces_1.FN002002_DEVDEP_microsoft_sp_module_interfaces('1.14.0-beta.4'),
+    new FN002009_DEVDEP_microsoft_sp_tslint_rules_1.FN002009_DEVDEP_microsoft_sp_tslint_rules('1.14.0-beta.4'),
+    new FN006004_CFG_PS_developer_1.FN006004_CFG_PS_developer('1.14.0-beta.4'),
+    new FN006005_CFG_PS_metadata_1.FN006005_CFG_PS_metadata(),
+    new FN006006_CFG_PS_features_1.FN006006_CFG_PS_features(),
+    new FN010001_YORC_version_1.FN010001_YORC_version('1.14.0-beta.4')
+];
+//# sourceMappingURL=upgrade-1.14.0-beta.4.js.map

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

@@ -3,6 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require("fs");
 const os = require("os");
 const path = require("path");
+// uncomment to support upgrading to preview releases
+const semver_1 = require("semver");
 const Command_1 = require("../../../../Command");
 const commands_1 = require("../../commands");
 const base_project_command_1 = require("./base-project-command");
@@ -42,7 +44,8 @@ class SpfxProjectUpgradeCommand extends base_project_command_1.BaseProjectComman
             '1.12.0',
             '1.12.1',
             '1.13.0',
-            '1.13.1'
+            '1.13.1',
+            '1.14.0-beta.4'
         ];
     }
     get name() {
@@ -55,9 +58,9 @@ class SpfxProjectUpgradeCommand extends base_project_command_1.BaseProjectComman
         const telemetryProps = super.getTelemetryProperties(args);
         telemetryProps.toVersion = args.options.toVersion || this.supportedVersions[this.supportedVersions.length - 1];
         // uncomment to support upgrading to preview releases
-        // if (prerelease(telemetryProps.toVersion) && !args.options.preview) {
-        //   telemetryProps.toVersion = this.supportedVersions[this.supportedVersions.length - 2];
-        // }
+        if ((0, semver_1.prerelease)(telemetryProps.toVersion) && !args.options.preview) {
+            telemetryProps.toVersion = this.supportedVersions[this.supportedVersions.length - 2];
+        }
         telemetryProps.packageManager = args.options.packageManager || 'npm';
         telemetryProps.shell = args.options.shell || 'bash';
         telemetryProps.preview = args.options.preview;
@@ -71,15 +74,15 @@ class SpfxProjectUpgradeCommand extends base_project_command_1.BaseProjectComman
         }
         this.toVersion = args.options.toVersion ? args.options.toVersion : this.supportedVersions[this.supportedVersions.length - 1];
         // uncomment to support upgrading to preview releases
-        // if (!args.options.toVersion &&
-        //   !args.options.preview &&
-        //   prerelease(this.toVersion)) {
-        //   // no version and no preview specified while the current version to
-        //   // upgrade to is a prerelease so let's grab the first non-preview version
-        //   // since we're supporting only one preview version, it's sufficient for
-        //   // us to take second to last version
-        //   this.toVersion = this.supportedVersions[this.supportedVersions.length - 2];
-        // }
+        if (!args.options.toVersion &&
+            !args.options.preview &&
+            (0, semver_1.prerelease)(this.toVersion)) {
+            // no version and no preview specified while the current version to
+            // upgrade to is a prerelease so let's grab the first non-preview version
+            // since we're supporting only one preview version, it's sufficient for
+            // us to take second to last version
+            this.toVersion = this.supportedVersions[this.supportedVersions.length - 2];
+        }
         this.packageManager = args.options.packageManager || 'npm';
         this.shell = args.options.shell || 'bash';
         if (this.supportedVersions.indexOf(this.toVersion) < 0) {

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

@@ -59,7 +59,7 @@ class SpoSiteEnsureCommand extends SpoCommand_1.default {
             if (this.debug) {
                 logger.logToStderr(err.stderr);
             }
-            if (err.error.message !== 'Request failed with status code 404') {
+            if (err.error.message !== '404 FILE NOT FOUND') {
                 return Promise.reject(err);
             }
             if (this.verbose) {

package/dist/request.js

@@ -16,7 +16,9 @@ class Request {
             decompress: true,
             responseType: 'text',
             /* c8 ignore next */
-            transformResponse: [data => data]
+            transformResponse: [data => data],
+            maxBodyLength: Infinity,
+            maxContentLength: Infinity
         });
         // since we're stubbing requests, request interceptor is never called in
         // tests, so let's exclude it from coverage
@@ -64,7 +66,7 @@ class Request {
             });
             // since we're stubbing requests, response interceptor is never called in
             // tests, so let's exclude it from coverage
-            /* c8 ignore next 22 */
+            /* c8 ignore next 26 */
             this.req.interceptors.response.use((response) => {
                 if (this._logger) {
                     this._logger.logToStderr('Response:');
@@ -73,19 +75,22 @@ class Request {
                         response.headers['content-type'].indexOf('json') > -1) {
                         properties.push('data');
                     }
-                    this._logger.logToStderr(JSON.stringify(Utils_1.default.filterObject(response, properties), null, 2));
+                    this._logger.logToStderr(JSON.stringify(Object.assign({ url: response.config.url }, Utils_1.default.filterObject(response, properties)), null, 2));
                 }
                 return response;
             }, (error) => {
                 if (this._logger) {
                     const properties = ['status', 'statusText', 'headers'];
                     this._logger.logToStderr('Request error:');
-                    this._logger.logToStderr(JSON.stringify(Object.assign(Object.assign({}, Utils_1.default.filterObject(error.response, properties)), { error: error.error }), null, 2));
+                    this._logger.logToStderr(JSON.stringify(Object.assign(Object.assign({ url: error.config.url }, Utils_1.default.filterObject(error.response, properties)), { error: error.error }), null, 2));
                 }
                 throw error;
             });
         }
     }
+    get logger() {
+        return this._logger;
+    }
     set logger(logger) {
         this._logger = logger;
     }

package/docs/docs/cmd/_global.md

@@ -5,10 +5,10 @@
 : JMESPath query string. See [http://jmespath.org/](http://jmespath.org/) for more information and examples
 
 `-o, --output [output]`
-: Output type. `json,text`. Default `text`
+: Output type. `json,text,csv`. Default `json`
 
 `--verbose`
 : Runs command with verbose logging
 
 `--debug`
-: Runs command with debug logging
+: Runs command with debug logging

package/docs/docs/cmd/aad/user/user-get.md

@@ -11,10 +11,13 @@ m365 aad user get [options]
 ## Options
 
 `-i, --id [id]`
-: The ID of the user to retrieve information for. Specify `id` or `userName` but not both
+: The ID of the user to retrieve information for. Use either `id`, `userName` or `email`, but not all.
 
 `-n, --userName [userName]`
-: The name of the user to retrieve information for. Specify `id` or `userName` but not both
+: The name of the user to retrieve information for. Use either `id`, `userName` or `email`, but not all.
+
+`--email [email]`
+: The email of the user to retrieve information for. Use either `id`, `userName` or `email`, but not all.
 
 `-p, --properties [properties]`
 : Comma-separated list of properties to retrieve
@@ -23,9 +26,9 @@ m365 aad user get [options]
 
 ## Remarks
 
-You can retrieve information about a user, either by specifying that user's id or user name (`userPrincipalName`), but not both.
+You can retrieve information about a user, either by specifying that user's id, user name (`userPrincipalName`), or email (`mail`), but not all.
 
-If the user with the specified id or user name doesn't exist, you will get a `Resource 'xyz' does not exist or one of its queried reference-property objects are not present.` error.
+If the user with the specified id, user name, or email doesn't exist, you will get a `Resource 'xyz' does not exist or one of its queried reference-property objects are not present.` error.
 
 ## Examples
 
@@ -41,6 +44,12 @@ Get information about the user with user name _AarifS@contoso.onmicrosoft.com_
 m365 aad user get --userName AarifS@contoso.onmicrosoft.com
 ```
 
+Get information about the user with email _AarifS@contoso.onmicrosoft.com_
+
+```sh
+m365 aad user get --email AarifS@contoso.onmicrosoft.com
+```
+
 For the user with id _1caf7dcd-7e83-4c3a-94f7-932a1299c844_ retrieve the user name, e-mail address and full name
 
 ```sh