@pnp/cli-microsoft365 5.8.0 → 5.9.0-beta.005c47a

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

@@ -21,7 +21,8 @@ const path = require("path");
 // uncomment to support upgrading to preview releases
 const semver_1 = require("semver");
 const Command_1 = require("../../../../Command");
-const utils_1 = require("../../../../utils");
+const fsUtil_1 = require("../../../../utils/fsUtil");
+const packageManager_1 = require("../../../../utils/packageManager");
 const commands_1 = require("../../commands");
 const base_project_command_1 = require("./base-project-command");
 const FN017001_MISC_npm_dedupe_1 = require("./project-upgrade/rules/FN017001_MISC_npm_dedupe");
@@ -192,33 +193,33 @@ class SpfxProjectUpgradeCommand extends base_project_command_1.BaseProjectComman
                 // matches must be in this particular order to avoid false matches, eg.
                 // uninstallDev contains install
                 if (f.resolution.startsWith('uninstallDev')) {
-                    f.resolution = f.resolution.replace('uninstallDev', utils_1.packageManager.getPackageManagerCommand('uninstallDev', this.packageManager));
+                    f.resolution = f.resolution.replace('uninstallDev', packageManager_1.packageManager.getPackageManagerCommand('uninstallDev', this.packageManager));
                     return;
                 }
                 if (f.resolution.startsWith('installDev')) {
-                    f.resolution = f.resolution.replace('installDev', utils_1.packageManager.getPackageManagerCommand('installDev', this.packageManager));
+                    f.resolution = f.resolution.replace('installDev', packageManager_1.packageManager.getPackageManagerCommand('installDev', this.packageManager));
                     return;
                 }
                 if (f.resolution.startsWith('uninstall')) {
-                    f.resolution = f.resolution.replace('uninstall', utils_1.packageManager.getPackageManagerCommand('uninstall', this.packageManager));
+                    f.resolution = f.resolution.replace('uninstall', packageManager_1.packageManager.getPackageManagerCommand('uninstall', this.packageManager));
                     return;
                 }
                 if (f.resolution.startsWith('install')) {
-                    f.resolution = f.resolution.replace('install', utils_1.packageManager.getPackageManagerCommand('install', this.packageManager));
+                    f.resolution = f.resolution.replace('install', packageManager_1.packageManager.getPackageManagerCommand('install', this.packageManager));
                     return;
                 }
                 // copy support for multiple shells
                 if (f.resolution.startsWith('copy_cmd')) {
-                    f.resolution = f.resolution.replace('copy_cmd', utils_1.fsUtil.getCopyCommand('copyCommand', this.shell));
-                    f.resolution = f.resolution.replace('DestinationParam', utils_1.fsUtil.getCopyCommand('copyDestinationParam', this.shell));
+                    f.resolution = f.resolution.replace('copy_cmd', fsUtil_1.fsUtil.getCopyCommand('copyCommand', this.shell));
+                    f.resolution = f.resolution.replace('DestinationParam', fsUtil_1.fsUtil.getCopyCommand('copyDestinationParam', this.shell));
                     return;
                 }
                 // createdir support for multiple shells
                 if (f.resolution.startsWith('create_dir_cmd')) {
-                    f.resolution = f.resolution.replace('create_dir_cmd', utils_1.fsUtil.getDirectoryCommand('createDirectoryCommand', this.shell));
-                    f.resolution = f.resolution.replace('NameParam', utils_1.fsUtil.getDirectoryCommand('createDirectoryNameParam', this.shell));
-                    f.resolution = f.resolution.replace('PathParam', utils_1.fsUtil.getDirectoryCommand('createDirectoryPathParam', this.shell));
-                    f.resolution = f.resolution.replace('ItemTypeParam', utils_1.fsUtil.getDirectoryCommand('createDirectoryItemTypeParam', this.shell));
+                    f.resolution = f.resolution.replace('create_dir_cmd', fsUtil_1.fsUtil.getDirectoryCommand('createDirectoryCommand', this.shell));
+                    f.resolution = f.resolution.replace('NameParam', fsUtil_1.fsUtil.getDirectoryCommand('createDirectoryNameParam', this.shell));
+                    f.resolution = f.resolution.replace('PathParam', fsUtil_1.fsUtil.getDirectoryCommand('createDirectoryPathParam', this.shell));
+                    f.resolution = f.resolution.replace('ItemTypeParam', fsUtil_1.fsUtil.getDirectoryCommand('createDirectoryItemTypeParam', this.shell));
                     return;
                 }
                 // 'Add' support for multiple shells
@@ -229,7 +230,7 @@ class SpfxProjectUpgradeCommand extends base_project_command_1.BaseProjectComman
                     const contentStart = f.resolution.indexOf('[BEFORECONTENT]') + '[BEFORECONTENT]'.length;
                     const contentEnd = f.resolution.indexOf('[AFTERCONTENT]');
                     const fileContent = f.resolution.substring(contentStart, contentEnd);
-                    f.resolution = utils_1.fsUtil.getAddCommand('addFileCommand', this.shell);
+                    f.resolution = fsUtil_1.fsUtil.getAddCommand('addFileCommand', this.shell);
                     f.resolution = f.resolution.replace('[FILECONTENT]', fileContent);
                     f.resolution = f.resolution.replace('[FILEPATH]', filePath);
                     f.resolution = f.resolution.replace('[BEFOREPATH]', ' ');
@@ -240,7 +241,7 @@ class SpfxProjectUpgradeCommand extends base_project_command_1.BaseProjectComman
                 }
                 // 'Remove' support for multiple shells
                 if (f.resolution.startsWith('remove_cmd')) {
-                    f.resolution = f.resolution.replace('remove_cmd', utils_1.fsUtil.getRemoveCommand('removeFileCommand', this.shell));
+                    f.resolution = f.resolution.replace('remove_cmd', fsUtil_1.fsUtil.getRemoveCommand('removeFileCommand', this.shell));
                     return;
                 }
             });
@@ -277,10 +278,10 @@ class SpfxProjectUpgradeCommand extends base_project_command_1.BaseProjectComman
             '-----------------------', os.EOL,
             (reportData.packageManagerCommands
                 .concat(reportData.commandsToExecute
-                .filter((command) => command.indexOf(utils_1.packageManager.getPackageManagerCommand('install', this.packageManager)) === -1 &&
-                command.indexOf(utils_1.packageManager.getPackageManagerCommand('installDev', this.packageManager)) === -1 &&
-                command.indexOf(utils_1.packageManager.getPackageManagerCommand('uninstall', this.packageManager)) === -1 &&
-                command.indexOf(utils_1.packageManager.getPackageManagerCommand('uninstallDev', this.packageManager)) === -1))).join(os.EOL), os.EOL,
+                .filter((command) => command.indexOf(packageManager_1.packageManager.getPackageManagerCommand('install', this.packageManager)) === -1 &&
+                command.indexOf(packageManager_1.packageManager.getPackageManagerCommand('installDev', this.packageManager)) === -1 &&
+                command.indexOf(packageManager_1.packageManager.getPackageManagerCommand('uninstall', this.packageManager)) === -1 &&
+                command.indexOf(packageManager_1.packageManager.getPackageManagerCommand('uninstallDev', this.packageManager)) === -1))).join(os.EOL), os.EOL,
             os.EOL,
             Object.keys(reportData.modificationPerFile).map(file => {
                 return [
@@ -336,10 +337,10 @@ ${f.resolution}
             '```sh', os.EOL,
             (reportData.packageManagerCommands
                 .concat(reportData.commandsToExecute
-                .filter((command) => command.indexOf(utils_1.packageManager.getPackageManagerCommand('install', this.packageManager)) === -1 &&
-                command.indexOf(utils_1.packageManager.getPackageManagerCommand('installDev', this.packageManager)) === -1 &&
-                command.indexOf(utils_1.packageManager.getPackageManagerCommand('uninstall', this.packageManager)) === -1 &&
-                command.indexOf(utils_1.packageManager.getPackageManagerCommand('uninstallDev', this.packageManager)) === -1))).join(os.EOL), os.EOL,
+                .filter((command) => command.indexOf(packageManager_1.packageManager.getPackageManagerCommand('install', this.packageManager)) === -1 &&
+                command.indexOf(packageManager_1.packageManager.getPackageManagerCommand('installDev', this.packageManager)) === -1 &&
+                command.indexOf(packageManager_1.packageManager.getPackageManagerCommand('uninstall', this.packageManager)) === -1 &&
+                command.indexOf(packageManager_1.packageManager.getPackageManagerCommand('uninstallDev', this.packageManager)) === -1))).join(os.EOL), os.EOL,
             '```', os.EOL,
             os.EOL,
             '### Modify files', os.EOL,
@@ -419,7 +420,7 @@ ${f.resolution}
             if (f.resolutionType === 'cmd') {
                 if (f.resolution.indexOf('npm') > -1 ||
                     f.resolution.indexOf('yarn') > -1) {
-                    utils_1.packageManager.mapPackageManagerCommand({
+                    packageManager_1.packageManager.mapPackageManagerCommand({
                         command: f.resolution,
                         packagesDevExact,
                         packagesDepExact,
@@ -445,7 +446,7 @@ ${f.resolution}
                 });
             }
         });
-        const packageManagerCommands = utils_1.packageManager.reducePackageManagerCommand({
+        const packageManagerCommands = packageManager_1.packageManager.reducePackageManagerCommand({
             packagesDepExact,
             packagesDevExact,
             packagesDepUn,

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

@@ -428,6 +428,21 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
                     range: '^4',
                     fix: 'npm i -g yo@4'
                 }
+            },
+            '1.16.0-beta.1': {
+                gulpCli: {
+                    range: '^1 || ^2',
+                    fix: 'npm i -g gulp-cli@2'
+                },
+                node: {
+                    range: '^16.13',
+                    fix: 'Install Node.js v16.13 or higher'
+                },
+                sp: SharePointVersion.SPO,
+                yo: {
+                    range: '^4',
+                    fix: 'npm i -g yo@4'
+                }
             }
         };
         __classPrivateFieldGet(this, _SpfxDoctorCommand_instances, "m", _SpfxDoctorCommand_initTelemetry).call(this);

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

@@ -18,7 +18,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require("fs");
 const path = require("path");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const spo_1 = require("../../../../utils/spo");
+const validation_1 = require("../../../../utils/validation");
 const commands_1 = require("../../commands");
 const SpoAppBaseCommand_1 = require("./SpoAppBaseCommand");
 class SpoAppAddCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
@@ -40,7 +41,7 @@ class SpoAppAddCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
             const scope = (args.options.scope) ? args.options.scope.toLowerCase() : 'tenant';
             const overwrite = args.options.overwrite || false;
             try {
-                const spoUrl = yield utils_1.spo.getSpoUrl(logger, this.debug);
+                const spoUrl = yield spo_1.spo.getSpoUrl(logger, this.debug);
                 const appCatalogUrl = yield this.getAppCatalogSiteUrl(logger, spoUrl, args);
                 const fullPath = path.resolve(args.options.filePath);
                 if (this.verbose) {
@@ -109,7 +110,7 @@ _SpoAppAddCommand_instances = new WeakSet(), _SpoAppAddCommand_initTelemetry = f
             return `Path '${fullPath}' points to a directory`;
         }
         if (args.options.appCatalogUrl) {
-            return utils_1.validation.isValidSharePointUrl(args.options.appCatalogUrl);
+            return validation_1.validation.isValidSharePointUrl(args.options.appCatalogUrl);
         }
         return true;
     }));

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

@@ -16,7 +16,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoAppDeployCommand_instances, _SpoAppDeployCommand_initTelemetry, _SpoAppDeployCommand_initOptions, _SpoAppDeployCommand_initValidators, _SpoAppDeployCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const spo_1 = require("../../../../utils/spo");
+const validation_1 = require("../../../../utils/validation");
 const commands_1 = require("../../commands");
 const SpoAppBaseCommand_1 = require("./SpoAppBaseCommand");
 class SpoAppDeployCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
@@ -40,7 +41,7 @@ class SpoAppDeployCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
             const scope = (args.options.scope) ? args.options.scope.toLowerCase() : 'tenant';
             let appCatalogUrl = '';
             try {
-                const spoUrl = yield utils_1.spo.getSpoUrl(logger, this.debug);
+                const spoUrl = yield spo_1.spo.getSpoUrl(logger, this.debug);
                 appCatalogUrl = yield this.getAppCatalogSiteUrl(logger, spoUrl, args);
                 let res;
                 if (args.options.id) {
@@ -118,11 +119,11 @@ _SpoAppDeployCommand_instances = new WeakSet(), _SpoAppDeployCommand_initTelemet
                 return `You must specify appCatalogUrl when the scope is sitecollection`;
             }
         }
-        if (args.options.id && !utils_1.validation.isValidGuid(args.options.id)) {
+        if (args.options.id && !validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         if (args.options.appCatalogUrl) {
-            return utils_1.validation.isValidSharePointUrl(args.options.appCatalogUrl);
+            return validation_1.validation.isValidSharePointUrl(args.options.appCatalogUrl);
         }
         return true;
     }));

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

@@ -16,7 +16,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoAppGetCommand_instances, _SpoAppGetCommand_initTelemetry, _SpoAppGetCommand_initOptions, _SpoAppGetCommand_initValidators, _SpoAppGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const spo_1 = require("../../../../utils/spo");
+const validation_1 = require("../../../../utils/validation");
 const commands_1 = require("../../commands");
 const SpoAppBaseCommand_1 = require("./SpoAppBaseCommand");
 class SpoAppGetCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
@@ -38,7 +39,7 @@ class SpoAppGetCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 const scope = (args.options.scope) ? args.options.scope.toLowerCase() : 'tenant';
-                const spoUrl = yield utils_1.spo.getSpoUrl(logger, this.debug);
+                const spoUrl = yield spo_1.spo.getSpoUrl(logger, this.debug);
                 const appCatalogSiteUrl = yield this.getAppCatalogSiteUrl(logger, spoUrl, args);
                 let appId;
                 if (args.options.id) {
@@ -109,11 +110,11 @@ _SpoAppGetCommand_instances = new WeakSet(), _SpoAppGetCommand_initTelemetry = f
                 return `You must specify appCatalogUrl when the scope is sitecollection`;
             }
         }
-        if (args.options.id && !utils_1.validation.isValidGuid(args.options.id)) {
+        if (args.options.id && !validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         if (args.options.appCatalogUrl) {
-            return utils_1.validation.isValidSharePointUrl(args.options.appCatalogUrl);
+            return validation_1.validation.isValidSharePointUrl(args.options.appCatalogUrl);
         }
         return true;
     }));

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

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoAppInstallCommand_instances, _SpoAppInstallCommand_initTelemetry, _SpoAppInstallCommand_initOptions, _SpoAppInstallCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoAppInstallCommand extends SpoCommand_1.default {
@@ -77,10 +77,10 @@ _SpoAppInstallCommand_instances = new WeakSet(), _SpoAppInstallCommand_initTelem
                 return `Scope must be either 'tenant' or 'sitecollection' if specified`;
             }
         }
-        if (!utils_1.validation.isValidGuid(args.options.id)) {
+        if (!validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
-        return utils_1.validation.isValidSharePointUrl(args.options.siteUrl);
+        return validation_1.validation.isValidSharePointUrl(args.options.siteUrl);
     }));
 };
 module.exports = new SpoAppInstallCommand();

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

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoAppInStanceListCommand_instances, _SpoAppInStanceListCommand_initOptions, _SpoAppInStanceListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const commands_1 = require("../../commands");
 const SpoAppBaseCommand_1 = require("./SpoAppBaseCommand");
 class SpoAppInStanceListCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
@@ -71,7 +71,7 @@ _SpoAppInStanceListCommand_instances = new WeakSet(), _SpoAppInStanceListCommand
     });
 }, _SpoAppInStanceListCommand_initValidators = function _SpoAppInStanceListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.siteUrl);
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.siteUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }

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

@@ -16,7 +16,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoAppListCommand_instances, _SpoAppListCommand_initTelemetry, _SpoAppListCommand_initOptions, _SpoAppListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const spo_1 = require("../../../../utils/spo");
+const validation_1 = require("../../../../utils/validation");
 const commands_1 = require("../../commands");
 const SpoAppBaseCommand_1 = require("./SpoAppBaseCommand");
 class SpoAppListCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
@@ -42,7 +43,7 @@ class SpoAppListCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
             let appCatalogSiteUrl = '';
             let spoUrl = '';
             try {
-                spoUrl = yield utils_1.spo.getSpoUrl(logger, this.debug);
+                spoUrl = yield spo_1.spo.getSpoUrl(logger, this.debug);
                 appCatalogSiteUrl = yield this.getAppCatalogSiteUrl(logger, spoUrl, args);
                 if (this.verbose) {
                     logger.logToStderr(`Retrieving apps...`);
@@ -96,7 +97,7 @@ _SpoAppListCommand_instances = new WeakSet(), _SpoAppListCommand_initTelemetry =
                 return `You must specify appCatalogUrl when the scope is sitecollection`;
             }
             if (args.options.appCatalogUrl) {
-                return utils_1.validation.isValidSharePointUrl(args.options.appCatalogUrl);
+                return validation_1.validation.isValidSharePointUrl(args.options.appCatalogUrl);
             }
         }
         return true;

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

@@ -15,9 +15,10 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoAppRemoveCommand_instances, _SpoAppRemoveCommand_initTelemetry, _SpoAppRemoveCommand_initOptions, _SpoAppRemoveCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const spo_1 = require("../../../../utils/spo");
+const validation_1 = require("../../../../utils/validation");
 const commands_1 = require("../../commands");
 const SpoAppBaseCommand_1 = require("./SpoAppBaseCommand");
 class SpoAppRemoveCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
@@ -39,7 +40,7 @@ class SpoAppRemoveCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
             const scope = (args.options.scope) ? args.options.scope.toLowerCase() : 'tenant';
             const removeApp = () => __awaiter(this, void 0, void 0, function* () {
                 try {
-                    const spoUrl = yield utils_1.spo.getSpoUrl(logger, this.debug);
+                    const spoUrl = yield spo_1.spo.getSpoUrl(logger, this.debug);
                     const appCatalogUrl = yield this.getAppCatalogSiteUrl(logger, spoUrl, args);
                     if (this.debug) {
                         logger.logToStderr(`Retrieved app catalog URL ${appCatalogUrl}. Removing app from the app catalog...`);
@@ -60,7 +61,7 @@ class SpoAppRemoveCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
                 yield removeApp();
             }
             else {
-                const result = yield cli_1.Cli.prompt({
+                const result = yield Cli_1.Cli.prompt({
                     type: 'confirm',
                     name: 'continue',
                     default: false,
@@ -104,11 +105,11 @@ _SpoAppRemoveCommand_instances = new WeakSet(), _SpoAppRemoveCommand_initTelemet
                 return `You must specify appCatalogUrl when the scope is sitecollection`;
             }
         }
-        if (!utils_1.validation.isValidGuid(args.options.id)) {
+        if (!validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         if (args.options.appCatalogUrl) {
-            return utils_1.validation.isValidSharePointUrl(args.options.appCatalogUrl);
+            return validation_1.validation.isValidSharePointUrl(args.options.appCatalogUrl);
         }
         return true;
     }));

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

@@ -15,9 +15,10 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoAppRetractCommand_instances, _SpoAppRetractCommand_initTelemetry, _SpoAppRetractCommand_initOptions, _SpoAppRetractCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const spo_1 = require("../../../../utils/spo");
+const validation_1 = require("../../../../utils/validation");
 const commands_1 = require("../../commands");
 const SpoAppBaseCommand_1 = require("./SpoAppBaseCommand");
 class SpoAppRetractCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
@@ -39,7 +40,7 @@ class SpoAppRetractCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
             const scope = (args.options.scope) ? args.options.scope.toLowerCase() : 'tenant';
             const retractApp = () => __awaiter(this, void 0, void 0, function* () {
                 try {
-                    const spoUrl = yield utils_1.spo.getSpoUrl(logger, this.debug);
+                    const spoUrl = yield spo_1.spo.getSpoUrl(logger, this.debug);
                     const appCatalogSiteUrl = yield this.getAppCatalogSiteUrl(logger, spoUrl, args);
                     if (this.verbose) {
                         logger.logToStderr(`Retracting app...`);
@@ -60,7 +61,7 @@ class SpoAppRetractCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
                 yield retractApp();
             }
             else {
-                const result = yield cli_1.Cli.prompt({
+                const result = yield Cli_1.Cli.prompt({
                     type: 'confirm',
                     name: 'continue',
                     default: false,
@@ -103,11 +104,11 @@ _SpoAppRetractCommand_instances = new WeakSet(), _SpoAppRetractCommand_initTelem
                 return `You must specify appCatalogUrl when the scope is sitecollection`;
             }
         }
-        if (!utils_1.validation.isValidGuid(args.options.id)) {
+        if (!validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         if (args.options.appCatalogUrl) {
-            return utils_1.validation.isValidSharePointUrl(args.options.appCatalogUrl);
+            return validation_1.validation.isValidSharePointUrl(args.options.appCatalogUrl);
         }
         return true;
     }));

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

@@ -15,9 +15,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoAppUninstallCommand_instances, _SpoAppUninstallCommand_initTelemetry, _SpoAppUninstallCommand_initOptions, _SpoAppUninstallCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoAppUninstallCommand extends SpoCommand_1.default {
@@ -58,7 +58,7 @@ class SpoAppUninstallCommand extends SpoCommand_1.default {
                 yield uninstallApp();
             }
             else {
-                const result = yield cli_1.Cli.prompt({
+                const result = yield Cli_1.Cli.prompt({
                     type: 'confirm',
                     name: 'continue',
                     default: false,
@@ -97,10 +97,10 @@ _SpoAppUninstallCommand_instances = new WeakSet(), _SpoAppUninstallCommand_initT
                 return `Scope must be either 'tenant' or 'sitecollection' if specified`;
             }
         }
-        if (!utils_1.validation.isValidGuid(args.options.id)) {
+        if (!validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
-        return utils_1.validation.isValidSharePointUrl(args.options.siteUrl);
+        return validation_1.validation.isValidSharePointUrl(args.options.siteUrl);
     }));
 };
 module.exports = new SpoAppUninstallCommand();

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

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoAppUpgradeCommand_instances, _SpoAppUpgradeCommand_initTelemetry, _SpoAppUpgradeCommand_initOptions, _SpoAppUpgradeCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoAppUpgradeCommand extends SpoCommand_1.default {
@@ -77,10 +77,10 @@ _SpoAppUpgradeCommand_instances = new WeakSet(), _SpoAppUpgradeCommand_initTelem
                 return `Scope must be either 'tenant' or 'sitecollection' if specified`;
             }
         }
-        if (!utils_1.validation.isValidGuid(args.options.id)) {
+        if (!validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
-        return utils_1.validation.isValidSharePointUrl(args.options.siteUrl);
+        return validation_1.validation.isValidSharePointUrl(args.options.siteUrl);
     }));
 };
 module.exports = new SpoAppUpgradeCommand();

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

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoAppPageAddCommand_instances, _SpoAppPageAddCommand_initTelemetry, _SpoAppPageAddCommand_initOptions, _SpoAppPageAddCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const urlUtil_1 = require("../../../../utils/urlUtil");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoAppPageAddCommand extends SpoCommand_1.default {
@@ -50,7 +50,7 @@ class SpoAppPageAddCommand extends SpoCommand_1.default {
                 const page = yield request_1.default.post(createPageRequestOptions);
                 const pageUrl = page.value;
                 let requestOptions = {
-                    url: `${args.options.webUrl}/_api/web/getfilebyserverrelativeurl('${utils_1.urlUtil.getServerRelativeSiteUrl(args.options.webUrl)}/${pageUrl}')?$expand=ListItemAllFields`,
+                    url: `${args.options.webUrl}/_api/web/getfilebyserverrelativeurl('${urlUtil_1.urlUtil.getServerRelativeSiteUrl(args.options.webUrl)}/${pageUrl}')?$expand=ListItemAllFields`,
                     headers: {
                         'content-type': 'application/json;charset=utf-8',
                         accept: 'application/json;odata=nometadata'

package/dist/m365/spo/commands/apppage/apppage-set.js

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoAppPageSetCommand_instances, _SpoAppPageSetCommand_initOptions, _SpoAppPageSetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const urlUtil_1 = require("../../../../utils/urlUtil");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoAppPageSetCommand extends SpoCommand_1.default {
@@ -42,7 +42,7 @@ class SpoAppPageSetCommand extends SpoCommand_1.default {
                 },
                 responseType: 'json',
                 data: {
-                    serverRelativeUrl: `${utils_1.urlUtil.getServerRelativePath(args.options.webUrl, '')}/SitePages/${args.options.pageName}`,
+                    serverRelativeUrl: `${urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, '')}/SitePages/${args.options.pageName}`,
                     webPartDataAsJson: args.options.webPartData
                 }
             };

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

@@ -17,7 +17,7 @@ var _SpoCdnGetCommand_instances, _SpoCdnGetCommand_initTelemetry, _SpoCdnGetComm
 Object.defineProperty(exports, "__esModule", { value: true });
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const spo_1 = require("../../../../utils/spo");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoCdnGetCommand extends SpoCommand_1.default {
@@ -41,9 +41,9 @@ class SpoCdnGetCommand extends SpoCommand_1.default {
             let spoAdminUrl = '';
             let tenantId = '';
             try {
-                tenantId = yield utils_1.spo.getTenantId(logger, this.debug);
-                spoAdminUrl = yield utils_1.spo.getSpoAdminUrl(logger, this.debug);
-                const reqDigest = yield utils_1.spo.getRequestDigest(spoAdminUrl);
+                tenantId = yield spo_1.spo.getTenantId(logger, this.debug);
+                spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
+                const reqDigest = yield spo_1.spo.getRequestDigest(spoAdminUrl);
                 if (this.verbose) {
                     logger.logToStderr(`Retrieving status of ${(cdnType === 1 ? 'Private' : 'Public')} CDN...`);
                 }

package/dist/m365/spo/commands/cdn/cdn-origin-add.js

@@ -17,7 +17,8 @@ var _SpoCdnOriginAddCommand_instances, _SpoCdnOriginAddCommand_initTelemetry, _S
 Object.defineProperty(exports, "__esModule", { value: true });
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const spo_1 = require("../../../../utils/spo");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoCdnOriginAddCommand extends SpoCommand_1.default {
@@ -41,9 +42,9 @@ class SpoCdnOriginAddCommand extends SpoCommand_1.default {
             let spoAdminUrl = '';
             let tenantId = '';
             try {
-                tenantId = yield utils_1.spo.getTenantId(logger, this.debug);
-                spoAdminUrl = yield utils_1.spo.getSpoAdminUrl(logger, this.debug);
-                const reqDigest = yield utils_1.spo.getRequestDigest(spoAdminUrl);
+                tenantId = yield spo_1.spo.getTenantId(logger, this.debug);
+                spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
+                const reqDigest = yield spo_1.spo.getRequestDigest(spoAdminUrl);
                 if (this.verbose) {
                     logger.logToStderr(`Adding origin ${args.options.origin} to the ${(cdnType === 1 ? 'Private' : 'Public')} CDN. Please wait, this might take a moment...`);
                 }
@@ -52,7 +53,7 @@ class SpoCdnOriginAddCommand extends SpoCommand_1.default {
                     headers: {
                         'X-RequestDigest': reqDigest.FormDigestValue
                     },
-                    data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><Method Name="AddTenantCdnOrigin" Id="27" ObjectPathId="23"><Parameters><Parameter Type="Enum">${cdnType}</Parameter><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.origin)}</Parameter></Parameters></Method></Actions><ObjectPaths><Identity Id="23" Name="${tenantId}" /></ObjectPaths></Request>`
+                    data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><Method Name="AddTenantCdnOrigin" Id="27" ObjectPathId="23"><Parameters><Parameter Type="Enum">${cdnType}</Parameter><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.origin)}</Parameter></Parameters></Method></Actions><ObjectPaths><Identity Id="23" Name="${tenantId}" /></ObjectPaths></Request>`
                 };
                 const res = yield request_1.default.post(requestOptions);
                 const json = JSON.parse(res);

package/dist/m365/spo/commands/cdn/cdn-origin-list.js

@@ -17,7 +17,7 @@ var _SpoCdnOriginListCommand_instances, _SpoCdnOriginListCommand_initTelemetry,
 Object.defineProperty(exports, "__esModule", { value: true });
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const spo_1 = require("../../../../utils/spo");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoCdnOriginListCommand extends SpoCommand_1.default {
@@ -41,9 +41,9 @@ class SpoCdnOriginListCommand extends SpoCommand_1.default {
             let spoAdminUrl = '';
             let tenantId = '';
             try {
-                tenantId = yield utils_1.spo.getTenantId(logger, this.debug);
-                spoAdminUrl = yield utils_1.spo.getSpoAdminUrl(logger, this.debug);
-                const reqDigest = yield utils_1.spo.getRequestDigest(spoAdminUrl);
+                tenantId = yield spo_1.spo.getTenantId(logger, this.debug);
+                spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
+                const reqDigest = yield spo_1.spo.getRequestDigest(spoAdminUrl);
                 if (this.verbose) {
                     logger.logToStderr(`Retrieving configured origins for ${(cdnType === 1 ? 'Private' : 'Public')} CDN...`);
                 }