@pnp/cli-microsoft365 5.1.0-beta.55e5dfb → 5.1.0-beta.94e050c

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PackageRule = void 0;
-const JsonRule_1 = require("./JsonRule");
+const JsonRule_1 = require("../../JsonRule");
 class PackageRule extends JsonRule_1.JsonRule {
     constructor(propertyName, add, propertyValue) {
         super();

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ResolutionRule = void 0;
-const JsonRule_1 = require("./JsonRule");
+const JsonRule_1 = require("../../JsonRule");
 class ResolutionRule extends JsonRule_1.JsonRule {
     constructor(packageName, packageVersion) {
         super();

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

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ScssRule = void 0;
 const path = require("path");
-const Rule_1 = require("./Rule");
+const Rule_1 = require("../../Rule");
 class ScssRule extends Rule_1.Rule {
     get resolutionType() {
         return 'scss';

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

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TsRule = void 0;
 const path = require("path");
-const Rule_1 = require("./Rule");
+const Rule_1 = require("../../Rule");
 class TsRule extends Rule_1.Rule {
     get resolution() {
         return '';

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

@@ -40,7 +40,6 @@ const FN012017_TSC_extends_1 = require("./rules/FN012017_TSC_extends");
 const FN012018_TSC_lib_es2015_promise_1 = require("./rules/FN012018_TSC_lib_es2015_promise");
 const FN012019_TSC_types_es6_promise_1 = require("./rules/FN012019_TSC_types_es6_promise");
 const FN013002_GULP_serveTask_1 = require("./rules/FN013002_GULP_serveTask");
-const FN015006_FILE_editorconfig_1 = require("./rules/FN015006_FILE_editorconfig");
 const FN019002_TSL_extends_1 = require("./rules/FN019002_TSL_extends");
 const FN021002_PKG_engines_1 = require("./rules/FN021002_PKG_engines");
 module.exports = [
@@ -84,7 +83,6 @@ module.exports = [
     new FN012018_TSC_lib_es2015_promise_1.FN012018_TSC_lib_es2015_promise(),
     new FN012019_TSC_types_es6_promise_1.FN012019_TSC_types_es6_promise(false),
     new FN013002_GULP_serveTask_1.FN013002_GULP_serveTask(),
-    new FN015006_FILE_editorconfig_1.FN015006_FILE_editorconfig(false),
     new FN019002_TSL_extends_1.FN019002_TSL_extends('./node_modules/@microsoft/sp-tslint-rules/base-tslint.json'),
     new FN021002_PKG_engines_1.FN021002_PKG_engines(false)
 ];

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

@@ -0,0 +1,63 @@
+"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 FN001033_DEP_tslib_1 = require("./rules/FN001033_DEP_tslib");
+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 FN002007_DEVDEP_ajv_1 = require("./rules/FN002007_DEVDEP_ajv");
+const FN002009_DEVDEP_microsoft_sp_tslint_rules_1 = require("./rules/FN002009_DEVDEP_microsoft_sp_tslint_rules");
+const FN002013_DEVDEP_types_webpack_env_1 = require("./rules/FN002013_DEVDEP_types_webpack_env");
+const FN006004_CFG_PS_developer_1 = require("./rules/FN006004_CFG_PS_developer");
+const FN010001_YORC_version_1 = require("./rules/FN010001_YORC_version");
+const FN023002_GITIGNORE_heft_1 = require("./rules/FN023002_GITIGNORE_heft");
+module.exports = [
+    new FN001001_DEP_microsoft_sp_core_library_1.FN001001_DEP_microsoft_sp_core_library('1.15.0-beta.1'),
+    new FN001002_DEP_microsoft_sp_lodash_subset_1.FN001002_DEP_microsoft_sp_lodash_subset('1.15.0-beta.1'),
+    new FN001003_DEP_microsoft_sp_office_ui_fabric_core_1.FN001003_DEP_microsoft_sp_office_ui_fabric_core('1.15.0-beta.1'),
+    new FN001004_DEP_microsoft_sp_webpart_base_1.FN001004_DEP_microsoft_sp_webpart_base('1.15.0-beta.1'),
+    new FN001011_DEP_microsoft_sp_dialog_1.FN001011_DEP_microsoft_sp_dialog('1.15.0-beta.1'),
+    new FN001012_DEP_microsoft_sp_application_base_1.FN001012_DEP_microsoft_sp_application_base('1.15.0-beta.1'),
+    new FN001013_DEP_microsoft_decorators_1.FN001013_DEP_microsoft_decorators('1.15.0-beta.1'),
+    new FN001014_DEP_microsoft_sp_listview_extensibility_1.FN001014_DEP_microsoft_sp_listview_extensibility('1.15.0-beta.1'),
+    new FN001021_DEP_microsoft_sp_property_pane_1.FN001021_DEP_microsoft_sp_property_pane('1.15.0-beta.1'),
+    new FN001022_DEP_office_ui_fabric_react_1.FN001022_DEP_office_ui_fabric_react('7.181.1'),
+    new FN001023_DEP_microsoft_sp_component_base_1.FN001023_DEP_microsoft_sp_component_base('1.15.0-beta.1'),
+    new FN001024_DEP_microsoft_sp_diagnostics_1.FN001024_DEP_microsoft_sp_diagnostics('1.15.0-beta.1'),
+    new FN001025_DEP_microsoft_sp_dynamic_data_1.FN001025_DEP_microsoft_sp_dynamic_data('1.15.0-beta.1'),
+    new FN001026_DEP_microsoft_sp_extension_base_1.FN001026_DEP_microsoft_sp_extension_base('1.15.0-beta.1'),
+    new FN001027_DEP_microsoft_sp_http_1.FN001027_DEP_microsoft_sp_http('1.15.0-beta.1'),
+    new FN001028_DEP_microsoft_sp_list_subscription_1.FN001028_DEP_microsoft_sp_list_subscription('1.15.0-beta.1'),
+    new FN001029_DEP_microsoft_sp_loader_1.FN001029_DEP_microsoft_sp_loader('1.15.0-beta.1'),
+    new FN001030_DEP_microsoft_sp_module_interfaces_1.FN001030_DEP_microsoft_sp_module_interfaces('1.15.0-beta.1'),
+    new FN001031_DEP_microsoft_sp_odata_types_1.FN001031_DEP_microsoft_sp_odata_types('1.15.0-beta.1'),
+    new FN001032_DEP_microsoft_sp_page_context_1.FN001032_DEP_microsoft_sp_page_context('1.15.0-beta.1'),
+    new FN001033_DEP_tslib_1.FN001033_DEP_tslib('1.13.0'),
+    new FN002001_DEVDEP_microsoft_sp_build_web_1.FN002001_DEVDEP_microsoft_sp_build_web('1.15.0-beta.1'),
+    new FN002002_DEVDEP_microsoft_sp_module_interfaces_1.FN002002_DEVDEP_microsoft_sp_module_interfaces('1.15.0-beta.1'),
+    new FN002007_DEVDEP_ajv_1.FN002007_DEVDEP_ajv('6.12.5'),
+    new FN002009_DEVDEP_microsoft_sp_tslint_rules_1.FN002009_DEVDEP_microsoft_sp_tslint_rules('1.15.0-beta.1'),
+    new FN002013_DEVDEP_types_webpack_env_1.FN002013_DEVDEP_types_webpack_env('1.15.2'),
+    new FN006004_CFG_PS_developer_1.FN006004_CFG_PS_developer('1.15.0-beta.1'),
+    new FN010001_YORC_version_1.FN010001_YORC_version('1.15.0-beta.1'),
+    new FN023002_GITIGNORE_heft_1.FN023002_GITIGNORE_heft()
+];
+//# sourceMappingURL=upgrade-1.15.0-beta.1.js.map

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

@@ -3,7 +3,10 @@ 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");
 const base_project_command_1 = require("./base-project-command");
 const FN017001_MISC_npm_dedupe_1 = require("./project-upgrade/rules/FN017001_MISC_npm_dedupe");
@@ -43,7 +46,8 @@ class SpfxProjectUpgradeCommand extends base_project_command_1.BaseProjectComman
             '1.12.1',
             '1.13.0',
             '1.13.1',
-            '1.14.0'
+            '1.14.0',
+            '1.15.0-beta.1'
         ];
     }
     get name() {
@@ -56,9 +60,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;
@@ -72,15 +76,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) {
@@ -94,7 +98,7 @@ class SpfxProjectUpgradeCommand extends base_project_command_1.BaseProjectComman
         }
         const pos = this.supportedVersions.indexOf(this.projectVersion);
         if (pos < 0) {
-            cb(new Command_1.CommandError(`CLI for Microsoft 365 doesn't support upgrading projects build on SharePoint Framework v${this.projectVersion}`, SpfxProjectUpgradeCommand.ERROR_UNSUPPORTED_FROM_VERSION));
+            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);
@@ -185,33 +189,33 @@ class SpfxProjectUpgradeCommand extends base_project_command_1.BaseProjectComman
             // 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', this.getPackageManagerCommand('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', this.getPackageManagerCommand('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', this.getPackageManagerCommand('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', this.getPackageManagerCommand('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', this.getCopyCommand('copyCommand'));
-                f.resolution = f.resolution.replace('DestinationParam', this.getCopyCommand('copyDestinationParam'));
+                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', this.getDirectoryCommand('createDirectoryCommand'));
-                f.resolution = f.resolution.replace('NameParam', this.getDirectoryCommand('createDirectoryNameParam'));
-                f.resolution = f.resolution.replace('PathParam', this.getDirectoryCommand('createDirectoryPathParam'));
-                f.resolution = f.resolution.replace('ItemTypeParam', this.getDirectoryCommand('createDirectoryItemTypeParam'));
+                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
@@ -222,7 +226,7 @@ class SpfxProjectUpgradeCommand extends base_project_command_1.BaseProjectComman
                 const contentStart = f.resolution.indexOf('[BEFORECONTENT]') + '[BEFORECONTENT]'.length;
                 const contentEnd = f.resolution.indexOf('[AFTERCONTENT]');
                 const fileContent = f.resolution.substring(contentStart, contentEnd);
-                f.resolution = this.getAddCommand('addFileCommand');
+                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]', ' ');
@@ -233,7 +237,7 @@ class SpfxProjectUpgradeCommand extends base_project_command_1.BaseProjectComman
             }
             // 'Remove' support for multiple shells
             if (f.resolution.startsWith('remove_cmd')) {
-                f.resolution = f.resolution.replace('remove_cmd', this.getRemoveCommand('removeFileCommand'));
+                f.resolution = f.resolution.replace('remove_cmd', utils_1.fsUtil.getRemoveCommand('removeFileCommand', this.shell));
                 return;
             }
         });
@@ -267,10 +271,10 @@ class SpfxProjectUpgradeCommand extends base_project_command_1.BaseProjectComman
             '-----------------------', os.EOL,
             (reportData.packageManagerCommands
                 .concat(reportData.commandsToExecute
-                .filter((command) => command.indexOf(this.getPackageManagerCommand('install')) === -1 &&
-                command.indexOf(this.getPackageManagerCommand('installDev')) === -1 &&
-                command.indexOf(this.getPackageManagerCommand('uninstall')) === -1 &&
-                command.indexOf(this.getPackageManagerCommand('uninstallDev')) === -1))).join(os.EOL), os.EOL,
+                .filter((command) => command.indexOf(utils_1.packageManager.getPackageManagerCommand('install', this.packageManager)) === -1 &&
+                command.indexOf(utils_1.packageManager.getPackageManagerCommand('installDev', this.packageManager)) === -1 &&
+                command.indexOf(utils_1.packageManager.getPackageManagerCommand('uninstall', this.packageManager)) === -1 &&
+                command.indexOf(utils_1.packageManager.getPackageManagerCommand('uninstallDev', this.packageManager)) === -1))).join(os.EOL), os.EOL,
             os.EOL,
             Object.keys(reportData.modificationPerFile).map(file => {
                 return [
@@ -326,10 +330,10 @@ ${f.resolution}
             '```sh', os.EOL,
             (reportData.packageManagerCommands
                 .concat(reportData.commandsToExecute
-                .filter((command) => command.indexOf(this.getPackageManagerCommand('install')) === -1 &&
-                command.indexOf(this.getPackageManagerCommand('installDev')) === -1 &&
-                command.indexOf(this.getPackageManagerCommand('uninstall')) === -1 &&
-                command.indexOf(this.getPackageManagerCommand('uninstallDev')) === -1))).join(os.EOL), os.EOL,
+                .filter((command) => command.indexOf(utils_1.packageManager.getPackageManagerCommand('install', this.packageManager)) === -1 &&
+                command.indexOf(utils_1.packageManager.getPackageManagerCommand('installDev', this.packageManager)) === -1 &&
+                command.indexOf(utils_1.packageManager.getPackageManagerCommand('uninstall', this.packageManager)) === -1 &&
+                command.indexOf(utils_1.packageManager.getPackageManagerCommand('uninstallDev', this.packageManager)) === -1))).join(os.EOL), os.EOL,
             '```', os.EOL,
             os.EOL,
             '### Modify files', os.EOL,
@@ -409,7 +413,14 @@ ${f.resolution}
             if (f.resolutionType === 'cmd') {
                 if (f.resolution.indexOf('npm') > -1 ||
                     f.resolution.indexOf('yarn') > -1) {
-                    this.mapPackageManagerCommand(f.resolution, packagesDevExact, packagesDepExact, packagesDepUn, packagesDevUn);
+                    utils_1.packageManager.mapPackageManagerCommand({
+                        command: f.resolution,
+                        packagesDevExact,
+                        packagesDepExact,
+                        packagesDepUn,
+                        packagesDevUn,
+                        packageMgr: this.packageManager
+                    });
                 }
                 else {
                     commandsToExecute.push(f.resolution);
@@ -428,7 +439,13 @@ ${f.resolution}
                 });
             }
         });
-        const packageManagerCommands = this.reducePackageManagerCommand(packagesDepExact, packagesDevExact, packagesDepUn, packagesDevUn);
+        const packageManagerCommands = utils_1.packageManager.reducePackageManagerCommand({
+            packagesDepExact,
+            packagesDevExact,
+            packagesDepUn,
+            packagesDevUn,
+            packageMgr: this.packageManager
+        });
         if (this.packageManager === 'npm') {
             const dedupeFinding = findings.filter(f => f.id === 'FN017001');
             if (dedupeFinding.length > 0) {
@@ -442,58 +459,6 @@ ${f.resolution}
             modificationTypePerFile: modificationTypePerFile
         };
     }
-    mapPackageManagerCommand(command, packagesDevExact, packagesDepExact, packagesDepUn, packagesDevUn) {
-        // matches must be in this particular order to avoid false matches, eg.
-        // uninstallDev contains install
-        if (command.startsWith(`${this.getPackageManagerCommand('uninstallDev')} `)) {
-            packagesDevUn.push(command.replace(this.getPackageManagerCommand('uninstallDev'), '').trim());
-            return;
-        }
-        if (command.startsWith(`${this.getPackageManagerCommand('installDev')} `)) {
-            packagesDevExact.push(command.replace(this.getPackageManagerCommand('installDev'), '').trim());
-            return;
-        }
-        if (command.startsWith(`${this.getPackageManagerCommand('uninstall')} `)) {
-            packagesDepUn.push(command.replace(this.getPackageManagerCommand('uninstall'), '').trim());
-            return;
-        }
-        if (command.startsWith(`${this.getPackageManagerCommand('install')} `)) {
-            packagesDepExact.push(command.replace(this.getPackageManagerCommand('install'), '').trim());
-        }
-    }
-    reducePackageManagerCommand(packagesDepExact, packagesDevExact, packagesDepUn, packagesDevUn) {
-        const commandsToExecute = [];
-        // uninstall commands must come first otherwise there is a chance that
-        // whatever we recommended to install, will be immediately uninstalled
-        if (packagesDepUn.length > 0) {
-            commandsToExecute.push(`${this.getPackageManagerCommand('uninstall')} ${packagesDepUn.join(' ')}`);
-        }
-        if (packagesDevUn.length > 0) {
-            commandsToExecute.push(`${this.getPackageManagerCommand('uninstallDev')} ${packagesDevUn.join(' ')}`);
-        }
-        if (packagesDepExact.length > 0) {
-            commandsToExecute.push(`${this.getPackageManagerCommand('install')} ${packagesDepExact.join(' ')}`);
-        }
-        if (packagesDevExact.length > 0) {
-            commandsToExecute.push(`${this.getPackageManagerCommand('installDev')} ${packagesDevExact.join(' ')}`);
-        }
-        return commandsToExecute;
-    }
-    getPackageManagerCommand(command) {
-        return SpfxProjectUpgradeCommand.packageCommands[this.packageManager][command];
-    }
-    getCopyCommand(command) {
-        return SpfxProjectUpgradeCommand.copyCommands[this.shell][command];
-    }
-    getDirectoryCommand(command) {
-        return SpfxProjectUpgradeCommand.createDirectoryCommands[this.shell][command];
-    }
-    getAddCommand(command) {
-        return SpfxProjectUpgradeCommand.addFileCommands[this.shell][command];
-    }
-    getRemoveCommand(command) {
-        return SpfxProjectUpgradeCommand.removeFileCommands[this.shell][command];
-    }
     options() {
         const options = [
             {
@@ -501,11 +466,11 @@ ${f.resolution}
             },
             {
                 option: '--packageManager [packageManager]',
-                autocomplete: ['npm', 'pnpm', 'yarn']
+                autocomplete: SpfxProjectUpgradeCommand.packageManagers
             },
             {
                 option: '--shell [shell]',
-                autocomplete: ['bash', 'powershell', 'cmd']
+                autocomplete: SpfxProjectUpgradeCommand.shells
             },
             {
                 option: '--preview'
@@ -521,96 +486,20 @@ ${f.resolution}
     }
     validate(args) {
         if (args.options.packageManager) {
-            if (['npm', 'pnpm', 'yarn'].indexOf(args.options.packageManager) < 0) {
-                return `${args.options.packageManager} is not a supported package manager. Supported package managers are npm, pnpm and yarn`;
+            if (SpfxProjectUpgradeCommand.packageManagers.indexOf(args.options.packageManager) < 0) {
+                return `${args.options.packageManager} is not a supported package manager. Supported package managers are ${SpfxProjectUpgradeCommand.packageManagers.join(', ')}`;
             }
         }
         if (args.options.shell) {
-            if (['bash', 'powershell', 'logger'].indexOf(args.options.shell) < 0) {
-                return `${args.options.shell} is not a supported shell. Supported shells are bash, powershell and cmd`;
+            if (SpfxProjectUpgradeCommand.shells.indexOf(args.options.shell) < 0) {
+                return `${args.options.shell} is not a supported shell. Supported shells are ${SpfxProjectUpgradeCommand.shells.join(', ')}`;
             }
         }
         return true;
     }
 }
-SpfxProjectUpgradeCommand.packageCommands = {
-    npm: {
-        install: 'npm i -SE',
-        installDev: 'npm i -DE',
-        uninstall: 'npm un -S',
-        uninstallDev: 'npm un -D'
-    },
-    pnpm: {
-        install: 'pnpm i -E',
-        installDev: 'pnpm i -DE',
-        uninstall: 'pnpm un',
-        uninstallDev: 'pnpm un'
-    },
-    yarn: {
-        install: 'yarn add -E',
-        installDev: 'yarn add -DE',
-        uninstall: 'yarn remove',
-        uninstallDev: 'yarn remove'
-    }
-};
-SpfxProjectUpgradeCommand.copyCommands = {
-    bash: {
-        copyCommand: 'cp',
-        copyDestinationParam: ' '
-    },
-    powershell: {
-        copyCommand: 'Copy-Item',
-        copyDestinationParam: ' -Destination '
-    },
-    cmd: {
-        copyCommand: 'copy',
-        copyDestinationParam: ' '
-    }
-};
-SpfxProjectUpgradeCommand.createDirectoryCommands = {
-    bash: {
-        createDirectoryCommand: 'mkdir',
-        createDirectoryPathParam: ' "',
-        createDirectoryNameParam: '/',
-        createDirectoryItemTypeParam: '"'
-    },
-    powershell: {
-        createDirectoryCommand: 'New-Item',
-        createDirectoryPathParam: ' -Path "',
-        createDirectoryNameParam: '" -Name "',
-        createDirectoryItemTypeParam: '" -ItemType "directory"'
-    },
-    cmd: {
-        createDirectoryCommand: 'mkdir',
-        createDirectoryPathParam: ' "',
-        createDirectoryNameParam: '\\',
-        createDirectoryItemTypeParam: '"'
-    }
-};
-SpfxProjectUpgradeCommand.addFileCommands = {
-    bash: {
-        addFileCommand: 'cat > [FILEPATH] << EOF [FILECONTENT]EOF'
-    },
-    powershell: {
-        addFileCommand: `@"[FILECONTENT]"@ | Out-File -FilePath "[FILEPATH]"
-      `
-    },
-    cmd: {
-        addFileCommand: `echo [FILECONTENT] > "[FILEPATH]"
-      `
-    }
-};
-SpfxProjectUpgradeCommand.removeFileCommands = {
-    bash: {
-        removeFileCommand: 'rm'
-    },
-    powershell: {
-        removeFileCommand: 'Remove-Item'
-    },
-    cmd: {
-        removeFileCommand: 'del'
-    }
-};
+SpfxProjectUpgradeCommand.packageManagers = ['npm', 'pnpm', 'yarn'];
+SpfxProjectUpgradeCommand.shells = ['bash', 'powershell', 'cmd'];
 SpfxProjectUpgradeCommand.ERROR_NO_PROJECT_ROOT_FOLDER = 1;
 SpfxProjectUpgradeCommand.ERROR_UNSUPPORTED_TO_VERSION = 2;
 SpfxProjectUpgradeCommand.ERROR_NO_VERSION = 3;

package/dist/m365/spfx/commands/project/{project-upgrade → report-model}/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -10,10 +14,9 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./DependencyInformation"), exports);
-__exportStar(require("./Dictionary"), exports);
 __exportStar(require("./Finding"), exports);
 __exportStar(require("./FindingToReport"), exports);
-__exportStar(require("./Hash"), exports);
+__exportStar(require("./FindingTour"), exports);
+__exportStar(require("./FindingTourStep"), exports);
 __exportStar(require("./Occurrence"), exports);
 //# sourceMappingURL=index.js.map

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

@@ -481,6 +481,9 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
         return 'Verifies environment configuration for using the specific version of the SharePoint Framework';
     }
     commandAction(logger, args, cb) {
+        if (!args.options.output) {
+            args.options.output = 'text';
+        }
         logger.log(' ');
         logger.log('CLI for Microsoft 365 SharePoint Framework doctor');
         logger.log('Verifying configuration of your system for working with the SharePoint Framework');
@@ -758,6 +761,9 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
                 return `${args.options.env} is not a valid SharePoint version. Valid versions are sp2016, sp2019 or spo`;
             }
         }
+        if (args.options.output && args.options.output !== 'text') {
+            return `The output option only accepts the type 'text'`;
+        }
         return true;
     }
 }

package/dist/m365/spfx/commands.js

@@ -4,6 +4,7 @@ const prefix = 'spfx';
 exports.default = {
     DOCTOR: `${prefix} doctor`,
     PACKAGE_GENERATE: `${prefix} package generate`,
+    PROJECT_DOCTOR: `${prefix} project doctor`,
     PROJECT_UPGRADE: `${prefix} project upgrade`,
     PROJECT_EXTERNALIZE: `${prefix} project externalize`,
     PROJECT_RENAME: `${prefix} project rename`