@pnp/cli-microsoft365 6.1.0-beta.1da0a1d → 6.1.0-beta.a927083

package/dist/cli/Cli.js

@@ -22,6 +22,7 @@ const settingsNames_1 = require("../settingsNames");
 const formatting_1 = require("../utils/formatting");
 const fsUtil_1 = require("../utils/fsUtil");
 const md_1 = require("../utils/md");
+const validation_1 = require("../utils/validation");
 const packageJSON = require('../../package.json');
 class Cli {
     // eslint-disable-next-line @typescript-eslint/no-empty-function
@@ -83,9 +84,15 @@ class Cli {
                 // we have found a command to execute. Parse args again taking into
                 // account short and long options, option types and whether the command
                 // supports known and unknown options or not
-                this.optionsFromArgs = {
-                    options: this.getCommandOptionsFromArgs(rawArgs, this.commandToExecute)
-                };
+                try {
+                    this.optionsFromArgs = {
+                        options: this.getCommandOptionsFromArgs(rawArgs, this.commandToExecute)
+                    };
+                }
+                catch (e) {
+                    const optionsWithoutShorts = Cli.removeShortOptions({ options: parsedArgs });
+                    return this.closeWithError(e.message, optionsWithoutShorts, false);
+                }
             }
             else {
                 this.optionsFromArgs = {
@@ -208,6 +215,11 @@ class Cli {
                 });
             }
             catch (err) {
+                // restoring the command and logger is done here instead of in a 'finally' because there were issues with the code coverage tool
+                // restore the original command name
+                cli.currentCommandName = parentCommandName;
+                // restore the original logger
+                request_1.default.logger = currentLogger;
                 throw {
                     error: err,
                     stderr: logErr.join(os.EOL)
@@ -339,11 +351,15 @@ class Cli {
         const minimistOptions = {
             alias: {}
         };
+        let argsToParse = args;
         if (commandInfo) {
             const commandTypes = commandInfo.command.types;
             if (commandTypes) {
                 minimistOptions.string = commandTypes.string;
-                minimistOptions.boolean = commandTypes.boolean;
+                // minimist will parse unused boolean options to 'false' (unused options => options that are not included in the args) 
+                // But in the CLI booleans are nullable. They can can be true, false or undefined.
+                // For this reason we only pass boolean types that are actually used as arg.
+                minimistOptions.boolean = commandTypes.boolean.filter(optionName => args.some(arg => `--${optionName}` === arg || `-${optionName}` === arg));
             }
             minimistOptions.alias = {};
             commandInfo.options.forEach(option => {
@@ -351,8 +367,35 @@ class Cli {
                     minimistOptions.alias[option.short] = option.long;
                 }
             });
+            argsToParse = this.getRewrittenArgs(args, commandTypes);
         }
-        return minimist(args, minimistOptions);
+        return minimist(argsToParse, minimistOptions);
+    }
+    /**
+     * Rewrites arguments (if necessary) before passing them into minimist.
+     * Currently only boolean values are checked and fixed.
+     * Args are only checked and rewritten if the option has been added to the 'types.boolean' array.
+     */
+    getRewrittenArgs(args, commandTypes) {
+        const booleanTypes = commandTypes.boolean;
+        if (booleanTypes.length === 0) {
+            return args;
+        }
+        return args.map((arg, index, array) => {
+            if (arg.startsWith('-') || index === 0) {
+                return arg;
+            }
+            // This line checks if the current arg is a value that belongs to a boolean option.
+            if (booleanTypes.some(t => `--${t}` === array[index - 1] || `-${t}` === array[index - 1])) {
+                const rewrittenBoolean = formatting_1.formatting.rewriteBooleanValue(arg);
+                if (!validation_1.validation.isValidBoolean(rewrittenBoolean)) {
+                    const optionName = array[index - 1];
+                    throw new Error(`The value '${arg}' for option '${optionName}' is not a valid boolean`);
+                }
+                return rewrittenBoolean;
+            }
+            return arg;
+        });
     }
     static formatOutput(logStatement, options) {
         if (logStatement instanceof Date) {

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

@@ -0,0 +1,305 @@
+"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());
+    });
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _PlannerPlanSetCommand_instances, _PlannerPlanSetCommand_initTelemetry, _PlannerPlanSetCommand_initOptions, _PlannerPlanSetCommand_initValidators, _PlannerPlanSetCommand_initOptionSets;
+Object.defineProperty(exports, "__esModule", { value: true });
+const Auth_1 = require("../../../../Auth");
+const request_1 = require("../../../../request");
+const accessToken_1 = require("../../../../utils/accessToken");
+const formatting_1 = require("../../../../utils/formatting");
+const validation_1 = require("../../../../utils/validation");
+const aadGroup_1 = require("../../../../utils/aadGroup");
+const planner_1 = require("../../../../utils/planner");
+const GraphCommand_1 = require("../../../base/GraphCommand");
+const commands_1 = require("../../commands");
+class PlannerPlanSetCommand extends GraphCommand_1.default {
+    constructor() {
+        super();
+        _PlannerPlanSetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _PlannerPlanSetCommand_instances, "m", _PlannerPlanSetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _PlannerPlanSetCommand_instances, "m", _PlannerPlanSetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _PlannerPlanSetCommand_instances, "m", _PlannerPlanSetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _PlannerPlanSetCommand_instances, "m", _PlannerPlanSetCommand_initOptionSets).call(this);
+    }
+    get name() {
+        return commands_1.default.PLAN_SET;
+    }
+    get description() {
+        return 'Updates a Microsoft Planner plan';
+    }
+    defaultProperties() {
+        return ['id', 'title', 'createdDateTime', 'owner'];
+    }
+    allowUnknownOptions() {
+        return true;
+    }
+    getGroupId(args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { ownerGroupId, ownerGroupName } = args.options;
+            if (ownerGroupId) {
+                return ownerGroupId;
+            }
+            const group = yield aadGroup_1.aadGroup.getGroupByDisplayName(ownerGroupName);
+            return group.id;
+        });
+    }
+    getPlanId(args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { id, title } = args.options;
+            if (id) {
+                return id;
+            }
+            const groupId = yield this.getGroupId(args);
+            const plan = yield planner_1.planner.getPlanByTitle(title, groupId);
+            return plan.id;
+        });
+    }
+    getUserIds(options) {
+        if (options.shareWithUserIds) {
+            return Promise.resolve(options.shareWithUserIds.split(','));
+        }
+        const userNames = options.shareWithUserNames;
+        const userArr = userNames.split(',').map(o => o.trim());
+        const promises = userArr.map(user => {
+            const requestOptions = {
+                url: `${this.resource}/v1.0/users?$filter=userPrincipalName eq '${formatting_1.formatting.encodeQueryParameter(user)}'&$select=id,userPrincipalName`,
+                headers: {
+                    'content-type': 'application/json'
+                },
+                responseType: 'json'
+            };
+            return request_1.default.get(requestOptions);
+        });
+        return Promise
+            .all(promises)
+            .then((usersRes) => {
+            const userUpns = usersRes.map(res => { var _a; return (_a = res.value[0]) === null || _a === void 0 ? void 0 : _a.userPrincipalName; });
+            const 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 plan creation. The following users provided are invalid: ${invalidUsers.join(',')}`);
+            }
+            return Promise.resolve(userIds);
+        });
+    }
+    generateSharedWith(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const sharedWith = {};
+            const userIds = yield this.getUserIds(options);
+            userIds.map(x => sharedWith[x] = true);
+            return sharedWith;
+        });
+    }
+    getPlanEtag(planId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestOptions = {
+                url: `${this.resource}/v1.0/planner/plans/${planId}`,
+                headers: {
+                    accept: 'application/json'
+                },
+                responseType: 'json'
+            };
+            const response = yield request_1.default.get(requestOptions);
+            return response['@odata.etag'];
+        });
+    }
+    getPlanDetailsEtag(planId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestOptions = {
+                url: `${this.resource}/v1.0/planner/plans/${planId}/details`,
+                headers: {
+                    accept: 'application/json'
+                },
+                responseType: 'json'
+            };
+            const response = yield request_1.default.get(requestOptions);
+            return response['@odata.etag'];
+        });
+    }
+    getPlanDetails(plan) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestOptionsTaskDetails = {
+                url: `${this.resource}/v1.0/planner/plans/${plan.id}/details`,
+                headers: {
+                    'accept': 'application/json;odata.metadata=none',
+                    'Prefer': 'return=representation'
+                },
+                responseType: 'json'
+            };
+            const planDetails = yield request_1.default.get(requestOptionsTaskDetails);
+            return Object.assign(Object.assign({}, plan), planDetails);
+        });
+    }
+    updatePlanDetails(options, planId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const plan = yield planner_1.planner.getPlanById(planId);
+            const categories = {};
+            let categoriesCount = 0;
+            Object.keys(options).forEach(key => {
+                if (key.indexOf('category') !== -1) {
+                    categories[key] = options[key];
+                    categoriesCount++;
+                }
+            });
+            if (!options.shareWithUserIds && !options.shareWithUserNames && categoriesCount === 0) {
+                return this.getPlanDetails(plan);
+            }
+            const requestBody = {};
+            if (options.shareWithUserIds || options.shareWithUserNames) {
+                const sharedWith = yield this.generateSharedWith(options);
+                requestBody['sharedWith'] = sharedWith;
+            }
+            if (categoriesCount > 0) {
+                requestBody['categoryDescriptions'] = categories;
+            }
+            const etag = yield this.getPlanDetailsEtag(planId);
+            const requestOptionsPlanDetails = {
+                url: `${this.resource}/v1.0/planner/plans/${planId}/details`,
+                headers: {
+                    'accept': 'application/json;odata.metadata=none',
+                    'If-Match': etag,
+                    'Prefer': 'return=representation'
+                },
+                responseType: 'json',
+                data: requestBody
+            };
+            const planDetails = yield request_1.default.patch(requestOptionsPlanDetails);
+            return Object.assign(Object.assign({}, plan), planDetails);
+        });
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (accessToken_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken)) {
+                this.handleError('This command does not support application permissions.');
+                return;
+            }
+            try {
+                const planId = yield this.getPlanId(args);
+                if (args.options.newTitle) {
+                    const etag = yield this.getPlanEtag(planId);
+                    const requestOptions = {
+                        url: `${this.resource}/v1.0/planner/plans/${planId}`,
+                        headers: {
+                            accept: 'application/json;odata.metadata=none',
+                            'If-Match': etag,
+                            'Prefer': 'return=representation'
+                        },
+                        responseType: 'json',
+                        data: {
+                            "title": args.options.newTitle
+                        }
+                    };
+                    yield request_1.default.patch(requestOptions);
+                }
+                const result = yield this.updatePlanDetails(args.options, planId);
+                logger.log(result);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+}
+_PlannerPlanSetCommand_instances = new WeakSet(), _PlannerPlanSetCommand_initTelemetry = function _PlannerPlanSetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            id: typeof args.options.id !== 'undefined',
+            title: typeof args.options.title !== 'undefined',
+            ownerGroupId: typeof args.options.ownerGroupId !== 'undefined',
+            ownerGroupName: typeof args.options.ownerGroupName !== 'undefined',
+            newTitle: typeof args.options.newTitle !== 'undefined',
+            shareWithUserIds: typeof args.options.shareWithUserIds !== 'undefined',
+            shareWithUserNames: typeof args.options.shareWithUserNames !== 'undefined'
+        });
+    });
+}, _PlannerPlanSetCommand_initOptions = function _PlannerPlanSetCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --id [id]'
+    }, {
+        option: '-t, --title [title]'
+    }, {
+        option: '--ownerGroupId [ownerGroupId]'
+    }, {
+        option: '--ownerGroupName [ownerGroupName]'
+    }, {
+        option: '--newTitle [newTitle]'
+    }, {
+        option: '--shareWithUserIds [shareWithUserIds]'
+    }, {
+        option: '--shareWithUserNames [shareWithUserNames]'
+    });
+}, _PlannerPlanSetCommand_initValidators = function _PlannerPlanSetCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (args.options.title) {
+            if (args.options.ownerGroupId && !validation_1.validation.isValidGuid(args.options.ownerGroupId)) {
+                return `${args.options.ownerGroupId} is not a valid GUID`;
+            }
+            if (!args.options.ownerGroupId && !args.options.ownerGroupName) {
+                return 'Specify either ownerGroupId or ownerGroupName when using title';
+            }
+            if (args.options.ownerGroupId && args.options.ownerGroupName) {
+                return 'Specify either ownerGroupId or ownerGroupName when using title but not both';
+            }
+        }
+        if (args.options.shareWithUserIds && args.options.shareWithUserNames) {
+            return 'Specify either shareWithUserIds or shareWithUserNames but not both';
+        }
+        if (args.options.shareWithUserIds && !validation_1.validation.isValidGuidArray(args.options.shareWithUserIds.split(','))) {
+            return 'shareWithUserIds contains invalid GUID';
+        }
+        const allowedCategories = [
+            'category1',
+            'category2',
+            'category3',
+            'category4',
+            'category5',
+            'category6',
+            'category7',
+            'category8',
+            'category9',
+            'category10',
+            'category11',
+            'category12',
+            'category13',
+            'category14',
+            'category15',
+            'category16',
+            'category17',
+            'category18',
+            'category19',
+            'category20',
+            'category21',
+            'category22',
+            'category23',
+            'category24',
+            'category25'
+        ];
+        let invalidCategoryOptions = false;
+        Object.keys(args.options).forEach(key => {
+            if (key.indexOf('category') !== -1 && allowedCategories.indexOf(key) === -1) {
+                invalidCategoryOptions = true;
+            }
+        });
+        if (invalidCategoryOptions) {
+            return 'Specify category values between category1 to category25';
+        }
+        return true;
+    }));
+}, _PlannerPlanSetCommand_initOptionSets = function _PlannerPlanSetCommand_initOptionSets() {
+    this.optionSets.push({ options: ['id', 'title'] });
+};
+module.exports = new PlannerPlanSetCommand();
+//# sourceMappingURL=plan-set.js.map

package/dist/m365/planner/commands/tenant/tenant-settings-set.js

@@ -13,10 +13,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _PlannerTenantSettingsSetCommand_instances, _PlannerTenantSettingsSetCommand_initTelemetry, _PlannerTenantSettingsSetCommand_initOptions, _PlannerTenantSettingsSetCommand_initValidators;
+var _PlannerTenantSettingsSetCommand_instances, _PlannerTenantSettingsSetCommand_initTelemetry, _PlannerTenantSettingsSetCommand_initOptions, _PlannerTenantSettingsSetCommand_initTypes, _PlannerTenantSettingsSetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const validation_1 = require("../../../../utils/validation");
 const PlannerCommand_1 = require("../../../base/PlannerCommand");
 const commands_1 = require("../../commands");
 class PlannerTenantSettingsSetCommand extends PlannerCommand_1.default {
@@ -25,6 +24,7 @@ class PlannerTenantSettingsSetCommand extends PlannerCommand_1.default {
         _PlannerTenantSettingsSetCommand_instances.add(this);
         __classPrivateFieldGet(this, _PlannerTenantSettingsSetCommand_instances, "m", _PlannerTenantSettingsSetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _PlannerTenantSettingsSetCommand_instances, "m", _PlannerTenantSettingsSetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _PlannerTenantSettingsSetCommand_instances, "m", _PlannerTenantSettingsSetCommand_initTypes).call(this);
         __classPrivateFieldGet(this, _PlannerTenantSettingsSetCommand_instances, "m", _PlannerTenantSettingsSetCommand_initValidators).call(this);
     }
     get name() {
@@ -92,6 +92,8 @@ _PlannerTenantSettingsSetCommand_instances = new WeakSet(), _PlannerTenantSettin
         option: '--allowPlannerMobilePushNotifications [allowPlannerMobilePushNotifications]',
         autocomplete: ['true', 'false']
     });
+}, _PlannerTenantSettingsSetCommand_initTypes = function _PlannerTenantSettingsSetCommand_initTypes() {
+    this.types.boolean.push('isPlannerAllowed', 'allowCalendarSharing', 'allowTenantMoveWithDataLoss', 'allowTenantMoveWithDataMigration', 'allowRosterCreation', 'allowPlannerMobilePushNotifications');
 }, _PlannerTenantSettingsSetCommand_initValidators = function _PlannerTenantSettingsSetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         const optionsArray = [
@@ -101,11 +103,6 @@ _PlannerTenantSettingsSetCommand_instances = new WeakSet(), _PlannerTenantSettin
         if (optionsArray.every(o => typeof o === 'undefined')) {
             return 'You must specify at least one option';
         }
-        for (const option of optionsArray) {
-            if (typeof option !== 'undefined' && !validation_1.validation.isValidBoolean(option)) {
-                return `Value '${option}' is not a valid boolean`;
-            }
-        }
         return true;
     }));
 };

package/dist/m365/planner/commands.js

@@ -11,6 +11,7 @@ exports.default = {
     PLAN_GET: `${prefix} plan get`,
     PLAN_LIST: `${prefix} plan list`,
     PLAN_REMOVE: `${prefix} plan remove`,
+    PLAN_SET: `${prefix} plan set`,
     TASK_ADD: `${prefix} task add`,
     TASK_CHECKLISTITEM_ADD: `${prefix} task checklistitem add`,
     TASK_CHECKLISTITEM_LIST: `${prefix} task checklistitem list`,

package/dist/m365/spfx/commands/project/project-doctor/doctor-1.16.1.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const FN001008_DEP_react_1 = require("./rules/FN001008_DEP_react");
+const FN001009_DEP_react_dom_1 = require("./rules/FN001009_DEP_react_dom");
+const FN001022_DEP_office_ui_fabric_react_1 = require("./rules/FN001022_DEP_office_ui_fabric_react");
+const FN002004_DEVDEP_gulp_1 = require("./rules/FN002004_DEVDEP_gulp");
+const FN002007_DEVDEP_ajv_1 = require("./rules/FN002007_DEVDEP_ajv");
+const FN002013_DEVDEP_types_webpack_env_1 = require("./rules/FN002013_DEVDEP_types_webpack_env");
+const FN002015_DEVDEP_types_react_1 = require("./rules/FN002015_DEVDEP_types_react");
+const FN002016_DEVDEP_types_react_dom_1 = require("./rules/FN002016_DEVDEP_types_react_dom");
+const FN002019_DEVDEP_microsoft_rush_stack_compiler_1 = require("./rules/FN002019_DEVDEP_microsoft_rush_stack_compiler");
+module.exports = [
+    new FN001008_DEP_react_1.FN001008_DEP_react('17'),
+    new FN001009_DEP_react_dom_1.FN001009_DEP_react_dom('17'),
+    new FN001022_DEP_office_ui_fabric_react_1.FN001022_DEP_office_ui_fabric_react('^7.199.1'),
+    new FN002004_DEVDEP_gulp_1.FN002004_DEVDEP_gulp('4.0.2'),
+    new FN002007_DEVDEP_ajv_1.FN002007_DEVDEP_ajv('^6.12.5'),
+    new FN002013_DEVDEP_types_webpack_env_1.FN002013_DEVDEP_types_webpack_env('~1.15.2'),
+    new FN002015_DEVDEP_types_react_1.FN002015_DEVDEP_types_react('17'),
+    new FN002016_DEVDEP_types_react_dom_1.FN002016_DEVDEP_types_react_dom('17'),
+    new FN002019_DEVDEP_microsoft_rush_stack_compiler_1.FN002019_DEVDEP_microsoft_rush_stack_compiler(['4.5'])
+];
+//# sourceMappingURL=doctor-1.16.1.js.map

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

@@ -62,7 +62,8 @@ class SpfxProjectDoctorCommand extends base_project_command_1.BaseProjectCommand
             '1.14.0',
             '1.15.0',
             '1.15.2',
-            '1.16.0'
+            '1.16.0',
+            '1.16.1'
         ];
         __classPrivateFieldGet(this, _SpfxProjectDoctorCommand_instances, "m", _SpfxProjectDoctorCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpfxProjectDoctorCommand_instances, "m", _SpfxProjectDoctorCommand_initOptions).call(this);

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

@@ -0,0 +1,63 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FN006006_CFG_PS_features = void 0;
+const JsonRule_1 = require("../../JsonRule");
+class FN006006_CFG_PS_features extends JsonRule_1.JsonRule {
+    get id() {
+        return 'FN006006';
+    }
+    get title() {
+        return 'package-solution.json features';
+    }
+    get description() {
+        return `In package-solution.json add features for components`;
+    }
+    get resolution() {
+        return '';
+    }
+    get resolutionType() {
+        return 'json';
+    }
+    get severity() {
+        return 'Required';
+    }
+    get file() {
+        return './config/package-solution.json';
+    }
+    visit(project, findings) {
+        if (!project.packageSolutionJson ||
+            !project.packageSolutionJson.solution ||
+            // if project already has features defined, we don't need to do anything
+            (project.packageSolutionJson.solution.features && project.packageSolutionJson.solution.features.length > 0) ||
+            // if there are no components, we don't need to do anything
+            !project.manifests || project.manifests.length < 1) {
+            return;
+        }
+        const occurrences = [];
+        project.manifests.forEach(manifest => {
+            var _a, _b;
+            const resolution = {
+                solution: {
+                    features: [
+                        {
+                            title: `${(_a = project.packageJson) === null || _a === void 0 ? void 0 : _a.name} ${manifest.alias} Feature`,
+                            description: `The feature that activates ${manifest.alias} from the ${(_b = project.packageJson) === null || _b === void 0 ? void 0 : _b.name} solution.`,
+                            id: manifest.id,
+                            version: project.packageSolutionJson.solution.version,
+                            componentIds: [manifest.id]
+                        }
+                    ]
+                }
+            };
+            const node = this.getAstNodeFromFile(project.packageSolutionJson, 'solution');
+            occurrences.push({
+                file: this.file,
+                resolution: JSON.stringify(resolution, null, 2),
+                position: this.getPositionFromNode(node)
+            });
+        });
+        this.addFindingWithOccurrences(occurrences, 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/rules/FN015009_FILE_config_sass_json.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FN015009_FILE_config_sass_json = void 0;
+const FileAddRemoveRule_1 = require("./FileAddRemoveRule");
+class FN015009_FILE_config_sass_json extends FileAddRemoveRule_1.FileAddRemoveRule {
+    constructor(add, contents) {
+        super('./config/sass.json', add, contents);
+    }
+    get id() {
+        return 'FN015009';
+    }
+}
+exports.FN015009_FILE_config_sass_json = FN015009_FILE_config_sass_json;
+//# sourceMappingURL=FN015009_FILE_config_sass_json.js.map

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

@@ -25,6 +25,7 @@ const FN002009_DEVDEP_microsoft_sp_tslint_rules_1 = require("./rules/FN002009_DE
 const FN002019_DEVDEP_spfx_fast_serve_helpers_1 = require("./rules/FN002019_DEVDEP_spfx_fast_serve_helpers");
 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");
 const FN014008_CODE_launch_hostedWorkbench_type_1 = require("./rules/FN014008_CODE_launch_hostedWorkbench_type");
 module.exports = [
@@ -53,6 +54,7 @@ module.exports = [
     new FN002019_DEVDEP_spfx_fast_serve_helpers_1.FN002019_DEVDEP_spfx_fast_serve_helpers('1.14.0'),
     new FN006004_CFG_PS_developer_1.FN006004_CFG_PS_developer('1.14.0'),
     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'),
     new FN014008_CODE_launch_hostedWorkbench_type_1.FN014008_CODE_launch_hostedWorkbench_type('pwa-chrome')
 ];

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

@@ -0,0 +1,59 @@
+"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 FN001034_DEP_microsoft_sp_adaptive_card_extension_base_1 = require("./rules/FN001034_DEP_microsoft_sp_adaptive_card_extension_base");
+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 FN002022_DEVDEP_microsoft_eslint_plugin_spfx_1 = require("./rules/FN002022_DEVDEP_microsoft_eslint_plugin_spfx");
+const FN002023_DEVDEP_microsoft_eslint_config_spfx_1 = require("./rules/FN002023_DEVDEP_microsoft_eslint_config_spfx");
+const FN010001_YORC_version_1 = require("./rules/FN010001_YORC_version");
+const FN015009_FILE_config_sass_json_1 = require("./rules/FN015009_FILE_config_sass_json");
+module.exports = [
+    new FN001001_DEP_microsoft_sp_core_library_1.FN001001_DEP_microsoft_sp_core_library('1.16.1'),
+    new FN001002_DEP_microsoft_sp_lodash_subset_1.FN001002_DEP_microsoft_sp_lodash_subset('1.16.1'),
+    new FN001003_DEP_microsoft_sp_office_ui_fabric_core_1.FN001003_DEP_microsoft_sp_office_ui_fabric_core('1.16.1'),
+    new FN001004_DEP_microsoft_sp_webpart_base_1.FN001004_DEP_microsoft_sp_webpart_base('1.16.1'),
+    new FN001011_DEP_microsoft_sp_dialog_1.FN001011_DEP_microsoft_sp_dialog('1.16.1'),
+    new FN001012_DEP_microsoft_sp_application_base_1.FN001012_DEP_microsoft_sp_application_base('1.16.1'),
+    new FN001014_DEP_microsoft_sp_listview_extensibility_1.FN001014_DEP_microsoft_sp_listview_extensibility('1.16.1'),
+    new FN001021_DEP_microsoft_sp_property_pane_1.FN001021_DEP_microsoft_sp_property_pane('1.16.1'),
+    new FN001023_DEP_microsoft_sp_component_base_1.FN001023_DEP_microsoft_sp_component_base('1.16.1'),
+    new FN001024_DEP_microsoft_sp_diagnostics_1.FN001024_DEP_microsoft_sp_diagnostics('1.16.1'),
+    new FN001025_DEP_microsoft_sp_dynamic_data_1.FN001025_DEP_microsoft_sp_dynamic_data('1.16.1'),
+    new FN001026_DEP_microsoft_sp_extension_base_1.FN001026_DEP_microsoft_sp_extension_base('1.16.1'),
+    new FN001027_DEP_microsoft_sp_http_1.FN001027_DEP_microsoft_sp_http('1.16.1'),
+    new FN001028_DEP_microsoft_sp_list_subscription_1.FN001028_DEP_microsoft_sp_list_subscription('1.16.1'),
+    new FN001029_DEP_microsoft_sp_loader_1.FN001029_DEP_microsoft_sp_loader('1.16.1'),
+    new FN001030_DEP_microsoft_sp_module_interfaces_1.FN001030_DEP_microsoft_sp_module_interfaces('1.16.1'),
+    new FN001031_DEP_microsoft_sp_odata_types_1.FN001031_DEP_microsoft_sp_odata_types('1.16.1'),
+    new FN001032_DEP_microsoft_sp_page_context_1.FN001032_DEP_microsoft_sp_page_context('1.16.1'),
+    new FN001013_DEP_microsoft_decorators_1.FN001013_DEP_microsoft_decorators('1.16.1'),
+    new FN001034_DEP_microsoft_sp_adaptive_card_extension_base_1.FN001034_DEP_microsoft_sp_adaptive_card_extension_base('1.16.1'),
+    new FN002022_DEVDEP_microsoft_eslint_plugin_spfx_1.FN002022_DEVDEP_microsoft_eslint_plugin_spfx('1.16.1'),
+    new FN002023_DEVDEP_microsoft_eslint_config_spfx_1.FN002023_DEVDEP_microsoft_eslint_config_spfx('1.16.1'),
+    new FN002001_DEVDEP_microsoft_sp_build_web_1.FN002001_DEVDEP_microsoft_sp_build_web('1.16.1'),
+    new FN002002_DEVDEP_microsoft_sp_module_interfaces_1.FN002002_DEVDEP_microsoft_sp_module_interfaces('1.16.1'),
+    new FN010001_YORC_version_1.FN010001_YORC_version('1.16.1'),
+    new FN015009_FILE_config_sass_json_1.FN015009_FILE_config_sass_json(true, `{
+  "$schema": "https://developer.microsoft.com/json-schemas/core-build/sass.schema.json"
+}`)
+];
+//# sourceMappingURL=upgrade-1.16.1.js.map

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

@@ -64,7 +64,8 @@ class SpfxProjectUpgradeCommand extends base_project_command_1.BaseProjectComman
             '1.14.0',
             '1.15.0',
             '1.15.2',
-            '1.16.0'
+            '1.16.0',
+            '1.16.1'
         ];
         __classPrivateFieldGet(this, _SpfxProjectUpgradeCommand_instances, "m", _SpfxProjectUpgradeCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpfxProjectUpgradeCommand_instances, "m", _SpfxProjectUpgradeCommand_initOptions).call(this);