@pnp/cli-microsoft365 5.8.0-beta.f956c5d → 6.0.0-beta.0b0fb88

package/dist/m365/spo/commands/site/site-apppermission-set.js

@@ -58,8 +58,8 @@ class SpoSiteAppPermissionSetCommand extends GraphCommand_1.default {
         return permissions.filter((p) => p.grantedToIdentities.some(({ application }) => application[filterProperty] === filterValue));
     }
     getPermission(args) {
-        if (args.options.permissionId) {
-            return Promise.resolve(args.options.permissionId);
+        if (args.options.id) {
+            return Promise.resolve(args.options.id);
         }
         const permissionRequestOptions = {
             url: `${this.resource}/v1.0/sites/${this.siteId}/permissions`,
@@ -111,7 +111,7 @@ class SpoSiteAppPermissionSetCommand extends GraphCommand_1.default {
 _SpoSiteAppPermissionSetCommand_instances = new WeakSet(), _SpoSiteAppPermissionSetCommand_initTelemetry = function _SpoSiteAppPermissionSetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            permissionId: typeof args.options.permissionId !== 'undefined',
+            id: typeof args.options.id !== 'undefined',
             appId: typeof args.options.appId !== 'undefined',
             appDisplayName: typeof args.options.appDisplayName !== 'undefined'
         });
@@ -120,7 +120,7 @@ _SpoSiteAppPermissionSetCommand_instances = new WeakSet(), _SpoSiteAppPermission
     this.options.unshift({
         option: '-u, --siteUrl <siteUrl>'
     }, {
-        option: '-i, --permissionId [permissionId]'
+        option: '-i, --id [id]'
     }, {
         option: '--appId [appId]'
     }, {
@@ -139,7 +139,7 @@ _SpoSiteAppPermissionSetCommand_instances = new WeakSet(), _SpoSiteAppPermission
         return utils_1.validation.isValidSharePointUrl(args.options.siteUrl);
     }));
 }, _SpoSiteAppPermissionSetCommand_initOptionSets = function _SpoSiteAppPermissionSetCommand_initOptionSets() {
-    this.optionSets.push(['permissionId', 'appId', 'appDisplayName']);
+    this.optionSets.push(['id', 'appId', 'appDisplayName']);
 };
 module.exports = new SpoSiteAppPermissionSetCommand();
 //# sourceMappingURL=site-apppermission-set.js.map

package/dist/m365/spo/commands/site/site-chrome-set.js

@@ -93,7 +93,7 @@ class SpoSiteChromeSetCommand extends SpoCommand_1.default {
             body["footerEnabled"] = !disableFooter;
         }
         const requestOptions = {
-            url: `${args.options.url}/_api/web/SetChromeOptions`,
+            url: `${args.options.siteUrl}/_api/web/SetChromeOptions`,
             headers: {
                 accept: 'application/json;odata=nometadata'
             },
@@ -120,7 +120,7 @@ _SpoSiteChromeSetCommand_instances = new WeakSet(), _SpoSiteChromeSetCommand_ini
     });
 }, _SpoSiteChromeSetCommand_initOptions = function _SpoSiteChromeSetCommand_initOptions() {
     this.options.unshift({
-        option: '-u, --url <url>'
+        option: '-u, --siteUrl <siteUrl>'
     }, {
         option: '--headerLayout [headerLayout]',
         autocomplete: ['Standard', 'Compact', 'Minimal', 'Extended']
@@ -145,7 +145,7 @@ _SpoSiteChromeSetCommand_instances = new WeakSet(), _SpoSiteChromeSetCommand_ini
     });
 }, _SpoSiteChromeSetCommand_initValidators = function _SpoSiteChromeSetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.url);
+        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.siteUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }

package/dist/m365/spo/commands/site/site-ensure.js

@@ -105,7 +105,7 @@ class SpoSiteEnsureCommand extends SpoCommand_1.default {
             logger.logToStderr(`Checking if site ${args.options.url} exists...`);
         }
         const options = {
-            webUrl: args.options.url,
+            url: args.options.url,
             output: 'json',
             debug: this.debug,
             verbose: this.verbose

package/dist/m365/spo/commands/site/site-groupify.js

@@ -51,7 +51,7 @@ class SpoSiteGroupifyCommand extends SpoCommand_1.default {
             optionalParams.CreationOptions = ["SharePointKeepOldHomepage"];
         }
         const requestOptions = {
-            url: `${args.options.siteUrl}/_api/GroupSiteManager/CreateGroupForSite`,
+            url: `${args.options.url}/_api/GroupSiteManager/CreateGroupForSite`,
             headers: {
                 'content-type': 'application/json;odata=nometadata',
                 accept: 'application/json;odata=nometadata',
@@ -79,7 +79,7 @@ _SpoSiteGroupifyCommand_instances = new WeakSet(), _SpoSiteGroupifyCommand_initT
     });
 }, _SpoSiteGroupifyCommand_initOptions = function _SpoSiteGroupifyCommand_initOptions() {
     this.options.unshift({
-        option: '-u, --siteUrl <siteUrl>'
+        option: '-u, --url <url>'
     }, {
         option: '-a, --alias <alias>'
     }, {
@@ -94,7 +94,7 @@ _SpoSiteGroupifyCommand_instances = new WeakSet(), _SpoSiteGroupifyCommand_initT
         option: '--keepOldHomepage'
     });
 }, _SpoSiteGroupifyCommand_initValidators = function _SpoSiteGroupifyCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.siteUrl); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.url); }));
 };
 module.exports = new SpoSiteGroupifyCommand();
 //# sourceMappingURL=site-groupify.js.map

package/dist/m365/spo/commands/site/site-list.js

@@ -97,11 +97,6 @@ class SpoSiteListCommand extends SpoCommand_1.default {
             }, err => reject(err));
         });
     }
-    /*
-      The type property currently defaults to Teamsite.
-      It makes more sense to default to All. Certainly after adding the 'includeOneDriveSites' option.
-      Changing this will be a breaking change. We'll remove the default the next major version.
-    */
     getWebTemplateId(options) {
         if (options.webTemplate) {
             return options.webTemplate;
@@ -109,11 +104,7 @@ class SpoSiteListCommand extends SpoCommand_1.default {
         if (options.includeOneDriveSites) {
             return '';
         }
-        let siteType = options.type;
-        if (!siteType) {
-            siteType = 'TeamSite';
-        }
-        switch (siteType) {
+        switch (options.type) {
             case "TeamSite":
                 return 'GROUP#0';
             case "CommunicationSite":
@@ -127,7 +118,7 @@ _SpoSiteListCommand_instances = new WeakSet(), _SpoSiteListCommand_initTelemetry
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             webTemplate: args.options.webTemplate,
-            siteType: args.options.type || 'TeamSite',
+            type: args.options.type,
             filter: (!(!args.options.filter)).toString(),
             deleted: args.options.deleted,
             includeOneDriveSites: typeof args.options.includeOneDriveSites !== 'undefined'
@@ -136,9 +127,7 @@ _SpoSiteListCommand_instances = new WeakSet(), _SpoSiteListCommand_initTelemetry
 }, _SpoSiteListCommand_initOptions = function _SpoSiteListCommand_initOptions() {
     this.options.unshift({
         option: '-t, --type [type]',
-        // To not introduce a breaking change, 'All' has been added.
-        // You should use all when using '--includeOneDriveSites'
-        autocomplete: ['TeamSite', 'CommunicationSite', 'All']
+        autocomplete: ['TeamSite', 'CommunicationSite']
     }, {
         option: '--webTemplate [webTemplate]'
     }, {
@@ -153,14 +142,14 @@ _SpoSiteListCommand_instances = new WeakSet(), _SpoSiteListCommand_initTelemetry
         if (args.options.type && args.options.webTemplate) {
             return 'Specify either type or webTemplate, but not both';
         }
-        const typeValues = ['TeamSite', 'CommunicationSite', 'All'];
+        const typeValues = ['TeamSite', 'CommunicationSite'];
         if (args.options.type &&
             typeValues.indexOf(args.options.type) < 0) {
             return `${args.options.type} is not a valid value for the type option. Allowed values are ${typeValues.join('|')}`;
         }
         if (args.options.includeOneDriveSites
-            && (!args.options.type || args.options.type !== 'All')) {
-            return 'When using includeOneDriveSites, specify All as value for type';
+            && (args.options.type || args.options.webTemplate)) {
+            return 'When using includeOneDriveSites, don\'t specify the type or webTemplate options';
         }
         return true;
     }));

package/dist/m365/spo/commands/site/site-rename.js

@@ -55,9 +55,9 @@ class SpoSiteRenameCommand extends SpoCommand_1.default {
                 optionsBitmask = optionsBitmask | 16;
             }
             const requestOptions = {
-                "SourceSiteUrl": options.siteUrl,
-                "TargetSiteUrl": options.newSiteUrl,
-                "TargetSiteTitle": options.newSiteTitle || null,
+                "SourceSiteUrl": options.url,
+                "TargetSiteUrl": options.newUrl,
+                "TargetSiteTitle": options.newTitle || null,
                 "Option": optionsBitmask,
                 "Reserve": null,
                 "SkipGestures": null,
@@ -87,7 +87,7 @@ class SpoSiteRenameCommand extends SpoCommand_1.default {
                 return Promise.resolve();
             }
             return new Promise((resolve, reject) => {
-                this.waitForRenameCompletion(this, true, spoAdminUrl, options.siteUrl, resolve, reject, 0);
+                this.waitForRenameCompletion(this, true, spoAdminUrl, options.url, resolve, reject, 0);
             });
         }).then(() => {
             logger.log(this.operationData);
@@ -127,7 +127,7 @@ class SpoSiteRenameCommand extends SpoCommand_1.default {
 _SpoSiteRenameCommand_instances = new WeakSet(), _SpoSiteRenameCommand_initTelemetry = function _SpoSiteRenameCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            newSiteTitle: args.options.newSiteTitle ? true : false,
+            newTitle: args.options.newTitle ? true : false,
             suppressMarketplaceAppCheck: args.options.suppressMarketplaceAppCheck,
             suppressWorkflow2013Check: args.options.suppressWorkflow2013Check,
             wait: args.options.wait
@@ -135,11 +135,11 @@ _SpoSiteRenameCommand_instances = new WeakSet(), _SpoSiteRenameCommand_initTelem
     });
 }, _SpoSiteRenameCommand_initOptions = function _SpoSiteRenameCommand_initOptions() {
     this.options.unshift({
-        option: '-u, --siteUrl <siteUrl>'
+        option: '-u, --url <url>'
     }, {
-        option: '--newSiteUrl <newSiteUrl>'
+        option: '--newUrl <newUrl>'
     }, {
-        option: '--newSiteTitle [newSiteTitle]'
+        option: '--newTitle [newTitle]'
     }, {
         option: '--suppressMarketplaceAppCheck'
     }, {
@@ -149,7 +149,7 @@ _SpoSiteRenameCommand_instances = new WeakSet(), _SpoSiteRenameCommand_initTelem
     });
 }, _SpoSiteRenameCommand_initValidators = function _SpoSiteRenameCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.siteUrl.toLowerCase() === args.options.newSiteUrl.toLowerCase()) {
+        if (args.options.url.toLowerCase() === args.options.newUrl.toLowerCase()) {
             return 'The new URL cannot be the same as the target URL.';
         }
         return true;

package/dist/m365/spo/commands/sitedesign/sitedesign-rights-grant.js

@@ -50,7 +50,7 @@ class SpoSiteDesignRightsGrantCommand extends SpoCommand_1.default {
                     accept: 'application/json;odata=nometadata'
                 },
                 data: {
-                    id: args.options.id,
+                    id: args.options.siteDesignId,
                     principalNames: args.options.principals.split(',').map(p => p.trim()),
                     grantedRights: grantedRights
                 },
@@ -63,7 +63,7 @@ class SpoSiteDesignRightsGrantCommand extends SpoCommand_1.default {
 }
 _SpoSiteDesignRightsGrantCommand_instances = new WeakSet(), _SpoSiteDesignRightsGrantCommand_initOptions = function _SpoSiteDesignRightsGrantCommand_initOptions() {
     this.options.unshift({
-        option: '-i, --id <id>'
+        option: '-i, --siteDesignId <siteDesignId>'
     }, {
         option: '-p, --principals <principals>'
     }, {
@@ -72,8 +72,8 @@ _SpoSiteDesignRightsGrantCommand_instances = new WeakSet(), _SpoSiteDesignRights
     });
 }, _SpoSiteDesignRightsGrantCommand_initValidators = function _SpoSiteDesignRightsGrantCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.id)) {
-            return `${args.options.id} is not a valid GUID`;
+        if (!utils_1.validation.isValidGuid(args.options.siteDesignId)) {
+            return `${args.options.siteDesignId} is not a valid GUID`;
         }
         if (args.options.rights !== 'View') {
             return `${args.options.rights} is not a valid rights value. Allowed values View`;

package/dist/m365/spo/commands/sitedesign/sitedesign-rights-list.js

@@ -48,7 +48,7 @@ class SpoSiteDesignRightsListCommand extends SpoCommand_1.default {
                     'content-type': 'application/json;charset=utf-8',
                     accept: 'application/json;odata=nometadata'
                 },
-                data: { id: args.options.id },
+                data: { id: args.options.siteDesignId },
                 responseType: 'json'
             };
             return request_1.default.post(requestOptions);
@@ -64,12 +64,12 @@ class SpoSiteDesignRightsListCommand extends SpoCommand_1.default {
 }
 _SpoSiteDesignRightsListCommand_instances = new WeakSet(), _SpoSiteDesignRightsListCommand_initOptions = function _SpoSiteDesignRightsListCommand_initOptions() {
     this.options.unshift({
-        option: '-i, --id <id>'
+        option: '-i, --siteDesignId <siteDesignId>'
     });
 }, _SpoSiteDesignRightsListCommand_initValidators = function _SpoSiteDesignRightsListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.id)) {
-            return `${args.options.id} is not a valid GUID`;
+        if (!utils_1.validation.isValidGuid(args.options.siteDesignId)) {
+            return `${args.options.siteDesignId} is not a valid GUID`;
         }
         return true;
     }));

package/dist/m365/spo/commands/sitedesign/sitedesign-rights-revoke.js

@@ -52,7 +52,7 @@ class SpoSiteDesignRightsRevokeCommand extends SpoCommand_1.default {
                         accept: 'application/json;odata=nometadata'
                     },
                     data: {
-                        id: args.options.id,
+                        id: args.options.siteDesignId,
                         principalNames: args.options.principals.split(',').map(p => p.trim())
                     },
                     responseType: 'json'
@@ -69,7 +69,7 @@ class SpoSiteDesignRightsRevokeCommand extends SpoCommand_1.default {
                 type: 'confirm',
                 name: 'continue',
                 default: false,
-                message: `Are you sure you want to revoke access to site design ${args.options.id} from the specified users?`
+                message: `Are you sure you want to revoke access to site design ${args.options.siteDesignId} from the specified users?`
             }, (result) => {
                 if (!result.continue) {
                     cb();
@@ -89,7 +89,7 @@ _SpoSiteDesignRightsRevokeCommand_instances = new WeakSet(), _SpoSiteDesignRight
     });
 }, _SpoSiteDesignRightsRevokeCommand_initOptions = function _SpoSiteDesignRightsRevokeCommand_initOptions() {
     this.options.unshift({
-        option: '-i, --id <id>'
+        option: '-i, --siteDesignId <siteDesignId>'
     }, {
         option: '-p, --principals <principals>'
     }, {
@@ -97,8 +97,8 @@ _SpoSiteDesignRightsRevokeCommand_instances = new WeakSet(), _SpoSiteDesignRight
     });
 }, _SpoSiteDesignRightsRevokeCommand_initValidators = function _SpoSiteDesignRightsRevokeCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.id)) {
-            return `${args.options.id} is not a valid GUID`;
+        if (!utils_1.validation.isValidGuid(args.options.siteDesignId)) {
+            return `${args.options.siteDesignId} is not a valid GUID`;
         }
         return true;
     }));

package/dist/m365/spo/commands/sitedesign/sitedesign-task-get.js

@@ -42,7 +42,7 @@ class SpoSiteDesignTaskGetCommand extends SpoCommand_1.default {
                     accept: 'application/json;odata=nometadata'
                 },
                 data: {
-                    taskId: args.options.taskId
+                    taskId: args.options.id
                 },
                 responseType: 'json'
             };
@@ -58,12 +58,12 @@ class SpoSiteDesignTaskGetCommand extends SpoCommand_1.default {
 }
 _SpoSiteDesignTaskGetCommand_instances = new WeakSet(), _SpoSiteDesignTaskGetCommand_initOptions = function _SpoSiteDesignTaskGetCommand_initOptions() {
     this.options.unshift({
-        option: '-i, --taskId <taskId>'
+        option: '-i, --id <id>'
     });
 }, _SpoSiteDesignTaskGetCommand_initValidators = function _SpoSiteDesignTaskGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.taskId)) {
-            return `${args.options.taskId} is not a valid GUID`;
+        if (!utils_1.validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID`;
         }
         return true;
     }));

package/dist/m365/spo/commands/sitedesign/sitedesign-task-remove.js

@@ -45,7 +45,7 @@ class SpoSiteDesignTaskRemoveCommand extends SpoCommand_1.default {
                         accept: 'application/json;odata=nometadata'
                     },
                     data: {
-                        taskId: args.options.taskId
+                        taskId: args.options.id
                     },
                     responseType: 'json'
                 };
@@ -61,7 +61,7 @@ class SpoSiteDesignTaskRemoveCommand extends SpoCommand_1.default {
                 type: 'confirm',
                 name: 'continue',
                 default: false,
-                message: `Are you sure you want to remove the site design task ${args.options.taskId}?`
+                message: `Are you sure you want to remove the site design task ${args.options.id}?`
             }, (result) => {
                 if (!result.continue) {
                     cb();
@@ -81,14 +81,14 @@ _SpoSiteDesignTaskRemoveCommand_instances = new WeakSet(), _SpoSiteDesignTaskRem
     });
 }, _SpoSiteDesignTaskRemoveCommand_initOptions = function _SpoSiteDesignTaskRemoveCommand_initOptions() {
     this.options.unshift({
-        option: '-i, --taskId <taskId>'
+        option: '-i, --id <id>'
     }, {
         option: '--confirm'
     });
 }, _SpoSiteDesignTaskRemoveCommand_initValidators = function _SpoSiteDesignTaskRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.taskId)) {
-            return `${args.options.taskId} is not a valid GUID`;
+        if (!utils_1.validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID`;
         }
         return true;
     }));

package/dist/m365/spo/commands/tenant/tenant-recyclebinitem-remove.js

@@ -46,14 +46,14 @@ class SpoTenantRecycleBinItemRemoveCommand extends SpoCommand_1.default {
                 .then((res) => {
                 this.context = res;
                 if (this.verbose) {
-                    logger.logToStderr(`Removing deleted site collection ${args.options.url}...`);
+                    logger.logToStderr(`Removing deleted site collection ${args.options.siteUrl}...`);
                 }
                 const requestOptions = {
                     url: `${this.spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
                     headers: {
                         'X-RequestDigest': this.context.FormDigestValue
                     },
-                    data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="16" ObjectPathId="15" /><Query Id="17" ObjectPathId="15"><Query SelectAllProperties="false"><Properties><Property Name="PollingInterval" ScalarProperty="true" /><Property Name="IsComplete" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Method Id="15" ParentId="1" Name="RemoveDeletedSite"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.url)}</Parameter></Parameters></Method><Constructor Id="1" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
+                    data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="16" ObjectPathId="15" /><Query Id="17" ObjectPathId="15"><Query SelectAllProperties="false"><Properties><Property Name="PollingInterval" ScalarProperty="true" /><Property Name="IsComplete" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Method Id="15" ParentId="1" Name="RemoveDeletedSite"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.siteUrl)}</Parameter></Parameters></Method><Constructor Id="1" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
                 };
                 return request_1.default.post(requestOptions);
             })
@@ -97,7 +97,7 @@ class SpoTenantRecycleBinItemRemoveCommand extends SpoCommand_1.default {
                 type: 'confirm',
                 name: 'continue',
                 default: false,
-                message: `Are you sure you want to remove the deleted site collection ${args.options.url} from tenant recycle bin?`
+                message: `Are you sure you want to remove the deleted site collection ${args.options.siteUrl} from tenant recycle bin?`
             }, (result) => {
                 if (!result.continue) {
                     cb();
@@ -118,14 +118,14 @@ _SpoTenantRecycleBinItemRemoveCommand_instances = new WeakSet(), _SpoTenantRecyc
     });
 }, _SpoTenantRecycleBinItemRemoveCommand_initOptions = function _SpoTenantRecycleBinItemRemoveCommand_initOptions() {
     this.options.unshift({
-        option: '-u, --url <url>'
+        option: '-u, --siteUrl <siteUrl>'
     }, {
         option: '--wait'
     }, {
         option: '--confirm'
     });
 }, _SpoTenantRecycleBinItemRemoveCommand_initValidators = function _SpoTenantRecycleBinItemRemoveCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.url); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.siteUrl); }));
 };
 module.exports = new SpoTenantRecycleBinItemRemoveCommand();
 //# sourceMappingURL=tenant-recyclebinitem-remove.js.map

package/dist/m365/spo/commands/tenant/tenant-recyclebinitem-restore.js

@@ -44,7 +44,7 @@ class SpoTenantRecycleBinItemRestoreCommand extends SpoCommand_1.default {
                     'content-type': 'application/json;charset=utf-8'
                 },
                 data: {
-                    siteUrl: args.options.url
+                    siteUrl: args.options.siteUrl
                 }
             };
             return request_1.default.post(requestOptions);
@@ -63,12 +63,12 @@ _SpoTenantRecycleBinItemRestoreCommand_instances = new WeakSet(), _SpoTenantRecy
     });
 }, _SpoTenantRecycleBinItemRestoreCommand_initOptions = function _SpoTenantRecycleBinItemRestoreCommand_initOptions() {
     this.options.unshift({
-        option: '-u, --url <url>'
+        option: '-u, --siteUrl <siteUrl>'
     }, {
         option: '--wait'
     });
 }, _SpoTenantRecycleBinItemRestoreCommand_initValidators = function _SpoTenantRecycleBinItemRestoreCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.url); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.siteUrl); }));
 };
 module.exports = new SpoTenantRecycleBinItemRestoreCommand();
 //# sourceMappingURL=tenant-recyclebinitem-restore.js.map

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

@@ -37,7 +37,7 @@ class SpoWebAddCommand extends SpoCommand_1.default {
         return 'Create new subsite';
     }
     getExcludedOptionsWithUrls() {
-        return ['webUrl'];
+        return ['url'];
     }
     commandAction(logger, args, cb) {
         let siteInfo = null;
@@ -55,7 +55,7 @@ class SpoWebAddCommand extends SpoCommand_1.default {
                 responseType: 'json',
                 data: {
                     parameters: {
-                        Url: args.options.webUrl,
+                        Url: args.options.url,
                         Title: args.options.title,
                         Description: args.options.description,
                         Language: args.options.locale,
@@ -65,7 +65,7 @@ class SpoWebAddCommand extends SpoCommand_1.default {
                 }
             };
             if (this.verbose) {
-                logger.logToStderr(`Creating subsite ${args.options.parentWebUrl}/${args.options.webUrl}...`);
+                logger.logToStderr(`Creating subsite ${args.options.parentWebUrl}/${args.options.url}...`);
             }
             return request_1.default.post(requestOptions);
         })
@@ -77,7 +77,7 @@ class SpoWebAddCommand extends SpoCommand_1.default {
             if (this.verbose) {
                 logger.logToStderr("Setting inheriting navigation from the parent site...");
             }
-            subsiteFullUrl = `${args.options.parentWebUrl}/${encodeURIComponent(args.options.webUrl)}`;
+            subsiteFullUrl = `${args.options.parentWebUrl}/${encodeURIComponent(args.options.url)}`;
             const requestOptions = {
                 url: `${subsiteFullUrl}/_api/web/effectivebasepermissions`,
                 headers: {
@@ -157,7 +157,7 @@ _SpoWebAddCommand_instances = new WeakSet(), _SpoWebAddCommand_initTelemetry = f
     }, {
         option: '-d, --description [description]'
     }, {
-        option: '-u, --webUrl <webUrl>'
+        option: '-u, --url <url>'
     }, {
         option: '-w, --webTemplate <webTemplate>'
     }, {

package/dist/m365/spo/commands/web/web-get.js

@@ -34,7 +34,7 @@ class SpoWebGetCommand extends SpoCommand_1.default {
         return 'Retrieve information about the specified site';
     }
     commandAction(logger, args, cb) {
-        let url = `${args.options.webUrl}/_api/web`;
+        let url = `${args.options.url}/_api/web`;
         if (args.options.withGroups) {
             url += '?$expand=AssociatedMemberGroup,AssociatedOwnerGroup,AssociatedVisitorGroup';
         }
@@ -61,12 +61,12 @@ _SpoWebGetCommand_instances = new WeakSet(), _SpoWebGetCommand_initTelemetry = f
     });
 }, _SpoWebGetCommand_initOptions = function _SpoWebGetCommand_initOptions() {
     this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
+        option: '-u, --url <url>'
     }, {
         option: '--withGroups'
     });
 }, _SpoWebGetCommand_initValidators = function _SpoWebGetCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.webUrl); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.url); }));
 };
 module.exports = new SpoWebGetCommand();
 //# sourceMappingURL=web-get.js.map

package/dist/m365/spo/commands/web/web-list.js

@@ -37,9 +37,9 @@ class SpoWebListCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args, cb) {
         if (this.verbose) {
-            logger.logToStderr(`Retrieving all webs in site at ${args.options.webUrl}...`);
+            logger.logToStderr(`Retrieving all webs in site at ${args.options.url}...`);
         }
-        let requestUrl = `${args.options.webUrl}/_api/web/webs`;
+        let requestUrl = `${args.options.url}/_api/web/webs`;
         if (args.options.output !== 'json') {
             requestUrl += '?$select=Title,Id,URL';
         }
@@ -60,10 +60,10 @@ class SpoWebListCommand extends SpoCommand_1.default {
 }
 _SpoWebListCommand_instances = new WeakSet(), _SpoWebListCommand_initOptions = function _SpoWebListCommand_initOptions() {
     this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
+        option: '-u, --url <url>'
     });
 }, _SpoWebListCommand_initValidators = function _SpoWebListCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.webUrl); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.url); }));
 };
 module.exports = new SpoWebListCommand();
 //# sourceMappingURL=web-list.js.map

package/dist/m365/spo/commands/web/web-reindex.js

@@ -38,13 +38,13 @@ class SpoWebReindexCommand extends SpoCommand_1.default {
         let requestDigest = '';
         let webIdentityResp;
         utils_1.spo
-            .getRequestDigest(args.options.webUrl)
+            .getRequestDigest(args.options.url)
             .then((res) => {
             requestDigest = res.FormDigestValue;
             if (this.debug) {
                 logger.logToStderr(`Retrieved request digest. Retrieving web identity...`);
             }
-            return utils_1.spo.getCurrentWebIdentity(args.options.webUrl, requestDigest);
+            return utils_1.spo.getCurrentWebIdentity(args.options.url, requestDigest);
         })
             .then((identityResp) => {
             webIdentityResp = identityResp;
@@ -54,20 +54,20 @@ class SpoWebReindexCommand extends SpoCommand_1.default {
             if (this.verbose) {
                 logger.logToStderr(`Checking if the site is a no-script site...`);
             }
-            return propertybag_base_1.SpoPropertyBagBaseCommand.isNoScriptSite(args.options.webUrl, requestDigest, webIdentityResp, logger, this.debug);
+            return propertybag_base_1.SpoPropertyBagBaseCommand.isNoScriptSite(args.options.url, requestDigest, webIdentityResp, logger, this.debug);
         })
             .then((isNoScriptSite) => {
             if (isNoScriptSite) {
                 if (this.verbose) {
                     logger.logToStderr(`Site is a no-script site. Reindexing lists instead...`);
                 }
-                return this.reindexLists(args.options.webUrl, requestDigest, logger, webIdentityResp);
+                return this.reindexLists(args.options.url, requestDigest, logger, webIdentityResp);
             }
             if (this.verbose) {
                 logger.logToStderr(`Site is not a no-script site. Reindexing site...`);
             }
             const requestOptions = {
-                url: `${args.options.webUrl}/_api/web/allproperties`,
+                url: `${args.options.url}/_api/web/allproperties`,
                 headers: {
                     'accept': 'application/json;odata=nometadata'
                 },
@@ -78,7 +78,7 @@ class SpoWebReindexCommand extends SpoCommand_1.default {
             .then((webProperties) => {
             let searchVersion = webProperties.vti_x005f_searchversion || 0;
             searchVersion++;
-            return propertybag_base_1.SpoPropertyBagBaseCommand.setProperty('vti_searchversion', searchVersion.toString(), args.options.webUrl, requestDigest, webIdentityResp, logger, this.debug);
+            return propertybag_base_1.SpoPropertyBagBaseCommand.setProperty('vti_searchversion', searchVersion.toString(), args.options.url, requestDigest, webIdentityResp, logger, this.debug);
         })
             .then(_ => cb(), (err) => {
             if (this.reindexedLists) {
@@ -138,10 +138,10 @@ class SpoWebReindexCommand extends SpoCommand_1.default {
 }
 _SpoWebReindexCommand_instances = new WeakSet(), _SpoWebReindexCommand_initOptions = function _SpoWebReindexCommand_initOptions() {
     this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
+        option: '-u, --url <url>'
     });
 }, _SpoWebReindexCommand_initValidators = function _SpoWebReindexCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.webUrl); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.url); }));
 };
 module.exports = new SpoWebReindexCommand();
 //# sourceMappingURL=web-reindex.js.map