@pnp/cli-microsoft365 6.0.0-beta.c377306 → 6.0.0-beta.c5b75e1

package/dist/m365/spfx/commands/project/base-project-command.js

@@ -3,7 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseProjectCommand = void 0;
 const fs = require("fs");
 const path = require("path");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const fsUtil_1 = require("../../../../utils/fsUtil");
 const AnonymousCommand_1 = require("../../../base/AnonymousCommand");
 const project_model_1 = require("./project-model");
 class BaseProjectCommand extends AnonymousCommand_1.default {
@@ -36,7 +37,7 @@ class BaseProjectCommand extends AnonymousCommand_1.default {
         const configJsonPath = path.join(projectRootPath, 'config/config.json');
         if (fs.existsSync(configJsonPath)) {
             try {
-                const source = utils_1.formatting.removeSingleLineComments(fs.readFileSync(configJsonPath, 'utf-8'));
+                const source = formatting_1.formatting.removeSingleLineComments(fs.readFileSync(configJsonPath, 'utf-8'));
                 project.configJson = JSON.parse(source);
                 project.configJson.source = source;
             }
@@ -45,7 +46,7 @@ class BaseProjectCommand extends AnonymousCommand_1.default {
         const copyAssetsJsonPath = path.join(projectRootPath, 'config/copy-assets.json');
         if (fs.existsSync(copyAssetsJsonPath)) {
             try {
-                const source = utils_1.formatting.removeSingleLineComments(fs.readFileSync(copyAssetsJsonPath, 'utf-8'));
+                const source = formatting_1.formatting.removeSingleLineComments(fs.readFileSync(copyAssetsJsonPath, 'utf-8'));
                 project.copyAssetsJson = JSON.parse(source);
                 project.copyAssetsJson.source = source;
             }
@@ -54,7 +55,7 @@ class BaseProjectCommand extends AnonymousCommand_1.default {
         const deployAzureStorageJsonPath = path.join(projectRootPath, 'config/deploy-azure-storage.json');
         if (fs.existsSync(deployAzureStorageJsonPath)) {
             try {
-                const source = utils_1.formatting.removeSingleLineComments(fs.readFileSync(deployAzureStorageJsonPath, 'utf-8'));
+                const source = formatting_1.formatting.removeSingleLineComments(fs.readFileSync(deployAzureStorageJsonPath, 'utf-8'));
                 project.deployAzureStorageJson = JSON.parse(source);
                 project.deployAzureStorageJson.source = source;
             }
@@ -63,7 +64,7 @@ class BaseProjectCommand extends AnonymousCommand_1.default {
         const packageJsonPath = path.join(projectRootPath, 'package.json');
         if (fs.existsSync(packageJsonPath)) {
             try {
-                const source = utils_1.formatting.removeSingleLineComments(fs.readFileSync(packageJsonPath, 'utf-8'));
+                const source = formatting_1.formatting.removeSingleLineComments(fs.readFileSync(packageJsonPath, 'utf-8'));
                 project.packageJson = JSON.parse(source);
                 project.packageJson.source = source;
             }
@@ -72,7 +73,7 @@ class BaseProjectCommand extends AnonymousCommand_1.default {
         const packageSolutionJsonPath = path.join(projectRootPath, 'config/package-solution.json');
         if (fs.existsSync(packageSolutionJsonPath)) {
             try {
-                const source = utils_1.formatting.removeSingleLineComments(fs.readFileSync(packageSolutionJsonPath, 'utf-8'));
+                const source = formatting_1.formatting.removeSingleLineComments(fs.readFileSync(packageSolutionJsonPath, 'utf-8'));
                 project.packageSolutionJson = JSON.parse(source);
                 project.packageSolutionJson.source = source;
             }
@@ -81,7 +82,7 @@ class BaseProjectCommand extends AnonymousCommand_1.default {
         const serveJsonPath = path.join(projectRootPath, 'config/serve.json');
         if (fs.existsSync(serveJsonPath)) {
             try {
-                const source = utils_1.formatting.removeSingleLineComments(fs.readFileSync(serveJsonPath, 'utf-8'));
+                const source = formatting_1.formatting.removeSingleLineComments(fs.readFileSync(serveJsonPath, 'utf-8'));
                 project.serveJson = JSON.parse(source);
                 project.serveJson.source = source;
             }
@@ -90,7 +91,7 @@ class BaseProjectCommand extends AnonymousCommand_1.default {
         const tsConfigJsonPath = path.join(projectRootPath, 'tsconfig.json');
         if (fs.existsSync(tsConfigJsonPath)) {
             try {
-                const source = utils_1.formatting.removeSingleLineComments(fs.readFileSync(tsConfigJsonPath, 'utf-8'));
+                const source = formatting_1.formatting.removeSingleLineComments(fs.readFileSync(tsConfigJsonPath, 'utf-8'));
                 project.tsConfigJson = JSON.parse(source);
                 project.tsConfigJson.source = source;
             }
@@ -99,7 +100,7 @@ class BaseProjectCommand extends AnonymousCommand_1.default {
         const tsLintJsonPath = path.join(projectRootPath, 'config/tslint.json');
         if (fs.existsSync(tsLintJsonPath)) {
             try {
-                const source = utils_1.formatting.removeSingleLineComments(fs.readFileSync(tsLintJsonPath, 'utf-8'));
+                const source = formatting_1.formatting.removeSingleLineComments(fs.readFileSync(tsLintJsonPath, 'utf-8'));
                 project.tsLintJson = JSON.parse(source);
                 project.tsLintJson.source = source;
             }
@@ -108,7 +109,7 @@ class BaseProjectCommand extends AnonymousCommand_1.default {
         const tsLintJsonRootPath = path.join(projectRootPath, 'tslint.json');
         if (fs.existsSync(tsLintJsonRootPath)) {
             try {
-                const source = utils_1.formatting.removeSingleLineComments(fs.readFileSync(tsLintJsonRootPath, 'utf-8'));
+                const source = formatting_1.formatting.removeSingleLineComments(fs.readFileSync(tsLintJsonRootPath, 'utf-8'));
                 project.tsLintJsonRoot = JSON.parse(source);
                 project.tsLintJsonRoot.source = source;
             }
@@ -117,7 +118,7 @@ class BaseProjectCommand extends AnonymousCommand_1.default {
         const writeManifestJsonPath = path.join(projectRootPath, 'config/write-manifests.json');
         if (fs.existsSync(writeManifestJsonPath)) {
             try {
-                const source = utils_1.formatting.removeSingleLineComments(fs.readFileSync(writeManifestJsonPath, 'utf-8'));
+                const source = formatting_1.formatting.removeSingleLineComments(fs.readFileSync(writeManifestJsonPath, 'utf-8'));
                 project.writeManifestsJson = JSON.parse(source);
                 project.writeManifestsJson.source = source;
             }
@@ -126,7 +127,7 @@ class BaseProjectCommand extends AnonymousCommand_1.default {
         const yoRcJsonPath = path.join(projectRootPath, '.yo-rc.json');
         if (fs.existsSync(yoRcJsonPath)) {
             try {
-                const source = utils_1.formatting.removeSingleLineComments(fs.readFileSync(yoRcJsonPath, 'utf-8'));
+                const source = formatting_1.formatting.removeSingleLineComments(fs.readFileSync(yoRcJsonPath, 'utf-8'));
                 project.yoRcJson = JSON.parse(source);
                 project.yoRcJson.source = source;
             }
@@ -146,7 +147,7 @@ class BaseProjectCommand extends AnonymousCommand_1.default {
         const vsCodeSettingsPath = path.join(projectRootPath, '.vscode', 'settings.json');
         if (fs.existsSync(vsCodeSettingsPath)) {
             try {
-                const source = utils_1.formatting.removeSingleLineComments(fs.readFileSync(vsCodeSettingsPath, 'utf-8'));
+                const source = formatting_1.formatting.removeSingleLineComments(fs.readFileSync(vsCodeSettingsPath, 'utf-8'));
                 project.vsCode.settingsJson = JSON.parse(source);
                 project.vsCode.settingsJson.source = source;
             }
@@ -155,7 +156,7 @@ class BaseProjectCommand extends AnonymousCommand_1.default {
         const vsCodeExtensionsPath = path.join(projectRootPath, '.vscode', 'extensions.json');
         if (fs.existsSync(vsCodeExtensionsPath)) {
             try {
-                const source = utils_1.formatting.removeSingleLineComments(fs.readFileSync(vsCodeExtensionsPath, 'utf-8'));
+                const source = formatting_1.formatting.removeSingleLineComments(fs.readFileSync(vsCodeExtensionsPath, 'utf-8'));
                 project.vsCode.extensionsJson = JSON.parse(source);
                 project.vsCode.extensionsJson.source = source;
             }
@@ -164,17 +165,17 @@ class BaseProjectCommand extends AnonymousCommand_1.default {
         const vsCodeLaunchPath = path.join(projectRootPath, '.vscode', 'launch.json');
         if (fs.existsSync(vsCodeLaunchPath)) {
             try {
-                const source = utils_1.formatting.removeSingleLineComments(fs.readFileSync(vsCodeLaunchPath, 'utf-8'));
+                const source = formatting_1.formatting.removeSingleLineComments(fs.readFileSync(vsCodeLaunchPath, 'utf-8'));
                 project.vsCode.launchJson = JSON.parse(source);
                 project.vsCode.launchJson.source = source;
             }
             catch (_r) { }
         }
-        const srcFiles = utils_1.fsUtil.readdirR(path.join(projectRootPath, 'src'));
+        const srcFiles = fsUtil_1.fsUtil.readdirR(path.join(projectRootPath, 'src'));
         const manifestFiles = srcFiles.filter(f => f.endsWith('.manifest.json'));
         const manifests = manifestFiles.map((f) => {
-            const manifestStr = utils_1.formatting.removeSingleLineComments(fs.readFileSync(f, 'utf-8'));
-            const manifest = utils_1.formatting.parseJsonWithBom(manifestStr);
+            const manifestStr = formatting_1.formatting.removeSingleLineComments(fs.readFileSync(f, 'utf-8'));
+            const manifest = formatting_1.formatting.parseJsonWithBom(manifestStr);
             manifest.path = f;
             manifest.source = manifestStr;
             return manifest;

package/dist/m365/spfx/commands/project/project-doctor/doctor-1.16.0-beta.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('16'),
+    new FN001009_DEP_react_dom_1.FN001009_DEP_react_dom('16'),
+    new FN001022_DEP_office_ui_fabric_react_1.FN001022_DEP_office_ui_fabric_react('7.192.0'),
+    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('16'),
+    new FN002016_DEVDEP_types_react_dom_1.FN002016_DEVDEP_types_react_dom('16'),
+    new FN002019_DEVDEP_microsoft_rush_stack_compiler_1.FN002019_DEVDEP_microsoft_rush_stack_compiler(['4.5'])
+];
+//# sourceMappingURL=doctor-1.16.0-beta.1.js.map

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FN001008_DEP_react = void 0;
-const utils_1 = require("../../../../../../utils");
+const spfx_1 = require("../../../../../../utils/spfx");
 const DependencyRule_1 = require("./DependencyRule");
 class FN001008_DEP_react extends DependencyRule_1.DependencyRule {
     constructor(supportedRange) {
@@ -11,7 +11,7 @@ class FN001008_DEP_react extends DependencyRule_1.DependencyRule {
         return 'FN001008';
     }
     customCondition(project) {
-        return utils_1.spfx.isReactProject(project);
+        return spfx_1.spfx.isReactProject(project);
     }
 }
 exports.FN001008_DEP_react = FN001008_DEP_react;

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FN001009_DEP_react_dom = void 0;
-const utils_1 = require("../../../../../../utils");
+const spfx_1 = require("../../../../../../utils/spfx");
 const DependencyRule_1 = require("./DependencyRule");
 class FN001009_DEP_react_dom extends DependencyRule_1.DependencyRule {
     constructor(supportedRange) {
@@ -11,7 +11,7 @@ class FN001009_DEP_react_dom extends DependencyRule_1.DependencyRule {
         return 'FN001009';
     }
     customCondition(project) {
-        return utils_1.spfx.isReactProject(project);
+        return spfx_1.spfx.isReactProject(project);
     }
 }
 exports.FN001009_DEP_react_dom = FN001009_DEP_react_dom;

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FN001022_DEP_office_ui_fabric_react = void 0;
-const utils_1 = require("../../../../../../utils");
+const spfx_1 = require("../../../../../../utils/spfx");
 const DependencyRule_1 = require("./DependencyRule");
 class FN001022_DEP_office_ui_fabric_react extends DependencyRule_1.DependencyRule {
     constructor(supportedRange) {
@@ -11,7 +11,7 @@ class FN001022_DEP_office_ui_fabric_react extends DependencyRule_1.DependencyRul
         return 'FN001022';
     }
     customCondition(project) {
-        return utils_1.spfx.isReactProject(project);
+        return spfx_1.spfx.isReactProject(project);
     }
 }
 exports.FN001022_DEP_office_ui_fabric_react = FN001022_DEP_office_ui_fabric_react;

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FN002015_DEVDEP_types_react = void 0;
-const utils_1 = require("../../../../../../utils");
+const spfx_1 = require("../../../../../../utils/spfx");
 const DependencyRule_1 = require("./DependencyRule");
 class FN002015_DEVDEP_types_react extends DependencyRule_1.DependencyRule {
     constructor(supportedRange) {
@@ -11,7 +11,7 @@ class FN002015_DEVDEP_types_react extends DependencyRule_1.DependencyRule {
         return 'FN002015';
     }
     customCondition(project) {
-        return utils_1.spfx.isReactProject(project);
+        return spfx_1.spfx.isReactProject(project);
     }
 }
 exports.FN002015_DEVDEP_types_react = FN002015_DEVDEP_types_react;

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FN002016_DEVDEP_types_react_dom = void 0;
-const utils_1 = require("../../../../../../utils");
+const spfx_1 = require("../../../../../../utils/spfx");
 const DependencyRule_1 = require("./DependencyRule");
 class FN002016_DEVDEP_types_react_dom extends DependencyRule_1.DependencyRule {
     constructor(supportedRange) {
@@ -11,7 +11,7 @@ class FN002016_DEVDEP_types_react_dom extends DependencyRule_1.DependencyRule {
         return 'FN002016';
     }
     customCondition(project) {
-        return utils_1.spfx.isReactProject(project);
+        return spfx_1.spfx.isReactProject(project);
     }
 }
 exports.FN002016_DEVDEP_types_react_dom = FN002016_DEVDEP_types_react_dom;

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

@@ -19,7 +19,7 @@ const fs = require("fs");
 const os = require("os");
 const path = require("path");
 const Command_1 = require("../../../../Command");
-const utils_1 = require("../../../../utils");
+const packageManager_1 = require("../../../../utils/packageManager");
 const commands_1 = require("../../commands");
 const base_project_command_1 = require("./base-project-command");
 const generic_rules_1 = require("./project-doctor/generic-rules");
@@ -61,7 +61,8 @@ class SpfxProjectDoctorCommand extends base_project_command_1.BaseProjectCommand
             '1.13.1',
             '1.14.0',
             '1.15.0',
-            '1.15.2'
+            '1.15.2',
+            '1.16.0-beta.1'
         ];
         __classPrivateFieldGet(this, _SpfxProjectDoctorCommand_instances, "m", _SpfxProjectDoctorCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpfxProjectDoctorCommand_instances, "m", _SpfxProjectDoctorCommand_initOptions).call(this);
@@ -73,113 +74,110 @@ class SpfxProjectDoctorCommand extends base_project_command_1.BaseProjectCommand
     get description() {
         return 'Validates correctness of a 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`, SpfxProjectDoctorCommand.ERROR_NO_PROJECT_ROOT_FOLDER));
-            return;
-        }
-        this.packageManager = args.options.packageManager || 'npm';
-        if (this.verbose) {
-            logger.logToStderr('Collecting project...');
-        }
-        const project = this.getProject(this.projectRootPath);
-        if (this.debug) {
-            logger.logToStderr('Collected project');
-            logger.logToStderr(project);
-        }
-        project.version = this.getProjectVersion();
-        if (!project.version) {
-            cb(new Command_1.CommandError(`Unable to determine the version of the current SharePoint Framework project`, SpfxProjectDoctorCommand.ERROR_NO_VERSION));
-            return;
-        }
-        if (!this.supportedVersions.includes(project.version)) {
-            cb(new Command_1.CommandError(`CLI for Microsoft 365 doesn't support validating projects built using SharePoint Framework v${project.version}`, SpfxProjectDoctorCommand.ERROR_UNSUPPORTED_VERSION));
-            return;
-        }
-        if (this.verbose) {
-            logger.logToStderr(`Project built using SPFx v${project.version}`);
-        }
-        const rules = [...generic_rules_1.rules];
-        try {
-            const versionRules = require(`./project-doctor/doctor-${project.version}`);
-            rules.push(...versionRules);
-        }
-        catch (e) {
-            cb(new Command_1.CommandError(e.message));
-            return;
-        }
-        rules.forEach(r => {
-            r.visit(project, this.allFindings);
-        });
-        if (this.packageManager === 'npm') {
-            const npmDedupeRule = new FN017001_MISC_npm_dedupe_1.FN017001_MISC_npm_dedupe();
-            npmDedupeRule.visit(project, this.allFindings);
-        }
-        // remove superseded findings
-        this.allFindings
-            // get findings that supersede other findings
-            .filter(f => f.supersedes.length > 0)
-            .forEach(f => {
-            f.supersedes.forEach(s => {
-                // find the superseded finding
-                const i = this.allFindings.findIndex(f1 => f1.id === s);
-                if (i > -1) {
-                    // ...and remove it from findings
-                    this.allFindings.splice(i, 1);
-                }
-            });
-        });
-        // flatten
-        const findingsToReport = [].concat.apply([], this.allFindings.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;
+    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`, SpfxProjectDoctorCommand.ERROR_NO_PROJECT_ROOT_FOLDER);
+            }
+            this.packageManager = args.options.packageManager || 'npm';
+            if (this.verbose) {
+                logger.logToStderr('Collecting project...');
             }
-            if (f.resolution.startsWith('installDev')) {
-                f.resolution = f.resolution.replace('installDev', utils_1.packageManager.getPackageManagerCommand('installDev', this.packageManager));
-                return;
+            const project = this.getProject(this.projectRootPath);
+            if (this.debug) {
+                logger.logToStderr('Collected project');
+                logger.logToStderr(project);
             }
-            if (f.resolution.startsWith('uninstall')) {
-                f.resolution = f.resolution.replace('uninstall', utils_1.packageManager.getPackageManagerCommand('uninstall', this.packageManager));
-                return;
+            project.version = this.getProjectVersion();
+            if (!project.version) {
+                throw new Command_1.CommandError(`Unable to determine the version of the current SharePoint Framework project`, SpfxProjectDoctorCommand.ERROR_NO_VERSION);
             }
-            if (f.resolution.startsWith('install')) {
-                f.resolution = f.resolution.replace('install', utils_1.packageManager.getPackageManagerCommand('install', this.packageManager));
-                return;
+            if (!this.supportedVersions.includes(project.version)) {
+                throw new Command_1.CommandError(`CLI for Microsoft 365 doesn't support validating projects built using SharePoint Framework v${project.version}`, SpfxProjectDoctorCommand.ERROR_UNSUPPORTED_VERSION);
+            }
+            if (this.verbose) {
+                logger.logToStderr(`Project built using SPFx v${project.version}`);
+            }
+            const rules = [...generic_rules_1.rules];
+            try {
+                const versionRules = require(`./project-doctor/doctor-${project.version}`);
+                rules.push(...versionRules);
+            }
+            catch (e) {
+                throw new Command_1.CommandError(e.message);
+            }
+            rules.forEach(r => {
+                r.visit(project, this.allFindings);
+            });
+            if (this.packageManager === 'npm') {
+                const npmDedupeRule = new FN017001_MISC_npm_dedupe_1.FN017001_MISC_npm_dedupe();
+                npmDedupeRule.visit(project, this.allFindings);
+            }
+            // remove superseded findings
+            this.allFindings
+                // get findings that supersede other findings
+                .filter(f => f.supersedes.length > 0)
+                .forEach(f => {
+                f.supersedes.forEach(s => {
+                    // find the superseded finding
+                    const i = this.allFindings.findIndex(f1 => f1.id === s);
+                    if (i > -1) {
+                        // ...and remove it from findings
+                        this.allFindings.splice(i, 1);
+                    }
+                });
+            });
+            // flatten
+            const findingsToReport = [].concat.apply([], this.allFindings.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', packageManager_1.packageManager.getPackageManagerCommand('uninstallDev', this.packageManager));
+                    return;
+                }
+                if (f.resolution.startsWith('installDev')) {
+                    f.resolution = f.resolution.replace('installDev', packageManager_1.packageManager.getPackageManagerCommand('installDev', this.packageManager));
+                    return;
+                }
+                if (f.resolution.startsWith('uninstall')) {
+                    f.resolution = f.resolution.replace('uninstall', packageManager_1.packageManager.getPackageManagerCommand('uninstall', this.packageManager));
+                    return;
+                }
+                if (f.resolution.startsWith('install')) {
+                    f.resolution = f.resolution.replace('install', packageManager_1.packageManager.getPackageManagerCommand('install', this.packageManager));
+                    return;
+                }
+            });
+            switch (args.options.output) {
+                case 'text':
+                    logger.log(this.getTextReport(findingsToReport));
+                    break;
+                case 'tour':
+                    this.writeReportTourFolder(this.getTourReport(findingsToReport));
+                    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 'tour':
-                this.writeReportTourFolder(this.getTourReport(findingsToReport));
-                break;
-            case 'md':
-                logger.log(this.getMdReport(findingsToReport));
-                break;
-            default:
-                logger.log(findingsToReport);
-        }
-        cb();
     }
     writeReportTourFolder(findingsToReport) {
         const toursFolder = path.join(this.projectRootPath, '.tours');
@@ -296,7 +294,7 @@ ${f.resolution}
         const packagesDepUn = [];
         const packagesDevUn = [];
         findings.forEach(f => {
-            utils_1.packageManager.mapPackageManagerCommand({
+            packageManager_1.packageManager.mapPackageManagerCommand({
                 command: f.resolution,
                 packagesDevExact,
                 packagesDepExact,
@@ -305,7 +303,7 @@ ${f.resolution}
                 packageMgr: this.packageManager
             });
         });
-        const packageManagerCommands = utils_1.packageManager.reducePackageManagerCommand({
+        const packageManagerCommands = packageManager_1.packageManager.reducePackageManagerCommand({
             packagesDepExact,
             packagesDevExact,
             packagesDepUn,

package/dist/m365/spfx/commands/project/project-externalize.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");
@@ -50,44 +59,42 @@ class SpfxProjectExternalizeCommand extends base_project_command_1.BaseProjectCo
     get description() {
         return 'Externalizes SharePoint Framework project dependencies';
     }
-    commandAction(logger, args, cb) {
-        if (args.options.output !== 'json' || this.verbose) {
-            logger.logToStderr(`This command is currently in preview. Feedback welcome at https://github.com/pnp/cli-microsoft365/issues${os.EOL}`);
-        }
-        this.projectRootPath = this.getProjectRoot(process.cwd());
-        if (this.projectRootPath === null) {
-            cb(new Command_1.CommandError(`Couldn't find project root folder`, SpfxProjectExternalizeCommand.ERROR_NO_PROJECT_ROOT_FOLDER));
-            return;
-        }
-        this.projectVersion = this.getProjectVersion();
-        if (!this.projectVersion) {
-            cb(new Command_1.CommandError(`Unable to determine the version of the current SharePoint Framework project`, SpfxProjectExternalizeCommand.ERROR_NO_VERSION));
-            return;
-        }
-        if (this.projectVersion && this.supportedVersions.indexOf(this.projectVersion) < 0) {
-            cb(new Command_1.CommandError(`CLI for Microsoft 365 doesn't support externalizing dependencies of SharePoint Framework projects of version ${this.projectVersion}. Supported versions are ${this.supportedVersions.join(', ')}`, SpfxProjectExternalizeCommand.ERROR_UNSUPPORTED_VERSION));
-            return;
-        }
-        if (this.verbose) {
-            logger.logToStderr('Collecting project...');
-        }
-        const project = this.getProject(this.projectRootPath);
-        if (this.debug) {
-            logger.logToStderr('Collected project');
-            logger.logToStderr(project);
-        }
-        const asyncRulesResults = rules.map(r => r.visit(project));
-        Promise
-            .all(asyncRulesResults)
-            .then((rulesResults) => {
-            this.allFindings.push(...rulesResults.map(x => x.entries).reduce((x, y) => [...x, ...y]));
-            this.allEditSuggestions.push(...rulesResults.map(x => x.suggestions).reduce((x, y) => [...x, ...y]));
-            //removing duplicates
-            this.allFindings = this.allFindings.filter((x, i) => this.allFindings.findIndex(y => y.key === x.key) === i);
-            this.writeReport(this.allFindings, this.allEditSuggestions, logger, args.options);
-            cb();
-        }).catch((err) => {
-            cb(new Command_1.CommandError(err));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.output !== 'json' || this.verbose) {
+                logger.logToStderr(`This command is currently in preview. Feedback welcome at https://github.com/pnp/cli-microsoft365/issues${os.EOL}`);
+            }
+            this.projectRootPath = this.getProjectRoot(process.cwd());
+            if (this.projectRootPath === null) {
+                throw new Command_1.CommandError(`Couldn't find project root folder`, SpfxProjectExternalizeCommand.ERROR_NO_PROJECT_ROOT_FOLDER);
+            }
+            this.projectVersion = this.getProjectVersion();
+            if (!this.projectVersion) {
+                throw new Command_1.CommandError(`Unable to determine the version of the current SharePoint Framework project`, SpfxProjectExternalizeCommand.ERROR_NO_VERSION);
+            }
+            if (this.projectVersion && this.supportedVersions.indexOf(this.projectVersion) < 0) {
+                throw new Command_1.CommandError(`CLI for Microsoft 365 doesn't support externalizing dependencies of SharePoint Framework projects of version ${this.projectVersion}. Supported versions are ${this.supportedVersions.join(', ')}`, SpfxProjectExternalizeCommand.ERROR_UNSUPPORTED_VERSION);
+            }
+            if (this.verbose) {
+                logger.logToStderr('Collecting project...');
+            }
+            const project = this.getProject(this.projectRootPath);
+            if (this.debug) {
+                logger.logToStderr('Collected project');
+                logger.logToStderr(project);
+            }
+            const asyncRulesResults = rules.map(r => r.visit(project));
+            try {
+                const rulesResults = yield Promise.all(asyncRulesResults);
+                this.allFindings.push(...rulesResults.map(x => x.entries).reduce((x, y) => [...x, ...y]));
+                this.allEditSuggestions.push(...rulesResults.map(x => x.suggestions).reduce((x, y) => [...x, ...y]));
+                //removing duplicates
+                this.allFindings = this.allFindings.filter((x, i) => this.allFindings.findIndex(y => y.key === x.key) === i);
+                this.writeReport(this.allFindings, this.allEditSuggestions, logger, args.options);
+            }
+            catch (err) {
+                throw new Command_1.CommandError(err);
+            }
         });
     }
     writeReport(findingsToReport, editsToReport, logger, options) {