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

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

@@ -1,9 +1,23 @@
 "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;
 Object.defineProperty(exports, "__esModule", { value: true });
 const chalk = require("chalk");
 const child_process = require("child_process");
 const semver_1 = require("semver");
-const Command_1 = require("../../../Command");
 const AnonymousCommand_1 = require("../../base/AnonymousCommand");
 const commands_1 = require("../commands");
 /**
@@ -52,12 +66,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 +85,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 +100,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 +115,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 +130,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 +145,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 +160,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 +175,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 +190,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 +205,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 +220,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 +235,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 +250,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 +265,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 +280,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 +295,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 +310,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 +325,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 +340,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 +355,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 +370,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 +385,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 +400,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',
@@ -398,8 +428,26 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
                     range: '^4',
                     fix: 'npm i -g yo@4'
                 }
+            },
+            '1.16.0-beta.1': {
+                gulpCli: {
+                    range: '^1 || ^2',
+                    fix: 'npm i -g gulp-cli@2'
+                },
+                node: {
+                    range: '^16.13',
+                    fix: 'Install Node.js v16.13 or higher'
+                },
+                sp: SharePointVersion.SPO,
+                yo: {
+                    range: '^4',
+                    fix: 'npm i -g yo@4'
+                }
             }
         };
+        __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);
     }
     get name() {
         return commands_1.default.DOCTOR;
@@ -407,57 +455,61 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
     get description() {
         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');
-        logger.log(' ');
-        let spfxVersion = '';
-        let prerequisites;
-        const fixes = [];
-        this
-            .getSharePointFrameworkVersion(logger)
-            .then((_spfxVersion) => {
-            if (!_spfxVersion) {
-                logger.log(this.getStatus(CheckStatus.Failure, `SharePoint Framework`));
-                return Promise.reject(`SharePoint Framework not found`);
-            }
-            spfxVersion = _spfxVersion;
-            prerequisites = this.versions[spfxVersion];
-            if (!prerequisites) {
-                logger.log(this.getStatus(CheckStatus.Failure, `SharePoint Framework v${spfxVersion}`));
-                return Promise.reject(`spfx doctor doesn't support SPFx v${spfxVersion} at this moment`);
-            }
-            logger.log(this.getStatus(CheckStatus.Success, `SharePoint Framework v${spfxVersion}`));
-            return Promise.resolve();
-        })
-            .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.checkTypeScript(fixes, logger))
-            .then(_ => {
-            if (fixes.length > 0) {
-                logger.log(' ');
-                logger.log('Recommended fixes:');
-                logger.log(' ');
-                fixes.forEach(f => logger.log(`- ${f}`));
-                logger.log(' ');
+    commandAction(logger, args) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!args.options.output) {
+                args.options.output = 'text';
             }
-            cb();
-        })
-            .catch((error) => {
             logger.log(' ');
-            if (fixes.length > 0) {
-                logger.log('Recommended fixes:');
-                logger.log(' ');
-                fixes.forEach(f => logger.log(`- ${f}`));
+            logger.log('CLI for Microsoft 365 SharePoint Framework doctor');
+            logger.log('Verifying configuration of your system for working with the SharePoint Framework');
+            logger.log(' ');
+            let spfxVersion = '';
+            let prerequisites;
+            const fixes = [];
+            try {
+                spfxVersion = (_a = args.options.spfxVersion) !== null && _a !== void 0 ? _a : yield this.getSharePointFrameworkVersion(logger);
+                if (!spfxVersion) {
+                    logger.log(this.getStatus(CheckStatus.Failure, `SharePoint Framework`));
+                    throw `SharePoint Framework not found`;
+                }
+                prerequisites = this.versions[spfxVersion];
+                if (!prerequisites) {
+                    logger.log(this.getStatus(CheckStatus.Failure, `SharePoint Framework v${spfxVersion}`));
+                    throw `spfx doctor doesn't support SPFx v${spfxVersion} at this moment`;
+                }
+                if (args.options.spfxVersion) {
+                    yield this.checkSharePointFrameworkVersion(args.options.spfxVersion, fixes, logger);
+                }
+                else {
+                    // spfx was detected and if we are here, it means that we support it
+                    logger.log(this.getStatus(CheckStatus.Success, `SharePoint Framework v${spfxVersion}`));
+                }
+                yield this.checkSharePointCompatibility(spfxVersion, prerequisites, args, fixes, logger);
+                yield this.checkNodeVersion(prerequisites, fixes, logger);
+                yield this.checkYo(prerequisites, fixes, logger);
+                yield this.checkGulp(fixes, logger);
+                yield this.checkGulpCli(prerequisites, fixes, logger);
+                yield this.checkTypeScript(fixes, logger);
+                if (fixes.length > 0) {
+                    logger.log(' ');
+                    logger.log('Recommended fixes:');
+                    logger.log(' ');
+                    fixes.forEach(f => logger.log(`- ${f}`));
+                    logger.log(' ');
+                }
+            }
+            catch (err) {
                 logger.log(' ');
+                if (fixes.length > 0) {
+                    logger.log('Recommended fixes:');
+                    logger.log(' ');
+                    fixes.forEach(f => logger.log(`- ${f}`));
+                    logger.log(' ');
+                }
+                this.handleRejectedPromise(err);
             }
-            cb(new Command_1.CommandError(error));
         });
     }
     checkSharePointCompatibility(spfxVersion, prerequisites, args, fixes, logger) {
@@ -486,6 +538,23 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
             this.checkStatus('Node', nodeVersion, prerequisites.node, OptionalOrRequired.Required, fixes, logger);
         });
     }
+    checkSharePointFrameworkVersion(spfxVersionRequested, fixes, logger) {
+        return this
+            .getPackageVersion('@microsoft/generator-sharepoint', PackageSearchMode.GlobalOnly, HandlePromise.Continue, logger)
+            .then((spfxVersionDetected) => {
+            const versionCheck = {
+                range: spfxVersionRequested,
+                fix: `npm i -g @microsoft/generator-sharepoint@${spfxVersionRequested}`
+            };
+            if (spfxVersionDetected) {
+                this.checkStatus(`SharePoint Framework`, spfxVersionDetected, versionCheck, OptionalOrRequired.Required, fixes, logger);
+            }
+            else {
+                logger.log(this.getStatus(CheckStatus.Failure, `SharePoint Framework v${spfxVersionRequested} not found`));
+                fixes.push(versionCheck.fix);
+            }
+        });
+    }
     checkYo(prerequisites, fixes, logger) {
         return this
             .getPackageVersion('yo', PackageSearchMode.GlobalOnly, HandlePromise.Continue, logger)
@@ -499,16 +568,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,33 +729,40 @@ 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,
+            spfxVersion: args.options.spfxVersion
+        });
+    });
+}, _SpfxDoctorCommand_initOptions = function _SpfxDoctorCommand_initOptions() {
+    this.options.unshift({
+        option: '-e, --env [env]',
+        autocomplete: ['sp2016', 'sp2019', 'spo']
+    }, {
+        option: '-v, --spfxVersion [spfxVersion]',
+        autocomplete: Object.keys(this.versions)
+    });
+}, _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) {
                 return `${args.options.env} is not a valid SharePoint version. Valid versions are sp2016, sp2019 or spo`;
             }
         }
+        if (args.options.spfxVersion) {
+            if (!this.versions[args.options.spfxVersion]) {
+                return `${args.options.spfxVersion} is not a supported SharePoint Framework version. Supported versions are ${Object.keys(this.versions).join(', ')}`;
+            }
+        }
         if (args.options.output && args.options.output !== 'text') {
             return `The output option only accepts the type 'text'`;
         }
         return true;
-    }
-}
+    }));
+};
 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) {