@pnp/cli-microsoft365 5.7.0 → 5.8.0-beta.03ce984

package/dist/m365/spfx/commands/project/project-rename.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());
+    });
+};
 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");
@@ -137,37 +146,36 @@ class SpfxProjectRenameCommand extends base_project_command_1.BaseProjectCommand
     get description() {
         return 'Renames SharePoint Framework project';
     }
-    commandAction(logger, args, cb) {
-        this.projectRootPath = this.getProjectRoot(process.cwd());
-        if (this.projectRootPath === null) {
-            cb(new Command_1.CommandError(`Couldn't find project root folder`, SpfxProjectRenameCommand.ERROR_NO_PROJECT_ROOT_FOLDER));
-            return;
-        }
-        const packageJson = this.getProject(this.projectRootPath).packageJson;
-        const projectName = packageJson.name;
-        let newId = '';
-        if (args.options.generateNewId) {
-            newId = this.generateNewId();
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.projectRootPath = this.getProjectRoot(process.cwd());
+            if (this.projectRootPath === null) {
+                throw new Command_1.CommandError(`Couldn't find project root folder`, SpfxProjectRenameCommand.ERROR_NO_PROJECT_ROOT_FOLDER);
+            }
+            const packageJson = this.getProject(this.projectRootPath).packageJson;
+            const projectName = packageJson.name;
+            let newId = '';
+            if (args.options.generateNewId) {
+                newId = this.generateNewId();
+                if (this.debug) {
+                    logger.logToStderr('Created new solution id');
+                    logger.logToStderr(newId);
+                }
+            }
             if (this.debug) {
-                logger.logToStderr('Created new solution id');
-                logger.logToStderr(newId);
-            }
-        }
-        if (this.debug) {
-            logger.logToStderr(`Renaming SharePoint Framework project to '${args.options.newName}'`);
-        }
-        try {
-            this.replacePackageJsonContent(path.join(this.projectRootPath, 'package.json'), args, logger);
-            this.replaceYoRcJsonContent(path.join(this.projectRootPath, '.yo-rc.json'), newId, args, logger);
-            this.replacePackageSolutionJsonContent(path.join(this.projectRootPath, 'config', 'package-solution.json'), projectName, newId, args, logger);
-            this.replaceDeployAzureStorageJsonContent(path.join(this.projectRootPath, 'config', 'deploy-azure-storage.json'), args, logger);
-            this.replaceReadMeContent(path.join(this.projectRootPath, 'README.md'), projectName, args, logger);
-        }
-        catch (error) {
-            cb(new Command_1.CommandError(error));
-            return;
-        }
-        cb();
+                logger.logToStderr(`Renaming SharePoint Framework project to '${args.options.newName}'`);
+            }
+            try {
+                this.replacePackageJsonContent(path.join(this.projectRootPath, 'package.json'), args, logger);
+                this.replaceYoRcJsonContent(path.join(this.projectRootPath, '.yo-rc.json'), newId, args, logger);
+                this.replacePackageSolutionJsonContent(path.join(this.projectRootPath, 'config', 'package-solution.json'), projectName, newId, args, logger);
+                this.replaceDeployAzureStorageJsonContent(path.join(this.projectRootPath, 'config', 'deploy-azure-storage.json'), args, logger);
+                this.replaceReadMeContent(path.join(this.projectRootPath, 'README.md'), projectName, args, logger);
+            }
+            catch (error) {
+                throw new Command_1.CommandError(error);
+            }
+        });
     }
 }
 _SpfxProjectRenameCommand_instances = new WeakSet(), _SpfxProjectRenameCommand_initTelemetry = function _SpfxProjectRenameCommand_initTelemetry() {

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

@@ -0,0 +1,47 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FN010008_YORC_nodeVersion = void 0;
+const JsonRule_1 = require("../../JsonRule");
+const process = require("process");
+class FN010008_YORC_nodeVersion extends JsonRule_1.JsonRule {
+    constructor() {
+        super();
+    }
+    get id() {
+        return 'FN010008';
+    }
+    get title() {
+        return '.yo-rc.json nodeVersion';
+    }
+    get description() {
+        return `Update nodeVersion in .yo-rc.json`;
+    }
+    get resolution() {
+        return `{
+  "@microsoft/generator-sharepoint": {
+    "nodeVersion": "${process.version.substring(1)}"
+  }
+}`;
+    }
+    get resolutionType() {
+        return 'json';
+    }
+    get severity() {
+        return 'Recommended';
+    }
+    get file() {
+        return './.yo-rc.json';
+    }
+    visit(project, findings) {
+        if (!project.yoRcJson) {
+            return;
+        }
+        const nodeVersion = process.version.substring(1);
+        if (project.yoRcJson["@microsoft/generator-sharepoint"].nodeVersion !== nodeVersion) {
+            const node = this.getAstNodeFromFile(project.yoRcJson, '@microsoft/generator-sharepoint.nodeVersion');
+            this.addFindingWithPosition(findings, node);
+        }
+    }
+}
+exports.FN010008_YORC_nodeVersion = FN010008_YORC_nodeVersion;
+//# sourceMappingURL=FN010008_YORC_nodeVersion.js.map

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

@@ -0,0 +1,48 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FN021003_PKG_engines_node = void 0;
+const JsonRule_1 = require("../../JsonRule");
+class FN021003_PKG_engines_node extends JsonRule_1.JsonRule {
+    constructor(version) {
+        super();
+        this.version = version;
+    }
+    get id() {
+        return 'FN021003';
+    }
+    get title() {
+        return 'package.json engines.node';
+    }
+    get description() {
+        return 'Update package.json engines.node property';
+    }
+    get resolution() {
+        return `{
+  "engines": {
+    "node": "${this.version}"
+  }
+}`;
+    }
+    get resolutionType() {
+        return 'json';
+    }
+    get severity() {
+        return 'Required';
+    }
+    get file() {
+        return './package.json';
+    }
+    visit(project, findings) {
+        if (!project.packageJson) {
+            return;
+        }
+        if (!project.packageJson.engines ||
+            !project.packageJson.engines.node ||
+            project.packageJson.engines.node !== this.version) {
+            const node = this.getAstNodeFromFile(project.packageJson, 'engines.node');
+            this.addFindingWithPosition(findings, node);
+        }
+    }
+}
+exports.FN021003_PKG_engines_node = FN021003_PKG_engines_node;
+//# sourceMappingURL=FN021003_PKG_engines_node.js.map

package/dist/m365/spfx/commands/project/project-upgrade/upgrade-1.16.0-beta.1.js

@@ -0,0 +1,61 @@
+"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 FN001022_DEP_office_ui_fabric_react_1 = require("./rules/FN001022_DEP_office_ui_fabric_react");
+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 FN010008_YORC_nodeVersion_1 = require("./rules/FN010008_YORC_nodeVersion");
+const FN021003_PKG_engines_node_1 = require("./rules/FN021003_PKG_engines_node");
+module.exports = [
+    new FN001001_DEP_microsoft_sp_core_library_1.FN001001_DEP_microsoft_sp_core_library('1.16.0-beta.1'),
+    new FN001021_DEP_microsoft_sp_property_pane_1.FN001021_DEP_microsoft_sp_property_pane('1.16.0-beta.1'),
+    new FN001004_DEP_microsoft_sp_webpart_base_1.FN001004_DEP_microsoft_sp_webpart_base('1.16.0-beta.1'),
+    new FN001002_DEP_microsoft_sp_lodash_subset_1.FN001002_DEP_microsoft_sp_lodash_subset('1.16.0-beta.1'),
+    new FN001003_DEP_microsoft_sp_office_ui_fabric_core_1.FN001003_DEP_microsoft_sp_office_ui_fabric_core('1.16.0-beta.1'),
+    new FN001034_DEP_microsoft_sp_adaptive_card_extension_base_1.FN001034_DEP_microsoft_sp_adaptive_card_extension_base('1.16.0-beta.1'),
+    new FN001022_DEP_office_ui_fabric_react_1.FN001022_DEP_office_ui_fabric_react('7.192.0'),
+    new FN001023_DEP_microsoft_sp_component_base_1.FN001023_DEP_microsoft_sp_component_base('1.16.0-beta.1'),
+    new FN001024_DEP_microsoft_sp_diagnostics_1.FN001024_DEP_microsoft_sp_diagnostics('1.16.0-beta.1'),
+    new FN001025_DEP_microsoft_sp_dynamic_data_1.FN001025_DEP_microsoft_sp_dynamic_data('1.16.0-beta.1'),
+    new FN001026_DEP_microsoft_sp_extension_base_1.FN001026_DEP_microsoft_sp_extension_base('1.16.0-beta.1'),
+    new FN001027_DEP_microsoft_sp_http_1.FN001027_DEP_microsoft_sp_http('1.16.0-beta.1'),
+    new FN001028_DEP_microsoft_sp_list_subscription_1.FN001028_DEP_microsoft_sp_list_subscription('1.16.0-beta.1'),
+    new FN001029_DEP_microsoft_sp_loader_1.FN001029_DEP_microsoft_sp_loader('1.16.0-beta.1'),
+    new FN001030_DEP_microsoft_sp_module_interfaces_1.FN001030_DEP_microsoft_sp_module_interfaces('1.16.0-beta.1'),
+    new FN001031_DEP_microsoft_sp_odata_types_1.FN001031_DEP_microsoft_sp_odata_types('1.16.0-beta.1'),
+    new FN001032_DEP_microsoft_sp_page_context_1.FN001032_DEP_microsoft_sp_page_context('1.16.0-beta.1'),
+    new FN001013_DEP_microsoft_decorators_1.FN001013_DEP_microsoft_decorators('1.16.0-beta.1'),
+    new FN001011_DEP_microsoft_sp_dialog_1.FN001011_DEP_microsoft_sp_dialog('1.16.0-beta.1'),
+    new FN001012_DEP_microsoft_sp_application_base_1.FN001012_DEP_microsoft_sp_application_base('1.16.0-beta.1'),
+    new FN001014_DEP_microsoft_sp_listview_extensibility_1.FN001014_DEP_microsoft_sp_listview_extensibility('1.16.0-beta.1'),
+    new FN002022_DEVDEP_microsoft_eslint_plugin_spfx_1.FN002022_DEVDEP_microsoft_eslint_plugin_spfx('1.16.0-beta.1'),
+    new FN002023_DEVDEP_microsoft_eslint_config_spfx_1.FN002023_DEVDEP_microsoft_eslint_config_spfx('1.16.0-beta.1'),
+    new FN002001_DEVDEP_microsoft_sp_build_web_1.FN002001_DEVDEP_microsoft_sp_build_web('1.16.0-beta.1'),
+    new FN002002_DEVDEP_microsoft_sp_module_interfaces_1.FN002002_DEVDEP_microsoft_sp_module_interfaces('1.16.0-beta.1'),
+    new FN010001_YORC_version_1.FN010001_YORC_version('1.16.0-beta.1'),
+    new FN010008_YORC_nodeVersion_1.FN010008_YORC_nodeVersion(),
+    new FN021003_PKG_engines_node_1.FN021003_PKG_engines_node('>=16.13.0 <17.0.0')
+];
+//# sourceMappingURL=upgrade-1.16.0-beta.1.js.map

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

@@ -18,6 +18,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 utils_1 = require("../../../../utils");
 const commands_1 = require("../../commands");
@@ -62,7 +64,8 @@ class SpfxProjectUpgradeCommand extends base_project_command_1.BaseProjectComman
             '1.13.1',
             '1.14.0',
             '1.15.0',
-            '1.15.2'
+            '1.15.2',
+            '1.16.0-beta.1'
         ];
         __classPrivateFieldGet(this, _SpfxProjectUpgradeCommand_instances, "m", _SpfxProjectUpgradeCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpfxProjectUpgradeCommand_instances, "m", _SpfxProjectUpgradeCommand_initOptions).call(this);
@@ -74,196 +77,190 @@ class SpfxProjectUpgradeCommand extends base_project_command_1.BaseProjectComman
     get description() {
         return 'Upgrades SharePoint Framework project to the specified version';
     }
-    commandAction(logger, args, cb) {
-        this.projectRootPath = this.getProjectRoot(process.cwd());
-        if (this.projectRootPath === null) {
-            cb(new Command_1.CommandError(`Couldn't find project root folder`, SpfxProjectUpgradeCommand.ERROR_NO_PROJECT_ROOT_FOLDER));
-            return;
-        }
-        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];
-        // }
-        this.packageManager = args.options.packageManager || 'npm';
-        this.shell = args.options.shell || 'bash';
-        if (this.supportedVersions.indexOf(this.toVersion) < 0) {
-            cb(new Command_1.CommandError(`CLI for Microsoft 365 doesn't support upgrading SharePoint Framework projects to version ${this.toVersion}. Supported versions are ${this.supportedVersions.join(', ')}`, SpfxProjectUpgradeCommand.ERROR_UNSUPPORTED_TO_VERSION));
-            return;
-        }
-        this.projectVersion = this.getProjectVersion();
-        if (!this.projectVersion) {
-            cb(new Command_1.CommandError(`Unable to determine the version of the current SharePoint Framework project`, SpfxProjectUpgradeCommand.ERROR_NO_VERSION));
-            return;
-        }
-        const pos = this.supportedVersions.indexOf(this.projectVersion);
-        if (pos < 0) {
-            cb(new Command_1.CommandError(`CLI for Microsoft 365 doesn't support upgrading projects built using SharePoint Framework v${this.projectVersion}`, SpfxProjectUpgradeCommand.ERROR_UNSUPPORTED_FROM_VERSION));
-            return;
-        }
-        const posTo = this.supportedVersions.indexOf(this.toVersion);
-        if (pos > posTo) {
-            cb(new Command_1.CommandError('You cannot downgrade a project', SpfxProjectUpgradeCommand.ERROR_NO_DOWNGRADE));
-            return;
-        }
-        if (pos === posTo) {
-            logger.log(`Project doesn't need to be upgraded`);
-            cb();
-            return;
-        }
-        if (this.verbose) {
-            logger.logToStderr('Collecting project...');
-        }
-        const project = this.getProject(this.projectRootPath);
-        if (this.debug) {
-            logger.logToStderr('Collected project');
-            logger.logToStderr(project);
-        }
-        // reverse the list of versions to upgrade to, so that most recent findings
-        // will end up on top already. Saves us reversing a larger array later
-        const versionsToUpgradeTo = this.supportedVersions.slice(pos + 1, posTo + 1).reverse();
-        try {
-            versionsToUpgradeTo.forEach(v => {
-                const rules = require(`./project-upgrade/upgrade-${v}`);
-                rules.forEach(r => {
-                    r.visit(project, this.allFindings);
-                });
-            });
-        }
-        catch (e) {
-            cb(new Command_1.CommandError(e.message));
-            return;
-        }
-        if (this.packageManager === 'npm') {
-            const npmDedupeRule = new FN017001_MISC_npm_dedupe_1.FN017001_MISC_npm_dedupe();
-            npmDedupeRule.visit(project, this.allFindings);
-        }
-        // dedupe
-        const findings = this.allFindings.filter((f, i) => {
-            const firstFindingPos = this.allFindings.findIndex(f1 => f1.id === f.id);
-            return i === firstFindingPos;
-        });
-        // remove superseded findings
-        findings
-            // get findings that supersede other findings
-            .filter(f => f.supersedes.length > 0)
-            .forEach(f => {
-            f.supersedes.forEach(s => {
-                // find the superseded finding
-                const i = findings.findIndex(f1 => f1.id === s);
-                if (i > -1) {
-                    // ...and remove it from findings
-                    findings.splice(i, 1);
-                }
-            });
-        });
-        // remove findings without title
-        findings
-            .forEach(f => {
-            if (!f.title) {
-                // find the finding
-                const i = findings.findIndex(f1 => f1.id === f.id);
-                if (i > -1) {
-                    // ...and remove it from findings
-                    findings.splice(i, 1);
-                }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.projectRootPath = this.getProjectRoot(process.cwd());
+            if (this.projectRootPath === null) {
+                throw new Command_1.CommandError(`Couldn't find project root folder`, SpfxProjectUpgradeCommand.ERROR_NO_PROJECT_ROOT_FOLDER);
             }
-        });
-        // flatten
-        const findingsToReport = [].concat.apply([], findings.map(f => {
-            return f.occurrences.map(o => {
-                return {
-                    description: f.description,
-                    id: f.id,
-                    file: o.file,
-                    position: o.position,
-                    resolution: o.resolution,
-                    resolutionType: f.resolutionType,
-                    severity: f.severity,
-                    title: f.title
-                };
-            });
-        }));
-        // replace package operation tokens with command for the specific package manager
-        findingsToReport.forEach(f => {
-            // matches must be in this particular order to avoid false matches, eg.
-            // uninstallDev contains install
-            if (f.resolution.startsWith('uninstallDev')) {
-                f.resolution = f.resolution.replace('uninstallDev', utils_1.packageManager.getPackageManagerCommand('uninstallDev', this.packageManager));
-                return;
+            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 &&
+                (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];
             }
-            if (f.resolution.startsWith('installDev')) {
-                f.resolution = f.resolution.replace('installDev', utils_1.packageManager.getPackageManagerCommand('installDev', this.packageManager));
-                return;
+            this.packageManager = args.options.packageManager || 'npm';
+            this.shell = args.options.shell || 'bash';
+            if (this.supportedVersions.indexOf(this.toVersion) < 0) {
+                throw new Command_1.CommandError(`CLI for Microsoft 365 doesn't support upgrading SharePoint Framework projects to version ${this.toVersion}. Supported versions are ${this.supportedVersions.join(', ')}`, SpfxProjectUpgradeCommand.ERROR_UNSUPPORTED_TO_VERSION);
             }
-            if (f.resolution.startsWith('uninstall')) {
-                f.resolution = f.resolution.replace('uninstall', utils_1.packageManager.getPackageManagerCommand('uninstall', this.packageManager));
-                return;
+            this.projectVersion = this.getProjectVersion();
+            if (!this.projectVersion) {
+                throw new Command_1.CommandError(`Unable to determine the version of the current SharePoint Framework project`, SpfxProjectUpgradeCommand.ERROR_NO_VERSION);
             }
-            if (f.resolution.startsWith('install')) {
-                f.resolution = f.resolution.replace('install', utils_1.packageManager.getPackageManagerCommand('install', this.packageManager));
-                return;
+            const pos = this.supportedVersions.indexOf(this.projectVersion);
+            if (pos < 0) {
+                throw new Command_1.CommandError(`CLI for Microsoft 365 doesn't support upgrading projects built using SharePoint Framework v${this.projectVersion}`, SpfxProjectUpgradeCommand.ERROR_UNSUPPORTED_FROM_VERSION);
             }
-            // copy support for multiple shells
-            if (f.resolution.startsWith('copy_cmd')) {
-                f.resolution = f.resolution.replace('copy_cmd', utils_1.fsUtil.getCopyCommand('copyCommand', this.shell));
-                f.resolution = f.resolution.replace('DestinationParam', utils_1.fsUtil.getCopyCommand('copyDestinationParam', this.shell));
-                return;
+            const posTo = this.supportedVersions.indexOf(this.toVersion);
+            if (pos > posTo) {
+                throw new Command_1.CommandError('You cannot downgrade a project', SpfxProjectUpgradeCommand.ERROR_NO_DOWNGRADE);
             }
-            // createdir support for multiple shells
-            if (f.resolution.startsWith('create_dir_cmd')) {
-                f.resolution = f.resolution.replace('create_dir_cmd', utils_1.fsUtil.getDirectoryCommand('createDirectoryCommand', this.shell));
-                f.resolution = f.resolution.replace('NameParam', utils_1.fsUtil.getDirectoryCommand('createDirectoryNameParam', this.shell));
-                f.resolution = f.resolution.replace('PathParam', utils_1.fsUtil.getDirectoryCommand('createDirectoryPathParam', this.shell));
-                f.resolution = f.resolution.replace('ItemTypeParam', utils_1.fsUtil.getDirectoryCommand('createDirectoryItemTypeParam', this.shell));
+            if (pos === posTo) {
+                logger.log(`Project doesn't need to be upgraded`);
                 return;
             }
-            // 'Add' support for multiple shells
-            if (f.resolution.startsWith('add_cmd')) {
-                const pathStart = f.resolution.indexOf('[BEFOREPATH]') + '[BEFOREPATH]'.length;
-                const pathEnd = f.resolution.indexOf('[AFTERPATH]');
-                const filePath = f.resolution.substring(pathStart, pathEnd);
-                const contentStart = f.resolution.indexOf('[BEFORECONTENT]') + '[BEFORECONTENT]'.length;
-                const contentEnd = f.resolution.indexOf('[AFTERCONTENT]');
-                const fileContent = f.resolution.substring(contentStart, contentEnd);
-                f.resolution = utils_1.fsUtil.getAddCommand('addFileCommand', this.shell);
-                f.resolution = f.resolution.replace('[FILECONTENT]', fileContent);
-                f.resolution = f.resolution.replace('[FILEPATH]', filePath);
-                f.resolution = f.resolution.replace('[BEFOREPATH]', ' ');
-                f.resolution = f.resolution.replace('[AFTERPATH]', ' ');
-                f.resolution = f.resolution.replace('[BEFORECONTENT]', ' ');
-                f.resolution = f.resolution.replace('[AFTERCONTENT]', ' ');
-                return;
+            if (this.verbose) {
+                logger.logToStderr('Collecting project...');
             }
-            // 'Remove' support for multiple shells
-            if (f.resolution.startsWith('remove_cmd')) {
-                f.resolution = f.resolution.replace('remove_cmd', utils_1.fsUtil.getRemoveCommand('removeFileCommand', this.shell));
-                return;
+            const project = this.getProject(this.projectRootPath);
+            if (this.debug) {
+                logger.logToStderr('Collected project');
+                logger.logToStderr(project);
+            }
+            // reverse the list of versions to upgrade to, so that most recent findings
+            // will end up on top already. Saves us reversing a larger array later
+            const versionsToUpgradeTo = this.supportedVersions.slice(pos + 1, posTo + 1).reverse();
+            try {
+                versionsToUpgradeTo.forEach(v => {
+                    const rules = require(`./project-upgrade/upgrade-${v}`);
+                    rules.forEach(r => {
+                        r.visit(project, this.allFindings);
+                    });
+                });
+            }
+            catch (e) {
+                throw new Command_1.CommandError(e.message);
+            }
+            if (this.packageManager === 'npm') {
+                const npmDedupeRule = new FN017001_MISC_npm_dedupe_1.FN017001_MISC_npm_dedupe();
+                npmDedupeRule.visit(project, this.allFindings);
+            }
+            // dedupe
+            const findings = this.allFindings.filter((f, i) => {
+                const firstFindingPos = this.allFindings.findIndex(f1 => f1.id === f.id);
+                return i === firstFindingPos;
+            });
+            // remove superseded findings
+            findings
+                // get findings that supersede other findings
+                .filter(f => f.supersedes.length > 0)
+                .forEach(f => {
+                f.supersedes.forEach(s => {
+                    // find the superseded finding
+                    const i = findings.findIndex(f1 => f1.id === s);
+                    if (i > -1) {
+                        // ...and remove it from findings
+                        findings.splice(i, 1);
+                    }
+                });
+            });
+            // remove findings without title
+            findings
+                .forEach(f => {
+                if (!f.title) {
+                    // find the finding
+                    const i = findings.findIndex(f1 => f1.id === f.id);
+                    if (i > -1) {
+                        // ...and remove it from findings
+                        findings.splice(i, 1);
+                    }
+                }
+            });
+            // flatten
+            const findingsToReport = [].concat.apply([], findings.map(f => {
+                return f.occurrences.map(o => {
+                    return {
+                        description: f.description,
+                        id: f.id,
+                        file: o.file,
+                        position: o.position,
+                        resolution: o.resolution,
+                        resolutionType: f.resolutionType,
+                        severity: f.severity,
+                        title: f.title
+                    };
+                });
+            }));
+            // replace package operation tokens with command for the specific package manager
+            findingsToReport.forEach(f => {
+                // matches must be in this particular order to avoid false matches, eg.
+                // uninstallDev contains install
+                if (f.resolution.startsWith('uninstallDev')) {
+                    f.resolution = f.resolution.replace('uninstallDev', utils_1.packageManager.getPackageManagerCommand('uninstallDev', this.packageManager));
+                    return;
+                }
+                if (f.resolution.startsWith('installDev')) {
+                    f.resolution = f.resolution.replace('installDev', utils_1.packageManager.getPackageManagerCommand('installDev', this.packageManager));
+                    return;
+                }
+                if (f.resolution.startsWith('uninstall')) {
+                    f.resolution = f.resolution.replace('uninstall', utils_1.packageManager.getPackageManagerCommand('uninstall', this.packageManager));
+                    return;
+                }
+                if (f.resolution.startsWith('install')) {
+                    f.resolution = f.resolution.replace('install', utils_1.packageManager.getPackageManagerCommand('install', this.packageManager));
+                    return;
+                }
+                // copy support for multiple shells
+                if (f.resolution.startsWith('copy_cmd')) {
+                    f.resolution = f.resolution.replace('copy_cmd', utils_1.fsUtil.getCopyCommand('copyCommand', this.shell));
+                    f.resolution = f.resolution.replace('DestinationParam', utils_1.fsUtil.getCopyCommand('copyDestinationParam', this.shell));
+                    return;
+                }
+                // createdir support for multiple shells
+                if (f.resolution.startsWith('create_dir_cmd')) {
+                    f.resolution = f.resolution.replace('create_dir_cmd', utils_1.fsUtil.getDirectoryCommand('createDirectoryCommand', this.shell));
+                    f.resolution = f.resolution.replace('NameParam', utils_1.fsUtil.getDirectoryCommand('createDirectoryNameParam', this.shell));
+                    f.resolution = f.resolution.replace('PathParam', utils_1.fsUtil.getDirectoryCommand('createDirectoryPathParam', this.shell));
+                    f.resolution = f.resolution.replace('ItemTypeParam', utils_1.fsUtil.getDirectoryCommand('createDirectoryItemTypeParam', this.shell));
+                    return;
+                }
+                // 'Add' support for multiple shells
+                if (f.resolution.startsWith('add_cmd')) {
+                    const pathStart = f.resolution.indexOf('[BEFOREPATH]') + '[BEFOREPATH]'.length;
+                    const pathEnd = f.resolution.indexOf('[AFTERPATH]');
+                    const filePath = f.resolution.substring(pathStart, pathEnd);
+                    const contentStart = f.resolution.indexOf('[BEFORECONTENT]') + '[BEFORECONTENT]'.length;
+                    const contentEnd = f.resolution.indexOf('[AFTERCONTENT]');
+                    const fileContent = f.resolution.substring(contentStart, contentEnd);
+                    f.resolution = utils_1.fsUtil.getAddCommand('addFileCommand', this.shell);
+                    f.resolution = f.resolution.replace('[FILECONTENT]', fileContent);
+                    f.resolution = f.resolution.replace('[FILEPATH]', filePath);
+                    f.resolution = f.resolution.replace('[BEFOREPATH]', ' ');
+                    f.resolution = f.resolution.replace('[AFTERPATH]', ' ');
+                    f.resolution = f.resolution.replace('[BEFORECONTENT]', ' ');
+                    f.resolution = f.resolution.replace('[AFTERCONTENT]', ' ');
+                    return;
+                }
+                // 'Remove' support for multiple shells
+                if (f.resolution.startsWith('remove_cmd')) {
+                    f.resolution = f.resolution.replace('remove_cmd', utils_1.fsUtil.getRemoveCommand('removeFileCommand', this.shell));
+                    return;
+                }
+            });
+            switch (args.options.output) {
+                case 'text':
+                    logger.log(this.getTextReport(findingsToReport));
+                    break;
+                case 'json':
+                    logger.log(findingsToReport);
+                    break;
+                case 'tour':
+                    this.writeReportTourFolder(this.getTourReport(findingsToReport, project));
+                    break;
+                case 'md':
+                    logger.log(this.getMdReport(findingsToReport));
+                    break;
+                default:
+                    logger.log(findingsToReport);
             }
         });
-        switch (args.options.output) {
-            case 'text':
-                logger.log(this.getTextReport(findingsToReport));
-                break;
-            case 'json':
-                logger.log(findingsToReport);
-                break;
-            case 'tour':
-                this.writeReportTourFolder(this.getTourReport(findingsToReport, project));
-                break;
-            case 'md':
-                logger.log(this.getMdReport(findingsToReport));
-                break;
-            default:
-                logger.log(findingsToReport);
-        }
-        cb();
     }
     writeReportTourFolder(findingsToReport) {
         const toursFolder = path.join(this.projectRootPath, '.tours');
@@ -478,9 +475,9 @@ _SpfxProjectUpgradeCommand_instances = new WeakSet(), _SpfxProjectUpgradeCommand
             preview: args.options.preview
         });
         // uncomment to support upgrading to preview releases
-        // if (prerelease(this.telemetryProperties.toVersion) && !args.options.preview) {
-        //   this.telemetryProperties.toVersion = this.supportedVersions[this.supportedVersions.length - 2];
-        // }
+        if ((0, semver_1.prerelease)(this.telemetryProperties.toVersion) && !args.options.preview) {
+            this.telemetryProperties.toVersion = this.supportedVersions[this.supportedVersions.length - 2];
+        }
     });
 }, _SpfxProjectUpgradeCommand_initOptions = function _SpfxProjectUpgradeCommand_initOptions() {
     this.options.unshift({