@pnp/cli-microsoft365 5.9.0-beta.fd6d022 → 6.0.0-beta.01ba480

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

@@ -71,8 +71,8 @@ class SpoSiteAppPermissionRemoveCommand extends GraphCommand_1.default {
         });
     }
     getPermissionIds(args) {
-        if (args.options.permissionId) {
-            return Promise.resolve([args.options.permissionId]);
+        if (args.options.id) {
+            return Promise.resolve([args.options.id]);
         }
         return this
             .getPermissions()
@@ -133,7 +133,7 @@ _SpoSiteAppPermissionRemoveCommand_instances = new WeakSet(), _SpoSiteAppPermiss
         Object.assign(this.telemetryProperties, {
             appId: typeof args.options.appId !== 'undefined',
             appDisplayName: typeof args.options.appDisplayName !== 'undefined',
-            permissionId: typeof args.options.permissionId !== 'undefined',
+            id: typeof args.options.id !== 'undefined',
             confirm: (!!args.options.confirm).toString()
         });
     });
@@ -141,7 +141,7 @@ _SpoSiteAppPermissionRemoveCommand_instances = new WeakSet(), _SpoSiteAppPermiss
     this.options.unshift({
         option: '-u, --siteUrl <siteUrl>'
     }, {
-        option: '-i, --permissionId [permissionId]'
+        option: '-i, --id [id]'
     }, {
         option: '--appId [appId]'
     }, {
@@ -157,7 +157,7 @@ _SpoSiteAppPermissionRemoveCommand_instances = new WeakSet(), _SpoSiteAppPermiss
         return validation_1.validation.isValidSharePointUrl(args.options.siteUrl);
     }));
 }, _SpoSiteAppPermissionRemoveCommand_initOptionSets = function _SpoSiteAppPermissionRemoveCommand_initOptionSets() {
-    this.optionSets.push(['appId', 'appDisplayName', 'permissionId']);
+    this.optionSets.push(['appId', 'appDisplayName', 'id']);
 };
 module.exports = new SpoSiteAppPermissionRemoveCommand();
 //# sourceMappingURL=site-apppermission-remove.js.map

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

@@ -59,8 +59,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`,
@@ -110,7 +110,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',
             permissions: args.options.permissions
@@ -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]'
     }, {
@@ -140,7 +140,7 @@ _SpoSiteAppPermissionSetCommand_instances = new WeakSet(), _SpoSiteAppPermission
         return validation_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

@@ -94,7 +94,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'
                 },
@@ -125,7 +125,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']
@@ -150,7 +150,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 = validation_1.validation.isValidSharePointUrl(args.options.url);
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.siteUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }

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

@@ -115,7 +115,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

@@ -52,7 +52,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',
@@ -82,7 +82,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>'
     }, {
@@ -97,7 +97,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 validation_1.validation.isValidSharePointUrl(args.options.siteUrl); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.url); }));
 };
 module.exports = new SpoSiteGroupifyCommand();
 //# sourceMappingURL=site-groupify.js.map

package/dist/m365/spo/commands/{hubsite/hubsite-connect.js → site/site-hubsite-connect.js}

@@ -13,22 +13,22 @@ 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 _SpoHubSiteConnectCommand_instances, _SpoHubSiteConnectCommand_initOptions, _SpoHubSiteConnectCommand_initValidators;
+var _SpoSiteHubSiteConnectCommand_instances, _SpoSiteHubSiteConnectCommand_initOptions, _SpoSiteHubSiteConnectCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const spo_1 = require("../../../../utils/spo");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
-class SpoHubSiteConnectCommand extends SpoCommand_1.default {
+class SpoSiteHubSiteConnectCommand extends SpoCommand_1.default {
     constructor() {
         super();
-        _SpoHubSiteConnectCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoHubSiteConnectCommand_instances, "m", _SpoHubSiteConnectCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoHubSiteConnectCommand_instances, "m", _SpoHubSiteConnectCommand_initValidators).call(this);
+        _SpoSiteHubSiteConnectCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoSiteHubSiteConnectCommand_instances, "m", _SpoSiteHubSiteConnectCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoSiteHubSiteConnectCommand_instances, "m", _SpoSiteHubSiteConnectCommand_initValidators).call(this);
     }
     get name() {
-        return commands_1.default.HUBSITE_CONNECT;
+        return commands_1.default.SITE_HUBSITE_CONNECT;
     }
     get description() {
         return 'Connects the specified site collection to the given hub site';
@@ -36,9 +36,9 @@ class SpoHubSiteConnectCommand extends SpoCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const res = yield spo_1.spo.getRequestDigest(args.options.url);
+                const res = yield spo_1.spo.getRequestDigest(args.options.siteUrl);
                 const requestOptions = {
-                    url: `${args.options.url}/_api/site/JoinHubSite('${encodeURIComponent(args.options.hubSiteId)}')`,
+                    url: `${args.options.siteUrl}/_api/site/JoinHubSite('${encodeURIComponent(args.options.id)}')`,
                     headers: {
                         'X-RequestDigest': res.FormDigestValue,
                         accept: 'application/json;odata=nometadata'
@@ -53,23 +53,23 @@ class SpoHubSiteConnectCommand extends SpoCommand_1.default {
         });
     }
 }
-_SpoHubSiteConnectCommand_instances = new WeakSet(), _SpoHubSiteConnectCommand_initOptions = function _SpoHubSiteConnectCommand_initOptions() {
+_SpoSiteHubSiteConnectCommand_instances = new WeakSet(), _SpoSiteHubSiteConnectCommand_initOptions = function _SpoSiteHubSiteConnectCommand_initOptions() {
     this.options.unshift({
-        option: '-u, --url <url>'
+        option: '-u, --siteUrl <siteUrl>'
     }, {
-        option: '-i, --hubSiteId <hubSiteId>'
+        option: '-i, --id <id>'
     });
-}, _SpoHubSiteConnectCommand_initValidators = function _SpoHubSiteConnectCommand_initValidators() {
+}, _SpoSiteHubSiteConnectCommand_initValidators = function _SpoSiteHubSiteConnectCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.url);
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.siteUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
-        if (!validation_1.validation.isValidGuid(args.options.hubSiteId)) {
-            return `${args.options.hubSiteId} is not a valid GUID`;
+        if (!validation_1.validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID`;
         }
         return true;
     }));
 };
-module.exports = new SpoHubSiteConnectCommand();
-//# sourceMappingURL=hubsite-connect.js.map
+module.exports = new SpoSiteHubSiteConnectCommand();
+//# sourceMappingURL=site-hubsite-connect.js.map

package/dist/m365/spo/commands/{hubsite/hubsite-disconnect.js → site/site-hubsite-disconnect.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 _SpoHubSiteDisconnectCommand_instances, _SpoHubSiteDisconnectCommand_initTelemetry, _SpoHubSiteDisconnectCommand_initOptions, _SpoHubSiteDisconnectCommand_initValidators;
+var _SpoSiteHubSiteDisconnectCommand_instances, _SpoSiteHubSiteDisconnectCommand_initTelemetry, _SpoSiteHubSiteDisconnectCommand_initOptions, _SpoSiteHubSiteDisconnectCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
@@ -21,16 +21,16 @@ const spo_1 = require("../../../../utils/spo");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
-class SpoHubSiteDisconnectCommand extends SpoCommand_1.default {
+class SpoSiteHubSiteDisconnectCommand extends SpoCommand_1.default {
     constructor() {
         super();
-        _SpoHubSiteDisconnectCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoHubSiteDisconnectCommand_instances, "m", _SpoHubSiteDisconnectCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoHubSiteDisconnectCommand_instances, "m", _SpoHubSiteDisconnectCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoHubSiteDisconnectCommand_instances, "m", _SpoHubSiteDisconnectCommand_initValidators).call(this);
+        _SpoSiteHubSiteDisconnectCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoSiteHubSiteDisconnectCommand_instances, "m", _SpoSiteHubSiteDisconnectCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoSiteHubSiteDisconnectCommand_instances, "m", _SpoSiteHubSiteDisconnectCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoSiteHubSiteDisconnectCommand_instances, "m", _SpoSiteHubSiteDisconnectCommand_initValidators).call(this);
     }
     get name() {
-        return commands_1.default.HUBSITE_DISCONNECT;
+        return commands_1.default.SITE_HUBSITE_DISCONNECT;
     }
     get description() {
         return 'Disconnects the specifies site collection from its hub site';
@@ -39,12 +39,12 @@ class SpoHubSiteDisconnectCommand extends SpoCommand_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             const disconnectHubSite = () => __awaiter(this, void 0, void 0, function* () {
                 try {
-                    const res = yield spo_1.spo.getRequestDigest(args.options.url);
+                    const res = yield spo_1.spo.getRequestDigest(args.options.siteUrl);
                     if (this.verbose) {
-                        logger.logToStderr(`Disconnecting site collection ${args.options.url} from its hubsite...`);
+                        logger.logToStderr(`Disconnecting site collection ${args.options.siteUrl} from its hubsite...`);
                     }
                     const requestOptions = {
-                        url: `${args.options.url}/_api/site/JoinHubSite('00000000-0000-0000-0000-000000000000')`,
+                        url: `${args.options.siteUrl}/_api/site/JoinHubSite('00000000-0000-0000-0000-000000000000')`,
                         headers: {
                             'X-RequestDigest': res.FormDigestValue,
                             accept: 'application/json;odata=nometadata'
@@ -65,7 +65,7 @@ class SpoHubSiteDisconnectCommand extends SpoCommand_1.default {
                     type: 'confirm',
                     name: 'continue',
                     default: false,
-                    message: `Are you sure you want to disconnect the site collection ${args.options.url} from its hub site?`
+                    message: `Are you sure you want to disconnect the site collection ${args.options.siteUrl} from its hub site?`
                 });
                 if (result.continue) {
                     yield disconnectHubSite();
@@ -74,20 +74,20 @@ class SpoHubSiteDisconnectCommand extends SpoCommand_1.default {
         });
     }
 }
-_SpoHubSiteDisconnectCommand_instances = new WeakSet(), _SpoHubSiteDisconnectCommand_initTelemetry = function _SpoHubSiteDisconnectCommand_initTelemetry() {
+_SpoSiteHubSiteDisconnectCommand_instances = new WeakSet(), _SpoSiteHubSiteDisconnectCommand_initTelemetry = function _SpoSiteHubSiteDisconnectCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             confirm: args.options.confirm || false
         });
     });
-}, _SpoHubSiteDisconnectCommand_initOptions = function _SpoHubSiteDisconnectCommand_initOptions() {
+}, _SpoSiteHubSiteDisconnectCommand_initOptions = function _SpoSiteHubSiteDisconnectCommand_initOptions() {
     this.options.unshift({
-        option: '-u, --url <url>'
+        option: '-u, --siteUrl <siteUrl>'
     }, {
         option: '--confirm'
     });
-}, _SpoHubSiteDisconnectCommand_initValidators = function _SpoHubSiteDisconnectCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.url); }));
+}, _SpoSiteHubSiteDisconnectCommand_initValidators = function _SpoSiteHubSiteDisconnectCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.siteUrl); }));
 };
-module.exports = new SpoHubSiteDisconnectCommand();
-//# sourceMappingURL=hubsite-disconnect.js.map
+module.exports = new SpoSiteHubSiteDisconnectCommand();
+//# sourceMappingURL=site-hubsite-disconnect.js.map

package/dist/m365/spo/commands/{hubsite/hubsite-theme-sync.js → site/site-hubsite-theme-sync.js}

@@ -13,24 +13,24 @@ 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 _SpoHubSiteThemeSyncCommand_instances, _SpoHubSiteThemeSyncCommand_initOptions, _SpoHubSiteThemeSyncCommand_initValidators;
+var _SpoSiteHubSiteThemeSyncCommand_instances, _SpoSiteHubSiteThemeSyncCommand_initOptions, _SpoSiteHubSiteThemeSyncCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
-class SpoHubSiteThemeSyncCommand extends SpoCommand_1.default {
+class SpoSiteHubSiteThemeSyncCommand extends SpoCommand_1.default {
     constructor() {
         super();
-        _SpoHubSiteThemeSyncCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoHubSiteThemeSyncCommand_instances, "m", _SpoHubSiteThemeSyncCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoHubSiteThemeSyncCommand_instances, "m", _SpoHubSiteThemeSyncCommand_initValidators).call(this);
+        _SpoSiteHubSiteThemeSyncCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoSiteHubSiteThemeSyncCommand_instances, "m", _SpoSiteHubSiteThemeSyncCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoSiteHubSiteThemeSyncCommand_instances, "m", _SpoSiteHubSiteThemeSyncCommand_initValidators).call(this);
     }
     get name() {
-        return commands_1.default.HUBSITE_THEME_SYNC;
+        return commands_1.default.SITE_HUBSITE_THEME_SYNC;
     }
     get description() {
-        return 'Applies any theme updates from the parent hub site.';
+        return 'Applies any theme updates from the hub site the site is connected to.';
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -53,12 +53,12 @@ class SpoHubSiteThemeSyncCommand extends SpoCommand_1.default {
         });
     }
 }
-_SpoHubSiteThemeSyncCommand_instances = new WeakSet(), _SpoHubSiteThemeSyncCommand_initOptions = function _SpoHubSiteThemeSyncCommand_initOptions() {
+_SpoSiteHubSiteThemeSyncCommand_instances = new WeakSet(), _SpoSiteHubSiteThemeSyncCommand_initOptions = function _SpoSiteHubSiteThemeSyncCommand_initOptions() {
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     });
-}, _SpoHubSiteThemeSyncCommand_initValidators = function _SpoHubSiteThemeSyncCommand_initValidators() {
+}, _SpoSiteHubSiteThemeSyncCommand_initValidators = function _SpoSiteHubSiteThemeSyncCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.webUrl); }));
 };
-module.exports = new SpoHubSiteThemeSyncCommand();
-//# sourceMappingURL=hubsite-theme-sync.js.map
+module.exports = new SpoSiteHubSiteThemeSyncCommand();
+//# sourceMappingURL=site-hubsite-theme-sync.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

@@ -51,9 +51,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,
@@ -78,7 +78,7 @@ class SpoSiteRenameCommand extends SpoCommand_1.default {
                 }
                 const isComplete = this.operationData.JobState === "Success";
                 if (options.wait && !isComplete) {
-                    yield this.waitForRenameCompletion(this, true, spoAdminUrl, options.siteUrl, 0);
+                    yield this.waitForRenameCompletion(this, true, spoAdminUrl, options.url, 0);
                 }
                 logger.log(this.operationData);
             }
@@ -116,7 +116,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
@@ -124,11 +124,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'
     }, {
@@ -138,7 +138,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

@@ -47,7 +47,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 (!validation_1.validation.isValidGuid(args.options.id)) {
-            return `${args.options.id} is not a valid GUID`;
+        if (!validation_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

@@ -45,7 +45,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'
                 };
                 const res = yield request_1.default.post(requestOptions);
@@ -62,12 +62,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 (!validation_1.validation.isValidGuid(args.options.id)) {
-            return `${args.options.id} is not a valid GUID`;
+        if (!validation_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

@@ -49,7 +49,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'
@@ -68,7 +68,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?`
                 });
                 if (result.continue) {
                     yield revokePermissions();
@@ -85,7 +85,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>'
     }, {
@@ -93,8 +93,8 @@ _SpoSiteDesignRightsRevokeCommand_instances = new WeakSet(), _SpoSiteDesignRight
     });
 }, _SpoSiteDesignRightsRevokeCommand_initValidators = function _SpoSiteDesignRightsRevokeCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!validation_1.validation.isValidGuid(args.options.id)) {
-            return `${args.options.id} is not a valid GUID`;
+        if (!validation_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

@@ -43,7 +43,7 @@ class SpoSiteDesignTaskGetCommand extends SpoCommand_1.default {
                         accept: 'application/json;odata=nometadata'
                     },
                     data: {
-                        taskId: args.options.taskId
+                        taskId: args.options.id
                     },
                     responseType: 'json'
                 };
@@ -60,12 +60,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 (!validation_1.validation.isValidGuid(args.options.taskId)) {
-            return `${args.options.taskId} is not a valid GUID`;
+        if (!validation_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

@@ -46,7 +46,7 @@ class SpoSiteDesignTaskRemoveCommand extends SpoCommand_1.default {
                             accept: 'application/json;odata=nometadata'
                         },
                         data: {
-                            taskId: args.options.taskId
+                            taskId: args.options.id
                         },
                         responseType: 'json'
                     };
@@ -64,7 +64,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}?`
                 });
                 if (result.continue) {
                     yield removeSiteDesignTask();
@@ -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 (!validation_1.validation.isValidGuid(args.options.taskId)) {
-            return `${args.options.taskId} is not a valid GUID`;
+        if (!validation_1.validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID`;
         }
         return true;
     }));