@pnp/cli-microsoft365 10.0.0-beta.58f28f9 → 10.0.0-beta.66db729

package/dist/m365/entra/commands/group/{group-user-add.js → group-member-add.js}

@@ -3,34 +3,34 @@ 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 _EntraGroupUserAddCommand_instances, _EntraGroupUserAddCommand_initTelemetry, _EntraGroupUserAddCommand_initOptions, _EntraGroupUserAddCommand_initValidators, _EntraGroupUserAddCommand_initOptionSets, _EntraGroupUserAddCommand_initTypes;
+var _EntraGroupMemberAddCommand_instances, _EntraGroupMemberAddCommand_initTelemetry, _EntraGroupMemberAddCommand_initOptions, _EntraGroupMemberAddCommand_initValidators, _EntraGroupMemberAddCommand_initOptionSets, _EntraGroupMemberAddCommand_initTypes;
 import request from '../../../../request.js';
 import { entraGroup } from '../../../../utils/entraGroup.js';
 import { entraUser } from '../../../../utils/entraUser.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
-class EntraGroupUserAddCommand extends GraphCommand {
+class EntraGroupMemberAddCommand extends GraphCommand {
     get name() {
-        return commands.GROUP_USER_ADD;
+        return commands.GROUP_MEMBER_ADD;
     }
     get description() {
-        return 'Adds a user to a Microsoft Entra ID group';
+        return 'Adds a member to a Microsoft Entra ID group';
     }
     constructor() {
         super();
-        _EntraGroupUserAddCommand_instances.add(this);
+        _EntraGroupMemberAddCommand_instances.add(this);
         this.roleValues = ['Owner', 'Member'];
-        __classPrivateFieldGet(this, _EntraGroupUserAddCommand_instances, "m", _EntraGroupUserAddCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraGroupUserAddCommand_instances, "m", _EntraGroupUserAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraGroupUserAddCommand_instances, "m", _EntraGroupUserAddCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _EntraGroupUserAddCommand_instances, "m", _EntraGroupUserAddCommand_initOptionSets).call(this);
-        __classPrivateFieldGet(this, _EntraGroupUserAddCommand_instances, "m", _EntraGroupUserAddCommand_initTypes).call(this);
+        __classPrivateFieldGet(this, _EntraGroupMemberAddCommand_instances, "m", _EntraGroupMemberAddCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _EntraGroupMemberAddCommand_instances, "m", _EntraGroupMemberAddCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _EntraGroupMemberAddCommand_instances, "m", _EntraGroupMemberAddCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _EntraGroupMemberAddCommand_instances, "m", _EntraGroupMemberAddCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _EntraGroupMemberAddCommand_instances, "m", _EntraGroupMemberAddCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
         try {
             if (this.verbose) {
-                await logger.logToStderr(`Adding user(s) ${args.options.ids || args.options.userNames} to group ${args.options.groupId || args.options.groupDisplayName}...`);
+                await logger.logToStderr(`Adding member(s) ${args.options.ids || args.options.userNames} to group ${args.options.groupId || args.options.groupDisplayName}...`);
             }
             const groupId = await this.getGroupId(logger, args.options);
             const userIds = await this.getUserIds(logger, args.options);
@@ -91,7 +91,7 @@ class EntraGroupUserAddCommand extends GraphCommand {
         return entraUser.getUserIdsByUpns(options.userNames.split(',').map(u => u.trim()));
     }
 }
-_EntraGroupUserAddCommand_instances = new WeakSet(), _EntraGroupUserAddCommand_initTelemetry = function _EntraGroupUserAddCommand_initTelemetry() {
+_EntraGroupMemberAddCommand_instances = new WeakSet(), _EntraGroupMemberAddCommand_initTelemetry = function _EntraGroupMemberAddCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             groupId: typeof args.options.groupId !== 'undefined',
@@ -100,7 +100,7 @@ _EntraGroupUserAddCommand_instances = new WeakSet(), _EntraGroupUserAddCommand_i
             userNames: typeof args.options.userNames !== 'undefined'
         });
     });
-}, _EntraGroupUserAddCommand_initOptions = function _EntraGroupUserAddCommand_initOptions() {
+}, _EntraGroupMemberAddCommand_initOptions = function _EntraGroupMemberAddCommand_initOptions() {
     this.options.unshift({
         option: '-i, --groupId [groupId]'
     }, {
@@ -113,7 +113,7 @@ _EntraGroupUserAddCommand_instances = new WeakSet(), _EntraGroupUserAddCommand_i
         option: '-r, --role <role>',
         autocomplete: this.roleValues
     });
-}, _EntraGroupUserAddCommand_initValidators = function _EntraGroupUserAddCommand_initValidators() {
+}, _EntraGroupMemberAddCommand_initValidators = function _EntraGroupMemberAddCommand_initValidators() {
     this.validators.push(async (args) => {
         if (args.options.groupId && !validation.isValidGuid(args.options.groupId)) {
             return `${args.options.groupId} is not a valid GUID for option groupId.`;
@@ -135,10 +135,10 @@ _EntraGroupUserAddCommand_instances = new WeakSet(), _EntraGroupUserAddCommand_i
         }
         return true;
     });
-}, _EntraGroupUserAddCommand_initOptionSets = function _EntraGroupUserAddCommand_initOptionSets() {
+}, _EntraGroupMemberAddCommand_initOptionSets = function _EntraGroupMemberAddCommand_initOptionSets() {
     this.optionSets.push({ options: ['groupId', 'groupDisplayName'] }, { options: ['ids', 'userNames'] });
-}, _EntraGroupUserAddCommand_initTypes = function _EntraGroupUserAddCommand_initTypes() {
+}, _EntraGroupMemberAddCommand_initTypes = function _EntraGroupMemberAddCommand_initTypes() {
     this.types.string.push('groupId', 'groupDisplayName', 'ids', 'userNames', 'role');
 };
-export default new EntraGroupUserAddCommand();
-//# sourceMappingURL=group-user-add.js.map
+export default new EntraGroupMemberAddCommand();
+//# sourceMappingURL=group-member-add.js.map

package/dist/m365/entra/commands/group/{group-user-list.js → group-member-list.js}

@@ -3,19 +3,19 @@ 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 _EntraGroupUserListCommand_instances, _EntraGroupUserListCommand_initTelemetry, _EntraGroupUserListCommand_initOptions, _EntraGroupUserListCommand_initOptionSets, _EntraGroupUserListCommand_initValidators;
+var _EntraGroupMemberListCommand_instances, _EntraGroupMemberListCommand_initTelemetry, _EntraGroupMemberListCommand_initOptions, _EntraGroupMemberListCommand_initOptionSets, _EntraGroupMemberListCommand_initValidators;
 import { entraGroup } from '../../../../utils/entraGroup.js';
 import { odata } from '../../../../utils/odata.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
 import aadCommands from '../../aadCommands.js';
-class EntraGroupUserListCommand extends GraphCommand {
+class EntraGroupMemberListCommand extends GraphCommand {
     get name() {
-        return commands.GROUP_USER_LIST;
+        return commands.GROUP_MEMBER_LIST;
     }
     get description() {
-        return 'Lists users of a specific Entra group';
+        return 'Lists members of a specific Entra group';
     }
     alias() {
         return [aadCommands.GROUP_USER_LIST];
@@ -25,14 +25,14 @@ class EntraGroupUserListCommand extends GraphCommand {
     }
     constructor() {
         super();
-        _EntraGroupUserListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraGroupUserListCommand_instances, "m", _EntraGroupUserListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraGroupUserListCommand_instances, "m", _EntraGroupUserListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraGroupUserListCommand_instances, "m", _EntraGroupUserListCommand_initOptionSets).call(this);
-        __classPrivateFieldGet(this, _EntraGroupUserListCommand_instances, "m", _EntraGroupUserListCommand_initValidators).call(this);
+        _EntraGroupMemberListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _EntraGroupMemberListCommand_instances, "m", _EntraGroupMemberListCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _EntraGroupMemberListCommand_instances, "m", _EntraGroupMemberListCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _EntraGroupMemberListCommand_instances, "m", _EntraGroupMemberListCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _EntraGroupMemberListCommand_instances, "m", _EntraGroupMemberListCommand_initValidators).call(this);
     }
     async commandAction(logger, args) {
-        await this.showDeprecationWarning(logger, aadCommands.GROUP_USER_LIST, commands.GROUP_USER_LIST);
+        await this.showDeprecationWarning(logger, aadCommands.GROUP_USER_LIST, commands.GROUP_MEMBER_LIST);
         try {
             const groupId = await this.getGroupId(args.options, logger);
             const users = [];
@@ -86,7 +86,7 @@ class EntraGroupUserListCommand extends GraphCommand {
         });
         const expandParam = fieldExpand.length > 0 ? `&$expand=${fieldExpand}` : '';
         const selectParam = allSelectProperties.filter(item => !item.includes('/'));
-        const endpoint = `${this.resource}/v1.0/groups/${groupId}/${role}/microsoft.graph.user?$select=${selectParam}${expandParam}`;
+        const endpoint = `${this.resource}/v1.0/groups/${groupId}/${role}?$select=${selectParam}${expandParam}`;
         let users = [];
         if (filter) {
             // While using the filter, we need to specify the ConsistencyLevel header.
@@ -107,7 +107,7 @@ class EntraGroupUserListCommand extends GraphCommand {
         return users;
     }
 }
-_EntraGroupUserListCommand_instances = new WeakSet(), _EntraGroupUserListCommand_initTelemetry = function _EntraGroupUserListCommand_initTelemetry() {
+_EntraGroupMemberListCommand_instances = new WeakSet(), _EntraGroupMemberListCommand_initTelemetry = function _EntraGroupMemberListCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             groupId: typeof args.options.groupId !== 'undefined',
@@ -117,7 +117,7 @@ _EntraGroupUserListCommand_instances = new WeakSet(), _EntraGroupUserListCommand
             filter: typeof args.options.filter !== 'undefined'
         });
     });
-}, _EntraGroupUserListCommand_initOptions = function _EntraGroupUserListCommand_initOptions() {
+}, _EntraGroupMemberListCommand_initOptions = function _EntraGroupMemberListCommand_initOptions() {
     this.options.unshift({
         option: "-i, --groupId [groupId]"
     }, {
@@ -130,11 +130,11 @@ _EntraGroupUserListCommand_instances = new WeakSet(), _EntraGroupUserListCommand
     }, {
         option: "-f, --filter [filter]"
     });
-}, _EntraGroupUserListCommand_initOptionSets = function _EntraGroupUserListCommand_initOptionSets() {
+}, _EntraGroupMemberListCommand_initOptionSets = function _EntraGroupMemberListCommand_initOptionSets() {
     this.optionSets.push({
         options: ['groupId', 'groupName']
     });
-}, _EntraGroupUserListCommand_initValidators = function _EntraGroupUserListCommand_initValidators() {
+}, _EntraGroupMemberListCommand_initValidators = function _EntraGroupMemberListCommand_initValidators() {
     this.validators.push(async (args) => {
         if (args.options.groupId && !validation.isValidGuid(args.options.groupId)) {
             return `${args.options.groupId} is not a valid GUID`;
@@ -147,5 +147,5 @@ _EntraGroupUserListCommand_instances = new WeakSet(), _EntraGroupUserListCommand
         return true;
     });
 };
-export default new EntraGroupUserListCommand();
-//# sourceMappingURL=group-user-list.js.map
+export default new EntraGroupMemberListCommand();
+//# sourceMappingURL=group-member-list.js.map

package/dist/m365/entra/commands/group/{group-user-set.js → group-member-set.js}

@@ -3,34 +3,34 @@ 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 _EntraGroupUserSetCommand_instances, _EntraGroupUserSetCommand_initTelemetry, _EntraGroupUserSetCommand_initOptions, _EntraGroupUserSetCommand_initValidators, _EntraGroupUserSetCommand_initOptionSets, _EntraGroupUserSetCommand_initTypes;
+var _EntraGroupMemberSetCommand_instances, _EntraGroupMemberSetCommand_initTelemetry, _EntraGroupMemberSetCommand_initOptions, _EntraGroupMemberSetCommand_initValidators, _EntraGroupMemberSetCommand_initOptionSets, _EntraGroupMemberSetCommand_initTypes;
 import request from '../../../../request.js';
 import { entraGroup } from '../../../../utils/entraGroup.js';
 import { entraUser } from '../../../../utils/entraUser.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
-class EntraGroupUserSetCommand extends GraphCommand {
+class EntraGroupMemberSetCommand extends GraphCommand {
     get name() {
-        return commands.GROUP_USER_SET;
+        return commands.GROUP_MEMBER_SET;
     }
     get description() {
-        return 'Updates role of users in a Microsoft Entra ID group';
+        return 'Updates the role of members in a Microsoft Entra ID group';
     }
     constructor() {
         super();
-        _EntraGroupUserSetCommand_instances.add(this);
+        _EntraGroupMemberSetCommand_instances.add(this);
         this.roleValues = ['Owner', 'Member'];
-        __classPrivateFieldGet(this, _EntraGroupUserSetCommand_instances, "m", _EntraGroupUserSetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraGroupUserSetCommand_instances, "m", _EntraGroupUserSetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraGroupUserSetCommand_instances, "m", _EntraGroupUserSetCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _EntraGroupUserSetCommand_instances, "m", _EntraGroupUserSetCommand_initOptionSets).call(this);
-        __classPrivateFieldGet(this, _EntraGroupUserSetCommand_instances, "m", _EntraGroupUserSetCommand_initTypes).call(this);
+        __classPrivateFieldGet(this, _EntraGroupMemberSetCommand_instances, "m", _EntraGroupMemberSetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _EntraGroupMemberSetCommand_instances, "m", _EntraGroupMemberSetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _EntraGroupMemberSetCommand_instances, "m", _EntraGroupMemberSetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _EntraGroupMemberSetCommand_instances, "m", _EntraGroupMemberSetCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _EntraGroupMemberSetCommand_instances, "m", _EntraGroupMemberSetCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
         try {
             if (this.verbose) {
-                await logger.logToStderr(`Adding user(s) ${args.options.ids || args.options.userNames} to group ${args.options.groupId || args.options.groupDisplayName}...`);
+                await logger.logToStderr(`Adding member(s) ${args.options.ids || args.options.userNames} to role ${args.options.role} of group ${args.options.groupId || args.options.groupDisplayName}...`);
             }
             const groupId = await this.getGroupId(logger, args.options);
             const userIds = await this.getUserIds(logger, args.options);
@@ -66,7 +66,7 @@ class EntraGroupUserSetCommand extends GraphCommand {
         const userIdsToRemove = [];
         const currentRole = options.role === 'Member' ? 'owners' : 'members';
         if (this.verbose) {
-            await logger.logToStderr(`Removing users from the old role '${currentRole}'.`);
+            await logger.logToStderr(`Removing members from the old role '${currentRole}'.`);
         }
         for (let i = 0; i < userIds.length; i += 20) {
             const userIdsBatch = userIds.slice(i, i + 20);
@@ -153,7 +153,7 @@ class EntraGroupUserSetCommand extends GraphCommand {
         return requestOptions;
     }
 }
-_EntraGroupUserSetCommand_instances = new WeakSet(), _EntraGroupUserSetCommand_initTelemetry = function _EntraGroupUserSetCommand_initTelemetry() {
+_EntraGroupMemberSetCommand_instances = new WeakSet(), _EntraGroupMemberSetCommand_initTelemetry = function _EntraGroupMemberSetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             groupId: typeof args.options.groupId !== 'undefined',
@@ -162,7 +162,7 @@ _EntraGroupUserSetCommand_instances = new WeakSet(), _EntraGroupUserSetCommand_i
             userNames: typeof args.options.userNames !== 'undefined'
         });
     });
-}, _EntraGroupUserSetCommand_initOptions = function _EntraGroupUserSetCommand_initOptions() {
+}, _EntraGroupMemberSetCommand_initOptions = function _EntraGroupMemberSetCommand_initOptions() {
     this.options.unshift({
         option: '-i, --groupId [groupId]'
     }, {
@@ -175,7 +175,7 @@ _EntraGroupUserSetCommand_instances = new WeakSet(), _EntraGroupUserSetCommand_i
         option: '-r, --role <role>',
         autocomplete: this.roleValues
     });
-}, _EntraGroupUserSetCommand_initValidators = function _EntraGroupUserSetCommand_initValidators() {
+}, _EntraGroupMemberSetCommand_initValidators = function _EntraGroupMemberSetCommand_initValidators() {
     this.validators.push(async (args) => {
         if (args.options.groupId && !validation.isValidGuid(args.options.groupId)) {
             return `${args.options.groupId} is not a valid GUID for option groupId.`;
@@ -197,10 +197,10 @@ _EntraGroupUserSetCommand_instances = new WeakSet(), _EntraGroupUserSetCommand_i
         }
         return true;
     });
-}, _EntraGroupUserSetCommand_initOptionSets = function _EntraGroupUserSetCommand_initOptionSets() {
+}, _EntraGroupMemberSetCommand_initOptionSets = function _EntraGroupMemberSetCommand_initOptionSets() {
     this.optionSets.push({ options: ['groupId', 'groupDisplayName'] }, { options: ['ids', 'userNames'] });
-}, _EntraGroupUserSetCommand_initTypes = function _EntraGroupUserSetCommand_initTypes() {
+}, _EntraGroupMemberSetCommand_initTypes = function _EntraGroupMemberSetCommand_initTypes() {
     this.types.string.push('groupId', 'groupDisplayName', 'ids', 'userNames', 'role');
 };
-export default new EntraGroupUserSetCommand();
-//# sourceMappingURL=group-user-set.js.map
+export default new EntraGroupMemberSetCommand();
+//# sourceMappingURL=group-member-set.js.map

package/dist/m365/entra/commands.js

@@ -41,9 +41,9 @@ export default {
     GROUP_LIST: `${prefix} group list`,
     GROUP_REMOVE: `${prefix} group remove`,
     GROUP_SET: `${prefix} group set`,
-    GROUP_USER_ADD: `${prefix} group user add`,
-    GROUP_USER_LIST: `${prefix} group user list`,
-    GROUP_USER_SET: `${prefix} group user set`,
+    GROUP_MEMBER_ADD: `${prefix} group member add`,
+    GROUP_MEMBER_LIST: `${prefix} group member list`,
+    GROUP_MEMBER_SET: `${prefix} group member set`,
     GROUPSETTING_ADD: `${prefix} groupsetting add`,
     GROUPSETTING_GET: `${prefix} groupsetting get`,
     GROUPSETTING_LIST: `${prefix} groupsetting list`,

package/dist/m365/spfx/commands/project/project-doctor/{doctor-1.20.0-rc.1.js → doctor-1.20.0.js}

@@ -1,3 +1,4 @@
+import { FN002021_DEVDEP_rushstack_eslint_config } from '../project-upgrade/rules/FN002021_DEVDEP_rushstack_eslint_config.js';
 import { FN001008_DEP_react } from './rules/FN001008_DEP_react.js';
 import { FN001009_DEP_react_dom } from './rules/FN001009_DEP_react_dom.js';
 import { FN001035_DEP_fluentui_react } from './rules/FN001035_DEP_fluentui_react.js';
@@ -19,7 +20,8 @@ export default [
     new FN002015_DEVDEP_types_react('17'),
     new FN002016_DEVDEP_types_react_dom('17'),
     new FN002019_DEVDEP_microsoft_rush_stack_compiler(['4.7']),
+    new FN002021_DEVDEP_rushstack_eslint_config('4.0.1'),
     new FN021001_PKG_spfx_deps_versions_match_project_version(false),
-    new FN021013_PKG_spfx_devdeps_match_version('1.20.1')
+    new FN021013_PKG_spfx_devdeps_match_version('1.20.2')
 ];
-//# sourceMappingURL=doctor-1.20.0-rc.1.js.map
+//# sourceMappingURL=doctor-1.20.0.js.map

package/dist/m365/spfx/commands/project/project-doctor/rules/FN002021_DEVDEP_rushstack_eslint_config.js

@@ -0,0 +1,10 @@
+import { DependencyRule } from './DependencyRule.js';
+export class FN002021_DEVDEP_rushstack_eslint_config extends DependencyRule {
+    constructor(supportedRange) {
+        super('@rushstack/eslint-config', supportedRange, true);
+    }
+    get id() {
+        return 'FN002021';
+    }
+}
+//# sourceMappingURL=FN002021_DEVDEP_rushstack_eslint_config.js.map

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

@@ -71,7 +71,7 @@ class SpfxProjectDoctorCommand extends BaseProjectCommand {
             '1.18.1',
             '1.18.2',
             '1.19.0',
-            '1.20.0-rc.1'
+            '1.20.0'
         ];
         __classPrivateFieldGet(this, _SpfxProjectDoctorCommand_instances, "m", _SpfxProjectDoctorCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpfxProjectDoctorCommand_instances, "m", _SpfxProjectDoctorCommand_initOptions).call(this);

package/dist/m365/spfx/commands/project/project-upgrade/{upgrade-1.20.0-rc.1.js → upgrade-1.20.0.js}

@@ -20,38 +20,40 @@ import { FN001032_DEP_microsoft_sp_page_context } from './rules/FN001032_DEP_mic
 import { FN001034_DEP_microsoft_sp_adaptive_card_extension_base } from './rules/FN001034_DEP_microsoft_sp_adaptive_card_extension_base.js';
 import { FN002001_DEVDEP_microsoft_sp_build_web } from './rules/FN002001_DEVDEP_microsoft_sp_build_web.js';
 import { FN002002_DEVDEP_microsoft_sp_module_interfaces } from './rules/FN002002_DEVDEP_microsoft_sp_module_interfaces.js';
+import { FN002021_DEVDEP_rushstack_eslint_config } from './rules/FN002021_DEVDEP_rushstack_eslint_config.js';
 import { FN002022_DEVDEP_microsoft_eslint_plugin_spfx } from './rules/FN002022_DEVDEP_microsoft_eslint_plugin_spfx.js';
 import { FN002023_DEVDEP_microsoft_eslint_config_spfx } from './rules/FN002023_DEVDEP_microsoft_eslint_config_spfx.js';
 import { FN002024_DEVDEP_eslint } from './rules/FN002024_DEVDEP_eslint.js';
 import { FN010001_YORC_version } from './rules/FN010001_YORC_version.js';
 import { FN010010_YORC_sdkVersions_teams_js } from './rules/FN010010_YORC_sdkVersions_teams_js.js';
 export default [
-    new FN001001_DEP_microsoft_sp_core_library('1.20.0-rc.1'),
-    new FN001002_DEP_microsoft_sp_lodash_subset('1.20.0-rc.1'),
-    new FN001003_DEP_microsoft_sp_office_ui_fabric_core('1.20.0-rc.1'),
-    new FN001004_DEP_microsoft_sp_webpart_base('1.20.0-rc.1'),
-    new FN001011_DEP_microsoft_sp_dialog('1.20.0-rc.1'),
-    new FN001012_DEP_microsoft_sp_application_base('1.20.0-rc.1'),
-    new FN001014_DEP_microsoft_sp_listview_extensibility('1.20.0-rc.1'),
-    new FN001021_DEP_microsoft_sp_property_pane('1.20.0-rc.1'),
-    new FN001023_DEP_microsoft_sp_component_base('1.20.0-rc.1'),
-    new FN001024_DEP_microsoft_sp_diagnostics('1.20.0-rc.1'),
-    new FN001025_DEP_microsoft_sp_dynamic_data('1.20.0-rc.1'),
-    new FN001026_DEP_microsoft_sp_extension_base('1.20.0-rc.1'),
-    new FN001027_DEP_microsoft_sp_http('1.20.0-rc.1'),
-    new FN001028_DEP_microsoft_sp_list_subscription('1.20.0-rc.1'),
-    new FN001029_DEP_microsoft_sp_loader('1.20.0-rc.1'),
-    new FN001030_DEP_microsoft_sp_module_interfaces('1.20.0-rc.1'),
-    new FN001031_DEP_microsoft_sp_odata_types('1.20.0-rc.1'),
-    new FN001032_DEP_microsoft_sp_page_context('1.20.0-rc.1'),
-    new FN001013_DEP_microsoft_decorators('1.20.0-rc.1'),
-    new FN001034_DEP_microsoft_sp_adaptive_card_extension_base('1.20.0-rc.1'),
-    new FN002001_DEVDEP_microsoft_sp_build_web('1.20.1'),
-    new FN002002_DEVDEP_microsoft_sp_module_interfaces('1.20.1'),
+    new FN001001_DEP_microsoft_sp_core_library('1.20.0'),
+    new FN001002_DEP_microsoft_sp_lodash_subset('1.20.0'),
+    new FN001003_DEP_microsoft_sp_office_ui_fabric_core('1.20.0'),
+    new FN001004_DEP_microsoft_sp_webpart_base('1.20.0'),
+    new FN001011_DEP_microsoft_sp_dialog('1.20.0'),
+    new FN001012_DEP_microsoft_sp_application_base('1.20.0'),
+    new FN001014_DEP_microsoft_sp_listview_extensibility('1.20.0'),
+    new FN001021_DEP_microsoft_sp_property_pane('1.20.0'),
+    new FN001023_DEP_microsoft_sp_component_base('1.20.0'),
+    new FN001024_DEP_microsoft_sp_diagnostics('1.20.0'),
+    new FN001025_DEP_microsoft_sp_dynamic_data('1.20.0'),
+    new FN001026_DEP_microsoft_sp_extension_base('1.20.0'),
+    new FN001027_DEP_microsoft_sp_http('1.20.0'),
+    new FN001028_DEP_microsoft_sp_list_subscription('1.20.0'),
+    new FN001029_DEP_microsoft_sp_loader('1.20.0'),
+    new FN001030_DEP_microsoft_sp_module_interfaces('1.20.0'),
+    new FN001031_DEP_microsoft_sp_odata_types('1.20.0'),
+    new FN001032_DEP_microsoft_sp_page_context('1.20.0'),
+    new FN001013_DEP_microsoft_decorators('1.20.0'),
+    new FN001034_DEP_microsoft_sp_adaptive_card_extension_base('1.20.0'),
+    new FN002001_DEVDEP_microsoft_sp_build_web('1.20.2'),
+    new FN002002_DEVDEP_microsoft_sp_module_interfaces('1.20.2'),
+    new FN002021_DEVDEP_rushstack_eslint_config('4.0.1'),
     new FN002024_DEVDEP_eslint('8.57.0'),
-    new FN002022_DEVDEP_microsoft_eslint_plugin_spfx('1.20.1'),
-    new FN002023_DEVDEP_microsoft_eslint_config_spfx('1.20.1'),
-    new FN010001_YORC_version('1.20.0-rc.1'),
+    new FN002022_DEVDEP_microsoft_eslint_plugin_spfx('1.20.2'),
+    new FN002023_DEVDEP_microsoft_eslint_config_spfx('1.20.2'),
+    new FN010001_YORC_version('1.20.0'),
     new FN010010_YORC_sdkVersions_teams_js('2.24.0')
 ];
-//# sourceMappingURL=upgrade-1.20.0-rc.1.js.map
+//# sourceMappingURL=upgrade-1.20.0.js.map

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

@@ -7,8 +7,6 @@ var _SpfxProjectUpgradeCommand_instances, _a, _SpfxProjectUpgradeCommand_initTel
 import fs from 'fs';
 import os from 'os';
 import path from 'path';
-// uncomment to support upgrading to preview releases
-import { prerelease } from 'semver';
 import { CommandError } from '../../../../Command.js';
 import { fsUtil } from '../../../../utils/fsUtil.js';
 import { packageManager } from '../../../../utils/packageManager.js';
@@ -75,7 +73,7 @@ class SpfxProjectUpgradeCommand extends BaseProjectCommand {
             '1.18.1',
             '1.18.2',
             '1.19.0',
-            '1.20.0-rc.1'
+            '1.20.0'
         ];
         __classPrivateFieldGet(this, _SpfxProjectUpgradeCommand_instances, "m", _SpfxProjectUpgradeCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpfxProjectUpgradeCommand_instances, "m", _SpfxProjectUpgradeCommand_initOptions).call(this);
@@ -88,15 +86,15 @@ class SpfxProjectUpgradeCommand extends BaseProjectCommand {
         }
         this.toVersion = args.options.toVersion ? args.options.toVersion : this.supportedVersions[this.supportedVersions.length - 1];
         // uncomment to support upgrading to preview releases
-        if (!args.options.toVersion &&
-            !args.options.preview &&
-            prerelease(this.toVersion)) {
-            // no version and no preview specified while the current version to
-            // upgrade to is a prerelease so let's grab the first non-preview version
-            // since we're supporting only one preview version, it's sufficient for
-            // us to take second to last version
-            this.toVersion = this.supportedVersions[this.supportedVersions.length - 2];
-        }
+        // if (!args.options.toVersion &&
+        //   !args.options.preview &&
+        //   prerelease(this.toVersion)) {
+        //   // no version and no preview specified while the current version to
+        //   // upgrade to is a prerelease so let's grab the first non-preview version
+        //   // since we're supporting only one preview version, it's sufficient for
+        //   // us to take second to last version
+        //   this.toVersion = this.supportedVersions[this.supportedVersions.length - 2];
+        // }
         this.packageManager = args.options.packageManager || 'npm';
         this.shell = args.options.shell || 'bash';
         if (this.supportedVersions.indexOf(this.toVersion) < 0) {
@@ -485,9 +483,9 @@ _a = SpfxProjectUpgradeCommand, _SpfxProjectUpgradeCommand_instances = new WeakS
             preview: args.options.preview
         });
         // uncomment to support upgrading to preview releases
-        if (prerelease(this.telemetryProperties.toVersion) && !args.options.preview) {
-            this.telemetryProperties.toVersion = this.supportedVersions[this.supportedVersions.length - 2];
-        }
+        // if (prerelease(this.telemetryProperties.toVersion) && !args.options.preview) {
+        //   this.telemetryProperties.toVersion = this.supportedVersions[this.supportedVersions.length - 2];
+        // }
     });
 }, _SpfxProjectUpgradeCommand_initOptions = function _SpfxProjectUpgradeCommand_initOptions() {
     this.options.unshift({

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

@@ -576,7 +576,7 @@ class SpfxDoctorCommand extends BaseProjectCommand {
                     fix: 'npm i -g yo@5'
                 }
             },
-            '1.20.0-rc.1': {
+            '1.20.0': {
                 gulpCli: {
                     range: '^1 || ^2 || ^3',
                     fix: 'npm i -g gulp-cli@3'

package/dist/m365/spo/commands/page/page-remove.js

@@ -3,10 +3,10 @@ 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 _SpoPageRemoveCommand_instances, _SpoPageRemoveCommand_initOptions, _SpoPageRemoveCommand_initValidators;
+var _SpoPageRemoveCommand_instances, _SpoPageRemoveCommand_initTelemetry, _SpoPageRemoveCommand_initOptions, _SpoPageRemoveCommand_initValidators, _SpoPageRemoveCommand_initTypes;
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
-import { spo } from '../../../../utils/spo.js';
+import { formatting } from '../../../../utils/formatting.js';
 import { urlUtil } from '../../../../utils/urlUtil.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
@@ -21,15 +21,17 @@ class SpoPageRemoveCommand extends SpoCommand {
     constructor() {
         super();
         _SpoPageRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoPageRemoveCommand_instances, "m", _SpoPageRemoveCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoPageRemoveCommand_instances, "m", _SpoPageRemoveCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoPageRemoveCommand_instances, "m", _SpoPageRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoPageRemoveCommand_instances, "m", _SpoPageRemoveCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
         if (args.options.force) {
             await this.removePage(logger, args);
         }
         else {
-            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove the page '${args.options.name}'?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove page '${args.options.name}'?` });
             if (result) {
                 await this.removePage(logger, args);
             }
@@ -37,44 +39,63 @@ class SpoPageRemoveCommand extends SpoCommand {
     }
     async removePage(logger, args) {
         try {
-            let requestDigest = '';
-            let pageName = args.options.name;
-            const reqDigest = await spo.getRequestDigest(args.options.webUrl);
-            requestDigest = reqDigest.FormDigestValue;
-            if (!pageName.endsWith('.aspx')) {
+            // Remove leading slashes from the page name (page can be nested in folders)
+            let pageName = urlUtil.removeLeadingSlashes(args.options.name);
+            if (!pageName.toLowerCase().endsWith('.aspx')) {
                 pageName += '.aspx';
             }
             if (this.verbose) {
                 await logger.logToStderr(`Removing page ${pageName}...`);
             }
+            const filePath = `${urlUtil.getServerRelativeSiteUrl(args.options.webUrl)}/SitePages/${pageName}`;
             const requestOptions = {
-                url: `${args.options
-                    .webUrl}/_api/web/GetFileByServerRelativePath(DecodedUrl='${urlUtil.getServerRelativeSiteUrl(args.options.webUrl)}/sitepages/${pageName}')`,
+                url: `${args.options.webUrl}/_api/web/GetFileByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(filePath)}')`,
                 headers: {
-                    'X-RequestDigest': requestDigest,
-                    'X-HTTP-Method': 'DELETE',
-                    'content-type': 'application/json;odata=nometadata',
                     accept: 'application/json;odata=nometadata'
                 },
                 responseType: 'json'
             };
-            await request.post(requestOptions);
+            if (args.options.bypassSharedLock) {
+                requestOptions.headers.Prefer = 'bypass-shared-lock';
+            }
+            if (args.options.recycle) {
+                requestOptions.url += '/Recycle';
+                await request.post(requestOptions);
+            }
+            else {
+                await request.delete(requestOptions);
+            }
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);
         }
     }
 }
-_SpoPageRemoveCommand_instances = new WeakSet(), _SpoPageRemoveCommand_initOptions = function _SpoPageRemoveCommand_initOptions() {
+_SpoPageRemoveCommand_instances = new WeakSet(), _SpoPageRemoveCommand_initTelemetry = function _SpoPageRemoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            force: !!args.options.force,
+            recycle: !!args.options.recycle,
+            bypassSharedLock: !!args.options.bypassSharedLock
+        });
+    });
+}, _SpoPageRemoveCommand_initOptions = function _SpoPageRemoveCommand_initOptions() {
     this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
         option: '-n, --name <name>'
     }, {
-        option: '-u, --webUrl <webUrl>'
+        option: '--recycle'
+    }, {
+        option: '--bypassSharedLock'
     }, {
         option: '-f, --force'
     });
 }, _SpoPageRemoveCommand_initValidators = function _SpoPageRemoveCommand_initValidators() {
     this.validators.push(async (args) => validation.isValidSharePointUrl(args.options.webUrl));
+}, _SpoPageRemoveCommand_initTypes = function _SpoPageRemoveCommand_initTypes() {
+    this.types.string.push('name', 'webUrl');
+    this.types.boolean.push('force', 'bypassSharedLock', 'recycle');
 };
 export default new SpoPageRemoveCommand();
 //# sourceMappingURL=page-remove.js.map