@pnp/cli-microsoft365 5.0.0 → 5.1.0-beta.04832fc

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FN022001_SCSS_remove_fabric_react = void 0;
-const __1 = require("../");
+const utils_1 = require("../../../../../../utils");
 const ScssRule_1 = require("./ScssRule");
 class FN022001_SCSS_remove_fabric_react extends ScssRule_1.ScssRule {
     constructor(importValue) {
@@ -30,7 +30,7 @@ class FN022001_SCSS_remove_fabric_react extends ScssRule_1.ScssRule {
         return '';
     }
     visit(project, findings) {
-        if (__1.Utils.isReactProject(project) === false) {
+        if (utils_1.spfx.isReactProject(project) === false) {
             return;
         }
         if (!project.scssFiles ||

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FN022002_SCSS_add_fabric_react = void 0;
-const __1 = require("../");
+const utils_1 = require("../../../../../../utils");
 const ScssRule_1 = require("./ScssRule");
 class FN022002_SCSS_add_fabric_react extends ScssRule_1.ScssRule {
     constructor(importValue, addIfContains) {
@@ -31,7 +31,7 @@ class FN022002_SCSS_add_fabric_react extends ScssRule_1.ScssRule {
         return '';
     }
     visit(project, findings) {
-        if (__1.Utils.isReactProject(project) === false) {
+        if (utils_1.spfx.isReactProject(project) === false) {
             return;
         }
         if (!project.scssFiles ||

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

@@ -0,0 +1,40 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FN023002_GITIGNORE_heft = void 0;
+const Rule_1 = require("./Rule");
+class FN023002_GITIGNORE_heft extends Rule_1.Rule {
+    constructor() {
+        super();
+    }
+    get id() {
+        return 'FN023002';
+    }
+    get title() {
+        return `.gitignore '.heft' folder`;
+    }
+    get description() {
+        return `To .gitignore add the '.heft' folder`;
+    }
+    get resolution() {
+        return `.heft`;
+    }
+    get resolutionType() {
+        return 'text';
+    }
+    get severity() {
+        return 'Required';
+    }
+    get file() {
+        return './.gitignore';
+    }
+    visit(project, findings) {
+        if (!project.gitignore) {
+            return;
+        }
+        if (!/^\.heft$/m.test(project.gitignore.source)) {
+            this.addFinding(findings);
+        }
+    }
+}
+exports.FN023002_GITIGNORE_heft = FN023002_GITIGNORE_heft;
+//# sourceMappingURL=FN023002_GITIGNORE_heft.js.map

package/dist/m365/spfx/commands/project/project-upgrade/upgrade-1.15.0-beta.1.js

@@ -0,0 +1,63 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const FN001001_DEP_microsoft_sp_core_library_1 = require("./rules/FN001001_DEP_microsoft_sp_core_library");
+const FN001002_DEP_microsoft_sp_lodash_subset_1 = require("./rules/FN001002_DEP_microsoft_sp_lodash_subset");
+const FN001003_DEP_microsoft_sp_office_ui_fabric_core_1 = require("./rules/FN001003_DEP_microsoft_sp_office_ui_fabric_core");
+const FN001004_DEP_microsoft_sp_webpart_base_1 = require("./rules/FN001004_DEP_microsoft_sp_webpart_base");
+const FN001011_DEP_microsoft_sp_dialog_1 = require("./rules/FN001011_DEP_microsoft_sp_dialog");
+const FN001012_DEP_microsoft_sp_application_base_1 = require("./rules/FN001012_DEP_microsoft_sp_application_base");
+const FN001013_DEP_microsoft_decorators_1 = require("./rules/FN001013_DEP_microsoft_decorators");
+const FN001014_DEP_microsoft_sp_listview_extensibility_1 = require("./rules/FN001014_DEP_microsoft_sp_listview_extensibility");
+const FN001021_DEP_microsoft_sp_property_pane_1 = require("./rules/FN001021_DEP_microsoft_sp_property_pane");
+const FN001022_DEP_office_ui_fabric_react_1 = require("./rules/FN001022_DEP_office_ui_fabric_react");
+const FN001023_DEP_microsoft_sp_component_base_1 = require("./rules/FN001023_DEP_microsoft_sp_component_base");
+const FN001024_DEP_microsoft_sp_diagnostics_1 = require("./rules/FN001024_DEP_microsoft_sp_diagnostics");
+const FN001025_DEP_microsoft_sp_dynamic_data_1 = require("./rules/FN001025_DEP_microsoft_sp_dynamic_data");
+const FN001026_DEP_microsoft_sp_extension_base_1 = require("./rules/FN001026_DEP_microsoft_sp_extension_base");
+const FN001027_DEP_microsoft_sp_http_1 = require("./rules/FN001027_DEP_microsoft_sp_http");
+const FN001028_DEP_microsoft_sp_list_subscription_1 = require("./rules/FN001028_DEP_microsoft_sp_list_subscription");
+const FN001029_DEP_microsoft_sp_loader_1 = require("./rules/FN001029_DEP_microsoft_sp_loader");
+const FN001030_DEP_microsoft_sp_module_interfaces_1 = require("./rules/FN001030_DEP_microsoft_sp_module_interfaces");
+const FN001031_DEP_microsoft_sp_odata_types_1 = require("./rules/FN001031_DEP_microsoft_sp_odata_types");
+const FN001032_DEP_microsoft_sp_page_context_1 = require("./rules/FN001032_DEP_microsoft_sp_page_context");
+const FN001033_DEP_tslib_1 = require("./rules/FN001033_DEP_tslib");
+const FN002001_DEVDEP_microsoft_sp_build_web_1 = require("./rules/FN002001_DEVDEP_microsoft_sp_build_web");
+const FN002002_DEVDEP_microsoft_sp_module_interfaces_1 = require("./rules/FN002002_DEVDEP_microsoft_sp_module_interfaces");
+const FN002007_DEVDEP_ajv_1 = require("./rules/FN002007_DEVDEP_ajv");
+const FN002009_DEVDEP_microsoft_sp_tslint_rules_1 = require("./rules/FN002009_DEVDEP_microsoft_sp_tslint_rules");
+const FN002013_DEVDEP_types_webpack_env_1 = require("./rules/FN002013_DEVDEP_types_webpack_env");
+const FN006004_CFG_PS_developer_1 = require("./rules/FN006004_CFG_PS_developer");
+const FN010001_YORC_version_1 = require("./rules/FN010001_YORC_version");
+const FN023002_GITIGNORE_heft_1 = require("./rules/FN023002_GITIGNORE_heft");
+module.exports = [
+    new FN001001_DEP_microsoft_sp_core_library_1.FN001001_DEP_microsoft_sp_core_library('1.15.0-beta.1'),
+    new FN001002_DEP_microsoft_sp_lodash_subset_1.FN001002_DEP_microsoft_sp_lodash_subset('1.15.0-beta.1'),
+    new FN001003_DEP_microsoft_sp_office_ui_fabric_core_1.FN001003_DEP_microsoft_sp_office_ui_fabric_core('1.15.0-beta.1'),
+    new FN001004_DEP_microsoft_sp_webpart_base_1.FN001004_DEP_microsoft_sp_webpart_base('1.15.0-beta.1'),
+    new FN001011_DEP_microsoft_sp_dialog_1.FN001011_DEP_microsoft_sp_dialog('1.15.0-beta.1'),
+    new FN001012_DEP_microsoft_sp_application_base_1.FN001012_DEP_microsoft_sp_application_base('1.15.0-beta.1'),
+    new FN001013_DEP_microsoft_decorators_1.FN001013_DEP_microsoft_decorators('1.15.0-beta.1'),
+    new FN001014_DEP_microsoft_sp_listview_extensibility_1.FN001014_DEP_microsoft_sp_listview_extensibility('1.15.0-beta.1'),
+    new FN001021_DEP_microsoft_sp_property_pane_1.FN001021_DEP_microsoft_sp_property_pane('1.15.0-beta.1'),
+    new FN001022_DEP_office_ui_fabric_react_1.FN001022_DEP_office_ui_fabric_react('7.181.1'),
+    new FN001023_DEP_microsoft_sp_component_base_1.FN001023_DEP_microsoft_sp_component_base('1.15.0-beta.1'),
+    new FN001024_DEP_microsoft_sp_diagnostics_1.FN001024_DEP_microsoft_sp_diagnostics('1.15.0-beta.1'),
+    new FN001025_DEP_microsoft_sp_dynamic_data_1.FN001025_DEP_microsoft_sp_dynamic_data('1.15.0-beta.1'),
+    new FN001026_DEP_microsoft_sp_extension_base_1.FN001026_DEP_microsoft_sp_extension_base('1.15.0-beta.1'),
+    new FN001027_DEP_microsoft_sp_http_1.FN001027_DEP_microsoft_sp_http('1.15.0-beta.1'),
+    new FN001028_DEP_microsoft_sp_list_subscription_1.FN001028_DEP_microsoft_sp_list_subscription('1.15.0-beta.1'),
+    new FN001029_DEP_microsoft_sp_loader_1.FN001029_DEP_microsoft_sp_loader('1.15.0-beta.1'),
+    new FN001030_DEP_microsoft_sp_module_interfaces_1.FN001030_DEP_microsoft_sp_module_interfaces('1.15.0-beta.1'),
+    new FN001031_DEP_microsoft_sp_odata_types_1.FN001031_DEP_microsoft_sp_odata_types('1.15.0-beta.1'),
+    new FN001032_DEP_microsoft_sp_page_context_1.FN001032_DEP_microsoft_sp_page_context('1.15.0-beta.1'),
+    new FN001033_DEP_tslib_1.FN001033_DEP_tslib('1.13.0'),
+    new FN002001_DEVDEP_microsoft_sp_build_web_1.FN002001_DEVDEP_microsoft_sp_build_web('1.15.0-beta.1'),
+    new FN002002_DEVDEP_microsoft_sp_module_interfaces_1.FN002002_DEVDEP_microsoft_sp_module_interfaces('1.15.0-beta.1'),
+    new FN002007_DEVDEP_ajv_1.FN002007_DEVDEP_ajv('6.12.5'),
+    new FN002009_DEVDEP_microsoft_sp_tslint_rules_1.FN002009_DEVDEP_microsoft_sp_tslint_rules('1.15.0-beta.1'),
+    new FN002013_DEVDEP_types_webpack_env_1.FN002013_DEVDEP_types_webpack_env('1.15.2'),
+    new FN006004_CFG_PS_developer_1.FN006004_CFG_PS_developer('1.15.0-beta.1'),
+    new FN010001_YORC_version_1.FN010001_YORC_version('1.15.0-beta.1'),
+    new FN023002_GITIGNORE_heft_1.FN023002_GITIGNORE_heft()
+];
+//# sourceMappingURL=upgrade-1.15.0-beta.1.js.map

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

@@ -3,6 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require("fs");
 const os = require("os");
 const path = require("path");
+// uncomment to support upgrading to preview releases
+const semver_1 = require("semver");
 const Command_1 = require("../../../../Command");
 const commands_1 = require("../../commands");
 const base_project_command_1 = require("./base-project-command");
@@ -43,7 +45,8 @@ class SpfxProjectUpgradeCommand extends base_project_command_1.BaseProjectComman
             '1.12.1',
             '1.13.0',
             '1.13.1',
-            '1.14.0'
+            '1.14.0',
+            '1.15.0-beta.1'
         ];
     }
     get name() {
@@ -56,9 +59,9 @@ class SpfxProjectUpgradeCommand extends base_project_command_1.BaseProjectComman
         const telemetryProps = super.getTelemetryProperties(args);
         telemetryProps.toVersion = args.options.toVersion || this.supportedVersions[this.supportedVersions.length - 1];
         // uncomment to support upgrading to preview releases
-        // if (prerelease(telemetryProps.toVersion) && !args.options.preview) {
-        //   telemetryProps.toVersion = this.supportedVersions[this.supportedVersions.length - 2];
-        // }
+        if ((0, semver_1.prerelease)(telemetryProps.toVersion) && !args.options.preview) {
+            telemetryProps.toVersion = this.supportedVersions[this.supportedVersions.length - 2];
+        }
         telemetryProps.packageManager = args.options.packageManager || 'npm';
         telemetryProps.shell = args.options.shell || 'bash';
         telemetryProps.preview = args.options.preview;
@@ -72,15 +75,15 @@ class SpfxProjectUpgradeCommand extends base_project_command_1.BaseProjectComman
         }
         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 &&
+            (0, semver_1.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) {
@@ -501,11 +504,11 @@ ${f.resolution}
             },
             {
                 option: '--packageManager [packageManager]',
-                autocomplete: ['npm', 'pnpm', 'yarn']
+                autocomplete: SpfxProjectUpgradeCommand.packageManagers
             },
             {
                 option: '--shell [shell]',
-                autocomplete: ['bash', 'powershell', 'cmd']
+                autocomplete: SpfxProjectUpgradeCommand.shells
             },
             {
                 option: '--preview'
@@ -521,18 +524,20 @@ ${f.resolution}
     }
     validate(args) {
         if (args.options.packageManager) {
-            if (['npm', 'pnpm', 'yarn'].indexOf(args.options.packageManager) < 0) {
-                return `${args.options.packageManager} is not a supported package manager. Supported package managers are npm, pnpm and yarn`;
+            if (SpfxProjectUpgradeCommand.packageManagers.indexOf(args.options.packageManager) < 0) {
+                return `${args.options.packageManager} is not a supported package manager. Supported package managers are ${SpfxProjectUpgradeCommand.packageManagers.join(', ')}`;
             }
         }
         if (args.options.shell) {
-            if (['bash', 'powershell', 'logger'].indexOf(args.options.shell) < 0) {
-                return `${args.options.shell} is not a supported shell. Supported shells are bash, powershell and cmd`;
+            if (SpfxProjectUpgradeCommand.shells.indexOf(args.options.shell) < 0) {
+                return `${args.options.shell} is not a supported shell. Supported shells are ${SpfxProjectUpgradeCommand.shells.join(', ')}`;
             }
         }
         return true;
     }
 }
+SpfxProjectUpgradeCommand.packageManagers = ['npm', 'pnpm', 'yarn'];
+SpfxProjectUpgradeCommand.shells = ['bash', 'powershell', 'cmd'];
 SpfxProjectUpgradeCommand.packageCommands = {
     npm: {
         install: 'npm i -SE',

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

@@ -3,6 +3,7 @@ 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 commands_1 = require("../../commands");
 const SpoAppBaseCommand_1 = require("./SpoAppBaseCommand");
 class SpoAppAddCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
@@ -22,7 +23,7 @@ class SpoAppAddCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
     commandAction(logger, args, cb) {
         const scope = (args.options.scope) ? args.options.scope.toLowerCase() : 'tenant';
         const overwrite = args.options.overwrite || false;
-        this
+        utils_1.spo
             .getSpoUrl(logger, this.debug)
             .then((spoUrl) => {
             return this.getAppCatalogSiteUrl(logger, spoUrl, args);
@@ -92,7 +93,7 @@ class SpoAppAddCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
             return `Path '${fullPath}' points to a directory`;
         }
         if (args.options.appCatalogUrl) {
-            return SpoAppBaseCommand_1.SpoAppBaseCommand.isValidSharePointUrl(args.options.appCatalogUrl);
+            return utils_1.validation.isValidSharePointUrl(args.options.appCatalogUrl);
         }
         return true;
     }

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
 const commands_1 = require("../../commands");
 const SpoAppBaseCommand_1 = require("./SpoAppBaseCommand");
 class SpoAppDeployCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
@@ -24,7 +24,7 @@ class SpoAppDeployCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
         let appId = '';
         const scope = (args.options.scope) ? args.options.scope.toLowerCase() : 'tenant';
         let appCatalogUrl = '';
-        this
+        utils_1.spo
             .getSpoUrl(logger, this.debug)
             .then((spoUrl) => {
             return this.getAppCatalogSiteUrl(logger, spoUrl, args);
@@ -108,11 +108,11 @@ class SpoAppDeployCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
         if (args.options.id && args.options.name) {
             return 'Specify either the id or the name but not both';
         }
-        if (args.options.id && !Utils_1.default.isValidGuid(args.options.id)) {
+        if (args.options.id && !utils_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         if (args.options.appCatalogUrl) {
-            return SpoAppBaseCommand_1.SpoAppBaseCommand.isValidSharePointUrl(args.options.appCatalogUrl);
+            return utils_1.validation.isValidSharePointUrl(args.options.appCatalogUrl);
         }
         return true;
     }

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
 const commands_1 = require("../../commands");
 const SpoAppBaseCommand_1 = require("./SpoAppBaseCommand");
 class SpoAppGetCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
@@ -22,7 +22,7 @@ class SpoAppGetCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
     commandAction(logger, args, cb) {
         const scope = (args.options.scope) ? args.options.scope.toLowerCase() : 'tenant';
         let appCatalogSiteUrl = '';
-        this
+        utils_1.spo
             .getSpoUrl(logger, this.debug)
             .then((spoUrl) => {
             return this.getAppCatalogSiteUrl(logger, spoUrl, args);
@@ -98,11 +98,11 @@ class SpoAppGetCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
         if (args.options.id && args.options.name) {
             return 'Specify either the id or the name but not both';
         }
-        if (args.options.id && !Utils_1.default.isValidGuid(args.options.id)) {
+        if (args.options.id && !utils_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         if (args.options.appCatalogUrl) {
-            return SpoAppBaseCommand_1.SpoAppBaseCommand.isValidSharePointUrl(args.options.appCatalogUrl);
+            return utils_1.validation.isValidSharePointUrl(args.options.appCatalogUrl);
         }
         return true;
     }

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoAppInstallCommand extends SpoCommand_1.default {
@@ -54,10 +54,10 @@ class SpoAppInstallCommand extends SpoCommand_1.default {
                 return `Scope must be either 'tenant' or 'sitecollection' if specified`;
             }
         }
-        if (!Utils_1.default.isValidGuid(args.options.id)) {
+        if (!utils_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
-        return SpoCommand_1.default.isValidSharePointUrl(args.options.siteUrl);
+        return utils_1.validation.isValidSharePointUrl(args.options.siteUrl);
     }
 }
 module.exports = new SpoAppInstallCommand();

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
+const utils_1 = require("../../../../utils");
 const commands_1 = require("../../commands");
 const SpoAppBaseCommand_1 = require("./SpoAppBaseCommand");
 class SpoAppInStanceListCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
@@ -48,7 +49,7 @@ class SpoAppInStanceListCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
         return options.concat(parentOptions);
     }
     validate(args) {
-        const isValidSharePointUrl = SpoAppBaseCommand_1.SpoAppBaseCommand.isValidSharePointUrl(args.options.siteUrl);
+        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.siteUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
+const utils_1 = require("../../../../utils");
 const commands_1 = require("../../commands");
 const SpoAppBaseCommand_1 = require("./SpoAppBaseCommand");
 class SpoAppListCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
@@ -23,7 +24,7 @@ class SpoAppListCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
         const scope = (args.options.scope) ? args.options.scope.toLowerCase() : 'tenant';
         let appCatalogSiteUrl = '';
         let spoUrl = '';
-        this
+        utils_1.spo
             .getSpoUrl(logger, this.debug)
             .then((_spoUrl) => {
             spoUrl = _spoUrl;
@@ -79,7 +80,7 @@ class SpoAppListCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
                 return `You must specify appCatalogUrl when the scope is sitecollection`;
             }
             if (args.options.appCatalogUrl) {
-                return SpoAppBaseCommand_1.SpoAppBaseCommand.isValidSharePointUrl(args.options.appCatalogUrl);
+                return utils_1.validation.isValidSharePointUrl(args.options.appCatalogUrl);
             }
         }
         return true;

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

@@ -2,8 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const cli_1 = require("../../../../cli");
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
-const SpoCommand_1 = require("../../../base/SpoCommand");
+const utils_1 = require("../../../../utils");
 const commands_1 = require("../../commands");
 const SpoAppBaseCommand_1 = require("./SpoAppBaseCommand");
 class SpoAppRemoveCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
@@ -23,7 +22,7 @@ class SpoAppRemoveCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
     commandAction(logger, args, cb) {
         const scope = (args.options.scope) ? args.options.scope.toLowerCase() : 'tenant';
         const removeApp = () => {
-            this
+            utils_1.spo
                 .getSpoUrl(logger, this.debug)
                 .then((spoUrl) => {
                 return this.getAppCatalogSiteUrl(logger, spoUrl, args);
@@ -91,11 +90,11 @@ class SpoAppRemoveCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
                 return `You must specify appCatalogUrl when the scope is sitecollection`;
             }
         }
-        if (!Utils_1.default.isValidGuid(args.options.id)) {
+        if (!utils_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         if (args.options.appCatalogUrl) {
-            return SpoCommand_1.default.isValidSharePointUrl(args.options.appCatalogUrl);
+            return utils_1.validation.isValidSharePointUrl(args.options.appCatalogUrl);
         }
         return true;
     }

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

@@ -2,8 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const cli_1 = require("../../../../cli");
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
-const SpoCommand_1 = require("../../../base/SpoCommand");
+const utils_1 = require("../../../../utils");
 const commands_1 = require("../../commands");
 const SpoAppBaseCommand_1 = require("./SpoAppBaseCommand");
 class SpoAppRetractCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
@@ -23,7 +22,7 @@ class SpoAppRetractCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
     commandAction(logger, args, cb) {
         const scope = (args.options.scope) ? args.options.scope.toLowerCase() : 'tenant';
         const retractApp = () => {
-            this
+            utils_1.spo
                 .getSpoUrl(logger, this.debug)
                 .then((spoUrl) => {
                 return this.getAppCatalogSiteUrl(logger, spoUrl, args);
@@ -90,11 +89,11 @@ class SpoAppRetractCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
                 return `You must specify appCatalogUrl when the scope is sitecollection`;
             }
         }
-        if (!Utils_1.default.isValidGuid(args.options.id)) {
+        if (!utils_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         if (args.options.appCatalogUrl) {
-            return SpoCommand_1.default.isValidSharePointUrl(args.options.appCatalogUrl);
+            return utils_1.validation.isValidSharePointUrl(args.options.appCatalogUrl);
         }
         return true;
     }

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

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const cli_1 = require("../../../../cli");
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoAppUninstallCommand extends SpoCommand_1.default {
@@ -79,10 +79,10 @@ class SpoAppUninstallCommand extends SpoCommand_1.default {
                 return `Scope must be either 'tenant' or 'sitecollection' if specified`;
             }
         }
-        if (!Utils_1.default.isValidGuid(args.options.id)) {
+        if (!utils_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
-        return SpoCommand_1.default.isValidSharePointUrl(args.options.siteUrl);
+        return utils_1.validation.isValidSharePointUrl(args.options.siteUrl);
     }
 }
 module.exports = new SpoAppUninstallCommand();

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoAppUpgradeCommand extends SpoCommand_1.default {
@@ -54,10 +54,10 @@ class SpoAppUpgradeCommand extends SpoCommand_1.default {
                 return `Scope must be either 'tenant' or 'sitecollection' if specified`;
             }
         }
-        if (!Utils_1.default.isValidGuid(args.options.id)) {
+        if (!utils_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
-        return SpoCommand_1.default.isValidSharePointUrl(args.options.siteUrl);
+        return utils_1.validation.isValidSharePointUrl(args.options.siteUrl);
     }
 }
 module.exports = new SpoAppUpgradeCommand();

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoAppPageAddCommand extends SpoCommand_1.default {
@@ -33,7 +33,7 @@ class SpoAppPageAddCommand extends SpoCommand_1.default {
             .then((page) => {
             const pageUrl = page.value;
             const requestOptions = {
-                url: `${args.options.webUrl}/_api/web/getfilebyserverrelativeurl('${Utils_1.default.getServerRelativeSiteUrl(args.options.webUrl)}/${pageUrl}')?$expand=ListItemAllFields`,
+                url: `${args.options.webUrl}/_api/web/getfilebyserverrelativeurl('${utils_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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoAppPageSetCommand extends SpoCommand_1.default {
@@ -20,7 +20,7 @@ class SpoAppPageSetCommand extends SpoCommand_1.default {
             },
             responseType: 'json',
             data: {
-                serverRelativeUrl: `${Utils_1.default.getServerRelativePath(args.options.webUrl, '')}/SitePages/${args.options.pageName}`,
+                serverRelativeUrl: `${utils_1.urlUtil.getServerRelativePath(args.options.webUrl, '')}/SitePages/${args.options.pageName}`,
                 webPartDataAsJson: args.options.webPartData
             }
         };

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const Command_1 = require("../../../../Command");
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoCdnGetCommand extends SpoCommand_1.default {
@@ -22,15 +23,15 @@ class SpoCdnGetCommand extends SpoCommand_1.default {
         const cdnType = cdnTypeString === 'Private' ? 1 : 0;
         let spoAdminUrl = '';
         let tenantId = '';
-        this
+        utils_1.spo
             .getTenantId(logger, this.debug)
             .then((_tenantId) => {
             tenantId = _tenantId;
-            return this.getSpoAdminUrl(logger, this.debug);
+            return utils_1.spo.getSpoAdminUrl(logger, this.debug);
         })
             .then((_spoAdminUrl) => {
             spoAdminUrl = _spoAdminUrl;
-            return this.getRequestDigest(spoAdminUrl);
+            return utils_1.spo.getRequestDigest(spoAdminUrl);
         })
             .then((res) => {
             if (this.verbose) {

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

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const Command_1 = require("../../../../Command");
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoCdnOriginAddCommand extends SpoCommand_1.default {
@@ -23,15 +23,15 @@ class SpoCdnOriginAddCommand extends SpoCommand_1.default {
         const cdnType = cdnTypeString === 'Private' ? 1 : 0;
         let spoAdminUrl = '';
         let tenantId = '';
-        this
+        utils_1.spo
             .getTenantId(logger, this.debug)
             .then((_tenantId) => {
             tenantId = _tenantId;
-            return this.getSpoAdminUrl(logger, this.debug);
+            return utils_1.spo.getSpoAdminUrl(logger, this.debug);
         })
             .then((_spoAdminUrl) => {
             spoAdminUrl = _spoAdminUrl;
-            return this.getRequestDigest(spoAdminUrl);
+            return utils_1.spo.getRequestDigest(spoAdminUrl);
         })
             .then((res) => {
             if (this.verbose) {
@@ -42,7 +42,7 @@ class SpoCdnOriginAddCommand extends SpoCommand_1.default {
                 headers: {
                     'X-RequestDigest': res.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.default.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">${utils_1.formatting.escapeXml(args.options.origin)}</Parameter></Parameters></Method></Actions><ObjectPaths><Identity Id="23" Name="${tenantId}" /></ObjectPaths></Request>`
             };
             return request_1.default.post(requestOptions);
         })