@pnp/cli-microsoft365 7.0.0-beta.b7c2a8d → 7.0.0-beta.c0afb7b

package/dist/m365/aad/commands/{o365group/o365group-user-list.js → m365group/m365group-user-list.js}

@@ -3,24 +3,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 _AadO365GroupUserListCommand_instances, _AadO365GroupUserListCommand_initTelemetry, _AadO365GroupUserListCommand_initOptions, _AadO365GroupUserListCommand_initValidators;
+var _AadM365GroupUserListCommand_instances, _AadM365GroupUserListCommand_initTelemetry, _AadM365GroupUserListCommand_initOptions, _AadM365GroupUserListCommand_initValidators;
 import { odata } from '../../../../utils/odata.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
-class AadO365GroupUserListCommand extends GraphCommand {
+class AadM365GroupUserListCommand extends GraphCommand {
     get name() {
-        return commands.O365GROUP_USER_LIST;
+        return commands.M365GROUP_USER_LIST;
     }
     get description() {
         return "Lists users for the specified Microsoft 365 group";
     }
     constructor() {
         super();
-        _AadO365GroupUserListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _AadO365GroupUserListCommand_instances, "m", _AadO365GroupUserListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _AadO365GroupUserListCommand_instances, "m", _AadO365GroupUserListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _AadO365GroupUserListCommand_instances, "m", _AadO365GroupUserListCommand_initValidators).call(this);
+        _AadM365GroupUserListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _AadM365GroupUserListCommand_instances, "m", _AadM365GroupUserListCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _AadM365GroupUserListCommand_instances, "m", _AadM365GroupUserListCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _AadM365GroupUserListCommand_instances, "m", _AadM365GroupUserListCommand_initValidators).call(this);
     }
     async commandAction(logger, args) {
         try {
@@ -59,20 +59,20 @@ class AadO365GroupUserListCommand extends GraphCommand {
         return await odata.getAllItems(endpoint);
     }
 }
-_AadO365GroupUserListCommand_instances = new WeakSet(), _AadO365GroupUserListCommand_initTelemetry = function _AadO365GroupUserListCommand_initTelemetry() {
+_AadM365GroupUserListCommand_instances = new WeakSet(), _AadM365GroupUserListCommand_initTelemetry = function _AadM365GroupUserListCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             role: args.options.role
         });
     });
-}, _AadO365GroupUserListCommand_initOptions = function _AadO365GroupUserListCommand_initOptions() {
+}, _AadM365GroupUserListCommand_initOptions = function _AadM365GroupUserListCommand_initOptions() {
     this.options.unshift({
         option: "-i, --groupId <groupId>"
     }, {
         option: "-r, --role [type]",
         autocomplete: ["Owner", "Member", "Guest"]
     });
-}, _AadO365GroupUserListCommand_initValidators = function _AadO365GroupUserListCommand_initValidators() {
+}, _AadM365GroupUserListCommand_initValidators = function _AadM365GroupUserListCommand_initValidators() {
     this.validators.push(async (args) => {
         if (!validation.isValidGuid(args.options.groupId)) {
             return `${args.options.groupId} is not a valid GUID`;
@@ -85,5 +85,5 @@ _AadO365GroupUserListCommand_instances = new WeakSet(), _AadO365GroupUserListCom
         return true;
     });
 };
-export default new AadO365GroupUserListCommand();
-//# sourceMappingURL=o365group-user-list.js.map
+export default new AadM365GroupUserListCommand();
+//# sourceMappingURL=m365group-user-list.js.map

package/dist/m365/aad/commands/{o365group/o365group-user-remove.js → m365group/m365group-user-remove.js}

@@ -3,7 +3,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 _AadO365GroupUserRemoveCommand_instances, _AadO365GroupUserRemoveCommand_initTelemetry, _AadO365GroupUserRemoveCommand_initOptions, _AadO365GroupUserRemoveCommand_initValidators, _AadO365GroupUserRemoveCommand_initOptionSets;
+var _AadM365GroupUserRemoveCommand_instances, _AadM365GroupUserRemoveCommand_initTelemetry, _AadM365GroupUserRemoveCommand_initOptions, _AadM365GroupUserRemoveCommand_initValidators, _AadM365GroupUserRemoveCommand_initOptionSets;
 import { Cli } from '../../../../cli/Cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
@@ -11,9 +11,9 @@ import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import teamsCommands from '../../../teams/commands.js';
 import commands from '../../commands.js';
-class AadO365GroupUserRemoveCommand extends GraphCommand {
+class AadM365GroupUserRemoveCommand extends GraphCommand {
     get name() {
-        return commands.O365GROUP_USER_REMOVE;
+        return commands.M365GROUP_USER_REMOVE;
     }
     get description() {
         return 'Removes the specified user from specified Microsoft 365 Group or Microsoft Teams team';
@@ -23,11 +23,11 @@ class AadO365GroupUserRemoveCommand extends GraphCommand {
     }
     constructor() {
         super();
-        _AadO365GroupUserRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _AadO365GroupUserRemoveCommand_instances, "m", _AadO365GroupUserRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _AadO365GroupUserRemoveCommand_instances, "m", _AadO365GroupUserRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _AadO365GroupUserRemoveCommand_instances, "m", _AadO365GroupUserRemoveCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _AadO365GroupUserRemoveCommand_instances, "m", _AadO365GroupUserRemoveCommand_initOptionSets).call(this);
+        _AadM365GroupUserRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _AadM365GroupUserRemoveCommand_instances, "m", _AadM365GroupUserRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _AadM365GroupUserRemoveCommand_instances, "m", _AadM365GroupUserRemoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _AadM365GroupUserRemoveCommand_instances, "m", _AadM365GroupUserRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _AadM365GroupUserRemoveCommand_instances, "m", _AadM365GroupUserRemoveCommand_initOptionSets).call(this);
     }
     async commandAction(logger, args) {
         const groupId = (typeof args.options.groupId !== 'undefined') ? args.options.groupId : args.options.teamId;
@@ -99,7 +99,7 @@ class AadO365GroupUserRemoveCommand extends GraphCommand {
         }
     }
 }
-_AadO365GroupUserRemoveCommand_instances = new WeakSet(), _AadO365GroupUserRemoveCommand_initTelemetry = function _AadO365GroupUserRemoveCommand_initTelemetry() {
+_AadM365GroupUserRemoveCommand_instances = new WeakSet(), _AadM365GroupUserRemoveCommand_initTelemetry = function _AadM365GroupUserRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             force: (!(!args.options.force)).toString(),
@@ -107,7 +107,7 @@ _AadO365GroupUserRemoveCommand_instances = new WeakSet(), _AadO365GroupUserRemov
             groupId: typeof args.options.groupId !== 'undefined'
         });
     });
-}, _AadO365GroupUserRemoveCommand_initOptions = function _AadO365GroupUserRemoveCommand_initOptions() {
+}, _AadM365GroupUserRemoveCommand_initOptions = function _AadM365GroupUserRemoveCommand_initOptions() {
     this.options.unshift({
         option: "-i, --groupId [groupId]"
     }, {
@@ -117,7 +117,7 @@ _AadO365GroupUserRemoveCommand_instances = new WeakSet(), _AadO365GroupUserRemov
     }, {
         option: '-f, --force'
     });
-}, _AadO365GroupUserRemoveCommand_initValidators = function _AadO365GroupUserRemoveCommand_initValidators() {
+}, _AadM365GroupUserRemoveCommand_initValidators = function _AadM365GroupUserRemoveCommand_initValidators() {
     this.validators.push(async (args) => {
         if (args.options.teamId && !validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
@@ -127,8 +127,8 @@ _AadO365GroupUserRemoveCommand_instances = new WeakSet(), _AadO365GroupUserRemov
         }
         return true;
     });
-}, _AadO365GroupUserRemoveCommand_initOptionSets = function _AadO365GroupUserRemoveCommand_initOptionSets() {
+}, _AadM365GroupUserRemoveCommand_initOptionSets = function _AadM365GroupUserRemoveCommand_initOptionSets() {
     this.optionSets.push({ options: ['groupId', 'teamId'] });
 };
-export default new AadO365GroupUserRemoveCommand();
-//# sourceMappingURL=o365group-user-remove.js.map
+export default new AadM365GroupUserRemoveCommand();
+//# sourceMappingURL=m365group-user-remove.js.map

package/dist/m365/aad/commands/{o365group/o365group-user-set.js → m365group/m365group-user-set.js}

@@ -3,16 +3,16 @@ 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 _AadO365GroupUserSetCommand_instances, _AadO365GroupUserSetCommand_initTelemetry, _AadO365GroupUserSetCommand_initOptions, _AadO365GroupUserSetCommand_initValidators, _AadO365GroupUserSetCommand_initOptionSets;
+var _AadM365GroupUserSetCommand_instances, _AadM365GroupUserSetCommand_initTelemetry, _AadM365GroupUserSetCommand_initOptions, _AadM365GroupUserSetCommand_initValidators, _AadM365GroupUserSetCommand_initOptionSets;
 import request from '../../../../request.js';
 import { odata } from '../../../../utils/odata.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import teamsCommands from '../../../teams/commands.js';
 import commands from '../../commands.js';
-class AadO365GroupUserSetCommand extends GraphCommand {
+class AadM365GroupUserSetCommand extends GraphCommand {
     get name() {
-        return commands.O365GROUP_USER_SET;
+        return commands.M365GROUP_USER_SET;
     }
     get description() {
         return 'Updates role of the specified user in the specified Microsoft 365 Group or Microsoft Teams team';
@@ -22,11 +22,11 @@ class AadO365GroupUserSetCommand extends GraphCommand {
     }
     constructor() {
         super();
-        _AadO365GroupUserSetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _AadO365GroupUserSetCommand_instances, "m", _AadO365GroupUserSetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _AadO365GroupUserSetCommand_instances, "m", _AadO365GroupUserSetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _AadO365GroupUserSetCommand_instances, "m", _AadO365GroupUserSetCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _AadO365GroupUserSetCommand_instances, "m", _AadO365GroupUserSetCommand_initOptionSets).call(this);
+        _AadM365GroupUserSetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _AadM365GroupUserSetCommand_instances, "m", _AadM365GroupUserSetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _AadM365GroupUserSetCommand_instances, "m", _AadM365GroupUserSetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _AadM365GroupUserSetCommand_instances, "m", _AadM365GroupUserSetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _AadM365GroupUserSetCommand_instances, "m", _AadM365GroupUserSetCommand_initOptionSets).call(this);
     }
     async commandAction(logger, args) {
         try {
@@ -43,7 +43,7 @@ class AadO365GroupUserSetCommand extends GraphCommand {
             }
             if (users.filter(i => args.options.userName.toUpperCase() === i.userPrincipalName.toUpperCase()).length <= 0) {
                 const userNotInGroup = (typeof args.options.groupId !== 'undefined') ?
-                    'The specified user does not belong to the given Microsoft 365 Group. Please use the \'o365group user add\' command to add new users.' :
+                    'The specified user does not belong to the given Microsoft 365 Group. Please use the \'m365group user add\' command to add new users.' :
                     'The specified user does not belong to the given Microsoft Teams team. Please use the \'graph teams user add\' command to add new users.';
                 throw new Error(userNotInGroup);
             }
@@ -113,7 +113,7 @@ class AadO365GroupUserSetCommand extends GraphCommand {
         return await odata.getAllItems(endpoint);
     }
 }
-_AadO365GroupUserSetCommand_instances = new WeakSet(), _AadO365GroupUserSetCommand_initTelemetry = function _AadO365GroupUserSetCommand_initTelemetry() {
+_AadM365GroupUserSetCommand_instances = new WeakSet(), _AadM365GroupUserSetCommand_initTelemetry = function _AadM365GroupUserSetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             teamId: typeof args.options.teamId !== 'undefined',
@@ -121,7 +121,7 @@ _AadO365GroupUserSetCommand_instances = new WeakSet(), _AadO365GroupUserSetComma
             role: args.options.role
         });
     });
-}, _AadO365GroupUserSetCommand_initOptions = function _AadO365GroupUserSetCommand_initOptions() {
+}, _AadM365GroupUserSetCommand_initOptions = function _AadM365GroupUserSetCommand_initOptions() {
     this.options.unshift({
         option: "-i, --groupId [groupId]"
     }, {
@@ -132,7 +132,7 @@ _AadO365GroupUserSetCommand_instances = new WeakSet(), _AadO365GroupUserSetComma
         option: '-r, --role <role>',
         autocomplete: ['Owner', 'Member']
     });
-}, _AadO365GroupUserSetCommand_initValidators = function _AadO365GroupUserSetCommand_initValidators() {
+}, _AadM365GroupUserSetCommand_initValidators = function _AadM365GroupUserSetCommand_initValidators() {
     this.validators.push(async (args) => {
         if (args.options.teamId && !validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
@@ -145,8 +145,8 @@ _AadO365GroupUserSetCommand_instances = new WeakSet(), _AadO365GroupUserSetComma
         }
         return true;
     });
-}, _AadO365GroupUserSetCommand_initOptionSets = function _AadO365GroupUserSetCommand_initOptionSets() {
+}, _AadM365GroupUserSetCommand_initOptionSets = function _AadM365GroupUserSetCommand_initOptionSets() {
     this.optionSets.push({ options: ['groupId', 'teamId'] });
 };
-export default new AadO365GroupUserSetCommand();
-//# sourceMappingURL=o365group-user-set.js.map
+export default new AadM365GroupUserSetCommand();
+//# sourceMappingURL=m365group-user-set.js.map

package/dist/m365/aad/commands.js

@@ -21,28 +21,28 @@ export default {
     GROUPSETTINGTEMPLATE_GET: `${prefix} groupsettingtemplate get`,
     GROUPSETTINGTEMPLATE_LIST: `${prefix} groupsettingtemplate list`,
     LICENSE_LIST: `${prefix} license list`,
-    O365GROUP_ADD: `${prefix} o365group add`,
-    O365GROUP_GET: `${prefix} o365group get`,
-    O365GROUP_LIST: `${prefix} o365group list`,
-    O365GROUP_CONVERSATION_LIST: `${prefix} o365group conversation list`,
-    O365GROUP_CONVERSATION_POST_LIST: `${prefix} o365group conversation post list`,
-    O365GROUP_RECYCLEBINITEM_CLEAR: `${prefix} o365group recyclebinitem clear`,
-    O365GROUP_RECYCLEBINITEM_LIST: `${prefix} o365group recyclebinitem list`,
-    O365GROUP_RECYCLEBINITEM_REMOVE: `${prefix} o365group recyclebinitem remove`,
-    O365GROUP_RECYCLEBINITEM_RESTORE: `${prefix} o365group recyclebinitem restore`,
-    O365GROUP_SET: `${prefix} o365group set`,
-    O365GROUP_TEAMIFY: `${prefix} o365group teamify`,
-    O365GROUP_REMOVE: `${prefix} o365group remove`,
-    O365GROUP_RENEW: `${prefix} o365group renew`,
-    O365GROUP_REPORT_ACTIVITYCOUNTS: `${prefix} o365group report activitycounts`,
-    O365GROUP_REPORT_ACTIVITYDETAIL: `${prefix} o365group report activitydetail`,
-    O365GROUP_REPORT_ACTIVITYFILECOUNTS: `${prefix} o365group report activityfilecounts`,
-    O365GROUP_REPORT_ACTIVITYGROUPCOUNTS: `${prefix} o365group report activitygroupcounts`,
-    O365GROUP_REPORT_ACTIVITYSTORAGE: `${prefix} o365group report activitystorage`,
-    O365GROUP_USER_ADD: `${prefix} o365group user add`,
-    O365GROUP_USER_LIST: `${prefix} o365group user list`,
-    O365GROUP_USER_REMOVE: `${prefix} o365group user remove`,
-    O365GROUP_USER_SET: `${prefix} o365group user set`,
+    M365GROUP_ADD: `${prefix} m365group add`,
+    M365GROUP_GET: `${prefix} m365group get`,
+    M365GROUP_LIST: `${prefix} m365group list`,
+    M365GROUP_CONVERSATION_LIST: `${prefix} m365group conversation list`,
+    M365GROUP_CONVERSATION_POST_LIST: `${prefix} m365group conversation post list`,
+    M365GROUP_RECYCLEBINITEM_CLEAR: `${prefix} m365group recyclebinitem clear`,
+    M365GROUP_RECYCLEBINITEM_LIST: `${prefix} m365group recyclebinitem list`,
+    M365GROUP_RECYCLEBINITEM_REMOVE: `${prefix} m365group recyclebinitem remove`,
+    M365GROUP_RECYCLEBINITEM_RESTORE: `${prefix} m365group recyclebinitem restore`,
+    M365GROUP_SET: `${prefix} m365group set`,
+    M365GROUP_TEAMIFY: `${prefix} m365group teamify`,
+    M365GROUP_REMOVE: `${prefix} m365group remove`,
+    M365GROUP_RENEW: `${prefix} m365group renew`,
+    M365GROUP_REPORT_ACTIVITYCOUNTS: `${prefix} m365group report activitycounts`,
+    M365GROUP_REPORT_ACTIVITYDETAIL: `${prefix} m365group report activitydetail`,
+    M365GROUP_REPORT_ACTIVITYFILECOUNTS: `${prefix} m365group report activityfilecounts`,
+    M365GROUP_REPORT_ACTIVITYGROUPCOUNTS: `${prefix} m365group report activitygroupcounts`,
+    M365GROUP_REPORT_ACTIVITYSTORAGE: `${prefix} m365group report activitystorage`,
+    M365GROUP_USER_ADD: `${prefix} m365group user add`,
+    M365GROUP_USER_LIST: `${prefix} m365group user list`,
+    M365GROUP_USER_REMOVE: `${prefix} m365group user remove`,
+    M365GROUP_USER_SET: `${prefix} m365group user set`,
     OAUTH2GRANT_ADD: `${prefix} oauth2grant add`,
     OAUTH2GRANT_LIST: `${prefix} oauth2grant list`,
     OAUTH2GRANT_REMOVE: `${prefix} oauth2grant remove`,

package/dist/m365/pa/commands/app/app-permission-list.js

@@ -29,7 +29,7 @@ class PaAppPermissionListCommand extends PowerAppsCommand {
     }
     async commandAction(logger, args) {
         if (this.verbose) {
-            logger.logToStderr(`Retrieving permissions for app ${args.options.appName}${args.options.roleName !== undefined ? ` with role name ${args.options.roleName}` : ''}`);
+            await logger.logToStderr(`Retrieving permissions for app ${args.options.appName}${args.options.roleName !== undefined ? ` with role name ${args.options.roleName}` : ''}`);
         }
         const url = `${this.resource}/providers/Microsoft.PowerApps${args.options.asAdmin ? '/scopes/admin' : ''}${args.options.environmentName ? '/environments/' + formatting.encodeQueryParameter(args.options.environmentName) : ''}/apps/${args.options.appName}/permissions?api-version=2022-11-01`;
         try {
@@ -44,7 +44,7 @@ class PaAppPermissionListCommand extends PowerAppsCommand {
                     permission.principalType = permission.properties.principal.type;
                 });
             }
-            logger.log(permissions);
+            await logger.log(permissions);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);

package/dist/m365/pa/commands/app/app-permission-remove.js

@@ -31,7 +31,7 @@ class PaAppPermissionRemoveCommand extends PowerAppsCommand {
     }
     async commandAction(logger, args) {
         try {
-            if (args.options.confirm) {
+            if (args.options.force) {
                 await this.removeAppPermission(logger, args.options);
             }
             else {
@@ -99,7 +99,7 @@ _PaAppPermissionRemoveCommand_instances = new WeakSet(), _PaAppPermissionRemoveC
             tenant: !!args.options.tenant,
             asAdmin: !!args.options.asAdmin,
             environmentName: typeof args.options.environmentName !== 'undefined',
-            confirm: !!args.options.confirm
+            force: !!args.options.force
         });
     });
 }, _PaAppPermissionRemoveCommand_initOptions = function _PaAppPermissionRemoveCommand_initOptions() {
@@ -120,7 +120,7 @@ _PaAppPermissionRemoveCommand_instances = new WeakSet(), _PaAppPermissionRemoveC
     }, {
         option: '-e, --environmentName [environmentName]'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _PaAppPermissionRemoveCommand_initValidators = function _PaAppPermissionRemoveCommand_initValidators() {
     this.validators.push(async (args) => {

package/dist/m365/pa/commands.js

@@ -12,9 +12,6 @@ export default {
     CONNECTOR_EXPORT: `${prefix} connector export`,
     CONNECTOR_LIST: `${prefix} connector list`,
     ENVIRONMENT_GET: `${prefix} environment get`,
-    ENVIRONMENT_LIST: `${prefix} environment list`,
-    PCF_INIT: `${prefix} pcf init`,
-    SOLUTION_INIT: `${prefix} solution init`,
-    SOLUTION_REFERENCE_ADD: `${prefix} solution reference add`
+    ENVIRONMENT_LIST: `${prefix} environment list`
 };
 //# sourceMappingURL=commands.js.map

package/dist/m365/spfx/commands/project/project-doctor/{doctor-1.18.0-beta.1.js → doctor-1.18.0-beta.5.js}

@@ -18,4 +18,4 @@ export default [
     new FN002016_DEVDEP_types_react_dom('17'),
     new FN002019_DEVDEP_microsoft_rush_stack_compiler(['4.5'])
 ];
-//# sourceMappingURL=doctor-1.18.0-beta.1.js.map
+//# sourceMappingURL=doctor-1.18.0-beta.5.js.map

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

@@ -67,7 +67,7 @@ class SpfxProjectDoctorCommand extends BaseProjectCommand {
             '1.17.2',
             '1.17.3',
             '1.17.4',
-            '1.18.0-beta.1'
+            '1.18.0-beta.5'
         ];
         __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.15.2.js

@@ -103,7 +103,7 @@ export default [
                 'fixWith': 'symbol'
               },
               'Function': {
-                'message': 'The \\'Function\\' type accepts any function-like value.\nIt provides no type safety when calling the function, which can be a common source of bugs.\nIt also accepts things like class declarations, which will throw at runtime as they will not be called with \'new\'.\nIf you are expecting the function to accept certain arguments, you should explicitly define the function shape.'
+                'message': 'The \\'Function\\' type accepts any function-like value.\\nIt provides no type safety when calling the function, which can be a common source of bugs.\\nIt also accepts things like class declarations, which will throw at runtime as they will not be called with \\'new\\'.\\nIf you are expecting the function to accept certain arguments, you should explicitly define the function shape.'
               }
             }
           }

package/dist/m365/spfx/commands/project/project-upgrade/{upgrade-1.18.0-beta.1.js → upgrade-1.18.0-beta.5.js}

@@ -27,33 +27,33 @@ import { FN002023_DEVDEP_microsoft_eslint_config_spfx } from './rules/FN002023_D
 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.18.0-beta.1'),
-    new FN001002_DEP_microsoft_sp_lodash_subset('1.18.0-beta.1'),
-    new FN001003_DEP_microsoft_sp_office_ui_fabric_core('1.18.0-beta.1'),
-    new FN001004_DEP_microsoft_sp_webpart_base('1.18.0-beta.1'),
-    new FN001011_DEP_microsoft_sp_dialog('1.18.0-beta.1'),
-    new FN001012_DEP_microsoft_sp_application_base('1.18.0-beta.1'),
-    new FN001014_DEP_microsoft_sp_listview_extensibility('1.18.0-beta.1'),
-    new FN001021_DEP_microsoft_sp_property_pane('1.18.0-beta.1'),
+    new FN001001_DEP_microsoft_sp_core_library('1.18.0-beta.5'),
+    new FN001002_DEP_microsoft_sp_lodash_subset('1.18.0-beta.5'),
+    new FN001003_DEP_microsoft_sp_office_ui_fabric_core('1.18.0-beta.5'),
+    new FN001004_DEP_microsoft_sp_webpart_base('1.18.0-beta.5'),
+    new FN001011_DEP_microsoft_sp_dialog('1.18.0-beta.5'),
+    new FN001012_DEP_microsoft_sp_application_base('1.18.0-beta.5'),
+    new FN001014_DEP_microsoft_sp_listview_extensibility('1.18.0-beta.5'),
+    new FN001021_DEP_microsoft_sp_property_pane('1.18.0-beta.5'),
     new FN001022_DEP_office_ui_fabric_react('', false),
-    new FN001023_DEP_microsoft_sp_component_base('1.18.0-beta.1'),
-    new FN001024_DEP_microsoft_sp_diagnostics('1.18.0-beta.1'),
-    new FN001025_DEP_microsoft_sp_dynamic_data('1.18.0-beta.1'),
-    new FN001026_DEP_microsoft_sp_extension_base('1.18.0-beta.1'),
-    new FN001027_DEP_microsoft_sp_http('1.18.0-beta.1'),
-    new FN001028_DEP_microsoft_sp_list_subscription('1.18.0-beta.1'),
-    new FN001029_DEP_microsoft_sp_loader('1.18.0-beta.1'),
-    new FN001030_DEP_microsoft_sp_module_interfaces('1.18.0-beta.1'),
-    new FN001031_DEP_microsoft_sp_odata_types('1.18.0-beta.1'),
-    new FN001032_DEP_microsoft_sp_page_context('1.18.0-beta.1'),
+    new FN001023_DEP_microsoft_sp_component_base('1.18.0-beta.5'),
+    new FN001024_DEP_microsoft_sp_diagnostics('1.18.0-beta.5'),
+    new FN001025_DEP_microsoft_sp_dynamic_data('1.18.0-beta.5'),
+    new FN001026_DEP_microsoft_sp_extension_base('1.18.0-beta.5'),
+    new FN001027_DEP_microsoft_sp_http('1.18.0-beta.5'),
+    new FN001028_DEP_microsoft_sp_list_subscription('1.18.0-beta.5'),
+    new FN001029_DEP_microsoft_sp_loader('1.18.0-beta.5'),
+    new FN001030_DEP_microsoft_sp_module_interfaces('1.18.0-beta.5'),
+    new FN001031_DEP_microsoft_sp_odata_types('1.18.0-beta.5'),
+    new FN001032_DEP_microsoft_sp_page_context('1.18.0-beta.5'),
     new FN001035_DEP_fluentui_react('8.106.4'),
-    new FN001013_DEP_microsoft_decorators('1.18.0-beta.1'),
-    new FN001034_DEP_microsoft_sp_adaptive_card_extension_base('1.18.0-beta.1'),
-    new FN002022_DEVDEP_microsoft_eslint_plugin_spfx('1.18.0-beta.1'),
-    new FN002023_DEVDEP_microsoft_eslint_config_spfx('1.18.0-beta.1'),
-    new FN002001_DEVDEP_microsoft_sp_build_web('1.18.0-beta.1'),
-    new FN002002_DEVDEP_microsoft_sp_module_interfaces('1.18.0-beta.1'),
-    new FN010001_YORC_version('1.18.0-beta.1'),
+    new FN001013_DEP_microsoft_decorators('1.18.0-beta.5'),
+    new FN001034_DEP_microsoft_sp_adaptive_card_extension_base('1.18.0-beta.5'),
+    new FN002022_DEVDEP_microsoft_eslint_plugin_spfx('1.18.0-beta.5'),
+    new FN002023_DEVDEP_microsoft_eslint_config_spfx('1.18.0-beta.5'),
+    new FN002001_DEVDEP_microsoft_sp_build_web('1.18.0-beta.5'),
+    new FN002002_DEVDEP_microsoft_sp_module_interfaces('1.18.0-beta.5'),
+    new FN010001_YORC_version('1.18.0-beta.5'),
     new FN010010_YORC_sdkVersions_teams_js('2.12.0')
 ];
-//# sourceMappingURL=upgrade-1.18.0-beta.1.js.map
+//# sourceMappingURL=upgrade-1.18.0-beta.5.js.map

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

@@ -71,7 +71,7 @@ class SpfxProjectUpgradeCommand extends BaseProjectCommand {
             '1.17.2',
             '1.17.3',
             '1.17.4',
-            '1.18.0-beta.1'
+            '1.18.0-beta.5'
         ];
         __classPrivateFieldGet(this, _SpfxProjectUpgradeCommand_instances, "m", _SpfxProjectUpgradeCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpfxProjectUpgradeCommand_instances, "m", _SpfxProjectUpgradeCommand_initOptions).call(this);

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

@@ -524,14 +524,14 @@ class SpfxDoctorCommand extends BaseProjectCommand {
                     fix: 'npm i -g yo@4'
                 }
             },
-            '1.18.0-beta.1': {
+            '1.18.0-beta.5': {
                 gulpCli: {
                     range: '^1 || ^2',
                     fix: 'npm i -g gulp-cli@2'
                 },
                 node: {
-                    range: '>=16.13.0 <17.0.0',
-                    fix: 'Install Node.js >=16.13.0 <17.0.0'
+                    range: '>=16.14.0 <17.0.0',
+                    fix: 'Install Node.js >=16.14.0 <17.0.0'
                 },
                 sp: SharePointVersion.SPO,
                 yo: {

package/dist/m365/spo/commands/app/SpoAppBaseCommand.js

@@ -1,33 +1,34 @@
 import request from '../../../../request.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 export class SpoAppBaseCommand extends SpoCommand {
-    getAppCatalogSiteUrl(logger, authSiteUrl, args) {
-        return new Promise((resolve, reject) => {
-            if (args.options.appCatalogScope === 'sitecollection') {
-                return resolve(args.options.appCatalogUrl.toLowerCase().replace('/appcatalog', ''));
+    async getAppCatalogSiteUrl(logger, authSiteUrl, args) {
+        if (args.options.appCatalogScope === 'sitecollection') {
+            // trim trailing slashes if there are any
+            const appCatalogUrl = args.options.appCatalogUrl.replace(/\/$/, '');
+            const appCatalogUrlChunks = appCatalogUrl.split('/');
+            // Trim the last part of the URL if it ends on '/appcatalog', but don't trim it if the site URL is called like that (/sites/appcatalog).
+            if (appCatalogUrl.toLowerCase().endsWith('/appcatalog') && appCatalogUrlChunks.length !== 5) {
+                return appCatalogUrl.substring(0, appCatalogUrl.lastIndexOf('/'));
             }
-            if (args.options.appCatalogUrl) {
-                return resolve(args.options.appCatalogUrl);
-            }
-            const requestOptions = {
-                url: `${authSiteUrl}/_api/SP_TenantSettings_Current`,
-                headers: {
-                    accept: 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            request
-                .get(requestOptions)
-                .then((res) => {
-                if (res.CorporateCatalogUrl) {
-                    return resolve(res.CorporateCatalogUrl);
-                }
-                reject('Tenant app catalog is not configured.');
-            })
-                .catch((err) => {
-                reject(err);
-            });
-        });
+        }
+        if (args.options.appCatalogUrl) {
+            return args.options.appCatalogUrl.replace(/\/$/, '');
+        }
+        if (this.verbose) {
+            await logger.logToStderr('Getting tenant app catalog url...');
+        }
+        const requestOptions = {
+            url: `${authSiteUrl}/_api/SP_TenantSettings_Current`,
+            headers: {
+                accept: 'application/json;odata=nometadata'
+            },
+            responseType: 'json'
+        };
+        const response = await request.get(requestOptions);
+        if (response.CorporateCatalogUrl) {
+            return response.CorporateCatalogUrl;
+        }
+        throw new Error('Tenant app catalog is not configured.');
     }
 }
 //# sourceMappingURL=SpoAppBaseCommand.js.map

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

@@ -22,6 +22,7 @@ class SpoAppAddCommand extends SpoAppBaseCommand {
     constructor() {
         super();
         _SpoAppAddCommand_instances.add(this);
+        this.appCatalogScopeOptions = ['tenant', 'sitecollection'];
         __classPrivateFieldGet(this, _SpoAppAddCommand_instances, "m", _SpoAppAddCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoAppAddCommand_instances, "m", _SpoAppAddCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoAppAddCommand_instances, "m", _SpoAppAddCommand_initValidators).call(this);
@@ -62,9 +63,9 @@ class SpoAppAddCommand extends SpoAppBaseCommand {
 _SpoAppAddCommand_instances = new WeakSet(), _SpoAppAddCommand_initTelemetry = function _SpoAppAddCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            overwrite: (!(!args.options.overwrite)).toString(),
+            overwrite: !!args.options.overwrite,
             appCatalogScope: args.options.appCatalogScope || 'tenant',
-            appCatalogUrl: (!(!args.options.appCatalogUrl)).toString()
+            appCatalogUrl: typeof args.options.appCatalogUrl !== 'undefined'
         });
     });
 }, _SpoAppAddCommand_initOptions = function _SpoAppAddCommand_initOptions() {
@@ -72,7 +73,7 @@ _SpoAppAddCommand_instances = new WeakSet(), _SpoAppAddCommand_initTelemetry = f
         option: '-p, --filePath <filePath>'
     }, {
         option: '-s, --appCatalogScope [appCatalogScope]',
-        autocomplete: ['tenant', 'sitecollection']
+        autocomplete: this.appCatalogScopeOptions
     }, {
         option: '-u, --appCatalogUrl [appCatalogUrl]'
     }, {
@@ -80,14 +81,13 @@ _SpoAppAddCommand_instances = new WeakSet(), _SpoAppAddCommand_initTelemetry = f
     });
 }, _SpoAppAddCommand_initValidators = function _SpoAppAddCommand_initValidators() {
     this.validators.push(async (args) => {
-        // verify either 'tenant' or 'sitecollection' specified if scope provided
         if (args.options.appCatalogScope) {
-            const testScope = args.options.appCatalogScope.toLowerCase();
-            if (!(testScope === 'tenant' || testScope === 'sitecollection')) {
-                return `appCatalogScope must be either 'tenant' or 'sitecollection'`;
+            const appCatalogScope = args.options.appCatalogScope.toLowerCase();
+            if (this.appCatalogScopeOptions.indexOf(appCatalogScope) === -1) {
+                return `${args.options.appCatalogScope} is not a valid appCatalogScope. Allowed values are: ${this.appCatalogScopeOptions.join(', ')}`;
             }
-            if (testScope === 'sitecollection' && !args.options.appCatalogUrl) {
-                return `You must specify appCatalogUrl when the appCatalogScope is sitecollection`;
+            if (appCatalogScope === 'sitecollection' && !args.options.appCatalogUrl) {
+                return `You must specify appCatalogUrl when appCatalogScope is sitecollection`;
             }
         }
         const fullPath = path.resolve(args.options.filePath);

package/dist/m365/spo/commands/file/file-copy.js

@@ -72,7 +72,7 @@ class SpoFileCopyCommand extends SpoCommand {
             return urlUtil.getServerRelativePath(options.webUrl, options.sourceUrl);
         }
         if (this.verbose) {
-            logger.logToStderr(`Retrieving server-relative path for file with ID '${options.sourceId}'...`);
+            await logger.logToStderr(`Retrieving server-relative path for file with ID '${options.sourceId}'...`);
         }
         const requestOptions = {
             url: `${options.webUrl}/_api/Web/GetFileById('${options.sourceId}')?$select=ServerRelativePath`,