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

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

@@ -18,7 +18,6 @@ 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");
 /**
@@ -71,9 +70,9 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
         _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',
@@ -86,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',
@@ -101,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',
@@ -116,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',
@@ -131,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',
@@ -146,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',
@@ -161,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',
@@ -176,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',
@@ -191,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',
@@ -206,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',
@@ -221,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',
@@ -236,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',
@@ -251,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',
@@ -266,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',
@@ -281,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',
@@ -296,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',
@@ -311,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',
@@ -326,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',
@@ -341,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',
@@ -356,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',
@@ -371,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',
@@ -386,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',
@@ -401,9 +400,9 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
                 }
             },
             '1.15.0': {
-                gulp: {
-                    range: '^4',
-                    fix: 'npm i -g gulp@4'
+                gulpCli: {
+                    range: '^1 || ^2',
+                    fix: 'npm i -g gulp-cli@2'
                 },
                 node: {
                     range: '^12.13 || ^14.15 || ^16.13',
@@ -416,9 +415,9 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
                 }
             },
             '1.15.2': {
-                gulp: {
-                    range: '^4',
-                    fix: 'npm i -g gulp@4'
+                gulpCli: {
+                    range: '^1 || ^2',
+                    fix: 'npm i -g gulp-cli@2'
                 },
                 node: {
                     range: '^12.13 || ^14.15 || ^16.13',
@@ -442,57 +441,54 @@ 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`);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!args.options.output) {
+                args.options.output = 'text';
             }
-            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(' ');
-            }
-            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 = 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`;
+                }
+                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) {
@@ -534,16 +530,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');
             }
         });
     }

package/dist/m365/spo/commands/app/app-add.js

@@ -35,40 +35,39 @@ class SpoAppAddCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
     get description() {
         return 'Adds an app to the specified SharePoint Online app catalog';
     }
-    commandAction(logger, args, cb) {
-        const scope = (args.options.scope) ? args.options.scope.toLowerCase() : 'tenant';
-        const overwrite = args.options.overwrite || false;
-        utils_1.spo
-            .getSpoUrl(logger, this.debug)
-            .then((spoUrl) => {
-            return this.getAppCatalogSiteUrl(logger, spoUrl, args);
-        })
-            .then((appCatalogUrl) => {
-            const fullPath = path.resolve(args.options.filePath);
-            if (this.verbose) {
-                logger.logToStderr(`Adding app '${fullPath}' to app catalog...`);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const scope = (args.options.scope) ? args.options.scope.toLowerCase() : 'tenant';
+            const overwrite = args.options.overwrite || false;
+            try {
+                const spoUrl = yield utils_1.spo.getSpoUrl(logger, this.debug);
+                const appCatalogUrl = yield this.getAppCatalogSiteUrl(logger, spoUrl, args);
+                const fullPath = path.resolve(args.options.filePath);
+                if (this.verbose) {
+                    logger.logToStderr(`Adding app '${fullPath}' to app catalog...`);
+                }
+                const fileName = path.basename(fullPath);
+                const requestOptions = {
+                    url: `${appCatalogUrl}/_api/web/${scope}appcatalog/Add(overwrite=${(overwrite.toString().toLowerCase())}, url='${fileName}')`,
+                    headers: {
+                        accept: 'application/json;odata=nometadata',
+                        binaryStringRequestBody: 'true'
+                    },
+                    data: fs.readFileSync(fullPath)
+                };
+                const res = yield request_1.default.post(requestOptions);
+                const json = JSON.parse(res);
+                if (args.options.output === 'json') {
+                    logger.log(json);
+                }
+                else {
+                    logger.log(json.UniqueId);
+                }
             }
-            const fileName = path.basename(fullPath);
-            const requestOptions = {
-                url: `${appCatalogUrl}/_api/web/${scope}appcatalog/Add(overwrite=${(overwrite.toString().toLowerCase())}, url='${fileName}')`,
-                headers: {
-                    accept: 'application/json;odata=nometadata',
-                    binaryStringRequestBody: 'true'
-                },
-                data: fs.readFileSync(fullPath)
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then((res) => {
-            const json = JSON.parse(res);
-            if (args.options.output === 'json') {
-                logger.log(json);
+            catch (err) {
+                this.handleRejectedODataPromise(err);
             }
-            else {
-                logger.log(json.UniqueId);
-            }
-            cb();
-        }, (rawRes) => this.handleRejectedODataPromise(rawRes, logger, cb));
+        });
     }
 }
 _SpoAppAddCommand_instances = new WeakSet(), _SpoAppAddCommand_initTelemetry = function _SpoAppAddCommand_initTelemetry() {

package/dist/m365/spo/commands/app/app-deploy.js

@@ -13,7 +13,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     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 _SpoAppDeployCommand_instances, _SpoAppDeployCommand_initTelemetry, _SpoAppDeployCommand_initOptions, _SpoAppDeployCommand_initValidators;
+var _SpoAppDeployCommand_instances, _SpoAppDeployCommand_initTelemetry, _SpoAppDeployCommand_initOptions, _SpoAppDeployCommand_initValidators, _SpoAppDeployCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
@@ -26,6 +26,7 @@ class SpoAppDeployCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
         __classPrivateFieldGet(this, _SpoAppDeployCommand_instances, "m", _SpoAppDeployCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoAppDeployCommand_instances, "m", _SpoAppDeployCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoAppDeployCommand_instances, "m", _SpoAppDeployCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoAppDeployCommand_instances, "m", _SpoAppDeployCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.APP_DEPLOY;
@@ -33,54 +34,53 @@ class SpoAppDeployCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
     get description() {
         return 'Deploys the specified app in the specified app catalog';
     }
-    commandAction(logger, args, cb) {
-        let appId = '';
-        const scope = (args.options.scope) ? args.options.scope.toLowerCase() : 'tenant';
-        let appCatalogUrl = '';
-        utils_1.spo
-            .getSpoUrl(logger, this.debug)
-            .then((spoUrl) => {
-            return this.getAppCatalogSiteUrl(logger, spoUrl, args);
-        })
-            .then((_appCatalogUrl) => {
-            appCatalogUrl = _appCatalogUrl;
-            if (args.options.id) {
-                if (this.verbose) {
-                    logger.logToStderr(`Using the specified app id ${args.options.id}`);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let appId = '';
+            const scope = (args.options.scope) ? args.options.scope.toLowerCase() : 'tenant';
+            let appCatalogUrl = '';
+            try {
+                const spoUrl = yield utils_1.spo.getSpoUrl(logger, this.debug);
+                appCatalogUrl = yield this.getAppCatalogSiteUrl(logger, spoUrl, args);
+                let res;
+                if (args.options.id) {
+                    if (this.verbose) {
+                        logger.logToStderr(`Using the specified app id ${args.options.id}`);
+                    }
+                    res = { UniqueId: args.options.id };
                 }
-                return Promise.resolve({ UniqueId: args.options.id });
-            }
-            else {
+                else {
+                    if (this.verbose) {
+                        logger.logToStderr(`Looking up app id for app named ${args.options.name}...`);
+                    }
+                    const requestOptions = {
+                        url: `${appCatalogUrl}/_api/web/getfolderbyserverrelativeurl('AppCatalog')/files('${args.options.name}')?$select=UniqueId`,
+                        headers: {
+                            accept: 'application/json;odata=nometadata'
+                        },
+                        responseType: 'json'
+                    };
+                    res = yield request_1.default.get(requestOptions);
+                }
+                appId = res.UniqueId;
                 if (this.verbose) {
-                    logger.logToStderr(`Looking up app id for app named ${args.options.name}...`);
+                    logger.logToStderr(`Deploying app...`);
                 }
                 const requestOptions = {
-                    url: `${appCatalogUrl}/_api/web/getfolderbyserverrelativeurl('AppCatalog')/files('${args.options.name}')?$select=UniqueId`,
+                    url: `${appCatalogUrl}/_api/web/${scope}appcatalog/AvailableApps/GetById('${appId}')/deploy`,
                     headers: {
-                        accept: 'application/json;odata=nometadata'
+                        accept: 'application/json;odata=nometadata',
+                        'content-type': 'application/json;odata=nometadata;charset=utf-8'
                     },
+                    data: { 'skipFeatureDeployment': args.options.skipFeatureDeployment || false },
                     responseType: 'json'
                 };
-                return request_1.default.get(requestOptions);
+                yield request_1.default.post(requestOptions);
             }
-        })
-            .then((res) => {
-            appId = res.UniqueId;
-            if (this.verbose) {
-                logger.logToStderr(`Deploying app...`);
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-            const requestOptions = {
-                url: `${appCatalogUrl}/_api/web/${scope}appcatalog/AvailableApps/GetById('${appId}')/deploy`,
-                headers: {
-                    accept: 'application/json;odata=nometadata',
-                    'content-type': 'application/json;odata=nometadata;charset=utf-8'
-                },
-                data: { 'skipFeatureDeployment': args.options.skipFeatureDeployment || false },
-                responseType: 'json'
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then(_ => cb(), (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
+        });
     }
 }
 _SpoAppDeployCommand_instances = new WeakSet(), _SpoAppDeployCommand_initTelemetry = function _SpoAppDeployCommand_initTelemetry() {
@@ -118,12 +118,6 @@ _SpoAppDeployCommand_instances = new WeakSet(), _SpoAppDeployCommand_initTelemet
                 return `You must specify appCatalogUrl when the scope is sitecollection`;
             }
         }
-        if (!args.options.id && !args.options.name) {
-            return 'Specify either the id or the name';
-        }
-        if (args.options.id && args.options.name) {
-            return 'Specify either the id or the name but not both';
-        }
         if (args.options.id && !utils_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
@@ -132,6 +126,8 @@ _SpoAppDeployCommand_instances = new WeakSet(), _SpoAppDeployCommand_initTelemet
         }
         return true;
     }));
+}, _SpoAppDeployCommand_initOptionSets = function _SpoAppDeployCommand_initOptionSets() {
+    this.optionSets.push(['id', 'name']);
 };
 module.exports = new SpoAppDeployCommand();
 //# sourceMappingURL=app-deploy.js.map