@pnp/cli-microsoft365 10.0.0-beta.c07d83f → 10.0.0-beta.d03ed9d

package/dist/m365/external/commands/item/item-add.js

@@ -45,8 +45,7 @@ class ExternalItemAddCommand extends GraphCommand {
             properties: {}
         };
         // we need to rewrite the @odata properties to the correct format
-        // because . in @odata.type is interpreted by minimist as a child property
-        // we also need to extract multiple values for collections into arrays
+        // to extract multiple values for collections into arrays
         this.rewriteCollectionProperties(args.options);
         this.addUnknownOptionsToPayload(requestBody.properties, args.options);
         const requestOptions = {
@@ -81,11 +80,9 @@ class ExternalItemAddCommand extends GraphCommand {
     }
     rewriteCollectionProperties(options) {
         Object.getOwnPropertyNames(options).forEach(name => {
-            if (!name.endsWith('@odata')) {
+            if (!name.includes('@odata')) {
                 return;
             }
-            options[`${name}.type`] = options[name].type;
-            delete options[name];
             // convert the value of a collection to an array
             const nameWithoutOData = name.substring(0, name.indexOf('@odata'));
             if (options[nameWithoutOData]) {

package/dist/m365/flow/commands/environment/environment-list.js

@@ -23,8 +23,8 @@ class FlowEnvironmentListCommand extends PowerAutomateCommand {
                         e.displayName = e.properties.displayName;
                     });
                 }
-                await logger.log(res);
             }
+            await logger.log(res);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);

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

@@ -33,13 +33,8 @@ class PaAppListCommand extends PowerAppsCommand {
                 apps.forEach(a => {
                     a.displayName = a.properties.displayName;
                 });
-                await logger.log(apps);
-            }
-            else {
-                if (this.verbose) {
-                    await logger.logToStderr('No apps found');
-                }
             }
+            await logger.log(apps);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);

package/dist/m365/pa/commands/connector/connector-list.js

@@ -35,13 +35,8 @@ class PaConnectorListCommand extends PowerAppsCommand {
                 connectors.forEach(c => {
                     c.displayName = c.properties.displayName;
                 });
-                await logger.log(connectors);
-            }
-            else {
-                if (this.verbose) {
-                    await logger.logToStderr('No custom connectors found');
-                }
             }
+            await logger.log(connectors);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);

package/dist/m365/pa/commands/environment/environment-list.js

@@ -28,8 +28,8 @@ class PaEnvironmentListCommand extends PowerAppsCommand {
                 res.value.forEach(e => {
                     e.displayName = e.properties.displayName;
                 });
-                await logger.log(res.value);
             }
+            await logger.log(res.value);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);

package/dist/m365/pp/commands/environment/environment-list.js

@@ -47,8 +47,8 @@ class PpEnvironmentListCommand extends PowerPlatformCommand {
                 res.value.forEach(e => {
                     e.displayName = e.properties.displayName;
                 });
-                await logger.log(res.value);
             }
+            await logger.log(res.value);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);

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/app/app-instance-list.js

@@ -4,7 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _SpoAppInStanceListCommand_instances, _SpoAppInStanceListCommand_initOptions, _SpoAppInStanceListCommand_initValidators;
-import request from '../../../../request.js';
+import { odata } from '../../../../utils/odata.js';
 import { validation } from '../../../../utils/validation.js';
 import commands from '../../commands.js';
 import { SpoAppBaseCommand } from './SpoAppBaseCommand.js';
@@ -28,24 +28,9 @@ class SpoAppInStanceListCommand extends SpoAppBaseCommand {
         if (this.verbose) {
             await logger.logToStderr(`Retrieving installed apps in site at ${args.options.siteUrl}...`);
         }
-        const requestOptions = {
-            url: `${args.options.siteUrl}/_api/web/AppTiles?$filter=AppType eq 3`,
-            method: 'GET',
-            headers: {
-                'accept': 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
         try {
-            const apps = await request.get(requestOptions);
-            if (apps.value && apps.value.length > 0) {
-                await logger.log(apps.value);
-            }
-            else {
-                if (this.verbose) {
-                    await logger.logToStderr('No apps found');
-                }
-            }
+            const apps = await odata.getAllItems(`${args.options.siteUrl}/_api/web/AppTiles?$filter=AppType eq 3`);
+            await logger.log(apps);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);

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

@@ -37,14 +37,7 @@ class SpoAppListCommand extends SpoAppBaseCommand {
                 await logger.logToStderr(`Retrieving apps...`);
             }
             const apps = await odata.getAllItems(`${appCatalogSiteUrl}/_api/web/${scope}appcatalog/AvailableApps`);
-            if (apps && apps.length > 0) {
-                await logger.log(apps);
-            }
-            else {
-                if (this.verbose) {
-                    await logger.logToStderr('No apps found');
-                }
-            }
+            await logger.log(apps);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);

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

@@ -26,14 +26,7 @@ class SpoFeatureListCommand extends SpoCommand {
         const scope = (args.options.scope) ? args.options.scope : 'Web';
         try {
             const features = await odata.getAllItems(`${args.options.webUrl}/_api/${scope}/Features?$select=DisplayName,DefinitionId`);
-            if (features && features.length > 0) {
-                await logger.log(features);
-            }
-            else {
-                if (this.verbose) {
-                    await logger.logToStderr('No activated Features found');
-                }
-            }
+            await logger.log(features);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);

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

@@ -5,7 +5,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoFileCopyCommand_instances, _SpoFileCopyCommand_initTelemetry, _SpoFileCopyCommand_initOptions, _SpoFileCopyCommand_initValidators, _SpoFileCopyCommand_initOptionSets, _SpoFileCopyCommand_initTypes;
 import request from '../../../../request.js';
-import { CreateCopyJobsNameConflictBehavior, spo } from '../../../../utils/spo.js';
+import { CreateFileCopyJobsNameConflictBehavior, spo } from '../../../../utils/spo.js';
 import { urlUtil } from '../../../../utils/urlUtil.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
@@ -43,7 +43,7 @@ class SpoFileCopyCommand extends SpoCommand {
             if (newName && !newName.includes('.')) {
                 newName += sourceServerRelativePath.substring(sourceServerRelativePath.lastIndexOf('.'));
             }
-            const copyJobResponse = await spo.createCopyJob(args.options.webUrl, sourcePath, destinationPath, {
+            const copyJobResponse = await spo.createFileCopyJob(args.options.webUrl, sourcePath, destinationPath, {
                 nameConflictBehavior: this.getNameConflictBehaviorValue(args.options.nameConflictBehavior),
                 bypassSharedLock: !!args.options.bypassSharedLock,
                 ignoreVersionHistory: !!args.options.ignoreVersionHistory,
@@ -97,13 +97,13 @@ class SpoFileCopyCommand extends SpoCommand {
     getNameConflictBehaviorValue(nameConflictBehavior) {
         switch (nameConflictBehavior?.toLowerCase()) {
             case 'fail':
-                return CreateCopyJobsNameConflictBehavior.Fail;
+                return CreateFileCopyJobsNameConflictBehavior.Fail;
             case 'replace':
-                return CreateCopyJobsNameConflictBehavior.Replace;
+                return CreateFileCopyJobsNameConflictBehavior.Replace;
             case 'rename':
-                return CreateCopyJobsNameConflictBehavior.Rename;
+                return CreateFileCopyJobsNameConflictBehavior.Rename;
             default:
-                return CreateCopyJobsNameConflictBehavior.Fail;
+                return CreateFileCopyJobsNameConflictBehavior.Fail;
         }
     }
     getAbsoluteUrl(webUrl, url) {

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

@@ -5,7 +5,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoFileMoveCommand_instances, _SpoFileMoveCommand_initTelemetry, _SpoFileMoveCommand_initOptions, _SpoFileMoveCommand_initValidators, _SpoFileMoveCommand_initOptionSets, _SpoFileMoveCommand_initTypes;
 import request from '../../../../request.js';
-import { CreateCopyJobsNameConflictBehavior, spo } from '../../../../utils/spo.js';
+import { CreateFileCopyJobsNameConflictBehavior, spo } from '../../../../utils/spo.js';
 import { urlUtil } from '../../../../utils/urlUtil.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
@@ -43,7 +43,7 @@ class SpoFileMoveCommand extends SpoCommand {
             if (newName && !newName.includes('.')) {
                 newName += sourceServerRelativePath.substring(sourceServerRelativePath.lastIndexOf('.'));
             }
-            const copyJobResponse = await spo.createCopyJob(args.options.webUrl, sourcePath, destinationPath, {
+            const copyJobResponse = await spo.createFileCopyJob(args.options.webUrl, sourcePath, destinationPath, {
                 nameConflictBehavior: this.getNameConflictBehaviorValue(args.options.nameConflictBehavior),
                 bypassSharedLock: !!args.options.bypassSharedLock,
                 includeItemPermissions: !!args.options.includeItemPermissions,
@@ -97,13 +97,13 @@ class SpoFileMoveCommand extends SpoCommand {
     getNameConflictBehaviorValue(nameConflictBehavior) {
         switch (nameConflictBehavior?.toLowerCase()) {
             case 'fail':
-                return CreateCopyJobsNameConflictBehavior.Fail;
+                return CreateFileCopyJobsNameConflictBehavior.Fail;
             case 'replace':
-                return CreateCopyJobsNameConflictBehavior.Replace;
+                return CreateFileCopyJobsNameConflictBehavior.Replace;
             case 'rename':
-                return CreateCopyJobsNameConflictBehavior.Rename;
+                return CreateFileCopyJobsNameConflictBehavior.Rename;
             default:
-                return CreateCopyJobsNameConflictBehavior.Fail;
+                return CreateFileCopyJobsNameConflictBehavior.Fail;
         }
     }
     getAbsoluteUrl(webUrl, url) {

package/dist/m365/spo/commands/folder/folder-move.js

@@ -5,6 +5,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoFolderMoveCommand_instances, _SpoFolderMoveCommand_initTelemetry, _SpoFolderMoveCommand_initOptions, _SpoFolderMoveCommand_initValidators, _SpoFolderMoveCommand_initOptionSets, _SpoFolderMoveCommand_initTypes;
 import request from '../../../../request.js';
+import { CreateFolderCopyJobsNameConflictBehavior, spo } from '../../../../utils/spo.js';
 import { urlUtil } from '../../../../utils/urlUtil.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
@@ -31,45 +32,54 @@ class SpoFolderMoveCommand extends SpoCommand {
     }
     async commandAction(logger, args) {
         try {
-            const sourcePath = await this.getSourcePath(logger, args.options);
+            const sourceServerRelativePath = await this.getSourcePath(logger, args.options);
+            const sourcePath = this.getAbsoluteUrl(args.options.webUrl, sourceServerRelativePath);
+            const destinationPath = this.getAbsoluteUrl(args.options.webUrl, args.options.targetUrl);
             if (this.verbose) {
-                await logger.logToStderr(`Moving folder '${sourcePath}' to '${args.options.targetUrl}'...`);
+                await logger.logToStderr(`Moving folder '${sourcePath}' to '${destinationPath}'...`);
             }
-            const absoluteSourcePath = this.getAbsoluteUrl(args.options.webUrl, sourcePath);
-            let absoluteTargetPath = this.getAbsoluteUrl(args.options.webUrl, args.options.targetUrl) + '/';
-            if (args.options.newName) {
-                absoluteTargetPath += args.options.newName;
+            const copyJobResponse = await spo.createFolderCopyJob(args.options.webUrl, sourcePath, destinationPath, {
+                nameConflictBehavior: this.getNameConflictBehaviorValue(args.options.nameConflictBehavior),
+                newName: args.options.newName,
+                operation: 'move'
+            });
+            if (args.options.skipWait) {
+                return;
             }
-            else {
-                // Keep the original file name
-                absoluteTargetPath += sourcePath.substring(sourcePath.lastIndexOf('/') + 1);
+            if (this.verbose) {
+                await logger.logToStderr('Waiting for the move job to complete...');
+            }
+            const copyJobResult = await spo.getCopyJobResult(args.options.webUrl, copyJobResponse);
+            if (this.verbose) {
+                await logger.logToStderr('Getting information about the destination folder...');
             }
+            // Get destination folder data
+            const siteRelativeDestinationFolder = '/' + copyJobResult.TargetObjectSiteRelativeUrl.substring(0, copyJobResult.TargetObjectSiteRelativeUrl.lastIndexOf('/'));
+            const absoluteWebUrl = destinationPath.substring(0, destinationPath.toLowerCase().lastIndexOf(siteRelativeDestinationFolder.toLowerCase()));
             const requestOptions = {
-                url: `${args.options.webUrl}/_api/SP.MoveCopyUtil.MoveFolderByPath`,
+                url: `${absoluteWebUrl}/_api/Web/GetFolderById('${copyJobResult.TargetObjectUniqueId}')`,
                 headers: {
                     accept: 'application/json;odata=nometadata'
                 },
-                responseType: 'json',
-                data: {
-                    srcPath: {
-                        DecodedUrl: absoluteSourcePath
-                    },
-                    destPath: {
-                        DecodedUrl: absoluteTargetPath
-                    },
-                    options: {
-                        KeepBoth: args.options.nameConflictBehavior === 'rename',
-                        ShouldBypassSharedLocks: !!args.options.bypassSharedLock,
-                        RetainEditorAndModifiedOnMove: !!args.options.retainEditorAndModified
-                    }
-                }
+                responseType: 'json'
             };
-            await request.post(requestOptions);
+            const destinationFile = await request.get(requestOptions);
+            await logger.log(destinationFile);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);
         }
     }
+    getNameConflictBehaviorValue(nameConflictBehavior) {
+        switch (nameConflictBehavior?.toLowerCase()) {
+            case 'fail':
+                return CreateFolderCopyJobsNameConflictBehavior.Fail;
+            case 'rename':
+                return CreateFolderCopyJobsNameConflictBehavior.Rename;
+            default:
+                return CreateFolderCopyJobsNameConflictBehavior.Fail;
+        }
+    }
     async getSourcePath(logger, options) {
         if (options.sourceUrl) {
             return urlUtil.getServerRelativePath(options.webUrl, options.sourceUrl);
@@ -78,17 +88,18 @@ class SpoFolderMoveCommand extends SpoCommand {
             await logger.logToStderr(`Retrieving server-relative path for folder with ID '${options.sourceId}'...`);
         }
         const requestOptions = {
-            url: `${options.webUrl}/_api/Web/GetFolderById('${options.sourceId}')?$select=ServerRelativePath`,
+            url: `${options.webUrl}/_api/Web/GetFolderById('${options.sourceId}')/ServerRelativePath`,
             headers: {
                 accept: 'application/json;odata=nometadata'
             },
             responseType: 'json'
         };
-        const file = await request.get(requestOptions);
-        return file.ServerRelativePath.DecodedUrl;
+        const path = await request.get(requestOptions);
+        return path.DecodedUrl;
     }
     getAbsoluteUrl(webUrl, url) {
-        return url.startsWith('https://') ? url : urlUtil.getAbsoluteUrl(webUrl, url);
+        const result = url.startsWith('https://') ? url : urlUtil.getAbsoluteUrl(webUrl, url);
+        return urlUtil.removeTrailingSlashes(result);
     }
 }
 _SpoFolderMoveCommand_instances = new WeakSet(), _SpoFolderMoveCommand_initTelemetry = function _SpoFolderMoveCommand_initTelemetry() {
@@ -98,8 +109,7 @@ _SpoFolderMoveCommand_instances = new WeakSet(), _SpoFolderMoveCommand_initTelem
             sourceId: typeof args.options.sourceId !== 'undefined',
             newName: typeof args.options.newName !== 'undefined',
             nameConflictBehavior: typeof args.options.nameConflictBehavior !== 'undefined',
-            retainEditorAndModified: !!args.options.retainEditorAndModified,
-            bypassSharedLock: !!args.options.bypassSharedLock
+            skipWait: !!args.options.skipWait
         });
     });
 }, _SpoFolderMoveCommand_initOptions = function _SpoFolderMoveCommand_initOptions() {
@@ -117,9 +127,7 @@ _SpoFolderMoveCommand_instances = new WeakSet(), _SpoFolderMoveCommand_initTelem
         option: '--nameConflictBehavior [nameConflictBehavior]',
         autocomplete: this.nameConflictBehaviorOptions
     }, {
-        option: '--retainEditorAndModified'
-    }, {
-        option: '--bypassSharedLock'
+        option: '--skipWait'
     });
 }, _SpoFolderMoveCommand_initValidators = function _SpoFolderMoveCommand_initValidators() {
     this.validators.push(async (args) => {
@@ -139,7 +147,7 @@ _SpoFolderMoveCommand_instances = new WeakSet(), _SpoFolderMoveCommand_initTelem
     this.optionSets.push({ options: ['sourceUrl', 'sourceId'] });
 }, _SpoFolderMoveCommand_initTypes = function _SpoFolderMoveCommand_initTypes() {
     this.types.string.push('webUrl', 'sourceUrl', 'sourceId', 'targetUrl', 'newName', 'nameConflictBehavior');
-    this.types.boolean.push('retainEditorAndModified', 'bypassSharedLock');
+    this.types.boolean.push('skipWait');
 };
 export default new SpoFolderMoveCommand();
 //# sourceMappingURL=folder-move.js.map

package/dist/m365/spo/commands/group/group-member-add.js

@@ -31,14 +31,6 @@ class SpoGroupMemberAddCommand extends SpoCommand {
     }
     async commandAction(logger, args) {
         try {
-            if (args.options.aadGroupIds) {
-                args.options.entraGroupIds = args.options.aadGroupIds;
-                await this.warn(logger, `Option 'aadGroupIds' is deprecated. Please use 'entraGroupIds' instead.`);
-            }
-            if (args.options.aadGroupNames) {
-                args.options.entraGroupNames = args.options.aadGroupNames;
-                await this.warn(logger, `Option 'aadGroupNames' is deprecated. Please use 'entraGroupNames' instead.`);
-            }
             const loginNames = await this.getLoginNames(logger, args.options);
             let apiUrl = `${args.options.webUrl}/_api/web/SiteGroups`;
             if (args.options.groupId) {
@@ -132,9 +124,7 @@ _SpoGroupMemberAddCommand_instances = new WeakSet(), _SpoGroupMemberAddCommand_i
             emails: typeof args.options.emails !== 'undefined',
             userIds: typeof args.options.userIds !== 'undefined',
             entraGroupIds: typeof args.options.entraGroupIds !== 'undefined',
-            aadGroupIds: typeof args.options.aadGroupIds !== 'undefined',
-            entraGroupNames: typeof args.options.entraGroupNames !== 'undefined',
-            aadGroupNames: typeof args.options.aadGroupNames !== 'undefined'
+            entraGroupNames: typeof args.options.entraGroupNames !== 'undefined'
         });
     });
 }, _SpoGroupMemberAddCommand_initOptions = function _SpoGroupMemberAddCommand_initOptions() {
@@ -152,12 +142,8 @@ _SpoGroupMemberAddCommand_instances = new WeakSet(), _SpoGroupMemberAddCommand_i
         option: '--userIds [userIds]'
     }, {
         option: '--entraGroupIds [entraGroupIds]'
-    }, {
-        option: '--aadGroupIds [aadGroupIds]'
     }, {
         option: '--entraGroupNames [entraGroupNames]'
-    }, {
-        option: '--aadGroupNames [aadGroupNames]'
     });
 }, _SpoGroupMemberAddCommand_initValidators = function _SpoGroupMemberAddCommand_initValidators() {
     this.validators.push(async (args) => {
@@ -192,18 +178,12 @@ _SpoGroupMemberAddCommand_instances = new WeakSet(), _SpoGroupMemberAddCommand_i
                 return `Option 'entraGroupIds' contains one or more invalid GUIDs: ${isValidArray}.`;
             }
         }
-        if (args.options.aadGroupIds) {
-            const isValidArray = validation.isValidGuidArray(args.options.aadGroupIds);
-            if (isValidArray !== true) {
-                return `Option 'aadGroupIds' contains one or more invalid GUIDs: ${isValidArray}.`;
-            }
-        }
         return true;
     });
 }, _SpoGroupMemberAddCommand_initOptionSets = function _SpoGroupMemberAddCommand_initOptionSets() {
-    this.optionSets.push({ options: ['groupId', 'groupName'] }, { options: ['userNames', 'emails', 'userIds', 'entraGroupIds', 'aadGroupIds', 'entraGroupNames', 'aadGroupNames'] });
+    this.optionSets.push({ options: ['groupId', 'groupName'] }, { options: ['userNames', 'emails', 'userIds', 'entraGroupIds', 'entraGroupNames'] });
 }, _SpoGroupMemberAddCommand_initTypes = function _SpoGroupMemberAddCommand_initTypes() {
-    this.types.string.push('webUrl', 'groupName', 'userNames', 'emails', 'userIds', 'entraGroupIds', 'aadGroupIds', 'entraGroupNames', 'aadGroupNames');
+    this.types.string.push('webUrl', 'groupName', 'userNames', 'emails', 'userIds', 'entraGroupIds', 'entraGroupNames');
 };
 export default new SpoGroupMemberAddCommand();
 //# sourceMappingURL=group-member-add.js.map