@pnp/cli-microsoft365 6.0.0-beta.d4d33ed → 6.0.0-beta.dee678a

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

@@ -1,8 +1,25 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _SpfxProjectUpgradeCommand_instances, _SpfxProjectUpgradeCommand_initTelemetry, _SpfxProjectUpgradeCommand_initOptions, _SpfxProjectUpgradeCommand_initValidators;
 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");
@@ -11,6 +28,7 @@ const FN017001_MISC_npm_dedupe_1 = require("./project-upgrade/rules/FN017001_MIS
 class SpfxProjectUpgradeCommand extends base_project_command_1.BaseProjectCommand {
     constructor() {
         super();
+        _SpfxProjectUpgradeCommand_instances.add(this);
         this.toVersion = '';
         this.packageManager = 'npm';
         this.shell = 'bash';
@@ -45,8 +63,13 @@ class SpfxProjectUpgradeCommand extends base_project_command_1.BaseProjectComman
             '1.13.0',
             '1.13.1',
             '1.14.0',
-            '1.15.0'
+            '1.15.0',
+            '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);
+        __classPrivateFieldGet(this, _SpfxProjectUpgradeCommand_instances, "m", _SpfxProjectUpgradeCommand_initValidators).call(this);
     }
     get name() {
         return commands_1.default.PROJECT_UPGRADE;
@@ -54,18 +77,6 @@ class SpfxProjectUpgradeCommand extends base_project_command_1.BaseProjectComman
     get description() {
         return 'Upgrades SharePoint Framework project to the specified version';
     }
-    getTelemetryProperties(args) {
-        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];
-        // }
-        telemetryProps.packageManager = args.options.packageManager || 'npm';
-        telemetryProps.shell = args.options.shell || 'bash';
-        telemetryProps.preview = args.options.preview;
-        return telemetryProps;
-    }
     commandAction(logger, args, cb) {
         this.projectRootPath = this.getProjectRoot(process.cwd());
         if (this.projectRootPath === null) {
@@ -74,15 +85,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) {
@@ -460,32 +471,39 @@ ${f.resolution}
             modificationTypePerFile: modificationTypePerFile
         };
     }
-    options() {
-        const options = [
-            {
-                option: '-v, --toVersion [toVersion]'
-            },
-            {
-                option: '--packageManager [packageManager]',
-                autocomplete: SpfxProjectUpgradeCommand.packageManagers
-            },
-            {
-                option: '--shell [shell]',
-                autocomplete: SpfxProjectUpgradeCommand.shells
-            },
-            {
-                option: '--preview'
-            }
-        ];
-        const parentOptions = super.options();
-        parentOptions.forEach(o => {
-            if (o.option.indexOf('--output') > -1) {
-                o.autocomplete = ['json', 'text', 'md', 'tour'];
-            }
+}
+_SpfxProjectUpgradeCommand_instances = new WeakSet(), _SpfxProjectUpgradeCommand_initTelemetry = function _SpfxProjectUpgradeCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            toVersion: args.options.toVersion || this.supportedVersions[this.supportedVersions.length - 1],
+            packageManager: args.options.packageManager || 'npm',
+            shell: args.options.shell || 'bash',
+            preview: args.options.preview
         });
-        return options.concat(parentOptions);
-    }
-    validate(args) {
+        // uncomment to support upgrading to preview releases
+        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({
+        option: '-v, --toVersion [toVersion]'
+    }, {
+        option: '--packageManager [packageManager]',
+        autocomplete: SpfxProjectUpgradeCommand.packageManagers
+    }, {
+        option: '--shell [shell]',
+        autocomplete: SpfxProjectUpgradeCommand.shells
+    }, {
+        option: '--preview'
+    });
+    this.options.forEach(o => {
+        if (o.option.indexOf('--output') > -1) {
+            o.autocomplete = ['json', 'text', 'md', 'tour'];
+        }
+    });
+}, _SpfxProjectUpgradeCommand_initValidators = function _SpfxProjectUpgradeCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.packageManager) {
             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(', ')}`;
@@ -497,8 +515,8 @@ ${f.resolution}
             }
         }
         return true;
-    }
-}
+    }));
+};
 SpfxProjectUpgradeCommand.packageManagers = ['npm', 'pnpm', 'yarn'];
 SpfxProjectUpgradeCommand.shells = ['bash', 'powershell', 'cmd'];
 SpfxProjectUpgradeCommand.ERROR_NO_PROJECT_ROOT_FOLDER = 1;

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

@@ -1,4 +1,19 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _SpfxDoctorCommand_instances, _SpfxDoctorCommand_initTelemetry, _SpfxDoctorCommand_initOptions, _SpfxDoctorCommand_initValidators, _SpfxDoctorCommand_initTypes;
 Object.defineProperty(exports, "__esModule", { value: true });
 const chalk = require("chalk");
 const child_process = require("child_process");
@@ -52,12 +67,13 @@ var SharePointVersion;
 })(SharePointVersion || (SharePointVersion = {}));
 class SpfxDoctorCommand extends AnonymousCommand_1.default {
     constructor() {
-        super(...arguments);
+        super();
+        _SpfxDoctorCommand_instances.add(this);
         this.versions = {
             '1.0.0': {
-                gulp: {
-                    range: '^3',
-                    fix: 'npm i -g gulp@3'
+                gulpCli: {
+                    range: '^1 || ^2',
+                    fix: 'npm i -g gulp-cli@2'
                 },
                 node: {
                     range: '^6',
@@ -70,9 +86,9 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
                 }
             },
             '1.1.0': {
-                gulp: {
-                    range: '^3',
-                    fix: 'npm i -g gulp@3'
+                gulpCli: {
+                    range: '^1 || ^2',
+                    fix: 'npm i -g gulp-cli@2'
                 },
                 node: {
                     range: '^6',
@@ -85,9 +101,9 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
                 }
             },
             '1.2.0': {
-                gulp: {
-                    range: '^3',
-                    fix: 'npm i -g gulp@3'
+                gulpCli: {
+                    range: '^1 || ^2',
+                    fix: 'npm i -g gulp-cli@2'
                 },
                 node: {
                     range: '^6',
@@ -100,9 +116,9 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
                 }
             },
             '1.4.0': {
-                gulp: {
-                    range: '^3',
-                    fix: 'npm i -g gulp@3'
+                gulpCli: {
+                    range: '^1 || ^2',
+                    fix: 'npm i -g gulp-cli@2'
                 },
                 node: {
                     range: '^6',
@@ -115,9 +131,9 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
                 }
             },
             '1.4.1': {
-                gulp: {
-                    range: '^3',
-                    fix: 'npm i -g gulp@3'
+                gulpCli: {
+                    range: '^1 || ^2',
+                    fix: 'npm i -g gulp-cli@2'
                 },
                 node: {
                     range: '^6 || ^8',
@@ -130,9 +146,9 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
                 }
             },
             '1.5.0': {
-                gulp: {
-                    range: '^3',
-                    fix: 'npm i -g gulp@3'
+                gulpCli: {
+                    range: '^1 || ^2',
+                    fix: 'npm i -g gulp-cli@2'
                 },
                 node: {
                     range: '^6 || ^8',
@@ -145,9 +161,9 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
                 }
             },
             '1.5.1': {
-                gulp: {
-                    range: '^3',
-                    fix: 'npm i -g gulp@3'
+                gulpCli: {
+                    range: '^1 || ^2',
+                    fix: 'npm i -g gulp-cli@2'
                 },
                 node: {
                     range: '^6 || ^8',
@@ -160,9 +176,9 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
                 }
             },
             '1.6.0': {
-                gulp: {
-                    range: '^3',
-                    fix: 'npm i -g gulp@3'
+                gulpCli: {
+                    range: '^1 || ^2',
+                    fix: 'npm i -g gulp-cli@2'
                 },
                 node: {
                     range: '^6 || ^8',
@@ -175,9 +191,9 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
                 }
             },
             '1.7.0': {
-                gulp: {
-                    range: '^3',
-                    fix: 'npm i -g gulp@3'
+                gulpCli: {
+                    range: '^1 || ^2',
+                    fix: 'npm i -g gulp-cli@2'
                 },
                 node: {
                     range: '^8',
@@ -190,9 +206,9 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
                 }
             },
             '1.7.1': {
-                gulp: {
-                    range: '^3',
-                    fix: 'npm i -g gulp@3'
+                gulpCli: {
+                    range: '^1 || ^2',
+                    fix: 'npm i -g gulp-cli@2'
                 },
                 node: {
                     range: '^8',
@@ -205,9 +221,9 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
                 }
             },
             '1.8.0': {
-                gulp: {
-                    range: '^3',
-                    fix: 'npm i -g gulp@3'
+                gulpCli: {
+                    range: '^1 || ^2',
+                    fix: 'npm i -g gulp-cli@2'
                 },
                 node: {
                     range: '^8',
@@ -220,9 +236,9 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
                 }
             },
             '1.8.1': {
-                gulp: {
-                    range: '^3',
-                    fix: 'npm i -g gulp@3'
+                gulpCli: {
+                    range: '^1 || ^2',
+                    fix: 'npm i -g gulp-cli@2'
                 },
                 node: {
                     range: '^8',
@@ -235,9 +251,9 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
                 }
             },
             '1.8.2': {
-                gulp: {
-                    range: '^3',
-                    fix: 'npm i -g gulp@3'
+                gulpCli: {
+                    range: '^1 || ^2',
+                    fix: 'npm i -g gulp-cli@2'
                 },
                 node: {
                     range: '^8 || ^10',
@@ -250,9 +266,9 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
                 }
             },
             '1.9.0': {
-                gulp: {
-                    range: '^3',
-                    fix: 'npm i -g gulp@3'
+                gulpCli: {
+                    range: '^1 || ^2',
+                    fix: 'npm i -g gulp-cli@2'
                 },
                 node: {
                     range: '^8 || ^10',
@@ -265,9 +281,9 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
                 }
             },
             '1.9.1': {
-                gulp: {
-                    range: '^3',
-                    fix: 'npm i -g gulp@3'
+                gulpCli: {
+                    range: '^1 || ^2',
+                    fix: 'npm i -g gulp-cli@2'
                 },
                 node: {
                     range: '^10',
@@ -280,9 +296,9 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
                 }
             },
             '1.10.0': {
-                gulp: {
-                    range: '^3',
-                    fix: 'npm i -g gulp@3'
+                gulpCli: {
+                    range: '^1 || ^2',
+                    fix: 'npm i -g gulp-cli@2'
                 },
                 node: {
                     range: '^10',
@@ -295,9 +311,9 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
                 }
             },
             '1.11.0': {
-                gulp: {
-                    range: '^3',
-                    fix: 'npm i -g gulp@3'
+                gulpCli: {
+                    range: '^1 || ^2',
+                    fix: 'npm i -g gulp-cli@2'
                 },
                 node: {
                     range: '^10',
@@ -310,9 +326,9 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
                 }
             },
             '1.12.0': {
-                gulp: {
-                    range: '^4',
-                    fix: 'npm i -g gulp@4'
+                gulpCli: {
+                    range: '^1 || ^2',
+                    fix: 'npm i -g gulp-cli@2'
                 },
                 node: {
                     range: '^12',
@@ -325,9 +341,9 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
                 }
             },
             '1.12.1': {
-                gulp: {
-                    range: '^4',
-                    fix: 'npm i -g gulp@4'
+                gulpCli: {
+                    range: '^1 || ^2',
+                    fix: 'npm i -g gulp-cli@2'
                 },
                 node: {
                     range: '^12 || ^14',
@@ -340,9 +356,9 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
                 }
             },
             '1.13.0': {
-                gulp: {
-                    range: '^4',
-                    fix: 'npm i -g gulp@4'
+                gulpCli: {
+                    range: '^1 || ^2',
+                    fix: 'npm i -g gulp-cli@2'
                 },
                 node: {
                     range: '^12 || ^14',
@@ -355,9 +371,9 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
                 }
             },
             '1.13.1': {
-                gulp: {
-                    range: '^4',
-                    fix: 'npm i -g gulp@4'
+                gulpCli: {
+                    range: '^1 || ^2',
+                    fix: 'npm i -g gulp-cli@2'
                 },
                 node: {
                     range: '^12 || ^14',
@@ -370,9 +386,9 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
                 }
             },
             '1.14.0': {
-                gulp: {
-                    range: '^4',
-                    fix: 'npm i -g gulp@4'
+                gulpCli: {
+                    range: '^1 || ^2',
+                    fix: 'npm i -g gulp-cli@2'
                 },
                 node: {
                     range: '^12 || ^14',
@@ -385,9 +401,24 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
                 }
             },
             '1.15.0': {
-                gulp: {
+                gulpCli: {
+                    range: '^1 || ^2',
+                    fix: 'npm i -g gulp-cli@2'
+                },
+                node: {
+                    range: '^12.13 || ^14.15 || ^16.13',
+                    fix: 'Install Node.js v12.13, v14.15, v16.13 or higher'
+                },
+                sp: SharePointVersion.SPO,
+                yo: {
                     range: '^4',
-                    fix: 'npm i -g gulp@4'
+                    fix: 'npm i -g yo@4'
+                }
+            },
+            '1.15.2': {
+                gulpCli: {
+                    range: '^1 || ^2',
+                    fix: 'npm i -g gulp-cli@2'
                 },
                 node: {
                     range: '^12.13 || ^14.15 || ^16.13',
@@ -400,6 +431,10 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
                 }
             }
         };
+        __classPrivateFieldGet(this, _SpfxDoctorCommand_instances, "m", _SpfxDoctorCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpfxDoctorCommand_instances, "m", _SpfxDoctorCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpfxDoctorCommand_instances, "m", _SpfxDoctorCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpfxDoctorCommand_instances, "m", _SpfxDoctorCommand_initTypes).call(this);
     }
     get name() {
         return commands_1.default.DOCTOR;
@@ -437,7 +472,8 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
             .then(_ => this.checkSharePointCompatibility(spfxVersion, prerequisites, args, fixes, logger))
             .then(_ => this.checkNodeVersion(prerequisites, fixes, logger))
             .then(_ => this.checkYo(prerequisites, fixes, logger))
-            .then(_ => this.checkGulp(prerequisites, fixes, logger))
+            .then(_ => this.checkGulp(fixes, logger))
+            .then(_ => this.checkGulpCli(prerequisites, fixes, logger))
             .then(_ => this.checkTypeScript(fixes, logger))
             .then(_ => {
             if (fixes.length > 0) {
@@ -499,16 +535,26 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
             }
         });
     }
-    checkGulp(prerequisites, fixes, logger) {
+    checkGulpCli(prerequisites, fixes, logger) {
+        return this
+            .getPackageVersion('gulp-cli', PackageSearchMode.GlobalOnly, HandlePromise.Continue, logger)
+            .then((gulpCliVersion) => {
+            if (gulpCliVersion) {
+                this.checkStatus('gulp-cli', gulpCliVersion, prerequisites.gulpCli, OptionalOrRequired.Required, fixes, logger);
+            }
+            else {
+                logger.log(this.getStatus(CheckStatus.Failure, `gulp-cli not found`));
+                fixes.push(prerequisites.gulpCli.fix);
+            }
+        });
+    }
+    checkGulp(fixes, logger) {
         return this
             .getPackageVersion('gulp', PackageSearchMode.GlobalOnly, HandlePromise.Continue, logger)
             .then((gulpVersion) => {
             if (gulpVersion) {
-                this.checkStatus('gulp', gulpVersion, prerequisites.gulp, OptionalOrRequired.Required, fixes, logger);
-            }
-            else {
-                logger.log(this.getStatus(CheckStatus.Failure, `gulp not found`));
-                fixes.push(prerequisites.gulp.fix);
+                logger.log(this.getStatus(CheckStatus.Failure, `gulp should be removed`));
+                fixes.push('npm un -g gulp');
             }
         });
     }
@@ -650,22 +696,20 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
         const failure = primarySupported ? '✖' : '×';
         return `${result === CheckStatus.Success ? chalk.green(success) : chalk.red(failure)} ${message}`;
     }
-    options() {
-        const options = [
-            {
-                option: '-e, --env [env]',
-                autocomplete: ['sp2016', 'sp2019', 'spo']
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    types() {
-        return {
-            string: ['e', 'env']
-        };
-    }
-    validate(args) {
+}
+_SpfxDoctorCommand_instances = new WeakSet(), _SpfxDoctorCommand_initTelemetry = function _SpfxDoctorCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            env: args.options.env
+        });
+    });
+}, _SpfxDoctorCommand_initOptions = function _SpfxDoctorCommand_initOptions() {
+    this.options.unshift({
+        option: '-e, --env [env]',
+        autocomplete: ['sp2016', 'sp2019', 'spo']
+    });
+}, _SpfxDoctorCommand_initValidators = function _SpfxDoctorCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.env) {
             const sp = this.spVersionStringToEnum(args.options.env);
             if (!sp) {
@@ -676,7 +720,9 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
             return `The output option only accepts the type 'text'`;
         }
         return true;
-    }
-}
+    }));
+}, _SpfxDoctorCommand_initTypes = function _SpfxDoctorCommand_initTypes() {
+    this.types.string.push('e', 'env');
+};
 module.exports = new SpfxDoctorCommand();
 //# sourceMappingURL=spfx-doctor.js.map

package/dist/m365/spo/commands/app/SpoAppBaseCommand.js

@@ -6,7 +6,7 @@ const SpoCommand_1 = require("../../../base/SpoCommand");
 class SpoAppBaseCommand extends SpoCommand_1.default {
     getAppCatalogSiteUrl(logger, authSiteUrl, args) {
         return new Promise((resolve, reject) => {
-            if (args.options.scope === 'sitecollection') {
+            if (args.options.appCatalogScope === 'sitecollection') {
                 return resolve(args.options.appCatalogUrl.toLowerCase().replace('/appcatalog', ''));
             }
             if (args.options.appCatalogUrl) {